diff --git a/asm/non_matchings/camera/func_80068514.s b/asm/non_matchings/camera/func_80068514.s index 3078ef43..7f5ffc7e 100644 --- a/asm/non_matchings/camera/func_80068514.s +++ b/asm/non_matchings/camera/func_80068514.s @@ -56,11 +56,11 @@ glabel func_80068514 /* 0691EC 800685EC 0C0326B4 */ jal sqrtf /* 0691F0 800685F0 46125300 */ add.s $f12, $f10, $f18 /* 0691F4 800685F4 C7AC0044 */ lwc1 $f12, 0x44($sp) -/* 0691F8 800685F8 0C01C1D4 */ jal func_80070750 +/* 0691F8 800685F8 0C01C1D4 */ jal atan2f /* 0691FC 800685FC 46000386 */ mov.s $f14, $f0 /* 069200 80068600 C7AC0044 */ lwc1 $f12, 0x44($sp) /* 069204 80068604 AFA20038 */ sw $v0, 0x38($sp) -/* 069208 80068608 0C01C1D4 */ jal func_80070750 +/* 069208 80068608 0C01C1D4 */ jal atan2f /* 06920C 8006860C 4600A386 */ mov.s $f14, $f20 /* 069210 80068610 00022400 */ sll $a0, $v0, 0x10 /* 069214 80068614 00045403 */ sra $t2, $a0, 0x10 @@ -81,7 +81,7 @@ glabel func_80068514 .L80068650: /* 069250 80068650 C7AC0058 */ lwc1 $f12, 0x58($sp) /* 069254 80068654 4600A386 */ mov.s $f14, $f20 -/* 069258 80068658 0C01C1D4 */ jal func_80070750 +/* 069258 80068658 0C01C1D4 */ jal atan2f /* 06925C 8006865C AFA4003C */ sw $a0, 0x3c($sp) /* 069260 80068660 34018001 */ li $at, 32769 /* 069264 80068664 8FA4003C */ lw $a0, 0x3c($sp) @@ -136,13 +136,13 @@ glabel func_80068514 /* 069320 80068720 46125300 */ add.s $f12, $f10, $f18 /* 069324 80068724 C7AC005C */ lwc1 $f12, 0x5c($sp) /* 069328 80068728 E7A00050 */ swc1 $f0, 0x50($sp) -/* 06932C 8006872C 0C01C1D4 */ jal func_80070750 +/* 06932C 8006872C 0C01C1D4 */ jal atan2f /* 069330 80068730 4600A386 */ mov.s $f14, $f20 /* 069334 80068734 3C058012 */ lui $a1, %hi(D_80120CF0) # $a1, 0x8012 /* 069338 80068738 24A50CF0 */ addiu $a1, %lo(D_80120CF0) # addiu $a1, $a1, 0xcf0 /* 06933C 8006873C C7AC0058 */ lwc1 $f12, 0x58($sp) /* 069340 80068740 C7AE0050 */ lwc1 $f14, 0x50($sp) -/* 069344 80068744 0C01C1D4 */ jal func_80070750 +/* 069344 80068744 0C01C1D4 */ jal atan2f /* 069348 80068748 A4A20000 */ sh $v0, ($a1) /* 06934C 8006874C 3C058012 */ lui $a1, %hi(D_80120CF0) # $a1, 0x8012 /* 069350 80068750 8FAE0034 */ lw $t6, 0x34($sp) diff --git a/asm/non_matchings/objects/func_8001C6C4.s b/asm/non_matchings/objects/func_8001C6C4.s index bdd630d4..5047530e 100644 --- a/asm/non_matchings/objects/func_8001C6C4.s +++ b/asm/non_matchings/objects/func_8001C6C4.s @@ -245,7 +245,7 @@ glabel func_8001C6C4 /* 01D638 8001CA38 4500003C */ bc1f .L8001CB2C /* 01D63C 8001CA3C 8FAB00EC */ lw $t3, 0xec($sp) /* 01D640 8001CA40 4600B306 */ mov.s $f12, $f22 -/* 01D644 8001CA44 0C01C1D4 */ jal func_80070750 +/* 01D644 8001CA44 0C01C1D4 */ jal atan2f /* 01D648 8001CA48 4600D386 */ mov.s $f14, $f26 /* 01D64C 8001CA4C 8FA800EC */ lw $t0, 0xec($sp) /* 01D650 8001CA50 24018000 */ li $at, -32768 @@ -281,7 +281,7 @@ glabel func_8001C6C4 /* 01D6C0 8001CAC0 00005812 */ mflo $t3 /* 01D6C4 8001CAC4 000B6103 */ sra $t4, $t3, 4 /* 01D6C8 8001CAC8 006C6821 */ addu $t5, $v1, $t4 -/* 01D6CC 8001CACC 0C01C1D4 */ jal func_80070750 +/* 01D6CC 8001CACC 0C01C1D4 */ jal atan2f /* 01D6D0 8001CAD0 A5CD0000 */ sh $t5, ($t6) /* 01D6D4 8001CAD4 8FAF00EC */ lw $t7, 0xec($sp) /* 01D6D8 8001CAD8 00000000 */ nop diff --git a/asm/non_matchings/objects/func_8001F460.s b/asm/non_matchings/objects/func_8001F460.s index 382c32c0..09a1367a 100644 --- a/asm/non_matchings/objects/func_8001F460.s +++ b/asm/non_matchings/objects/func_8001F460.s @@ -1404,7 +1404,7 @@ glabel func_8001F460 .L800208E8: /* 0214E8 800208E8 C7AE011C */ lwc1 $f14, 0x11c($sp) /* 0214EC 800208EC C7AC0124 */ lwc1 $f12, 0x124($sp) -/* 0214F0 800208F0 0C01C1D4 */ jal func_80070750 +/* 0214F0 800208F0 0C01C1D4 */ jal atan2f /* 0214F4 800208F4 00000000 */ nop /* 0214F8 800208F8 24018000 */ li $at, -32768 /* 0214FC 800208FC 00417021 */ addu $t6, $v0, $at @@ -1412,7 +1412,7 @@ glabel func_8001F460 /* 021504 80020904 3C0142C8 */ li $at, 0x42C80000 # 100.000000 /* 021508 80020908 44817000 */ mtc1 $at, $f14 /* 02150C 8002090C C7AC0120 */ lwc1 $f12, 0x120($sp) -/* 021510 80020910 0C01C1D4 */ jal func_80070750 +/* 021510 80020910 0C01C1D4 */ jal atan2f /* 021514 80020914 00000000 */ nop /* 021518 80020918 10000107 */ b .L80020D38 /* 02151C 8002091C A6C20002 */ sh $v0, 2($s6) @@ -1916,13 +1916,13 @@ glabel func_8001F460 /* 021C48 80021048 4500000B */ bc1f .L80021078 /* 021C4C 8002104C 46000506 */ mov.s $f20, $f0 /* 021C50 80021050 C7AC0124 */ lwc1 $f12, 0x124($sp) -/* 021C54 80021054 0C01C1D4 */ jal func_80070750 +/* 021C54 80021054 0C01C1D4 */ jal atan2f /* 021C58 80021058 00000000 */ nop /* 021C5C 8002105C 24018000 */ li $at, -32768 /* 021C60 80021060 0041C021 */ addu $t8, $v0, $at /* 021C64 80021064 A6D80000 */ sh $t8, ($s6) /* 021C68 80021068 C7AC0120 */ lwc1 $f12, 0x120($sp) -/* 021C6C 8002106C 0C01C1D4 */ jal func_80070750 +/* 021C6C 8002106C 0C01C1D4 */ jal atan2f /* 021C70 80021070 4600A386 */ mov.s $f14, $f20 /* 021C74 80021074 A6C20002 */ sh $v0, 2($s6) .L80021078: diff --git a/asm/non_matchings/objects/func_80021600.s b/asm/non_matchings/objects/func_80021600.s index cb17d2c8..5fafc5b6 100644 --- a/asm/non_matchings/objects/func_80021600.s +++ b/asm/non_matchings/objects/func_80021600.s @@ -626,7 +626,7 @@ glabel func_80021600 .L80021F60: /* 022B60 80021F60 C7AE00F0 */ lwc1 $f14, 0xf0($sp) /* 022B64 80021F64 C7AC00F8 */ lwc1 $f12, 0xf8($sp) -/* 022B68 80021F68 0C01C1D4 */ jal func_80070750 +/* 022B68 80021F68 0C01C1D4 */ jal atan2f /* 022B6C 80021F6C 00000000 */ nop /* 022B70 80021F70 24018000 */ li $at, -32768 /* 022B74 80021F74 8FAD0154 */ lw $t5, 0x154($sp) @@ -635,7 +635,7 @@ glabel func_80021600 /* 022B80 80021F80 A5AC0000 */ sh $t4, ($t5) /* 022B84 80021F84 C7AC00F4 */ lwc1 $f12, 0xf4($sp) /* 022B88 80021F88 44817000 */ mtc1 $at, $f14 -/* 022B8C 80021F8C 0C01C1D4 */ jal func_80070750 +/* 022B8C 80021F8C 0C01C1D4 */ jal atan2f /* 022B90 80021F90 00000000 */ nop /* 022B94 80021F94 8FAF0154 */ lw $t7, 0x154($sp) /* 022B98 80021F98 1000015A */ b .L80022504 @@ -706,7 +706,7 @@ glabel func_80021600 /* 022C90 80022090 C7AC00F8 */ lwc1 $f12, 0xf8($sp) /* 022C94 80022094 4500011B */ bc1f .L80022504 /* 022C98 80022098 E7A000EC */ swc1 $f0, 0xec($sp) -/* 022C9C 8002209C 0C01C1D4 */ jal func_80070750 +/* 022C9C 8002209C 0C01C1D4 */ jal atan2f /* 022CA0 800220A0 00000000 */ nop /* 022CA4 800220A4 8FAF0154 */ lw $t7, 0x154($sp) /* 022CA8 800220A8 24018000 */ li $at, -32768 @@ -714,7 +714,7 @@ glabel func_80021600 /* 022CB0 800220B0 A5ED0000 */ sh $t5, ($t7) /* 022CB4 800220B4 C7AE00EC */ lwc1 $f14, 0xec($sp) /* 022CB8 800220B8 C7AC00F4 */ lwc1 $f12, 0xf4($sp) -/* 022CBC 800220BC 0C01C1D4 */ jal func_80070750 +/* 022CBC 800220BC 0C01C1D4 */ jal atan2f /* 022CC0 800220C0 00000000 */ nop /* 022CC4 800220C4 8FAE0154 */ lw $t6, 0x154($sp) /* 022CC8 800220C8 1000010E */ b .L80022504 diff --git a/asm/non_matchings/objects/func_800230D0.s b/asm/non_matchings/objects/func_800230D0.s index c004f8d9..272901b6 100644 --- a/asm/non_matchings/objects/func_800230D0.s +++ b/asm/non_matchings/objects/func_800230D0.s @@ -117,7 +117,7 @@ glabel func_800230D0 /* 023E80 80023280 E6280064 */ swc1 $f8, 0x64($s1) /* 023E84 80023284 C50C0000 */ lwc1 $f12, ($t0) /* 023E88 80023288 C50E0008 */ lwc1 $f14, 8($t0) -/* 023E8C 8002328C 0C01C1D4 */ jal func_80070750 +/* 023E8C 8002328C 0C01C1D4 */ jal atan2f /* 023E90 80023290 AFA8005C */ sw $t0, 0x5c($sp) /* 023E94 80023294 8FA8005C */ lw $t0, 0x5c($sp) /* 023E98 80023298 10000004 */ b .L800232AC diff --git a/asm/non_matchings/racer/func_80042D20.s b/asm/non_matchings/racer/func_80042D20.s index 5f11da27..09a8e29e 100644 --- a/asm/non_matchings/racer/func_80042D20.s +++ b/asm/non_matchings/racer/func_80042D20.s @@ -1196,9 +1196,9 @@ glabel func_80042D20 /* 044A30 80043E30 462A903C */ c.lt.d $f18, $f10 /* 044A34 80043E34 35D98000 */ ori $t9, $t6, 0x8000 /* 044A38 80043E38 45000003 */ bc1f .L80043E48 -/* 044A3C 80043E3C 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 +/* 044A3C 80043E3C 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 /* 044A40 80043E40 AC590000 */ sw $t9, ($v0) -/* 044A44 80043E44 AC20D534 */ sw $zero, %lo(D_8011D534)($at) +/* 044A44 80043E44 AC20D534 */ sw $zero, %lo(gCurrentStickX)($at) .L80043E48: /* 044A48 80043E48 82180214 */ lb $t8, 0x214($s0) /* 044A4C 80043E4C 87AE006E */ lh $t6, 0x6e($sp) diff --git a/asm/non_matchings/racer/func_8004447C.s b/asm/non_matchings/racer/func_8004447C.s index 9f95f17e..104fd685 100644 --- a/asm/non_matchings/racer/func_8004447C.s +++ b/asm/non_matchings/racer/func_8004447C.s @@ -16,15 +16,15 @@ glabel func_8004447C /* 04508C 8004448C 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 /* 045090 80044490 27BDFF88 */ addiu $sp, $sp, -0x78 /* 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) +/* 045098 80044498 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 +/* 04509C 8004449C AC20D534 */ sw $zero, %lo(gCurrentStickX)($at) /* 0450A0 800444A0 AFBF001C */ sw $ra, 0x1c($sp) /* 0450A4 800444A4 AFB00018 */ sw $s0, 0x18($sp) /* 0450A8 800444A8 AFA40078 */ sw $a0, 0x78($sp) -/* 0450AC 800444AC 3C018012 */ lui $at, %hi(D_8011D538) # $at, 0x8012 +/* 0450AC 800444AC 3C018012 */ lui $at, %hi(gCurrentStickY) # $at, 0x8012 /* 0450B0 800444B0 00A08025 */ move $s0, $a1 /* 0450B4 800444B4 AFA60080 */ sw $a2, 0x80($sp) -/* 0450B8 800444B8 AC20D538 */ sw $zero, %lo(D_8011D538)($at) +/* 0450B8 800444B8 AC20D538 */ sw $zero, %lo(gCurrentStickY)($at) /* 0450BC 800444BC 0C006E9D */ jal get_object_struct_array /* 0450C0 800444C0 27A40058 */ addiu $a0, $sp, 0x58 /* 0450C4 800444C4 8FAE0058 */ lw $t6, 0x58($sp) @@ -86,7 +86,7 @@ glabel func_8004447C /* 0451A0 800445A0 4500001A */ bc1f .L8004460C /* 0451A4 800445A4 E7A0005C */ swc1 $f0, 0x5c($sp) /* 0451A8 800445A8 C7AC0064 */ lwc1 $f12, 0x64($sp) -/* 0451AC 800445AC 0C01C1D4 */ jal func_80070750 +/* 0451AC 800445AC 0C01C1D4 */ jal atan2f /* 0451B0 800445B0 AFA60074 */ sw $a2, 0x74($sp) /* 0451B4 800445B4 24018000 */ li $at, -32768 /* 0451B8 800445B8 00417821 */ addu $t7, $v0, $at @@ -110,8 +110,8 @@ glabel func_8004447C .L800445FC: /* 0451FC 800445FC 00036823 */ negu $t5, $v1 /* 045200 80044600 000D7103 */ sra $t6, $t5, 4 -/* 045204 80044604 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 -/* 045208 80044608 AC2ED534 */ sw $t6, %lo(D_8011D534)($at) +/* 045204 80044604 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 +/* 045208 80044608 AC2ED534 */ sw $t6, %lo(gCurrentStickX)($at) .L8004460C: /* 04520C 8004460C 3C0F8012 */ lui $t7, %hi(D_8011D540) # $t7, 0x8012 /* 045210 80044610 8DEFD540 */ lw $t7, %lo(D_8011D540)($t7) @@ -500,8 +500,8 @@ glabel L80044ADC .L80044B7C: /* 04577C 80044B7C A20F01CD */ sb $t7, 0x1cd($s0) .L80044B80: -/* 045780 80044B80 3C028012 */ lui $v0, %hi(D_8011D534) # $v0, 0x8012 -/* 045784 80044B84 8C42D534 */ lw $v0, %lo(D_8011D534)($v0) +/* 045780 80044B80 3C028012 */ lui $v0, %hi(gCurrentStickX) # $v0, 0x8012 +/* 045784 80044B84 8C42D534 */ lw $v0, %lo(gCurrentStickX)($v0) /* 045788 80044B88 00000000 */ nop /* 04578C 80044B8C 2841FFE3 */ slti $at, $v0, -0x1d /* 045790 80044B90 1420000E */ bnez $at, .L80044BCC @@ -571,7 +571,7 @@ glabel L80044ADC /* 045880 80044C80 45000028 */ bc1f .L80044D24 /* 045884 80044C84 00000000 */ nop /* 045888 80044C88 C7AC0064 */ lwc1 $f12, 0x64($sp) -/* 04588C 80044C8C 0C01C1D4 */ jal func_80070750 +/* 04588C 80044C8C 0C01C1D4 */ jal atan2f /* 045890 80044C90 00000000 */ nop /* 045894 80044C94 24018000 */ li $at, -32768 /* 045898 80044C98 00417021 */ addu $t6, $v0, $at @@ -841,7 +841,7 @@ glabel L80044F54 /* 045C5C 8004505C 45000028 */ bc1f .L80045100 /* 045C60 80045060 00000000 */ nop /* 045C64 80045064 C7AC0064 */ lwc1 $f12, 0x64($sp) -/* 045C68 80045068 0C01C1D4 */ jal func_80070750 +/* 045C68 80045068 0C01C1D4 */ jal atan2f /* 045C6C 8004506C A7A50052 */ sh $a1, 0x52($sp) /* 045C70 80045070 8FB90078 */ lw $t9, 0x78($sp) /* 045C74 80045074 AFA20058 */ sw $v0, 0x58($sp) diff --git a/asm/non_matchings/racer/func_800452A0.s b/asm/non_matchings/racer/func_800452A0.s index 312aa2a8..a4c37e53 100644 --- a/asm/non_matchings/racer/func_800452A0.s +++ b/asm/non_matchings/racer/func_800452A0.s @@ -19,14 +19,14 @@ glabel func_800452A0 /* 045EB4 800452B4 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 /* 045EB8 800452B8 340E8000 */ li $t6, 32768 /* 045EBC 800452BC AC2ED528 */ sw $t6, %lo(gCurrentCarInput)($at) -/* 045EC0 800452C0 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 +/* 045EC0 800452C0 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 /* 045EC4 800452C4 AFB60048 */ sw $s6, 0x48($sp) -/* 045EC8 800452C8 AC20D534 */ sw $zero, %lo(D_8011D534)($at) +/* 045EC8 800452C8 AC20D534 */ sw $zero, %lo(gCurrentStickX)($at) /* 045ECC 800452CC 0080B025 */ move $s6, $a0 /* 045ED0 800452D0 AFBF0054 */ sw $ra, 0x54($sp) /* 045ED4 800452D4 AFB50044 */ sw $s5, 0x44($sp) /* 045ED8 800452D8 AFB00030 */ sw $s0, 0x30($sp) -/* 045EDC 800452DC 3C018012 */ lui $at, %hi(D_8011D538) # $at, 0x8012 +/* 045EDC 800452DC 3C018012 */ lui $at, %hi(gCurrentStickY) # $at, 0x8012 /* 045EE0 800452E0 00C08025 */ move $s0, $a2 /* 045EE4 800452E4 00A0A825 */ move $s5, $a1 /* 045EE8 800452E8 AFBE0050 */ sw $fp, 0x50($sp) @@ -41,7 +41,7 @@ glabel func_800452A0 /* 045F0C 8004530C E7B60024 */ swc1 $f22, 0x24($sp) /* 045F10 80045310 E7B50018 */ swc1 $f21, 0x18($sp) /* 045F14 80045314 E7B4001C */ swc1 $f20, 0x1c($sp) -/* 045F18 80045318 AC20D538 */ sw $zero, %lo(D_8011D538)($at) +/* 045F18 80045318 AC20D538 */ sw $zero, %lo(gCurrentStickY)($at) /* 045F1C 8004531C 0C006E9D */ jal get_object_struct_array /* 045F20 80045320 27A4009C */ addiu $a0, $sp, 0x9c /* 045F24 80045324 8FAF009C */ lw $t7, 0x9c($sp) @@ -504,7 +504,7 @@ glabel L800456DC /* 046568 80045968 45000031 */ bc1f .L80045A30 /* 04656C 8004596C 46000086 */ mov.s $f2, $f0 /* 046570 80045970 4600A306 */ mov.s $f12, $f20 -/* 046574 80045974 0C01C1D4 */ jal func_80070750 +/* 046574 80045974 0C01C1D4 */ jal atan2f /* 046578 80045978 E7A200A8 */ swc1 $f2, 0xa8($sp) /* 04657C 8004597C 24018000 */ li $at, -32768 /* 046580 80045980 0041C821 */ addu $t9, $v0, $at @@ -529,13 +529,13 @@ glabel L800456DC /* 0465C4 800459C4 C7A8005C */ lwc1 $f8, 0x5c($sp) /* 0465C8 800459C8 00035823 */ negu $t3, $v1 /* 0465CC 800459CC 000B6143 */ sra $t4, $t3, 5 -/* 0465D0 800459D0 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 -/* 0465D4 800459D4 AC2CD534 */ sw $t4, %lo(D_8011D534)($at) +/* 0465D0 800459D0 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 +/* 0465D4 800459D4 AC2CD534 */ sw $t4, %lo(gCurrentStickX)($at) /* 0465D8 800459D8 E7A200A8 */ swc1 $f2, 0xa8($sp) /* 0465DC 800459DC 0C0326B4 */ jal sqrtf /* 0465E0 800459E0 4608C300 */ add.s $f12, $f24, $f8 /* 0465E4 800459E4 4600B306 */ mov.s $f12, $f22 -/* 0465E8 800459E8 0C01C1D4 */ jal func_80070750 +/* 0465E8 800459E8 0C01C1D4 */ jal atan2f /* 0465EC 800459EC 46000386 */ mov.s $f14, $f0 /* 0465F0 800459F0 3044FFFF */ andi $a0, $v0, 0xffff /* 0465F4 800459F4 C7A200A8 */ lwc1 $f2, 0xa8($sp) @@ -553,24 +553,24 @@ glabel L800456DC .L80045A20: /* 046620 80045A20 00036823 */ negu $t5, $v1 /* 046624 80045A24 000D71C3 */ sra $t6, $t5, 7 -/* 046628 80045A28 3C018012 */ lui $at, %hi(D_8011D538) # $at, 0x8012 -/* 04662C 80045A2C AC2ED538 */ sw $t6, %lo(D_8011D538)($at) +/* 046628 80045A28 3C018012 */ lui $at, %hi(gCurrentStickY) # $at, 0x8012 +/* 04662C 80045A2C AC2ED538 */ sw $t6, %lo(gCurrentStickY)($at) .L80045A30: /* 046630 80045A30 82A201CC */ lb $v0, 0x1cc($s5) -/* 046634 80045A34 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 +/* 046634 80045A34 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 /* 046638 80045A38 0441000A */ bgez $v0, .L80045A64 -/* 04663C 80045A3C 3C038012 */ lui $v1, %hi(D_8011D534) # $v1, 0x8012 -/* 046640 80045A40 AC20D534 */ sw $zero, %lo(D_8011D534)($at) -/* 046644 80045A44 3C018012 */ lui $at, %hi(D_8011D538) # $at, 0x8012 +/* 04663C 80045A3C 3C038012 */ lui $v1, %hi(gCurrentStickX) # $v1, 0x8012 +/* 046640 80045A40 AC20D534 */ sw $zero, %lo(gCurrentStickX)($at) +/* 046644 80045A44 3C018012 */ lui $at, %hi(gCurrentStickY) # $at, 0x8012 /* 046648 80045A48 240FFFDD */ li $t7, -35 -/* 04664C 80045A4C AC2FD538 */ sw $t7, %lo(D_8011D538)($at) +/* 04664C 80045A4C AC2FD538 */ sw $t7, %lo(gCurrentStickY)($at) /* 046650 80045A50 82B801CC */ lb $t8, 0x1cc($s5) /* 046654 80045A54 00000000 */ nop /* 046658 80045A58 27190001 */ addiu $t9, $t8, 1 /* 04665C 80045A5C 10000013 */ b .L80045AAC /* 046660 80045A60 A2B901CC */ sb $t9, 0x1cc($s5) .L80045A64: -/* 046664 80045A64 8C63D534 */ lw $v1, %lo(D_8011D534)($v1) +/* 046664 80045A64 8C63D534 */ lw $v1, %lo(gCurrentStickX)($v1) /* 046668 80045A68 24490001 */ addiu $t1, $v0, 1 /* 04666C 80045A6C 2861003D */ slti $at, $v1, 0x3d /* 046670 80045A70 10200003 */ beqz $at, .L80045A80 diff --git a/asm/non_matchings/racer/func_80045C48.s b/asm/non_matchings/racer/func_80045C48.s index 48c696f6..406d48e8 100644 --- a/asm/non_matchings/racer/func_80045C48.s +++ b/asm/non_matchings/racer/func_80045C48.s @@ -6,11 +6,11 @@ glabel func_80045C48 /* 046858 80045C58 AC20D52C */ sw $zero, %lo(gActivePlayerButtonPress)($at) /* 04685C 80045C5C 3C018012 */ lui $at, %hi(D_8011D530) # $at, 0x8012 /* 046860 80045C60 AC20D530 */ sw $zero, %lo(D_8011D530)($at) -/* 046864 80045C64 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 -/* 046868 80045C68 AC20D534 */ sw $zero, %lo(D_8011D534)($at) +/* 046864 80045C64 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 +/* 046868 80045C68 AC20D534 */ sw $zero, %lo(gCurrentStickX)($at) /* 04686C 80045C6C AFBF002C */ sw $ra, 0x2c($sp) /* 046870 80045C70 AFB10024 */ sw $s1, 0x24($sp) -/* 046874 80045C74 3C018012 */ lui $at, %hi(D_8011D538) # $at, 0x8012 +/* 046874 80045C74 3C018012 */ lui $at, %hi(gCurrentStickY) # $at, 0x8012 /* 046878 80045C78 00A08825 */ move $s1, $a1 /* 04687C 80045C7C AFB20028 */ sw $s2, 0x28($sp) /* 046880 80045C80 AFB00020 */ sw $s0, 0x20($sp) @@ -20,13 +20,13 @@ glabel func_80045C48 /* 046890 80045C90 AFA600F0 */ sw $a2, 0xf0($sp) /* 046894 80045C94 AFA000C4 */ sw $zero, 0xc4($sp) /* 046898 80045C98 0C006E99 */ jal func_8001BA64 -/* 04689C 80045C9C AC20D538 */ sw $zero, %lo(D_8011D538)($at) +/* 04689C 80045C9C AC20D538 */ sw $zero, %lo(gCurrentStickY)($at) /* 0468A0 80045CA0 14400005 */ bnez $v0, .L80045CB8 /* 0468A4 80045CA4 00409025 */ move $s2, $v0 /* 0468A8 80045CA8 240E0019 */ li $t6, 25 -/* 0468AC 80045CAC 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 +/* 0468AC 80045CAC 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 /* 0468B0 80045CB0 10000214 */ b .L80046504 -/* 0468B4 80045CB4 AC2ED534 */ sw $t6, %lo(D_8011D534)($at) +/* 0468B4 80045CB4 AC2ED534 */ sw $t6, %lo(gCurrentStickX)($at) .L80045CB8: /* 0468B8 80045CB8 C62400A8 */ lwc1 $f4, 0xa8($s1) /* 0468BC 80045CBC 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 @@ -234,7 +234,7 @@ glabel func_80045C48 .L80045FC8: /* 046BC8 80045FC8 C7AE0054 */ lwc1 $f14, 0x54($sp) /* 046BCC 80045FCC C7AC005C */ lwc1 $f12, 0x5c($sp) -/* 046BD0 80045FD0 0C01C1D4 */ jal func_80070750 +/* 046BD0 80045FD0 0C01C1D4 */ jal atan2f /* 046BD4 80045FD4 00000000 */ nop /* 046BD8 80045FD8 24018000 */ li $at, -32768 /* 046BDC 80045FDC 00418021 */ addu $s0, $v0, $at @@ -242,7 +242,7 @@ glabel func_80045C48 /* 046BE4 80045FE4 320BFFFF */ andi $t3, $s0, 0xffff /* 046BE8 80045FE8 44817000 */ mtc1 $at, $f14 /* 046BEC 80045FEC C7AC0058 */ lwc1 $f12, 0x58($sp) -/* 046BF0 80045FF0 0C01C1D4 */ jal func_80070750 +/* 046BF0 80045FF0 0C01C1D4 */ jal atan2f /* 046BF4 80045FF4 01608025 */ move $s0, $t3 /* 046BF8 80045FF8 862C01BE */ lh $t4, 0x1be($s1) /* 046BFC 80045FFC 862D01C0 */ lh $t5, 0x1c0($s1) @@ -282,12 +282,12 @@ glabel func_80045C48 /* 046C78 80046078 3401FFFF */ li $at, 65535 /* 046C7C 8004607C 00611821 */ addu $v1, $v1, $at .L80046080: -/* 046C80 80046080 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 -/* 046C84 80046084 AC2AD534 */ sw $t2, %lo(D_8011D534)($at) +/* 046C80 80046080 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 +/* 046C84 80046084 AC2AD534 */ sw $t2, %lo(gCurrentStickX)($at) /* 046C88 80046088 000358C3 */ sra $t3, $v1, 3 /* 046C8C 8004608C 000B6023 */ negu $t4, $t3 -/* 046C90 80046090 3C018012 */ lui $at, %hi(D_8011D538) # $at, 0x8012 -/* 046C94 80046094 AC2CD538 */ sw $t4, %lo(D_8011D538)($at) +/* 046C90 80046090 3C018012 */ lui $at, %hi(gCurrentStickY) # $at, 0x8012 +/* 046C94 80046094 AC2CD538 */ sw $t4, %lo(gCurrentStickY)($at) /* 046C98 80046098 862D01A0 */ lh $t5, 0x1a0($s1) /* 046C9C 8004609C 44804000 */ mtc1 $zero, $f8 /* 046CA0 800460A0 31AEFFFF */ andi $t6, $t5, 0xffff @@ -472,7 +472,7 @@ glabel func_80045C48 /* 046F38 80046338 C4460014 */ lwc1 $f6, 0x14($v0) /* 046F3C 8004633C 46082280 */ add.s $f10, $f4, $f8 /* 046F40 80046340 46065381 */ sub.s $f14, $f10, $f6 -/* 046F44 80046344 0C01C1D4 */ jal func_80070750 +/* 046F44 80046344 0C01C1D4 */ jal atan2f /* 046F48 80046348 E7AE0054 */ swc1 $f14, 0x54($sp) /* 046F4C 8004634C 24018000 */ li $at, -32768 /* 046F50 80046350 00418021 */ addu $s0, $v0, $at @@ -480,7 +480,7 @@ glabel func_80045C48 /* 046F58 80046358 320DFFFF */ andi $t5, $s0, 0xffff /* 046F5C 8004635C 44817000 */ mtc1 $at, $f14 /* 046F60 80046360 C7AC0058 */ lwc1 $f12, 0x58($sp) -/* 046F64 80046364 0C01C1D4 */ jal func_80070750 +/* 046F64 80046364 0C01C1D4 */ jal atan2f /* 046F68 80046368 01A08025 */ move $s0, $t5 /* 046F6C 8004636C 862501A0 */ lh $a1, 0x1a0($s1) /* 046F70 80046370 34018001 */ li $at, 32769 @@ -533,63 +533,63 @@ glabel func_80045C48 /* 047018 80046418 A62C01A0 */ sh $t4, 0x1a0($s1) .L8004641C: /* 04701C 8004641C 10C70019 */ beq $a2, $a3, .L80046484 -/* 047020 80046420 3C0A8012 */ lui $t2, %hi(D_8011D534) # $t2, 0x8012 +/* 047020 80046420 3C0A8012 */ lui $t2, %hi(gCurrentStickX) # $t2, 0x8012 /* 047024 80046424 24010004 */ li $at, 4 /* 047028 80046428 10C10013 */ beq $a2, $at, .L80046478 /* 04702C 8004642C 24010005 */ li $at, 5 /* 047030 80046430 10C1001B */ beq $a2, $at, .L800464A0 -/* 047034 80046434 3C0D8012 */ lui $t5, %hi(D_8011D534) # $t5, 0x8012 +/* 047034 80046434 3C0D8012 */ lui $t5, %hi(gCurrentStickX) # $t5, 0x8012 /* 047038 80046438 24010007 */ li $at, 7 /* 04703C 8004643C 10C10021 */ beq $a2, $at, .L800464C4 -/* 047040 80046440 3C0F8012 */ lui $t7, %hi(D_8011D534) # $t7, 0x8012 -/* 047044 80046444 3C0D8012 */ lui $t5, %hi(D_8011D534) # $t5, 0x8012 -/* 047048 80046448 8DADD534 */ lw $t5, %lo(D_8011D534)($t5) +/* 047040 80046440 3C0F8012 */ lui $t7, %hi(gCurrentStickX) # $t7, 0x8012 +/* 047044 80046444 3C0D8012 */ lui $t5, %hi(gCurrentStickX) # $t5, 0x8012 +/* 047048 80046448 8DADD534 */ lw $t5, %lo(gCurrentStickX)($t5) /* 04704C 8004644C 00447007 */ srav $t6, $a0, $v0 -/* 047050 80046450 3C198012 */ lui $t9, %hi(D_8011D538) # $t9, 0x8012 -/* 047054 80046454 8F39D538 */ lw $t9, %lo(D_8011D538)($t9) -/* 047058 80046458 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 +/* 047050 80046450 3C198012 */ lui $t9, %hi(gCurrentStickY) # $t9, 0x8012 +/* 047054 80046454 8F39D538 */ lw $t9, %lo(gCurrentStickY)($t9) +/* 047058 80046458 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 /* 04705C 8004645C 01AEC021 */ addu $t8, $t5, $t6 -/* 047060 80046460 AC38D534 */ sw $t8, %lo(D_8011D534)($at) +/* 047060 80046460 AC38D534 */ sw $t8, %lo(gCurrentStickX)($at) /* 047064 80046464 00437807 */ srav $t7, $v1, $v0 -/* 047068 80046468 3C018012 */ lui $at, %hi(D_8011D538) # $at, 0x8012 +/* 047068 80046468 3C018012 */ lui $at, %hi(gCurrentStickY) # $at, 0x8012 /* 04706C 8004646C 032F4821 */ addu $t1, $t9, $t7 /* 047070 80046470 10000020 */ b .L800464F4 -/* 047074 80046474 AC29D538 */ sw $t1, %lo(D_8011D538)($at) +/* 047074 80046474 AC29D538 */ sw $t1, %lo(gCurrentStickY)($at) .L80046478: -/* 047078 80046478 3C018012 */ lui $at, %hi(D_8011D538) # $at, 0x8012 +/* 047078 80046478 3C018012 */ lui $at, %hi(gCurrentStickY) # $at, 0x8012 /* 04707C 8004647C 1000001D */ b .L800464F4 -/* 047080 80046480 AC20D538 */ sw $zero, %lo(D_8011D538)($at) +/* 047080 80046480 AC20D538 */ sw $zero, %lo(gCurrentStickY)($at) .L80046484: -/* 047084 80046484 8D4AD534 */ lw $t2, %lo(D_8011D534)($t2) -/* 047088 80046488 AC20D538 */ sw $zero, %lo(D_8011D538)($at) +/* 047084 80046484 8D4AD534 */ lw $t2, %lo(gCurrentStickX)($t2) +/* 047088 80046488 AC20D538 */ sw $zero, %lo(gCurrentStickY)($at) /* 04708C 8004648C 00445807 */ srav $t3, $a0, $v0 -/* 047090 80046490 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 +/* 047090 80046490 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 /* 047094 80046494 014B6021 */ addu $t4, $t2, $t3 /* 047098 80046498 10000016 */ b .L800464F4 -/* 04709C 8004649C AC2CD534 */ sw $t4, %lo(D_8011D534)($at) +/* 04709C 8004649C AC2CD534 */ sw $t4, %lo(gCurrentStickX)($at) .L800464A0: -/* 0470A0 800464A0 8DADD534 */ lw $t5, %lo(D_8011D534)($t5) +/* 0470A0 800464A0 8DADD534 */ lw $t5, %lo(gCurrentStickX)($t5) /* 0470A4 800464A4 244E001F */ addiu $t6, $v0, 0x1f /* 0470A8 800464A8 01C4C007 */ srav $t8, $a0, $t6 -/* 0470AC 800464AC 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 +/* 0470AC 800464AC 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 /* 0470B0 800464B0 01B8C821 */ addu $t9, $t5, $t8 -/* 0470B4 800464B4 AC39D534 */ sw $t9, %lo(D_8011D534)($at) -/* 0470B8 800464B8 3C018012 */ lui $at, %hi(D_8011D538) # $at, 0x8012 +/* 0470B4 800464B4 AC39D534 */ sw $t9, %lo(gCurrentStickX)($at) +/* 0470B8 800464B8 3C018012 */ lui $at, %hi(gCurrentStickY) # $at, 0x8012 /* 0470BC 800464BC 1000000D */ b .L800464F4 -/* 0470C0 800464C0 AC20D538 */ sw $zero, %lo(D_8011D538)($at) +/* 0470C0 800464C0 AC20D538 */ sw $zero, %lo(gCurrentStickY)($at) .L800464C4: -/* 0470C4 800464C4 8DEFD534 */ lw $t7, %lo(D_8011D534)($t7) +/* 0470C4 800464C4 8DEFD534 */ lw $t7, %lo(gCurrentStickX)($t7) /* 0470C8 800464C8 2442FFFF */ addiu $v0, $v0, -1 /* 0470CC 800464CC 00444807 */ srav $t1, $a0, $v0 -/* 0470D0 800464D0 3C0B8012 */ lui $t3, %hi(D_8011D538) # $t3, 0x8012 -/* 0470D4 800464D4 8D6BD538 */ lw $t3, %lo(D_8011D538)($t3) -/* 0470D8 800464D8 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 +/* 0470D0 800464D0 3C0B8012 */ lui $t3, %hi(gCurrentStickY) # $t3, 0x8012 +/* 0470D4 800464D4 8D6BD538 */ lw $t3, %lo(gCurrentStickY)($t3) +/* 0470D8 800464D8 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 /* 0470DC 800464DC 01E95021 */ addu $t2, $t7, $t1 -/* 0470E0 800464E0 AC2AD534 */ sw $t2, %lo(D_8011D534)($at) +/* 0470E0 800464E0 AC2AD534 */ sw $t2, %lo(gCurrentStickX)($at) /* 0470E4 800464E4 00436007 */ srav $t4, $v1, $v0 -/* 0470E8 800464E8 3C018012 */ lui $at, %hi(D_8011D538) # $at, 0x8012 +/* 0470E8 800464E8 3C018012 */ lui $at, %hi(gCurrentStickY) # $at, 0x8012 /* 0470EC 800464EC 016C7021 */ addu $t6, $t3, $t4 -/* 0470F0 800464F0 AC2ED538 */ sw $t6, %lo(D_8011D538)($at) +/* 0470F0 800464F0 AC2ED538 */ sw $t6, %lo(gCurrentStickY)($at) .L800464F4: /* 0470F4 800464F4 8FA400E8 */ lw $a0, 0xe8($sp) /* 0470F8 800464F8 8FA600F0 */ lw $a2, 0xf0($sp) diff --git a/asm/non_matchings/racer/func_80046524.s b/asm/non_matchings/racer/func_80046524.s index a0476955..dc03593a 100644 --- a/asm/non_matchings/racer/func_80046524.s +++ b/asm/non_matchings/racer/func_80046524.s @@ -77,7 +77,7 @@ glabel func_80046524 .L80046570: /* 047170 80046570 A3A00067 */ sb $zero, 0x67($sp) /* 047174 80046574 860E0000 */ lh $t6, ($s0) -/* 047178 80046578 3C0D8012 */ lui $t5, %hi(D_8011D534) # $t5, 0x8012 +/* 047178 80046578 3C0D8012 */ lui $t5, %hi(gCurrentStickX) # $t5, 0x8012 /* 04717C 8004657C 05C0000B */ bltz $t6, .L800465AC /* 047180 80046580 02202025 */ move $a0, $s1 /* 047184 80046584 3C0F800E */ lui $t7, %hi(D_800DCB98) # $t7, 0x800e @@ -146,7 +146,7 @@ glabel func_80046524 /* 047274 80046674 00000000 */ nop .L80046678: /* 047278 80046678 820801E1 */ lb $t0, 0x1e1($s0) -/* 04727C 8004667C 8DADD534 */ lw $t5, %lo(D_8011D534)($t5) +/* 04727C 8004667C 8DADD534 */ lw $t5, %lo(gCurrentStickX)($t5) /* 047280 80046680 C7A4012C */ lwc1 $f4, 0x12c($sp) /* 047284 80046684 01A81823 */ subu $v1, $t5, $t0 /* 047288 80046688 44835000 */ mtc1 $v1, $f10 @@ -314,8 +314,8 @@ glabel func_80046524 /* 0474E8 800468E8 E7A800F4 */ swc1 $f8, 0xf4($sp) .L800468EC: /* 0474EC 800468EC 11C0002F */ beqz $t6, .L800469AC -/* 0474F0 800468F0 3C0F8012 */ lui $t7, %hi(D_8011D538) # $t7, 0x8012 -/* 0474F4 800468F4 8DEFD538 */ lw $t7, %lo(D_8011D538)($t7) +/* 0474F0 800468F0 3C0F8012 */ lui $t7, %hi(gCurrentStickY) # $t7, 0x8012 +/* 0474F4 800468F4 8DEFD538 */ lw $t7, %lo(gCurrentStickY)($t7) /* 0474F8 800468F8 C7A70050 */ lwc1 $f7, 0x50($sp) /* 0474FC 800468FC 29E1FFD8 */ slti $at, $t7, -0x28 /* 047500 80046900 14200006 */ bnez $at, .L8004691C @@ -417,8 +417,8 @@ glabel func_80046524 /* 047668 80046A68 921801F5 */ lbu $t8, 0x1f5($s0) /* 04766C 80046A6C 00000000 */ nop /* 047670 80046A70 13000059 */ beqz $t8, .L80046BD8 -/* 047674 80046A74 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 -/* 047678 80046A78 AC20D534 */ sw $zero, %lo(D_8011D534)($at) +/* 047674 80046A74 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 +/* 047678 80046A78 AC20D534 */ sw $zero, %lo(gCurrentStickX)($at) /* 04767C 80046A7C 8E19014C */ lw $t9, 0x14c($s0) /* 047680 80046A80 860201A0 */ lh $v0, 0x1a0($s0) /* 047684 80046A84 A2000175 */ sb $zero, 0x175($s0) @@ -590,8 +590,8 @@ glabel func_80046524 /* 0478E4 80046CE4 00000000 */ nop /* 0478E8 80046CE8 A20001D5 */ sb $zero, 0x1d5($s0) .L80046CEC: -/* 0478EC 80046CEC 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 -/* 0478F0 80046CF0 AC20D534 */ sw $zero, %lo(D_8011D534)($at) +/* 0478EC 80046CEC 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 +/* 0478F0 80046CF0 AC20D534 */ sw $zero, %lo(gCurrentStickX)($at) .L80046CF4: /* 0478F4 80046CF4 820201DB */ lb $v0, 0x1db($s0) /* 0478F8 80046CF8 00000000 */ nop @@ -737,11 +737,11 @@ glabel func_80046524 /* 047B0C 80046F0C 01416024 */ and $t4, $t2, $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) +/* 047B18 80046F18 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 +/* 047B1C 80046F1C AC20D534 */ sw $zero, %lo(gCurrentStickX)($at) /* 047B20 80046F20 A20001E1 */ sb $zero, 0x1e1($s0) -/* 047B24 80046F24 3C018012 */ lui $at, %hi(D_8011D538) # $at, 0x8012 -/* 047B28 80046F28 AC20D538 */ sw $zero, %lo(D_8011D538)($at) +/* 047B24 80046F24 3C018012 */ lui $at, %hi(gCurrentStickY) # $at, 0x8012 +/* 047B28 80046F28 AC20D538 */ sw $zero, %lo(gCurrentStickY)($at) .L80046F2C: /* 047B2C 80046F2C 920B01F1 */ lbu $t3, 0x1f1($s0) /* 047B30 80046F30 3C013F80 */ li $at, 0x3F800000 # 1.000000 @@ -918,8 +918,8 @@ glabel func_80046524 /* 047DBC 800471BC 10000004 */ b .L800471D0 /* 047DC0 800471C0 00000000 */ nop .L800471C4: -/* 047DC4 800471C4 3C088012 */ lui $t0, %hi(D_8011D534) # $t0, 0x8012 -/* 047DC8 800471C8 8D08D534 */ lw $t0, %lo(D_8011D534)($t0) +/* 047DC4 800471C4 3C088012 */ lui $t0, %hi(gCurrentStickX) # $t0, 0x8012 +/* 047DC8 800471C8 8D08D534 */ lw $t0, %lo(gCurrentStickX)($t0) /* 047DCC 800471CC 00000000 */ nop .L800471D0: /* 047DD0 800471D0 3C01800E */ lui $at, %hi(D_800E63F0) # $at, 0x800e @@ -942,8 +942,8 @@ glabel func_80046524 /* 047E14 80047214 00000000 */ nop /* 047E18 80047218 31F84000 */ andi $t8, $t7, 0x4000 /* 047E1C 8004721C 13000013 */ beqz $t8, .L8004726C -/* 047E20 80047220 3C198012 */ lui $t9, %hi(D_8011D538) # $t9, 0x8012 -/* 047E24 80047224 8F39D538 */ lw $t9, %lo(D_8011D538)($t9) +/* 047E20 80047220 3C198012 */ lui $t9, %hi(gCurrentStickY) # $t9, 0x8012 +/* 047E24 80047224 8F39D538 */ lw $t9, %lo(gCurrentStickY)($t9) /* 047E28 80047228 00000000 */ nop /* 047E2C 8004722C 2B21FFD8 */ slti $at, $t9, -0x28 /* 047E30 80047230 1420000F */ bnez $at, .L80047270 @@ -966,8 +966,8 @@ glabel func_80046524 .L80047270: /* 047E70 80047270 000850C0 */ sll $t2, $t0, 3 /* 047E74 80047274 01440019 */ multu $t2, $a0 -/* 047E78 80047278 3C028012 */ lui $v0, %hi(D_8011D538) # $v0, 0x8012 -/* 047E7C 8004727C 8C42D538 */ lw $v0, %lo(D_8011D538)($v0) +/* 047E78 80047278 3C028012 */ lui $v0, %hi(gCurrentStickY) # $v0, 0x8012 +/* 047E7C 8004727C 8C42D538 */ lw $v0, %lo(gCurrentStickY)($v0) /* 047E80 80047280 00004025 */ move $t0, $zero /* 047E84 80047284 00006012 */ mflo $t4 /* 047E88 80047288 448C4000 */ mtc1 $t4, $f8 @@ -1306,7 +1306,7 @@ glabel func_80046524 /* 048368 80047768 C62C001C */ lwc1 $f12, 0x1c($s1) /* 04836C 8004776C C62E0024 */ lwc1 $f14, 0x24($s1) /* 048370 80047770 E7B20104 */ swc1 $f18, 0x104($sp) -/* 048374 80047774 0C01C1D4 */ jal func_80070750 +/* 048374 80047774 0C01C1D4 */ jal atan2f /* 048378 80047778 E7A200D0 */ swc1 $f2, 0xd0($sp) /* 04837C 8004777C 34058000 */ li $a1, 32768 /* 048380 80047780 C7A200D0 */ lwc1 $f2, 0xd0($sp) @@ -1558,9 +1558,9 @@ glabel func_80046524 /* 048720 80047B20 30980010 */ andi $t8, $a0, 0x10 /* 048724 80047B24 1300002E */ beqz $t8, .L80047BE0 /* 048728 80047B28 46204420 */ cvt.s.d $f16, $f8 -/* 04872C 80047B2C 3C028012 */ lui $v0, %hi(D_8011D534) # $v0, 0x8012 +/* 04872C 80047B2C 3C028012 */ lui $v0, %hi(gCurrentStickX) # $v0, 0x8012 /* 048730 80047B30 44815000 */ mtc1 $at, $f10 -/* 048734 80047B34 8C42D534 */ lw $v0, %lo(D_8011D534)($v0) +/* 048734 80047B34 8C42D534 */ lw $v0, %lo(gCurrentStickX)($v0) /* 048738 80047B38 460A8402 */ mul.s $f16, $f16, $f10 /* 04873C 80047B3C 2841FFD9 */ slti $at, $v0, -0x27 /* 048740 80047B40 1420000C */ bnez $at, .L80047B74 @@ -2095,8 +2095,8 @@ glabel func_80046524 /* 048F04 80048304 31CF0010 */ andi $t7, $t6, 0x10 /* 048F08 80048308 11E00006 */ beqz $t7, .L80048324 /* 048F0C 8004830C 02202025 */ move $a0, $s1 -/* 048F10 80048310 3C088012 */ lui $t0, %hi(D_8011D534) # $t0, 0x8012 -/* 048F14 80048314 8D08D534 */ lw $t0, %lo(D_8011D534)($t0) +/* 048F10 80048310 3C088012 */ lui $t0, %hi(gCurrentStickX) # $t0, 0x8012 +/* 048F14 80048314 8D08D534 */ lw $t0, %lo(gCurrentStickX)($t0) /* 048F18 80048318 00000000 */ nop /* 048F1C 8004831C 0008C040 */ sll $t8, $t0, 1 /* 048F20 80048320 03004025 */ move $t0, $t8 @@ -2262,8 +2262,8 @@ glabel func_80046524 /* 049180 80048580 34018010 */ li $at, 32784 /* 049184 80048584 330D8010 */ andi $t5, $t8, 0x8010 /* 049188 80048588 15A10011 */ bne $t5, $at, .L800485D0 -/* 04918C 8004858C 3C028012 */ lui $v0, %hi(D_8011D534) # $v0, 0x8012 -/* 049190 80048590 8C42D534 */ lw $v0, %lo(D_8011D534)($v0) +/* 04918C 8004858C 3C028012 */ lui $v0, %hi(gCurrentStickX) # $v0, 0x8012 +/* 049190 80048590 8C42D534 */ lw $v0, %lo(gCurrentStickX)($v0) /* 049194 80048594 02202025 */ move $a0, $s1 /* 049198 80048598 2841FFE2 */ slti $at, $v0, -0x1e /* 04919C 8004859C 14200004 */ bnez $at, .L800485B0 @@ -2531,10 +2531,10 @@ glabel func_80046524 /* 049570 80048970 1580002B */ bnez $t4, .L80048A20 /* 049574 80048974 24060004 */ li $a2, 4 /* 049578 80048978 820B01E5 */ lb $t3, 0x1e5($s0) -/* 04957C 8004897C 3C088012 */ lui $t0, %hi(D_8011D538) # $t0, 0x8012 +/* 04957C 8004897C 3C088012 */ lui $t0, %hi(gCurrentStickY) # $t0, 0x8012 /* 049580 80048980 15600027 */ bnez $t3, .L80048A20 /* 049584 80048984 34018001 */ li $at, 32769 -/* 049588 80048988 8D08D538 */ lw $t0, %lo(D_8011D538)($t0) +/* 049588 80048988 8D08D538 */ lw $t0, %lo(gCurrentStickY)($t0) /* 04958C 8004898C 86240002 */ lh $a0, 2($s1) /* 049590 80048990 00084023 */ negu $t0, $t0 /* 049594 80048994 00087180 */ sll $t6, $t0, 6 @@ -2698,7 +2698,7 @@ glabel func_80046524 /* 0497D4 80048BD4 C7AA0118 */ lwc1 $f10, 0x118($sp) /* 0497D8 80048BD8 3C01800E */ lui $at, %hi(D_800E6468) # $at, 0x800e /* 0497DC 80048BDC 460A303C */ c.lt.s $f6, $f10 -/* 0497E0 80048BE0 3C0C8012 */ lui $t4, %hi(D_8011D534) # $t4, 0x8012 +/* 0497E0 80048BE0 3C0C8012 */ lui $t4, %hi(gCurrentStickX) # $t4, 0x8012 /* 0497E4 80048BE4 45000004 */ bc1f .L80048BF8 /* 0497E8 80048BE8 00000000 */ nop /* 0497EC 80048BEC C4246468 */ lwc1 $f4, %lo(D_800E6468)($at) @@ -2712,7 +2712,7 @@ glabel func_80046524 /* 049808 80048C08 1541000F */ bne $t2, $at, .L80048C48 /* 04980C 80048C0C 8FA7012C */ lw $a3, 0x12c($sp) /* 049810 80048C10 8C620004 */ lw $v0, 4($v1) -/* 049814 80048C14 8D8CD534 */ lw $t4, %lo(D_8011D534)($t4) +/* 049814 80048C14 8D8CD534 */ lw $t4, %lo(gCurrentStickX)($t4) /* 049818 80048C18 804F003A */ lb $t7, 0x3a($v0) /* 04981C 80048C1C 000C5880 */ sll $t3, $t4, 2 /* 049820 80048C20 25F80001 */ addiu $t8, $t7, 1 diff --git a/asm/non_matchings/racer/func_800494E0.s b/asm/non_matchings/racer/func_800494E0.s index e0e4126e..a3486f5c 100644 --- a/asm/non_matchings/racer/func_800494E0.s +++ b/asm/non_matchings/racer/func_800494E0.s @@ -91,7 +91,7 @@ glabel func_800494E0 /* 04A224 80049624 27A40048 */ addiu $a0, $sp, 0x48 /* 04A228 80049628 C60C0000 */ lwc1 $f12, ($s0) /* 04A22C 8004962C C60E0004 */ lwc1 $f14, 4($s0) -/* 04A230 80049630 0C01C1D4 */ jal func_80070750 +/* 04A230 80049630 0C01C1D4 */ jal atan2f /* 04A234 80049634 00000000 */ nop /* 04A238 80049638 00026400 */ sll $t4, $v0, 0x10 /* 04A23C 8004963C 000C6C03 */ sra $t5, $t4, 0x10 @@ -135,15 +135,15 @@ glabel func_800494E0 /* 04A2CC 800496CC A4AF01A4 */ sh $t7, 0x1a4($a1) /* 04A2D0 800496D0 C60E0004 */ lwc1 $f14, 4($s0) /* 04A2D4 800496D4 C60C0008 */ lwc1 $f12, 8($s0) -/* 04A2D8 800496D8 0C01C1D4 */ jal func_80070750 +/* 04A2D8 800496D8 0C01C1D4 */ jal atan2f /* 04A2DC 800496DC E7A20044 */ swc1 $f2, 0x44($sp) /* 04A2E0 800496E0 0002CC00 */ sll $t9, $v0, 0x10 /* 04A2E4 800496E4 0019C403 */ sra $t8, $t9, 0x10 /* 04A2E8 800496E8 44988000 */ mtc1 $t8, $f16 /* 04A2EC 800496EC C7A20044 */ lwc1 $f2, 0x44($sp) /* 04A2F0 800496F0 468082A0 */ cvt.s.w $f10, $f16 -/* 04A2F4 800496F4 3C0A8012 */ lui $t2, %hi(D_8011D538) # $t2, 0x8012 -/* 04A2F8 800496F8 8D4AD538 */ lw $t2, %lo(D_8011D538)($t2) +/* 04A2F4 800496F4 3C0A8012 */ lui $t2, %hi(gCurrentStickY) # $t2, 0x8012 +/* 04A2F8 800496F8 8D4AD538 */ lw $t2, %lo(gCurrentStickY)($t2) /* 04A2FC 800496FC 46025182 */ mul.s $f6, $f10, $f2 /* 04A300 80049700 000A5823 */ negu $t3, $t2 /* 04A304 80049704 000B6140 */ sll $t4, $t3, 5 diff --git a/asm/non_matchings/racer/func_80049794.s b/asm/non_matchings/racer/func_80049794.s index 2241f49f..a7f769c8 100644 --- a/asm/non_matchings/racer/func_80049794.s +++ b/asm/non_matchings/racer/func_80049794.s @@ -232,16 +232,16 @@ glabel func_80049794 /* 04A62C 80049A2C 462C903C */ c.lt.d $f18, $f12 /* 04A630 80049A30 44802000 */ mtc1 $zero, $f4 /* 04A634 80049A34 45010007 */ bc1t .L80049A54 -/* 04A638 80049A38 3C088012 */ lui $t0, %hi(D_8011D538) # $t0, 0x8012 -/* 04A63C 80049A3C 2508D538 */ addiu $t0, %lo(D_8011D538) # addiu $t0, $t0, -0x2ac8 +/* 04A638 80049A38 3C088012 */ lui $t0, %hi(gCurrentStickY) # $t0, 0x8012 +/* 04A63C 80049A3C 2508D538 */ addiu $t0, %lo(gCurrentStickY) # addiu $t0, $t0, -0x2ac8 /* 04A640 80049A40 8D0B0000 */ lw $t3, ($t0) /* 04A644 80049A44 00000000 */ nop /* 04A648 80049A48 2961FFF6 */ slti $at, $t3, -0xa /* 04A64C 80049A4C 10200005 */ beqz $at, .L80049A64 /* 04A650 80049A50 3C014100 */ lui $at, 0x4100 .L80049A54: -/* 04A654 80049A54 3C088012 */ lui $t0, %hi(D_8011D538) # $t0, 0x8012 -/* 04A658 80049A58 2508D538 */ addiu $t0, %lo(D_8011D538) # addiu $t0, $t0, -0x2ac8 +/* 04A654 80049A54 3C088012 */ lui $t0, %hi(gCurrentStickY) # $t0, 0x8012 +/* 04A658 80049A58 2508D538 */ addiu $t0, %lo(gCurrentStickY) # addiu $t0, $t0, -0x2ac8 /* 04A65C 80049A5C A20001E6 */ sb $zero, 0x1e6($s0) /* 04A660 80049A60 3C014100 */ li $at, 0x41000000 # 8.000000 .L80049A64: @@ -287,13 +287,13 @@ glabel func_80049794 /* 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) -/* 04A700 80049B00 3C088012 */ lui $t0, %hi(D_8011D538) # $t0, 0x8012 +/* 04A700 80049B00 3C088012 */ lui $t0, %hi(gCurrentStickY) # $t0, 0x8012 /* 04A704 80049B04 E7A400E8 */ swc1 $f4, 0xe8($sp) /* 04A708 80049B08 C6260010 */ lwc1 $f6, 0x10($s1) -/* 04A70C 80049B0C 2508D538 */ addiu $t0, %lo(D_8011D538) # addiu $t0, $t0, -0x2ac8 +/* 04A70C 80049B0C 2508D538 */ addiu $t0, %lo(gCurrentStickY) # addiu $t0, $t0, -0x2ac8 /* 04A710 80049B10 E7A600E4 */ swc1 $f6, 0xe4($sp) /* 04A714 80049B14 C6280014 */ lwc1 $f8, 0x14($s1) -/* 04A718 80049B18 3C0E8012 */ lui $t6, %hi(D_8011D534) # $t6, 0x8012 +/* 04A718 80049B18 3C0E8012 */ lui $t6, %hi(gCurrentStickX) # $t6, 0x8012 /* 04A71C 80049B1C E7A800E0 */ swc1 $f8, 0xe0($sp) /* 04A720 80049B20 820D01E0 */ lb $t5, 0x1e0($s0) /* 04A724 80049B24 00000000 */ nop @@ -306,7 +306,7 @@ glabel func_80049794 /* 04A73C 80049B3C 46008086 */ mov.s $f2, $f16 /* 04A740 80049B40 820501E1 */ lb $a1, 0x1e1($s0) .L80049B44: -/* 04A744 80049B44 8DCED534 */ lw $t6, %lo(D_8011D534)($t6) +/* 04A744 80049B44 8DCED534 */ lw $t6, %lo(gCurrentStickX)($t6) /* 04A748 80049B48 C7A400FC */ lwc1 $f4, 0xfc($sp) /* 04A74C 80049B4C 01C51023 */ subu $v0, $t6, $a1 /* 04A750 80049B50 44825000 */ mtc1 $v0, $f10 @@ -468,8 +468,8 @@ glabel func_80049794 /* 04A994 80049D94 332B4000 */ andi $t3, $t9, 0x4000 /* 04A998 80049D98 11600038 */ beqz $t3, .L80049E7C /* 04A99C 80049D9C E7B200C8 */ swc1 $f18, 0xc8($sp) -/* 04A9A0 80049DA0 3C0C8012 */ lui $t4, %hi(D_8011D538) # $t4, 0x8012 -/* 04A9A4 80049DA4 8D8CD538 */ lw $t4, %lo(D_8011D538)($t4) +/* 04A9A0 80049DA0 3C0C8012 */ lui $t4, %hi(gCurrentStickY) # $t4, 0x8012 +/* 04A9A4 80049DA4 8D8CD538 */ lw $t4, %lo(gCurrentStickY)($t4) /* 04A9A8 80049DA8 00000000 */ nop /* 04A9AC 80049DAC 2981FFD8 */ slti $at, $t4, -0x28 /* 04A9B0 80049DB0 14200007 */ bnez $at, .L80049DD0 @@ -704,8 +704,8 @@ glabel func_80049794 /* 04AD18 8004A118 460051A1 */ cvt.d.s $f6, $f10 /* 04AD1C 8004A11C 00000000 */ nop /* 04AD20 8004A120 46243203 */ div.d $f8, $f6, $f4 -/* 04AD24 8004A124 3C098012 */ lui $t1, %hi(D_8011D538) # $t1, 0x8012 -/* 04AD28 8004A128 2529D538 */ addiu $t1, %lo(D_8011D538) # addiu $t1, $t1, -0x2ac8 +/* 04AD24 8004A124 3C098012 */ lui $t1, %hi(gCurrentStickY) # $t1, 0x8012 +/* 04AD28 8004A128 2529D538 */ addiu $t1, %lo(gCurrentStickY) # addiu $t1, $t1, -0x2ac8 /* 04AD2C 8004A12C 8D2E0000 */ lw $t6, ($t1) /* 04AD30 8004A130 4600A4A1 */ cvt.d.s $f18, $f20 /* 04AD34 8004A134 44803000 */ mtc1 $zero, $f6 @@ -730,9 +730,9 @@ glabel func_80049794 .L8004A178: /* 04AD78 8004A178 C602002C */ lwc1 $f2, 0x2c($s0) /* 04AD7C 8004A17C 44809000 */ mtc1 $zero, $f18 -/* 04AD80 8004A180 3C098012 */ lui $t1, %hi(D_8011D538) # $t1, 0x8012 +/* 04AD80 8004A180 3C098012 */ lui $t1, %hi(gCurrentStickY) # $t1, 0x8012 /* 04AD84 8004A184 4612103C */ c.lt.s $f2, $f18 -/* 04AD88 8004A188 2529D538 */ addiu $t1, %lo(D_8011D538) # addiu $t1, $t1, -0x2ac8 +/* 04AD88 8004A188 2529D538 */ addiu $t1, %lo(gCurrentStickY) # addiu $t1, $t1, -0x2ac8 /* 04AD8C 8004A18C 45000002 */ bc1f .L8004A198 /* 04AD90 8004A190 46001386 */ mov.s $f14, $f2 /* 04AD94 8004A194 46007387 */ neg.s $f14, $f14 @@ -896,11 +896,11 @@ glabel func_80049794 /* 04AFE4 8004A3E4 86040000 */ lh $a0, ($s0) /* 04AFE8 8004A3E8 0C01C8D2 */ jal func_80072348 /* 04AFEC 8004A3EC 24050008 */ li $a1, 8 -/* 04AFF0 8004A3F0 3C098012 */ lui $t1, %hi(D_8011D538) # $t1, 0x8012 +/* 04AFF0 8004A3F0 3C098012 */ lui $t1, %hi(gCurrentStickY) # $t1, 0x8012 /* 04AFF4 8004A3F4 C7A10048 */ lwc1 $f1, 0x48($sp) /* 04AFF8 8004A3F8 C7A0004C */ lwc1 $f0, 0x4c($sp) /* 04AFFC 8004A3FC C7AE00DC */ lwc1 $f14, 0xdc($sp) -/* 04B000 8004A400 2529D538 */ addiu $t1, %lo(D_8011D538) # addiu $t1, $t1, -0x2ac8 +/* 04B000 8004A400 2529D538 */ addiu $t1, %lo(gCurrentStickY) # addiu $t1, $t1, -0x2ac8 .L8004A404: /* 04B004 8004A404 820C01D6 */ lb $t4, 0x1d6($s0) /* 04B008 8004A408 3C0D8012 */ lui $t5, %hi(gCurrentCarInput) # $t5, 0x8012 @@ -1033,9 +1033,9 @@ glabel func_80049794 /* 04B1E0 8004A5E0 45010021 */ bc1t .L8004A668 /* 04B1E4 8004A5E4 3C01BF80 */ li $at, 0xBF800000 # -1.000000 /* 04B1E8 8004A5E8 44810000 */ mtc1 $at, $f0 -/* 04B1EC 8004A5EC 3C018012 */ lui $at, %hi(D_8011D538) # $at, 0x8012 +/* 04B1EC 8004A5EC 3C018012 */ lui $at, %hi(gCurrentStickY) # $at, 0x8012 /* 04B1F0 8004A5F0 240BFFC4 */ li $t3, -60 -/* 04B1F4 8004A5F4 AC2BD538 */ sw $t3, %lo(D_8011D538)($at) +/* 04B1F4 8004A5F4 AC2BD538 */ sw $t3, %lo(gCurrentStickY)($at) /* 04B1F8 8004A5F8 3C0141A0 */ li $at, 0x41A00000 # 20.000000 /* 04B1FC 8004A5FC 44813000 */ mtc1 $at, $f6 /* 04B200 8004A600 C60800C0 */ lwc1 $f8, 0xc0($s0) @@ -1669,7 +1669,7 @@ glabel func_80049794 /* 04BB00 8004AF00 8D8CD55C */ lw $t4, %lo(D_8011D55C)($t4) /* 04BB04 8004AF04 2401FFFF */ li $at, -1 /* 04BB08 8004AF08 11810025 */ beq $t4, $at, .L8004AFA0 -/* 04BB0C 8004AF0C 3C088012 */ lui $t0, %hi(D_8011D534) # $t0, 0x8012 +/* 04BB0C 8004AF0C 3C088012 */ lui $t0, %hi(gCurrentStickX) # $t0, 0x8012 /* 04BB10 8004AF10 820B01D8 */ lb $t3, 0x1d8($s0) /* 04BB14 8004AF14 3C028012 */ lui $v0, %hi(gCurrentCarInput) # $v0, 0x8012 /* 04BB18 8004AF18 15600021 */ bnez $t3, .L8004AFA0 @@ -1708,7 +1708,7 @@ glabel func_80049794 /* 04BB98 8004AF98 1000002E */ b .L8004B054 /* 04BB9C 8004AF9C A61801A0 */ sh $t8, 0x1a0($s0) .L8004AFA0: -/* 04BBA0 8004AFA0 8D08D534 */ lw $t0, %lo(D_8011D534)($t0) +/* 04BBA0 8004AFA0 8D08D534 */ lw $t0, %lo(gCurrentStickX)($t0) /* 04BBA4 8004AFA4 8FAB00F8 */ lw $t3, 0xf8($sp) /* 04BBA8 8004AFA8 0008C880 */ sll $t9, $t0, 2 /* 04BBAC 8004AFAC 032B0019 */ multu $t9, $t3 @@ -1806,8 +1806,8 @@ glabel func_80049794 /* 04BD04 8004B104 03201025 */ move $v0, $t9 .L8004B108: /* 04BD08 8004B108 8DEFD55C */ lw $t7, %lo(D_8011D55C)($t7) -/* 04BD0C 8004B10C 3C088012 */ lui $t0, %hi(D_8011D538) # $t0, 0x8012 -/* 04BD10 8004B110 8D08D538 */ lw $t0, %lo(D_8011D538)($t0) +/* 04BD0C 8004B10C 3C088012 */ lui $t0, %hi(gCurrentStickY) # $t0, 0x8012 +/* 04BD10 8004B110 8D08D538 */ lw $t0, %lo(gCurrentStickY)($t0) /* 04BD14 8004B114 2401FFFF */ li $at, -1 /* 04BD18 8004B118 11E10007 */ beq $t7, $at, .L8004B138 /* 04BD1C 8004B11C 00000000 */ nop @@ -1917,17 +1917,17 @@ glabel func_80049794 /* 04BEA8 8004B2A8 45000020 */ bc1f .L8004B32C /* 04BEAC 8004B2AC 00000000 */ nop /* 04BEB0 8004B2B0 821901E5 */ lb $t9, 0x1e5($s0) -/* 04BEB4 8004B2B4 3C028012 */ lui $v0, %hi(D_8011D534) # $v0, 0x8012 +/* 04BEB4 8004B2B4 3C028012 */ lui $v0, %hi(gCurrentStickX) # $v0, 0x8012 /* 04BEB8 8004B2B8 1720001C */ bnez $t9, .L8004B32C -/* 04BEBC 8004B2BC 3C0B8012 */ lui $t3, %hi(D_8011D538) # $t3, 0x8012 -/* 04BEC0 8004B2C0 8C42D534 */ lw $v0, %lo(D_8011D534)($v0) +/* 04BEBC 8004B2BC 3C0B8012 */ lui $t3, %hi(gCurrentStickY) # $t3, 0x8012 +/* 04BEC0 8004B2C0 8C42D534 */ lw $v0, %lo(gCurrentStickX)($v0) /* 04BEC4 8004B2C4 240FFFFF */ li $t7, -1 /* 04BEC8 8004B2C8 28410029 */ slti $at, $v0, 0x29 /* 04BECC 8004B2CC 14200005 */ bnez $at, .L8004B2E4 /* 04BED0 8004B2D0 240D0001 */ li $t5, 1 /* 04BED4 8004B2D4 A20F01E0 */ sb $t7, 0x1e0($s0) -/* 04BED8 8004B2D8 3C028012 */ lui $v0, %hi(D_8011D534) # $v0, 0x8012 -/* 04BEDC 8004B2DC 8C42D534 */ lw $v0, %lo(D_8011D534)($v0) +/* 04BED8 8004B2D8 3C028012 */ lui $v0, %hi(gCurrentStickX) # $v0, 0x8012 +/* 04BEDC 8004B2DC 8C42D534 */ lw $v0, %lo(gCurrentStickX)($v0) /* 04BEE0 8004B2E0 00000000 */ nop .L8004B2E4: /* 04BEE4 8004B2E4 2841FFD8 */ slti $at, $v0, -0x28 @@ -1935,7 +1935,7 @@ glabel func_80049794 /* 04BEEC 8004B2EC 00000000 */ nop /* 04BEF0 8004B2F0 A20D01E0 */ sb $t5, 0x1e0($s0) .L8004B2F4: -/* 04BEF4 8004B2F4 8D6BD538 */ lw $t3, %lo(D_8011D538)($t3) +/* 04BEF4 8004B2F4 8D6BD538 */ lw $t3, %lo(gCurrentStickY)($t3) /* 04BEF8 8004B2F8 00000000 */ nop /* 04BEFC 8004B2FC 29610029 */ slti $at, $t3, 0x29 /* 04BF00 8004B300 14200003 */ bnez $at, .L8004B310 diff --git a/asm/non_matchings/racer/func_8004CC20.s b/asm/non_matchings/racer/func_8004CC20.s index 0ec9b238..39526a75 100644 --- a/asm/non_matchings/racer/func_8004CC20.s +++ b/asm/non_matchings/racer/func_8004CC20.s @@ -53,16 +53,16 @@ glabel func_8004CC20 /* 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) -/* 04D8C0 8004CCC0 3C188012 */ lui $t8, %hi(D_8011D534) # $t8, 0x8012 +/* 04D8C0 8004CCC0 3C188012 */ lui $t8, %hi(gCurrentStickX) # $t8, 0x8012 /* 04D8C4 8004CCC4 E7A400B8 */ swc1 $f4, 0xb8($sp) /* 04D8C8 8004CCC8 C6260010 */ lwc1 $f6, 0x10($s1) -/* 04D8CC 8004CCCC 8F18D534 */ lw $t8, %lo(D_8011D534)($t8) +/* 04D8CC 8004CCCC 8F18D534 */ lw $t8, %lo(gCurrentStickX)($t8) /* 04D8D0 8004CCD0 E7A600B4 */ swc1 $f6, 0xb4($sp) /* 04D8D4 8004CCD4 C6280014 */ lwc1 $f8, 0x14($s1) /* 04D8D8 8004CCD8 8FA800D8 */ lw $t0, 0xd8($sp) /* 04D8DC 8004CCDC E7A800B0 */ swc1 $f8, 0xb0($sp) /* 04D8E0 8004CCE0 820401E1 */ lb $a0, 0x1e1($s0) -/* 04D8E4 8004CCE4 3C0C8012 */ lui $t4, %hi(D_8011D538) # $t4, 0x8012 +/* 04D8E4 8004CCE4 3C0C8012 */ lui $t4, %hi(gCurrentStickY) # $t4, 0x8012 /* 04D8E8 8004CCE8 03041823 */ subu $v1, $t8, $a0 /* 04D8EC 8004CCEC 00680019 */ multu $v1, $t0 /* 04D8F0 8004CCF0 02002825 */ move $a1, $s0 @@ -83,7 +83,7 @@ glabel func_8004CC20 /* 04D924 8004CD24 00865821 */ addu $t3, $a0, $a2 .L8004CD28: /* 04D928 8004CD28 A20B01E1 */ sb $t3, 0x1e1($s0) -/* 04D92C 8004CD2C 8D8CD538 */ lw $t4, %lo(D_8011D538)($t4) +/* 04D92C 8004CD2C 8D8CD538 */ lw $t4, %lo(gCurrentStickY)($t4) /* 04D930 8004CD30 820701E8 */ lb $a3, 0x1e8($s0) /* 04D934 8004CD34 02202025 */ move $a0, $s1 /* 04D938 8004CD38 01871823 */ subu $v1, $t4, $a3 diff --git a/asm/non_matchings/racer/func_8004DE38.s b/asm/non_matchings/racer/func_8004DE38.s index bbbcf797..e75a9308 100644 --- a/asm/non_matchings/racer/func_8004DE38.s +++ b/asm/non_matchings/racer/func_8004DE38.s @@ -590,25 +590,25 @@ glabel func_8004DE38 /* 04F260 8004E660 00C02025 */ move $a0, $a2 /* 04F264 8004E664 0C01A967 */ jal clamp_joystick_x_axis /* 04F268 8004E668 AFA600AC */ sw $a2, 0xac($sp) -/* 04F26C 8004E66C 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 +/* 04F26C 8004E66C 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 /* 04F270 8004E670 0C0270C3 */ jal get_filtered_cheats -/* 04F274 8004E674 AC22D534 */ sw $v0, %lo(D_8011D534)($at) +/* 04F274 8004E674 AC22D534 */ sw $v0, %lo(gCurrentStickX)($at) /* 04F278 8004E678 8FA600AC */ lw $a2, 0xac($sp) /* 04F27C 8004E67C 30480004 */ andi $t0, $v0, 4 /* 04F280 8004E680 11000006 */ beqz $t0, .L8004E69C /* 04F284 8004E684 00C02025 */ move $a0, $a2 -/* 04F288 8004E688 3C188012 */ lui $t8, %hi(D_8011D534) # $t8, 0x8012 -/* 04F28C 8004E68C 8F18D534 */ lw $t8, %lo(D_8011D534)($t8) -/* 04F290 8004E690 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 +/* 04F288 8004E688 3C188012 */ lui $t8, %hi(gCurrentStickX) # $t8, 0x8012 +/* 04F28C 8004E68C 8F18D534 */ lw $t8, %lo(gCurrentStickX)($t8) +/* 04F290 8004E690 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 /* 04F294 8004E694 0018C823 */ negu $t9, $t8 -/* 04F298 8004E698 AC39D534 */ sw $t9, %lo(D_8011D534)($at) +/* 04F298 8004E698 AC39D534 */ sw $t9, %lo(gCurrentStickX)($at) .L8004E69C: /* 04F29C 8004E69C 0C01A978 */ jal clamp_joystick_y_axis /* 04F2A0 8004E6A0 AFA600AC */ sw $a2, 0xac($sp) /* 04F2A4 8004E6A4 8FA400AC */ lw $a0, 0xac($sp) -/* 04F2A8 8004E6A8 3C018012 */ lui $at, %hi(D_8011D538) # $at, 0x8012 +/* 04F2A8 8004E6A8 3C018012 */ lui $at, %hi(gCurrentStickY) # $at, 0x8012 /* 04F2AC 8004E6AC 0C01A94A */ jal get_buttons_held_from_player -/* 04F2B0 8004E6B0 AC22D538 */ sw $v0, %lo(D_8011D538)($at) +/* 04F2B0 8004E6B0 AC22D538 */ sw $v0, %lo(gCurrentStickY)($at) /* 04F2B4 8004E6B4 8FA400AC */ lw $a0, 0xac($sp) /* 04F2B8 8004E6B8 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 /* 04F2BC 8004E6BC 0C01A955 */ jal get_buttons_pressed_from_player @@ -663,10 +663,10 @@ glabel func_8004DE38 /* 04F370 8004E770 00000000 */ nop /* 04F374 8004E774 1840000C */ blez $v0, .L8004E7A8 .L8004E778: -/* 04F378 8004E778 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 -/* 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) +/* 04F378 8004E778 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 +/* 04F37C 8004E77C AC20D534 */ sw $zero, %lo(gCurrentStickX)($at) +/* 04F380 8004E780 3C018012 */ lui $at, %hi(gCurrentStickY) # $at, 0x8012 +/* 04F384 8004E784 AC20D538 */ sw $zero, %lo(gCurrentStickY)($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 @@ -732,13 +732,13 @@ glabel func_8004DE38 /* 04F470 8004E870 24050050 */ li $a1, 80 /* 04F474 8004E874 A20201D1 */ sb $v0, 0x1d1($s0) .L8004E878: -/* 04F478 8004E878 3C0E8012 */ lui $t6, %hi(D_8011D534) # $t6, 0x8012 -/* 04F47C 8004E87C 8DCED534 */ lw $t6, %lo(D_8011D534)($t6) +/* 04F478 8004E878 3C0E8012 */ lui $t6, %hi(gCurrentStickX) # $t6, 0x8012 +/* 04F47C 8004E87C 8DCED534 */ lw $t6, %lo(gCurrentStickX)($t6) /* 04F480 8004E880 820F01D1 */ lb $t7, 0x1d1($s0) -/* 04F484 8004E884 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 +/* 04F484 8004E884 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 /* 04F488 8004E888 01CF4021 */ addu $t0, $t6, $t7 /* 04F48C 8004E88C 10000002 */ b .L8004E898 -/* 04F490 8004E890 AC28D534 */ sw $t0, %lo(D_8011D534)($at) +/* 04F490 8004E890 AC28D534 */ sw $t0, %lo(gCurrentStickX)($at) .L8004E894: /* 04F494 8004E894 A600018A */ sh $zero, 0x18a($s0) .L8004E898: @@ -766,10 +766,10 @@ glabel func_8004DE38 /* 04F4E8 8004E8E8 24010008 */ li $at, 8 /* 04F4EC 8004E8EC 14410006 */ bne $v0, $at, .L8004E908 .L8004E8F0: -/* 04F4F0 8004E8F0 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 -/* 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) +/* 04F4F0 8004E8F0 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 +/* 04F4F4 8004E8F4 AC20D534 */ sw $zero, %lo(gCurrentStickX)($at) +/* 04F4F8 8004E8F8 3C018012 */ lui $at, %hi(gCurrentStickY) # $at, 0x8012 +/* 04F4FC 8004E8FC AC20D538 */ sw $zero, %lo(gCurrentStickY)($at) /* 04F500 8004E900 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 /* 04F504 8004E904 AC20D528 */ sw $zero, %lo(gCurrentCarInput)($at) .L8004E908: @@ -1020,10 +1020,10 @@ glabel L8004EC50 /* 04F88C 8004EC8C 820A0175 */ lb $t2, 0x175($s0) glabel L8004EC90 /* 04F890 8004EC90 3C188012 */ lui $t8, %hi(gCurrentCarInput) # $t8, 0x8012 -/* 04F894 8004EC94 3C198012 */ lui $t9, %hi(D_8011D534) # $t9, 0x8012 +/* 04F894 8004EC94 3C198012 */ lui $t9, %hi(gCurrentStickX) # $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 +/* 04F8A0 8004ECA0 2739D534 */ addiu $t9, %lo(gCurrentStickX) # addiu $t9, $t9, -0x2acc /* 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) diff --git a/asm/non_matchings/racer/func_8004F7F4.s b/asm/non_matchings/racer/func_8004F7F4.s index fe13d6f4..d26a00f2 100644 --- a/asm/non_matchings/racer/func_8004F7F4.s +++ b/asm/non_matchings/racer/func_8004F7F4.s @@ -130,8 +130,8 @@ glabel func_8004F7F4 /* 050594 8004F994 10400068 */ beqz $v0, .L8004FB38 /* 050598 8004F998 00000000 */ nop /* 05059C 8004F99C 04410013 */ bgez $v0, .L8004F9EC -/* 0505A0 8004F9A0 3C068012 */ lui $a2, %hi(D_8011D534) # $a2, 0x8012 -/* 0505A4 8004F9A4 24C6D534 */ addiu $a2, %lo(D_8011D534) # addiu $a2, $a2, -0x2acc +/* 0505A0 8004F9A0 3C068012 */ lui $a2, %hi(gCurrentStickX) # $a2, 0x8012 +/* 0505A4 8004F9A4 24C6D534 */ addiu $a2, %lo(gCurrentStickX) # addiu $a2, $a2, -0x2acc /* 0505A8 8004F9A8 8CC90000 */ lw $t1, ($a2) /* 0505AC 8004F9AC 8FAB00C0 */ lw $t3, 0xc0($sp) /* 0505B0 8004F9B0 2921001A */ slti $at, $t1, 0x1a @@ -150,9 +150,9 @@ glabel func_8004F7F4 /* 0505E4 8004F9E4 10000019 */ b .L8004FA4C /* 0505E8 8004F9E8 44825000 */ mtc1 $v0, $f10 .L8004F9EC: -/* 0505EC 8004F9EC 3C068012 */ lui $a2, %hi(D_8011D534) # $a2, 0x8012 +/* 0505EC 8004F9EC 3C068012 */ lui $a2, %hi(gCurrentStickX) # $a2, 0x8012 /* 0505F0 8004F9F0 18400012 */ blez $v0, .L8004FA3C -/* 0505F4 8004F9F4 24C6D534 */ addiu $a2, %lo(D_8011D534) # addiu $a2, $a2, -0x2acc +/* 0505F4 8004F9F4 24C6D534 */ addiu $a2, %lo(gCurrentStickX) # addiu $a2, $a2, -0x2acc /* 0505F8 8004F9F8 8CCD0000 */ lw $t5, ($a2) /* 0505FC 8004F9FC 8FAF00C0 */ lw $t7, 0xc0($sp) /* 050600 8004FA00 29A1FFE7 */ slti $at, $t5, -0x19 @@ -200,9 +200,9 @@ glabel func_8004F7F4 /* 050698 8004FA98 0C015C12 */ jal func_80057048 /* 05069C 8004FA9C 2405001C */ li $a1, 28 /* 0506A0 8004FAA0 821901E6 */ lb $t9, 0x1e6($s0) -/* 0506A4 8004FAA4 3C068012 */ lui $a2, %hi(D_8011D534) # $a2, 0x8012 +/* 0506A4 8004FAA4 3C068012 */ lui $a2, %hi(gCurrentStickX) # $a2, 0x8012 /* 0506A8 8004FAA8 00194023 */ negu $t0, $t9 -/* 0506AC 8004FAAC 24C6D534 */ addiu $a2, %lo(D_8011D534) # addiu $a2, $a2, -0x2acc +/* 0506AC 8004FAAC 24C6D534 */ addiu $a2, %lo(gCurrentStickX) # addiu $a2, $a2, -0x2acc /* 0506B0 8004FAB0 A20801DB */ sb $t0, 0x1db($s0) /* 0506B4 8004FAB4 A20001E6 */ sb $zero, 0x1e6($s0) .L8004FAB8: diff --git a/asm/non_matchings/racer/func_80050A28.s b/asm/non_matchings/racer/func_80050A28.s index 90dfc3a0..3e2fe637 100644 --- a/asm/non_matchings/racer/func_80050A28.s +++ b/asm/non_matchings/racer/func_80050A28.s @@ -260,8 +260,8 @@ glabel func_80050A28 /* 051948 80050D48 8FA70078 */ lw $a3, 0x78($sp) /* 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 +/* 051950 80050D50 3C098012 */ lui $t1, %hi(gCurrentStickX) # $t1, 0x8012 +/* 051954 80050D54 2529D534 */ addiu $t1, %lo(gCurrentStickX) # addiu $t1, $t1, -0x2acc /* 051958 80050D58 8D390000 */ lw $t9, ($t1) /* 05195C 80050D5C 820A01D1 */ lb $t2, 0x1d1($s0) /* 051960 80050D60 00000000 */ nop @@ -269,9 +269,9 @@ glabel func_80050A28 /* 051968 80050D68 AD2B0000 */ sw $t3, ($t1) .L80050D6C: /* 05196C 80050D6C 820401FA */ lb $a0, 0x1fa($s0) -/* 051970 80050D70 3C098012 */ lui $t1, %hi(D_8011D534) # $t1, 0x8012 +/* 051970 80050D70 3C098012 */ lui $t1, %hi(gCurrentStickX) # $t1, 0x8012 /* 051974 80050D74 14800020 */ bnez $a0, .L80050DF8 -/* 051978 80050D78 2529D534 */ addiu $t1, %lo(D_8011D534) # addiu $t1, $t1, -0x2acc +/* 051978 80050D78 2529D534 */ addiu $t1, %lo(gCurrentStickX) # addiu $t1, $t1, -0x2acc /* 05197C 80050D7C C60A002C */ lwc1 $f10, 0x2c($s0) /* 051980 80050D80 3C014000 */ li $at, 0x40000000 # 2.000000 /* 051984 80050D84 44812800 */ mtc1 $at, $f5 @@ -317,9 +317,9 @@ glabel func_80050A28 /* 051A18 80050E18 AD0B0000 */ sw $t3, ($t0) /* 051A1C 80050E1C 3C0E800E */ lui $t6, %hi(D_800DCB98) # $t6, 0x800e /* 051A20 80050E20 8DCECB98 */ lw $t6, %lo(D_800DCB98)($t6) -/* 051A24 80050E24 3C018012 */ lui $at, %hi(D_8011D538) # $at, 0x8012 +/* 051A24 80050E24 3C018012 */ lui $at, %hi(gCurrentStickY) # $at, 0x8012 /* 051A28 80050E28 240CFFBA */ li $t4, -70 -/* 051A2C 80050E2C AC2CD538 */ sw $t4, %lo(D_8011D538)($at) +/* 051A2C 80050E2C AC2CD538 */ sw $t4, %lo(gCurrentStickY)($at) /* 051A30 80050E30 240D0001 */ li $t5, 1 /* 051A34 80050E34 29C10003 */ slti $at, $t6, 3 /* 051A38 80050E38 10200006 */ beqz $at, .L80050E54 @@ -465,12 +465,12 @@ glabel func_80050A28 /* 051C34 80051034 820401E6 */ lb $a0, 0x1e6($s0) /* 051C38 80051038 3C01800E */ lui $at, %hi(D_800E6648 + 4) # $at, 0x800e /* 051C3C 8005103C 10800015 */ beqz $a0, .L80051094 -/* 051C40 80051040 3C198012 */ lui $t9, %hi(D_8011D534) # $t9, 0x8012 +/* 051C40 80051040 3C198012 */ lui $t9, %hi(gCurrentStickX) # $t9, 0x8012 /* 051C44 80051044 C4296648 */ lwc1 $f9, %lo(D_800E6648)($at) /* 051C48 80051048 C428664C */ lwc1 $f8, %lo(D_800E6648 + 4)($at) /* 051C4C 8005104C 46000121 */ cvt.d.s $f4, $f0 /* 051C50 80051050 46282182 */ mul.d $f6, $f4, $f8 -/* 051C54 80051054 8F39D534 */ lw $t9, %lo(D_8011D534)($t9) +/* 051C54 80051054 8F39D534 */ lw $t9, %lo(gCurrentStickX)($t9) /* 051C58 80051058 00045900 */ sll $t3, $a0, 4 /* 051C5C 8005105C 01645823 */ subu $t3, $t3, $a0 /* 051C60 80051060 000B5840 */ sll $t3, $t3, 1 @@ -917,10 +917,10 @@ glabel func_80050A28 /* 0522B0 800516B0 1700001B */ bnez $t8, .L80051720 /* 0522B4 800516B4 00000000 */ nop /* 0522B8 800516B8 820A01D8 */ lb $t2, 0x1d8($s0) -/* 0522BC 800516BC 3C0B8012 */ lui $t3, %hi(D_8011D534) # $t3, 0x8012 +/* 0522BC 800516BC 3C0B8012 */ lui $t3, %hi(gCurrentStickX) # $t3, 0x8012 /* 0522C0 800516C0 15400017 */ bnez $t2, .L80051720 /* 0522C4 800516C4 00000000 */ nop -/* 0522C8 800516C8 8D6BD534 */ lw $t3, %lo(D_8011D534)($t3) +/* 0522C8 800516C8 8D6BD534 */ lw $t3, %lo(gCurrentStickX)($t3) /* 0522CC 800516CC 82190003 */ lb $t9, 3($s0) /* 0522D0 800516D0 448B9000 */ mtc1 $t3, $f18 /* 0522D4 800516D4 00196080 */ sll $t4, $t9, 2 @@ -1399,7 +1399,7 @@ glabel func_80050A28 /* 0529C8 80051DC8 860F0000 */ lh $t7, ($s0) /* 0529CC 80051DCC 2401FFFF */ li $at, -1 /* 0529D0 80051DD0 15E10004 */ bne $t7, $at, .L80051DE4 -/* 0529D4 80051DD4 3C0A8012 */ lui $t2, %hi(D_8011D538) # $t2, 0x8012 +/* 0529D4 80051DD4 3C0A8012 */ lui $t2, %hi(gCurrentStickY) # $t2, 0x8012 /* 0529D8 80051DD8 820E0214 */ lb $t6, 0x214($s0) /* 0529DC 80051DDC 00000000 */ nop /* 0529E0 80051DE0 11C0002A */ beqz $t6, .L80051E8C @@ -1420,7 +1420,7 @@ glabel func_80050A28 /* 052A18 80051E18 46249182 */ mul.d $f6, $f18, $f4 /* 052A1C 80051E1C 46203020 */ cvt.s.d $f0, $f6 .L80051E20: -/* 052A20 80051E20 8D4AD538 */ lw $t2, %lo(D_8011D538)($t2) +/* 052A20 80051E20 8D4AD538 */ lw $t2, %lo(gCurrentStickY)($t2) /* 052A24 80051E24 00000000 */ nop /* 052A28 80051E28 2941FFE7 */ slti $at, $t2, -0x19 /* 052A2C 80051E2C 10200017 */ beqz $at, .L80051E8C diff --git a/asm/non_matchings/racer/func_80052B64.s b/asm/non_matchings/racer/func_80052B64.s index e1f821b6..11255ad7 100644 --- a/asm/non_matchings/racer/func_80052B64.s +++ b/asm/non_matchings/racer/func_80052B64.s @@ -84,10 +84,10 @@ glabel func_80052B64 /* 053888 80052C88 0461002B */ bgez $v1, .L80052D38 /* 05388C 80052C8C 00000000 */ nop /* 053890 80052C90 80ED01DB */ lb $t5, 0x1db($a3) -/* 053894 80052C94 3C0F8012 */ lui $t7, %hi(D_8011D534) # $t7, 0x8012 +/* 053894 80052C94 3C0F8012 */ lui $t7, %hi(gCurrentStickX) # $t7, 0x8012 /* 053898 80052C98 25B8FFFF */ addiu $t8, $t5, -1 /* 05389C 80052C9C A0F801DB */ sb $t8, 0x1db($a3) -/* 0538A0 80052CA0 8DEFD534 */ lw $t7, %lo(D_8011D534)($t7) +/* 0538A0 80052CA0 8DEFD534 */ lw $t7, %lo(gCurrentStickX)($t7) /* 0538A4 80052CA4 00000000 */ nop /* 0538A8 80052CA8 29E10033 */ slti $at, $t7, 0x33 /* 0538AC 80052CAC 14200022 */ bnez $at, .L80052D38 @@ -113,10 +113,10 @@ glabel func_80052B64 /* 0538F8 80052CF8 1860000F */ blez $v1, .L80052D38 /* 0538FC 80052CFC 00000000 */ nop /* 053900 80052D00 80E901DB */ lb $t1, 0x1db($a3) -/* 053904 80052D04 3C0D8012 */ lui $t5, %hi(D_8011D534) # $t5, 0x8012 +/* 053904 80052D04 3C0D8012 */ lui $t5, %hi(gCurrentStickX) # $t5, 0x8012 /* 053908 80052D08 252C0001 */ addiu $t4, $t1, 1 /* 05390C 80052D0C A0EC01DB */ sb $t4, 0x1db($a3) -/* 053910 80052D10 8DADD534 */ lw $t5, %lo(D_8011D534)($t5) +/* 053910 80052D10 8DADD534 */ lw $t5, %lo(gCurrentStickX)($t5) /* 053914 80052D14 00000000 */ nop /* 053918 80052D18 29A1FFCE */ slti $at, $t5, -0x32 /* 05391C 80052D1C 10200006 */ beqz $at, .L80052D38 @@ -135,10 +135,10 @@ glabel func_80052B64 /* 05394C 80052D4C C7A6002C */ lwc1 $f6, 0x2c($sp) /* 053950 80052D50 C60A0020 */ lwc1 $f10, 0x20($s0) /* 053954 80052D54 46062202 */ mul.s $f8, $f4, $f6 -/* 053958 80052D58 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 +/* 053958 80052D58 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 /* 05395C 80052D5C 46085401 */ sub.s $f16, $f10, $f8 /* 053960 80052D60 E6100020 */ swc1 $f16, 0x20($s0) -/* 053964 80052D64 AC20D534 */ sw $zero, %lo(D_8011D534)($at) +/* 053964 80052D64 AC20D534 */ sw $zero, %lo(gCurrentStickX)($at) /* 053968 80052D68 A0E001E1 */ sb $zero, 0x1e1($a3) /* 05396C 80052D6C 8FBF001C */ lw $ra, 0x1c($sp) /* 053970 80052D70 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/racer/func_80052D7C.s b/asm/non_matchings/racer/func_80052D7C.s index f14782ac..47e70911 100644 --- a/asm/non_matchings/racer/func_80052D7C.s +++ b/asm/non_matchings/racer/func_80052D7C.s @@ -39,8 +39,8 @@ glabel func_80052D7C /* 0539A8 80052DA8 2401FFFF */ li $at, -1 /* 0539AC 80052DAC 15E10003 */ bne $t7, $at, .L80052DBC /* 0539B0 80052DB0 2418003C */ li $t8, 60 -/* 0539B4 80052DB4 3C018012 */ lui $at, %hi(D_8011D538) # $at, 0x8012 -/* 0539B8 80052DB8 AC38D538 */ sw $t8, %lo(D_8011D538)($at) +/* 0539B4 80052DB4 3C018012 */ lui $at, %hi(gCurrentStickY) # $at, 0x8012 +/* 0539B8 80052DB8 AC38D538 */ sw $t8, %lo(gCurrentStickY)($at) .L80052DBC: /* 0539BC 80052DBC 90B901F0 */ lbu $t9, 0x1f0($a1) /* 0539C0 80052DC0 00000000 */ nop @@ -49,12 +49,12 @@ glabel func_80052D7C /* 0539CC 80052DCC 84A80000 */ lh $t0, ($a1) /* 0539D0 80052DD0 2401FFFF */ li $at, -1 /* 0539D4 80052DD4 11010004 */ beq $t0, $at, .L80052DE8 -/* 0539D8 80052DD8 3C038012 */ lui $v1, %hi(D_8011D534) # $v1, 0x8012 +/* 0539D8 80052DD8 3C038012 */ lui $v1, %hi(gCurrentStickX) # $v1, 0x8012 /* 0539DC 80052DDC 80A301E1 */ lb $v1, 0x1e1($a1) /* 0539E0 80052DE0 10000004 */ b .L80052DF4 /* 0539E4 80052DE4 00034880 */ sll $t1, $v1, 2 .L80052DE8: -/* 0539E8 80052DE8 8C63D534 */ lw $v1, %lo(D_8011D534)($v1) +/* 0539E8 80052DE8 8C63D534 */ lw $v1, %lo(gCurrentStickX)($v1) /* 0539EC 80052DEC 00000000 */ nop /* 0539F0 80052DF0 00034880 */ sll $t1, $v1, 2 .L80052DF4: @@ -154,7 +154,7 @@ glabel func_80052D7C /* 053B44 80052F44 4626003C */ c.lt.d $f0, $f6 /* 053B48 80052F48 3C01C000 */ li $at, 0xC0000000 # -2.000000 /* 053B4C 80052F4C 45000004 */ bc1f .L80052F60 -/* 053B50 80052F50 3C0D8012 */ lui $t5, %hi(D_8011D538) # $t5, 0x8012 +/* 053B50 80052F50 3C0D8012 */ lui $t5, %hi(gCurrentStickY) # $t5, 0x8012 /* 053B54 80052F54 44812000 */ mtc1 $at, $f4 /* 053B58 80052F58 00000000 */ nop /* 053B5C 80052F5C E5440020 */ swc1 $f4, 0x20($t2) @@ -181,7 +181,7 @@ glabel func_80052D7C .L80052FAC: /* 053BAC 80052FAC 11C0000E */ beqz $t6, .L80052FE8 /* 053BB0 80052FB0 00000000 */ nop -/* 053BB4 80052FB4 8DADD538 */ lw $t5, %lo(D_8011D538)($t5) +/* 053BB4 80052FB4 8DADD538 */ lw $t5, %lo(gCurrentStickY)($t5) /* 053BB8 80052FB8 00000000 */ nop /* 053BBC 80052FBC 29A1FFE7 */ slti $at, $t5, -0x19 /* 053BC0 80052FC0 10200009 */ beqz $at, .L80052FE8 @@ -205,7 +205,7 @@ glabel func_80052D7C /* 053C04 80053004 C4B0002C */ lwc1 $f16, 0x2c($a1) /* 053C08 80053008 3C01800E */ lui $at, %hi(D_800E6700) # $at, 0x800e /* 053C0C 8005300C 460084A1 */ cvt.d.s $f18, $f16 -/* 053C10 80053010 3C088012 */ lui $t0, %hi(D_8011D534) # $t0, 0x8012 +/* 053C10 80053010 3C088012 */ lui $t0, %hi(gCurrentStickX) # $t0, 0x8012 /* 053C14 80053014 46209182 */ mul.d $f6, $f18, $f0 /* 053C18 80053018 462042A0 */ cvt.s.d $f10, $f8 /* 053C1C 8005301C 3C078012 */ lui $a3, %hi(D_8011D504) # $a3, 0x8012 @@ -224,7 +224,7 @@ glabel func_80052D7C /* 053C50 80053050 44812000 */ mtc1 $at, $f4 /* 053C54 80053054 462091A0 */ cvt.s.d $f6, $f18 /* 053C58 80053058 E4860020 */ swc1 $f6, 0x20($a0) -/* 053C5C 8005305C 8D08D534 */ lw $t0, %lo(D_8011D534)($t0) +/* 053C5C 8005305C 8D08D534 */ lw $t0, %lo(gCurrentStickX)($t0) /* 053C60 80053060 8FB90048 */ lw $t9, 0x48($sp) /* 053C64 80053064 80E7D504 */ lb $a3, %lo(D_8011D504)($a3) /* 053C68 80053068 AFA50044 */ sw $a1, 0x44($sp) @@ -280,7 +280,7 @@ glabel func_80052D7C /* 053D1C 8005311C 80A901D3 */ lb $t1, 0x1d3($a1) /* 053D20 80053120 3C01C034 */ li $at, 0xC0340000 # -2.812500 /* 053D24 80053124 1120000F */ beqz $t1, .L80053164 -/* 053D28 80053128 3C038012 */ lui $v1, %hi(D_8011D538) # $v1, 0x8012 +/* 053D28 80053128 3C038012 */ lui $v1, %hi(gCurrentStickY) # $v1, 0x8012 /* 053D2C 8005312C C4B2002C */ lwc1 $f18, 0x2c($a1) /* 053D30 80053130 44813800 */ mtc1 $at, $f7 /* 053D34 80053134 44803000 */ mtc1 $zero, $f6 @@ -296,7 +296,7 @@ glabel func_80052D7C /* 053D5C 8005315C 46205220 */ cvt.s.d $f8, $f10 /* 053D60 80053160 E4A8002C */ swc1 $f8, 0x2c($a1) .L80053164: -/* 053D64 80053164 8C63D538 */ lw $v1, %lo(D_8011D538)($v1) +/* 053D64 80053164 8C63D538 */ lw $v1, %lo(gCurrentStickY)($v1) /* 053D68 80053168 8FAA0040 */ lw $t2, 0x40($sp) /* 053D6C 8005316C 28610032 */ slti $at, $v1, 0x32 /* 053D70 80053170 10200004 */ beqz $at, .L80053184 diff --git a/asm/non_matchings/racer/func_80053750.s b/asm/non_matchings/racer/func_80053750.s index 42662baa..f8a2ea02 100644 --- a/asm/non_matchings/racer/func_80053750.s +++ b/asm/non_matchings/racer/func_80053750.s @@ -496,8 +496,8 @@ glabel func_80053750 /* 054A44 80053E44 24420008 */ addiu $v0, $v0, 8 /* 054A48 80053E48 1443FF99 */ bne $v0, $v1, .L80053CB0 /* 054A4C 80053E4C 01603825 */ move $a3, $t3 -/* 054A50 80053E50 3C028012 */ lui $v0, %hi(D_8011D534) # $v0, 0x8012 -/* 054A54 80053E54 2442D534 */ addiu $v0, %lo(D_8011D534) # addiu $v0, $v0, -0x2acc +/* 054A50 80053E50 3C028012 */ lui $v0, %hi(gCurrentStickX) # $v0, 0x8012 +/* 054A54 80053E54 2442D534 */ addiu $v0, %lo(gCurrentStickX) # addiu $v0, $v0, -0x2acc /* 054A58 80053E58 8C4D0000 */ lw $t5, ($v0) /* 054A5C 80053E5C 24030064 */ li $v1, 100 /* 054A60 80053E60 01A30019 */ multu $t5, $v1 diff --git a/asm/non_matchings/racer/func_8005492C.s b/asm/non_matchings/racer/func_8005492C.s index 51feb79f..1794ce70 100644 --- a/asm/non_matchings/racer/func_8005492C.s +++ b/asm/non_matchings/racer/func_8005492C.s @@ -51,7 +51,7 @@ glabel func_8005492C /* 05558C 8005498C C7A20030 */ lwc1 $f2, 0x30($sp) /* 055590 80054990 28411C01 */ slti $at, $v0, 0x1c01 /* 055594 80054994 10200003 */ beqz $at, .L800549A4 -/* 055598 80054998 3C048012 */ lui $a0, %hi(D_8011D534) # $a0, 0x8012 +/* 055598 80054998 3C048012 */ lui $a0, %hi(gCurrentStickX) # $a0, 0x8012 /* 05559C 8005499C 2841E400 */ slti $at, $v0, -0x1c00 /* 0555A0 800549A0 10200002 */ beqz $at, .L800549AC .L800549A4: @@ -60,7 +60,7 @@ glabel func_8005492C .L800549AC: /* 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) +/* 0555B4 800549B4 8C84D534 */ lw $a0, %lo(gCurrentStickX)($a0) /* 0555B8 800549B8 304F4000 */ andi $t7, $v0, 0x4000 /* 0555BC 800549BC 24030006 */ li $v1, 6 /* 0555C0 800549C0 11E00002 */ beqz $t7, .L800549CC @@ -350,9 +350,9 @@ glabel func_8005492C /* 0559E8 80054DE8 46208201 */ sub.d $f8, $f16, $f0 /* 0559EC 80054DEC C4256810 */ lwc1 $f5, %lo(D_800E6810)($at) /* 0559F0 80054DF0 C4246814 */ lwc1 $f4, %lo(D_800E6810 + 4)($at) -/* 0559F4 80054DF4 3C088012 */ lui $t0, %hi(D_8011D538) # $t0, 0x8012 +/* 0559F4 80054DF4 3C088012 */ lui $t0, %hi(gCurrentStickY) # $t0, 0x8012 /* 0559F8 80054DF8 46244182 */ mul.d $f6, $f8, $f4 -/* 0559FC 80054DFC 8D08D538 */ lw $t0, %lo(D_8011D538)($t0) +/* 0559FC 80054DFC 8D08D538 */ lw $t0, %lo(gCurrentStickY)($t0) /* 055A00 80054E00 3C028012 */ lui $v0, %hi(gCurrentCarInput) # $v0, 0x8012 /* 055A04 80054E04 2901FFE7 */ slti $at, $t0, -0x19 /* 055A08 80054E08 1020000D */ beqz $at, .L80054E40 diff --git a/asm/non_matchings/racer/func_80054FD0.s b/asm/non_matchings/racer/func_80054FD0.s index 70eb86fb..17cc5016 100644 --- a/asm/non_matchings/racer/func_80054FD0.s +++ b/asm/non_matchings/racer/func_80054FD0.s @@ -256,7 +256,7 @@ glabel func_80054FD0 /* 055F94 80055394 46003302 */ mul.s $f12, $f6, $f0 /* 055F98 80055398 AFA9018C */ sw $t1, 0x18c($sp) /* 055F9C 8005539C 46004382 */ mul.s $f14, $f8, $f0 -/* 055FA0 800553A0 0C01C1D4 */ jal func_80070750 +/* 055FA0 800553A0 0C01C1D4 */ jal atan2f /* 055FA4 800553A4 00000000 */ nop /* 055FA8 800553A8 86390000 */ lh $t9, ($s1) /* 055FAC 800553AC 8FA9018C */ lw $t1, 0x18c($sp) @@ -587,7 +587,7 @@ glabel func_80054FD0 /* 056474 80055874 46083080 */ add.s $f2, $f6, $f8 /* 056478 80055878 E7B00180 */ swc1 $f16, 0x180($sp) /* 05647C 8005587C 46029381 */ sub.s $f14, $f18, $f2 -/* 056480 80055880 0C01C1D4 */ jal func_80070750 +/* 056480 80055880 0C01C1D4 */ jal atan2f /* 056484 80055884 46008301 */ sub.s $f12, $f16, $f0 /* 056488 80055888 34018000 */ li $at, 32768 /* 05648C 8005588C 00412021 */ addu $a0, $v0, $at @@ -657,7 +657,7 @@ glabel func_80054FD0 /* 056570 80055970 46045301 */ sub.s $f12, $f10, $f4 /* 056574 80055974 46083381 */ sub.s $f14, $f6, $f8 /* 056578 80055978 E7AC0180 */ swc1 $f12, 0x180($sp) -/* 05657C 8005597C 0C01C1D4 */ jal func_80070750 +/* 05657C 8005597C 0C01C1D4 */ jal atan2f /* 056580 80055980 E7AE017C */ swc1 $f14, 0x17c($sp) /* 056584 80055984 8FB80184 */ lw $t8, 0x184($sp) /* 056588 80055988 00000000 */ nop @@ -675,7 +675,7 @@ glabel func_80054FD0 /* 0565B4 800559B4 46045301 */ sub.s $f12, $f10, $f4 /* 0565B8 800559B8 46083381 */ sub.s $f14, $f6, $f8 /* 0565BC 800559BC E7AC0180 */ swc1 $f12, 0x180($sp) -/* 0565C0 800559C0 0C01C1D4 */ jal func_80070750 +/* 0565C0 800559C0 0C01C1D4 */ jal atan2f /* 0565C4 800559C4 E7AE017C */ swc1 $f14, 0x17c($sp) /* 0565C8 800559C8 8FB80184 */ lw $t8, 0x184($sp) /* 0565CC 800559CC 24194000 */ li $t9, 16384 diff --git a/asm/non_matchings/racer/func_80055A84.s b/asm/non_matchings/racer/func_80055A84.s index d750f7a6..dae70cc5 100644 --- a/asm/non_matchings/racer/func_80055A84.s +++ b/asm/non_matchings/racer/func_80055A84.s @@ -196,7 +196,7 @@ glabel func_80055A84 /* 056968 80055D68 460A4300 */ add.s $f12, $f8, $f10 /* 05696C 80055D6C 46009182 */ mul.s $f6, $f18, $f0 /* 056970 80055D70 46062481 */ sub.s $f18, $f4, $f6 -/* 056974 80055D74 0C01C1D4 */ jal func_80070750 +/* 056974 80055D74 0C01C1D4 */ jal atan2f /* 056978 80055D78 E7B20060 */ swc1 $f18, 0x60($sp) /* 05697C 80055D7C 00021C00 */ sll $v1, $v0, 0x10 /* 056980 80055D80 00034C03 */ sra $t1, $v1, 0x10 @@ -210,7 +210,7 @@ glabel func_80055A84 .L80055DA0: /* 0569A0 80055DA0 C7AC0060 */ lwc1 $f12, 0x60($sp) /* 0569A4 80055DA4 C7AE0064 */ lwc1 $f14, 0x64($sp) -/* 0569A8 80055DA8 0C01C1D4 */ jal func_80070750 +/* 0569A8 80055DA8 0C01C1D4 */ jal atan2f /* 0569AC 80055DAC 00000000 */ nop /* 0569B0 80055DB0 00021C00 */ sll $v1, $v0, 0x10 /* 0569B4 80055DB4 00035403 */ sra $t2, $v1, 0x10 diff --git a/asm/non_matchings/racer/func_80059208.s b/asm/non_matchings/racer/func_80059208.s index d462935a..2401270f 100644 --- a/asm/non_matchings/racer/func_80059208.s +++ b/asm/non_matchings/racer/func_80059208.s @@ -242,7 +242,7 @@ glabel func_80059208 .L80059588: /* 05A188 80059588 C7AE004C */ lwc1 $f14, 0x4c($sp) /* 05A18C 8005958C C7AC0054 */ lwc1 $f12, 0x54($sp) -/* 05A190 80059590 0C01C1D4 */ jal func_80070750 +/* 05A190 80059590 0C01C1D4 */ jal atan2f /* 05A194 80059594 00000000 */ nop /* 05A198 80059598 863901A0 */ lh $t9, 0x1a0($s1) /* 05A19C 8005959C 24018000 */ li $at, -32768 diff --git a/asm/non_matchings/racer/func_8005A424.s b/asm/non_matchings/racer/func_8005A424.s index fa2345e5..061d1ce3 100644 --- a/asm/non_matchings/racer/func_8005A424.s +++ b/asm/non_matchings/racer/func_8005A424.s @@ -9,7 +9,7 @@ glabel func_8005A424 /* 05B040 8005A440 C4EE0008 */ lwc1 $f14, 8($a3) /* 05B044 8005A444 C4EC0000 */ lwc1 $f12, ($a3) /* 05B048 8005A448 AFA40020 */ sw $a0, 0x20($sp) -/* 05B04C 8005A44C 0C01C1D4 */ jal func_80070750 +/* 05B04C 8005A44C 0C01C1D4 */ jal atan2f /* 05B050 8005A450 AFA7001C */ sw $a3, 0x1c($sp) /* 05B054 8005A454 8FA60020 */ lw $a2, 0x20($sp) /* 05B058 8005A458 3058FFFF */ andi $t8, $v0, 0xffff @@ -31,9 +31,9 @@ glabel func_8005A424 /* 05B094 8005A494 3401FFFF */ li $at, 65535 /* 05B098 8005A498 00611821 */ addu $v1, $v1, $at .L8005A49C: -/* 05B09C 8005A49C 3C058012 */ lui $a1, %hi(D_8011D534) # $a1, 0x8012 +/* 05B09C 8005A49C 3C058012 */ lui $a1, %hi(gCurrentStickX) # $a1, 0x8012 /* 05B0A0 8005A4A0 00031823 */ negu $v1, $v1 -/* 05B0A4 8005A4A4 24A5D534 */ addiu $a1, %lo(D_8011D534) # addiu $a1, $a1, -0x2acc +/* 05B0A4 8005A4A4 24A5D534 */ addiu $a1, %lo(gCurrentStickX) # addiu $a1, $a1, -0x2acc /* 05B0A8 8005A4A8 00035943 */ sra $t3, $v1, 5 /* 05B0AC 8005A4AC ACAB0000 */ sw $t3, ($a1) /* 05B0B0 8005A4B0 3C018012 */ lui $at, %hi(gActivePlayerButtonPress) # $at, 0x8012 @@ -42,8 +42,8 @@ glabel func_8005A424 /* 05B0BC 8005A4BC AC20D530 */ sw $zero, %lo(D_8011D530)($at) /* 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) +/* 05B0C8 8005A4C8 3C018012 */ lui $at, %hi(gCurrentStickY) # $at, 0x8012 +/* 05B0CC 8005A4CC AC20D538 */ sw $zero, %lo(gCurrentStickY)($at) /* 05B0D0 8005A4D0 C4C4002C */ lwc1 $f4, 0x2c($a2) /* 05B0D4 8005A4D4 3C01C010 */ li $at, 0xC0100000 # -2.250000 /* 05B0D8 8005A4D8 44813800 */ mtc1 $at, $f7 diff --git a/asm/non_matchings/racer/func_8005A6F0.s b/asm/non_matchings/racer/func_8005A6F0.s index fd0db90b..ba54dab7 100644 --- a/asm/non_matchings/racer/func_8005A6F0.s +++ b/asm/non_matchings/racer/func_8005A6F0.s @@ -414,7 +414,7 @@ glabel func_8005A6F0 /* 05B868 8005AC68 46040182 */ mul.s $f6, $f0, $f4 /* 05B86C 8005AC6C 3C014300 */ li $at, 0x43000000 # 128.000000 /* 05B870 8005AC70 44819000 */ mtc1 $at, $f18 -/* 05B874 8005AC74 3C018012 */ lui $at, %hi(D_8011D538) # $at, 0x8012 +/* 05B874 8005AC74 3C018012 */ lui $at, %hi(gCurrentStickY) # $at, 0x8012 /* 05B878 8005AC78 46123283 */ div.s $f10, $f6, $f18 /* 05B87C 8005AC7C 2418003C */ li $t8, 60 /* 05B880 8005AC80 460A0201 */ sub.s $f8, $f0, $f10 @@ -428,7 +428,7 @@ glabel func_8005A6F0 /* 05B8A0 8005ACA0 46002187 */ neg.s $f6, $f4 /* 05B8A4 8005ACA4 E5860000 */ swc1 $f6, ($t4) .L8005ACA8: -/* 05B8A8 8005ACA8 AC38D538 */ sw $t8, %lo(D_8011D538)($at) +/* 05B8A8 8005ACA8 AC38D538 */ sw $t8, %lo(gCurrentStickY)($at) /* 05B8AC 8005ACAC 920201FE */ lbu $v0, 0x1fe($s0) /* 05B8B0 8005ACB0 00000000 */ nop /* 05B8B4 8005ACB4 24010002 */ li $at, 2 @@ -591,11 +591,11 @@ glabel func_8005A6F0 /* 05BB08 8005AF08 00000000 */ nop /* 05BB0C 8005AF0C 19E0000E */ blez $t7, .L8005AF48 .L8005AF10: -/* 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 +/* 05BB10 8005AF10 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 +/* 05BB14 8005AF14 AC20D534 */ sw $zero, %lo(gCurrentStickX)($at) +/* 05BB18 8005AF18 3C018012 */ lui $at, %hi(gCurrentStickY) # $at, 0x8012 /* 05BB1C 8005AF1C 3C038012 */ lui $v1, %hi(gCurrentCarInput) # $v1, 0x8012 -/* 05BB20 8005AF20 AC20D538 */ sw $zero, %lo(D_8011D538)($at) +/* 05BB20 8005AF20 AC20D538 */ sw $zero, %lo(gCurrentStickY)($at) /* 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) @@ -711,8 +711,8 @@ glabel L8005B094 /* 05BCC4 8005B0C4 1000003A */ b .L8005B1B0 /* 05BCC8 8005B0C8 240B0001 */ li $t3, 1 glabel L8005B0CC -/* 05BCCC 8005B0CC 3C0D8012 */ lui $t5, %hi(D_8011D534) # $t5, 0x8012 -/* 05BCD0 8005B0D0 25ADD534 */ addiu $t5, %lo(D_8011D534) # addiu $t5, $t5, -0x2acc +/* 05BCCC 8005B0CC 3C0D8012 */ lui $t5, %hi(gCurrentStickX) # $t5, 0x8012 +/* 05BCD0 8005B0D0 25ADD534 */ addiu $t5, %lo(gCurrentStickX) # addiu $t5, $t5, -0x2acc /* 05BCD4 8005B0D4 8FA400A8 */ lw $a0, 0xa8($sp) /* 05BCD8 8005B0D8 8FA500AC */ lw $a1, 0xac($sp) /* 05BCDC 8005B0DC 8FA600A0 */ lw $a2, 0xa0($sp) diff --git a/asm/non_matchings/racer/func_8005B818.s b/asm/non_matchings/racer/func_8005B818.s index 4634d5e8..65dd3fe1 100644 --- a/asm/non_matchings/racer/func_8005B818.s +++ b/asm/non_matchings/racer/func_8005B818.s @@ -564,7 +564,7 @@ glabel func_8005B818 /* 05CC20 8005C020 E7AC009C */ swc1 $f12, 0x9c($sp) /* 05CC24 8005C024 46004283 */ div.s $f10, $f8, $f0 /* 05CC28 8005C028 E7AE0094 */ swc1 $f14, 0x94($sp) -/* 05CC2C 8005C02C 0C01C1D4 */ jal func_80070750 +/* 05CC2C 8005C02C 0C01C1D4 */ jal atan2f /* 05CC30 8005C030 E7AA0098 */ swc1 $f10, 0x98($sp) /* 05CC34 8005C034 24018000 */ li $at, -32768 /* 05CC38 8005C038 00415021 */ addu $t2, $v0, $at @@ -574,7 +574,7 @@ glabel func_8005B818 /* 05CC48 8005C048 A6790000 */ sh $t9, ($s3) /* 05CC4C 8005C04C C7AC0098 */ lwc1 $f12, 0x98($sp) /* 05CC50 8005C050 44817000 */ mtc1 $at, $f14 -/* 05CC54 8005C054 0C01C1D4 */ jal func_80070750 +/* 05CC54 8005C054 0C01C1D4 */ jal atan2f /* 05CC58 8005C058 00000000 */ nop /* 05CC5C 8005C05C A6620002 */ sh $v0, 2($s3) .L8005C060: diff --git a/asm/non_matchings/unknown_005740/func_800090C0.s b/asm/non_matchings/unknown_005740/func_800090C0.s index 23b18851..9b5b6002 100644 --- a/asm/non_matchings/unknown_005740/func_800090C0.s +++ b/asm/non_matchings/unknown_005740/func_800090C0.s @@ -11,7 +11,7 @@ glabel func_800090C0 /* 009CE4 800090E4 46128300 */ add.s $f12, $f16, $f18 /* 009CE8 800090E8 C7AE002C */ lwc1 $f14, 0x2c($sp) /* 009CEC 800090EC C7AC0028 */ lwc1 $f12, 0x28($sp) -/* 009CF0 800090F0 0C01C1D4 */ jal func_80070750 +/* 009CF0 800090F0 0C01C1D4 */ jal atan2f /* 009CF4 800090F4 E7A0001C */ swc1 $f0, 0x1c($sp) /* 009CF8 800090F8 8FA60030 */ lw $a2, 0x30($sp) /* 009CFC 800090FC 340EFFFF */ li $t6, 65535 diff --git a/asm/non_matchings/unknown_032760/func_8003EC14.s b/asm/non_matchings/unknown_032760/func_8003EC14.s index 14bf42b5..b909afe3 100644 --- a/asm/non_matchings/unknown_032760/func_8003EC14.s +++ b/asm/non_matchings/unknown_032760/func_8003EC14.s @@ -66,7 +66,7 @@ glabel func_8003EC14 /* 03F90C 8003ED0C E6120010 */ swc1 $f18, 0x10($s0) /* 03F910 8003ED10 C7AC002C */ lwc1 $f12, 0x2c($sp) /* 03F914 8003ED14 AFA70038 */ sw $a3, 0x38($sp) -/* 03F918 8003ED18 0C01C1D4 */ jal func_80070750 +/* 03F918 8003ED18 0C01C1D4 */ jal atan2f /* 03F91C 8003ED1C AFA50034 */ sw $a1, 0x34($sp) /* 03F920 8003ED20 8FA70038 */ lw $a3, 0x38($sp) /* 03F924 8003ED24 24018000 */ li $at, -32768 @@ -104,7 +104,7 @@ glabel func_8003EC14 /* 03F994 8003ED94 C7AC0028 */ lwc1 $f12, 0x28($sp) /* 03F998 8003ED98 C7AE0030 */ lwc1 $f14, 0x30($sp) /* 03F99C 8003ED9C AFA60020 */ sw $a2, 0x20($sp) -/* 03F9A0 8003EDA0 0C01C1D4 */ jal func_80070750 +/* 03F9A0 8003EDA0 0C01C1D4 */ jal atan2f /* 03F9A4 8003EDA4 AFA70038 */ sw $a3, 0x38($sp) /* 03F9A8 8003EDA8 8FA70038 */ lw $a3, 0x38($sp) /* 03F9AC 8003EDAC 8FA60020 */ lw $a2, 0x20($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003EDD8.s b/asm/non_matchings/unknown_032760/func_8003EDD8.s index 24efb196..fcc681f9 100644 --- a/asm/non_matchings/unknown_032760/func_8003EDD8.s +++ b/asm/non_matchings/unknown_032760/func_8003EDD8.s @@ -93,7 +93,7 @@ glabel func_8003EDD8 /* 03FB2C 8003EF2C 3C0143FA */ li $at, 0x43FA0000 # 500.000000 /* 03FB30 8003EF30 44817000 */ mtc1 $at, $f14 /* 03FB34 8003EF34 C7AC0064 */ lwc1 $f12, 0x64($sp) -/* 03FB38 8003EF38 0C01C1D4 */ jal func_80070750 +/* 03FB38 8003EF38 0C01C1D4 */ jal atan2f /* 03FB3C 8003EF3C AFA20058 */ sw $v0, 0x58($sp) /* 03FB40 8003EF40 8FA80074 */ lw $t0, 0x74($sp) /* 03FB44 8003EF44 304FFFFF */ andi $t7, $v0, 0xffff @@ -111,7 +111,7 @@ glabel func_8003EDD8 .L8003EF6C: /* 03FB6C 8003EF6C C7AC0068 */ lwc1 $f12, 0x68($sp) /* 03FB70 8003EF70 C7AE0060 */ lwc1 $f14, 0x60($sp) -/* 03FB74 8003EF74 0C01C1D4 */ jal func_80070750 +/* 03FB74 8003EF74 0C01C1D4 */ jal atan2f /* 03FB78 8003EF78 AFA80074 */ sw $t0, 0x74($sp) /* 03FB7C 8003EF7C 86050000 */ lh $a1, ($s0) /* 03FB80 8003EF80 24018000 */ li $at, -32768 @@ -179,7 +179,7 @@ glabel func_8003EDD8 .L8003F060: /* 03FC60 8003F060 C7AC0064 */ lwc1 $f12, 0x64($sp) /* 03FC64 8003F064 C7AE006C */ lwc1 $f14, 0x6c($sp) -/* 03FC68 8003F068 0C01C1D4 */ jal func_80070750 +/* 03FC68 8003F068 0C01C1D4 */ jal atan2f /* 03FC6C 8003F06C AFA60054 */ sw $a2, 0x54($sp) /* 03FC70 8003F070 8FA60054 */ lw $a2, 0x54($sp) /* 03FC74 8003F074 A6020002 */ sh $v0, 2($s0) diff --git a/asm/non_matchings/unknown_032760/obj_loop_butterfly.s b/asm/non_matchings/unknown_032760/obj_loop_butterfly.s index 86fc3b4a..08fc0594 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_butterfly.s +++ b/asm/non_matchings/unknown_032760/obj_loop_butterfly.s @@ -188,7 +188,7 @@ glabel L80040E54 /* 041AC8 80040EC8 E7AC0094 */ swc1 $f12, 0x94($sp) /* 041ACC 80040ECC E7AE008C */ swc1 $f14, 0x8c($sp) /* 041AD0 80040ED0 AFA90038 */ sw $t1, 0x38($sp) -/* 041AD4 80040ED4 0C01C1D4 */ jal func_80070750 +/* 041AD4 80040ED4 0C01C1D4 */ jal atan2f /* 041AD8 80040ED8 AFA8003C */ sw $t0, 0x3c($sp) /* 041ADC 80040EDC 86040000 */ lh $a0, ($s0) /* 041AE0 80040EE0 8FA8003C */ lw $t0, 0x3c($sp) @@ -517,7 +517,7 @@ glabel L800411E4 /* 041FAC 800413AC E7AC0094 */ swc1 $f12, 0x94($sp) /* 041FB0 800413B0 E7AE008C */ swc1 $f14, 0x8c($sp) /* 041FB4 800413B4 A7AA0072 */ sh $t2, 0x72($sp) -/* 041FB8 800413B8 0C01C1D4 */ jal func_80070750 +/* 041FB8 800413B8 0C01C1D4 */ jal atan2f /* 041FBC 800413BC AFA8003C */ sw $t0, 0x3c($sp) /* 041FC0 800413C0 86040000 */ lh $a0, ($s0) /* 041FC4 800413C4 8FA8003C */ lw $t0, 0x3c($sp) diff --git a/asm/non_matchings/unknown_032760/obj_loop_fireball_octoweapon.s b/asm/non_matchings/unknown_032760/obj_loop_fireball_octoweapon.s index e6cc1576..1176a302 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_fireball_octoweapon.s +++ b/asm/non_matchings/unknown_032760/obj_loop_fireball_octoweapon.s @@ -196,7 +196,7 @@ glabel obj_loop_fireball_octoweapon /* 034E24 80034224 00000000 */ nop /* 034E28 80034228 C60C001C */ lwc1 $f12, 0x1c($s0) /* 034E2C 8003422C C60E0024 */ lwc1 $f14, 0x24($s0) -/* 034E30 80034230 0C01C1D4 */ jal func_80070750 +/* 034E30 80034230 0C01C1D4 */ jal atan2f /* 034E34 80034234 00000000 */ nop /* 034E38 80034238 C7A2007C */ lwc1 $f2, 0x7c($sp) /* 034E3C 8003423C A6020000 */ sh $v0, ($s0) diff --git a/asm/non_matchings/unknown_032760/obj_loop_fish.s b/asm/non_matchings/unknown_032760/obj_loop_fish.s index 5b2a52c0..0508e3cd 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_fish.s +++ b/asm/non_matchings/unknown_032760/obj_loop_fish.s @@ -211,12 +211,12 @@ glabel obj_loop_fish /* 037FF0 800373F0 A6080106 */ sh $t0, 0x106($s0) /* 037FF4 800373F4 C7AE0058 */ lwc1 $f14, 0x58($sp) /* 037FF8 800373F8 C7AC0060 */ lwc1 $f12, 0x60($sp) -/* 037FFC 800373FC 0C01C1D4 */ jal func_80070750 +/* 037FFC 800373FC 0C01C1D4 */ jal atan2f /* 038000 80037400 00000000 */ nop /* 038004 80037404 A6220000 */ sh $v0, ($s1) /* 038008 80037408 C7AC005C */ lwc1 $f12, 0x5c($sp) /* 03800C 8003740C C7AE0054 */ lwc1 $f14, 0x54($sp) -/* 038010 80037410 0C01C1D4 */ jal func_80070750 +/* 038010 80037410 0C01C1D4 */ jal atan2f /* 038014 80037414 46006307 */ neg.s $f12, $f12 /* 038018 80037418 86230002 */ lh $v1, 2($s1) /* 03801C 8003741C 8FAE0074 */ lw $t6, 0x74($sp) diff --git a/asm/non_matchings/unknown_032760/obj_loop_frog.s b/asm/non_matchings/unknown_032760/obj_loop_frog.s index 2487f15a..6e604efa 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_frog.s +++ b/asm/non_matchings/unknown_032760/obj_loop_frog.s @@ -141,7 +141,7 @@ glabel L80042378 /* 0430CC 800424CC 460A4402 */ mul.s $f16, $f8, $f10 /* 0430D0 800424D0 E610001C */ swc1 $f16, 0x1c($s0) .L800424D4: -/* 0430D4 800424D4 0C01C1D4 */ jal func_80070750 +/* 0430D4 800424D4 0C01C1D4 */ jal atan2f /* 0430D8 800424D8 4600B387 */ neg.s $f14, $f22 /* 0430DC 800424DC 34018000 */ li $at, 32768 /* 0430E0 800424E0 0041C021 */ addu $t8, $v0, $at @@ -231,7 +231,7 @@ glabel L80042378 /* 043214 80042614 C6100000 */ lwc1 $f16, ($s0) /* 043218 80042618 C6120008 */ lwc1 $f18, 8($s0) /* 04321C 8004261C 46008301 */ sub.s $f12, $f16, $f0 -/* 043220 80042620 0C01C1D4 */ jal func_80070750 +/* 043220 80042620 0C01C1D4 */ jal atan2f /* 043224 80042624 46029381 */ sub.s $f14, $f18, $f2 /* 043228 80042628 A602001A */ sh $v0, 0x1a($s0) /* 04322C 8004262C C6220014 */ lwc1 $f2, 0x14($s1) diff --git a/asm/non_matchings/unknown_032760/obj_loop_lasergun.s b/asm/non_matchings/unknown_032760/obj_loop_lasergun.s index 201b65bd..0cd26c5f 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_lasergun.s +++ b/asm/non_matchings/unknown_032760/obj_loop_lasergun.s @@ -61,14 +61,14 @@ glabel obj_loop_lasergun /* 035288 80034688 4600A303 */ div.s $f12, $f20, $f0 /* 03528C 8003468C 00000000 */ nop /* 035290 80034690 4600B583 */ div.s $f22, $f22, $f0 -/* 035294 80034694 0C01C1D4 */ jal func_80070750 +/* 035294 80034694 0C01C1D4 */ jal atan2f /* 035298 80034698 46007383 */ div.s $f14, $f14, $f0 /* 03529C 8003469C 24018000 */ li $at, -32768 /* 0352A0 800346A0 00415021 */ addu $t2, $v0, $at /* 0352A4 800346A4 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 0352A8 800346A8 44817000 */ mtc1 $at, $f14 /* 0352AC 800346AC A60A0000 */ sh $t2, ($s0) -/* 0352B0 800346B0 0C01C1D4 */ jal func_80070750 +/* 0352B0 800346B0 0C01C1D4 */ jal atan2f /* 0352B4 800346B4 4600B306 */ mov.s $f12, $f22 /* 0352B8 800346B8 A6020002 */ sh $v0, 2($s0) .L800346BC: diff --git a/asm/non_matchings/unknown_032760/obj_loop_parkwarden.s b/asm/non_matchings/unknown_032760/obj_loop_parkwarden.s index 0c14f44f..0cd7623c 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_parkwarden.s +++ b/asm/non_matchings/unknown_032760/obj_loop_parkwarden.s @@ -143,7 +143,7 @@ glabel obj_loop_parkwarden /* 03A0F8 800394F8 C5CA0014 */ lwc1 $f10, 0x14($t6) /* 03A0FC 800394FC AFA60084 */ sw $a2, 0x84($sp) /* 03A100 80039500 46122301 */ sub.s $f12, $f4, $f18 -/* 03A104 80039504 0C01C1D4 */ jal func_80070750 +/* 03A104 80039504 0C01C1D4 */ jal atan2f /* 03A108 80039508 46065381 */ sub.s $f14, $f10, $f6 /* 03A10C 8003950C 8FAF0090 */ lw $t7, 0x90($sp) /* 03A110 80039510 34018001 */ li $at, 32769 @@ -211,7 +211,7 @@ glabel obj_loop_parkwarden /* 03A1F0 800395F0 C448000C */ lwc1 $f8, 0xc($v0) /* 03A1F4 800395F4 C4440014 */ lwc1 $f4, 0x14($v0) /* 03A1F8 800395F8 46104301 */ sub.s $f12, $f8, $f16 -/* 03A1FC 800395FC 0C01C1D4 */ jal func_80070750 +/* 03A1FC 800395FC 0C01C1D4 */ jal atan2f /* 03A200 80039600 46122381 */ sub.s $f14, $f4, $f18 /* 03A204 80039604 8FAC0090 */ lw $t4, 0x90($sp) /* 03A208 80039608 34018001 */ li $at, 32769 @@ -365,7 +365,7 @@ glabel L800397BC /* 03A41C 8003981C 240A0002 */ li $t2, 2 /* 03A420 80039820 00000000 */ nop /* 03A424 80039824 46028303 */ div.s $f12, $f16, $f2 -/* 03A428 80039828 0C01C1D4 */ jal func_80070750 +/* 03A428 80039828 0C01C1D4 */ jal atan2f /* 03A42C 8003982C 46022383 */ div.s $f14, $f4, $f2 /* 03A430 80039830 86050000 */ lh $a1, ($s0) /* 03A434 80039834 34018000 */ li $at, 32768 @@ -1348,7 +1348,7 @@ glabel L8003A5AC /* 03B26C 8003A66C C7AA00A0 */ lwc1 $f10, 0xa0($sp) /* 03B270 8003A670 C7B000A8 */ lwc1 $f16, 0xa8($sp) /* 03B274 8003A674 46085383 */ div.s $f14, $f10, $f8 -/* 03B278 8003A678 0C01C1D4 */ jal func_80070750 +/* 03B278 8003A678 0C01C1D4 */ jal atan2f /* 03B27C 8003A67C 46088303 */ div.s $f12, $f16, $f8 /* 03B280 8003A680 244D4000 */ addiu $t5, $v0, 0x4000 /* 03B284 8003A684 A62D001E */ sh $t5, 0x1e($s1) diff --git a/asm/non_matchings/unknown_032760/obj_loop_stopwatchman.s b/asm/non_matchings/unknown_032760/obj_loop_stopwatchman.s index 32e66350..9260271a 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_stopwatchman.s +++ b/asm/non_matchings/unknown_032760/obj_loop_stopwatchman.s @@ -99,7 +99,7 @@ glabel obj_loop_stopwatchman /* 036F30 80036330 C448000C */ lwc1 $f8, 0xc($v0) /* 036F34 80036334 C4460014 */ lwc1 $f6, 0x14($v0) /* 036F38 80036338 460A4301 */ sub.s $f12, $f8, $f10 -/* 036F3C 8003633C 0C01C1D4 */ jal func_80070750 +/* 036F3C 8003633C 0C01C1D4 */ jal atan2f /* 036F40 80036340 46043381 */ sub.s $f14, $f6, $f4 /* 036F44 80036344 8FB90064 */ lw $t9, 0x64($sp) /* 036F48 80036348 34018001 */ li $at, 32769 @@ -273,7 +273,7 @@ glabel obj_loop_stopwatchman /* 0371B8 800365B8 240D0002 */ li $t5, 2 /* 0371BC 800365BC C7A60074 */ lwc1 $f6, 0x74($sp) /* 0371C0 800365C0 460A4303 */ div.s $f12, $f8, $f10 -/* 0371C4 800365C4 0C01C1D4 */ jal func_80070750 +/* 0371C4 800365C4 0C01C1D4 */ jal atan2f /* 0371C8 800365C8 460A3383 */ div.s $f14, $f6, $f10 /* 0371CC 800365CC 86040000 */ lh $a0, ($s0) /* 0371D0 800365D0 34018000 */ li $at, 32768 diff --git a/asm/non_matchings/unknown_05CEF0/func_8005C364.s b/asm/non_matchings/unknown_05CEF0/func_8005C364.s index bc5ca848..a9d25337 100644 --- a/asm/non_matchings/unknown_05CEF0/func_8005C364.s +++ b/asm/non_matchings/unknown_05CEF0/func_8005C364.s @@ -372,7 +372,7 @@ glabel func_8005C364 /* 05D4B4 8005C8B4 4500001E */ bc1f .L8005C930 /* 05D4B8 8005C8B8 00000000 */ nop /* 05D4BC 8005C8BC 4600A306 */ mov.s $f12, $f20 -/* 05D4C0 8005C8C0 0C01C1D4 */ jal func_80070750 +/* 05D4C0 8005C8C0 0C01C1D4 */ jal atan2f /* 05D4C4 8005C8C4 AFA50038 */ sw $a1, 0x38($sp) /* 05D4C8 8005C8C8 86380000 */ lh $t8, ($s1) /* 05D4CC 8005C8CC 34018000 */ li $at, 32768 diff --git a/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s b/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s index 974cc6f6..44954071 100644 --- a/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s +++ b/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s @@ -419,7 +419,7 @@ glabel func_8005D0D0 /* 05E2CC 8005D6CC C7AE0050 */ lwc1 $f14, 0x50($sp) /* 05E2D0 8005D6D0 4500001B */ bc1f .L8005D740 /* 05E2D4 8005D6D4 00000000 */ nop -/* 05E2D8 8005D6D8 0C01C1D4 */ jal func_80070750 +/* 05E2D8 8005D6D8 0C01C1D4 */ jal atan2f /* 05E2DC 8005D6DC 4600A306 */ mov.s $f12, $f20 /* 05E2E0 8005D6E0 862B0000 */ lh $t3, ($s1) /* 05E2E4 8005D6E4 34018000 */ li $at, 32768 diff --git a/asm/non_matchings/unknown_05DCD0/func_8005D820.s b/asm/non_matchings/unknown_05DCD0/func_8005D820.s index 5e0dc154..c796633a 100644 --- a/asm/non_matchings/unknown_05DCD0/func_8005D820.s +++ b/asm/non_matchings/unknown_05DCD0/func_8005D820.s @@ -621,7 +621,7 @@ glabel L8005DCE8 /* 05ECC8 8005E0C8 C7AE0050 */ lwc1 $f14, 0x50($sp) /* 05ECCC 8005E0CC 4500001B */ bc1f .L8005E13C /* 05ECD0 8005E0D0 00000000 */ nop -/* 05ECD4 8005E0D4 0C01C1D4 */ jal func_80070750 +/* 05ECD4 8005E0D4 0C01C1D4 */ jal atan2f /* 05ECD8 8005E0D8 4600A306 */ mov.s $f12, $f20 /* 05ECDC 8005E0DC 862D0000 */ lh $t5, ($s1) /* 05ECE0 8005E0E0 34018000 */ li $at, 32768 diff --git a/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s b/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s index 3d37abc0..5a632d97 100644 --- a/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s +++ b/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s @@ -315,7 +315,7 @@ glabel func_8005E4C0 /* 05F548 8005E948 4500001E */ bc1f .L8005E9C4 /* 05F54C 8005E94C 00000000 */ nop /* 05F550 8005E950 4600A306 */ mov.s $f12, $f20 -/* 05F554 8005E954 0C01C1D4 */ jal func_80070750 +/* 05F554 8005E954 0C01C1D4 */ jal atan2f /* 05F558 8005E958 AFA50038 */ sw $a1, 0x38($sp) /* 05F55C 8005E95C 862E0000 */ lh $t6, ($s1) /* 05F560 8005E960 34018000 */ li $at, 32768 diff --git a/asm/unknown_070110.s b/asm/unknown_070110.s index f0aac61d..76752920 100644 --- a/asm/unknown_070110.s +++ b/asm/unknown_070110.s @@ -33,7 +33,7 @@ .include "asm/unknown_070110/func_800705F8.s" .include "asm/unknown_070110/func_80070638.s" .include "asm/unknown_070110/func_8007066C.s" -.include "asm/unknown_070110/func_80070750.s" +.include "asm/unknown_070110/atan2f.s" .include "asm/unknown_070110/func_800707C4.s" .include "asm/unknown_070110/func_800707F8.s" .include "asm/unknown_070110/func_8007082C.s" diff --git a/asm/unknown_070110/func_80070750.s b/asm/unknown_070110/atan2f.s similarity index 98% rename from asm/unknown_070110/func_80070750.s rename to asm/unknown_070110/atan2f.s index 9ffca0af..dccdcf58 100644 --- a/asm/unknown_070110/func_80070750.s +++ b/asm/unknown_070110/atan2f.s @@ -1,4 +1,4 @@ -glabel func_80070750 +glabel atan2f /* 071350 80070750 3C01437F */ li $at, 0x437F0000 # 255.000000 /* 071354 80070754 44810000 */ mtc1 $at, $f0 /* 071358 80070758 00000000 */ nop diff --git a/include/math_util.h b/include/math_util.h new file mode 100644 index 00000000..1b693a45 --- /dev/null +++ b/include/math_util.h @@ -0,0 +1,9 @@ +#ifndef MATH_UTIL_H +#define MATH_UTIL_H + +#include "types.h" +#include "structs.h" + +extern s16 atan2f(f32 y, f32 x); + +#endif // MATH_UTIL_H diff --git a/src/object_functions.c b/src/object_functions.c index fbb3635f..c7a2401b 100644 --- a/src/object_functions.c +++ b/src/object_functions.c @@ -211,7 +211,7 @@ typedef struct Object80033F60_4C_64 { s32 func_80011560(void); void func_80011570(Object*, f32, f32, f32); void func_8003FC44(f32, f32, f32, s32, s32, f32, s32); -s16 func_80070750(f32, f32); +s16 atan2f(f32, f32); s32 func_8002AD08(f32, f32**, s32); void func_80001D04(u16, s32 *); void func_8000488C(s32); @@ -268,7 +268,7 @@ void obj_loop_fireball_octoweapon(Object *obj, s32 speed) { } obj->segment.z_velocity += (phi_f2 - obj->segment.z_velocity) * 0.125 * sp7C; if (sqrtf((obj->segment.x_velocity * obj->segment.x_velocity) + (obj->segment.z_velocity * obj->segment.z_velocity)) > 0.5) { - obj->segment.trans.y_rotation = func_80070750(obj->segment.x_velocity, obj->segment.z_velocity); + obj->segment.trans.y_rotation = atan2f(obj->segment.x_velocity, obj->segment.z_velocity); obj->segment.trans.x_rotation -= speed << 9; } func_80011570(obj, obj->segment.x_velocity * sp7C, obj->segment.y_velocity * sp7C, obj->segment.z_velocity * sp7C); diff --git a/src/racer.c b/src/racer.c index bcc407a1..d804d14a 100644 --- a/src/racer.c +++ b/src/racer.c @@ -17,6 +17,7 @@ #include "object_functions.h" #include "game.h" #include "printf.h" +#include "math_util.h" #define MAX_NUMBER_OF_GHOST_NODES 360 @@ -142,8 +143,8 @@ ObjectTransform D_8011D510; s32 gCurrentCarInput; // Related to input of the car. s32 gActivePlayerButtonPress; s32 D_8011D530; -s32 D_8011D534; -s32 D_8011D538; +s32 gCurrentStickX; +s32 gCurrentStickY; s32 D_8011D53C; s32 D_8011D540; f32 D_8011D544; @@ -332,27 +333,29 @@ void func_80044170(Object *arg0, Object_Racer *arg1, s32 arg2) { } } + // Kick it into reverse. if (arg1->unk214 != 0) { - D_8011D534 *= -1; + gCurrentStickX *= -1; gCurrentCarInput &= ~A_BUTTON; - D_8011D538 = -50; + gCurrentStickY = -50; gCurrentCarInput |= B_BUTTON; } - if (D_8011D534 > 75) { - D_8011D534 = 75; + // Cap stick inputs. + if (gCurrentStickX > 75) { + gCurrentStickX = 75; } - if (D_8011D534 < -75) { - D_8011D534 = -75; + if (gCurrentStickX < -75) { + gCurrentStickX = -75; } - if (D_8011D538 > 75) { - D_8011D538 = 75; + if (gCurrentStickY > 75) { + gCurrentStickY = 75; } - if (D_8011D538 < -75) { - D_8011D538 = -75; + if (gCurrentStickY < -75) { + gCurrentStickY = -75; } } @@ -753,8 +756,6 @@ void func_8005234C(unk8005234C *arg0) { } } -extern s16 func_80070750(f32 y, f32 x); - s32 func_80052388(Object *obj1, Object_Racer *arg1, Object *obj2, f32 distance) { s32 rotation; f32 diffX; @@ -764,7 +765,7 @@ s32 func_80052388(Object *obj1, Object_Racer *arg1, Object *obj2, f32 distance) diffX = obj2->segment.trans.x_position - obj1->segment.trans.x_position; diffZ = obj2->segment.trans.z_position - obj1->segment.trans.z_position; if ((diffX * diffX) + (diffZ * diffZ) < distance) { - rotation = (func_80070750(diffX, diffZ) - (obj1->segment.trans.y_rotation & 0xFFFF)) + 0x8000; + rotation = (atan2f(diffX, diffZ) - (obj1->segment.trans.y_rotation & 0xFFFF)) + 0x8000; if (rotation > 0x8000) { rotation += 0xFFFF0001; } @@ -782,7 +783,7 @@ s32 func_80052388(Object *obj1, Object_Racer *arg1, Object *obj2, f32 distance) arg1->unk16C = 0; } arg1 = (struct Object_Racer *) obj2->unk64; - rotation = func_80070750(diffX, diffZ) - (obj1->segment.trans.y_rotation & 0xFFFF); + rotation = atan2f(diffX, diffZ) - (obj1->segment.trans.y_rotation & 0xFFFF); if (rotation > 0x8000) { rotation += 0xFFFF0001; } @@ -1033,7 +1034,7 @@ GLOBAL_ASM("asm/non_matchings/racer/func_800576E0.s") void func_800579B0(unk800579B0 *arg0, UNUSED s32 arg1, f32 arg2) { s32 temp, temp2; - temp = D_8011D534 - arg0->unk1E1; + temp = gCurrentStickX - arg0->unk1E1; temp2 = (s32)((f64)((f32)temp * arg2) * 0.125); if (temp != 0 && temp2 == 0) { diff --git a/src/racer.h b/src/racer.h index 707aae1a..c3ff0ace 100644 --- a/src/racer.h +++ b/src/racer.h @@ -126,7 +126,7 @@ extern s16 D_800DCDD4[4]; extern ObjectTransform D_8011D510; -extern s32 D_8011D534; +extern s32 gCurrentStickX; s32 get_random_number_from_range(s32, s32); //? void func_8006FC30(Matrix, ObjectTransform *); // asm func