From c756b700e2770fcfa4dbabf75f4704dd286162c4 Mon Sep 17 00:00:00 2001 From: Fazana <52551480+FazanaJ@users.noreply.github.com> Date: Wed, 4 May 2022 14:47:26 +0100 Subject: [PATCH] rename arctan2 again --- asm/non_matchings/camera/func_80068514.s | 10 +++++----- asm/non_matchings/objects/func_8001C6C4.s | 4 ++-- asm/non_matchings/objects/func_8001F460.s | 8 ++++---- asm/non_matchings/objects/func_80021600.s | 8 ++++---- asm/non_matchings/objects/func_800230D0.s | 2 +- asm/non_matchings/racer/func_8004447C.s | 6 +++--- asm/non_matchings/racer/func_800452A0.s | 4 ++-- asm/non_matchings/racer/func_80045C48.s | 8 ++++---- asm/non_matchings/racer/func_80046524.s | 2 +- asm/non_matchings/racer/func_800494E0.s | 4 ++-- asm/non_matchings/racer/func_80054FD0.s | 8 ++++---- asm/non_matchings/racer/func_80055A84.s | 4 ++-- asm/non_matchings/racer/func_80059208.s | 2 +- asm/non_matchings/racer/func_8005A424.s | 2 +- asm/non_matchings/racer/func_8005B818.s | 4 ++-- asm/non_matchings/unknown_005740/func_800090C0.s | 2 +- asm/non_matchings/unknown_032760/func_8003EC14.s | 4 ++-- asm/non_matchings/unknown_032760/func_8003EDD8.s | 6 +++--- asm/non_matchings/unknown_032760/obj_loop_butterfly.s | 4 ++-- .../unknown_032760/obj_loop_fireball_octoweapon.s | 2 +- asm/non_matchings/unknown_032760/obj_loop_fish.s | 4 ++-- asm/non_matchings/unknown_032760/obj_loop_frog.s | 4 ++-- asm/non_matchings/unknown_032760/obj_loop_lasergun.s | 4 ++-- asm/non_matchings/unknown_032760/obj_loop_parkwarden.s | 8 ++++---- .../unknown_032760/obj_loop_stopwatchman.s | 4 ++-- asm/non_matchings/unknown_05CEF0/func_8005C364.s | 2 +- asm/non_matchings/unknown_05DCD0/func_8005D0D0.s | 2 +- asm/non_matchings/unknown_05DCD0/func_8005D820.s | 2 +- asm/non_matchings/unknown_05F0C0/func_8005E4C0.s | 2 +- asm/unknown_070110.s | 2 +- asm/unknown_070110/{atan2f.s => arctan2_f.s} | 2 +- include/math_util.h | 2 +- src/object_functions.c | 4 ++-- src/racer.c | 4 ++-- 34 files changed, 70 insertions(+), 70 deletions(-) rename asm/unknown_070110/{atan2f.s => arctan2_f.s} (98%) diff --git a/asm/non_matchings/camera/func_80068514.s b/asm/non_matchings/camera/func_80068514.s index 9be1d891..aa429b32 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 atan2f +/* 0691F8 800685F8 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 069208 80068608 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 069258 80068658 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 06932C 8006872C 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 069344 80068744 0C01C1D4 */ jal arctan2_f /* 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 cc1bb885..4348d98a 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 atan2f +/* 01D644 8001CA44 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 01D6CC 8001CACC 0C01C1D4 */ jal arctan2_f /* 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 09a1367a..286a1d28 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 atan2f +/* 0214F0 800208F0 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 021510 80020910 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 021C54 80021054 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 021C6C 8002106C 0C01C1D4 */ jal arctan2_f /* 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 5fafc5b6..0ae8bd1b 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 atan2f +/* 022B68 80021F68 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 022B8C 80021F8C 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 022C9C 8002209C 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 022CBC 800220BC 0C01C1D4 */ jal arctan2_f /* 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 272901b6..aedc8cb3 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 atan2f +/* 023E8C 8002328C 0C01C1D4 */ jal arctan2_f /* 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_8004447C.s b/asm/non_matchings/racer/func_8004447C.s index 104fd685..31c06816 100644 --- a/asm/non_matchings/racer/func_8004447C.s +++ b/asm/non_matchings/racer/func_8004447C.s @@ -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 atan2f +/* 0451AC 800445AC 0C01C1D4 */ jal arctan2_f /* 0451B0 800445B0 AFA60074 */ sw $a2, 0x74($sp) /* 0451B4 800445B4 24018000 */ li $at, -32768 /* 0451B8 800445B8 00417821 */ addu $t7, $v0, $at @@ -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 atan2f +/* 04588C 80044C8C 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 045C68 80045068 0C01C1D4 */ jal arctan2_f /* 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 e0ee62f6..b7f9dc0f 100644 --- a/asm/non_matchings/racer/func_800452A0.s +++ b/asm/non_matchings/racer/func_800452A0.s @@ -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 atan2f +/* 046574 80045974 0C01C1D4 */ jal arctan2_f /* 046578 80045978 E7A200A8 */ swc1 $f2, 0xa8($sp) /* 04657C 8004597C 24018000 */ li $at, -32768 /* 046580 80045980 0041C821 */ addu $t9, $v0, $at @@ -535,7 +535,7 @@ glabel L800456DC /* 0465DC 800459DC 0C0326B4 */ jal sqrtf /* 0465E0 800459E0 4608C300 */ add.s $f12, $f24, $f8 /* 0465E4 800459E4 4600B306 */ mov.s $f12, $f22 -/* 0465E8 800459E8 0C01C1D4 */ jal atan2f +/* 0465E8 800459E8 0C01C1D4 */ jal arctan2_f /* 0465EC 800459EC 46000386 */ mov.s $f14, $f0 /* 0465F0 800459F0 3044FFFF */ andi $a0, $v0, 0xffff /* 0465F4 800459F4 C7A200A8 */ lwc1 $f2, 0xa8($sp) diff --git a/asm/non_matchings/racer/func_80045C48.s b/asm/non_matchings/racer/func_80045C48.s index 406d48e8..4b67219d 100644 --- a/asm/non_matchings/racer/func_80045C48.s +++ b/asm/non_matchings/racer/func_80045C48.s @@ -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 atan2f +/* 046BD0 80045FD0 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 046BF0 80045FF0 0C01C1D4 */ jal arctan2_f /* 046BF4 80045FF4 01608025 */ move $s0, $t3 /* 046BF8 80045FF8 862C01BE */ lh $t4, 0x1be($s1) /* 046BFC 80045FFC 862D01C0 */ lh $t5, 0x1c0($s1) @@ -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 atan2f +/* 046F44 80046344 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 046F64 80046364 0C01C1D4 */ jal arctan2_f /* 046F68 80046368 01A08025 */ move $s0, $t5 /* 046F6C 8004636C 862501A0 */ lh $a1, 0x1a0($s1) /* 046F70 80046370 34018001 */ li $at, 32769 diff --git a/asm/non_matchings/racer/func_80046524.s b/asm/non_matchings/racer/func_80046524.s index dc03593a..d1c68e78 100644 --- a/asm/non_matchings/racer/func_80046524.s +++ b/asm/non_matchings/racer/func_80046524.s @@ -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 atan2f +/* 048374 80047774 0C01C1D4 */ jal arctan2_f /* 048378 80047778 E7A200D0 */ swc1 $f2, 0xd0($sp) /* 04837C 8004777C 34058000 */ li $a1, 32768 /* 048380 80047780 C7A200D0 */ lwc1 $f2, 0xd0($sp) diff --git a/asm/non_matchings/racer/func_800494E0.s b/asm/non_matchings/racer/func_800494E0.s index a3486f5c..8dca7559 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 atan2f +/* 04A230 80049630 0C01C1D4 */ jal arctan2_f /* 04A234 80049634 00000000 */ nop /* 04A238 80049638 00026400 */ sll $t4, $v0, 0x10 /* 04A23C 8004963C 000C6C03 */ sra $t5, $t4, 0x10 @@ -135,7 +135,7 @@ 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 atan2f +/* 04A2D8 800496D8 0C01C1D4 */ jal arctan2_f /* 04A2DC 800496DC E7A20044 */ swc1 $f2, 0x44($sp) /* 04A2E0 800496E0 0002CC00 */ sll $t9, $v0, 0x10 /* 04A2E4 800496E4 0019C403 */ sra $t8, $t9, 0x10 diff --git a/asm/non_matchings/racer/func_80054FD0.s b/asm/non_matchings/racer/func_80054FD0.s index 17cc5016..6ed49ce0 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 atan2f +/* 055FA0 800553A0 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 056480 80055880 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 05657C 8005597C 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 0565C0 800559C0 0C01C1D4 */ jal arctan2_f /* 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 fe887759..74946648 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 atan2f +/* 056974 80055D74 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 0569A8 80055DA8 0C01C1D4 */ jal arctan2_f /* 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 2401270f..35e528e4 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 atan2f +/* 05A190 80059590 0C01C1D4 */ jal arctan2_f /* 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 061d1ce3..b820eb6b 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 atan2f +/* 05B04C 8005A44C 0C01C1D4 */ jal arctan2_f /* 05B050 8005A450 AFA7001C */ sw $a3, 0x1c($sp) /* 05B054 8005A454 8FA60020 */ lw $a2, 0x20($sp) /* 05B058 8005A458 3058FFFF */ andi $t8, $v0, 0xffff diff --git a/asm/non_matchings/racer/func_8005B818.s b/asm/non_matchings/racer/func_8005B818.s index 65dd3fe1..0d149b6a 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 atan2f +/* 05CC2C 8005C02C 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 05CC54 8005C054 0C01C1D4 */ jal arctan2_f /* 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 9b5b6002..63a0e7a5 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 atan2f +/* 009CF0 800090F0 0C01C1D4 */ jal arctan2_f /* 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 b909afe3..a5b8a0d0 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 atan2f +/* 03F918 8003ED18 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 03F9A0 8003EDA0 0C01C1D4 */ jal arctan2_f /* 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 fcc681f9..ba6d8fee 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 atan2f +/* 03FB38 8003EF38 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 03FB74 8003EF74 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 03FC68 8003F068 0C01C1D4 */ jal arctan2_f /* 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 586a1e61..b05623a7 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 atan2f +/* 041AD4 80040ED4 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 041FB8 800413B8 0C01C1D4 */ jal arctan2_f /* 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 1176a302..c69c7917 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 atan2f +/* 034E30 80034230 0C01C1D4 */ jal arctan2_f /* 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 bb9de29e..709dd655 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 atan2f +/* 037FFC 800373FC 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 038010 80037410 0C01C1D4 */ jal arctan2_f /* 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 e33c944e..3cb78798 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 atan2f +/* 0430D4 800424D4 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 043220 80042620 0C01C1D4 */ jal arctan2_f /* 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 0cd26c5f..17f91987 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 atan2f +/* 035294 80034694 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 0352B0 800346B0 0C01C1D4 */ jal arctan2_f /* 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 a6add04c..f10f077e 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 atan2f +/* 03A104 80039504 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 03A1FC 800395FC 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 03A428 80039828 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 03B278 8003A678 0C01C1D4 */ jal arctan2_f /* 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 d9b5138d..68d63f73 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 atan2f +/* 036F3C 8003633C 0C01C1D4 */ jal arctan2_f /* 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 atan2f +/* 0371C4 800365C4 0C01C1D4 */ jal arctan2_f /* 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 a9d25337..8b04c94d 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 atan2f +/* 05D4C0 8005C8C0 0C01C1D4 */ jal arctan2_f /* 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 44954071..5996b5a7 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 atan2f +/* 05E2D8 8005D6D8 0C01C1D4 */ jal arctan2_f /* 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 c796633a..3036cd7e 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 atan2f +/* 05ECD4 8005E0D4 0C01C1D4 */ jal arctan2_f /* 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 5a632d97..6a9a4993 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 atan2f +/* 05F554 8005E954 0C01C1D4 */ jal arctan2_f /* 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 9bae15fb..546ce0ec 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/atan2f.s" +.include "asm/unknown_070110/arctan2_f.s" .include "asm/unknown_070110/cosine_s.s" .include "asm/unknown_070110/sine_s.s" .include "asm/unknown_070110/func_8007082C.s" diff --git a/asm/unknown_070110/atan2f.s b/asm/unknown_070110/arctan2_f.s similarity index 98% rename from asm/unknown_070110/atan2f.s rename to asm/unknown_070110/arctan2_f.s index dccdcf58..5cec5f5e 100644 --- a/asm/unknown_070110/atan2f.s +++ b/asm/unknown_070110/arctan2_f.s @@ -1,4 +1,4 @@ -glabel atan2f +glabel arctan2_f /* 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 index 3ec99cc9..ece8f218 100644 --- a/include/math_util.h +++ b/include/math_util.h @@ -4,7 +4,7 @@ #include "types.h" #include "structs.h" -extern s16 atan2f(f32 y, f32 x); +extern s16 arctan2_f(f32 y, f32 x); extern f32 sine_s(s16 angle); extern f32 cosine_s(s16 angle); diff --git a/src/object_functions.c b/src/object_functions.c index 27c46444..97fbdd57 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 atan2f(f32, f32); +s16 arctan2_f(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 = atan2f(obj->segment.x_velocity, obj->segment.z_velocity); + obj->segment.trans.y_rotation = arctan2_f(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 27091b1b..e00387a9 100644 --- a/src/racer.c +++ b/src/racer.c @@ -818,7 +818,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 = (atan2f(diffX, diffZ) - (obj1->segment.trans.y_rotation & 0xFFFF)) + 0x8000; + rotation = (arctan2_f(diffX, diffZ) - (obj1->segment.trans.y_rotation & 0xFFFF)) + 0x8000; if (rotation > 0x8000) { rotation += 0xFFFF0001; } @@ -836,7 +836,7 @@ s32 func_80052388(Object *obj1, Object_Racer *arg1, Object *obj2, f32 distance) arg1->unk16C = 0; } arg1 = (struct Object_Racer *) obj2->unk64; - rotation = atan2f(diffX, diffZ) - (obj1->segment.trans.y_rotation & 0xFFFF); + rotation = arctan2_f(diffX, diffZ) - (obj1->segment.trans.y_rotation & 0xFFFF); if (rotation > 0x8000) { rotation += 0xFFFF0001; }