From 47a8b7b22b0d921e6ef89036f2e96c66cdc47e41 Mon Sep 17 00:00:00 2001 From: Fazana <52551480+FazanaJ@users.noreply.github.com> Date: Tue, 3 May 2022 21:26:56 +0100 Subject: [PATCH] rename sine and cosine funcs --- asm/non_matchings/camera/func_80068514.s | 4 ++-- asm/non_matchings/camera/func_80068FA8.s | 20 ++++++++-------- asm/non_matchings/camera/func_80069790.s | 8 +++---- asm/non_matchings/camera/func_80069A40.s | 8 +++---- .../fade_transition/func_800C15D4.s | 4 ++-- .../fade_transition/func_800C1EE8.s | 4 ++-- asm/non_matchings/game_ui/func_800A01A0.s | 2 +- asm/non_matchings/game_ui/func_800A4C44.s | 2 +- asm/non_matchings/game_ui/func_800A7520.s | 2 +- asm/non_matchings/game_ui/func_800A8474.s | 4 ++-- asm/non_matchings/game_ui/func_800AD658.s | 4 ++-- asm/non_matchings/game_ui/func_800ADCBC.s | 4 ++-- asm/non_matchings/objects/func_8000B750.s | 2 +- asm/non_matchings/objects/func_800135B8.s | 2 +- asm/non_matchings/objects/func_80013A0C.s | 4 ++-- asm/non_matchings/objects/func_80013DCC.s | 2 +- asm/non_matchings/objects/func_80016500.s | 4 ++-- asm/non_matchings/objects/func_8001C6C4.s | 4 ++-- asm/non_matchings/racer/func_80048E64.s | 12 +++++----- asm/non_matchings/racer/func_80049794.s | 4 ++-- asm/non_matchings/racer/func_8004C2B0.s | 12 +++++----- asm/non_matchings/racer/func_8004D590.s | 2 +- asm/non_matchings/racer/func_8004DE38.s | 4 ++-- asm/non_matchings/racer/func_80050A28.s | 2 +- asm/non_matchings/racer/func_80055A84.s | 4 ++-- asm/non_matchings/racer/func_800581E8.s | 14 +++++------ asm/non_matchings/racer/func_80059BF0.s | 4 ++-- asm/non_matchings/racer/func_8005A6F0.s | 4 ++-- .../unknown_005740/func_80005D08.s | 2 +- .../unknown_005740/func_800063EC.s | 4 ++-- .../unknown_0255E0/func_8002581C.s | 4 ++-- .../unknown_0255E0/func_80028050.s | 4 ++-- .../unknown_0255E0/func_8002F440.s | 4 ++-- .../unknown_032760/func_8003E694.s | 2 +- .../unknown_032760/obj_init_fish.s | 8 +++---- .../unknown_032760/obj_init_midifade.s | 4 ++-- .../unknown_032760/obj_loop_butterfly.s | 4 ++-- .../unknown_032760/obj_loop_effectbox.s | 4 ++-- .../unknown_032760/obj_loop_fish.s | 12 +++++----- .../unknown_032760/obj_loop_frog.s | 6 ++--- .../unknown_032760/obj_loop_log.s | 4 ++-- .../unknown_032760/obj_loop_parkwarden.s | 8 +++---- .../unknown_032760/obj_loop_stopwatchman.s | 4 ++-- asm/non_matchings/waves/func_800B82B4.s | 4 ++-- asm/non_matchings/waves/func_800BC6C8.s | 2 +- asm/non_matchings/waves/func_800BEFC4.s | 4 ++-- asm/unknown_070110.s | 4 ++-- .../{func_800707C4.s => cosine_s.s} | 2 +- asm/unknown_070110/func_80070320.s | 12 +++++----- asm/unknown_070110/func_800703D8.s | 12 +++++----- asm/unknown_070110/func_80070490.s | 8 +++---- .../{func_800707F8.s => sine_s.s} | 2 +- include/math_util.h | 2 ++ src/object_functions.c | 24 +++++++++---------- src/object_functions.h | 4 ++-- src/objects.c | 4 ++-- src/objects.h | 2 +- src/racer.c | 4 ++-- src/unknown_032760.c | 4 ++-- src/unknown_032760.h | 2 +- src/weather.c | 4 ++-- src/weather.h | 4 ++-- 62 files changed, 163 insertions(+), 161 deletions(-) rename asm/unknown_070110/{func_800707C4.s => cosine_s.s} (96%) rename asm/unknown_070110/{func_800707F8.s => sine_s.s} (96%) diff --git a/asm/non_matchings/camera/func_80068514.s b/asm/non_matchings/camera/func_80068514.s index 7f5ffc7e..9be1d891 100644 --- a/asm/non_matchings/camera/func_80068514.s +++ b/asm/non_matchings/camera/func_80068514.s @@ -34,10 +34,10 @@ glabel func_80068514 /* 069194 80068594 C4E80014 */ lwc1 $f8, 0x14($a3) /* 069198 80068598 C4260D58 */ lwc1 $f6, %lo(perspNorm)($at) /* 06919C 8006859C 84E40000 */ lh $a0, ($a3) -/* 0691A0 800685A0 0C01C1F1 */ jal func_800707C4 +/* 0691A0 800685A0 0C01C1F1 */ jal cosine_s /* 0691A4 800685A4 46083501 */ sub.s $f20, $f6, $f8 /* 0691A8 800685A8 86040000 */ lh $a0, ($s0) -/* 0691AC 800685AC 0C01C1FE */ jal func_800707F8 +/* 0691AC 800685AC 0C01C1FE */ jal sine_s /* 0691B0 800685B0 E7A0004C */ swc1 $f0, 0x4c($sp) /* 0691B4 800685B4 C7AE005C */ lwc1 $f14, 0x5c($sp) /* 0691B8 800685B8 C7A2004C */ lwc1 $f2, 0x4c($sp) diff --git a/asm/non_matchings/camera/func_80068FA8.s b/asm/non_matchings/camera/func_80068FA8.s index 983d7026..088123dd 100644 --- a/asm/non_matchings/camera/func_80068FA8.s +++ b/asm/non_matchings/camera/func_80068FA8.s @@ -19,17 +19,17 @@ glabel func_80068FA8 /* 069BEC 80068FEC AFA5012C */ sw $a1, 0x12c($sp) /* 069BF0 80068FF0 84C40002 */ lh $a0, 2($a2) /* 069BF4 80068FF4 00E08025 */ move $s0, $a3 -/* 069BF8 80068FF8 0C01C1FE */ jal func_800707F8 +/* 069BF8 80068FF8 0C01C1FE */ jal sine_s /* 069BFC 80068FFC 00C08825 */ move $s1, $a2 /* 069C00 80069000 86240002 */ lh $a0, 2($s1) -/* 069C04 80069004 0C01C1F1 */ jal func_800707C4 +/* 069C04 80069004 0C01C1F1 */ jal cosine_s /* 069C08 80069008 46000786 */ mov.s $f30, $f0 /* 069C0C 8006900C E7A00118 */ swc1 $f0, 0x118($sp) /* 069C10 80069010 86240000 */ lh $a0, ($s1) -/* 069C14 80069014 0C01C1FE */ jal func_800707F8 +/* 069C14 80069014 0C01C1FE */ jal sine_s /* 069C18 80069018 00000000 */ nop /* 069C1C 8006901C 86240000 */ lh $a0, ($s1) -/* 069C20 80069020 0C01C1F1 */ jal func_800707C4 +/* 069C20 80069020 0C01C1F1 */ jal cosine_s /* 069C24 80069024 46000586 */ mov.s $f22, $f0 /* 069C28 80069028 C624000C */ lwc1 $f4, 0xc($s1) /* 069C2C 8006902C 46000606 */ mov.s $f24, $f0 @@ -41,22 +41,22 @@ glabel func_80068FA8 /* 069C44 80069044 00000000 */ nop /* 069C48 80069048 E7A800EC */ swc1 $f8, 0xec($sp) /* 069C4C 8006904C 86040004 */ lh $a0, 4($s0) -/* 069C50 80069050 0C01C1FE */ jal func_800707F8 +/* 069C50 80069050 0C01C1FE */ jal sine_s /* 069C54 80069054 00000000 */ nop /* 069C58 80069058 86040004 */ lh $a0, 4($s0) -/* 069C5C 8006905C 0C01C1F1 */ jal func_800707C4 +/* 069C5C 8006905C 0C01C1F1 */ jal cosine_s /* 069C60 80069060 46000506 */ mov.s $f20, $f0 /* 069C64 80069064 86040002 */ lh $a0, 2($s0) -/* 069C68 80069068 0C01C1FE */ jal func_800707F8 +/* 069C68 80069068 0C01C1FE */ jal sine_s /* 069C6C 8006906C 46000686 */ mov.s $f26, $f0 /* 069C70 80069070 86040002 */ lh $a0, 2($s0) -/* 069C74 80069074 0C01C1F1 */ jal func_800707C4 +/* 069C74 80069074 0C01C1F1 */ jal cosine_s /* 069C78 80069078 46000706 */ mov.s $f28, $f0 /* 069C7C 8006907C 86040000 */ lh $a0, ($s0) -/* 069C80 80069080 0C01C1FE */ jal func_800707F8 +/* 069C80 80069080 0C01C1FE */ jal sine_s /* 069C84 80069084 E7A00100 */ swc1 $f0, 0x100($sp) /* 069C88 80069088 86040000 */ lh $a0, ($s0) -/* 069C8C 8006908C 0C01C1F1 */ jal func_800707C4 +/* 069C8C 8006908C 0C01C1F1 */ jal cosine_s /* 069C90 80069090 E7A000FC */ swc1 $f0, 0xfc($sp) /* 069C94 80069094 C606000C */ lwc1 $f6, 0xc($s0) /* 069C98 80069098 C7B00138 */ lwc1 $f16, 0x138($sp) diff --git a/asm/non_matchings/camera/func_80069790.s b/asm/non_matchings/camera/func_80069790.s index 07f3f809..cd29ae50 100644 --- a/asm/non_matchings/camera/func_80069790.s +++ b/asm/non_matchings/camera/func_80069790.s @@ -27,18 +27,18 @@ glabel func_80069790 /* 06A3F4 800697F4 468021A0 */ cvt.s.w $f6, $f4 /* 06A3F8 800697F8 E7A600EC */ swc1 $f6, 0xec($sp) /* 06A3FC 800697FC 84C4001C */ lh $a0, 0x1c($a2) -/* 06A400 80069800 0C01C1FE */ jal func_800707F8 +/* 06A400 80069800 0C01C1FE */ jal sine_s /* 06A404 80069804 AFA60108 */ sw $a2, 0x108($sp) /* 06A408 80069808 8FA60108 */ lw $a2, 0x108($sp) /* 06A40C 8006980C 46000506 */ mov.s $f20, $f0 /* 06A410 80069810 84C4001C */ lh $a0, 0x1c($a2) -/* 06A414 80069814 0C01C1F1 */ jal func_800707C4 +/* 06A414 80069814 0C01C1F1 */ jal cosine_s /* 06A418 80069818 00000000 */ nop /* 06A41C 8006981C 87A4010E */ lh $a0, 0x10e($sp) -/* 06A420 80069820 0C01C1FE */ jal func_800707F8 +/* 06A420 80069820 0C01C1FE */ jal sine_s /* 06A424 80069824 E7A000E4 */ swc1 $f0, 0xe4($sp) /* 06A428 80069828 87A4010E */ lh $a0, 0x10e($sp) -/* 06A42C 8006982C 0C01C1F1 */ jal func_800707C4 +/* 06A42C 8006982C 0C01C1F1 */ jal cosine_s /* 06A430 80069830 46000586 */ mov.s $f22, $f0 /* 06A434 80069834 4614B482 */ mul.s $f18, $f22, $f20 /* 06A438 80069838 C7B000E4 */ lwc1 $f16, 0xe4($sp) diff --git a/asm/non_matchings/camera/func_80069A40.s b/asm/non_matchings/camera/func_80069A40.s index 14f77133..08940164 100644 --- a/asm/non_matchings/camera/func_80069A40.s +++ b/asm/non_matchings/camera/func_80069A40.s @@ -98,7 +98,7 @@ glabel func_80069A40 /* 06A7B0 80069BB0 00007812 */ mflo $t7 /* 06A7B4 80069BB4 022FC021 */ addu $t8, $s1, $t7 /* 06A7B8 80069BB8 87040000 */ lh $a0, ($t8) -/* 06A7BC 80069BBC 0C01C1FE */ jal func_800707F8 +/* 06A7BC 80069BBC 0C01C1FE */ jal sine_s /* 06A7C0 80069BC0 00000000 */ nop /* 06A7C4 80069BC4 8E590000 */ lw $t9, ($s2) /* 06A7C8 80069BC8 C7A60028 */ lwc1 $f6, 0x28($sp) @@ -109,7 +109,7 @@ glabel func_80069A40 /* 06A7DC 80069BDC C604000C */ lwc1 $f4, 0xc($s0) /* 06A7E0 80069BE0 86040000 */ lh $a0, ($s0) /* 06A7E4 80069BE4 46082281 */ sub.s $f10, $f4, $f8 -/* 06A7E8 80069BE8 0C01C1F1 */ jal func_800707C4 +/* 06A7E8 80069BE8 0C01C1F1 */ jal cosine_s /* 06A7EC 80069BEC E60A000C */ swc1 $f10, 0xc($s0) /* 06A7F0 80069BF0 8E490000 */ lw $t1, ($s2) /* 06A7F4 80069BF4 C7B20028 */ lwc1 $f18, 0x28($sp) @@ -120,7 +120,7 @@ glabel func_80069A40 /* 06A808 80069C08 C6100014 */ lwc1 $f16, 0x14($s0) /* 06A80C 80069C0C 86040000 */ lh $a0, ($s0) /* 06A810 80069C10 46068101 */ sub.s $f4, $f16, $f6 -/* 06A814 80069C14 0C01C1F1 */ jal func_800707C4 +/* 06A814 80069C14 0C01C1F1 */ jal cosine_s /* 06A818 80069C18 E6040014 */ swc1 $f4, 0x14($s0) /* 06A81C 80069C1C 8E4B0000 */ lw $t3, ($s2) /* 06A820 80069C20 C7AA0030 */ lwc1 $f10, 0x30($sp) @@ -131,7 +131,7 @@ glabel func_80069A40 /* 06A834 80069C34 C608000C */ lwc1 $f8, 0xc($s0) /* 06A838 80069C38 86040000 */ lh $a0, ($s0) /* 06A83C 80069C3C 46124401 */ sub.s $f16, $f8, $f18 -/* 06A840 80069C40 0C01C1FE */ jal func_800707F8 +/* 06A840 80069C40 0C01C1FE */ jal sine_s /* 06A844 80069C44 E610000C */ swc1 $f16, 0xc($s0) /* 06A848 80069C48 8E4D0000 */ lw $t5, ($s2) /* 06A84C 80069C4C C7A40030 */ lwc1 $f4, 0x30($sp) diff --git a/asm/non_matchings/fade_transition/func_800C15D4.s b/asm/non_matchings/fade_transition/func_800C15D4.s index 24d6ae32..348dd390 100644 --- a/asm/non_matchings/fade_transition/func_800C15D4.s +++ b/asm/non_matchings/fade_transition/func_800C15D4.s @@ -183,7 +183,7 @@ glabel func_800C15D4 /* 0C2498 800C1898 00182400 */ sll $a0, $t8, 0x10 /* 0C249C 800C189C 0004CC03 */ sra $t9, $a0, 0x10 /* 0C24A0 800C18A0 03202025 */ move $a0, $t9 -/* 0C24A4 800C18A4 0C01C1F1 */ jal func_800707C4 +/* 0C24A4 800C18A4 0C01C1F1 */ jal cosine_s /* 0C24A8 800C18A8 03009825 */ move $s3, $t8 /* 0C24AC 800C18AC 46140102 */ mul.s $f4, $f0, $f20 /* 0C24B0 800C18B0 00132400 */ sll $a0, $s3, 0x10 @@ -199,7 +199,7 @@ glabel func_800C15D4 /* 0C24D8 800C18D8 44113000 */ mfc1 $s1, $f6 /* 0C24DC 800C18DC 44CDF800 */ ctc1 $t5, $31 /* 0C24E0 800C18E0 00116400 */ sll $t4, $s1, 0x10 -/* 0C24E4 800C18E4 0C01C1FE */ jal func_800707F8 +/* 0C24E4 800C18E4 0C01C1FE */ jal sine_s /* 0C24E8 800C18E8 000C8C03 */ sra $s1, $t4, 0x10 /* 0C24EC 800C18EC 3C014334 */ li $at, 0x43340000 # 180.000000 /* 0C24F0 800C18F0 44814000 */ mtc1 $at, $f8 diff --git a/asm/non_matchings/fade_transition/func_800C1EE8.s b/asm/non_matchings/fade_transition/func_800C1EE8.s index 2bebd001..4a7b9759 100644 --- a/asm/non_matchings/fade_transition/func_800C1EE8.s +++ b/asm/non_matchings/fade_transition/func_800C1EE8.s @@ -75,13 +75,13 @@ glabel func_800C1EE8 /* 0C2BEC 800C1FEC 000F2400 */ sll $a0, $t7, 0x10 /* 0C2BF0 800C1FF0 0004C403 */ sra $t8, $a0, 0x10 /* 0C2BF4 800C1FF4 03002025 */ move $a0, $t8 -/* 0C2BF8 800C1FF8 0C01C1F1 */ jal func_800707C4 +/* 0C2BF8 800C1FF8 0C01C1F1 */ jal cosine_s /* 0C2BFC 800C1FFC 01E0A025 */ move $s4, $t7 /* 0C2C00 800C2000 C6E40000 */ lwc1 $f4, ($s7) /* 0C2C04 800C2004 00142400 */ sll $a0, $s4, 0x10 /* 0C2C08 800C2008 0004CC03 */ sra $t9, $a0, 0x10 /* 0C2C0C 800C200C 46040502 */ mul.s $f20, $f0, $f4 -/* 0C2C10 800C2010 0C01C1FE */ jal func_800707F8 +/* 0C2C10 800C2010 0C01C1FE */ jal sine_s /* 0C2C14 800C2014 03202025 */ move $a0, $t9 /* 0C2C18 800C2018 C7D20000 */ lwc1 $f18, ($fp) /* 0C2C1C 800C201C 00124040 */ sll $t0, $s2, 1 diff --git a/asm/non_matchings/game_ui/func_800A01A0.s b/asm/non_matchings/game_ui/func_800A01A0.s index 96680145..fd85dacc 100644 --- a/asm/non_matchings/game_ui/func_800A01A0.s +++ b/asm/non_matchings/game_ui/func_800A01A0.s @@ -352,7 +352,7 @@ glabel func_800A01A0 /* 0A12CC 800A06CC 3C098012 */ lui $t1, %hi(D_80126CD4) # $t1, 0x8012 /* 0A12D0 800A06D0 24426D2C */ addiu $v0, %lo(D_80126D2C) # addiu $v0, $v0, 0x6d2c /* 0A12D4 800A06D4 84440000 */ lh $a0, ($v0) -/* 0A12D8 800A06D8 0C01C1F1 */ jal func_800707C4 +/* 0A12D8 800A06D8 0C01C1F1 */ jal cosine_s /* 0A12DC 800A06DC 00000000 */ nop /* 0A12E0 800A06E0 3C048012 */ lui $a0, %hi(D_80126D30) # $a0, 0x8012 /* 0A12E4 800A06E4 24846D30 */ addiu $a0, %lo(D_80126D30) # addiu $a0, $a0, 0x6d30 diff --git a/asm/non_matchings/game_ui/func_800A4C44.s b/asm/non_matchings/game_ui/func_800A4C44.s index 6a16766c..118e1498 100644 --- a/asm/non_matchings/game_ui/func_800A4C44.s +++ b/asm/non_matchings/game_ui/func_800A4C44.s @@ -92,7 +92,7 @@ glabel func_800A4C44 /* 0A5994 800A4D94 44044000 */ mfc1 $a0, $f8 /* 0A5998 800A4D98 44C9F800 */ ctc1 $t1, $31 /* 0A599C 800A4D9C 00045400 */ sll $t2, $a0, 0x10 -/* 0A59A0 800A4DA0 0C01C1F1 */ jal func_800707C4 +/* 0A59A0 800A4DA0 0C01C1F1 */ jal cosine_s /* 0A59A4 800A4DA4 000A2403 */ sra $a0, $t2, 0x10 /* 0A59A8 800A4DA8 3C088012 */ lui $t0, %hi(D_80126CDC) # $t0, 0x8012 /* 0A59AC 800A4DAC 25086CDC */ addiu $t0, %lo(D_80126CDC) # addiu $t0, $t0, 0x6cdc diff --git a/asm/non_matchings/game_ui/func_800A7520.s b/asm/non_matchings/game_ui/func_800A7520.s index 5383658e..f6127ad9 100644 --- a/asm/non_matchings/game_ui/func_800A7520.s +++ b/asm/non_matchings/game_ui/func_800A7520.s @@ -153,7 +153,7 @@ glabel func_800A7520 /* 0A8334 800A7734 44045000 */ mfc1 $a0, $f10 /* 0A8338 800A7738 44CFF800 */ ctc1 $t7, $31 /* 0A833C 800A773C 0004C400 */ sll $t8, $a0, 0x10 -/* 0A8340 800A7740 0C01C1F1 */ jal func_800707C4 +/* 0A8340 800A7740 0C01C1F1 */ jal cosine_s /* 0A8344 800A7744 00182403 */ sra $a0, $t8, 0x10 /* 0A8348 800A7748 3C01800F */ lui $at, %hi(D_800E8790 + 4) # $at, 0x800f /* 0A834C 800A774C C4318790 */ lwc1 $f17, %lo(D_800E8790)($at) diff --git a/asm/non_matchings/game_ui/func_800A8474.s b/asm/non_matchings/game_ui/func_800A8474.s index 4ab434a8..f2d92acd 100644 --- a/asm/non_matchings/game_ui/func_800A8474.s +++ b/asm/non_matchings/game_ui/func_800A8474.s @@ -1716,7 +1716,7 @@ glabel func_800A8474 /* 0AA970 800A9D70 01A1001A */ div $zero, $t5, $at /* 0AA974 800A9D74 00007012 */ mflo $t6 /* 0AA978 800A9D78 000EC400 */ sll $t8, $t6, 0x10 -/* 0AA97C 800A9D7C 0C01C1FE */ jal func_800707F8 +/* 0AA97C 800A9D7C 0C01C1FE */ jal sine_s /* 0AA980 800A9D80 00182403 */ sra $a0, $t8, 0x10 /* 0AA984 800A9D84 8FB90158 */ lw $t9, 0x158($sp) /* 0AA988 800A9D88 E7A00118 */ swc1 $f0, 0x118($sp) @@ -1727,7 +1727,7 @@ glabel func_800A8474 /* 0AA99C 800A9D9C 0181001A */ div $zero, $t4, $at /* 0AA9A0 800A9DA0 00005812 */ mflo $t3 /* 0AA9A4 800A9DA4 000B5400 */ sll $t2, $t3, 0x10 -/* 0AA9A8 800A9DA8 0C01C1F1 */ jal func_800707C4 +/* 0AA9A8 800A9DA8 0C01C1F1 */ jal cosine_s /* 0AA9AC 800A9DAC 000A2403 */ sra $a0, $t2, 0x10 /* 0AA9B0 800A9DB0 0C003936 */ jal func_8000E4D8 /* 0AA9B4 800A9DB4 E7A00114 */ swc1 $f0, 0x114($sp) diff --git a/asm/non_matchings/game_ui/func_800AD658.s b/asm/non_matchings/game_ui/func_800AD658.s index 898937b0..cce9b1a5 100644 --- a/asm/non_matchings/game_ui/func_800AD658.s +++ b/asm/non_matchings/game_ui/func_800AD658.s @@ -73,7 +73,7 @@ glabel func_800AD658 /* 0AE368 800AD768 00102400 */ sll $a0, $s0, 0x10 /* 0AE36C 800AD76C 00045403 */ sra $t2, $a0, 0x10 /* 0AE370 800AD770 E7A6005C */ swc1 $f6, 0x5c($sp) -/* 0AE374 800AD774 0C01C1F1 */ jal func_800707C4 +/* 0AE374 800AD774 0C01C1F1 */ jal cosine_s /* 0AE378 800AD778 01402025 */ move $a0, $t2 /* 0AE37C 800AD77C C7A8005C */ lwc1 $f8, 0x5c($sp) /* 0AE380 800AD780 8FAB0050 */ lw $t3, 0x50($sp) @@ -83,7 +83,7 @@ glabel func_800AD658 /* 0AE390 800AD790 00046403 */ sra $t4, $a0, 0x10 /* 0AE394 800AD794 46105480 */ add.s $f18, $f10, $f16 /* 0AE398 800AD798 01802025 */ move $a0, $t4 -/* 0AE39C 800AD79C 0C01C1FE */ jal func_800707F8 +/* 0AE39C 800AD79C 0C01C1FE */ jal sine_s /* 0AE3A0 800AD7A0 E7B20058 */ swc1 $f18, 0x58($sp) /* 0AE3A4 800AD7A4 C7A4005C */ lwc1 $f4, 0x5c($sp) /* 0AE3A8 800AD7A8 8FA20050 */ lw $v0, 0x50($sp) diff --git a/asm/non_matchings/game_ui/func_800ADCBC.s b/asm/non_matchings/game_ui/func_800ADCBC.s index 7d5dc05a..faad555e 100644 --- a/asm/non_matchings/game_ui/func_800ADCBC.s +++ b/asm/non_matchings/game_ui/func_800ADCBC.s @@ -98,13 +98,13 @@ glabel func_800ADCBC /* 0AEA3C 800ADE3C 01B97021 */ addu $t6, $t5, $t9 /* 0AEA40 800ADE40 01CF4024 */ and $t0, $t6, $t7 /* 0AEA44 800ADE44 02288821 */ addu $s1, $s1, $t0 -/* 0AEA48 800ADE48 0C01C1F1 */ jal func_800707C4 +/* 0AEA48 800ADE48 0C01C1F1 */ jal cosine_s /* 0AEA4C 800ADE4C AFA8009C */ sw $t0, 0x9c($sp) /* 0AEA50 800ADE50 3C188012 */ lui $t8, %hi(D_80127C1C) # $t8, 0x8012 /* 0AEA54 800ADE54 8F187C1C */ lw $t8, %lo(D_80127C1C)($t8) /* 0AEA58 800ADE58 00000000 */ nop /* 0AEA5C 800ADE5C 87040004 */ lh $a0, 4($t8) -/* 0AEA60 800ADE60 0C01C1FE */ jal func_800707F8 +/* 0AEA60 800ADE60 0C01C1FE */ jal sine_s /* 0AEA64 800ADE64 E7A0007C */ swc1 $f0, 0x7c($sp) /* 0AEA68 800ADE68 3C01800E */ lui $at, %hi(D_800E2A8C) # $at, 0x800e /* 0AEA6C 800ADE6C C42C2A8C */ lwc1 $f12, %lo(D_800E2A8C)($at) diff --git a/asm/non_matchings/objects/func_8000B750.s b/asm/non_matchings/objects/func_8000B750.s index b85afe42..7114c140 100644 --- a/asm/non_matchings/objects/func_8000B750.s +++ b/asm/non_matchings/objects/func_8000B750.s @@ -85,7 +85,7 @@ glabel func_8000B750 /* 00C468 8000B868 00192403 */ sra $a0, $t9, 0x10 /* 00C46C 8000B86C AFAB004C */ sw $t3, 0x4c($sp) /* 00C470 8000B870 AFAA0038 */ sw $t2, 0x38($sp) -/* 00C474 8000B874 0C01C1FE */ jal func_800707F8 +/* 00C474 8000B874 0C01C1FE */ jal sine_s /* 00C478 8000B878 AFA20044 */ sw $v0, 0x44($sp) /* 00C47C 8000B87C 8FA20044 */ lw $v0, 0x44($sp) /* 00C480 8000B880 8FAB004C */ lw $t3, 0x4c($sp) diff --git a/asm/non_matchings/objects/func_800135B8.s b/asm/non_matchings/objects/func_800135B8.s index 399ea5ce..631cd34b 100644 --- a/asm/non_matchings/objects/func_800135B8.s +++ b/asm/non_matchings/objects/func_800135B8.s @@ -71,7 +71,7 @@ glabel func_800135B8 /* 0142B0 800136B0 92390072 */ lbu $t9, 0x72($s1) /* 0142B4 800136B4 00000000 */ nop /* 0142B8 800136B8 00196700 */ sll $t4, $t9, 0x1c -/* 0142BC 800136BC 0C01C1FE */ jal func_800707F8 +/* 0142BC 800136BC 0C01C1FE */ jal sine_s /* 0142C0 800136C0 000C2403 */ sra $a0, $t4, 0x10 /* 0142C4 800136C4 8FA30050 */ lw $v1, 0x50($sp) /* 0142C8 800136C8 3C058012 */ lui $a1, %hi(D_8011AE90) # $a1, 0x8012 diff --git a/asm/non_matchings/objects/func_80013A0C.s b/asm/non_matchings/objects/func_80013A0C.s index 6baab4e3..133c0a26 100644 --- a/asm/non_matchings/objects/func_80013A0C.s +++ b/asm/non_matchings/objects/func_80013A0C.s @@ -86,7 +86,7 @@ glabel func_80013A0C /* 01472C 80013B2C 90EE0000 */ lbu $t6, ($a3) /* 014730 80013B30 AFA70028 */ sw $a3, 0x28($sp) /* 014734 80013B34 000E7E40 */ sll $t7, $t6, 0x19 -/* 014738 80013B38 0C01C1F1 */ jal func_800707C4 +/* 014738 80013B38 0C01C1F1 */ jal cosine_s /* 01473C 80013B3C 000F2403 */ sra $a0, $t7, 0x10 /* 014740 80013B40 8FB90058 */ lw $t9, 0x58($sp) /* 014744 80013B44 8E020000 */ lw $v0, ($s0) @@ -103,7 +103,7 @@ glabel func_80013A0C /* 014770 80013B70 914B0000 */ lbu $t3, ($t2) /* 014774 80013B74 00000000 */ nop /* 014778 80013B78 000B6680 */ sll $t4, $t3, 0x1a -/* 01477C 80013B7C 0C01C1FE */ jal func_800707F8 +/* 01477C 80013B7C 0C01C1FE */ jal sine_s /* 014780 80013B80 000C2403 */ sra $a0, $t4, 0x10 /* 014784 80013B84 3C01800E */ lui $at, %hi(D_800E556C) # $at, 0x800e /* 014788 80013B88 C432556C */ lwc1 $f18, %lo(D_800E556C)($at) diff --git a/asm/non_matchings/objects/func_80013DCC.s b/asm/non_matchings/objects/func_80013DCC.s index d4590046..4b110254 100644 --- a/asm/non_matchings/objects/func_80013DCC.s +++ b/asm/non_matchings/objects/func_80013DCC.s @@ -78,7 +78,7 @@ glabel func_80013DCC /* 014AD4 80013ED4 000E2403 */ sra $a0, $t6, 0x10 /* 014AD8 80013ED8 AFA30048 */ sw $v1, 0x48($sp) /* 014ADC 80013EDC AFAB0054 */ sw $t3, 0x54($sp) -/* 014AE0 80013EE0 0C01C1FE */ jal func_800707F8 +/* 014AE0 80013EE0 0C01C1FE */ jal sine_s /* 014AE4 80013EE4 AFA90028 */ sw $t1, 0x28($sp) /* 014AE8 80013EE8 3C01800E */ lui $at, %hi(D_800E5580) # $at, 0x800e /* 014AEC 80013EEC C42A5580 */ lwc1 $f10, %lo(D_800E5580)($at) diff --git a/asm/non_matchings/objects/func_80016500.s b/asm/non_matchings/objects/func_80016500.s index a644458b..3bf2e8f3 100644 --- a/asm/non_matchings/objects/func_80016500.s +++ b/asm/non_matchings/objects/func_80016500.s @@ -23,10 +23,10 @@ glabel func_80016500 .L80016554: /* 017154 80016554 00044C00 */ sll $t1, $a0, 0x10 /* 017158 80016558 00092403 */ sra $a0, $t1, 0x10 -/* 01715C 8001655C 0C01C1FE */ jal func_800707F8 +/* 01715C 8001655C 0C01C1FE */ jal sine_s /* 017160 80016560 AFA40020 */ sw $a0, 0x20($sp) /* 017164 80016564 8FA40020 */ lw $a0, 0x20($sp) -/* 017168 80016568 0C01C1F1 */ jal func_800707C4 +/* 017168 80016568 0C01C1F1 */ jal cosine_s /* 01716C 8001656C E7A0002C */ swc1 $f0, 0x2c($sp) /* 017170 80016570 8FAB0040 */ lw $t3, 0x40($sp) /* 017174 80016574 C7A2002C */ lwc1 $f2, 0x2c($sp) diff --git a/asm/non_matchings/objects/func_8001C6C4.s b/asm/non_matchings/objects/func_8001C6C4.s index 5047530e..cc1bb885 100644 --- a/asm/non_matchings/objects/func_8001C6C4.s +++ b/asm/non_matchings/objects/func_8001C6C4.s @@ -313,7 +313,7 @@ glabel func_8001C6C4 /* 01D734 8001CB34 A5600004 */ sh $zero, 4($t3) /* 01D738 8001CB38 01902021 */ addu $a0, $t4, $s0 /* 01D73C 8001CB3C 00046C00 */ sll $t5, $a0, 0x10 -/* 01D740 8001CB40 0C01C1F1 */ jal func_800707C4 +/* 01D740 8001CB40 0C01C1F1 */ jal cosine_s /* 01D744 8001CB44 000D2403 */ sra $a0, $t5, 0x10 /* 01D748 8001CB48 8FAF00EC */ lw $t7, 0xec($sp) /* 01D74C 8001CB4C 46140582 */ mul.s $f22, $f0, $f20 @@ -321,7 +321,7 @@ glabel func_8001C6C4 /* 01D754 8001CB54 00000000 */ nop /* 01D758 8001CB58 03102021 */ addu $a0, $t8, $s0 /* 01D75C 8001CB5C 0004CC00 */ sll $t9, $a0, 0x10 -/* 01D760 8001CB60 0C01C1FE */ jal func_800707F8 +/* 01D760 8001CB60 0C01C1FE */ jal sine_s /* 01D764 8001CB64 00192403 */ sra $a0, $t9, 0x10 /* 01D768 8001CB68 C7A600F0 */ lwc1 $f6, 0xf0($sp) /* 01D76C 8001CB6C 8FA400EC */ lw $a0, 0xec($sp) diff --git a/asm/non_matchings/racer/func_80048E64.s b/asm/non_matchings/racer/func_80048E64.s index 21837dd5..aaddd28f 100644 --- a/asm/non_matchings/racer/func_80048E64.s +++ b/asm/non_matchings/racer/func_80048E64.s @@ -245,7 +245,7 @@ glabel func_80048E64 /* 049DD4 800491D4 AFA70068 */ sw $a3, 0x68($sp) /* 049DD8 800491D8 016C2023 */ subu $a0, $t3, $t4 /* 049DDC 800491DC 00046C00 */ sll $t5, $a0, 0x10 -/* 049DE0 800491E0 0C01C1F1 */ jal func_800707C4 +/* 049DE0 800491E0 0C01C1F1 */ jal cosine_s /* 049DE4 800491E4 000D2403 */ sra $a0, $t5, 0x10 /* 049DE8 800491E8 8E0F0000 */ lw $t7, ($s0) /* 049DEC 800491EC E7A00034 */ swc1 $f0, 0x34($sp) @@ -254,7 +254,7 @@ glabel func_80048E64 /* 049DF8 800491F8 00000000 */ nop /* 049DFC 800491FC 03192023 */ subu $a0, $t8, $t9 /* 049E00 80049200 00044400 */ sll $t0, $a0, 0x10 -/* 049E04 80049204 0C01C1FE */ jal func_800707F8 +/* 049E04 80049204 0C01C1FE */ jal sine_s /* 049E08 80049208 00082403 */ sra $a0, $t0, 0x10 /* 049E0C 8004920C 8E050000 */ lw $a1, ($s0) /* 049E10 80049210 C7A60034 */ lwc1 $f6, 0x34($sp) @@ -269,7 +269,7 @@ glabel func_80048E64 /* 049E34 80049234 00046400 */ sll $t4, $a0, 0x10 /* 049E38 80049238 000C2403 */ sra $a0, $t4, 0x10 /* 049E3C 8004923C 460A4480 */ add.s $f18, $f8, $f10 -/* 049E40 80049240 0C01C1F1 */ jal func_800707C4 +/* 049E40 80049240 0C01C1F1 */ jal cosine_s /* 049E44 80049244 E7B20044 */ swc1 $f18, 0x44($sp) /* 049E48 80049248 8E0E0000 */ lw $t6, ($s0) /* 049E4C 8004924C 8FA70068 */ lw $a3, 0x68($sp) @@ -281,7 +281,7 @@ glabel func_80048E64 /* 049E64 80049264 00000000 */ nop /* 049E68 80049268 030F2023 */ subu $a0, $t8, $t7 /* 049E6C 8004926C 0004CC00 */ sll $t9, $a0, 0x10 -/* 049E70 80049270 0C01C1FE */ jal func_800707F8 +/* 049E70 80049270 0C01C1FE */ jal sine_s /* 049E74 80049274 00192403 */ sra $a0, $t9, 0x10 /* 049E78 80049278 3C0B8012 */ lui $t3, %hi(D_8011D586) # $t3, 0x8012 /* 049E7C 8004927C 856BD586 */ lh $t3, %lo(D_8011D586)($t3) @@ -333,7 +333,7 @@ glabel func_80048E64 /* 049F34 80049334 462A4101 */ sub.d $f4, $f8, $f10 /* 049F38 80049338 462021A0 */ cvt.s.d $f6, $f4 /* 049F3C 8004933C E4E600C8 */ swc1 $f6, 0xc8($a3) -/* 049F40 80049340 0C01C1F1 */ jal func_800707C4 +/* 049F40 80049340 0C01C1F1 */ jal cosine_s /* 049F44 80049344 E7B0003C */ swc1 $f16, 0x3c($sp) /* 049F48 80049348 8FA70068 */ lw $a3, 0x68($sp) /* 049F4C 8004934C 8FA20064 */ lw $v0, 0x64($sp) @@ -412,7 +412,7 @@ glabel func_80048E64 /* 04A05C 8004945C 24844000 */ addiu $a0, $a0, 0x4000 /* 04A060 80049460 00044C00 */ sll $t1, $a0, 0x10 /* 04A064 80049464 00092403 */ sra $a0, $t1, 0x10 -/* 04A068 80049468 0C01C1FE */ jal func_800707F8 +/* 04A068 80049468 0C01C1FE */ jal sine_s /* 04A06C 8004946C AFA70068 */ sw $a3, 0x68($sp) /* 04A070 80049470 8FAA0064 */ lw $t2, 0x64($sp) /* 04A074 80049474 C7B0003C */ lwc1 $f16, 0x3c($sp) diff --git a/asm/non_matchings/racer/func_80049794.s b/asm/non_matchings/racer/func_80049794.s index a7f769c8..0cf9733e 100644 --- a/asm/non_matchings/racer/func_80049794.s +++ b/asm/non_matchings/racer/func_80049794.s @@ -2199,7 +2199,7 @@ glabel func_80049794 /* 04C2C8 8004B6C8 860401A4 */ lh $a0, 0x1a4($s0) /* 04C2CC 8004B6CC 46244482 */ mul.d $f18, $f8, $f4 /* 04C2D0 8004B6D0 46209320 */ cvt.s.d $f12, $f18 -/* 04C2D4 8004B6D4 0C01C1FE */ jal func_800707F8 +/* 04C2D4 8004B6D4 0C01C1FE */ jal sine_s /* 04C2D8 8004B6D8 E7AC00EC */ swc1 $f12, 0xec($sp) /* 04C2DC 8004B6DC 821901E0 */ lb $t9, 0x1e0($s0) /* 04C2E0 8004B6E0 C7AC00EC */ lwc1 $f12, 0xec($sp) @@ -2237,7 +2237,7 @@ glabel func_80049794 /* 04C358 8004B758 46044481 */ sub.s $f18, $f8, $f4 /* 04C35C 8004B75C E6320024 */ swc1 $f18, 0x24($s1) /* 04C360 8004B760 860401A4 */ lh $a0, 0x1a4($s0) -/* 04C364 8004B764 0C01C1F1 */ jal func_800707C4 +/* 04C364 8004B764 0C01C1F1 */ jal cosine_s /* 04C368 8004B768 E7AC00EC */ swc1 $f12, 0xec($sp) /* 04C36C 8004B76C 820F01E0 */ lb $t7, 0x1e0($s0) /* 04C370 8004B770 C7AC00EC */ lwc1 $f12, 0xec($sp) diff --git a/asm/non_matchings/racer/func_8004C2B0.s b/asm/non_matchings/racer/func_8004C2B0.s index 3f80e3f0..3e614576 100644 --- a/asm/non_matchings/racer/func_8004C2B0.s +++ b/asm/non_matchings/racer/func_8004C2B0.s @@ -415,7 +415,7 @@ glabel func_8004C2B0 /* 04D45C 8004C85C AFA70058 */ sw $a3, 0x58($sp) /* 04D460 8004C860 2484FC00 */ addiu $a0, $a0, -0x400 /* 04D464 8004C864 00047400 */ sll $t6, $a0, 0x10 -/* 04D468 8004C868 0C01C1F1 */ jal func_800707C4 +/* 04D468 8004C868 0C01C1F1 */ jal cosine_s /* 04D46C 8004C86C 000E2403 */ sra $a0, $t6, 0x10 /* 04D470 8004C870 3C088012 */ lui $t0, %hi(gCameraObject) # $t0, 0x8012 /* 04D474 8004C874 2508D508 */ addiu $t0, %lo(gCameraObject) # addiu $t0, $t0, -0x2af8 @@ -425,7 +425,7 @@ glabel func_8004C2B0 /* 04D484 8004C884 E7A0001C */ swc1 $f0, 0x1c($sp) /* 04D488 8004C888 2484FC00 */ addiu $a0, $a0, -0x400 /* 04D48C 8004C88C 0004C400 */ sll $t8, $a0, 0x10 -/* 04D490 8004C890 0C01C1FE */ jal func_800707F8 +/* 04D490 8004C890 0C01C1FE */ jal sine_s /* 04D494 8004C894 00182403 */ sra $a0, $t8, 0x10 /* 04D498 8004C898 3C088012 */ lui $t0, %hi(gCameraObject) # $t0, 0x8012 /* 04D49C 8004C89C 2508D508 */ addiu $t0, %lo(gCameraObject) # addiu $t0, $t0, -0x2af8 @@ -446,7 +446,7 @@ glabel func_8004C2B0 /* 04D4D8 8004C8D8 E7B00020 */ swc1 $f16, 0x20($sp) /* 04D4DC 8004C8DC 46006282 */ mul.s $f10, $f12, $f0 /* 04D4E0 8004C8E0 460A3480 */ add.s $f18, $f6, $f10 -/* 04D4E4 8004C8E4 0C01C1F1 */ jal func_800707C4 +/* 04D4E4 8004C8E4 0C01C1F1 */ jal cosine_s /* 04D4E8 8004C8E8 E7B20030 */ swc1 $f18, 0x30($sp) /* 04D4EC 8004C8EC C7B00020 */ lwc1 $f16, 0x20($sp) /* 04D4F0 8004C8F0 8FA70058 */ lw $a3, 0x58($sp) @@ -457,7 +457,7 @@ glabel func_8004C2B0 /* 04D504 8004C904 00000000 */ nop /* 04D508 8004C908 01EC2023 */ subu $a0, $t7, $t4 /* 04D50C 8004C90C 0004C400 */ sll $t8, $a0, 0x10 -/* 04D510 8004C910 0C01C1FE */ jal func_800707F8 +/* 04D510 8004C910 0C01C1FE */ jal sine_s /* 04D514 8004C914 00182403 */ sra $a0, $t8, 0x10 /* 04D518 8004C918 C7B00020 */ lwc1 $f16, 0x20($sp) /* 04D51C 8004C91C 8FA70058 */ lw $a3, 0x58($sp) @@ -467,7 +467,7 @@ glabel func_8004C2B0 /* 04D52C 8004C92C 00000000 */ nop /* 04D530 8004C930 24844000 */ addiu $a0, $a0, 0x4000 /* 04D534 8004C934 00045C00 */ sll $t3, $a0, 0x10 -/* 04D538 8004C938 0C01C1F1 */ jal func_800707C4 +/* 04D538 8004C938 0C01C1F1 */ jal cosine_s /* 04D53C 8004C93C 000B2403 */ sra $a0, $t3, 0x10 /* 04D540 8004C940 3C014040 */ li $at, 0x40400000 # 3.000000 /* 04D544 8004C944 44813000 */ mtc1 $at, $f6 @@ -570,7 +570,7 @@ glabel func_8004C2B0 /* 04D6A4 8004CAA4 AFA70058 */ sw $a3, 0x58($sp) /* 04D6A8 8004CAA8 24844000 */ addiu $a0, $a0, 0x4000 /* 04D6AC 8004CAAC 00047C00 */ sll $t7, $a0, 0x10 -/* 04D6B0 8004CAB0 0C01C1FE */ jal func_800707F8 +/* 04D6B0 8004CAB0 0C01C1FE */ jal sine_s /* 04D6B4 8004CAB4 000F2403 */ sra $a0, $t7, 0x10 /* 04D6B8 8004CAB8 3C014040 */ li $at, 0x40400000 # 3.000000 /* 04D6BC 8004CABC 44812000 */ mtc1 $at, $f4 diff --git a/asm/non_matchings/racer/func_8004D590.s b/asm/non_matchings/racer/func_8004D590.s index e84d08e6..10ab160e 100644 --- a/asm/non_matchings/racer/func_8004D590.s +++ b/asm/non_matchings/racer/func_8004D590.s @@ -111,7 +111,7 @@ glabel func_8004D590 /* 04E334 8004D734 C4480014 */ lwc1 $f8, 0x14($v0) /* 04E338 8004D738 8E0B0000 */ lw $t3, ($s0) /* 04E33C 8004D73C 46104280 */ add.s $f10, $f8, $f16 -/* 04E340 8004D740 0C01C1F1 */ jal func_800707C4 +/* 04E340 8004D740 0C01C1F1 */ jal cosine_s /* 04E344 8004D744 E56A0014 */ swc1 $f10, 0x14($t3) /* 04E348 8004D748 8E0C0000 */ lw $t4, ($s0) /* 04E34C 8004D74C 44801000 */ mtc1 $zero, $f2 diff --git a/asm/non_matchings/racer/func_8004DE38.s b/asm/non_matchings/racer/func_8004DE38.s index e75a9308..dfd8839d 100644 --- a/asm/non_matchings/racer/func_8004DE38.s +++ b/asm/non_matchings/racer/func_8004DE38.s @@ -410,7 +410,7 @@ glabel func_8004DE38 /* 04EFB0 8004E3B0 920E01FF */ lbu $t6, 0x1ff($s0) /* 04EFB4 8004E3B4 00000000 */ nop /* 04EFB8 8004E3B8 000E7E00 */ sll $t7, $t6, 0x18 -/* 04EFBC 8004E3BC 0C01C1F1 */ jal func_800707C4 +/* 04EFBC 8004E3BC 0C01C1F1 */ jal cosine_s /* 04EFC0 8004E3C0 000F2403 */ sra $a0, $t7, 0x10 /* 04EFC4 8004E3C4 3C013FB0 */ li $at, 0x3FB00000 # 1.375000 /* 04EFC8 8004E3C8 44816800 */ mtc1 $at, $f13 @@ -433,7 +433,7 @@ glabel func_8004DE38 /* 04F00C 8004E40C 462051A0 */ cvt.s.d $f6, $f10 /* 04F010 8004E410 E6060084 */ swc1 $f6, 0x84($s0) /* 04F014 8004E414 E7AE0054 */ swc1 $f14, 0x54($sp) -/* 04F018 8004E418 0C01C1FE */ jal func_800707F8 +/* 04F018 8004E418 0C01C1FE */ jal sine_s /* 04F01C 8004E41C E7AF0050 */ swc1 $f15, 0x50($sp) /* 04F020 8004E420 3C013FB0 */ li $at, 0x3FB00000 # 1.375000 /* 04F024 8004E424 44816800 */ mtc1 $at, $f13 diff --git a/asm/non_matchings/racer/func_80050A28.s b/asm/non_matchings/racer/func_80050A28.s index 3e2fe637..a48459c8 100644 --- a/asm/non_matchings/racer/func_80050A28.s +++ b/asm/non_matchings/racer/func_80050A28.s @@ -1004,7 +1004,7 @@ glabel func_80050A28 /* 052400 80051800 E60A0030 */ swc1 $f10, 0x30($s0) /* 052404 80051804 E7AE0044 */ swc1 $f14, 0x44($sp) /* 052408 80051808 AFA90064 */ sw $t1, 0x64($sp) -/* 05240C 8005180C 0C01C1FE */ jal func_800707F8 +/* 05240C 8005180C 0C01C1FE */ jal sine_s /* 052410 80051810 A3A80057 */ sb $t0, 0x57($sp) /* 052414 80051814 44803000 */ mtc1 $zero, $f6 /* 052418 80051818 83A80057 */ lb $t0, 0x57($sp) diff --git a/asm/non_matchings/racer/func_80055A84.s b/asm/non_matchings/racer/func_80055A84.s index dae70cc5..fe887759 100644 --- a/asm/non_matchings/racer/func_80055A84.s +++ b/asm/non_matchings/racer/func_80055A84.s @@ -177,13 +177,13 @@ glabel func_80055A84 /* 05691C 80055D1C 00000000 */ nop /* 056920 80055D20 00042023 */ negu $a0, $a0 /* 056924 80055D24 00047400 */ sll $t6, $a0, 0x10 -/* 056928 80055D28 0C01C1F1 */ jal func_800707C4 +/* 056928 80055D28 0C01C1F1 */ jal cosine_s /* 05692C 80055D2C 000E2403 */ sra $a0, $t6, 0x10 /* 056930 80055D30 86240000 */ lh $a0, ($s1) /* 056934 80055D34 E7A00058 */ swc1 $f0, 0x58($sp) /* 056938 80055D38 00042023 */ negu $a0, $a0 /* 05693C 80055D3C 0004C400 */ sll $t8, $a0, 0x10 -/* 056940 80055D40 0C01C1FE */ jal func_800707F8 +/* 056940 80055D40 0C01C1FE */ jal sine_s /* 056944 80055D44 00182403 */ sra $a0, $t8, 0x10 /* 056948 80055D48 C7B00068 */ lwc1 $f16, 0x68($sp) /* 05694C 80055D4C C7A20058 */ lwc1 $f2, 0x58($sp) diff --git a/asm/non_matchings/racer/func_800581E8.s b/asm/non_matchings/racer/func_800581E8.s index a3478f9b..81ea8432 100644 --- a/asm/non_matchings/racer/func_800581E8.s +++ b/asm/non_matchings/racer/func_800581E8.s @@ -321,7 +321,7 @@ glabel func_800581E8 /* 059254 80058654 AFA70070 */ sw $a3, 0x70($sp) /* 059258 80058658 01CF2023 */ subu $a0, $t6, $t7 /* 05925C 8005865C 0004C400 */ sll $t8, $a0, 0x10 -/* 059260 80058660 0C01C1F1 */ jal func_800707C4 +/* 059260 80058660 0C01C1F1 */ jal cosine_s /* 059264 80058664 00182403 */ sra $a0, $t8, 0x10 /* 059268 80058668 3C088012 */ lui $t0, %hi(gCameraObject) # $t0, 0x8012 /* 05926C 8005866C 2508D508 */ addiu $t0, %lo(gCameraObject) # addiu $t0, $t0, -0x2af8 @@ -331,7 +331,7 @@ glabel func_800581E8 /* 05927C 8005867C E7A00038 */ swc1 $f0, 0x38($sp) /* 059280 80058680 014B2023 */ subu $a0, $t2, $t3 /* 059284 80058684 00046400 */ sll $t4, $a0, 0x10 -/* 059288 80058688 0C01C1FE */ jal func_800707F8 +/* 059288 80058688 0C01C1FE */ jal sine_s /* 05928C 8005868C 000C2403 */ sra $a0, $t4, 0x10 /* 059290 80058690 3C088012 */ lui $t0, %hi(gCameraObject) # $t0, 0x8012 /* 059294 80058694 2508D508 */ addiu $t0, %lo(gCameraObject) # addiu $t0, $t0, -0x2af8 @@ -353,7 +353,7 @@ glabel func_800581E8 /* 0592D4 800586D4 E7AC0040 */ swc1 $f12, 0x40($sp) /* 0592D8 800586D8 01EE2023 */ subu $a0, $t7, $t6 /* 0592DC 800586DC 0004C400 */ sll $t8, $a0, 0x10 -/* 0592E0 800586E0 0C01C1F1 */ jal func_800707C4 +/* 0592E0 800586E0 0C01C1F1 */ jal cosine_s /* 0592E4 800586E4 00182403 */ sra $a0, $t8, 0x10 /* 0592E8 800586E8 C7AC0040 */ lwc1 $f12, 0x40($sp) /* 0592EC 800586EC 8FA70070 */ lw $a3, 0x70($sp) @@ -364,7 +364,7 @@ glabel func_800581E8 /* 059300 80058700 00000000 */ nop /* 059304 80058704 01492023 */ subu $a0, $t2, $t1 /* 059308 80058708 00045C00 */ sll $t3, $a0, 0x10 -/* 05930C 8005870C 0C01C1FE */ jal func_800707F8 +/* 05930C 8005870C 0C01C1FE */ jal sine_s /* 059310 80058710 000B2403 */ sra $a0, $t3, 0x10 /* 059314 80058714 C7AC0040 */ lwc1 $f12, 0x40($sp) /* 059318 80058718 3C0D8012 */ lui $t5, %hi(gCurrentCarInput) # $t5, 0x8012 @@ -484,7 +484,7 @@ glabel func_800581E8 /* 0594CC 800588CC AFA70070 */ sw $a3, 0x70($sp) /* 0594D0 800588D0 24844000 */ addiu $a0, $a0, 0x4000 /* 0594D4 800588D4 0004C400 */ sll $t8, $a0, 0x10 -/* 0594D8 800588D8 0C01C1F1 */ jal func_800707C4 +/* 0594D8 800588D8 0C01C1F1 */ jal cosine_s /* 0594DC 800588DC 00182403 */ sra $a0, $t8, 0x10 /* 0594E0 800588E0 8FA70070 */ lw $a3, 0x70($sp) /* 0594E4 800588E4 C7A60030 */ lwc1 $f6, 0x30($sp) @@ -556,7 +556,7 @@ glabel func_800581E8 /* 0595E0 800589E0 AFA70070 */ sw $a3, 0x70($sp) /* 0595E4 800589E4 24844000 */ addiu $a0, $a0, 0x4000 /* 0595E8 800589E8 00046400 */ sll $t4, $a0, 0x10 -/* 0595EC 800589EC 0C01C1FE */ jal func_800707F8 +/* 0595EC 800589EC 0C01C1FE */ jal sine_s /* 0595F0 800589F0 000C2403 */ sra $a0, $t4, 0x10 /* 0595F4 800589F4 8FA70070 */ lw $a3, 0x70($sp) /* 0595F8 800589F8 46000107 */ neg.s $f4, $f0 @@ -626,7 +626,7 @@ glabel func_800581E8 /* 0596E8 80058AE8 87040004 */ lh $a0, 4($t8) /* 0596EC 80058AEC 00000000 */ nop .L80058AF0: -/* 0596F0 80058AF0 0C01C1F1 */ jal func_800707C4 +/* 0596F0 80058AF0 0C01C1F1 */ jal cosine_s /* 0596F4 80058AF4 AFA70070 */ sw $a3, 0x70($sp) /* 0596F8 80058AF8 8FA70070 */ lw $a3, 0x70($sp) /* 0596FC 80058AFC 3C088012 */ lui $t0, %hi(gCameraObject) # $t0, 0x8012 diff --git a/asm/non_matchings/racer/func_80059BF0.s b/asm/non_matchings/racer/func_80059BF0.s index 21e27791..2a5127d2 100644 --- a/asm/non_matchings/racer/func_80059BF0.s +++ b/asm/non_matchings/racer/func_80059BF0.s @@ -6,7 +6,7 @@ glabel func_80059BF0 /* 05A800 80059C00 00803025 */ move $a2, $a0 /* 05A804 80059C04 85040164 */ lh $a0, 0x164($t0) /* 05A808 80059C08 AFA60028 */ sw $a2, 0x28($sp) -/* 05A80C 80059C0C 0C01C1FE */ jal func_800707F8 +/* 05A80C 80059C0C 0C01C1FE */ jal sine_s /* 05A810 80059C10 AFA80020 */ sw $t0, 0x20($sp) /* 05A814 80059C14 8FA80020 */ lw $t0, 0x20($sp) /* 05A818 80059C18 E7A00018 */ swc1 $f0, 0x18($sp) @@ -15,7 +15,7 @@ glabel func_80059BF0 /* 05A824 80059C24 00000000 */ nop /* 05A828 80059C28 01CF2023 */ subu $a0, $t6, $t7 /* 05A82C 80059C2C 0004C400 */ sll $t8, $a0, 0x10 -/* 05A830 80059C30 0C01C1FE */ jal func_800707F8 +/* 05A830 80059C30 0C01C1FE */ jal sine_s /* 05A834 80059C34 00182403 */ sra $a0, $t8, 0x10 /* 05A838 80059C38 C7A40018 */ lwc1 $f4, 0x18($sp) /* 05A83C 80059C3C 44803000 */ mtc1 $zero, $f6 diff --git a/asm/non_matchings/racer/func_8005A6F0.s b/asm/non_matchings/racer/func_8005A6F0.s index ba54dab7..a7d6309c 100644 --- a/asm/non_matchings/racer/func_8005A6F0.s +++ b/asm/non_matchings/racer/func_8005A6F0.s @@ -438,7 +438,7 @@ glabel func_8005A6F0 /* 05B8C0 8005ACC0 920F01FF */ lbu $t7, 0x1ff($s0) /* 05B8C4 8005ACC4 00000000 */ nop /* 05B8C8 8005ACC8 000FCE00 */ sll $t9, $t7, 0x18 -/* 05B8CC 8005ACCC 0C01C1F1 */ jal func_800707C4 +/* 05B8CC 8005ACCC 0C01C1F1 */ jal cosine_s /* 05B8D0 8005ACD0 00192403 */ sra $a0, $t9, 0x10 /* 05B8D4 8005ACD4 3C013FB0 */ li $at, 0x3FB00000 # 1.375000 /* 05B8D8 8005ACD8 44817800 */ mtc1 $at, $f15 @@ -461,7 +461,7 @@ glabel func_8005A6F0 /* 05B91C 8005AD1C 462034A0 */ cvt.s.d $f18, $f6 /* 05B920 8005AD20 E6120084 */ swc1 $f18, 0x84($s0) /* 05B924 8005AD24 E7AC0044 */ swc1 $f12, 0x44($sp) -/* 05B928 8005AD28 0C01C1FE */ jal func_800707F8 +/* 05B928 8005AD28 0C01C1FE */ jal sine_s /* 05B92C 8005AD2C E7AD0040 */ swc1 $f13, 0x40($sp) /* 05B930 8005AD30 3C013FB0 */ li $at, 0x3FB00000 # 1.375000 /* 05B934 8005AD34 44817800 */ mtc1 $at, $f15 diff --git a/asm/non_matchings/unknown_005740/func_80005D08.s b/asm/non_matchings/unknown_005740/func_80005D08.s index b7414355..a505d025 100644 --- a/asm/non_matchings/unknown_005740/func_80005D08.s +++ b/asm/non_matchings/unknown_005740/func_80005D08.s @@ -117,7 +117,7 @@ glabel func_80005D08 /* 006A78 80005E78 00047403 */ sra $t6, $a0, 0x10 /* 006A7C 80005E7C 01C02025 */ move $a0, $t6 /* 006A80 80005E80 E7AE001C */ swc1 $f14, 0x1c($sp) -/* 006A84 80005E84 0C01C1F1 */ jal func_800707C4 +/* 006A84 80005E84 0C01C1F1 */ jal cosine_s /* 006A88 80005E88 E7B00030 */ swc1 $f16, 0x30($sp) /* 006A8C 80005E8C 44803000 */ mtc1 $zero, $f6 /* 006A90 80005E90 C7AE001C */ lwc1 $f14, 0x1c($sp) diff --git a/asm/non_matchings/unknown_005740/func_800063EC.s b/asm/non_matchings/unknown_005740/func_800063EC.s index 42836050..e4fb87fb 100644 --- a/asm/non_matchings/unknown_005740/func_800063EC.s +++ b/asm/non_matchings/unknown_005740/func_800063EC.s @@ -300,12 +300,12 @@ glabel func_800063EC /* 007400 80006800 85640002 */ lh $a0, 2($t3) /* 007404 80006804 46067380 */ add.s $f14, $f14, $f6 /* 007408 80006808 E7B2002C */ swc1 $f18, 0x2c($sp) -/* 00740C 8000680C 0C01C1F1 */ jal func_800707C4 +/* 00740C 8000680C 0C01C1F1 */ jal cosine_s /* 007410 80006810 E7AE0018 */ swc1 $f14, 0x18($sp) /* 007414 80006814 8FAC0030 */ lw $t4, 0x30($sp) /* 007418 80006818 E7A00028 */ swc1 $f0, 0x28($sp) /* 00741C 8000681C 85840004 */ lh $a0, 4($t4) -/* 007420 80006820 0C01C1F1 */ jal func_800707C4 +/* 007420 80006820 0C01C1F1 */ jal cosine_s /* 007424 80006824 00000000 */ nop /* 007428 80006828 3C098012 */ lui $t1, %hi(D_80119C38) # $t1, 0x8012 /* 00742C 8000682C 25299C38 */ addiu $t1, %lo(D_80119C38) # addiu $t1, $t1, -0x63c8 diff --git a/asm/non_matchings/unknown_0255E0/func_8002581C.s b/asm/non_matchings/unknown_0255E0/func_8002581C.s index b8b7dba0..b5bdcae5 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002581C.s +++ b/asm/non_matchings/unknown_0255E0/func_8002581C.s @@ -54,7 +54,7 @@ glabel func_8002581C /* 0264D8 800258D8 00000000 */ nop /* 0264DC 800258DC 00042023 */ negu $a0, $a0 /* 0264E0 800258E0 00046C00 */ sll $t5, $a0, 0x10 -/* 0264E4 800258E4 0C01C1F1 */ jal func_800707C4 +/* 0264E4 800258E4 0C01C1F1 */ jal cosine_s /* 0264E8 800258E8 000D2403 */ sra $a0, $t5, 0x10 /* 0264EC 800258EC 8E0F0000 */ lw $t7, ($s0) /* 0264F0 800258F0 46000686 */ mov.s $f26, $f0 @@ -62,7 +62,7 @@ glabel func_8002581C /* 0264F8 800258F8 00000000 */ nop /* 0264FC 800258FC 00042023 */ negu $a0, $a0 /* 026500 80025900 0004C400 */ sll $t8, $a0, 0x10 -/* 026504 80025904 0C01C1FE */ jal func_800707F8 +/* 026504 80025904 0C01C1FE */ jal sine_s /* 026508 80025908 00182403 */ sra $a0, $t8, 0x10 /* 02650C 8002590C 3C01800E */ lui $at, %hi(D_800E5E60 + 4) # $at, 0x800e /* 026510 80025910 C42F5E60 */ lwc1 $f15, %lo(D_800E5E60)($at) diff --git a/asm/non_matchings/unknown_0255E0/func_80028050.s b/asm/non_matchings/unknown_0255E0/func_80028050.s index 0b25df8c..f2f3071e 100644 --- a/asm/non_matchings/unknown_0255E0/func_80028050.s +++ b/asm/non_matchings/unknown_0255E0/func_80028050.s @@ -26,14 +26,14 @@ glabel func_80028050 /* 028CB0 800280B0 00046C00 */ sll $t5, $a0, 0x10 /* 028CB4 800280B4 25F3FFFF */ addiu $s3, $t7, -1 /* 028CB8 800280B8 000D2403 */ sra $a0, $t5, 0x10 -/* 028CBC 800280BC 0C01C1F1 */ jal func_800707C4 +/* 028CBC 800280BC 0C01C1F1 */ jal cosine_s /* 028CC0 800280C0 AFA30074 */ sw $v1, 0x74($sp) /* 028CC4 800280C4 E7A0010C */ swc1 $f0, 0x10c($sp) /* 028CC8 800280C8 86440000 */ lh $a0, ($s2) /* 028CCC 800280CC 00000000 */ nop /* 028CD0 800280D0 00042023 */ negu $a0, $a0 /* 028CD4 800280D4 00047C00 */ sll $t7, $a0, 0x10 -/* 028CD8 800280D8 0C01C1FE */ jal func_800707F8 +/* 028CD8 800280D8 0C01C1FE */ jal sine_s /* 028CDC 800280DC 000F2403 */ sra $a0, $t7, 0x10 /* 028CE0 800280E0 3C0144A0 */ li $at, 0x44A00000 # 1280.000000 /* 028CE4 800280E4 44812000 */ mtc1 $at, $f4 diff --git a/asm/non_matchings/unknown_0255E0/func_8002F440.s b/asm/non_matchings/unknown_0255E0/func_8002F440.s index e4c226f5..1a24097f 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002F440.s +++ b/asm/non_matchings/unknown_0255E0/func_8002F440.s @@ -21,14 +21,14 @@ glabel func_8002F440 /* 030070 8002F470 AFB1001C */ sw $s1, 0x1c($sp) /* 030074 8002F474 AFB00018 */ sw $s0, 0x18($sp) /* 030078 8002F478 85C40000 */ lh $a0, ($t6) -/* 03007C 8002F47C 0C01C1F1 */ jal func_800707C4 +/* 03007C 8002F47C 0C01C1F1 */ jal cosine_s /* 030080 8002F480 241700FF */ li $s7, 255 /* 030084 8002F484 3C0C8012 */ lui $t4, %hi(D_8011D0C4) # $t4, 0x8012 /* 030088 8002F488 258CD0C4 */ addiu $t4, %lo(D_8011D0C4) # addiu $t4, $t4, -0x2f3c /* 03008C 8002F48C 8D8F0000 */ lw $t7, ($t4) /* 030090 8002F490 00000000 */ nop /* 030094 8002F494 85E40000 */ lh $a0, ($t7) -/* 030098 8002F498 0C01C1FE */ jal func_800707F8 +/* 030098 8002F498 0C01C1FE */ jal sine_s /* 03009C 8002F49C E7A00074 */ swc1 $f0, 0x74($sp) /* 0300A0 8002F4A0 3C188012 */ lui $t8, %hi(D_8011D0C0) # $t8, 0x8012 /* 0300A4 8002F4A4 8F18D0C0 */ lw $t8, %lo(D_8011D0C0)($t8) diff --git a/asm/non_matchings/unknown_032760/func_8003E694.s b/asm/non_matchings/unknown_032760/func_8003E694.s index 37866477..87627b38 100644 --- a/asm/non_matchings/unknown_032760/func_8003E694.s +++ b/asm/non_matchings/unknown_032760/func_8003E694.s @@ -340,7 +340,7 @@ glabel func_8003E694 /* 03F784 8003EB84 E6320008 */ swc1 $f18, 8($s1) .L8003EB88: /* 03F788 8003EB88 00046700 */ sll $t4, $a0, 0x1c -/* 03F78C 8003EB8C 0C01C1F1 */ jal func_800707C4 +/* 03F78C 8003EB8C 0C01C1F1 */ jal cosine_s /* 03F790 8003EB90 000C2403 */ sra $a0, $t4, 0x10 /* 03F794 8003EB94 3C013E80 */ li $at, 0x3E800000 # 0.250000 /* 03F798 8003EB98 44812000 */ mtc1 $at, $f4 diff --git a/asm/non_matchings/unknown_032760/obj_init_fish.s b/asm/non_matchings/unknown_032760/obj_init_fish.s index 7ad7af13..8b6a5401 100644 --- a/asm/non_matchings/unknown_032760/obj_init_fish.s +++ b/asm/non_matchings/unknown_032760/obj_init_fish.s @@ -84,24 +84,24 @@ glabel obj_init_fish /* 037954 80036D54 861800FE */ lh $t8, 0xfe($s0) /* 037958 80036D58 00000000 */ nop /* 03795C 80036D5C 0018CC40 */ sll $t9, $t8, 0x11 -/* 037960 80036D60 0C01C1F1 */ jal func_800707C4 +/* 037960 80036D60 0C01C1F1 */ jal cosine_s /* 037964 80036D64 00192403 */ sra $a0, $t9, 0x10 /* 037968 80036D68 C6060114 */ lwc1 $f6, 0x114($s0) /* 03796C 80036D6C 00000000 */ nop /* 037970 80036D70 46060282 */ mul.s $f10, $f0, $f6 /* 037974 80036D74 E7AA0030 */ swc1 $f10, 0x30($sp) /* 037978 80036D78 860400FE */ lh $a0, 0xfe($s0) -/* 03797C 80036D7C 0C01C1FE */ jal func_800707F8 +/* 03797C 80036D7C 0C01C1FE */ jal sine_s /* 037980 80036D80 00000000 */ nop /* 037984 80036D84 C6040114 */ lwc1 $f4, 0x114($s0) /* 037988 80036D88 00000000 */ nop /* 03798C 80036D8C 46040482 */ mul.s $f18, $f0, $f4 /* 037990 80036D90 E7B2002C */ swc1 $f18, 0x2c($sp) /* 037994 80036D94 86040104 */ lh $a0, 0x104($s0) -/* 037998 80036D98 0C01C1F1 */ jal func_800707C4 +/* 037998 80036D98 0C01C1F1 */ jal cosine_s /* 03799C 80036D9C 00000000 */ nop /* 0379A0 80036DA0 86040104 */ lh $a0, 0x104($s0) -/* 0379A4 80036DA4 0C01C1FE */ jal func_800707F8 +/* 0379A4 80036DA4 0C01C1FE */ jal sine_s /* 0379A8 80036DA8 E7A00028 */ swc1 $f0, 0x28($sp) /* 0379AC 80036DAC C7A20030 */ lwc1 $f2, 0x30($sp) /* 0379B0 80036DB0 C7AC0028 */ lwc1 $f12, 0x28($sp) diff --git a/asm/non_matchings/unknown_032760/obj_init_midifade.s b/asm/non_matchings/unknown_032760/obj_init_midifade.s index d99b7675..ecee1455 100644 --- a/asm/non_matchings/unknown_032760/obj_init_midifade.s +++ b/asm/non_matchings/unknown_032760/obj_init_midifade.s @@ -184,11 +184,11 @@ glabel obj_init_midifade /* 042940 80041D40 E7AE0080 */ swc1 $f14, 0x80($sp) /* 042944 80041D44 E7AC006C */ swc1 $f12, 0x6c($sp) /* 042948 80041D48 E7A20070 */ swc1 $f2, 0x70($sp) -/* 04294C 80041D4C 0C01C1FE */ jal func_800707F8 +/* 04294C 80041D4C 0C01C1FE */ jal sine_s /* 042950 80041D50 AFA800FC */ sw $t0, 0xfc($sp) /* 042954 80041D54 E7A00068 */ swc1 $f0, 0x68($sp) /* 042958 80041D58 86040000 */ lh $a0, ($s0) -/* 04295C 80041D5C 0C01C1F1 */ jal func_800707C4 +/* 04295C 80041D5C 0C01C1F1 */ jal cosine_s /* 042960 80041D60 00000000 */ nop /* 042964 80041D64 C7AE0080 */ lwc1 $f14, 0x80($sp) /* 042968 80041D68 C7AA0068 */ lwc1 $f10, 0x68($sp) diff --git a/asm/non_matchings/unknown_032760/obj_loop_butterfly.s b/asm/non_matchings/unknown_032760/obj_loop_butterfly.s index 08fc0594..586a1e61 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_butterfly.s +++ b/asm/non_matchings/unknown_032760/obj_loop_butterfly.s @@ -903,7 +903,7 @@ glabel L8004153C /* 042540 80041940 45010019 */ bc1t .L800419A8 /* 042544 80041944 00000000 */ nop /* 042548 80041948 86040000 */ lh $a0, ($s0) -/* 04254C 8004194C 0C01C1F1 */ jal func_800707C4 +/* 04254C 8004194C 0C01C1F1 */ jal cosine_s /* 042550 80041950 AFA8003C */ sw $t0, 0x3c($sp) /* 042554 80041954 8FA8003C */ lw $t0, 0x3c($sp) /* 042558 80041958 86040000 */ lh $a0, ($s0) @@ -911,7 +911,7 @@ glabel L8004153C /* 042560 80041960 00000000 */ nop /* 042564 80041964 46009287 */ neg.s $f10, $f18 /* 042568 80041968 460A0102 */ mul.s $f4, $f0, $f10 -/* 04256C 8004196C 0C01C1FE */ jal func_800707F8 +/* 04256C 8004196C 0C01C1FE */ jal sine_s /* 042570 80041970 E604001C */ swc1 $f4, 0x1c($s0) /* 042574 80041974 8FA8003C */ lw $t0, 0x3c($sp) /* 042578 80041978 8E05001C */ lw $a1, 0x1c($s0) diff --git a/asm/non_matchings/unknown_032760/obj_loop_effectbox.s b/asm/non_matchings/unknown_032760/obj_loop_effectbox.s index 86220401..99aae354 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_effectbox.s +++ b/asm/non_matchings/unknown_032760/obj_loop_effectbox.s @@ -26,14 +26,14 @@ glabel obj_loop_effectbox /* 0357D4 80034BD4 00047200 */ sll $t6, $a0, 8 /* 0357D8 80034BD8 000E2023 */ negu $a0, $t6 /* 0357DC 80034BDC 00047C00 */ sll $t7, $a0, 0x10 -/* 0357E0 80034BE0 0C01C1FE */ jal func_800707F8 +/* 0357E0 80034BE0 0C01C1FE */ jal sine_s /* 0357E4 80034BE4 000F2403 */ sra $a0, $t7, 0x10 /* 0357E8 80034BE8 9204000B */ lbu $a0, 0xb($s0) /* 0357EC 80034BEC 46000506 */ mov.s $f20, $f0 /* 0357F0 80034BF0 0004CA00 */ sll $t9, $a0, 8 /* 0357F4 80034BF4 00192023 */ negu $a0, $t9 /* 0357F8 80034BF8 00044400 */ sll $t0, $a0, 0x10 -/* 0357FC 80034BFC 0C01C1F1 */ jal func_800707C4 +/* 0357FC 80034BFC 0C01C1F1 */ jal cosine_s /* 035800 80034C00 00082403 */ sra $a0, $t0, 0x10 /* 035804 80034C04 920A0008 */ lbu $t2, 8($s0) /* 035808 80034C08 24020003 */ li $v0, 3 diff --git a/asm/non_matchings/unknown_032760/obj_loop_fish.s b/asm/non_matchings/unknown_032760/obj_loop_fish.s index 0508e3cd..bb9de29e 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_fish.s +++ b/asm/non_matchings/unknown_032760/obj_loop_fish.s @@ -124,20 +124,20 @@ glabel obj_loop_fish /* 037E94 80037294 860B00FE */ lh $t3, 0xfe($s0) /* 037E98 80037298 00000000 */ nop /* 037E9C 8003729C 000B6440 */ sll $t4, $t3, 0x11 -/* 037EA0 800372A0 0C01C1F1 */ jal func_800707C4 +/* 037EA0 800372A0 0C01C1F1 */ jal cosine_s /* 037EA4 800372A4 000C2403 */ sra $a0, $t4, 0x10 /* 037EA8 800372A8 C6080114 */ lwc1 $f8, 0x114($s0) /* 037EAC 800372AC 860400FE */ lh $a0, 0xfe($s0) /* 037EB0 800372B0 46080302 */ mul.s $f12, $f0, $f8 -/* 037EB4 800372B4 0C01C1FE */ jal func_800707F8 +/* 037EB4 800372B4 0C01C1FE */ jal sine_s /* 037EB8 800372B8 E7AC006C */ swc1 $f12, 0x6c($sp) /* 037EBC 800372BC C6040114 */ lwc1 $f4, 0x114($s0) /* 037EC0 800372C0 86040104 */ lh $a0, 0x104($s0) /* 037EC4 800372C4 46040082 */ mul.s $f2, $f0, $f4 -/* 037EC8 800372C8 0C01C1F1 */ jal func_800707C4 +/* 037EC8 800372C8 0C01C1F1 */ jal cosine_s /* 037ECC 800372CC E7A20064 */ swc1 $f2, 0x64($sp) /* 037ED0 800372D0 86040104 */ lh $a0, 0x104($s0) -/* 037ED4 800372D4 0C01C1FE */ jal func_800707F8 +/* 037ED4 800372D4 0C01C1FE */ jal sine_s /* 037ED8 800372D8 E7A0004C */ swc1 $f0, 0x4c($sp) /* 037EDC 800372DC C7AE006C */ lwc1 $f14, 0x6c($sp) /* 037EE0 800372E0 C7A20064 */ lwc1 $f2, 0x64($sp) @@ -261,7 +261,7 @@ glabel obj_loop_fish /* 0380B0 800374B0 000288C3 */ sra $s1, $v0, 3 /* 0380B4 800374B4 00112400 */ sll $a0, $s1, 0x10 /* 0380B8 800374B8 00047403 */ sra $t6, $a0, 0x10 -/* 0380BC 800374BC 0C01C1FE */ jal func_800707F8 +/* 0380BC 800374BC 0C01C1FE */ jal sine_s /* 0380C0 800374C0 01C02025 */ move $a0, $t6 /* 0380C4 800374C4 3C014200 */ li $at, 0x42000000 # 32.000000 /* 0380C8 800374C8 44813000 */ mtc1 $at, $f6 @@ -278,7 +278,7 @@ glabel obj_loop_fish /* 0380F4 800374F4 46005224 */ cvt.w.s $f8, $f10 /* 0380F8 800374F8 44104000 */ mfc1 $s0, $f8 /* 0380FC 800374FC 44D8F800 */ ctc1 $t8, $31 -/* 038100 80037500 0C01C1F1 */ jal func_800707C4 +/* 038100 80037500 0C01C1F1 */ jal cosine_s /* 038104 80037504 00000000 */ nop /* 038108 80037508 3C014200 */ li $at, 0x42000000 # 32.000000 /* 03810C 8003750C 44812000 */ mtc1 $at, $f4 diff --git a/asm/non_matchings/unknown_032760/obj_loop_frog.s b/asm/non_matchings/unknown_032760/obj_loop_frog.s index 6e604efa..e33c944e 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_frog.s +++ b/asm/non_matchings/unknown_032760/obj_loop_frog.s @@ -179,12 +179,12 @@ glabel L80042378 .L80042554: /* 043154 80042554 8604001A */ lh $a0, 0x1a($s0) /* 043158 80042558 AFA30100 */ sw $v1, 0x100($sp) -/* 04315C 8004255C 0C01C1F1 */ jal func_800707C4 +/* 04315C 8004255C 0C01C1F1 */ jal cosine_s /* 043160 80042560 AFA20108 */ sw $v0, 0x108($sp) /* 043164 80042564 C606001C */ lwc1 $f6, 0x1c($s0) /* 043168 80042568 8604001A */ lh $a0, 0x1a($s0) /* 04316C 8004256C 46060202 */ mul.s $f8, $f0, $f6 -/* 043170 80042570 0C01C1FE */ jal func_800707F8 +/* 043170 80042570 0C01C1FE */ jal sine_s /* 043174 80042574 E6080028 */ swc1 $f8, 0x28($s0) /* 043178 80042578 C60A001C */ lwc1 $f10, 0x1c($s0) /* 04317C 8004257C 8FA20108 */ lw $v0, 0x108($sp) @@ -301,7 +301,7 @@ glabel L800426B8 /* 043314 80042714 820B0018 */ lb $t3, 0x18($s0) /* 043318 80042718 00000000 */ nop /* 04331C 8004271C 000B6680 */ sll $t4, $t3, 0x1a -/* 043320 80042720 0C01C1FE */ jal func_800707F8 +/* 043320 80042720 0C01C1FE */ jal sine_s /* 043324 80042724 000C2403 */ sra $a0, $t4, 0x10 /* 043328 80042728 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 04332C 8004272C 44816000 */ mtc1 $at, $f12 diff --git a/asm/non_matchings/unknown_032760/obj_loop_log.s b/asm/non_matchings/unknown_032760/obj_loop_log.s index 339eaf7f..0f38a6d3 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_log.s +++ b/asm/non_matchings/unknown_032760/obj_loop_log.s @@ -64,7 +64,7 @@ glabel obj_loop_log /* 04125C 8004065C 00042023 */ negu $a0, $a0 /* 041260 80040660 00045C00 */ sll $t3, $a0, 0x10 /* 041264 80040664 000B2403 */ sra $a0, $t3, 0x10 -/* 041268 80040668 0C01C1F1 */ jal func_800707C4 +/* 041268 80040668 0C01C1F1 */ jal cosine_s /* 04126C 8004066C AFA30024 */ sw $v1, 0x24($sp) /* 041270 80040670 8FA60028 */ lw $a2, 0x28($sp) /* 041274 80040674 00000000 */ nop @@ -72,7 +72,7 @@ glabel obj_loop_log /* 04127C 8004067C E7A00018 */ swc1 $f0, 0x18($sp) /* 041280 80040680 00042023 */ negu $a0, $a0 /* 041284 80040684 00046C00 */ sll $t5, $a0, 0x10 -/* 041288 80040688 0C01C1FE */ jal func_800707F8 +/* 041288 80040688 0C01C1FE */ jal sine_s /* 04128C 8004068C 000D2403 */ sra $a0, $t5, 0x10 /* 041290 80040690 8FA30024 */ lw $v1, 0x24($sp) /* 041294 80040694 8FA60028 */ lw $a2, 0x28($sp) diff --git a/asm/non_matchings/unknown_032760/obj_loop_parkwarden.s b/asm/non_matchings/unknown_032760/obj_loop_parkwarden.s index 0cd7623c..a6add04c 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_parkwarden.s +++ b/asm/non_matchings/unknown_032760/obj_loop_parkwarden.s @@ -417,12 +417,12 @@ glabel L800397BC /* 03A4D4 800398D4 46208120 */ cvt.s.d $f4, $f16 /* 03A4D8 800398D8 E6240014 */ swc1 $f4, 0x14($s1) /* 03A4DC 800398DC 86040000 */ lh $a0, ($s0) -/* 03A4E0 800398E0 0C01C1F1 */ jal func_800707C4 +/* 03A4E0 800398E0 0C01C1F1 */ jal cosine_s /* 03A4E4 800398E4 00000000 */ nop /* 03A4E8 800398E8 C62A0014 */ lwc1 $f10, 0x14($s1) /* 03A4EC 800398EC 86040000 */ lh $a0, ($s0) /* 03A4F0 800398F0 460A0182 */ mul.s $f6, $f0, $f10 -/* 03A4F4 800398F4 0C01C1FE */ jal func_800707F8 +/* 03A4F4 800398F4 0C01C1FE */ jal sine_s /* 03A4F8 800398F8 E606001C */ swc1 $f6, 0x1c($s0) /* 03A4FC 800398FC C6320014 */ lwc1 $f18, 0x14($s1) /* 03A500 80039900 C7A200AC */ lwc1 $f2, 0xac($sp) @@ -1404,14 +1404,14 @@ glabel L8003A5AC /* 03B334 8003A734 00000000 */ nop /* 03B338 8003A738 00812021 */ addu $a0, $a0, $at /* 03B33C 8003A73C 00046C00 */ sll $t5, $a0, 0x10 -/* 03B340 8003A740 0C01C1F1 */ jal func_800707C4 +/* 03B340 8003A740 0C01C1F1 */ jal cosine_s /* 03B344 8003A744 000D2403 */ sra $a0, $t5, 0x10 /* 03B348 8003A748 E7A000A8 */ swc1 $f0, 0xa8($sp) /* 03B34C 8003A74C 86040000 */ lh $a0, ($s0) /* 03B350 8003A750 34018000 */ li $at, 32768 /* 03B354 8003A754 00812021 */ addu $a0, $a0, $at /* 03B358 8003A758 00047C00 */ sll $t7, $a0, 0x10 -/* 03B35C 8003A75C 0C01C1FE */ jal func_800707F8 +/* 03B35C 8003A75C 0C01C1FE */ jal sine_s /* 03B360 8003A760 000F2403 */ sra $a0, $t7, 0x10 /* 03B364 8003A764 C7AC0048 */ lwc1 $f12, 0x48($sp) /* 03B368 8003A768 C7B200A8 */ lwc1 $f18, 0xa8($sp) diff --git a/asm/non_matchings/unknown_032760/obj_loop_stopwatchman.s b/asm/non_matchings/unknown_032760/obj_loop_stopwatchman.s index 9260271a..d9b5138d 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_stopwatchman.s +++ b/asm/non_matchings/unknown_032760/obj_loop_stopwatchman.s @@ -325,12 +325,12 @@ glabel obj_loop_stopwatchman /* 037270 80036670 462024A0 */ cvt.s.d $f18, $f4 /* 037274 80036674 E6320014 */ swc1 $f18, 0x14($s1) /* 037278 80036678 86040000 */ lh $a0, ($s0) -/* 03727C 8003667C 0C01C1F1 */ jal func_800707C4 +/* 03727C 8003667C 0C01C1F1 */ jal cosine_s /* 037280 80036680 00000000 */ nop /* 037284 80036684 C6280014 */ lwc1 $f8, 0x14($s1) /* 037288 80036688 86040000 */ lh $a0, ($s0) /* 03728C 8003668C 46080282 */ mul.s $f10, $f0, $f8 -/* 037290 80036690 0C01C1FE */ jal func_800707F8 +/* 037290 80036690 0C01C1FE */ jal sine_s /* 037294 80036694 E60A001C */ swc1 $f10, 0x1c($s0) /* 037298 80036698 C6260014 */ lwc1 $f6, 0x14($s1) /* 03729C 8003669C C7A2007C */ lwc1 $f2, 0x7c($sp) diff --git a/asm/non_matchings/waves/func_800B82B4.s b/asm/non_matchings/waves/func_800B82B4.s index 4555f49e..58be6380 100644 --- a/asm/non_matchings/waves/func_800B82B4.s +++ b/asm/non_matchings/waves/func_800B82B4.s @@ -174,12 +174,12 @@ glabel func_800B82B4 .L800B8528: /* 0B9128 800B8528 00162400 */ sll $a0, $s6, 0x10 /* 0B912C 800B852C 00047403 */ sra $t6, $a0, 0x10 -/* 0B9130 800B8530 0C01C1F1 */ jal func_800707C4 +/* 0B9130 800B8530 0C01C1F1 */ jal cosine_s /* 0B9134 800B8534 01C02025 */ move $a0, $t6 /* 0B9138 800B8538 001E2400 */ sll $a0, $fp, 0x10 /* 0B913C 800B853C 00047C03 */ sra $t7, $a0, 0x10 /* 0B9140 800B8540 01E02025 */ move $a0, $t7 -/* 0B9144 800B8544 0C01C1F1 */ jal func_800707C4 +/* 0B9144 800B8544 0C01C1F1 */ jal cosine_s /* 0B9148 800B8548 46000506 */ mov.s $f20, $f0 /* 0B914C 800B854C C6920018 */ lwc1 $f18, 0x18($s4) /* 0B9150 800B8550 C686000C */ lwc1 $f6, 0xc($s4) diff --git a/asm/non_matchings/waves/func_800BC6C8.s b/asm/non_matchings/waves/func_800BC6C8.s index dbece45f..a717fb78 100644 --- a/asm/non_matchings/waves/func_800BC6C8.s +++ b/asm/non_matchings/waves/func_800BC6C8.s @@ -29,7 +29,7 @@ glabel func_800BC6C8 /* 0BD328 800BC728 01E02025 */ move $a0, $t7 /* 0BD32C 800BC72C AFA20234 */ sw $v0, 0x234($sp) /* 0BD330 800BC730 AFA50028 */ sw $a1, 0x28($sp) -/* 0BD334 800BC734 0C01C1F1 */ jal func_800707C4 +/* 0BD334 800BC734 0C01C1F1 */ jal cosine_s /* 0BD338 800BC738 AFAB0244 */ sw $t3, 0x244($sp) /* 0BD33C 800BC73C 3C0A8013 */ lui $t2, %hi(D_80129FC8) # $t2, 0x8013 /* 0BD340 800BC740 8FAB0244 */ lw $t3, 0x244($sp) diff --git a/asm/non_matchings/waves/func_800BEFC4.s b/asm/non_matchings/waves/func_800BEFC4.s index 90066c61..4e7a97cd 100644 --- a/asm/non_matchings/waves/func_800BEFC4.s +++ b/asm/non_matchings/waves/func_800BEFC4.s @@ -228,12 +228,12 @@ glabel func_800BEFC4 /* 0BFF2C 800BF32C 44044000 */ mfc1 $a0, $f8 /* 0BFF30 800BF330 44CCF800 */ ctc1 $t4, $31 /* 0BFF34 800BF334 00046C00 */ sll $t5, $a0, 0x10 -/* 0BFF38 800BF338 0C01C1FE */ jal func_800707F8 +/* 0BFF38 800BF338 0C01C1FE */ jal sine_s /* 0BFF3C 800BF33C 000D2403 */ sra $a0, $t5, 0x10 /* 0BFF40 800BF340 00102400 */ sll $a0, $s0, 0x10 /* 0BFF44 800BF344 00047C03 */ sra $t7, $a0, 0x10 /* 0BFF48 800BF348 46000506 */ mov.s $f20, $f0 -/* 0BFF4C 800BF34C 0C01C1F1 */ jal func_800707C4 +/* 0BFF4C 800BF34C 0C01C1F1 */ jal cosine_s /* 0BFF50 800BF350 01E02025 */ move $a0, $t7 /* 0BFF54 800BF354 C62A0024 */ lwc1 $f10, 0x24($s1) /* 0BFF58 800BF358 00000000 */ nop diff --git a/asm/unknown_070110.s b/asm/unknown_070110.s index 76752920..9bae15fb 100644 --- a/asm/unknown_070110.s +++ b/asm/unknown_070110.s @@ -34,8 +34,8 @@ .include "asm/unknown_070110/func_80070638.s" .include "asm/unknown_070110/func_8007066C.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/cosine_s.s" +.include "asm/unknown_070110/sine_s.s" .include "asm/unknown_070110/func_8007082C.s" .include "asm/unknown_070110/func_80070890.s" .include "asm/unknown_070110/func_80070A2C.s" diff --git a/asm/unknown_070110/func_800707C4.s b/asm/unknown_070110/cosine_s.s similarity index 96% rename from asm/unknown_070110/func_800707C4.s rename to asm/unknown_070110/cosine_s.s index fb84beac..78c66a85 100644 --- a/asm/unknown_070110/func_800707C4.s +++ b/asm/unknown_070110/cosine_s.s @@ -1,4 +1,4 @@ -glabel func_800707C4 +glabel cosine_s /* 0713C4 800707C4 27BDFFF8 */ addiu $sp, $sp, -8 /* 0713C8 800707C8 FFBF0000 */ sd $ra, ($sp) /* 0713CC 800707CC 0C01C20C */ jal func_80070830 diff --git a/asm/unknown_070110/func_80070320.s b/asm/unknown_070110/func_80070320.s index dd6132b2..67a30c9f 100644 --- a/asm/unknown_070110/func_80070320.s +++ b/asm/unknown_070110/func_80070320.s @@ -5,34 +5,34 @@ glabel func_80070320 /* 070F2C 8007032C C4A40000 */ lwc1 $f4, ($a1) /* 070F30 80070330 C4A60004 */ lwc1 $f6, 4($a1) /* 070F34 80070334 C4A80008 */ lwc1 $f8, 8($a1) -/* 070F38 80070338 0C01C1F1 */ jal func_800707C4 +/* 070F38 80070338 0C01C1F1 */ jal cosine_s /* 070F3C 8007033C 84C40004 */ lh $a0, 4($a2) /* 070F40 80070340 46002282 */ mul.s $f10, $f4, $f0 /* 070F44 80070344 84C40004 */ lh $a0, 4($a2) /* 070F48 80070348 46003302 */ mul.s $f12, $f6, $f0 -/* 070F4C 8007034C 0C01C1FE */ jal func_800707F8 +/* 070F4C 8007034C 0C01C1FE */ jal sine_s /* 070F50 80070350 00000000 */ nop /* 070F54 80070354 46002102 */ mul.s $f4, $f4, $f0 /* 070F58 80070358 84C40002 */ lh $a0, 2($a2) /* 070F5C 8007035C 46003182 */ mul.s $f6, $f6, $f0 /* 070F60 80070360 460C2101 */ sub.s $f4, $f4, $f12 -/* 070F64 80070364 0C01C1F1 */ jal func_800707C4 +/* 070F64 80070364 0C01C1F1 */ jal cosine_s /* 070F68 80070368 460A3180 */ add.s $f6, $f6, $f10 /* 070F6C 8007036C 46003282 */ mul.s $f10, $f6, $f0 /* 070F70 80070370 84C40002 */ lh $a0, 2($a2) /* 070F74 80070374 46004302 */ mul.s $f12, $f8, $f0 -/* 070F78 80070378 0C01C1FE */ jal func_800707F8 +/* 070F78 80070378 0C01C1FE */ jal sine_s /* 070F7C 8007037C 00000000 */ nop /* 070F80 80070380 46003182 */ mul.s $f6, $f6, $f0 /* 070F84 80070384 84C40000 */ lh $a0, ($a2) /* 070F88 80070388 46004202 */ mul.s $f8, $f8, $f0 /* 070F8C 8007038C 460C3181 */ sub.s $f6, $f6, $f12 -/* 070F90 80070390 0C01C1F1 */ jal func_800707C4 +/* 070F90 80070390 0C01C1F1 */ jal cosine_s /* 070F94 80070394 460A4200 */ add.s $f8, $f8, $f10 /* 070F98 80070398 46002282 */ mul.s $f10, $f4, $f0 /* 070F9C 8007039C 84C40000 */ lh $a0, ($a2) /* 070FA0 800703A0 46004302 */ mul.s $f12, $f8, $f0 -/* 070FA4 800703A4 0C01C1FE */ jal func_800707F8 +/* 070FA4 800703A4 0C01C1FE */ jal sine_s /* 070FA8 800703A8 00000000 */ nop /* 070FAC 800703AC 46002102 */ mul.s $f4, $f4, $f0 /* 070FB0 800703B0 E4A60004 */ swc1 $f6, 4($a1) diff --git a/asm/unknown_070110/func_800703D8.s b/asm/unknown_070110/func_800703D8.s index e5c77423..d58f5b30 100644 --- a/asm/unknown_070110/func_800703D8.s +++ b/asm/unknown_070110/func_800703D8.s @@ -5,34 +5,34 @@ glabel func_800703D8 /* 070FE4 800703E4 C4A40000 */ lwc1 $f4, ($a1) /* 070FE8 800703E8 C4A60004 */ lwc1 $f6, 4($a1) /* 070FEC 800703EC C4A80008 */ lwc1 $f8, 8($a1) -/* 070FF0 800703F0 0C01C1F1 */ jal func_800707C4 +/* 070FF0 800703F0 0C01C1F1 */ jal cosine_s /* 070FF4 800703F4 84C40000 */ lh $a0, ($a2) /* 070FF8 800703F8 46002282 */ mul.s $f10, $f4, $f0 /* 070FFC 800703FC 84C40000 */ lh $a0, ($a2) /* 071000 80070400 46004302 */ mul.s $f12, $f8, $f0 -/* 071004 80070404 0C01C1FE */ jal func_800707F8 +/* 071004 80070404 0C01C1FE */ jal sine_s /* 071008 80070408 00000000 */ nop /* 07100C 8007040C 46002102 */ mul.s $f4, $f4, $f0 /* 071010 80070410 84C40002 */ lh $a0, 2($a2) /* 071014 80070414 46004202 */ mul.s $f8, $f8, $f0 /* 071018 80070418 460C2100 */ add.s $f4, $f4, $f12 -/* 07101C 8007041C 0C01C1F1 */ jal func_800707C4 +/* 07101C 8007041C 0C01C1F1 */ jal cosine_s /* 071020 80070420 460A4201 */ sub.s $f8, $f8, $f10 /* 071024 80070424 46003282 */ mul.s $f10, $f6, $f0 /* 071028 80070428 84C40002 */ lh $a0, 2($a2) /* 07102C 8007042C 46004302 */ mul.s $f12, $f8, $f0 -/* 071030 80070430 0C01C1FE */ jal func_800707F8 +/* 071030 80070430 0C01C1FE */ jal sine_s /* 071034 80070434 00000000 */ nop /* 071038 80070438 46003182 */ mul.s $f6, $f6, $f0 /* 07103C 8007043C 84C40004 */ lh $a0, 4($a2) /* 071040 80070440 46004202 */ mul.s $f8, $f8, $f0 /* 071044 80070444 460C3181 */ sub.s $f6, $f6, $f12 -/* 071048 80070448 0C01C1F1 */ jal func_800707C4 +/* 071048 80070448 0C01C1F1 */ jal cosine_s /* 07104C 8007044C 460A4200 */ add.s $f8, $f8, $f10 /* 071050 80070450 46002282 */ mul.s $f10, $f4, $f0 /* 071054 80070454 84C40004 */ lh $a0, 4($a2) /* 071058 80070458 46003302 */ mul.s $f12, $f6, $f0 -/* 07105C 8007045C 0C01C1FE */ jal func_800707F8 +/* 07105C 8007045C 0C01C1FE */ jal sine_s /* 071060 80070460 00000000 */ nop /* 071064 80070464 46002102 */ mul.s $f4, $f4, $f0 /* 071068 80070468 E4A80008 */ swc1 $f8, 8($a1) diff --git a/asm/unknown_070110/func_80070490.s b/asm/unknown_070110/func_80070490.s index afed0ef2..7a641198 100644 --- a/asm/unknown_070110/func_80070490.s +++ b/asm/unknown_070110/func_80070490.s @@ -3,17 +3,17 @@ glabel func_80070490 /* 071094 80070494 FFBF0000 */ sd $ra, ($sp) /* 071098 80070498 00803025 */ move $a2, $a0 /* 07109C 8007049C C4A80008 */ lwc1 $f8, 8($a1) -/* 0710A0 800704A0 0C01C1F1 */ jal func_800707C4 +/* 0710A0 800704A0 0C01C1F1 */ jal cosine_s /* 0710A4 800704A4 84C40002 */ lh $a0, 2($a2) /* 0710A8 800704A8 46004182 */ mul.s $f6, $f8, $f0 -/* 0710AC 800704AC 0C01C1FE */ jal func_800707F8 +/* 0710AC 800704AC 0C01C1FE */ jal sine_s /* 0710B0 800704B0 84C40002 */ lh $a0, 2($a2) /* 0710B4 800704B4 46004202 */ mul.s $f8, $f8, $f0 /* 0710B8 800704B8 46003187 */ neg.s $f6, $f6 -/* 0710BC 800704BC 0C01C1F1 */ jal func_800707C4 +/* 0710BC 800704BC 0C01C1F1 */ jal cosine_s /* 0710C0 800704C0 84C40000 */ lh $a0, ($a2) /* 0710C4 800704C4 46004102 */ mul.s $f4, $f8, $f0 -/* 0710C8 800704C8 0C01C1FE */ jal func_800707F8 +/* 0710C8 800704C8 0C01C1FE */ jal sine_s /* 0710CC 800704CC 84C40000 */ lh $a0, ($a2) /* 0710D0 800704D0 46004202 */ mul.s $f8, $f8, $f0 /* 0710D4 800704D4 E4A40000 */ swc1 $f4, ($a1) diff --git a/asm/unknown_070110/func_800707F8.s b/asm/unknown_070110/sine_s.s similarity index 96% rename from asm/unknown_070110/func_800707F8.s rename to asm/unknown_070110/sine_s.s index 67e0472d..d09edd66 100644 --- a/asm/unknown_070110/func_800707F8.s +++ b/asm/unknown_070110/sine_s.s @@ -1,4 +1,4 @@ -glabel func_800707F8 +glabel sine_s /* 0713F8 800707F8 27BDFFF8 */ addiu $sp, $sp, -8 /* 0713FC 800707FC FFBF0000 */ sd $ra, ($sp) /* 071400 80070800 0C01C20B */ jal func_8007082C diff --git a/include/math_util.h b/include/math_util.h index 1b693a45..3ec99cc9 100644 --- a/include/math_util.h +++ b/include/math_util.h @@ -5,5 +5,7 @@ #include "structs.h" extern s16 atan2f(f32 y, f32 x); +extern f32 sine_s(s16 angle); +extern f32 cosine_s(s16 angle); #endif // MATH_UTIL_H diff --git a/src/object_functions.c b/src/object_functions.c index c7a2401b..27c46444 100644 --- a/src/object_functions.c +++ b/src/object_functions.c @@ -455,8 +455,8 @@ void obj_init_effectbox(UNUSED Object *obj, UNUSED LevelObjectEntry_EffectBox *e // Has regalloc & stack issues. -f32 func_800707C4(s16); -f32 func_800707F8(s16); +f32 cosine_s(s16); +f32 sine_s(s16); Object **get_object_struct_array(s32 *count); void obj_loop_effectbox(Object *obj, s32 speed) { @@ -479,8 +479,8 @@ void obj_loop_effectbox(Object *obj, s32 speed) { obj3C = obj->segment.unk3C_a.unk3C; objList = get_object_struct_array(&numberOfObjects); - temp0 = func_800707F8((obj3C->unkB << 8) * -1); - temp1 = func_800707C4((obj3C->unkB << 8) * -1); + temp0 = sine_s((obj3C->unkB << 8) * -1); + temp1 = cosine_s((obj3C->unkB << 8) * -1); temp2 = obj3C->unk8 * 3; temp3 = obj3C->unk9 * 3; temp4 = obj3C->unkA * 3; @@ -1486,9 +1486,9 @@ void obj_init_exit(Object *obj, LevelObjectEntry_Exit *entry) { phi_f0 /= 128; obj->segment.trans.scale = phi_f0; obj->segment.trans.y_rotation = entry->unk11 << 6 << 4; - obj64->unk0 = func_800707C4(obj->segment.trans.y_rotation); + obj64->unk0 = cosine_s(obj->segment.trans.y_rotation); obj64->unk4 = 0.0f; - obj64->unk8 = func_800707F8(obj->segment.trans.y_rotation); + obj64->unk8 = sine_s(obj->segment.trans.y_rotation); obj64->unkC = -((obj64->unk0 * obj->segment.trans.x_position) + (obj64->unk8 * obj->segment.trans.z_position)); obj64->unk10 = entry->unk10; obj64->unk14 = entry->unk18; @@ -1657,9 +1657,9 @@ void obj_init_modechange(Object *obj, LevelObjectEntry_ModeChange *entry) { phi_f0 /= 128; obj->segment.trans.scale = phi_f0; obj->segment.trans.y_rotation = entry->unk9 << 6 << 4; - obj64->unk0 = func_800707C4(obj->segment.trans.y_rotation); + obj64->unk0 = cosine_s(obj->segment.trans.y_rotation); obj64->unk4 = 0.0f; - obj64->unk8 = func_800707F8(obj->segment.trans.y_rotation); + obj64->unk8 = sine_s(obj->segment.trans.y_rotation); obj64->unkC = -((obj64->unk0 * obj->segment.trans.x_position) + (obj64->unk8 * obj->segment.trans.z_position)); obj64->unk10 = entry->unk8; obj64->unk14 = entry->unkA; @@ -1682,9 +1682,9 @@ void obj_init_bonus(Object *obj, LevelObjectEntry_Bonus *entry) { phi_f0 /= 128; obj->segment.trans.scale = phi_f0; obj->segment.trans.y_rotation = entry->unk9 << 6 << 4; - obj64->unk0 = func_800707C4(obj->segment.trans.y_rotation); + obj64->unk0 = cosine_s(obj->segment.trans.y_rotation); obj64->unk4 = 0.0f; - obj64->unk8 = func_800707F8(obj->segment.trans.y_rotation); + obj64->unk8 = sine_s(obj->segment.trans.y_rotation); obj64->unkC = -((obj64->unk0 * obj->segment.trans.x_position) + (obj64->unk8 * obj->segment.trans.z_position)); obj64->unk10 = entry->unk8; obj64->unk14 = entry->unkA; @@ -1955,9 +1955,9 @@ void obj_init_trigger(Object *obj, LevelObjectEntry_Trigger *entry) { phi_f0 /= 128; obj->segment.trans.scale = phi_f0; obj->segment.trans.y_rotation = entry->rotation << 6 << 4; - obj64->unk0 = func_800707C4(obj->segment.trans.y_rotation); + obj64->unk0 = cosine_s(obj->segment.trans.y_rotation); obj64->unk4 = 0.0f; - obj64->unk8 = func_800707F8(obj->segment.trans.y_rotation); + obj64->unk8 = sine_s(obj->segment.trans.y_rotation); obj64->unkC = -((obj64->unk0 * obj->segment.trans.x_position) + (obj64->unk8 * obj->segment.trans.z_position)); obj64->unk10 = entry->scale; obj64->unk14 = entry->unkD; diff --git a/src/object_functions.h b/src/object_functions.h index baee3195..95b27beb 100644 --- a/src/object_functions.h +++ b/src/object_functions.h @@ -246,8 +246,8 @@ extern Triangle D_800DCAA8[8]; extern VertexPosition D_800DCB28[6]; extern u32 osTvType; -f32 func_800707C4(s16); // No idea where it's located -f32 func_800707F8(s16); // No idea where it's located +f32 cosine_s(s16); // No idea where it's located +f32 sine_s(s16); // No idea where it's located s32 get_random_number_from_range(s32, s32); // Non Matching src/unknown_070110.c s32 func_8007066C(s32, s32); // Non Matching src/unknown_070110.c diff --git a/src/objects.c b/src/objects.c index 0e197942..8d086ab1 100644 --- a/src/objects.c +++ b/src/objects.c @@ -996,9 +996,9 @@ void func_80012E28(Object *this) { sp_1c = 0.0f; if (sp_20->unk1D7 < 5) { - sp_1c = func_800707F8(sp_20->z_rotation_offset); + sp_1c = sine_s(sp_20->z_rotation_offset); tmp_f2 = sp_1c; - tmp_f0 = func_800707F8(sp_20->y_rotation_offset - sp_20->unk166) * tmp_f2; + tmp_f0 = sine_s(sp_20->y_rotation_offset - sp_20->unk166) * tmp_f2; tmp_f0 = (tmp_f0 < 0.0f) ? 0.0f : tmp_f0 * tmp_f0; diff --git a/src/objects.h b/src/objects.h index 1df3bd2c..8366cab3 100644 --- a/src/objects.h +++ b/src/objects.h @@ -124,7 +124,7 @@ extern s32 D_800DC85C; extern u8 D_800DC860; extern u16 D_800DC864; -f32 func_800707F8(s16); //? +f32 sine_s(s16); //? Object *func_8000BF44(s32 arg0); void func_8000BF8C(void); diff --git a/src/racer.c b/src/racer.c index e5aced07..a7ded5f6 100644 --- a/src/racer.c +++ b/src/racer.c @@ -1088,8 +1088,8 @@ void func_80058B84(f32 arg0, Object* obj, Object_Racer* arg2) { gCameraObject->trans.x_rotation = 0x400; gCameraObject->trans.z_rotation = 0; gCameraObject->unk1C = 150.0f; - xOffset = func_800707C4(0x8000 - gCameraObject->trans.y_rotation) * gCameraObject->unk1C; - zOffset = func_800707F8(0x8000 - gCameraObject->trans.y_rotation) * gCameraObject->unk1C; + xOffset = cosine_s(0x8000 - gCameraObject->trans.y_rotation) * gCameraObject->unk1C; + zOffset = sine_s(0x8000 - gCameraObject->trans.y_rotation) * gCameraObject->unk1C; gCameraObject->trans.x_position = obj->segment.trans.x_position + xOffset; temp_f12 = (gCameraObject->trans.y_position - (obj->segment.trans.y_position + 45.0f)) * 0.25; if (temp_f12 < -2.0) { diff --git a/src/unknown_032760.c b/src/unknown_032760.c index 65246d53..2e2ca77d 100644 --- a/src/unknown_032760.c +++ b/src/unknown_032760.c @@ -349,11 +349,11 @@ f32 func_80033A14(unk800DC950 *arg0) { out *= temp; break; case 3: - temp = func_800707F8(sqrtf(D_8011D4C0) * arg0->unk6C * 16384.0f); + temp = sine_s(sqrtf(D_8011D4C0) * arg0->unk6C * 16384.0f); out *= temp; break; case 4: - temp = func_800707F8(sqrtf(D_8011D4C0) * arg0->unk6C * 16384.0f); + temp = sine_s(sqrtf(D_8011D4C0) * arg0->unk6C * 16384.0f); temp *= temp; out *= temp; break; diff --git a/src/unknown_032760.h b/src/unknown_032760.h index 986454da..025af2c9 100644 --- a/src/unknown_032760.h +++ b/src/unknown_032760.h @@ -82,7 +82,7 @@ typedef struct unk800DC964 { extern unk800DC950 **D_800DC950; -f32 func_800707F8(s16); //? +f32 sine_s(s16); //? void func_80031B60(void); void func_80032210(unk800DC950 *arg0); diff --git a/src/weather.c b/src/weather.c index 917293f6..b3b49634 100644 --- a/src/weather.c +++ b/src/weather.c @@ -495,8 +495,8 @@ void func_800ADBC8(UNUSED s32 arg0) { f32 temp_f2; sp28 = 1152.0f - (f32) (D_800E2C60 >> 6); - sp24 = func_800707C4(D_80127C1C->trans.y_rotation) * sp28; - temp_f2 = func_800707F8(D_80127C1C->trans.y_rotation) * sp28; + sp24 = cosine_s(D_80127C1C->trans.y_rotation) * sp28; + temp_f2 = sine_s(D_80127C1C->trans.y_rotation) * sp28; temp_f14 = D_80127C1C->trans.x_position + (temp_f2 - sp24); temp_f16 = D_80127C1C->trans.y_position; temp_f18 = D_80127C1C->trans.z_position + (-temp_f2 - sp24); diff --git a/src/weather.h b/src/weather.h index 1eb7403a..763e683f 100644 --- a/src/weather.h +++ b/src/weather.h @@ -91,8 +91,8 @@ void func_800ADAB8(s32); void func_800ADCBC(unk800E2C2C*, s32); void func_800ABE68(Gfx **currDisplayList, Mtx **currHudMat, VertexList **currHudVerts, TriangleList **currHudTris, s32 updateRate); -f32 func_800707C4(s16); -f32 func_800707F8(s16); +f32 cosine_s(s16); +f32 sine_s(s16); s32 func_8007082C(s16); s32 func_80070830(s16); void func_800AB35C(void);