diff --git a/asm/non_matchings/code/code_80043480/func_800435D8.s b/asm/non_matchings/code/code_80043480/func_800435D8.s index 53733b1023..1d2fc5cf72 100644 --- a/asm/non_matchings/code/code_80043480/func_800435D8.s +++ b/asm/non_matchings/code/code_80043480/func_800435D8.s @@ -14,10 +14,10 @@ glabel func_800435D8 /* ABA788 800435E8 AFA60098 */ sw $a2, 0x98($sp) /* ABA78C 800435EC AFA7009C */ sw $a3, 0x9c($sp) /* ABA790 800435F0 00A08025 */ move $s0, $a1 -/* ABA794 800435F4 0C01DE1C */ jal Math_Sins +/* ABA794 800435F4 0C01DE1C */ jal Math_SinS /* ABA798 800435F8 84A40158 */ lh $a0, 0x158($a1) /* ABA79C 800435FC 86040158 */ lh $a0, 0x158($s0) -/* ABA7A0 80043600 0C01DE0D */ jal Math_Coss +/* ABA7A0 80043600 0C01DE0D */ jal Math_CosS /* ABA7A4 80043604 E7A00068 */ swc1 $f0, 0x68($sp) /* ABA7A8 80043608 C6040150 */ lwc1 $f4, 0x150($s0) /* ABA7AC 8004360C 44803000 */ mtc1 $zero, $f6 diff --git a/asm/non_matchings/code/db_camera/func_800B3BD4.s b/asm/non_matchings/code/db_camera/func_800B3BD4.s index 1897bc3b54..2a57e6224c 100644 --- a/asm/non_matchings/code/db_camera/func_800B3BD4.s +++ b/asm/non_matchings/code/db_camera/func_800B3BD4.s @@ -7,26 +7,26 @@ glabel func_800B3BD4 /* B2AD88 800B3BE8 F7B40010 */ sdc1 $f20, 0x10($sp) /* B2AD8C 800B3BEC AFA600C8 */ sw $a2, 0xc8($sp) /* B2AD90 800B3BF0 AFA700CC */ sw $a3, 0xcc($sp) -/* B2AD94 800B3BF4 0C01DE1C */ jal Math_Sins +/* B2AD94 800B3BF4 0C01DE1C */ jal Math_SinS /* B2AD98 800B3BF8 87A400C6 */ lh $a0, 0xc6($sp) /* B2AD9C 800B3BFC 46000586 */ mov.s $f22, $f0 -/* B2ADA0 800B3C00 0C01DE0D */ jal Math_Coss +/* B2ADA0 800B3C00 0C01DE0D */ jal Math_CosS /* B2ADA4 800B3C04 87A400C6 */ lh $a0, 0xc6($sp) /* B2ADA8 800B3C08 46000506 */ mov.s $f20, $f0 -/* B2ADAC 800B3C0C 0C01DE1C */ jal Math_Sins +/* B2ADAC 800B3C0C 0C01DE1C */ jal Math_SinS /* B2ADB0 800B3C10 87A400CA */ lh $a0, 0xca($sp) /* B2ADB4 800B3C14 E7A000B4 */ swc1 $f0, 0xb4($sp) -/* B2ADB8 800B3C18 0C01DE0D */ jal Math_Coss +/* B2ADB8 800B3C18 0C01DE0D */ jal Math_CosS /* B2ADBC 800B3C1C 87A400CA */ lh $a0, 0xca($sp) /* B2ADC0 800B3C20 87A400CE */ lh $a0, 0xce($sp) /* B2ADC4 800B3C24 E7A000B0 */ swc1 $f0, 0xb0($sp) /* B2ADC8 800B3C28 00042023 */ negu $a0, $a0 /* B2ADCC 800B3C2C 00042400 */ sll $a0, $a0, 0x10 /* B2ADD0 800B3C30 00042403 */ sra $a0, $a0, 0x10 -/* B2ADD4 800B3C34 0C01DE1C */ jal Math_Sins +/* B2ADD4 800B3C34 0C01DE1C */ jal Math_SinS /* B2ADD8 800B3C38 AFA4005C */ sw $a0, 0x5c($sp) /* B2ADDC 800B3C3C 8FA4005C */ lw $a0, 0x5c($sp) -/* B2ADE0 800B3C40 0C01DE0D */ jal Math_Coss +/* B2ADE0 800B3C40 0C01DE0D */ jal Math_CosS /* B2ADE4 800B3C44 E7A000AC */ swc1 $f0, 0xac($sp) /* B2ADE8 800B3C48 4600B287 */ neg.s $f10, $f22 /* B2ADEC 800B3C4C C7A400B4 */ lwc1 $f4, 0xb4($sp) diff --git a/asm/non_matchings/code/sys_matrix/func_800D20CC.s b/asm/non_matchings/code/sys_matrix/func_800D20CC.s index 5e3a8efcdd..e84e7cb690 100644 --- a/asm/non_matchings/code/sys_matrix/func_800D20CC.s +++ b/asm/non_matchings/code/sys_matrix/func_800D20CC.s @@ -30,7 +30,7 @@ glabel func_800D20CC /* B49298 800D20F8 46021102 */ mul.s $f4, $f2, $f2 /* B4929C 800D20FC 46006307 */ neg.s $f12, $f12 /* B492A0 800D2100 4604A500 */ add.s $f20, $f20, $f4 -/* B492A4 800D2104 0C03F494 */ jal Math_atan2f +/* B492A4 800D2104 0C03F494 */ jal Math_FAtan2F /* B492A8 800D2108 4600A384 */ sqrt.s $f14, $f20 /* B492AC 800D210C 3C018014 */ lui $at, %hi(D_80146640) /* B492B0 800D2110 C4266640 */ lwc1 $f6, %lo(D_80146640)($at) @@ -50,7 +50,7 @@ glabel func_800D20CC /* B492E4 800D2144 A6000004 */ sh $zero, 4($s0) /* B492E8 800D2148 C48C0008 */ lwc1 $f12, 8($a0) /* B492EC 800D214C C48E0000 */ lwc1 $f14, ($a0) -/* B492F0 800D2150 0C03F494 */ jal Math_atan2f +/* B492F0 800D2150 0C03F494 */ jal Math_FAtan2F /* B492F4 800D2154 46006307 */ neg.s $f12, $f12 /* B492F8 800D2158 3C018014 */ lui $at, %hi(D_80146644) /* B492FC 800D215C C4326644 */ lwc1 $f18, %lo(D_80146644)($at) @@ -62,7 +62,7 @@ glabel func_800D20CC /* B49314 800D2174 C48C0020 */ lwc1 $f12, 0x20($a0) .L800D2178: /* B49318 800D2178 C48E0028 */ lwc1 $f14, 0x28($a0) -/* B4931C 800D217C 0C03F494 */ jal Math_atan2f +/* B4931C 800D217C 0C03F494 */ jal Math_FAtan2F /* B49320 800D2180 AFA40028 */ sw $a0, 0x28($sp) /* B49324 800D2184 3C018014 */ lui $at, %hi(D_80146648) /* B49328 800D2188 C4286648 */ lwc1 $f8, %lo(D_80146648)($at) @@ -76,7 +76,7 @@ glabel func_800D20CC /* B49348 800D21A8 5540000C */ bnezl $t2, .L800D21DC /* B4934C 800D21AC C4940000 */ lwc1 $f20, ($a0) /* B49350 800D21B0 C48C0004 */ lwc1 $f12, 4($a0) -/* B49354 800D21B4 0C03F494 */ jal Math_atan2f +/* B49354 800D21B4 0C03F494 */ jal Math_FAtan2F /* B49358 800D21B8 C48E0014 */ lwc1 $f14, 0x14($a0) /* B4935C 800D21BC 3C018014 */ lui $at, %hi(D_8014664C) /* B49360 800D21C0 C424664C */ lwc1 $f4, %lo(D_8014664C)($at) @@ -107,7 +107,7 @@ glabel func_800D20CC /* B493C0 800D2220 46041080 */ add.s $f2, $f2, $f4 /* B493C4 800D2224 46061080 */ add.s $f2, $f2, $f6 /* B493C8 800D2228 46001004 */ sqrt.s $f0, $f2 -/* B493CC 800D222C 0C03F494 */ jal Math_atan2f +/* B493CC 800D222C 0C03F494 */ jal Math_FAtan2F /* B493D0 800D2230 46008383 */ div.s $f14, $f16, $f0 /* B493D4 800D2234 3C018014 */ lui $at, %hi(D_80146650) /* B493D8 800D2238 C4286650 */ lwc1 $f8, %lo(D_80146650)($at) diff --git a/asm/non_matchings/code/sys_matrix/func_800D2264.s b/asm/non_matchings/code/sys_matrix/func_800D2264.s index 0d1893e827..e3d50d37a7 100644 --- a/asm/non_matchings/code/sys_matrix/func_800D2264.s +++ b/asm/non_matchings/code/sys_matrix/func_800D2264.s @@ -30,7 +30,7 @@ glabel func_800D2264 /* B49430 800D2290 46021102 */ mul.s $f4, $f2, $f2 /* B49434 800D2294 46006307 */ neg.s $f12, $f12 /* B49438 800D2298 4604A500 */ add.s $f20, $f20, $f4 -/* B4943C 800D229C 0C03F494 */ jal Math_atan2f +/* B4943C 800D229C 0C03F494 */ jal Math_FAtan2F /* B49440 800D22A0 4600A384 */ sqrt.s $f14, $f20 /* B49444 800D22A4 3C018014 */ lui $at, %hi(D_80146654) /* B49448 800D22A8 C4266654 */ lwc1 $f6, %lo(D_80146654)($at) @@ -50,7 +50,7 @@ glabel func_800D2264 /* B4947C 800D22DC A6000000 */ sh $zero, ($s0) /* B49480 800D22E0 C48C0010 */ lwc1 $f12, 0x10($a0) /* B49484 800D22E4 C48E0014 */ lwc1 $f14, 0x14($a0) -/* B49488 800D22E8 0C03F494 */ jal Math_atan2f +/* B49488 800D22E8 0C03F494 */ jal Math_FAtan2F /* B4948C 800D22EC 46006307 */ neg.s $f12, $f12 /* B49490 800D22F0 3C018014 */ lui $at, %hi(D_80146658) /* B49494 800D22F4 C4326658 */ lwc1 $f18, %lo(D_80146658)($at) @@ -62,7 +62,7 @@ glabel func_800D2264 /* B494AC 800D230C C48C0004 */ lwc1 $f12, 4($a0) .L800D2310: /* B494B0 800D2310 C48E0000 */ lwc1 $f14, ($a0) -/* B494B4 800D2314 0C03F494 */ jal Math_atan2f +/* B494B4 800D2314 0C03F494 */ jal Math_FAtan2F /* B494B8 800D2318 AFA40028 */ sw $a0, 0x28($sp) /* B494BC 800D231C 3C018014 */ lui $at, %hi(D_8014665C) /* B494C0 800D2320 C428665C */ lwc1 $f8, %lo(D_8014665C)($at) @@ -76,7 +76,7 @@ glabel func_800D2264 /* B494E0 800D2340 5540000C */ bnezl $t2, .L800D2374 /* B494E4 800D2344 C4940010 */ lwc1 $f20, 0x10($a0) /* B494E8 800D2348 C48C0018 */ lwc1 $f12, 0x18($a0) -/* B494EC 800D234C 0C03F494 */ jal Math_atan2f +/* B494EC 800D234C 0C03F494 */ jal Math_FAtan2F /* B494F0 800D2350 C48E0028 */ lwc1 $f14, 0x28($a0) /* B494F4 800D2354 3C018014 */ lui $at, %hi(D_80146660) /* B494F8 800D2358 C4246660 */ lwc1 $f4, %lo(D_80146660)($at) @@ -107,7 +107,7 @@ glabel func_800D2264 /* B49558 800D23B8 46041080 */ add.s $f2, $f2, $f4 /* B4955C 800D23BC 46061080 */ add.s $f2, $f2, $f6 /* B49560 800D23C0 46001004 */ sqrt.s $f0, $f2 -/* B49564 800D23C4 0C03F494 */ jal Math_atan2f +/* B49564 800D23C4 0C03F494 */ jal Math_FAtan2F /* B49568 800D23C8 46008383 */ div.s $f14, $f16, $f0 /* B4956C 800D23CC 3C018014 */ lui $at, %hi(D_80146664) /* B49570 800D23D0 C4286664 */ lwc1 $f8, %lo(D_80146664)($at) diff --git a/asm/non_matchings/code/z_actor/func_8002FBAC.s b/asm/non_matchings/code/z_actor/func_8002FBAC.s index 77a07d8fc1..066f6bbbcf 100644 --- a/asm/non_matchings/code/z_actor/func_8002FBAC.s +++ b/asm/non_matchings/code/z_actor/func_8002FBAC.s @@ -170,7 +170,7 @@ glabel func_8002FBAC /* AA6EF8 8002FD58 44067000 */ mfc1 $a2, $f14 .L8002FD5C: /* AA6EFC 8002FD5C E7AC009C */ swc1 $f12, 0x9c($sp) -/* AA6F00 8002FD60 0C01DE80 */ jal Math_ApproxF +/* AA6F00 8002FD60 0C01DE80 */ jal Math_StepToF /* AA6F04 8002FD64 E7B000B0 */ swc1 $f16, 0xb0($sp) /* AA6F08 8002FD68 3C018016 */ lui $at, %hi(D_8015BC18) /* AA6F0C 8002FD6C C426BC18 */ lwc1 $f6, %lo(D_8015BC18)($at) @@ -227,12 +227,12 @@ glabel func_8002FBAC /* AA6FD8 8002FE38 3C0140C0 */ li $at, 0x40C00000 # 0.000000 .L8002FE3C: /* AA6FDC 8002FE3C 44816000 */ mtc1 $at, $f12 -/* AA6FE0 8002FE40 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* AA6FE0 8002FE40 0C00CFC8 */ jal Rand_CenteredFloat /* AA6FE4 8002FE44 00000000 */ nop /* AA6FE8 8002FE48 3C018016 */ lui $at, %hi(gSaveContext+0x13a0) /* AA6FEC 8002FE4C C426FA00 */ lwc1 $f6, %lo(gSaveContext+0x13a0)($at) /* AA6FF0 8002FE50 46060280 */ add.s $f10, $f0, $f6 -/* AA6FF4 8002FE54 0C03F66B */ jal Math_Rand_ZeroOne +/* AA6FF4 8002FE54 0C03F66B */ jal Rand_ZeroOne /* AA6FF8 8002FE58 E7AA00A4 */ swc1 $f10, 0xa4($sp) /* AA6FFC 8002FE5C 3C0140C0 */ li $at, 0x40C00000 # 0.000000 /* AA7000 8002FE60 44816000 */ mtc1 $at, $f12 @@ -244,7 +244,7 @@ glabel func_8002FBAC /* AA7018 8002FE78 00000000 */ nop /* AA701C 8002FE7C 46044180 */ add.s $f6, $f8, $f4 /* AA7020 8002FE80 46065200 */ add.s $f8, $f10, $f6 -/* AA7024 8002FE84 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* AA7024 8002FE84 0C00CFC8 */ jal Rand_CenteredFloat /* AA7028 8002FE88 E7A800A8 */ swc1 $f8, 0xa8($sp) /* AA702C 8002FE8C 3C018016 */ lui $at, %hi(gSaveContext+0x13a8) /* AA7030 8002FE90 C424FA08 */ lwc1 $f4, %lo(gSaveContext+0x13a8)($at) diff --git a/asm/non_matchings/code/z_actor/func_800344BC.s b/asm/non_matchings/code/z_actor/func_800344BC.s index 7c693b63f6..fb05a90839 100644 --- a/asm/non_matchings/code/z_actor/func_800344BC.s +++ b/asm/non_matchings/code/z_actor/func_800344BC.s @@ -54,7 +54,7 @@ glabel func_800344BC /* AAB720 80034580 240A0001 */ li $t2, 1 /* AAB724 80034584 AFAA0010 */ sw $t2, 0x10($sp) /* AAB728 80034588 2504000A */ addiu $a0, $t0, 0xa -/* AAB72C 8003458C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* AAB72C 8003458C 0C01E1A7 */ jal Math_SmoothStepToS /* AAB730 80034590 A7A30040 */ sh $v1, 0x40($sp) /* AAB734 80034594 87A30040 */ lh $v1, 0x40($sp) /* AAB738 80034598 8FA8004C */ lw $t0, 0x4c($sp) @@ -120,7 +120,7 @@ glabel func_800344BC .L80034660: /* AAB800 80034660 25040010 */ addiu $a0, $t0, 0x10 /* AAB804 80034664 AFAC0010 */ sw $t4, 0x10($sp) -/* AAB808 80034668 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* AAB808 80034668 0C01E1A7 */ jal Math_SmoothStepToS /* AAB80C 8003466C A7A30040 */ sh $v1, 0x40($sp) /* AAB810 80034670 87A30040 */ lh $v1, 0x40($sp) /* AAB814 80034674 8FA8004C */ lw $t0, 0x4c($sp) @@ -167,7 +167,7 @@ glabel func_800344BC /* AAB89C 800346FC 11A00005 */ beqz $t5, .L80034714 /* AAB8A0 80034700 248400B6 */ addiu $a0, $a0, 0xb6 /* AAB8A4 80034704 240E0001 */ li $t6, 1 -/* AAB8A8 80034708 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* AAB8A8 80034708 0C01E1A7 */ jal Math_SmoothStepToS /* AAB8AC 8003470C AFAE0010 */ sw $t6, 0x10($sp) /* AAB8B0 80034710 8FA8004C */ lw $t0, 0x4c($sp) .L80034714: @@ -194,7 +194,7 @@ glabel func_800344BC /* AAB8FC 8003475C 00052C03 */ sra $a1, $a1, 0x10 .L80034760: /* AAB900 80034760 240F0001 */ li $t7, 1 -/* AAB904 80034764 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* AAB904 80034764 0C01E1A7 */ jal Math_SmoothStepToS /* AAB908 80034768 AFAF0010 */ sw $t7, 0x10($sp) /* AAB90C 8003476C 8FA8004C */ lw $t0, 0x4c($sp) /* AAB910 80034770 87B80046 */ lh $t8, 0x46($sp) @@ -224,7 +224,7 @@ glabel func_800344BC /* AAB968 800347C8 00052C03 */ sra $a1, $a1, 0x10 .L800347CC: /* AAB96C 800347CC 2504000E */ addiu $a0, $t0, 0xe -/* AAB970 800347D0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* AAB970 800347D0 0C01E1A7 */ jal Math_SmoothStepToS /* AAB974 800347D4 AFAA0010 */ sw $t2, 0x10($sp) /* AAB978 800347D8 8FBF001C */ lw $ra, 0x1c($sp) /* AAB97C 800347DC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/code/z_eff_blure/EffectBlure_DrawElemHermiteInterpolation.s b/asm/non_matchings/code/z_eff_blure/EffectBlure_DrawElemHermiteInterpolation.s index 68afd2c37b..c408b56a52 100644 --- a/asm/non_matchings/code/z_eff_blure/EffectBlure_DrawElemHermiteInterpolation.s +++ b/asm/non_matchings/code/z_eff_blure/EffectBlure_DrawElemHermiteInterpolation.s @@ -330,19 +330,19 @@ glabel EffectBlure_DrawElemHermiteInterpolation /* A98AE8 80021948 8C59000C */ lw $t9, 0xc($v0) /* A98AEC 8002194C AA99001C */ swl $t9, 0x1c($s4) /* A98AF0 80021950 BA99001F */ swr $t9, 0x1f($s4) -/* A98AF4 80021954 0C03F3CD */ jal Math_nearbyintf +/* A98AF4 80021954 0C03F3CD */ jal Math_FNearbyIntF /* A98AF8 80021958 C7AC0158 */ lwc1 $f12, 0x158($sp) /* A98AFC 8002195C 4600018D */ trunc.w.s $f6, $f0 /* A98B00 80021960 440A3000 */ mfc1 $t2, $f6 /* A98B04 80021964 00000000 */ nop /* A98B08 80021968 A68A0000 */ sh $t2, ($s4) -/* A98B0C 8002196C 0C03F3CD */ jal Math_nearbyintf +/* A98B0C 8002196C 0C03F3CD */ jal Math_FNearbyIntF /* A98B10 80021970 C7AC015C */ lwc1 $f12, 0x15c($sp) /* A98B14 80021974 4600040D */ trunc.w.s $f16, $f0 /* A98B18 80021978 440C8000 */ mfc1 $t4, $f16 /* A98B1C 8002197C 00000000 */ nop /* A98B20 80021980 A68C0002 */ sh $t4, 2($s4) -/* A98B24 80021984 0C03F3CD */ jal Math_nearbyintf +/* A98B24 80021984 0C03F3CD */ jal Math_FNearbyIntF /* A98B28 80021988 C7AC0160 */ lwc1 $f12, 0x160($sp) /* A98B2C 8002198C 4600020D */ trunc.w.s $f8, $f0 /* A98B30 80021990 440E4000 */ mfc1 $t6, $f8 @@ -356,19 +356,19 @@ glabel EffectBlure_DrawElemHermiteInterpolation /* A98B50 800219B0 A299000E */ sb $t9, 0xe($s4) /* A98B54 800219B4 93A8014B */ lbu $t0, 0x14b($sp) /* A98B58 800219B8 A288000F */ sb $t0, 0xf($s4) -/* A98B5C 800219BC 0C03F3CD */ jal Math_nearbyintf +/* A98B5C 800219BC 0C03F3CD */ jal Math_FNearbyIntF /* A98B60 800219C0 C7AC014C */ lwc1 $f12, 0x14c($sp) /* A98B64 800219C4 4600048D */ trunc.w.s $f18, $f0 /* A98B68 800219C8 440A9000 */ mfc1 $t2, $f18 /* A98B6C 800219CC 00000000 */ nop /* A98B70 800219D0 A68A0010 */ sh $t2, 0x10($s4) -/* A98B74 800219D4 0C03F3CD */ jal Math_nearbyintf +/* A98B74 800219D4 0C03F3CD */ jal Math_FNearbyIntF /* A98B78 800219D8 C7AC0150 */ lwc1 $f12, 0x150($sp) /* A98B7C 800219DC 4600028D */ trunc.w.s $f10, $f0 /* A98B80 800219E0 440C5000 */ mfc1 $t4, $f10 /* A98B84 800219E4 00000000 */ nop /* A98B88 800219E8 A68C0012 */ sh $t4, 0x12($s4) -/* A98B8C 800219EC 0C03F3CD */ jal Math_nearbyintf +/* A98B8C 800219EC 0C03F3CD */ jal Math_FNearbyIntF /* A98B90 800219F0 C7AC0154 */ lwc1 $f12, 0x154($sp) /* A98B94 800219F4 4600010D */ trunc.w.s $f4, $f0 /* A98B98 800219F8 24120001 */ li $s2, 1 @@ -520,19 +520,19 @@ glabel EffectBlure_DrawElemHermiteInterpolation /* A98DDC 80021C3C 8C4B000C */ lw $t3, 0xc($v0) /* A98DE0 80021C40 AA2B000C */ swl $t3, 0xc($s1) /* A98DE4 80021C44 BA2B000F */ swr $t3, 0xf($s1) -/* A98DE8 80021C48 0C03F3CD */ jal Math_nearbyintf +/* A98DE8 80021C48 0C03F3CD */ jal Math_FNearbyIntF /* A98DEC 80021C4C C7AC0158 */ lwc1 $f12, 0x158($sp) /* A98DF0 80021C50 4600018D */ trunc.w.s $f6, $f0 /* A98DF4 80021C54 440E3000 */ mfc1 $t6, $f6 /* A98DF8 80021C58 00000000 */ nop /* A98DFC 80021C5C A60E0000 */ sh $t6, ($s0) -/* A98E00 80021C60 0C03F3CD */ jal Math_nearbyintf +/* A98E00 80021C60 0C03F3CD */ jal Math_FNearbyIntF /* A98E04 80021C64 C7AC015C */ lwc1 $f12, 0x15c($sp) /* A98E08 80021C68 4600020D */ trunc.w.s $f8, $f0 /* A98E0C 80021C6C 44184000 */ mfc1 $t8, $f8 /* A98E10 80021C70 00000000 */ nop /* A98E14 80021C74 A6180002 */ sh $t8, 2($s0) -/* A98E18 80021C78 0C03F3CD */ jal Math_nearbyintf +/* A98E18 80021C78 0C03F3CD */ jal Math_FNearbyIntF /* A98E1C 80021C7C C7AC0160 */ lwc1 $f12, 0x160($sp) /* A98E20 80021C80 4600048D */ trunc.w.s $f18, $f0 /* A98E24 80021C84 4406E000 */ mfc1 $a2, $f28 @@ -558,19 +558,19 @@ glabel EffectBlure_DrawElemHermiteInterpolation /* A98E74 80021CD4 0C009FA1 */ jal func_80027E84 /* A98E78 80021CD8 93A401A7 */ lbu $a0, 0x1a7($sp) /* A98E7C 80021CDC A202000F */ sb $v0, 0xf($s0) -/* A98E80 80021CE0 0C03F3CD */ jal Math_nearbyintf +/* A98E80 80021CE0 0C03F3CD */ jal Math_FNearbyIntF /* A98E84 80021CE4 C7AC014C */ lwc1 $f12, 0x14c($sp) /* A98E88 80021CE8 4600028D */ trunc.w.s $f10, $f0 /* A98E8C 80021CEC 440A5000 */ mfc1 $t2, $f10 /* A98E90 80021CF0 00000000 */ nop /* A98E94 80021CF4 A62A0000 */ sh $t2, ($s1) -/* A98E98 80021CF8 0C03F3CD */ jal Math_nearbyintf +/* A98E98 80021CF8 0C03F3CD */ jal Math_FNearbyIntF /* A98E9C 80021CFC C7AC0150 */ lwc1 $f12, 0x150($sp) /* A98EA0 80021D00 4600010D */ trunc.w.s $f4, $f0 /* A98EA4 80021D04 440C2000 */ mfc1 $t4, $f4 /* A98EA8 80021D08 00000000 */ nop /* A98EAC 80021D0C A62C0002 */ sh $t4, 2($s1) -/* A98EB0 80021D10 0C03F3CD */ jal Math_nearbyintf +/* A98EB0 80021D10 0C03F3CD */ jal Math_FNearbyIntF /* A98EB4 80021D14 C7AC0154 */ lwc1 $f12, 0x154($sp) /* A98EB8 80021D18 4600040D */ trunc.w.s $f16, $f0 /* A98EBC 80021D1C 4406E000 */ mfc1 $a2, $f28 diff --git a/asm/non_matchings/code/z_kankyo/func_8006F140.s b/asm/non_matchings/code/z_kankyo/func_8006F140.s index 36ef86567b..78aa242a6d 100644 --- a/asm/non_matchings/code/z_kankyo/func_8006F140.s +++ b/asm/non_matchings/code/z_kankyo/func_8006F140.s @@ -139,7 +139,7 @@ glabel func_8006F140 /* AE64BC 8006F31C 8503000C */ lh $v1, 0xc($t0) /* AE64C0 8006F320 00612021 */ addu $a0, $v1, $at /* AE64C4 8006F324 00042400 */ sll $a0, $a0, 0x10 -/* AE64C8 8006F328 0C01DE1C */ jal Math_Sins +/* AE64C8 8006F328 0C01DE1C */ jal Math_SinS /* AE64CC 8006F32C 00042403 */ sra $a0, $a0, 0x10 /* AE64D0 8006F330 3C0142F0 */ li $at, 0x42F00000 # 0.000000 /* AE64D4 8006F334 44813000 */ mtc1 $at, $f6 @@ -155,7 +155,7 @@ glabel func_8006F140 /* AE64FC 8006F35C 9503000C */ lhu $v1, 0xc($t0) /* AE6500 8006F360 00612021 */ addu $a0, $v1, $at /* AE6504 8006F364 00042400 */ sll $a0, $a0, 0x10 -/* AE6508 8006F368 0C01DE0D */ jal Math_Coss +/* AE6508 8006F368 0C01DE0D */ jal Math_CosS /* AE650C 8006F36C 00042403 */ sra $a0, $a0, 0x10 /* AE6510 8006F370 3C0142F0 */ li $at, 0x42F00000 # 0.000000 /* AE6514 8006F374 44812000 */ mtc1 $at, $f4 @@ -170,7 +170,7 @@ glabel func_8006F140 /* AE6538 8006F398 9503000C */ lhu $v1, 0xc($t0) /* AE653C 8006F39C 00612021 */ addu $a0, $v1, $at /* AE6540 8006F3A0 00042400 */ sll $a0, $a0, 0x10 -/* AE6544 8006F3A4 0C01DE0D */ jal Math_Coss +/* AE6544 8006F3A4 0C01DE0D */ jal Math_CosS /* AE6548 8006F3A8 00042403 */ sra $a0, $a0, 0x10 /* AE654C 8006F3AC 3C0141A0 */ li $at, 0x41A00000 # 0.000000 /* AE6550 8006F3B0 44818000 */ mtc1 $at, $f16 diff --git a/asm/non_matchings/code/z_kankyo/func_80070C24.s b/asm/non_matchings/code/z_kankyo/func_80070C24.s index 1e839f2176..0a25ac0954 100644 --- a/asm/non_matchings/code/z_kankyo/func_80070C24.s +++ b/asm/non_matchings/code/z_kankyo/func_80070C24.s @@ -693,7 +693,7 @@ glabel func_80070C24 /* AE8740 800715A0 00042403 */ sra $a0, $a0, 0x10 /* AE8744 800715A4 AFAA007C */ sw $t2, 0x7c($sp) /* AE8748 800715A8 E7A2008C */ swc1 $f2, 0x8c($sp) -/* AE874C 800715AC 0C01DE1C */ jal Math_Sins +/* AE874C 800715AC 0C01DE1C */ jal Math_SinS /* AE8750 800715B0 E7AE0088 */ swc1 $f14, 0x88($sp) /* AE8754 800715B4 3C0142F0 */ li $at, 0x42F00000 # 0.000000 /* AE8758 800715B8 44818000 */ mtc1 $at, $f16 @@ -709,7 +709,7 @@ glabel func_80070C24 /* AE8780 800715E0 95A6000C */ lhu $a2, 0xc($t5) /* AE8784 800715E4 00C12021 */ addu $a0, $a2, $at /* AE8788 800715E8 00042400 */ sll $a0, $a0, 0x10 -/* AE878C 800715EC 0C01DE0D */ jal Math_Coss +/* AE878C 800715EC 0C01DE0D */ jal Math_CosS /* AE8790 800715F0 00042403 */ sra $a0, $a0, 0x10 /* AE8794 800715F4 3C0142F0 */ li $at, 0x42F00000 # 0.000000 /* AE8798 800715F8 44813000 */ mtc1 $at, $f6 @@ -724,7 +724,7 @@ glabel func_80070C24 /* AE87BC 8007161C 95A6000C */ lhu $a2, 0xc($t5) /* AE87C0 80071620 00C12021 */ addu $a0, $a2, $at /* AE87C4 80071624 00042400 */ sll $a0, $a0, 0x10 -/* AE87C8 80071628 0C01DE0D */ jal Math_Coss +/* AE87C8 80071628 0C01DE0D */ jal Math_CosS /* AE87CC 8007162C 00042403 */ sra $a0, $a0, 0x10 /* AE87D0 80071630 3C0141A0 */ li $at, 0x41A00000 # 0.000000 /* AE87D4 80071634 44812000 */ mtc1 $at, $f4 @@ -2327,13 +2327,13 @@ glabel func_80070C24 /* AE9F84 80072DE4 84590B70 */ lh $t9, 0xb70($v0) /* AE9F88 80072DE8 53200082 */ beql $t9, $zero, .L80072FF4 /* AE9F8C 80072DEC 84590B5A */ lh $t9, 0xb5a($v0) -/* AE9F90 80072DF0 0C01DE0D */ jal Math_Coss +/* AE9F90 80072DF0 0C01DE0D */ jal Math_CosS /* AE9F94 80072DF4 84440B68 */ lh $a0, 0xb68($v0) /* AE9F98 80072DF8 3C0B8016 */ lui $t3, %hi(gGameInfo) # $t3, 0x8016 /* AE9F9C 80072DFC 256BFA90 */ addiu $t3, %lo(gGameInfo) # addiu $t3, $t3, -0x570 /* AE9FA0 80072E00 8D780000 */ lw $t8, ($t3) /* AE9FA4 80072E04 E7A00044 */ swc1 $f0, 0x44($sp) -/* AE9FA8 80072E08 0C01DE0D */ jal Math_Coss +/* AE9FA8 80072E08 0C01DE0D */ jal Math_CosS /* AE9FAC 80072E0C 87040B6A */ lh $a0, 0xb6a($t8) /* AE9FB0 80072E10 C7B00044 */ lwc1 $f16, 0x44($sp) /* AE9FB4 80072E14 3C0142F0 */ li $at, 0x42F00000 # 0.000000 @@ -2351,13 +2351,13 @@ glabel func_80070C24 /* AE9FE4 80072E44 870F0B5A */ lh $t7, 0xb5a($t8) /* AE9FE8 80072E48 A20F002A */ sb $t7, 0x2a($s0) /* AE9FEC 80072E4C 8D6E0000 */ lw $t6, ($t3) -/* AE9FF0 80072E50 0C01DE1C */ jal Math_Sins +/* AE9FF0 80072E50 0C01DE1C */ jal Math_SinS /* AE9FF4 80072E54 85C40B68 */ lh $a0, 0xb68($t6) /* AE9FF8 80072E58 3C0B8016 */ lui $t3, %hi(gGameInfo) # $t3, 0x8016 /* AE9FFC 80072E5C 256BFA90 */ addiu $t3, %lo(gGameInfo) # addiu $t3, $t3, -0x570 /* AEA000 80072E60 8D790000 */ lw $t9, ($t3) /* AEA004 80072E64 E7A00044 */ swc1 $f0, 0x44($sp) -/* AEA008 80072E68 0C01DE0D */ jal Math_Coss +/* AEA008 80072E68 0C01DE0D */ jal Math_CosS /* AEA00C 80072E6C 87240B6A */ lh $a0, 0xb6a($t9) /* AEA010 80072E70 C7A60044 */ lwc1 $f6, 0x44($sp) /* AEA014 80072E74 3C0142F0 */ li $at, 0x42F00000 # 0.000000 @@ -2375,7 +2375,7 @@ glabel func_80070C24 /* AEA044 80072EA4 87380B5C */ lh $t8, 0xb5c($t9) /* AEA048 80072EA8 A218002B */ sb $t8, 0x2b($s0) /* AEA04C 80072EAC 8D6F0000 */ lw $t7, ($t3) -/* AEA050 80072EB0 0C01DE1C */ jal Math_Sins +/* AEA050 80072EB0 0C01DE1C */ jal Math_SinS /* AEA054 80072EB4 85E40B6A */ lh $a0, 0xb6a($t7) /* AEA058 80072EB8 3C0142F0 */ li $at, 0x42F00000 # 0.000000 /* AEA05C 80072EBC 44812000 */ mtc1 $at, $f4 @@ -2391,13 +2391,13 @@ glabel func_80070C24 /* AEA084 80072EE4 85EE0B5E */ lh $t6, 0xb5e($t7) /* AEA088 80072EE8 A20E002C */ sb $t6, 0x2c($s0) /* AEA08C 80072EEC 8D790000 */ lw $t9, ($t3) -/* AEA090 80072EF0 0C01DE0D */ jal Math_Coss +/* AEA090 80072EF0 0C01DE0D */ jal Math_CosS /* AEA094 80072EF4 87240B6C */ lh $a0, 0xb6c($t9) /* AEA098 80072EF8 3C0B8016 */ lui $t3, %hi(gGameInfo) # $t3, 0x8016 /* AEA09C 80072EFC 256BFA90 */ addiu $t3, %lo(gGameInfo) # addiu $t3, $t3, -0x570 /* AEA0A0 80072F00 8D780000 */ lw $t8, ($t3) /* AEA0A4 80072F04 E7A00044 */ swc1 $f0, 0x44($sp) -/* AEA0A8 80072F08 0C01DE0D */ jal Math_Coss +/* AEA0A8 80072F08 0C01DE0D */ jal Math_CosS /* AEA0AC 80072F0C 87040B6E */ lh $a0, 0xb6e($t8) /* AEA0B0 80072F10 C7AA0044 */ lwc1 $f10, 0x44($sp) /* AEA0B4 80072F14 3C0142F0 */ li $at, 0x42F00000 # 0.000000 @@ -2415,13 +2415,13 @@ glabel func_80070C24 /* AEA0E4 80072F44 870F0B60 */ lh $t7, 0xb60($t8) /* AEA0E8 80072F48 A20F0038 */ sb $t7, 0x38($s0) /* AEA0EC 80072F4C 8D6E0000 */ lw $t6, ($t3) -/* AEA0F0 80072F50 0C01DE1C */ jal Math_Sins +/* AEA0F0 80072F50 0C01DE1C */ jal Math_SinS /* AEA0F4 80072F54 85C40B6C */ lh $a0, 0xb6c($t6) /* AEA0F8 80072F58 3C0B8016 */ lui $t3, %hi(gGameInfo) # $t3, 0x8016 /* AEA0FC 80072F5C 256BFA90 */ addiu $t3, %lo(gGameInfo) # addiu $t3, $t3, -0x570 /* AEA100 80072F60 8D790000 */ lw $t9, ($t3) /* AEA104 80072F64 E7A00044 */ swc1 $f0, 0x44($sp) -/* AEA108 80072F68 0C01DE0D */ jal Math_Coss +/* AEA108 80072F68 0C01DE0D */ jal Math_CosS /* AEA10C 80072F6C 87240B6E */ lh $a0, 0xb6e($t9) /* AEA110 80072F70 C7B00044 */ lwc1 $f16, 0x44($sp) /* AEA114 80072F74 3C0142F0 */ li $at, 0x42F00000 # 0.000000 @@ -2439,7 +2439,7 @@ glabel func_80070C24 /* AEA144 80072FA4 87380B62 */ lh $t8, 0xb62($t9) /* AEA148 80072FA8 A2180039 */ sb $t8, 0x39($s0) /* AEA14C 80072FAC 8D6F0000 */ lw $t7, ($t3) -/* AEA150 80072FB0 0C01DE1C */ jal Math_Sins +/* AEA150 80072FB0 0C01DE1C */ jal Math_SinS /* AEA154 80072FB4 85E40B6E */ lh $a0, 0xb6e($t7) /* AEA158 80072FB8 3C0142F0 */ li $at, 0x42F00000 # 0.000000 /* AEA15C 80072FBC 44813000 */ mtc1 $at, $f6 diff --git a/asm/non_matchings/code/z_kankyo/func_800730DC.s b/asm/non_matchings/code/z_kankyo/func_800730DC.s index 9950378b18..d49dcff59e 100644 --- a/asm/non_matchings/code/z_kankyo/func_800730DC.s +++ b/asm/non_matchings/code/z_kankyo/func_800730DC.s @@ -48,7 +48,7 @@ glabel func_800730DC /* AEA2C4 80073124 24018000 */ li $at, -32768 /* AEA2C8 80073128 00412021 */ addu $a0, $v0, $at /* AEA2CC 8007312C 00042400 */ sll $a0, $a0, 0x10 -/* AEA2D0 80073130 0C01DE1C */ jal Math_Sins +/* AEA2D0 80073130 0C01DE1C */ jal Math_SinS /* AEA2D4 80073134 00042403 */ sra $a0, $a0, 0x10 /* AEA2D8 80073138 3C018014 */ lui $at, %hi(D_8013C7AC) /* AEA2DC 8007313C C422C7AC */ lwc1 $f2, %lo(D_8013C7AC)($at) @@ -66,14 +66,14 @@ glabel func_800730DC /* AEA30C 8007316C 46003207 */ neg.s $f8, $f6 /* AEA310 80073170 460A4102 */ mul.s $f4, $f8, $f10 /* AEA314 80073174 44052000 */ mfc1 $a1, $f4 -/* AEA318 80073178 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* AEA318 80073178 0C01E0C4 */ jal Math_SmoothStepToF /* AEA31C 8007317C 00000000 */ nop /* AEA320 80073180 3C028016 */ lui $v0, %hi(gSaveContext+0xc) # $v0, 0x8016 /* AEA324 80073184 9442E66C */ lhu $v0, %lo(gSaveContext+0xc)($v0) /* AEA328 80073188 24018000 */ li $at, -32768 /* AEA32C 8007318C 00412021 */ addu $a0, $v0, $at /* AEA330 80073190 00042400 */ sll $a0, $a0, 0x10 -/* AEA334 80073194 0C01DE0D */ jal Math_Coss +/* AEA334 80073194 0C01DE0D */ jal Math_CosS /* AEA338 80073198 00042403 */ sra $a0, $a0, 0x10 /* AEA33C 8007319C 3C018014 */ lui $at, %hi(D_8013C7B0) /* AEA340 800731A0 C422C7B0 */ lwc1 $f2, %lo(D_8013C7B0)($at) @@ -91,14 +91,14 @@ glabel func_800730DC /* AEA370 800731D0 E7A20010 */ swc1 $f2, 0x10($sp) /* AEA374 800731D4 460A4102 */ mul.s $f4, $f8, $f10 /* AEA378 800731D8 44052000 */ mfc1 $a1, $f4 -/* AEA37C 800731DC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* AEA37C 800731DC 0C01E0C4 */ jal Math_SmoothStepToF /* AEA380 800731E0 00000000 */ nop /* AEA384 800731E4 3C028016 */ lui $v0, %hi(gSaveContext+0xc) # $v0, 0x8016 /* AEA388 800731E8 9442E66C */ lhu $v0, %lo(gSaveContext+0xc)($v0) /* AEA38C 800731EC 24018000 */ li $at, -32768 /* AEA390 800731F0 00412021 */ addu $a0, $v0, $at /* AEA394 800731F4 00042400 */ sll $a0, $a0, 0x10 -/* AEA398 800731F8 0C01DE0D */ jal Math_Coss +/* AEA398 800731F8 0C01DE0D */ jal Math_CosS /* AEA39C 800731FC 00042403 */ sra $a0, $a0, 0x10 /* AEA3A0 80073200 3C0141A0 */ li $at, 0x41A00000 # 0.000000 /* AEA3A4 80073204 44813000 */ mtc1 $at, $f6 @@ -114,7 +114,7 @@ glabel func_800730DC /* AEA3CC 8007322C 460A4102 */ mul.s $f4, $f8, $f10 /* AEA3D0 80073230 E7A60010 */ swc1 $f6, 0x10($sp) /* AEA3D4 80073234 44052000 */ mfc1 $a1, $f4 -/* AEA3D8 80073238 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* AEA3D8 80073238 0C01E0C4 */ jal Math_SmoothStepToF /* AEA3DC 8007323C 00000000 */ nop /* AEA3E0 80073240 10000031 */ b .L80073308 /* AEA3E4 80073244 00000000 */ nop @@ -123,7 +123,7 @@ glabel func_800730DC /* AEA3EC 8007324C 24018000 */ li $at, -32768 /* AEA3F0 80073250 00412021 */ addu $a0, $v0, $at /* AEA3F4 80073254 00042400 */ sll $a0, $a0, 0x10 -/* AEA3F8 80073258 0C01DE1C */ jal Math_Sins +/* AEA3F8 80073258 0C01DE1C */ jal Math_SinS /* AEA3FC 8007325C 00042403 */ sra $a0, $a0, 0x10 /* AEA400 80073260 3C0142F0 */ li $at, 0x42F00000 # 0.000000 /* AEA404 80073264 44814000 */ mtc1 $at, $f8 @@ -140,7 +140,7 @@ glabel func_800730DC /* AEA430 80073290 24018000 */ li $at, -32768 /* AEA434 80073294 00412021 */ addu $a0, $v0, $at /* AEA438 80073298 00042400 */ sll $a0, $a0, 0x10 -/* AEA43C 8007329C 0C01DE0D */ jal Math_Coss +/* AEA43C 8007329C 0C01DE0D */ jal Math_CosS /* AEA440 800732A0 00042403 */ sra $a0, $a0, 0x10 /* AEA444 800732A4 3C0142F0 */ li $at, 0x42F00000 # 0.000000 /* AEA448 800732A8 44815000 */ mtc1 $at, $f10 @@ -156,7 +156,7 @@ glabel func_800730DC /* AEA470 800732D0 24018000 */ li $at, -32768 /* AEA474 800732D4 00412021 */ addu $a0, $v0, $at /* AEA478 800732D8 00042400 */ sll $a0, $a0, 0x10 -/* AEA47C 800732DC 0C01DE0D */ jal Math_Coss +/* AEA47C 800732DC 0C01DE0D */ jal Math_CosS /* AEA480 800732E0 00042403 */ sra $a0, $a0, 0x10 /* AEA484 800732E4 3C0141A0 */ li $at, 0x41A00000 # 0.000000 /* AEA488 800732E8 44815000 */ mtc1 $at, $f10 diff --git a/asm/non_matchings/code/z_kankyo/func_80073988.s b/asm/non_matchings/code/z_kankyo/func_80073988.s index 5328cb739f..823ed52cb4 100644 --- a/asm/non_matchings/code/z_kankyo/func_80073988.s +++ b/asm/non_matchings/code/z_kankyo/func_80073988.s @@ -19,7 +19,7 @@ glabel func_80073988 /* AEAB6C 800739CC 24018000 */ li $at, -32768 /* AEAB70 800739D0 00412021 */ addu $a0, $v0, $at /* AEAB74 800739D4 00042400 */ sll $a0, $a0, 0x10 -/* AEAB78 800739D8 0C01DE0D */ jal Math_Coss +/* AEAB78 800739D8 0C01DE0D */ jal Math_CosS /* AEAB7C 800739DC 00042403 */ sra $a0, $a0, 0x10 /* AEAB80 800739E0 27B80050 */ addiu $t8, $sp, 0x50 /* AEAB84 800739E4 8F080000 */ lw $t0, ($t8) diff --git a/asm/non_matchings/code/z_kankyo/func_80073A5C.s b/asm/non_matchings/code/z_kankyo/func_80073A5C.s index 9273c49887..539d611332 100644 --- a/asm/non_matchings/code/z_kankyo/func_80073A5C.s +++ b/asm/non_matchings/code/z_kankyo/func_80073A5C.s @@ -464,14 +464,14 @@ glabel func_80073A5C /* AEB25C 800740BC 34E7CCCD */ ori $a3, (0x3D4CCCCD & 0xFFFF) # ori $a3, $a3, 0xcccd /* AEB260 800740C0 8FA40060 */ lw $a0, 0x60($sp) /* AEB264 800740C4 3C063F00 */ lui $a2, 0x3f00 -/* AEB268 800740C8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* AEB268 800740C8 0C01E0C4 */ jal Math_SmoothStepToF /* AEB26C 800740CC E7A80010 */ swc1 $f8, 0x10($sp) /* AEB270 800740D0 10000006 */ b .L800740EC /* AEB274 800740D4 8E0702D0 */ lw $a3, 0x2d0($s0) .L800740D8: /* AEB278 800740D8 C42AC7D0 */ lwc1 $f10, %lo(D_8013C7D0)($at) /* AEB27C 800740DC 4405D000 */ mfc1 $a1, $f26 -/* AEB280 800740E0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* AEB280 800740E0 0C01E0C4 */ jal Math_SmoothStepToF /* AEB284 800740E4 E7AA0010 */ swc1 $f10, 0x10($sp) /* AEB288 800740E8 8E0702D0 */ lw $a3, 0x2d0($s0) .L800740EC: @@ -698,7 +698,7 @@ glabel func_80073A5C /* AEB5D4 80074434 3C074248 */ lui $a3, 0x4248 /* AEB5D8 80074438 E7A80010 */ swc1 $f8, 0x10($sp) /* AEB5DC 8007443C 44053000 */ mfc1 $a1, $f6 -/* AEB5E0 80074440 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* AEB5E0 80074440 0C01E0C4 */ jal Math_SmoothStepToF /* AEB5E4 80074444 24840084 */ addiu $a0, $a0, 0x84 /* AEB5E8 80074448 10000007 */ b .L80074468 /* AEB5EC 8007444C 3C0142F0 */ lui $at, 0x42f0 @@ -706,7 +706,7 @@ glabel func_80073A5C /* AEB5F0 80074450 C42AC7D8 */ lwc1 $f10, %lo(D_8013C7D8)($at) /* AEB5F4 80074454 4405D000 */ mfc1 $a1, $f26 /* AEB5F8 80074458 3C074248 */ lui $a3, 0x4248 -/* AEB5FC 8007445C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* AEB5FC 8007445C 0C01E0C4 */ jal Math_SmoothStepToF /* AEB600 80074460 E7AA0010 */ swc1 $f10, 0x10($sp) /* AEB604 80074464 3C0142F0 */ li $at, 0x42F00000 # 0.000000 .L80074468: diff --git a/asm/non_matchings/code/z_kankyo/func_80074704.s b/asm/non_matchings/code/z_kankyo/func_80074704.s index 4368b159ed..059ce024f7 100644 --- a/asm/non_matchings/code/z_kankyo/func_80074704.s +++ b/asm/non_matchings/code/z_kankyo/func_80074704.s @@ -168,11 +168,11 @@ glabel func_80074704 /* AEBAA4 80074904 AFAB0078 */ sw $t3, 0x78($sp) /* AEBAA8 80074908 3C1EDE00 */ lui $fp, 0xde00 .L8007490C: -/* AEBAAC 8007490C 0C03F66B */ jal Math_Rand_ZeroOne +/* AEBAAC 8007490C 0C03F66B */ jal Rand_ZeroOne /* AEBAB0 80074910 00000000 */ nop -/* AEBAB4 80074914 0C03F66B */ jal Math_Rand_ZeroOne +/* AEBAB4 80074914 0C03F66B */ jal Rand_ZeroOne /* AEBAB8 80074918 46000586 */ mov.s $f22, $f0 -/* AEBABC 8007491C 0C03F66B */ jal Math_Rand_ZeroOne +/* AEBABC 8007491C 0C03F66B */ jal Rand_ZeroOne /* AEBAC0 80074920 46000506 */ mov.s $f20, $f0 /* AEBAC4 80074924 461AB101 */ sub.s $f4, $f22, $f26 /* AEBAC8 80074928 C7A800F8 */ lwc1 $f8, 0xf8($sp) @@ -205,7 +205,7 @@ glabel func_80074704 /* AEBB34 80074994 448E4000 */ mtc1 $t6, $f8 /* AEBB38 80074998 00000000 */ nop /* AEBB3C 8007499C 468042A0 */ cvt.s.w $f10, $f8 -/* AEBB40 800749A0 0C03F66B */ jal Math_Rand_ZeroOne +/* AEBB40 800749A0 0C03F66B */ jal Rand_ZeroOne /* AEBB44 800749A4 E7AA00D8 */ swc1 $f10, 0xd8($sp) /* AEBB48 800749A8 3C0143FA */ li $at, 0x43FA0000 # 0.000000 /* AEBB4C 800749AC 44813000 */ mtc1 $at, $f6 @@ -227,11 +227,11 @@ glabel func_80074704 /* AEBB8C 800749EC AC530004 */ sw $s3, 4($v0) /* AEBB90 800749F0 46008387 */ neg.s $f14, $f16 /* AEBB94 800749F4 460A3000 */ add.s $f0, $f6, $f10 -/* AEBB98 800749F8 0C0341F5 */ jal atan2f +/* AEBB98 800749F8 0C0341F5 */ jal Math_Atan2F /* AEBB9C 800749FC 46000304 */ sqrt.s $f12, $f0 /* AEBBA0 80074A00 46000606 */ mov.s $f24, $f0 /* AEBBA4 80074A04 4600B306 */ mov.s $f12, $f22 -/* AEBBA8 80074A08 0C0341F5 */ jal atan2f +/* AEBBA8 80074A08 0C0341F5 */ jal Math_Atan2F /* AEBBAC 80074A0C 4600A386 */ mov.s $f14, $f20 /* AEBBB0 80074A10 46000307 */ neg.s $f12, $f0 /* AEBBB4 80074A14 0C034348 */ jal Matrix_RotateY diff --git a/asm/non_matchings/code/z_kankyo/func_800750C0.s b/asm/non_matchings/code/z_kankyo/func_800750C0.s index cdd559f180..6093ab05e7 100644 --- a/asm/non_matchings/code/z_kankyo/func_800750C0.s +++ b/asm/non_matchings/code/z_kankyo/func_800750C0.s @@ -29,7 +29,7 @@ glabel func_800750C0 /* AEC2AC 8007510C 1000009B */ b .L8007537C /* AEC2B0 80075110 00000000 */ nop .L80075114: -/* AEC2B4 80075114 0C03F66B */ jal Math_Rand_ZeroOne +/* AEC2B4 80075114 0C03F66B */ jal Rand_ZeroOne /* AEC2B8 80075118 00000000 */ nop /* AEC2BC 8007511C 3C018014 */ lui $at, %hi(D_8013C7F8) /* AEC2C0 80075120 C424C7F8 */ lwc1 $f4, %lo(D_8013C7F8)($at) @@ -45,7 +45,7 @@ glabel func_800750C0 /* AEC2E8 80075148 46083280 */ add.s $f10, $f6, $f8 /* AEC2EC 8007514C E46A0008 */ swc1 $f10, 8($v1) .L80075150: -/* AEC2F0 80075150 0C03F66B */ jal Math_Rand_ZeroOne +/* AEC2F0 80075150 0C03F66B */ jal Rand_ZeroOne /* AEC2F4 80075154 00000000 */ nop /* AEC2F8 80075158 3C038016 */ lui $v1, %hi(D_8015FD70) /* AEC2FC 8007515C 2463FD70 */ addiu $v1, %lo(D_8015FD70) # addiu $v1, $v1, -0x290 @@ -66,7 +66,7 @@ glabel func_800750C0 /* AEC338 80075198 A0640002 */ sb $a0, 2($v1) /* AEC33C 8007519C A06F0003 */ sb $t7, 3($v1) /* AEC340 800751A0 A0640004 */ sb $a0, 4($v1) -/* AEC344 800751A4 0C03F66B */ jal Math_Rand_ZeroOne +/* AEC344 800751A4 0C03F66B */ jal Rand_ZeroOne /* AEC348 800751A8 E4680008 */ swc1 $f8, 8($v1) /* AEC34C 800751AC 3C018014 */ lui $at, %hi(D_8013C7FC) /* AEC350 800751B0 C42AC7FC */ lwc1 $f10, %lo(D_8013C7FC)($at) diff --git a/asm/non_matchings/code/z_kankyo/func_8007542C.s b/asm/non_matchings/code/z_kankyo/func_8007542C.s index 2a25eb5718..12c8080f26 100644 --- a/asm/non_matchings/code/z_kankyo/func_8007542C.s +++ b/asm/non_matchings/code/z_kankyo/func_8007542C.s @@ -109,7 +109,7 @@ glabel func_8007542C /* AEC710 80075570 46006503 */ div.s $f20, $f12, $f0 /* AEC714 80075574 461C9102 */ mul.s $f4, $f18, $f28 /* AEC718 80075578 46047180 */ add.s $f6, $f14, $f4 -/* AEC71C 8007557C 0C03F66B */ jal Math_Rand_ZeroOne +/* AEC71C 8007557C 0C03F66B */ jal Rand_ZeroOne /* AEC720 80075580 E6060010 */ swc1 $f6, 0x10($s0) /* AEC724 80075584 3C01447A */ li $at, 0x447A0000 # 0.000000 /* AEC728 80075588 44814000 */ mtc1 $at, $f8 @@ -121,18 +121,18 @@ glabel func_8007542C /* AEC740 800755A0 E6120014 */ swc1 $f18, 0x14($s0) /* AEC744 800755A4 C66400E8 */ lwc1 $f4, 0xe8($s3) /* AEC748 800755A8 46062200 */ add.s $f8, $f4, $f6 -/* AEC74C 800755AC 0C03F66B */ jal Math_Rand_ZeroOne +/* AEC74C 800755AC 0C03F66B */ jal Rand_ZeroOne /* AEC750 800755B0 E6080018 */ swc1 $f8, 0x18($s0) /* AEC754 800755B4 46160281 */ sub.s $f10, $f0, $f22 /* AEC758 800755B8 44809000 */ mtc1 $zero, $f18 /* AEC75C 800755BC 461E5402 */ mul.s $f16, $f10, $f30 /* AEC760 800755C0 E6120008 */ swc1 $f18, 8($s0) -/* AEC764 800755C4 0C03F66B */ jal Math_Rand_ZeroOne +/* AEC764 800755C4 0C03F66B */ jal Rand_ZeroOne /* AEC768 800755C8 E6100004 */ swc1 $f16, 4($s0) /* AEC76C 800755CC 46160101 */ sub.s $f4, $f0, $f22 /* AEC770 800755D0 A200001E */ sb $zero, 0x1e($s0) /* AEC774 800755D4 461E2182 */ mul.s $f6, $f4, $f30 -/* AEC778 800755D8 0C03F66B */ jal Math_Rand_ZeroOne +/* AEC778 800755D8 0C03F66B */ jal Rand_ZeroOne /* AEC77C 800755DC E606000C */ swc1 $f6, 0xc($s0) /* AEC780 800755E0 46160201 */ sub.s $f8, $f0, $f22 /* AEC784 800755E4 3C014220 */ li $at, 0x42200000 # 0.000000 @@ -141,7 +141,7 @@ glabel func_8007542C /* AEC790 800755F0 460A4402 */ mul.s $f16, $f8, $f10 /* AEC794 800755F4 4600848D */ trunc.w.s $f18, $f16 /* AEC798 800755F8 440F9000 */ mfc1 $t7, $f18 -/* AEC79C 800755FC 0C03F66B */ jal Math_Rand_ZeroOne +/* AEC79C 800755FC 0C03F66B */ jal Rand_ZeroOne /* AEC7A0 80075600 A20F001C */ sb $t7, 0x1c($s0) /* AEC7A4 80075604 46160101 */ sub.s $f4, $f0, $f22 /* AEC7A8 80075608 3C014220 */ li $at, 0x42200000 # 0.000000 diff --git a/asm/non_matchings/code/z_kankyo/func_800763A8.s b/asm/non_matchings/code/z_kankyo/func_800763A8.s index ad81f4634c..e6bf518d19 100644 --- a/asm/non_matchings/code/z_kankyo/func_800763A8.s +++ b/asm/non_matchings/code/z_kankyo/func_800763A8.s @@ -155,14 +155,14 @@ glabel func_800763A8 /* AED798 800765F8 02322021 */ addu $a0, $s1, $s2 /* AED79C 800765FC 00002825 */ move $a1, $zero /* AED7A0 80076600 24060005 */ li $a2, 5 -/* AED7A4 80076604 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* AED7A4 80076604 0C01E1A7 */ jal Math_SmoothStepToS /* AED7A8 80076608 2407000C */ li $a3, 12 /* AED7AC 8007660C 24090001 */ li $t1, 1 /* AED7B0 80076610 AFA90010 */ sw $t1, 0x10($sp) /* AED7B4 80076614 02332021 */ addu $a0, $s1, $s3 /* AED7B8 80076618 00002825 */ move $a1, $zero /* AED7BC 8007661C 24060005 */ li $a2, 5 -/* AED7C0 80076620 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* AED7C0 80076620 0C01E1A7 */ jal Math_SmoothStepToS /* AED7C4 80076624 2407000C */ li $a3, 12 /* AED7C8 80076628 26100001 */ addiu $s0, $s0, 1 /* AED7CC 8007662C 00108400 */ sll $s0, $s0, 0x10 diff --git a/asm/non_matchings/code/z_onepointdemo/func_8007C704.s b/asm/non_matchings/code/z_onepointdemo/func_8007C704.s index c0dcb5ca7f..32cfb5a3bd 100644 --- a/asm/non_matchings/code/z_onepointdemo/func_8007C704.s +++ b/asm/non_matchings/code/z_onepointdemo/func_8007C704.s @@ -14,7 +14,7 @@ glabel func_8007C704 /* AF38B4 8007C714 C4860000 */ lwc1 $f6, ($a0) /* AF38B8 8007C718 C4A40000 */ lwc1 $f4, ($a1) /* AF38BC 8007C71C 460A4381 */ sub.s $f14, $f8, $f10 -/* AF38C0 8007C720 0C03F494 */ jal Math_atan2f +/* AF38C0 8007C720 0C03F494 */ jal Math_FAtan2F /* AF38C4 8007C724 46062301 */ sub.s $f12, $f4, $f6 /* AF38C8 8007C728 3C018014 */ lui $at, %hi(D_8013CE40) /* AF38CC 8007C72C C430CE40 */ lwc1 $f16, %lo(D_8013CE40)($at) diff --git a/asm/non_matchings/code/z_onepointdemo/func_8007C850.s b/asm/non_matchings/code/z_onepointdemo/func_8007C850.s index 14b6a06583..5847a33b1f 100644 --- a/asm/non_matchings/code/z_onepointdemo/func_8007C850.s +++ b/asm/non_matchings/code/z_onepointdemo/func_8007C850.s @@ -1050,7 +1050,7 @@ glabel func_8007C850 /* AF4078 8007CED8 44816000 */ mtc1 $at, $f12 /* AF407C 8007CEDC 00000000 */ nop .L8007CEE0: -/* AF4080 8007CEE0 0C03F66B */ jal Math_Rand_ZeroOne +/* AF4080 8007CEE0 0C03F66B */ jal Rand_ZeroOne /* AF4084 8007CEE4 E7AC005C */ swc1 $f12, 0x5c($sp) /* AF4088 8007CEE8 3C014100 */ li $at, 0x41000000 # 0.000000 /* AF408C 8007CEEC 44814000 */ mtc1 $at, $f8 @@ -1075,7 +1075,7 @@ glabel func_8007C850 /* AF40D4 8007CF34 44816000 */ mtc1 $at, $f12 /* AF40D8 8007CF38 00000000 */ nop .L8007CF3C: -/* AF40DC 8007CF3C 0C03F66B */ jal Math_Rand_ZeroOne +/* AF40DC 8007CF3C 0C03F66B */ jal Rand_ZeroOne /* AF40E0 8007CF40 E7AC005C */ swc1 $f12, 0x5c($sp) /* AF40E4 8007CF44 3C0140A0 */ li $at, 0x40A00000 # 0.000000 /* AF40E8 8007CF48 44812000 */ mtc1 $at, $f4 @@ -1109,13 +1109,13 @@ glabel func_8007C850 /* AF4150 8007CFB0 2401008F */ li $at, 143 /* AF4154 8007CFB4 51A10021 */ beql $t5, $at, .L8007D03C /* AF4158 8007CFB8 8FAE0084 */ lw $t6, 0x84($sp) -/* AF415C 8007CFBC 0C03F66B */ jal Math_Rand_ZeroOne +/* AF415C 8007CFBC 0C03F66B */ jal Rand_ZeroOne /* AF4160 8007CFC0 00000000 */ nop /* AF4164 8007CFC4 3C0140A0 */ li $at, 0x40A00000 # 0.000000 /* AF4168 8007CFC8 44815000 */ mtc1 $at, $f10 /* AF416C 8007CFCC 00000000 */ nop /* AF4170 8007CFD0 460A0402 */ mul.s $f16, $f0, $f10 -/* AF4174 8007CFD4 0C03F66B */ jal Math_Rand_ZeroOne +/* AF4174 8007CFD4 0C03F66B */ jal Rand_ZeroOne /* AF4178 8007CFD8 E6100010 */ swc1 $f16, 0x10($s0) /* AF417C 8007CFDC 3C0141F0 */ li $at, 0x41F00000 # 0.000000 /* AF4180 8007CFE0 44814000 */ mtc1 $at, $f8 @@ -1123,7 +1123,7 @@ glabel func_8007C850 /* AF4188 8007CFE8 44812000 */ mtc1 $at, $f4 /* AF418C 8007CFEC 46080482 */ mul.s $f18, $f0, $f8 /* AF4190 8007CFF0 46049180 */ add.s $f6, $f18, $f4 -/* AF4194 8007CFF4 0C03F66B */ jal Math_Rand_ZeroOne +/* AF4194 8007CFF4 0C03F66B */ jal Rand_ZeroOne /* AF4198 8007CFF8 E6060018 */ swc1 $f6, 0x18($s0) /* AF419C 8007CFFC 3C0142C8 */ li $at, 0x42C80000 # 0.000000 /* AF41A0 8007D000 44815000 */ mtc1 $at, $f10 @@ -1131,7 +1131,7 @@ glabel func_8007C850 /* AF41A8 8007D008 44814000 */ mtc1 $at, $f8 /* AF41AC 8007D00C 460A0402 */ mul.s $f16, $f0, $f10 /* AF41B0 8007D010 46088480 */ add.s $f18, $f16, $f8 -/* AF41B4 8007D014 0C03F66B */ jal Math_Rand_ZeroOne +/* AF41B4 8007D014 0C03F66B */ jal Rand_ZeroOne /* AF41B8 8007D018 E612001C */ swc1 $f18, 0x1c($s0) /* AF41BC 8007D01C 3C0142A0 */ li $at, 0x42A00000 # 0.000000 /* AF41C0 8007D020 44812000 */ mtc1 $at, $f4 @@ -1163,7 +1163,7 @@ glabel func_8007C850 /* AF4220 8007D080 44811000 */ mtc1 $at, $f2 /* AF4224 8007D084 00000000 */ nop .L8007D088: -/* AF4228 8007D088 0C03F66B */ jal Math_Rand_ZeroOne +/* AF4228 8007D088 0C03F66B */ jal Rand_ZeroOne /* AF422C 8007D08C E7A20060 */ swc1 $f2, 0x60($sp) /* AF4230 8007D090 C7A20060 */ lwc1 $f2, 0x60($sp) /* AF4234 8007D094 0015C080 */ sll $t8, $s5, 2 @@ -1217,13 +1217,13 @@ glabel func_8007C850 /* AF42EC 8007D14C 2401008F */ li $at, 143 /* AF42F0 8007D150 51E10021 */ beql $t7, $at, .L8007D1D8 /* AF42F4 8007D154 8FB80084 */ lw $t8, 0x84($sp) -/* AF42F8 8007D158 0C03F66B */ jal Math_Rand_ZeroOne +/* AF42F8 8007D158 0C03F66B */ jal Rand_ZeroOne /* AF42FC 8007D15C 00000000 */ nop /* AF4300 8007D160 3C0141A0 */ li $at, 0x41A00000 # 0.000000 /* AF4304 8007D164 44819000 */ mtc1 $at, $f18 /* AF4308 8007D168 00000000 */ nop /* AF430C 8007D16C 46120102 */ mul.s $f4, $f0, $f18 -/* AF4310 8007D170 0C03F66B */ jal Math_Rand_ZeroOne +/* AF4310 8007D170 0C03F66B */ jal Rand_ZeroOne /* AF4314 8007D174 E6040010 */ swc1 $f4, 0x10($s0) /* AF4318 8007D178 3C014220 */ li $at, 0x42200000 # 0.000000 /* AF431C 8007D17C 44813000 */ mtc1 $at, $f6 @@ -1231,7 +1231,7 @@ glabel func_8007C850 /* AF4324 8007D184 44818000 */ mtc1 $at, $f16 /* AF4328 8007D188 46060282 */ mul.s $f10, $f0, $f6 /* AF432C 8007D18C 46105200 */ add.s $f8, $f10, $f16 -/* AF4330 8007D190 0C03F66B */ jal Math_Rand_ZeroOne +/* AF4330 8007D190 0C03F66B */ jal Rand_ZeroOne /* AF4334 8007D194 E6080018 */ swc1 $f8, 0x18($s0) /* AF4338 8007D198 3C014220 */ li $at, 0x42200000 # 0.000000 /* AF433C 8007D19C 44819000 */ mtc1 $at, $f18 @@ -1239,7 +1239,7 @@ glabel func_8007C850 /* AF4344 8007D1A4 44813000 */ mtc1 $at, $f6 /* AF4348 8007D1A8 46120102 */ mul.s $f4, $f0, $f18 /* AF434C 8007D1AC 46062280 */ add.s $f10, $f4, $f6 -/* AF4350 8007D1B0 0C03F66B */ jal Math_Rand_ZeroOne +/* AF4350 8007D1B0 0C03F66B */ jal Rand_ZeroOne /* AF4354 8007D1B4 E60A001C */ swc1 $f10, 0x1c($s0) /* AF4358 8007D1B8 3C014220 */ li $at, 0x42200000 # 0.000000 /* AF435C 8007D1BC 44818000 */ mtc1 $at, $f16 @@ -1271,7 +1271,7 @@ glabel func_8007C850 /* AF43BC 8007D21C 44811000 */ mtc1 $at, $f2 /* AF43C0 8007D220 00000000 */ nop .L8007D224: -/* AF43C4 8007D224 0C03F66B */ jal Math_Rand_ZeroOne +/* AF43C4 8007D224 0C03F66B */ jal Rand_ZeroOne /* AF43C8 8007D228 E7A20060 */ swc1 $f2, 0x60($sp) /* AF43CC 8007D22C C7A20060 */ lwc1 $f2, 0x60($sp) /* AF43D0 8007D230 00156880 */ sll $t5, $s5, 2 @@ -1547,7 +1547,7 @@ glabel func_8007C850 /* AF47E8 8007D648 F7AA0010 */ sdc1 $f10, 0x10($sp) /* AF47EC 8007D64C 0C00084C */ jal osSyncPrintf /* AF47F0 8007D650 F7A40020 */ sdc1 $f4, 0x20($sp) -/* AF47F4 8007D654 0C03F66B */ jal Math_Rand_ZeroOne +/* AF47F4 8007D654 0C03F66B */ jal Rand_ZeroOne /* AF47F8 8007D658 00000000 */ nop /* AF47FC 8007D65C 3C0142F0 */ li $at, 0x42F00000 # 0.000000 /* AF4800 8007D660 44811000 */ mtc1 $at, $f2 @@ -1568,7 +1568,7 @@ glabel func_8007C850 /* AF483C 8007D69C C5C6003C */ lwc1 $f6, 0x3c($t6) /* AF4840 8007D6A0 46123200 */ add.s $f8, $f6, $f18 /* AF4844 8007D6A4 46044280 */ add.s $f10, $f8, $f4 -/* AF4848 8007D6A8 0C03F66B */ jal Math_Rand_ZeroOne +/* AF4848 8007D6A8 0C03F66B */ jal Rand_ZeroOne /* AF484C 8007D6AC E60A0020 */ swc1 $f10, 0x20($s0) /* AF4850 8007D6B0 3C0142F0 */ li $at, 0x42F00000 # 0.000000 /* AF4854 8007D6B4 44818000 */ mtc1 $at, $f16 @@ -1741,7 +1741,7 @@ glabel func_8007C850 /* AF4AD4 8007D934 E6000064 */ swc1 $f0, 0x64($s0) /* AF4AD8 8007D938 E6000070 */ swc1 $f0, 0x70($s0) /* AF4ADC 8007D93C E6000048 */ swc1 $f0, 0x48($s0) -/* AF4AE0 8007D940 0C03F66B */ jal Math_Rand_ZeroOne +/* AF4AE0 8007D940 0C03F66B */ jal Rand_ZeroOne /* AF4AE4 8007D944 E6000020 */ swc1 $f0, 0x20($s0) /* AF4AE8 8007D948 44808000 */ mtc1 $zero, $f16 /* AF4AEC 8007D94C 00000000 */ nop @@ -1947,7 +1947,7 @@ glabel L8007DBF8 /* AF4DEC 8007DC4C E6120038 */ swc1 $f18, 0x38($s0) /* AF4DF0 8007DC50 E6040044 */ swc1 $f4, 0x44($s0) .L8007DC54: -/* AF4DF4 8007DC54 0C03F66B */ jal Math_Rand_ZeroOne +/* AF4DF4 8007DC54 0C03F66B */ jal Rand_ZeroOne /* AF4DF8 8007DC58 00000000 */ nop /* AF4DFC 8007DC5C 3C014170 */ li $at, 0x41700000 # 0.000000 /* AF4E00 8007DC60 44818000 */ mtc1 $at, $f16 diff --git a/asm/non_matchings/code/z_play/Gameplay_Init.s b/asm/non_matchings/code/z_play/Gameplay_Init.s index 87d53b67ed..7ec55a8d8e 100644 --- a/asm/non_matchings/code/z_play/Gameplay_Init.s +++ b/asm/non_matchings/code/z_play/Gameplay_Init.s @@ -401,7 +401,7 @@ glabel Gameplay_Init /* B34148 800BCFA8 262407B8 */ addiu $a0, $s1, 0x7b8 /* B3414C 800BCFAC 0C001A78 */ jal osGetTime /* B34150 800BCFB0 00000000 */ nop -/* B34154 800BCFB4 0C03F668 */ jal Math_Rand_Seed +/* B34154 800BCFB4 0C03F668 */ jal Rand_Seed /* B34158 800BCFB8 00602025 */ move $a0, $v1 /* B3415C 800BCFBC 0C034204 */ jal Matrix_Init /* B34160 800BCFC0 02202025 */ move $a0, $s1 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Init.s index 5a44507fb2..8618df4e10 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Init.s @@ -21,11 +21,11 @@ glabel BgBombwall_Init /* 00100 8086E8D0 F7B60028 */ sdc1 $f22, 0x0028($sp) /* 00104 8086E8D4 F7B40020 */ sdc1 $f20, 0x0020($sp) /* 00108 8086E8D8 AFA500BC */ sw $a1, 0x00BC($sp) -/* 0010C 8086E8DC 0C01DE1C */ jal Math_Sins +/* 0010C 8086E8DC 0C01DE1C */ jal Math_SinS ## sins? /* 00110 8086E8E0 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 /* 00114 8086E8E4 46000586 */ mov.s $f22, $f0 -/* 00118 8086E8E8 0C01DE0D */ jal Math_Coss +/* 00118 8086E8E8 0C01DE0D */ jal Math_CosS ## coss? /* 0011C 8086E8EC 866400B6 */ lh $a0, 0x00B6($s3) ## 000000B6 /* 00120 8086E8F0 3C058087 */ lui $a1, %hi(D_8086F004) ## $a1 = 80870000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EB5C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EB5C.s index cb4aaceb6d..4843a590c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EB5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EB5C.s @@ -14,11 +14,11 @@ glabel func_8086EB5C /* 003BC 8086EB8C F7B60028 */ sdc1 $f22, 0x0028($sp) /* 003C0 8086EB90 F7B40020 */ sdc1 $f20, 0x0020($sp) /* 003C4 8086EB94 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 003C8 8086EB98 0C01DE1C */ jal Math_Sins +/* 003C8 8086EB98 0C01DE1C */ jal Math_SinS ## sins? /* 003CC 8086EB9C 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 /* 003D0 8086EBA0 46000586 */ mov.s $f22, $f0 -/* 003D4 8086EBA4 0C01DE0D */ jal Math_Coss +/* 003D4 8086EBA4 0C01DE0D */ jal Math_CosS ## coss? /* 003D8 8086EBA8 864400B6 */ lh $a0, 0x00B6($s2) ## 000000B6 /* 003DC 8086EBAC 3C014370 */ lui $at, 0x4370 ## $at = 43700000 @@ -59,7 +59,7 @@ glabel func_8086EB5C /* 00464 8086EC34 E7B0008C */ swc1 $f16, 0x008C($sp) /* 00468 8086EC38 C6280008 */ lwc1 $f8, 0x0008($s1) ## 0000002C /* 0046C 8086EC3C 46083280 */ add.s $f10, $f6, $f8 -/* 00470 8086EC40 0C03F66B */ jal Math_Rand_ZeroOne +/* 00470 8086EC40 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00474 8086EC44 E7AA0090 */ swc1 $f10, 0x0090($sp) /* 00478 8086EC48 46180402 */ mul.s $f16, $f0, $f24 @@ -70,7 +70,7 @@ glabel func_8086EB5C /* 0048C 8086EC5C 00129403 */ sra $s2, $s2, 16 /* 00490 8086EC60 26520014 */ addiu $s2, $s2, 0x0014 ## $s2 = 00000014 /* 00494 8086EC64 00129400 */ sll $s2, $s2, 16 -/* 00498 8086EC68 0C03F66B */ jal Math_Rand_ZeroOne +/* 00498 8086EC68 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0049C 8086EC6C 00129403 */ sra $s2, $s2, 16 /* 004A0 8086EC70 461C0102 */ mul.s $f4, $f0, $f28 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s index 9053640095..6d4a3626ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s @@ -186,15 +186,15 @@ glabel func_8086FDC0 /* 00460 80870040 02802025 */ or $a0, $s4, $zero ## $a0 = FFFFFF80 /* 00464 80870044 0C0346BD */ jal Matrix_MultVec3f /* 00468 80870048 02A02825 */ or $a1, $s5, $zero ## $a1 = FFFFFFF0 -/* 0046C 8087004C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0046C 8087004C 0C00CFC8 */ jal Rand_CenteredFloat /* 00470 80870050 4600C306 */ mov.s $f12, $f24 /* 00474 80870054 46000506 */ mov.s $f20, $f0 -/* 00478 80870058 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00478 80870058 0C00CFC8 */ jal Rand_CenteredFloat /* 0047C 8087005C 4600C306 */ mov.s $f12, $f24 /* 00480 80870060 46000586 */ mov.s $f22, $f0 -/* 00484 80870064 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00484 80870064 0C00CFC8 */ jal Rand_CenteredFloat /* 00488 80870068 4600C306 */ mov.s $f12, $f24 /* 0048C 8087006C C7A801EC */ lwc1 $f8, 0x01EC($sp) @@ -244,15 +244,15 @@ glabel func_8086FDC0 /* 00534 80870114 27AC0184 */ addiu $t4, $sp, 0x0184 ## $t4 = FFFFFF8C /* 00538 80870118 026C9021 */ addu $s2, $s3, $t4 /* 0053C 8087011C 460AF502 */ mul.s $f20, $f30, $f10 -/* 00540 80870120 0C03F66B */ jal Math_Rand_ZeroOne +/* 00540 80870120 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00544 80870124 00000000 */ nop /* 00548 80870128 46140400 */ add.s $f16, $f0, $f20 -/* 0054C 8087012C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0054C 8087012C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00550 80870130 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 /* 00554 80870134 46140480 */ add.s $f18, $f0, $f20 -/* 00558 80870138 0C03F66B */ jal Math_Rand_ZeroOne +/* 00558 80870138 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0055C 8087013C E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 /* 00560 80870140 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -266,7 +266,7 @@ glabel func_8086FDC0 /* 00580 80870160 44088000 */ mfc1 $t0, $f16 /* 00584 80870164 00000000 */ nop /* 00588 80870168 03284821 */ addu $t1, $t9, $t0 -/* 0058C 8087016C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0058C 8087016C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00590 80870170 A6090032 */ sh $t1, 0x0032($s0) ## 00000032 /* 00594 80870174 461C0482 */ mul.s $f18, $f0, $f28 @@ -274,7 +274,7 @@ glabel func_8086FDC0 /* 0059C 8087017C 440C2000 */ mfc1 $t4, $f4 /* 005A0 80870180 00000000 */ nop /* 005A4 80870184 258E07D0 */ addiu $t6, $t4, 0x07D0 ## $t6 = 000007D0 -/* 005A8 80870188 0C03F66B */ jal Math_Rand_ZeroOne +/* 005A8 80870188 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 005AC 8087018C A60E0030 */ sh $t6, 0x0030($s0) ## 00000030 /* 005B0 80870190 461C0182 */ mul.s $f6, $f0, $f28 @@ -285,19 +285,19 @@ glabel func_8086FDC0 /* 005C4 808701A4 250907D0 */ addiu $t1, $t0, 0x07D0 ## $t1 = 000007D0 /* 005C8 808701A8 A6090034 */ sh $t1, 0x0034($s0) ## 00000034 /* 005CC 808701AC 8FAA01FC */ lw $t2, 0x01FC($sp) -/* 005D0 808701B0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 005D0 808701B0 0C00CFC8 */ jal Rand_CenteredFloat /* 005D4 808701B4 AE0A0118 */ sw $t2, 0x0118($s0) ## 00000118 /* 005D8 808701B8 C64A0000 */ lwc1 $f10, 0x0000($s2) ## FFFFFFA4 /* 005DC 808701BC 4600D306 */ mov.s $f12, $f26 /* 005E0 808701C0 460A0400 */ add.s $f16, $f0, $f10 -/* 005E4 808701C4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 005E4 808701C4 0C00CFC8 */ jal Rand_CenteredFloat /* 005E8 808701C8 E6100050 */ swc1 $f16, 0x0050($s0) ## 00000050 /* 005EC 808701CC C6520004 */ lwc1 $f18, 0x0004($s2) ## FFFFFFA8 /* 005F0 808701D0 4600D306 */ mov.s $f12, $f26 /* 005F4 808701D4 46120100 */ add.s $f4, $f0, $f18 -/* 005F8 808701D8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 005F8 808701D8 0C00CFC8 */ jal Rand_CenteredFloat /* 005FC 808701DC E6040054 */ swc1 $f4, 0x0054($s0) ## 00000054 /* 00600 808701E0 C6460008 */ lwc1 $f6, 0x0008($s2) ## FFFFFFAC diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870564.s b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870564.s index 116cc30526..583ed9cd99 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870564.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870564.s @@ -13,7 +13,7 @@ glabel func_80870564 /* 009B0 80870590 468021A0 */ cvt.s.w $f6, $f4 /* 009B4 80870594 46083280 */ add.s $f10, $f6, $f8 /* 009B8 80870598 44055000 */ mfc1 $a1, $f10 -/* 009BC 8087059C 0C01DE80 */ jal Math_ApproxF +/* 009BC 8087059C 0C01DE80 */ jal Math_StepToF /* 009C0 808705A0 00000000 */ nop /* 009C4 808705A4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Update.s index 4d2133a596..ce8391cdad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Update.s @@ -117,7 +117,7 @@ glabel BgDyYoseizo_Update /* 0229C 80874ACC 860902F4 */ lh $t1, 0x02F4($s0) ## 000002F4 /* 022A0 80874AD0 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 022A4 80874AD4 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 -/* 022A8 80874AD8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 022A8 80874AD8 0C00CFBE */ jal Rand_ZeroFloat /* 022AC 80874ADC A60902F2 */ sh $t1, 0x02F2($s0) ## 000002F2 /* 022B0 80874AE0 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872960.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872960.s index 9c78a0eba6..5dfec9d40c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872960.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872960.s @@ -56,18 +56,18 @@ glabel func_80872960 /* 001C4 808729F4 8FBF0084 */ lw $ra, 0x0084($sp) /* 001C8 808729F8 C4265684 */ lwc1 $f6, %lo(D_80875684)($at) /* 001CC 808729FC 46060502 */ mul.s $f20, $f0, $f6 -/* 001D0 80872A00 0C03F66B */ jal Math_Rand_ZeroOne +/* 001D0 80872A00 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 001D4 80872A04 00000000 */ nop /* 001D8 80872A08 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 001DC 80872A0C 4481E000 */ mtc1 $at, $f28 ## $f28 = 0.50 /* 001E0 80872A10 00000000 */ nop /* 001E4 80872A14 461C0201 */ sub.s $f8, $f0, $f28 -/* 001E8 80872A18 0C03F66B */ jal Math_Rand_ZeroOne +/* 001E8 80872A18 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 001EC 80872A1C E7A800B8 */ swc1 $f8, 0x00B8($sp) /* 001F0 80872A20 461C0281 */ sub.s $f10, $f0, $f28 -/* 001F4 80872A24 0C03F66B */ jal Math_Rand_ZeroOne +/* 001F4 80872A24 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 001F8 80872A28 E7AA00BC */ swc1 $f10, 0x00BC($sp) /* 001FC 80872A2C 461C0401 */ sub.s $f16, $f0, $f28 @@ -91,7 +91,7 @@ glabel func_80872960 /* 00240 80872A70 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 /* 00244 80872A74 4600F606 */ mov.s $f24, $f30 /* 00248 80872A78 2412005A */ addiu $s2, $zero, 0x005A ## $s2 = 0000005A -/* 0024C 80872A7C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0024C 80872A7C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00250 80872A80 E7B200AC */ swc1 $f18, 0x00AC($sp) /* 00254 80872A84 461C0101 */ sub.s $f4, $f0, $f28 @@ -113,7 +113,7 @@ glabel func_80872960 /* 00290 80872AC0 24120032 */ addiu $s2, $zero, 0x0032 ## $s2 = 00000032 /* 00294 80872AC4 02808825 */ or $s1, $s4, $zero ## $s1 = 00000000 /* 00298 80872AC8 4608A582 */ mul.s $f22, $f20, $f8 -/* 0029C 80872ACC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0029C 80872ACC 0C00CFC8 */ jal Rand_CenteredFloat /* 002A0 80872AD0 00000000 */ nop /* 002A4 80872AD4 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 @@ -124,7 +124,7 @@ glabel func_80872960 /* 002B8 80872AE8 852A00A4 */ lh $t2, 0x00A4($t1) ## 000000A4 /* 002BC 80872AEC 15410010 */ bne $t2, $at, .L80872B30 /* 002C0 80872AF0 00000000 */ nop -/* 002C4 80872AF4 0C03F66B */ jal Math_Rand_ZeroOne +/* 002C4 80872AF4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 002C8 80872AF8 00000000 */ nop /* 002CC 80872AFC 461C0181 */ sub.s $f6, $f0, $f28 @@ -141,7 +141,7 @@ glabel func_80872960 /* 002F8 80872B28 1000000F */ beq $zero, $zero, .L80872B68 /* 002FC 80872B2C E7A400B4 */ swc1 $f4, 0x00B4($sp) .L80872B30: -/* 00300 80872B30 0C03F66B */ jal Math_Rand_ZeroOne +/* 00300 80872B30 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00304 80872B34 00000000 */ nop /* 00308 80872B38 461C0181 */ sub.s $f6, $f0, $f28 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872C58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872C58.s index f10631e02a..e97ad65752 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872C58.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872C58.s @@ -17,14 +17,14 @@ glabel func_80872C58 /* 00450 80872C80 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 00454 80872C84 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 00458 80872C88 44050000 */ mfc1 $a1, $f0 -/* 0045C 80872C8C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0045C 80872C8C 0C01E107 */ jal Math_ApproachF /* 00460 80872C90 E48002F4 */ swc1 $f0, 0x02F4($a0) ## 0000031C /* 00464 80872C94 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00468 80872C98 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0046C 80872C9C 26040320 */ addiu $a0, $s0, 0x0320 ## $a0 = 00000320 /* 00470 80872CA0 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 00474 80872CA4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00474 80872CA4 0C01E107 */ jal Math_ApproachF /* 00478 80872CA8 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 0047C 80872CAC 8FAE0024 */ lw $t6, 0x0024($sp) @@ -36,7 +36,7 @@ glabel func_80872C58 /* 00494 80872CC4 44045000 */ mfc1 $a0, $f10 /* 00498 80872CC8 00000000 */ nop /* 0049C 80872CCC 00042400 */ sll $a0, $a0, 16 -/* 004A0 80872CD0 0C01DE1C */ jal Math_Sins +/* 004A0 80872CD0 0C01DE1C */ jal Math_SinS ## sins? /* 004A4 80872CD4 00042403 */ sra $a0, $a0, 16 /* 004A8 80872CD8 1000000C */ beq $zero, $zero, .L80872D0C @@ -47,7 +47,7 @@ glabel func_80872C58 /* 004B8 80872CE8 44049000 */ mfc1 $a0, $f18 /* 004BC 80872CEC 00000000 */ nop /* 004C0 80872CF0 00042400 */ sll $a0, $a0, 16 -/* 004C4 80872CF4 0C01DE1C */ jal Math_Sins +/* 004C4 80872CF4 0C01DE1C */ jal Math_SinS ## sins? /* 004C8 80872CF8 00042403 */ sra $a0, $a0, 16 /* 004CC 80872CFC 3C018087 */ lui $at, %hi(D_80875694) ## $at = 80870000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873380.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873380.s index 7cd26bde4e..f6e068bc19 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873380.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873380.s @@ -16,7 +16,7 @@ glabel func_80873380 /* 00B74 808733A4 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 00B78 808733A8 8E05030C */ lw $a1, 0x030C($s0) ## 0000030C /* 00B7C 808733AC 8E060314 */ lw $a2, 0x0314($s0) ## 00000314 -/* 00B80 808733B0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00B80 808733B0 0C01E107 */ jal Math_ApproachF /* 00B84 808733B4 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 00B88 808733B8 3C053D0F */ lui $a1, 0x3D0F ## $a1 = 3D0F0000 @@ -24,7 +24,7 @@ glabel func_80873380 /* 00B90 808733C0 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A /* 00B94 808733C4 34A55C29 */ ori $a1, $a1, 0x5C29 ## $a1 = 3D0F5C29 /* 00B98 808733C8 26040308 */ addiu $a0, $s0, 0x0308 ## $a0 = 00000308 -/* 00B9C 808733CC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00B9C 808733CC 0C01E107 */ jal Math_ApproachF /* 00BA0 808733D0 8E060318 */ lw $a2, 0x0318($s0) ## 00000318 /* 00BA4 808733D4 3C053F4C */ lui $a1, 0x3F4C ## $a1 = 3F4C0000 @@ -33,7 +33,7 @@ glabel func_80873380 /* 00BB0 808733E0 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 00BB4 808733E4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 00BB8 808733E8 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3F4CCCCD -/* 00BBC 808733EC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00BBC 808733EC 0C01E107 */ jal Math_ApproachF /* 00BC0 808733F0 26040314 */ addiu $a0, $s0, 0x0314 ## $a0 = 00000314 /* 00BC4 808733F4 3C053E4C */ lui $a1, 0x3E4C ## $a1 = 3E4C0000 @@ -42,7 +42,7 @@ glabel func_80873380 /* 00BD0 80873400 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 00BD4 80873404 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 3CF5C28F /* 00BD8 80873408 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3E4CCCCD -/* 00BDC 8087340C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00BDC 8087340C 0C01E107 */ jal Math_ApproachF /* 00BE0 80873410 26040318 */ addiu $a0, $s0, 0x0318 ## $a0 = 00000318 /* 00BE4 80873414 3C018087 */ lui $at, %hi(D_80875698) ## $at = 80870000 @@ -66,7 +66,7 @@ glabel func_80873380 /* 00C28 80873458 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00C2C 8087345C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 00C30 80873460 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 00C34 80873464 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00C34 80873464 0C01E1A7 */ jal Math_SmoothStepToS /* 00C38 80873468 AFA00010 */ sw $zero, 0x0010($sp) /* 00C3C 8087346C 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873D14.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873D14.s index 970fbcb526..532baa1d65 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873D14.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873D14.s @@ -31,13 +31,13 @@ glabel func_80873D14 /* 01540 80873D70 AE18014C */ sw $t8, 0x014C($s0) ## 0000014C /* 01544 80873D74 8E050310 */ lw $a1, 0x0310($s0) ## 00000310 .L80873D78: -/* 01548 80873D78 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01548 80873D78 0C01E107 */ jal Math_ApproachF /* 0154C 80873D7C 8E060314 */ lw $a2, 0x0314($s0) ## 00000314 /* 01550 80873D80 3C063BA3 */ lui $a2, 0x3BA3 ## $a2 = 3BA30000 /* 01554 80873D84 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3BA3D70A /* 01558 80873D88 26040308 */ addiu $a0, $s0, 0x0308 ## $a0 = 00000308 -/* 0155C 80873D8C 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 0155C 80873D8C 0C01E123 */ jal Math_ApproachZeroF /* 01560 80873D90 8E050318 */ lw $a1, 0x0318($s0) ## 00000318 /* 01564 80873D94 3C053F4C */ lui $a1, 0x3F4C ## $a1 = 3F4C0000 @@ -46,7 +46,7 @@ glabel func_80873D14 /* 01570 80873DA0 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 01574 80873DA4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01578 80873DA8 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3F4CCCCD -/* 0157C 80873DAC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0157C 80873DAC 0C01E107 */ jal Math_ApproachF /* 01580 80873DB0 26040314 */ addiu $a0, $s0, 0x0314 ## $a0 = 00000314 /* 01584 80873DB4 3C053E4C */ lui $a1, 0x3E4C ## $a1 = 3E4C0000 @@ -55,7 +55,7 @@ glabel func_80873D14 /* 01590 80873DC0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 01594 80873DC4 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 3CF5C28F /* 01598 80873DC8 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3E4CCCCD -/* 0159C 80873DCC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0159C 80873DCC 0C01E107 */ jal Math_ApproachF /* 015A0 80873DD0 26040318 */ addiu $a0, $s0, 0x0318 ## $a0 = 00000318 /* 015A4 80873DD4 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s index 5ceb9dc677..c9794a3041 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s @@ -15,7 +15,7 @@ glabel func_80873FD8 /* 017C8 80873FF8 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 017CC 80873FFC 8E05030C */ lw $a1, 0x030C($s0) ## 0000030C /* 017D0 80874000 8E060314 */ lw $a2, 0x0314($s0) ## 00000314 -/* 017D4 80874004 0C01E107 */ jal Math_SmoothScaleMaxF +/* 017D4 80874004 0C01E107 */ jal Math_ApproachF /* 017D8 80874008 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 017DC 8087400C 3C053D0F */ lui $a1, 0x3D0F ## $a1 = 3D0F0000 @@ -23,7 +23,7 @@ glabel func_80873FD8 /* 017E4 80874014 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A /* 017E8 80874018 34A55C29 */ ori $a1, $a1, 0x5C29 ## $a1 = 3D0F5C29 /* 017EC 8087401C 26040308 */ addiu $a0, $s0, 0x0308 ## $a0 = 00000308 -/* 017F0 80874020 0C01E107 */ jal Math_SmoothScaleMaxF +/* 017F0 80874020 0C01E107 */ jal Math_ApproachF /* 017F4 80874024 8E060318 */ lw $a2, 0x0318($s0) ## 00000318 /* 017F8 80874028 3C053F4C */ lui $a1, 0x3F4C ## $a1 = 3F4C0000 @@ -32,7 +32,7 @@ glabel func_80873FD8 /* 01804 80874034 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 01808 80874038 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0180C 8087403C 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3F4CCCCD -/* 01810 80874040 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01810 80874040 0C01E107 */ jal Math_ApproachF /* 01814 80874044 26040314 */ addiu $a0, $s0, 0x0314 ## $a0 = 00000314 /* 01818 80874048 3C053E4C */ lui $a1, 0x3E4C ## $a1 = 3E4C0000 @@ -41,7 +41,7 @@ glabel func_80873FD8 /* 01824 80874054 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 01828 80874058 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 3CF5C28F /* 0182C 8087405C 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3E4CCCCD -/* 01830 80874060 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01830 80874060 0C01E107 */ jal Math_ApproachF /* 01834 80874064 26040318 */ addiu $a0, $s0, 0x0318 ## $a0 = 00000318 /* 01838 80874068 3C018087 */ lui $at, %hi(D_808756AC) ## $at = 80870000 @@ -64,7 +64,7 @@ glabel func_80873FD8 /* 01878 808740A8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 0187C 808740AC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01880 808740B0 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 01884 808740B4 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01884 808740B4 0C01E1EF */ jal Math_ApproachS /* 01888 808740B8 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 0188C 808740BC 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874D9C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874D9C.s index 42f3493e51..58040fd39c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874D9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874D9C.s @@ -59,7 +59,7 @@ glabel func_80874D9C /* 02638 80874E68 E4460038 */ swc1 $f6, 0x0038($v0) ## 000003CC /* 0263C 80874E6C A4490036 */ sh $t1, 0x0036($v0) ## 000003CA /* 02640 80874E70 AFA2001C */ sw $v0, 0x001C($sp) -/* 02644 80874E74 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02644 80874E74 0C00CFC8 */ jal Rand_CenteredFloat /* 02648 80874E78 C42C56B8 */ lwc1 $f12, %lo(D_808756B8)($at) /* 0264C 80874E7C 8FA2001C */ lw $v0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874EAC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874EAC.s index c87d4f91d0..d45c616543 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874EAC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874EAC.s @@ -119,13 +119,13 @@ glabel func_80874EAC /* 027F8 80875028 4406D000 */ mfc1 $a2, $f26 /* 027FC 8087502C 4407E000 */ mfc1 $a3, $f28 /* 02800 80875030 26040038 */ addiu $a0, $s0, 0x0038 ## $a0 = 000003CC -/* 02804 80875034 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02804 80875034 0C01E107 */ jal Math_ApproachF /* 02808 80875038 468085A0 */ cvt.s.w $f22, $f16 /* 0280C 8087503C 4405B000 */ mfc1 $a1, $f22 /* 02810 80875040 4406D000 */ mfc1 $a2, $f26 /* 02814 80875044 4407E000 */ mfc1 $a3, $f28 -/* 02818 80875048 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02818 80875048 0C01E107 */ jal Math_ApproachF /* 0281C 8087504C 2604003C */ addiu $a0, $s0, 0x003C ## $a0 = 000003D0 /* 02820 80875050 0C034213 */ jal Matrix_Push diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/func_80879668.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/func_80879668.s index cfe5dfdb94..20a17c1edf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/func_80879668.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/func_80879668.s @@ -39,7 +39,7 @@ glabel func_80879668 /* 00234 808796F4 AE190028 */ sw $t9, 0x0028($s0) ## 00000028 /* 00238 808796F8 AE08002C */ sw $t0, 0x002C($s0) ## 0000002C /* 0023C 808796FC E7A20020 */ swc1 $f2, 0x0020($sp) -/* 00240 80879700 0C01DE1C */ jal Math_Sins +/* 00240 80879700 0C01DE1C */ jal Math_SinS ## sins? /* 00244 80879704 00042403 */ sra $a0, $a0, 16 /* 00248 80879708 C7A20020 */ lwc1 $f2, 0x0020($sp) @@ -54,7 +54,7 @@ glabel func_80879668 /* 0026C 8087972C 00042400 */ sll $a0, $a0, 16 /* 00270 80879730 46062200 */ add.s $f8, $f4, $f6 /* 00274 80879734 00042403 */ sra $a0, $a0, 16 -/* 00278 80879738 0C01DE0D */ jal Math_Coss +/* 00278 80879738 0C01DE0D */ jal Math_CosS ## coss? /* 0027C 8087973C E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 /* 00280 80879740 C7A20020 */ lwc1 $f2, 0x0020($sp) @@ -67,7 +67,7 @@ glabel func_80879668 /* 0029C 8087975C 00042400 */ sll $a0, $a0, 16 /* 002A0 80879760 00042403 */ sra $a0, $a0, 16 /* 002A4 80879764 46105480 */ add.s $f18, $f10, $f16 -/* 002A8 80879768 0C01DE0D */ jal Math_Coss +/* 002A8 80879768 0C01DE0D */ jal Math_CosS ## coss? /* 002AC 8087976C E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C /* 002B0 80879770 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A184.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A184.s index f325f3cc73..bdec8a3d16 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A184.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A184.s @@ -17,7 +17,7 @@ glabel func_8087A184 /* 00720 8087A1C0 8CE5000C */ lw $a1, 0x000C($a3) ## 0000000C .L8087A1C4: /* 00724 8087A1C4 AFA70018 */ sw $a3, 0x0018($sp) -/* 00728 8087A1C8 0C01DE80 */ jal Math_ApproxF +/* 00728 8087A1C8 0C01DE80 */ jal Math_StepToF /* 0072C 8087A1CC 24E40028 */ addiu $a0, $a3, 0x0028 ## $a0 = 00000028 /* 00730 8087A1D0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A248.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A248.s index 1d3155d935..4d9f573c85 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A248.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A248.s @@ -16,7 +16,7 @@ glabel func_8087A248 /* 007E0 8087A280 8E060060 */ lw $a2, 0x0060($s0) ## 00000060 /* 007E4 8087A284 46105481 */ sub.s $f18, $f10, $f16 /* 007E8 8087A288 44059000 */ mfc1 $a1, $f18 -/* 007EC 8087A28C 0C01DE80 */ jal Math_ApproxF +/* 007EC 8087A28C 0C01DE80 */ jal Math_StepToF /* 007F0 8087A290 00000000 */ nop /* 007F4 8087A294 10400015 */ beq $v0, $zero, .L8087A2EC diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A300.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A300.s index 30e295de32..44f674f0f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A300.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A300.s @@ -16,7 +16,7 @@ glabel func_8087A300 /* 00898 8087A338 8E060060 */ lw $a2, 0x0060($s0) ## 00000060 /* 0089C 8087A33C 46105481 */ sub.s $f18, $f10, $f16 /* 008A0 8087A340 44059000 */ mfc1 $a1, $f18 -/* 008A4 8087A344 0C01DE80 */ jal Math_ApproxF +/* 008A4 8087A344 0C01DE80 */ jal Math_StepToF /* 008A8 8087A348 00000000 */ nop /* 008AC 8087A34C 5040000F */ beql $v0, $zero, .L8087A38C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A39C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A39C.s index dc8a811e6b..c0ffa28e4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A39C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A39C.s @@ -7,18 +7,18 @@ glabel func_8087A39C /* 00910 8087A3B0 F7B40028 */ sdc1 $f20, 0x0028($sp) /* 00914 8087A3B4 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 00918 8087A3B8 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 0091C 8087A3BC 0C01DE80 */ jal Math_ApproxF +/* 0091C 8087A3BC 0C01DE80 */ jal Math_StepToF /* 00920 8087A3C0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 00924 8087A3C4 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 00928 8087A3C8 8E050168 */ lw $a1, 0x0168($s0) ## 00000168 -/* 0092C 8087A3CC 0C01DE80 */ jal Math_ApproxF +/* 0092C 8087A3CC 0C01DE80 */ jal Math_StepToF /* 00930 8087A3D0 8E060068 */ lw $a2, 0x0068($s0) ## 00000068 /* 00934 8087A3D4 8E050170 */ lw $a1, 0x0170($s0) ## 00000170 /* 00938 8087A3D8 8E060068 */ lw $a2, 0x0068($s0) ## 00000068 /* 0093C 8087A3DC AFA20064 */ sw $v0, 0x0064($sp) -/* 00940 8087A3E0 0C01DE80 */ jal Math_ApproxF +/* 00940 8087A3E0 0C01DE80 */ jal Math_StepToF /* 00944 8087A3E4 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 00948 8087A3E8 8FA30064 */ lw $v1, 0x0064($sp) @@ -73,14 +73,14 @@ glabel func_8087A39C /* 009F8 8087A498 45020088 */ bc1fl .L8087A6BC /* 009FC 8087A49C 8FBF0034 */ lw $ra, 0x0034($sp) /* 00A00 8087A4A0 44816000 */ mtc1 $at, $f12 ## $f12 = 120.00 -/* 00A04 8087A4A4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00A04 8087A4A4 0C00CFC8 */ jal Rand_CenteredFloat /* 00A08 8087A4A8 00000000 */ nop -/* 00A0C 8087A4AC 0C03F66B */ jal Math_Rand_ZeroOne +/* 00A0C 8087A4AC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A10 8087A4B0 E7A00048 */ swc1 $f0, 0x0048($sp) /* 00A14 8087A4B4 46000506 */ mov.s $f20, $f0 -/* 00A18 8087A4B8 0C01DE1C */ jal Math_Sins +/* 00A18 8087A4B8 0C01DE1C */ jal Math_SinS ## sins? /* 00A1C 8087A4BC 86040158 */ lh $a0, 0x0158($s0) ## 00000158 /* 00A20 8087A4C0 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 @@ -89,18 +89,18 @@ glabel func_8087A39C /* 00A2C 8087A4CC 46149100 */ add.s $f4, $f18, $f20 /* 00A30 8087A4D0 46002187 */ neg.s $f6, $f4 /* 00A34 8087A4D4 46060202 */ mul.s $f8, $f0, $f6 -/* 00A38 8087A4D8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00A38 8087A4D8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A3C 8087A4DC E7A8004C */ swc1 $f8, 0x004C($sp) /* 00A40 8087A4E0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00A44 8087A4E4 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 /* 00A48 8087A4E8 00000000 */ nop /* 00A4C 8087A4EC 460A0400 */ add.s $f16, $f0, $f10 -/* 00A50 8087A4F0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00A50 8087A4F0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A54 8087A4F4 E7B00050 */ swc1 $f16, 0x0050($sp) /* 00A58 8087A4F8 46000506 */ mov.s $f20, $f0 -/* 00A5C 8087A4FC 0C01DE0D */ jal Math_Coss +/* 00A5C 8087A4FC 0C01DE0D */ jal Math_CosS ## coss? /* 00A60 8087A500 86040158 */ lh $a0, 0x0158($s0) ## 00000158 /* 00A64 8087A504 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 @@ -110,11 +110,11 @@ glabel func_8087A39C /* 00A74 8087A514 46002187 */ neg.s $f6, $f4 /* 00A78 8087A518 46060202 */ mul.s $f8, $f0, $f6 /* 00A7C 8087A51C E7A80054 */ swc1 $f8, 0x0054($sp) -/* 00A80 8087A520 0C01DE1C */ jal Math_Sins +/* 00A80 8087A520 0C01DE1C */ jal Math_SinS ## sins? /* 00A84 8087A524 86040158 */ lh $a0, 0x0158($s0) ## 00000158 /* 00A88 8087A528 46000506 */ mov.s $f20, $f0 -/* 00A8C 8087A52C 0C01DE0D */ jal Math_Coss +/* 00A8C 8087A52C 0C01DE0D */ jal Math_CosS ## coss? /* 00A90 8087A530 86040158 */ lh $a0, 0x0158($s0) ## 00000158 /* 00A94 8087A534 3C014270 */ lui $at, 0x4270 ## $at = 42700000 @@ -126,11 +126,11 @@ glabel func_8087A39C /* 00AAC 8087A54C 46060202 */ mul.s $f8, $f0, $f6 /* 00AB0 8087A550 46082401 */ sub.s $f16, $f4, $f8 /* 00AB4 8087A554 E7B00058 */ swc1 $f16, 0x0058($sp) -/* 00AB8 8087A558 0C01DE0D */ jal Math_Coss +/* 00AB8 8087A558 0C01DE0D */ jal Math_CosS ## coss? /* 00ABC 8087A55C 86040158 */ lh $a0, 0x0158($s0) ## 00000158 /* 00AC0 8087A560 46000506 */ mov.s $f20, $f0 -/* 00AC4 8087A564 0C01DE1C */ jal Math_Sins +/* 00AC4 8087A564 0C01DE1C */ jal Math_SinS ## sins? /* 00AC8 8087A568 86040158 */ lh $a0, 0x0158($s0) ## 00000158 /* 00ACC 8087A56C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 @@ -145,7 +145,7 @@ glabel func_8087A39C /* 00AF0 8087A590 46048480 */ add.s $f18, $f16, $f4 /* 00AF4 8087A594 E7B20060 */ swc1 $f18, 0x0060($sp) /* 00AF8 8087A598 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 00AFC 8087A59C 0C01DF64 */ jal Math_Rand_S16Offset +/* 00AFC 8087A59C 0C01DF64 */ jal Rand_S16Offset /* 00B00 8087A5A0 E7AA005C */ swc1 $f10, 0x005C($sp) /* 00B04 8087A5A4 3C198088 */ lui $t9, %hi(D_8087A740) ## $t9 = 80880000 @@ -165,15 +165,15 @@ glabel func_8087A39C /* 00B3C 8087A5DC AFA2001C */ sw $v0, 0x001C($sp) /* 00B40 8087A5E0 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 00B44 8087A5E4 44816000 */ mtc1 $at, $f12 ## $f12 = 120.00 -/* 00B48 8087A5E8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00B48 8087A5E8 0C00CFC8 */ jal Rand_CenteredFloat /* 00B4C 8087A5EC 00000000 */ nop /* 00B50 8087A5F0 E7A00048 */ swc1 $f0, 0x0048($sp) -/* 00B54 8087A5F4 0C01DE1C */ jal Math_Sins +/* 00B54 8087A5F4 0C01DE1C */ jal Math_SinS ## sins? /* 00B58 8087A5F8 86040158 */ lh $a0, 0x0158($s0) ## 00000158 /* 00B5C 8087A5FC 46000506 */ mov.s $f20, $f0 -/* 00B60 8087A600 0C01DE0D */ jal Math_Coss +/* 00B60 8087A600 0C01DE0D */ jal Math_CosS ## coss? /* 00B64 8087A604 86040158 */ lh $a0, 0x0158($s0) ## 00000158 /* 00B68 8087A608 3C014270 */ lui $at, 0x4270 ## $at = 42700000 @@ -185,11 +185,11 @@ glabel func_8087A39C /* 00B80 8087A620 46120282 */ mul.s $f10, $f0, $f18 /* 00B84 8087A624 46045200 */ add.s $f8, $f10, $f4 /* 00B88 8087A628 E7A80058 */ swc1 $f8, 0x0058($sp) -/* 00B8C 8087A62C 0C01DE0D */ jal Math_Coss +/* 00B8C 8087A62C 0C01DE0D */ jal Math_CosS ## coss? /* 00B90 8087A630 86040158 */ lh $a0, 0x0158($s0) ## 00000158 /* 00B94 8087A634 46000506 */ mov.s $f20, $f0 -/* 00B98 8087A638 0C01DE1C */ jal Math_Sins +/* 00B98 8087A638 0C01DE1C */ jal Math_SinS ## sins? /* 00B9C 8087A63C 86040158 */ lh $a0, 0x0158($s0) ## 00000158 /* 00BA0 8087A640 3C014270 */ lui $at, 0x4270 ## $at = 42700000 @@ -202,7 +202,7 @@ glabel func_8087A39C /* 00BBC 8087A65C 46040202 */ mul.s $f8, $f0, $f4 /* 00BC0 8087A660 46123281 */ sub.s $f10, $f6, $f18 /* 00BC4 8087A664 46085401 */ sub.s $f16, $f10, $f8 -/* 00BC8 8087A668 0C01DF64 */ jal Math_Rand_S16Offset +/* 00BC8 8087A668 0C01DF64 */ jal Rand_S16Offset /* 00BCC 8087A66C E7B00060 */ swc1 $f16, 0x0060($sp) /* 00BD0 8087A670 3C0A8088 */ lui $t2, %hi(D_8087A740) ## $t2 = 80880000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Init.s index 3796f4c680..f3b0fd87c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Init.s @@ -43,7 +43,7 @@ glabel BgHakaGate_Init /* 00094 8087BE84 28614000 */ slti $at, $v1, 0x4000 /* 00098 8087BE88 5020002D */ beql $at, $zero, .L8087BF40 /* 0009C 8087BE8C AE080164 */ sw $t0, 0x0164($s0) ## 00000164 -/* 000A0 8087BE90 0C03F66B */ jal Math_Rand_ZeroOne +/* 000A0 8087BE90 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 000A4 8087BE94 00000000 */ nop /* 000A8 8087BE98 3C038088 */ lui $v1, %hi(D_8087CCD4) ## $v1 = 80880000 @@ -93,7 +93,7 @@ glabel BgHakaGate_Init /* 00148 8087BF38 AE190164 */ sw $t9, 0x0164($s0) ## 00000164 /* 0014C 8087BF3C AE080164 */ sw $t0, 0x0164($s0) ## 00000164 .L8087BF40: -/* 00150 8087BF40 0C03F66B */ jal Math_Rand_ZeroOne +/* 00150 8087BF40 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00154 8087BF44 00000000 */ nop /* 00158 8087BF48 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C270.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C270.s index 5f54049c5b..0244370a29 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C270.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C270.s @@ -27,7 +27,7 @@ glabel func_8087C270 .L8087C2B4: /* 004C4 8087C2B4 8606016C */ lh $a2, 0x016C($s0) ## 0000016C /* 004C8 8087C2B8 AFA3002C */ sw $v1, 0x002C($sp) -/* 004CC 8087C2BC 0C01DE5F */ jal Math_ApproxS +/* 004CC 8087C2BC 0C01DE5F */ jal Math_StepToS /* 004D0 8087C2C0 2604016E */ addiu $a0, $s0, 0x016E ## $a0 = 0000016E /* 004D4 8087C2C4 AFA20028 */ sw $v0, 0x0028($sp) @@ -71,7 +71,7 @@ glabel func_8087C270 /* 0056C 8087C35C AFA3002C */ sw $v1, 0x002C($sp) /* 00570 8087C360 01F82023 */ subu $a0, $t7, $t8 /* 00574 8087C364 00042400 */ sll $a0, $a0, 16 -/* 00578 8087C368 0C01DE1C */ jal Math_Sins +/* 00578 8087C368 0C01DE1C */ jal Math_SinS ## sins? /* 0057C 8087C36C 00042403 */ sra $a0, $a0, 16 /* 00580 8087C370 3C018088 */ lui $at, %hi(D_8087CCD8) ## $at = 80880000 @@ -85,7 +85,7 @@ glabel func_8087C270 /* 005A0 8087C390 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 /* 005A4 8087C394 03282023 */ subu $a0, $t9, $t0 /* 005A8 8087C398 00042400 */ sll $a0, $a0, 16 -/* 005AC 8087C39C 0C01DE0D */ jal Math_Coss +/* 005AC 8087C39C 0C01DE0D */ jal Math_CosS ## coss? /* 005B0 8087C3A0 00042403 */ sra $a0, $a0, 16 /* 005B4 8087C3A4 3C018088 */ lui $at, %hi(D_8087CCD8) ## $at = 80880000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C454.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C454.s index a1cdc6731d..47f2270e17 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C454.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C454.s @@ -15,12 +15,12 @@ glabel func_8087C454 /* 00698 8087C488 5080004D */ beql $a0, $zero, .L8087C5C0 /* 0069C 8087C48C 8FBF001C */ lw $ra, 0x001C($sp) /* 006A0 8087C490 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 006A4 8087C494 0C01DE0D */ jal Math_Coss +/* 006A4 8087C494 0C01DE0D */ jal Math_CosS ## coss? /* 006A8 8087C498 AFAF002C */ sw $t7, 0x002C($sp) /* 006AC 8087C49C 3C048088 */ lui $a0, %hi(D_8087CFB0) ## $a0 = 80880000 /* 006B0 8087C4A0 8484CFB0 */ lh $a0, %lo(D_8087CFB0)($a0) -/* 006B4 8087C4A4 0C01DE1C */ jal Math_Sins +/* 006B4 8087C4A4 0C01DE1C */ jal Math_SinS ## sins? /* 006B8 8087C4A8 E7A00020 */ swc1 $f0, 0x0020($sp) /* 006BC 8087C4AC 8FA2002C */ lw $v0, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C5D0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C5D0.s index 2a67357f64..cbec54dc79 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C5D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C5D0.s @@ -15,7 +15,7 @@ glabel func_8087C5D0 /* 00810 8087C600 24E4016C */ addiu $a0, $a3, 0x016C ## $a0 = 0000016C /* 00814 8087C604 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00818 8087C608 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 -/* 0081C 8087C60C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 0081C 8087C60C 0C01DE2B */ jal Math_ScaledStepToS /* 00820 8087C610 AFA70018 */ sw $a3, 0x0018($sp) /* 00824 8087C614 8FA4001C */ lw $a0, 0x001C($sp) @@ -31,7 +31,7 @@ glabel func_8087C5D0 /* 0084C 8087C63C 10000003 */ beq $zero, $zero, .L8087C64C /* 00850 8087C640 ACEF0164 */ sw $t7, 0x0164($a3) ## 00000164 .L8087C644: -/* 00854 8087C644 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00854 8087C644 0C01DE2B */ jal Math_ScaledStepToS /* 00858 8087C648 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 .L8087C64C: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C6AC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C6AC.s index 2b0046bafe..f6145aabe3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C6AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C6AC.s @@ -11,7 +11,7 @@ glabel func_8087C6AC /* 008E0 8087C6D0 46062200 */ add.s $f8, $f4, $f6 /* 008E4 8087C6D4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 008E8 8087C6D8 44054000 */ mfc1 $a1, $f8 -/* 008EC 8087C6DC 0C01DE80 */ jal Math_ApproxF +/* 008EC 8087C6DC 0C01DE80 */ jal Math_StepToF /* 008F0 8087C6E0 00000000 */ nop /* 008F4 8087C6E4 1040000E */ beq $v0, $zero, .L8087C720 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C73C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C73C.s index 4c7b6d8b5b..97d29da80f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C73C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C73C.s @@ -11,7 +11,7 @@ glabel func_8087C73C /* 0096C 8087C75C 8FA40018 */ lw $a0, 0x0018($sp) /* 00970 8087C760 2484016E */ addiu $a0, $a0, 0x016E ## $a0 = 0000016E /* 00974 8087C764 2405015E */ addiu $a1, $zero, 0x015E ## $a1 = 0000015E -/* 00978 8087C768 0C01DE5F */ jal Math_ApproxS +/* 00978 8087C768 0C01DE5F */ jal Math_StepToS /* 0097C 8087C76C 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 /* 00980 8087C770 10400004 */ beq $v0, $zero, .L8087C784 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C794.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C794.s index f16ed051b1..a0a5dd0044 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C794.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C794.s @@ -13,7 +13,7 @@ glabel func_8087C794 /* 009CC 8087C7BC 24E4016E */ addiu $a0, $a3, 0x016E ## $a0 = 0000016E /* 009D0 8087C7C0 2405015E */ addiu $a1, $zero, 0x015E ## $a1 = 0000015E /* 009D4 8087C7C4 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 009D8 8087C7C8 0C01DE5F */ jal Math_ApproxS +/* 009D8 8087C7C8 0C01DE5F */ jal Math_StepToS /* 009DC 8087C7CC AFA70018 */ sw $a3, 0x0018($sp) /* 009E0 8087C7D0 8FA70018 */ lw $a3, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D0AC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D0AC.s index 9e49a33d53..2da81db932 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D0AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D0AC.s @@ -73,13 +73,13 @@ glabel func_8087D0AC /* 001FC 8087D1BC 46105480 */ add.s $f18, $f10, $f16 /* 00200 8087D1C0 E7B2009C */ swc1 $f18, 0x009C($sp) .L8087D1C4: -/* 00204 8087D1C4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00204 8087D1C4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00208 8087D1C8 00000000 */ nop /* 0020C 8087D1CC 46160202 */ mul.s $f8, $f0, $f22 /* 00210 8087D1D0 C6240008 */ lwc1 $f4, 0x0008($s1) ## 00000008 /* 00214 8087D1D4 46082181 */ sub.s $f6, $f4, $f8 -/* 00218 8087D1D8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00218 8087D1D8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0021C 8087D1DC E7A60094 */ swc1 $f6, 0x0094($sp) /* 00220 8087D1E0 461A0282 */ mul.s $f10, $f0, $f26 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D2F0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D2F0.s index 688f95a515..5705bda27d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D2F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D2F0.s @@ -29,19 +29,19 @@ glabel func_8087D2F0 /* 00398 8087D358 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 0039C 8087D35C 54610061 */ bnel $v1, $at, .L8087D4E4 /* 003A0 8087D360 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 003A4 8087D364 0C01DE0D */ jal Math_Coss +/* 003A4 8087D364 0C01DE0D */ jal Math_CosS ## coss? /* 003A8 8087D368 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 003AC 8087D36C E7A00040 */ swc1 $f0, 0x0040($sp) -/* 003B0 8087D370 0C01DE1C */ jal Math_Sins +/* 003B0 8087D370 0C01DE1C */ jal Math_SinS ## sins? /* 003B4 8087D374 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 003B8 8087D378 E7A00044 */ swc1 $f0, 0x0044($sp) -/* 003BC 8087D37C 0C01DE1C */ jal Math_Sins +/* 003BC 8087D37C 0C01DE1C */ jal Math_SinS ## sins? /* 003C0 8087D380 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 003C4 8087D384 E7A00048 */ swc1 $f0, 0x0048($sp) -/* 003C8 8087D388 0C01DE0D */ jal Math_Coss +/* 003C8 8087D388 0C01DE0D */ jal Math_CosS ## coss? /* 003CC 8087D38C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 003D0 8087D390 3C01C1C8 */ lui $at, 0xC1C8 ## $at = C1C80000 @@ -82,19 +82,19 @@ glabel func_8087D2F0 /* 0045C 8087D41C 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn /* 00460 8087D420 AFA00020 */ sw $zero, 0x0020($sp) -/* 00464 8087D424 0C01DE0D */ jal Math_Coss +/* 00464 8087D424 0C01DE0D */ jal Math_CosS ## coss? /* 00468 8087D428 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 0046C 8087D42C E7A00040 */ swc1 $f0, 0x0040($sp) -/* 00470 8087D430 0C01DE1C */ jal Math_Sins +/* 00470 8087D430 0C01DE1C */ jal Math_SinS ## sins? /* 00474 8087D434 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00478 8087D438 E7A00044 */ swc1 $f0, 0x0044($sp) -/* 0047C 8087D43C 0C01DE1C */ jal Math_Sins +/* 0047C 8087D43C 0C01DE1C */ jal Math_SinS ## sins? /* 00480 8087D440 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00484 8087D444 E7A00048 */ swc1 $f0, 0x0048($sp) -/* 00488 8087D448 0C01DE0D */ jal Math_Coss +/* 00488 8087D448 0C01DE0D */ jal Math_CosS ## coss? /* 0048C 8087D44C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00490 8087D450 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 @@ -138,19 +138,19 @@ glabel func_8087D2F0 .L8087D4E4: /* 00524 8087D4E4 54610030 */ bnel $v1, $at, .L8087D5A8 /* 00528 8087D4E8 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0052C 8087D4EC 0C01DE0D */ jal Math_Coss +/* 0052C 8087D4EC 0C01DE0D */ jal Math_CosS ## coss? /* 00530 8087D4F0 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00534 8087D4F4 E7A00040 */ swc1 $f0, 0x0040($sp) -/* 00538 8087D4F8 0C01DE1C */ jal Math_Sins +/* 00538 8087D4F8 0C01DE1C */ jal Math_SinS ## sins? /* 0053C 8087D4FC 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00540 8087D500 E7A00044 */ swc1 $f0, 0x0044($sp) -/* 00544 8087D504 0C01DE1C */ jal Math_Sins +/* 00544 8087D504 0C01DE1C */ jal Math_SinS ## sins? /* 00548 8087D508 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 0054C 8087D50C E7A00048 */ swc1 $f0, 0x0048($sp) -/* 00550 8087D510 0C01DE0D */ jal Math_Coss +/* 00550 8087D510 0C01DE0D */ jal Math_CosS ## coss? /* 00554 8087D514 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00558 8087D518 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D5B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D5B8.s index 4eccc256c4..4f5910e1af 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D5B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D5B8.s @@ -26,7 +26,7 @@ glabel func_8087D5B8 /* 0064C 8087D60C 46002180 */ add.s $f6, $f4, $f0 /* 00650 8087D610 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 00654 8087D614 44053000 */ mfc1 $a1, $f6 -/* 00658 8087D618 0C01DE80 */ jal Math_ApproxF +/* 00658 8087D618 0C01DE80 */ jal Math_StepToF /* 0065C 8087D61C 00000000 */ nop /* 00660 8087D620 8FA70018 */ lw $a3, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D66C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D66C.s index e99f2e857b..403c76301b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D66C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D66C.s @@ -26,7 +26,7 @@ glabel func_8087D66C /* 00700 8087D6C0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 00704 8087D6C4 46002180 */ add.s $f6, $f4, $f0 /* 00708 8087D6C8 44053000 */ mfc1 $a1, $f6 -/* 0070C 8087D6CC 0C01DE80 */ jal Math_ApproxF +/* 0070C 8087D6CC 0C01DE80 */ jal Math_StepToF /* 00710 8087D6D0 00000000 */ nop /* 00714 8087D6D4 14400003 */ bne $v0, $zero, .L8087D6E4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F400.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F400.s index 44d88c0a79..a27541856d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F400.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F400.s @@ -90,7 +90,7 @@ glabel func_8087F400 .L8087F504: /* 00404 8087F504 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 00408 8087F508 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 0040C 8087F50C 0C01DE80 */ jal Math_ApproxF +/* 0040C 8087F50C 0C01DE80 */ jal Math_StepToF /* 00410 8087F510 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 .L8087F514: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F5C8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F5C8.s index 195b798266..cb9c4cf73e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F5C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/func_8087F5C8.s @@ -18,7 +18,7 @@ glabel func_8087F5C8 /* 00504 8087F604 A0EF0168 */ sb $t7, 0x0168($a3) ## 00000168 /* 00508 8087F608 ACF80164 */ sw $t8, 0x0164($a3) ## 00000164 .L8087F60C: -/* 0050C 8087F60C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 0050C 8087F60C 0C01DE2B */ jal Math_ScaledStepToS /* 00510 8087F610 24E4016A */ addiu $a0, $a3, 0x016A ## $a0 = 0000016A /* 00514 8087F614 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Init.s index e6c326eeb0..aa391e8daf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Init.s @@ -27,7 +27,7 @@ glabel BgHakaZou_Init /* 0003C 808825FC A2180169 */ sb $t8, 0x0169($s0) ## 00000169 /* 00040 80882600 15210052 */ bne $t1, $at, .L8088274C /* 00044 80882604 8FA4003C */ lw $a0, 0x003C($sp) -/* 00048 80882608 0C03F66B */ jal Math_Rand_ZeroOne +/* 00048 80882608 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0004C 8088260C 00000000 */ nop /* 00050 80882610 3C018088 */ lui $at, %hi(D_80883660) ## $at = 80880000 @@ -41,10 +41,10 @@ glabel BgHakaZou_Init /* 00070 80882630 0C00B58B */ jal Actor_SetScale /* 00074 80882634 00000000 */ nop -/* 00078 80882638 0C03F66B */ jal Math_Rand_ZeroOne +/* 00078 80882638 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0007C 8088263C 00000000 */ nop -/* 00080 80882640 0C03F66B */ jal Math_Rand_ZeroOne +/* 00080 80882640 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00084 80882644 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 00088 80882648 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -58,7 +58,7 @@ glabel BgHakaZou_Init /* 000A8 80882668 10000001 */ beq $zero, $zero, .L80882670 /* 000AC 8088266C 2403FFFF */ addiu $v1, $zero, 0xFFFF ## $v1 = FFFFFFFF .L80882670: -/* 000B0 80882670 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 000B0 80882670 0C00CFC8 */ jal Rand_CenteredFloat /* 000B4 80882674 AFA30028 */ sw $v1, 0x0028($sp) /* 000B8 80882678 8FA30028 */ lw $v1, 0x0028($sp) @@ -75,10 +75,10 @@ glabel BgHakaZou_Init /* 000E4 808826A4 46040180 */ add.s $f6, $f0, $f4 /* 000E8 808826A8 4600320D */ trunc.w.s $f8, $f6 /* 000EC 808826AC 440D4000 */ mfc1 $t5, $f8 -/* 000F0 808826B0 0C01DF64 */ jal Math_Rand_S16Offset +/* 000F0 808826B0 0C01DF64 */ jal Rand_S16Offset /* 000F4 808826B4 A60D0032 */ sh $t5, 0x0032($s0) ## 00000032 -/* 000F8 808826B8 0C03F66B */ jal Math_Rand_ZeroOne +/* 000F8 808826B8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 000FC 808826BC A7A20026 */ sh $v0, 0x0026($sp) /* 00100 808826C0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -97,10 +97,10 @@ glabel BgHakaZou_Init /* 00130 808826F0 24050800 */ addiu $a1, $zero, 0x0800 ## $a1 = 00000800 /* 00134 808826F4 0000C012 */ mflo $t8 /* 00138 808826F8 A6180030 */ sh $t8, 0x0030($s0) ## 00000030 -/* 0013C 808826FC 0C01DF64 */ jal Math_Rand_S16Offset +/* 0013C 808826FC 0C01DF64 */ jal Rand_S16Offset /* 00140 80882700 00000000 */ nop -/* 00144 80882704 0C03F66B */ jal Math_Rand_ZeroOne +/* 00144 80882704 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00148 80882708 A7A20026 */ sh $v0, 0x0026($sp) /* 0014C 8088270C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808828F4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808828F4.s index 0017c29df2..9599b0a5c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808828F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808828F4.s @@ -42,7 +42,7 @@ glabel func_808828F4 .L80882994: /* 003D4 80882994 16000008 */ bne $s0, $zero, .L808829B8 /* 003D8 80882998 00000000 */ nop -/* 003DC 8088299C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 003DC 8088299C 0C00CFC8 */ jal Rand_CenteredFloat /* 003E0 808829A0 4600A306 */ mov.s $f12, $f20 /* 003E4 808829A4 46160400 */ add.s $f16, $f0, $f22 @@ -51,14 +51,14 @@ glabel func_808828F4 /* 003F0 808829B0 10000006 */ beq $zero, $zero, .L808829CC /* 003F4 808829B4 E7B20084 */ swc1 $f18, 0x0084($sp) .L808829B8: -/* 003F8 808829B8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 003F8 808829B8 0C00CFC8 */ jal Rand_CenteredFloat /* 003FC 808829BC 4600A306 */ mov.s $f12, $f20 /* 00400 808829C0 C6240024 */ lwc1 $f4, 0x0024($s1) ## 00000024 /* 00404 808829C4 46040180 */ add.s $f6, $f0, $f4 /* 00408 808829C8 E7A60084 */ swc1 $f6, 0x0084($sp) .L808829CC: -/* 0040C 808829CC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0040C 808829CC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00410 808829D0 00000000 */ nop /* 00414 808829D4 4600C282 */ mul.s $f10, $f24, $f0 @@ -68,7 +68,7 @@ glabel func_808828F4 /* 00424 808829E4 E7B00088 */ swc1 $f16, 0x0088($sp) /* 00428 808829E8 C632002C */ lwc1 $f18, 0x002C($s1) ## 0000002C /* 0042C 808829EC 46049180 */ add.s $f6, $f18, $f4 -/* 00430 808829F0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00430 808829F0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00434 808829F4 E7A6008C */ swc1 $f6, 0x008C($sp) /* 00438 808829F8 461A0202 */ mul.s $f8, $f0, $f26 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882CC4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882CC4.s index ca65e83840..20d50f8905 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882CC4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882CC4.s @@ -18,7 +18,7 @@ glabel func_80882CC4 /* 00744 80882D04 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 00748 80882D08 2484C000 */ addiu $a0, $a0, 0xC000 ## $a0 = FFFFC000 /* 0074C 80882D0C 00042400 */ sll $a0, $a0, 16 -/* 00750 80882D10 0C01DE1C */ jal Math_Sins +/* 00750 80882D10 0C01DE1C */ jal Math_SinS ## sins? /* 00754 80882D14 00042403 */ sra $a0, $a0, 16 /* 00758 80882D18 862400B6 */ lh $a0, 0x00B6($s1) ## 000000B6 @@ -27,7 +27,7 @@ glabel func_80882CC4 /* 00764 80882D24 2484C000 */ addiu $a0, $a0, 0xC000 ## $a0 = FFFFC000 /* 00768 80882D28 00042400 */ sll $a0, $a0, 16 /* 0076C 80882D2C 46140582 */ mul.s $f22, $f0, $f20 -/* 00770 80882D30 0C01DE0D */ jal Math_Coss +/* 00770 80882D30 0C01DE0D */ jal Math_CosS ## coss? /* 00774 80882D34 00042403 */ sra $a0, $a0, 16 /* 00778 80882D38 3C138088 */ lui $s3, %hi(D_8088361C) ## $s3 = 80880000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883144.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883144.s index 1057e3fe5b..cd6566c4c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883144.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883144.s @@ -20,7 +20,7 @@ glabel func_80883144 /* 00BC4 80883184 15E00028 */ bne $t7, $zero, .L80883228 /* 00BC8 80883188 00000000 */ nop /* 00BCC 8088318C 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 -/* 00BD0 80883190 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00BD0 80883190 0C00CFC8 */ jal Rand_CenteredFloat /* 00BD4 80883194 00000000 */ nop /* 00BD8 80883198 3C014260 */ lui $at, 0x4260 ## $at = 42600000 @@ -28,7 +28,7 @@ glabel func_80883144 /* 00BE0 808831A0 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 00BE4 808831A4 46062201 */ sub.s $f8, $f4, $f6 /* 00BE8 808831A8 46080280 */ add.s $f10, $f0, $f8 -/* 00BEC 808831AC 0C03F66B */ jal Math_Rand_ZeroOne +/* 00BEC 808831AC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00BF0 808831B0 E7AA002C */ swc1 $f10, 0x002C($sp) /* 00BF4 808831B4 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 @@ -38,7 +38,7 @@ glabel func_80883144 /* 00C04 808831C4 46100482 */ mul.s $f18, $f0, $f16 /* 00C08 808831C8 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 /* 00C0C 808831CC 46049180 */ add.s $f6, $f18, $f4 -/* 00C10 808831D0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00C10 808831D0 0C00CFC8 */ jal Rand_CenteredFloat /* 00C14 808831D4 E7A60030 */ swc1 $f6, 0x0030($sp) /* 00C18 808831D8 3C014260 */ lui $at, 0x4260 ## $at = 42600000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883254.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883254.s index a941af33a6..694b5b9d32 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883254.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883254.s @@ -3,7 +3,7 @@ glabel func_80883254 /* 00C98 80883258 AFBF001C */ sw $ra, 0x001C($sp) /* 00C9C 8088325C AFB00018 */ sw $s0, 0x0018($sp) /* 00CA0 80883260 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00CA4 80883264 0C03F66B */ jal Math_Rand_ZeroOne +/* 00CA4 80883264 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00CA8 80883268 AFA5002C */ sw $a1, 0x002C($sp) /* 00CAC 8088326C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -19,7 +19,7 @@ glabel func_80883254 /* 00CD4 80883294 46083281 */ sub.s $f10, $f6, $f8 /* 00CD8 80883298 44068000 */ mfc1 $a2, $f16 /* 00CDC 8088329C 44055000 */ mfc1 $a1, $f10 -/* 00CE0 808832A0 0C01DE80 */ jal Math_ApproxF +/* 00CE0 808832A0 0C01DE80 */ jal Math_StepToF /* 00CE4 808832A4 00000000 */ nop /* 00CE8 808832A8 3C014220 */ lui $at, 0x4220 ## $at = 42200000 @@ -29,7 +29,7 @@ glabel func_80883254 /* 00CF8 808832B8 8FA60024 */ lw $a2, 0x0024($sp) /* 00CFC 808832BC 46049181 */ sub.s $f6, $f18, $f4 /* 00D00 808832C0 44053000 */ mfc1 $a1, $f6 -/* 00D04 808832C4 0C01DE80 */ jal Math_ApproxF +/* 00D04 808832C4 0C01DE80 */ jal Math_StepToF /* 00D08 808832C8 00000000 */ nop /* 00D0C 808832CC 1040000F */ beq $v0, $zero, .L8088330C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883328.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883328.s index da27bc2915..58c26ec044 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883328.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883328.s @@ -34,7 +34,7 @@ glabel func_80883328 /* 00DD4 80883394 44188000 */ mfc1 $t8, $f16 /* 00DD8 80883398 00000000 */ nop /* 00DDC 8088339C A498FF7C */ sh $t8, -0x0084($a0) ## 00000030 -/* 00DE0 808833A0 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00DE0 808833A0 0C01DE2B */ jal Math_ScaledStepToS /* 00DE4 808833A4 86E60030 */ lh $a2, 0x0030($s7) ## 00000030 /* 00DE8 808833A8 1040003B */ beq $v0, $zero, .L80883498 @@ -71,7 +71,7 @@ glabel func_80883328 /* 00E58 80883418 4600D006 */ mov.s $f0, $f26 .L8088341C: /* 00E5C 8088341C 46004281 */ sub.s $f10, $f8, $f0 -/* 00E60 80883420 0C03F66B */ jal Math_Rand_ZeroOne +/* 00E60 80883420 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00E64 80883424 E7AA0084 */ swc1 $f10, 0x0084($sp) /* 00E68 80883428 46160402 */ mul.s $f16, $f0, $f22 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_8088805C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_8088805C.s index 5598090911..59337feea3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_8088805C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_8088805C.s @@ -23,14 +23,14 @@ glabel func_8088805C /* 00070 808880B0 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 /* 00074 808880B4 01D12021 */ addu $a0, $t6, $s1 /* 00078 808880B8 00042400 */ sll $a0, $a0, 16 -/* 0007C 808880BC 0C01DE1C */ jal Math_Sins +/* 0007C 808880BC 0C01DE1C */ jal Math_SinS ## sins? /* 00080 808880C0 00042403 */ sra $a0, $a0, 16 /* 00084 808880C4 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 /* 00088 808880C8 46000506 */ mov.s $f20, $f0 /* 0008C 808880CC 01F12021 */ addu $a0, $t7, $s1 /* 00090 808880D0 00042400 */ sll $a0, $a0, 16 -/* 00094 808880D4 0C01DE0D */ jal Math_Coss +/* 00094 808880D4 0C01DE0D */ jal Math_CosS ## coss? /* 00098 808880D8 00042403 */ sra $a0, $a0, 16 /* 0009C 808880DC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808884C8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808884C8.s index 04c9c2ae91..abe06231f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808884C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808884C8.s @@ -38,14 +38,14 @@ glabel func_808884C8 /* 00518 80888558 34108000 */ ori $s0, $zero, 0x8000 ## $s0 = 00008000 /* 0051C 8088855C 01102021 */ addu $a0, $t0, $s0 /* 00520 80888560 00042400 */ sll $a0, $a0, 16 -/* 00524 80888564 0C01DE1C */ jal Math_Sins +/* 00524 80888564 0C01DE1C */ jal Math_SinS ## sins? /* 00528 80888568 00042403 */ sra $a0, $a0, 16 /* 0052C 8088856C 862900B6 */ lh $t1, 0x00B6($s1) ## 000000B6 /* 00530 80888570 46000506 */ mov.s $f20, $f0 /* 00534 80888574 01302021 */ addu $a0, $t1, $s0 /* 00538 80888578 00042400 */ sll $a0, $a0, 16 -/* 0053C 8088857C 0C01DE0D */ jal Math_Coss +/* 0053C 8088857C 0C01DE0D */ jal Math_CosS ## coss? /* 00540 80888580 00042403 */ sra $a0, $a0, 16 /* 00544 80888584 C62A0028 */ lwc1 $f10, 0x0028($s1) ## 00000028 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Init.s index 12a9621282..5051a1bd70 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Init.s @@ -49,11 +49,11 @@ glabel BgHidanHrock_Init /* 0009C 808891CC 0C010D20 */ jal DynaPolyInfo_SetActorMove /* 000A0 808891D0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 000A4 808891D4 0C01DE1C */ jal Math_Sins +/* 000A4 808891D4 0C01DE1C */ jal Math_SinS ## sins? /* 000A8 808891D8 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 000AC 808891DC 46000586 */ mov.s $f22, $f0 -/* 000B0 808891E0 0C01DE0D */ jal Math_Coss +/* 000B0 808891E0 0C01DE0D */ jal Math_CosS ## coss? /* 000B4 808891E4 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 000B8 808891E8 860A001C */ lh $t2, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808894B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808894B0.s index ee6b339155..35cfed10f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808894B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808894B0.s @@ -14,7 +14,7 @@ glabel func_808894B0 /* 003AC 808894DC 0002C380 */ sll $t8, $v0, 14 /* 003B0 808894E0 01F82021 */ addu $a0, $t7, $t8 /* 003B4 808894E4 00042400 */ sll $a0, $a0, 16 -/* 003B8 808894E8 0C01DE1C */ jal Math_Sins +/* 003B8 808894E8 0C01DE1C */ jal Math_SinS ## sins? /* 003BC 808894EC 00042403 */ sra $a0, $a0, 16 /* 003C0 808894F0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -28,7 +28,7 @@ glabel func_808894B0 /* 003E0 80889510 00042400 */ sll $a0, $a0, 16 /* 003E4 80889514 00042403 */ sra $a0, $a0, 16 /* 003E8 80889518 46083280 */ add.s $f10, $f6, $f8 -/* 003EC 8088951C 0C01DE0D */ jal Math_Coss +/* 003EC 8088951C 0C01DE0D */ jal Math_CosS ## coss? /* 003F0 80889520 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 /* 003F4 80889524 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_8088960C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_8088960C.s index b073d1443d..4827438b5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_8088960C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_8088960C.s @@ -11,7 +11,7 @@ glabel func_8088960C /* 00500 80889630 46062200 */ add.s $f8, $f4, $f6 /* 00504 80889634 E4880038 */ swc1 $f8, 0x0038($a0) ## 00000060 /* 00508 80889638 8E060060 */ lw $a2, 0x0060($s0) ## 00000060 -/* 0050C 8088963C 0C01DE80 */ jal Math_ApproxF +/* 0050C 8088963C 0C01DE80 */ jal Math_StepToF /* 00510 80889640 8E05000C */ lw $a1, 0x000C($s0) ## 0000000C /* 00514 80889644 10400017 */ beq $v0, $zero, .L808896A4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808896B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808896B8.s index 09430b9173..2c8ad4d53f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808896B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808896B8.s @@ -48,14 +48,14 @@ glabel func_808896B8 /* 0062C 8088975C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00630 80889760 46062201 */ sub.s $f8, $f4, $f6 /* 00634 80889764 44054000 */ mfc1 $a1, $f8 -/* 00638 80889768 0C01DE80 */ jal Math_ApproxF +/* 00638 80889768 0C01DE80 */ jal Math_StepToF /* 0063C 8088976C 00000000 */ nop /* 00640 80889770 10000005 */ beq $zero, $zero, .L80889788 /* 00644 80889774 8FBF001C */ lw $ra, 0x001C($sp) .L80889778: /* 00648 80889778 8E05000C */ lw $a1, 0x000C($s0) ## 0000000C -/* 0064C 8088977C 0C01DE80 */ jal Math_ApproxF +/* 0064C 8088977C 0C01DE80 */ jal Math_StepToF /* 00650 80889780 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00654 80889784 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A290.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A290.s index 8fa6811e81..58f468e3a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A290.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A290.s @@ -25,7 +25,7 @@ glabel func_8088A290 /* 002CC 8088A2EC E7A8002C */ swc1 $f8, 0x002C($sp) /* 002D0 8088A2F0 0C00CD20 */ jal func_80033480 /* 002D4 8088A2F4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 002D8 8088A2F8 0C03F66B */ jal Math_Rand_ZeroOne +/* 002D8 8088A2F8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 002DC 8088A2FC 00000000 */ nop /* 002E0 8088A300 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -37,7 +37,7 @@ glabel func_8088A290 /* 002F8 8088A318 46128102 */ mul.s $f4, $f16, $f18 /* 002FC 8088A31C C5460024 */ lwc1 $f6, 0x0024($t2) ## 00000024 /* 00300 8088A320 46062200 */ add.s $f8, $f4, $f6 -/* 00304 8088A324 0C03F66B */ jal Math_Rand_ZeroOne +/* 00304 8088A324 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00308 8088A328 E7A80028 */ swc1 $f8, 0x0028($sp) /* 0030C 8088A32C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -46,7 +46,7 @@ glabel func_8088A290 /* 00318 8088A338 460A0402 */ mul.s $f16, $f0, $f10 /* 0031C 8088A33C C5720028 */ lwc1 $f18, 0x0028($t3) ## 00000028 /* 00320 8088A340 46128100 */ add.s $f4, $f16, $f18 -/* 00324 8088A344 0C03F66B */ jal Math_Rand_ZeroOne +/* 00324 8088A344 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00328 8088A348 E7A4002C */ swc1 $f4, 0x002C($sp) /* 0032C 8088A34C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A3B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A3B0.s index db011de5e0..939f60fc5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A3B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A3B0.s @@ -23,11 +23,11 @@ glabel func_8088A3B0 /* 003D0 8088A3F0 F7B60050 */ sdc1 $f22, 0x0050($sp) /* 003D4 8088A3F4 F7B40048 */ sdc1 $f20, 0x0048($sp) /* 003D8 8088A3F8 AFA500FC */ sw $a1, 0x00FC($sp) -/* 003DC 8088A3FC 0C01DE1C */ jal Math_Sins +/* 003DC 8088A3FC 0C01DE1C */ jal Math_SinS ## sins? /* 003E0 8088A400 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 /* 003E4 8088A404 46000606 */ mov.s $f24, $f0 -/* 003E8 8088A408 0C01DE0D */ jal Math_Coss +/* 003E8 8088A408 0C01DE0D */ jal Math_CosS ## coss? /* 003EC 8088A40C 864400B6 */ lh $a0, 0x00B6($s2) ## 000000B6 /* 003F0 8088A410 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -82,13 +82,13 @@ glabel func_8088A3B0 /* 004AC 8088A4CC E7A600D8 */ swc1 $f6, 0x00D8($sp) /* 004B0 8088A4D0 C650002C */ lwc1 $f16, 0x002C($s2) ## 0000002C /* 004B4 8088A4D4 46105480 */ add.s $f18, $f10, $f16 -/* 004B8 8088A4D8 0C03F66B */ jal Math_Rand_ZeroOne +/* 004B8 8088A4D8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 004BC 8088A4DC E7B200E0 */ swc1 $f18, 0x00E0($sp) /* 004C0 8088A4E0 461C0102 */ mul.s $f4, $f0, $f28 /* 004C4 8088A4E4 C7A600A8 */ lwc1 $f6, 0x00A8($sp) /* 004C8 8088A4E8 46062502 */ mul.s $f20, $f4, $f6 -/* 004CC 8088A4EC 0C03F66B */ jal Math_Rand_ZeroOne +/* 004CC 8088A4EC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 004D0 8088A4F0 00000000 */ nop /* 004D4 8088A4F4 2618FFFE */ addiu $t8, $s0, 0xFFFE ## $t8 = FFFFFFFE @@ -101,7 +101,7 @@ glabel func_8088A3B0 /* 004F0 8088A510 00000000 */ nop /* 004F4 8088A514 461AA102 */ mul.s $f4, $f20, $f26 /* 004F8 8088A518 46049180 */ add.s $f6, $f18, $f4 -/* 004FC 8088A51C 0C03F66B */ jal Math_Rand_ZeroOne +/* 004FC 8088A51C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00500 8088A520 E7A600E4 */ swc1 $f6, 0x00E4($sp) /* 00504 8088A524 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -114,7 +114,7 @@ glabel func_8088A3B0 /* 00520 8088A540 4618A482 */ mul.s $f18, $f20, $f24 /* 00524 8088A544 E7A800E8 */ swc1 $f8, 0x00E8($sp) /* 00528 8088A548 46128101 */ sub.s $f4, $f16, $f18 -/* 0052C 8088A54C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0052C 8088A54C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00530 8088A550 E7A400EC */ swc1 $f4, 0x00EC($sp) /* 00534 8088A554 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A67C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A67C.s index aed8ed8f03..03f171f260 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A67C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A67C.s @@ -23,11 +23,11 @@ glabel func_8088A67C /* 0069C 8088A6BC F7B60050 */ sdc1 $f22, 0x0050($sp) /* 006A0 8088A6C0 F7B40048 */ sdc1 $f20, 0x0048($sp) /* 006A4 8088A6C4 AFA500EC */ sw $a1, 0x00EC($sp) -/* 006A8 8088A6C8 0C01DE1C */ jal Math_Sins +/* 006A8 8088A6C8 0C01DE1C */ jal Math_SinS ## sins? /* 006AC 8088A6CC 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 /* 006B0 8088A6D0 46000606 */ mov.s $f24, $f0 -/* 006B4 8088A6D4 0C01DE0D */ jal Math_Coss +/* 006B4 8088A6D4 0C01DE0D */ jal Math_CosS ## coss? /* 006B8 8088A6D8 868400B6 */ lh $a0, 0x00B6($s4) ## 000000B6 /* 006BC 8088A6DC 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -60,7 +60,7 @@ glabel func_8088A67C /* 00720 8088A740 E7A600C8 */ swc1 $f6, 0x00C8($sp) /* 00724 8088A744 C688002C */ lwc1 $f8, 0x002C($s4) ## 0000002C /* 00728 8088A748 460A4401 */ sub.s $f16, $f8, $f10 -/* 0072C 8088A74C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0072C 8088A74C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00730 8088A750 E7B000D0 */ swc1 $f16, 0x00D0($sp) /* 00734 8088A754 262EFFFE */ addiu $t6, $s1, 0xFFFE ## $t6 = FFFFFFFE @@ -68,7 +68,7 @@ glabel func_8088A67C /* 0073C 8088A75C 461E0482 */ mul.s $f18, $f0, $f30 /* 00740 8088A760 468021A0 */ cvt.s.w $f6, $f4 /* 00744 8088A764 46069502 */ mul.s $f20, $f18, $f6 -/* 00748 8088A768 0C03F66B */ jal Math_Rand_ZeroOne +/* 00748 8088A768 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0074C 8088A76C 00000000 */ nop /* 00750 8088A770 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 @@ -80,7 +80,7 @@ glabel func_8088A67C /* 00768 8088A788 00000000 */ nop /* 0076C 8088A78C 461AA402 */ mul.s $f16, $f20, $f26 /* 00770 8088A790 46105100 */ add.s $f4, $f10, $f16 -/* 00774 8088A794 0C03F66B */ jal Math_Rand_ZeroOne +/* 00774 8088A794 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00778 8088A798 E7A400D4 */ swc1 $f4, 0x00D4($sp) /* 0077C 8088A79C 3C014190 */ lui $at, 0x4190 ## $at = 41900000 @@ -93,7 +93,7 @@ glabel func_8088A67C /* 00798 8088A7B8 4618A282 */ mul.s $f10, $f20, $f24 /* 0079C 8088A7BC E7A600D8 */ swc1 $f6, 0x00D8($sp) /* 007A0 8088A7C0 460A4401 */ sub.s $f16, $f8, $f10 -/* 007A4 8088A7C4 0C03F66B */ jal Math_Rand_ZeroOne +/* 007A4 8088A7C4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 007A8 8088A7C8 E7B000DC */ swc1 $f16, 0x00DC($sp) /* 007AC 8088A7CC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -118,7 +118,7 @@ glabel func_8088A67C /* 007F8 8088A818 10000001 */ beq $zero, $zero, .L8088A820 /* 007FC 8088A81C 24100020 */ addiu $s0, $zero, 0x0020 ## $s0 = 00000020 .L8088A820: -/* 00800 8088A820 0C03F66B */ jal Math_Rand_ZeroOne +/* 00800 8088A820 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00804 8088A824 00000000 */ nop /* 00808 8088A828 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A914.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A914.s index c91554a6bc..47baffc480 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A914.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A914.s @@ -23,11 +23,11 @@ glabel func_8088A914 /* 00934 8088A954 F7B60050 */ sdc1 $f22, 0x0050($sp) /* 00938 8088A958 F7B40048 */ sdc1 $f20, 0x0048($sp) /* 0093C 8088A95C AFA500EC */ sw $a1, 0x00EC($sp) -/* 00940 8088A960 0C01DE1C */ jal Math_Sins +/* 00940 8088A960 0C01DE1C */ jal Math_SinS ## sins? /* 00944 8088A964 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 /* 00948 8088A968 46000606 */ mov.s $f24, $f0 -/* 0094C 8088A96C 0C01DE0D */ jal Math_Coss +/* 0094C 8088A96C 0C01DE0D */ jal Math_CosS ## coss? /* 00950 8088A970 868400B6 */ lh $a0, 0x00B6($s4) ## 000000B6 /* 00954 8088A974 3C014160 */ lui $at, 0x4160 ## $at = 41600000 @@ -60,7 +60,7 @@ glabel func_8088A914 /* 009B8 8088A9D8 E7A600C8 */ swc1 $f6, 0x00C8($sp) /* 009BC 8088A9DC C688002C */ lwc1 $f8, 0x002C($s4) ## 0000002C /* 009C0 8088A9E0 460A4401 */ sub.s $f16, $f8, $f10 -/* 009C4 8088A9E4 0C03F66B */ jal Math_Rand_ZeroOne +/* 009C4 8088A9E4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 009C8 8088A9E8 E7B000D0 */ swc1 $f16, 0x00D0($sp) /* 009CC 8088A9EC 262EFFFE */ addiu $t6, $s1, 0xFFFE ## $t6 = FFFFFFFE @@ -68,7 +68,7 @@ glabel func_8088A914 /* 009D4 8088A9F4 461C0482 */ mul.s $f18, $f0, $f28 /* 009D8 8088A9F8 468021A0 */ cvt.s.w $f6, $f4 /* 009DC 8088A9FC 46069502 */ mul.s $f20, $f18, $f6 -/* 009E0 8088AA00 0C03F66B */ jal Math_Rand_ZeroOne +/* 009E0 8088AA00 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 009E4 8088AA04 00000000 */ nop /* 009E8 8088AA08 461C0582 */ mul.s $f22, $f0, $f28 @@ -77,7 +77,7 @@ glabel func_8088A914 /* 009F4 8088AA14 00000000 */ nop /* 009F8 8088AA18 461AA282 */ mul.s $f10, $f20, $f26 /* 009FC 8088AA1C 460A4400 */ add.s $f16, $f8, $f10 -/* 00A00 8088AA20 0C03F66B */ jal Math_Rand_ZeroOne +/* 00A00 8088AA20 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A04 8088AA24 E7B000D4 */ swc1 $f16, 0x00D4($sp) /* 00A08 8088AA28 3C014208 */ lui $at, 0x4208 ## $at = 42080000 @@ -90,7 +90,7 @@ glabel func_8088A914 /* 00A24 8088AA44 4618A202 */ mul.s $f8, $f20, $f24 /* 00A28 8088AA48 E7B200D8 */ swc1 $f18, 0x00D8($sp) /* 00A2C 8088AA4C 46083281 */ sub.s $f10, $f6, $f8 -/* 00A30 8088AA50 0C03F66B */ jal Math_Rand_ZeroOne +/* 00A30 8088AA50 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A34 8088AA54 E7AA00DC */ swc1 $f10, 0x00DC($sp) /* 00A38 8088AA58 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -115,7 +115,7 @@ glabel func_8088A914 /* 00A84 8088AAA4 10000001 */ beq $zero, $zero, .L8088AAAC /* 00A88 8088AAA8 24100020 */ addiu $s0, $zero, 0x0020 ## $s0 = 00000020 .L8088AAAC: -/* 00A8C 8088AAAC 0C03F66B */ jal Math_Rand_ZeroOne +/* 00A8C 8088AAAC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A90 8088AAB0 00000000 */ nop /* 00A94 8088AAB4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B268.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B268.s index cb1d9eb566..67f0f39976 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B268.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B268.s @@ -82,19 +82,19 @@ glabel func_8088B268 /* 002E0 8088B360 3C048089 */ lui $a0, %hi(D_8088BFC0) ## $a0 = 80890000 /* 002E4 8088B364 2484BFC0 */ addiu $a0, $a0, %lo(D_8088BFC0) ## $a0 = 8088BFC0 /* 002E8 8088B368 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 -/* 002EC 8088B36C 0C01DE80 */ jal Math_ApproxF +/* 002EC 8088B36C 0C01DE80 */ jal Math_StepToF /* 002F0 8088B370 8E060068 */ lw $a2, 0x0068($s0) ## 00000068 /* 002F4 8088B374 10000004 */ beq $zero, $zero, .L8088B388 /* 002F8 8088B378 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 .L8088B37C: -/* 002FC 8088B37C 0C01DE80 */ jal Math_ApproxF +/* 002FC 8088B37C 0C01DE80 */ jal Math_StepToF /* 00300 8088B380 8E060068 */ lw $a2, 0x0068($s0) ## 00000068 /* 00304 8088B384 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 .L8088B388: /* 00308 8088B388 86040158 */ lh $a0, 0x0158($s0) ## 00000158 -/* 0030C 8088B38C 0C01DE1C */ jal Math_Sins +/* 0030C 8088B38C 0C01DE1C */ jal Math_SinS ## sins? /* 00310 8088B390 AFA30028 */ sw $v1, 0x0028($sp) /* 00314 8088B394 3C018089 */ lui $at, %hi(D_8088BFC0) ## $at = 80890000 @@ -103,7 +103,7 @@ glabel func_8088B268 /* 00320 8088B3A0 86040158 */ lh $a0, 0x0158($s0) ## 00000158 /* 00324 8088B3A4 46100482 */ mul.s $f18, $f0, $f16 /* 00328 8088B3A8 46049180 */ add.s $f6, $f18, $f4 -/* 0032C 8088B3AC 0C01DE0D */ jal Math_Coss +/* 0032C 8088B3AC 0C01DE0D */ jal Math_CosS ## coss? /* 00330 8088B3B0 E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 /* 00334 8088B3B4 3C018089 */ lui $at, %hi(D_8088BFC0) ## $at = 80890000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B69C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B69C.s index 233189eec3..910628b2b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B69C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B69C.s @@ -16,7 +16,7 @@ glabel func_8088B69C /* 00650 8088B6D0 0002C380 */ sll $t8, $v0, 14 /* 00654 8088B6D4 01F82021 */ addu $a0, $t7, $t8 /* 00658 8088B6D8 00042400 */ sll $a0, $a0, 16 -/* 0065C 8088B6DC 0C01DE1C */ jal Math_Sins +/* 0065C 8088B6DC 0C01DE1C */ jal Math_SinS ## sins? /* 00660 8088B6E0 00042403 */ sra $a0, $a0, 16 /* 00664 8088B6E4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -30,7 +30,7 @@ glabel func_8088B69C /* 00684 8088B704 00042400 */ sll $a0, $a0, 16 /* 00688 8088B708 00042403 */ sra $a0, $a0, 16 /* 0068C 8088B70C 46083280 */ add.s $f10, $f6, $f8 -/* 00690 8088B710 0C01DE0D */ jal Math_Coss +/* 00690 8088B710 0C01DE0D */ jal Math_CosS ## coss? /* 00694 8088B714 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 /* 00698 8088B718 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B90C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B90C.s index a7038bb51a..92fcf863c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B90C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B90C.s @@ -6,7 +6,7 @@ glabel func_8088B90C /* 0089C 8088B91C 8CE5000C */ lw $a1, 0x000C($a3) ## 0000000C /* 008A0 8088B920 AFA70018 */ sw $a3, 0x0018($sp) /* 008A4 8088B924 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 008A8 8088B928 0C01DE80 */ jal Math_ApproxF +/* 008A8 8088B928 0C01DE80 */ jal Math_StepToF /* 008AC 8088B92C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 008B0 8088B930 10400004 */ beq $v0, $zero, .L8088B944 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B990.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B990.s index 4c6d0ebfc6..af98f56519 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B990.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088B990.s @@ -42,7 +42,7 @@ glabel func_8088B990 /* 00984 8088BA04 3C063E80 */ lui $a2, 0x3E80 ## $a2 = 3E800000 /* 00988 8088BA08 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 0098C 8088BA0C 44055000 */ mfc1 $a1, $f10 -/* 00990 8088BA10 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00990 8088BA10 0C01E0C4 */ jal Math_SmoothStepToF /* 00994 8088BA14 E7B00010 */ swc1 $f16, 0x0010($sp) /* 00998 8088BA18 3C018089 */ lui $at, %hi(D_8088C04C) ## $at = 80890000 @@ -68,7 +68,7 @@ glabel func_8088B990 /* 009E4 8088BA64 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 009E8 8088BA68 E7B20010 */ swc1 $f18, 0x0010($sp) /* 009EC 8088BA6C 44058000 */ mfc1 $a1, $f16 -/* 009F0 8088BA70 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 009F0 8088BA70 0C01E0C4 */ jal Math_SmoothStepToF /* 009F4 8088BA74 00000000 */ nop /* 009F8 8088BA78 3C018089 */ lui $at, %hi(D_8088C050) ## $at = 80890000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088CEC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088CEC0.s index ff24aac2db..c76d045169 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088CEC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088CEC0.s @@ -10,11 +10,11 @@ glabel func_8088CEC0 /* 00020 8088CEE0 AFA9001C */ sw $t1, 0x001C($sp) /* 00024 8088CEE4 AFA70040 */ sw $a3, 0x0040($sp) /* 00028 8088CEE8 87A4004A */ lh $a0, 0x004A($sp) -/* 0002C 8088CEEC 0C01DE1C */ jal Math_Sins +/* 0002C 8088CEEC 0C01DE1C */ jal Math_SinS ## sins? /* 00030 8088CEF0 AFA30020 */ sw $v1, 0x0020($sp) /* 00034 8088CEF4 87A4004A */ lh $a0, 0x004A($sp) -/* 00038 8088CEF8 0C01DE0D */ jal Math_Coss +/* 00038 8088CEF8 0C01DE0D */ jal Math_CosS ## coss? /* 0003C 8088CEFC E7A00030 */ swc1 $f0, 0x0030($sp) /* 00040 8088CF00 8FA30020 */ lw $v1, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088DC50.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088DC50.s index 27b3af2d27..db85f812d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088DC50.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/func_8088DC50.s @@ -33,12 +33,12 @@ glabel func_8088DC50 /* 00E08 8088DCC8 24120004 */ addiu $s2, $zero, 0x0004 ## $s2 = 00000004 .L8088DCCC: /* 00E0C 8088DCCC 00102400 */ sll $a0, $s0, 16 -/* 00E10 8088DCD0 0C01DE1C */ jal Math_Sins +/* 00E10 8088DCD0 0C01DE1C */ jal Math_SinS ## sins? /* 00E14 8088DCD4 00042403 */ sra $a0, $a0, 16 /* 00E18 8088DCD8 00102400 */ sll $a0, $s0, 16 /* 00E1C 8088DCDC 46000506 */ mov.s $f20, $f0 -/* 00E20 8088DCE0 0C01DE0D */ jal Math_Coss +/* 00E20 8088DCE0 0C01DE0D */ jal Math_CosS ## coss? /* 00E24 8088DCE4 00042403 */ sra $a0, $a0, 16 /* 00E28 8088DCE8 27B30068 */ addiu $s3, $sp, 0x0068 ## $s3 = FFFFFFA8 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E518.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E518.s index ac06aa9c87..bf056203b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E518.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E518.s @@ -9,7 +9,7 @@ glabel func_8088E518 /* 00164 8088E534 AFAF0024 */ sw $t7, 0x0024($sp) /* 00168 8088E538 8E05000C */ lw $a1, 0x000C($s0) ## 0000000C /* 0016C 8088E53C 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 4059999A -/* 00170 8088E540 0C01DE80 */ jal Math_ApproxF +/* 00170 8088E540 0C01DE80 */ jal Math_StepToF /* 00174 8088E544 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 00178 8088E548 0C010D5B */ jal func_8004356C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E5D0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E5D0.s index 0f0d45585c..a965a06494 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E5D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E5D0.s @@ -17,7 +17,7 @@ glabel func_8088E5D0 /* 00238 8088E608 0002C380 */ sll $t8, $v0, 14 /* 0023C 8088E60C 01F82021 */ addu $a0, $t7, $t8 /* 00240 8088E610 00042400 */ sll $a0, $a0, 16 -/* 00244 8088E614 0C01DE1C */ jal Math_Sins +/* 00244 8088E614 0C01DE1C */ jal Math_SinS ## sins? /* 00248 8088E618 00042403 */ sra $a0, $a0, 16 /* 0024C 8088E61C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -31,7 +31,7 @@ glabel func_8088E5D0 /* 0026C 8088E63C 00042400 */ sll $a0, $a0, 16 /* 00270 8088E640 00042403 */ sra $a0, $a0, 16 /* 00274 8088E644 46083280 */ add.s $f10, $f6, $f8 -/* 00278 8088E648 0C01DE0D */ jal Math_Coss +/* 00278 8088E648 0C01DE0D */ jal Math_CosS ## coss? /* 0027C 8088E64C E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 /* 00280 8088E650 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E6D0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E6D0.s index 6996f6cbb7..308adc8387 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E6D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E6D0.s @@ -24,7 +24,7 @@ glabel func_8088E6D0 /* 00350 8088E720 AFA70018 */ sw $a3, 0x0018($sp) /* 00354 8088E724 24E40028 */ addiu $a0, $a3, 0x0028 ## $a0 = 00000028 /* 00358 8088E728 44054000 */ mfc1 $a1, $f8 -/* 0035C 8088E72C 0C01DE80 */ jal Math_ApproxF +/* 0035C 8088E72C 0C01DE80 */ jal Math_StepToF /* 00360 8088E730 00000000 */ nop /* 00364 8088E734 8FA70018 */ lw $a3, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E7A8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E7A8.s index 340ca53563..d8b844b701 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E7A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E7A8.s @@ -75,7 +75,7 @@ glabel func_8088E7A8 /* 004C0 8088E890 00000000 */ nop /* 004C4 8088E894 86040032 */ lh $a0, 0x0032($s0) ## 00000032 .L8088E898: -/* 004C8 8088E898 0C01DE1C */ jal Math_Sins +/* 004C8 8088E898 0C01DE1C */ jal Math_SinS ## sins? /* 004CC 8088E89C E7A20024 */ swc1 $f2, 0x0024($sp) /* 004D0 8088E8A0 C7A20024 */ lwc1 $f2, 0x0024($sp) @@ -83,7 +83,7 @@ glabel func_8088E7A8 /* 004D8 8088E8A8 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 004DC 8088E8AC 46020402 */ mul.s $f16, $f0, $f2 /* 004E0 8088E8B0 46128100 */ add.s $f4, $f16, $f18 -/* 004E4 8088E8B4 0C01DE0D */ jal Math_Coss +/* 004E4 8088E8B4 0C01DE0D */ jal Math_CosS ## coss? /* 004E8 8088E8B8 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 /* 004EC 8088E8BC C7A20024 */ lwc1 $f2, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E90C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E90C.s index d43da0fb88..29b6c5c225 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E90C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088E90C.s @@ -7,7 +7,7 @@ glabel func_8088E90C /* 00550 8088E920 AFA50028 */ sw $a1, 0x0028($sp) /* 00554 8088E924 00812021 */ addu $a0, $a0, $at /* 00558 8088E928 00042400 */ sll $a0, $a0, 16 -/* 0055C 8088E92C 0C01DE0D */ jal Math_Coss +/* 0055C 8088E92C 0C01DE0D */ jal Math_CosS ## coss? /* 00560 8088E930 00042403 */ sra $a0, $a0, 16 /* 00564 8088E934 8FA50028 */ lw $a1, 0x0028($sp) @@ -16,7 +16,7 @@ glabel func_8088E90C /* 00570 8088E940 E7A0001C */ swc1 $f0, 0x001C($sp) /* 00574 8088E944 00812021 */ addu $a0, $a0, $at /* 00578 8088E948 00042400 */ sll $a0, $a0, 16 -/* 0057C 8088E94C 0C01DE1C */ jal Math_Sins +/* 0057C 8088E94C 0C01DE1C */ jal Math_SinS ## sins? /* 00580 8088E950 00042403 */ sra $a0, $a0, 16 /* 00584 8088E954 8FA50028 */ lw $a1, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088EB54.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088EB54.s index f925b54248..0885f6f1cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088EB54.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/func_8088EB54.s @@ -38,14 +38,14 @@ glabel func_8088EB54 /* 007DC 8088EBAC 34108000 */ ori $s0, $zero, 0x8000 ## $s0 = 00008000 /* 007E0 8088EBB0 01D02021 */ addu $a0, $t6, $s0 /* 007E4 8088EBB4 00042400 */ sll $a0, $a0, 16 -/* 007E8 8088EBB8 0C01DE0D */ jal Math_Coss +/* 007E8 8088EBB8 0C01DE0D */ jal Math_CosS ## coss? /* 007EC 8088EBBC 00042403 */ sra $a0, $a0, 16 /* 007F0 8088EBC0 E7A00098 */ swc1 $f0, 0x0098($sp) /* 007F4 8088EBC4 868F0032 */ lh $t7, 0x0032($s4) ## 00000032 /* 007F8 8088EBC8 01F02021 */ addu $a0, $t7, $s0 /* 007FC 8088EBCC 00042400 */ sll $a0, $a0, 16 -/* 00800 8088EBD0 0C01DE1C */ jal Math_Sins +/* 00800 8088EBD0 0C01DE1C */ jal Math_SinS ## sins? /* 00804 8088EBD4 00042403 */ sra $a0, $a0, 16 /* 00808 8088EBD8 E7A00094 */ swc1 $f0, 0x0094($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FD48.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FD48.s index 57428910d5..9b7e4de68e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FD48.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FD48.s @@ -83,7 +83,7 @@ glabel func_8088FD48 /* 0063C 8088FE4C 46061200 */ add.s $f8, $f2, $f6 /* 00640 8088FE50 E4E80060 */ swc1 $f8, 0x0060($a3) ## 00000060 /* 00644 8088FE54 8CE60060 */ lw $a2, 0x0060($a3) ## 00000060 -/* 00648 8088FE58 0C01DE80 */ jal Math_ApproxF +/* 00648 8088FE58 0C01DE80 */ jal Math_StepToF /* 0064C 8088FE5C AFA70018 */ sw $a3, 0x0018($sp) /* 00650 8088FE60 10400017 */ beq $v0, $zero, .L8088FEC0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FFD0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FFD0.s index 186c01e6d2..7c44e740a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FFD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FFD0.s @@ -12,18 +12,18 @@ glabel func_8088FFD0 /* 007D4 8088FFE4 F7B40028 */ sdc1 $f20, 0x0028($sp) /* 007D8 8088FFE8 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 007DC 8088FFEC 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 007E0 8088FFF0 0C01DE80 */ jal Math_ApproxF +/* 007E0 8088FFF0 0C01DE80 */ jal Math_StepToF /* 007E4 8088FFF4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 007E8 8088FFF8 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 007EC 8088FFFC 8E050168 */ lw $a1, 0x0168($s0) ## 00000168 -/* 007F0 80890000 0C01DE80 */ jal Math_ApproxF +/* 007F0 80890000 0C01DE80 */ jal Math_StepToF /* 007F4 80890004 8E060068 */ lw $a2, 0x0068($s0) ## 00000068 /* 007F8 80890008 8E050170 */ lw $a1, 0x0170($s0) ## 00000170 /* 007FC 8089000C 8E060068 */ lw $a2, 0x0068($s0) ## 00000068 /* 00800 80890010 AFA20064 */ sw $v0, 0x0064($sp) -/* 00804 80890014 0C01DE80 */ jal Math_ApproxF +/* 00804 80890014 0C01DE80 */ jal Math_StepToF /* 00808 80890018 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 0080C 8089001C 8FA30064 */ lw $v1, 0x0064($sp) @@ -98,14 +98,14 @@ glabel func_8088FFD0 /* 00910 80890120 45020088 */ bc1fl .L80890344 /* 00914 80890124 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00918 80890128 44816000 */ mtc1 $at, $f12 ## $f12 = 120.00 -/* 0091C 8089012C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0091C 8089012C 0C00CFC8 */ jal Rand_CenteredFloat /* 00920 80890130 00000000 */ nop -/* 00924 80890134 0C03F66B */ jal Math_Rand_ZeroOne +/* 00924 80890134 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00928 80890138 E7A00048 */ swc1 $f0, 0x0048($sp) /* 0092C 8089013C 46000506 */ mov.s $f20, $f0 -/* 00930 80890140 0C01DE1C */ jal Math_Sins +/* 00930 80890140 0C01DE1C */ jal Math_SinS ## sins? /* 00934 80890144 86040158 */ lh $a0, 0x0158($s0) ## 00000158 /* 00938 80890148 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 @@ -114,18 +114,18 @@ glabel func_8088FFD0 /* 00944 80890154 46148480 */ add.s $f18, $f16, $f20 /* 00948 80890158 46009107 */ neg.s $f4, $f18 /* 0094C 8089015C 46040182 */ mul.s $f6, $f0, $f4 -/* 00950 80890160 0C03F66B */ jal Math_Rand_ZeroOne +/* 00950 80890160 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00954 80890164 E7A6004C */ swc1 $f6, 0x004C($sp) /* 00958 80890168 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0095C 8089016C 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 00960 80890170 00000000 */ nop /* 00964 80890174 46020200 */ add.s $f8, $f0, $f2 -/* 00968 80890178 0C03F66B */ jal Math_Rand_ZeroOne +/* 00968 80890178 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0096C 8089017C E7A80050 */ swc1 $f8, 0x0050($sp) /* 00970 80890180 46000506 */ mov.s $f20, $f0 -/* 00974 80890184 0C01DE0D */ jal Math_Coss +/* 00974 80890184 0C01DE0D */ jal Math_CosS ## coss? /* 00978 80890188 86040158 */ lh $a0, 0x0158($s0) ## 00000158 /* 0097C 8089018C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 @@ -135,11 +135,11 @@ glabel func_8088FFD0 /* 0098C 8089019C 46008487 */ neg.s $f18, $f16 /* 00990 808901A0 46120102 */ mul.s $f4, $f0, $f18 /* 00994 808901A4 E7A40054 */ swc1 $f4, 0x0054($sp) -/* 00998 808901A8 0C01DE1C */ jal Math_Sins +/* 00998 808901A8 0C01DE1C */ jal Math_SinS ## sins? /* 0099C 808901AC 86040158 */ lh $a0, 0x0158($s0) ## 00000158 /* 009A0 808901B0 46000506 */ mov.s $f20, $f0 -/* 009A4 808901B4 0C01DE0D */ jal Math_Coss +/* 009A4 808901B4 0C01DE0D */ jal Math_CosS ## coss? /* 009A8 808901B8 86040158 */ lh $a0, 0x0158($s0) ## 00000158 /* 009AC 808901BC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 @@ -151,11 +151,11 @@ glabel func_8088FFD0 /* 009C4 808901D4 46120102 */ mul.s $f4, $f0, $f18 /* 009C8 808901D8 46048201 */ sub.s $f8, $f16, $f4 /* 009CC 808901DC E7A80058 */ swc1 $f8, 0x0058($sp) -/* 009D0 808901E0 0C01DE0D */ jal Math_Coss +/* 009D0 808901E0 0C01DE0D */ jal Math_CosS ## coss? /* 009D4 808901E4 86040158 */ lh $a0, 0x0158($s0) ## 00000158 /* 009D8 808901E8 46000506 */ mov.s $f20, $f0 -/* 009DC 808901EC 0C01DE1C */ jal Math_Sins +/* 009DC 808901EC 0C01DE1C */ jal Math_SinS ## sins? /* 009E0 808901F0 86040158 */ lh $a0, 0x0158($s0) ## 00000158 /* 009E4 808901F4 3C014270 */ lui $at, 0x4270 ## $at = 42700000 @@ -170,7 +170,7 @@ glabel func_8088FFD0 /* 00A08 80890218 46104280 */ add.s $f10, $f8, $f16 /* 00A0C 8089021C E7AA0060 */ swc1 $f10, 0x0060($sp) /* 00A10 80890220 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 00A14 80890224 0C01DF64 */ jal Math_Rand_S16Offset +/* 00A14 80890224 0C01DF64 */ jal Rand_S16Offset /* 00A18 80890228 E7A6005C */ swc1 $f6, 0x005C($sp) /* 00A1C 8089022C 3C088089 */ lui $t0, %hi(D_80890490) ## $t0 = 80890000 @@ -190,15 +190,15 @@ glabel func_8088FFD0 /* 00A54 80890264 AFA2001C */ sw $v0, 0x001C($sp) /* 00A58 80890268 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 00A5C 8089026C 44816000 */ mtc1 $at, $f12 ## $f12 = 120.00 -/* 00A60 80890270 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00A60 80890270 0C00CFC8 */ jal Rand_CenteredFloat /* 00A64 80890274 00000000 */ nop /* 00A68 80890278 E7A00048 */ swc1 $f0, 0x0048($sp) -/* 00A6C 8089027C 0C01DE1C */ jal Math_Sins +/* 00A6C 8089027C 0C01DE1C */ jal Math_SinS ## sins? /* 00A70 80890280 86040158 */ lh $a0, 0x0158($s0) ## 00000158 /* 00A74 80890284 46000506 */ mov.s $f20, $f0 -/* 00A78 80890288 0C01DE0D */ jal Math_Coss +/* 00A78 80890288 0C01DE0D */ jal Math_CosS ## coss? /* 00A7C 8089028C 86040158 */ lh $a0, 0x0158($s0) ## 00000158 /* 00A80 80890290 3C014270 */ lui $at, 0x4270 ## $at = 42700000 @@ -210,11 +210,11 @@ glabel func_8088FFD0 /* 00A98 808902A8 460A0182 */ mul.s $f6, $f0, $f10 /* 00A9C 808902AC 46103100 */ add.s $f4, $f6, $f16 /* 00AA0 808902B0 E7A40058 */ swc1 $f4, 0x0058($sp) -/* 00AA4 808902B4 0C01DE0D */ jal Math_Coss +/* 00AA4 808902B4 0C01DE0D */ jal Math_CosS ## coss? /* 00AA8 808902B8 86040158 */ lh $a0, 0x0158($s0) ## 00000158 /* 00AAC 808902BC 46000506 */ mov.s $f20, $f0 -/* 00AB0 808902C0 0C01DE1C */ jal Math_Sins +/* 00AB0 808902C0 0C01DE1C */ jal Math_SinS ## sins? /* 00AB4 808902C4 86040158 */ lh $a0, 0x0158($s0) ## 00000158 /* 00AB8 808902C8 3C014270 */ lui $at, 0x4270 ## $at = 42700000 @@ -227,7 +227,7 @@ glabel func_8088FFD0 /* 00AD4 808902E4 46100102 */ mul.s $f4, $f0, $f16 /* 00AD8 808902E8 460A9181 */ sub.s $f6, $f18, $f10 /* 00ADC 808902EC 46043201 */ sub.s $f8, $f6, $f4 -/* 00AE0 808902F0 0C01DF64 */ jal Math_Rand_S16Offset +/* 00AE0 808902F0 0C01DF64 */ jal Rand_S16Offset /* 00AE4 808902F4 E7A80060 */ swc1 $f8, 0x0060($sp) /* 00AE8 808902F8 3C0B8089 */ lui $t3, %hi(D_80890490) ## $t3 = 80890000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_80890360.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_80890360.s index 59f1205dd3..f73906b67b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_80890360.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_80890360.s @@ -17,7 +17,7 @@ glabel func_80890360 /* 00B8C 8089039C 8CE5000C */ lw $a1, 0x000C($a3) ## 0000000C .L808903A0: /* 00B90 808903A0 AFA70018 */ sw $a3, 0x0018($sp) -/* 00B94 808903A4 0C01DE80 */ jal Math_ApproxF +/* 00B94 808903A4 0C01DE80 */ jal Math_StepToF /* 00B98 808903A8 24E40028 */ addiu $a0, $a3, 0x0028 ## $a0 = 00000028 /* 00B9C 808903AC 1040000F */ beq $v0, $zero, .L808903EC diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_808908FC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_808908FC.s index e385edd0fe..158889af9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_808908FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_808908FC.s @@ -4,11 +4,11 @@ glabel func_808908FC /* 001C4 80890904 AFA40020 */ sw $a0, 0x0020($sp) /* 001C8 80890908 AFA60028 */ sw $a2, 0x0028($sp) /* 001CC 8089090C 87A4002A */ lh $a0, 0x002A($sp) -/* 001D0 80890910 0C01DE1C */ jal Math_Sins +/* 001D0 80890910 0C01DE1C */ jal Math_SinS ## sins? /* 001D4 80890914 AFA50024 */ sw $a1, 0x0024($sp) /* 001D8 80890918 87A4002A */ lh $a0, 0x002A($sp) -/* 001DC 8089091C 0C01DE0D */ jal Math_Coss +/* 001DC 8089091C 0C01DE0D */ jal Math_CosS ## coss? /* 001E0 80890920 E7A0001C */ swc1 $f0, 0x001C($sp) /* 001E4 80890924 8FA50024 */ lw $a1, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890B8C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890B8C.s index 2f51fe7f20..440fcee923 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890B8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890B8C.s @@ -38,7 +38,7 @@ glabel func_80890B8C /* 004C0 80890C00 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 /* 004C4 80890C04 24170002 */ addiu $s7, $zero, 0x0002 ## $s7 = 00000002 .L80890C08: -/* 004C8 80890C08 0C03F66B */ jal Math_Rand_ZeroOne +/* 004C8 80890C08 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 004CC 80890C0C 00000000 */ nop /* 004D0 80890C10 C7A400E0 */ lwc1 $f4, 0x00E0($sp) @@ -69,12 +69,12 @@ glabel func_80890B8C /* 00534 80890C74 44139000 */ mfc1 $s3, $f18 /* 00538 80890C78 00000000 */ nop /* 0053C 80890C7C 00139C00 */ sll $s3, $s3, 16 -/* 00540 80890C80 0C01DE1C */ jal Math_Sins +/* 00540 80890C80 0C01DE1C */ jal Math_SinS ## sins? /* 00544 80890C84 00139C03 */ sra $s3, $s3, 16 /* 00548 80890C88 00112400 */ sll $a0, $s1, 16 /* 0054C 80890C8C 46000506 */ mov.s $f20, $f0 -/* 00550 80890C90 0C01DE0D */ jal Math_Coss +/* 00550 80890C90 0C01DE0D */ jal Math_CosS ## coss? /* 00554 80890C94 00042403 */ sra $a0, $a0, 16 /* 00558 80890C98 4614B102 */ mul.s $f4, $f22, $f20 @@ -88,7 +88,7 @@ glabel func_80890B8C /* 00578 80890CB8 E7B000B0 */ swc1 $f16, 0x00B0($sp) /* 0057C 80890CBC C6040008 */ lwc1 $f4, 0x0008($s0) ## 0000002C /* 00580 80890CC0 46049180 */ add.s $f6, $f18, $f4 -/* 00584 80890CC4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00584 80890CC4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00588 80890CC8 E7A600B4 */ swc1 $f6, 0x00B4($sp) /* 0058C 80890CCC 461E0202 */ mul.s $f8, $f0, $f30 @@ -99,7 +99,7 @@ glabel func_80890B8C /* 005A0 80890CE0 E7A400A4 */ swc1 $f4, 0x00A4($sp) /* 005A4 80890CE4 460A4401 */ sub.s $f16, $f8, $f10 /* 005A8 80890CE8 46148482 */ mul.s $f18, $f16, $f20 -/* 005AC 80890CEC 0C03F66B */ jal Math_Rand_ZeroOne +/* 005AC 80890CEC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 005B0 80890CF0 E7B200A0 */ swc1 $f18, 0x00A0($sp) /* 005B4 80890CF4 461E0182 */ mul.s $f6, $f0, $f30 @@ -118,7 +118,7 @@ glabel func_80890B8C /* 005E8 80890D28 46181182 */ mul.s $f6, $f2, $f24 /* 005EC 80890D2C E7B000A8 */ swc1 $f16, 0x00A8($sp) /* 005F0 80890D30 E7B20094 */ swc1 $f18, 0x0094($sp) -/* 005F4 80890D34 0C03F66B */ jal Math_Rand_ZeroOne +/* 005F4 80890D34 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 005F8 80890D38 E7A6009C */ swc1 $f6, 0x009C($sp) /* 005FC 80890D3C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890E00.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890E00.s index a5017f1402..ea93c0ebb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890E00.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890E00.s @@ -50,7 +50,7 @@ glabel func_80890E00 /* 00750 80890E90 27B400BC */ addiu $s4, $sp, 0x00BC ## $s4 = FFFFFFE4 /* 00754 80890E94 241E0002 */ addiu $s8, $zero, 0x0002 ## $s8 = 00000002 .L80890E98: -/* 00758 80890E98 0C03F66B */ jal Math_Rand_ZeroOne +/* 00758 80890E98 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0075C 80890E9C 00000000 */ nop /* 00760 80890EA0 4600F03C */ c.lt.s $f30, $f0 @@ -63,7 +63,7 @@ glabel func_80890E00 /* 0077C 80890EBC 273917A4 */ addiu $t9, $t9, %lo(D_808917A4) ## $t9 = 808917A4 /* 00780 80890EC0 0016C040 */ sll $t8, $s6, 1 /* 00784 80890EC4 03199021 */ addu $s2, $t8, $t9 -/* 00788 80890EC8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00788 80890EC8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0078C 80890ECC 01CF8821 */ addu $s1, $t6, $t7 /* 00790 80890ED0 3C014140 */ lui $at, 0x4140 ## $at = 41400000 @@ -82,7 +82,7 @@ glabel func_80890E00 /* 007C4 80890F04 C6260000 */ lwc1 $f6, 0x0000($s1) ## 00000000 /* 007C8 80890F08 460A9100 */ add.s $f4, $f18, $f10 /* 007CC 80890F0C 46043202 */ mul.s $f8, $f6, $f4 -/* 007D0 80890F10 0C03F66B */ jal Math_Rand_ZeroOne +/* 007D0 80890F10 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 007D4 80890F14 E7A80098 */ swc1 $f8, 0x0098($sp) /* 007D8 80890F18 3C0142A8 */ lui $at, 0x42A8 ## $at = 42A80000 @@ -106,7 +106,7 @@ glabel func_80890E00 /* 00820 80890F60 0C01DFA7 */ jal Math_Vec3f_Sum ## Vec3f_Add /* 00824 80890F64 02803025 */ or $a2, $s4, $zero ## $a2 = FFFFFFE4 -/* 00828 80890F68 0C03F66B */ jal Math_Rand_ZeroOne +/* 00828 80890F68 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0082C 80890F6C 00000000 */ nop /* 00830 80890F70 46140182 */ mul.s $f6, $f0, $f20 @@ -114,12 +114,12 @@ glabel func_80890E00 /* 00838 80890F78 00000000 */ nop /* 0083C 80890F7C E7B000B4 */ swc1 $f16, 0x00B4($sp) /* 00840 80890F80 46163101 */ sub.s $f4, $f6, $f22 -/* 00844 80890F84 0C03F66B */ jal Math_Rand_ZeroOne +/* 00844 80890F84 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00848 80890F88 E7A400B0 */ swc1 $f4, 0x00B0($sp) /* 0084C 80890F8C 46140482 */ mul.s $f18, $f0, $f20 /* 00850 80890F90 46169201 */ sub.s $f8, $f18, $f22 -/* 00854 80890F94 0C03F66B */ jal Math_Rand_ZeroOne +/* 00854 80890F94 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00858 80890F98 E7A800B8 */ swc1 $f8, 0x00B8($sp) /* 0085C 80890F9C 46180282 */ mul.s $f10, $f0, $f24 @@ -127,12 +127,12 @@ glabel func_80890E00 /* 00864 80890FA4 C42418E8 */ lwc1 $f4, %lo(D_808918E8)($at) /* 00868 80890FA8 E7A400A8 */ swc1 $f4, 0x00A8($sp) /* 0086C 80890FAC 461A5181 */ sub.s $f6, $f10, $f26 -/* 00870 80890FB0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00870 80890FB0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00874 80890FB4 E7A600A4 */ swc1 $f6, 0x00A4($sp) /* 00878 80890FB8 46180402 */ mul.s $f16, $f0, $f24 /* 0087C 80890FBC 461A8481 */ sub.s $f18, $f16, $f26 -/* 00880 80890FC0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00880 80890FC0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00884 80890FC4 E7B200AC */ swc1 $f18, 0x00AC($sp) /* 00888 80890FC8 461C0202 */ mul.s $f8, $f0, $f28 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895BEC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895BEC.s index f49f8897a7..716f9432d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895BEC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895BEC.s @@ -5,11 +5,11 @@ glabel func_80895BEC /* 00308 80895BF8 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 0030C 80895BFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00310 80895C00 AFAE003C */ sw $t6, 0x003C($sp) -/* 00314 80895C04 0C01DE1C */ jal Math_Sins +/* 00314 80895C04 0C01DE1C */ jal Math_SinS ## sins? /* 00318 80895C08 84840170 */ lh $a0, 0x0170($a0) ## 00000170 /* 0031C 80895C0C E7A00024 */ swc1 $f0, 0x0024($sp) -/* 00320 80895C10 0C01DE0D */ jal Math_Coss +/* 00320 80895C10 0C01DE0D */ jal Math_CosS ## coss? /* 00324 80895C14 86040170 */ lh $a0, 0x0170($s0) ## 00000170 /* 00328 80895C18 44070000 */ mfc1 $a3, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895C74.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895C74.s index 32d3ea1601..ed668fea46 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895C74.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80895C74.s @@ -44,7 +44,7 @@ glabel func_80895C74 /* 003D8 80895CC8 AFA30018 */ sw $v1, 0x0018($sp) /* 003DC 80895CCC 44050000 */ mfc1 $a1, $f0 /* 003E0 80895CD0 AFA70028 */ sw $a3, 0x0028($sp) -/* 003E4 80895CD4 0C01DE80 */ jal Math_ApproxF +/* 003E4 80895CD4 0C01DE80 */ jal Math_StepToF /* 003E8 80895CD8 AFA80020 */ sw $t0, 0x0020($sp) /* 003EC 80895CDC 8FA30018 */ lw $v1, 0x0018($sp) @@ -149,7 +149,7 @@ glabel func_80895C74 .L80895E4C: /* 0055C 80895E4C 44050000 */ mfc1 $a1, $f0 .L80895E50: -/* 00560 80895E50 0C01DE80 */ jal Math_ApproxF +/* 00560 80895E50 0C01DE80 */ jal Math_StepToF /* 00564 80895E54 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3D23D70A /* 00568 80895E58 10000022 */ beq $zero, $zero, .L80895EE4 @@ -187,7 +187,7 @@ glabel func_80895C74 /* 005E0 80895ED0 C420771C */ lwc1 $f0, %lo(D_8089771C)($at) .L80895ED4: /* 005E4 80895ED4 44050000 */ mfc1 $a1, $f0 -/* 005E8 80895ED8 0C01DE80 */ jal Math_ApproxF +/* 005E8 80895ED8 0C01DE80 */ jal Math_StepToF /* 005EC 80895EDC 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3D23D70A .L80895EE0: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896ABC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896ABC.s index 498d02ef6a..61a132dc08 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896ABC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896ABC.s @@ -30,13 +30,13 @@ glabel func_80896ABC /* 01224 80896B14 2604016E */ addiu $a0, $s0, 0x016E ## $a0 = 0000016E /* 01228 80896B18 2604016E */ addiu $a0, $s0, 0x016E ## $a0 = 0000016E /* 0122C 80896B1C 2405006A */ addiu $a1, $zero, 0x006A ## $a1 = 0000006A -/* 01230 80896B20 0C01DE5F */ jal Math_ApproxS +/* 01230 80896B20 0C01DE5F */ jal Math_StepToS /* 01234 80896B24 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 01238 80896B28 10000004 */ beq $zero, $zero, .L80896B3C /* 0123C 80896B2C 8605016A */ lh $a1, 0x016A($s0) ## 0000016A .L80896B30: -/* 01240 80896B30 0C01DE5F */ jal Math_ApproxS +/* 01240 80896B30 0C01DE5F */ jal Math_StepToS /* 01244 80896B34 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A /* 01248 80896B38 8605016A */ lh $a1, 0x016A($s0) ## 0000016A @@ -45,7 +45,7 @@ glabel func_80896ABC /* 01250 80896B40 8606016E */ lh $a2, 0x016E($s0) ## 0000016E /* 01254 80896B44 00052B40 */ sll $a1, $a1, 13 /* 01258 80896B48 00052C00 */ sll $a1, $a1, 16 -/* 0125C 80896B4C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 0125C 80896B4C 0C01DE2B */ jal Math_ScaledStepToS /* 01260 80896B50 00052C03 */ sra $a1, $a1, 16 /* 01264 80896B54 50400013 */ beql $v0, $zero, .L80896BA4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898920.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898920.s index 4d0da1e355..6469b43717 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898920.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898920.s @@ -88,10 +88,10 @@ glabel func_80898920 /* 00160 80898A00 26B41C24 */ addiu $s4, $s5, 0x1C24 ## $s4 = 00001C24 /* 00164 80898A04 24120008 */ addiu $s2, $zero, 0x0008 ## $s2 = 00000008 .L80898A08: -/* 00168 80898A08 0C03F66B */ jal Math_Rand_ZeroOne +/* 00168 80898A08 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0016C 80898A0C 00000000 */ nop -/* 00170 80898A10 0C03F66B */ jal Math_Rand_ZeroOne +/* 00170 80898A10 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00174 80898A14 46000506 */ mov.s $f20, $f0 /* 00178 80898A18 4616A102 */ mul.s $f4, $f20, $f22 @@ -122,7 +122,7 @@ glabel func_80898920 /* 001D8 80898A78 E7B00014 */ swc1 $f16, 0x0014($sp) /* 001DC 80898A7C 1040000D */ beq $v0, $zero, .L80898AB4 /* 001E0 80898A80 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 001E4 80898A84 0C03F66B */ jal Math_Rand_ZeroOne +/* 001E4 80898A84 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 001E8 80898A88 00000000 */ nop /* 001EC 80898A8C 461A0202 */ mul.s $f8, $f0, $f26 @@ -130,7 +130,7 @@ glabel func_80898920 /* 001F4 80898A94 44815000 */ mtc1 $at, $f10 ## $f10 = 9.00 /* 001F8 80898A98 00000000 */ nop /* 001FC 80898A9C 460A4400 */ add.s $f16, $f8, $f10 -/* 00200 80898AA0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00200 80898AA0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00204 80898AA4 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 /* 00208 80898AA8 461E0482 */ mul.s $f18, $f0, $f30 @@ -174,12 +174,12 @@ glabel func_80898920 ## ActorSpawn /* 00298 80898B38 E7A40014 */ swc1 $f4, 0x0014($sp) /* 0029C 80898B3C 00162400 */ sll $a0, $s6, 16 -/* 002A0 80898B40 0C01DE1C */ jal Math_Sins +/* 002A0 80898B40 0C01DE1C */ jal Math_SinS ## sins? /* 002A4 80898B44 00042403 */ sra $a0, $a0, 16 /* 002A8 80898B48 00162400 */ sll $a0, $s6, 16 /* 002AC 80898B4C E7A000BC */ swc1 $f0, 0x00BC($sp) -/* 002B0 80898B50 0C01DE0D */ jal Math_Coss +/* 002B0 80898B50 0C01DE0D */ jal Math_CosS ## coss? /* 002B4 80898B54 00042403 */ sra $a0, $a0, 16 /* 002B8 80898B58 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -189,7 +189,7 @@ glabel func_80898920 /* 002C8 80898B68 27B600C8 */ addiu $s6, $sp, 0x00C8 ## $s6 = FFFFFFD8 /* 002CC 80898B6C 27B400D4 */ addiu $s4, $sp, 0x00D4 ## $s4 = FFFFFFE4 .L80898B70: -/* 002D0 80898B70 0C03F66B */ jal Math_Rand_ZeroOne +/* 002D0 80898B70 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 002D4 80898B74 00000000 */ nop /* 002D8 80898B78 3C01808A */ lui $at, %hi(D_80899600) ## $at = 808A0000 @@ -232,10 +232,10 @@ glabel func_80898920 /* 00364 80898C04 E7AA00D8 */ swc1 $f10, 0x00D8($sp) /* 00368 80898C08 C670002C */ lwc1 $f16, 0x002C($s3) ## 0000002C /* 0036C 80898C0C 46089580 */ add.s $f22, $f18, $f8 -/* 00370 80898C10 0C03F66B */ jal Math_Rand_ZeroOne +/* 00370 80898C10 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00374 80898C14 E7B000DC */ swc1 $f16, 0x00DC($sp) -/* 00378 80898C18 0C03F66B */ jal Math_Rand_ZeroOne +/* 00378 80898C18 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0037C 80898C1C 46000506 */ mov.s $f20, $f0 /* 00380 80898C20 461CA282 */ mul.s $f10, $f20, $f28 @@ -246,15 +246,15 @@ glabel func_80898920 /* 00394 80898C34 46021200 */ add.s $f8, $f2, $f2 /* 00398 80898C38 46163482 */ mul.s $f18, $f6, $f22 /* 0039C 80898C3C 46089280 */ add.s $f10, $f18, $f8 -/* 003A0 80898C40 0C03F66B */ jal Math_Rand_ZeroOne +/* 003A0 80898C40 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 003A4 80898C44 E7AA00C8 */ swc1 $f10, 0x00C8($sp) /* 003A8 80898C48 461A0402 */ mul.s $f16, $f0, $f26 /* 003AC 80898C4C 46188101 */ sub.s $f4, $f16, $f24 -/* 003B0 80898C50 0C03F66B */ jal Math_Rand_ZeroOne +/* 003B0 80898C50 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 003B4 80898C54 E7A400CC */ swc1 $f4, 0x00CC($sp) -/* 003B8 80898C58 0C03F66B */ jal Math_Rand_ZeroOne +/* 003B8 80898C58 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 003BC 80898C5C 46000506 */ mov.s $f20, $f0 /* 003C0 80898C60 461CA182 */ mul.s $f6, $f20, $f28 @@ -303,7 +303,7 @@ glabel func_80898920 /* 0046C 80898D0C 0C00A7A3 */ jal EffectSsKakera_Spawn /* 00470 80898D10 AFAB0030 */ sw $t3, 0x0030($sp) -/* 00474 80898D14 0C03F66B */ jal Math_Rand_ZeroOne +/* 00474 80898D14 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00478 80898D18 00000000 */ nop /* 0047C 80898D1C 3C01808A */ lui $at, %hi(D_8089960C) ## $at = 808A0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898DB4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898DB4.s index e5470f12a8..1fa84454c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898DB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898DB4.s @@ -86,10 +86,10 @@ glabel func_80898DB4 /* 005EC 80898E8C 26D21C24 */ addiu $s2, $s6, 0x1C24 ## $s2 = 00001C24 /* 005F0 80898E90 24140008 */ addiu $s4, $zero, 0x0008 ## $s4 = 00000008 .L80898E94: -/* 005F4 80898E94 0C03F66B */ jal Math_Rand_ZeroOne +/* 005F4 80898E94 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 005F8 80898E98 00000000 */ nop -/* 005FC 80898E9C 0C03F66B */ jal Math_Rand_ZeroOne +/* 005FC 80898E9C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00600 80898EA0 46000506 */ mov.s $f20, $f0 /* 00604 80898EA4 4618A102 */ mul.s $f4, $f20, $f24 @@ -120,7 +120,7 @@ glabel func_80898DB4 /* 00664 80898F04 E7B00014 */ swc1 $f16, 0x0014($sp) /* 00668 80898F08 1040000D */ beq $v0, $zero, .L80898F40 /* 0066C 80898F0C 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 00670 80898F10 0C03F66B */ jal Math_Rand_ZeroOne +/* 00670 80898F10 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00674 80898F14 00000000 */ nop /* 00678 80898F18 461A0202 */ mul.s $f8, $f0, $f26 @@ -128,7 +128,7 @@ glabel func_80898DB4 /* 00680 80898F20 44815000 */ mtc1 $at, $f10 ## $f10 = 9.00 /* 00684 80898F24 00000000 */ nop /* 00688 80898F28 460A4400 */ add.s $f16, $f8, $f10 -/* 0068C 80898F2C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0068C 80898F2C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00690 80898F30 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 /* 00694 80898F34 46160482 */ mul.s $f18, $f0, $f22 @@ -139,12 +139,12 @@ glabel func_80898DB4 /* 006A4 80898F44 1634FFD3 */ bne $s1, $s4, .L80898E94 /* 006A8 80898F48 00000000 */ nop /* 006AC 80898F4C 00152400 */ sll $a0, $s5, 16 -/* 006B0 80898F50 0C01DE1C */ jal Math_Sins +/* 006B0 80898F50 0C01DE1C */ jal Math_SinS ## sins? /* 006B4 80898F54 00042403 */ sra $a0, $a0, 16 /* 006B8 80898F58 00152400 */ sll $a0, $s5, 16 /* 006BC 80898F5C E7A000BC */ swc1 $f0, 0x00BC($sp) -/* 006C0 80898F60 0C01DE0D */ jal Math_Coss +/* 006C0 80898F60 0C01DE0D */ jal Math_CosS ## coss? /* 006C4 80898F64 00042403 */ sra $a0, $a0, 16 /* 006C8 80898F68 3C014220 */ lui $at, 0x4220 ## $at = 42200000 @@ -156,7 +156,7 @@ glabel func_80898DB4 /* 006E0 80898F80 27B500C8 */ addiu $s5, $sp, 0x00C8 ## $s5 = FFFFFFD8 /* 006E4 80898F84 27B400D4 */ addiu $s4, $sp, 0x00D4 ## $s4 = FFFFFFE4 .L80898F88: -/* 006E8 80898F88 0C03F66B */ jal Math_Rand_ZeroOne +/* 006E8 80898F88 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 006EC 80898F8C 00000000 */ nop /* 006F0 80898F90 3C01808A */ lui $at, %hi(D_80899610) ## $at = 808A0000 @@ -178,7 +178,7 @@ glabel func_80898DB4 /* 0072C 80898FCC 10000001 */ beq $zero, $zero, .L80898FD4 /* 00730 80898FD0 24110040 */ addiu $s1, $zero, 0x0040 ## $s1 = 00000040 .L80898FD4: -/* 00734 80898FD4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00734 80898FD4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00738 80898FD8 00000000 */ nop /* 0073C 80898FDC 461E0282 */ mul.s $f10, $f0, $f30 @@ -195,7 +195,7 @@ glabel func_80898DB4 /* 00768 80899008 E7A600D4 */ swc1 $f6, 0x00D4($sp) /* 0076C 8089900C C66A0028 */ lwc1 $f10, 0x0028($s3) ## 00000028 /* 00770 80899010 46125100 */ add.s $f4, $f10, $f18 -/* 00774 80899014 0C03F66B */ jal Math_Rand_ZeroOne +/* 00774 80899014 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00778 80899018 E7A400D8 */ swc1 $f4, 0x00D8($sp) /* 0077C 8089901C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -214,10 +214,10 @@ glabel func_80898DB4 /* 007B0 80899050 46060202 */ mul.s $f8, $f0, $f6 /* 007B4 80899054 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 /* 007B8 80899058 E7B200DC */ swc1 $f18, 0x00DC($sp) -/* 007BC 8089905C 0C03F66B */ jal Math_Rand_ZeroOne +/* 007BC 8089905C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 007C0 80899060 46104580 */ add.s $f22, $f8, $f16 -/* 007C4 80899064 0C03F66B */ jal Math_Rand_ZeroOne +/* 007C4 80899064 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 007C8 80899068 46000506 */ mov.s $f20, $f0 /* 007CC 8089906C 461CA282 */ mul.s $f10, $f20, $f28 @@ -228,15 +228,15 @@ glabel func_80898DB4 /* 007E0 80899080 46021400 */ add.s $f16, $f2, $f2 /* 007E4 80899084 46163202 */ mul.s $f8, $f6, $f22 /* 007E8 80899088 46104280 */ add.s $f10, $f8, $f16 -/* 007EC 8089908C 0C03F66B */ jal Math_Rand_ZeroOne +/* 007EC 8089908C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 007F0 80899090 E7AA00C8 */ swc1 $f10, 0x00C8($sp) /* 007F4 80899094 461A0482 */ mul.s $f18, $f0, $f26 /* 007F8 80899098 46189101 */ sub.s $f4, $f18, $f24 -/* 007FC 8089909C 0C03F66B */ jal Math_Rand_ZeroOne +/* 007FC 8089909C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00800 808990A0 E7A400CC */ swc1 $f4, 0x00CC($sp) -/* 00804 808990A4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00804 808990A4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00808 808990A8 46000506 */ mov.s $f20, $f0 /* 0080C 808990AC 461CA182 */ mul.s $f6, $f20, $f28 @@ -285,7 +285,7 @@ glabel func_80898DB4 /* 008B8 80899158 0C00A7A3 */ jal EffectSsKakera_Spawn /* 008BC 8089915C AFA90030 */ sw $t1, 0x0030($sp) -/* 008C0 80899160 0C03F66B */ jal Math_Rand_ZeroOne +/* 008C0 80899160 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 008C4 80899164 00000000 */ nop /* 008C8 80899168 3C01808A */ lui $at, %hi(D_8089961C) ## $at = 808A0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Init.s index 360d6e3da4..4a5a790e08 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Init.s @@ -155,11 +155,11 @@ glabel L8089C5B0 /* 001C4 8089C644 100001CF */ beq $zero, $zero, .L8089CD84 /* 001C8 8089C648 8FBF005C */ lw $ra, 0x005C($sp) .L8089C64C: -/* 001CC 8089C64C 0C01DE1C */ jal Math_Sins +/* 001CC 8089C64C 0C01DE1C */ jal Math_SinS ## sins? /* 001D0 8089C650 864400B6 */ lh $a0, 0x00B6($s2) ## 000000B6 /* 001D4 8089C654 46000586 */ mov.s $f22, $f0 -/* 001D8 8089C658 0C01DE0D */ jal Math_Coss +/* 001D8 8089C658 0C01DE0D */ jal Math_CosS ## coss? /* 001DC 8089C65C 864400B6 */ lh $a0, 0x00B6($s2) ## 000000B6 /* 001E0 8089C660 3C014000 */ lui $at, 0x4000 ## $at = 40000000 @@ -265,11 +265,11 @@ glabel L8089C740 /* 00354 8089C7D4 1000016B */ beq $zero, $zero, .L8089CD84 /* 00358 8089C7D8 8FBF005C */ lw $ra, 0x005C($sp) .L8089C7DC: -/* 0035C 8089C7DC 0C01DE1C */ jal Math_Sins +/* 0035C 8089C7DC 0C01DE1C */ jal Math_SinS ## sins? /* 00360 8089C7E0 864400B6 */ lh $a0, 0x00B6($s2) ## 000000B6 /* 00364 8089C7E4 46000586 */ mov.s $f22, $f0 -/* 00368 8089C7E8 0C01DE0D */ jal Math_Coss +/* 00368 8089C7E8 0C01DE0D */ jal Math_CosS ## coss? /* 0036C 8089C7EC 864400B6 */ lh $a0, 0x00B6($s2) ## 000000B6 /* 00370 8089C7F0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 @@ -375,11 +375,11 @@ glabel L8089C8D4 /* 004E4 8089C964 10000107 */ beq $zero, $zero, .L8089CD84 /* 004E8 8089C968 8FBF005C */ lw $ra, 0x005C($sp) .L8089C96C: -/* 004EC 8089C96C 0C01DE1C */ jal Math_Sins +/* 004EC 8089C96C 0C01DE1C */ jal Math_SinS ## sins? /* 004F0 8089C970 864400B6 */ lh $a0, 0x00B6($s2) ## 000000B6 /* 004F4 8089C974 46000506 */ mov.s $f20, $f0 -/* 004F8 8089C978 0C01DE0D */ jal Math_Coss +/* 004F8 8089C978 0C01DE0D */ jal Math_CosS ## coss? /* 004FC 8089C97C 864400B6 */ lh $a0, 0x00B6($s2) ## 000000B6 /* 00500 8089C980 27B50118 */ addiu $s5, $sp, 0x0118 ## $s5 = FFFFFF58 @@ -483,11 +483,11 @@ glabel L8089CA5C /* 0066C 8089CAEC 100000A5 */ beq $zero, $zero, .L8089CD84 /* 00670 8089CAF0 8FBF005C */ lw $ra, 0x005C($sp) .L8089CAF4: -/* 00674 8089CAF4 0C01DE1C */ jal Math_Sins +/* 00674 8089CAF4 0C01DE1C */ jal Math_SinS ## sins? /* 00678 8089CAF8 864400B6 */ lh $a0, 0x00B6($s2) ## 000000B6 /* 0067C 8089CAFC 46000586 */ mov.s $f22, $f0 -/* 00680 8089CB00 0C01DE0D */ jal Math_Coss +/* 00680 8089CB00 0C01DE0D */ jal Math_CosS ## coss? /* 00684 8089CB04 864400B6 */ lh $a0, 0x00B6($s2) ## 000000B6 /* 00688 8089CB08 3C014000 */ lui $at, 0x4000 ## $at = 40000000 @@ -594,11 +594,11 @@ glabel L8089CBF0 /* 00800 8089CC80 10000040 */ beq $zero, $zero, .L8089CD84 /* 00804 8089CC84 8FBF005C */ lw $ra, 0x005C($sp) .L8089CC88: -/* 00808 8089CC88 0C01DE1C */ jal Math_Sins +/* 00808 8089CC88 0C01DE1C */ jal Math_SinS ## sins? /* 0080C 8089CC8C 864400B6 */ lh $a0, 0x00B6($s2) ## 000000B6 /* 00810 8089CC90 46000586 */ mov.s $f22, $f0 -/* 00814 8089CC94 0C01DE0D */ jal Math_Coss +/* 00814 8089CC94 0C01DE0D */ jal Math_CosS ## coss? /* 00818 8089CC98 864400B6 */ lh $a0, 0x00B6($s2) ## 000000B6 /* 0081C 8089CC9C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089CF84.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089CF84.s index 388c340c34..d6891b691f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089CF84.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089CF84.s @@ -16,11 +16,11 @@ glabel func_8089CF84 /* 00B3C 8089CFBC F7B60038 */ sdc1 $f22, 0x0038($sp) /* 00B40 8089CFC0 F7B40030 */ sdc1 $f20, 0x0030($sp) /* 00B44 8089CFC4 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 -/* 00B48 8089CFC8 0C01DE1C */ jal Math_Sins +/* 00B48 8089CFC8 0C01DE1C */ jal Math_SinS ## sins? /* 00B4C 8089CFCC 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 /* 00B50 8089CFD0 46000706 */ mov.s $f28, $f0 -/* 00B54 8089CFD4 0C01DE0D */ jal Math_Coss +/* 00B54 8089CFD4 0C01DE0D */ jal Math_CosS ## coss? /* 00B58 8089CFD8 864400B6 */ lh $a0, 0x00B6($s2) ## 000000B6 /* 00B5C 8089CFDC 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 @@ -50,16 +50,16 @@ glabel func_8089CF84 /* 00BB8 8089D038 1000001D */ beq $zero, $zero, .L8089D0B0 /* 00BBC 8089D03C 00000000 */ nop .L8089D040: -/* 00BC0 8089D040 0C03F66B */ jal Math_Rand_ZeroOne +/* 00BC0 8089D040 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00BC4 8089D044 00000000 */ nop /* 00BC8 8089D048 46160102 */ mul.s $f4, $f0, $f22 /* 00BCC 8089D04C 46182181 */ sub.s $f6, $f4, $f24 -/* 00BD0 8089D050 0C03F66B */ jal Math_Rand_ZeroOne +/* 00BD0 8089D050 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00BD4 8089D054 E6060000 */ swc1 $f6, 0x0000($s0) ## FFFFFF20 /* 00BD8 8089D058 46140202 */ mul.s $f8, $f0, $f20 -/* 00BDC 8089D05C 0C03F66B */ jal Math_Rand_ZeroOne +/* 00BDC 8089D05C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00BE0 8089D060 E6080004 */ swc1 $f8, 0x0004($s0) ## FFFFFF24 /* 00BE4 8089D064 46160282 */ mul.s $f10, $f0, $f22 @@ -67,18 +67,18 @@ glabel func_8089CF84 /* 00BEC 8089D06C 1000001E */ beq $zero, $zero, .L8089D0E8 /* 00BF0 8089D070 E6100008 */ swc1 $f16, 0x0008($s0) ## FFFFFF28 .L8089D074: -/* 00BF4 8089D074 0C03F66B */ jal Math_Rand_ZeroOne +/* 00BF4 8089D074 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00BF8 8089D078 00000000 */ nop /* 00BFC 8089D07C 46140482 */ mul.s $f18, $f0, $f20 -/* 00C00 8089D080 0C03F66B */ jal Math_Rand_ZeroOne +/* 00C00 8089D080 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00C04 8089D084 E6120000 */ swc1 $f18, 0x0000($s0) ## FFFFFF20 /* 00C08 8089D088 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00C0C 8089D08C 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 /* 00C10 8089D090 00000000 */ nop /* 00C14 8089D094 46040182 */ mul.s $f6, $f0, $f4 -/* 00C18 8089D098 0C03F66B */ jal Math_Rand_ZeroOne +/* 00C18 8089D098 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00C1C 8089D09C E6060004 */ swc1 $f6, 0x0004($s0) ## FFFFFF24 /* 00C20 8089D0A0 46160202 */ mul.s $f8, $f0, $f22 @@ -86,7 +86,7 @@ glabel func_8089CF84 /* 00C28 8089D0A8 1000000F */ beq $zero, $zero, .L8089D0E8 /* 00C2C 8089D0AC E60A0008 */ swc1 $f10, 0x0008($s0) ## FFFFFF28 .L8089D0B0: -/* 00C30 8089D0B0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00C30 8089D0B0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00C34 8089D0B4 00000000 */ nop /* 00C38 8089D0B8 461A0402 */ mul.s $f16, $f0, $f26 @@ -94,11 +94,11 @@ glabel func_8089CF84 /* 00C40 8089D0C0 44819000 */ mtc1 $at, $f18 ## $f18 = 60.00 /* 00C44 8089D0C4 00000000 */ nop /* 00C48 8089D0C8 46128101 */ sub.s $f4, $f16, $f18 -/* 00C4C 8089D0CC 0C03F66B */ jal Math_Rand_ZeroOne +/* 00C4C 8089D0CC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00C50 8089D0D0 E6040000 */ swc1 $f4, 0x0000($s0) ## FFFFFF20 /* 00C54 8089D0D4 461A0182 */ mul.s $f6, $f0, $f26 -/* 00C58 8089D0D8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00C58 8089D0D8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00C5C 8089D0DC E6060004 */ swc1 $f6, 0x0004($s0) ## FFFFFF24 /* 00C60 8089D0E0 46140202 */ mul.s $f8, $f0, $f20 @@ -137,7 +137,7 @@ glabel func_8089CF84 /* 00CDC 8089D15C C6320008 */ lwc1 $f18, 0x0008($s1) ## 0000002C /* 00CE0 8089D160 46049180 */ add.s $f6, $f18, $f4 /* 00CE4 8089D164 46083281 */ sub.s $f10, $f6, $f8 -/* 00CE8 8089D168 0C03F66B */ jal Math_Rand_ZeroOne +/* 00CE8 8089D168 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00CEC 8089D16C E7AA015C */ swc1 $f10, 0x015C($sp) /* 00CF0 8089D170 46140402 */ mul.s $f16, $f0, $f20 @@ -148,7 +148,7 @@ glabel func_8089CF84 /* 00D04 8089D184 00129403 */ sra $s2, $s2, 16 /* 00D08 8089D188 26520014 */ addiu $s2, $s2, 0x0014 ## $s2 = 00000014 /* 00D0C 8089D18C 00129400 */ sll $s2, $s2, 16 -/* 00D10 8089D190 0C03F66B */ jal Math_Rand_ZeroOne +/* 00D10 8089D190 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00D14 8089D194 00129403 */ sra $s2, $s2, 16 /* 00D18 8089D198 46180102 */ mul.s $f4, $f0, $f24 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E318.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E318.s index fb1aca01a0..4c4b52f897 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E318.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/func_8089E318.s @@ -95,7 +95,7 @@ glabel L8089E414 /* 00804 8089E434 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00808 8089E438 46128000 */ add.s $f0, $f16, $f18 /* 0080C 8089E43C 44050000 */ mfc1 $a1, $f0 -/* 00810 8089E440 0C01DE80 */ jal Math_ApproxF +/* 00810 8089E440 0C01DE80 */ jal Math_StepToF /* 00814 8089E444 00000000 */ nop /* 00818 8089E448 1440001F */ bne $v0, $zero, .L8089E4C8 @@ -154,7 +154,7 @@ glabel L8089E4D8 /* 008D0 8089E500 C6000168 */ lwc1 $f0, 0x0168($s0) ## 00000168 .L8089E504: /* 008D4 8089E504 44050000 */ mfc1 $a1, $f0 -/* 008D8 8089E508 0C01DE80 */ jal Math_ApproxF +/* 008D8 8089E508 0C01DE80 */ jal Math_StepToF /* 008DC 8089E50C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 008E0 8089E510 14400017 */ bne $v0, $zero, .L8089E570 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Init.s index c367758898..706f636cde 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Init.s @@ -100,11 +100,11 @@ glabel BgSpot00Hanebasi_Init /* 00158 808A98D8 00000000 */ nop /* 0015C 808A98DC A61900B4 */ sh $t9, 0x00B4($s0) ## 000000B4 .L808A98E0: -/* 00160 808A98E0 0C01DE0D */ jal Math_Coss +/* 00160 808A98E0 0C01DE0D */ jal Math_CosS ## coss? /* 00164 808A98E4 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 /* 00168 808A98E8 E7A00054 */ swc1 $f0, 0x0054($sp) -/* 0016C 808A98EC 0C01DE1C */ jal Math_Sins +/* 0016C 808A98EC 0C01DE1C */ jal Math_SinS ## sins? /* 00170 808A98F0 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 /* 00174 808A98F4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -117,11 +117,11 @@ glabel BgSpot00Hanebasi_Init /* 00190 808A9910 46080282 */ mul.s $f10, $f0, $f8 /* 00194 808A9914 460A3401 */ sub.s $f16, $f6, $f10 /* 00198 808A9918 E7B00060 */ swc1 $f16, 0x0060($sp) -/* 0019C 808A991C 0C01DE1C */ jal Math_Sins +/* 0019C 808A991C 0C01DE1C */ jal Math_SinS ## sins? /* 001A0 808A9920 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 /* 001A4 808A9924 E7A00054 */ swc1 $f0, 0x0054($sp) -/* 001A8 808A9928 0C01DE0D */ jal Math_Coss +/* 001A8 808A9928 0C01DE0D */ jal Math_CosS ## coss? /* 001AC 808A992C 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 /* 001B0 808A9930 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -134,11 +134,11 @@ glabel BgSpot00Hanebasi_Init /* 001CC 808A994C 46080182 */ mul.s $f6, $f0, $f8 /* 001D0 808A9950 46062281 */ sub.s $f10, $f4, $f6 /* 001D4 808A9954 E7AA0064 */ swc1 $f10, 0x0064($sp) -/* 001D8 808A9958 0C01DE0D */ jal Math_Coss +/* 001D8 808A9958 0C01DE0D */ jal Math_CosS ## coss? /* 001DC 808A995C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 001E0 808A9960 E7A00054 */ swc1 $f0, 0x0054($sp) -/* 001E4 808A9964 0C01DE1C */ jal Math_Sins +/* 001E4 808A9964 0C01DE1C */ jal Math_SinS ## sins? /* 001E8 808A9968 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 001EC 808A996C C7B00064 */ lwc1 $f16, 0x0064($sp) @@ -149,11 +149,11 @@ glabel BgSpot00Hanebasi_Init /* 00200 808A9980 46024102 */ mul.s $f4, $f8, $f2 /* 00204 808A9984 46049180 */ add.s $f6, $f18, $f4 /* 00208 808A9988 E7A6005C */ swc1 $f6, 0x005C($sp) -/* 0020C 808A998C 0C01DE1C */ jal Math_Sins +/* 0020C 808A998C 0C01DE1C */ jal Math_SinS ## sins? /* 00210 808A9990 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00214 808A9994 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00218 808A9998 0C01DE0D */ jal Math_Coss +/* 00218 808A9998 0C01DE0D */ jal Math_CosS ## coss? /* 0021C 808A999C E7A00054 */ swc1 $f0, 0x0054($sp) /* 00220 808A99A0 C7AC0064 */ lwc1 $f12, 0x0064($sp) @@ -206,11 +206,11 @@ glabel BgSpot00Hanebasi_Init .L808A9A4C: /* 002CC 808A9A4C 14600029 */ bne $v1, $zero, .L808A9AF4 /* 002D0 808A9A50 3C19808B */ lui $t9, %hi(func_808A9E58) ## $t9 = 808B0000 -/* 002D4 808A9A54 0C01DE0D */ jal Math_Coss +/* 002D4 808A9A54 0C01DE0D */ jal Math_CosS ## coss? /* 002D8 808A9A58 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 002DC 808A9A5C E7A0004C */ swc1 $f0, 0x004C($sp) -/* 002E0 808A9A60 0C01DE1C */ jal Math_Sins +/* 002E0 808A9A60 0C01DE1C */ jal Math_SinS ## sins? /* 002E4 808A9A64 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 002E8 808A9A68 3C01439E */ lui $at, 0x439E ## $at = 439E0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9D24.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9D24.s index 88edcdfb25..8a997944ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9D24.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9D24.s @@ -11,7 +11,7 @@ glabel func_808A9D24 /* 005B4 808A9D34 84E50168 */ lh $a1, 0x0168($a3) ## 00000168 /* 005B8 808A9D38 AFA70028 */ sw $a3, 0x0028($sp) /* 005BC 808A9D3C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 005C0 808A9D40 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 005C0 808A9D40 0C01DE2B */ jal Math_ScaledStepToS /* 005C4 808A9D44 24060050 */ addiu $a2, $zero, 0x0050 ## $a2 = 00000050 /* 005C8 808A9D48 10400004 */ beq $v0, $zero, .L808A9D5C @@ -42,14 +42,14 @@ glabel func_808A9D24 /* 00628 808A9DA8 00000000 */ nop /* 0062C 808A9DAC 00063400 */ sll $a2, $a2, 16 /* 00630 808A9DB0 00063403 */ sra $a2, $a2, 16 -/* 00634 808A9DB4 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00634 808A9DB4 0C01DE2B */ jal Math_ScaledStepToS /* 00638 808A9DB8 A7A6001E */ sh $a2, 0x001E($sp) /* 0063C 808A9DBC 8FA30024 */ lw $v1, 0x0024($sp) /* 00640 808A9DC0 87A6001E */ lh $a2, 0x001E($sp) /* 00644 808A9DC4 8C68011C */ lw $t0, 0x011C($v1) ## 0000011C /* 00648 808A9DC8 84650168 */ lh $a1, 0x0168($v1) ## 00000168 -/* 0064C 808A9DCC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 0064C 808A9DCC 0C01DE2B */ jal Math_ScaledStepToS /* 00650 808A9DD0 250400B4 */ addiu $a0, $t0, 0x00B4 ## $a0 = 000000B4 /* 00654 808A9DD4 8FA70028 */ lw $a3, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9E58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9E58.s index 73f9cd4a32..33b9439ae6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9E58.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9E58.s @@ -10,7 +10,7 @@ glabel func_808A9E58 /* 006D8 808A9E58 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 006DC 808A9E5C AFBF0024 */ sw $ra, 0x0024($sp) /* 006E0 808A9E60 AFA40028 */ sw $a0, 0x0028($sp) -/* 006E4 808A9E64 0C03F66B */ jal Math_Rand_ZeroOne +/* 006E4 808A9E64 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 006E8 808A9E68 AFA5002C */ sw $a1, 0x002C($sp) /* 006EC 808A9E6C 3C0142FE */ lui $at, 0x42FE ## $at = 42FE0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AC908.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AC908.s index 4541362933..e76a12709e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AC908.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AC908.s @@ -25,7 +25,7 @@ glabel func_808AC908 /* 00300 808AC960 37192000 */ ori $t9, $t8, 0x2000 ## $t9 = 00002000 /* 00304 808AC964 A4590ED6 */ sh $t9, 0x0ED6($v0) ## 8015F536 /* 00308 808AC968 A6080168 */ sh $t0, 0x0168($s0) ## 00000168 -/* 0030C 808AC96C 0C01DE1C */ jal Math_Sins +/* 0030C 808AC96C 0C01DE1C */ jal Math_SinS ## sins? /* 00310 808AC970 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00314 808AC974 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -39,7 +39,7 @@ glabel func_808AC908 /* 00334 808AC994 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 00338 808AC998 46128100 */ add.s $f4, $f16, $f18 /* 0033C 808AC99C E7A40030 */ swc1 $f4, 0x0030($sp) -/* 00340 808AC9A0 0C01DE0D */ jal Math_Coss +/* 00340 808AC9A0 0C01DE0D */ jal Math_CosS ## coss? /* 00344 808AC9A4 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00348 808AC9A8 3C014248 */ lui $at, 0x4248 ## $at = 42480000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACB58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACB58.s index c37c058552..88a533b7be 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACB58.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACB58.s @@ -11,7 +11,7 @@ glabel func_808ACB58 /* 0051C 808ACB7C 46062200 */ add.s $f8, $f4, $f6 /* 00520 808ACB80 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00524 808ACB84 44054000 */ mfc1 $a1, $f8 -/* 00528 808ACB88 0C01DE80 */ jal Math_ApproxF +/* 00528 808ACB88 0C01DE80 */ jal Math_StepToF /* 0052C 808ACB8C 00000000 */ nop /* 00530 808ACB90 1040000A */ beq $v0, $zero, .L808ACBBC diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEBC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEBC0.s index f0fb7fd201..813620f3cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEBC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEBC0.s @@ -22,14 +22,14 @@ glabel func_808AEBC0 /* 00470 808AEBF0 5700002C */ bnel $t8, $zero, .L808AECA4 /* 00474 808AEBF4 8FBF0024 */ lw $ra, 0x0024($sp) /* 00478 808AEBF8 44816000 */ mtc1 $at, $f12 ## $f12 = 160.00 -/* 0047C 808AEBFC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0047C 808AEBFC 0C00CFC8 */ jal Rand_CenteredFloat /* 00480 808AEC00 00000000 */ nop /* 00484 808AEC04 E7A00030 */ swc1 $f0, 0x0030($sp) /* 00488 808AEC08 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 0048C 808AEC0C 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 /* 00490 808AEC10 00042400 */ sll $a0, $a0, 16 -/* 00494 808AEC14 0C01DE1C */ jal Math_Sins +/* 00494 808AEC14 0C01DE1C */ jal Math_SinS ## sins? /* 00498 808AEC18 00042403 */ sra $a0, $a0, 16 /* 0049C 808AEC1C C7A40030 */ lwc1 $f4, 0x0030($sp) @@ -42,14 +42,14 @@ glabel func_808AEBC0 /* 004B8 808AEC38 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 004BC 808AEC3C 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 /* 004C0 808AEC40 00042400 */ sll $a0, $a0, 16 -/* 004C4 808AEC44 0C01DE0D */ jal Math_Coss +/* 004C4 808AEC44 0C01DE0D */ jal Math_CosS ## coss? /* 004C8 808AEC48 00042403 */ sra $a0, $a0, 16 /* 004CC 808AEC4C C7B20030 */ lwc1 $f18, 0x0030($sp) /* 004D0 808AEC50 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C /* 004D4 808AEC54 46120102 */ mul.s $f4, $f0, $f18 /* 004D8 808AEC58 46062200 */ add.s $f8, $f4, $f6 -/* 004DC 808AEC5C 0C03F66B */ jal Math_Rand_ZeroOne +/* 004DC 808AEC5C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 004E0 808AEC60 E7A8003C */ swc1 $f8, 0x003C($sp) /* 004E4 808AEC64 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AED7C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AED7C.s index 259f036def..d4b3571a10 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AED7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AED7C.s @@ -12,7 +12,7 @@ glabel func_808AED7C /* 00624 808AEDA4 46062200 */ add.s $f8, $f4, $f6 /* 00628 808AEDA8 24E40028 */ addiu $a0, $a3, 0x0028 ## $a0 = 00000028 /* 0062C 808AEDAC 44054000 */ mfc1 $a1, $f8 -/* 00630 808AEDB0 0C01DE80 */ jal Math_ApproxF +/* 00630 808AEDB0 0C01DE80 */ jal Math_StepToF /* 00634 808AEDB4 00000000 */ nop /* 00638 808AEDB8 1040000A */ beq $v0, $zero, .L808AEDE4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE6C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE6C.s index e26761c321..c039a546a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE6C.s @@ -22,7 +22,7 @@ glabel func_808AEE6C /* 0071C 808AEE9C 50C00014 */ beql $a2, $zero, .L808AEEF0 /* 00720 808AEEA0 8FBF001C */ lw $ra, 0x001C($sp) .L808AEEA4: -/* 00724 808AEEA4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00724 808AEEA4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00728 808AEEA8 00000000 */ nop /* 0072C 808AEEAC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEEFC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEEFC.s index 33b335ed2d..56710e0d0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEEFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEEFC.s @@ -29,11 +29,11 @@ glabel func_808AEEFC /* 007C8 808AEF48 A498016A */ sh $t8, 0x016A($a0) ## 0000016A /* 007CC 808AEF4C 37280010 */ ori $t0, $t9, 0x0010 ## $t0 = 00000010 /* 007D0 808AEF50 AC880004 */ sw $t0, 0x0004($a0) ## 00000004 -/* 007D4 808AEF54 0C01DE1C */ jal Math_Sins +/* 007D4 808AEF54 0C01DE1C */ jal Math_SinS ## sins? /* 007D8 808AEF58 84840032 */ lh $a0, 0x0032($a0) ## 00000032 /* 007DC 808AEF5C 46000506 */ mov.s $f20, $f0 -/* 007E0 808AEF60 0C01DE0D */ jal Math_Coss +/* 007E0 808AEF60 0C01DE0D */ jal Math_CosS ## coss? /* 007E4 808AEF64 86240032 */ lh $a0, 0x0032($s1) ## 00000032 /* 007E8 808AEF68 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -80,7 +80,7 @@ glabel func_808AEEFC /* 00888 808AF008 46128100 */ add.s $f4, $f16, $f18 /* 0088C 808AF00C E7A40070 */ swc1 $f4, 0x0070($sp) .L808AF010: -/* 00890 808AF010 0C03F66B */ jal Math_Rand_ZeroOne +/* 00890 808AF010 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00894 808AF014 00000000 */ nop /* 00898 808AF018 46180182 */ mul.s $f6, $f0, $f24 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF120.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF120.s index 612adf58cb..f3709e001e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF120.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF120.s @@ -17,7 +17,7 @@ glabel func_808AF120 /* 009BC 808AF13C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF /* 009C0 808AF140 A48E016A */ sh $t6, 0x016A($a0) ## 0000016A .L808AF144: -/* 009C4 808AF144 0C01DE1C */ jal Math_Sins +/* 009C4 808AF144 0C01DE1C */ jal Math_SinS ## sins? /* 009C8 808AF148 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 009CC 808AF14C 3C01808B */ lui $at, %hi(D_808AFA14) ## $at = 808B0000 @@ -26,7 +26,7 @@ glabel func_808AF120 /* 009D8 808AF158 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 009DC 808AF15C 46003202 */ mul.s $f8, $f6, $f0 /* 009E0 808AF160 46082280 */ add.s $f10, $f4, $f8 -/* 009E4 808AF164 0C01DE0D */ jal Math_Coss +/* 009E4 808AF164 0C01DE0D */ jal Math_CosS ## coss? /* 009E8 808AF168 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 /* 009EC 808AF16C 3C01808B */ lui $at, %hi(D_808AFA18) ## $at = 808B0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF1D8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF1D8.s index 79ea817051..fabf9b4293 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF1D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF1D8.s @@ -29,14 +29,14 @@ glabel func_808AF1D8 /* 00A80 808AF200 46022180 */ add.s $f6, $f4, $f2 /* 00A84 808AF204 45000045 */ bc1f .L808AF31C /* 00A88 808AF208 E4860028 */ swc1 $f6, 0x0028($a0) ## 00000028 -/* 00A8C 808AF20C 0C01DE0D */ jal Math_Coss +/* 00A8C 808AF20C 0C01DE0D */ jal Math_CosS ## coss? /* 00A90 808AF210 848400B4 */ lh $a0, 0x00B4($a0) ## 000000B4 /* 00A94 808AF214 3C01808B */ lui $at, %hi(D_808AFA1C) ## $at = 808B0000 /* 00A98 808AF218 C428FA1C */ lwc1 $f8, %lo(D_808AFA1C)($at) /* 00A9C 808AF21C 46080282 */ mul.s $f10, $f0, $f8 /* 00AA0 808AF220 E7AA002C */ swc1 $f10, 0x002C($sp) -/* 00AA4 808AF224 0C01DE1C */ jal Math_Sins +/* 00AA4 808AF224 0C01DE1C */ jal Math_SinS ## sins? /* 00AA8 808AF228 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00AAC 808AF22C C7B2002C */ lwc1 $f18, 0x002C($sp) @@ -44,7 +44,7 @@ glabel func_808AF1D8 /* 00AB4 808AF234 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00AB8 808AF238 46009102 */ mul.s $f4, $f18, $f0 /* 00ABC 808AF23C 46048180 */ add.s $f6, $f16, $f4 -/* 00AC0 808AF240 0C01DE0D */ jal Math_Coss +/* 00AC0 808AF240 0C01DE0D */ jal Math_CosS ## coss? /* 00AC4 808AF244 E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 /* 00AC8 808AF248 C7AA002C */ lwc1 $f10, 0x002C($sp) @@ -63,12 +63,12 @@ glabel func_808AF1D8 /* 00AFC 808AF27C 8FA50034 */ lw $a1, 0x0034($sp) /* 00B00 808AF280 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00B04 808AF284 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00B08 808AF288 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00B08 808AF288 0C01DE2B */ jal Math_ScaledStepToS /* 00B0C 808AF28C 24060260 */ addiu $a2, $zero, 0x0260 ## $a2 = 00000260 /* 00B10 808AF290 5040006B */ beql $v0, $zero, .L808AF440 /* 00B14 808AF294 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00B18 808AF298 0C01DE1C */ jal Math_Sins +/* 00B18 808AF298 0C01DE1C */ jal Math_SinS ## sins? /* 00B1C 808AF29C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00B20 808AF2A0 3C014180 */ lui $at, 0x4180 ## $at = 41800000 @@ -77,7 +77,7 @@ glabel func_808AF1D8 /* 00B2C 808AF2AC 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00B30 808AF2B0 46120402 */ mul.s $f16, $f0, $f18 /* 00B34 808AF2B4 46104101 */ sub.s $f4, $f8, $f16 -/* 00B38 808AF2B8 0C01DE0D */ jal Math_Coss +/* 00B38 808AF2B8 0C01DE0D */ jal Math_CosS ## coss? /* 00B3C 808AF2BC E6040008 */ swc1 $f4, 0x0008($s0) ## 00000008 /* 00B40 808AF2C0 3C014180 */ lui $at, 0x4180 ## $at = 41800000 @@ -137,14 +137,14 @@ glabel func_808AF1D8 /* 00C10 808AF390 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00C14 808AF394 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 /* 00C18 808AF398 46061480 */ add.s $f18, $f2, $f6 -/* 00C1C 808AF39C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00C1C 808AF39C 0C00CFC8 */ jal Rand_CenteredFloat /* 00C20 808AF3A0 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 /* 00C24 808AF3A4 C6080008 */ lwc1 $f8, 0x0008($s0) ## 00000008 /* 00C28 808AF3A8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00C2C 808AF3AC 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 /* 00C30 808AF3B0 46080400 */ add.s $f16, $f0, $f8 -/* 00C34 808AF3B4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00C34 808AF3B4 0C00CFC8 */ jal Rand_CenteredFloat /* 00C38 808AF3B8 E6100024 */ swc1 $f16, 0x0024($s0) ## 00000024 /* 00C3C 808AF3BC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -171,7 +171,7 @@ glabel func_808AF1D8 /* 00C84 808AF404 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00C88 808AF408 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00C8C 808AF40C 2405C000 */ addiu $a1, $zero, 0xC000 ## $a1 = FFFFC000 -/* 00C90 808AF410 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00C90 808AF410 0C01DE2B */ jal Math_ScaledStepToS /* 00C94 808AF414 24060030 */ addiu $a2, $zero, 0x0030 ## $a2 = 00000030 /* 00C98 808AF418 50400009 */ beql $v0, $zero, .L808AF440 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF824.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF824.s index b88790fcd5..b006e8ba39 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF824.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF824.s @@ -39,7 +39,7 @@ glabel func_808AF824 /* 01110 808AF890 44050000 */ mfc1 $a1, $f0 /* 01114 808AF894 44070000 */ mfc1 $a3, $f0 /* 01118 808AF898 2604016C */ addiu $a0, $s0, 0x016C ## $a0 = 0000016C -/* 0111C 808AF89C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0111C 808AF89C 0C01E0C4 */ jal Math_SmoothStepToF /* 01120 808AF8A0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 01124 808AF8A4 8FA2002C */ lw $v0, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Init.s index 2449d497dd..58c1bd9438 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Init.s @@ -120,7 +120,7 @@ glabel BgSpot08Iceblock_Init /* 00930 808B1290 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3D4CCCCD .L808B1294: -/* 00934 808B1294 0C03F66B */ jal Math_Rand_ZeroOne +/* 00934 808B1294 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00938 808B1298 00000000 */ nop /* 0093C 808B129C 3C01808B */ lui $at, %hi(D_808B1890) ## $at = 808B0000 @@ -128,7 +128,7 @@ glabel BgSpot08Iceblock_Init /* 00944 808B12A4 46040182 */ mul.s $f6, $f0, $f4 /* 00948 808B12A8 4600320D */ trunc.w.s $f8, $f6 /* 0094C 808B12AC 44184000 */ mfc1 $t8, $f8 -/* 00950 808B12B0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00950 808B12B0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00954 808B12B4 A618018C */ sh $t8, 0x018C($s0) ## 0000018C /* 00958 808B12B8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Update.s index 45d7d2a237..9ff110b2d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Update.s @@ -9,7 +9,7 @@ glabel BgSpot08Iceblock_Update /* 00C38 808B1598 AFBF001C */ sw $ra, 0x001C($sp) /* 00C3C 808B159C AFB00018 */ sw $s0, 0x0018($sp) /* 00C40 808B15A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C44 808B15A4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00C44 808B15A4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00C48 808B15A8 AFA50024 */ sw $a1, 0x0024($sp) /* 00C4C 808B15AC 3C01808B */ lui $at, %hi(D_808B18AC) ## $at = 808B0000 @@ -19,12 +19,12 @@ glabel BgSpot08Iceblock_Update /* 00C5C 808B15BC 00000000 */ nop /* 00C60 808B15C0 45020009 */ bc1fl .L808B15E8 /* 00C64 808B15C4 860E018C */ lh $t6, 0x018C($s0) ## 0000018C -/* 00C68 808B15C8 0C01DF64 */ jal Math_Rand_S16Offset +/* 00C68 808B15C8 0C01DF64 */ jal Rand_S16Offset /* 00C6C 808B15CC 24050064 */ addiu $a1, $zero, 0x0064 ## $a1 = 00000064 /* 00C70 808B15D0 A6020190 */ sh $v0, 0x0190($s0) ## 00000190 /* 00C74 808B15D4 24040320 */ addiu $a0, $zero, 0x0320 ## $a0 = 00000320 -/* 00C78 808B15D8 0C01DF64 */ jal Math_Rand_S16Offset +/* 00C78 808B15D8 0C01DF64 */ jal Rand_S16Offset /* 00C7C 808B15DC 24050190 */ addiu $a1, $zero, 0x0190 ## $a1 = 00000190 /* 00C80 808B15E0 A6020192 */ sh $v0, 0x0192($s0) ## 00000192 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0A84.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0A84.s index a5c7a7a3dd..ab0dcc951f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0A84.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0A84.s @@ -2,12 +2,12 @@ glabel func_808B0A84 /* 00124 808B0A84 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00128 808B0A88 AFBF0014 */ sw $ra, 0x0014($sp) /* 0012C 808B0A8C AFA40020 */ sw $a0, 0x0020($sp) -/* 00130 808B0A90 0C01DE1C */ jal Math_Sins +/* 00130 808B0A90 0C01DE1C */ jal Math_SinS ## sins? /* 00134 808B0A94 8484018C */ lh $a0, 0x018C($a0) ## 0000018C /* 00138 808B0A98 8FAF0020 */ lw $t7, 0x0020($sp) /* 0013C 808B0A9C E7A0001C */ swc1 $f0, 0x001C($sp) -/* 00140 808B0AA0 0C01DE1C */ jal Math_Sins +/* 00140 808B0AA0 0C01DE1C */ jal Math_SinS ## sins? /* 00144 808B0AA4 85E4018E */ lh $a0, 0x018E($t7) ## 0000018E /* 00148 808B0AA8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0AE0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0AE0.s index ac60034f7a..341294c1fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0AE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0AE0.s @@ -54,7 +54,7 @@ glabel func_808B0AE0 /* 0020C 808B0B6C 44050000 */ mfc1 $a1, $f0 .L808B0B70: /* 00210 808B0B70 24E40194 */ addiu $a0, $a3, 0x0194 ## $a0 = 00000194 -/* 00214 808B0B74 0C01DE80 */ jal Math_ApproxF +/* 00214 808B0B74 0C01DE80 */ jal Math_StepToF /* 00218 808B0B78 8FA60018 */ lw $a2, 0x0018($sp) /* 0021C 808B0B7C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0CE0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0CE0.s index 378bb35eb1..b4efb8b8e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0CE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0CE0.s @@ -46,7 +46,7 @@ glabel func_808B0CE0 /* 003F0 808B0D50 46085401 */ sub.s $f16, $f10, $f8 /* 003F4 808B0D54 0C032D8A */ jal Math3D_Vec3fMagnitude /* 003F8 808B0D58 E7B000CC */ swc1 $f16, 0x00CC($sp) -/* 003FC 808B0D5C 0C03F66B */ jal Math_Rand_ZeroOne +/* 003FC 808B0D5C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00400 808B0D60 E7A00088 */ swc1 $f0, 0x0088($sp) /* 00404 808B0D64 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -57,7 +57,7 @@ glabel func_808B0CE0 /* 00418 808B0D78 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 0041C 808B0D7C 46062282 */ mul.s $f10, $f4, $f6 /* 00420 808B0D80 E7A800A8 */ swc1 $f8, 0x00A8($sp) -/* 00424 808B0D84 0C03F66B */ jal Math_Rand_ZeroOne +/* 00424 808B0D84 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00428 808B0D88 E7AA00A4 */ swc1 $f10, 0x00A4($sp) /* 0042C 808B0D8C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -223,7 +223,7 @@ glabel func_808B0CE0 /* 00680 808B0FE0 8FA50024 */ lw $a1, 0x0024($sp) /* 00684 808B0FE4 0C032BFB */ jal Math3D_Cos /* 00688 808B0FE8 AFA7002C */ sw $a3, 0x002C($sp) -/* 0068C 808B0FEC 0C03F4DA */ jal Math_acosf +/* 0068C 808B0FEC 0C03F4DA */ jal Math_FAcosF /* 00690 808B0FF0 46000306 */ mov.s $f12, $f0 /* 00694 808B0FF4 8FA5002C */ lw $a1, 0x002C($sp) /* 00698 808B0FF8 46000306 */ mov.s $f12, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1054.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1054.s index 118e82ed50..ab30de955d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1054.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1054.s @@ -4,7 +4,7 @@ glabel func_808B1054 /* 006FC 808B105C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00700 808B1060 AFBF003C */ sw $ra, 0x003C($sp) /* 00704 808B1064 AFA50054 */ sw $a1, 0x0054($sp) -/* 00708 808B1068 0C01DE1C */ jal Math_Sins +/* 00708 808B1068 0C01DE1C */ jal Math_SinS ## sins? /* 0070C 808B106C 84840016 */ lh $a0, 0x0016($a0) ## 00000016 /* 00710 808B1070 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -12,7 +12,7 @@ glabel func_808B1054 /* 00718 808B1078 00000000 */ nop /* 0071C 808B107C 46040182 */ mul.s $f6, $f0, $f4 /* 00720 808B1080 E7A60044 */ swc1 $f6, 0x0044($sp) -/* 00724 808B1084 0C01DE0D */ jal Math_Coss +/* 00724 808B1084 0C01DE0D */ jal Math_CosS ## coss? /* 00728 808B1088 86040016 */ lh $a0, 0x0016($s0) ## 00000016 /* 0072C 808B108C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B14A0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B14A0.s index 4f0402e092..06d73584a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B14A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B14A0.s @@ -16,14 +16,14 @@ glabel func_808B14A0 /* 00B78 808B14D8 86180032 */ lh $t8, 0x0032($s0) ## 00000032 /* 00B7C 808B14DC 27190190 */ addiu $t9, $t8, 0x0190 ## $t9 = 00000190 /* 00B80 808B14E0 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -/* 00B84 808B14E4 0C01DE1C */ jal Math_Sins +/* 00B84 808B14E4 0C01DE1C */ jal Math_SinS ## sins? /* 00B88 808B14E8 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 00B8C 808B14EC 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00B90 808B14F0 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 /* 00B94 808B14F4 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 00B98 808B14F8 46040082 */ mul.s $f2, $f0, $f4 -/* 00B9C 808B14FC 0C01DE0D */ jal Math_Coss +/* 00B9C 808B14FC 0C01DE0D */ jal Math_CosS ## coss? /* 00BA0 808B1500 E7A20020 */ swc1 $f2, 0x0020($sp) /* 00BA4 808B1504 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Update.s index 7450b86f8f..e3fbd6a6f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Update.s @@ -198,7 +198,7 @@ glabel BgSstFloor_Update /* 00348 808B9C58 46060282 */ mul.s $f10, $f0, $f6 /* 0034C 808B9C5C 4600520D */ trunc.w.s $f8, $f10 /* 00350 808B9C60 440F4000 */ mfc1 $t7, $f8 -/* 00354 808B9C64 0C01DE5F */ jal Math_ApproxS +/* 00354 808B9C64 0C01DE5F */ jal Math_StepToS /* 00358 808B9C68 A62F0168 */ sh $t7, 0x0168($s1) ## 00000168 /* 0035C 808B9C6C 86380168 */ lh $t8, 0x0168($s1) ## 00000168 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Update.s index 37e38ae2f2..b228cdf8e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Update.s @@ -54,13 +54,13 @@ glabel BgVbSima_Update /* 001F0 808BDF50 3C05C47A */ lui $a1, 0xC47A ## $a1 = C47A0000 /* 001F4 808BDF54 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 001F8 808BDF58 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 001FC 808BDF5C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 001FC 808BDF5C 0C01E0C4 */ jal Math_SmoothStepToF /* 00200 808BDF60 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00204 808BDF64 86C40174 */ lh $a0, 0x0174($s6) ## 00000174 /* 00208 808BDF68 000423C0 */ sll $a0, $a0, 15 /* 0020C 808BDF6C 00042400 */ sll $a0, $a0, 16 -/* 00210 808BDF70 0C01DE0D */ jal Math_Coss +/* 00210 808BDF70 0C01DE0D */ jal Math_CosS ## coss? /* 00214 808BDF74 00042403 */ sra $a0, $a0, 16 /* 00218 808BDF78 86C40174 */ lh $a0, 0x0174($s6) ## 00000174 @@ -73,7 +73,7 @@ glabel BgVbSima_Update /* 00234 808BDF94 00042300 */ sll $a0, $a0, 12 /* 00238 808BDF98 00042400 */ sll $a0, $a0, 16 /* 0023C 808BDF9C E6CA002C */ swc1 $f10, 0x002C($s6) ## 0000002C -/* 00240 808BDFA0 0C01DE1C */ jal Math_Sins +/* 00240 808BDFA0 0C01DE1C */ jal Math_SinS ## sins? /* 00244 808BDFA4 00042403 */ sra $a0, $a0, 16 /* 00248 808BDFA8 4600040D */ trunc.w.s $f16, $f0 @@ -91,7 +91,7 @@ glabel BgVbSima_Update /* 00278 808BDFD8 00042403 */ sra $a0, $a0, 16 /* 0027C 808BDFDC 00005012 */ mflo $t2 /* 00280 808BDFE0 A6CA00B4 */ sh $t2, 0x00B4($s6) ## 000000B4 -/* 00284 808BDFE4 0C01DE1C */ jal Math_Sins +/* 00284 808BDFE4 0C01DE1C */ jal Math_SinS ## sins? /* 00288 808BDFE8 00000000 */ nop /* 0028C 808BDFEC 4600048D */ trunc.w.s $f18, $f0 @@ -138,7 +138,7 @@ glabel BgVbSima_Update /* 00320 808BE080 27B3009C */ addiu $s3, $sp, 0x009C ## $s3 = FFFFFFAC /* 00324 808BE084 27B200A8 */ addiu $s2, $sp, 0x00A8 ## $s2 = FFFFFFB8 .L808BE088: -/* 00328 808BE088 0C03F66B */ jal Math_Rand_ZeroOne +/* 00328 808BE088 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0032C 808BE08C 00000000 */ nop /* 00330 808BE090 3C01808C */ lui $at, %hi(D_808BE460) ## $at = 808C0000 @@ -152,14 +152,14 @@ glabel BgVbSima_Update /* 00350 808BE0B0 4481C000 */ mtc1 $at, $f24 ## $f24 = -80.00 /* 00354 808BE0B4 3C014320 */ lui $at, 0x4320 ## $at = 43200000 /* 00358 808BE0B8 44816000 */ mtc1 $at, $f12 ## $f12 = 160.00 -/* 0035C 808BE0BC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0035C 808BE0BC 0C00CFC8 */ jal Rand_CenteredFloat /* 00360 808BE0C0 00000000 */ nop /* 00364 808BE0C4 10000013 */ beq $zero, $zero, .L808BE114 /* 00368 808BE0C8 46000686 */ mov.s $f26, $f0 /* 0036C 808BE0CC 4481D000 */ mtc1 $at, $f26 ## $f26 = 0.00 .L808BE0D0: -/* 00370 808BE0D0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00370 808BE0D0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00374 808BE0D4 00000000 */ nop /* 00378 808BE0D8 4614003C */ c.lt.s $f0, $f20 @@ -175,7 +175,7 @@ glabel BgVbSima_Update /* 003A0 808BE100 3C014320 */ lui $at, 0x4320 ## $at = 43200000 .L808BE104: /* 003A4 808BE104 44816000 */ mtc1 $at, $f12 ## $f12 = 160.00 -/* 003A8 808BE108 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 003A8 808BE108 0C00CFC8 */ jal Rand_CenteredFloat /* 003AC 808BE10C 00000000 */ nop /* 003B0 808BE110 46000606 */ mov.s $f24, $f0 @@ -185,7 +185,7 @@ glabel BgVbSima_Update /* 003BC 808BE11C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 003C0 808BE120 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 /* 003C4 808BE124 460AC402 */ mul.s $f16, $f24, $f10 -/* 003C8 808BE128 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 003C8 808BE128 0C00CFBE */ jal Rand_ZeroFloat /* 003CC 808BE12C E7B000CC */ swc1 $f16, 0x00CC($sp) /* 003D0 808BE130 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -213,7 +213,7 @@ glabel BgVbSima_Update /* 00428 808BE188 E7A600B4 */ swc1 $f6, 0x00B4($sp) /* 0042C 808BE18C C6CA002C */ lwc1 $f10, 0x002C($s6) ## 0000002C /* 00430 808BE190 461A5400 */ add.s $f16, $f10, $f26 -/* 00434 808BE194 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00434 808BE194 0C00CFBE */ jal Rand_ZeroFloat /* 00438 808BE198 E7B000BC */ swc1 $f16, 0x00BC($sp) /* 0043C 808BE19C 4600048D */ trunc.w.s $f18, $f0 @@ -241,42 +241,42 @@ glabel BgVbSima_Update /* 00494 808BE1F4 C7A400CC */ lwc1 $f4, 0x00CC($sp) .L808BE1F8: /* 00498 808BE1F8 4600E306 */ mov.s $f12, $f28 -/* 0049C 808BE1FC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0049C 808BE1FC 0C00CFBE */ jal Rand_ZeroFloat /* 004A0 808BE200 E7A4009C */ swc1 $f4, 0x009C($sp) /* 004A4 808BE204 C7A600D4 */ lwc1 $f6, 0x00D4($sp) /* 004A8 808BE208 E7A000A0 */ swc1 $f0, 0x00A0($sp) /* 004AC 808BE20C E7BE0094 */ swc1 $f30, 0x0094($sp) /* 004B0 808BE210 4600A306 */ mov.s $f12, $f20 -/* 004B4 808BE214 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 004B4 808BE214 0C00CFC8 */ jal Rand_CenteredFloat /* 004B8 808BE218 E7A600A4 */ swc1 $f6, 0x00A4($sp) /* 004BC 808BE21C E7A00090 */ swc1 $f0, 0x0090($sp) -/* 004C0 808BE220 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 004C0 808BE220 0C00CFC8 */ jal Rand_CenteredFloat /* 004C4 808BE224 4600A306 */ mov.s $f12, $f20 /* 004C8 808BE228 E7A00098 */ swc1 $f0, 0x0098($sp) -/* 004CC 808BE22C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 004CC 808BE22C 0C00CFC8 */ jal Rand_CenteredFloat /* 004D0 808BE230 4600B306 */ mov.s $f12, $f22 /* 004D4 808BE234 C7A800B4 */ lwc1 $f8, 0x00B4($sp) /* 004D8 808BE238 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 004DC 808BE23C 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 004E0 808BE240 46080280 */ add.s $f10, $f0, $f8 -/* 004E4 808BE244 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 004E4 808BE244 0C00CFBE */ jal Rand_ZeroFloat /* 004E8 808BE248 E7AA00A8 */ swc1 $f10, 0x00A8($sp) /* 004EC 808BE24C C7B000B8 */ lwc1 $f16, 0x00B8($sp) /* 004F0 808BE250 4600B306 */ mov.s $f12, $f22 /* 004F4 808BE254 46100480 */ add.s $f18, $f0, $f16 -/* 004F8 808BE258 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 004F8 808BE258 0C00CFC8 */ jal Rand_CenteredFloat /* 004FC 808BE25C E7B200AC */ swc1 $f18, 0x00AC($sp) /* 00500 808BE260 C7A400BC */ lwc1 $f4, 0x00BC($sp) /* 00504 808BE264 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 00508 808BE268 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 /* 0050C 808BE26C 46040180 */ add.s $f6, $f0, $f4 -/* 00510 808BE270 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00510 808BE270 0C00CFBE */ jal Rand_ZeroFloat /* 00514 808BE274 E7A600B0 */ swc1 $f6, 0x00B0($sp) /* 00518 808BE278 4600020D */ trunc.w.s $f8, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/func_808BDDF8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/func_808BDDF8.s index d446921a71..0f9479c4db 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/func_808BDDF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/func_808BDDF8.s @@ -37,7 +37,7 @@ glabel func_808BDDF8 /* 00120 808BDE80 A48C002A */ sh $t4, 0x002A($a0) ## 0000002A /* 00124 808BDE84 46062203 */ div.s $f8, $f4, $f6 /* 00128 808BDE88 E4880030 */ swc1 $f8, 0x0030($a0) ## 00000030 -/* 0012C 808BDE8C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0012C 808BDE8C 0C00CFBE */ jal Rand_ZeroFloat /* 00130 808BDE90 AFA40018 */ sw $a0, 0x0018($sp) /* 00134 808BDE94 4600028D */ trunc.w.s $f10, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Init.s index 7b3855e51f..bb89c66d91 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Init.s @@ -118,20 +118,20 @@ glabel BgYdanSp_Init /* 001B4 808BF5C4 0C00B56E */ jal Actor_SetHeight /* 001B8 808BF5C8 3C0541F0 */ lui $a1, 0x41F0 ## $a1 = 41F00000 -/* 001BC 808BF5CC 0C01DE1C */ jal Math_Sins +/* 001BC 808BF5CC 0C01DE1C */ jal Math_SinS ## sins? /* 001C0 808BF5D0 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 001C4 808BF5D4 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 001C8 808BF5D8 0C01DE0D */ jal Math_Coss +/* 001C8 808BF5D8 0C01DE0D */ jal Math_CosS ## coss? /* 001CC 808BF5DC E7A00040 */ swc1 $f0, 0x0040($sp) /* 001D0 808BF5E0 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 -/* 001D4 808BF5E4 0C01DE1C */ jal Math_Sins +/* 001D4 808BF5E4 0C01DE1C */ jal Math_SinS ## sins? /* 001D8 808BF5E8 E7A00044 */ swc1 $f0, 0x0044($sp) /* 001DC 808BF5EC 46000387 */ neg.s $f14, $f0 /* 001E0 808BF5F0 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 -/* 001E4 808BF5F4 0C01DE0D */ jal Math_Coss +/* 001E4 808BF5F4 0C01DE0D */ jal Math_CosS ## coss? /* 001E8 808BF5F8 E7AE0038 */ swc1 $f14, 0x0038($sp) /* 001EC 808BF5FC 3C03808C */ lui $v1, %hi(D_808C096C) ## $v1 = 808C0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF97C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF97C.s index 1f2cc612ec..021424054c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF97C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF97C.s @@ -46,7 +46,7 @@ glabel func_808BF97C /* 005EC 808BF9FC 00007810 */ mfhi $t7 /* 005F0 808BFA00 55E00082 */ bnel $t7, $zero, .L808BFC0C /* 005F4 808BFA04 8FBF009C */ lw $ra, 0x009C($sp) -/* 005F8 808BFA08 0C03F66B */ jal Math_Rand_ZeroOne +/* 005F8 808BFA08 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 005FC 808BFA0C 00000000 */ nop /* 00600 808BFA10 3C01808C */ lui $at, %hi(D_808C0A68) ## $at = 808C0000 @@ -74,7 +74,7 @@ glabel func_808BF97C .L808BFA68: /* 00658 808BFA68 3C014620 */ lui $at, 0x4620 ## $at = 46200000 /* 0065C 808BFA6C 44816000 */ mtc1 $at, $f12 ## $f12 = 10240.00 -/* 00660 808BFA70 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00660 808BFA70 0C00CFC8 */ jal Rand_CenteredFloat /* 00664 808BFA74 00000000 */ nop /* 00668 808BFA78 44928000 */ mtc1 $s2, $f16 ## $f16 = 0.00 @@ -87,12 +87,12 @@ glabel func_808BF97C /* 00684 808BFA94 00028400 */ sll $s0, $v0, 16 /* 00688 808BFA98 00022400 */ sll $a0, $v0, 16 /* 0068C 808BFA9C 00108403 */ sra $s0, $s0, 16 -/* 00690 808BFAA0 0C01DE1C */ jal Math_Sins +/* 00690 808BFAA0 0C01DE1C */ jal Math_SinS ## sins? /* 00694 808BFAA4 00042403 */ sra $a0, $a0, 16 /* 00698 808BFAA8 00102400 */ sll $a0, $s0, 16 /* 0069C 808BFAAC 46000506 */ mov.s $f20, $f0 -/* 006A0 808BFAB0 0C01DE0D */ jal Math_Coss +/* 006A0 808BFAB0 0C01DE0D */ jal Math_CosS ## coss? /* 006A4 808BFAB4 00042403 */ sra $a0, $a0, 16 /* 006A8 808BFAB8 4614C282 */ mul.s $f10, $f24, $f20 @@ -119,12 +119,12 @@ glabel func_808BF97C /* 006F8 808BFB08 00000000 */ nop /* 006FC 808BFB0C 45000015 */ bc1f .L808BFB64 /* 00700 808BFB10 00000000 */ nop -/* 00704 808BFB14 0C01DE1C */ jal Math_Sins +/* 00704 808BFB14 0C01DE1C */ jal Math_SinS ## sins? /* 00708 808BFB18 00042403 */ sra $a0, $a0, 16 /* 0070C 808BFB1C 00112400 */ sll $a0, $s1, 16 /* 00710 808BFB20 46000506 */ mov.s $f20, $f0 -/* 00714 808BFB24 0C01DE0D */ jal Math_Coss +/* 00714 808BFB24 0C01DE0D */ jal Math_CosS ## coss? /* 00718 808BFB28 00042403 */ sra $a0, $a0, 16 /* 0071C 808BFB2C 4614C402 */ mul.s $f16, $f24, $f20 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFC90.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFC90.s index 251b115923..3cd2869bf7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFC90.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFC90.s @@ -76,7 +76,7 @@ glabel func_808BFC90 /* 00988 808BFD98 27B40068 */ addiu $s4, $sp, 0x0068 ## $s4 = FFFFFFF0 .L808BFD9C: /* 0098C 808BFD9C 00102400 */ sll $a0, $s0, 16 -/* 00990 808BFDA0 0C01DE1C */ jal Math_Sins +/* 00990 808BFDA0 0C01DE1C */ jal Math_SinS ## sins? /* 00994 808BFDA4 00042403 */ sra $a0, $a0, 16 /* 00998 808BFDA8 46140282 */ mul.s $f10, $f0, $f20 @@ -84,7 +84,7 @@ glabel func_808BFC90 /* 009A0 808BFDB0 00102400 */ sll $a0, $s0, 16 /* 009A4 808BFDB4 00042403 */ sra $a0, $a0, 16 /* 009A8 808BFDB8 46105480 */ add.s $f18, $f10, $f16 -/* 009AC 808BFDBC 0C01DE0D */ jal Math_Coss +/* 009AC 808BFDBC 0C01DE0D */ jal Math_CosS ## coss? /* 009B0 808BFDC0 E7B20068 */ swc1 $f18, 0x0068($sp) /* 009B4 808BFDC4 46140102 */ mul.s $f4, $f0, $f20 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFE50.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFE50.s index 128a97badf..fa75bc5494 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFE50.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFE50.s @@ -172,7 +172,7 @@ glabel func_808BFE50 /* 00C90 808C00A0 2604016C */ addiu $a0, $s0, 0x016C ## $a0 = 0000016C /* 00C94 808C00A4 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 00C98 808C00A8 46062200 */ add.s $f8, $f4, $f6 -/* 00C9C 808C00AC 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 00C9C 808C00AC 0C01E123 */ jal Math_ApproachZeroF /* 00CA0 808C00B0 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 /* 00CA4 808C00B4 8619016A */ lh $t9, 0x016A($s0) ## 0000016A diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C012C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C012C.s index fe60ab4251..adf2f15a66 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C012C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C012C.s @@ -46,7 +46,7 @@ glabel func_808C012C /* 00D9C 808C01AC 00007810 */ mfhi $t7 /* 00DA0 808C01B0 55E0009B */ bnel $t7, $zero, .L808C0420 /* 00DA4 808C01B4 8FBF009C */ lw $ra, 0x009C($sp) -/* 00DA8 808C01B8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00DA8 808C01B8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00DAC 808C01BC 00000000 */ nop /* 00DB0 808C01C0 3C01808C */ lui $at, %hi(D_808C0A84) ## $at = 808C0000 @@ -71,7 +71,7 @@ glabel func_808C012C .L808C020C: /* 00DFC 808C020C 3C014620 */ lui $at, 0x4620 ## $at = 46200000 /* 00E00 808C0210 44816000 */ mtc1 $at, $f12 ## $f12 = 10240.00 -/* 00E04 808C0214 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00E04 808C0214 0C00CFC8 */ jal Rand_CenteredFloat /* 00E08 808C0218 00000000 */ nop /* 00E0C 808C021C 44935000 */ mtc1 $s3, $f10 ## $f10 = 0.00 @@ -84,20 +84,20 @@ glabel func_808C012C /* 00E28 808C0238 00029400 */ sll $s2, $v0, 16 /* 00E2C 808C023C 00022400 */ sll $a0, $v0, 16 /* 00E30 808C0240 00129403 */ sra $s2, $s2, 16 -/* 00E34 808C0244 0C01DE1C */ jal Math_Sins +/* 00E34 808C0244 0C01DE1C */ jal Math_SinS ## sins? /* 00E38 808C0248 00042403 */ sra $a0, $a0, 16 /* 00E3C 808C024C 00122400 */ sll $a0, $s2, 16 /* 00E40 808C0250 46000506 */ mov.s $f20, $f0 -/* 00E44 808C0254 0C01DE0D */ jal Math_Coss +/* 00E44 808C0254 0C01DE0D */ jal Math_CosS ## coss? /* 00E48 808C0258 00042403 */ sra $a0, $a0, 16 /* 00E4C 808C025C 46000586 */ mov.s $f22, $f0 -/* 00E50 808C0260 0C01DE0D */ jal Math_Coss +/* 00E50 808C0260 0C01DE0D */ jal Math_CosS ## coss? /* 00E54 808C0264 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00E58 808C0268 46140602 */ mul.s $f24, $f0, $f20 -/* 00E5C 808C026C 0C01DE1C */ jal Math_Sins +/* 00E5C 808C026C 0C01DE1C */ jal Math_SinS ## sins? /* 00E60 808C0270 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00E64 808C0274 4600A502 */ mul.s $f20, $f20, $f0 @@ -129,20 +129,20 @@ glabel func_808C012C /* 00EC8 808C02D8 00000000 */ nop /* 00ECC 808C02DC 45020021 */ bc1fl .L808C0364 /* 00ED0 808C02E0 3C0140D0 */ lui $at, 0x40D0 ## $at = 40D00000 -/* 00ED4 808C02E4 0C01DE1C */ jal Math_Sins +/* 00ED4 808C02E4 0C01DE1C */ jal Math_SinS ## sins? /* 00ED8 808C02E8 00042403 */ sra $a0, $a0, 16 /* 00EDC 808C02EC 00112400 */ sll $a0, $s1, 16 /* 00EE0 808C02F0 46000506 */ mov.s $f20, $f0 -/* 00EE4 808C02F4 0C01DE0D */ jal Math_Coss +/* 00EE4 808C02F4 0C01DE0D */ jal Math_CosS ## coss? /* 00EE8 808C02F8 00042403 */ sra $a0, $a0, 16 /* 00EEC 808C02FC 46000586 */ mov.s $f22, $f0 -/* 00EF0 808C0300 0C01DE0D */ jal Math_Coss +/* 00EF0 808C0300 0C01DE0D */ jal Math_CosS ## coss? /* 00EF4 808C0304 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00EF8 808C0308 46140602 */ mul.s $f24, $f0, $f20 -/* 00EFC 808C030C 0C01DE1C */ jal Math_Sins +/* 00EFC 808C030C 0C01DE1C */ jal Math_SinS ## sins? /* 00F00 808C0310 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00F04 808C0314 4600A502 */ mul.s $f20, $f20, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Update.s index 4c35524b4c..297422f801 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Update.s @@ -136,7 +136,7 @@ glabel BossDodongo_Update /* 02A94 808C3C24 262400BC */ addiu $a0, $s1, 0x00BC ## $a0 = 000000BC /* 02A98 808C3C28 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02A9C 808C3C2C 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 02AA0 808C3C30 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02AA0 808C3C30 0C01E0C4 */ jal Math_SmoothStepToF /* 02AA4 808C3C34 E7B00010 */ swc1 $f16, 0x0010($sp) /* 02AA8 808C3C38 0C00B638 */ jal Actor_MoveForward @@ -163,7 +163,7 @@ glabel BossDodongo_Update /* 02AF8 808C3C88 44050000 */ mfc1 $a1, $f0 /* 02AFC 808C3C8C 26240208 */ addiu $a0, $s1, 0x0208 ## $a0 = 00000208 /* 02B00 808C3C90 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02B04 808C3C94 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02B04 808C3C94 0C01E0C4 */ jal Math_SmoothStepToF /* 02B08 808C3C98 E7A00010 */ swc1 $f0, 0x0010($sp) /* 02B0C 808C3C9C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 @@ -172,7 +172,7 @@ glabel BossDodongo_Update /* 02B18 808C3CA8 44051000 */ mfc1 $a1, $f2 /* 02B1C 808C3CAC 2624020C */ addiu $a0, $s1, 0x020C ## $a0 = 0000020C /* 02B20 808C3CB0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02B24 808C3CB4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02B24 808C3CB4 0C01E0C4 */ jal Math_SmoothStepToF /* 02B28 808C3CB8 E7A20010 */ swc1 $f2, 0x0010($sp) /* 02B2C 808C3CBC 862C019E */ lh $t4, 0x019E($s1) ## 0000019E @@ -180,7 +180,7 @@ glabel BossDodongo_Update /* 02B34 808C3CC4 15A00011 */ bne $t5, $zero, .L808C3D0C /* 02B38 808C3CC8 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 .L808C3CCC: -/* 02B3C 808C3CCC 0C03F66B */ jal Math_Rand_ZeroOne +/* 02B3C 808C3CCC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02B40 808C3CD0 00000000 */ nop /* 02B44 808C3CD4 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 @@ -232,7 +232,7 @@ glabel BossDodongo_Update /* 02BEC 808C3D7C 44050000 */ mfc1 $a1, $f0 /* 02BF0 808C3D80 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02BF4 808C3D84 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 02BF8 808C3D88 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02BF8 808C3D88 0C01E0C4 */ jal Math_SmoothStepToF /* 02BFC 808C3D8C E7A60010 */ swc1 $f6, 0x0010($sp) /* 02C00 808C3D90 10000008 */ beq $zero, $zero, .L808C3DB4 @@ -242,7 +242,7 @@ glabel BossDodongo_Update /* 02C0C 808C3D9C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02C10 808C3DA0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02C14 808C3DA4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 02C18 808C3DA8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02C18 808C3DA8 0C01E0C4 */ jal Math_SmoothStepToF /* 02C1C 808C3DAC E7A80010 */ swc1 $f8, 0x0010($sp) /* 02C20 808C3DB0 8FA300B4 */ lw $v1, 0x00B4($sp) @@ -428,7 +428,7 @@ glabel BossDodongo_Update /* 02EB4 808C4044 3C0541F0 */ lui $a1, 0x41F0 ## $a1 = 41F00000 /* 02EB8 808C4048 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02EBC 808C404C 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 02EC0 808C4050 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02EC0 808C4050 0C01E0C4 */ jal Math_SmoothStepToF /* 02EC4 808C4054 E7A60010 */ swc1 $f6, 0x0010($sp) /* 02EC8 808C4058 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 @@ -436,7 +436,7 @@ glabel BossDodongo_Update /* 02ED0 808C4060 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 02ED4 808C4064 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02ED8 808C4068 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 02EDC 808C406C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02EDC 808C406C 0C01E0C4 */ jal Math_SmoothStepToF /* 02EE0 808C4070 E7A80010 */ swc1 $f8, 0x0010($sp) /* 02EE4 808C4074 10000011 */ beq $zero, $zero, .L808C40BC @@ -448,7 +448,7 @@ glabel BossDodongo_Update /* 02EF8 808C4088 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 02EFC 808C408C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02F00 808C4090 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 02F04 808C4094 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02F04 808C4094 0C01E0C4 */ jal Math_SmoothStepToF /* 02F08 808C4098 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 02F0C 808C409C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 @@ -456,7 +456,7 @@ glabel BossDodongo_Update /* 02F14 808C40A4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02F18 808C40A8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02F1C 808C40AC 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 02F20 808C40B0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02F20 808C40B0 0C01E0C4 */ jal Math_SmoothStepToF /* 02F24 808C40B4 E7B00010 */ swc1 $f16, 0x0010($sp) /* 02F28 808C40B8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 @@ -465,7 +465,7 @@ glabel BossDodongo_Update /* 02F30 808C40C0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02F34 808C40C4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02F38 808C40C8 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 02F3C 808C40CC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02F3C 808C40CC 0C01E0C4 */ jal Math_SmoothStepToF /* 02F40 808C40D0 E7B20010 */ swc1 $f18, 0x0010($sp) /* 02F44 808C40D4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -473,7 +473,7 @@ glabel BossDodongo_Update /* 02F4C 808C40DC 3C054461 */ lui $a1, 0x4461 ## $a1 = 44610000 /* 02F50 808C40E0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02F54 808C40E4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 02F58 808C40E8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02F58 808C40E8 0C01E0C4 */ jal Math_SmoothStepToF /* 02F5C 808C40EC E7A40010 */ swc1 $f4, 0x0010($sp) /* 02F60 808C40F0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 @@ -482,7 +482,7 @@ glabel BossDodongo_Update /* 02F6C 808C40FC 26240220 */ addiu $a0, $s1, 0x0220 ## $a0 = 00000220 /* 02F70 808C4100 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02F74 808C4104 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 02F78 808C4108 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02F78 808C4108 0C01E0C4 */ jal Math_SmoothStepToF /* 02F7C 808C410C E7A60010 */ swc1 $f6, 0x0010($sp) /* 02F80 808C4110 10000042 */ beq $zero, $zero, .L808C421C @@ -500,7 +500,7 @@ glabel BossDodongo_Update /* 02FAC 808C413C 460A4200 */ add.s $f8, $f8, $f10 .L808C4140: /* 02FB0 808C4140 44054000 */ mfc1 $a1, $f8 -/* 02FB4 808C4144 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02FB4 808C4144 0C01E0C4 */ jal Math_SmoothStepToF /* 02FB8 808C4148 E7B00010 */ swc1 $f16, 0x0010($sp) /* 02FBC 808C414C 8FAA00B4 */ lw $t2, 0x00B4($sp) @@ -518,7 +518,7 @@ glabel BossDodongo_Update /* 02FEC 808C417C 46049480 */ add.s $f18, $f18, $f4 .L808C4180: /* 02FF0 808C4180 44059000 */ mfc1 $a1, $f18 -/* 02FF4 808C4184 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02FF4 808C4184 0C01E0C4 */ jal Math_SmoothStepToF /* 02FF8 808C4188 E7A60010 */ swc1 $f6, 0x0010($sp) /* 02FFC 808C418C 8FAC00B4 */ lw $t4, 0x00B4($sp) @@ -536,7 +536,7 @@ glabel BossDodongo_Update /* 0302C 808C41BC 460A4200 */ add.s $f8, $f8, $f10 .L808C41C0: /* 03030 808C41C0 44054000 */ mfc1 $a1, $f8 -/* 03034 808C41C4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03034 808C41C4 0C01E0C4 */ jal Math_SmoothStepToF /* 03038 808C41C8 E7B00010 */ swc1 $f16, 0x0010($sp) /* 0303C 808C41CC 8FAE00B4 */ lw $t6, 0x00B4($sp) @@ -549,7 +549,7 @@ glabel BossDodongo_Update /* 03058 808C41E8 E7A40010 */ swc1 $f4, 0x0010($sp) /* 0305C 808C41EC 468094A0 */ cvt.s.w $f18, $f18 /* 03060 808C41F0 44059000 */ mfc1 $a1, $f18 -/* 03064 808C41F4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03064 808C41F4 0C01E0C4 */ jal Math_SmoothStepToF /* 03068 808C41F8 00000000 */ nop /* 0306C 808C41FC 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 @@ -557,7 +557,7 @@ glabel BossDodongo_Update /* 03074 808C4204 3C05447A */ lui $a1, 0x447A ## $a1 = 447A0000 /* 03078 808C4208 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0307C 808C420C 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 03080 808C4210 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03080 808C4210 0C01E0C4 */ jal Math_SmoothStepToF /* 03084 808C4214 E7A60010 */ swc1 $f6, 0x0010($sp) /* 03088 808C4218 8FB8009C */ lw $t8, 0x009C($sp) @@ -600,7 +600,7 @@ glabel BossDodongo_Update /* 03110 808C42A0 3C01808D */ lui $at, %hi(D_808CA6EC) ## $at = 808D0000 /* 03114 808C42A4 4500000C */ bc1f .L808C42D8 /* 03118 808C42A8 00000000 */ nop -/* 0311C 808C42AC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0311C 808C42AC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 03120 808C42B0 A7AA0090 */ sh $t2, 0x0090($sp) /* 03124 808C42B4 3C01808D */ lui $at, %hi(D_808CA6E8) ## $at = 808D0000 @@ -622,7 +622,7 @@ glabel BossDodongo_Update /* 03160 808C42F0 4502000E */ bc1fl .L808C432C /* 03164 808C42F4 A7AE0090 */ sh $t6, 0x0090($sp) /* 03168 808C42F8 24100007 */ addiu $s0, $zero, 0x0007 ## $s0 = 00000007 -/* 0316C 808C42FC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0316C 808C42FC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 03170 808C4300 A7AC0090 */ sh $t4, 0x0090($sp) /* 03174 808C4304 3C01808D */ lui $at, %hi(D_808CA6F0) ## $at = 808D0000 @@ -636,7 +636,7 @@ glabel BossDodongo_Update /* 03194 808C4324 00031C03 */ sra $v1, $v1, 16 /* 03198 808C4328 A7AE0090 */ sh $t6, 0x0090($sp) .L808C432C: -/* 0319C 808C432C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0319C 808C432C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 031A0 808C4330 A7A3008E */ sh $v1, 0x008E($sp) /* 031A4 808C4334 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -660,14 +660,14 @@ glabel BossDodongo_Update /* 031E4 808C4374 00D07024 */ and $t6, $a2, $s0 /* 031E8 808C4378 55C00035 */ bnel $t6, $zero, .L808C4450 /* 031EC 808C437C 87AE0090 */ lh $t6, 0x0090($sp) -/* 031F0 808C4380 0C03F66B */ jal Math_Rand_ZeroOne +/* 031F0 808C4380 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 031F4 808C4384 A7A3008E */ sh $v1, 0x008E($sp) /* 031F8 808C4388 3C0143A5 */ lui $at, 0x43A5 ## $at = 43A50000 /* 031FC 808C438C 44819000 */ mtc1 $at, $f18 ## $f18 = 330.00 /* 03200 808C4390 00000000 */ nop /* 03204 808C4394 46120102 */ mul.s $f4, $f0, $f18 -/* 03208 808C4398 0C03F66B */ jal Math_Rand_ZeroOne +/* 03208 808C4398 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0320C 808C439C E7A4007C */ swc1 $f4, 0x007C($sp) /* 03210 808C43A0 3C01808D */ lui $at, %hi(D_808CA6F4) ## $at = 808D0000 @@ -736,14 +736,14 @@ glabel BossDodongo_Update /* 03300 808C4490 AD8F0000 */ sw $t7, 0x0000($t4) ## FFFFFFB0 /* 03304 808C4494 8DAF0008 */ lw $t7, 0x0008($t5) ## 808CA43C /* 03308 808C4498 AD8E0004 */ sw $t6, 0x0004($t4) ## FFFFFFB4 -/* 0330C 808C449C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0330C 808C449C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 03310 808C44A0 AD8F0008 */ sw $t7, 0x0008($t4) ## FFFFFFB8 /* 03314 808C44A4 3C0143A5 */ lui $at, 0x43A5 ## $at = 43A50000 /* 03318 808C44A8 44819000 */ mtc1 $at, $f18 ## $f18 = 330.00 /* 0331C 808C44AC 00000000 */ nop /* 03320 808C44B0 46120102 */ mul.s $f4, $f0, $f18 -/* 03324 808C44B4 0C03F66B */ jal Math_Rand_ZeroOne +/* 03324 808C44B4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 03328 808C44B8 E7A40050 */ swc1 $f4, 0x0050($sp) /* 0332C 808C44BC 3C01808D */ lui $at, %hi(D_808CA704) ## $at = 808D0000 @@ -779,22 +779,22 @@ glabel BossDodongo_Update /* 03398 808C4528 C432A714 */ lwc1 $f18, %lo(D_808CA714)($at) /* 0339C 808C452C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 033A0 808C4530 44816000 */ mtc1 $at, $f12 ## $f12 = 0.50 -/* 033A4 808C4534 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 033A4 808C4534 0C00CFC8 */ jal Rand_CenteredFloat /* 033A8 808C4538 E7B20064 */ swc1 $f18, 0x0064($sp) /* 033AC 808C453C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 033B0 808C4540 44816000 */ mtc1 $at, $f12 ## $f12 = 0.50 -/* 033B4 808C4544 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 033B4 808C4544 0C00CFC8 */ jal Rand_CenteredFloat /* 033B8 808C4548 E7A00060 */ swc1 $f0, 0x0060($sp) -/* 033BC 808C454C 0C03F66B */ jal Math_Rand_ZeroOne +/* 033BC 808C454C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 033C0 808C4550 E7A00068 */ swc1 $f0, 0x0068($sp) /* 033C4 808C4554 3C0143A5 */ lui $at, 0x43A5 ## $at = 43A50000 /* 033C8 808C4558 44812000 */ mtc1 $at, $f4 ## $f4 = 330.00 /* 033CC 808C455C 00000000 */ nop /* 033D0 808C4560 46040182 */ mul.s $f6, $f0, $f4 -/* 033D4 808C4564 0C03F66B */ jal Math_Rand_ZeroOne +/* 033D4 808C4564 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 033D8 808C4568 E7A60050 */ swc1 $f6, 0x0050($sp) /* 033DC 808C456C 3C01808D */ lui $at, %hi(D_808CA718) ## $at = 808D0000 @@ -822,7 +822,7 @@ glabel BossDodongo_Update /* 0342C 808C45BC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 03430 808C45C0 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 /* 03434 808C45C4 46105480 */ add.s $f18, $f10, $f16 -/* 03438 808C45C8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 03438 808C45C8 0C00CFBE */ jal Rand_ZeroFloat /* 0343C 808C45CC E7B2005C */ swc1 $f18, 0x005C($sp) /* 03440 808C45D0 4600010D */ trunc.w.s $f4, $f0 @@ -907,7 +907,7 @@ glabel BossDodongo_Update /* 03570 808C4700 44050000 */ mfc1 $a1, $f0 /* 03574 808C4704 26240224 */ addiu $a0, $s1, 0x0224 ## $a0 = 00000224 /* 03578 808C4708 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0357C 808C470C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0357C 808C470C 0C01E0C4 */ jal Math_SmoothStepToF /* 03580 808C4710 E7A00010 */ swc1 $f0, 0x0010($sp) .L808C4714: @@ -1058,7 +1058,7 @@ glabel BossDodongo_Update /* 03784 808C4914 A5C00454 */ sh $zero, 0x0454($t6) ## 00000454 .L808C4918: /* 03788 808C4918 44050000 */ mfc1 $a1, $f0 -/* 0378C 808C491C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0378C 808C491C 0C01E0C4 */ jal Math_SmoothStepToF /* 03790 808C4920 E7A00010 */ swc1 $f0, 0x0010($sp) /* 03794 808C4924 0C231B2D */ jal func_808C6CB4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C17C8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C17C8.s index 5da5cf98b1..fa6239af86 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C17C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C17C8.s @@ -43,7 +43,7 @@ glabel func_808C17C8 /* 006D8 808C1868 A46C002A */ sh $t4, 0x002A($v1) ## 0001002A /* 006DC 808C186C 46062203 */ div.s $f8, $f4, $f6 /* 006E0 808C1870 E468002C */ swc1 $f8, 0x002C($v1) ## 0001002C -/* 006E4 808C1874 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 006E4 808C1874 0C00CFBE */ jal Rand_ZeroFloat /* 006E8 808C1878 AFA30020 */ sw $v1, 0x0020($sp) /* 006EC 808C187C 4600028D */ trunc.w.s $f10, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1D00.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1D00.s index 4874685b01..5701394fb1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1D00.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1D00.s @@ -234,7 +234,7 @@ glabel L808C1E60 /* 00E38 808C1FC8 44054000 */ mfc1 $a1, $f8 /* 00E3C 808C1FCC E7A40010 */ swc1 $f4, 0x0010($sp) /* 00E40 808C1FD0 44079000 */ mfc1 $a3, $f18 -/* 00E44 808C1FD4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00E44 808C1FD4 0C01E0C4 */ jal Math_SmoothStepToF /* 00E48 808C1FD8 00000000 */ nop /* 00E4C 808C1FDC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -248,7 +248,7 @@ glabel L808C1E60 /* 00E6C 808C1FFC 2604042C */ addiu $a0, $s0, 0x042C ## $a0 = 0000042C /* 00E70 808C2000 E7B00010 */ swc1 $f16, 0x0010($sp) /* 00E74 808C2004 44075000 */ mfc1 $a3, $f10 -/* 00E78 808C2008 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00E78 808C2008 0C01E0C4 */ jal Math_SmoothStepToF /* 00E7C 808C200C 00000000 */ nop /* 00E80 808C2010 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -266,7 +266,7 @@ glabel L808C1E60 /* 00EB0 808C2040 44053000 */ mfc1 $a1, $f6 /* 00EB4 808C2044 E7B20010 */ swc1 $f18, 0x0010($sp) /* 00EB8 808C2048 44078000 */ mfc1 $a3, $f16 -/* 00EBC 808C204C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00EBC 808C204C 0C01E0C4 */ jal Math_SmoothStepToF /* 00EC0 808C2050 00000000 */ nop /* 00EC4 808C2054 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -275,7 +275,7 @@ glabel L808C1E60 /* 00ED0 808C2060 26040204 */ addiu $a0, $s0, 0x0204 ## $a0 = 00000204 /* 00ED4 808C2064 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 00ED8 808C2068 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00EDC 808C206C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00EDC 808C206C 0C01E0C4 */ jal Math_SmoothStepToF /* 00EE0 808C2070 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00EE4 808C2074 1000000C */ beq $zero, $zero, .L808C20A8 @@ -379,7 +379,7 @@ glabel L808C2190 /* 0104C 808C21DC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01050 808C21E0 E7A40010 */ swc1 $f4, 0x0010($sp) /* 01054 808C21E4 44059000 */ mfc1 $a1, $f18 -/* 01058 808C21E8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01058 808C21E8 0C01E0C4 */ jal Math_SmoothStepToF /* 0105C 808C21EC 00000000 */ nop /* 01060 808C21F0 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 @@ -397,7 +397,7 @@ glabel L808C2190 /* 01090 808C2220 44055000 */ mfc1 $a1, $f10 /* 01094 808C2224 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01098 808C2228 44072000 */ mfc1 $a3, $f4 -/* 0109C 808C222C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0109C 808C222C 0C01E0C4 */ jal Math_SmoothStepToF /* 010A0 808C2230 00000000 */ nop /* 010A4 808C2234 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -415,7 +415,7 @@ glabel L808C2190 /* 010D4 808C2264 44058000 */ mfc1 $a1, $f16 /* 010D8 808C2268 E7A80010 */ swc1 $f8, 0x0010($sp) /* 010DC 808C226C 44073000 */ mfc1 $a3, $f6 -/* 010E0 808C2270 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 010E0 808C2270 0C01E0C4 */ jal Math_SmoothStepToF /* 010E4 808C2274 00000000 */ nop /* 010E8 808C2278 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -429,7 +429,7 @@ glabel L808C2190 /* 01108 808C2298 26040430 */ addiu $a0, $s0, 0x0430 ## $a0 = 00000430 /* 0110C 808C229C E7A40010 */ swc1 $f4, 0x0010($sp) /* 01110 808C22A0 44079000 */ mfc1 $a3, $f18 -/* 01114 808C22A4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01114 808C22A4 0C01E0C4 */ jal Math_SmoothStepToF /* 01118 808C22A8 00000000 */ nop /* 0111C 808C22AC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -447,7 +447,7 @@ glabel L808C2190 /* 0114C 808C22DC 44055000 */ mfc1 $a1, $f10 /* 01150 808C22E0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01154 808C22E4 44072000 */ mfc1 $a3, $f4 -/* 01158 808C22E8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01158 808C22E8 0C01E0C4 */ jal Math_SmoothStepToF /* 0115C 808C22EC 00000000 */ nop /* 01160 808C22F0 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 @@ -456,7 +456,7 @@ glabel L808C2190 /* 0116C 808C22FC 26040204 */ addiu $a0, $s0, 0x0204 ## $a0 = 00000204 /* 01170 808C2300 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 01174 808C2304 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01178 808C2308 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01178 808C2308 0C01E0C4 */ jal Math_SmoothStepToF /* 0117C 808C230C E7A80010 */ swc1 $f8, 0x0010($sp) /* 01180 808C2310 8FA8006C */ lw $t0, 0x006C($sp) @@ -506,7 +506,7 @@ glabel L808C23A8 /* 01224 808C23B4 44050000 */ mfc1 $a1, $f0 /* 01228 808C23B8 2604020C */ addiu $a0, $s0, 0x020C ## $a0 = 0000020C /* 0122C 808C23BC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01230 808C23C0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01230 808C23C0 0C01E0C4 */ jal Math_SmoothStepToF /* 01234 808C23C4 E7A00010 */ swc1 $f0, 0x0010($sp) /* 01238 808C23C8 3C0D8016 */ lui $t5, %hi(gSaveContext+0xee2) @@ -538,7 +538,7 @@ glabel L808C23A8 /* 01298 808C2428 AFA40038 */ sw $a0, 0x0038($sp) /* 0129C 808C242C 44053000 */ mfc1 $a1, $f6 /* 012A0 808C2430 44078000 */ mfc1 $a3, $f16 -/* 012A4 808C2434 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 012A4 808C2434 0C01E0C4 */ jal Math_SmoothStepToF /* 012A8 808C2438 E7B20010 */ swc1 $f18, 0x0010($sp) /* 012AC 808C243C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -556,7 +556,7 @@ glabel L808C23A8 /* 012DC 808C246C 2604042C */ addiu $a0, $s0, 0x042C ## $a0 = 0000042C /* 012E0 808C2470 44054000 */ mfc1 $a1, $f8 /* 012E4 808C2474 44079000 */ mfc1 $a3, $f18 -/* 012E8 808C2478 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 012E8 808C2478 0C01E0C4 */ jal Math_SmoothStepToF /* 012EC 808C247C E7A40010 */ swc1 $f4, 0x0010($sp) /* 012F0 808C2480 3C014270 */ lui $at, 0x4270 ## $at = 42700000 @@ -574,7 +574,7 @@ glabel L808C23A8 /* 01320 808C24B0 26040430 */ addiu $a0, $s0, 0x0430 ## $a0 = 00000430 /* 01324 808C24B4 44055000 */ mfc1 $a1, $f10 /* 01328 808C24B8 44072000 */ mfc1 $a3, $f4 -/* 0132C 808C24BC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0132C 808C24BC 0C01E0C4 */ jal Math_SmoothStepToF /* 01330 808C24C0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01334 808C24C4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -589,7 +589,7 @@ glabel L808C23A8 /* 01358 808C24E8 AFA40034 */ sw $a0, 0x0034($sp) /* 0135C 808C24EC E7B20010 */ swc1 $f18, 0x0010($sp) /* 01360 808C24F0 44078000 */ mfc1 $a3, $f16 -/* 01364 808C24F4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01364 808C24F4 0C01E0C4 */ jal Math_SmoothStepToF /* 01368 808C24F8 00000000 */ nop /* 0136C 808C24FC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -603,7 +603,7 @@ glabel L808C23A8 /* 0138C 808C251C 26040438 */ addiu $a0, $s0, 0x0438 ## $a0 = 00000438 /* 01390 808C2520 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 01394 808C2524 44074000 */ mfc1 $a3, $f8 -/* 01398 808C2528 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01398 808C2528 0C01E0C4 */ jal Math_SmoothStepToF /* 0139C 808C252C 00000000 */ nop /* 013A0 808C2530 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -617,7 +617,7 @@ glabel L808C23A8 /* 013C0 808C2550 2604043C */ addiu $a0, $s0, 0x043C ## $a0 = 0000043C /* 013C4 808C2554 E7A60010 */ swc1 $f6, 0x0010($sp) /* 013C8 808C2558 44072000 */ mfc1 $a3, $f4 -/* 013CC 808C255C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 013CC 808C255C 0C01E0C4 */ jal Math_SmoothStepToF /* 013D0 808C2560 00000000 */ nop /* 013D4 808C2564 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -628,7 +628,7 @@ glabel L808C23A8 /* 013E8 808C2578 44061000 */ mfc1 $a2, $f2 /* 013EC 808C257C 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 013F0 808C2580 26040204 */ addiu $a0, $s0, 0x0204 ## $a0 = 00000204 -/* 013F4 808C2584 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 013F4 808C2584 0C01E0C4 */ jal Math_SmoothStepToF /* 013F8 808C2588 E7A80010 */ swc1 $f8, 0x0010($sp) /* 013FC 808C258C 86080196 */ lh $t0, 0x0196($s0) ## 00000196 @@ -644,7 +644,7 @@ glabel L808C23A8 /* 01420 808C25B0 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3D4CCCCD /* 01424 808C25B4 26040208 */ addiu $a0, $s0, 0x0208 ## $a0 = 00000208 /* 01428 808C25B8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0142C 808C25BC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0142C 808C25BC 0C01E0C4 */ jal Math_SmoothStepToF /* 01430 808C25C0 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 01434 808C25C4 86030198 */ lh $v1, 0x0198($s0) ## 00000198 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2BC8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2BC8.s index 649a5ef973..920b9e4201 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2BC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2BC8.s @@ -20,7 +20,7 @@ glabel func_808C2BC8 /* 01A68 808C2BF8 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 01A6C 808C2BFC 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 01A70 808C2C00 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01A74 808C2C04 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01A74 808C2C04 0C01E0C4 */ jal Math_SmoothStepToF /* 01A78 808C2C08 248401F8 */ addiu $a0, $a0, 0x01F8 ## $a0 = 000001F8 /* 01A7C 808C2C0C 8FA40028 */ lw $a0, 0x0028($sp) @@ -31,7 +31,7 @@ glabel func_808C2BC8 /* 01A90 808C2C20 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3D4CCCCD /* 01A94 808C2C24 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01A98 808C2C28 24840208 */ addiu $a0, $a0, 0x0208 ## $a0 = 00000208 -/* 01A9C 808C2C2C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01A9C 808C2C2C 0C01E0C4 */ jal Math_SmoothStepToF /* 01AA0 808C2C30 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01AA4 808C2C34 3C040600 */ lui $a0, %hi(D_06001074) ## $a0 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2C78.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2C78.s index f2b260bb7f..272c7ddbda 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2C78.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2C78.s @@ -27,7 +27,7 @@ glabel func_808C2C78 /* 01B38 808C2CC8 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3D4CCCCD /* 01B3C 808C2CCC 24840208 */ addiu $a0, $a0, 0x0208 ## $a0 = 00000208 /* 01B40 808C2CD0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01B44 808C2CD4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01B44 808C2CD4 0C01E0C4 */ jal Math_SmoothStepToF /* 01B48 808C2CD8 E7A40010 */ swc1 $f4, 0x0010($sp) /* 01B4C 808C2CDC 2624014C */ addiu $a0, $s1, 0x014C ## $a0 = 0000014C @@ -53,15 +53,15 @@ glabel func_808C2C78 /* 01B98 808C2D28 27B30090 */ addiu $s3, $sp, 0x0090 ## $s3 = FFFFFFF0 /* 01B9C 808C2D2C 27B20078 */ addiu $s2, $sp, 0x0078 ## $s2 = FFFFFFD8 .L808C2D30: -/* 01BA0 808C2D30 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01BA0 808C2D30 0C00CFC8 */ jal Rand_CenteredFloat /* 01BA4 808C2D34 4600A306 */ mov.s $f12, $f20 /* 01BA8 808C2D38 E7A00090 */ swc1 $f0, 0x0090($sp) -/* 01BAC 808C2D3C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01BAC 808C2D3C 0C00CFC8 */ jal Rand_CenteredFloat /* 01BB0 808C2D40 4600A306 */ mov.s $f12, $f20 /* 01BB4 808C2D44 E7A00094 */ swc1 $f0, 0x0094($sp) -/* 01BB8 808C2D48 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01BB8 808C2D48 0C00CFC8 */ jal Rand_CenteredFloat /* 01BBC 808C2D4C 4600A306 */ mov.s $f12, $f20 /* 01BC0 808C2D50 C7A60090 */ lwc1 $f6, 0x0090($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2ECC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2ECC.s index e3858855d1..cae043c9ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2ECC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2ECC.s @@ -19,7 +19,7 @@ glabel func_808C2ECC /* 01D6C 808C2EFC 34A56666 */ ori $a1, $a1, 0x6666 ## $a1 = 3FA66666 /* 01D70 808C2F00 248401F8 */ addiu $a0, $a0, 0x01F8 ## $a0 = 000001F8 /* 01D74 808C2F04 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01D78 808C2F08 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01D78 808C2F08 0C01E0C4 */ jal Math_SmoothStepToF /* 01D7C 808C2F0C E7A40010 */ swc1 $f4, 0x0010($sp) /* 01D80 808C2F10 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2FAC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2FAC.s index 0af4827b5b..bc038343d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2FAC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2FAC.s @@ -21,7 +21,7 @@ glabel func_808C2FAC /* 01E50 808C2FE0 260401F8 */ addiu $a0, $s0, 0x01F8 ## $a0 = 000001F8 /* 01E54 808C2FE4 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 01E58 808C2FE8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 01E5C 808C2FEC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01E5C 808C2FEC 0C01E0C4 */ jal Math_SmoothStepToF /* 01E60 808C2FF0 E7A40010 */ swc1 $f4, 0x0010($sp) /* 01E64 808C2FF4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 @@ -31,7 +31,7 @@ glabel func_808C2FAC /* 01E74 808C3004 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3D4CCCCD /* 01E78 808C3008 26040208 */ addiu $a0, $s0, 0x0208 ## $a0 = 00000208 /* 01E7C 808C300C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01E80 808C3010 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01E80 808C3010 0C01E0C4 */ jal Math_SmoothStepToF /* 01E84 808C3014 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01E88 808C3018 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C30F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C30F4.s index ce13af26c7..3bee0db96a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C30F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C30F4.s @@ -67,7 +67,7 @@ glabel func_808C30F4 /* 02058 808C31E8 44050000 */ mfc1 $a1, $f0 /* 0205C 808C31EC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02060 808C31F0 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 -/* 02064 808C31F4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02064 808C31F4 0C01E0C4 */ jal Math_SmoothStepToF /* 02068 808C31F8 E7A00010 */ swc1 $f0, 0x0010($sp) /* 0206C 808C31FC 860F01DA */ lh $t7, 0x01DA($s0) ## 000001DA diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3224.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3224.s index 7948315434..51480d701c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3224.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3224.s @@ -20,7 +20,7 @@ glabel func_808C3224 /* 020D4 808C3264 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3D4CCCCD /* 020D8 808C3268 26040208 */ addiu $a0, $s0, 0x0208 ## $a0 = 00000208 /* 020DC 808C326C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 020E0 808C3270 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 020E0 808C3270 0C01E0C4 */ jal Math_SmoothStepToF /* 020E4 808C3274 E7A40010 */ swc1 $f4, 0x0010($sp) /* 020E8 808C3278 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s index 8bae68cb24..c63f0bd57e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s @@ -133,7 +133,7 @@ glabel func_808C32F4 /* 02328 808C34B8 E60001EC */ swc1 $f0, 0x01EC($s0) ## 000001EC /* 0232C 808C34BC 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 /* 02330 808C34C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02334 808C34C4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02334 808C34C4 0C01E0C4 */ jal Math_SmoothStepToF /* 02338 808C34C8 E7A80010 */ swc1 $f8, 0x0010($sp) /* 0233C 808C34CC 8FAA004C */ lw $t2, 0x004C($sp) @@ -143,7 +143,7 @@ glabel func_808C32F4 /* 0234C 808C34DC 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 02350 808C34E0 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 02354 808C34E4 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 02358 808C34E8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02358 808C34E8 0C01E0C4 */ jal Math_SmoothStepToF /* 0235C 808C34EC E7AA0010 */ swc1 $f10, 0x0010($sp) /* 02360 808C34F0 8FAB004C */ lw $t3, 0x004C($sp) @@ -153,7 +153,7 @@ glabel func_808C32F4 /* 02370 808C3500 8D650008 */ lw $a1, 0x0008($t3) ## 00000008 /* 02374 808C3504 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 02378 808C3508 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 0237C 808C350C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0237C 808C350C 0C01E0C4 */ jal Math_SmoothStepToF /* 02380 808C3510 E7B00010 */ swc1 $f16, 0x0010($sp) /* 02384 808C3514 8FA2004C */ lw $v0, 0x004C($sp) @@ -175,11 +175,11 @@ glabel func_808C32F4 /* 023C4 808C3554 E7A80010 */ swc1 $f8, 0x0010($sp) /* 023C8 808C3558 46049182 */ mul.s $f6, $f18, $f4 /* 023CC 808C355C 44073000 */ mfc1 $a3, $f6 -/* 023D0 808C3560 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 023D0 808C3560 0C01E0C4 */ jal Math_SmoothStepToF /* 023D4 808C3564 00000000 */ nop /* 023D8 808C3568 C7AC0048 */ lwc1 $f12, 0x0048($sp) -/* 023DC 808C356C 0C03F494 */ jal Math_atan2f +/* 023DC 808C356C 0C03F494 */ jal Math_FAtan2F /* 023E0 808C3570 C7AE0044 */ lwc1 $f14, 0x0044($sp) /* 023E4 808C3574 3C01808D */ lui $at, %hi(D_808CA6C8) ## $at = 808D0000 /* 023E8 808C3578 C42AA6C8 */ lwc1 $f10, %lo(D_808CA6C8)($at) @@ -198,14 +198,14 @@ glabel func_808C32F4 /* 0241C 808C35AC 00052C00 */ sll $a1, $a1, 16 /* 02420 808C35B0 00052C03 */ sra $a1, $a1, 16 /* 02424 808C35B4 00073C00 */ sll $a3, $a3, 16 -/* 02428 808C35B8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 02428 808C35B8 0C01E1A7 */ jal Math_SmoothStepToS /* 0242C 808C35BC 00073C03 */ sra $a3, $a3, 16 /* 02430 808C35C0 260401C4 */ addiu $a0, $s0, 0x01C4 ## $a0 = 000001C4 /* 02434 808C35C4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02438 808C35C8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 0243C 808C35CC 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 02440 808C35D0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 02440 808C35D0 0C01E1A7 */ jal Math_SmoothStepToS /* 02444 808C35D4 AFA00010 */ sw $zero, 0x0010($sp) /* 02448 808C35D8 C7A00048 */ lwc1 $f0, 0x0048($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3704.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3704.s index b872791246..6acd1b9e7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3704.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3704.s @@ -65,7 +65,7 @@ glabel func_808C3704 /* 02638 808C37C8 E7A40010 */ swc1 $f4, 0x0010($sp) /* 0263C 808C37CC 44055000 */ mfc1 $a1, $f10 /* 02640 808C37D0 44079000 */ mfc1 $a3, $f18 -/* 02644 808C37D4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02644 808C37D4 0C01E0C4 */ jal Math_SmoothStepToF /* 02648 808C37D8 00000000 */ nop /* 0264C 808C37DC 8FAA005C */ lw $t2, 0x005C($sp) @@ -75,7 +75,7 @@ glabel func_808C3704 /* 0265C 808C37EC 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 02660 808C37F0 AFA40040 */ sw $a0, 0x0040($sp) /* 02664 808C37F4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02668 808C37F8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02668 808C37F8 0C01E0C4 */ jal Math_SmoothStepToF /* 0266C 808C37FC E7A60010 */ swc1 $f6, 0x0010($sp) /* 02670 808C3800 8FAB005C */ lw $t3, 0x005C($sp) @@ -84,7 +84,7 @@ glabel func_808C3704 /* 0267C 808C380C 8D650008 */ lw $a1, 0x0008($t3) ## 00000008 /* 02680 808C3810 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 02684 808C3814 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02688 808C3818 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02688 808C3818 0C01E0C4 */ jal Math_SmoothStepToF /* 0268C 808C381C E7A80010 */ swc1 $f8, 0x0010($sp) /* 02690 808C3820 860C01C4 */ lh $t4, 0x01C4($s0) ## 000001C4 @@ -148,11 +148,11 @@ glabel func_808C3704 /* 0276C 808C38FC E7A80010 */ swc1 $f8, 0x0010($sp) /* 02770 808C3900 46049182 */ mul.s $f6, $f18, $f4 /* 02774 808C3904 44073000 */ mfc1 $a3, $f6 -/* 02778 808C3908 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02778 808C3908 0C01E0C4 */ jal Math_SmoothStepToF /* 0277C 808C390C 00000000 */ nop /* 02780 808C3910 C7AC004C */ lwc1 $f12, 0x004C($sp) -/* 02784 808C3914 0C03F494 */ jal Math_atan2f +/* 02784 808C3914 0C03F494 */ jal Math_FAtan2F /* 02788 808C3918 C7AE0048 */ lwc1 $f14, 0x0048($sp) /* 0278C 808C391C 3C01808D */ lui $at, %hi(D_808CA6D0) ## $at = 808D0000 /* 02790 808C3920 C42AA6D0 */ lwc1 $f10, %lo(D_808CA6D0)($at) @@ -170,7 +170,7 @@ glabel func_808C3704 /* 027C0 808C3950 00052C00 */ sll $a1, $a1, 16 /* 027C4 808C3954 00052C03 */ sra $a1, $a1, 16 /* 027C8 808C3958 00073C00 */ sll $a3, $a3, 16 -/* 027CC 808C395C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 027CC 808C395C 0C01E1A7 */ jal Math_SmoothStepToS /* 027D0 808C3960 00073C03 */ sra $a3, $a3, 16 /* 027D4 808C3964 C7A0004C */ lwc1 $f0, 0x004C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4F6C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4F6C.s index c133f8790d..f773db20df 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4F6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4F6C.s @@ -15,14 +15,14 @@ glabel func_808C4F6C /* 03E10 808C4FA0 84840032 */ lh $a0, 0x0032($a0) ## 00000032 /* 03E14 808C4FA4 00042023 */ subu $a0, $zero, $a0 /* 03E18 808C4FA8 00042400 */ sll $a0, $a0, 16 -/* 03E1C 808C4FAC 0C01DE0D */ jal Math_Coss +/* 03E1C 808C4FAC 0C01DE0D */ jal Math_CosS ## coss? /* 03E20 808C4FB0 00042403 */ sra $a0, $a0, 16 /* 03E24 808C4FB4 E7A00020 */ swc1 $f0, 0x0020($sp) /* 03E28 808C4FB8 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 03E2C 808C4FBC 00042023 */ subu $a0, $zero, $a0 /* 03E30 808C4FC0 00042400 */ sll $a0, $a0, 16 -/* 03E34 808C4FC4 0C01DE1C */ jal Math_Sins +/* 03E34 808C4FC4 0C01DE1C */ jal Math_SinS ## sins? /* 03E38 808C4FC8 00042403 */ sra $a0, $a0, 16 /* 03E3C 808C4FCC C7A40020 */ lwc1 $f4, 0x0020($sp) @@ -36,14 +36,14 @@ glabel func_808C4F6C /* 03E5C 808C4FEC 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 03E60 808C4FF0 00042023 */ subu $a0, $zero, $a0 /* 03E64 808C4FF4 00042400 */ sll $a0, $a0, 16 -/* 03E68 808C4FF8 0C01DE1C */ jal Math_Sins +/* 03E68 808C4FF8 0C01DE1C */ jal Math_SinS ## sins? /* 03E6C 808C4FFC 00042403 */ sra $a0, $a0, 16 /* 03E70 808C5000 E7A00020 */ swc1 $f0, 0x0020($sp) /* 03E74 808C5004 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 03E78 808C5008 00042023 */ subu $a0, $zero, $a0 /* 03E7C 808C500C 00042400 */ sll $a0, $a0, 16 -/* 03E80 808C5010 0C01DE0D */ jal Math_Coss +/* 03E80 808C5010 0C01DE0D */ jal Math_CosS ## coss? /* 03E84 808C5014 00042403 */ sra $a0, $a0, 16 /* 03E88 808C5018 C7A40020 */ lwc1 $f4, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C50A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C50A8.s index bf59d94107..dec5876e26 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C50A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C50A8.s @@ -16,7 +16,7 @@ glabel func_808C50A8 /* 03F50 808C50E0 848E0032 */ lh $t6, 0x0032($a0) ## 00000032 /* 03F54 808C50E4 01EE2023 */ subu $a0, $t7, $t6 /* 03F58 808C50E8 00042400 */ sll $a0, $a0, 16 -/* 03F5C 808C50EC 0C01DE0D */ jal Math_Coss +/* 03F5C 808C50EC 0C01DE0D */ jal Math_CosS ## coss? /* 03F60 808C50F0 00042403 */ sra $a0, $a0, 16 /* 03F64 808C50F4 E7A00020 */ swc1 $f0, 0x0020($sp) @@ -24,7 +24,7 @@ glabel func_808C50A8 /* 03F6C 808C50FC 24198000 */ addiu $t9, $zero, 0x8000 ## $t9 = FFFF8000 /* 03F70 808C5100 03382023 */ subu $a0, $t9, $t8 /* 03F74 808C5104 00042400 */ sll $a0, $a0, 16 -/* 03F78 808C5108 0C01DE1C */ jal Math_Sins +/* 03F78 808C5108 0C01DE1C */ jal Math_SinS ## sins? /* 03F7C 808C510C 00042403 */ sra $a0, $a0, 16 /* 03F80 808C5110 C7A40020 */ lwc1 $f4, 0x0020($sp) @@ -39,7 +39,7 @@ glabel func_808C50A8 /* 03FA4 808C5134 86080032 */ lh $t0, 0x0032($s0) ## 00000032 /* 03FA8 808C5138 01282023 */ subu $a0, $t1, $t0 /* 03FAC 808C513C 00042400 */ sll $a0, $a0, 16 -/* 03FB0 808C5140 0C01DE1C */ jal Math_Sins +/* 03FB0 808C5140 0C01DE1C */ jal Math_SinS ## sins? /* 03FB4 808C5144 00042403 */ sra $a0, $a0, 16 /* 03FB8 808C5148 E7A00020 */ swc1 $f0, 0x0020($sp) @@ -47,7 +47,7 @@ glabel func_808C50A8 /* 03FC0 808C5150 240B8000 */ addiu $t3, $zero, 0x8000 ## $t3 = FFFF8000 /* 03FC4 808C5154 016A2023 */ subu $a0, $t3, $t2 /* 03FC8 808C5158 00042400 */ sll $a0, $a0, 16 -/* 03FCC 808C515C 0C01DE0D */ jal Math_Coss +/* 03FCC 808C515C 0C01DE0D */ jal Math_CosS ## coss? /* 03FD0 808C5160 00042403 */ sra $a0, $a0, 16 /* 03FD4 808C5164 C7A40020 */ lwc1 $f4, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s index 604d8db159..db19034e9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s @@ -154,7 +154,7 @@ glabel L808C5670 /* 044E0 808C5670 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 044E4 808C5674 2484EC78 */ addiu $a0, $a0, 0xEC78 ## $a0 = FFFFEC78 /* 044E8 808C5678 00042400 */ sll $a0, $a0, 16 -/* 044EC 808C567C 0C01DE1C */ jal Math_Sins +/* 044EC 808C567C 0C01DE1C */ jal Math_SinS ## sins? /* 044F0 808C5680 00042403 */ sra $a0, $a0, 16 /* 044F4 808C5684 3C014316 */ lui $at, 0x4316 ## $at = 43160000 @@ -164,7 +164,7 @@ glabel L808C5670 /* 04504 808C5694 2484EC78 */ addiu $a0, $a0, 0xEC78 ## $a0 = FFFFEC78 /* 04508 808C5698 00042400 */ sll $a0, $a0, 16 /* 0450C 808C569C 00042403 */ sra $a0, $a0, 16 -/* 04510 808C56A0 0C01DE0D */ jal Math_Coss +/* 04510 808C56A0 0C01DE0D */ jal Math_CosS ## coss? /* 04514 808C56A4 E7AC0180 */ swc1 $f12, 0x0180($sp) /* 04518 808C56A8 3C014316 */ lui $at, 0x4316 ## $at = 43160000 @@ -180,7 +180,7 @@ glabel L808C5670 /* 04540 808C56D0 44059000 */ mfc1 $a1, $f18 /* 04544 808C56D4 E7AE017C */ swc1 $f14, 0x017C($sp) /* 04548 808C56D8 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 -/* 0454C 808C56DC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0454C 808C56DC 0C01E0C4 */ jal Math_SmoothStepToF /* 04550 808C56E0 E7A40010 */ swc1 $f4, 0x0010($sp) /* 04554 808C56E4 C7AE017C */ lwc1 $f14, 0x017C($sp) @@ -192,7 +192,7 @@ glabel L808C5670 /* 0456C 808C56FC 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 04570 808C5700 2484002C */ addiu $a0, $a0, 0x002C ## $a0 = 0000002C /* 04574 808C5704 44054000 */ mfc1 $a1, $f8 -/* 04578 808C5708 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04578 808C5708 0C01E0C4 */ jal Math_SmoothStepToF /* 0457C 808C570C E7AA0010 */ swc1 $f10, 0x0010($sp) /* 04580 808C5710 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 @@ -202,17 +202,17 @@ glabel L808C5670 /* 04590 808C5720 34A55C29 */ ori $a1, $a1, 0x5C29 ## $a1 = 3D8F5C29 /* 04594 808C5724 26040208 */ addiu $a0, $s0, 0x0208 ## $a0 = 00000208 /* 04598 808C5728 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0459C 808C572C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0459C 808C572C 0C01E0C4 */ jal Math_SmoothStepToF /* 045A0 808C5730 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 045A4 808C5734 0C01DE1C */ jal Math_Sins +/* 045A4 808C5734 0C01DE1C */ jal Math_SinS ## sins? /* 045A8 808C5738 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 045AC 808C573C 3C014366 */ lui $at, 0x4366 ## $at = 43660000 /* 045B0 808C5740 44812000 */ mtc1 $at, $f4 ## $f4 = 230.00 /* 045B4 808C5744 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 045B8 808C5748 46040302 */ mul.s $f12, $f0, $f4 -/* 045BC 808C574C 0C01DE0D */ jal Math_Coss +/* 045BC 808C574C 0C01DE0D */ jal Math_CosS ## coss? /* 045C0 808C5750 E7AC0180 */ swc1 $f12, 0x0180($sp) /* 045C4 808C5754 3C014366 */ lui $at, 0x4366 ## $at = 43660000 @@ -229,7 +229,7 @@ glabel L808C5670 /* 045F0 808C5780 E7AE017C */ swc1 $f14, 0x017C($sp) /* 045F4 808C5784 26040428 */ addiu $a0, $s0, 0x0428 ## $a0 = 00000428 /* 045F8 808C5788 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 045FC 808C578C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 045FC 808C578C 0C01E0C4 */ jal Math_SmoothStepToF /* 04600 808C5790 E7B20010 */ swc1 $f18, 0x0010($sp) /* 04604 808C5794 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -243,7 +243,7 @@ glabel L808C5670 /* 04624 808C57B4 2604042C */ addiu $a0, $s0, 0x042C ## $a0 = 0000042C /* 04628 808C57B8 44054000 */ mfc1 $a1, $f8 /* 0462C 808C57BC 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 04630 808C57C0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04630 808C57C0 0C01E0C4 */ jal Math_SmoothStepToF /* 04634 808C57C4 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 04638 808C57C8 C7AE017C */ lwc1 $f14, 0x017C($sp) @@ -256,7 +256,7 @@ glabel L808C5670 /* 04654 808C57E4 26040430 */ addiu $a0, $s0, 0x0430 ## $a0 = 00000430 /* 04658 808C57E8 44052000 */ mfc1 $a1, $f4 /* 0465C 808C57EC 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 04660 808C57F0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04660 808C57F0 0C01E0C4 */ jal Math_SmoothStepToF /* 04664 808C57F4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 04668 808C57F8 3C01808D */ lui $at, %hi(D_808CA778) ## $at = 808D0000 @@ -266,7 +266,7 @@ glabel L808C5670 /* 04678 808C5808 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 0467C 808C580C 26040434 */ addiu $a0, $s0, 0x0434 ## $a0 = 00000434 /* 04680 808C5810 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 04684 808C5814 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04684 808C5814 0C01E0C4 */ jal Math_SmoothStepToF /* 04688 808C5818 E7A80010 */ swc1 $f8, 0x0010($sp) /* 0468C 808C581C 3C01428C */ lui $at, 0x428C ## $at = 428C0000 @@ -280,7 +280,7 @@ glabel L808C5670 /* 046AC 808C583C 26040438 */ addiu $a0, $s0, 0x0438 ## $a0 = 00000438 /* 046B0 808C5840 44052000 */ mfc1 $a1, $f4 /* 046B4 808C5844 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 046B8 808C5848 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 046B8 808C5848 0C01E0C4 */ jal Math_SmoothStepToF /* 046BC 808C584C E7A60010 */ swc1 $f6, 0x0010($sp) /* 046C0 808C5850 3C01808D */ lui $at, %hi(D_808CA780) ## $at = 808D0000 @@ -290,7 +290,7 @@ glabel L808C5670 /* 046D0 808C5860 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 046D4 808C5864 2604043C */ addiu $a0, $s0, 0x043C ## $a0 = 0000043C /* 046D8 808C5868 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 046DC 808C586C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 046DC 808C586C 0C01E0C4 */ jal Math_SmoothStepToF /* 046E0 808C5870 E7A80010 */ swc1 $f8, 0x0010($sp) /* 046E4 808C5874 3C040600 */ lui $a0, %hi(D_06002D0C) ## $a0 = 06000000 @@ -353,7 +353,7 @@ glabel L808C5934 /* 047B4 808C5944 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 047B8 808C5948 26040434 */ addiu $a0, $s0, 0x0434 ## $a0 = 00000434 /* 047BC 808C594C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 047C0 808C5950 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 047C0 808C5950 0C01E0C4 */ jal Math_SmoothStepToF /* 047C4 808C5954 E7B20010 */ swc1 $f18, 0x0010($sp) /* 047C8 808C5958 3C01428C */ lui $at, 0x428C ## $at = 428C0000 @@ -370,7 +370,7 @@ glabel L808C5934 /* 047F4 808C5984 26040438 */ addiu $a0, $s0, 0x0438 ## $a0 = 00000438 /* 047F8 808C5988 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 047FC 808C598C 44059000 */ mfc1 $a1, $f18 -/* 04800 808C5990 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04800 808C5990 0C01E0C4 */ jal Math_SmoothStepToF /* 04804 808C5994 E7A40010 */ swc1 $f4, 0x0010($sp) /* 04808 808C5998 3C01808D */ lui $at, %hi(D_808CA794) ## $at = 808D0000 @@ -380,7 +380,7 @@ glabel L808C5934 /* 04818 808C59A8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 0481C 808C59AC 2604043C */ addiu $a0, $s0, 0x043C ## $a0 = 0000043C /* 04820 808C59B0 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 04824 808C59B4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04824 808C59B4 0C01E0C4 */ jal Math_SmoothStepToF /* 04828 808C59B8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0482C 808C59BC 3C040600 */ lui $a0, %hi(D_06003CF8) ## $a0 = 06000000 @@ -431,7 +431,7 @@ glabel L808C5A4C /* 048D4 808C5A64 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 048D8 808C5A68 26040434 */ addiu $a0, $s0, 0x0434 ## $a0 = 00000434 /* 048DC 808C5A6C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 048E0 808C5A70 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 048E0 808C5A70 0C01E0C4 */ jal Math_SmoothStepToF /* 048E4 808C5A74 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 048E8 808C5A78 3C01428C */ lui $at, 0x428C ## $at = 428C0000 @@ -448,7 +448,7 @@ glabel L808C5A4C /* 04914 808C5AA4 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 04918 808C5AA8 E7B20010 */ swc1 $f18, 0x0010($sp) /* 0491C 808C5AAC 44055000 */ mfc1 $a1, $f10 -/* 04920 808C5AB0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04920 808C5AB0 0C01E0C4 */ jal Math_SmoothStepToF /* 04924 808C5AB4 00000000 */ nop /* 04928 808C5AB8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -457,7 +457,7 @@ glabel L808C5A4C /* 04934 808C5AC4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 04938 808C5AC8 2604043C */ addiu $a0, $s0, 0x043C ## $a0 = 0000043C /* 0493C 808C5ACC 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 04940 808C5AD0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04940 808C5AD0 0C01E0C4 */ jal Math_SmoothStepToF /* 04944 808C5AD4 E7A40010 */ swc1 $f4, 0x0010($sp) /* 04948 808C5AD8 3C01808D */ lui $at, %hi(D_808CA79C) ## $at = 808D0000 @@ -472,7 +472,7 @@ glabel L808C5A4C /* 0496C 808C5AFC 26040428 */ addiu $a0, $s0, 0x0428 ## $a0 = 00000428 /* 04970 808C5B00 E7A20010 */ swc1 $f2, 0x0010($sp) /* 04974 808C5B04 44075000 */ mfc1 $a3, $f10 -/* 04978 808C5B08 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04978 808C5B08 0C01E0C4 */ jal Math_SmoothStepToF /* 0497C 808C5B0C 00000000 */ nop /* 04980 808C5B10 3C01808D */ lui $at, %hi(D_808CA7A0) ## $at = 808D0000 @@ -487,7 +487,7 @@ glabel L808C5A4C /* 049A4 808C5B34 26040430 */ addiu $a0, $s0, 0x0430 ## $a0 = 00000430 /* 049A8 808C5B38 E7A20010 */ swc1 $f2, 0x0010($sp) /* 049AC 808C5B3C 44073000 */ mfc1 $a3, $f6 -/* 049B0 808C5B40 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 049B0 808C5B40 0C01E0C4 */ jal Math_SmoothStepToF /* 049B4 808C5B44 00000000 */ nop /* 049B8 808C5B48 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -498,7 +498,7 @@ glabel L808C5A4C /* 049CC 808C5B5C 44061000 */ mfc1 $a2, $f2 /* 049D0 808C5B60 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 049D4 808C5B64 26040204 */ addiu $a0, $s0, 0x0204 ## $a0 = 00000204 -/* 049D8 808C5B68 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 049D8 808C5B68 0C01E0C4 */ jal Math_SmoothStepToF /* 049DC 808C5B6C E7A80010 */ swc1 $f8, 0x0010($sp) /* 049E0 808C5B70 861801DA */ lh $t8, 0x01DA($s0) ## 000001DA @@ -552,7 +552,7 @@ glabel L808C5A4C /* 04A94 808C5C24 E60001EC */ swc1 $f0, 0x01EC($s0) ## 000001EC /* 04A98 808C5C28 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 /* 04A9C 808C5C2C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04AA0 808C5C30 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04AA0 808C5C30 0C01E0C4 */ jal Math_SmoothStepToF /* 04AA4 808C5C34 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 04AA8 808C5C38 8FA2019C */ lw $v0, 0x019C($sp) @@ -597,7 +597,7 @@ glabel L808C5A4C /* 04B38 808C5CC8 00812021 */ addu $a0, $a0, $at /* 04B3C 808C5CCC 000420C0 */ sll $a0, $a0, 3 /* 04B40 808C5CD0 00042400 */ sll $a0, $a0, 16 -/* 04B44 808C5CD4 0C01DE1C */ jal Math_Sins +/* 04B44 808C5CD4 0C01DE1C */ jal Math_SinS ## sins? /* 04B48 808C5CD8 00042403 */ sra $a0, $a0, 16 /* 04B4C 808C5CDC 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 @@ -615,7 +615,7 @@ glabel L808C5A4C /* 04B7C 808C5D0C 000420C0 */ sll $a0, $a0, 3 /* 04B80 808C5D10 00042400 */ sll $a0, $a0, 16 /* 04B84 808C5D14 00042403 */ sra $a0, $a0, 16 -/* 04B88 808C5D18 0C01DE1C */ jal Math_Sins +/* 04B88 808C5D18 0C01DE1C */ jal Math_SinS ## sins? /* 04B8C 808C5D1C E608023C */ swc1 $f8, 0x023C($s0) ## 0000023C /* 04B90 808C5D20 C7A20178 */ lwc1 $f2, 0x0178($sp) @@ -649,7 +649,7 @@ glabel L808C5A4C /* 04C00 808C5D90 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04C04 808C5D94 E7A80010 */ swc1 $f8, 0x0010($sp) /* 04C08 808C5D98 44053000 */ mfc1 $a1, $f6 -/* 04C0C 808C5D9C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04C0C 808C5D9C 0C01E0C4 */ jal Math_SmoothStepToF /* 04C10 808C5DA0 00000000 */ nop /* 04C14 808C5DA4 8FB9019C */ lw $t9, 0x019C($sp) @@ -662,7 +662,7 @@ glabel L808C5A4C /* 04C30 808C5DC0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04C34 808C5DC4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 04C38 808C5DC8 44052000 */ mfc1 $a1, $f4 -/* 04C3C 808C5DCC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04C3C 808C5DCC 0C01E0C4 */ jal Math_SmoothStepToF /* 04C40 808C5DD0 00000000 */ nop /* 04C44 808C5DD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -717,11 +717,11 @@ glabel L808C5A4C /* 04CFC 808C5E8C 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 /* 04D00 808C5E90 44079000 */ mfc1 $a3, $f18 /* 04D04 808C5E94 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04D08 808C5E98 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04D08 808C5E98 0C01E0C4 */ jal Math_SmoothStepToF /* 04D0C 808C5E9C E7A40010 */ swc1 $f4, 0x0010($sp) /* 04D10 808C5EA0 C7AC0180 */ lwc1 $f12, 0x0180($sp) -/* 04D14 808C5EA4 0C03F494 */ jal Math_atan2f +/* 04D14 808C5EA4 0C03F494 */ jal Math_FAtan2F /* 04D18 808C5EA8 C7AE017C */ lwc1 $f14, 0x017C($sp) /* 04D1C 808C5EAC 3C01808D */ lui $at, %hi(D_808CA7A8) ## $at = 808D0000 /* 04D20 808C5EB0 C426A7A8 */ lwc1 $f6, %lo(D_808CA7A8)($at) @@ -739,7 +739,7 @@ glabel L808C5A4C /* 04D50 808C5EE0 00052C00 */ sll $a1, $a1, 16 /* 04D54 808C5EE4 00052C03 */ sra $a1, $a1, 16 /* 04D58 808C5EE8 00073C00 */ sll $a3, $a3, 16 -/* 04D5C 808C5EEC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 04D5C 808C5EEC 0C01E1A7 */ jal Math_SmoothStepToS /* 04D60 808C5EF0 00073C03 */ sra $a3, $a3, 16 /* 04D64 808C5EF4 C7AC0180 */ lwc1 $f12, 0x0180($sp) @@ -840,7 +840,7 @@ glabel L808C5FE4 /* 04EC4 808C6054 460E7182 */ mul.s $f6, $f14, $f14 /* 04EC8 808C6058 46062000 */ add.s $f0, $f4, $f6 /* 04ECC 808C605C 46000004 */ sqrt.s $f0, $f0 -/* 04ED0 808C6060 0C03F494 */ jal Math_atan2f +/* 04ED0 808C6060 0C03F494 */ jal Math_FAtan2F /* 04ED4 808C6064 E600022C */ swc1 $f0, 0x022C($s0) ## 0000022C /* 04ED8 808C6068 2419015E */ addiu $t9, $zero, 0x015E ## $t9 = 0000015E /* 04EDC 808C606C 24080009 */ addiu $t0, $zero, 0x0009 ## $t0 = 00000009 @@ -879,7 +879,7 @@ glabel L808C5FE4 /* 04F50 808C60E0 2405C000 */ addiu $a1, $zero, 0xC000 ## $a1 = FFFFC000 /* 04F54 808C60E4 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A /* 04F58 808C60E8 2407012C */ addiu $a3, $zero, 0x012C ## $a3 = 0000012C -/* 04F5C 808C60EC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 04F5C 808C60EC 0C01E1A7 */ jal Math_SmoothStepToS /* 04F60 808C60F0 AFA00010 */ sw $zero, 0x0010($sp) /* 04F64 808C60F4 860301DA */ lh $v1, 0x01DA($s0) ## 000001DA @@ -916,7 +916,7 @@ glabel L808C5FE4 /* 04FC4 808C6154 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04FC8 808C6158 44050000 */ mfc1 $a1, $f0 /* 04FCC 808C615C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 04FD0 808C6160 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04FD0 808C6160 0C01E0C4 */ jal Math_SmoothStepToF /* 04FD4 808C6164 E7A00010 */ swc1 $f0, 0x0010($sp) /* 04FD8 808C6168 860301DA */ lh $v1, 0x01DA($s0) ## 000001DA @@ -991,7 +991,7 @@ glabel L808C5FE4 /* 050D8 808C6268 26040228 */ addiu $a0, $s0, 0x0228 ## $a0 = 00000228 /* 050DC 808C626C 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 050E0 808C6270 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 050E4 808C6274 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 050E4 808C6274 0C01E0C4 */ jal Math_SmoothStepToF /* 050E8 808C6278 E7A00010 */ swc1 $f0, 0x0010($sp) /* 050EC 808C627C 10000008 */ beq $zero, $zero, .L808C62A0 @@ -1002,7 +1002,7 @@ glabel L808C5FE4 /* 050FC 808C628C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 05100 808C6290 34A54000 */ ori $a1, $a1, 0x4000 ## $a1 = C5CE4000 /* 05104 808C6294 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 05108 808C6298 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 05108 808C6298 0C01E0C4 */ jal Math_SmoothStepToF /* 0510C 808C629C E7A00010 */ swc1 $f0, 0x0010($sp) .L808C62A0: @@ -1021,21 +1021,21 @@ glabel L808C5FE4 /* 05140 808C62D0 27AD00DC */ addiu $t5, $sp, 0x00DC ## $t5 = FFFFFF3C /* 05144 808C62D4 44816000 */ mtc1 $at, $f12 ## $f12 = 120.00 /* 05148 808C62D8 ADAC0004 */ sw $t4, 0x0004($t5) ## FFFFFF40 -/* 0514C 808C62DC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0514C 808C62DC 0C00CFC8 */ jal Rand_CenteredFloat /* 05150 808C62E0 ADA90000 */ sw $t1, 0x0000($t5) ## FFFFFF3C /* 05154 808C62E4 C6120038 */ lwc1 $f18, 0x0038($s0) ## 00000038 /* 05158 808C62E8 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 0515C 808C62EC 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 05160 808C62F0 46120100 */ add.s $f4, $f0, $f18 -/* 05164 808C62F4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 05164 808C62F4 0C00CFBE */ jal Rand_ZeroFloat /* 05168 808C62F8 E7A40168 */ swc1 $f4, 0x0168($sp) /* 0516C 808C62FC C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 05170 808C6300 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 05174 808C6304 44816000 */ mtc1 $at, $f12 ## $f12 = 120.00 /* 05178 808C6308 46060200 */ add.s $f8, $f0, $f6 -/* 0517C 808C630C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0517C 808C630C 0C00CFC8 */ jal Rand_CenteredFloat /* 05180 808C6310 E7A8016C */ swc1 $f8, 0x016C($sp) /* 05184 808C6314 C60A0040 */ lwc1 $f10, 0x0040($s0) ## 00000040 @@ -1062,7 +1062,7 @@ glabel L808C5FE4 /* 051D8 808C6368 27A50168 */ addiu $a1, $sp, 0x0168 ## $a1 = FFFFFFC8 /* 051DC 808C636C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 051E0 808C6370 44816000 */ mtc1 $at, $f12 ## $f12 = 120.00 -/* 051E4 808C6374 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 051E4 808C6374 0C00CFC8 */ jal Rand_CenteredFloat /* 051E8 808C6378 00000000 */ nop /* 051EC 808C637C C6040038 */ lwc1 $f4, 0x0038($s0) ## 00000038 @@ -1072,12 +1072,12 @@ glabel L808C5FE4 /* 051FC 808C638C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 05200 808C6390 44816000 */ mtc1 $at, $f12 ## $f12 = 120.00 /* 05204 808C6394 E7A8016C */ swc1 $f8, 0x016C($sp) -/* 05208 808C6398 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 05208 808C6398 0C00CFC8 */ jal Rand_CenteredFloat /* 0520C 808C639C E7A60168 */ swc1 $f6, 0x0168($sp) /* 05210 808C63A0 C60A0040 */ lwc1 $f10, 0x0040($s0) ## 00000040 /* 05214 808C63A4 460A0480 */ add.s $f18, $f0, $f10 -/* 05218 808C63A8 0C03F66B */ jal Math_Rand_ZeroOne +/* 05218 808C63A8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0521C 808C63AC E7B20170 */ swc1 $f18, 0x0170($sp) /* 05220 808C63B0 3C01808D */ lui $at, %hi(D_808CA7B0) ## $at = 808D0000 @@ -1088,7 +1088,7 @@ glabel L808C5FE4 /* 05234 808C63C4 00000000 */ nop /* 05238 808C63C8 00031C00 */ sll $v1, $v1, 16 /* 0523C 808C63CC 00031C03 */ sra $v1, $v1, 16 -/* 05240 808C63D0 0C03F66B */ jal Math_Rand_ZeroOne +/* 05240 808C63D0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 05244 808C63D4 A7A300EE */ sh $v1, 0x00EE($sp) /* 05248 808C63D8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -1148,7 +1148,7 @@ glabel L808C5FE4 /* 05310 808C64A0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 05314 808C64A4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 05318 808C64A8 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 0531C 808C64AC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0531C 808C64AC 0C01E0C4 */ jal Math_SmoothStepToF /* 05320 808C64B0 E7A00010 */ swc1 $f0, 0x0010($sp) /* 05324 808C64B4 C6020238 */ lwc1 $f2, 0x0238($s0) ## 00000238 @@ -1201,7 +1201,7 @@ glabel L808C5FE4 /* 053D8 808C6568 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 053DC 808C656C 44050000 */ mfc1 $a1, $f0 /* 053E0 808C6570 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 -/* 053E4 808C6574 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 053E4 808C6574 0C01E0C4 */ jal Math_SmoothStepToF /* 053E8 808C6578 E7A00010 */ swc1 $f0, 0x0010($sp) .L808C657C: @@ -1212,7 +1212,7 @@ glabel L808C5FE4 /* 053F8 808C6588 44050000 */ mfc1 $a1, $f0 /* 053FC 808C658C 26040234 */ addiu $a0, $s0, 0x0234 ## $a0 = 00000234 /* 05400 808C6590 3C074188 */ lui $a3, 0x4188 ## $a3 = 41880000 -/* 05404 808C6594 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 05404 808C6594 0C01E0C4 */ jal Math_SmoothStepToF /* 05408 808C6598 E7A00010 */ swc1 $f0, 0x0010($sp) /* 0540C 808C659C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 @@ -1222,7 +1222,7 @@ glabel L808C5FE4 /* 0541C 808C65AC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 05420 808C65B0 AFA40048 */ sw $a0, 0x0048($sp) /* 05424 808C65B4 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 05428 808C65B8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 05428 808C65B8 0C01E0C4 */ jal Math_SmoothStepToF /* 0542C 808C65BC E7A60010 */ swc1 $f6, 0x0010($sp) /* 05430 808C65C0 3C01428C */ lui $at, 0x428C ## $at = 428C0000 @@ -1239,7 +1239,7 @@ glabel L808C5FE4 /* 0545C 808C65EC 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 05460 808C65F0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 05464 808C65F4 44053000 */ mfc1 $a1, $f6 -/* 05468 808C65F8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 05468 808C65F8 0C01E0C4 */ jal Math_SmoothStepToF /* 0546C 808C65FC 00000000 */ nop /* 05470 808C6600 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 @@ -1248,7 +1248,7 @@ glabel L808C5FE4 /* 0547C 808C660C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 05480 808C6610 2604043C */ addiu $a0, $s0, 0x043C ## $a0 = 0000043C /* 05484 808C6614 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 05488 808C6618 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 05488 808C6618 0C01E0C4 */ jal Math_SmoothStepToF /* 0548C 808C661C E7AA0010 */ swc1 $f10, 0x0010($sp) /* 05490 808C6620 860A019C */ lh $t2, 0x019C($s0) ## 0000019C @@ -1318,7 +1318,7 @@ glabel L808C5FE4 /* 05580 808C6710 AFA20078 */ sw $v0, 0x0078($sp) /* 05584 808C6714 E7A80010 */ swc1 $f8, 0x0010($sp) /* 05588 808C6718 44073000 */ mfc1 $a3, $f6 -/* 0558C 808C671C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0558C 808C671C 0C01E0C4 */ jal Math_SmoothStepToF /* 05590 808C6720 00000000 */ nop /* 05594 808C6724 8FAD0160 */ lw $t5, 0x0160($sp) @@ -1337,7 +1337,7 @@ glabel L808C5FE4 /* 055C8 808C6758 2604042C */ addiu $a0, $s0, 0x042C ## $a0 = 0000042C /* 055CC 808C675C E7B20010 */ swc1 $f18, 0x0010($sp) /* 055D0 808C6760 44075000 */ mfc1 $a3, $f10 -/* 055D4 808C6764 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 055D4 808C6764 0C01E0C4 */ jal Math_SmoothStepToF /* 055D8 808C6768 00000000 */ nop /* 055DC 808C676C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -1352,7 +1352,7 @@ glabel L808C5FE4 /* 05600 808C6790 26040430 */ addiu $a0, $s0, 0x0430 ## $a0 = 00000430 /* 05604 808C6794 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 05608 808C6798 44074000 */ mfc1 $a3, $f8 -/* 0560C 808C679C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0560C 808C679C 0C01E0C4 */ jal Math_SmoothStepToF /* 05610 808C67A0 00000000 */ nop /* 05614 808C67A4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -1363,7 +1363,7 @@ glabel L808C5FE4 /* 05628 808C67B8 44061000 */ mfc1 $a2, $f2 /* 0562C 808C67BC 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 05630 808C67C0 26040204 */ addiu $a0, $s0, 0x0204 ## $a0 = 00000204 -/* 05634 808C67C4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 05634 808C67C4 0C01E0C4 */ jal Math_SmoothStepToF /* 05638 808C67C8 E7B20010 */ swc1 $f18, 0x0010($sp) /* 0563C 808C67CC 1000008C */ beq $zero, $zero, .L808C6A00 @@ -1390,7 +1390,7 @@ glabel L808C5FE4 /* 05684 808C6814 3C05435C */ lui $a1, 0x435C ## $a1 = 435C0000 /* 05688 808C6818 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 0568C 808C681C 44060000 */ mfc1 $a2, $f0 -/* 05690 808C6820 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 05690 808C6820 0C01E0C4 */ jal Math_SmoothStepToF /* 05694 808C6824 E7A00010 */ swc1 $f0, 0x0010($sp) /* 05698 808C6828 0C0400A4 */ jal sinf @@ -1415,7 +1415,7 @@ glabel L808C5FE4 /* 056DC 808C686C AFA4004C */ sw $a0, 0x004C($sp) /* 056E0 808C6870 E7AE017C */ swc1 $f14, 0x017C($sp) /* 056E4 808C6874 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 056E8 808C6878 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 056E8 808C6878 0C01E0C4 */ jal Math_SmoothStepToF /* 056EC 808C687C E7A60010 */ swc1 $f6, 0x0010($sp) /* 056F0 808C6880 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -1428,7 +1428,7 @@ glabel L808C5FE4 /* 0570C 808C689C 2604042C */ addiu $a0, $s0, 0x042C ## $a0 = 0000042C /* 05710 808C68A0 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 05714 808C68A4 44059000 */ mfc1 $a1, $f18 -/* 05718 808C68A8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 05718 808C68A8 0C01E0C4 */ jal Math_SmoothStepToF /* 0571C 808C68AC E7A40010 */ swc1 $f4, 0x0010($sp) /* 05720 808C68B0 C7AE017C */ lwc1 $f14, 0x017C($sp) @@ -1440,7 +1440,7 @@ glabel L808C5FE4 /* 05738 808C68C8 26040430 */ addiu $a0, $s0, 0x0430 ## $a0 = 00000430 /* 0573C 808C68CC 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 05740 808C68D0 44054000 */ mfc1 $a1, $f8 -/* 05744 808C68D4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 05744 808C68D4 0C01E0C4 */ jal Math_SmoothStepToF /* 05748 808C68D8 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 0574C 808C68DC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 @@ -1450,7 +1450,7 @@ glabel L808C5FE4 /* 0575C 808C68EC 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A /* 05760 808C68F0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 05764 808C68F4 2604023C */ addiu $a0, $s0, 0x023C ## $a0 = 0000023C -/* 05768 808C68F8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 05768 808C68F8 0C01E0C4 */ jal Math_SmoothStepToF /* 0576C 808C68FC E7A20010 */ swc1 $f2, 0x0010($sp) /* 05770 808C6900 1000003F */ beq $zero, $zero, .L808C6A00 @@ -1468,7 +1468,7 @@ glabel L808C5FE4 /* 0579C 808C692C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 057A0 808C6930 2604023C */ addiu $a0, $s0, 0x023C ## $a0 = 0000023C /* 057A4 808C6934 3C05BF00 */ lui $a1, 0xBF00 ## $a1 = BF000000 -/* 057A8 808C6938 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 057A8 808C6938 0C01E0C4 */ jal Math_SmoothStepToF /* 057AC 808C693C E7B20010 */ swc1 $f18, 0x0010($sp) /* 057B0 808C6940 10000007 */ beq $zero, $zero, .L808C6960 @@ -1478,7 +1478,7 @@ glabel L808C5FE4 /* 057BC 808C694C 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 057C0 808C6950 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 057C4 808C6954 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 0000CCCD -/* 057C8 808C6958 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 057C8 808C6958 0C01E0C4 */ jal Math_SmoothStepToF /* 057CC 808C695C E7A40010 */ swc1 $f4, 0x0010($sp) .L808C6960: @@ -1495,7 +1495,7 @@ glabel L808C5FE4 /* 057F8 808C6988 AFA4004C */ sw $a0, 0x004C($sp) /* 057FC 808C698C E7A00010 */ swc1 $f0, 0x0010($sp) /* 05800 808C6990 44075000 */ mfc1 $a3, $f10 -/* 05804 808C6994 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 05804 808C6994 0C01E0C4 */ jal Math_SmoothStepToF /* 05808 808C6998 00000000 */ nop /* 0580C 808C699C 3C01808D */ lui $at, %hi(D_808CA7C4) ## $at = 808D0000 @@ -1510,7 +1510,7 @@ glabel L808C5FE4 /* 05830 808C69C0 26040430 */ addiu $a0, $s0, 0x0430 ## $a0 = 00000430 /* 05834 808C69C4 E7A20010 */ swc1 $f2, 0x0010($sp) /* 05838 808C69C8 44073000 */ mfc1 $a3, $f6 -/* 0583C 808C69CC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0583C 808C69CC 0C01E0C4 */ jal Math_SmoothStepToF /* 05840 808C69D0 00000000 */ nop /* 05844 808C69D4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -1521,7 +1521,7 @@ glabel L808C5FE4 /* 05858 808C69E8 44061000 */ mfc1 $a2, $f2 /* 0585C 808C69EC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 05860 808C69F0 26040204 */ addiu $a0, $s0, 0x0204 ## $a0 = 00000204 -/* 05864 808C69F4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 05864 808C69F4 0C01E0C4 */ jal Math_SmoothStepToF /* 05868 808C69F8 E7A80010 */ swc1 $f8, 0x0010($sp) /* 0586C 808C69FC 860301DA */ lh $v1, 0x01DA($s0) ## 000001DA @@ -1532,11 +1532,11 @@ glabel L808C5FE4 /* 0587C 808C6A0C 0C03E803 */ jal Audio_SetBGM /* 05880 808C6A10 24040021 */ addiu $a0, $zero, 0x0021 ## $a0 = 00000021 -/* 05884 808C6A14 0C01DE1C */ jal Math_Sins +/* 05884 808C6A14 0C01DE1C */ jal Math_SinS ## sins? /* 05888 808C6A18 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 0588C 808C6A1C E7A00050 */ swc1 $f0, 0x0050($sp) -/* 05890 808C6A20 0C01DE0D */ jal Math_Coss +/* 05890 808C6A20 0C01DE0D */ jal Math_CosS ## coss? /* 05894 808C6A24 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 05898 808C6A28 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 @@ -1643,7 +1643,7 @@ glabel L808C5FE4 /* 05A14 808C6BA4 290102C6 */ slti $at, $t0, 0x02C6 /* 05A18 808C6BA8 50200037 */ beql $at, $zero, .L808C6C88 /* 05A1C 808C6BAC 860501B4 */ lh $a1, 0x01B4($s0) ## 000001B4 -/* 05A20 808C6BB0 0C03F66B */ jal Math_Rand_ZeroOne +/* 05A20 808C6BB0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 05A24 808C6BB4 00000000 */ nop /* 05A28 808C6BB8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -1658,12 +1658,12 @@ glabel L808C5FE4 /* 05A4C 808C6BDC 8D29A56C */ lw $t1, %lo(D_808CA56C)($t1) /* 05A50 808C6BE0 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 /* 05A54 808C6BE4 AFB80064 */ sw $t8, 0x0064($sp) -/* 05A58 808C6BE8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 05A58 808C6BE8 0C00CFC8 */ jal Rand_CenteredFloat /* 05A5C 808C6BEC AFA90060 */ sw $t1, 0x0060($sp) /* 05A60 808C6BF0 C6060038 */ lwc1 $f6, 0x0038($s0) ## 00000038 /* 05A64 808C6BF4 46060200 */ add.s $f8, $f0, $f6 -/* 05A68 808C6BF8 0C03F66B */ jal Math_Rand_ZeroOne +/* 05A68 808C6BF8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 05A6C 808C6BFC E7A80068 */ swc1 $f8, 0x0068($sp) /* 05A70 808C6C00 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -1674,12 +1674,12 @@ glabel L808C5FE4 /* 05A84 808C6C14 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 05A88 808C6C18 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 /* 05A8C 808C6C1C 46049180 */ add.s $f6, $f18, $f4 -/* 05A90 808C6C20 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 05A90 808C6C20 0C00CFC8 */ jal Rand_CenteredFloat /* 05A94 808C6C24 E7A6006C */ swc1 $f6, 0x006C($sp) /* 05A98 808C6C28 C6080040 */ lwc1 $f8, 0x0040($s0) ## 00000040 /* 05A9C 808C6C2C 46080280 */ add.s $f10, $f0, $f8 -/* 05AA0 808C6C30 0C03F66B */ jal Math_Rand_ZeroOne +/* 05AA0 808C6C30 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 05AA4 808C6C34 E7AA0070 */ swc1 $f10, 0x0070($sp) /* 05AA8 808C6C38 3C014248 */ lui $at, 0x4248 ## $at = 42480000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Update.s index 55e1def730..6071f7c835 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Update.s @@ -142,7 +142,7 @@ glabel BossFd_Update .L808CEE84: /* 040C4 808CEE84 26640270 */ addiu $a0, $s3, 0x0270 ## $a0 = 00000270 /* 040C8 808CEE88 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 040CC 808CEE8C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 040CC 808CEE8C 0C01E107 */ jal Math_ApproachF /* 040D0 808CEE90 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 /* 040D4 808CEE94 8679021E */ lh $t9, 0x021E($s3) ## 0000021E @@ -166,7 +166,7 @@ glabel BossFd_Update /* 04114 808CEED4 00000000 */ nop /* 04118 808CEED8 44050000 */ mfc1 $a1, $f0 .L808CEEDC: -/* 0411C 808CEEDC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0411C 808CEEDC 0C01E107 */ jal Math_ApproachF /* 04120 808CEEE0 3C074280 */ lui $a3, 0x4280 ## $a3 = 42800000 .L808CEEE4: @@ -207,19 +207,19 @@ glabel BossFd_Update /* 04198 808CEF58 00000000 */ nop .L808CEF5C: /* 0419C 808CEF5C 44050000 */ mfc1 $a1, $f0 -/* 041A0 808CEF60 0C01E107 */ jal Math_SmoothScaleMaxF +/* 041A0 808CEF60 0C01E107 */ jal Math_ApproachF /* 041A4 808CEF64 3C074180 */ lui $a3, 0x4180 ## $a3 = 41800000 /* 041A8 808CEF68 4405B000 */ mfc1 $a1, $f22 /* 041AC 808CEF6C 26640288 */ addiu $a0, $s3, 0x0288 ## $a0 = 00000288 /* 041B0 808CEF70 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 041B4 808CEF74 0C01E107 */ jal Math_SmoothScaleMaxF +/* 041B4 808CEF74 0C01E107 */ jal Math_ApproachF /* 041B8 808CEF78 3C074180 */ lui $a3, 0x4180 ## $a3 = 41800000 /* 041BC 808CEF7C 4405A000 */ mfc1 $a1, $f20 /* 041C0 808CEF80 2664028C */ addiu $a0, $s3, 0x028C ## $a0 = 0000028C /* 041C4 808CEF84 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 041C8 808CEF88 0C01E107 */ jal Math_SmoothScaleMaxF +/* 041C8 808CEF88 0C01E107 */ jal Math_ApproachF /* 041CC 808CEF8C 3C074180 */ lui $a3, 0x4180 ## $a3 = 41800000 /* 041D0 808CEF90 8662023A */ lh $v0, 0x023A($s3) ## 0000023A @@ -232,7 +232,7 @@ glabel BossFd_Update /* 041EC 808CEFAC 17200059 */ bne $t9, $zero, .L808CF114 /* 041F0 808CEFB0 00000000 */ nop /* 041F4 808CEFB4 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 041F8 808CEFB8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 041F8 808CEFB8 0C00CFBE */ jal Rand_ZeroFloat /* 041FC 808CEFBC 00000000 */ nop /* 04200 808CEFC0 4600020D */ trunc.w.s $f8, $f0 @@ -285,25 +285,25 @@ glabel BossFd_Update /* 042B4 808CF074 AD0B0000 */ sw $t3, 0x0000($t0) ## FFFFFFCC /* 042B8 808CF078 8D2B0008 */ lw $t3, 0x0008($t1) ## 808D1A74 /* 042BC 808CF07C AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFD0 -/* 042C0 808CF080 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 042C0 808CF080 0C00CFC8 */ jal Rand_CenteredFloat /* 042C4 808CF084 AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFD4 /* 042C8 808CF088 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 /* 042CC 808CF08C 4600A306 */ mov.s $f12, $f20 /* 042D0 808CF090 460A0400 */ add.s $f16, $f0, $f10 -/* 042D4 808CF094 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 042D4 808CF094 0C00CFC8 */ jal Rand_CenteredFloat /* 042D8 808CF098 E7B00098 */ swc1 $f16, 0x0098($sp) /* 042DC 808CF09C C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 /* 042E0 808CF0A0 4600A306 */ mov.s $f12, $f20 /* 042E4 808CF0A4 46120100 */ add.s $f4, $f0, $f18 -/* 042E8 808CF0A8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 042E8 808CF0A8 0C00CFC8 */ jal Rand_CenteredFloat /* 042EC 808CF0AC E7A4009C */ swc1 $f4, 0x009C($sp) /* 042F0 808CF0B0 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C /* 042F4 808CF0B4 4600B306 */ mov.s $f12, $f22 /* 042F8 808CF0B8 46060200 */ add.s $f8, $f0, $f6 -/* 042FC 808CF0BC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 042FC 808CF0BC 0C00CFBE */ jal Rand_ZeroFloat /* 04300 808CF0C0 E7A800A0 */ swc1 $f8, 0x00A0($sp) /* 04304 808CF0C4 4600028D */ trunc.w.s $f10, $f0 @@ -355,16 +355,16 @@ glabel BossFd_Update /* 043B4 808CF174 3C01808D */ lui $at, %hi(D_808D1F88) ## $at = 808D0000 /* 043B8 808CF178 C4241F88 */ lwc1 $f4, %lo(D_808D1F88)($at) /* 043BC 808CF17C 4600B306 */ mov.s $f12, $f22 -/* 043C0 808CF180 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 043C0 808CF180 0C00CFC8 */ jal Rand_CenteredFloat /* 043C4 808CF184 E7A40084 */ swc1 $f4, 0x0084($sp) /* 043C8 808CF188 E7A00080 */ swc1 $f0, 0x0080($sp) -/* 043CC 808CF18C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 043CC 808CF18C 0C00CFC8 */ jal Rand_CenteredFloat /* 043D0 808CF190 4600B306 */ mov.s $f12, $f22 /* 043D4 808CF194 3C01808D */ lui $at, %hi(D_808D1F8C) ## $at = 808D0000 /* 043D8 808CF198 E7A00088 */ swc1 $f0, 0x0088($sp) -/* 043DC 808CF19C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 043DC 808CF19C 0C00CFBE */ jal Rand_ZeroFloat /* 043E0 808CF1A0 C42C1F8C */ lwc1 $f12, %lo(D_808D1F8C)($at) /* 043E4 808CF1A4 4600018D */ trunc.w.s $f6, $f0 @@ -372,7 +372,7 @@ glabel BossFd_Update /* 043EC 808CF1AC 44103000 */ mfc1 $s0, $f6 /* 043F0 808CF1B0 00000000 */ nop /* 043F4 808CF1B4 00108400 */ sll $s0, $s0, 16 -/* 043F8 808CF1B8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 043F8 808CF1B8 0C00CFC8 */ jal Rand_CenteredFloat /* 043FC 808CF1BC 00108403 */ sra $s0, $s0, 16 /* 04400 808CF1C0 0010C080 */ sll $t8, $s0, 2 @@ -385,7 +385,7 @@ glabel BossFd_Update /* 0441C 808CF1DC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 04420 808CF1E0 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 04424 808CF1E4 46080280 */ add.s $f10, $f0, $f8 -/* 04428 808CF1E8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 04428 808CF1E8 0C00CFBE */ jal Rand_ZeroFloat /* 0442C 808CF1EC E7AA0074 */ swc1 $f10, 0x0074($sp) /* 04430 808CF1F0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -394,14 +394,14 @@ glabel BossFd_Update /* 0443C 808CF1FC 4600A306 */ mov.s $f12, $f20 /* 04440 808CF200 46128100 */ add.s $f4, $f16, $f18 /* 04444 808CF204 46040180 */ add.s $f6, $f0, $f4 -/* 04448 808CF208 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 04448 808CF208 0C00CFC8 */ jal Rand_CenteredFloat /* 0444C 808CF20C E7A60078 */ swc1 $f6, 0x0078($sp) /* 04450 808CF210 C6280008 */ lwc1 $f8, 0x0008($s1) ## FFFFFFE0 /* 04454 808CF214 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 04458 808CF218 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 /* 0445C 808CF21C 46080280 */ add.s $f10, $f0, $f8 -/* 04460 808CF220 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 04460 808CF220 0C00CFBE */ jal Rand_ZeroFloat /* 04464 808CF224 E7AA007C */ swc1 $f10, 0x007C($sp) /* 04468 808CF228 4600040D */ trunc.w.s $f16, $f0 @@ -441,7 +441,7 @@ glabel BossFd_Update /* 044F0 808CF2B0 00000000 */ nop .L808CF2B4: /* 044F4 808CF2B4 3C01808D */ lui $at, %hi(D_808D1F90) ## $at = 808D0000 -/* 044F8 808CF2B8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 044F8 808CF2B8 0C00CFBE */ jal Rand_ZeroFloat /* 044FC 808CF2BC C42C1F90 */ lwc1 $f12, %lo(D_808D1F90)($at) /* 04500 808CF2C0 4600028D */ trunc.w.s $f10, $f0 @@ -449,7 +449,7 @@ glabel BossFd_Update /* 04508 808CF2C8 44105000 */ mfc1 $s0, $f10 /* 0450C 808CF2CC 00000000 */ nop /* 04510 808CF2D0 00108400 */ sll $s0, $s0, 16 -/* 04514 808CF2D4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 04514 808CF2D4 0C00CFC8 */ jal Rand_CenteredFloat /* 04518 808CF2D8 00108403 */ sra $s0, $s0, 16 /* 0451C 808CF2DC 00104880 */ sll $t1, $s0, 2 @@ -466,43 +466,43 @@ glabel BossFd_Update /* 04548 808CF308 00000000 */ nop /* 0454C 808CF30C 4502002F */ bc1fl .L808CF3CC /* 04550 808CF310 8FAF00D0 */ lw $t7, 0x00D0($sp) -/* 04554 808CF314 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 04554 808CF314 0C00CFC8 */ jal Rand_CenteredFloat /* 04558 808CF318 4600A306 */ mov.s $f12, $f20 /* 0455C 808CF31C C6280E04 */ lwc1 $f8, 0x0E04($s1) ## 00000DDC /* 04560 808CF320 4600A306 */ mov.s $f12, $f20 /* 04564 808CF324 46080280 */ add.s $f10, $f0, $f8 -/* 04568 808CF328 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 04568 808CF328 0C00CFC8 */ jal Rand_CenteredFloat /* 0456C 808CF32C E7AA0074 */ swc1 $f10, 0x0074($sp) /* 04570 808CF330 C6300E0C */ lwc1 $f16, 0x0E0C($s1) ## 00000DE4 /* 04574 808CF334 46100480 */ add.s $f18, $f0, $f16 /* 04578 808CF338 E7B2007C */ swc1 $f18, 0x007C($sp) -/* 0457C 808CF33C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0457C 808CF33C 0C00CFC8 */ jal Rand_CenteredFloat /* 04580 808CF340 C66C0290 */ lwc1 $f12, 0x0290($s3) ## 00000290 /* 04584 808CF344 E7A0008C */ swc1 $f0, 0x008C($sp) -/* 04588 808CF348 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 04588 808CF348 0C00CFC8 */ jal Rand_CenteredFloat /* 0458C 808CF34C C66C0290 */ lwc1 $f12, 0x0290($s3) ## 00000290 /* 04590 808CF350 E7A00090 */ swc1 $f0, 0x0090($sp) -/* 04594 808CF354 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 04594 808CF354 0C00CFC8 */ jal Rand_CenteredFloat /* 04598 808CF358 C66C0290 */ lwc1 $f12, 0x0290($s3) ## 00000290 /* 0459C 808CF35C 3C01808D */ lui $at, %hi(D_808D1F94) ## $at = 808D0000 /* 045A0 808CF360 C4241F94 */ lwc1 $f4, %lo(D_808D1F94)($at) /* 045A4 808CF364 E7A00094 */ swc1 $f0, 0x0094($sp) /* 045A8 808CF368 4600B306 */ mov.s $f12, $f22 -/* 045AC 808CF36C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 045AC 808CF36C 0C00CFC8 */ jal Rand_CenteredFloat /* 045B0 808CF370 E7A40084 */ swc1 $f4, 0x0084($sp) /* 045B4 808CF374 E7A00080 */ swc1 $f0, 0x0080($sp) -/* 045B8 808CF378 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 045B8 808CF378 0C00CFC8 */ jal Rand_CenteredFloat /* 045BC 808CF37C 4600B306 */ mov.s $f12, $f22 /* 045C0 808CF380 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 045C4 808CF384 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 045C8 808CF388 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 045C8 808CF388 0C00CFBE */ jal Rand_ZeroFloat /* 045CC 808CF38C E7A00088 */ swc1 $f0, 0x0088($sp) /* 045D0 808CF390 4600018D */ trunc.w.s $f6, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CADC0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CADC0.s index e0c230174a..fa545aaf32 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CADC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CADC0.s @@ -37,7 +37,7 @@ glabel func_808CADC0 /* 00088 808CAE48 A48C002A */ sh $t4, 0x002A($a0) ## 0000002A /* 0008C 808CAE4C 46062203 */ div.s $f8, $f4, $f6 /* 00090 808CAE50 E4880030 */ swc1 $f8, 0x0030($a0) ## 00000030 -/* 00094 808CAE54 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00094 808CAE54 0C00CFBE */ jal Rand_ZeroFloat /* 00098 808CAE58 AFA40018 */ sw $a0, 0x0018($sp) /* 0009C 808CAE5C 4600028D */ trunc.w.s $f10, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CAE8C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CAE8C.s index ae693e065d..4854e54c17 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CAE8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CAE8C.s @@ -35,13 +35,13 @@ glabel func_808CAE8C /* 0014C 808CAF0C C7A40028 */ lwc1 $f4, 0x0028($sp) /* 00150 808CAF10 46062203 */ div.s $f8, $f4, $f6 /* 00154 808CAF14 E4880030 */ swc1 $f8, 0x0030($a0) ## 00000030 -/* 00158 808CAF18 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00158 808CAF18 0C00CFBE */ jal Rand_ZeroFloat /* 0015C 808CAF1C AFA40018 */ sw $a0, 0x0018($sp) /* 00160 808CAF20 8FA40018 */ lw $a0, 0x0018($sp) /* 00164 808CAF24 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00168 808CAF28 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 0016C 808CAF2C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0016C 808CAF2C 0C00CFBE */ jal Rand_ZeroFloat /* 00170 808CAF30 E4800034 */ swc1 $f0, 0x0034($a0) ## 00000034 /* 00174 808CAF34 8FA40018 */ lw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CAFF4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CAFF4.s index f8b11b12db..bbcb92d630 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CAFF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CAFF4.s @@ -47,7 +47,7 @@ glabel func_808CAFF4 /* 002E4 808CB0A4 E4880008 */ swc1 $f8, 0x0008($a0) ## 00000008 /* 002E8 808CB0A8 87AC002E */ lh $t4, 0x002E($sp) /* 002EC 808CB0AC A48C002A */ sh $t4, 0x002A($a0) ## 0000002A -/* 002F0 808CB0B0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 002F0 808CB0B0 0C00CFBE */ jal Rand_ZeroFloat /* 002F4 808CB0B4 AFA40018 */ sw $a0, 0x0018($sp) /* 002F8 808CB0B8 8FA40018 */ lw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB198.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB198.s index 16bb25cc81..eb404d4812 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB198.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB198.s @@ -15,7 +15,7 @@ glabel func_808CB198 /* 0040C 808CB1CC 8E06145C */ lw $a2, 0x145C($s0) ## 0000145C /* 00410 808CB1D0 AFA40024 */ sw $a0, 0x0024($sp) /* 00414 808CB1D4 44074000 */ mfc1 $a3, $f8 -/* 00418 808CB1D8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00418 808CB1D8 0C01E107 */ jal Math_ApproachF /* 0041C 808CB1DC 00000000 */ nop /* 00420 808CB1E0 C60A143C */ lwc1 $f10, 0x143C($s0) ## 0000143C @@ -25,7 +25,7 @@ glabel func_808CB198 /* 00430 808CB1F0 46105482 */ mul.s $f18, $f10, $f16 /* 00434 808CB1F4 8E061460 */ lw $a2, 0x1460($s0) ## 00001460 /* 00438 808CB1F8 44079000 */ mfc1 $a3, $f18 -/* 0043C 808CB1FC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0043C 808CB1FC 0C01E107 */ jal Math_ApproachF /* 00440 808CB200 00000000 */ nop /* 00444 808CB204 C6041440 */ lwc1 $f4, 0x1440($s0) ## 00001440 @@ -35,7 +35,7 @@ glabel func_808CB198 /* 00454 808CB214 46062202 */ mul.s $f8, $f4, $f6 /* 00458 808CB218 8E061464 */ lw $a2, 0x1464($s0) ## 00001464 /* 0045C 808CB21C 44074000 */ mfc1 $a3, $f8 -/* 00460 808CB220 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00460 808CB220 0C01E107 */ jal Math_ApproachF /* 00464 808CB224 00000000 */ nop /* 00468 808CB228 C60A1444 */ lwc1 $f10, 0x1444($s0) ## 00001444 @@ -46,7 +46,7 @@ glabel func_808CB198 /* 0047C 808CB23C 8E061474 */ lw $a2, 0x1474($s0) ## 00001474 /* 00480 808CB240 AFA40020 */ sw $a0, 0x0020($sp) /* 00484 808CB244 44079000 */ mfc1 $a3, $f18 -/* 00488 808CB248 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00488 808CB248 0C01E107 */ jal Math_ApproachF /* 0048C 808CB24C 00000000 */ nop /* 00490 808CB250 C6041448 */ lwc1 $f4, 0x1448($s0) ## 00001448 @@ -56,7 +56,7 @@ glabel func_808CB198 /* 004A0 808CB260 46062202 */ mul.s $f8, $f4, $f6 /* 004A4 808CB264 8E061478 */ lw $a2, 0x1478($s0) ## 00001478 /* 004A8 808CB268 44074000 */ mfc1 $a3, $f8 -/* 004AC 808CB26C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 004AC 808CB26C 0C01E107 */ jal Math_ApproachF /* 004B0 808CB270 00000000 */ nop /* 004B4 808CB274 C60A144C */ lwc1 $f10, 0x144C($s0) ## 0000144C @@ -66,7 +66,7 @@ glabel func_808CB198 /* 004C4 808CB284 46105482 */ mul.s $f18, $f10, $f16 /* 004C8 808CB288 8E06147C */ lw $a2, 0x147C($s0) ## 0000147C /* 004CC 808CB28C 44079000 */ mfc1 $a3, $f18 -/* 004D0 808CB290 0C01E107 */ jal Math_SmoothScaleMaxF +/* 004D0 808CB290 0C01E107 */ jal Math_ApproachF /* 004D4 808CB294 00000000 */ nop /* 004D8 808CB298 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -75,7 +75,7 @@ glabel func_808CB198 /* 004E4 808CB2A4 8E071484 */ lw $a3, 0x1484($s0) ## 00001484 /* 004E8 808CB2A8 44050000 */ mfc1 $a1, $f0 /* 004EC 808CB2AC 44060000 */ mfc1 $a2, $f0 -/* 004F0 808CB2B0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 004F0 808CB2B0 0C01E107 */ jal Math_ApproachF /* 004F4 808CB2B4 00000000 */ nop /* 004F8 808CB2B8 C6041418 */ lwc1 $f4, 0x1418($s0) ## 00001418 @@ -90,7 +90,7 @@ glabel func_808CB198 /* 0051C 808CB2DC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00520 808CB2E0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 00524 808CB2E4 26041488 */ addiu $a0, $s0, 0x1488 ## $a0 = 00001488 -/* 00528 808CB2E8 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 00528 808CB2E8 0C01E123 */ jal Math_ApproachZeroF /* 0052C 808CB2EC 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 00530 808CB2F0 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s index 28e069eef3..04ae6af21f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s @@ -220,7 +220,7 @@ glabel func_808CB718 /* 00A08 808CB7C8 44044000 */ mfc1 $a0, $f8 /* 00A0C 808CB7CC 00000000 */ nop /* 00A10 808CB7D0 00042400 */ sll $a0, $a0, 16 -/* 00A14 808CB7D4 0C01DE1C */ jal Math_Sins +/* 00A14 808CB7D4 0C01DE1C */ jal Math_SinS ## sins? /* 00A18 808CB7D8 00042403 */ sra $a0, $a0, 16 /* 00A1C 808CB7DC C6CA02B0 */ lwc1 $f10, 0x02B0($s6) ## 000002B0 @@ -239,7 +239,7 @@ glabel func_808CB718 /* 00A50 808CB810 44043000 */ mfc1 $a0, $f6 /* 00A54 808CB814 00000000 */ nop /* 00A58 808CB818 00042400 */ sll $a0, $a0, 16 -/* 00A5C 808CB81C 0C01DE1C */ jal Math_Sins +/* 00A5C 808CB81C 0C01DE1C */ jal Math_SinS ## sins? /* 00A60 808CB820 00042403 */ sra $a0, $a0, 16 /* 00A64 808CB824 C6CA02B0 */ lwc1 $f10, 0x02B0($s6) ## 000002B0 @@ -259,14 +259,14 @@ glabel func_808CB718 /* 00A9C 808CB85C 44043000 */ mfc1 $a0, $f6 /* 00AA0 808CB860 00000000 */ nop /* 00AA4 808CB864 00042400 */ sll $a0, $a0, 16 -/* 00AA8 808CB868 0C01DE1C */ jal Math_Sins +/* 00AA8 808CB868 0C01DE1C */ jal Math_SinS ## sins? /* 00AAC 808CB86C 00042403 */ sra $a0, $a0, 16 /* 00AB0 808CB870 C6CA02B0 */ lwc1 $f10, 0x02B0($s6) ## 000002B0 /* 00AB4 808CB874 4600A306 */ mov.s $f12, $f20 /* 00AB8 808CB878 460A0202 */ mul.s $f8, $f0, $f10 /* 00ABC 808CB87C 4608B580 */ add.s $f22, $f22, $f8 -/* 00AC0 808CB880 0C03F494 */ jal Math_atan2f +/* 00AC0 808CB880 0C03F494 */ jal Math_FAtan2F /* 00AC4 808CB884 4600B386 */ mov.s $f14, $f22 /* 00AC8 808CB888 3C01808D */ lui $at, %hi(D_808D1E4C) ## $at = 808D0000 /* 00ACC 808CB88C C4381E4C */ lwc1 $f24, %lo(D_808D1E4C)($at) @@ -288,7 +288,7 @@ glabel func_808CB718 /* 00B0C 808CB8CC 00000000 */ nop /* 00B10 808CB8D0 46805220 */ cvt.s.w $f8, $f10 /* 00B14 808CB8D4 E7AE0090 */ swc1 $f14, 0x0090($sp) -/* 00B18 808CB8D8 0C03F494 */ jal Math_atan2f +/* 00B18 808CB8D8 0C03F494 */ jal Math_FAtan2F /* 00B1C 808CB8DC E7A801B4 */ swc1 $f8, 0x01B4($sp) /* 00B20 808CB8E0 46180102 */ mul.s $f4, $f0, $f24 /* 00B24 808CB8E4 3C04808D */ lui $a0, %hi(D_808D1C30) ## $a0 = 808D0000 @@ -313,7 +313,7 @@ glabel func_808CB718 /* 00B6C 808CB92C 4406F000 */ mfc1 $a2, $f30 /* 00B70 808CB930 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 00B74 808CB934 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD -/* 00B78 808CB938 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00B78 808CB938 0C01E107 */ jal Math_ApproachF /* 00B7C 808CB93C 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000280 /* 00B80 808CB940 86C91402 */ lh $t1, 0x1402($s6) ## 00001402 @@ -596,7 +596,7 @@ glabel L808CBCF8 /* 00FB8 808CBD78 86C40224 */ lh $a0, 0x0224($s6) ## 00000224 /* 00FBC 808CBD7C 000423C0 */ sll $a0, $a0, 15 /* 00FC0 808CBD80 00042400 */ sll $a0, $a0, 16 -/* 00FC4 808CBD84 0C01DE0D */ jal Math_Coss +/* 00FC4 808CBD84 0C01DE0D */ jal Math_CosS ## coss? /* 00FC8 808CBD88 00042403 */ sra $a0, $a0, 16 /* 00FCC 808CBD8C C6C4148C */ lwc1 $f4, 0x148C($s6) ## 0000148C @@ -606,7 +606,7 @@ glabel L808CBCF8 /* 00FDC 808CBD9C 34E7126E */ ori $a3, $a3, 0x126E ## $a3 = 3C03126E /* 00FE0 808CBDA0 26C4148C */ addiu $a0, $s6, 0x148C ## $a0 = 0000148C /* 00FE4 808CBDA4 3C054000 */ lui $a1, 0x4000 ## $a1 = 40000000 -/* 00FE8 808CBDA8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00FE8 808CBDA8 0C01E107 */ jal Math_ApproachF /* 00FEC 808CBDAC E6C61488 */ swc1 $f6, 0x1488($s6) ## 00001488 /* 00FF0 808CBDB0 86C30248 */ lh $v1, 0x0248($s6) ## 00000248 @@ -643,7 +643,7 @@ glabel L808CBE20 /* 01060 808CBE20 86C40224 */ lh $a0, 0x0224($s6) ## 00000224 /* 01064 808CBE24 000423C0 */ sll $a0, $a0, 15 /* 01068 808CBE28 00042400 */ sll $a0, $a0, 16 -/* 0106C 808CBE2C 0C01DE0D */ jal Math_Coss +/* 0106C 808CBE2C 0C01DE0D */ jal Math_CosS ## coss? /* 01070 808CBE30 00042403 */ sra $a0, $a0, 16 /* 01074 808CBE34 C6C4148C */ lwc1 $f4, 0x148C($s6) ## 0000148C @@ -653,7 +653,7 @@ glabel L808CBE20 /* 01084 808CBE44 34E7126E */ ori $a3, $a3, 0x126E ## $a3 = 3C03126E /* 01088 808CBE48 26C4148C */ addiu $a0, $s6, 0x148C ## $a0 = 0000148C /* 0108C 808CBE4C 3C054000 */ lui $a1, 0x4000 ## $a1 = 40000000 -/* 01090 808CBE50 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01090 808CBE50 0C01E107 */ jal Math_ApproachF /* 01094 808CBE54 E6C61488 */ swc1 $f6, 0x1488($s6) ## 00001488 /* 01098 808CBE58 3C128013 */ lui $s2, %hi(D_801333E0) @@ -724,7 +724,7 @@ glabel L808CBF44 /* 01190 808CBF50 000423C0 */ sll $a0, $a0, 15 /* 01194 808CBF54 00042400 */ sll $a0, $a0, 16 /* 01198 808CBF58 00042403 */ sra $a0, $a0, 16 -/* 0119C 808CBF5C 0C01DE0D */ jal Math_Coss +/* 0119C 808CBF5C 0C01DE0D */ jal Math_CosS ## coss? /* 011A0 808CBF60 E6D41484 */ swc1 $f20, 0x1484($s6) ## 00001484 /* 011A4 808CBF64 C6CA148C */ lwc1 $f10, 0x148C($s6) ## 0000148C @@ -734,7 +734,7 @@ glabel L808CBF44 /* 011B4 808CBF74 34E7126E */ ori $a3, $a3, 0x126E ## $a3 = 3C03126E /* 011B8 808CBF78 26C4148C */ addiu $a0, $s6, 0x148C ## $a0 = 0000148C /* 011BC 808CBF7C 3C054000 */ lui $a1, 0x4000 ## $a1 = 40000000 -/* 011C0 808CBF80 0C01E107 */ jal Math_SmoothScaleMaxF +/* 011C0 808CBF80 0C01E107 */ jal Math_ApproachF /* 011C4 808CBF84 E6C81488 */ swc1 $f8, 0x1488($s6) ## 00001488 /* 011C8 808CBF88 3C128013 */ lui $s2, %hi(D_801333E0) @@ -947,13 +947,13 @@ glabel L808CC140 /* 014DC 808CC29C E6C6144C */ swc1 $f6, 0x144C($s6) ## 0000144C /* 014E0 808CC2A0 4406F000 */ mfc1 $a2, $f30 .L808CC2A4: -/* 014E4 808CC2A4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 014E4 808CC2A4 0C01E107 */ jal Math_ApproachF /* 014E8 808CC2A8 34E7126E */ ori $a3, $a3, 0x126E ## $a3 = 3C03126E /* 014EC 808CC2AC 86C40224 */ lh $a0, 0x0224($s6) ## 00000224 /* 014F0 808CC2B0 000423C0 */ sll $a0, $a0, 15 /* 014F4 808CC2B4 00042400 */ sll $a0, $a0, 16 -/* 014F8 808CC2B8 0C01DE0D */ jal Math_Coss +/* 014F8 808CC2B8 0C01DE0D */ jal Math_CosS ## coss? /* 014FC 808CC2BC 00042403 */ sra $a0, $a0, 16 /* 01500 808CC2C0 C6CA148C */ lwc1 $f10, 0x148C($s6) ## 0000148C @@ -1253,7 +1253,7 @@ glabel L808CC6A4 .L808CC6F8: /* 01938 808CC6F8 C4341EE4 */ lwc1 $f20, %lo(D_808D1EE4)($at) .L808CC6FC: -/* 0193C 808CC6FC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0193C 808CC6FC 0C00CFBE */ jal Rand_ZeroFloat /* 01940 808CC700 4600A306 */ mov.s $f12, $f20 /* 01944 808CC704 4459F800 */ cfc1 $t9, $31 @@ -1577,7 +1577,7 @@ glabel L808CC944 /* 01DF8 808CCBB8 C6C4027C */ lwc1 $f4, 0x027C($s6) ## 0000027C .L808CCBBC: /* 01DFC 808CCBBC 4405F000 */ mfc1 $a1, $f30 -/* 01E00 808CCBC0 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01E00 808CCBC0 0C01E123 */ jal Math_ApproachZeroF /* 01E04 808CCBC4 E7A401B0 */ swc1 $f4, 0x01B0($sp) .L808CCBC8: @@ -1603,7 +1603,7 @@ glabel L808CC944 /* 01E50 808CCC10 44043000 */ mfc1 $a0, $f6 /* 01E54 808CCC14 00000000 */ nop /* 01E58 808CCC18 00042400 */ sll $a0, $a0, 16 -/* 01E5C 808CCC1C 0C01DE1C */ jal Math_Sins +/* 01E5C 808CCC1C 0C01DE1C */ jal Math_SinS ## sins? /* 01E60 808CCC20 00042403 */ sra $a0, $a0, 16 /* 01E64 808CCC24 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -1657,7 +1657,7 @@ glabel L808CC944 /* 01F1C 808CCCDC A6C00232 */ sh $zero, 0x0232($s6) ## 00000232 /* 01F20 808CCCE0 4406F000 */ mfc1 $a2, $f30 .L808CCCE4: -/* 01F24 808CCCE4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01F24 808CCCE4 0C01E107 */ jal Math_ApproachF /* 01F28 808CCCE8 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 01F2C 808CCCEC 1000022B */ beq $zero, $zero, .L808CD59C @@ -1675,7 +1675,7 @@ glabel L808CCCF4 /* 01F54 808CCD14 55600021 */ bnel $t3, $zero, .L808CCD9C /* 01F58 808CCD18 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 01F5C 808CCD1C 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 -/* 01F60 808CCD20 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01F60 808CCD20 0C00CFBE */ jal Rand_ZeroFloat /* 01F64 808CCD24 00000000 */ nop /* 01F68 808CCD28 4600028D */ trunc.w.s $f10, $f0 @@ -1686,12 +1686,12 @@ glabel L808CCCF4 /* 01F7C 808CCD3C 25F8000A */ addiu $t8, $t7, 0x000A ## $t8 = 0000000A /* 01F80 808CCD40 A6D80248 */ sh $t8, 0x0248($s6) ## 00000248 .L808CCD44: -/* 01F84 808CCD44 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01F84 808CCD44 0C00CFC8 */ jal Rand_CenteredFloat /* 01F88 808CCD48 4600B306 */ mov.s $f12, $f22 /* 01F8C 808CCD4C E6C002BC */ swc1 $f0, 0x02BC($s6) ## 000002BC /* 01F90 808CCD50 E6D402C0 */ swc1 $f20, 0x02C0($s6) ## 000002C0 -/* 01F94 808CCD54 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01F94 808CCD54 0C00CFC8 */ jal Rand_CenteredFloat /* 01F98 808CCD58 4600B306 */ mov.s $f12, $f22 /* 01F9C 808CCD5C C6C802BC */ lwc1 $f8, 0x02BC($s6) ## 000002BC @@ -1722,7 +1722,7 @@ glabel L808CCCF4 /* 01FFC 808CCDBC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 02000 808CCDC0 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3E99999A /* 02004 808CCDC4 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000280 -/* 02008 808CCDC8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02008 808CCDC8 0C01E107 */ jal Math_ApproachF /* 0200C 808CCDCC E6C602AC */ swc1 $f6, 0x02AC($s6) ## 000002AC /* 02010 808CCDD0 86D9024A */ lh $t9, 0x024A($s6) ## 0000024A @@ -1753,7 +1753,7 @@ glabel L808CCDF0 /* 02070 808CCE30 E6C402B4 */ swc1 $f4, 0x02B4($s6) ## 000002B4 /* 02074 808CCE34 E6CA02BC */ swc1 $f10, 0x02BC($s6) ## 000002BC /* 02078 808CCE38 E6C802C4 */ swc1 $f8, 0x02C4($s6) ## 000002C4 -/* 0207C 808CCE3C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0207C 808CCE3C 0C01E107 */ jal Math_ApproachF /* 02080 808CCE40 E6C602AC */ swc1 $f6, 0x02AC($s6) ## 000002AC /* 02084 808CCE44 86CA0248 */ lh $t2, 0x0248($s6) ## 00000248 @@ -1847,7 +1847,7 @@ glabel L808CCDF0 .L808CCF88: /* 021C8 808CCF88 3C01808D */ lui $at, %hi(D_808D1F04) ## $at = 808D0000 /* 021CC 808CCF8C C42C1F04 */ lwc1 $f12, %lo(D_808D1F04)($at) -/* 021D0 808CCF90 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 021D0 808CCF90 0C00CFBE */ jal Rand_ZeroFloat /* 021D4 808CCF94 26D41970 */ addiu $s4, $s6, 0x1970 ## $s4 = 00001970 /* 021D8 808CCF98 4600020D */ trunc.w.s $f8, $f0 @@ -1870,7 +1870,7 @@ glabel L808CCDF0 /* 0221C 808CCFDC E7A8018C */ swc1 $f8, 0x018C($sp) /* 02220 808CCFE0 C4440794 */ lwc1 $f4, 0x0794($v0) ## 00000794 /* 02224 808CCFE4 E7A60168 */ swc1 $f6, 0x0168($sp) -/* 02228 808CCFE8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 02228 808CCFE8 0C00CFBE */ jal Rand_ZeroFloat /* 0222C 808CCFEC E7A40190 */ swc1 $f4, 0x0190($sp) /* 02230 808CCFF0 4600028D */ trunc.w.s $f10, $f0 @@ -1888,28 +1888,28 @@ glabel L808CCDF0 /* 02260 808CD020 27A70164 */ addiu $a3, $sp, 0x0164 ## $a3 = FFFFFF94 /* 02264 808CD024 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 .L808CD028: -/* 02268 808CD028 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02268 808CD028 0C00CFC8 */ jal Rand_CenteredFloat /* 0226C 808CD02C 4600A306 */ mov.s $f12, $f20 /* 02270 808CD030 E7A00170 */ swc1 $f0, 0x0170($sp) -/* 02274 808CD034 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02274 808CD034 0C00CFC8 */ jal Rand_CenteredFloat /* 02278 808CD038 4600A306 */ mov.s $f12, $f20 /* 0227C 808CD03C E7A00174 */ swc1 $f0, 0x0174($sp) -/* 02280 808CD040 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02280 808CD040 0C00CFC8 */ jal Rand_CenteredFloat /* 02284 808CD044 4600A306 */ mov.s $f12, $f20 /* 02288 808CD048 E7A00178 */ swc1 $f0, 0x0178($sp) /* 0228C 808CD04C E7B6015C */ swc1 $f22, 0x015C($sp) -/* 02290 808CD050 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02290 808CD050 0C00CFC8 */ jal Rand_CenteredFloat /* 02294 808CD054 4600D306 */ mov.s $f12, $f26 /* 02298 808CD058 E7A00158 */ swc1 $f0, 0x0158($sp) -/* 0229C 808CD05C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0229C 808CD05C 0C00CFC8 */ jal Rand_CenteredFloat /* 022A0 808CD060 4600D306 */ mov.s $f12, $f26 /* 022A4 808CD064 E7A00160 */ swc1 $f0, 0x0160($sp) -/* 022A8 808CD068 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 022A8 808CD068 0C00CFBE */ jal Rand_ZeroFloat /* 022AC 808CD06C 4600C306 */ mov.s $f12, $f24 /* 022B0 808CD070 4600020D */ trunc.w.s $f8, $f0 @@ -2066,15 +2066,15 @@ glabel L808CD178 /* 024EC 808CD2AC AE190004 */ sw $t9, 0x0004($s0) ## FFFFFF78 /* 024F0 808CD2B0 AE080008 */ sw $t0, 0x0008($s0) ## FFFFFF7C /* 024F4 808CD2B4 AE2A0008 */ sw $t2, 0x0008($s1) ## FFFFFF70 -/* 024F8 808CD2B8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 024F8 808CD2B8 0C00CFC8 */ jal Rand_CenteredFloat /* 024FC 808CD2BC AE290004 */ sw $t1, 0x0004($s1) ## FFFFFF6C /* 02500 808CD2C0 E7A00144 */ swc1 $f0, 0x0144($sp) -/* 02504 808CD2C4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 02504 808CD2C4 0C00CFBE */ jal Rand_ZeroFloat /* 02508 808CD2C8 4600F306 */ mov.s $f12, $f30 /* 0250C 808CD2CC E7A00148 */ swc1 $f0, 0x0148($sp) -/* 02510 808CD2D0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02510 808CD2D0 0C00CFC8 */ jal Rand_CenteredFloat /* 02514 808CD2D4 4600A306 */ mov.s $f12, $f20 /* 02518 808CD2D8 3C01808D */ lui $at, %hi(D_808D1F0C) ## $at = 808D0000 @@ -2082,27 +2082,27 @@ glabel L808CD178 /* 02520 808CD2E0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 02524 808CD2E4 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 02528 808CD2E8 E7A0014C */ swc1 $f0, 0x014C($sp) -/* 0252C 808CD2EC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0252C 808CD2EC 0C00CFC8 */ jal Rand_CenteredFloat /* 02530 808CD2F0 E7A6013C */ swc1 $f6, 0x013C($sp) /* 02534 808CD2F4 C6CA0024 */ lwc1 $f10, 0x0024($s6) ## 00000024 /* 02538 808CD2F8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0253C 808CD2FC 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 02540 808CD300 460A0200 */ add.s $f8, $f0, $f10 -/* 02544 808CD304 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02544 808CD304 0C00CFC8 */ jal Rand_CenteredFloat /* 02548 808CD308 E7A8012C */ swc1 $f8, 0x012C($sp) /* 0254C 808CD30C C6C40028 */ lwc1 $f4, 0x0028($s6) ## 00000028 /* 02550 808CD310 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 02554 808CD314 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 02558 808CD318 46040180 */ add.s $f6, $f0, $f4 -/* 0255C 808CD31C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0255C 808CD31C 0C00CFC8 */ jal Rand_CenteredFloat /* 02560 808CD320 E7A60130 */ swc1 $f6, 0x0130($sp) /* 02564 808CD324 C6CA002C */ lwc1 $f10, 0x002C($s6) ## 0000002C /* 02568 808CD328 4600E306 */ mov.s $f12, $f28 /* 0256C 808CD32C 460A0200 */ add.s $f8, $f0, $f10 -/* 02570 808CD330 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 02570 808CD330 0C00CFBE */ jal Rand_ZeroFloat /* 02574 808CD334 E7A80134 */ swc1 $f8, 0x0134($sp) /* 02578 808CD338 46160100 */ add.s $f4, $f0, $f22 @@ -2185,14 +2185,14 @@ glabel L808CD3A8 /* 02694 808CD454 AFB20010 */ sw $s2, 0x0010($sp) /* 02698 808CD458 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 0269C 808CD45C 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 -/* 026A0 808CD460 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 026A0 808CD460 0C00CFC8 */ jal Rand_CenteredFloat /* 026A4 808CD464 00000000 */ nop /* 026A8 808CD468 C6C60024 */ lwc1 $f6, 0x0024($s6) ## 00000024 /* 026AC 808CD46C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 026B0 808CD470 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 026B4 808CD474 46060280 */ add.s $f10, $f0, $f6 -/* 026B8 808CD478 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 026B8 808CD478 0C00CFC8 */ jal Rand_CenteredFloat /* 026BC 808CD47C E7AA0120 */ swc1 $f10, 0x0120($sp) /* 026C0 808CD480 C6C80028 */ lwc1 $f8, 0x0028($s6) ## 00000028 @@ -2202,7 +2202,7 @@ glabel L808CD3A8 /* 026D0 808CD490 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 026D4 808CD494 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 026D8 808CD498 46062281 */ sub.s $f10, $f4, $f6 -/* 026DC 808CD49C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 026DC 808CD49C 0C00CFC8 */ jal Rand_CenteredFloat /* 026E0 808CD4A0 E7AA0124 */ swc1 $f10, 0x0124($sp) /* 026E4 808CD4A4 C6C8002C */ lwc1 $f8, 0x002C($s6) ## 0000002C @@ -2215,7 +2215,7 @@ glabel L808CD3A8 /* 02700 808CD4C0 46062280 */ add.s $f10, $f4, $f6 /* 02704 808CD4C4 44816000 */ mtc1 $at, $f12 ## $f12 = 15.00 /* 02708 808CD4C8 E7A8010C */ swc1 $f8, 0x010C($sp) -/* 0270C 808CD4CC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0270C 808CD4CC 0C00CFBE */ jal Rand_ZeroFloat /* 02710 808CD4D0 E7AA0128 */ swc1 $f10, 0x0128($sp) /* 02714 808CD4D4 4600010D */ trunc.w.s $f4, $f0 @@ -2237,7 +2237,7 @@ glabel L808CD3A8 /* 02750 808CD510 26C40050 */ addiu $a0, $s6, 0x0050 ## $a0 = 00000050 /* 02754 808CD514 4405F000 */ mfc1 $a1, $f30 /* 02758 808CD518 3C063B23 */ lui $a2, 0x3B23 ## $a2 = 3B230000 -/* 0275C 808CD51C 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 0275C 808CD51C 0C01E123 */ jal Math_ApproachZeroF /* 02760 808CD520 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3B23D70A /* 02764 808CD524 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 @@ -2291,7 +2291,7 @@ glabel L808CD598 /* 02808 808CD5C8 00052C00 */ sll $a1, $a1, 16 /* 0280C 808CD5CC 00052C03 */ sra $a1, $a1, 16 /* 02810 808CD5D0 00073C00 */ sll $a3, $a3, 16 -/* 02814 808CD5D4 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 02814 808CD5D4 0C01E1EF */ jal Math_ApproachS /* 02818 808CD5D8 00073C03 */ sra $a3, $a3, 16 /* 0281C 808CD5DC 86C20222 */ lh $v0, 0x0222($s6) ## 00000222 @@ -2316,7 +2316,7 @@ glabel L808CD598 /* 02864 808CD624 45020005 */ bc1fl .L808CD63C /* 02868 808CD628 C7A601B0 */ lwc1 $f6, 0x01B0($sp) /* 0286C 808CD62C 4406F000 */ mfc1 $a2, $f30 -/* 02870 808CD630 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02870 808CD630 0C01E107 */ jal Math_ApproachF /* 02874 808CD634 E7A001B0 */ swc1 $f0, 0x01B0($sp) .L808CD638: @@ -2332,21 +2332,21 @@ glabel L808CD598 /* 02898 808CD658 00052C00 */ sll $a1, $a1, 16 /* 0289C 808CD65C 00052C03 */ sra $a1, $a1, 16 /* 028A0 808CD660 00073C00 */ sll $a3, $a3, 16 -/* 028A4 808CD664 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 028A4 808CD664 0C01E1EF */ jal Math_ApproachS /* 028A8 808CD668 00073C03 */ sra $a3, $a3, 16 /* 028AC 808CD66C 4406F000 */ mfc1 $a2, $f30 /* 028B0 808CD670 3C07469C */ lui $a3, 0x469C ## $a3 = 469C0000 /* 028B4 808CD674 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 469C4000 /* 028B8 808CD678 26C402A8 */ addiu $a0, $s6, 0x02A8 ## $a0 = 000002A8 -/* 028BC 808CD67C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 028BC 808CD67C 0C01E107 */ jal Math_ApproachF /* 028C0 808CD680 8EC502AC */ lw $a1, 0x02AC($s6) ## 000002AC /* 028C4 808CD684 4406F000 */ mfc1 $a2, $f30 /* 028C8 808CD688 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 028CC 808CD68C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 028D0 808CD690 26C40068 */ addiu $a0, $s6, 0x0068 ## $a0 = 00000068 -/* 028D4 808CD694 0C01E107 */ jal Math_SmoothScaleMaxF +/* 028D4 808CD694 0C01E107 */ jal Math_ApproachF /* 028D8 808CD698 8EC502A4 */ lw $a1, 0x02A4($s6) ## 000002A4 /* 028DC 808CD69C 86CC0222 */ lh $t4, 0x0222($s6) ## 00000222 @@ -2427,7 +2427,7 @@ glabel L808CD598 /* 029FC 808CD7BC 44042000 */ mfc1 $a0, $f4 /* 02A00 808CD7C0 00000000 */ nop /* 02A04 808CD7C4 00042400 */ sll $a0, $a0, 16 -/* 02A08 808CD7C8 0C01DE1C */ jal Math_Sins +/* 02A08 808CD7C8 0C01DE1C */ jal Math_SinS ## sins? /* 02A0C 808CD7CC 00042403 */ sra $a0, $a0, 16 /* 02A10 808CD7D0 3C01808D */ lui $at, %hi(D_808D1F1C) ## $at = 808D0000 @@ -2448,7 +2448,7 @@ glabel L808CD598 /* 02A4C 808CD80C 44042000 */ mfc1 $a0, $f4 /* 02A50 808CD810 00000000 */ nop /* 02A54 808CD814 00042400 */ sll $a0, $a0, 16 -/* 02A58 808CD818 0C01DE1C */ jal Math_Sins +/* 02A58 808CD818 0C01DE1C */ jal Math_SinS ## sins? /* 02A5C 808CD81C 00042403 */ sra $a0, $a0, 16 /* 02A60 808CD820 3C01808D */ lui $at, %hi(D_808D1F24) ## $at = 808D0000 @@ -2467,7 +2467,7 @@ glabel L808CD598 /* 02A94 808CD854 44042000 */ mfc1 $a0, $f4 /* 02A98 808CD858 00000000 */ nop /* 02A9C 808CD85C 00042400 */ sll $a0, $a0, 16 -/* 02AA0 808CD860 0C01DE0D */ jal Math_Coss +/* 02AA0 808CD860 0C01DE0D */ jal Math_CosS ## coss? /* 02AA4 808CD864 00042403 */ sra $a0, $a0, 16 /* 02AA8 808CD868 3C01808D */ lui $at, %hi(D_808D1F28) ## $at = 808D0000 @@ -2530,7 +2530,7 @@ glabel L808CD598 /* 02B8C 808CD94C 4406F000 */ mfc1 $a2, $f30 /* 02B90 808CD950 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 02B94 808CD954 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD -/* 02B98 808CD958 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02B98 808CD958 0C01E107 */ jal Math_ApproachF /* 02B9C 808CD95C 26C413C8 */ addiu $a0, $s6, 0x13C8 ## $a0 = 000013C8 /* 02BA0 808CD960 10000006 */ beq $zero, $zero, .L808CD97C @@ -2539,7 +2539,7 @@ glabel L808CD598 /* 02BA8 808CD968 4405D000 */ mfc1 $a1, $f26 .L808CD96C: /* 02BAC 808CD96C 4406F000 */ mfc1 $a2, $f30 -/* 02BB0 808CD970 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02BB0 808CD970 0C01E107 */ jal Math_ApproachF /* 02BB4 808CD974 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 0000CCCD /* 02BB8 808CD978 86C80222 */ lh $t0, 0x0222($s6) ## 00000222 @@ -2607,7 +2607,7 @@ glabel L808CD598 /* 02CA4 808CDA64 44043000 */ mfc1 $a0, $f6 /* 02CA8 808CDA68 00000000 */ nop /* 02CAC 808CDA6C 00042400 */ sll $a0, $a0, 16 -/* 02CB0 808CDA70 0C01DE1C */ jal Math_Sins +/* 02CB0 808CDA70 0C01DE1C */ jal Math_SinS ## sins? /* 02CB4 808CDA74 00042403 */ sra $a0, $a0, 16 /* 02CB8 808CDA78 3C01808D */ lui $at, %hi(D_808D1F30) ## $at = 808D0000 @@ -2626,7 +2626,7 @@ glabel L808CD598 /* 02CEC 808CDAAC 44044000 */ mfc1 $a0, $f8 /* 02CF0 808CDAB0 00000000 */ nop /* 02CF4 808CDAB4 00042400 */ sll $a0, $a0, 16 -/* 02CF8 808CDAB8 0C01DE1C */ jal Math_Sins +/* 02CF8 808CDAB8 0C01DE1C */ jal Math_SinS ## sins? /* 02CFC 808CDABC 00042403 */ sra $a0, $a0, 16 /* 02D00 808CDAC0 3C01457A */ lui $at, 0x457A ## $at = 457A0000 @@ -2644,7 +2644,7 @@ glabel L808CD598 /* 02D30 808CDAF0 44042000 */ mfc1 $a0, $f4 /* 02D34 808CDAF4 00000000 */ nop /* 02D38 808CDAF8 00042400 */ sll $a0, $a0, 16 -/* 02D3C 808CDAFC 0C01DE1C */ jal Math_Sins +/* 02D3C 808CDAFC 0C01DE1C */ jal Math_SinS ## sins? /* 02D40 808CDB00 00042403 */ sra $a0, $a0, 16 /* 02D44 808CDB04 46140182 */ mul.s $f6, $f0, $f20 @@ -2660,7 +2660,7 @@ glabel L808CD598 /* 02D6C 808CDB2C 44043000 */ mfc1 $a0, $f6 /* 02D70 808CDB30 00000000 */ nop /* 02D74 808CDB34 00042400 */ sll $a0, $a0, 16 -/* 02D78 808CDB38 0C01DE1C */ jal Math_Sins +/* 02D78 808CDB38 0C01DE1C */ jal Math_SinS ## sins? /* 02D7C 808CDB3C 00042403 */ sra $a0, $a0, 16 /* 02D80 808CDB40 3C01808D */ lui $at, %hi(D_808D1F3C) ## $at = 808D0000 @@ -2679,7 +2679,7 @@ glabel L808CD598 /* 02DB4 808CDB74 44044000 */ mfc1 $a0, $f8 /* 02DB8 808CDB78 00000000 */ nop /* 02DBC 808CDB7C 00042400 */ sll $a0, $a0, 16 -/* 02DC0 808CDB80 0C01DE1C */ jal Math_Sins +/* 02DC0 808CDB80 0C01DE1C */ jal Math_SinS ## sins? /* 02DC4 808CDB84 00042403 */ sra $a0, $a0, 16 /* 02DC8 808CDB88 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 @@ -2696,7 +2696,7 @@ glabel L808CD598 /* 02DF4 808CDBB4 44043000 */ mfc1 $a0, $f6 /* 02DF8 808CDBB8 00000000 */ nop /* 02DFC 808CDBBC 00042400 */ sll $a0, $a0, 16 -/* 02E00 808CDBC0 0C01DE1C */ jal Math_Sins +/* 02E00 808CDBC0 0C01DE1C */ jal Math_SinS ## sins? /* 02E04 808CDBC4 00042403 */ sra $a0, $a0, 16 /* 02E08 808CDBC8 3C01808D */ lui $at, %hi(D_808D1F40) ## $at = 808D0000 @@ -2713,7 +2713,7 @@ glabel L808CD598 /* 02E34 808CDBF4 44043000 */ mfc1 $a0, $f6 /* 02E38 808CDBF8 00000000 */ nop /* 02E3C 808CDBFC 00042400 */ sll $a0, $a0, 16 -/* 02E40 808CDC00 0C01DE1C */ jal Math_Sins +/* 02E40 808CDC00 0C01DE1C */ jal Math_SinS ## sins? /* 02E44 808CDC04 00042403 */ sra $a0, $a0, 16 /* 02E48 808CDC08 3C01C57A */ lui $at, 0xC57A ## $at = C57A0000 @@ -2731,7 +2731,7 @@ glabel L808CD598 /* 02E78 808CDC38 44044000 */ mfc1 $a0, $f8 /* 02E7C 808CDC3C 00000000 */ nop /* 02E80 808CDC40 00042400 */ sll $a0, $a0, 16 -/* 02E84 808CDC44 0C01DE1C */ jal Math_Sins +/* 02E84 808CDC44 0C01DE1C */ jal Math_SinS ## sins? /* 02E88 808CDC48 00042403 */ sra $a0, $a0, 16 /* 02E8C 808CDC4C 46160102 */ mul.s $f4, $f0, $f22 @@ -2745,7 +2745,7 @@ glabel L808CD598 /* 02EAC 808CDC6C 44042000 */ mfc1 $a0, $f4 /* 02EB0 808CDC70 00000000 */ nop /* 02EB4 808CDC74 00042400 */ sll $a0, $a0, 16 -/* 02EB8 808CDC78 0C01DE1C */ jal Math_Sins +/* 02EB8 808CDC78 0C01DE1C */ jal Math_SinS ## sins? /* 02EBC 808CDC7C 00042403 */ sra $a0, $a0, 16 /* 02EC0 808CDC80 3C01C4FA */ lui $at, 0xC4FA ## $at = C4FA0000 @@ -2762,7 +2762,7 @@ glabel L808CD598 /* 02EEC 808CDCAC 44043000 */ mfc1 $a0, $f6 /* 02EF0 808CDCB0 00000000 */ nop /* 02EF4 808CDCB4 00042400 */ sll $a0, $a0, 16 -/* 02EF8 808CDCB8 0C01DE1C */ jal Math_Sins +/* 02EF8 808CDCB8 0C01DE1C */ jal Math_SinS ## sins? /* 02EFC 808CDCBC 00042403 */ sra $a0, $a0, 16 /* 02F00 808CDCC0 46140282 */ mul.s $f10, $f0, $f20 @@ -2779,26 +2779,26 @@ glabel L808CD598 /* 02F28 808CDCE8 4406F000 */ mfc1 $a2, $f30 /* 02F2C 808CDCEC 8E450000 */ lw $a1, 0x0000($s2) ## 808D19F8 /* 02F30 808CDCF0 26040C3C */ addiu $a0, $s0, 0x0C3C ## $a0 = 00000C3C -/* 02F34 808CDCF4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02F34 808CDCF4 0C01E107 */ jal Math_ApproachF /* 02F38 808CDCF8 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 /* 02F3C 808CDCFC 4406F000 */ mfc1 $a2, $f30 /* 02F40 808CDD00 26040C40 */ addiu $a0, $s0, 0x0C40 ## $a0 = 00000C40 /* 02F44 808CDD04 8E450004 */ lw $a1, 0x0004($s2) ## 808D19FC -/* 02F48 808CDD08 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02F48 808CDD08 0C01E107 */ jal Math_ApproachF /* 02F4C 808CDD0C 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 /* 02F50 808CDD10 02B19021 */ addu $s2, $s5, $s1 /* 02F54 808CDD14 4406F000 */ mfc1 $a2, $f30 /* 02F58 808CDD18 8E450000 */ lw $a1, 0x0000($s2) ## 808D19F8 /* 02F5C 808CDD1C 26040C6C */ addiu $a0, $s0, 0x0C6C ## $a0 = 00000C6C -/* 02F60 808CDD20 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02F60 808CDD20 0C01E107 */ jal Math_ApproachF /* 02F64 808CDD24 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 /* 02F68 808CDD28 4406F000 */ mfc1 $a2, $f30 /* 02F6C 808CDD2C 26040C70 */ addiu $a0, $s0, 0x0C70 ## $a0 = 00000C70 /* 02F70 808CDD30 8E450004 */ lw $a1, 0x0004($s2) ## 808D19FC -/* 02F74 808CDD34 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02F74 808CDD34 0C01E107 */ jal Math_ApproachF /* 02F78 808CDD38 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 /* 02F7C 808CDD3C 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 @@ -2820,13 +2820,13 @@ glabel L808CD598 /* 02FB4 808CDD74 3C053DCC */ lui $a1, 0x3DCC ## $a1 = 3DCC0000 /* 02FB8 808CDD78 4406E000 */ mfc1 $a2, $f28 /* 02FBC 808CDD7C 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD -/* 02FC0 808CDD80 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 02FC0 808CDD80 0C01E123 */ jal Math_ApproachZeroF /* 02FC4 808CDD84 26240C40 */ addiu $a0, $s1, 0x0C40 ## $a0 = 00000B78 /* 02FC8 808CDD88 3C053DCC */ lui $a1, 0x3DCC ## $a1 = 3DCC0000 /* 02FCC 808CDD8C 4406E000 */ mfc1 $a2, $f28 /* 02FD0 808CDD90 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD -/* 02FD4 808CDD94 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 02FD4 808CDD94 0C01E123 */ jal Math_ApproachZeroF /* 02FD8 808CDD98 26240C70 */ addiu $a0, $s1, 0x0C70 ## $a0 = 00000BA8 /* 02FDC 808CDD9C 16000002 */ bne $s0, $zero, .L808CDDA8 @@ -2836,7 +2836,7 @@ glabel L808CD598 /* 02FE8 808CDDA8 4405A000 */ mfc1 $a1, $f20 /* 02FEC 808CDDAC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 02FF0 808CDDB0 4407E000 */ mfc1 $a3, $f28 -/* 02FF4 808CDDB4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02FF4 808CDDB4 0C01E107 */ jal Math_ApproachF /* 02FF8 808CDDB8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 02FFC 808CDDBC 4600A207 */ neg.s $f8, $f20 @@ -2844,7 +2844,7 @@ glabel L808CD598 /* 03004 808CDDC4 44054000 */ mfc1 $a1, $f8 /* 03008 808CDDC8 4407E000 */ mfc1 $a3, $f28 /* 0300C 808CDDCC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 03010 808CDDD0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03010 808CDDD0 0C01E107 */ jal Math_ApproachF /* 03014 808CDDD4 26240C6C */ addiu $a0, $s1, 0x0C6C ## $a0 = 00000BA4 /* 03018 808CDDD8 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CDE30.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CDE30.s index 1fea15d748..270a0763af 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CDE30.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CDE30.s @@ -20,7 +20,7 @@ glabel func_808CDE30 /* 030A4 808CDE64 3C01808D */ lui $at, %hi(D_808D1F48) ## $at = 808D0000 /* 030A8 808CDE68 C4341F48 */ lwc1 $f20, %lo(D_808D1F48)($at) .L808CDE6C: -/* 030AC 808CDE6C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 030AC 808CDE6C 0C00CFBE */ jal Rand_ZeroFloat /* 030B0 808CDE70 4600A306 */ mov.s $f12, $f20 /* 030B4 808CDE74 444EF800 */ cfc1 $t6, $31 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CE01C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CE01C.s index 229260be01..2f372feefd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CE01C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CE01C.s @@ -75,7 +75,7 @@ glabel func_808CE01C /* 032D8 808CE098 00812021 */ addu $a0, $a0, $at /* 032DC 808CE09C 00042200 */ sll $a0, $a0, 8 /* 032E0 808CE0A0 00042400 */ sll $a0, $a0, 16 -/* 032E4 808CE0A4 0C01DE1C */ jal Math_Sins +/* 032E4 808CE0A4 0C01DE1C */ jal Math_SinS ## sins? /* 032E8 808CE0A8 00042403 */ sra $a0, $a0, 16 /* 032EC 808CE0AC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -123,7 +123,7 @@ glabel func_808CE01C /* 03390 808CE150 4405B000 */ mfc1 $a1, $f22 /* 03394 808CE154 4406B000 */ mfc1 $a2, $f22 /* 03398 808CE158 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD -/* 0339C 808CE15C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0339C 808CE15C 0C01E107 */ jal Math_ApproachF /* 033A0 808CE160 02412021 */ addu $a0, $s2, $at /* 033A4 808CE164 10000071 */ beq $zero, $zero, .L808CE32C @@ -142,7 +142,7 @@ glabel func_808CE01C /* 033D4 808CE194 00812023 */ subu $a0, $a0, $at /* 033D8 808CE198 00042240 */ sll $a0, $a0, 9 /* 033DC 808CE19C 00042400 */ sll $a0, $a0, 16 -/* 033E0 808CE1A0 0C01DE1C */ jal Math_Sins +/* 033E0 808CE1A0 0C01DE1C */ jal Math_SinS ## sins? /* 033E4 808CE1A4 00042403 */ sra $a0, $a0, 16 /* 033E8 808CE1A8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -160,7 +160,7 @@ glabel func_808CE01C /* 03418 808CE1D8 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E19999A /* 0341C 808CE1DC 46049180 */ add.s $f6, $f18, $f4 /* 03420 808CE1E0 44053000 */ mfc1 $a1, $f6 -/* 03424 808CE1E4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03424 808CE1E4 0C01E107 */ jal Math_ApproachF /* 03428 808CE1E8 00000000 */ nop /* 0342C 808CE1EC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -189,7 +189,7 @@ glabel func_808CE01C /* 03484 808CE244 00812023 */ subu $a0, $a0, $at /* 03488 808CE248 00042280 */ sll $a0, $a0, 10 /* 0348C 808CE24C 00042400 */ sll $a0, $a0, 16 -/* 03490 808CE250 0C01DE1C */ jal Math_Sins +/* 03490 808CE250 0C01DE1C */ jal Math_SinS ## sins? /* 03494 808CE254 00042403 */ sra $a0, $a0, 16 /* 03498 808CE258 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -207,7 +207,7 @@ glabel func_808CE01C /* 034C8 808CE288 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 034CC 808CE28C 46105480 */ add.s $f18, $f10, $f16 /* 034D0 808CE290 44059000 */ mfc1 $a1, $f18 -/* 034D4 808CE294 0C01E107 */ jal Math_SmoothScaleMaxF +/* 034D4 808CE294 0C01E107 */ jal Math_ApproachF /* 034D8 808CE298 00000000 */ nop /* 034DC 808CE29C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -234,7 +234,7 @@ glabel func_808CE01C /* 0352C 808CE2EC 4406B000 */ mfc1 $a2, $f22 /* 03530 808CE2F0 4405E000 */ mfc1 $a1, $f28 /* 03534 808CE2F4 02412021 */ addu $a0, $s2, $at -/* 03538 808CE2F8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03538 808CE2F8 0C01E107 */ jal Math_ApproachF /* 0353C 808CE2FC 34E7C28F */ ori $a3, $a3, 0xC28F ## $a3 = 3CF5C28F /* 03540 808CE300 3C01808D */ lui $at, %hi(D_808D1F5C) ## $at = 808D0000 @@ -274,20 +274,20 @@ glabel func_808CE01C /* 035B8 808CE378 44050000 */ mfc1 $a1, $f0 /* 035BC 808CE37C 4406B000 */ mfc1 $a2, $f22 /* 035C0 808CE380 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 -/* 035C4 808CE384 0C01E107 */ jal Math_SmoothScaleMaxF +/* 035C4 808CE384 0C01E107 */ jal Math_ApproachF /* 035C8 808CE388 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 035CC 808CE38C 4405A000 */ mfc1 $a1, $f20 /* 035D0 808CE390 4406B000 */ mfc1 $a2, $f22 /* 035D4 808CE394 26240290 */ addiu $a0, $s1, 0x0290 ## $a0 = 00000290 -/* 035D8 808CE398 0C01E107 */ jal Math_SmoothScaleMaxF +/* 035D8 808CE398 0C01E107 */ jal Math_ApproachF /* 035DC 808CE39C 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 035E0 808CE3A0 86280226 */ lh $t0, 0x0226($s1) ## 00000226 /* 035E4 808CE3A4 31090007 */ andi $t1, $t0, 0x0007 ## $t1 = 00000000 /* 035E8 808CE3A8 5520000C */ bnel $t1, $zero, .L808CE3DC /* 035EC 808CE3AC 8622022C */ lh $v0, 0x022C($s1) ## 0000022C -/* 035F0 808CE3B0 0C03F66B */ jal Math_Rand_ZeroOne +/* 035F0 808CE3B0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 035F4 808CE3B4 00000000 */ nop /* 035F8 808CE3B8 3C01808D */ lui $at, %hi(D_808D1F60) ## $at = 808D0000 @@ -350,7 +350,7 @@ glabel func_808CE01C /* 036BC 808CE47C 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 /* 036C0 808CE480 44071000 */ mfc1 $a3, $f2 /* 036C4 808CE484 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 036C8 808CE488 0C01E107 */ jal Math_SmoothScaleMaxF +/* 036C8 808CE488 0C01E107 */ jal Math_ApproachF /* 036CC 808CE48C 262413CC */ addiu $a0, $s1, 0x13CC ## $a0 = 000013CC /* 036D0 808CE490 8622022E */ lh $v0, 0x022E($s1) ## 0000022E @@ -406,19 +406,19 @@ glabel func_808CE01C /* 03784 808CE544 4481A000 */ mtc1 $at, $f20 ## $f20 = 20.00 /* 03788 808CE548 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 .L808CE54C: -/* 0378C 808CE54C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0378C 808CE54C 0C00CFC8 */ jal Rand_CenteredFloat /* 03790 808CE550 4600D306 */ mov.s $f12, $f26 /* 03794 808CE554 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 03798 808CE558 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 0379C 808CE55C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0379C 808CE55C 0C00CFBE */ jal Rand_ZeroFloat /* 037A0 808CE560 E7A000D0 */ swc1 $f0, 0x00D0($sp) /* 037A4 808CE564 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 037A8 808CE568 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 /* 037AC 808CE56C 4600D306 */ mov.s $f12, $f26 /* 037B0 808CE570 460A0400 */ add.s $f16, $f0, $f10 -/* 037B4 808CE574 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 037B4 808CE574 0C00CFC8 */ jal Rand_CenteredFloat /* 037B8 808CE578 E7B000D4 */ swc1 $f16, 0x00D4($sp) /* 037BC 808CE57C C7A600D0 */ lwc1 $f6, 0x00D0($sp) @@ -440,12 +440,12 @@ glabel func_808CE01C /* 037FC 808CE5BC E7B000B8 */ swc1 $f16, 0x00B8($sp) /* 03800 808CE5C0 C63202D0 */ lwc1 $f18, 0x02D0($s1) ## 000002D0 /* 03804 808CE5C4 46089100 */ add.s $f4, $f18, $f8 -/* 03808 808CE5C8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 03808 808CE5C8 0C00CFBE */ jal Rand_ZeroFloat /* 0380C 808CE5CC E7A400C0 */ swc1 $f4, 0x00C0($sp) /* 03810 808CE5D0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 03814 808CE5D4 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 03818 808CE5D8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 03818 808CE5D8 0C00CFBE */ jal Rand_ZeroFloat /* 0381C 808CE5DC E7A00074 */ swc1 $f0, 0x0074($sp) /* 03820 808CE5E0 C7AA0074 */ lwc1 $f10, 0x0074($sp) @@ -490,19 +490,19 @@ glabel func_808CE01C /* 038B8 808CE678 4481A000 */ mtc1 $at, $f20 ## $f20 = 50.00 /* 038BC 808CE67C 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 .L808CE680: -/* 038C0 808CE680 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 038C0 808CE680 0C00CFC8 */ jal Rand_CenteredFloat /* 038C4 808CE684 4600B306 */ mov.s $f12, $f22 /* 038C8 808CE688 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 038CC 808CE68C 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 -/* 038D0 808CE690 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 038D0 808CE690 0C00CFBE */ jal Rand_ZeroFloat /* 038D4 808CE694 E7A000D0 */ swc1 $f0, 0x00D0($sp) /* 038D8 808CE698 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 038DC 808CE69C 44819000 */ mtc1 $at, $f18 ## $f18 = 3.00 /* 038E0 808CE6A0 4600B306 */ mov.s $f12, $f22 /* 038E4 808CE6A4 46120200 */ add.s $f8, $f0, $f18 -/* 038E8 808CE6A8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 038E8 808CE6A8 0C00CFC8 */ jal Rand_CenteredFloat /* 038EC 808CE6AC E7A800D4 */ swc1 $f8, 0x00D4($sp) /* 038F0 808CE6B0 C7B000D0 */ lwc1 $f16, 0x00D0($sp) @@ -553,15 +553,15 @@ glabel func_808CE01C /* 039A0 808CE760 AFAF0070 */ sw $t7, 0x0070($sp) /* 039A4 808CE764 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 .L808CE768: -/* 039A8 808CE768 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 039A8 808CE768 0C00CFC8 */ jal Rand_CenteredFloat /* 039AC 808CE76C 4600D306 */ mov.s $f12, $f26 /* 039B0 808CE770 E7A000D0 */ swc1 $f0, 0x00D0($sp) -/* 039B4 808CE774 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 039B4 808CE774 0C00CFBE */ jal Rand_ZeroFloat /* 039B8 808CE778 4600B306 */ mov.s $f12, $f22 /* 039BC 808CE77C E7A000D4 */ swc1 $f0, 0x00D4($sp) -/* 039C0 808CE780 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 039C0 808CE780 0C00CFC8 */ jal Rand_CenteredFloat /* 039C4 808CE784 4600D306 */ mov.s $f12, $f26 /* 039C8 808CE788 3C01808D */ lui $at, %hi(D_808D1F74) ## $at = 808D0000 @@ -569,35 +569,35 @@ glabel func_808CE01C /* 039D0 808CE790 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 039D4 808CE794 44816000 */ mtc1 $at, $f12 ## $f12 = 0.50 /* 039D8 808CE798 E7A000D8 */ swc1 $f0, 0x00D8($sp) -/* 039DC 808CE79C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 039DC 808CE79C 0C00CFC8 */ jal Rand_CenteredFloat /* 039E0 808CE7A0 E7B200C8 */ swc1 $f18, 0x00C8($sp) /* 039E4 808CE7A4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 039E8 808CE7A8 44816000 */ mtc1 $at, $f12 ## $f12 = 0.50 -/* 039EC 808CE7AC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 039EC 808CE7AC 0C00CFC8 */ jal Rand_CenteredFloat /* 039F0 808CE7B0 E7A000C4 */ swc1 $f0, 0x00C4($sp) /* 039F4 808CE7B4 E7A000CC */ swc1 $f0, 0x00CC($sp) -/* 039F8 808CE7B8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 039F8 808CE7B8 0C00CFC8 */ jal Rand_CenteredFloat /* 039FC 808CE7BC 4600A306 */ mov.s $f12, $f20 /* 03A00 808CE7C0 C62802C8 */ lwc1 $f8, 0x02C8($s1) ## 000002C8 /* 03A04 808CE7C4 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 03A08 808CE7C8 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 03A0C 808CE7CC 46080400 */ add.s $f16, $f0, $f8 -/* 03A10 808CE7D0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 03A10 808CE7D0 0C00CFBE */ jal Rand_ZeroFloat /* 03A14 808CE7D4 E7B000B8 */ swc1 $f16, 0x00B8($sp) /* 03A18 808CE7D8 46180100 */ add.s $f4, $f0, $f24 /* 03A1C 808CE7DC 4600A306 */ mov.s $f12, $f20 -/* 03A20 808CE7E0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 03A20 808CE7E0 0C00CFC8 */ jal Rand_CenteredFloat /* 03A24 808CE7E4 E7A400BC */ swc1 $f4, 0x00BC($sp) /* 03A28 808CE7E8 C62602D0 */ lwc1 $f6, 0x02D0($s1) ## 000002D0 /* 03A2C 808CE7EC 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 03A30 808CE7F0 44816000 */ mtc1 $at, $f12 ## $f12 = 1.50 /* 03A34 808CE7F4 46060280 */ add.s $f10, $f0, $f6 -/* 03A38 808CE7F8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 03A38 808CE7F8 0C00CFBE */ jal Rand_ZeroFloat /* 03A3C 808CE7FC E7AA00C0 */ swc1 $f10, 0x00C0($sp) /* 03A40 808CE800 4600048D */ trunc.w.s $f18, $f0 @@ -717,7 +717,7 @@ glabel func_808CE01C /* 03BF8 808CE9B8 86240226 */ lh $a0, 0x0226($s1) ## 00000226 /* 03BFC 808CE9BC 00042340 */ sll $a0, $a0, 13 /* 03C00 808CE9C0 00042400 */ sll $a0, $a0, 16 -/* 03C04 808CE9C4 0C01DE1C */ jal Math_Sins +/* 03C04 808CE9C4 0C01DE1C */ jal Math_SinS ## sins? /* 03C08 808CE9C8 00042403 */ sra $a0, $a0, 16 /* 03C0C 808CE9CC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -759,7 +759,7 @@ glabel func_808CE01C /* 03C9C 808CEA5C 86240226 */ lh $a0, 0x0226($s1) ## 00000226 /* 03CA0 808CEA60 00042340 */ sll $a0, $a0, 13 /* 03CA4 808CEA64 00042400 */ sll $a0, $a0, 16 -/* 03CA8 808CEA68 0C01DE1C */ jal Math_Sins +/* 03CA8 808CEA68 0C01DE1C */ jal Math_SinS ## sins? /* 03CAC 808CEA6C 00042403 */ sra $a0, $a0, 16 /* 03CB0 808CEA70 46140282 */ mul.s $f10, $f0, $f20 @@ -788,12 +788,12 @@ glabel func_808CE01C /* 03D0C 808CEACC E7B000A4 */ swc1 $f16, 0x00A4($sp) .L808CEAD0: /* 03D10 808CEAD0 3C01808D */ lui $at, %hi(D_808D1F80) ## $at = 808D0000 -/* 03D14 808CEAD4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 03D14 808CEAD4 0C00CFBE */ jal Rand_ZeroFloat /* 03D18 808CEAD8 C42C1F80 */ lwc1 $f12, %lo(D_808D1F80)($at) /* 03D1C 808CEADC 3C01808D */ lui $at, %hi(D_808D1F84) ## $at = 808D0000 /* 03D20 808CEAE0 C42C1F84 */ lwc1 $f12, %lo(D_808D1F84)($at) -/* 03D24 808CEAE4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 03D24 808CEAE4 0C00CFBE */ jal Rand_ZeroFloat /* 03D28 808CEAE8 E7A000AC */ swc1 $f0, 0x00AC($sp) /* 03D2C 808CEAEC C7AC00AC */ lwc1 $f12, 0x00AC($sp) @@ -818,7 +818,7 @@ glabel func_808CE01C /* 03D78 808CEB38 E7A60088 */ swc1 $f6, 0x0088($sp) /* 03D7C 808CEB3C 46162183 */ div.s $f6, $f4, $f22 /* 03D80 808CEB40 E7B0008C */ swc1 $f16, 0x008C($sp) -/* 03D84 808CEB44 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 03D84 808CEB44 0C00CFBE */ jal Rand_ZeroFloat /* 03D88 808CEB48 E7A60090 */ swc1 $f6, 0x0090($sp) /* 03D8C 808CEB4C 4600028D */ trunc.w.s $f10, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF448.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF448.s index e95bfa45c0..c8ecab5804 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF448.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF448.s @@ -148,7 +148,7 @@ glabel func_808CF448 /* 04884 808CF644 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000001 /* 04888 808CF648 5580000B */ bnel $t4, $zero, .L808CF678 /* 0488C 808CF64C 244D0001 */ addiu $t5, $v0, 0x0001 ## $t5 = 00000001 -/* 04890 808CF650 0C03F66B */ jal Math_Rand_ZeroOne +/* 04890 808CF650 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 04894 808CF654 00000000 */ nop /* 04898 808CF658 3C01808D */ lui $at, %hi(D_808D1FA0) ## $at = 808D0000 @@ -206,7 +206,7 @@ glabel func_808CF448 /* 04960 808CF720 1720000C */ bne $t9, $zero, .L808CF754 .L808CF724: /* 04964 808CF724 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 04968 808CF728 0C01DF64 */ jal Math_Rand_S16Offset +/* 04968 808CF728 0C01DF64 */ jal Rand_S16Offset /* 0496C 808CF72C 240500C8 */ addiu $a1, $zero, 0x00C8 ## $a1 = 000000C8 /* 04970 808CF730 02504021 */ addu $t0, $s2, $s0 @@ -273,7 +273,7 @@ glabel func_808CF448 /* 04A50 808CF810 4405B000 */ mfc1 $a1, $f22 /* 04A54 808CF814 4406F000 */ mfc1 $a2, $f30 /* 04A58 808CF818 4407F000 */ mfc1 $a3, $f30 -/* 04A5C 808CF81C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04A5C 808CF81C 0C01E107 */ jal Math_ApproachF /* 04A60 808CF820 26240030 */ addiu $a0, $s1, 0x0030 ## $a0 = 000019A0 /* 04A64 808CF824 8622002C */ lh $v0, 0x002C($s1) ## 0000199C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s index ca33094e74..3ba1e0402b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s @@ -395,7 +395,7 @@ glabel func_808D08F8 /* 06014 808D0DD4 44044000 */ mfc1 $a0, $f8 /* 06018 808D0DD8 00000000 */ nop /* 0601C 808D0DDC 00042400 */ sll $a0, $a0, 16 -/* 06020 808D0DE0 0C01DE1C */ jal Math_Sins +/* 06020 808D0DE0 0C01DE1C */ jal Math_SinS ## sins? /* 06024 808D0DE4 00042403 */ sra $a0, $a0, 16 /* 06028 808D0DE8 E7A0008C */ swc1 $f0, 0x008C($sp) @@ -411,7 +411,7 @@ glabel func_808D08F8 /* 06050 808D0E10 44044000 */ mfc1 $a0, $f8 /* 06054 808D0E14 00000000 */ nop /* 06058 808D0E18 00042400 */ sll $a0, $a0, 16 -/* 0605C 808D0E1C 0C01DE1C */ jal Math_Sins +/* 0605C 808D0E1C 0C01DE1C */ jal Math_SinS ## sins? /* 06060 808D0E20 00042403 */ sra $a0, $a0, 16 /* 06064 808D0E24 C6620280 */ lwc1 $f2, 0x0280($s3) ## 00000280 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2670.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2670.s index d68bcc878a..8871e25ae0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2670.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2670.s @@ -37,13 +37,13 @@ glabel func_808D2670 /* 00088 808D26F8 C7A4002C */ lwc1 $f4, 0x002C($sp) /* 0008C 808D26FC 46062203 */ div.s $f8, $f4, $f6 /* 00090 808D2700 E4A80030 */ swc1 $f8, 0x0030($a1) ## 00000030 -/* 00094 808D2704 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00094 808D2704 0C00CFBE */ jal Rand_ZeroFloat /* 00098 808D2708 AFA5001C */ sw $a1, 0x001C($sp) /* 0009C 808D270C 8FA5001C */ lw $a1, 0x001C($sp) /* 000A0 808D2710 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 000A4 808D2714 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 000A8 808D2718 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 000A8 808D2718 0C00CFBE */ jal Rand_ZeroFloat /* 000AC 808D271C E4A00034 */ swc1 $f0, 0x0034($a1) ## 00000034 /* 000B0 808D2720 8FA5001C */ lw $a1, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2748.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2748.s index 0ad8b0fd64..f05017ada3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2748.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2748.s @@ -49,7 +49,7 @@ glabel func_808D2748 /* 00190 808D2800 E4A80008 */ swc1 $f8, 0x0008($a1) ## 00000008 /* 00194 808D2804 87AD0032 */ lh $t5, 0x0032($sp) /* 00198 808D2808 A4AD002A */ sh $t5, 0x002A($a1) ## 0000002A -/* 0019C 808D280C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0019C 808D280C 0C00CFBE */ jal Rand_ZeroFloat /* 001A0 808D2810 AFA5001C */ sw $a1, 0x001C($sp) /* 001A4 808D2814 8FA5001C */ lw $a1, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D285C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D285C.s index d48b46ab37..0b223f18f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D285C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D285C.s @@ -39,7 +39,7 @@ glabel func_808D285C /* 0027C 808D28EC A4AD002A */ sh $t5, 0x002A($a1) ## 0000002A /* 00280 808D28F0 46062203 */ div.s $f8, $f4, $f6 /* 00284 808D28F4 E4A80030 */ swc1 $f8, 0x0030($a1) ## 00000030 -/* 00288 808D28F8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00288 808D28F8 0C00CFBE */ jal Rand_ZeroFloat /* 0028C 808D28FC AFA5001C */ sw $a1, 0x001C($sp) /* 00290 808D2900 4600028D */ trunc.w.s $f10, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2930.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2930.s index 117473f728..b482541b1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2930.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2930.s @@ -37,13 +37,13 @@ glabel func_808D2930 /* 00348 808D29B8 C7A4002C */ lwc1 $f4, 0x002C($sp) /* 0034C 808D29BC 46062203 */ div.s $f8, $f4, $f6 /* 00350 808D29C0 E4A80030 */ swc1 $f8, 0x0030($a1) ## 00000030 -/* 00354 808D29C4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00354 808D29C4 0C00CFBE */ jal Rand_ZeroFloat /* 00358 808D29C8 AFA5001C */ sw $a1, 0x001C($sp) /* 0035C 808D29CC 8FA5001C */ lw $a1, 0x001C($sp) /* 00360 808D29D0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00364 808D29D4 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 00368 808D29D8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00368 808D29D8 0C00CFBE */ jal Rand_ZeroFloat /* 0036C 808D29DC E4A00034 */ swc1 $f0, 0x0034($a1) ## 00000034 /* 00370 808D29E0 8FA5001C */ lw $a1, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2BD0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2BD0.s index ebd4ee6f2b..08b00b630f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2BD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2BD0.s @@ -34,7 +34,7 @@ glabel func_808D2BD0 /* 005A4 808D2C14 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 /* 005A8 808D2C18 3C01808D */ lui $at, %hi(D_808D647C) ## $at = 808D0000 /* 005AC 808D2C1C E6040168 */ swc1 $f4, 0x0168($s0) ## 00000168 -/* 005B0 808D2C20 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 005B0 808D2C20 0C00CFBE */ jal Rand_ZeroFloat /* 005B4 808D2C24 C42C647C */ lwc1 $f12, %lo(D_808D647C)($at) /* 005B8 808D2C28 4600018D */ trunc.w.s $f6, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2CE0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2CE0.s index b999d6cf75..24e2d620db 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2CE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2CE0.s @@ -165,7 +165,7 @@ glabel func_808D2CE0 /* 0082C 808D2E9C 10400017 */ beq $v0, $zero, .L808D2EFC /* 00830 808D2EA0 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF /* 00834 808D2EA4 A64F01AC */ sh $t7, 0x01AC($s2) ## 000001AC -/* 00838 808D2EA8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00838 808D2EA8 0C00CFBE */ jal Rand_ZeroFloat /* 0083C 808D2EAC C42C6480 */ lwc1 $f12, %lo(D_808D6480)($at) /* 00840 808D2EB0 4600048D */ trunc.w.s $f18, $f0 @@ -215,7 +215,7 @@ glabel func_808D2CE0 /* 008E4 808D2F54 A64E00B6 */ sh $t6, 0x00B6($s2) ## 000000B6 /* 008E8 808D2F58 E6520028 */ swc1 $f18, 0x0028($s2) ## 00000028 .L808D2F5C: -/* 008EC 808D2F5C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 008EC 808D2F5C 0C00CFC8 */ jal Rand_CenteredFloat /* 008F0 808D2F60 4600A306 */ mov.s $f12, $f20 /* 008F4 808D2F64 0011C080 */ sll $t8, $s1, 2 @@ -225,19 +225,19 @@ glabel func_808D2CE0 /* 00904 808D2F74 C60410C8 */ lwc1 $f4, 0x10C8($s0) ## 000010C8 /* 00908 808D2F78 4600A306 */ mov.s $f12, $f20 /* 0090C 808D2F7C 46002180 */ add.s $f6, $f4, $f0 -/* 00910 808D2F80 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00910 808D2F80 0C00CFC8 */ jal Rand_CenteredFloat /* 00914 808D2F84 E60610C8 */ swc1 $f6, 0x10C8($s0) ## 000010C8 /* 00918 808D2F88 C60810D0 */ lwc1 $f8, 0x10D0($s0) ## 000010D0 /* 0091C 808D2F8C 4600A306 */ mov.s $f12, $f20 /* 00920 808D2F90 46004280 */ add.s $f10, $f8, $f0 -/* 00924 808D2F94 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00924 808D2F94 0C00CFC8 */ jal Rand_CenteredFloat /* 00928 808D2F98 E60A10D0 */ swc1 $f10, 0x10D0($s0) ## 000010D0 /* 0092C 808D2F9C C6101264 */ lwc1 $f16, 0x1264($s0) ## 00001264 /* 00930 808D2FA0 4600A306 */ mov.s $f12, $f20 /* 00934 808D2FA4 46008480 */ add.s $f18, $f16, $f0 -/* 00938 808D2FA8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00938 808D2FA8 0C00CFC8 */ jal Rand_CenteredFloat /* 0093C 808D2FAC E6121264 */ swc1 $f18, 0x1264($s0) ## 00001264 /* 00940 808D2FB0 C604126C */ lwc1 $f4, 0x126C($s0) ## 0000126C @@ -255,7 +255,7 @@ glabel func_808D2CE0 .L808D2FE0: /* 00970 808D2FE0 8645008A */ lh $a1, 0x008A($s2) ## 0000008A /* 00974 808D2FE4 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00978 808D2FE8 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 00978 808D2FE8 0C01E1EF */ jal Math_ApproachS /* 0097C 808D2FEC 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 00980 808D2FF0 864901BC */ lh $t1, 0x01BC($s2) ## 000001BC diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3140.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3140.s index 03ff7f5cef..9225c9b926 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3140.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3140.s @@ -24,7 +24,7 @@ glabel func_808D3140 /* 00AFC 808D316C A7AE0036 */ sh $t6, 0x0036($sp) /* 00B00 808D3170 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 00B04 808D3174 AFA00010 */ sw $zero, 0x0010($sp) -/* 00B08 808D3178 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00B08 808D3178 0C01E1A7 */ jal Math_SmoothStepToS /* 00B0C 808D317C 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 00B10 808D3180 A6020196 */ sh $v0, 0x0196($s0) ## 00000196 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3330.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3330.s index d2875e3def..7c6cedd0d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3330.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3330.s @@ -25,7 +25,7 @@ glabel func_808D3330 /* 00D14 808D3384 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 00D18 808D3388 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00D1C 808D338C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 00D20 808D3390 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00D20 808D3390 0C01E107 */ jal Math_ApproachF /* 00D24 808D3394 AFA20024 */ sw $v0, 0x0024($sp) /* 00D28 808D3398 861901BC */ lh $t9, 0x01BC($s0) ## 000001BC diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3464.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3464.s index cd10103313..fdf5cf0d54 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3464.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3464.s @@ -94,7 +94,7 @@ glabel func_808D3464 /* 00F30 808D35A0 46128581 */ sub.s $f22, $f16, $f18 /* 00F34 808D35A4 4600A386 */ mov.s $f14, $f20 /* 00F38 808D35A8 460A4601 */ sub.s $f24, $f8, $f10 -/* 00F3C 808D35AC 0C034199 */ jal atan2s +/* 00F3C 808D35AC 0C034199 */ jal Math_Atan2S /* 00F40 808D35B0 4600B306 */ mov.s $f12, $f22 /* 00F44 808D35B4 4614A102 */ mul.s $f4, $f20, $f20 @@ -102,7 +102,7 @@ glabel func_808D3464 /* 00F4C 808D35BC A7A200B4 */ sh $v0, 0x00B4($sp) /* 00F50 808D35C0 4616B182 */ mul.s $f6, $f22, $f22 /* 00F54 808D35C4 46062000 */ add.s $f0, $f4, $f6 -/* 00F58 808D35C8 0C034199 */ jal atan2s +/* 00F58 808D35C8 0C034199 */ jal Math_Atan2S /* 00F5C 808D35CC 46000304 */ sqrt.s $f12, $f0 /* 00F60 808D35D0 87A500B4 */ lh $a1, 0x00B4($sp) @@ -133,26 +133,26 @@ glabel func_808D3464 /* 00FB8 808D3628 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 00FBC 808D362C 2411F060 */ addiu $s1, $zero, 0xF060 ## $s1 = FFFFF060 .L808D3630: -/* 00FC0 808D3630 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 00FC0 808D3630 0C01E1EF */ jal Math_ApproachS /* 00FC4 808D3634 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 00FC8 808D3638 00112C00 */ sll $a1, $s1, 16 /* 00FCC 808D363C 00052C03 */ sra $a1, $a1, 16 /* 00FD0 808D3640 2604021C */ addiu $a0, $s0, 0x021C ## $a0 = 0000021C /* 00FD4 808D3644 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 00FD8 808D3648 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 00FD8 808D3648 0C01E1EF */ jal Math_ApproachS /* 00FDC 808D364C 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 00FE0 808D3650 10000009 */ beq $zero, $zero, .L808D3678 /* 00FE4 808D3654 87AA00B2 */ lh $t2, 0x00B2($sp) .L808D3658: -/* 00FE8 808D3658 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 00FE8 808D3658 0C01E1EF */ jal Math_ApproachS /* 00FEC 808D365C 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 00FF0 808D3660 2604021C */ addiu $a0, $s0, 0x021C ## $a0 = 0000021C /* 00FF4 808D3664 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00FF8 808D3668 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 00FFC 808D366C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 00FFC 808D366C 0C01E1EF */ jal Math_ApproachS /* 01000 808D3670 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 01004 808D3674 87AA00B2 */ lh $t2, 0x00B2($sp) @@ -223,7 +223,7 @@ glabel func_808D3464 /* 01104 808D3774 8604019C */ lh $a0, 0x019C($s0) ## 0000019C /* 01108 808D3778 00042340 */ sll $a0, $a0, 13 /* 0110C 808D377C 00042400 */ sll $a0, $a0, 16 -/* 01110 808D3780 0C01DE1C */ jal Math_Sins +/* 01110 808D3780 0C01DE1C */ jal Math_SinS ## sins? /* 01114 808D3784 00042403 */ sra $a0, $a0, 16 /* 01118 808D3788 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -268,7 +268,7 @@ glabel func_808D3464 /* 011B4 808D3824 8604019C */ lh $a0, 0x019C($s0) ## 0000019C /* 011B8 808D3828 00042340 */ sll $a0, $a0, 13 /* 011BC 808D382C 00042400 */ sll $a0, $a0, 16 -/* 011C0 808D3830 0C01DE1C */ jal Math_Sins +/* 011C0 808D3830 0C01DE1C */ jal Math_SinS ## sins? /* 011C4 808D3834 00042403 */ sra $a0, $a0, 16 /* 011C8 808D3838 46140202 */ mul.s $f8, $f0, $f20 @@ -302,11 +302,11 @@ glabel func_808D3464 /* 01238 808D38A8 E7B00090 */ swc1 $f16, 0x0090($sp) /* 0123C 808D38AC E7A40098 */ swc1 $f4, 0x0098($sp) .L808D38B0: -/* 01240 808D38B0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01240 808D38B0 0C00CFBE */ jal Rand_ZeroFloat /* 01244 808D38B4 4600E306 */ mov.s $f12, $f28 /* 01248 808D38B8 46000506 */ mov.s $f20, $f0 -/* 0124C 808D38BC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0124C 808D38BC 0C00CFBE */ jal Rand_ZeroFloat /* 01250 808D38C0 4600E306 */ mov.s $f12, $f28 /* 01254 808D38C4 46000586 */ mov.s $f22, $f0 @@ -332,7 +332,7 @@ glabel func_808D3464 /* 012A4 808D3914 E7A60078 */ swc1 $f6, 0x0078($sp) /* 012A8 808D3918 461A4183 */ div.s $f6, $f8, $f26 /* 012AC 808D391C E7A4007C */ swc1 $f4, 0x007C($sp) -/* 012B0 808D3920 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 012B0 808D3920 0C00CFBE */ jal Rand_ZeroFloat /* 012B4 808D3924 E7A60080 */ swc1 $f6, 0x0080($sp) /* 012B8 808D3928 4600040D */ trunc.w.s $f16, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3AE0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3AE0.s index 2627431176..2fd27ea1f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3AE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3AE0.s @@ -69,40 +69,40 @@ glabel func_808D3AE0 /* 01568 808D3BD8 AE280000 */ sw $t0, 0x0000($s1) ## FFFFFFE0 /* 0156C 808D3BDC 8E680008 */ lw $t0, 0x0008($s3) ## 808D61CC /* 01570 808D3BE0 AE390004 */ sw $t9, 0x0004($s1) ## FFFFFFE4 -/* 01574 808D3BE4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01574 808D3BE4 0C00CFC8 */ jal Rand_CenteredFloat /* 01578 808D3BE8 AE280008 */ sw $t0, 0x0008($s1) ## FFFFFFE8 /* 0157C 808D3BEC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01580 808D3BF0 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 01584 808D3BF4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01584 808D3BF4 0C00CFBE */ jal Rand_ZeroFloat /* 01588 808D3BF8 E7A00084 */ swc1 $f0, 0x0084($sp) /* 0158C 808D3BFC E7A00088 */ swc1 $f0, 0x0088($sp) -/* 01590 808D3C00 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01590 808D3C00 0C00CFC8 */ jal Rand_CenteredFloat /* 01594 808D3C04 4600B306 */ mov.s $f12, $f22 /* 01598 808D3C08 E7A0008C */ swc1 $f0, 0x008C($sp) /* 0159C 808D3C0C E7B8007C */ swc1 $f24, 0x007C($sp) -/* 015A0 808D3C10 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 015A0 808D3C10 0C00CFC8 */ jal Rand_CenteredFloat /* 015A4 808D3C14 4600A306 */ mov.s $f12, $f20 /* 015A8 808D3C18 C64A0038 */ lwc1 $f10, 0x0038($s2) ## 00000038 /* 015AC 808D3C1C 4600A306 */ mov.s $f12, $f20 /* 015B0 808D3C20 460A0400 */ add.s $f16, $f0, $f10 -/* 015B4 808D3C24 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 015B4 808D3C24 0C00CFC8 */ jal Rand_CenteredFloat /* 015B8 808D3C28 E7B0006C */ swc1 $f16, 0x006C($sp) /* 015BC 808D3C2C C652003C */ lwc1 $f18, 0x003C($s2) ## 0000003C /* 015C0 808D3C30 4600A306 */ mov.s $f12, $f20 /* 015C4 808D3C34 46120100 */ add.s $f4, $f0, $f18 -/* 015C8 808D3C38 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 015C8 808D3C38 0C00CFC8 */ jal Rand_CenteredFloat /* 015CC 808D3C3C E7A40070 */ swc1 $f4, 0x0070($sp) /* 015D0 808D3C40 C6460040 */ lwc1 $f6, 0x0040($s2) ## 00000040 /* 015D4 808D3C44 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 015D8 808D3C48 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 015DC 808D3C4C 46060200 */ add.s $f8, $f0, $f6 -/* 015E0 808D3C50 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 015E0 808D3C50 0C00CFBE */ jal Rand_ZeroFloat /* 015E4 808D3C54 E7A80074 */ swc1 $f8, 0x0074($sp) /* 015E8 808D3C58 461A0280 */ add.s $f10, $f0, $f26 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D98.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D98.s index b3a4c38918..dbf33aaad1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D98.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D98.s @@ -66,7 +66,7 @@ glabel func_808D3D98 .L808D3E80: /* 01810 808D3E80 3C05C2C8 */ lui $a1, 0xC2C8 ## $a1 = C2C80000 /* 01814 808D3E84 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01818 808D3E88 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01818 808D3E88 0C01E107 */ jal Math_ApproachF /* 0181C 808D3E8C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01820 808D3E90 860B01BC */ lh $t3, 0x01BC($s0) ## 000001BC diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3F58.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3F58.s index a2ceb6b7d2..836341f5b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3F58.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3F58.s @@ -15,7 +15,7 @@ glabel func_808D3F58 /* 0191C 808D3F8C 8E0613E8 */ lw $a2, 0x13E8($s0) ## 000013E8 /* 01920 808D3F90 AFA40024 */ sw $a0, 0x0024($sp) /* 01924 808D3F94 44074000 */ mfc1 $a3, $f8 -/* 01928 808D3F98 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01928 808D3F98 0C01E107 */ jal Math_ApproachF /* 0192C 808D3F9C 00000000 */ nop /* 01930 808D3FA0 C60A13C8 */ lwc1 $f10, 0x13C8($s0) ## 000013C8 @@ -25,7 +25,7 @@ glabel func_808D3F58 /* 01940 808D3FB0 46105482 */ mul.s $f18, $f10, $f16 /* 01944 808D3FB4 8E0613EC */ lw $a2, 0x13EC($s0) ## 000013EC /* 01948 808D3FB8 44079000 */ mfc1 $a3, $f18 -/* 0194C 808D3FBC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0194C 808D3FBC 0C01E107 */ jal Math_ApproachF /* 01950 808D3FC0 00000000 */ nop /* 01954 808D3FC4 C60413CC */ lwc1 $f4, 0x13CC($s0) ## 000013CC @@ -35,7 +35,7 @@ glabel func_808D3F58 /* 01964 808D3FD4 46062202 */ mul.s $f8, $f4, $f6 /* 01968 808D3FD8 8E0613F0 */ lw $a2, 0x13F0($s0) ## 000013F0 /* 0196C 808D3FDC 44074000 */ mfc1 $a3, $f8 -/* 01970 808D3FE0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01970 808D3FE0 0C01E107 */ jal Math_ApproachF /* 01974 808D3FE4 00000000 */ nop /* 01978 808D3FE8 C60A13D0 */ lwc1 $f10, 0x13D0($s0) ## 000013D0 @@ -46,7 +46,7 @@ glabel func_808D3F58 /* 0198C 808D3FFC 8E061400 */ lw $a2, 0x1400($s0) ## 00001400 /* 01990 808D4000 AFA40020 */ sw $a0, 0x0020($sp) /* 01994 808D4004 44079000 */ mfc1 $a3, $f18 -/* 01998 808D4008 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01998 808D4008 0C01E107 */ jal Math_ApproachF /* 0199C 808D400C 00000000 */ nop /* 019A0 808D4010 C60413D4 */ lwc1 $f4, 0x13D4($s0) ## 000013D4 @@ -56,7 +56,7 @@ glabel func_808D3F58 /* 019B0 808D4020 46062202 */ mul.s $f8, $f4, $f6 /* 019B4 808D4024 8E061404 */ lw $a2, 0x1404($s0) ## 00001404 /* 019B8 808D4028 44074000 */ mfc1 $a3, $f8 -/* 019BC 808D402C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 019BC 808D402C 0C01E107 */ jal Math_ApproachF /* 019C0 808D4030 00000000 */ nop /* 019C4 808D4034 C60A13D8 */ lwc1 $f10, 0x13D8($s0) ## 000013D8 @@ -66,7 +66,7 @@ glabel func_808D3F58 /* 019D4 808D4044 46105482 */ mul.s $f18, $f10, $f16 /* 019D8 808D4048 8E061408 */ lw $a2, 0x1408($s0) ## 00001408 /* 019DC 808D404C 44079000 */ mfc1 $a3, $f18 -/* 019E0 808D4050 0C01E107 */ jal Math_SmoothScaleMaxF +/* 019E0 808D4050 0C01E107 */ jal Math_ApproachF /* 019E4 808D4054 00000000 */ nop /* 019E8 808D4058 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -75,7 +75,7 @@ glabel func_808D3F58 /* 019F4 808D4064 8E071410 */ lw $a3, 0x1410($s0) ## 00001410 /* 019F8 808D4068 44050000 */ mfc1 $a1, $f0 /* 019FC 808D406C 44060000 */ mfc1 $a2, $f0 -/* 01A00 808D4070 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01A00 808D4070 0C01E107 */ jal Math_ApproachF /* 01A04 808D4074 00000000 */ nop /* 01A08 808D4078 C60413A4 */ lwc1 $f4, 0x13A4($s0) ## 000013A4 @@ -91,7 +91,7 @@ glabel func_808D3F58 /* 01A30 808D40A0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 01A34 808D40A4 26041414 */ addiu $a0, $s0, 0x1414 ## $a0 = 00001414 /* 01A38 808D40A8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01A3C 808D40AC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01A3C 808D40AC 0C01E107 */ jal Math_ApproachF /* 01A40 808D40B0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01A44 808D40B4 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s index a6a67282dc..e96379b553 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s @@ -152,7 +152,7 @@ glabel L808D41FC /* 01C1C 808D428C 44050000 */ mfc1 $a1, $f0 /* 01C20 808D4290 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 /* 01C24 808D4294 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01C28 808D4298 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01C28 808D4298 0C01E107 */ jal Math_ApproachF /* 01C2C 808D429C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 01C30 808D42A0 860E008A */ lh $t6, 0x008A($s0) ## 0000008A @@ -252,7 +252,7 @@ glabel L808D43D4 /* 01D98 808D4408 100000C7 */ beq $zero, $zero, .L808D4728 /* 01D9C 808D440C E606140C */ swc1 $f6, 0x140C($s0) ## 0000140C .L808D4410: -/* 01DA0 808D4410 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01DA0 808D4410 0C01E107 */ jal Math_ApproachF /* 01DA4 808D4414 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 01DA8 808D4418 100000C4 */ beq $zero, $zero, .L808D472C @@ -300,7 +300,7 @@ glabel L808D4420 /* 01E48 808D44B8 AE0813F8 */ sw $t0, 0x13F8($s0) ## 000013F8 /* 01E4C 808D44BC 8C49002C */ lw $t1, 0x002C($v0) ## 0000002C /* 01E50 808D44C0 E60813DC */ swc1 $f8, 0x13DC($s0) ## 000013DC -/* 01E54 808D44C4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01E54 808D44C4 0C01E107 */ jal Math_ApproachF /* 01E58 808D44C8 AE0913FC */ sw $t1, 0x13FC($s0) ## 000013FC /* 01E5C 808D44CC 8FAA0060 */ lw $t2, 0x0060($sp) @@ -312,7 +312,7 @@ glabel L808D4420 /* 01E74 808D44E4 46105480 */ add.s $f18, $f10, $f16 /* 01E78 808D44E8 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 01E7C 808D44EC 44059000 */ mfc1 $a1, $f18 -/* 01E80 808D44F0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01E80 808D44F0 0C01E107 */ jal Math_ApproachF /* 01E84 808D44F4 00000000 */ nop /* 01E88 808D44F8 86020198 */ lh $v0, 0x0198($s0) ## 00000198 @@ -360,7 +360,7 @@ glabel L808D4594 /* 01F24 808D4594 260413F8 */ addiu $a0, $s0, 0x13F8 ## $a0 = 000013F8 /* 01F28 808D4598 3C0542C8 */ lui $a1, 0x42C8 ## $a1 = 42C80000 /* 01F2C 808D459C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01F30 808D45A0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01F30 808D45A0 0C01E107 */ jal Math_ApproachF /* 01F34 808D45A4 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 01F38 808D45A8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -374,7 +374,7 @@ glabel L808D4594 /* 01F58 808D45C8 E60013F4 */ swc1 $f0, 0x13F4($s0) ## 000013F4 /* 01F5C 808D45CC E60013FC */ swc1 $f0, 0x13FC($s0) ## 000013FC /* 01F60 808D45D0 E60013DC */ swc1 $f0, 0x13DC($s0) ## 000013DC -/* 01F64 808D45D4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01F64 808D45D4 0C01E107 */ jal Math_ApproachF /* 01F68 808D45D8 E60813E0 */ swc1 $f8, 0x13E0($s0) ## 000013E0 /* 01F6C 808D45DC 8FA30060 */ lw $v1, 0x0060($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4790.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4790.s index 59d60a395e..d04b572182 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4790.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4790.s @@ -140,19 +140,19 @@ glabel func_808D4790 /* 022DC 808D494C 8DF80004 */ lw $t8, 0x0004($t7) ## 808D61E0 /* 022E0 808D4950 AE580004 */ sw $t8, 0x0004($s2) ## FFFFFFDC /* 022E4 808D4954 8DEE0008 */ lw $t6, 0x0008($t7) ## 808D61E4 -/* 022E8 808D4958 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 022E8 808D4958 0C00CFC8 */ jal Rand_CenteredFloat /* 022EC 808D495C AE4E0008 */ sw $t6, 0x0008($s2) ## FFFFFFE0 /* 022F0 808D4960 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 022F4 808D4964 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 022F8 808D4968 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 022F8 808D4968 0C00CFBE */ jal Rand_ZeroFloat /* 022FC 808D496C E7A0008C */ swc1 $f0, 0x008C($sp) /* 02300 808D4970 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 02304 808D4974 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 /* 02308 808D4978 4600A306 */ mov.s $f12, $f20 /* 0230C 808D497C 46040180 */ add.s $f6, $f0, $f4 -/* 02310 808D4980 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02310 808D4980 0C00CFC8 */ jal Rand_CenteredFloat /* 02314 808D4984 E7A60090 */ swc1 $f6, 0x0090($sp) /* 02318 808D4988 E7A00094 */ swc1 $f0, 0x0094($sp) @@ -163,7 +163,7 @@ glabel func_808D4790 /* 0232C 808D499C C66A003C */ lwc1 $f10, 0x003C($s3) ## 0000003C /* 02330 808D49A0 E7AA0078 */ swc1 $f10, 0x0078($sp) /* 02334 808D49A4 C6700040 */ lwc1 $f16, 0x0040($s3) ## 00000040 -/* 02338 808D49A8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 02338 808D49A8 0C00CFBE */ jal Rand_ZeroFloat /* 0233C 808D49AC E7B0007C */ swc1 $f16, 0x007C($sp) /* 02340 808D49B0 4600048D */ trunc.w.s $f18, $f0 @@ -307,17 +307,17 @@ glabel func_808D4790 /* 02524 808D4B94 8D4C0004 */ lw $t4, 0x0004($t2) ## 808D61F8 /* 02528 808D4B98 AE4C0004 */ sw $t4, 0x0004($s2) ## FFFFFFB4 /* 0252C 808D4B9C 8D4B0008 */ lw $t3, 0x0008($t2) ## 808D61FC -/* 02530 808D4BA0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02530 808D4BA0 0C00CFC8 */ jal Rand_CenteredFloat /* 02534 808D4BA4 AE4B0008 */ sw $t3, 0x0008($s2) ## FFFFFFB8 /* 02538 808D4BA8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 0253C 808D4BAC 44816000 */ mtc1 $at, $f12 ## $f12 = 4.00 -/* 02540 808D4BB0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 02540 808D4BB0 0C00CFBE */ jal Rand_ZeroFloat /* 02544 808D4BB4 E7A00064 */ swc1 $f0, 0x0064($sp) /* 02548 808D4BB8 46140200 */ add.s $f8, $f0, $f20 /* 0254C 808D4BBC 4600A306 */ mov.s $f12, $f20 -/* 02550 808D4BC0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02550 808D4BC0 0C00CFC8 */ jal Rand_CenteredFloat /* 02554 808D4BC4 E7A80068 */ swc1 $f8, 0x0068($sp) /* 02558 808D4BC8 E7A0006C */ swc1 $f0, 0x006C($sp) @@ -327,7 +327,7 @@ glabel func_808D4790 /* 02568 808D4BD8 C670003C */ lwc1 $f16, 0x003C($s3) ## 0000003C /* 0256C 808D4BDC E7B00050 */ swc1 $f16, 0x0050($sp) /* 02570 808D4BE0 C6720040 */ lwc1 $f18, 0x0040($s3) ## 00000040 -/* 02574 808D4BE4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 02574 808D4BE4 0C00CFBE */ jal Rand_ZeroFloat /* 02578 808D4BE8 E7B20054 */ swc1 $f18, 0x0054($sp) /* 0257C 808D4BEC 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4C68.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4C68.s index b9e3d6a025..7b382f5168 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4C68.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4C68.s @@ -28,7 +28,7 @@ glabel func_808D4C68 /* 02634 808D4CA4 31090007 */ andi $t1, $t0, 0x0007 ## $t1 = 00000000 /* 02638 808D4CA8 5520000C */ bnel $t1, $zero, .L808D4CDC /* 0263C 808D4CAC 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 02640 808D4CB0 0C03F66B */ jal Math_Rand_ZeroOne +/* 02640 808D4CB0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02644 808D4CB4 00000000 */ nop /* 02648 808D4CB8 3C01808D */ lui $at, %hi(D_808D64BC) ## $at = 808D0000 @@ -101,7 +101,7 @@ glabel func_808D4C68 .L808D4DA0: /* 02730 808D4DA0 44050000 */ mfc1 $a1, $f0 /* 02734 808D4DA4 44071000 */ mfc1 $a3, $f2 -/* 02738 808D4DA8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02738 808D4DA8 0C01E107 */ jal Math_ApproachF /* 0273C 808D4DAC 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 02740 808D4DB0 860201A4 */ lh $v0, 0x01A4($s0) ## 000001A4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D52CC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D52CC.s index 27a138a993..67cce30a34 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D52CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D52CC.s @@ -135,19 +135,19 @@ glabel func_808D52CC /* 02DF8 808D5468 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02DFC 808D546C 00006012 */ mflo $t4 /* 02E00 808D5470 01999021 */ addu $s2, $t4, $t9 -/* 02E04 808D5474 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02E04 808D5474 0C01E107 */ jal Math_ApproachF /* 02E08 808D5478 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 02E0C 808D547C 4406A000 */ mfc1 $a2, $f20 /* 02E10 808D5480 4407A000 */ mfc1 $a3, $f20 /* 02E14 808D5484 26440004 */ addiu $a0, $s2, 0x0004 ## $a0 = 00000004 -/* 02E18 808D5488 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02E18 808D5488 0C01E107 */ jal Math_ApproachF /* 02E1C 808D548C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02E20 808D5490 4406A000 */ mfc1 $a2, $f20 /* 02E24 808D5494 4407A000 */ mfc1 $a3, $f20 /* 02E28 808D5498 26440008 */ addiu $a0, $s2, 0x0008 ## $a0 = 00000008 -/* 02E2C 808D549C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02E2C 808D549C 0C01E107 */ jal Math_ApproachF /* 02E30 808D54A0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02E34 808D54A4 8FA2016C */ lw $v0, 0x016C($sp) @@ -218,7 +218,7 @@ glabel func_808D52CC /* 02F28 808D5598 4600B386 */ mov.s $f14, $f22 /* 02F2C 808D559C 46064280 */ add.s $f10, $f8, $f6 /* 02F30 808D55A0 46125501 */ sub.s $f20, $f10, $f18 -/* 02F34 808D55A4 0C0341F5 */ jal atan2f +/* 02F34 808D55A4 0C0341F5 */ jal Math_Atan2F /* 02F38 808D55A8 4600A306 */ mov.s $f12, $f20 /* 02F3C 808D55AC 4616B102 */ mul.s $f4, $f22, $f22 @@ -226,7 +226,7 @@ glabel func_808D52CC /* 02F44 808D55B4 4600C386 */ mov.s $f14, $f24 /* 02F48 808D55B8 4614A202 */ mul.s $f8, $f20, $f20 /* 02F4C 808D55BC 46082000 */ add.s $f0, $f4, $f8 -/* 02F50 808D55C0 0C0341F5 */ jal atan2f +/* 02F50 808D55C0 0C0341F5 */ jal Math_Atan2F /* 02F54 808D55C4 46000304 */ sqrt.s $f12, $f0 /* 02F58 808D55C8 8FB80170 */ lw $t8, 0x0170($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D58E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D58E0.s index d2027a8cc8..c732ae8ec8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D58E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D58E0.s @@ -68,7 +68,7 @@ glabel func_808D58E0 /* 0332C 808D599C 44049000 */ mfc1 $a0, $f18 /* 03330 808D59A0 00000000 */ nop /* 03334 808D59A4 00042400 */ sll $a0, $a0, 16 -/* 03338 808D59A8 0C01DE1C */ jal Math_Sins +/* 03338 808D59A8 0C01DE1C */ jal Math_SinS ## sins? /* 0333C 808D59AC 00042403 */ sra $a0, $a0, 16 /* 03340 808D59B0 46160102 */ mul.s $f4, $f0, $f22 @@ -86,7 +86,7 @@ glabel func_808D58E0 /* 03370 808D59E0 44042000 */ mfc1 $a0, $f4 /* 03374 808D59E4 00000000 */ nop /* 03378 808D59E8 00042400 */ sll $a0, $a0, 16 -/* 0337C 808D59EC 0C01DE1C */ jal Math_Sins +/* 0337C 808D59EC 0C01DE1C */ jal Math_SinS ## sins? /* 03380 808D59F0 00042403 */ sra $a0, $a0, 16 /* 03384 808D59F4 46160182 */ mul.s $f6, $f0, $f22 @@ -102,7 +102,7 @@ glabel func_808D58E0 /* 033AC 808D5A1C 44043000 */ mfc1 $a0, $f6 /* 033B0 808D5A20 00000000 */ nop /* 033B4 808D5A24 00042400 */ sll $a0, $a0, 16 -/* 033B8 808D5A28 0C01DE0D */ jal Math_Coss +/* 033B8 808D5A28 0C01DE0D */ jal Math_CosS ## coss? /* 033BC 808D5A2C 00042403 */ sra $a0, $a0, 16 /* 033C0 808D5A30 46160202 */ mul.s $f8, $f0, $f22 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s index 0f834c8086..da22cddc4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s @@ -257,7 +257,7 @@ glabel BossGanon_Init /* 00C90 808D7500 AE0B0130 */ sw $t3, 0x0130($s0) ## 00000130 /* 00C94 808D7504 AE0C0134 */ sw $t4, 0x0134($s0) ## 00000134 /* 00C98 808D7508 3C01808F */ lui $at, %hi(D_808F7E5C) ## $at = 808F0000 -/* 00C9C 808D750C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00C9C 808D750C 0C00CFBE */ jal Rand_ZeroFloat /* 00CA0 808D7510 C42C7E5C */ lwc1 $f12, %lo(D_808F7E5C)($at) /* 00CA4 808D7514 4600018D */ trunc.w.s $f6, $f0 @@ -302,7 +302,7 @@ glabel BossGanon_Init .L808D75A8: /* 00D38 808D75A8 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 00D3C 808D75AC 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 -/* 00D40 808D75B0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00D40 808D75B0 0C00CFBE */ jal Rand_ZeroFloat /* 00D44 808D75B4 00000000 */ nop /* 00D48 808D75B8 4600028D */ trunc.w.s $f10, $f0 @@ -351,7 +351,7 @@ glabel BossGanon_Init /* 00DE8 808D7658 C468002C */ lwc1 $f8, 0x002C($v1) ## 00000038 /* 00DEC 808D765C E7AE005C */ swc1 $f14, 0x005C($sp) /* 00DF0 808D7660 460A4301 */ sub.s $f12, $f8, $f10 -/* 00DF4 808D7664 0C034199 */ jal atan2s +/* 00DF4 808D7664 0C034199 */ jal Math_Atan2S /* 00DF8 808D7668 E7AC0054 */ swc1 $f12, 0x0054($sp) /* 00DFC 808D766C C7A2005C */ lwc1 $f2, 0x005C($sp) @@ -361,10 +361,10 @@ glabel BossGanon_Init /* 00E0C 808D767C C7AE0058 */ lwc1 $f14, 0x0058($sp) /* 00E10 808D7680 46108102 */ mul.s $f4, $f16, $f16 /* 00E14 808D7684 46049000 */ add.s $f0, $f18, $f4 -/* 00E18 808D7688 0C034199 */ jal atan2s +/* 00E18 808D7688 0C034199 */ jal Math_Atan2S /* 00E1C 808D768C 46000304 */ sqrt.s $f12, $f0 -/* 00E20 808D7690 0C03F66B */ jal Math_Rand_ZeroOne +/* 00E20 808D7690 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00E24 808D7694 A6020030 */ sh $v0, 0x0030($s0) ## 00000030 /* 00E28 808D7698 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 @@ -373,7 +373,7 @@ glabel BossGanon_Init /* 00E34 808D76A4 00000000 */ nop /* 00E38 808D76A8 45020013 */ bc1fl .L808D76F8 /* 00E3C 808D76AC 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 00E40 808D76B0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00E40 808D76B0 0C00CFC8 */ jal Rand_CenteredFloat /* 00E44 808D76B4 C42C7E64 */ lwc1 $f12, %lo(D_808F7E64)($at) /* 00E48 808D76B8 4600018D */ trunc.w.s $f6, $f0 @@ -383,7 +383,7 @@ glabel BossGanon_Init /* 00E58 808D76C8 44183000 */ mfc1 $t8, $f6 /* 00E5C 808D76CC 00000000 */ nop /* 00E60 808D76D0 0198C821 */ addu $t9, $t4, $t8 -/* 00E64 808D76D4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00E64 808D76D4 0C00CFC8 */ jal Rand_CenteredFloat /* 00E68 808D76D8 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 /* 00E6C 808D76DC 4600020D */ trunc.w.s $f8, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s index c104b2de0b..d75e569966 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s @@ -135,14 +135,14 @@ glabel BossGanon_Update /* 06E40 808DD6B0 3C014370 */ lui $at, 0x4370 ## $at = 43700000 .L808DD6B4: /* 06E44 808DD6B4 44816000 */ mtc1 $at, $f12 ## $f12 = 240.00 -/* 06E48 808DD6B8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06E48 808DD6B8 0C00CFBE */ jal Rand_ZeroFloat /* 06E4C 808DD6BC 00000000 */ nop /* 06E50 808DD6C0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 06E54 808DD6C4 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 /* 06E58 808DD6C8 00000000 */ nop /* 06E5C 808DD6CC 46040180 */ add.s $f6, $f0, $f4 -/* 06E60 808DD6D0 0C03F66B */ jal Math_Rand_ZeroOne +/* 06E60 808DD6D0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 06E64 808DD6D4 E7A60104 */ swc1 $f6, 0x0104($sp) /* 06E68 808DD6D8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -153,38 +153,38 @@ glabel BossGanon_Update /* 06E7C 808DD6EC 4502000E */ bc1fl .L808DD728 /* 06E80 808DD6F0 E7B40108 */ swc1 $f20, 0x0108($sp) /* 06E84 808DD6F4 E7B40100 */ swc1 $f20, 0x0100($sp) -/* 06E88 808DD6F8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06E88 808DD6F8 0C00CFBE */ jal Rand_ZeroFloat /* 06E8C 808DD6FC 4600B306 */ mov.s $f12, $f22 /* 06E90 808DD700 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 06E94 808DD704 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 06E98 808DD708 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06E98 808DD708 0C00CFBE */ jal Rand_ZeroFloat /* 06E9C 808DD70C E7A00108 */ swc1 $f0, 0x0108($sp) /* 06EA0 808DD710 E7A000F4 */ swc1 $f0, 0x00F4($sp) -/* 06EA4 808DD714 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06EA4 808DD714 0C00CFBE */ jal Rand_ZeroFloat /* 06EA8 808DD718 4600D306 */ mov.s $f12, $f26 /* 06EAC 808DD71C 1000000C */ beq $zero, $zero, .L808DD750 /* 06EB0 808DD720 E7A000FC */ swc1 $f0, 0x00FC($sp) /* 06EB4 808DD724 E7B40108 */ swc1 $f20, 0x0108($sp) .L808DD728: -/* 06EB8 808DD728 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06EB8 808DD728 0C00CFBE */ jal Rand_ZeroFloat /* 06EBC 808DD72C 4600B306 */ mov.s $f12, $f22 /* 06EC0 808DD730 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 06EC4 808DD734 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 06EC8 808DD738 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06EC8 808DD738 0C00CFBE */ jal Rand_ZeroFloat /* 06ECC 808DD73C E7A00100 */ swc1 $f0, 0x0100($sp) /* 06ED0 808DD740 E7A000FC */ swc1 $f0, 0x00FC($sp) -/* 06ED4 808DD744 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06ED4 808DD744 0C00CFBE */ jal Rand_ZeroFloat /* 06ED8 808DD748 4600D306 */ mov.s $f12, $f26 /* 06EDC 808DD74C E7A000F4 */ swc1 $f0, 0x00F4($sp) .L808DD750: /* 06EE0 808DD750 3C018090 */ lui $at, %hi(D_808F8034) ## $at = 80900000 -/* 06EE4 808DD754 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06EE4 808DD754 0C00CFBE */ jal Rand_ZeroFloat /* 06EE8 808DD758 C42C8034 */ lwc1 $f12, %lo(D_808F8034)($at) /* 06EEC 808DD75C 3C018090 */ lui $at, %hi(D_808F8038) ## $at = 80900000 @@ -333,14 +333,14 @@ glabel BossGanon_Update /* 070EC 808DD95C 86A400B6 */ lh $a0, 0x00B6($s5) ## 000000B6 /* 070F0 808DD960 00042023 */ subu $a0, $zero, $a0 /* 070F4 808DD964 00042400 */ sll $a0, $a0, 16 -/* 070F8 808DD968 0C01DE1C */ jal Math_Sins +/* 070F8 808DD968 0C01DE1C */ jal Math_SinS ## sins? /* 070FC 808DD96C 00042403 */ sra $a0, $a0, 16 /* 07100 808DD970 86A400B6 */ lh $a0, 0x00B6($s5) ## 000000B6 /* 07104 808DD974 46000506 */ mov.s $f20, $f0 /* 07108 808DD978 00042023 */ subu $a0, $zero, $a0 /* 0710C 808DD97C 00042400 */ sll $a0, $a0, 16 -/* 07110 808DD980 0C01DE0D */ jal Math_Coss +/* 07110 808DD980 0C01DE0D */ jal Math_CosS ## coss? /* 07114 808DD984 00042403 */ sra $a0, $a0, 16 /* 07118 808DD988 C6A20064 */ lwc1 $f2, 0x0064($s5) ## 00000064 @@ -369,7 +369,7 @@ glabel BossGanon_Update /* 07174 808DD9E4 00812023 */ subu $a0, $a0, $at /* 07178 808DD9E8 00042080 */ sll $a0, $a0, 2 /* 0717C 808DD9EC 00042400 */ sll $a0, $a0, 16 -/* 07180 808DD9F0 0C01DE1C */ jal Math_Sins +/* 07180 808DD9F0 0C01DE1C */ jal Math_SinS ## sins? /* 07184 808DD9F4 00042403 */ sra $a0, $a0, 16 /* 07188 808DD9F8 3C01C3FA */ lui $at, 0xC3FA ## $at = C3FA0000 @@ -389,21 +389,21 @@ glabel BossGanon_Update /* 071B8 808DDA28 4406D000 */ mfc1 $a2, $f26 /* 071BC 808DDA2C E7B80010 */ swc1 $f24, 0x0010($sp) /* 071C0 808DDA30 26A4050C */ addiu $a0, $s5, 0x050C ## $a0 = 0000050C -/* 071C4 808DDA34 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 071C4 808DDA34 0C01E0C4 */ jal Math_SmoothStepToF /* 071C8 808DDA38 3C074416 */ lui $a3, 0x4416 ## $a3 = 44160000 /* 071CC 808DDA3C 4406D000 */ mfc1 $a2, $f26 /* 071D0 808DDA40 26A40510 */ addiu $a0, $s5, 0x0510 ## $a0 = 00000510 /* 071D4 808DDA44 8FA50120 */ lw $a1, 0x0120($sp) /* 071D8 808DDA48 3C074416 */ lui $a3, 0x4416 ## $a3 = 44160000 -/* 071DC 808DDA4C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 071DC 808DDA4C 0C01E0C4 */ jal Math_SmoothStepToF /* 071E0 808DDA50 E7B80010 */ swc1 $f24, 0x0010($sp) /* 071E4 808DDA54 4405A000 */ mfc1 $a1, $f20 /* 071E8 808DDA58 4406D000 */ mfc1 $a2, $f26 /* 071EC 808DDA5C 26A40514 */ addiu $a0, $s5, 0x0514 ## $a0 = 00000514 /* 071F0 808DDA60 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 071F4 808DDA64 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 071F4 808DDA64 0C01E0C4 */ jal Math_SmoothStepToF /* 071F8 808DDA68 E7B80010 */ swc1 $f24, 0x0010($sp) /* 071FC 808DDA6C 86A201BA */ lh $v0, 0x01BA($s5) ## 000001BA @@ -448,7 +448,7 @@ glabel BossGanon_Update /* 07280 808DDAF0 4406D000 */ mfc1 $a2, $f26 /* 07284 808DDAF4 2484049C */ addiu $a0, $a0, 0x049C ## $a0 = 0000049C /* 07288 808DDAF8 8EA50508 */ lw $a1, 0x0508($s5) ## 00000508 -/* 0728C 808DDAFC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0728C 808DDAFC 0C01E107 */ jal Math_ApproachF /* 07290 808DDB00 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 07294 808DDB04 10000006 */ beq $zero, $zero, .L808DDB20 @@ -456,7 +456,7 @@ glabel BossGanon_Update .L808DDB0C: /* 0729C 808DDB0C 4405D000 */ mfc1 $a1, $f26 /* 072A0 808DDB10 4406A000 */ mfc1 $a2, $f20 -/* 072A4 808DDB14 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 072A4 808DDB14 0C01E123 */ jal Math_ApproachZeroF /* 072A8 808DDB18 2484049C */ addiu $a0, $a0, 0x049C ## $a0 = 0000049C /* 072AC 808DDB1C 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000003 @@ -519,7 +519,7 @@ glabel BossGanon_Update .L808DDBF4: /* 07384 808DDBF4 3C018090 */ lui $at, %hi(D_808F8040) ## $at = 80900000 /* 07388 808DDBF8 C4348040 */ lwc1 $f20, %lo(D_808F8040)($at) -/* 0738C 808DDBFC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0738C 808DDBFC 0C00CFC8 */ jal Rand_CenteredFloat /* 07390 808DDC00 4600A306 */ mov.s $f12, $f20 /* 07394 808DDC04 86B9026C */ lh $t9, 0x026C($s5) ## 0000026C @@ -606,7 +606,7 @@ glabel BossGanon_Update /* 074C4 808DDD34 C42C8048 */ lwc1 $f12, %lo(D_808F8048)($at) /* 074C8 808DDD38 46125101 */ sub.s $f4, $f10, $f18 /* 074CC 808DDD3C 46062202 */ mul.s $f8, $f4, $f6 -/* 074D0 808DDD40 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 074D0 808DDD40 0C00CFBE */ jal Rand_ZeroFloat /* 074D4 808DDD44 E7A800E0 */ swc1 $f8, 0x00E0($sp) /* 074D8 808DDD48 46000306 */ mov.s $f12, $f0 @@ -747,7 +747,7 @@ glabel L808DDF20 /* 076BC 808DDF2C 4406D000 */ mfc1 $a2, $f26 /* 076C0 808DDF30 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 /* 076C4 808DDF34 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A -/* 076C8 808DDF38 0C01E107 */ jal Math_SmoothScaleMaxF +/* 076C8 808DDF38 0C01E107 */ jal Math_ApproachF /* 076CC 808DDF3C 02C12021 */ addu $a0, $s6, $at /* 076D0 808DDF40 1000011C */ beq $zero, $zero, .L808DE3B4 @@ -763,7 +763,7 @@ glabel L808DDF48 /* 076F4 808DDF64 4406D000 */ mfc1 $a2, $f26 /* 076F8 808DDF68 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 076FC 808DDF6C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 07700 808DDF70 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07700 808DDF70 0C01E107 */ jal Math_ApproachF /* 07704 808DDF74 02C12021 */ addu $a0, $s6, $at /* 07708 808DDF78 1000010E */ beq $zero, $zero, .L808DE3B4 @@ -779,7 +779,7 @@ glabel L808DDF80 /* 0772C 808DDF9C 4406D000 */ mfc1 $a2, $f26 /* 07730 808DDFA0 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 /* 07734 808DDFA4 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A -/* 07738 808DDFA8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07738 808DDFA8 0C01E107 */ jal Math_ApproachF /* 0773C 808DDFAC 02C12021 */ addu $a0, $s6, $at /* 07740 808DDFB0 10000100 */ beq $zero, $zero, .L808DE3B4 @@ -824,7 +824,7 @@ glabel L808DE014 /* 077CC 808DE03C 4405D000 */ mfc1 $a1, $f26 /* 077D0 808DE040 3C063D99 */ lui $a2, 0x3D99 ## $a2 = 3D990000 /* 077D4 808DE044 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3D99999A -/* 077D8 808DE048 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 077D8 808DE048 0C01E123 */ jal Math_ApproachZeroF /* 077DC 808DE04C 02C12021 */ addu $a0, $s6, $at /* 077E0 808DE050 100000D8 */ beq $zero, $zero, .L808DE3B4 @@ -851,7 +851,7 @@ glabel L808DE058 /* 0782C 808DE09C 4405D000 */ mfc1 $a1, $f26 /* 07830 808DE0A0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 07834 808DE0A4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 07838 808DE0A8 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 07838 808DE0A8 0C01E123 */ jal Math_ApproachZeroF /* 0783C 808DE0AC 02C12021 */ addu $a0, $s6, $at /* 07840 808DE0B0 100000C0 */ beq $zero, $zero, .L808DE3B4 @@ -878,7 +878,7 @@ glabel L808DE0B8 /* 0788C 808DE0FC 4405D000 */ mfc1 $a1, $f26 /* 07890 808DE100 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 07894 808DE104 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 07898 808DE108 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 07898 808DE108 0C01E123 */ jal Math_ApproachZeroF /* 0789C 808DE10C 02C12021 */ addu $a0, $s6, $at /* 078A0 808DE110 100000A8 */ beq $zero, $zero, .L808DE3B4 @@ -898,7 +898,7 @@ glabel L808DE118 /* 078D4 808DE144 4406D000 */ mfc1 $a2, $f26 /* 078D8 808DE148 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 078DC 808DE14C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD -/* 078E0 808DE150 0C01E107 */ jal Math_SmoothScaleMaxF +/* 078E0 808DE150 0C01E107 */ jal Math_ApproachF /* 078E4 808DE154 02C12021 */ addu $a0, $s6, $at /* 078E8 808DE158 10000096 */ beq $zero, $zero, .L808DE3B4 @@ -917,7 +917,7 @@ glabel L808DE160 /* 07918 808DE188 4405D000 */ mfc1 $a1, $f26 /* 0791C 808DE18C 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 07920 808DE190 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 07924 808DE194 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 07924 808DE194 0C01E123 */ jal Math_ApproachZeroF /* 07928 808DE198 02C12021 */ addu $a0, $s6, $at /* 0792C 808DE19C 10000085 */ beq $zero, $zero, .L808DE3B4 @@ -937,7 +937,7 @@ glabel L808DE1A4 /* 07960 808DE1D0 4406D000 */ mfc1 $a2, $f26 /* 07964 808DE1D4 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 07968 808DE1D8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD -/* 0796C 808DE1DC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0796C 808DE1DC 0C01E107 */ jal Math_ApproachF /* 07970 808DE1E0 02C12021 */ addu $a0, $s6, $at /* 07974 808DE1E4 10000072 */ beq $zero, $zero, .L808DE3B0 @@ -957,7 +957,7 @@ glabel L808DE1EC /* 079A8 808DE218 00812023 */ subu $a0, $a0, $at /* 079AC 808DE21C 000422C0 */ sll $a0, $a0, 11 /* 079B0 808DE220 00042400 */ sll $a0, $a0, 16 -/* 079B4 808DE224 0C01DE0D */ jal Math_Coss +/* 079B4 808DE224 0C01DE0D */ jal Math_CosS ## coss? /* 079B8 808DE228 00042403 */ sra $a0, $a0, 16 /* 079BC 808DE22C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -971,7 +971,7 @@ glabel L808DE1EC /* 079DC 808DE24C 4407D000 */ mfc1 $a3, $f26 /* 079E0 808DE250 46083400 */ add.s $f16, $f6, $f8 /* 079E4 808DE254 44058000 */ mfc1 $a1, $f16 -/* 079E8 808DE258 0C01E107 */ jal Math_SmoothScaleMaxF +/* 079E8 808DE258 0C01E107 */ jal Math_ApproachF /* 079EC 808DE25C 00000000 */ nop /* 079F0 808DE260 10000054 */ beq $zero, $zero, .L808DE3B4 @@ -991,7 +991,7 @@ glabel L808DE268 /* 07A24 808DE294 4406D000 */ mfc1 $a2, $f26 /* 07A28 808DE298 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 07A2C 808DE29C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD -/* 07A30 808DE2A0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07A30 808DE2A0 0C01E107 */ jal Math_ApproachF /* 07A34 808DE2A4 02C12021 */ addu $a0, $s6, $at /* 07A38 808DE2A8 10000042 */ beq $zero, $zero, .L808DE3B4 @@ -1007,7 +1007,7 @@ glabel L808DE2B0 /* 07A5C 808DE2CC 4406D000 */ mfc1 $a2, $f26 /* 07A60 808DE2D0 3C073CCC */ lui $a3, 0x3CCC ## $a3 = 3CCC0000 /* 07A64 808DE2D4 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3CCCCCCD -/* 07A68 808DE2D8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07A68 808DE2D8 0C01E107 */ jal Math_ApproachF /* 07A6C 808DE2DC 02C12021 */ addu $a0, $s6, $at /* 07A70 808DE2E0 10000034 */ beq $zero, $zero, .L808DE3B4 @@ -1036,7 +1036,7 @@ glabel L808DE308 /* 07AC4 808DE334 4406D000 */ mfc1 $a2, $f26 /* 07AC8 808DE338 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 /* 07ACC 808DE33C 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A -/* 07AD0 808DE340 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07AD0 808DE340 0C01E107 */ jal Math_ApproachF /* 07AD4 808DE344 02C12021 */ addu $a0, $s6, $at /* 07AD8 808DE348 1000001A */ beq $zero, $zero, .L808DE3B4 @@ -1055,7 +1055,7 @@ glabel L808DE350 /* 07B08 808DE378 4405D000 */ mfc1 $a1, $f26 /* 07B0C 808DE37C 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 07B10 808DE380 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 07B14 808DE384 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 07B14 808DE384 0C01E123 */ jal Math_ApproachZeroF /* 07B18 808DE388 02C12021 */ addu $a0, $s6, $at /* 07B1C 808DE38C 10000009 */ beq $zero, $zero, .L808DE3B4 @@ -1185,14 +1185,14 @@ glabel L808DE3B0 /* 07CD8 808DE548 00000000 */ nop /* 07CDC 808DE54C 44050000 */ mfc1 $a1, $f0 .L808DE550: -/* 07CE0 808DE550 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07CE0 808DE550 0C01E107 */ jal Math_ApproachF /* 07CE4 808DE554 26A40670 */ addiu $a0, $s5, 0x0670 ## $a0 = 00000670 /* 07CE8 808DE558 1000000B */ beq $zero, $zero, .L808DE588 /* 07CEC 808DE55C 92AE066C */ lbu $t6, 0x066C($s5) ## 0000066C /* 07CF0 808DE560 4405D000 */ mfc1 $a1, $f26 .L808DE564: -/* 07CF4 808DE564 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 07CF4 808DE564 0C01E123 */ jal Math_ApproachZeroF /* 07CF8 808DE568 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 07CFC 808DE56C C6A40670 */ lwc1 $f4, 0x0670($s5) ## 00000670 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6870.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6870.s index 7d0bafe2ac..aedacdca79 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6870.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6870.s @@ -51,17 +51,17 @@ glabel func_808D6870 /* 00094 808D6904 E60E0034 */ swc1 $f14, 0x0034($s0) ## 00010034 /* 00098 808D6908 E6040020 */ swc1 $f4, 0x0020($s0) ## 00010020 /* 0009C 808D690C AE0C0024 */ sw $t4, 0x0024($s0) ## 00010024 -/* 000A0 808D6910 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 000A0 808D6910 0C00CFBE */ jal Rand_ZeroFloat /* 000A4 808D6914 C42C7E4C */ lwc1 $f12, %lo(D_808F7E4C)($at) /* 000A8 808D6918 E6000044 */ swc1 $f0, 0x0044($s0) ## 00010044 /* 000AC 808D691C 3C01808F */ lui $at, %hi(D_808F7E50) ## $at = 808F0000 -/* 000B0 808D6920 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 000B0 808D6920 0C00CFBE */ jal Rand_ZeroFloat /* 000B4 808D6924 C42C7E50 */ lwc1 $f12, %lo(D_808F7E50)($at) /* 000B8 808D6928 E6000048 */ swc1 $f0, 0x0048($s0) ## 00010048 /* 000BC 808D692C 3C01808F */ lui $at, %hi(D_808F7E54) ## $at = 808F0000 -/* 000C0 808D6930 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 000C0 808D6930 0C00CFBE */ jal Rand_ZeroFloat /* 000C4 808D6934 C42C7E54 */ lwc1 $f12, %lo(D_808F7E54)($at) /* 000C8 808D6938 4600018D */ trunc.w.s $f6, $f0 @@ -80,7 +80,7 @@ glabel func_808D6870 /* 000FC 808D696C 904A0001 */ lbu $t2, 0x0001($v0) ## 00000001 /* 00100 808D6970 A20A0029 */ sb $t2, 0x0029($s0) ## 00010029 /* 00104 808D6974 904B0002 */ lbu $t3, 0x0002($v0) ## 00000002 -/* 00108 808D6978 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00108 808D6978 0C00CFBE */ jal Rand_ZeroFloat /* 0010C 808D697C A20B002A */ sb $t3, 0x002A($s0) ## 0001002A /* 00110 808D6980 4600020D */ trunc.w.s $f8, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D69B0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D69B0.s index 47411e9482..b6524132ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D69B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D69B0.s @@ -38,7 +38,7 @@ glabel func_808D69B0 /* 001CC 808D6A3C C7A40030 */ lwc1 $f4, 0x0030($sp) /* 001D0 808D6A40 46062203 */ div.s $f8, $f4, $f6 /* 001D4 808D6A44 E4680034 */ swc1 $f8, 0x0034($v1) ## 00010034 -/* 001D8 808D6A48 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 001D8 808D6A48 0C00CFBE */ jal Rand_ZeroFloat /* 001DC 808D6A4C AFA30018 */ sw $v1, 0x0018($sp) /* 001E0 808D6A50 4600028D */ trunc.w.s $f10, $f0 @@ -50,7 +50,7 @@ glabel func_808D69B0 /* 001F8 808D6A68 25F800C8 */ addiu $t8, $t7, 0x00C8 ## $t8 = 000000C8 /* 001FC 808D6A6C A478002E */ sh $t8, 0x002E($v1) ## 0000002E /* 00200 808D6A70 87B90036 */ lh $t9, 0x0036($sp) -/* 00204 808D6A74 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00204 808D6A74 0C00CFBE */ jal Rand_ZeroFloat /* 00208 808D6A78 A4790030 */ sh $t9, 0x0030($v1) ## 00000030 /* 0020C 808D6A7C 4600040D */ trunc.w.s $f16, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6AAC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6AAC.s index d3b3e300ca..8b827b7628 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6AAC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6AAC.s @@ -43,7 +43,7 @@ glabel func_808D6AAC /* 002DC 808D6B4C 46062203 */ div.s $f8, $f4, $f6 /* 002E0 808D6B50 E6080034 */ swc1 $f8, 0x0034($s0) ## 00010034 /* 002E4 808D6B54 C7B20034 */ lwc1 $f18, 0x0034($sp) -/* 002E8 808D6B58 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 002E8 808D6B58 0C00CFBE */ jal Rand_ZeroFloat /* 002EC 808D6B5C E6120040 */ swc1 $f18, 0x0040($s0) ## 00010040 /* 002F0 808D6B60 4600010D */ trunc.w.s $f4, $f0 @@ -54,14 +54,14 @@ glabel func_808D6AAC /* 00304 808D6B74 25F800C8 */ addiu $t8, $t7, 0x00C8 ## $t8 = 000000C8 /* 00308 808D6B78 A618002E */ sh $t8, 0x002E($s0) ## 0001002E /* 0030C 808D6B7C 87B9003A */ lh $t9, 0x003A($sp) -/* 00310 808D6B80 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00310 808D6B80 0C00CFBE */ jal Rand_ZeroFloat /* 00314 808D6B84 A6190030 */ sh $t9, 0x0030($s0) ## 00010030 /* 00318 808D6B88 4600018D */ trunc.w.s $f6, $f0 /* 0031C 808D6B8C C60C0018 */ lwc1 $f12, 0x0018($s0) ## 00010018 /* 00320 808D6B90 C60E0010 */ lwc1 $f14, 0x0010($s0) ## 00010010 /* 00324 808D6B94 440B3000 */ mfc1 $t3, $f6 -/* 00328 808D6B98 0C0341F5 */ jal atan2f +/* 00328 808D6B98 0C0341F5 */ jal Math_Atan2F /* 0032C 808D6B9C A20B0001 */ sb $t3, 0x0001($s0) ## 00010001 /* 00330 808D6BA0 C6100010 */ lwc1 $f16, 0x0010($s0) ## 00010010 @@ -71,7 +71,7 @@ glabel func_808D6AAC /* 00340 808D6BB0 C60E0014 */ lwc1 $f14, 0x0014($s0) ## 00010014 /* 00344 808D6BB4 46021282 */ mul.s $f10, $f2, $f2 /* 00348 808D6BB8 460A4000 */ add.s $f0, $f8, $f10 -/* 0034C 808D6BBC 0C0341F5 */ jal atan2f +/* 0034C 808D6BBC 0C0341F5 */ jal Math_Atan2F /* 00350 808D6BC0 46000304 */ sqrt.s $f12, $f0 /* 00354 808D6BC4 46000487 */ neg.s $f18, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6D60.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6D60.s index a617050167..feb0925aea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6D60.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6D60.s @@ -43,7 +43,7 @@ glabel func_808D6D60 /* 00590 808D6E00 AC4B0024 */ sw $t3, 0x0024($v0) ## 00010024 /* 00594 808D6E04 C7A6002C */ lwc1 $f6, 0x002C($sp) /* 00598 808D6E08 E4460038 */ swc1 $f6, 0x0038($v0) ## 00010038 -/* 0059C 808D6E0C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0059C 808D6E0C 0C00CFBE */ jal Rand_ZeroFloat /* 005A0 808D6E10 AFA20018 */ sw $v0, 0x0018($sp) /* 005A4 808D6E14 8FA20018 */ lw $v0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6E54.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6E54.s index 07bd2be585..76cb97fce8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6E54.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6E54.s @@ -43,7 +43,7 @@ glabel func_808D6E54 /* 00688 808D6EF8 AC4C0024 */ sw $t4, 0x0024($v0) ## 00000024 /* 0068C 808D6EFC C7A60034 */ lwc1 $f6, 0x0034($sp) /* 00690 808D6F00 E4460038 */ swc1 $f6, 0x0038($v0) ## 00000038 -/* 00694 808D6F04 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00694 808D6F04 0C00CFBE */ jal Rand_ZeroFloat /* 00698 808D6F08 AFA2001C */ sw $v0, 0x001C($sp) /* 0069C 808D6F0C 8FA2001C */ lw $v0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6F3C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6F3C.s index 9a63b28c76..c82d069595 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6F3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D6F3C.s @@ -50,7 +50,7 @@ glabel func_808D6F3C /* 00774 808D6FE4 C7A6002C */ lwc1 $f6, 0x002C($sp) /* 00778 808D6FE8 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 0077C 808D6FEC E4460038 */ swc1 $f6, 0x0038($v0) ## 00010038 -/* 00780 808D6FF0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00780 808D6FF0 0C00CFBE */ jal Rand_ZeroFloat /* 00784 808D6FF4 AFA20018 */ sw $v0, 0x0018($sp) /* 00788 808D6FF8 4600020D */ trunc.w.s $f8, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s index c933dde76f..745d770327 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s @@ -315,7 +315,7 @@ glabel L808D7C90 /* 0147C 808D7CEC 3C053E80 */ lui $a1, 0x3E80 ## $a1 = 3E800000 /* 01480 808D7CF0 8E0706B4 */ lw $a3, 0x06B4($s0) ## 000006B4 /* 01484 808D7CF4 460A4400 */ add.s $f16, $f8, $f10 -/* 01488 808D7CF8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01488 808D7CF8 0C01E107 */ jal Math_ApproachF /* 0148C 808D7CFC E6100694 */ swc1 $f16, 0x0694($s0) ## 00000694 /* 01490 808D7D00 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 @@ -323,7 +323,7 @@ glabel L808D7C90 /* 01498 808D7D08 34E7B717 */ ori $a3, $a3, 0xB717 ## $a3 = 38D1B717 /* 0149C 808D7D0C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 014A0 808D7D10 260406B4 */ addiu $a0, $s0, 0x06B4 ## $a0 = 000006B4 -/* 014A4 808D7D14 0C01E107 */ jal Math_SmoothScaleMaxF +/* 014A4 808D7D14 0C01E107 */ jal Math_ApproachF /* 014A8 808D7D18 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 014AC 808D7D1C 8E0F0674 */ lw $t7, 0x0674($s0) ## 00000674 @@ -449,7 +449,7 @@ glabel L808D7ECC /* 01664 808D7ED4 260401D8 */ addiu $a0, $s0, 0x01D8 ## $a0 = 000001D8 /* 01668 808D7ED8 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 0166C 808D7EDC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01670 808D7EE0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01670 808D7EE0 0C01E107 */ jal Math_ApproachF /* 01674 808D7EE4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01678 808D7EE8 3C053ECC */ lui $a1, 0x3ECC ## $a1 = 3ECC0000 @@ -457,20 +457,20 @@ glabel L808D7ECC /* 01680 808D7EF0 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E99999A /* 01684 808D7EF4 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3ECCCCCD /* 01688 808D7EF8 260401E0 */ addiu $a0, $s0, 0x01E0 ## $a0 = 000001E0 -/* 0168C 808D7EFC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0168C 808D7EFC 0C01E107 */ jal Math_ApproachF /* 01690 808D7F00 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01694 808D7F04 3C074023 */ lui $a3, 0x4023 ## $a3 = 40230000 /* 01698 808D7F08 34E73333 */ ori $a3, $a3, 0x3333 ## $a3 = 40233333 /* 0169C 808D7F0C 260401D4 */ addiu $a0, $s0, 0x01D4 ## $a0 = 000001D4 /* 016A0 808D7F10 3C05432A */ lui $a1, 0x432A ## $a1 = 432A0000 -/* 016A4 808D7F14 0C01E107 */ jal Math_SmoothScaleMaxF +/* 016A4 808D7F14 0C01E107 */ jal Math_ApproachF /* 016A8 808D7F18 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 016AC 808D7F1C 260401DC */ addiu $a0, $s0, 0x01DC ## $a0 = 000001DC /* 016B0 808D7F20 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 016B4 808D7F24 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 016B8 808D7F28 0C01E107 */ jal Math_SmoothScaleMaxF +/* 016B8 808D7F28 0C01E107 */ jal Math_ApproachF /* 016BC 808D7F2C 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 016C0 808D7F30 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 @@ -563,7 +563,7 @@ glabel L808D8068 /* 0180C 808D807C 260401D8 */ addiu $a0, $s0, 0x01D8 ## $a0 = 000001D8 /* 01810 808D8080 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 01814 808D8084 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01818 808D8088 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01818 808D8088 0C01E107 */ jal Math_ApproachF /* 0181C 808D808C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01820 808D8090 3C053ECC */ lui $a1, 0x3ECC ## $a1 = 3ECC0000 @@ -571,20 +571,20 @@ glabel L808D8068 /* 01828 808D8098 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E99999A /* 0182C 808D809C 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3ECCCCCD /* 01830 808D80A0 260401E0 */ addiu $a0, $s0, 0x01E0 ## $a0 = 000001E0 -/* 01834 808D80A4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01834 808D80A4 0C01E107 */ jal Math_ApproachF /* 01838 808D80A8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0183C 808D80AC 3C074023 */ lui $a3, 0x4023 ## $a3 = 40230000 /* 01840 808D80B0 34E73333 */ ori $a3, $a3, 0x3333 ## $a3 = 40233333 /* 01844 808D80B4 260401D4 */ addiu $a0, $s0, 0x01D4 ## $a0 = 000001D4 /* 01848 808D80B8 3C05432A */ lui $a1, 0x432A ## $a1 = 432A0000 -/* 0184C 808D80BC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0184C 808D80BC 0C01E107 */ jal Math_ApproachF /* 01850 808D80C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01854 808D80C4 260401DC */ addiu $a0, $s0, 0x01DC ## $a0 = 000001DC /* 01858 808D80C8 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 0185C 808D80CC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01860 808D80D0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01860 808D80D0 0C01E107 */ jal Math_ApproachF /* 01864 808D80D4 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 01868 808D80D8 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 @@ -880,7 +880,7 @@ glabel L808D8468 /* 01C88 808D84F8 260406F4 */ addiu $a0, $s0, 0x06F4 ## $a0 = 000006F4 /* 01C8C 808D84FC 3C0542DC */ lui $a1, 0x42DC ## $a1 = 42DC0000 /* 01C90 808D8500 44075000 */ mfc1 $a3, $f10 -/* 01C94 808D8504 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01C94 808D8504 0C01E107 */ jal Math_ApproachF /* 01C98 808D8508 00000000 */ nop /* 01C9C 808D850C 3C01808F */ lui $at, %hi(D_808F7ED4) ## $at = 808F0000 @@ -892,14 +892,14 @@ glabel L808D8468 /* 01CB4 808D8524 26040688 */ addiu $a0, $s0, 0x0688 ## $a0 = 00000688 /* 01CB8 808D8528 3C05C391 */ lui $a1, 0xC391 ## $a1 = C3910000 /* 01CBC 808D852C 44072000 */ mfc1 $a3, $f4 -/* 01CC0 808D8530 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01CC0 808D8530 0C01E107 */ jal Math_ApproachF /* 01CC4 808D8534 00000000 */ nop /* 01CC8 808D8538 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 01CCC 808D853C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 01CD0 808D8540 260406EC */ addiu $a0, $s0, 0x06EC ## $a0 = 000006EC /* 01CD4 808D8544 3C053F40 */ lui $a1, 0x3F40 ## $a1 = 3F400000 -/* 01CD8 808D8548 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01CD8 808D8548 0C01E107 */ jal Math_ApproachF /* 01CDC 808D854C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01CE0 808D8550 8E0F0674 */ lw $t7, 0x0674($s0) ## 00000674 @@ -1035,7 +1035,7 @@ glabel L808D86B4 .L808D8748: /* 01ED8 808D8748 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 01EDC 808D874C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01EE0 808D8750 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01EE0 808D8750 0C01E107 */ jal Math_ApproachF /* 01EE4 808D8754 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01EE8 808D8758 3C053F19 */ lui $a1, 0x3F19 ## $a1 = 3F190000 @@ -1043,20 +1043,20 @@ glabel L808D86B4 /* 01EF0 808D8760 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E99999A /* 01EF4 808D8764 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3F19999A /* 01EF8 808D8768 260401E0 */ addiu $a0, $s0, 0x01E0 ## $a0 = 000001E0 -/* 01EFC 808D876C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01EFC 808D876C 0C01E107 */ jal Math_ApproachF /* 01F00 808D8770 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01F04 808D8774 3C074023 */ lui $a3, 0x4023 ## $a3 = 40230000 /* 01F08 808D8778 34E73333 */ ori $a3, $a3, 0x3333 ## $a3 = 40233333 /* 01F0C 808D877C 260401D4 */ addiu $a0, $s0, 0x01D4 ## $a0 = 000001D4 /* 01F10 808D8780 3C05432A */ lui $a1, 0x432A ## $a1 = 432A0000 -/* 01F14 808D8784 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01F14 808D8784 0C01E107 */ jal Math_ApproachF /* 01F18 808D8788 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01F1C 808D878C 260401DC */ addiu $a0, $s0, 0x01DC ## $a0 = 000001DC /* 01F20 808D8790 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 01F24 808D8794 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01F28 808D8798 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01F28 808D8798 0C01E107 */ jal Math_ApproachF /* 01F2C 808D879C 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 01F30 808D87A0 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 @@ -1130,7 +1130,7 @@ glabel L808D8888 /* 02030 808D88A0 34E7C28F */ ori $a3, $a3, 0xC28F ## $a3 = 3C75C28F /* 02034 808D88A4 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3E19999A /* 02038 808D88A8 260406EC */ addiu $a0, $s0, 0x06EC ## $a0 = 000006EC -/* 0203C 808D88AC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0203C 808D88AC 0C01E107 */ jal Math_ApproachF /* 02040 808D88B0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02044 808D88B4 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 @@ -1139,7 +1139,7 @@ glabel L808D8888 /* 02050 808D88C0 2C610029 */ sltiu $at, $v1, 0x0029 /* 02054 808D88C4 1020000B */ beq $at, $zero, .L808D88F4 /* 02058 808D88C8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0205C 808D88CC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0205C 808D88CC 0C01E107 */ jal Math_ApproachF /* 02060 808D88D0 3C0740D0 */ lui $a3, 0x40D0 ## $a3 = 40D00000 /* 02064 808D88D4 3C053E4C */ lui $a1, 0x3E4C ## $a1 = 3E4C0000 @@ -1147,7 +1147,7 @@ glabel L808D8888 /* 0206C 808D88DC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3CCCCCCD /* 02070 808D88E0 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3E4CCCCD /* 02074 808D88E4 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 -/* 02078 808D88E8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02078 808D88E8 0C01E107 */ jal Math_ApproachF /* 0207C 808D88EC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02080 808D88F0 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 @@ -1277,7 +1277,7 @@ glabel L808D8A98 .L808D8AB8: /* 02248 808D8AB8 A20E01A0 */ sb $t6, 0x01A0($s0) ## 000001A0 .L808D8ABC: -/* 0224C 808D8ABC 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 0224C 808D8ABC 0C01E123 */ jal Math_ApproachZeroF /* 02250 808D8AC0 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 02254 808D8AC4 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 @@ -1297,7 +1297,7 @@ glabel L808D8A98 /* 0228C 808D8AFC E6120680 */ swc1 $f18, 0x0680($s0) ## 00000680 /* 02290 808D8B00 44058000 */ mfc1 $a1, $f16 /* 02294 808D8B04 E6040684 */ swc1 $f4, 0x0684($s0) ## 00000684 -/* 02298 808D8B08 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02298 808D8B08 0C01E107 */ jal Math_ApproachF /* 0229C 808D8B0C E6060688 */ swc1 $f6, 0x0688($s0) ## 00000688 /* 022A0 808D8B10 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -1310,7 +1310,7 @@ glabel L808D8A98 /* 022BC 808D8B2C AFA40048 */ sw $a0, 0x0048($sp) /* 022C0 808D8B30 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 022C4 808D8B34 44053000 */ mfc1 $a1, $f6 -/* 022C8 808D8B38 0C01E107 */ jal Math_SmoothScaleMaxF +/* 022C8 808D8B38 0C01E107 */ jal Math_ApproachF /* 022CC 808D8B3C 00000000 */ nop /* 022D0 808D8B40 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 @@ -1415,14 +1415,14 @@ glabel L808D8A98 /* 02438 808D8CA8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 0243C 808D8CAC 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 02440 808D8CB0 3C054364 */ lui $a1, 0x4364 ## $a1 = 43640000 -/* 02444 808D8CB4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02444 808D8CB4 0C01E107 */ jal Math_ApproachF /* 02448 808D8CB8 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 0244C 808D8CBC 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02450 808D8CC0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02454 808D8CC4 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 02458 808D8CC8 3C05C366 */ lui $a1, 0xC366 ## $a1 = C3660000 -/* 0245C 808D8CCC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0245C 808D8CCC 0C01E107 */ jal Math_ApproachF /* 02460 808D8CD0 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 /* 02464 808D8CD4 3C028090 */ lui $v0, %hi(D_808F93C0) ## $v0 = 80900000 @@ -1447,7 +1447,7 @@ glabel L808D8A98 /* 024B0 808D8D20 00812023 */ subu $a0, $a0, $at /* 024B4 808D8D24 00042080 */ sll $a0, $a0, 2 /* 024B8 808D8D28 00042400 */ sll $a0, $a0, 16 -/* 024BC 808D8D2C 0C01DE1C */ jal Math_Sins +/* 024BC 808D8D2C 0C01DE1C */ jal Math_SinS ## sins? /* 024C0 808D8D30 00042403 */ sra $a0, $a0, 16 /* 024C4 808D8D34 C61201C8 */ lwc1 $f18, 0x01C8($s0) ## 000001C8 @@ -1467,7 +1467,7 @@ glabel L808D8A98 /* 024FC 808D8D6C 00042403 */ sra $a0, $a0, 16 /* 02500 808D8D70 46024280 */ add.s $f10, $f8, $f2 /* 02504 808D8D74 E6020060 */ swc1 $f2, 0x0060($s0) ## 00000060 -/* 02508 808D8D78 0C01DE0D */ jal Math_Coss +/* 02508 808D8D78 0C01DE0D */ jal Math_CosS ## coss? /* 0250C 808D8D7C E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 02510 808D8D80 C61001C8 */ lwc1 $f16, 0x01C8($s0) ## 000001C8 @@ -1486,7 +1486,7 @@ glabel L808D8A98 /* 02544 808D8DB4 260401C8 */ addiu $a0, $s0, 0x01C8 ## $a0 = 000001C8 /* 02548 808D8DB8 46061201 */ sub.s $f8, $f2, $f6 /* 0254C 808D8DBC E6020024 */ swc1 $f2, 0x0024($s0) ## 00000024 -/* 02550 808D8DC0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02550 808D8DC0 0C01E107 */ jal Math_ApproachF /* 02554 808D8DC4 E608005C */ swc1 $f8, 0x005C($s0) ## 0000005C /* 02558 808D8DC8 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 @@ -1583,7 +1583,7 @@ glabel L808D8ED4 /* 026A8 808D8F18 AFAE0050 */ sw $t6, 0x0050($sp) /* 026AC 808D8F1C 01802025 */ or $a0, $t4, $zero ## $a0 = 00000680 /* 026B0 808D8F20 44072000 */ mfc1 $a3, $f4 -/* 026B4 808D8F24 0C01E107 */ jal Math_SmoothScaleMaxF +/* 026B4 808D8F24 0C01E107 */ jal Math_ApproachF /* 026B8 808D8F28 00000000 */ nop /* 026BC 808D8F2C C60606A8 */ lwc1 $f6, 0x06A8($s0) ## 000006A8 @@ -1593,7 +1593,7 @@ glabel L808D8ED4 /* 026CC 808D8F3C 46083282 */ mul.s $f10, $f6, $f8 /* 026D0 808D8F40 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 /* 026D4 808D8F44 44075000 */ mfc1 $a3, $f10 -/* 026D8 808D8F48 0C01E107 */ jal Math_SmoothScaleMaxF +/* 026D8 808D8F48 0C01E107 */ jal Math_ApproachF /* 026DC 808D8F4C 00000000 */ nop /* 026E0 808D8F50 C61006AC */ lwc1 $f16, 0x06AC($s0) ## 000006AC @@ -1603,7 +1603,7 @@ glabel L808D8ED4 /* 026F0 808D8F60 46128102 */ mul.s $f4, $f16, $f18 /* 026F4 808D8F64 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 /* 026F8 808D8F68 44072000 */ mfc1 $a3, $f4 -/* 026FC 808D8F6C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 026FC 808D8F6C 0C01E107 */ jal Math_ApproachF /* 02700 808D8F70 00000000 */ nop /* 02704 808D8F74 C60606B0 */ lwc1 $f6, 0x06B0($s0) ## 000006B0 @@ -1613,7 +1613,7 @@ glabel L808D8ED4 /* 02714 808D8F84 46083282 */ mul.s $f10, $f6, $f8 /* 02718 808D8F88 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 /* 0271C 808D8F8C 44075000 */ mfc1 $a3, $f10 -/* 02720 808D8F90 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02720 808D8F90 0C01E107 */ jal Math_ApproachF /* 02724 808D8F94 00000000 */ nop /* 02728 808D8F98 C61006B4 */ lwc1 $f16, 0x06B4($s0) ## 000006B4 @@ -1623,7 +1623,7 @@ glabel L808D8ED4 /* 02738 808D8FA8 46128102 */ mul.s $f4, $f16, $f18 /* 0273C 808D8FAC 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 /* 02740 808D8FB0 44072000 */ mfc1 $a3, $f4 -/* 02744 808D8FB4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02744 808D8FB4 0C01E107 */ jal Math_ApproachF /* 02748 808D8FB8 00000000 */ nop /* 0274C 808D8FBC C60606B8 */ lwc1 $f6, 0x06B8($s0) ## 000006B8 @@ -1633,7 +1633,7 @@ glabel L808D8ED4 /* 0275C 808D8FCC 46083282 */ mul.s $f10, $f6, $f8 /* 02760 808D8FD0 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 /* 02764 808D8FD4 44075000 */ mfc1 $a3, $f10 -/* 02768 808D8FD8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02768 808D8FD8 0C01E107 */ jal Math_ApproachF /* 0276C 808D8FDC 00000000 */ nop /* 02770 808D8FE0 8605067A */ lh $a1, 0x067A($s0) ## 0000067A diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D91F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D91F8.s index a405bf6702..affcb3484e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D91F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D91F8.s @@ -54,7 +54,7 @@ glabel func_808D91F8 /* 02A40 808D92B0 92280000 */ lbu $t0, 0x0000($s1) ## 00000000 /* 02A44 808D92B4 51000010 */ beql $t0, $zero, .L808D92F8 /* 02A48 808D92B8 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 02A4C 808D92BC 0C03F66B */ jal Math_Rand_ZeroOne +/* 02A4C 808D92BC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02A50 808D92C0 00000000 */ nop /* 02A54 808D92C4 4614003C */ c.lt.s $f0, $f20 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s index be4272993a..7620d5523b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s @@ -409,12 +409,12 @@ glabel L808D9654 /* 02F20 808D9790 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 .L808D9794: /* 02F24 808D9794 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 02F28 808D9798 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02F28 808D9798 0C00CFC8 */ jal Rand_CenteredFloat /* 02F2C 808D979C A7A200AE */ sh $v0, 0x00AE($sp) /* 02F30 808D97A0 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 02F34 808D97A4 44816000 */ mtc1 $at, $f12 ## $f12 = 1.50 -/* 02F38 808D97A8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02F38 808D97A8 0C00CFC8 */ jal Rand_CenteredFloat /* 02F3C 808D97AC E7A00098 */ swc1 $f0, 0x0098($sp) /* 02F40 808D97B0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -422,7 +422,7 @@ glabel L808D9654 /* 02F48 808D97B8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 02F4C 808D97BC 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 02F50 808D97C0 46080280 */ add.s $f10, $f0, $f8 -/* 02F54 808D97C4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 02F54 808D97C4 0C00CFBE */ jal Rand_ZeroFloat /* 02F58 808D97C8 E7AA009C */ swc1 $f10, 0x009C($sp) /* 02F5C 808D97CC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 @@ -445,7 +445,7 @@ glabel L808D9654 /* 02FA0 808D9810 460A4401 */ sub.s $f16, $f8, $f10 /* 02FA4 808D9814 E7B00084 */ swc1 $f16, 0x0084($sp) /* 02FA8 808D9818 C6120210 */ lwc1 $f18, 0x0210($s0) ## 00000210 -/* 02FAC 808D981C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 02FAC 808D981C 0C00CFBE */ jal Rand_ZeroFloat /* 02FB0 808D9820 E7B20088 */ swc1 $f18, 0x0088($sp) /* 02FB4 808D9824 4600010D */ trunc.w.s $f4, $f0 @@ -606,7 +606,7 @@ glabel L808D9A54 /* 031FC 808D9A6C 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A /* 03200 808D9A70 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3E4CCCCD /* 03204 808D9A74 260406EC */ addiu $a0, $s0, 0x06EC ## $a0 = 000006EC -/* 03208 808D9A78 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03208 808D9A78 0C01E107 */ jal Math_ApproachF /* 0320C 808D9A7C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03210 808D9A80 8FA40054 */ lw $a0, 0x0054($sp) @@ -683,7 +683,7 @@ glabel L808D9B34 /* 0331C 808D9B8C E6040688 */ swc1 $f4, 0x0688($s0) ## 00000688 /* 03320 808D9B90 E6060694 */ swc1 $f6, 0x0694($s0) ## 00000694 /* 03324 808D9B94 E600068C */ swc1 $f0, 0x068C($s0) ## 0000068C -/* 03328 808D9B98 0C01DE1C */ jal Math_Sins +/* 03328 808D9B98 0C01DE1C */ jal Math_SinS ## sins? /* 0332C 808D9B9C E6000690 */ swc1 $f0, 0x0690($s0) ## 00000690 /* 03330 808D9BA0 3C01808F */ lui $at, %hi(D_808F7F48) ## $at = 808F0000 @@ -718,7 +718,7 @@ glabel L808D9B34 /* 03394 808D9C04 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 03398 808D9C08 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 0339C 808D9C0C 26040508 */ addiu $a0, $s0, 0x0508 ## $a0 = 00000508 -/* 033A0 808D9C10 0C01E107 */ jal Math_SmoothScaleMaxF +/* 033A0 808D9C10 0C01E107 */ jal Math_ApproachF /* 033A4 808D9C14 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 /* 033A8 808D9C18 8E0C0674 */ lw $t4, 0x0674($s0) ## 00000674 @@ -772,7 +772,7 @@ glabel L808D9C94 /* 03458 808D9CC8 26040710 */ addiu $a0, $s0, 0x0710 ## $a0 = 00000710 /* 0345C 808D9CCC 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 03460 808D9CD0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 03464 808D9CD4 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 03464 808D9CD4 0C01E123 */ jal Math_ApproachZeroF /* 03468 808D9CD8 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 0346C 808D9CDC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -784,7 +784,7 @@ glabel L808D9C94 /* 03484 808D9CF4 26040680 */ addiu $a0, $s0, 0x0680 ## $a0 = 00000680 /* 03488 808D9CF8 3C054387 */ lui $a1, 0x4387 ## $a1 = 43870000 /* 0348C 808D9CFC 44074000 */ mfc1 $a3, $f8 -/* 03490 808D9D00 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03490 808D9D00 0C01E107 */ jal Math_ApproachF /* 03494 808D9D04 00000000 */ nop /* 03498 808D9D08 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -796,7 +796,7 @@ glabel L808D9C94 /* 034B0 808D9D20 26040688 */ addiu $a0, $s0, 0x0688 ## $a0 = 00000688 /* 034B4 808D9D24 3C054382 */ lui $a1, 0x4382 ## $a1 = 43820000 /* 034B8 808D9D28 44079000 */ mfc1 $a3, $f18 -/* 034BC 808D9D2C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 034BC 808D9D2C 0C01E107 */ jal Math_ApproachF /* 034C0 808D9D30 00000000 */ nop /* 034C4 808D9D34 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 @@ -808,7 +808,7 @@ glabel L808D9C94 /* 034DC 808D9D4C 26040690 */ addiu $a0, $s0, 0x0690 ## $a0 = 00000690 /* 034E0 808D9D50 3C0542CE */ lui $a1, 0x42CE ## $a1 = 42CE0000 /* 034E4 808D9D54 44074000 */ mfc1 $a3, $f8 -/* 034E8 808D9D58 0C01E107 */ jal Math_SmoothScaleMaxF +/* 034E8 808D9D58 0C01E107 */ jal Math_ApproachF /* 034EC 808D9D5C 00000000 */ nop /* 034F0 808D9D60 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -820,7 +820,7 @@ glabel L808D9C94 /* 03508 808D9D78 26040694 */ addiu $a0, $s0, 0x0694 ## $a0 = 00000694 /* 0350C 808D9D7C 3C05438C */ lui $a1, 0x438C ## $a1 = 438C0000 /* 03510 808D9D80 44079000 */ mfc1 $a3, $f18 -/* 03514 808D9D84 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03514 808D9D84 0C01E107 */ jal Math_ApproachF /* 03518 808D9D88 00000000 */ nop /* 0351C 808D9D8C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -829,7 +829,7 @@ glabel L808D9C94 /* 03528 808D9D98 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A /* 0352C 808D9D9C 44050000 */ mfc1 $a1, $f0 /* 03530 808D9DA0 44060000 */ mfc1 $a2, $f0 -/* 03534 808D9DA4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03534 808D9DA4 0C01E107 */ jal Math_ApproachF /* 03538 808D9DA8 260406EC */ addiu $a0, $s0, 0x06EC ## $a0 = 000006EC /* 0353C 808D9DAC 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 @@ -842,7 +842,7 @@ glabel L808D9C94 /* 03554 808D9DC4 00832023 */ subu $a0, $a0, $v1 /* 03558 808D9DC8 00042200 */ sll $a0, $a0, 8 /* 0355C 808D9DCC 00042400 */ sll $a0, $a0, 16 -/* 03560 808D9DD0 0C01DE1C */ jal Math_Sins +/* 03560 808D9DD0 0C01DE1C */ jal Math_SinS ## sins? /* 03564 808D9DD4 00042403 */ sra $a0, $a0, 16 /* 03568 808D9DD8 C6040710 */ lwc1 $f4, 0x0710($s0) ## 00000710 @@ -870,7 +870,7 @@ glabel L808D9C94 /* 035B8 808D9E28 2C610082 */ sltiu $at, $v1, 0x0082 /* 035BC 808D9E2C 14200004 */ bne $at, $zero, .L808D9E40 /* 035C0 808D9E30 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 035C4 808D9E34 0C01E107 */ jal Math_SmoothScaleMaxF +/* 035C4 808D9E34 0C01E107 */ jal Math_ApproachF /* 035C8 808D9E38 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 035CC 808D9E3C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 @@ -1024,7 +1024,7 @@ glabel L808DA068 /* 03804 808DA074 26040714 */ addiu $a0, $s0, 0x0714 ## $a0 = 00000714 /* 03808 808DA078 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 0380C 808DA07C 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 03810 808DA080 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 03810 808DA080 0C01E123 */ jal Math_ApproachZeroF /* 03814 808DA084 E5260028 */ swc1 $f6, 0x0028($t1) ## FFFF8028 /* 03818 808DA088 8E0A0674 */ lw $t2, 0x0674($s0) ## 00000674 @@ -1034,14 +1034,14 @@ glabel L808DA068 /* 03828 808DA098 1420003D */ bne $at, $zero, .L808DA190 /* 0382C 808DA09C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 03830 808DA0A0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 03834 808DA0A4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03834 808DA0A4 0C01E107 */ jal Math_ApproachF /* 03838 808DA0A8 8E0706EC */ lw $a3, 0x06EC($s0) ## 000006EC /* 0383C 808DA0AC 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 03840 808DA0B0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 03844 808DA0B4 260406EC */ addiu $a0, $s0, 0x06EC ## $a0 = 000006EC /* 03848 808DA0B8 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 0384C 808DA0BC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0384C 808DA0BC 0C01E107 */ jal Math_ApproachF /* 03850 808DA0C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03854 808DA0C4 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 @@ -1184,7 +1184,7 @@ glabel L808DA284 /* 03A3C 808DA2AC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 03A40 808DA2B0 34A53000 */ ori $a1, $a1, 0x3000 ## $a1 = 45803000 /* 03A44 808DA2B4 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 03A48 808DA2B8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03A48 808DA2B8 0C01E107 */ jal Math_ApproachF /* 03A4C 808DA2BC 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 03A50 808DA2C0 3C01C372 */ lui $at, 0xC372 ## $at = C3720000 @@ -1264,7 +1264,7 @@ glabel L808DA35C /* 03B6C 808DA3DC 8FA400B4 */ lw $a0, 0x00B4($sp) /* 03B70 808DA3E0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 03B74 808DA3E4 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC -/* 03B78 808DA3E8 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 03B78 808DA3E8 0C01E123 */ jal Math_ApproachZeroF /* 03B7C 808DA3EC 00812021 */ addu $a0, $a0, $at /* 03B80 808DA3F0 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 @@ -1358,7 +1358,7 @@ glabel L808DA450 /* 03CC0 808DA530 00812023 */ subu $a0, $a0, $at /* 03CC4 808DA534 00042200 */ sll $a0, $a0, 8 /* 03CC8 808DA538 00042400 */ sll $a0, $a0, 16 -/* 03CCC 808DA53C 0C01DE1C */ jal Math_Sins +/* 03CCC 808DA53C 0C01DE1C */ jal Math_SinS ## sins? /* 03CD0 808DA540 00042403 */ sra $a0, $a0, 16 /* 03CD4 808DA544 3C01808F */ lui $at, %hi(D_808F7F84) ## $at = 808F0000 @@ -1400,7 +1400,7 @@ glabel L808DA450 /* 03D58 808DA5C8 00812023 */ subu $a0, $a0, $at /* 03D5C 808DA5CC 00042200 */ sll $a0, $a0, 8 /* 03D60 808DA5D0 00042400 */ sll $a0, $a0, 16 -/* 03D64 808DA5D4 0C01DE1C */ jal Math_Sins +/* 03D64 808DA5D4 0C01DE1C */ jal Math_SinS ## sins? /* 03D68 808DA5D8 00042403 */ sra $a0, $a0, 16 /* 03D6C 808DA5DC 3C01808F */ lui $at, %hi(D_808F7F88) ## $at = 808F0000 @@ -1447,7 +1447,7 @@ glabel L808DA450 /* 03E08 808DA678 00812023 */ subu $a0, $a0, $at /* 03E0C 808DA67C 00042200 */ sll $a0, $a0, 8 /* 03E10 808DA680 00042400 */ sll $a0, $a0, 16 -/* 03E14 808DA684 0C01DE1C */ jal Math_Sins +/* 03E14 808DA684 0C01DE1C */ jal Math_SinS ## sins? /* 03E18 808DA688 00042403 */ sra $a0, $a0, 16 /* 03E1C 808DA68C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -1468,7 +1468,7 @@ glabel L808DA450 /* 03E58 808DA6C8 26040680 */ addiu $a0, $s0, 0x0680 ## $a0 = 00000680 /* 03E5C 808DA6CC 3C05C496 */ lui $a1, 0xC496 ## $a1 = C4960000 /* 03E60 808DA6D0 44075000 */ mfc1 $a3, $f10 -/* 03E64 808DA6D4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03E64 808DA6D4 0C01E107 */ jal Math_ApproachF /* 03E68 808DA6D8 00000000 */ nop /* 03E6C 808DA6DC 3C0142E2 */ lui $at, 0x42E2 ## $at = 42E20000 @@ -1481,7 +1481,7 @@ glabel L808DA450 /* 03E88 808DA6F8 34A58800 */ ori $a1, $a1, 0x8800 ## $a1 = 45848800 /* 03E8C 808DA6FC 26040684 */ addiu $a0, $s0, 0x0684 ## $a0 = 00000684 /* 03E90 808DA700 44072000 */ mfc1 $a3, $f4 -/* 03E94 808DA704 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03E94 808DA704 0C01E107 */ jal Math_ApproachF /* 03E98 808DA708 00000000 */ nop /* 03E9C 808DA70C 3C01808F */ lui $at, %hi(D_808F7F98) ## $at = 808F0000 @@ -1493,7 +1493,7 @@ glabel L808DA450 /* 03EB4 808DA724 26040688 */ addiu $a0, $s0, 0x0688 ## $a0 = 00000688 /* 03EB8 808DA728 3C05C483 */ lui $a1, 0xC483 ## $a1 = C4830000 /* 03EBC 808DA72C 44075000 */ mfc1 $a3, $f10 -/* 03EC0 808DA730 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03EC0 808DA730 0C01E107 */ jal Math_ApproachF /* 03EC4 808DA734 00000000 */ nop /* 03EC8 808DA738 3C053D4C */ lui $a1, 0x3D4C ## $a1 = 3D4C0000 @@ -1501,7 +1501,7 @@ glabel L808DA450 /* 03ED0 808DA740 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A83126F /* 03ED4 808DA744 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3D4CCCCD /* 03ED8 808DA748 260406F0 */ addiu $a0, $s0, 0x06F0 ## $a0 = 000006F0 -/* 03EDC 808DA74C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03EDC 808DA74C 0C01E107 */ jal Math_ApproachF /* 03EE0 808DA750 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03EE4 808DA754 8E190674 */ lw $t9, 0x0674($s0) ## 00000674 @@ -1556,7 +1556,7 @@ glabel L808DA77C /* 03FA0 808DA810 00042403 */ sra $a0, $a0, 16 /* 03FA4 808DA814 C5A6002C */ lwc1 $f6, 0x002C($t5) ## 0000002C /* 03FA8 808DA818 46083281 */ sub.s $f10, $f6, $f8 -/* 03FAC 808DA81C 0C01DE1C */ jal Math_Sins +/* 03FAC 808DA81C 0C01DE1C */ jal Math_SinS ## sins? /* 03FB0 808DA820 E60A0694 */ swc1 $f10, 0x0694($s0) ## 00000694 /* 03FB4 808DA824 3C01808F */ lui $at, %hi(D_808F7FA0) ## $at = 808F0000 @@ -1614,7 +1614,7 @@ glabel L808DA8C8 /* 04074 808DA8E4 00812023 */ subu $a0, $a0, $at /* 04078 808DA8E8 00042200 */ sll $a0, $a0, 8 /* 0407C 808DA8EC 00042400 */ sll $a0, $a0, 16 -/* 04080 808DA8F0 0C01DE1C */ jal Math_Sins +/* 04080 808DA8F0 0C01DE1C */ jal Math_SinS ## sins? /* 04084 808DA8F4 00042403 */ sra $a0, $a0, 16 /* 04088 808DA8F8 3C01808F */ lui $at, %hi(D_808F7FA4) ## $at = 808F0000 @@ -1691,7 +1691,7 @@ glabel L808DA9F0 /* 0419C 808DAA0C 00812023 */ subu $a0, $a0, $at /* 041A0 808DAA10 00042200 */ sll $a0, $a0, 8 /* 041A4 808DAA14 00042400 */ sll $a0, $a0, 16 -/* 041A8 808DAA18 0C01DE1C */ jal Math_Sins +/* 041A8 808DAA18 0C01DE1C */ jal Math_SinS ## sins? /* 041AC 808DAA1C 00042403 */ sra $a0, $a0, 16 /* 041B0 808DAA20 3C01808F */ lui $at, %hi(D_808F7FAC) ## $at = 808F0000 @@ -1810,7 +1810,7 @@ glabel L808DAB60 /* 0435C 808DABCC 44075000 */ mfc1 $a3, $f10 /* 04360 808DABD0 AFAE0050 */ sw $t6, 0x0050($sp) /* 04364 808DABD4 AFAD0054 */ sw $t5, 0x0054($sp) -/* 04368 808DABD8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04368 808DABD8 0C01E107 */ jal Math_ApproachF /* 0436C 808DABDC 01402025 */ or $a0, $t2, $zero ## $a0 = 00000680 /* 04370 808DABE0 C61006A8 */ lwc1 $f16, 0x06A8($s0) ## 000006A8 @@ -1820,7 +1820,7 @@ glabel L808DAB60 /* 04380 808DABF0 46128102 */ mul.s $f4, $f16, $f18 /* 04384 808DABF4 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 /* 04388 808DABF8 44072000 */ mfc1 $a3, $f4 -/* 0438C 808DABFC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0438C 808DABFC 0C01E107 */ jal Math_ApproachF /* 04390 808DAC00 00000000 */ nop /* 04394 808DAC04 C60606AC */ lwc1 $f6, 0x06AC($s0) ## 000006AC @@ -1830,7 +1830,7 @@ glabel L808DAB60 /* 043A4 808DAC14 46083282 */ mul.s $f10, $f6, $f8 /* 043A8 808DAC18 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 /* 043AC 808DAC1C 44075000 */ mfc1 $a3, $f10 -/* 043B0 808DAC20 0C01E107 */ jal Math_SmoothScaleMaxF +/* 043B0 808DAC20 0C01E107 */ jal Math_ApproachF /* 043B4 808DAC24 00000000 */ nop /* 043B8 808DAC28 C61006B0 */ lwc1 $f16, 0x06B0($s0) ## 000006B0 @@ -1840,7 +1840,7 @@ glabel L808DAB60 /* 043C8 808DAC38 46128102 */ mul.s $f4, $f16, $f18 /* 043CC 808DAC3C 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 /* 043D0 808DAC40 44072000 */ mfc1 $a3, $f4 -/* 043D4 808DAC44 0C01E107 */ jal Math_SmoothScaleMaxF +/* 043D4 808DAC44 0C01E107 */ jal Math_ApproachF /* 043D8 808DAC48 00000000 */ nop /* 043DC 808DAC4C C60606B4 */ lwc1 $f6, 0x06B4($s0) ## 000006B4 @@ -1850,7 +1850,7 @@ glabel L808DAB60 /* 043EC 808DAC5C 46083282 */ mul.s $f10, $f6, $f8 /* 043F0 808DAC60 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 /* 043F4 808DAC64 44075000 */ mfc1 $a3, $f10 -/* 043F8 808DAC68 0C01E107 */ jal Math_SmoothScaleMaxF +/* 043F8 808DAC68 0C01E107 */ jal Math_ApproachF /* 043FC 808DAC6C 00000000 */ nop /* 04400 808DAC70 C61006B8 */ lwc1 $f16, 0x06B8($s0) ## 000006B8 @@ -1860,7 +1860,7 @@ glabel L808DAB60 /* 04410 808DAC80 46128102 */ mul.s $f4, $f16, $f18 /* 04414 808DAC84 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 /* 04418 808DAC88 44072000 */ mfc1 $a3, $f4 -/* 0441C 808DAC8C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0441C 808DAC8C 0C01E107 */ jal Math_ApproachF /* 04420 808DAC90 00000000 */ nop .L808DAC94: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DAD20.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DAD20.s index cffcd6dfc0..81914effd8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DAD20.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DAD20.s @@ -41,7 +41,7 @@ glabel L808DAD6C /* 04508 808DAD78 00812021 */ addu $a0, $a0, $at /* 0450C 808DAD7C 00042200 */ sll $a0, $a0, 8 /* 04510 808DAD80 00042400 */ sll $a0, $a0, 16 -/* 04514 808DAD84 0C01DE1C */ jal Math_Sins +/* 04514 808DAD84 0C01DE1C */ jal Math_SinS ## sins? /* 04518 808DAD88 00042403 */ sra $a0, $a0, 16 /* 0451C 808DAD8C 862401A2 */ lh $a0, 0x01A2($s1) ## 000001A2 @@ -52,7 +52,7 @@ glabel L808DAD6C /* 04530 808DADA0 00042200 */ sll $a0, $a0, 8 /* 04534 808DADA4 00042400 */ sll $a0, $a0, 16 /* 04538 808DADA8 46002502 */ mul.s $f20, $f4, $f0 -/* 0453C 808DADAC 0C01DE0D */ jal Math_Coss +/* 0453C 808DADAC 0C01DE0D */ jal Math_CosS ## coss? /* 04540 808DADB0 00042403 */ sra $a0, $a0, 16 /* 04544 808DADB4 C62601D0 */ lwc1 $f6, 0x01D0($s1) ## 000001D0 @@ -62,20 +62,20 @@ glabel L808DAD6C /* 04554 808DADC4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04558 808DADC8 26240024 */ addiu $a0, $s1, 0x0024 ## $a0 = 00000024 /* 0455C 808DADCC E7A80078 */ swc1 $f8, 0x0078($sp) -/* 04560 808DADD0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04560 808DADD0 0C01E107 */ jal Math_ApproachF /* 04564 808DADD4 8E2701C8 */ lw $a3, 0x01C8($s1) ## 000001C8 /* 04568 808DADD8 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 0456C 808DADDC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04570 808DADE0 2624002C */ addiu $a0, $s1, 0x002C ## $a0 = 0000002C /* 04574 808DADE4 8FA50078 */ lw $a1, 0x0078($sp) -/* 04578 808DADE8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04578 808DADE8 0C01E107 */ jal Math_ApproachF /* 0457C 808DADEC 8E2701C8 */ lw $a3, 0x01C8($s1) ## 000001C8 /* 04580 808DADF0 262401D0 */ addiu $a0, $s1, 0x01D0 ## $a0 = 000001D0 /* 04584 808DADF4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 04588 808DADF8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0458C 808DADFC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0458C 808DADFC 0C01E107 */ jal Math_ApproachF /* 04590 808DAE00 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 /* 04594 808DAE04 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 @@ -93,7 +93,7 @@ glabel L808DAD6C /* 045BC 808DAE2C 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 045C0 808DAE30 4481A000 */ mtc1 $at, $f20 ## $f20 = 250.00 /* 045C4 808DAE34 3C01808F */ lui $at, %hi(D_808F7FC4) ## $at = 808F0000 -/* 045C8 808DAE38 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 045C8 808DAE38 0C00CFBE */ jal Rand_ZeroFloat /* 045CC 808DAE3C C42C7FC4 */ lwc1 $f12, %lo(D_808F7FC4)($at) /* 045D0 808DAE40 3C01808F */ lui $at, %hi(D_808F7FC8) ## $at = 808F0000 @@ -105,7 +105,7 @@ glabel L808DAD6C /* 045E8 808DAE58 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 045EC 808DAE5C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 045F0 808DAE60 46125100 */ add.s $f4, $f10, $f18 -/* 045F4 808DAE64 0C01E107 */ jal Math_SmoothScaleMaxF +/* 045F4 808DAE64 0C01E107 */ jal Math_ApproachF /* 045F8 808DAE68 E6240258 */ swc1 $f4, 0x0258($s1) ## 00000258 /* 045FC 808DAE6C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 @@ -120,7 +120,7 @@ glabel L808DAD6C /* 04618 808DAE88 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 0461C 808DAE8C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 04620 808DAE90 26240028 */ addiu $a0, $s1, 0x0028 ## $a0 = 00000028 -/* 04624 808DAE94 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04624 808DAE94 0C01E107 */ jal Math_ApproachF /* 04628 808DAE98 8E270060 */ lw $a3, 0x0060($s1) ## 00000060 /* 0462C 808DAE9C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -129,7 +129,7 @@ glabel L808DAD6C /* 04638 808DAEA8 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 /* 0463C 808DAEAC 44060000 */ mfc1 $a2, $f0 /* 04640 808DAEB0 44070000 */ mfc1 $a3, $f0 -/* 04644 808DAEB4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04644 808DAEB4 0C01E107 */ jal Math_ApproachF /* 04648 808DAEB8 00000000 */ nop /* 0464C 808DAEBC 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 @@ -169,7 +169,7 @@ glabel L808DAF1C /* 046C8 808DAF38 A22801A0 */ sb $t0, 0x01A0($s1) ## 000001A0 /* 046CC 808DAF3C 3C05C248 */ lui $a1, 0xC248 ## $a1 = C2480000 /* 046D0 808DAF40 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 046D4 808DAF44 0C01E107 */ jal Math_SmoothScaleMaxF +/* 046D4 808DAF44 0C01E107 */ jal Math_ApproachF /* 046D8 808DAF48 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 046DC 808DAF4C C6240028 */ lwc1 $f4, 0x0028($s1) ## 00000028 @@ -215,21 +215,21 @@ glabel L808DAF1C /* 04778 808DAFE8 AD8E0008 */ sw $t6, 0x0008($t4) ## FFFFFFE0 /* 0477C 808DAFEC E7B20064 */ swc1 $f18, 0x0064($sp) .L808DAFF0: -/* 04780 808DAFF0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 04780 808DAFF0 0C00CFC8 */ jal Rand_CenteredFloat /* 04784 808DAFF4 4600A306 */ mov.s $f12, $f20 /* 04788 808DAFF8 3C014188 */ lui $at, 0x4188 ## $at = 41880000 /* 0478C 808DAFFC 44816000 */ mtc1 $at, $f12 ## $f12 = 17.00 -/* 04790 808DB000 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 04790 808DB000 0C00CFBE */ jal Rand_ZeroFloat /* 04794 808DB004 E7A0006C */ swc1 $f0, 0x006C($sp) /* 04798 808DB008 E7A00070 */ swc1 $f0, 0x0070($sp) -/* 0479C 808DB00C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0479C 808DB00C 0C00CFC8 */ jal Rand_CenteredFloat /* 047A0 808DB010 4600A306 */ mov.s $f12, $f20 /* 047A4 808DB014 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 047A8 808DB018 44816000 */ mtc1 $at, $f12 ## $f12 = 300.00 -/* 047AC 808DB01C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 047AC 808DB01C 0C00CFBE */ jal Rand_ZeroFloat /* 047B0 808DB020 E7A00074 */ swc1 $f0, 0x0074($sp) /* 047B4 808DB024 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 @@ -284,13 +284,13 @@ glabel L808DB0D8 /* 0486C 808DB0DC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 04870 808DB0E0 26240028 */ addiu $a0, $s1, 0x0028 ## $a0 = 00000028 /* 04874 808DB0E4 3C054316 */ lui $a1, 0x4316 ## $a1 = 43160000 -/* 04878 808DB0E8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04878 808DB0E8 0C01E107 */ jal Math_ApproachF /* 0487C 808DB0EC 8E270060 */ lw $a3, 0x0060($s1) ## 00000060 /* 04880 808DB0F0 26240060 */ addiu $a0, $s1, 0x0060 ## $a0 = 00000060 /* 04884 808DB0F4 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 /* 04888 808DB0F8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0488C 808DB0FC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0488C 808DB0FC 0C01E107 */ jal Math_ApproachF /* 04890 808DB100 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 04894 808DB104 02002025 */ or $a0, $s0, $zero ## $a0 = 00000001 @@ -329,13 +329,13 @@ glabel L808DB174 /* 04908 808DB178 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0490C 808DB17C 26240028 */ addiu $a0, $s1, 0x0028 ## $a0 = 00000028 /* 04910 808DB180 3C054316 */ lui $a1, 0x4316 ## $a1 = 43160000 -/* 04914 808DB184 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04914 808DB184 0C01E107 */ jal Math_ApproachF /* 04918 808DB188 8E270060 */ lw $a3, 0x0060($s1) ## 00000060 /* 0491C 808DB18C 26240060 */ addiu $a0, $s1, 0x0060 ## $a0 = 00000060 /* 04920 808DB190 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 /* 04924 808DB194 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04928 808DB198 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04928 808DB198 0C01E107 */ jal Math_ApproachF /* 0492C 808DB19C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 04930 808DB1A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB278.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB278.s index b665876fbf..c5d43444c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB278.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB278.s @@ -18,7 +18,7 @@ glabel func_808DB278 /* 04A34 808DB2A4 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 /* 04A38 808DB2A8 E48401D0 */ swc1 $f4, 0x01D0($a0) ## 000001D0 /* 04A3C 808DB2AC AFA40018 */ sw $a0, 0x0018($sp) -/* 04A40 808DB2B0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 04A40 808DB2B0 0C00CFBE */ jal Rand_ZeroFloat /* 04A44 808DB2B4 C42C7FCC */ lwc1 $f12, %lo(D_808F7FCC)($at) /* 04A48 808DB2B8 4600018D */ trunc.w.s $f6, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s index 68e7c4d9fd..b3769b2242 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s @@ -30,7 +30,7 @@ glabel func_808DB2E8 /* 04AB0 808DB320 00812021 */ addu $a0, $a0, $at /* 04AB4 808DB324 00042200 */ sll $a0, $a0, 8 /* 04AB8 808DB328 00042400 */ sll $a0, $a0, 16 -/* 04ABC 808DB32C 0C01DE1C */ jal Math_Sins +/* 04ABC 808DB32C 0C01DE1C */ jal Math_SinS ## sins? /* 04AC0 808DB330 00042403 */ sra $a0, $a0, 16 /* 04AC4 808DB334 862401A2 */ lh $a0, 0x01A2($s1) ## 000001A2 @@ -41,7 +41,7 @@ glabel func_808DB2E8 /* 04AD8 808DB348 00042200 */ sll $a0, $a0, 8 /* 04ADC 808DB34C 00042400 */ sll $a0, $a0, 16 /* 04AE0 808DB350 46002502 */ mul.s $f20, $f4, $f0 -/* 04AE4 808DB354 0C01DE0D */ jal Math_Coss +/* 04AE4 808DB354 0C01DE0D */ jal Math_CosS ## coss? /* 04AE8 808DB358 00042403 */ sra $a0, $a0, 16 /* 04AEC 808DB35C C62601D0 */ lwc1 $f6, 0x01D0($s1) ## 000001D0 @@ -50,14 +50,14 @@ glabel func_808DB2E8 /* 04AF8 808DB368 46003582 */ mul.s $f22, $f6, $f0 /* 04AFC 808DB36C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04B00 808DB370 26240024 */ addiu $a0, $s1, 0x0024 ## $a0 = 00000024 -/* 04B04 808DB374 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04B04 808DB374 0C01E107 */ jal Math_ApproachF /* 04B08 808DB378 8E2701C8 */ lw $a3, 0x01C8($s1) ## 000001C8 /* 04B0C 808DB37C 4405B000 */ mfc1 $a1, $f22 /* 04B10 808DB380 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 04B14 808DB384 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04B18 808DB388 2624002C */ addiu $a0, $s1, 0x002C ## $a0 = 0000002C -/* 04B1C 808DB38C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04B1C 808DB38C 0C01E107 */ jal Math_ApproachF /* 04B20 808DB390 8E2701C8 */ lw $a3, 0x01C8($s1) ## 000001C8 /* 04B24 808DB394 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -66,20 +66,20 @@ glabel func_808DB2E8 /* 04B30 808DB3A0 262401D0 */ addiu $a0, $s1, 0x01D0 ## $a0 = 000001D0 /* 04B34 808DB3A4 4406A000 */ mfc1 $a2, $f20 /* 04B38 808DB3A8 4405B000 */ mfc1 $a1, $f22 -/* 04B3C 808DB3AC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04B3C 808DB3AC 0C01E107 */ jal Math_ApproachF /* 04B40 808DB3B0 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 /* 04B44 808DB3B4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 04B48 808DB3B8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04B4C 808DB3BC 26240028 */ addiu $a0, $s1, 0x0028 ## $a0 = 00000028 /* 04B50 808DB3C0 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 -/* 04B54 808DB3C4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04B54 808DB3C4 0C01E107 */ jal Math_ApproachF /* 04B58 808DB3C8 8E270060 */ lw $a3, 0x0060($s1) ## 00000060 /* 04B5C 808DB3CC 4406A000 */ mfc1 $a2, $f20 /* 04B60 808DB3D0 4407A000 */ mfc1 $a3, $f20 /* 04B64 808DB3D4 26240060 */ addiu $a0, $s1, 0x0060 ## $a0 = 00000060 -/* 04B68 808DB3D8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04B68 808DB3D8 0C01E107 */ jal Math_ApproachF /* 04B6C 808DB3DC 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 /* 04B70 808DB3E0 962E01C2 */ lhu $t6, 0x01C2($s1) ## 000001C2 @@ -157,7 +157,7 @@ glabel L808DB498 /* 04C78 808DB4E8 AFA40054 */ sw $a0, 0x0054($sp) /* 04C7C 808DB4EC 34E79BA6 */ ori $a3, $a3, 0x9BA6 ## $a3 = 3BC49BA6 /* 04C80 808DB4F0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 04C84 808DB4F4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04C84 808DB4F4 0C01E107 */ jal Math_ApproachF /* 04C88 808DB4F8 3C053E80 */ lui $a1, 0x3E80 ## $a1 = 3E800000 /* 04C8C 808DB4FC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 @@ -166,7 +166,7 @@ glabel L808DB498 /* 04C98 808DB508 26240288 */ addiu $a0, $s1, 0x0288 ## $a0 = 00000288 /* 04C9C 808DB50C 44050000 */ mfc1 $a1, $f0 /* 04CA0 808DB510 44070000 */ mfc1 $a3, $f0 -/* 04CA4 808DB514 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04CA4 808DB514 0C01E107 */ jal Math_ApproachF /* 04CA8 808DB518 00000000 */ nop /* 04CAC 808DB51C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 @@ -174,7 +174,7 @@ glabel L808DB498 /* 04CB4 808DB524 34E79BA6 */ ori $a3, $a3, 0x9BA6 ## $a3 = 3BC49BA6 /* 04CB8 808DB528 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 04CBC 808DB52C 2624028C */ addiu $a0, $s1, 0x028C ## $a0 = 0000028C -/* 04CC0 808DB530 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04CC0 808DB530 0C01E107 */ jal Math_ApproachF /* 04CC4 808DB534 3C053E80 */ lui $a1, 0x3E80 ## $a1 = 3E800000 /* 04CC8 808DB538 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 @@ -185,7 +185,7 @@ glabel L808DB498 /* 04CDC 808DB54C 26240290 */ addiu $a0, $s1, 0x0290 ## $a0 = 00000290 /* 04CE0 808DB550 4406A000 */ mfc1 $a2, $f20 /* 04CE4 808DB554 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 -/* 04CE8 808DB558 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04CE8 808DB558 0C01E107 */ jal Math_ApproachF /* 04CEC 808DB55C 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 /* 04CF0 808DB560 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 @@ -219,7 +219,7 @@ glabel L808DB498 .L808DB5C4: /* 04D54 808DB5C4 8625008A */ lh $a1, 0x008A($s1) ## 0000008A /* 04D58 808DB5C8 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 04D5C 808DB5CC 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 04D5C 808DB5CC 0C01E1EF */ jal Math_ApproachS /* 04D60 808DB5D0 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 04D64 808DB5D4 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 @@ -232,7 +232,7 @@ glabel L808DB498 /* 04D7C 808DB5EC 4405B000 */ mfc1 $a1, $f22 /* 04D80 808DB5F0 4406A000 */ mfc1 $a2, $f20 /* 04D84 808DB5F4 24840294 */ addiu $a0, $a0, 0x0294 ## $a0 = 00000294 -/* 04D88 808DB5F8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04D88 808DB5F8 0C01E107 */ jal Math_ApproachF /* 04D8C 808DB5FC 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 /* 04D90 808DB600 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 @@ -264,7 +264,7 @@ glabel L808DB498 /* 04DEC 808DB65C 4406A000 */ mfc1 $a2, $f20 /* 04DF0 808DB660 24840294 */ addiu $a0, $a0, 0x0294 ## $a0 = 00000294 /* 04DF4 808DB664 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 -/* 04DF8 808DB668 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04DF8 808DB668 0C01E107 */ jal Math_ApproachF /* 04DFC 808DB66C 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 /* 04E00 808DB670 863801AC */ lh $t8, 0x01AC($s1) ## 000001AC @@ -286,7 +286,7 @@ glabel L808DB498 /* 04E38 808DB6A8 3C073C8B */ lui $a3, 0x3C8B ## $a3 = 3C8B0000 /* 04E3C 808DB6AC 34E74396 */ ori $a3, $a3, 0x4396 ## $a3 = 3C8B4396 /* 04E40 808DB6B0 4406A000 */ mfc1 $a2, $f20 -/* 04E44 808DB6B4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04E44 808DB6B4 0C01E107 */ jal Math_ApproachF /* 04E48 808DB6B8 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3ECCCCCD /* 04E4C 808DB6BC C62A0284 */ lwc1 $f10, 0x0284($s1) ## 00000284 @@ -299,7 +299,7 @@ glabel L808DB498 /* 04E64 808DB6D4 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 04E68 808DB6D8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 04E6C 808DB6DC 3C054234 */ lui $a1, 0x4234 ## $a1 = 42340000 -/* 04E70 808DB6E0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04E70 808DB6E0 0C01E107 */ jal Math_ApproachF /* 04E74 808DB6E4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 04E78 808DB6E8 8E2B0278 */ lw $t3, 0x0278($s1) ## 00000278 @@ -356,7 +356,7 @@ glabel L808DB498 /* 04F28 808DB798 142000CE */ bne $at, $zero, .L808DBAD4 /* 04F2C 808DB79C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 04F30 808DB7A0 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 04F34 808DB7A4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 04F34 808DB7A4 0C00CFBE */ jal Rand_ZeroFloat /* 04F38 808DB7A8 E7B60074 */ swc1 $f22, 0x0074($sp) /* 04F3C 808DB7AC 3C014316 */ lui $at, 0x4316 ## $at = 43160000 @@ -379,7 +379,7 @@ glabel L808DB498 /* 04F80 808DB7F0 00000000 */ nop /* 04F84 808DB7F4 3C014780 */ lui $at, 0x4780 ## $at = 47800000 /* 04F88 808DB7F8 44816000 */ mtc1 $at, $f12 ## $f12 = 65536.00 -/* 04F8C 808DB7FC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 04F8C 808DB7FC 0C00CFBE */ jal Rand_ZeroFloat /* 04F90 808DB800 00000000 */ nop /* 04F94 808DB804 46000306 */ mov.s $f12, $f0 @@ -416,7 +416,7 @@ glabel L808DB864 /* 05008 808DB878 4405B000 */ mfc1 $a1, $f22 /* 0500C 808DB87C 4406A000 */ mfc1 $a2, $f20 /* 05010 808DB880 24840294 */ addiu $a0, $a0, 0x0294 ## $a0 = 00000294 -/* 05014 808DB884 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05014 808DB884 0C01E107 */ jal Math_ApproachF /* 05018 808DB888 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 /* 0501C 808DB88C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 @@ -443,14 +443,14 @@ glabel L808DB864 /* 05068 808DB8D8 26240284 */ addiu $a0, $s1, 0x0284 ## $a0 = 00000284 /* 0506C 808DB8DC 4405A000 */ mfc1 $a1, $f20 /* 05070 808DB8E0 3C063DA3 */ lui $a2, 0x3DA3 ## $a2 = 3DA30000 -/* 05074 808DB8E4 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 05074 808DB8E4 0C01E123 */ jal Math_ApproachZeroF /* 05078 808DB8E8 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3DA3D70A /* 0507C 808DB8EC C62A0284 */ lwc1 $f10, 0x0284($s1) ## 00000284 /* 05080 808DB8F0 4405A000 */ mfc1 $a1, $f20 /* 05084 808DB8F4 262402D0 */ addiu $a0, $s1, 0x02D0 ## $a0 = 000002D0 /* 05088 808DB8F8 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 0508C 808DB8FC 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 0508C 808DB8FC 0C01E123 */ jal Math_ApproachZeroF /* 05090 808DB900 E62A028C */ swc1 $f10, 0x028C($s1) ## 0000028C /* 05094 808DB904 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -458,19 +458,19 @@ glabel L808DB864 /* 0509C 808DB90C 26240278 */ addiu $a0, $s1, 0x0278 ## $a0 = 00000278 /* 050A0 808DB910 8E2501FC */ lw $a1, 0x01FC($s1) ## 000001FC /* 050A4 808DB914 4406A000 */ mfc1 $a2, $f20 -/* 050A8 808DB918 0C01E107 */ jal Math_SmoothScaleMaxF +/* 050A8 808DB918 0C01E107 */ jal Math_ApproachF /* 050AC 808DB91C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 050B0 808DB920 4406A000 */ mfc1 $a2, $f20 /* 050B4 808DB924 2624027C */ addiu $a0, $s1, 0x027C ## $a0 = 0000027C /* 050B8 808DB928 8E250200 */ lw $a1, 0x0200($s1) ## 00000200 -/* 050BC 808DB92C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 050BC 808DB92C 0C01E107 */ jal Math_ApproachF /* 050C0 808DB930 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 050C4 808DB934 4406A000 */ mfc1 $a2, $f20 /* 050C8 808DB938 26240280 */ addiu $a0, $s1, 0x0280 ## $a0 = 00000280 /* 050CC 808DB93C 8E250204 */ lw $a1, 0x0204($s1) ## 00000204 -/* 050D0 808DB940 0C01E107 */ jal Math_SmoothScaleMaxF +/* 050D0 808DB940 0C01E107 */ jal Math_ApproachF /* 050D4 808DB944 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 .L808DB948: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s index 7c5c2d09d2..c2a5974f8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s @@ -16,7 +16,7 @@ glabel func_808DBAF0 /* 052B8 808DBB28 25CEBB78 */ addiu $t6, $t6, %lo(func_808DBB78) ## $t6 = 808DBB78 /* 052BC 808DBB2C 44816000 */ mtc1 $at, $f12 ## $f12 = 64.00 /* 052C0 808DBB30 AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 -/* 052C4 808DBB34 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 052C4 808DBB34 0C00CFBE */ jal Rand_ZeroFloat /* 052C8 808DBB38 E60401C8 */ swc1 $f4, 0x01C8($s0) ## 000001C8 /* 052CC 808DBB3C 4600018D */ trunc.w.s $f6, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBB78.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBB78.s index ded0e7c738..ef1f3f2444 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBB78.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBB78.s @@ -76,7 +76,7 @@ glabel func_808DBB78 /* 05408 808DBC78 14400033 */ bne $v0, $zero, .L808DBD48 /* 0540C 808DBC7C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 05410 808DBC80 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 05414 808DBC84 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 05414 808DBC84 0C00CFBE */ jal Rand_ZeroFloat /* 05418 808DBC88 AFA50034 */ sw $a1, 0x0034($sp) /* 0541C 808DBC8C 4600040D */ trunc.w.s $f16, $f0 @@ -92,7 +92,7 @@ glabel func_808DBB78 /* 05444 808DBCB4 10000025 */ beq $zero, $zero, .L808DBD4C /* 05448 808DBCB8 860401A2 */ lh $a0, 0x01A2($s0) ## 000001A2 .L808DBCBC: -/* 0544C 808DBCBC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0544C 808DBCBC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 05450 808DBCC0 AFA50034 */ sw $a1, 0x0034($sp) /* 05454 808DBCC4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -102,7 +102,7 @@ glabel func_808DBB78 /* 05464 808DBCD4 00000000 */ nop /* 05468 808DBCD8 45000019 */ bc1f .L808DBD40 /* 0546C 808DBCDC 00000000 */ nop -/* 05470 808DBCE0 0C03F66B */ jal Math_Rand_ZeroOne +/* 05470 808DBCE0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 05474 808DBCE4 AFA50034 */ sw $a1, 0x0034($sp) /* 05478 808DBCE8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -140,7 +140,7 @@ glabel func_808DBB78 /* 054E4 808DBD54 00812021 */ addu $a0, $a0, $at /* 054E8 808DBD58 00042200 */ sll $a0, $a0, 8 /* 054EC 808DBD5C 00042400 */ sll $a0, $a0, 16 -/* 054F0 808DBD60 0C01DE1C */ jal Math_Sins +/* 054F0 808DBD60 0C01DE1C */ jal Math_SinS ## sins? /* 054F4 808DBD64 00042403 */ sra $a0, $a0, 16 /* 054F8 808DBD68 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -154,7 +154,7 @@ glabel func_808DBB78 /* 05518 808DBD88 00812023 */ subu $a0, $a0, $at /* 0551C 808DBD8C 00042200 */ sll $a0, $a0, 8 /* 05520 808DBD90 00042400 */ sll $a0, $a0, 16 -/* 05524 808DBD94 0C01DE0D */ jal Math_Coss +/* 05524 808DBD94 0C01DE0D */ jal Math_CosS ## coss? /* 05528 808DBD98 00042403 */ sra $a0, $a0, 16 /* 0552C 808DBD9C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -165,7 +165,7 @@ glabel func_808DBB78 /* 05540 808DBDB0 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 05544 808DBDB4 8FA5002C */ lw $a1, 0x002C($sp) /* 05548 808DBDB8 E7A40024 */ swc1 $f4, 0x0024($sp) -/* 0554C 808DBDBC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0554C 808DBDBC 0C01E107 */ jal Math_ApproachF /* 05550 808DBDC0 8E0701C8 */ lw $a3, 0x01C8($s0) ## 000001C8 /* 05554 808DBDC4 3C01808F */ lui $at, %hi(D_808F7FEC) ## $at = 808F0000 @@ -177,20 +177,20 @@ glabel func_808DBB78 /* 0556C 808DBDDC 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 05570 808DBDE0 3C054316 */ lui $a1, 0x4316 ## $a1 = 43160000 /* 05574 808DBDE4 44075000 */ mfc1 $a3, $f10 -/* 05578 808DBDE8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05578 808DBDE8 0C01E107 */ jal Math_ApproachF /* 0557C 808DBDEC 00000000 */ nop /* 05580 808DBDF0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 05584 808DBDF4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 05588 808DBDF8 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 0558C 808DBDFC 8FA50024 */ lw $a1, 0x0024($sp) -/* 05590 808DBE00 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05590 808DBE00 0C01E107 */ jal Math_ApproachF /* 05594 808DBE04 8E0701C8 */ lw $a3, 0x01C8($s0) ## 000001C8 /* 05598 808DBE08 260401C8 */ addiu $a0, $s0, 0x01C8 ## $a0 = 000001C8 /* 0559C 808DBE0C 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 /* 055A0 808DBE10 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 055A4 808DBE14 0C01E107 */ jal Math_SmoothScaleMaxF +/* 055A4 808DBE14 0C01E107 */ jal Math_ApproachF /* 055A8 808DBE18 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 055AC 808DBE1C 860401A2 */ lh $a0, 0x01A2($s0) ## 000001A2 @@ -211,7 +211,7 @@ glabel func_808DBB78 /* 055E8 808DBE58 00042400 */ sll $a0, $a0, 16 /* 055EC 808DBE5C E604005C */ swc1 $f4, 0x005C($s0) ## 0000005C /* 055F0 808DBE60 00042403 */ sra $a0, $a0, 16 -/* 055F4 808DBE64 0C01DE1C */ jal Math_Sins +/* 055F4 808DBE64 0C01DE1C */ jal Math_SinS ## sins? /* 055F8 808DBE68 E60A0064 */ swc1 $f10, 0x0064($s0) ## 00000064 /* 055FC 808DBE6C C61001C8 */ lwc1 $f16, 0x01C8($s0) ## 000001C8 @@ -226,7 +226,7 @@ glabel func_808DBB78 /* 05620 808DBE90 46049082 */ mul.s $f2, $f18, $f4 /* 05624 808DBE94 46023200 */ add.s $f8, $f6, $f2 /* 05628 808DBE98 E6020060 */ swc1 $f2, 0x0060($s0) ## 00000060 -/* 0562C 808DBE9C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0562C 808DBE9C 0C01E1EF */ jal Math_ApproachS /* 05630 808DBEA0 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 /* 05634 808DBEA4 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBF30.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBF30.s index de5c0d0f24..0e704e02c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBF30.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBF30.s @@ -50,7 +50,7 @@ glabel func_808DBF30 /* 0574C 808DBFBC 2841000A */ slti $at, $v0, 0x000A /* 05750 808DBFC0 A609026C */ sh $t1, 0x026C($s0) ## 0000026C /* 05754 808DBFC4 3C01808F */ lui $at, %hi(D_808F7FF4) ## $at = 808F0000 -/* 05758 808DBFC8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 05758 808DBFC8 0C00CFBE */ jal Rand_ZeroFloat /* 0575C 808DBFCC C42C7FF4 */ lwc1 $f12, %lo(D_808F7FF4)($at) /* 05760 808DBFD0 E6000270 */ swc1 $f0, 0x0270($s0) ## 00000270 @@ -63,7 +63,7 @@ glabel func_808DBF30 .L808DBFE8: /* 05778 808DBFE8 10200014 */ beq $at, $zero, .L808DC03C /* 0577C 808DBFEC 3C01808F */ lui $at, %hi(D_808F7FF8) ## $at = 808F0000 -/* 05780 808DBFF0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 05780 808DBFF0 0C00CFBE */ jal Rand_ZeroFloat /* 05784 808DBFF4 C42C7FF8 */ lwc1 $f12, %lo(D_808F7FF8)($at) /* 05788 808DBFF8 3C01808F */ lui $at, %hi(D_808F7FFC) ## $at = 808F0000 @@ -75,7 +75,7 @@ glabel func_808DBF30 /* 057A0 808DC010 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 057A4 808DC014 3C073FA0 */ lui $a3, 0x3FA0 ## $a3 = 3FA00000 /* 057A8 808DC018 46048180 */ add.s $f6, $f16, $f4 -/* 057AC 808DC01C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 057AC 808DC01C 0C01E107 */ jal Math_ApproachF /* 057B0 808DC020 E6060258 */ swc1 $f6, 0x0258($s0) ## 00000258 /* 057B4 808DC024 860A01B6 */ lh $t2, 0x01B6($s0) ## 000001B6 @@ -89,7 +89,7 @@ glabel func_808DBF30 .L808DC040: /* 057D0 808DC040 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 057D4 808DC044 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 057D8 808DC048 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 057D8 808DC048 0C01E1EF */ jal Math_ApproachS /* 057DC 808DC04C 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 057E0 808DC050 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 @@ -102,12 +102,12 @@ glabel func_808DBF30 /* 057FC 808DC06C 46048180 */ add.s $f6, $f16, $f4 /* 05800 808DC070 E6120024 */ swc1 $f18, 0x0024($s0) ## 00000024 /* 05804 808DC074 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 05808 808DC078 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 05808 808DC078 0C01E123 */ jal Math_ApproachZeroF /* 0580C 808DC07C E606002C */ swc1 $f6, 0x002C($s0) ## 0000002C /* 05810 808DC080 26040064 */ addiu $a0, $s0, 0x0064 ## $a0 = 00000064 /* 05814 808DC084 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 05818 808DC088 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 05818 808DC088 0C01E123 */ jal Math_ApproachZeroF /* 0581C 808DC08C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 05820 808DC090 860401A2 */ lh $a0, 0x01A2($s0) ## 000001A2 @@ -120,7 +120,7 @@ glabel func_808DBF30 /* 0583C 808DC0AC 00812023 */ subu $a0, $a0, $at /* 05840 808DC0B0 00042080 */ sll $a0, $a0, 2 /* 05844 808DC0B4 00042400 */ sll $a0, $a0, 16 -/* 05848 808DC0B8 0C01DE1C */ jal Math_Sins +/* 05848 808DC0B8 0C01DE1C */ jal Math_SinS ## sins? /* 0584C 808DC0BC 00042403 */ sra $a0, $a0, 16 /* 05850 808DC0C0 46000080 */ add.s $f2, $f0, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s index 64157248c4..65cf2d5853 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s @@ -16,7 +16,7 @@ glabel func_808DC14C /* 058FC 808DC16C 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 05900 808DC170 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 05904 808DC174 26040254 */ addiu $a0, $s0, 0x0254 ## $a0 = 00000254 -/* 05908 808DC178 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 05908 808DC178 0C01E123 */ jal Math_ApproachZeroF /* 0590C 808DC17C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 05910 808DC180 860201C2 */ lh $v0, 0x01C2($s0) ## 000001C2 @@ -105,7 +105,7 @@ glabel func_808DC14C .L808DC2B0: /* 05A40 808DC2B0 51A0002B */ beql $t5, $zero, .L808DC360 /* 05A44 808DC2B4 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 05A48 808DC2B8 0C03F66B */ jal Math_Rand_ZeroOne +/* 05A48 808DC2B8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 05A4C 808DC2BC 00000000 */ nop /* 05A50 808DC2C0 3C018090 */ lui $at, %hi(D_808F8000) ## $at = 80900000 @@ -154,7 +154,7 @@ glabel func_808DC14C .L808DC360: /* 05AF0 808DC360 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 05AF4 808DC364 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 05AF8 808DC368 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 05AF8 808DC368 0C01E1EF */ jal Math_ApproachS /* 05AFC 808DC36C 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 05B00 808DC370 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 @@ -170,7 +170,7 @@ glabel func_808DC14C /* 05B28 808DC398 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05B2C 808DC39C E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C /* 05B30 808DC3A0 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 05B34 808DC3A4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 05B34 808DC3A4 0C01E0C4 */ jal Math_SmoothStepToF /* 05B38 808DC3A8 E7A00010 */ swc1 $f0, 0x0010($sp) /* 05B3C 808DC3AC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -178,7 +178,7 @@ glabel func_808DC14C /* 05B44 808DC3B4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 05B48 808DC3B8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05B4C 808DC3BC 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 05B50 808DC3C0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 05B50 808DC3C0 0C01E0C4 */ jal Math_SmoothStepToF /* 05B54 808DC3C4 E7A40010 */ swc1 $f4, 0x0010($sp) /* 05B58 808DC3C8 860401A2 */ lh $a0, 0x01A2($s0) ## 000001A2 @@ -191,7 +191,7 @@ glabel func_808DC14C /* 05B74 808DC3E4 00812023 */ subu $a0, $a0, $at /* 05B78 808DC3E8 00042080 */ sll $a0, $a0, 2 /* 05B7C 808DC3EC 00042400 */ sll $a0, $a0, 16 -/* 05B80 808DC3F0 0C01DE1C */ jal Math_Sins +/* 05B80 808DC3F0 0C01DE1C */ jal Math_SinS ## sins? /* 05B84 808DC3F4 00042403 */ sra $a0, $a0, 16 /* 05B88 808DC3F8 46000080 */ add.s $f2, $f0, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC4DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC4DC.s index 61f1b8a638..8e77004411 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC4DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC4DC.s @@ -91,17 +91,17 @@ glabel func_808DC4DC /* 05DB4 808DC624 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 /* 05DB8 808DC628 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 05DBC 808DC62C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 05DC0 808DC630 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 05DC0 808DC630 0C01E123 */ jal Math_ApproachZeroF /* 05DC4 808DC634 E610002C */ swc1 $f16, 0x002C($s0) ## 0000002C /* 05DC8 808DC638 26040060 */ addiu $a0, $s0, 0x0060 ## $a0 = 00000060 /* 05DCC 808DC63C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 05DD0 808DC640 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 05DD0 808DC640 0C01E123 */ jal Math_ApproachZeroF /* 05DD4 808DC644 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 05DD8 808DC648 26040064 */ addiu $a0, $s0, 0x0064 ## $a0 = 00000064 /* 05DDC 808DC64C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 05DE0 808DC650 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 05DE0 808DC650 0C01E123 */ jal Math_ApproachZeroF /* 05DE4 808DC654 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 05DE8 808DC658 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s index f355366aae..4e33ea29aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s @@ -94,20 +94,20 @@ glabel func_808DC75C /* 0603C 808DC8AC 4481A000 */ mtc1 $at, $f20 ## $f20 = 25.00 /* 06040 808DC8B0 267101FC */ addiu $s1, $s3, 0x01FC ## $s1 = 000001FC .L808DC8B4: -/* 06044 808DC8B4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 06044 808DC8B4 0C00CFC8 */ jal Rand_CenteredFloat /* 06048 808DC8B8 4600A306 */ mov.s $f12, $f20 /* 0604C 808DC8BC E7A00050 */ swc1 $f0, 0x0050($sp) -/* 06050 808DC8C0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 06050 808DC8C0 0C00CFC8 */ jal Rand_CenteredFloat /* 06054 808DC8C4 4600A306 */ mov.s $f12, $f20 /* 06058 808DC8C8 E7A00054 */ swc1 $f0, 0x0054($sp) -/* 0605C 808DC8CC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0605C 808DC8CC 0C00CFC8 */ jal Rand_CenteredFloat /* 06060 808DC8D0 4600A306 */ mov.s $f12, $f20 /* 06064 808DC8D4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 06068 808DC8D8 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 -/* 0606C 808DC8DC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0606C 808DC8DC 0C00CFBE */ jal Rand_ZeroFloat /* 06070 808DC8E0 E7A00058 */ swc1 $f0, 0x0058($sp) /* 06074 808DC8E4 46160480 */ add.s $f18, $f0, $f22 @@ -150,7 +150,7 @@ glabel func_808DC75C /* 060F8 808DC968 00812023 */ subu $a0, $a0, $at /* 060FC 808DC96C 00042080 */ sll $a0, $a0, 2 /* 06100 808DC970 00042400 */ sll $a0, $a0, 16 -/* 06104 808DC974 0C01DE1C */ jal Math_Sins +/* 06104 808DC974 0C01DE1C */ jal Math_SinS ## sins? /* 06108 808DC978 00042403 */ sra $a0, $a0, 16 /* 0610C 808DC97C 46000080 */ add.s $f2, $f0, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s index 5188922b35..3190fe88b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s @@ -65,11 +65,11 @@ glabel func_808DC9B4 /* 0623C 808DCAAC 8C4A0000 */ lw $t2, 0x0000($v0) ## 808F93C0 /* 06240 808DCAB0 E54616D0 */ swc1 $f6, 0x16D0($t2) ## 000016D0 .L808DCAB4: -/* 06244 808DCAB4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 06244 808DCAB4 0C00CFC8 */ jal Rand_CenteredFloat /* 06248 808DCAB8 4600B306 */ mov.s $f12, $f22 /* 0624C 808DCABC 46000506 */ mov.s $f20, $f0 -/* 06250 808DCAC0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 06250 808DCAC0 0C00CFC8 */ jal Rand_CenteredFloat /* 06254 808DCAC4 4600B306 */ mov.s $f12, $f22 /* 06258 808DCAC8 C62801FC */ lwc1 $f8, 0x01FC($s1) ## 000001FC diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s index bdad316322..35b9cb64dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s @@ -48,7 +48,7 @@ glabel func_808DCB7C /* 0637C 808DCBEC 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 /* 06380 808DCBF0 44060000 */ mfc1 $a2, $f0 /* 06384 808DCBF4 44070000 */ mfc1 $a3, $f0 -/* 06388 808DCBF8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06388 808DCBF8 0C01E107 */ jal Math_ApproachF /* 0638C 808DCBFC 00000000 */ nop /* 06390 808DCC00 862301A4 */ lh $v1, 0x01A4($s1) ## 000001A4 @@ -62,7 +62,7 @@ glabel func_808DCB7C /* 063AC 808DCC1C 26240508 */ addiu $a0, $s1, 0x0508 ## $a0 = 00000508 /* 063B0 808DCC20 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 063B4 808DCC24 4405A000 */ mfc1 $a1, $f20 -/* 063B8 808DCC28 0C01E107 */ jal Math_SmoothScaleMaxF +/* 063B8 808DCC28 0C01E107 */ jal Math_ApproachF /* 063BC 808DCC2C 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 063C0 808DCC30 862301A4 */ lh $v1, 0x01A4($s1) ## 000001A4 @@ -76,7 +76,7 @@ glabel func_808DCB7C /* 063D8 808DCC48 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E19999A /* 063DC 808DCC4C 26240508 */ addiu $a0, $s1, 0x0508 ## $a0 = 00000508 /* 063E0 808DCC50 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 063E4 808DCC54 0C01E107 */ jal Math_SmoothScaleMaxF +/* 063E4 808DCC54 0C01E107 */ jal Math_ApproachF /* 063E8 808DCC58 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 063EC 808DCC5C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 @@ -229,7 +229,7 @@ glabel L808DCE0C /* 06600 808DCE70 A62C02D4 */ sh $t4, 0x02D4($s1) ## 000002D4 /* 06604 808DCE74 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 .L808DCE78: -/* 06608 808DCE78 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06608 808DCE78 0C00CFBE */ jal Rand_ZeroFloat /* 0660C 808DCE7C 4600A306 */ mov.s $f12, $f20 /* 06610 808DCE80 4600048D */ trunc.w.s $f18, $f0 @@ -287,7 +287,7 @@ glabel L808DCF3C /* 066D4 808DCF44 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 066D8 808DCF48 26240028 */ addiu $a0, $s1, 0x0028 ## $a0 = 00000028 /* 066DC 808DCF4C 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 -/* 066E0 808DCF50 0C01E107 */ jal Math_SmoothScaleMaxF +/* 066E0 808DCF50 0C01E107 */ jal Math_ApproachF /* 066E4 808DCF54 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 /* 066E8 808DCF58 8FA40038 */ lw $a0, 0x0038($sp) @@ -303,7 +303,7 @@ glabel L808DCF74 /* 0670C 808DCF7C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 06710 808DCF80 26240028 */ addiu $a0, $s1, 0x0028 ## $a0 = 00000028 /* 06714 808DCF84 3C054316 */ lui $a1, 0x4316 ## $a1 = 43160000 -/* 06718 808DCF88 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06718 808DCF88 0C01E107 */ jal Math_ApproachF /* 0671C 808DCF8C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 06720 808DCF90 3C100601 */ lui $s0, %hi(D_06008A88) ## $s0 = 06010000 @@ -350,20 +350,20 @@ glabel L808DD000 /* 067B0 808DD020 4481A000 */ mtc1 $at, $f20 ## $f20 = 25.00 /* 067B4 808DD024 AFB80034 */ sw $t8, 0x0034($sp) .L808DD028: -/* 067B8 808DD028 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 067B8 808DD028 0C00CFC8 */ jal Rand_CenteredFloat /* 067BC 808DD02C 4600A306 */ mov.s $f12, $f20 /* 067C0 808DD030 E7A00040 */ swc1 $f0, 0x0040($sp) -/* 067C4 808DD034 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 067C4 808DD034 0C00CFC8 */ jal Rand_CenteredFloat /* 067C8 808DD038 4600A306 */ mov.s $f12, $f20 /* 067CC 808DD03C E7A00044 */ swc1 $f0, 0x0044($sp) -/* 067D0 808DD040 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 067D0 808DD040 0C00CFC8 */ jal Rand_CenteredFloat /* 067D4 808DD044 4600A306 */ mov.s $f12, $f20 /* 067D8 808DD048 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 067DC 808DD04C 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 -/* 067E0 808DD050 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 067E0 808DD050 0C00CFBE */ jal Rand_ZeroFloat /* 067E4 808DD054 E7A00048 */ swc1 $f0, 0x0048($sp) /* 067E8 808DD058 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s index a42e8875ee..934a3655e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s @@ -19,7 +19,7 @@ glabel func_808DD14C /* 0691C 808DD18C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 06920 808DD190 3C073E19 */ lui $a3, 0x3E19 ## $a3 = 3E190000 /* 06924 808DD194 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E19999A -/* 06928 808DD198 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06928 808DD198 0C01E107 */ jal Math_ApproachF /* 0692C 808DD19C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 06930 808DD1A0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD20C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD20C.s index 0dca35a6d5..c73341b403 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD20C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD20C.s @@ -60,20 +60,20 @@ glabel func_808DD20C /* 06A78 808DD2E8 4481A000 */ mtc1 $at, $f20 ## $f20 = 20.00 /* 06A7C 808DD2EC 27B10050 */ addiu $s1, $sp, 0x0050 ## $s1 = FFFFFFE8 .L808DD2F0: -/* 06A80 808DD2F0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 06A80 808DD2F0 0C00CFC8 */ jal Rand_CenteredFloat /* 06A84 808DD2F4 4600A306 */ mov.s $f12, $f20 /* 06A88 808DD2F8 E7A00050 */ swc1 $f0, 0x0050($sp) -/* 06A8C 808DD2FC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 06A8C 808DD2FC 0C00CFC8 */ jal Rand_CenteredFloat /* 06A90 808DD300 4600A306 */ mov.s $f12, $f20 /* 06A94 808DD304 E7A00054 */ swc1 $f0, 0x0054($sp) -/* 06A98 808DD308 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 06A98 808DD308 0C00CFC8 */ jal Rand_CenteredFloat /* 06A9C 808DD30C 4600A306 */ mov.s $f12, $f20 /* 06AA0 808DD310 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 06AA4 808DD314 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 -/* 06AA8 808DD318 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06AA8 808DD318 0C00CFBE */ jal Rand_ZeroFloat /* 06AAC 808DD31C E7A00058 */ swc1 $f0, 0x0058($sp) /* 06AB0 808DD320 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 @@ -121,7 +121,7 @@ glabel func_808DD20C /* 06B48 808DD3B8 2414000C */ addiu $s4, $zero, 0x000C ## $s4 = 0000000C /* 06B4C 808DD3BC 24110001 */ addiu $s1, $zero, 0x0001 ## $s1 = 00000001 .L808DD3C0: -/* 06B50 808DD3C0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 06B50 808DD3C0 0C00CFC8 */ jal Rand_CenteredFloat /* 06B54 808DD3C4 4600A306 */ mov.s $f12, $f20 /* 06B58 808DD3C8 02340019 */ multu $s1, $s4 @@ -135,7 +135,7 @@ glabel func_808DD20C /* 06B78 808DD3E8 4600A306 */ mov.s $f12, $f20 /* 06B7C 808DD3EC 00008012 */ mflo $s0 /* 06B80 808DD3F0 01906821 */ addu $t5, $t4, $s0 -/* 06B84 808DD3F4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 06B84 808DD3F4 0C00CFC8 */ jal Rand_CenteredFloat /* 06B88 808DD3F8 E5A00278 */ swc1 $f0, 0x0278($t5) ## 00000278 /* 06B8C 808DD3FC 001278C0 */ sll $t7, $s2, 3 @@ -219,7 +219,7 @@ glabel func_808DD20C /* 06CA4 808DD514 2414000C */ addiu $s4, $zero, 0x000C ## $s4 = 0000000C /* 06CA8 808DD518 24110001 */ addiu $s1, $zero, 0x0001 ## $s1 = 00000001 .L808DD51C: -/* 06CAC 808DD51C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 06CAC 808DD51C 0C00CFC8 */ jal Rand_CenteredFloat /* 06CB0 808DD520 4600A306 */ mov.s $f12, $f20 /* 06CB4 808DD524 02340019 */ multu $s1, $s4 @@ -233,7 +233,7 @@ glabel func_808DD20C /* 06CD4 808DD544 4600A306 */ mov.s $f12, $f20 /* 06CD8 808DD548 00008012 */ mflo $s0 /* 06CDC 808DD54C 03304021 */ addu $t0, $t9, $s0 -/* 06CE0 808DD550 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 06CE0 808DD550 0C00CFC8 */ jal Rand_CenteredFloat /* 06CE4 808DD554 E5000278 */ swc1 $f0, 0x0278($t0) ## 00000278 /* 06CE8 808DD558 001250C0 */ sll $t2, $s2, 3 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DEE70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DEE70.s index 1842f80621..d5becf638b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DEE70.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DEE70.s @@ -115,7 +115,7 @@ glabel func_808DEE70 /* 08758 808DEFC8 44066000 */ mfc1 $a2, $f12 /* 0875C 808DEFCC 0C0342A3 */ jal Matrix_Scale /* 08760 808DEFD0 46006386 */ mov.s $f14, $f12 -/* 08764 808DEFD4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 08764 808DEFD4 0C00CFC8 */ jal Rand_CenteredFloat /* 08768 808DEFD8 4600A306 */ mov.s $f12, $f20 /* 0876C 808DEFDC 46000306 */ mov.s $f12, $f0 @@ -173,7 +173,7 @@ glabel func_808DEE70 /* 08834 808DF0A4 929902E4 */ lbu $t9, 0x02E4($s4) ## 000002E4 /* 08838 808DF0A8 57200007 */ bnel $t9, $zero, .L808DF0C8 /* 0883C 808DF0AC 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 08840 808DF0B0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 08840 808DF0B0 0C00CFC8 */ jal Rand_CenteredFloat /* 08844 808DF0B4 4600A306 */ mov.s $f12, $f20 /* 08848 808DF0B8 46000306 */ mov.s $f12, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1034.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1034.s index da5e741af1..751cb07450 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1034.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1034.s @@ -55,13 +55,13 @@ glabel func_808E1034 /* 0A814 808E1084 1441000B */ bne $v0, $at, .L808E10B4 /* 0A818 808E1088 248401CC */ addiu $a0, $a0, 0x01CC ## $a0 = 000001CC /* 0A81C 808E108C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 0A820 808E1090 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 0A820 808E1090 0C01E123 */ jal Math_ApproachZeroF /* 0A824 808E1094 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 0A828 808E1098 26240050 */ addiu $a0, $s1, 0x0050 ## $a0 = 00000050 /* 0A82C 808E109C 3C0541F0 */ lui $a1, 0x41F0 ## $a1 = 41F00000 /* 0A830 808E10A0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 0A834 808E10A4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0A834 808E10A4 0C01E107 */ jal Math_ApproachF /* 0A838 808E10A8 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 0A83C 808E10AC 10000020 */ beq $zero, $zero, .L808E1130 @@ -81,17 +81,17 @@ glabel func_808E1034 /* 0A870 808E10E0 3C0641F0 */ lui $a2, 0x41F0 ## $a2 = 41F00000 /* 0A874 808E10E4 AD6C0004 */ sw $t4, 0x0004($t3) ## 8015FCFC /* 0A878 808E10E8 8E2D002C */ lw $t5, 0x002C($s1) ## 0000002C -/* 0A87C 808E10EC 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 0A87C 808E10EC 0C01E123 */ jal Math_ApproachZeroF /* 0A880 808E10F0 AD6D0008 */ sw $t5, 0x0008($t3) ## 8015FD00 /* 0A884 808E10F4 26240050 */ addiu $a0, $s1, 0x0050 ## $a0 = 00000050 /* 0A888 808E10F8 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 /* 0A88C 808E10FC 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 0A890 808E1100 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0A890 808E1100 0C01E107 */ jal Math_ApproachF /* 0A894 808E1104 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 0A898 808E1108 3C018090 */ lui $at, %hi(D_808F817C) ## $at = 80900000 -/* 0A89C 808E110C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0A89C 808E110C 0C00CFBE */ jal Rand_ZeroFloat /* 0A8A0 808E1110 C42C817C */ lwc1 $f12, %lo(D_808F817C)($at) /* 0A8A4 808E1114 3C018090 */ lui $at, %hi(D_808F8180) ## $at = 80900000 @@ -137,7 +137,7 @@ glabel func_808E1034 /* 0A928 808E1198 3C0540A8 */ lui $a1, 0x40A8 ## $a1 = 40A80000 .L808E119C: -/* 0A92C 808E119C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0A92C 808E119C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0A930 808E11A0 00000000 */ nop /* 0A934 808E11A4 3C018090 */ lui $at, %hi(D_808F8184) ## $at = 80900000 @@ -287,7 +287,7 @@ glabel L808E12A0 /* 0AB4C 808E13BC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 0AB50 808E13C0 A7AE00BA */ sh $t6, 0x00BA($sp) /* 0AB54 808E13C4 C7AC0070 */ lwc1 $f12, 0x0070($sp) -/* 0AB58 808E13C8 0C034199 */ jal atan2s +/* 0AB58 808E13C8 0C034199 */ jal Math_Atan2S /* 0AB5C 808E13CC C7AE0078 */ lwc1 $f14, 0x0078($sp) /* 0AB60 808E13D0 C7B00078 */ lwc1 $f16, 0x0078($sp) @@ -297,7 +297,7 @@ glabel L808E12A0 /* 0AB70 808E13E0 C7AE0074 */ lwc1 $f14, 0x0074($sp) /* 0AB74 808E13E4 46129282 */ mul.s $f10, $f18, $f18 /* 0AB78 808E13E8 460A4000 */ add.s $f0, $f8, $f10 -/* 0AB7C 808E13EC 0C034199 */ jal atan2s +/* 0AB7C 808E13EC 0C034199 */ jal Math_Atan2S /* 0AB80 808E13F0 46000304 */ sqrt.s $f12, $f0 /* 0AB84 808E13F4 863801A4 */ lh $t8, 0x01A4($s1) ## 000001A4 @@ -340,7 +340,7 @@ glabel L808E12A0 /* 0AC14 808E1484 1000000E */ beq $zero, $zero, .L808E14C0 /* 0AC18 808E1488 A62C01C2 */ sh $t4, 0x01C2($s1) ## 000001C2 .L808E148C: -/* 0AC1C 808E148C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0AC1C 808E148C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0AC20 808E1490 00000000 */ nop /* 0AC24 808E1494 3C018090 */ lui $at, %hi(D_808F81A0) ## $at = 80900000 @@ -364,7 +364,7 @@ glabel L808E12A0 /* 0AC68 808E14D8 100000B5 */ beq $zero, $zero, .L808E17B0 /* 0AC6C 808E14DC E62A0068 */ swc1 $f10, 0x0068($s1) ## 00000068 .L808E14E0: -/* 0AC70 808E14E0 0C03F66B */ jal Math_Rand_ZeroOne +/* 0AC70 808E14E0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0AC74 808E14E4 00000000 */ nop /* 0AC78 808E14E8 3C018090 */ lui $at, %hi(D_808F81A4) ## $at = 80900000 @@ -487,7 +487,7 @@ glabel L808E1688 /* 0AE28 808E1698 00000000 */ nop /* 0AE2C 808E169C A7A900BA */ sh $t1, 0x00BA($sp) /* 0AE30 808E16A0 C7AC0080 */ lwc1 $f12, 0x0080($sp) -/* 0AE34 808E16A4 0C034199 */ jal atan2s +/* 0AE34 808E16A4 0C034199 */ jal Math_Atan2S /* 0AE38 808E16A8 4600A386 */ mov.s $f14, $f20 /* 0AE3C 808E16AC A6220032 */ sh $v0, 0x0032($s1) ## 00000032 @@ -497,7 +497,7 @@ glabel L808E1688 /* 0AE4C 808E16BC 00000000 */ nop /* 0AE50 808E16C0 4614A282 */ mul.s $f10, $f20, $f20 /* 0AE54 808E16C4 46085000 */ add.s $f0, $f10, $f8 -/* 0AE58 808E16C8 0C034199 */ jal atan2s +/* 0AE58 808E16C8 0C034199 */ jal Math_Atan2S /* 0AE5C 808E16CC 46000304 */ sqrt.s $f12, $f0 /* 0AE60 808E16D0 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 @@ -592,28 +592,28 @@ glabel L808E176C /* 0AF90 808E1800 E7B400B4 */ swc1 $f20, 0x00B4($sp) /* 0AF94 808E1804 E7B400B0 */ swc1 $f20, 0x00B0($sp) /* 0AF98 808E1808 E7B400AC */ swc1 $f20, 0x00AC($sp) -/* 0AF9C 808E180C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0AF9C 808E180C 0C00CFC8 */ jal Rand_CenteredFloat /* 0AFA0 808E1810 E7AA00A4 */ swc1 $f10, 0x00A4($sp) /* 0AFA4 808E1814 C6280024 */ lwc1 $f8, 0x0024($s1) ## 00000024 /* 0AFA8 808E1818 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0AFAC 808E181C 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 0AFB0 808E1820 46080180 */ add.s $f6, $f0, $f8 -/* 0AFB4 808E1824 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0AFB4 808E1824 0C00CFC8 */ jal Rand_CenteredFloat /* 0AFB8 808E1828 E7A60094 */ swc1 $f6, 0x0094($sp) /* 0AFBC 808E182C C6240028 */ lwc1 $f4, 0x0028($s1) ## 00000028 /* 0AFC0 808E1830 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0AFC4 808E1834 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 0AFC8 808E1838 46040280 */ add.s $f10, $f0, $f4 -/* 0AFCC 808E183C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0AFCC 808E183C 0C00CFC8 */ jal Rand_CenteredFloat /* 0AFD0 808E1840 E7AA0098 */ swc1 $f10, 0x0098($sp) /* 0AFD4 808E1844 C628002C */ lwc1 $f8, 0x002C($s1) ## 0000002C /* 0AFD8 808E1848 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 0AFDC 808E184C 44816000 */ mtc1 $at, $f12 ## $f12 = 500.00 /* 0AFE0 808E1850 46080180 */ add.s $f6, $f0, $f8 -/* 0AFE4 808E1854 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0AFE4 808E1854 0C00CFBE */ jal Rand_ZeroFloat /* 0AFE8 808E1858 E7A6009C */ swc1 $f6, 0x009C($sp) /* 0AFEC 808E185C 3C01442F */ lui $at, 0x442F ## $at = 442F0000 @@ -688,7 +688,7 @@ glabel L808E176C /* 0B0F0 808E1960 262F0024 */ addiu $t7, $s1, 0x0024 ## $t7 = 00000024 /* 0B0F4 808E1964 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0B0F8 808E1968 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 0B0FC 808E196C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0B0FC 808E196C 0C00CFBE */ jal Rand_ZeroFloat /* 0B100 808E1970 00000000 */ nop /* 0B104 808E1974 3C014396 */ lui $at, 0x4396 ## $at = 43960000 @@ -706,7 +706,7 @@ glabel L808E176C .L808E19A4: /* 0B134 808E19A4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 0B138 808E19A8 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 -/* 0B13C 808E19AC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0B13C 808E19AC 0C00CFBE */ jal Rand_ZeroFloat /* 0B140 808E19B0 AFAF0040 */ sw $t7, 0x0040($sp) /* 0B144 808E19B4 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 @@ -737,30 +737,30 @@ glabel L808E176C .L808E1A10: /* 0B1A0 808E1A10 1140000B */ beq $t2, $zero, .L808E1A40 /* 0B1A4 808E1A14 00000000 */ nop -/* 0B1A8 808E1A18 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0B1A8 808E1A18 0C00CFC8 */ jal Rand_CenteredFloat /* 0B1AC 808E1A1C 4600A306 */ mov.s $f12, $f20 /* 0B1B0 808E1A20 E7A000AC */ swc1 $f0, 0x00AC($sp) -/* 0B1B4 808E1A24 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0B1B4 808E1A24 0C00CFC8 */ jal Rand_CenteredFloat /* 0B1B8 808E1A28 4600A306 */ mov.s $f12, $f20 /* 0B1BC 808E1A2C E7A000B0 */ swc1 $f0, 0x00B0($sp) -/* 0B1C0 808E1A30 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0B1C0 808E1A30 0C00CFC8 */ jal Rand_CenteredFloat /* 0B1C4 808E1A34 4600A306 */ mov.s $f12, $f20 /* 0B1C8 808E1A38 1000000B */ beq $zero, $zero, .L808E1A68 /* 0B1CC 808E1A3C E7A000B4 */ swc1 $f0, 0x00B4($sp) .L808E1A40: -/* 0B1D0 808E1A40 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0B1D0 808E1A40 0C00CFC8 */ jal Rand_CenteredFloat /* 0B1D4 808E1A44 4600A306 */ mov.s $f12, $f20 /* 0B1D8 808E1A48 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 0B1DC 808E1A4C 44816000 */ mtc1 $at, $f12 ## $f12 = 25.00 -/* 0B1E0 808E1A50 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0B1E0 808E1A50 0C00CFBE */ jal Rand_ZeroFloat /* 0B1E4 808E1A54 E7A000AC */ swc1 $f0, 0x00AC($sp) /* 0B1E8 808E1A58 E7A000B0 */ swc1 $f0, 0x00B0($sp) -/* 0B1EC 808E1A5C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0B1EC 808E1A5C 0C00CFC8 */ jal Rand_CenteredFloat /* 0B1F0 808E1A60 4600A306 */ mov.s $f12, $f20 /* 0B1F4 808E1A64 E7A000B4 */ swc1 $f0, 0x00B4($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1EB4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1EB4.s index 62fc69de7e..6920910071 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1EB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1EB4.s @@ -34,7 +34,7 @@ glabel func_808E1EB4 /* 0B680 808E1EF0 0C00B58B */ jal Actor_SetScale /* 0B684 808E1EF4 A25801A0 */ sb $t8, 0x01A0($s2) ## 000001A0 -/* 0B688 808E1EF8 0C03F66B */ jal Math_Rand_ZeroOne +/* 0B688 808E1EF8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0B68C 808E1EFC 00000000 */ nop /* 0B690 808E1F00 3C018090 */ lui $at, %hi(D_808F81C0) ## $at = 80900000 @@ -109,7 +109,7 @@ glabel func_808E1EB4 /* 0B794 808E2004 460A4381 */ sub.s $f14, $f8, $f10 /* 0B798 808E2008 4600A306 */ mov.s $f12, $f20 /* 0B79C 808E200C 46062581 */ sub.s $f22, $f4, $f6 -/* 0B7A0 808E2010 0C03F494 */ jal Math_atan2f +/* 0B7A0 808E2010 0C03F494 */ jal Math_FAtan2F /* 0B7A4 808E2014 E7AE0084 */ swc1 $f14, 0x0084($sp) /* 0B7A8 808E2018 3C018090 */ lui $at, %hi(D_808F81C4) ## $at = 80900000 /* 0B7AC 808E201C C43281C4 */ lwc1 $f18, %lo(D_808F81C4)($at) @@ -127,7 +127,7 @@ glabel func_808E1EB4 /* 0B7DC 808E204C 00108400 */ sll $s0, $s0, 16 /* 0B7E0 808E2050 00108403 */ sra $s0, $s0, 16 /* 0B7E4 808E2054 46001384 */ sqrt.s $f14, $f2 -/* 0B7E8 808E2058 0C03F494 */ jal Math_atan2f +/* 0B7E8 808E2058 0C03F494 */ jal Math_FAtan2F /* 0B7EC 808E205C E7A2005C */ swc1 $f2, 0x005C($sp) /* 0B7F0 808E2060 3C018090 */ lui $at, %hi(D_808F81C8) ## $at = 80900000 /* 0B7F4 808E2064 C43281C8 */ lwc1 $f18, %lo(D_808F81C8)($at) @@ -139,14 +139,14 @@ glabel func_808E1EB4 /* 0B80C 808E207C 44053000 */ mfc1 $a1, $f6 /* 0B810 808E2080 00000000 */ nop /* 0B814 808E2084 00052C00 */ sll $a1, $a1, 16 -/* 0B818 808E2088 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0B818 808E2088 0C01E1EF */ jal Math_ApproachS /* 0B81C 808E208C 00052C03 */ sra $a1, $a1, 16 /* 0B820 808E2090 00102C00 */ sll $a1, $s0, 16 /* 0B824 808E2094 00052C03 */ sra $a1, $a1, 16 /* 0B828 808E2098 26240032 */ addiu $a0, $s1, 0x0032 ## $a0 = 00000032 /* 0B82C 808E209C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0B830 808E20A0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0B830 808E20A0 0C01E1EF */ jal Math_ApproachS /* 0B834 808E20A4 24071000 */ addiu $a3, $zero, 0x1000 ## $a3 = 00001000 /* 0B838 808E20A8 4616B282 */ mul.s $f10, $f22, $f22 @@ -180,15 +180,15 @@ glabel func_808E1EB4 /* 0B8A8 808E2118 AFAA005C */ sw $t2, 0x005C($sp) /* 0B8AC 808E211C 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 .L808E2120: -/* 0B8B0 808E2120 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0B8B0 808E2120 0C00CFC8 */ jal Rand_CenteredFloat /* 0B8B4 808E2124 4600A306 */ mov.s $f12, $f20 /* 0B8B8 808E2128 E7A00070 */ swc1 $f0, 0x0070($sp) -/* 0B8BC 808E212C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0B8BC 808E212C 0C00CFC8 */ jal Rand_CenteredFloat /* 0B8C0 808E2130 4600A306 */ mov.s $f12, $f20 /* 0B8C4 808E2134 E7A00074 */ swc1 $f0, 0x0074($sp) -/* 0B8C8 808E2138 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0B8C8 808E2138 0C00CFC8 */ jal Rand_CenteredFloat /* 0B8CC 808E213C 4600A306 */ mov.s $f12, $f20 /* 0B8D0 808E2140 C7A60070 */ lwc1 $f6, 0x0070($sp) @@ -202,7 +202,7 @@ glabel func_808E1EB4 /* 0B8F0 808E2160 46160102 */ mul.s $f4, $f0, $f22 /* 0B8F4 808E2164 E7A80064 */ swc1 $f8, 0x0064($sp) /* 0B8F8 808E2168 E7B20068 */ swc1 $f18, 0x0068($sp) -/* 0B8FC 808E216C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0B8FC 808E216C 0C00CFBE */ jal Rand_ZeroFloat /* 0B900 808E2170 E7A4006C */ swc1 $f4, 0x006C($sp) /* 0B904 808E2174 3C01447A */ lui $at, 0x447A ## $at = 447A0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s index 2dfaf8ee40..f422673edc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s @@ -147,7 +147,7 @@ glabel L808E26AC /* 0BE48 808E26B8 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 0BE4C 808E26BC 44070000 */ mfc1 $a3, $f0 /* 0BE50 808E26C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0BE54 808E26C4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0BE54 808E26C4 0C01E107 */ jal Math_ApproachF /* 0BE58 808E26C8 E6200068 */ swc1 $f0, 0x0068($s1) ## 00000068 /* 0BE5C 808E26CC C6440278 */ lwc1 $f4, 0x0278($s2) ## 00000278 @@ -161,7 +161,7 @@ glabel L808E26AC /* 0BE7C 808E26EC C6460280 */ lwc1 $f6, 0x0280($s2) ## 00000280 /* 0BE80 808E26F0 E7AC0098 */ swc1 $f12, 0x0098($sp) /* 0BE84 808E26F4 46083381 */ sub.s $f14, $f6, $f8 -/* 0BE88 808E26F8 0C03F494 */ jal Math_atan2f +/* 0BE88 808E26F8 0C03F494 */ jal Math_FAtan2F /* 0BE8C 808E26FC E7AE0090 */ swc1 $f14, 0x0090($sp) /* 0BE90 808E2700 3C018090 */ lui $at, %hi(D_808F8214) ## $at = 80900000 /* 0BE94 808E2704 C42A8214 */ lwc1 $f10, %lo(D_808F8214)($at) @@ -178,7 +178,7 @@ glabel L808E26AC /* 0BEC0 808E2730 46002384 */ sqrt.s $f14, $f4 /* 0BEC4 808E2734 E7A40058 */ swc1 $f4, 0x0058($sp) /* 0BEC8 808E2738 A7A80080 */ sh $t0, 0x0080($sp) -/* 0BECC 808E273C 0C03F494 */ jal Math_atan2f +/* 0BECC 808E273C 0C03F494 */ jal Math_FAtan2F /* 0BED0 808E2740 E7AE008C */ swc1 $f14, 0x008C($sp) /* 0BED4 808E2744 3C0145C0 */ lui $at, 0x45C0 ## $at = 45C00000 /* 0BED8 808E2748 44816000 */ mtc1 $at, $f12 ## $f12 = 6144.00 @@ -211,7 +211,7 @@ glabel L808E26AC /* 0BF40 808E27B0 00812021 */ addu $a0, $a0, $at /* 0BF44 808E27B4 00042240 */ sll $a0, $a0, 9 /* 0BF48 808E27B8 00042400 */ sll $a0, $a0, 16 -/* 0BF4C 808E27BC 0C01DE0D */ jal Math_Coss +/* 0BF4C 808E27BC 0C01DE0D */ jal Math_CosS ## coss? /* 0BF50 808E27C0 00042403 */ sra $a0, $a0, 16 /* 0BF54 808E27C4 C7AE0084 */ lwc1 $f14, 0x0084($sp) @@ -231,13 +231,13 @@ glabel L808E26AC /* 0BF8C 808E27FC A6300030 */ sh $s0, 0x0030($s1) ## 00000030 /* 0BF90 808E2800 00073C00 */ sll $a3, $a3, 16 /* 0BF94 808E2804 00073C03 */ sra $a3, $a3, 16 -/* 0BF98 808E2808 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0BF98 808E2808 0C01E1EF */ jal Math_ApproachS /* 0BF9C 808E280C 87A50080 */ lh $a1, 0x0080($sp) /* 0BFA0 808E2810 262406EC */ addiu $a0, $s1, 0x06EC ## $a0 = 000006EC /* 0BFA4 808E2814 3C054580 */ lui $a1, 0x4580 ## $a1 = 45800000 /* 0BFA8 808E2818 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0BFAC 808E281C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0BFAC 808E281C 0C01E107 */ jal Math_ApproachF /* 0BFB0 808E2820 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 /* 0BFB4 808E2824 862401A2 */ lh $a0, 0x01A2($s1) ## 000001A2 @@ -248,7 +248,7 @@ glabel L808E26AC /* 0BFC8 808E2838 00812021 */ addu $a0, $a0, $at /* 0BFCC 808E283C 00042240 */ sll $a0, $a0, 9 /* 0BFD0 808E2840 00042400 */ sll $a0, $a0, 16 -/* 0BFD4 808E2844 0C01DE1C */ jal Math_Sins +/* 0BFD4 808E2844 0C01DE1C */ jal Math_SinS ## sins? /* 0BFD8 808E2848 00042403 */ sra $a0, $a0, 16 /* 0BFDC 808E284C 862C00B6 */ lh $t4, 0x00B6($s1) ## 000000B6 @@ -285,7 +285,7 @@ glabel L808E28B8 /* 0C050 808E28C0 262401CC */ addiu $a0, $s1, 0x01CC ## $a0 = 000001CC /* 0C054 808E28C4 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 0C058 808E28C8 44060000 */ mfc1 $a2, $f0 -/* 0C05C 808E28CC 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 0C05C 808E28CC 0C01E123 */ jal Math_ApproachZeroF /* 0C060 808E28D0 00000000 */ nop /* 0C064 808E28D4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 @@ -329,7 +329,7 @@ glabel L808E28FC /* 0C0F0 808E2960 46044301 */ sub.s $f12, $f8, $f4 /* 0C0F4 808E2964 AE2D01F8 */ sw $t5, 0x01F8($s1) ## 000001F8 /* 0C0F8 808E2968 C62601F8 */ lwc1 $f6, 0x01F8($s1) ## 000001F8 -/* 0C0FC 808E296C 0C03F494 */ jal Math_atan2f +/* 0C0FC 808E296C 0C03F494 */ jal Math_FAtan2F /* 0C100 808E2970 460A3381 */ sub.s $f14, $f6, $f10 /* 0C104 808E2974 3C018090 */ lui $at, %hi(D_808F821C) ## $at = 80900000 /* 0C108 808E2978 C428821C */ lwc1 $f8, %lo(D_808F821C)($at) @@ -369,7 +369,7 @@ glabel L808E29A8 /* 0C18C 808E29FC C62601F8 */ lwc1 $f6, 0x01F8($s1) ## 000001F8 /* 0C190 808E2A00 E7AC0098 */ swc1 $f12, 0x0098($sp) /* 0C194 808E2A04 460A3381 */ sub.s $f14, $f6, $f10 -/* 0C198 808E2A08 0C03F494 */ jal Math_atan2f +/* 0C198 808E2A08 0C03F494 */ jal Math_FAtan2F /* 0C19C 808E2A0C E7AE0090 */ swc1 $f14, 0x0090($sp) /* 0C1A0 808E2A10 3C018090 */ lui $at, %hi(D_808F8220) ## $at = 80900000 /* 0C1A4 808E2A14 C4288220 */ lwc1 $f8, %lo(D_808F8220)($at) @@ -384,7 +384,7 @@ glabel L808E29A8 /* 0C1C8 808E2A38 46085000 */ add.s $f0, $f10, $f8 /* 0C1CC 808E2A3C 44083000 */ mfc1 $t0, $f6 /* 0C1D0 808E2A40 46000384 */ sqrt.s $f14, $f0 -/* 0C1D4 808E2A44 0C03F494 */ jal Math_atan2f +/* 0C1D4 808E2A44 0C03F494 */ jal Math_FAtan2F /* 0C1D8 808E2A48 A7A80080 */ sh $t0, 0x0080($sp) /* 0C1DC 808E2A4C 3C018090 */ lui $at, %hi(D_808F8224) ## $at = 80900000 /* 0C1E0 808E2A50 C4248224 */ lwc1 $f4, %lo(D_808F8224)($at) @@ -400,13 +400,13 @@ glabel L808E29A8 /* 0C208 808E2A78 44095000 */ mfc1 $t1, $f10 /* 0C20C 808E2A7C 00000000 */ nop /* 0C210 808E2A80 A62900B4 */ sh $t1, 0x00B4($s1) ## 000000B4 -/* 0C214 808E2A84 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0C214 808E2A84 0C01E1EF */ jal Math_ApproachS /* 0C218 808E2A88 87A50080 */ lh $a1, 0x0080($sp) /* 0C21C 808E2A8C 262406EC */ addiu $a0, $s1, 0x06EC ## $a0 = 000006EC /* 0C220 808E2A90 3C054580 */ lui $a1, 0x4580 ## $a1 = 45800000 /* 0C224 808E2A94 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0C228 808E2A98 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0C228 808E2A98 0C01E107 */ jal Math_ApproachF /* 0C22C 808E2A9C 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 /* 0C230 808E2AA0 C620008C */ lwc1 $f0, 0x008C($s1) ## 0000008C @@ -435,7 +435,7 @@ glabel L808E29A8 /* 0C284 808E2AF4 00812021 */ addu $a0, $a0, $at /* 0C288 808E2AF8 00042280 */ sll $a0, $a0, 10 /* 0C28C 808E2AFC 00042400 */ sll $a0, $a0, 16 -/* 0C290 808E2B00 0C01DE0D */ jal Math_Coss +/* 0C290 808E2B00 0C01DE0D */ jal Math_CosS ## coss? /* 0C294 808E2B04 00042403 */ sra $a0, $a0, 16 /* 0C298 808E2B08 C7AE0084 */ lwc1 $f14, 0x0084($sp) @@ -458,7 +458,7 @@ glabel L808E29A8 /* 0C2DC 808E2B4C 46045180 */ add.s $f6, $f10, $f4 /* 0C2E0 808E2B50 4600320D */ trunc.w.s $f8, $f6 /* 0C2E4 808E2B54 440D4000 */ mfc1 $t5, $f8 -/* 0C2E8 808E2B58 0C01DE1C */ jal Math_Sins +/* 0C2E8 808E2B58 0C01DE1C */ jal Math_SinS ## sins? /* 0C2EC 808E2B5C A62D0030 */ sh $t5, 0x0030($s1) ## 00000030 /* 0C2F0 808E2B60 862E00B6 */ lh $t6, 0x00B6($s1) ## 000000B6 @@ -538,21 +538,21 @@ glabel L808E29A8 /* 0C40C 808E2C7C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0C410 808E2C80 3C01442F */ lui $at, 0x442F ## $at = 442F0000 /* 0C414 808E2C84 44816000 */ mtc1 $at, $f12 ## $f12 = 700.00 -/* 0C418 808E2C88 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C418 808E2C88 0C00CFC8 */ jal Rand_CenteredFloat /* 0C41C 808E2C8C 00000000 */ nop /* 0C420 808E2C90 C64A01FC */ lwc1 $f10, 0x01FC($s2) ## 000001FC /* 0C424 808E2C94 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 0C428 808E2C98 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 /* 0C42C 808E2C9C 460A0180 */ add.s $f6, $f0, $f10 -/* 0C430 808E2CA0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C430 808E2CA0 0C00CFC8 */ jal Rand_CenteredFloat /* 0C434 808E2CA4 E62601F0 */ swc1 $f6, 0x01F0($s1) ## 000001F0 /* 0C438 808E2CA8 C6480200 */ lwc1 $f8, 0x0200($s2) ## 00000200 /* 0C43C 808E2CAC 3C01442F */ lui $at, 0x442F ## $at = 442F0000 /* 0C440 808E2CB0 44816000 */ mtc1 $at, $f12 ## $f12 = 700.00 /* 0C444 808E2CB4 46080100 */ add.s $f4, $f0, $f8 -/* 0C448 808E2CB8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C448 808E2CB8 0C00CFC8 */ jal Rand_CenteredFloat /* 0C44C 808E2CBC E62401F4 */ swc1 $f4, 0x01F4($s1) ## 000001F4 /* 0C450 808E2CC0 C62201F0 */ lwc1 $f2, 0x01F0($s1) ## 000001F0 @@ -685,7 +685,7 @@ glabel L808E2E70 /* 0C62C 808E2E9C C62A01F8 */ lwc1 $f10, 0x01F8($s1) ## 000001F8 /* 0C630 808E2EA0 E7AC0098 */ swc1 $f12, 0x0098($sp) /* 0C634 808E2EA4 46065381 */ sub.s $f14, $f10, $f6 -/* 0C638 808E2EA8 0C03F494 */ jal Math_atan2f +/* 0C638 808E2EA8 0C03F494 */ jal Math_FAtan2F /* 0C63C 808E2EAC E7AE0090 */ swc1 $f14, 0x0090($sp) /* 0C640 808E2EB0 3C018090 */ lui $at, %hi(D_808F822C) ## $at = 80900000 /* 0C644 808E2EB4 C428822C */ lwc1 $f8, %lo(D_808F822C)($at) @@ -701,7 +701,7 @@ glabel L808E2E70 /* 0C66C 808E2EDC 440E5000 */ mfc1 $t6, $f10 /* 0C670 808E2EE0 46000384 */ sqrt.s $f14, $f0 /* 0C674 808E2EE4 A7AE0080 */ sh $t6, 0x0080($sp) -/* 0C678 808E2EE8 0C03F494 */ jal Math_atan2f +/* 0C678 808E2EE8 0C03F494 */ jal Math_FAtan2F /* 0C67C 808E2EEC E7AE008C */ swc1 $f14, 0x008C($sp) /* 0C680 808E2EF0 3C0145C0 */ lui $at, 0x45C0 ## $at = 45C00000 /* 0C684 808E2EF4 44816000 */ mtc1 $at, $f12 ## $f12 = 6144.00 @@ -734,7 +734,7 @@ glabel L808E2E70 /* 0C6EC 808E2F5C 00812021 */ addu $a0, $a0, $at /* 0C6F0 808E2F60 00042240 */ sll $a0, $a0, 9 /* 0C6F4 808E2F64 00042400 */ sll $a0, $a0, 16 -/* 0C6F8 808E2F68 0C01DE1C */ jal Math_Sins +/* 0C6F8 808E2F68 0C01DE1C */ jal Math_SinS ## sins? /* 0C6FC 808E2F6C 00042403 */ sra $a0, $a0, 16 /* 0C700 808E2F70 87B80080 */ lh $t8, 0x0080($sp) @@ -753,7 +753,7 @@ glabel L808E2E70 /* 0C734 808E2FA4 00812023 */ subu $a0, $a0, $at /* 0C738 808E2FA8 000422C0 */ sll $a0, $a0, 11 /* 0C73C 808E2FAC 00042400 */ sll $a0, $a0, 16 -/* 0C740 808E2FB0 0C01DE0D */ jal Math_Coss +/* 0C740 808E2FB0 0C01DE0D */ jal Math_CosS ## coss? /* 0C744 808E2FB4 00042403 */ sra $a0, $a0, 16 /* 0C748 808E2FB8 C7AE0084 */ lwc1 $f14, 0x0084($sp) @@ -889,22 +889,22 @@ glabel L808E306C /* 0C92C 808E319C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 .L808E31A0: /* 0C930 808E31A0 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 0C934 808E31A4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C934 808E31A4 0C00CFC8 */ jal Rand_CenteredFloat /* 0C938 808E31A8 00000000 */ nop /* 0C93C 808E31AC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0C940 808E31B0 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 0C944 808E31B4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C944 808E31B4 0C00CFC8 */ jal Rand_CenteredFloat /* 0C948 808E31B8 E7A00060 */ swc1 $f0, 0x0060($sp) /* 0C94C 808E31BC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0C950 808E31C0 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 0C954 808E31C4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C954 808E31C4 0C00CFC8 */ jal Rand_CenteredFloat /* 0C958 808E31C8 E7A00064 */ swc1 $f0, 0x0064($sp) /* 0C95C 808E31CC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 0C960 808E31D0 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 -/* 0C964 808E31D4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0C964 808E31D4 0C00CFBE */ jal Rand_ZeroFloat /* 0C968 808E31D8 E7A00068 */ swc1 $f0, 0x0068($sp) /* 0C96C 808E31DC 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E324C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E324C.s index 5a4bc33d32..30c4eaa024 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E324C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E324C.s @@ -175,7 +175,7 @@ glabel func_808E324C /* 0CC1C 808E348C 0C0342A3 */ jal Matrix_Scale /* 0CC20 808E3490 46006386 */ mov.s $f14, $f12 /* 0CC24 808E3494 3C018090 */ lui $at, %hi(D_808F823C) ## $at = 80900000 -/* 0CC28 808E3498 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0CC28 808E3498 0C00CFC8 */ jal Rand_CenteredFloat /* 0CC2C 808E349C C42C823C */ lwc1 $f12, %lo(D_808F823C)($at) /* 0CC30 808E34A0 46000306 */ mov.s $f12, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3564.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3564.s index 6229a5b782..39012805a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3564.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3564.s @@ -118,7 +118,7 @@ glabel func_808E3564 /* 0CE30 808E36A0 1662001A */ bne $s3, $v0, .L808E370C /* 0CE34 808E36A4 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 /* 0CE38 808E36A8 3C018090 */ lui $at, %hi(D_808F8244) ## $at = 80900000 -/* 0CE3C 808E36AC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0CE3C 808E36AC 0C00CFBE */ jal Rand_ZeroFloat /* 0CE40 808E36B0 C42C8244 */ lwc1 $f12, %lo(D_808F8244)($at) /* 0CE44 808E36B4 3C018090 */ lui $at, %hi(D_808F8248) ## $at = 80900000 @@ -158,14 +158,14 @@ glabel func_808E3564 /* 0CEC4 808E3734 46128581 */ sub.s $f22, $f16, $f18 /* 0CEC8 808E3738 4600A306 */ mov.s $f12, $f20 /* 0CECC 808E373C 46085601 */ sub.s $f24, $f10, $f8 -/* 0CED0 808E3740 0C03F494 */ jal Math_atan2f +/* 0CED0 808E3740 0C03F494 */ jal Math_FAtan2F /* 0CED4 808E3744 4600B386 */ mov.s $f14, $f22 /* 0CED8 808E3748 4614A682 */ mul.s $f26, $f20, $f20 /* 0CEDC 808E374C E7A000B0 */ swc1 $f0, 0x00B0($sp) /* 0CEE0 808E3750 4600C306 */ mov.s $f12, $f24 /* 0CEE4 808E3754 4616B702 */ mul.s $f28, $f22, $f22 /* 0CEE8 808E3758 461CD000 */ add.s $f0, $f26, $f28 -/* 0CEEC 808E375C 0C03F494 */ jal Math_atan2f +/* 0CEEC 808E375C 0C03F494 */ jal Math_FAtan2F /* 0CEF0 808E3760 46000384 */ sqrt.s $f14, $f0 /* 0CEF4 808E3764 C6040038 */ lwc1 $f4, 0x0038($s0) ## 00010038 /* 0CEF8 808E3768 46000507 */ neg.s $f20, $f0 @@ -182,7 +182,7 @@ glabel func_808E3564 /* 0CF24 808E3794 4406F000 */ mfc1 $a2, $f30 /* 0CF28 808E3798 26040038 */ addiu $a0, $s0, 0x0038 ## $a0 = 00010038 /* 0CF2C 808E379C 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 0CF30 808E37A0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0CF30 808E37A0 0C01E107 */ jal Math_ApproachF /* 0CF34 808E37A4 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 0CF38 808E37A8 4618C182 */ mul.s $f6, $f24, $f24 @@ -215,7 +215,7 @@ glabel func_808E3564 /* 0CF98 808E3808 16C20028 */ bne $s6, $v0, .L808E38AC /* 0CF9C 808E380C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 0CFA0 808E3810 3C018090 */ lui $at, %hi(D_808F824C) ## $at = 80900000 -/* 0CFA4 808E3814 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0CFA4 808E3814 0C00CFBE */ jal Rand_ZeroFloat /* 0CFA8 808E3818 C42C824C */ lwc1 $f12, %lo(D_808F824C)($at) /* 0CFAC 808E381C 3C018090 */ lui $at, %hi(D_808F8250) ## $at = 80900000 @@ -252,7 +252,7 @@ glabel func_808E3564 /* 0D020 808E3890 26040038 */ addiu $a0, $s0, 0x0038 ## $a0 = 00010038 /* 0D024 808E3894 46124402 */ mul.s $f16, $f8, $f18 /* 0D028 808E3898 44078000 */ mfc1 $a3, $f16 -/* 0D02C 808E389C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0D02C 808E389C 0C01E107 */ jal Math_ApproachF /* 0D030 808E38A0 00000000 */ nop /* 0D034 808E38A4 10000120 */ beq $zero, $zero, .L808E3D28 @@ -265,7 +265,7 @@ glabel func_808E3564 /* 0D04C 808E38BC 15400028 */ bne $t2, $zero, .L808E3960 /* 0D050 808E38C0 00000000 */ nop /* 0D054 808E38C4 3C018090 */ lui $at, %hi(D_808F8254) ## $at = 80900000 -/* 0D058 808E38C8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0D058 808E38C8 0C00CFBE */ jal Rand_ZeroFloat /* 0D05C 808E38CC C42C8254 */ lwc1 $f12, %lo(D_808F8254)($at) /* 0D060 808E38D0 4600010D */ trunc.w.s $f4, $f0 @@ -277,7 +277,7 @@ glabel func_808E3564 /* 0D078 808E38E8 00118C03 */ sra $s1, $s1, 16 /* 0D07C 808E38EC 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 /* 0D080 808E38F0 00118C00 */ sll $s1, $s1, 16 -/* 0D084 808E38F4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D084 808E38F4 0C00CFC8 */ jal Rand_CenteredFloat /* 0D088 808E38F8 00118C03 */ sra $s1, $s1, 16 /* 0D08C 808E38FC 8EAC0000 */ lw $t4, 0x0000($s5) ## 808F93D0 @@ -289,7 +289,7 @@ glabel func_808E3564 /* 0D0A4 808E3914 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0D0A8 808E3918 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 0D0AC 808E391C 46060280 */ add.s $f10, $f0, $f6 -/* 0D0B0 808E3920 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D0B0 808E3920 0C00CFC8 */ jal Rand_CenteredFloat /* 0D0B4 808E3924 E60A0004 */ swc1 $f10, 0x0004($s0) ## 00010004 /* 0D0B8 808E3928 8EAE0000 */ lw $t6, 0x0000($s5) ## 808F93D0 @@ -298,7 +298,7 @@ glabel func_808E3564 /* 0D0C4 808E3934 01D27821 */ addu $t7, $t6, $s2 /* 0D0C8 808E3938 C5E802F0 */ lwc1 $f8, 0x02F0($t7) ## 000002F0 /* 0D0CC 808E393C 46080480 */ add.s $f18, $f0, $f8 -/* 0D0D0 808E3940 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D0D0 808E3940 0C00CFC8 */ jal Rand_CenteredFloat /* 0D0D4 808E3944 E6120008 */ swc1 $f18, 0x0008($s0) ## 00010008 /* 0D0D8 808E3948 8EB80000 */ lw $t8, 0x0000($s5) ## 808F93D0 @@ -308,7 +308,7 @@ glabel func_808E3564 /* 0D0E8 808E3958 1000001E */ beq $zero, $zero, .L808E39D4 /* 0D0EC 808E395C E604000C */ swc1 $f4, 0x000C($s0) ## 0001000C .L808E3960: -/* 0D0F0 808E3960 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0D0F0 808E3960 0C00CFBE */ jal Rand_ZeroFloat /* 0D0F4 808E3964 C42C8258 */ lwc1 $f12, %lo(D_808F8258)($at) /* 0D0F8 808E3968 4600018D */ trunc.w.s $f6, $f0 @@ -317,7 +317,7 @@ glabel func_808E3564 /* 0D104 808E3974 44113000 */ mfc1 $s1, $f6 /* 0D108 808E3978 00000000 */ nop /* 0D10C 808E397C 00118C00 */ sll $s1, $s1, 16 -/* 0D110 808E3980 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D110 808E3980 0C00CFC8 */ jal Rand_CenteredFloat /* 0D114 808E3984 00118C03 */ sra $s1, $s1, 16 /* 0D118 808E3988 00114880 */ sll $t1, $s1, 2 @@ -328,14 +328,14 @@ glabel func_808E3564 /* 0D12C 808E399C 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 0D130 808E39A0 44816000 */ mtc1 $at, $f12 ## $f12 = 15.00 /* 0D134 808E39A4 460A0200 */ add.s $f8, $f0, $f10 -/* 0D138 808E39A8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D138 808E39A8 0C00CFC8 */ jal Rand_CenteredFloat /* 0D13C 808E39AC E6080004 */ swc1 $f8, 0x0004($s0) ## 00010004 /* 0D140 808E39B0 C652090C */ lwc1 $f18, 0x090C($s2) ## 0000090C /* 0D144 808E39B4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0D148 808E39B8 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 0D14C 808E39BC 46120400 */ add.s $f16, $f0, $f18 -/* 0D150 808E39C0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D150 808E39C0 0C00CFC8 */ jal Rand_CenteredFloat /* 0D154 808E39C4 E6100008 */ swc1 $f16, 0x0008($s0) ## 00010008 /* 0D158 808E39C8 C6440910 */ lwc1 $f4, 0x0910($s2) ## 00000910 @@ -343,7 +343,7 @@ glabel func_808E3564 /* 0D160 808E39D0 E606000C */ swc1 $f6, 0x000C($s0) ## 0001000C .L808E39D4: /* 0D164 808E39D4 3C018090 */ lui $at, %hi(D_808F825C) ## $at = 80900000 -/* 0D168 808E39D8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0D168 808E39D8 0C00CFBE */ jal Rand_ZeroFloat /* 0D16C 808E39DC C42C825C */ lwc1 $f12, %lo(D_808F825C)($at) /* 0D170 808E39E0 3C018090 */ lui $at, %hi(D_808F8260) ## $at = 80900000 @@ -433,14 +433,14 @@ glabel func_808E3564 /* 0D2A4 808E3B14 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 .L808E3B18: /* 0D2A8 808E3B18 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A -/* 0D2AC 808E3B1C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0D2AC 808E3B1C 0C01E107 */ jal Math_ApproachF /* 0D2B0 808E3B20 8E050038 */ lw $a1, 0x0038($s0) ## 00010038 /* 0D2B4 808E3B24 4406F000 */ mfc1 $a2, $f30 /* 0D2B8 808E3B28 3C073E19 */ lui $a3, 0x3E19 ## $a3 = 3E190000 /* 0D2BC 808E3B2C 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E19999A /* 0D2C0 808E3B30 26040040 */ addiu $a0, $s0, 0x0040 ## $a0 = 00010040 -/* 0D2C4 808E3B34 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0D2C4 808E3B34 0C01E107 */ jal Math_ApproachF /* 0D2C8 808E3B38 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 /* 0D2CC 808E3B3C 1000007A */ beq $zero, $zero, .L808E3D28 @@ -495,14 +495,14 @@ glabel func_808E3564 .L808E3BEC: /* 0D37C 808E3BEC 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 0D380 808E3BF0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 0D384 808E3BF4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0D384 808E3BF4 0C01E107 */ jal Math_ApproachF /* 0D388 808E3BF8 8E050038 */ lw $a1, 0x0038($s0) ## 00010038 /* 0D38C 808E3BFC 4405F000 */ mfc1 $a1, $f30 /* 0D390 808E3C00 4406F000 */ mfc1 $a2, $f30 /* 0D394 808E3C04 3C073E19 */ lui $a3, 0x3E19 ## $a3 = 3E190000 /* 0D398 808E3C08 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E19999A -/* 0D39C 808E3C0C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0D39C 808E3C0C 0C01E107 */ jal Math_ApproachF /* 0D3A0 808E3C10 26040040 */ addiu $a0, $s0, 0x0040 ## $a0 = 00010040 /* 0D3A4 808E3C14 10000044 */ beq $zero, $zero, .L808E3D28 @@ -525,7 +525,7 @@ glabel func_808E3564 /* 0D3E4 808E3C54 A2000000 */ sb $zero, 0x0000($s0) ## 00010000 .L808E3C58: /* 0D3E8 808E3C58 8E050038 */ lw $a1, 0x0038($s0) ## 00010038 -/* 0D3EC 808E3C5C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0D3EC 808E3C5C 0C01E107 */ jal Math_ApproachF /* 0D3F0 808E3C60 34E71EB8 */ ori $a3, $a3, 0x1EB8 ## $a3 = 3E051EB8 /* 0D3F4 808E3C64 920E0001 */ lbu $t6, 0x0001($s0) ## 00010001 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Update.s index 40382df79b..3ab0675942 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Update.s @@ -98,7 +98,7 @@ glabel BossGanon2_Update /* 05938 80902878 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0593C 8090287C 2624030C */ addiu $a0, $s1, 0x030C ## $a0 = 0000030C /* 05940 80902880 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 05944 80902884 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 05944 80902884 0C01E123 */ jal Math_ApproachZeroF /* 05948 80902888 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 .L8090288C: @@ -203,7 +203,7 @@ glabel BossGanon2_Update /* 05AA8 809029E8 316C001F */ andi $t4, $t3, 0x001F ## $t4 = 00000000 /* 05AAC 809029EC 5580000C */ bnel $t4, $zero, .L80902A20 /* 05AB0 809029F0 86220318 */ lh $v0, 0x0318($s1) ## 00000318 -/* 05AB4 809029F4 0C03F66B */ jal Math_Rand_ZeroOne +/* 05AB4 809029F4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 05AB8 809029F8 00000000 */ nop /* 05ABC 809029FC 3C018091 */ lui $at, %hi(D_8090DC64) ## $at = 80910000 @@ -230,7 +230,7 @@ glabel BossGanon2_Update /* 05B08 80902A48 00810019 */ multu $a0, $at /* 05B0C 80902A4C 00002012 */ mflo $a0 /* 05B10 80902A50 00042400 */ sll $a0, $a0, 16 -/* 05B14 80902A54 0C01DE1C */ jal Math_Sins +/* 05B14 80902A54 0C01DE1C */ jal Math_SinS ## sins? /* 05B18 80902A58 00042403 */ sra $a0, $a0, 16 /* 05B1C 80902A5C 3C014280 */ lui $at, 0x4280 ## $at = 42800000 @@ -254,7 +254,7 @@ glabel BossGanon2_Update /* 05B64 80902AA4 34A54000 */ ori $a1, $a1, 0x4000 ## $a1 = 459C4000 /* 05B68 80902AA8 26240360 */ addiu $a0, $s1, 0x0360 ## $a0 = 00000360 /* 05B6C 80902AAC 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 05B70 80902AB0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05B70 80902AB0 0C01E107 */ jal Math_ApproachF /* 05B74 80902AB4 34E78000 */ ori $a3, $a3, 0x8000 ## $a3 = 453B8000 /* 05B78 80902AB8 3C0545AB */ lui $a1, 0x45AB ## $a1 = 45AB0000 @@ -262,27 +262,27 @@ glabel BossGanon2_Update /* 05B80 80902AC0 34E78000 */ ori $a3, $a3, 0x8000 ## $a3 = 453B8000 /* 05B84 80902AC4 34A5E000 */ ori $a1, $a1, 0xE000 ## $a1 = 45ABE000 /* 05B88 80902AC8 26240370 */ addiu $a0, $s1, 0x0370 ## $a0 = 00000370 -/* 05B8C 80902ACC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05B8C 80902ACC 0C01E107 */ jal Math_ApproachF /* 05B90 80902AD0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 05B94 80902AD4 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 05B98 80902AD8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 05B9C 80902ADC 26240368 */ addiu $a0, $s1, 0x0368 ## $a0 = 00000368 /* 05BA0 80902AE0 3C0545FA */ lui $a1, 0x45FA ## $a1 = 45FA0000 -/* 05BA4 80902AE4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05BA4 80902AE4 0C01E107 */ jal Math_ApproachF /* 05BA8 80902AE8 3C07457A */ lui $a3, 0x457A ## $a3 = 457A0000 /* 05BAC 80902AEC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 05BB0 80902AF0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 05BB4 80902AF4 26240378 */ addiu $a0, $s1, 0x0378 ## $a0 = 00000378 /* 05BB8 80902AF8 3C0545FA */ lui $a1, 0x45FA ## $a1 = 45FA0000 -/* 05BBC 80902AFC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05BBC 80902AFC 0C01E107 */ jal Math_ApproachF /* 05BC0 80902B00 3C07457A */ lui $a3, 0x457A ## $a3 = 457A0000 /* 05BC4 80902B04 26240346 */ addiu $a0, $s1, 0x0346 ## $a0 = 00000346 /* 05BC8 80902B08 24050FA0 */ addiu $a1, $zero, 0x0FA0 ## $a1 = 00000FA0 /* 05BCC 80902B0C 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 05BD0 80902B10 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 05BD0 80902B10 0C01E1EF */ jal Math_ApproachS /* 05BD4 80902B14 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 05BD8 80902B18 10000040 */ beq $zero, $zero, .L80902C1C @@ -290,7 +290,7 @@ glabel BossGanon2_Update .L80902B20: /* 05BE0 80902B20 C42ADC68 */ lwc1 $f10, %lo(D_8090DC68)($at) /* 05BE4 80902B24 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 05BE8 80902B28 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05BE8 80902B28 0C01E107 */ jal Math_ApproachF /* 05BEC 80902B2C E62A0364 */ swc1 $f10, 0x0364($s1) ## 00000364 /* 05BF0 80902B30 3C018091 */ lui $at, %hi(D_8090DC6C) ## $at = 80910000 @@ -301,7 +301,7 @@ glabel BossGanon2_Update /* 05C04 80902B44 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = 44BB8000 /* 05C08 80902B48 26240370 */ addiu $a0, $s1, 0x0370 ## $a0 = 00000370 /* 05C0C 80902B4C 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 05C10 80902B50 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05C10 80902B50 0C01E107 */ jal Math_ApproachF /* 05C14 80902B54 E6300374 */ swc1 $f16, 0x0374($s1) ## 00000374 /* 05C18 80902B58 8E220190 */ lw $v0, 0x0190($s1) ## 00000190 @@ -320,20 +320,20 @@ glabel BossGanon2_Update /* 05C48 80902B88 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 05C4C 80902B8C 26240368 */ addiu $a0, $s1, 0x0368 ## $a0 = 00000368 /* 05C50 80902B90 3C05447A */ lui $a1, 0x447A ## $a1 = 447A0000 -/* 05C54 80902B94 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05C54 80902B94 0C01E107 */ jal Math_ApproachF /* 05C58 80902B98 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 05C5C 80902B9C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 05C60 80902BA0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 05C64 80902BA4 26240378 */ addiu $a0, $s1, 0x0378 ## $a0 = 00000378 /* 05C68 80902BA8 3C05447A */ lui $a1, 0x447A ## $a1 = 447A0000 -/* 05C6C 80902BAC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05C6C 80902BAC 0C01E107 */ jal Math_ApproachF /* 05C70 80902BB0 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 05C74 80902BB4 26240346 */ addiu $a0, $s1, 0x0346 ## $a0 = 00000346 /* 05C78 80902BB8 2405F060 */ addiu $a1, $zero, 0xF060 ## $a1 = FFFFF060 /* 05C7C 80902BBC 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 05C80 80902BC0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 05C80 80902BC0 0C01E1EF */ jal Math_ApproachS /* 05C84 80902BC4 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 05C88 80902BC8 10000014 */ beq $zero, $zero, .L80902C1C @@ -343,7 +343,7 @@ glabel BossGanon2_Update /* 05C94 80902BD4 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 05C98 80902BD8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 05C9C 80902BDC 34A54000 */ ori $a1, $a1, 0x4000 ## $a1 = 459C4000 -/* 05CA0 80902BE0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05CA0 80902BE0 0C01E107 */ jal Math_ApproachF /* 05CA4 80902BE4 3C074348 */ lui $a3, 0x4348 ## $a3 = 43480000 /* 05CA8 80902BE8 3C05459C */ lui $a1, 0x459C ## $a1 = 459C0000 @@ -351,13 +351,13 @@ glabel BossGanon2_Update /* 05CB0 80902BF0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 05CB4 80902BF4 34A54000 */ ori $a1, $a1, 0x4000 ## $a1 = 459C4000 /* 05CB8 80902BF8 26240378 */ addiu $a0, $s1, 0x0378 ## $a0 = 00000378 -/* 05CBC 80902BFC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05CBC 80902BFC 0C01E107 */ jal Math_ApproachF /* 05CC0 80902C00 3C074348 */ lui $a3, 0x4348 ## $a3 = 43480000 /* 05CC4 80902C04 26240346 */ addiu $a0, $s1, 0x0346 ## $a0 = 00000346 /* 05CC8 80902C08 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 05CCC 80902C0C 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 05CD0 80902C10 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 05CD0 80902C10 0C01E1EF */ jal Math_ApproachS /* 05CD4 80902C14 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 05CD8 80902C18 862C039C */ lh $t4, 0x039C($s1) ## 0000039C @@ -415,7 +415,7 @@ glabel BossGanon2_Update /* 05D8C 80902CCC 00006812 */ mflo $t5 /* 05D90 80902CD0 030D2021 */ addu $a0, $t8, $t5 /* 05D94 80902CD4 00042400 */ sll $a0, $a0, 16 -/* 05D98 80902CD8 0C01DE1C */ jal Math_Sins +/* 05D98 80902CD8 0C01DE1C */ jal Math_SinS ## sins? /* 05D9C 80902CDC 00042403 */ sra $a0, $a0, 16 /* 05DA0 80902CE0 C7A20068 */ lwc1 $f2, 0x0068($sp) @@ -442,7 +442,7 @@ glabel BossGanon2_Update /* 05DF4 80902D34 0000C812 */ mflo $t9 /* 05DF8 80902D38 01992021 */ addu $a0, $t4, $t9 /* 05DFC 80902D3C 00042400 */ sll $a0, $a0, 16 -/* 05E00 80902D40 0C01DE1C */ jal Math_Sins +/* 05E00 80902D40 0C01DE1C */ jal Math_SinS ## sins? /* 05E04 80902D44 00042403 */ sra $a0, $a0, 16 /* 05E08 80902D48 C7A20068 */ lwc1 $f2, 0x0068($sp) @@ -516,7 +516,7 @@ glabel BossGanon2_Update /* 05F00 80902E40 1461000A */ bne $v1, $at, .L80902E6C /* 05F04 80902E44 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 05F08 80902E48 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 05F0C 80902E4C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 05F0C 80902E4C 0C00CFBE */ jal Rand_ZeroFloat /* 05F10 80902E50 00000000 */ nop /* 05F14 80902E54 4600048D */ trunc.w.s $f18, $f0 @@ -528,7 +528,7 @@ glabel BossGanon2_Update .L80902E6C: /* 05F2C 80902E6C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 05F30 80902E70 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 -/* 05F34 80902E74 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 05F34 80902E74 0C00CFBE */ jal Rand_ZeroFloat /* 05F38 80902E78 00000000 */ nop /* 05F3C 80902E7C 4600010D */ trunc.w.s $f4, $f0 @@ -542,7 +542,7 @@ glabel BossGanon2_Update /* 05F58 80902E98 00320821 */ addu $at, $at, $s2 /* 05F5C 80902E9C A0200AE2 */ sb $zero, 0x0AE2($at) ## 00010AE2 /* 05F60 80902EA0 3C018091 */ lui $at, %hi(D_8090DC74) ## $at = 80910000 -/* 05F64 80902EA4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 05F64 80902EA4 0C00CFBE */ jal Rand_ZeroFloat /* 05F68 80902EA8 C42CDC74 */ lwc1 $f12, %lo(D_8090DC74)($at) /* 05F6C 80902EAC 4600018D */ trunc.w.s $f6, $f0 @@ -563,7 +563,7 @@ glabel BossGanon2_Update /* 05FA8 80902EE8 C6100004 */ lwc1 $f16, 0x0004($s0) ## 8090EB24 /* 05FAC 80902EEC E6100000 */ swc1 $f16, 0x0000($s0) ## 8090EB20 /* 05FB0 80902EF0 C6120000 */ lwc1 $f18, 0x0000($s0) ## 8090EB20 -/* 05FB4 80902EF4 0C03F66B */ jal Math_Rand_ZeroOne +/* 05FB4 80902EF4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 05FB8 80902EF8 E6120008 */ swc1 $f18, 0x0008($s0) ## 8090EB28 /* 05FBC 80902EFC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -574,7 +574,7 @@ glabel BossGanon2_Update /* 05FD0 80902F10 45020006 */ bc1fl .L80902F2C /* 05FD4 80902F14 02002025 */ or $a0, $s0, $zero ## $a0 = 8090EB20 /* 05FD8 80902F18 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 -/* 05FDC 80902F1C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 05FDC 80902F1C 0C00CFBE */ jal Rand_ZeroFloat /* 05FE0 80902F20 00000000 */ nop /* 05FE4 80902F24 E6000008 */ swc1 $f0, 0x0008($s0) ## 8090EB28 @@ -589,7 +589,7 @@ glabel BossGanon2_Update /* 06004 80902F44 A6380330 */ sh $t8, 0x0330($s1) ## 00000330 /* 06008 80902F48 3C018091 */ lui $at, %hi(D_8090DC78) ## $at = 80910000 /* 0600C 80902F4C E626032C */ swc1 $f6, 0x032C($s1) ## 0000032C -/* 06010 80902F50 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06010 80902F50 0C00CFBE */ jal Rand_ZeroFloat /* 06014 80902F54 C42CDC78 */ lwc1 $f12, %lo(D_8090DC78)($at) /* 06018 80902F58 4600020D */ trunc.w.s $f8, $f0 @@ -663,7 +663,7 @@ glabel L8090304C /* 06114 80903054 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 06118 80903058 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0611C 8090305C 02412021 */ addu $a0, $s2, $at -/* 06120 80903060 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 06120 80903060 0C01E123 */ jal Math_ApproachZeroF /* 06124 80903064 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 06128 80903068 100000BD */ beq $zero, $zero, .L80903360 @@ -685,7 +685,7 @@ glabel L80903070 /* 06164 809030A4 44050000 */ mfc1 $a1, $f0 /* 06168 809030A8 44060000 */ mfc1 $a2, $f0 /* 0616C 809030AC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3C4CCCCD -/* 06170 809030B0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06170 809030B0 0C01E107 */ jal Math_ApproachF /* 06174 809030B4 02412021 */ addu $a0, $s2, $at /* 06178 809030B8 100000A9 */ beq $zero, $zero, .L80903360 @@ -707,7 +707,7 @@ glabel L809030C0 /* 061B4 809030F4 44050000 */ mfc1 $a1, $f0 /* 061B8 809030F8 44060000 */ mfc1 $a2, $f0 /* 061BC 809030FC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3C4CCCCD -/* 061C0 80903100 0C01E107 */ jal Math_SmoothScaleMaxF +/* 061C0 80903100 0C01E107 */ jal Math_ApproachF /* 061C4 80903104 02412021 */ addu $a0, $s2, $at /* 061C8 80903108 10000095 */ beq $zero, $zero, .L80903360 @@ -726,7 +726,7 @@ glabel L80903110 /* 061F8 80903138 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 061FC 8090313C 34A5A3D7 */ ori $a1, $a1, 0xA3D7 ## $a1 = 3F30A3D7 /* 06200 80903140 2624033C */ addiu $a0, $s1, 0x033C ## $a0 = 0000033C -/* 06204 80903144 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06204 80903144 0C01E107 */ jal Math_ApproachF /* 06208 80903148 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0620C 8090314C 8E041DE4 */ lw $a0, 0x1DE4($s0) ## 80910904 @@ -735,7 +735,7 @@ glabel L80903110 /* 06218 80903158 00812021 */ addu $a0, $a0, $at /* 0621C 8090315C 00042300 */ sll $a0, $a0, 12 /* 06220 80903160 00042400 */ sll $a0, $a0, 16 -/* 06224 80903164 0C01DE1C */ jal Math_Sins +/* 06224 80903164 0C01DE1C */ jal Math_SinS ## sins? /* 06228 80903168 00042403 */ sra $a0, $a0, 16 /* 0622C 8090316C 3C018091 */ lui $at, %hi(D_8090DCE4) ## $at = 80910000 @@ -762,7 +762,7 @@ glabel L80903110 /* 0627C 809031BC 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 06280 809031C0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 06284 809031C4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 06288 809031C8 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 06288 809031C8 0C01E123 */ jal Math_ApproachZeroF /* 0628C 809031CC 02412021 */ addu $a0, $s2, $at /* 06290 809031D0 10000063 */ beq $zero, $zero, .L80903360 @@ -780,7 +780,7 @@ glabel L809031D8 /* 062BC 809031FC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 062C0 80903200 34A5A3D7 */ ori $a1, $a1, 0xA3D7 ## $a1 = 3F30A3D7 /* 062C4 80903204 2624033C */ addiu $a0, $s1, 0x033C ## $a0 = 0000033C -/* 062C8 80903208 0C01E107 */ jal Math_SmoothScaleMaxF +/* 062C8 80903208 0C01E107 */ jal Math_ApproachF /* 062CC 8090320C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 062D0 80903210 8E041DE4 */ lw $a0, 0x1DE4($s0) ## 80910904 @@ -789,7 +789,7 @@ glabel L809031D8 /* 062DC 8090321C 00812023 */ subu $a0, $a0, $at /* 062E0 80903220 00042300 */ sll $a0, $a0, 12 /* 062E4 80903224 00042400 */ sll $a0, $a0, 16 -/* 062E8 80903228 0C01DE1C */ jal Math_Sins +/* 062E8 80903228 0C01DE1C */ jal Math_SinS ## sins? /* 062EC 8090322C 00042403 */ sra $a0, $a0, 16 /* 062F0 80903230 3C018091 */ lui $at, %hi(D_8090DCEC) ## $at = 80910000 @@ -818,7 +818,7 @@ glabel L80903264 /* 06348 80903288 3C063CA3 */ lui $a2, 0x3CA3 ## $a2 = 3CA30000 /* 0634C 8090328C 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3CA3D70A /* 06350 80903290 02412021 */ addu $a0, $s2, $at -/* 06354 80903294 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 06354 80903294 0C01E123 */ jal Math_ApproachZeroF /* 06358 80903298 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 0635C 8090329C 10000030 */ beq $zero, $zero, .L80903360 @@ -891,12 +891,12 @@ glabel L80903360 /* 06448 80903388 AFAD0038 */ sw $t5, 0x0038($sp) .L8090338C: /* 0644C 8090338C 3C018091 */ lui $at, %hi(D_8090DCF4) ## $at = 80910000 -/* 06450 80903390 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06450 80903390 0C00CFBE */ jal Rand_ZeroFloat /* 06454 80903394 C42CDCF4 */ lwc1 $f12, %lo(D_8090DCF4)($at) /* 06458 80903398 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 0645C 8090339C 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 -/* 06460 809033A0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06460 809033A0 0C00CFBE */ jal Rand_ZeroFloat /* 06464 809033A4 E7A00048 */ swc1 $f0, 0x0048($sp) /* 06468 809033A8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -927,7 +927,7 @@ glabel L80903360 /* 064C4 80903404 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 064C8 80903408 44816000 */ mtc1 $at, $f12 ## $f12 = 15.00 /* 064CC 8090340C 46080282 */ mul.s $f10, $f0, $f8 -/* 064D0 80903410 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 064D0 80903410 0C00CFBE */ jal Rand_ZeroFloat /* 064D4 80903414 E7AA0054 */ swc1 $f10, 0x0054($sp) /* 064D8 80903418 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -951,7 +951,7 @@ glabel L80903360 /* 06520 80903460 460E4482 */ mul.s $f18, $f8, $f14 /* 06524 80903464 E7B00058 */ swc1 $f16, 0x0058($sp) /* 06528 80903468 46123280 */ add.s $f10, $f6, $f18 -/* 0652C 8090346C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0652C 8090346C 0C00CFBE */ jal Rand_ZeroFloat /* 06530 80903470 E7AA0060 */ swc1 $f10, 0x0060($sp) /* 06534 80903474 3C018091 */ lui $at, %hi(D_8090DD00) ## $at = 80910000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD27C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD27C.s index 121738fa27..e0db82f0b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD27C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD27C.s @@ -45,17 +45,17 @@ glabel func_808FD27C /* 003B8 808FD2F8 E6000024 */ swc1 $f0, 0x0024($s0) ## 00010024 /* 003BC 808FD2FC E6040020 */ swc1 $f4, 0x0020($s0) ## 00010020 /* 003C0 808FD300 AE090018 */ sw $t1, 0x0018($s0) ## 00010018 -/* 003C4 808FD304 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 003C4 808FD304 0C00CFBE */ jal Rand_ZeroFloat /* 003C8 808FD308 C42CDAA4 */ lwc1 $f12, %lo(D_8090DAA4)($at) /* 003CC 808FD30C E6000040 */ swc1 $f0, 0x0040($s0) ## 00010040 /* 003D0 808FD310 3C018091 */ lui $at, %hi(D_8090DAA8) ## $at = 80910000 -/* 003D4 808FD314 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 003D4 808FD314 0C00CFBE */ jal Rand_ZeroFloat /* 003D8 808FD318 C42CDAA8 */ lwc1 $f12, %lo(D_8090DAA8)($at) /* 003DC 808FD31C E600003C */ swc1 $f0, 0x003C($s0) ## 0001003C /* 003E0 808FD320 3C018091 */ lui $at, %hi(D_8090DAAC) ## $at = 80910000 -/* 003E4 808FD324 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 003E4 808FD324 0C00CFBE */ jal Rand_ZeroFloat /* 003E8 808FD328 C42CDAAC */ lwc1 $f12, %lo(D_8090DAAC)($at) /* 003EC 808FD32C E6000038 */ swc1 $f0, 0x0038($s0) ## 00010038 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s index 6e04adf510..2a3a608cc8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s @@ -256,7 +256,7 @@ glabel L808FD80C /* 00910 808FD850 AFA90088 */ sw $t1, 0x0088($sp) /* 00914 808FD854 260403A4 */ addiu $a0, $s0, 0x03A4 ## $a0 = 000003A4 /* 00918 808FD858 44074000 */ mfc1 $a3, $f8 -/* 0091C 808FD85C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0091C 808FD85C 0C01E107 */ jal Math_ApproachF /* 00920 808FD860 00000000 */ nop /* 00924 808FD864 3C0144DC */ lui $at, 0x44DC ## $at = 44DC0000 @@ -268,7 +268,7 @@ glabel L808FD80C /* 0093C 808FD87C 260403AC */ addiu $a0, $s0, 0x03AC ## $a0 = 000003AC /* 00940 808FD880 3C05C320 */ lui $a1, 0xC320 ## $a1 = C3200000 /* 00944 808FD884 44073000 */ mfc1 $a3, $f6 -/* 00948 808FD888 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00948 808FD888 0C01E107 */ jal Math_ApproachF /* 0094C 808FD88C 00000000 */ nop /* 00950 808FD890 3C053BF5 */ lui $a1, 0x3BF5 ## $a1 = 3BF50000 @@ -276,7 +276,7 @@ glabel L808FD80C /* 00958 808FD898 34E7B717 */ ori $a3, $a3, 0xB717 ## $a3 = 38D1B717 /* 0095C 808FD89C 34A5C28F */ ori $a1, $a1, 0xC28F ## $a1 = 3BF5C28F /* 00960 808FD8A0 26040410 */ addiu $a0, $s0, 0x0410 ## $a0 = 00000410 -/* 00964 808FD8A4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00964 808FD8A4 0C01E107 */ jal Math_ApproachF /* 00968 808FD8A8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0096C 808FD8AC 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 @@ -425,7 +425,7 @@ glabel L808FD940 /* 00B94 808FDAD4 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 /* 00B98 808FDAD8 460E3200 */ add.s $f8, $f6, $f14 /* 00B9C 808FDADC 44054000 */ mfc1 $a1, $f8 -/* 00BA0 808FDAE0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00BA0 808FDAE0 0C01E107 */ jal Math_ApproachF /* 00BA4 808FDAE4 00000000 */ nop /* 00BA8 808FDAE8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 @@ -434,7 +434,7 @@ glabel L808FD940 /* 00BB4 808FDAF4 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 00BB8 808FDAF8 44050000 */ mfc1 $a1, $f0 /* 00BBC 808FDAFC 8FA40054 */ lw $a0, 0x0054($sp) -/* 00BC0 808FDB00 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00BC0 808FDB00 0C01E107 */ jal Math_ApproachF /* 00BC4 808FDB04 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00BC8 808FDB08 1000000A */ beq $zero, $zero, .L808FDB34 @@ -477,7 +477,7 @@ glabel L808FDB64 /* 00C50 808FDB90 46045180 */ add.s $f6, $f10, $f4 /* 00C54 808FDB94 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 /* 00C58 808FDB98 44053000 */ mfc1 $a1, $f6 -/* 00C5C 808FDB9C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00C5C 808FDB9C 0C01E107 */ jal Math_ApproachF /* 00C60 808FDBA0 00000000 */ nop /* 00C64 808FDBA4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 @@ -537,7 +537,7 @@ glabel L808FDC48 /* 00D2C 808FDC6C AFA4004C */ sw $a0, 0x004C($sp) /* 00D30 808FDC70 3C05C3B4 */ lui $a1, 0xC3B4 ## $a1 = C3B40000 /* 00D34 808FDC74 44073000 */ mfc1 $a3, $f6 -/* 00D38 808FDC78 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00D38 808FDC78 0C01E107 */ jal Math_ApproachF /* 00D3C 808FDC7C 00000000 */ nop /* 00D40 808FDC80 3C01432A */ lui $at, 0x432A ## $at = 432A0000 @@ -549,7 +549,7 @@ glabel L808FDC48 /* 00D58 808FDC98 260403AC */ addiu $a0, $s0, 0x03AC ## $a0 = 000003AC /* 00D5C 808FDC9C 3C05C1A0 */ lui $a1, 0xC1A0 ## $a1 = C1A00000 /* 00D60 808FDCA0 44072000 */ mfc1 $a3, $f4 -/* 00D64 808FDCA4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00D64 808FDCA4 0C01E107 */ jal Math_ApproachF /* 00D68 808FDCA8 00000000 */ nop /* 00D6C 808FDCAC 3C053D23 */ lui $a1, 0x3D23 ## $a1 = 3D230000 @@ -557,7 +557,7 @@ glabel L808FDC48 /* 00D74 808FDCB4 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A03126F /* 00D78 808FDCB8 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3D23D70A /* 00D7C 808FDCBC 26040410 */ addiu $a0, $s0, 0x0410 ## $a0 = 00000410 -/* 00D80 808FDCC0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00D80 808FDCC0 0C01E107 */ jal Math_ApproachF /* 00D84 808FDCC4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00D88 808FDCC8 8E0E0398 */ lw $t6, 0x0398($s0) ## 00000398 @@ -697,7 +697,7 @@ glabel L808FDDE8 /* 00F98 808FDED8 26040324 */ addiu $a0, $s0, 0x0324 ## $a0 = 00000324 /* 00F9C 808FDEDC 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 00FA0 808FDEE0 44077000 */ mfc1 $a3, $f14 -/* 00FA4 808FDEE4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00FA4 808FDEE4 0C01E107 */ jal Math_ApproachF /* 00FA8 808FDEE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00FAC 808FDEEC 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 @@ -931,7 +931,7 @@ glabel L808FE1C0 /* 01308 808FE248 44077000 */ mfc1 $a3, $f14 /* 0130C 808FE24C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01310 808FE250 34A52000 */ ori $a1, $a1, 0x2000 ## $a1 = 44A12000 -/* 01314 808FE254 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01314 808FE254 0C01E107 */ jal Math_ApproachF /* 01318 808FE258 AFA90088 */ sw $t1, 0x0088($sp) /* 0131C 808FE25C 3C01428C */ lui $at, 0x428C ## $at = 428C0000 @@ -984,7 +984,7 @@ glabel L808FE2E0 /* 013C8 808FE308 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 013CC 808FE30C 34A52000 */ ori $a1, $a1, 0x2000 ## $a1 = 44A12000 /* 013D0 808FE310 8FA40054 */ lw $a0, 0x0054($sp) -/* 013D4 808FE314 0C01E107 */ jal Math_SmoothScaleMaxF +/* 013D4 808FE314 0C01E107 */ jal Math_ApproachF /* 013D8 808FE318 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 013DC 808FE31C 3C018091 */ lui $at, %hi(D_8090DB88) ## $at = 80910000 @@ -1124,7 +1124,7 @@ glabel L808FE4C0 /* 015D8 808FE518 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 /* 015DC 808FE51C 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 015E0 808FE520 44054000 */ mfc1 $a1, $f8 -/* 015E4 808FE524 0C01E107 */ jal Math_SmoothScaleMaxF +/* 015E4 808FE524 0C01E107 */ jal Math_ApproachF /* 015E8 808FE528 00000000 */ nop /* 015EC 808FE52C 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 @@ -1169,7 +1169,7 @@ glabel L808FE4C0 /* 0167C 808FE5BC 260401B4 */ addiu $a0, $s0, 0x01B4 ## $a0 = 000001B4 /* 01680 808FE5C0 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 01684 808FE5C4 44077000 */ mfc1 $a3, $f14 -/* 01688 808FE5C8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01688 808FE5C8 0C01E107 */ jal Math_ApproachF /* 0168C 808FE5CC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01690 808FE5D0 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 @@ -1233,13 +1233,13 @@ glabel L808FE63C /* 01764 808FE6A4 44070000 */ mfc1 $a3, $f0 /* 01768 808FE6A8 2604030C */ addiu $a0, $s0, 0x030C ## $a0 = 0000030C /* 0176C 808FE6AC 44057000 */ mfc1 $a1, $f14 -/* 01770 808FE6B0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01770 808FE6B0 0C01E107 */ jal Math_ApproachF /* 01774 808FE6B4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01778 808FE6B8 10000004 */ beq $zero, $zero, .L808FE6CC /* 0177C 808FE6BC 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 .L808FE6C0: -/* 01780 808FE6C0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01780 808FE6C0 0C01E107 */ jal Math_ApproachF /* 01784 808FE6C4 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 0000CCCD .L808FE6C8: @@ -1278,7 +1278,7 @@ glabel L808FE63C /* 017FC 808FE73C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01800 808FE740 AFA4004C */ sw $a0, 0x004C($sp) /* 01804 808FE744 44053000 */ mfc1 $a1, $f6 -/* 01808 808FE748 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01808 808FE748 0C01E107 */ jal Math_ApproachF /* 0180C 808FE74C 00000000 */ nop /* 01810 808FE750 3C014270 */ lui $at, 0x4270 ## $at = 42700000 @@ -1295,7 +1295,7 @@ glabel L808FE63C /* 0183C 808FE77C 3C074150 */ lui $a3, 0x4150 ## $a3 = 41500000 /* 01840 808FE780 460A4101 */ sub.s $f4, $f8, $f10 /* 01844 808FE784 44052000 */ mfc1 $a1, $f4 -/* 01848 808FE788 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01848 808FE788 0C01E107 */ jal Math_ApproachF /* 0184C 808FE78C 00000000 */ nop /* 01850 808FE790 3C014220 */ lui $at, 0x4220 ## $at = 42200000 @@ -1308,7 +1308,7 @@ glabel L808FE63C /* 0186C 808FE7AC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01870 808FE7B0 8FA40048 */ lw $a0, 0x0048($sp) /* 01874 808FE7B4 44054000 */ mfc1 $a1, $f8 -/* 01878 808FE7B8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01878 808FE7B8 0C01E107 */ jal Math_ApproachF /* 0187C 808FE7BC 00000000 */ nop /* 01880 808FE7C0 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 @@ -1477,7 +1477,7 @@ glabel L808FEA08 /* 01AE8 808FEA28 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 01AEC 808FEA2C 2604030C */ addiu $a0, $s0, 0x030C ## $a0 = 0000030C /* 01AF0 808FEA30 3C0540E0 */ lui $a1, 0x40E0 ## $a1 = 40E00000 -/* 01AF4 808FEA34 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01AF4 808FEA34 0C01E107 */ jal Math_ApproachF /* 01AF8 808FEA38 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01AFC 808FEA3C 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 @@ -1492,14 +1492,14 @@ glabel L808FEA08 /* 01B20 808FEA60 46045181 */ sub.s $f6, $f10, $f4 /* 01B24 808FEA64 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 01B28 808FEA68 44053000 */ mfc1 $a1, $f6 -/* 01B2C 808FEA6C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01B2C 808FEA6C 0C01E107 */ jal Math_ApproachF /* 01B30 808FEA70 00000000 */ nop /* 01B34 808FEA74 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01B38 808FEA78 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01B3C 808FEA7C 260403B0 */ addiu $a0, $s0, 0x03B0 ## $a0 = 000003B0 /* 01B40 808FEA80 8E050024 */ lw $a1, 0x0024($s0) ## 00000024 -/* 01B44 808FEA84 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01B44 808FEA84 0C01E107 */ jal Math_ApproachF /* 01B48 808FEA88 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 01B4C 808FEA8C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 @@ -1507,7 +1507,7 @@ glabel L808FEA08 /* 01B54 808FEA94 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 01B58 808FEA98 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01B5C 808FEA9C 26040228 */ addiu $a0, $s0, 0x0228 ## $a0 = 00000228 -/* 01B60 808FEAA0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01B60 808FEAA0 0C01E107 */ jal Math_ApproachF /* 01B64 808FEAA4 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 01B68 808FEAA8 8E0F0398 */ lw $t7, 0x0398($s0) ## 00000398 @@ -1668,7 +1668,7 @@ glabel L808FECE8 /* 01DC0 808FED00 8C841DE4 */ lw $a0, 0x1DE4($a0) ## 00011DE4 /* 01DC4 808FED04 000423C0 */ sll $a0, $a0, 15 /* 01DC8 808FED08 00042400 */ sll $a0, $a0, 16 -/* 01DCC 808FED0C 0C01DE0D */ jal Math_Coss +/* 01DCC 808FED0C 0C01DE0D */ jal Math_CosS ## coss? /* 01DD0 808FED10 00042403 */ sra $a0, $a0, 16 /* 01DD4 808FED14 C6080420 */ lwc1 $f8, 0x0420($s0) ## 00000420 @@ -1676,7 +1676,7 @@ glabel L808FECE8 /* 01DDC 808FED1C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 01DE0 808FED20 46080282 */ mul.s $f10, $f0, $f8 /* 01DE4 808FED24 3C063F40 */ lui $a2, 0x3F40 ## $a2 = 3F400000 -/* 01DE8 808FED28 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01DE8 808FED28 0C01E123 */ jal Math_ApproachZeroF /* 01DEC 808FED2C E60A041C */ swc1 $f10, 0x041C($s0) ## 0000041C /* 01DF0 808FED30 8E190398 */ lw $t9, 0x0398($s0) ## 00000398 @@ -1706,7 +1706,7 @@ glabel L808FED50 /* 01E44 808FED84 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01E48 808FED88 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01E4C 808FED8C 2604030C */ addiu $a0, $s0, 0x030C ## $a0 = 0000030C -/* 01E50 808FED90 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01E50 808FED90 0C01E123 */ jal Math_ApproachZeroF /* 01E54 808FED94 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 01E58 808FED98 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 @@ -1718,7 +1718,7 @@ glabel L808FED50 /* 01E70 808FEDB0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3CCCCCCD /* 01E74 808FEDB4 44050000 */ mfc1 $a1, $f0 /* 01E78 808FEDB8 44060000 */ mfc1 $a2, $f0 -/* 01E7C 808FEDBC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01E7C 808FEDBC 0C01E107 */ jal Math_ApproachF /* 01E80 808FEDC0 26040224 */ addiu $a0, $s0, 0x0224 ## $a0 = 00000224 /* 01E84 808FEDC4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 @@ -2247,7 +2247,7 @@ glabel L808FF51C /* 02640 808FF580 C5A8002C */ lwc1 $f8, 0x002C($t5) ## 0000002C /* 02644 808FF584 E60803AC */ swc1 $f8, 0x03AC($s0) ## 000003AC /* 02648 808FF588 8C6E0000 */ lw $t6, 0x0000($v1) ## 8090EB30 -/* 0264C 808FF58C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0264C 808FF58C 0C01E107 */ jal Math_ApproachF /* 02650 808FF590 8DC50024 */ lw $a1, 0x0024($t6) ## 00000024 /* 02654 808FF594 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -2259,7 +2259,7 @@ glabel L808FF51C /* 0266C 808FF5AC 44078000 */ mfc1 $a3, $f16 /* 02670 808FF5B0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 02674 808FF5B4 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 -/* 02678 808FF5B8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02678 808FF5B8 0C01E107 */ jal Math_ApproachF /* 0267C 808FF5BC 8DE50028 */ lw $a1, 0x0028($t7) ## 00000028 /* 02680 808FF5C0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -2271,7 +2271,7 @@ glabel L808FF51C /* 02698 808FF5D8 44078000 */ mfc1 $a3, $f16 /* 0269C 808FF5DC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 026A0 808FF5E0 260403B8 */ addiu $a0, $s0, 0x03B8 ## $a0 = 000003B8 -/* 026A4 808FF5E4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 026A4 808FF5E4 0C01E107 */ jal Math_ApproachF /* 026A8 808FF5E8 8F05002C */ lw $a1, 0x002C($t8) ## 0000002C /* 026AC 808FF5EC 8E190398 */ lw $t9, 0x0398($s0) ## 00000398 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFAC8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFAC8.s index da83c6bbdf..310abc87d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFAC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFAC8.s @@ -39,12 +39,12 @@ glabel func_808FFAC8 .L808FFB50: /* 02C10 808FFB50 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 .L808FFB54: -/* 02C14 808FFB54 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 02C14 808FFB54 0C01E1EF */ jal Math_ApproachS /* 02C18 808FFB58 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 02C1C 808FFB5C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 02C20 808FFB60 44817000 */ mtc1 $at, $f14 ## $f14 = 150.00 -/* 02C24 808FFB64 0C034199 */ jal atan2s +/* 02C24 808FFB64 0C034199 */ jal Math_Atan2S /* 02C28 808FFB68 C60C0090 */ lwc1 $f12, 0x0090($s0) ## 00000090 /* 02C2C 808FFB6C 2443F448 */ addiu $v1, $v0, 0xF448 ## $v1 = FFFFF448 @@ -62,7 +62,7 @@ glabel func_808FFAC8 /* 02C58 808FFB98 2405E4A8 */ addiu $a1, $zero, 0xE4A8 ## $a1 = FFFFE4A8 .L808FFB9C: /* 02C5C 808FFB9C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 02C60 808FFBA0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 02C60 808FFBA0 0C01E1EF */ jal Math_ApproachS /* 02C64 808FFBA4 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 02C68 808FFBA8 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFBBC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFBBC.s index f2ae10fbde..65162d7a67 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFBBC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFBBC.s @@ -27,7 +27,7 @@ glabel func_808FFBBC /* 02CBC 808FFBFC 44073000 */ mfc1 $a3, $f6 /* 02CC0 808FFC00 00000000 */ nop /* 02CC4 808FFC04 00073C00 */ sll $a3, $a3, 16 -/* 02CC8 808FFC08 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 02CC8 808FFC08 0C01E1EF */ jal Math_ApproachS /* 02CCC 808FFC0C 00073C03 */ sra $a3, $a3, 16 /* 02CD0 808FFC10 92180334 */ lbu $t8, 0x0334($s0) ## 00000334 @@ -49,7 +49,7 @@ glabel func_808FFBBC /* 02D0C 808FFC4C 44050000 */ mfc1 $a1, $f0 .L808FFC50: /* 02D10 808FFC50 44071000 */ mfc1 $a3, $f2 -/* 02D14 808FFC54 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02D14 808FFC54 0C01E107 */ jal Math_ApproachF /* 02D18 808FFC58 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02D1C 808FFC5C 10000005 */ beq $zero, $zero, .L808FFC74 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s index 2636a9776d..8697c9ba8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s @@ -43,7 +43,7 @@ glabel func_808FFDB0 /* 02F0C 808FFE4C AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 /* 02F10 808FFE50 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 02F14 808FFE54 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 02F18 808FFE58 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 02F18 808FFE58 0C00CFBE */ jal Rand_ZeroFloat /* 02F1C 808FFE5C 00000000 */ nop /* 02F20 808FFE60 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFEBC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFEBC.s index b831406659..78555a7fb4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFEBC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFEBC.s @@ -9,7 +9,7 @@ glabel func_808FFEBC /* 02F98 808FFED8 15C0000C */ bne $t6, $zero, .L808FFF0C /* 02F9C 808FFEDC 00000000 */ nop /* 02FA0 808FFEE0 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 02FA4 808FFEE4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 02FA4 808FFEE4 0C00CFBE */ jal Rand_ZeroFloat /* 02FA8 808FFEE8 00000000 */ nop /* 02FAC 808FFEEC 4600010D */ trunc.w.s $f4, $f0 @@ -27,7 +27,7 @@ glabel func_808FFEBC /* 02FD0 808FFF10 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02FD4 808FFF14 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 02FD8 808FFF18 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 02FDC 808FFF1C 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 02FDC 808FFF1C 0C01E123 */ jal Math_ApproachZeroF /* 02FE0 808FFF20 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02FE4 808FFF24 860A01A2 */ lh $t2, 0x01A2($s0) ## 000001A2 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFFE0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFFE0.s index 3b88ce4c67..fb2d13c71c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFFE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFFE0.s @@ -9,7 +9,7 @@ glabel func_808FFFE0 /* 030B8 808FFFF8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 030BC 808FFFFC 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 030C0 80900000 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 030C4 80900004 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 030C4 80900004 0C01E123 */ jal Math_ApproachZeroF /* 030C8 80900008 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 030CC 8090000C 860201A2 */ lh $v0, 0x01A2($s0) ## 000001A2 @@ -29,7 +29,7 @@ glabel func_808FFFE0 /* 03100 80900040 00822023 */ subu $a0, $a0, $v0 /* 03104 80900044 00042300 */ sll $a0, $a0, 12 /* 03108 80900048 00042400 */ sll $a0, $a0, 16 -/* 0310C 8090004C 0C01DE1C */ jal Math_Sins +/* 0310C 8090004C 0C01DE1C */ jal Math_SinS ## sins? /* 03110 80900050 00042403 */ sra $a0, $a0, 16 /* 03114 80900054 3C014600 */ lui $at, 0x4600 ## $at = 46000000 @@ -45,7 +45,7 @@ glabel func_808FFFE0 .L8090007C: /* 0313C 8090007C 2604031A */ addiu $a0, $s0, 0x031A ## $a0 = 0000031A /* 03140 80900080 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 03144 80900084 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 03144 80900084 0C01E1EF */ jal Math_ApproachS /* 03148 80900088 24074000 */ addiu $a3, $zero, 0x4000 ## $a3 = 00004000 /* 0314C 8090008C 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s index 6d48822019..62fc13028c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s @@ -11,7 +11,7 @@ glabel func_80900104 /* 031E4 80900124 AFA70020 */ sw $a3, 0x0020($sp) /* 031E8 80900128 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 031EC 8090012C 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 031F0 80900130 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 031F0 80900130 0C01E123 */ jal Math_ApproachZeroF /* 031F4 80900134 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 031F8 80900138 860201AC */ lh $v0, 0x01AC($s0) ## 000001AC diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090026C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090026C.s index 10155e9329..36848bf994 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090026C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090026C.s @@ -10,7 +10,7 @@ glabel func_8090026C /* 03348 80900288 8FA40020 */ lw $a0, 0x0020($sp) /* 0334C 8090028C 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 /* 03350 80900290 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 03354 80900294 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 03354 80900294 0C01E123 */ jal Math_ApproachZeroF /* 03358 80900298 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 /* 0335C 8090029C 8FAE0020 */ lw $t6, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s index e19b9b0e87..becfed0729 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s @@ -17,7 +17,7 @@ glabel func_809002CC /* 033C8 80900308 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 033CC 8090030C ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 /* 033D0 80900310 A0E00338 */ sb $zero, 0x0338($a3) ## 00000338 -/* 033D4 80900314 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 033D4 80900314 0C00CFBE */ jal Rand_ZeroFloat /* 033D8 80900318 A4EF01A2 */ sh $t7, 0x01A2($a3) ## 000001A2 /* 033DC 8090031C 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s index b525accdb2..b5faba376b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s @@ -14,7 +14,7 @@ glabel func_80900344 /* 03420 80900360 55C0000D */ bnel $t6, $zero, .L80900398 /* 03424 80900364 26040324 */ addiu $a0, $s0, 0x0324 ## $a0 = 00000324 /* 03428 80900368 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 0342C 8090036C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0342C 8090036C 0C00CFBE */ jal Rand_ZeroFloat /* 03430 80900370 00000000 */ nop /* 03434 80900374 4600010D */ trunc.w.s $f4, $f0 @@ -30,7 +30,7 @@ glabel func_80900344 .L80900398: /* 03458 80900398 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 0345C 8090039C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03460 809003A0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03460 809003A0 0C01E107 */ jal Math_ApproachF /* 03464 809003A4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 03468 809003A8 920A0338 */ lbu $t2, 0x0338($s0) ## 00000338 @@ -134,7 +134,7 @@ glabel func_80900344 /* 035CC 8090050C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 035D0 80900510 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 035D4 80900514 44050000 */ mfc1 $a1, $f0 -/* 035D8 80900518 0C01E107 */ jal Math_SmoothScaleMaxF +/* 035D8 80900518 0C01E107 */ jal Math_ApproachF /* 035DC 8090051C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 035E0 80900520 860D01A2 */ lh $t5, 0x01A2($s0) ## 000001A2 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900650.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900650.s index 3805018ef7..176910a8a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900650.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900650.s @@ -65,7 +65,7 @@ glabel func_80900650 /* 037F8 80900738 00000000 */ nop /* 037FC 8090073C A2180312 */ sb $t8, 0x0312($s0) ## 00000312 .L80900740: -/* 03800 80900740 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 03800 80900740 0C01E123 */ jal Math_ApproachZeroF /* 03804 80900744 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03808 80900748 8FA40024 */ lw $a0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s index 94d5badfad..269c52e9dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s @@ -135,14 +135,14 @@ glabel L809009A8 /* 03B00 80900A40 8FA40028 */ lw $a0, 0x0028($sp) /* 03B04 80900A44 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 03B08 80900A48 44059000 */ mfc1 $a1, $f18 -/* 03B0C 80900A4C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03B0C 80900A4C 0C01E107 */ jal Math_ApproachF /* 03B10 80900A50 00000000 */ nop /* 03B14 80900A54 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 03B18 80900A58 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 03B1C 80900A5C 260403A8 */ addiu $a0, $s0, 0x03A8 ## $a0 = 000003A8 /* 03B20 80900A60 3C05448E */ lui $a1, 0x448E ## $a1 = 448E0000 -/* 03B24 80900A64 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03B24 80900A64 0C01E107 */ jal Math_ApproachF /* 03B28 80900A68 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 03B2C 80900A6C C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C @@ -153,28 +153,28 @@ glabel L809009A8 /* 03B40 80900A80 260403AC */ addiu $a0, $s0, 0x03AC ## $a0 = 000003AC /* 03B44 80900A84 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 03B48 80900A88 44054000 */ mfc1 $a1, $f8 -/* 03B4C 80900A8C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03B4C 80900A8C 0C01E107 */ jal Math_ApproachF /* 03B50 80900A90 00000000 */ nop /* 03B54 80900A94 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 03B58 80900A98 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 03B5C 80900A9C 8FA40024 */ lw $a0, 0x0024($sp) /* 03B60 80900AA0 8E0501B8 */ lw $a1, 0x01B8($s0) ## 000001B8 -/* 03B64 80900AA4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03B64 80900AA4 0C01E107 */ jal Math_ApproachF /* 03B68 80900AA8 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 03B6C 80900AAC 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 03B70 80900AB0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 03B74 80900AB4 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 /* 03B78 80900AB8 8E0501BC */ lw $a1, 0x01BC($s0) ## 000001BC -/* 03B7C 80900ABC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03B7C 80900ABC 0C01E107 */ jal Math_ApproachF /* 03B80 80900AC0 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 03B84 80900AC4 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 03B88 80900AC8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 03B8C 80900ACC 260403B8 */ addiu $a0, $s0, 0x03B8 ## $a0 = 000003B8 /* 03B90 80900AD0 8E0501C0 */ lw $a1, 0x01C0($s0) ## 000001C0 -/* 03B94 80900AD4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03B94 80900AD4 0C01E107 */ jal Math_ApproachF /* 03B98 80900AD8 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 03B9C 80900ADC 860A01A4 */ lh $t2, 0x01A4($s0) ## 000001A4 @@ -224,7 +224,7 @@ glabel L80900AFC /* 03C48 80900B88 8C490000 */ lw $t1, 0x0000($v0) ## 8090EB2C /* 03C4C 80900B8C C528002C */ lwc1 $f8, 0x002C($t1) ## 0000002C /* 03C50 80900B90 460A4401 */ sub.s $f16, $f8, $f10 -/* 03C54 80900B94 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 03C54 80900B94 0C01E123 */ jal Math_ApproachZeroF /* 03C58 80900B98 E61003B8 */ swc1 $f16, 0x03B8($s0) ## 000003B8 /* 03C5C 80900B9C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -233,7 +233,7 @@ glabel L80900AFC /* 03C68 80900BA8 34E7A0A1 */ ori $a3, $a3, 0xA0A1 ## $a3 = 3CA0A0A1 /* 03C6C 80900BAC 02212021 */ addu $a0, $s1, $at /* 03C70 80900BB0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 03C74 80900BB4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03C74 80900BB4 0C01E107 */ jal Math_ApproachF /* 03C78 80900BB8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03C7C 80900BBC 860201A4 */ lh $v0, 0x01A4($s0) ## 000001A4 @@ -502,13 +502,13 @@ glabel L80900E4C /* 0405C 80900F9C AFA80028 */ sw $t0, 0x0028($sp) /* 04060 80900FA0 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 04064 80900FA4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04068 80900FA8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04068 80900FA8 0C01E107 */ jal Math_ApproachF /* 0406C 80900FAC 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 04070 80900FB0 3C063D20 */ lui $a2, 0x3D20 ## $a2 = 3D200000 /* 04074 80900FB4 34C6A0A1 */ ori $a2, $a2, 0xA0A1 ## $a2 = 3D20A0A1 /* 04078 80900FB8 8FA40028 */ lw $a0, 0x0028($sp) -/* 0407C 80900FBC 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 0407C 80900FBC 0C01E123 */ jal Math_ApproachZeroF /* 04080 80900FC0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 04084 80900FC4 8FA4002C */ lw $a0, 0x002C($sp) @@ -529,7 +529,7 @@ glabel L80900E4C /* 040BC 80900FFC 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 .L80901000: /* 040C0 80901000 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 040C4 80901004 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 040C4 80901004 0C01E123 */ jal Math_ApproachZeroF /* 040C8 80901008 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 040CC 8090100C 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090109C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090109C.s index d35855616d..79704f714d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090109C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090109C.s @@ -34,16 +34,16 @@ glabel func_8090109C /* 041DC 8090111C 27B40098 */ addiu $s4, $sp, 0x0098 ## $s4 = FFFFFFF0 /* 041E0 80901120 27B5008C */ addiu $s5, $sp, 0x008C ## $s5 = FFFFFFE4 .L80901124: -/* 041E4 80901124 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 041E4 80901124 0C00CFC8 */ jal Rand_CenteredFloat /* 041E8 80901128 4600A306 */ mov.s $f12, $f20 /* 041EC 8090112C E7A00098 */ swc1 $f0, 0x0098($sp) -/* 041F0 80901130 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 041F0 80901130 0C00CFC8 */ jal Rand_CenteredFloat /* 041F4 80901134 4600C306 */ mov.s $f12, $f24 /* 041F8 80901138 461A0100 */ add.s $f4, $f0, $f26 /* 041FC 8090113C 4600A306 */ mov.s $f12, $f20 -/* 04200 80901140 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 04200 80901140 0C00CFC8 */ jal Rand_CenteredFloat /* 04204 80901144 E7A4009C */ swc1 $f4, 0x009C($sp) /* 04208 80901148 E7A000A0 */ swc1 $f0, 0x00A0($sp) @@ -56,7 +56,7 @@ glabel func_8090109C /* 04224 80901164 C62801BC */ lwc1 $f8, 0x01BC($s1) ## 000001BC /* 04228 80901168 E7A80084 */ swc1 $f8, 0x0084($sp) /* 0422C 8090116C C62A01C0 */ lwc1 $f10, 0x01C0($s1) ## 000001C0 -/* 04230 80901170 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 04230 80901170 0C00CFBE */ jal Rand_ZeroFloat /* 04234 80901174 E7AA0088 */ swc1 $f10, 0x0088($sp) /* 04238 80901178 4600040D */ trunc.w.s $f16, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s index 147f0a4bbb..50e8fa3af4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s @@ -135,7 +135,7 @@ glabel L80901344 /* 04428 80901368 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 0442C 8090136C 44050000 */ mfc1 $a1, $f0 /* 04430 80901370 44060000 */ mfc1 $a2, $f0 -/* 04434 80901374 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04434 80901374 0C01E107 */ jal Math_ApproachF /* 04438 80901378 00812021 */ addu $a0, $a0, $at /* 0443C 8090137C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -153,7 +153,7 @@ glabel L80901344 /* 04468 809013A8 44050000 */ mfc1 $a1, $f0 /* 0446C 809013AC 3C063DA3 */ lui $a2, 0x3DA3 ## $a2 = 3DA30000 /* 04470 809013B0 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3DA3D70A -/* 04474 809013B4 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 04474 809013B4 0C01E123 */ jal Math_ApproachZeroF /* 04478 809013B8 00812021 */ addu $a0, $a0, $at /* 0447C 809013BC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -175,7 +175,7 @@ glabel L80901344 /* 044B4 809013F4 44060000 */ mfc1 $a2, $f0 /* 044B8 809013F8 3C073C4C */ lui $a3, 0x3C4C ## $a3 = 3C4C0000 /* 044BC 809013FC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3C4CCCCD -/* 044C0 80901400 0C01E107 */ jal Math_SmoothScaleMaxF +/* 044C0 80901400 0C01E107 */ jal Math_ApproachF /* 044C4 80901404 3C053E80 */ lui $a1, 0x3E80 ## $a1 = 3E800000 /* 044C8 80901408 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -202,7 +202,7 @@ glabel L80901344 /* 0450C 8090144C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 04510 80901450 2604030C */ addiu $a0, $s0, 0x030C ## $a0 = 0000030C /* 04514 80901454 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 04518 80901458 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04518 80901458 0C01E107 */ jal Math_ApproachF /* 0451C 8090145C 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 04520 80901460 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -281,7 +281,7 @@ glabel L80901560 /* 04638 80901578 44060000 */ mfc1 $a2, $f0 /* 0463C 8090157C 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 04640 80901580 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 04644 80901584 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04644 80901584 0C01E107 */ jal Math_ApproachF /* 04648 80901588 00812021 */ addu $a0, $a0, $at /* 0464C 8090158C 0C01E221 */ jal func_80078884 @@ -300,7 +300,7 @@ glabel L80901560 /* 04680 809015C0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 04684 809015C4 260403B0 */ addiu $a0, $s0, 0x03B0 ## $a0 = 000003B0 /* 04688 809015C8 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 0468C 809015CC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0468C 809015CC 0C01E107 */ jal Math_ApproachF /* 04690 809015D0 8F050024 */ lw $a1, 0x0024($t8) ## 80910024 /* 04694 809015D4 3C198091 */ lui $t9, %hi(D_8090EB2C) ## $t9 = 80910000 @@ -314,7 +314,7 @@ glabel L80901560 /* 046B4 809015F4 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 /* 046B8 809015F8 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 046BC 809015FC 44059000 */ mfc1 $a1, $f18 -/* 046C0 80901600 0C01E107 */ jal Math_SmoothScaleMaxF +/* 046C0 80901600 0C01E107 */ jal Math_ApproachF /* 046C4 80901604 00000000 */ nop /* 046C8 80901608 3C088091 */ lui $t0, %hi(D_8090EB2C) ## $t0 = 80910000 @@ -323,7 +323,7 @@ glabel L80901560 /* 046D4 80901614 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 046D8 80901618 260403B8 */ addiu $a0, $s0, 0x03B8 ## $a0 = 000003B8 /* 046DC 8090161C 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 046E0 80901620 0C01E107 */ jal Math_SmoothScaleMaxF +/* 046E0 80901620 0C01E107 */ jal Math_ApproachF /* 046E4 80901624 8D05002C */ lw $a1, 0x002C($t0) ## 8091002C /* 046E8 80901628 8E090398 */ lw $t1, 0x0398($s0) ## 00000398 @@ -390,7 +390,7 @@ glabel L80901700 /* 047D0 80901710 5420001A */ bnel $at, $zero, .L8090177C /* 047D4 80901714 A20B0339 */ sb $t3, 0x0339($s0) ## 00000339 /* 047D8 80901718 44050000 */ mfc1 $a1, $f0 -/* 047DC 8090171C 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 047DC 8090171C 0C01E123 */ jal Math_ApproachZeroF /* 047E0 80901720 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 047E4 80901724 8E190398 */ lw $t9, 0x0398($s0) ## 00000398 @@ -409,7 +409,7 @@ glabel L80901700 /* 04814 80901754 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 04818 80901758 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 0481C 8090175C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 04820 80901760 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 04820 80901760 0C01E123 */ jal Math_ApproachZeroF /* 04824 80901764 00812021 */ addu $a0, $a0, $at /* 04828 80901768 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -454,14 +454,14 @@ glabel L809017B4 .L809017F8: /* 048B8 809017F8 2604038C */ addiu $a0, $s0, 0x038C ## $a0 = 0000038C /* 048BC 809017FC 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 -/* 048C0 80901800 0C01E107 */ jal Math_SmoothScaleMaxF +/* 048C0 80901800 0C01E107 */ jal Math_ApproachF /* 048C4 80901804 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 /* 048C8 80901808 10000005 */ beq $zero, $zero, .L80901820 /* 048CC 8090180C 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L80901810: /* 048D0 80901810 44050000 */ mfc1 $a1, $f0 -/* 048D4 80901814 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 048D4 80901814 0C01E123 */ jal Math_ApproachZeroF /* 048D8 80901818 3C064100 */ lui $a2, 0x4100 ## $a2 = 41000000 /* 048DC 8090181C 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 @@ -561,7 +561,7 @@ glabel L80901968 /* 04A44 80901984 46062381 */ sub.s $f14, $f4, $f6 /* 04A48 80901988 460A4301 */ sub.s $f12, $f8, $f10 /* 04A4C 8090198C E7AE0048 */ swc1 $f14, 0x0048($sp) -/* 04A50 80901990 0C034199 */ jal atan2s +/* 04A50 80901990 0C034199 */ jal Math_Atan2S /* 04A54 80901994 E7AC0044 */ swc1 $f12, 0x0044($sp) /* 04A58 80901998 8FA6004C */ lw $a2, 0x004C($sp) @@ -645,7 +645,7 @@ glabel L80901AB0 /* 04B84 80901AC4 44050000 */ mfc1 $a1, $f0 /* 04B88 80901AC8 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 04B8C 80901ACC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 04B90 80901AD0 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 04B90 80901AD0 0C01E123 */ jal Math_ApproachZeroF /* 04B94 80901AD4 00812021 */ addu $a0, $a0, $at /* 04B98 80901AD8 3C01437A */ lui $at, 0x437A ## $at = 437A0000 @@ -889,7 +889,7 @@ glabel L80901E00 /* 04F0C 80901E4C 44050000 */ mfc1 $a1, $f0 /* 04F10 80901E50 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 04F14 80901E54 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 04F18 80901E58 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 04F18 80901E58 0C01E123 */ jal Math_ApproachZeroF /* 04F1C 80901E5C 00812021 */ addu $a0, $a0, $at /* 04F20 80901E60 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 @@ -1015,7 +1015,7 @@ glabel L80902014 /* 050E0 80902020 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 050E4 80902024 260403A4 */ addiu $a0, $s0, 0x03A4 ## $a0 = 000003A4 /* 050E8 80902028 3C054391 */ lui $a1, 0x4391 ## $a1 = 43910000 -/* 050EC 8090202C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 050EC 8090202C 0C01E107 */ jal Math_ApproachF /* 050F0 80902030 8E070410 */ lw $a3, 0x0410($s0) ## 00000410 /* 050F4 80902034 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 @@ -1028,7 +1028,7 @@ glabel L80902014 /* 05110 80902050 34A54000 */ ori $a1, $a1, 0x4000 ## $a1 = 448D4000 /* 05114 80902054 260403A8 */ addiu $a0, $s0, 0x03A8 ## $a0 = 000003A8 /* 05118 80902058 44073000 */ mfc1 $a3, $f6 -/* 0511C 8090205C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0511C 8090205C 0C01E107 */ jal Math_ApproachF /* 05120 80902060 00000000 */ nop /* 05124 80902064 3C013FA0 */ lui $at, 0x3FA0 ## $at = 3FA00000 @@ -1040,7 +1040,7 @@ glabel L80902014 /* 0513C 8090207C 260403AC */ addiu $a0, $s0, 0x03AC ## $a0 = 000003AC /* 05140 80902080 3C05C382 */ lui $a1, 0xC382 ## $a1 = C3820000 /* 05144 80902084 44075000 */ mfc1 $a3, $f10 -/* 05148 80902088 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05148 80902088 0C01E107 */ jal Math_ApproachF /* 0514C 8090208C 00000000 */ nop /* 05150 80902090 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 @@ -1058,7 +1058,7 @@ glabel L80902014 /* 05180 809020C0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 05184 809020C4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05188 809020C8 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A -/* 0518C 809020CC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0518C 809020CC 0C01E107 */ jal Math_ApproachF /* 05190 809020D0 00812021 */ addu $a0, $a0, $at /* 05194 809020D4 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 @@ -1066,7 +1066,7 @@ glabel L80902014 /* 0519C 809020DC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD /* 051A0 809020E0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 051A4 809020E4 26040384 */ addiu $a0, $s0, 0x0384 ## $a0 = 00000384 -/* 051A8 809020E8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 051A8 809020E8 0C01E107 */ jal Math_ApproachF /* 051AC 809020EC 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 051B0 809020F0 3C048091 */ lui $a0, %hi(D_8090EB2C) ## $a0 = 80910000 @@ -1077,7 +1077,7 @@ glabel L80902014 /* 051C0 80902100 10000004 */ beq $zero, $zero, .L80902114 /* 051C4 80902104 8E0A0398 */ lw $t2, 0x0398($s0) ## 00000398 .L80902108: -/* 051C8 80902108 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 051C8 80902108 0C01E123 */ jal Math_ApproachZeroF /* 051CC 8090210C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 0000CCCD /* 051D0 80902110 8E0A0398 */ lw $t2, 0x0398($s0) ## 00000398 @@ -1103,7 +1103,7 @@ glabel L80902014 /* 0521C 8090215C 8E070410 */ lw $a3, 0x0410($s0) ## 00000410 /* 05220 80902160 46048281 */ sub.s $f10, $f16, $f4 /* 05224 80902164 44055000 */ mfc1 $a1, $f10 -/* 05228 80902168 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05228 80902168 0C01E107 */ jal Math_ApproachF /* 0522C 8090216C 00000000 */ nop /* 05230 80902170 10000015 */ beq $zero, $zero, .L809021C8 @@ -1126,7 +1126,7 @@ glabel L80902014 /* 05270 809021B0 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 /* 05274 809021B4 44058000 */ mfc1 $a1, $f16 /* 05278 809021B8 44074000 */ mfc1 $a3, $f8 -/* 0527C 809021BC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0527C 809021BC 0C01E107 */ jal Math_ApproachF /* 05280 809021C0 00000000 */ nop /* 05284 809021C4 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 @@ -1134,7 +1134,7 @@ glabel L80902014 /* 05288 809021C8 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A /* 0528C 809021CC 26040410 */ addiu $a0, $s0, 0x0410 ## $a0 = 00000410 /* 05290 809021D0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 05294 809021D4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05294 809021D4 0C01E107 */ jal Math_ApproachF /* 05298 809021D8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0529C 809021DC 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80902348.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80902348.s index 5d916223a7..5d0f68a2f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80902348.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80902348.s @@ -91,7 +91,7 @@ glabel func_80902348 /* 05554 80902494 E7AC0034 */ swc1 $f12, 0x0034($sp) .L80902498: /* 05558 80902498 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 0555C 8090249C 0C01DF64 */ jal Math_Rand_S16Offset +/* 0555C 8090249C 0C01DF64 */ jal Rand_S16Offset /* 05560 809024A0 240500C8 */ addiu $a1, $zero, 0x00C8 ## $a1 = 000000C8 /* 05564 809024A4 0230C821 */ addu $t9, $s1, $s0 @@ -104,7 +104,7 @@ glabel func_80902348 /* 05580 809024C0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 05584 809024C4 A2280A60 */ sb $t0, 0x0A60($s1) ## 00000A60 /* 05588 809024C8 C7AE0038 */ lwc1 $f14, 0x0038($sp) -/* 0558C 809024CC 0C034199 */ jal atan2s +/* 0558C 809024CC 0C034199 */ jal Math_Atan2S /* 05590 809024D0 C7AC0034 */ lwc1 $f12, 0x0034($sp) /* 05594 809024D4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809034E4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809034E4.s index 9782f46939..836da1835f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809034E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809034E4.s @@ -100,7 +100,7 @@ glabel func_809034E4 /* 0670C 8090364C 4600A386 */ mov.s $f14, $f20 /* 06710 80903650 46062581 */ sub.s $f22, $f4, $f6 /* 06714 80903654 460A4601 */ sub.s $f24, $f8, $f10 -/* 06718 80903658 0C034199 */ jal atan2s +/* 06718 80903658 0C034199 */ jal Math_Atan2S /* 0671C 8090365C 4600B306 */ mov.s $f12, $f22 /* 06720 80903660 4614A682 */ mul.s $f26, $f20, $f20 @@ -108,7 +108,7 @@ glabel func_809034E4 /* 06728 80903668 4600C386 */ mov.s $f14, $f24 /* 0672C 8090366C 4616B702 */ mul.s $f28, $f22, $f22 /* 06730 80903670 461CD000 */ add.s $f0, $f26, $f28 -/* 06734 80903674 0C034199 */ jal atan2s +/* 06734 80903674 0C034199 */ jal Math_Atan2S /* 06738 80903678 46000304 */ sqrt.s $f12, $f0 /* 0673C 8090367C C60C0018 */ lwc1 $f12, 0x0018($s0) ## 809105F0 @@ -185,7 +185,7 @@ glabel func_809034E4 /* 06854 80903794 46045601 */ sub.s $f24, $f10, $f4 .L80903798: /* 06858 80903798 4600B306 */ mov.s $f12, $f22 -/* 0685C 8090379C 0C034199 */ jal atan2s +/* 0685C 8090379C 0C034199 */ jal Math_Atan2S /* 06860 809037A0 4600A386 */ mov.s $f14, $f20 /* 06864 809037A4 4614A282 */ mul.s $f10, $f20, $f20 @@ -194,24 +194,24 @@ glabel func_809034E4 /* 06870 809037B0 4616B102 */ mul.s $f4, $f22, $f22 /* 06874 809037B4 4600C386 */ mov.s $f14, $f24 /* 06878 809037B8 46045000 */ add.s $f0, $f10, $f4 -/* 0687C 809037BC 0C034199 */ jal atan2s +/* 0687C 809037BC 0C034199 */ jal Math_Atan2S /* 06880 809037C0 46000304 */ sqrt.s $f12, $f0 /* 06884 809037C4 00022C00 */ sll $a1, $v0, 16 /* 06888 809037C8 00052C03 */ sra $a1, $a1, 16 /* 0688C 809037CC 27A402C8 */ addiu $a0, $sp, 0x02C8 ## $a0 = FFFFFFE8 /* 06890 809037D0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 06894 809037D4 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 06894 809037D4 0C01E1EF */ jal Math_ApproachS /* 06898 809037D8 24071000 */ addiu $a3, $zero, 0x1000 ## $a3 = 00001000 /* 0689C 809037DC 00112C00 */ sll $a1, $s1, 16 /* 068A0 809037E0 00052C03 */ sra $a1, $a1, 16 /* 068A4 809037E4 27A402CA */ addiu $a0, $sp, 0x02CA ## $a0 = FFFFFFEA /* 068A8 809037E8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 068AC 809037EC 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 068AC 809037EC 0C01E1EF */ jal Math_ApproachS /* 068B0 809037F0 24071000 */ addiu $a3, $zero, 0x1000 ## $a3 = 00001000 -/* 068B4 809037F4 0C01DE0D */ jal Math_Coss +/* 068B4 809037F4 0C01DE0D */ jal Math_CosS ## coss? /* 068B8 809037F8 87A402C8 */ lh $a0, 0x02C8($sp) /* 068BC 809037FC 00147880 */ sll $t7, $s4, 2 @@ -226,21 +226,21 @@ glabel func_809034E4 /* 068E0 80903820 AF090004 */ sw $t1, 0x0004($t8) ## 00000004 /* 068E4 80903824 8F2A0008 */ lw $t2, 0x0008($t9) ## FFFFFFF8 /* 068E8 80903828 AF0A0008 */ sw $t2, 0x0008($t8) ## 00000008 -/* 068EC 8090382C 0C01DE1C */ jal Math_Sins +/* 068EC 8090382C 0C01DE1C */ jal Math_SinS ## sins? /* 068F0 80903830 87A402CA */ lh $a0, 0x02CA($sp) /* 068F4 80903834 4600D182 */ mul.s $f6, $f26, $f0 /* 068F8 80903838 C7A802D0 */ lwc1 $f8, 0x02D0($sp) /* 068FC 8090383C 87A402C8 */ lh $a0, 0x02C8($sp) /* 06900 80903840 46064280 */ add.s $f10, $f8, $f6 -/* 06904 80903844 0C01DE1C */ jal Math_Sins +/* 06904 80903844 0C01DE1C */ jal Math_SinS ## sins? /* 06908 80903848 E7AA02D0 */ swc1 $f10, 0x02D0($sp) /* 0690C 8090384C 4600E202 */ mul.s $f8, $f28, $f0 /* 06910 80903850 C7A402D4 */ lwc1 $f4, 0x02D4($sp) /* 06914 80903854 87A402CA */ lh $a0, 0x02CA($sp) /* 06918 80903858 46082180 */ add.s $f6, $f4, $f8 -/* 0691C 8090385C 0C01DE0D */ jal Math_Coss +/* 0691C 8090385C 0C01DE0D */ jal Math_CosS ## coss? /* 06920 80903860 E7A602D4 */ swc1 $f6, 0x02D4($sp) /* 06924 80903864 4600D102 */ mul.s $f4, $f26, $f0 @@ -371,7 +371,7 @@ glabel func_809034E4 /* 06B00 80903A40 46085601 */ sub.s $f24, $f10, $f8 /* 06B04 80903A44 4600A386 */ mov.s $f14, $f20 /* 06B08 80903A48 46062581 */ sub.s $f22, $f4, $f6 -/* 06B0C 80903A4C 0C034199 */ jal atan2s +/* 06B0C 80903A4C 0C034199 */ jal Math_Atan2S /* 06B10 80903A50 4600B306 */ mov.s $f12, $f22 /* 06B14 80903A54 4614A682 */ mul.s $f26, $f20, $f20 @@ -379,7 +379,7 @@ glabel func_809034E4 /* 06B1C 80903A5C 4600C386 */ mov.s $f14, $f24 /* 06B20 80903A60 4616B702 */ mul.s $f28, $f22, $f22 /* 06B24 80903A64 461CD000 */ add.s $f0, $f26, $f28 -/* 06B28 80903A68 0C034199 */ jal atan2s +/* 06B28 80903A68 0C034199 */ jal Math_Atan2S /* 06B2C 80903A6C 46000304 */ sqrt.s $f12, $f0 /* 06B30 80903A70 C614001C */ lwc1 $f20, 0x001C($s0) ## 80910624 @@ -456,7 +456,7 @@ glabel func_809034E4 /* 06C48 80903B88 460A2601 */ sub.s $f24, $f4, $f10 .L80903B8C: /* 06C4C 80903B8C 4600B306 */ mov.s $f12, $f22 -/* 06C50 80903B90 0C034199 */ jal atan2s +/* 06C50 80903B90 0C034199 */ jal Math_Atan2S /* 06C54 80903B94 4600A386 */ mov.s $f14, $f20 /* 06C58 80903B98 4614A102 */ mul.s $f4, $f20, $f20 @@ -465,24 +465,24 @@ glabel func_809034E4 /* 06C64 80903BA4 4616B282 */ mul.s $f10, $f22, $f22 /* 06C68 80903BA8 4600C386 */ mov.s $f14, $f24 /* 06C6C 80903BAC 460A2000 */ add.s $f0, $f4, $f10 -/* 06C70 80903BB0 0C034199 */ jal atan2s +/* 06C70 80903BB0 0C034199 */ jal Math_Atan2S /* 06C74 80903BB4 46000304 */ sqrt.s $f12, $f0 /* 06C78 80903BB8 00022C00 */ sll $a1, $v0, 16 /* 06C7C 80903BBC 00052C03 */ sra $a1, $a1, 16 /* 06C80 80903BC0 27A402C8 */ addiu $a0, $sp, 0x02C8 ## $a0 = FFFFFFE8 /* 06C84 80903BC4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 06C88 80903BC8 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 06C88 80903BC8 0C01E1EF */ jal Math_ApproachS /* 06C8C 80903BCC 24071000 */ addiu $a3, $zero, 0x1000 ## $a3 = 00001000 /* 06C90 80903BD0 00112C00 */ sll $a1, $s1, 16 /* 06C94 80903BD4 00052C03 */ sra $a1, $a1, 16 /* 06C98 80903BD8 27A402CA */ addiu $a0, $sp, 0x02CA ## $a0 = FFFFFFEA /* 06C9C 80903BDC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 06CA0 80903BE0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 06CA0 80903BE0 0C01E1EF */ jal Math_ApproachS /* 06CA4 80903BE4 24071000 */ addiu $a3, $zero, 0x1000 ## $a3 = 00001000 -/* 06CA8 80903BE8 0C01DE0D */ jal Math_Coss +/* 06CA8 80903BE8 0C01DE0D */ jal Math_CosS ## coss? /* 06CAC 80903BEC 87A402C8 */ lh $a0, 0x02C8($sp) /* 06CB0 80903BF0 00144880 */ sll $t1, $s4, 2 @@ -497,21 +497,21 @@ glabel func_809034E4 /* 06CD4 80903C14 AD4C0004 */ sw $t4, 0x0004($t2) ## 00000004 /* 06CD8 80903C18 8D6D0008 */ lw $t5, 0x0008($t3) ## FFFFFFF8 /* 06CDC 80903C1C AD4D0008 */ sw $t5, 0x0008($t2) ## 00000008 -/* 06CE0 80903C20 0C01DE1C */ jal Math_Sins +/* 06CE0 80903C20 0C01DE1C */ jal Math_SinS ## sins? /* 06CE4 80903C24 87A402CA */ lh $a0, 0x02CA($sp) /* 06CE8 80903C28 4600D202 */ mul.s $f8, $f26, $f0 /* 06CEC 80903C2C C7A602D0 */ lwc1 $f6, 0x02D0($sp) /* 06CF0 80903C30 87A402C8 */ lh $a0, 0x02C8($sp) /* 06CF4 80903C34 46083100 */ add.s $f4, $f6, $f8 -/* 06CF8 80903C38 0C01DE1C */ jal Math_Sins +/* 06CF8 80903C38 0C01DE1C */ jal Math_SinS ## sins? /* 06CFC 80903C3C E7A402D0 */ swc1 $f4, 0x02D0($sp) /* 06D00 80903C40 4600E182 */ mul.s $f6, $f28, $f0 /* 06D04 80903C44 C7AA02D4 */ lwc1 $f10, 0x02D4($sp) /* 06D08 80903C48 87A402CA */ lh $a0, 0x02CA($sp) /* 06D0C 80903C4C 46065200 */ add.s $f8, $f10, $f6 -/* 06D10 80903C50 0C01DE0D */ jal Math_Coss +/* 06D10 80903C50 0C01DE0D */ jal Math_CosS ## coss? /* 06D14 80903C54 E7A802D4 */ swc1 $f8, 0x02D4($sp) /* 06D18 80903C58 4600D282 */ mul.s $f10, $f26, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904340.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904340.s index f7fd04948b..5430de1679 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904340.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904340.s @@ -81,7 +81,7 @@ glabel func_80904340 .L809043F8: /* 074B8 809043F8 3C073D85 */ lui $a3, 0x3D85 ## $a3 = 3D850000 .L809043FC: -/* 074BC 809043FC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 074BC 809043FC 0C01E107 */ jal Math_ApproachF /* 074C0 80904400 34E71EB8 */ ori $a3, $a3, 0x1EB8 ## $a3 = 3D851EB8 /* 074C4 80904404 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904D88.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904D88.s index ae4fdd38f6..9ba4d53dd9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904D88.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904D88.s @@ -118,7 +118,7 @@ glabel func_80904D88 /* 07FC4 80904F04 44066000 */ mfc1 $a2, $f12 /* 07FC8 80904F08 0C0342A3 */ jal Matrix_Scale /* 07FCC 80904F0C 46006386 */ mov.s $f14, $f12 -/* 07FD0 80904F10 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 07FD0 80904F10 0C00CFC8 */ jal Rand_CenteredFloat /* 07FD4 80904F14 4600A306 */ mov.s $f12, $f20 /* 07FD8 80904F18 46000306 */ mov.s $f12, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090523C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090523C.s index b745b4b9bd..9d4f827158 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090523C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090523C.s @@ -145,7 +145,7 @@ glabel func_8090523C /* 084DC 8090541C 0C0342A3 */ jal Matrix_Scale /* 084E0 80905420 46006386 */ mov.s $f14, $f12 /* 084E4 80905424 3C018091 */ lui $at, %hi(D_8090DD4C) ## $at = 80910000 -/* 084E8 80905428 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 084E8 80905428 0C00CFBE */ jal Rand_ZeroFloat /* 084EC 8090542C C42CDD4C */ lwc1 $f12, %lo(D_8090DD4C)($at) /* 084F0 80905430 46000306 */ mov.s $f12, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Update.s index 6a1ab9a153..72bc2fe1d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Update.s @@ -190,14 +190,14 @@ glabel BossGanondrof_Update /* 03A7C 809140BC 00042403 */ sra $a0, $a0, 16 /* 03A80 809140C0 AE2D003C */ sw $t5, 0x003C($s1) ## 0000003C /* 03A84 809140C4 8D8E0008 */ lw $t6, 0x0008($t4) ## 00000008 -/* 03A88 809140C8 0C01DE1C */ jal Math_Sins +/* 03A88 809140C8 0C01DE1C */ jal Math_SinS ## sins? /* 03A8C 809140CC AE2E0040 */ sw $t6, 0x0040($s1) ## 00000040 /* 03A90 809140D0 862400B6 */ lh $a0, 0x00B6($s1) ## 000000B6 /* 03A94 809140D4 E7A00070 */ swc1 $f0, 0x0070($sp) /* 03A98 809140D8 00042023 */ subu $a0, $zero, $a0 /* 03A9C 809140DC 00042400 */ sll $a0, $a0, 16 -/* 03AA0 809140E0 0C01DE0D */ jal Math_Coss +/* 03AA0 809140E0 0C01DE0D */ jal Math_CosS ## coss? /* 03AA4 809140E4 00042403 */ sra $a0, $a0, 16 /* 03AA8 809140E8 C7B00070 */ lwc1 $f16, 0x0070($sp) @@ -220,13 +220,13 @@ glabel BossGanondrof_Update /* 03AEC 8091412C 44057000 */ mfc1 $a1, $f14 /* 03AF0 80914130 46062200 */ add.s $f8, $f4, $f6 /* 03AF4 80914134 46124282 */ mul.s $f10, $f8, $f18 -/* 03AF8 80914138 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03AF8 80914138 0C01E107 */ jal Math_ApproachF /* 03AFC 8091413C E7AA0068 */ swc1 $f10, 0x0068($sp) /* 03B00 80914140 262403CC */ addiu $a0, $s1, 0x03CC ## $a0 = 000003CC /* 03B04 80914144 8FA50068 */ lw $a1, 0x0068($sp) /* 03B08 80914148 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03B0C 8091414C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03B0C 8091414C 0C01E107 */ jal Math_ApproachF /* 03B10 80914150 3C074416 */ lui $a3, 0x4416 ## $a3 = 44160000 /* 03B14 80914154 922F01C9 */ lbu $t7, 0x01C9($s1) ## 000001C9 @@ -249,7 +249,7 @@ glabel BossGanondrof_Update /* 03B58 80914198 00812023 */ subu $a0, $a0, $at /* 03B5C 8091419C 00042080 */ sll $a0, $a0, 2 /* 03B60 809141A0 00042400 */ sll $a0, $a0, 16 -/* 03B64 809141A4 0C01DE1C */ jal Math_Sins +/* 03B64 809141A4 0C01DE1C */ jal Math_SinS ## sins? /* 03B68 809141A8 00042403 */ sra $a0, $a0, 16 /* 03B6C 809141AC 3C01C3FA */ lui $at, 0xC3FA ## $at = C3FA0000 @@ -266,7 +266,7 @@ glabel BossGanondrof_Update /* 03B90 809141D0 44051000 */ mfc1 $a1, $f2 /* 03B94 809141D4 262403D0 */ addiu $a0, $s1, 0x03D0 ## $a0 = 000003D0 /* 03B98 809141D8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03B9C 809141DC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03B9C 809141DC 0C01E107 */ jal Math_ApproachF /* 03BA0 809141E0 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 03BA4 809141E4 922201C8 */ lbu $v0, 0x01C8($s1) ## 000001C8 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s index 1193ff2a1e..a0507a3472 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s @@ -64,20 +64,20 @@ glabel func_80910DCC /* 00854 80910E94 8D4B0004 */ lw $t3, 0x0004($t2) ## 809150B0 /* 00858 80910E98 AE4B0004 */ sw $t3, 0x0004($s2) ## FFFFFFD4 /* 0085C 80910E9C 8D4C0008 */ lw $t4, 0x0008($t2) ## 809150B4 -/* 00860 80910EA0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00860 80910EA0 0C00CFC8 */ jal Rand_CenteredFloat /* 00864 80910EA4 AE4C0008 */ sw $t4, 0x0008($s2) ## FFFFFFD8 /* 00868 80910EA8 C66402C0 */ lwc1 $f4, 0x02C0($s3) ## 000002C0 /* 0086C 80910EAC 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 00870 80910EB0 44816000 */ mtc1 $at, $f12 ## $f12 = -5.00 /* 00874 80910EB4 46040180 */ add.s $f6, $f0, $f4 -/* 00878 80910EB8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00878 80910EB8 0C00CFBE */ jal Rand_ZeroFloat /* 0087C 80910EBC E7A60088 */ swc1 $f6, 0x0088($sp) /* 00880 80910EC0 C66802C4 */ lwc1 $f8, 0x02C4($s3) ## 000002C4 /* 00884 80910EC4 4600A306 */ mov.s $f12, $f20 /* 00888 80910EC8 46080280 */ add.s $f10, $f0, $f8 -/* 0088C 80910ECC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0088C 80910ECC 0C00CFC8 */ jal Rand_CenteredFloat /* 00890 80910ED0 E7AA008C */ swc1 $f10, 0x008C($sp) /* 00894 80910ED4 C67002C8 */ lwc1 $f16, 0x02C8($s3) ## 000002C8 @@ -89,7 +89,7 @@ glabel func_80910DCC /* 008AC 80910EEC 4600A306 */ mov.s $f12, $f20 /* 008B0 80910EF0 46049180 */ add.s $f6, $f18, $f4 /* 008B4 80910EF4 E7A80074 */ swc1 $f8, 0x0074($sp) -/* 008B8 80910EF8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 008B8 80910EF8 0C00CFBE */ jal Rand_ZeroFloat /* 008BC 80910EFC E7A60090 */ swc1 $f6, 0x0090($sp) /* 008C0 80910F00 4600028D */ trunc.w.s $f10, $f0 @@ -254,7 +254,7 @@ glabel func_80910DCC /* 00B00 80911140 00812021 */ addu $a0, $a0, $at /* 00B04 80911144 000420C0 */ sll $a0, $a0, 3 /* 00B08 80911148 00042400 */ sll $a0, $a0, 16 -/* 00B0C 8091114C 0C01DE1C */ jal Math_Sins +/* 00B0C 8091114C 0C01DE1C */ jal Math_SinS ## sins? /* 00B10 80911150 00042403 */ sra $a0, $a0, 16 /* 00B14 80911154 86640194 */ lh $a0, 0x0194($s3) ## 00000194 @@ -270,7 +270,7 @@ glabel func_80910DCC /* 00B3C 8091117C 00042080 */ sll $a0, $a0, 2 /* 00B40 80911180 00042400 */ sll $a0, $a0, 16 /* 00B44 80911184 E66403D4 */ swc1 $f4, 0x03D4($s3) ## 000003D4 -/* 00B48 80911188 0C01DE0D */ jal Math_Coss +/* 00B48 80911188 0C01DE0D */ jal Math_CosS ## coss? /* 00B4C 8091118C 00042403 */ sra $a0, $a0, 16 /* 00B50 80911190 3C014396 */ lui $at, 0x4396 ## $at = 43960000 @@ -291,7 +291,7 @@ glabel func_80910DCC /* 00B88 809111C8 01090019 */ multu $t0, $t1 /* 00B8C 809111CC 00002012 */ mflo $a0 /* 00B90 809111D0 00042400 */ sll $a0, $a0, 16 -/* 00B94 809111D4 0C01DE1C */ jal Math_Sins +/* 00B94 809111D4 0C01DE1C */ jal Math_SinS ## sins? /* 00B98 809111D8 00042403 */ sra $a0, $a0, 16 /* 00B9C 809111DC 46140282 */ mul.s $f10, $f0, $f20 @@ -303,7 +303,7 @@ glabel func_80910DCC /* 00BB4 809111F4 016C0019 */ multu $t3, $t4 /* 00BB8 809111F8 00002012 */ mflo $a0 /* 00BBC 809111FC 00042400 */ sll $a0, $a0, 16 -/* 00BC0 80911200 0C01DE0D */ jal Math_Coss +/* 00BC0 80911200 0C01DE0D */ jal Math_CosS ## coss? /* 00BC4 80911204 00042403 */ sra $a0, $a0, 16 /* 00BC8 80911208 46140402 */ mul.s $f16, $f0, $f20 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809114E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809114E8.s index 3a9901d1ef..3f3f7c18b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809114E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809114E8.s @@ -17,7 +17,7 @@ glabel func_809114E8 /* 00EE4 80911524 ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 /* 00EE8 80911528 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 /* 00EEC 8091152C ACF80004 */ sw $t8, 0x0004($a3) ## 00000004 -/* 00EF0 80911530 0C03F66B */ jal Math_Rand_ZeroOne +/* 00EF0 80911530 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00EF4 80911534 E4E401CC */ swc1 $f4, 0x01CC($a3) ## 000001CC /* 00EF8 80911538 3C014280 */ lui $at, 0x4280 ## $at = 42800000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091156C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091156C.s index 2f7b3894eb..7bbbcda839 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091156C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091156C.s @@ -54,7 +54,7 @@ glabel func_8091156C /* 00F98 809115D8 863801BC */ lh $t8, 0x01BC($s1) ## 000001BC /* 00F9C 809115DC 5700004D */ bnel $t8, $zero, .L80911714 /* 00FA0 809115E0 862A01BE */ lh $t2, 0x01BE($s1) ## 000001BE -/* 00FA4 809115E4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00FA4 809115E4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00FA8 809115E8 00000000 */ nop /* 00FAC 809115EC 3C014280 */ lui $at, 0x4280 ## $at = 42800000 @@ -65,7 +65,7 @@ glabel func_8091156C /* 00FC0 80911600 440A4000 */ mfc1 $t2, $f8 /* 00FC4 80911604 00000000 */ nop /* 00FC8 80911608 254B001E */ addiu $t3, $t2, 0x001E ## $t3 = 0000001E -/* 00FCC 8091160C 0C03F66B */ jal Math_Rand_ZeroOne +/* 00FCC 8091160C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00FD0 80911610 A62B01BC */ sh $t3, 0x01BC($s1) ## 000001BC /* 00FD4 80911614 922C00AF */ lbu $t4, 0x00AF($s1) ## 000000AF @@ -152,7 +152,7 @@ glabel func_8091156C /* 010F4 80911734 10000027 */ beq $zero, $zero, .L809117D4 /* 010F8 80911738 E7B0007C */ swc1 $f16, 0x007C($sp) .L8091173C: -/* 010FC 8091173C 0C01DE1C */ jal Math_Sins +/* 010FC 8091173C 0C01DE1C */ jal Math_SinS ## sins? /* 01100 80911740 856400B6 */ lh $a0, 0x00B6($t3) ## 000000B6 /* 01104 80911744 3C014334 */ lui $at, 0x4334 ## $at = 43340000 @@ -162,7 +162,7 @@ glabel func_8091156C /* 01114 80911754 C5840024 */ lwc1 $f4, 0x0024($t4) ## 00000024 /* 01118 80911758 46049180 */ add.s $f6, $f18, $f4 /* 0111C 8091175C E7A60084 */ swc1 $f6, 0x0084($sp) -/* 01120 80911760 0C01DE0D */ jal Math_Coss +/* 01120 80911760 0C01DE0D */ jal Math_CosS ## coss? /* 01124 80911764 858400B6 */ lh $a0, 0x00B6($t4) ## 000000B6 /* 01128 80911768 46140202 */ mul.s $f8, $f0, $f20 @@ -205,7 +205,7 @@ glabel func_8091156C /* 011B8 809117F8 00812021 */ addu $a0, $a0, $at /* 011BC 809117FC 00042200 */ sll $a0, $a0, 8 /* 011C0 80911800 00042400 */ sll $a0, $a0, 16 -/* 011C4 80911804 0C01DE1C */ jal Math_Sins +/* 011C4 80911804 0C01DE1C */ jal Math_SinS ## sins? /* 011C8 80911808 00042403 */ sra $a0, $a0, 16 /* 011CC 8091180C 46140282 */ mul.s $f10, $f0, $f20 @@ -218,7 +218,7 @@ glabel func_8091156C /* 011E8 80911828 00812023 */ subu $a0, $a0, $at /* 011EC 8091182C 00042200 */ sll $a0, $a0, 8 /* 011F0 80911830 00042400 */ sll $a0, $a0, 16 -/* 011F4 80911834 0C01DE0D */ jal Math_Coss +/* 011F4 80911834 0C01DE0D */ jal Math_CosS ## coss? /* 011F8 80911838 00042403 */ sra $a0, $a0, 16 /* 011FC 8091183C 46140402 */ mul.s $f16, $f0, $f20 @@ -239,7 +239,7 @@ glabel func_8091156C /* 01234 80911874 00812021 */ addu $a0, $a0, $at /* 01238 80911878 00042200 */ sll $a0, $a0, 8 /* 0123C 8091187C 00042400 */ sll $a0, $a0, 16 -/* 01240 80911880 0C01DE1C */ jal Math_Sins +/* 01240 80911880 0C01DE1C */ jal Math_SinS ## sins? /* 01244 80911884 00042403 */ sra $a0, $a0, 16 /* 01248 80911888 46140402 */ mul.s $f16, $f0, $f20 @@ -253,7 +253,7 @@ glabel func_8091156C /* 01268 809118A8 00812023 */ subu $a0, $a0, $at /* 0126C 809118AC 00042200 */ sll $a0, $a0, 8 /* 01270 809118B0 00042400 */ sll $a0, $a0, 16 -/* 01274 809118B4 0C01DE0D */ jal Math_Coss +/* 01274 809118B4 0C01DE0D */ jal Math_CosS ## coss? /* 01278 809118B8 00042403 */ sra $a0, $a0, 16 /* 0127C 809118BC 46140282 */ mul.s $f10, $f0, $f20 @@ -286,7 +286,7 @@ glabel func_8091156C /* 012E4 80911924 00812021 */ addu $a0, $a0, $at /* 012E8 80911928 00042200 */ sll $a0, $a0, 8 /* 012EC 8091192C 00042400 */ sll $a0, $a0, 16 -/* 012F0 80911930 0C01DE1C */ jal Math_Sins +/* 012F0 80911930 0C01DE1C */ jal Math_SinS ## sins? /* 012F4 80911934 00042403 */ sra $a0, $a0, 16 /* 012F8 80911938 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -301,7 +301,7 @@ glabel func_8091156C /* 0131C 8091195C 00812023 */ subu $a0, $a0, $at /* 01320 80911960 00042200 */ sll $a0, $a0, 8 /* 01324 80911964 00042400 */ sll $a0, $a0, 16 -/* 01328 80911968 0C01DE0D */ jal Math_Coss +/* 01328 80911968 0C01DE0D */ jal Math_CosS ## coss? /* 0132C 8091196C 00042403 */ sra $a0, $a0, 16 /* 01330 80911970 3C018091 */ lui $at, %hi(D_8091542C) ## $at = 80910000 @@ -342,7 +342,7 @@ glabel func_8091156C /* 013B4 809119F4 00812021 */ addu $a0, $a0, $at /* 013B8 809119F8 00042200 */ sll $a0, $a0, 8 /* 013BC 809119FC 00042400 */ sll $a0, $a0, 16 -/* 013C0 80911A00 0C01DE1C */ jal Math_Sins +/* 013C0 80911A00 0C01DE1C */ jal Math_SinS ## sins? /* 013C4 80911A04 00042403 */ sra $a0, $a0, 16 /* 013C8 80911A08 46140202 */ mul.s $f8, $f0, $f20 @@ -356,7 +356,7 @@ glabel func_8091156C /* 013E8 80911A28 00812023 */ subu $a0, $a0, $at /* 013EC 80911A2C 00042200 */ sll $a0, $a0, 8 /* 013F0 80911A30 00042400 */ sll $a0, $a0, 16 -/* 013F4 80911A34 0C01DE0D */ jal Math_Coss +/* 013F4 80911A34 0C01DE0D */ jal Math_CosS ## coss? /* 013F8 80911A38 00042403 */ sra $a0, $a0, 16 /* 013FC 80911A3C 46140182 */ mul.s $f6, $f0, $f20 @@ -376,7 +376,7 @@ glabel func_8091156C /* 0142C 80911A6C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 01430 80911A70 26240024 */ addiu $a0, $s1, 0x0024 ## $a0 = 00000024 /* 01434 80911A74 8FA50084 */ lw $a1, 0x0084($sp) -/* 01438 80911A78 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01438 80911A78 0C01E107 */ jal Math_ApproachF /* 0143C 80911A7C 8E2701CC */ lw $a3, 0x01CC($s1) ## 000001CC /* 01440 80911A80 863901C0 */ lh $t9, 0x01C0($s1) ## 000001C0 @@ -391,14 +391,14 @@ glabel func_8091156C /* 01464 80911AA4 26240028 */ addiu $a0, $s1, 0x0028 ## $a0 = 00000028 /* 01468 80911AA8 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 0146C 80911AAC 44054000 */ mfc1 $a1, $f8 -/* 01470 80911AB0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01470 80911AB0 0C01E107 */ jal Math_ApproachF /* 01474 80911AB4 00000000 */ nop /* 01478 80911AB8 10000005 */ beq $zero, $zero, .L80911AD0 /* 0147C 80911ABC 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 .L80911AC0: /* 01480 80911AC0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 01484 80911AC4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01484 80911AC4 0C01E107 */ jal Math_ApproachF /* 01488 80911AC8 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 0148C 80911ACC 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 @@ -406,13 +406,13 @@ glabel func_8091156C /* 01490 80911AD0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 01494 80911AD4 2624002C */ addiu $a0, $s1, 0x002C ## $a0 = 0000002C /* 01498 80911AD8 8FA5007C */ lw $a1, 0x007C($sp) -/* 0149C 80911ADC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0149C 80911ADC 0C01E107 */ jal Math_ApproachF /* 014A0 80911AE0 8E2701CC */ lw $a3, 0x01CC($s1) ## 000001CC /* 014A4 80911AE4 262401CC */ addiu $a0, $s1, 0x01CC ## $a0 = 000001CC /* 014A8 80911AE8 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 /* 014AC 80911AEC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 014B0 80911AF0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 014B0 80911AF0 0C01E107 */ jal Math_ApproachF /* 014B4 80911AF4 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 014B8 80911AF8 86240194 */ lh $a0, 0x0194($s1) ## 00000194 @@ -433,7 +433,7 @@ glabel func_8091156C /* 014F4 80911B34 00042400 */ sll $a0, $a0, 16 /* 014F8 80911B38 E626005C */ swc1 $f6, 0x005C($s1) ## 0000005C /* 014FC 80911B3C 00042403 */ sra $a0, $a0, 16 -/* 01500 80911B40 0C01DE1C */ jal Math_Sins +/* 01500 80911B40 0C01DE1C */ jal Math_SinS ## sins? /* 01504 80911B44 E6280064 */ swc1 $f8, 0x0064($s1) ## 00000064 /* 01508 80911B48 46000100 */ add.s $f4, $f0, $f0 @@ -443,7 +443,7 @@ glabel func_8091156C /* 01518 80911B58 46049180 */ add.s $f6, $f18, $f4 /* 0151C 80911B5C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 01520 80911B60 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 -/* 01524 80911B64 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01524 80911B64 0C01E1EF */ jal Math_ApproachS /* 01528 80911B68 E6260028 */ swc1 $f6, 0x0028($s1) ## 00000028 /* 0152C 80911B6C 86280194 */ lh $t0, 0x0194($s1) ## 00000194 @@ -471,19 +471,19 @@ glabel func_8091156C /* 01584 80911BC4 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFC0 /* 01588 80911BC8 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFC4 .L80911BCC: -/* 0158C 80911BCC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0158C 80911BCC 0C00CFC8 */ jal Rand_CenteredFloat /* 01590 80911BD0 4600A306 */ mov.s $f12, $f20 /* 01594 80911BD4 C6300200 */ lwc1 $f16, 0x0200($s1) ## 00000200 /* 01598 80911BD8 4600A306 */ mov.s $f12, $f20 /* 0159C 80911BDC 46100280 */ add.s $f10, $f0, $f16 -/* 015A0 80911BE0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 015A0 80911BE0 0C00CFC8 */ jal Rand_CenteredFloat /* 015A4 80911BE4 E7AA005C */ swc1 $f10, 0x005C($sp) /* 015A8 80911BE8 C6280204 */ lwc1 $f8, 0x0204($s1) ## 00000204 /* 015AC 80911BEC 4600A306 */ mov.s $f12, $f20 /* 015B0 80911BF0 46080480 */ add.s $f18, $f0, $f8 -/* 015B4 80911BF4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 015B4 80911BF4 0C00CFC8 */ jal Rand_CenteredFloat /* 015B8 80911BF8 E7B20060 */ swc1 $f18, 0x0060($sp) /* 015BC 80911BFC C6240208 */ lwc1 $f4, 0x0208($s1) ## 00000208 @@ -491,7 +491,7 @@ glabel func_8091156C /* 015C4 80911C04 C4305434 */ lwc1 $f16, %lo(D_80915434)($at) /* 015C8 80911C08 46040180 */ add.s $f6, $f0, $f4 /* 015CC 80911C0C E7B00048 */ swc1 $f16, 0x0048($sp) -/* 015D0 80911C10 0C03F66B */ jal Math_Rand_ZeroOne +/* 015D0 80911C10 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 015D4 80911C14 E7A60064 */ swc1 $f6, 0x0064($sp) /* 015D8 80911C18 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911CB0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911CB0.s index 5ec8610d07..41f7f6fd6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911CB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911CB0.s @@ -23,7 +23,7 @@ glabel func_80911CB0 /* 016AC 80911CEC E60601D0 */ swc1 $f6, 0x01D0($s0) ## 000001D0 /* 016B0 80911CF0 3C0E8091 */ lui $t6, %hi(func_80911DD8) ## $t6 = 80910000 /* 016B4 80911CF4 25CE1DD8 */ addiu $t6, $t6, %lo(func_80911DD8) ## $t6 = 80911DD8 -/* 016B8 80911CF8 0C03F66B */ jal Math_Rand_ZeroOne +/* 016B8 80911CF8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 016BC 80911CFC AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 /* 016C0 80911D00 3C018091 */ lui $at, %hi(D_80915438) ## $at = 80910000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911DD8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911DD8.s index a9015ac965..9bc7e0a1c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911DD8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911DD8.s @@ -131,7 +131,7 @@ glabel func_80911DD8 .L80911F7C: /* 0193C 80911F7C 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 01940 80911F80 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 01944 80911F84 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01944 80911F84 0C01E1EF */ jal Math_ApproachS /* 01948 80911F88 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 0194C 80911F8C C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 @@ -144,12 +144,12 @@ glabel func_80911DD8 /* 01968 80911FA8 46062200 */ add.s $f8, $f4, $f6 /* 0196C 80911FAC E6120024 */ swc1 $f18, 0x0024($s0) ## 00000024 /* 01970 80911FB0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 01974 80911FB4 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01974 80911FB4 0C01E123 */ jal Math_ApproachZeroF /* 01978 80911FB8 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C /* 0197C 80911FBC 26040064 */ addiu $a0, $s0, 0x0064 ## $a0 = 00000064 /* 01980 80911FC0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 01984 80911FC4 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01984 80911FC4 0C01E123 */ jal Math_ApproachZeroF /* 01988 80911FC8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 0198C 80911FCC 86040194 */ lh $a0, 0x0194($s0) ## 00000194 @@ -162,7 +162,7 @@ glabel func_80911DD8 /* 019A8 80911FE8 00812023 */ subu $a0, $a0, $at /* 019AC 80911FEC 00042080 */ sll $a0, $a0, 2 /* 019B0 80911FF0 00042400 */ sll $a0, $a0, 16 -/* 019B4 80911FF4 0C01DE1C */ jal Math_Sins +/* 019B4 80911FF4 0C01DE1C */ jal Math_SinS ## sins? /* 019B8 80911FF8 00042403 */ sra $a0, $a0, 16 /* 019BC 80911FFC 46000400 */ add.s $f16, $f0, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912020.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912020.s index 66e2eaf4ec..3d1c3ddf76 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912020.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912020.s @@ -7,7 +7,7 @@ glabel func_80912020 /* 019E0 80912020 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 019E4 80912024 AFBF0014 */ sw $ra, 0x0014($sp) /* 019E8 80912028 AFA40020 */ sw $a0, 0x0020($sp) -/* 019EC 8091202C 0C03F66B */ jal Math_Rand_ZeroOne +/* 019EC 8091202C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 019F0 80912030 AFA50024 */ sw $a1, 0x0024($sp) /* 019F4 80912034 3C018091 */ lui $at, %hi(D_8091543C) ## $at = 80910000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809120BC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809120BC.s index 7e4be2d491..79d004b7ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809120BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809120BC.s @@ -53,12 +53,12 @@ glabel func_809120BC /* 01B08 80912148 46105480 */ add.s $f18, $f10, $f16 /* 01B0C 8091214C E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 /* 01B10 80912150 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 01B14 80912154 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01B14 80912154 0C01E123 */ jal Math_ApproachZeroF /* 01B18 80912158 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C /* 01B1C 8091215C 26040064 */ addiu $a0, $s0, 0x0064 ## $a0 = 00000064 /* 01B20 80912160 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 01B24 80912164 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01B24 80912164 0C01E123 */ jal Math_ApproachZeroF /* 01B28 80912168 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 01B2C 8091216C 86040194 */ lh $a0, 0x0194($s0) ## 00000194 @@ -71,7 +71,7 @@ glabel func_809120BC /* 01B48 80912188 00812023 */ subu $a0, $a0, $at /* 01B4C 8091218C 00042080 */ sll $a0, $a0, 2 /* 01B50 80912190 00042400 */ sll $a0, $a0, 16 -/* 01B54 80912194 0C01DE1C */ jal Math_Sins +/* 01B54 80912194 0C01DE1C */ jal Math_SinS ## sins? /* 01B58 80912198 00042403 */ sra $a0, $a0, 16 /* 01B5C 8091219C 46000180 */ add.s $f6, $f0, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912448.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912448.s index 93c7d192e4..f2dd89e92b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912448.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912448.s @@ -19,12 +19,12 @@ glabel func_80912448 /* 01E48 80912488 46105480 */ add.s $f18, $f10, $f16 /* 01E4C 8091248C E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 /* 01E50 80912490 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 01E54 80912494 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01E54 80912494 0C01E123 */ jal Math_ApproachZeroF /* 01E58 80912498 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C /* 01E5C 8091249C 26040064 */ addiu $a0, $s0, 0x0064 ## $a0 = 00000064 /* 01E60 809124A0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 01E64 809124A4 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01E64 809124A4 0C01E123 */ jal Math_ApproachZeroF /* 01E68 809124A8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 01E6C 809124AC 86040194 */ lh $a0, 0x0194($s0) ## 00000194 @@ -37,7 +37,7 @@ glabel func_80912448 /* 01E88 809124C8 00812023 */ subu $a0, $a0, $at /* 01E8C 809124CC 00042080 */ sll $a0, $a0, 2 /* 01E90 809124D0 00042400 */ sll $a0, $a0, 16 -/* 01E94 809124D4 0C01DE1C */ jal Math_Sins +/* 01E94 809124D4 0C01DE1C */ jal Math_SinS ## sins? /* 01E98 809124D8 00042403 */ sra $a0, $a0, 16 /* 01E9C 809124DC 46000180 */ add.s $f6, $f0, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s index dbd45eb3d1..3c20000b20 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s @@ -94,12 +94,12 @@ glabel func_80912594 /* 02048 80912688 4406D000 */ mfc1 $a2, $f26 /* 0204C 8091268C E6260024 */ swc1 $f6, 0x0024($s1) ## 00000024 /* 02050 80912690 2624005C */ addiu $a0, $s1, 0x005C ## $a0 = 0000005C -/* 02054 80912694 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 02054 80912694 0C01E123 */ jal Math_ApproachZeroF /* 02058 80912698 E632002C */ swc1 $f18, 0x002C($s1) ## 0000002C /* 0205C 8091269C 4405C000 */ mfc1 $a1, $f24 /* 02060 809126A0 4406D000 */ mfc1 $a2, $f26 -/* 02064 809126A4 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 02064 809126A4 0C01E123 */ jal Math_ApproachZeroF /* 02068 809126A8 26240064 */ addiu $a0, $s1, 0x0064 ## $a0 = 00000064 /* 0206C 809126AC 863801BC */ lh $t8, 0x01BC($s1) ## 000001BC @@ -126,7 +126,7 @@ glabel func_80912594 /* 020B8 809126F8 262400B6 */ addiu $a0, $s1, 0x00B6 ## $a0 = 000000B6 /* 020BC 809126FC 8625008A */ lh $a1, 0x008A($s1) ## 0000008A /* 020C0 80912700 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 020C4 80912704 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 020C4 80912704 0C01E1EF */ jal Math_ApproachS /* 020C8 80912708 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 020CC 8091270C 100000AC */ beq $zero, $zero, .L809129C0 @@ -156,7 +156,7 @@ glabel func_80912594 /* 02120 80912760 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 02124 80912764 1140001D */ beq $t2, $zero, .L809127DC /* 02128 80912768 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 0212C 8091276C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0212C 8091276C 0C01E1EF */ jal Math_ApproachS /* 02130 80912770 8625008A */ lh $a1, 0x008A($s1) ## 0000008A /* 02134 80912774 3C014220 */ lui $at, 0x4220 ## $at = 42200000 @@ -176,7 +176,7 @@ glabel func_80912594 /* 0216C 809127AC 46125301 */ sub.s $f12, $f10, $f18 /* 02170 809127B0 46108282 */ mul.s $f10, $f16, $f16 /* 02174 809127B4 460A4000 */ add.s $f0, $f8, $f10 -/* 02178 809127B8 0C03F494 */ jal Math_atan2f +/* 02178 809127B8 0C03F494 */ jal Math_FAtan2F /* 0217C 809127BC 46000384 */ sqrt.s $f14, $f0 /* 02180 809127C0 3C018091 */ lui $at, %hi(D_80915448) ## $at = 80910000 /* 02184 809127C4 C4325448 */ lwc1 $f18, %lo(D_80915448)($at) @@ -197,7 +197,7 @@ glabel func_80912594 /* 021BC 809127FC 4406C000 */ mfc1 $a2, $f24 /* 021C0 80912800 26240068 */ addiu $a0, $s1, 0x0068 ## $a0 = 00000068 /* 021C4 80912804 4407D000 */ mfc1 $a3, $f26 -/* 021C8 80912808 0C01E107 */ jal Math_SmoothScaleMaxF +/* 021C8 80912808 0C01E107 */ jal Math_ApproachF /* 021CC 8091280C 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 021D0 80912810 4614A202 */ mul.s $f8, $f20, $f20 @@ -268,7 +268,7 @@ glabel func_80912594 /* 022BC 809128FC 4406A000 */ mfc1 $a2, $f20 /* 022C0 80912900 26240068 */ addiu $a0, $s1, 0x0068 ## $a0 = 00000068 /* 022C4 80912904 4405C000 */ mfc1 $a1, $f24 -/* 022C8 80912908 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 022C8 80912908 0C01E123 */ jal Math_ApproachZeroF /* 022CC 8091290C 00000000 */ nop /* 022D0 80912910 A62001BC */ sh $zero, 0x01BC($s1) ## 000001BC @@ -282,18 +282,18 @@ glabel func_80912594 /* 022EC 8091292C C6200028 */ lwc1 $f0, 0x0028($s1) ## 00000028 /* 022F0 80912930 4405C000 */ mfc1 $a1, $f24 /* 022F4 80912934 4406A000 */ mfc1 $a2, $f20 -/* 022F8 80912938 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 022F8 80912938 0C01E123 */ jal Math_ApproachZeroF /* 022FC 8091293C 26240068 */ addiu $a0, $s1, 0x0068 ## $a0 = 00000068 /* 02300 80912940 4405C000 */ mfc1 $a1, $f24 /* 02304 80912944 4406A000 */ mfc1 $a2, $f20 -/* 02308 80912948 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 02308 80912948 0C01E123 */ jal Math_ApproachZeroF /* 0230C 8091294C 26240060 */ addiu $a0, $s1, 0x0060 ## $a0 = 00000060 /* 02310 80912950 262400B6 */ addiu $a0, $s1, 0x00B6 ## $a0 = 000000B6 /* 02314 80912954 8625008A */ lh $a1, 0x008A($s1) ## 0000008A /* 02318 80912958 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 0231C 8091295C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0231C 8091295C 0C01E1EF */ jal Math_ApproachS /* 02320 80912960 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 02324 80912964 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -337,7 +337,7 @@ glabel func_80912594 /* 023B8 809129F8 00812023 */ subu $a0, $a0, $at /* 023BC 809129FC 00042080 */ sll $a0, $a0, 2 /* 023C0 80912A00 00042400 */ sll $a0, $a0, 16 -/* 023C4 80912A04 0C01DE1C */ jal Math_Sins +/* 023C4 80912A04 0C01DE1C */ jal Math_SinS ## sins? /* 023C8 80912A08 00042403 */ sra $a0, $a0, 16 /* 023CC 80912A0C 46000280 */ add.s $f10, $f0, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s index 471898dfa5..146bda50a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s @@ -328,7 +328,7 @@ glabel L80912FB4 /* 02A68 809130A8 00052880 */ sll $a1, $a1, 2 /* 02A6C 809130AC 00052C00 */ sll $a1, $a1, 16 /* 02A70 809130B0 00052C03 */ sra $a1, $a1, 16 -/* 02A74 809130B4 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 02A74 809130B4 0C01E1EF */ jal Math_ApproachS /* 02A78 809130B8 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 02A7C 809130BC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 @@ -340,14 +340,14 @@ glabel L80912FB4 /* 02A94 809130D4 26440398 */ addiu $a0, $s2, 0x0398 ## $a0 = 00000398 /* 02A98 809130D8 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 02A9C 809130DC 44052000 */ mfc1 $a1, $f4 -/* 02AA0 809130E0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02AA0 809130E0 0C01E107 */ jal Math_ApproachF /* 02AA4 809130E4 00000000 */ nop /* 02AA8 809130E8 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02AAC 809130EC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02AB0 809130F0 26440028 */ addiu $a0, $s2, 0x0028 ## $a0 = 00000028 /* 02AB4 809130F4 3C0542C8 */ lui $a1, 0x42C8 ## $a1 = 42C80000 -/* 02AB8 809130F8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02AB8 809130F8 0C01E107 */ jal Math_ApproachF /* 02ABC 809130FC 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 02AC0 80913100 86440194 */ lh $a0, 0x0194($s2) ## 00000194 @@ -360,7 +360,7 @@ glabel L80912FB4 /* 02ADC 8091311C 00812023 */ subu $a0, $a0, $at /* 02AE0 80913120 00042080 */ sll $a0, $a0, 2 /* 02AE4 80913124 00042400 */ sll $a0, $a0, 16 -/* 02AE8 80913128 0C01DE1C */ jal Math_Sins +/* 02AE8 80913128 0C01DE1C */ jal Math_SinS ## sins? /* 02AEC 8091312C 00042403 */ sra $a0, $a0, 16 /* 02AF0 80913130 C6460028 */ lwc1 $f6, 0x0028($s2) ## 00000028 @@ -445,7 +445,7 @@ glabel L809131C4 /* 02C20 80913260 00042400 */ sll $a0, $a0, 16 /* 02C24 80913264 2509FF38 */ addiu $t1, $t0, 0xFF38 ## $t1 = FFFFFF38 /* 02C28 80913268 A64900B6 */ sh $t1, 0x00B6($s2) ## 000000B6 -/* 02C2C 8091326C 0C01DE1C */ jal Math_Sins +/* 02C2C 8091326C 0C01DE1C */ jal Math_SinS ## sins? /* 02C30 80913270 00042403 */ sra $a0, $a0, 16 /* 02C34 80913274 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 @@ -461,7 +461,7 @@ glabel L809131C4 /* 02C5C 8091329C 44045000 */ mfc1 $a0, $f10 /* 02C60 809132A0 00000000 */ nop /* 02C64 809132A4 00042400 */ sll $a0, $a0, 16 -/* 02C68 809132A8 0C01DE1C */ jal Math_Sins +/* 02C68 809132A8 0C01DE1C */ jal Math_SinS ## sins? /* 02C6C 809132AC 00042403 */ sra $a0, $a0, 16 /* 02C70 809132B0 C65001D8 */ lwc1 $f16, 0x01D8($s2) ## 000001D8 @@ -472,7 +472,7 @@ glabel L809131C4 /* 02C84 809132C4 44043000 */ mfc1 $a0, $f6 /* 02C88 809132C8 00000000 */ nop /* 02C8C 809132CC 00042400 */ sll $a0, $a0, 16 -/* 02C90 809132D0 0C01DE0D */ jal Math_Coss +/* 02C90 809132D0 0C01DE0D */ jal Math_CosS ## coss? /* 02C94 809132D4 00042403 */ sra $a0, $a0, 16 /* 02C98 809132D8 3C014160 */ lui $at, 0x4160 ## $at = 41600000 @@ -501,28 +501,28 @@ glabel L809131C4 /* 02CF4 80913334 26440394 */ addiu $a0, $s2, 0x0394 ## $a0 = 00000394 /* 02CF8 80913338 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02CFC 8091333C 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 02D00 80913340 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02D00 80913340 0C01E107 */ jal Math_ApproachF /* 02D04 80913344 E6520374 */ swc1 $f18, 0x0374($s2) ## 00000374 /* 02D08 80913348 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02D0C 8091334C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02D10 80913350 264401D8 */ addiu $a0, $s2, 0x01D8 ## $a0 = 000001D8 /* 02D14 80913354 3C05432A */ lui $a1, 0x432A ## $a1 = 432A0000 -/* 02D18 80913358 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02D18 80913358 0C01E107 */ jal Math_ApproachF /* 02D1C 8091335C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 02D20 80913360 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02D24 80913364 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02D28 80913368 26440024 */ addiu $a0, $s2, 0x0024 ## $a0 = 00000024 /* 02D2C 8091336C 3C054160 */ lui $a1, 0x4160 ## $a1 = 41600000 -/* 02D30 80913370 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02D30 80913370 0C01E107 */ jal Math_ApproachF /* 02D34 80913374 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 /* 02D38 80913378 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02D3C 8091337C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02D40 80913380 26440028 */ addiu $a0, $s2, 0x0028 ## $a0 = 00000028 /* 02D44 80913384 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 02D48 80913388 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02D48 80913388 0C01E107 */ jal Math_ApproachF /* 02D4C 8091338C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 02D50 80913390 3C05C54F */ lui $a1, 0xC54F ## $a1 = C54F0000 @@ -530,7 +530,7 @@ glabel L809131C4 /* 02D58 80913398 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02D5C 8091339C 34A53000 */ ori $a1, $a1, 0x3000 ## $a1 = C54F3000 /* 02D60 809133A0 2644002C */ addiu $a0, $s2, 0x002C ## $a0 = 0000002C -/* 02D64 809133A4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02D64 809133A4 0C01E107 */ jal Math_ApproachF /* 02D68 809133A8 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 /* 02D6C 809133AC 864C01BC */ lh $t4, 0x01BC($s2) ## 000001BC @@ -610,7 +610,7 @@ glabel L809134B4 /* 02E84 809134C4 A3AD00BE */ sb $t5, 0x00BE($sp) /* 02E88 809134C8 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3D4CCCCD /* 02E8C 809134CC 26440364 */ addiu $a0, $s2, 0x0364 ## $a0 = 00000364 -/* 02E90 809134D0 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 02E90 809134D0 0C01E123 */ jal Math_ApproachZeroF /* 02E94 809134D4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02E98 809134D8 3C05C544 */ lui $a1, 0xC544 ## $a1 = C5440000 @@ -618,14 +618,14 @@ glabel L809134B4 /* 02EA0 809134E0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02EA4 809134E4 34A59000 */ ori $a1, $a1, 0x9000 ## $a1 = C5449000 /* 02EA8 809134E8 26440368 */ addiu $a0, $s2, 0x0368 ## $a0 = 00000368 -/* 02EAC 809134EC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02EAC 809134EC 0C01E107 */ jal Math_ApproachF /* 02EB0 809134F0 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 02EB4 809134F4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02EB8 809134F8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02EBC 809134FC 26440370 */ addiu $a0, $s2, 0x0370 ## $a0 = 00000370 /* 02EC0 80913500 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 -/* 02EC4 80913504 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02EC4 80913504 0C01E107 */ jal Math_ApproachF /* 02EC8 80913508 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 02ECC 8091350C 864E01BC */ lh $t6, 0x01BC($s2) ## 000001BC @@ -669,7 +669,7 @@ glabel L8091352C .L80913598: /* 02F58 80913598 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3D4CCCCD /* 02F5C 8091359C 26440364 */ addiu $a0, $s2, 0x0364 ## $a0 = 00000364 -/* 02F60 809135A0 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 02F60 809135A0 0C01E123 */ jal Math_ApproachZeroF /* 02F64 809135A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02F68 809135A8 3C05C544 */ lui $a1, 0xC544 ## $a1 = C5440000 @@ -677,14 +677,14 @@ glabel L8091352C /* 02F70 809135B0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02F74 809135B4 34A59000 */ ori $a1, $a1, 0x9000 ## $a1 = C5449000 /* 02F78 809135B8 26440368 */ addiu $a0, $s2, 0x0368 ## $a0 = 00000368 -/* 02F7C 809135BC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02F7C 809135BC 0C01E107 */ jal Math_ApproachF /* 02F80 809135C0 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 02F84 809135C4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02F88 809135C8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02F8C 809135CC 26440370 */ addiu $a0, $s2, 0x0370 ## $a0 = 00000370 /* 02F90 809135D0 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 -/* 02F94 809135D4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02F94 809135D4 0C01E107 */ jal Math_ApproachF /* 02F98 809135D8 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 02F9C 809135DC 864B01BC */ lh $t3, 0x01BC($s2) ## 000001BC @@ -812,7 +812,7 @@ glabel L8091352C /* 03170 809137B0 A02D0AE3 */ sb $t5, 0x0AE3($at) ## 00010AE3 /* 03174 809137B4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 03178 809137B8 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 0317C 809137BC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0317C 809137BC 0C00CFBE */ jal Rand_ZeroFloat /* 03180 809137C0 00000000 */ nop /* 03184 809137C4 4600010D */ trunc.w.s $f4, $f0 @@ -838,7 +838,7 @@ glabel L8091352C /* 031D0 80913810 A0200AE3 */ sb $zero, 0x0AE3($at) ## 00010AE3 /* 031D4 80913814 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 031D8 80913818 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 031DC 8091381C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 031DC 8091381C 0C00CFBE */ jal Rand_ZeroFloat /* 031E0 80913820 00000000 */ nop /* 031E4 80913824 4600010D */ trunc.w.s $f4, $f0 @@ -875,7 +875,7 @@ glabel L8091352C /* 03254 80913894 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 03258 80913898 00005810 */ mfhi $t3 /* 0325C 8091389C 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 03260 809138A0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 03260 809138A0 0C00CFC8 */ jal Rand_CenteredFloat /* 03264 809138A4 A64B01B2 */ sh $t3, 0x01B2($s2) ## 000001B2 /* 03268 809138A8 87AC006E */ lh $t4, 0x006E($sp) @@ -887,14 +887,14 @@ glabel L8091352C /* 03280 809138C0 024D8021 */ addu $s0, $s2, $t5 /* 03284 809138C4 C6040218 */ lwc1 $f4, 0x0218($s0) ## 06000F9C /* 03288 809138C8 46040180 */ add.s $f6, $f0, $f4 -/* 0328C 809138CC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0328C 809138CC 0C00CFC8 */ jal Rand_CenteredFloat /* 03290 809138D0 E7A60094 */ swc1 $f6, 0x0094($sp) /* 03294 809138D4 C608021C */ lwc1 $f8, 0x021C($s0) ## 06000FA0 /* 03298 809138D8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0329C 809138DC 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 032A0 809138E0 46080280 */ add.s $f10, $f0, $f8 -/* 032A4 809138E4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 032A4 809138E4 0C00CFC8 */ jal Rand_CenteredFloat /* 032A8 809138E8 E7AA0098 */ swc1 $f10, 0x0098($sp) /* 032AC 809138EC C6100220 */ lwc1 $f16, 0x0220($s0) ## 06000FA4 @@ -937,7 +937,7 @@ glabel L8091352C .L80913980: /* 03340 80913980 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 03344 80913984 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 03348 80913988 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 03348 80913988 0C00CFBE */ jal Rand_ZeroFloat /* 0334C 8091398C 00000000 */ nop /* 03350 80913990 4600028D */ trunc.w.s $f10, $f0 @@ -953,7 +953,7 @@ glabel L8091352C /* 03378 809139B8 AFA80010 */ sw $t0, 0x0010($sp) /* 0337C 809139BC 0C00A76F */ jal EffectSsKFire_Spawn /* 03380 809139C0 AFA90014 */ sw $t1, 0x0014($sp) -/* 03384 809139C4 0C03F66B */ jal Math_Rand_ZeroOne +/* 03384 809139C4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 03388 809139C8 00000000 */ nop /* 0338C 809139CC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -967,7 +967,7 @@ glabel L8091352C /* 033AC 809139EC 3C014080 */ lui $at, 0x4080 ## $at = 40800000 .L809139F0: /* 033B0 809139F0 44816000 */ mtc1 $at, $f12 ## $f12 = 4.00 -/* 033B4 809139F4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 033B4 809139F4 0C00CFBE */ jal Rand_ZeroFloat /* 033B8 809139F8 00000000 */ nop /* 033BC 809139FC 4600048D */ trunc.w.s $f18, $f0 @@ -1061,7 +1061,7 @@ glabel L8091352C /* 034F8 80913B38 26500364 */ addiu $s0, $s2, 0x0364 ## $s0 = 00000364 /* 034FC 80913B3C 26530368 */ addiu $s3, $s2, 0x0368 ## $s3 = 00000368 /* 03500 80913B40 44074000 */ mfc1 $a3, $f8 -/* 03504 80913B44 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03504 80913B44 0C01E107 */ jal Math_ApproachF /* 03508 80913B48 00000000 */ nop /* 0350C 80913B4C C64A037C */ lwc1 $f10, 0x037C($s2) ## 0000037C @@ -1071,7 +1071,7 @@ glabel L8091352C /* 0351C 80913B5C 46105482 */ mul.s $f18, $f10, $f16 /* 03520 80913B60 8E4603A0 */ lw $a2, 0x03A0($s2) ## 000003A0 /* 03524 80913B64 44079000 */ mfc1 $a3, $f18 -/* 03528 80913B68 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03528 80913B68 0C01E107 */ jal Math_ApproachF /* 0352C 80913B6C 00000000 */ nop /* 03530 80913B70 C6440380 */ lwc1 $f4, 0x0380($s2) ## 00000380 @@ -1081,7 +1081,7 @@ glabel L8091352C /* 03540 80913B80 46062202 */ mul.s $f8, $f4, $f6 /* 03544 80913B84 8E4603A4 */ lw $a2, 0x03A4($s2) ## 000003A4 /* 03548 80913B88 44074000 */ mfc1 $a3, $f8 -/* 0354C 80913B8C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0354C 80913B8C 0C01E107 */ jal Math_ApproachF /* 03550 80913B90 00000000 */ nop /* 03554 80913B94 C64A0384 */ lwc1 $f10, 0x0384($s2) ## 00000384 @@ -1091,7 +1091,7 @@ glabel L8091352C /* 03564 80913BA4 46105482 */ mul.s $f18, $f10, $f16 /* 03568 80913BA8 8E4603B4 */ lw $a2, 0x03B4($s2) ## 000003B4 /* 0356C 80913BAC 44079000 */ mfc1 $a3, $f18 -/* 03570 80913BB0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03570 80913BB0 0C01E107 */ jal Math_ApproachF /* 03574 80913BB4 00000000 */ nop /* 03578 80913BB8 C6440388 */ lwc1 $f4, 0x0388($s2) ## 00000388 @@ -1101,7 +1101,7 @@ glabel L8091352C /* 03588 80913BC8 46062202 */ mul.s $f8, $f4, $f6 /* 0358C 80913BCC 8E4603B8 */ lw $a2, 0x03B8($s2) ## 000003B8 /* 03590 80913BD0 44074000 */ mfc1 $a3, $f8 -/* 03594 80913BD4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03594 80913BD4 0C01E107 */ jal Math_ApproachF /* 03598 80913BD8 00000000 */ nop /* 0359C 80913BDC C64A038C */ lwc1 $f10, 0x038C($s2) ## 0000038C @@ -1111,7 +1111,7 @@ glabel L8091352C /* 035AC 80913BEC 46105482 */ mul.s $f18, $f10, $f16 /* 035B0 80913BF0 8E4603BC */ lw $a2, 0x03BC($s2) ## 000003BC /* 035B4 80913BF4 44079000 */ mfc1 $a3, $f18 -/* 035B8 80913BF8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 035B8 80913BF8 0C01E107 */ jal Math_ApproachF /* 035BC 80913BFC 00000000 */ nop /* 035C0 80913C00 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -1120,7 +1120,7 @@ glabel L8091352C /* 035CC 80913C0C 8E4703C4 */ lw $a3, 0x03C4($s2) ## 000003C4 /* 035D0 80913C10 44050000 */ mfc1 $a1, $f0 /* 035D4 80913C14 44060000 */ mfc1 $a2, $f0 -/* 035D8 80913C18 0C01E107 */ jal Math_SmoothScaleMaxF +/* 035D8 80913C18 0C01E107 */ jal Math_ApproachF /* 035DC 80913C1C 00000000 */ nop /* 035E0 80913C20 8645035C */ lh $a1, 0x035C($s2) ## 0000035C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809160A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809160A4.s index f3adff0b09..c33e1fb50d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809160A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809160A4.s @@ -10,7 +10,7 @@ glabel func_809160A4 /* 006B0 809160C0 24040014 */ addiu $a0, $zero, 0x0014 ## $a0 = 00000014 /* 006B4 809160C4 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E /* 006B8 809160C8 468021A0 */ cvt.s.w $f6, $f4 -/* 006BC 809160CC 0C01DF64 */ jal Math_Rand_S16Offset +/* 006BC 809160CC 0C01DF64 */ jal Rand_S16Offset /* 006C0 809160D0 E7A6002C */ swc1 $f6, 0x002C($sp) /* 006C4 809160D4 8FA30030 */ lw $v1, 0x0030($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091612C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091612C.s index e4d6f2fd34..c1979c6d2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091612C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091612C.s @@ -3,7 +3,7 @@ glabel func_8091612C /* 00720 80916130 AFBF0024 */ sw $ra, 0x0024($sp) /* 00724 80916134 AFA40028 */ sw $a0, 0x0028($sp) /* 00728 80916138 24040014 */ addiu $a0, $zero, 0x0014 ## $a0 = 00000014 -/* 0072C 8091613C 0C01DF64 */ jal Math_Rand_S16Offset +/* 0072C 8091613C 0C01DF64 */ jal Rand_S16Offset /* 00730 80916140 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E /* 00734 80916144 8FAE0028 */ lw $t6, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916418.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916418.s index f09a03bc39..9472670b01 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916418.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916418.s @@ -30,7 +30,7 @@ glabel func_80916418 /* 00A70 80916480 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C /* 00A74 80916484 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 00A78 80916488 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 00A7C 8091648C 0C01DF64 */ jal Math_Rand_S16Offset +/* 00A7C 8091648C 0C01DF64 */ jal Rand_S16Offset /* 00A80 80916490 E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C /* 00A84 80916494 A60201D2 */ sh $v0, 0x01D2($s0) ## 000001D2 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809164AC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809164AC.s index 22e7fe16fe..5db17b38cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809164AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809164AC.s @@ -26,7 +26,7 @@ glabel func_809164AC /* 00AF4 80916504 25CE9704 */ addiu $t6, $t6, %lo(func_80919704) ## $t6 = 80919704 /* 00AF8 80916508 24040046 */ addiu $a0, $zero, 0x0046 ## $a0 = 00000046 /* 00AFC 8091650C 2405006E */ addiu $a1, $zero, 0x006E ## $a1 = 0000006E -/* 00B00 80916510 0C01DF64 */ jal Math_Rand_S16Offset +/* 00B00 80916510 0C01DF64 */ jal Rand_S16Offset /* 00B04 80916514 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 /* 00B08 80916518 8FB80028 */ lw $t8, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809168B0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809168B0.s index fec49fb5f7..9a717deb0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809168B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809168B0.s @@ -29,7 +29,7 @@ glabel func_809168B0 /* 00F08 80916918 4405A000 */ mfc1 $a1, $f20 /* 00F0C 8091691C 27C40068 */ addiu $a0, $s8, 0x0068 ## $a0 = 00000068 /* 00F10 80916920 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 00F14 80916924 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00F14 80916924 0C01E107 */ jal Math_ApproachF /* 00F18 80916928 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 00F1C 8091692C 87AE00BA */ lh $t6, 0x00BA($sp) @@ -46,7 +46,7 @@ glabel func_809168B0 /* 00F44 80916954 00052C03 */ sra $a1, $a1, 16 /* 00F48 80916958 27C40032 */ addiu $a0, $s8, 0x0032 ## $a0 = 00000032 /* 00F4C 8091695C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00F50 80916960 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 00F50 80916960 0C01E1EF */ jal Math_ApproachS /* 00F54 80916964 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 00F58 80916968 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C @@ -92,24 +92,24 @@ glabel func_809168B0 /* 00FE8 809169F8 AE2F0004 */ sw $t7, 0x0004($s1) ## FFFFFFF0 /* 00FEC 809169FC AE380008 */ sw $t8, 0x0008($s1) ## FFFFFFF4 /* 00FF0 80916A00 AE480008 */ sw $t0, 0x0008($s2) ## FFFFFFE8 -/* 00FF4 80916A04 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00FF4 80916A04 0C00CFC8 */ jal Rand_CenteredFloat /* 00FF8 80916A08 AE590004 */ sw $t9, 0x0004($s2) ## FFFFFFE4 /* 00FFC 80916A0C C6680000 */ lwc1 $f8, 0x0000($s3) ## 00000284 /* 01000 80916A10 4600B306 */ mov.s $f12, $f22 /* 01004 80916A14 46080280 */ add.s $f10, $f0, $f8 -/* 01008 80916A18 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01008 80916A18 0C00CFBE */ jal Rand_ZeroFloat /* 0100C 80916A1C E7AA007C */ swc1 $f10, 0x007C($sp) /* 01010 80916A20 C6700004 */ lwc1 $f16, 0x0004($s3) ## 00000288 /* 01014 80916A24 4600A306 */ mov.s $f12, $f20 /* 01018 80916A28 46100480 */ add.s $f18, $f0, $f16 -/* 0101C 80916A2C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0101C 80916A2C 0C00CFC8 */ jal Rand_CenteredFloat /* 01020 80916A30 E7B20080 */ swc1 $f18, 0x0080($sp) /* 01024 80916A34 C6640008 */ lwc1 $f4, 0x0008($s3) ## 0000028C /* 01028 80916A38 46040180 */ add.s $f6, $f0, $f4 -/* 0102C 80916A3C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0102C 80916A3C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01030 80916A40 E7A60084 */ swc1 $f6, 0x0084($sp) /* 01034 80916A44 46180202 */ mul.s $f8, $f0, $f24 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s index 1d20bd3b26..e8006d370c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s @@ -51,7 +51,7 @@ glabel func_80916C9C /* 012A8 80916CB8 AFA40048 */ sw $a0, 0x0048($sp) /* 012AC 80916CBC 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 /* 012B0 80916CC0 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 012B4 80916CC4 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 012B4 80916CC4 0C01E123 */ jal Math_ApproachZeroF /* 012B8 80916CC8 AFAF0060 */ sw $t7, 0x0060($sp) /* 012BC 80916CCC 860201D0 */ lh $v0, 0x01D0($s0) ## 000001D0 @@ -235,7 +235,7 @@ glabel L80916F0C /* 01564 80916F74 26040290 */ addiu $a0, $s0, 0x0290 ## $a0 = 00000290 /* 01568 80916F78 44052000 */ mfc1 $a1, $f4 /* 0156C 80916F7C 44075000 */ mfc1 $a3, $f10 -/* 01570 80916F80 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01570 80916F80 0C01E107 */ jal Math_ApproachF /* 01574 80916F84 00000000 */ nop /* 01578 80916F88 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 @@ -252,7 +252,7 @@ glabel L80916F0C /* 015A4 80916FB4 26040294 */ addiu $a0, $s0, 0x0294 ## $a0 = 00000294 /* 015A8 80916FB8 44052000 */ mfc1 $a1, $f4 /* 015AC 80916FBC 44075000 */ mfc1 $a3, $f10 -/* 015B0 80916FC0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 015B0 80916FC0 0C01E107 */ jal Math_ApproachF /* 015B4 80916FC4 00000000 */ nop /* 015B8 80916FC8 3C014282 */ lui $at, 0x4282 ## $at = 42820000 @@ -269,7 +269,7 @@ glabel L80916F0C /* 015E4 80916FF4 26040298 */ addiu $a0, $s0, 0x0298 ## $a0 = 00000298 /* 015E8 80916FF8 44052000 */ mfc1 $a1, $f4 /* 015EC 80916FFC 44075000 */ mfc1 $a3, $f10 -/* 015F0 80917000 0C01E107 */ jal Math_SmoothScaleMaxF +/* 015F0 80917000 0C01E107 */ jal Math_ApproachF /* 015F4 80917004 00000000 */ nop /* 015F8 80917008 3C053E99 */ lui $a1, 0x3E99 ## $a1 = 3E990000 @@ -277,7 +277,7 @@ glabel L80916F0C /* 01600 80917010 34E7D70B */ ori $a3, $a3, 0xD70B ## $a3 = 3BA3D70B /* 01604 80917014 34A59999 */ ori $a1, $a1, 0x9999 ## $a1 = 3E999999 /* 01608 80917018 26040220 */ addiu $a0, $s0, 0x0220 ## $a0 = 00000220 -/* 0160C 8091701C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0160C 8091701C 0C01E107 */ jal Math_ApproachF /* 01610 80917020 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01614 80917024 860D01D4 */ lh $t5, 0x01D4($s0) ## 000001D4 @@ -297,7 +297,7 @@ glabel L80916F0C /* 0164C 8091705C 260402A0 */ addiu $a0, $s0, 0x02A0 ## $a0 = 000002A0 /* 01650 80917060 44052000 */ mfc1 $a1, $f4 /* 01654 80917064 44075000 */ mfc1 $a3, $f10 -/* 01658 80917068 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01658 80917068 0C01E107 */ jal Math_ApproachF /* 0165C 8091706C 00000000 */ nop /* 01660 80917070 8FA20060 */ lw $v0, 0x0060($sp) @@ -444,7 +444,7 @@ glabel L809171FC /* 01878 80917288 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 0187C 8091728C 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 /* 01880 80917290 A60F01C6 */ sh $t7, 0x01C6($s0) ## 000001C6 -/* 01884 80917294 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01884 80917294 0C01E123 */ jal Math_ApproachZeroF /* 01888 80917298 8FA40048 */ lw $a0, 0x0048($sp) /* 0188C 8091729C 8FB8006C */ lw $t8, 0x006C($sp) @@ -457,7 +457,7 @@ glabel L809171FC /* 018A8 809172B8 00052C03 */ sra $a1, $a1, 16 /* 018AC 809172BC 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 018B0 809172C0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 018B4 809172C4 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 018B4 809172C4 0C01E1EF */ jal Math_ApproachS /* 018B8 809172C8 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 018BC 809172CC A60001A0 */ sh $zero, 0x01A0($s0) ## 000001A0 @@ -504,7 +504,7 @@ glabel L80917318 /* 0194C 8091735C 26040290 */ addiu $a0, $s0, 0x0290 ## $a0 = 00000290 /* 01950 80917360 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 01954 80917364 44055000 */ mfc1 $a1, $f10 -/* 01958 80917368 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01958 80917368 0C01E107 */ jal Math_ApproachF /* 0195C 8091736C 00000000 */ nop /* 01960 80917370 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 @@ -516,7 +516,7 @@ glabel L80917318 /* 01978 80917388 26040294 */ addiu $a0, $s0, 0x0294 ## $a0 = 00000294 /* 0197C 8091738C 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 01980 80917390 44052000 */ mfc1 $a1, $f4 -/* 01984 80917394 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01984 80917394 0C01E107 */ jal Math_ApproachF /* 01988 80917398 00000000 */ nop /* 0198C 8091739C 3C014234 */ lui $at, 0x4234 ## $at = 42340000 @@ -528,14 +528,14 @@ glabel L80917318 /* 019A4 809173B4 26040298 */ addiu $a0, $s0, 0x0298 ## $a0 = 00000298 /* 019A8 809173B8 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 019AC 809173BC 44055000 */ mfc1 $a1, $f10 -/* 019B0 809173C0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 019B0 809173C0 0C01E107 */ jal Math_ApproachF /* 019B4 809173C4 00000000 */ nop /* 019B8 809173C8 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 019BC 809173CC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 019C0 809173D0 2604029C */ addiu $a0, $s0, 0x029C ## $a0 = 0000029C /* 019C4 809173D4 8E050024 */ lw $a1, 0x0024($s0) ## 00000024 -/* 019C8 809173D8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 019C8 809173D8 0C01E107 */ jal Math_ApproachF /* 019CC 809173DC 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 019D0 809173E0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -547,14 +547,14 @@ glabel L80917318 /* 019E8 809173F8 260402A0 */ addiu $a0, $s0, 0x02A0 ## $a0 = 000002A0 /* 019EC 809173FC 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 019F0 80917400 44052000 */ mfc1 $a1, $f4 -/* 019F4 80917404 0C01E107 */ jal Math_SmoothScaleMaxF +/* 019F4 80917404 0C01E107 */ jal Math_ApproachF /* 019F8 80917408 00000000 */ nop /* 019FC 8091740C 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 01A00 80917410 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 01A04 80917414 260402A4 */ addiu $a0, $s0, 0x02A4 ## $a0 = 000002A4 /* 01A08 80917418 8E05002C */ lw $a1, 0x002C($s0) ## 0000002C -/* 01A0C 8091741C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01A0C 8091741C 0C01E107 */ jal Math_ApproachF /* 01A10 80917420 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 01A14 80917424 860301D2 */ lh $v1, 0x01D2($s0) ## 000001D2 @@ -578,7 +578,7 @@ glabel L80917318 /* 01A54 80917464 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3ECCCCCD /* 01A58 80917468 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3F4CCCCD /* 01A5C 8091746C 260401F8 */ addiu $a0, $s0, 0x01F8 ## $a0 = 000001F8 -/* 01A60 80917470 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01A60 80917470 0C01E107 */ jal Math_ApproachF /* 01A64 80917474 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 01A68 80917478 3C063F4C */ lui $a2, 0x3F4C ## $a2 = 3F4C0000 @@ -586,7 +586,7 @@ glabel L80917318 /* 01A70 80917480 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3ECCCCCD /* 01A74 80917484 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3F4CCCCD /* 01A78 80917488 26040224 */ addiu $a0, $s0, 0x0224 ## $a0 = 00000224 -/* 01A7C 8091748C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01A7C 8091748C 0C01E107 */ jal Math_ApproachF /* 01A80 80917490 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 01A84 80917494 8FA40044 */ lw $a0, 0x0044($sp) @@ -644,7 +644,7 @@ glabel L80917520 /* 01B44 80917554 44055000 */ mfc1 $a1, $f10 /* 01B48 80917558 26040290 */ addiu $a0, $s0, 0x0290 ## $a0 = 00000290 /* 01B4C 8091755C 44072000 */ mfc1 $a3, $f4 -/* 01B50 80917560 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01B50 80917560 0C01E107 */ jal Math_ApproachF /* 01B54 80917564 00000000 */ nop /* 01B58 80917568 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -657,7 +657,7 @@ glabel L80917520 /* 01B74 80917584 26040294 */ addiu $a0, $s0, 0x0294 ## $a0 = 00000294 /* 01B78 80917588 8DC50028 */ lw $a1, 0x0028($t6) ## 00000028 /* 01B7C 8091758C 44075000 */ mfc1 $a3, $f10 -/* 01B80 80917590 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01B80 80917590 0C01E107 */ jal Math_ApproachF /* 01B84 80917594 00000000 */ nop /* 01B88 80917598 3C014234 */ lui $at, 0x4234 ## $at = 42340000 @@ -676,7 +676,7 @@ glabel L80917520 /* 01BBC 809175CC 44054000 */ mfc1 $a1, $f8 /* 01BC0 809175D0 26040298 */ addiu $a0, $s0, 0x0298 ## $a0 = 00000298 /* 01BC4 809175D4 44079000 */ mfc1 $a3, $f18 -/* 01BC8 809175D8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01BC8 809175D8 0C01E107 */ jal Math_ApproachF /* 01BCC 809175DC 00000000 */ nop /* 01BD0 809175E0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -685,7 +685,7 @@ glabel L80917520 /* 01BDC 809175EC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 01BE0 809175F0 44050000 */ mfc1 $a1, $f0 /* 01BE4 809175F4 44060000 */ mfc1 $a2, $f0 -/* 01BE8 809175F8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01BE8 809175F8 0C01E107 */ jal Math_ApproachF /* 01BEC 809175FC 26040220 */ addiu $a0, $s0, 0x0220 ## $a0 = 00000220 /* 01BF0 80917600 860F01D2 */ lh $t7, 0x01D2($s0) ## 000001D2 @@ -701,7 +701,7 @@ glabel L80917520 /* 01C14 80917624 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01C18 80917628 8FA40048 */ lw $a0, 0x0048($sp) /* 01C1C 8091762C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 01C20 80917630 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01C20 80917630 0C01E123 */ jal Math_ApproachZeroF /* 01C24 80917634 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 01C28 80917638 10000008 */ beq $zero, $zero, .L8091765C @@ -792,7 +792,7 @@ glabel L80917738 /* 01D5C 8091776C 44058000 */ mfc1 $a1, $f16 /* 01D60 80917770 26040290 */ addiu $a0, $s0, 0x0290 ## $a0 = 00000290 /* 01D64 80917774 44073000 */ mfc1 $a3, $f6 -/* 01D68 80917778 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01D68 80917778 0C01E107 */ jal Math_ApproachF /* 01D6C 8091777C 00000000 */ nop /* 01D70 80917780 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -809,7 +809,7 @@ glabel L80917738 /* 01D9C 809177AC 26040294 */ addiu $a0, $s0, 0x0294 ## $a0 = 00000294 /* 01DA0 809177B0 44058000 */ mfc1 $a1, $f16 /* 01DA4 809177B4 44073000 */ mfc1 $a3, $f6 -/* 01DA8 809177B8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01DA8 809177B8 0C01E107 */ jal Math_ApproachF /* 01DAC 809177BC 00000000 */ nop /* 01DB0 809177C0 3C014234 */ lui $at, 0x4234 ## $at = 42340000 @@ -828,7 +828,7 @@ glabel L80917738 /* 01DE4 809177F4 44052000 */ mfc1 $a1, $f4 /* 01DE8 809177F8 26040298 */ addiu $a0, $s0, 0x0298 ## $a0 = 00000298 /* 01DEC 809177FC 44075000 */ mfc1 $a3, $f10 -/* 01DF0 80917800 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01DF0 80917800 0C01E107 */ jal Math_ApproachF /* 01DF4 80917804 00000000 */ nop /* 01DF8 80917808 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 @@ -844,7 +844,7 @@ glabel L80917738 /* 01E1C 8091782C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01E20 80917830 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01E24 80917834 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01E28 80917838 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01E28 80917838 0C01E1EF */ jal Math_ApproachS /* 01E2C 8091783C 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 01E30 80917840 8FAB006C */ lw $t3, 0x006C($sp) @@ -855,7 +855,7 @@ glabel L80917738 /* 01E44 80917854 00052C03 */ sra $a1, $a1, 16 /* 01E48 80917858 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 01E4C 8091785C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01E50 80917860 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01E50 80917860 0C01E1EF */ jal Math_ApproachS /* 01E54 80917864 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 01E58 80917868 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 @@ -922,7 +922,7 @@ glabel L80917738 /* 01F3C 8091794C 44059000 */ mfc1 $a1, $f18 /* 01F40 80917950 26040290 */ addiu $a0, $s0, 0x0290 ## $a0 = 00000290 /* 01F44 80917954 44074000 */ mfc1 $a3, $f8 -/* 01F48 80917958 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01F48 80917958 0C01E107 */ jal Math_ApproachF /* 01F4C 8091795C 00000000 */ nop /* 01F50 80917960 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -939,7 +939,7 @@ glabel L80917738 /* 01F7C 8091798C 26040294 */ addiu $a0, $s0, 0x0294 ## $a0 = 00000294 /* 01F80 80917990 44059000 */ mfc1 $a1, $f18 /* 01F84 80917994 44074000 */ mfc1 $a3, $f8 -/* 01F88 80917998 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01F88 80917998 0C01E107 */ jal Math_ApproachF /* 01F8C 8091799C 00000000 */ nop /* 01F90 809179A0 3C014234 */ lui $at, 0x4234 ## $at = 42340000 @@ -958,13 +958,13 @@ glabel L80917738 /* 01FC4 809179D4 44053000 */ mfc1 $a1, $f6 /* 01FC8 809179D8 26040298 */ addiu $a0, $s0, 0x0298 ## $a0 = 00000298 /* 01FCC 809179DC 44078000 */ mfc1 $a3, $f16 -/* 01FD0 809179E0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01FD0 809179E0 0C01E107 */ jal Math_ApproachF /* 01FD4 809179E4 00000000 */ nop /* 01FD8 809179E8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01FDC 809179EC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01FE0 809179F0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01FE4 809179F4 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01FE4 809179F4 0C01E1EF */ jal Math_ApproachS /* 01FE8 809179F8 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 01FEC 809179FC 8FA8006C */ lw $t0, 0x006C($sp) @@ -975,7 +975,7 @@ glabel L80917738 /* 02000 80917A10 00052C03 */ sra $a1, $a1, 16 /* 02004 80917A14 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 02008 80917A18 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0200C 80917A1C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0200C 80917A1C 0C01E1EF */ jal Math_ApproachS /* 02010 80917A20 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 02014 80917A24 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C @@ -1017,7 +1017,7 @@ glabel L80917738 /* 02098 80917AA8 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 0209C 80917AAC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 020A0 80917AB0 8E05003C */ lw $a1, 0x003C($s0) ## 0000003C -/* 020A4 80917AB4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 020A4 80917AB4 0C01E107 */ jal Math_ApproachF /* 020A8 80917AB8 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 .L80917ABC: @@ -1103,7 +1103,7 @@ glabel L80917738 /* 021C4 80917BD4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 021C8 80917BD8 260402A0 */ addiu $a0, $s0, 0x02A0 ## $a0 = 000002A0 /* 021CC 80917BDC 8E05003C */ lw $a1, 0x003C($s0) ## 0000003C -/* 021D0 80917BE0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 021D0 80917BE0 0C01E107 */ jal Math_ApproachF /* 021D4 80917BE4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 021D8 80917BE8 860E01D2 */ lh $t6, 0x01D2($s0) ## 000001D2 @@ -1134,7 +1134,7 @@ glabel L80917738 /* 02234 80917C44 44052000 */ mfc1 $a1, $f4 /* 02238 80917C48 AFA40044 */ sw $a0, 0x0044($sp) /* 0223C 80917C4C 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 02240 80917C50 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02240 80917C50 0C01E0C4 */ jal Math_SmoothStepToF /* 02244 80917C54 E7A60010 */ swc1 $f6, 0x0010($sp) /* 02248 80917C58 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -1148,7 +1148,7 @@ glabel L80917738 /* 02268 80917C78 26040294 */ addiu $a0, $s0, 0x0294 ## $a0 = 00000294 /* 0226C 80917C7C 44058000 */ mfc1 $a1, $f16 /* 02270 80917C80 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 02274 80917C84 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02274 80917C84 0C01E0C4 */ jal Math_SmoothStepToF /* 02278 80917C88 E7B20010 */ swc1 $f18, 0x0010($sp) /* 0227C 80917C8C 3C01435C */ lui $at, 0x435C ## $at = 435C0000 @@ -1162,7 +1162,7 @@ glabel L80917738 /* 0229C 80917CAC 26040298 */ addiu $a0, $s0, 0x0298 ## $a0 = 00000298 /* 022A0 80917CB0 44054000 */ mfc1 $a1, $f8 /* 022A4 80917CB4 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 022A8 80917CB8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 022A8 80917CB8 0C01E0C4 */ jal Math_SmoothStepToF /* 022AC 80917CBC E7AA0010 */ swc1 $f10, 0x0010($sp) /* 022B0 80917CC0 861901D2 */ lh $t9, 0x01D2($s0) ## 000001D2 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s index e454c2534f..90b61808c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s @@ -107,7 +107,7 @@ glabel func_80917D98 /* 02464 80917E74 264400B4 */ addiu $a0, $s2, 0x00B4 ## $a0 = 000000B4 /* 02468 80917E78 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0246C 80917E7C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02470 80917E80 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 02470 80917E80 0C01E1EF */ jal Math_ApproachS /* 02474 80917E84 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 02478 80917E88 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C @@ -178,7 +178,7 @@ glabel func_80917D98 .L80917F74: /* 02564 80917F74 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 .L80917F78: -/* 02568 80917F78 0C03F66B */ jal Math_Rand_ZeroOne +/* 02568 80917F78 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0256C 80917F7C 00000000 */ nop /* 02570 80917F80 3C0142AA */ lui $at, 0x42AA ## $at = 42AA0000 @@ -204,7 +204,7 @@ glabel func_80917D98 /* 025C0 80917FD0 45020028 */ bc1fl .L80918074 /* 025C4 80917FD4 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 /* 025C8 80917FD8 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 025CC 80917FDC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 025CC 80917FDC 0C00CFC8 */ jal Rand_CenteredFloat /* 025D0 80917FE0 A7A300B6 */ sh $v1, 0x00B6($sp) /* 025D4 80917FE4 87A300B6 */ lh $v1, 0x00B6($sp) @@ -216,14 +216,14 @@ glabel func_80917D98 /* 025EC 80917FFC 024F8021 */ addu $s0, $s2, $t7 /* 025F0 80918000 C61202A8 */ lwc1 $f18, 0x02A8($s0) ## 000003F4 /* 025F4 80918004 46009100 */ add.s $f4, $f18, $f0 -/* 025F8 80918008 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 025F8 80918008 0C00CFC8 */ jal Rand_CenteredFloat /* 025FC 8091800C E7A40070 */ swc1 $f4, 0x0070($sp) /* 02600 80918010 C60602AC */ lwc1 $f6, 0x02AC($s0) ## 000003F8 /* 02604 80918014 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 02608 80918018 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 0260C 8091801C 46003200 */ add.s $f8, $f6, $f0 -/* 02610 80918020 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02610 80918020 0C00CFC8 */ jal Rand_CenteredFloat /* 02614 80918024 E7A80074 */ swc1 $f8, 0x0074($sp) /* 02618 80918028 C60A02B0 */ lwc1 $f10, 0x02B0($s0) ## 000003FC @@ -253,7 +253,7 @@ glabel func_80917D98 /* 02674 80918084 00000000 */ nop /* 02678 80918088 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 .L8091808C: -/* 0267C 8091808C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0267C 8091808C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02680 80918090 00000000 */ nop /* 02684 80918094 3C0142AA */ lui $at, 0x42AA ## $at = 42AA0000 @@ -279,7 +279,7 @@ glabel func_80917D98 /* 026D4 809180E4 4502002F */ bc1fl .L809181A4 /* 026D8 809180E8 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 /* 026DC 809180EC 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 026E0 809180F0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 026E0 809180F0 0C00CFC8 */ jal Rand_CenteredFloat /* 026E4 809180F4 A7A300B6 */ sh $v1, 0x00B6($sp) /* 026E8 809180F8 87A300B6 */ lh $v1, 0x00B6($sp) @@ -291,19 +291,19 @@ glabel func_80917D98 /* 02700 80918110 02588021 */ addu $s0, $s2, $t8 /* 02704 80918114 C61002A8 */ lwc1 $f16, 0x02A8($s0) ## 000003F4 /* 02708 80918118 46008480 */ add.s $f18, $f16, $f0 -/* 0270C 8091811C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0270C 8091811C 0C00CFC8 */ jal Rand_CenteredFloat /* 02710 80918120 E7B20070 */ swc1 $f18, 0x0070($sp) /* 02714 80918124 C60402AC */ lwc1 $f4, 0x02AC($s0) ## 000003F8 /* 02718 80918128 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0271C 8091812C 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 02720 80918130 46002180 */ add.s $f6, $f4, $f0 -/* 02724 80918134 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02724 80918134 0C00CFC8 */ jal Rand_CenteredFloat /* 02728 80918138 E7A60074 */ swc1 $f6, 0x0074($sp) /* 0272C 8091813C C60802B0 */ lwc1 $f8, 0x02B0($s0) ## 000003FC /* 02730 80918140 46004280 */ add.s $f10, $f8, $f0 -/* 02734 80918144 0C03F66B */ jal Math_Rand_ZeroOne +/* 02734 80918144 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02738 80918148 E7AA0078 */ swc1 $f10, 0x0078($sp) /* 0273C 8091814C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -395,7 +395,7 @@ glabel func_80917D98 /* 02884 80918294 460E7102 */ mul.s $f4, $f14, $f14 /* 02888 80918298 46049000 */ add.s $f0, $f18, $f4 /* 0288C 8091829C 46000004 */ sqrt.s $f0, $f0 -/* 02890 809182A0 0C03F494 */ jal Math_atan2f +/* 02890 809182A0 0C03F494 */ jal Math_FAtan2F /* 02894 809182A4 E6400228 */ swc1 $f0, 0x0228($s2) ## 00000228 /* 02898 809182A8 240F010E */ addiu $t7, $zero, 0x010E ## $t7 = 0000010E /* 0289C 809182AC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -404,7 +404,7 @@ glabel func_80917D98 /* 028A8 809182B8 100001E1 */ beq $zero, $zero, .L80918A40 /* 028AC 809182BC 02611821 */ addu $v1, $s3, $at .L809182C0: -/* 028B0 809182C0 0C01DE1C */ jal Math_Sins +/* 028B0 809182C0 0C01DE1C */ jal Math_SinS ## sins? /* 028B4 809182C4 864400B6 */ lh $a0, 0x00B6($s2) ## 000000B6 /* 028B8 809182C8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -412,7 +412,7 @@ glabel func_80917D98 /* 028C0 809182D0 00000000 */ nop /* 028C4 809182D4 46060202 */ mul.s $f8, $f0, $f6 /* 028C8 809182D8 E7A800BC */ swc1 $f8, 0x00BC($sp) -/* 028CC 809182DC 0C01DE0D */ jal Math_Coss +/* 028CC 809182DC 0C01DE0D */ jal Math_CosS ## coss? /* 028D0 809182E0 864400B6 */ lh $a0, 0x00B6($s2) ## 000000B6 /* 028D4 809182E4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -426,7 +426,7 @@ glabel func_80917D98 /* 028F4 80918304 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 028F8 80918308 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 /* 028FC 8091830C 44059000 */ mfc1 $a1, $f18 -/* 02900 80918310 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02900 80918310 0C01E107 */ jal Math_ApproachF /* 02904 80918314 E7AE00B8 */ swc1 $f14, 0x00B8($sp) /* 02908 80918318 C7AE00B8 */ lwc1 $f14, 0x00B8($sp) @@ -437,7 +437,7 @@ glabel func_80917D98 /* 0291C 8091832C 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 02920 80918330 2484002C */ addiu $a0, $a0, 0x002C ## $a0 = 0000002C /* 02924 80918334 44053000 */ mfc1 $a1, $f6 -/* 02928 80918338 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02928 80918338 0C01E107 */ jal Math_ApproachF /* 0292C 8091833C 00000000 */ nop /* 02930 80918340 864201D2 */ lh $v0, 0x01D2($s2) ## 000001D2 @@ -473,7 +473,7 @@ glabel func_80917D98 /* 0299C 809183AC 31090003 */ andi $t1, $t0, 0x0003 ## $t1 = 00000000 /* 029A0 809183B0 1520000B */ bne $t1, $zero, .L809183E0 /* 029A4 809183B4 00000000 */ nop -/* 029A8 809183B8 0C03F66B */ jal Math_Rand_ZeroOne +/* 029A8 809183B8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 029AC 809183BC 00000000 */ nop /* 029B0 809183C0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -494,7 +494,7 @@ glabel func_80917D98 /* 029E8 809183F8 26440228 */ addiu $a0, $s2, 0x0228 ## $a0 = 00000228 /* 029EC 809183FC 3C054316 */ lui $a1, 0x4316 ## $a1 = 43160000 /* 029F0 80918400 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 029F4 80918404 0C01E107 */ jal Math_SmoothScaleMaxF +/* 029F4 80918404 0C01E107 */ jal Math_ApproachF /* 029F8 80918408 E652022C */ swc1 $f18, 0x022C($s2) ## 0000022C /* 029FC 8091840C 0C0400A4 */ jal sinf @@ -519,7 +519,7 @@ glabel func_80917D98 /* 02A40 80918450 E7AE00B8 */ swc1 $f14, 0x00B8($sp) /* 02A44 80918454 26440290 */ addiu $a0, $s2, 0x0290 ## $a0 = 00000290 /* 02A48 80918458 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 02A4C 8091845C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02A4C 8091845C 0C01E0C4 */ jal Math_SmoothStepToF /* 02A50 80918460 E7B20010 */ swc1 $f18, 0x0010($sp) /* 02A54 80918464 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -533,7 +533,7 @@ glabel func_80917D98 /* 02A74 80918484 26440294 */ addiu $a0, $s2, 0x0294 ## $a0 = 00000294 /* 02A78 80918488 44054000 */ mfc1 $a1, $f8 /* 02A7C 8091848C 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 02A80 80918490 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02A80 80918490 0C01E0C4 */ jal Math_SmoothStepToF /* 02A84 80918494 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 02A88 80918498 C7AE00B8 */ lwc1 $f14, 0x00B8($sp) @@ -546,7 +546,7 @@ glabel func_80917D98 /* 02AA4 809184B4 26440298 */ addiu $a0, $s2, 0x0298 ## $a0 = 00000298 /* 02AA8 809184B8 44059000 */ mfc1 $a1, $f18 /* 02AAC 809184BC 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 02AB0 809184C0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02AB0 809184C0 0C01E0C4 */ jal Math_SmoothStepToF /* 02AB4 809184C4 E7A40010 */ swc1 $f4, 0x0010($sp) /* 02AB8 809184C8 3C018092 */ lui $at, %hi(D_8091B544) ## $at = 80920000 @@ -556,7 +556,7 @@ glabel func_80917D98 /* 02AC8 809184D8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 02ACC 809184DC 2644029C */ addiu $a0, $s2, 0x029C ## $a0 = 0000029C /* 02AD0 809184E0 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 02AD4 809184E4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02AD4 809184E4 0C01E0C4 */ jal Math_SmoothStepToF /* 02AD8 809184E8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 02ADC 809184EC 3C018092 */ lui $at, %hi(D_8091B548) ## $at = 80920000 @@ -565,7 +565,7 @@ glabel func_80917D98 /* 02AE8 809184F8 264402A0 */ addiu $a0, $s2, 0x02A0 ## $a0 = 000002A0 /* 02AEC 809184FC 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 02AF0 80918500 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 02AF4 80918504 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02AF4 80918504 0C01E0C4 */ jal Math_SmoothStepToF /* 02AF8 80918508 E7A80010 */ swc1 $f8, 0x0010($sp) /* 02AFC 8091850C 3C018092 */ lui $at, %hi(D_8091B54C) ## $at = 80920000 @@ -575,7 +575,7 @@ glabel func_80917D98 /* 02B0C 8091851C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 02B10 80918520 264402A4 */ addiu $a0, $s2, 0x02A4 ## $a0 = 000002A4 /* 02B14 80918524 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 02B18 80918528 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02B18 80918528 0C01E0C4 */ jal Math_SmoothStepToF /* 02B1C 8091852C E7AA0010 */ swc1 $f10, 0x0010($sp) /* 02B20 80918530 864201D4 */ lh $v0, 0x01D4($s2) ## 000001D4 @@ -633,7 +633,7 @@ glabel func_80917D98 /* 02BDC 809185EC 26440290 */ addiu $a0, $s2, 0x0290 ## $a0 = 00000290 /* 02BE0 809185F0 E7B00010 */ swc1 $f16, 0x0010($sp) /* 02BE4 809185F4 44075000 */ mfc1 $a3, $f10 -/* 02BE8 809185F8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02BE8 809185F8 0C01E0C4 */ jal Math_SmoothStepToF /* 02BEC 809185FC 00000000 */ nop /* 02BF0 80918600 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -648,7 +648,7 @@ glabel func_80917D98 /* 02C14 80918624 26440294 */ addiu $a0, $s2, 0x0294 ## $a0 = 00000294 /* 02C18 80918628 E7A80010 */ swc1 $f8, 0x0010($sp) /* 02C1C 8091862C 44073000 */ mfc1 $a3, $f6 -/* 02C20 80918630 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02C20 80918630 0C01E0C4 */ jal Math_SmoothStepToF /* 02C24 80918634 00000000 */ nop /* 02C28 80918638 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -663,7 +663,7 @@ glabel func_80917D98 /* 02C4C 8091865C 26440298 */ addiu $a0, $s2, 0x0298 ## $a0 = 00000298 /* 02C50 80918660 E7A40010 */ swc1 $f4, 0x0010($sp) /* 02C54 80918664 44079000 */ mfc1 $a3, $f18 -/* 02C58 80918668 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02C58 80918668 0C01E0C4 */ jal Math_SmoothStepToF /* 02C5C 8091866C 00000000 */ nop /* 02C60 80918670 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -678,7 +678,7 @@ glabel func_80917D98 /* 02C84 80918694 2644029C */ addiu $a0, $s2, 0x029C ## $a0 = 0000029C /* 02C88 80918698 E7B00010 */ swc1 $f16, 0x0010($sp) /* 02C8C 8091869C 44075000 */ mfc1 $a3, $f10 -/* 02C90 809186A0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02C90 809186A0 0C01E0C4 */ jal Math_SmoothStepToF /* 02C94 809186A4 00000000 */ nop /* 02C98 809186A8 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -693,7 +693,7 @@ glabel func_80917D98 /* 02CBC 809186CC 264402A0 */ addiu $a0, $s2, 0x02A0 ## $a0 = 000002A0 /* 02CC0 809186D0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 02CC4 809186D4 44073000 */ mfc1 $a3, $f6 -/* 02CC8 809186D8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02CC8 809186D8 0C01E0C4 */ jal Math_SmoothStepToF /* 02CCC 809186DC 00000000 */ nop /* 02CD0 809186E0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -708,7 +708,7 @@ glabel func_80917D98 /* 02CF4 80918704 264402A4 */ addiu $a0, $s2, 0x02A4 ## $a0 = 000002A4 /* 02CF8 80918708 E7A40010 */ swc1 $f4, 0x0010($sp) /* 02CFC 8091870C 44079000 */ mfc1 $a3, $f18 -/* 02D00 80918710 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02D00 80918710 0C01E0C4 */ jal Math_SmoothStepToF /* 02D04 80918714 00000000 */ nop /* 02D08 80918718 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -719,7 +719,7 @@ glabel func_80917D98 /* 02D1C 8091872C 44061000 */ mfc1 $a2, $f2 /* 02D20 80918730 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 02D24 80918734 26440220 */ addiu $a0, $s2, 0x0220 ## $a0 = 00000220 -/* 02D28 80918738 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02D28 80918738 0C01E0C4 */ jal Math_SmoothStepToF /* 02D2C 8091873C E7A60010 */ swc1 $f6, 0x0010($sp) /* 02D30 80918740 864D01D4 */ lh $t5, 0x01D4($s2) ## 000001D4 @@ -781,7 +781,7 @@ glabel func_80917D98 /* 02E08 80918818 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 .L8091881C: /* 02E0C 8091881C 44816000 */ mtc1 $at, $f12 ## $f12 = 400.00 -/* 02E10 80918820 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02E10 80918820 0C00CFC8 */ jal Rand_CenteredFloat /* 02E14 80918824 00000000 */ nop /* 02E18 80918828 3C01C316 */ lui $at, 0xC316 ## $at = C3160000 @@ -789,7 +789,7 @@ glabel func_80917D98 /* 02E20 80918830 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 02E24 80918834 44816000 */ mtc1 $at, $f12 ## $f12 = 400.00 /* 02E28 80918838 46040180 */ add.s $f6, $f0, $f4 -/* 02E2C 8091883C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02E2C 8091883C 0C00CFC8 */ jal Rand_CenteredFloat /* 02E30 80918840 E7A6005C */ swc1 $f6, 0x005C($sp) /* 02E34 80918844 3C01C3AF */ lui $at, 0xC3AF ## $at = C3AF0000 @@ -880,7 +880,7 @@ glabel func_80917D98 /* 02F60 80918970 3C073A44 */ lui $a3, 0x3A44 ## $a3 = 3A440000 /* 02F64 80918974 44061000 */ mfc1 $a2, $f2 /* 02F68 80918978 34E79BA6 */ ori $a3, $a3, 0x9BA6 ## $a3 = 3A449BA6 -/* 02F6C 8091897C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02F6C 8091897C 0C01E0C4 */ jal Math_SmoothStepToF /* 02F70 80918980 E7A60010 */ swc1 $f6, 0x0010($sp) /* 02F74 80918984 3C018092 */ lui $at, %hi(D_8091B568) ## $at = 80920000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918C08.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918C08.s index 2a2bf231c7..25d96a7645 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918C08.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918C08.s @@ -15,7 +15,7 @@ glabel func_80918C08 /* 03214 80918C24 AFA40020 */ sw $a0, 0x0020($sp) /* 03218 80918C28 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0321C 80918C2C 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 03220 80918C30 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 03220 80918C30 0C01E123 */ jal Math_ApproachZeroF /* 03224 80918C34 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 03228 80918C38 3C018092 */ lui $at, %hi(D_8091B56C) ## $at = 80920000 @@ -38,7 +38,7 @@ glabel func_80918C08 /* 0326C 80918C7C 00052C03 */ sra $a1, $a1, 16 /* 03270 80918C80 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 03274 80918C84 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 03278 80918C88 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 03278 80918C88 0C01E1EF */ jal Math_ApproachS /* 0327C 80918C8C 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 .L80918C90: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918D6C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918D6C.s index b5c453adc9..239d8fbc7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918D6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918D6C.s @@ -95,7 +95,7 @@ glabel func_80918D6C /* 034AC 80918EBC 860C01D2 */ lh $t4, 0x01D2($s0) ## 000001D2 /* 034B0 80918EC0 55800037 */ bnel $t4, $zero, .L80918FA0 /* 034B4 80918EC4 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 034B8 80918EC8 0C03F66B */ jal Math_Rand_ZeroOne +/* 034B8 80918EC8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 034BC 80918ECC 00000000 */ nop /* 034C0 80918ED0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918FBC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918FBC.s index 745335032a..447e26041b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918FBC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918FBC.s @@ -31,7 +31,7 @@ glabel func_80918FBC /* 03614 80919024 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD /* 03618 80919028 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3ECCCCCD /* 0361C 8091902C 260401F8 */ addiu $a0, $s0, 0x01F8 ## $a0 = 000001F8 -/* 03620 80919030 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03620 80919030 0C01E107 */ jal Math_ApproachF /* 03624 80919034 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 03628 80919038 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919150.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919150.s index 69648f0bf8..ed3811b909 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919150.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919150.s @@ -37,7 +37,7 @@ glabel func_80919150 .L809191D0: /* 037C0 809191D0 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 037C4 809191D4 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 037C8 809191D8 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 037C8 809191D8 0C01E123 */ jal Math_ApproachZeroF /* 037CC 809191DC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 037D0 809191E0 860A01D2 */ lh $t2, 0x01D2($s0) ## 000001D2 @@ -61,7 +61,7 @@ glabel func_80919150 .L80919228: /* 03818 80919228 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0381C 8091922C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 03820 80919230 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 03820 80919230 0C01E1EF */ jal Math_ApproachS /* 03824 80919234 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 03828 80919238 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 @@ -71,7 +71,7 @@ glabel func_80919150 /* 03838 80919248 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD /* 0383C 8091924C 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3ECCCCCD /* 03840 80919250 260401F8 */ addiu $a0, $s0, 0x01F8 ## $a0 = 000001F8 -/* 03844 80919254 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03844 80919254 0C01E107 */ jal Math_ApproachF /* 03848 80919258 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 0384C 8091925C 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919278.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919278.s index 989c435ad7..707381e7b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919278.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919278.s @@ -10,7 +10,7 @@ glabel func_80919278 /* 03884 80919294 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 03888 80919298 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0388C 8091929C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 03890 809192A0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 03890 809192A0 0C01E1EF */ jal Math_ApproachS /* 03894 809192A4 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 03898 809192A8 8FAE0024 */ lw $t6, 0x0024($sp) @@ -21,7 +21,7 @@ glabel func_80919278 /* 038AC 809192BC 00052C03 */ sra $a1, $a1, 16 /* 038B0 809192C0 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 038B4 809192C4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 038B8 809192C8 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 038B8 809192C8 0C01E1EF */ jal Math_ApproachS /* 038BC 809192CC 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 038C0 809192D0 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091932C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091932C.s index fcb93c6934..dab458c458 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091932C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091932C.s @@ -10,7 +10,7 @@ glabel func_8091932C /* 03938 80919348 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0393C 8091934C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03940 80919350 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 03944 80919354 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 03944 80919354 0C01E1EF */ jal Math_ApproachS /* 03948 80919358 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 0394C 8091935C 8FAE0024 */ lw $t6, 0x0024($sp) @@ -21,7 +21,7 @@ glabel func_8091932C /* 03960 80919370 00052C03 */ sra $a1, $a1, 16 /* 03964 80919374 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 03968 80919378 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 0396C 8091937C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0396C 8091937C 0C01E1EF */ jal Math_ApproachS /* 03970 80919380 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 03974 80919384 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809193EC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809193EC.s index 07e4072f83..c829ca6a11 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809193EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809193EC.s @@ -18,7 +18,7 @@ glabel func_809193EC /* 03A14 80919424 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 .L80919428: /* 03A18 80919428 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 03A1C 8091942C 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 03A1C 8091942C 0C01E123 */ jal Math_ApproachZeroF /* 03A20 80919430 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 03A24 80919434 861801B2 */ lh $t8, 0x01B2($s0) ## 000001B2 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809195A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809195A4.s index 10a6477ce6..64044e49da 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809195A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809195A4.s @@ -9,13 +9,13 @@ glabel func_809195A4 /* 03BAC 809195BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 03BB0 809195C0 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 03BB4 809195C4 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 03BB8 809195C8 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 03BB8 809195C8 0C01E123 */ jal Math_ApproachZeroF /* 03BBC 809195CC 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 03BC0 809195D0 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 03BC4 809195D4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03BC8 809195D8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 03BCC 809195DC 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 03BCC 809195DC 0C01E1EF */ jal Math_ApproachS /* 03BD0 809195E0 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 03BD4 809195E4 860E01D2 */ lh $t6, 0x01D2($s0) ## 000001D2 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091960C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091960C.s index c90dfc5401..b73f0ed403 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091960C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091960C.s @@ -10,7 +10,7 @@ glabel func_8091960C /* 03C18 80919628 8FA70018 */ lw $a3, 0x0018($sp) /* 03C1C 8091962C 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 /* 03C20 80919630 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 03C24 80919634 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 03C24 80919634 0C01E123 */ jal Math_ApproachZeroF /* 03C28 80919638 24E40068 */ addiu $a0, $a3, 0x0068 ## $a0 = 00000068 /* 03C2C 8091963C 8FA70018 */ lw $a3, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919704.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919704.s index b4bc8450d8..59a3372460 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919704.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919704.s @@ -97,13 +97,13 @@ glabel func_80919704 /* 03E44 80919854 34A55555 */ ori $a1, $a1, 0x5555 ## $a1 = 40555555 /* 03E48 80919858 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 03E4C 8091985C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 03E50 80919860 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03E50 80919860 0C01E107 */ jal Math_ApproachF /* 03E54 80919864 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 03E58 80919868 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 03E5C 8091986C 87A50026 */ lh $a1, 0x0026($sp) /* 03E60 80919870 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 03E64 80919874 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 03E64 80919874 0C01E1EF */ jal Math_ApproachS /* 03E68 80919878 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 03E6C 8091987C 10000025 */ beq $zero, $zero, .L80919914 @@ -117,7 +117,7 @@ glabel func_80919704 /* 03E88 80919898 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 03E8C 8091989C 3C05C120 */ lui $a1, 0xC120 ## $a1 = C1200000 /* 03E90 809198A0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 03E94 809198A4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03E94 809198A4 0C01E107 */ jal Math_ApproachF /* 03E98 809198A8 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 03E9C 809198AC 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 @@ -132,7 +132,7 @@ glabel func_80919704 /* 03EC0 809198D0 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 .L809198D4: /* 03EC4 809198D4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 03EC8 809198D8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03EC8 809198D8 0C01E107 */ jal Math_ApproachF /* 03ECC 809198DC 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 03ED0 809198E0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 @@ -147,7 +147,7 @@ glabel func_80919704 .L80919900: /* 03EF0 80919900 87A50026 */ lh $a1, 0x0026($sp) /* 03EF4 80919904 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 03EF8 80919908 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 03EF8 80919908 0C01E1EF */ jal Math_ApproachS /* 03EFC 8091990C 240709C4 */ addiu $a3, $zero, 0x09C4 ## $a3 = 000009C4 .L80919910: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919974.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919974.s index 55165cf02f..55c23b1e89 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919974.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919974.s @@ -19,13 +19,13 @@ glabel func_80919974 .L809199B0: /* 03FA0 809199B0 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 /* 03FA4 809199B4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 03FA8 809199B8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03FA8 809199B8 0C01E107 */ jal Math_ApproachF /* 03FAC 809199BC 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 03FB0 809199C0 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 03FB4 809199C4 2405C000 */ addiu $a1, $zero, 0xC000 ## $a1 = FFFFC000 /* 03FB8 809199C8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 03FBC 809199CC 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 03FBC 809199CC 0C01E1EF */ jal Math_ApproachS /* 03FC0 809199D0 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 03FC4 809199D4 8605007E */ lh $a1, 0x007E($s0) ## 0000007E @@ -35,7 +35,7 @@ glabel func_80919974 /* 03FD4 809199E4 00052C00 */ sll $a1, $a1, 16 /* 03FD8 809199E8 00052C03 */ sra $a1, $a1, 16 /* 03FDC 809199EC 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 03FE0 809199F0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 03FE0 809199F0 0C01E1EF */ jal Math_ApproachS /* 03FE4 809199F4 240705DC */ addiu $a3, $zero, 0x05DC ## $a3 = 000005DC /* 03FE8 809199F8 3C01C3A0 */ lui $at, 0xC3A0 ## $at = C3A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919A40.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919A40.s index 125641a8e8..0a9f01e041 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919A40.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919A40.s @@ -21,7 +21,7 @@ glabel func_80919A40 .L80919A88: /* 04078 80919A88 24058000 */ addiu $a1, $zero, 0x8000 ## $a1 = FFFF8000 /* 0407C 80919A8C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 04080 80919A90 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 04080 80919A90 0C01E1EF */ jal Math_ApproachS /* 04084 80919A94 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 04088 80919A98 96390088 */ lhu $t9, 0x0088($s1) ## 00000088 @@ -63,15 +63,15 @@ glabel func_80919A40 .L80919B1C: /* 0410C 80919B1C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 04110 80919B20 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 04114 80919B24 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 04114 80919B24 0C00CFC8 */ jal Rand_CenteredFloat /* 04118 80919B28 00000000 */ nop -/* 0411C 80919B2C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0411C 80919B2C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 04120 80919B30 E7A00028 */ swc1 $f0, 0x0028($sp) /* 04124 80919B34 00102400 */ sll $a0, $s0, 16 /* 04128 80919B38 00042403 */ sra $a0, $a0, 16 -/* 0412C 80919B3C 0C01DE0D */ jal Math_Coss +/* 0412C 80919B3C 0C01DE0D */ jal Math_CosS ## coss? /* 04130 80919B40 E7A0002C */ swc1 $f0, 0x002C($sp) /* 04134 80919B44 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -86,15 +86,15 @@ glabel func_80919A40 /* 04158 80919B68 46080282 */ mul.s $f10, $f0, $f8 /* 0415C 80919B6C 46105480 */ add.s $f18, $f10, $f16 /* 04160 80919B70 46122180 */ add.s $f6, $f4, $f18 -/* 04164 80919B74 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 04164 80919B74 0C00CFC8 */ jal Rand_CenteredFloat /* 04168 80919B78 E626002C */ swc1 $f6, 0x002C($s1) ## 0000002C -/* 0416C 80919B7C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0416C 80919B7C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 04170 80919B80 E7A00028 */ swc1 $f0, 0x0028($sp) /* 04174 80919B84 00102400 */ sll $a0, $s0, 16 /* 04178 80919B88 00042403 */ sra $a0, $a0, 16 -/* 0417C 80919B8C 0C01DE1C */ jal Math_Sins +/* 0417C 80919B8C 0C01DE1C */ jal Math_SinS ## sins? /* 04180 80919B90 E7A0002C */ swc1 $f0, 0x002C($sp) /* 04184 80919B94 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919C38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919C38.s index 2337276d03..ae1a3ea8b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919C38.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919C38.s @@ -27,7 +27,7 @@ glabel func_80919C38 /* 04274 80919C84 314B000F */ andi $t3, $t2, 0x000F ## $t3 = 00000000 /* 04278 80919C88 5560000C */ bnel $t3, $zero, .L80919CBC /* 0427C 80919C8C 860D01A4 */ lh $t5, 0x01A4($s0) ## 000001A4 -/* 04280 80919C90 0C03F66B */ jal Math_Rand_ZeroOne +/* 04280 80919C90 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 04284 80919C94 00000000 */ nop /* 04288 80919C98 3C018092 */ lui $at, %hi(D_8091B570) ## $at = 80920000 @@ -62,25 +62,25 @@ glabel func_80919C38 /* 042EC 80919CFC A619019C */ sh $t9, 0x019C($s0) ## 0000019C /* 042F0 80919D00 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 042F4 80919D04 2405F568 */ addiu $a1, $zero, 0xF568 ## $a1 = FFFFF568 -/* 042F8 80919D08 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 042F8 80919D08 0C01E1EF */ jal Math_ApproachS /* 042FC 80919D0C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 04300 80919D10 2604019A */ addiu $a0, $s0, 0x019A ## $a0 = 0000019A /* 04304 80919D14 24051600 */ addiu $a1, $zero, 0x1600 ## $a1 = 00001600 /* 04308 80919D18 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0430C 80919D1C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0430C 80919D1C 0C01E1EF */ jal Math_ApproachS /* 04310 80919D20 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 04314 80919D24 10000009 */ beq $zero, $zero, .L80919D4C /* 04318 80919D28 860901B4 */ lh $t1, 0x01B4($s0) ## 000001B4 .L80919D2C: -/* 0431C 80919D2C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0431C 80919D2C 0C01E1EF */ jal Math_ApproachS /* 04320 80919D30 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 04324 80919D34 2604019A */ addiu $a0, $s0, 0x019A ## $a0 = 0000019A /* 04328 80919D38 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0432C 80919D3C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 04330 80919D40 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 04330 80919D40 0C01E1EF */ jal Math_ApproachS /* 04334 80919D44 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 04338 80919D48 860901B4 */ lh $t1, 0x01B4($s0) ## 000001B4 @@ -130,26 +130,26 @@ glabel func_80919C38 /* 043D8 80919DE8 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 043DC 80919DEC 2405E890 */ addiu $a1, $zero, 0xE890 ## $a1 = FFFFE890 .L80919DF0: -/* 043E0 80919DF0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 043E0 80919DF0 0C01E1EF */ jal Math_ApproachS /* 043E4 80919DF4 A7A80026 */ sh $t0, 0x0026($sp) /* 043E8 80919DF8 2604019E */ addiu $a0, $s0, 0x019E ## $a0 = 0000019E /* 043EC 80919DFC 87A50026 */ lh $a1, 0x0026($sp) /* 043F0 80919E00 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 043F4 80919E04 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 043F4 80919E04 0C01E1EF */ jal Math_ApproachS /* 043F8 80919E08 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 043FC 80919E0C 1000000A */ beq $zero, $zero, .L80919E38 /* 04400 80919E10 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 .L80919E14: /* 04404 80919E14 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 04408 80919E18 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 04408 80919E18 0C01E1EF */ jal Math_ApproachS /* 0440C 80919E1C 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 04410 80919E20 2604019E */ addiu $a0, $s0, 0x019E ## $a0 = 0000019E /* 04414 80919E24 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04418 80919E28 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 0441C 80919E2C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0441C 80919E2C 0C01E1EF */ jal Math_ApproachS /* 04420 80919E30 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 04424 80919E34 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 @@ -158,7 +158,7 @@ glabel func_80919C38 /* 0442C 80919E3C 34E75C29 */ ori $a3, $a3, 0x5C29 ## $a3 = 3D8F5C29 /* 04430 80919E40 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 04434 80919E44 260401F8 */ addiu $a0, $s0, 0x01F8 ## $a0 = 000001F8 -/* 04438 80919E48 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04438 80919E48 0C01E107 */ jal Math_ApproachF /* 0443C 80919E4C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 04440 80919E50 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 @@ -166,7 +166,7 @@ glabel func_80919C38 /* 04448 80919E58 34E75C29 */ ori $a3, $a3, 0x5C29 ## $a3 = 3D8F5C29 /* 0444C 80919E5C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 04450 80919E60 26040224 */ addiu $a0, $s0, 0x0224 ## $a0 = 00000224 -/* 04454 80919E64 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04454 80919E64 0C01E107 */ jal Math_ApproachF /* 04458 80919E68 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 0445C 80919E6C 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919E80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919E80.s index 582c97ffad..ebf6fb5629 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919E80.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919E80.s @@ -52,7 +52,7 @@ glabel func_80919E80 /* 04510 80919F20 4406A000 */ mfc1 $a2, $f20 /* 04514 80919F24 4407B000 */ mfc1 $a3, $f22 /* 04518 80919F28 A44A01AA */ sh $t2, 0x01AA($v0) ## 000001AA -/* 0451C 80919F2C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0451C 80919F2C 0C01E107 */ jal Math_ApproachF /* 04520 80919F30 248401E8 */ addiu $a0, $a0, 0x01E8 ## $a0 = 000001E8 /* 04524 80919F34 10000007 */ beq $zero, $zero, .L80919F54 @@ -61,7 +61,7 @@ glabel func_80919E80 /* 0452C 80919F3C 4405D000 */ mfc1 $a1, $f26 /* 04530 80919F40 4406A000 */ mfc1 $a2, $f20 /* 04534 80919F44 4407B000 */ mfc1 $a3, $f22 -/* 04538 80919F48 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04538 80919F48 0C01E107 */ jal Math_ApproachF /* 0453C 80919F4C 248401E8 */ addiu $a0, $a0, 0x01E8 ## $a0 = 000001E8 /* 04540 80919F50 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000002 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A16C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A16C.s index 39cc34d8eb..aa7ee52b71 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A16C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A16C.s @@ -13,19 +13,19 @@ glabel func_8091A16C /* 04788 8091A198 31CF0010 */ andi $t7, $t6, 0x0010 ## $t7 = 00000000 /* 0478C 8091A19C 11E0000F */ beq $t7, $zero, .L8091A1DC /* 04790 8091A1A0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 04794 8091A1A4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04794 8091A1A4 0C01E107 */ jal Math_ApproachF /* 04798 8091A1A8 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 0479C 8091A1AC 26040208 */ addiu $a0, $s0, 0x0208 ## $a0 = 00000208 /* 047A0 8091A1B0 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 /* 047A4 8091A1B4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 047A8 8091A1B8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 047A8 8091A1B8 0C01E107 */ jal Math_ApproachF /* 047AC 8091A1BC 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 047B0 8091A1C0 2604020C */ addiu $a0, $s0, 0x020C ## $a0 = 0000020C /* 047B4 8091A1C4 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 /* 047B8 8091A1C8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 047BC 8091A1CC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 047BC 8091A1CC 0C01E107 */ jal Math_ApproachF /* 047C0 8091A1D0 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 047C4 8091A1D4 10000040 */ beq $zero, $zero, .L8091A2D8 @@ -72,7 +72,7 @@ glabel func_8091A16C /* 04858 8091A268 00AB2821 */ addu $a1, $a1, $t3 /* 0485C 8091A26C 8CA5B31C */ lw $a1, %lo(D_8091B31C)($a1) /* 04860 8091A270 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 04864 8091A274 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04864 8091A274 0C01E107 */ jal Math_ApproachF /* 04868 8091A278 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 0486C 8091A27C 860C01B8 */ lh $t4, 0x01B8($s0) ## 000001B8 @@ -84,7 +84,7 @@ glabel func_8091A16C /* 04884 8091A294 00AD2821 */ addu $a1, $a1, $t5 /* 04888 8091A298 8CA5B320 */ lw $a1, %lo(D_8091B320)($a1) /* 0488C 8091A29C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 04890 8091A2A0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04890 8091A2A0 0C01E107 */ jal Math_ApproachF /* 04894 8091A2A4 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 04898 8091A2A8 860E01B8 */ lh $t6, 0x01B8($s0) ## 000001B8 @@ -96,7 +96,7 @@ glabel func_8091A16C /* 048B0 8091A2C0 00AF2821 */ addu $a1, $a1, $t7 /* 048B4 8091A2C4 8CA5B324 */ lw $a1, %lo(D_8091B324)($a1) /* 048B8 8091A2C8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 048BC 8091A2CC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 048BC 8091A2CC 0C01E107 */ jal Math_ApproachF /* 048C0 8091A2D0 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 .L8091A2D4: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A2E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A2E8.s index b33f8f614b..41121c2aac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A2E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A2E8.s @@ -12,7 +12,7 @@ glabel func_8091A2E8 /* 04900 8091A310 00AF2821 */ addu $a1, $a1, $t7 /* 04904 8091A314 8CA5B3AC */ lw $a1, %lo(D_8091B3AC)($a1) /* 04908 8091A318 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 0490C 8091A31C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0490C 8091A31C 0C01E107 */ jal Math_ApproachF /* 04910 8091A320 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 04914 8091A324 861801B8 */ lh $t8, 0x01B8($s0) ## 000001B8 @@ -24,7 +24,7 @@ glabel func_8091A2E8 /* 0492C 8091A33C 00B92821 */ addu $a1, $a1, $t9 /* 04930 8091A340 8CA5B3B0 */ lw $a1, %lo(D_8091B3B0)($a1) /* 04934 8091A344 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 04938 8091A348 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04938 8091A348 0C01E107 */ jal Math_ApproachF /* 0493C 8091A34C 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 04940 8091A350 860801B8 */ lh $t0, 0x01B8($s0) ## 000001B8 @@ -36,7 +36,7 @@ glabel func_8091A2E8 /* 04958 8091A368 00A92821 */ addu $a1, $a1, $t1 /* 0495C 8091A36C 8CA5B3B4 */ lw $a1, %lo(D_8091B3B4)($a1) /* 04960 8091A370 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 04964 8091A374 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04964 8091A374 0C01E107 */ jal Math_ApproachF /* 04968 8091A378 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 0496C 8091A37C 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s index 85ac952564..231f1ad86e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s @@ -138,13 +138,13 @@ glabel L8091A660 /* 04C84 8091A694 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 04C88 8091A698 AD2D02C0 */ sw $t5, 0x02C0($t1) ## 000002C0 /* 04C8C 8091A69C AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -/* 04C90 8091A6A0 0C03F66B */ jal Math_Rand_ZeroOne +/* 04C90 8091A6A0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 04C94 8091A6A4 AFA20040 */ sw $v0, 0x0040($sp) -/* 04C98 8091A6A8 0C03F66B */ jal Math_Rand_ZeroOne +/* 04C98 8091A6A8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 04C9C 8091A6AC E7A0001C */ swc1 $f0, 0x001C($sp) -/* 04CA0 8091A6B0 0C03F66B */ jal Math_Rand_ZeroOne +/* 04CA0 8091A6B0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 04CA4 8091A6B4 E7A00020 */ swc1 $f0, 0x0020($sp) /* 04CA8 8091A6B8 3C01437F */ lui $at, 0x437F ## $at = 437F0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Draw.s index 8d17cecc49..49ac6a2cba 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Draw.s @@ -124,7 +124,7 @@ glabel BossMo_Draw /* 091C8 80924CC8 00812023 */ subu $a0, $a0, $at /* 091CC 80924CCC 00042200 */ sll $a0, $a0, 8 /* 091D0 80924CD0 00042400 */ sll $a0, $a0, 16 -/* 091D4 80924CD4 0C01DE1C */ jal Math_Sins +/* 091D4 80924CD4 0C01DE1C */ jal Math_SinS ## sins? /* 091D8 80924CD8 00042403 */ sra $a0, $a0, 16 /* 091DC 80924CDC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Update.s index 032928ffec..d56ff5abfb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Update.s @@ -70,13 +70,13 @@ glabel BossMo_Update /* 07520 80923020 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 07524 80923024 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 07528 80923028 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 0752C 8092302C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0752C 8092302C 0C01E1EF */ jal Math_ApproachS /* 07530 80923030 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 07534 80923034 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 /* 07538 80923038 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0753C 8092303C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 07540 80923040 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 07540 80923040 0C01E1EF */ jal Math_ApproachS /* 07544 80923044 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 07548 80923048 864D016A */ lh $t5, 0x016A($s2) ## 0000016A @@ -101,7 +101,7 @@ glabel BossMo_Update /* 07590 80923090 25F8F448 */ addiu $t8, $t7, 0xF448 ## $t8 = FFFFF448 /* 07594 80923094 A658016C */ sh $t8, 0x016C($s2) ## 0000016C /* 07598 80923098 8644016C */ lh $a0, 0x016C($s2) ## 0000016C -/* 0759C 8092309C 0C01DE1C */ jal Math_Sins +/* 0759C 8092309C 0C01DE1C */ jal Math_SinS ## sins? /* 075A0 809230A0 A7A300B4 */ sh $v1, 0x00B4($sp) /* 075A4 809230A4 C6420D6C */ lwc1 $f2, 0x0D6C($s2) ## 00000D6C @@ -152,7 +152,7 @@ glabel BossMo_Update /* 0764C 8092314C 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 07650 80923150 00006012 */ mflo $t4 /* 07654 80923154 024C8021 */ addu $s0, $s2, $t4 -/* 07658 80923158 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07658 80923158 0C01E107 */ jal Math_ApproachF /* 0765C 8092315C 26040894 */ addiu $a0, $s0, 0x0894 ## $a0 = 00000894 /* 07660 80923160 10000062 */ beq $zero, $zero, .L809232EC @@ -191,7 +191,7 @@ glabel BossMo_Update /* 076D8 809231D8 44050000 */ mfc1 $a1, $f0 /* 076DC 809231DC 3C073E99 */ lui $a3, 0x3E99 ## $a3 = 3E990000 /* 076E0 809231E0 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E99999A -/* 076E4 809231E4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 076E4 809231E4 0C01E107 */ jal Math_ApproachF /* 076E8 809231E8 26040894 */ addiu $a0, $s0, 0x0894 ## $a0 = 00000894 /* 076EC 809231EC 1000003F */ beq $zero, $zero, .L809232EC @@ -261,7 +261,7 @@ glabel BossMo_Update /* 077D4 809232D4 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E99999A /* 077D8 809232D8 26040894 */ addiu $a0, $s0, 0x0894 ## $a0 = 00000894 /* 077DC 809232DC 44050000 */ mfc1 $a1, $f0 -/* 077E0 809232E0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 077E0 809232E0 0C01E107 */ jal Math_ApproachF /* 077E4 809232E4 00000000 */ nop .L809232E8: @@ -283,7 +283,7 @@ glabel BossMo_Update /* 07820 80923320 44044000 */ mfc1 $a0, $f8 /* 07824 80923324 00000000 */ nop /* 07828 80923328 00042400 */ sll $a0, $a0, 16 -/* 0782C 8092332C 0C01DE1C */ jal Math_Sins +/* 0782C 8092332C 0C01DE1C */ jal Math_SinS ## sins? /* 07830 80923330 00042403 */ sra $a0, $a0, 16 /* 07834 80923334 C64A01E0 */ lwc1 $f10, 0x01E0($s2) ## 000001E0 @@ -305,7 +305,7 @@ glabel BossMo_Update /* 07874 80923374 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A /* 07878 80923378 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0787C 8092337C 264401E0 */ addiu $a0, $s2, 0x01E0 ## $a0 = 000001E0 -/* 07880 80923380 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07880 80923380 0C01E107 */ jal Math_ApproachF /* 07884 80923384 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 07888 80923388 3C053E4C */ lui $a1, 0x3E4C ## $a1 = 3E4C0000 @@ -313,7 +313,7 @@ glabel BossMo_Update /* 07890 80923390 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 /* 07894 80923394 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A /* 07898 80923398 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3E4CCCCD -/* 0789C 8092339C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0789C 8092339C 0C01E107 */ jal Math_ApproachF /* 078A0 809233A0 26440D6C */ addiu $a0, $s2, 0x0D6C ## $a0 = 00000D6C /* 078A4 809233A4 8E590150 */ lw $t9, 0x0150($s2) ## 00000150 @@ -339,7 +339,7 @@ glabel BossMo_Update /* 078EC 809233EC 26440032 */ addiu $a0, $s2, 0x0032 ## $a0 = 00000032 /* 078F0 809233F0 8645008A */ lh $a1, 0x008A($s2) ## 0000008A /* 078F4 809233F4 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 078F8 809233F8 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 078F8 809233F8 0C01E1EF */ jal Math_ApproachS /* 078FC 809233FC 240700C8 */ addiu $a3, $zero, 0x00C8 ## $a3 = 000000C8 /* 07900 80923400 0C00B638 */ jal Actor_MoveForward @@ -350,7 +350,7 @@ glabel BossMo_Update /* 07910 80923410 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 07914 80923414 4405A000 */ mfc1 $a1, $f20 /* 07918 80923418 26440068 */ addiu $a0, $s2, 0x0068 ## $a0 = 00000068 -/* 0791C 8092341C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0791C 8092341C 0C01E107 */ jal Math_ApproachF /* 07920 80923420 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 07924 80923424 26500024 */ addiu $s0, $s2, 0x0024 ## $s0 = 00000024 @@ -442,7 +442,7 @@ glabel BossMo_Update /* 07A68 80923568 E7B40088 */ swc1 $f20, 0x0088($sp) /* 07A6C 8092356C E7B4008C */ swc1 $f20, 0x008C($sp) /* 07A70 80923570 E7A40090 */ swc1 $f4, 0x0090($sp) -/* 07A74 80923574 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 07A74 80923574 0C00CFBE */ jal Rand_ZeroFloat /* 07A78 80923578 02619821 */ addu $s3, $s3, $at /* 07A7C 8092357C 46000306 */ mov.s $f12, $f0 @@ -476,7 +476,7 @@ glabel BossMo_Update /* 07AE0 809235E0 024D8021 */ addu $s0, $s2, $t5 /* 07AE4 809235E4 C6120D70 */ lwc1 $f18, 0x0D70($s0) ## 00000D94 /* 07AE8 809235E8 46069200 */ add.s $f8, $f18, $f6 -/* 07AEC 809235EC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 07AEC 809235EC 0C00CFBE */ jal Rand_ZeroFloat /* 07AF0 809235F0 E7A80070 */ swc1 $f8, 0x0070($sp) /* 07AF4 809235F4 8FAE00BC */ lw $t6, 0x00BC($sp) @@ -496,7 +496,7 @@ glabel BossMo_Update /* 07B2C 8092362C E7A60074 */ swc1 $f6, 0x0074($sp) /* 07B30 80923630 C6080D78 */ lwc1 $f8, 0x0D78($s0) ## 00000D9C /* 07B34 80923634 460A4400 */ add.s $f16, $f8, $f10 -/* 07B38 80923638 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 07B38 80923638 0C00CFBE */ jal Rand_ZeroFloat /* 07B3C 8092363C E7B00078 */ swc1 $f16, 0x0078($sp) /* 07B40 80923640 3C018092 */ lui $at, %hi(D_80926E6C) ## $at = 80920000 @@ -596,7 +596,7 @@ glabel BossMo_Update /* 07C88 80923788 A64F0168 */ sh $t7, 0x0168($s2) ## 00000168 /* 07C8C 8092378C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 07C90 80923790 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD -/* 07C94 80923794 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 07C94 80923794 0C01E123 */ jal Math_ApproachZeroF /* 07C98 80923798 264401C8 */ addiu $a0, $s2, 0x01C8 ## $a0 = 000001C8 .L8092379C: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C4E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C4E0.s index 4f5d515abe..49ceab6d1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C4E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C4E0.s @@ -9,7 +9,7 @@ glabel func_8091C4E0 /* 009FC 8091C4FC AC8E0150 */ sw $t6, 0x0150($a0) ## 00000150 /* 00A00 8091C500 A48F0158 */ sh $t7, 0x0158($a0) ## 00000158 /* 00A04 8091C504 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 00A08 8091C508 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00A08 8091C508 0C00CFBE */ jal Rand_ZeroFloat /* 00A0C 8091C50C AFA40018 */ sw $a0, 0x0018($sp) /* 00A10 8091C510 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s index d009b52b8f..6e7e05bef3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s @@ -518,37 +518,37 @@ glabel func_8091C538 /* 00E7C 8091C97C 4405C000 */ mfc1 $a1, $f24 /* 00E80 8091C980 C7B6017C */ lwc1 $f22, 0x017C($sp) /* 00E84 8091C984 C7BA0194 */ lwc1 $f26, 0x0194($sp) -/* 00E88 8091C988 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00E88 8091C988 0C01E107 */ jal Math_ApproachF /* 00E8C 8091C98C 26440190 */ addiu $a0, $s2, 0x0190 ## $a0 = 00000190 /* 00E90 8091C990 4405D000 */ mfc1 $a1, $f26 /* 00E94 8091C994 4406E000 */ mfc1 $a2, $f28 /* 00E98 8091C998 26440188 */ addiu $a0, $s2, 0x0188 ## $a0 = 00000188 -/* 00E9C 8091C99C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00E9C 8091C99C 0C01E107 */ jal Math_ApproachF /* 00EA0 8091C9A0 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 00EA4 8091C9A4 4406E000 */ mfc1 $a2, $f28 /* 00EA8 8091C9A8 4407B000 */ mfc1 $a3, $f22 /* 00EAC 8091C9AC 2644018C */ addiu $a0, $s2, 0x018C ## $a0 = 0000018C -/* 00EB0 8091C9B0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00EB0 8091C9B0 0C01E107 */ jal Math_ApproachF /* 00EB4 8091C9B4 8FA50190 */ lw $a1, 0x0190($sp) /* 00EB8 8091C9B8 4406E000 */ mfc1 $a2, $f28 /* 00EBC 8091C9BC 4407A000 */ mfc1 $a3, $f20 /* 00EC0 8091C9C0 2644019C */ addiu $a0, $s2, 0x019C ## $a0 = 0000019C -/* 00EC4 8091C9C4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00EC4 8091C9C4 0C01E107 */ jal Math_ApproachF /* 00EC8 8091C9C8 8FA5018C */ lw $a1, 0x018C($sp) /* 00ECC 8091C9CC 4406E000 */ mfc1 $a2, $f28 /* 00ED0 8091C9D0 26440194 */ addiu $a0, $s2, 0x0194 ## $a0 = 00000194 /* 00ED4 8091C9D4 8FA50188 */ lw $a1, 0x0188($sp) -/* 00ED8 8091C9D8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00ED8 8091C9D8 0C01E107 */ jal Math_ApproachF /* 00EDC 8091C9DC 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 00EE0 8091C9E0 4406E000 */ mfc1 $a2, $f28 /* 00EE4 8091C9E4 4407B000 */ mfc1 $a3, $f22 /* 00EE8 8091C9E8 26440198 */ addiu $a0, $s2, 0x0198 ## $a0 = 00000198 -/* 00EEC 8091C9EC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00EEC 8091C9EC 0C01E107 */ jal Math_ApproachF /* 00EF0 8091C9F0 8FA50184 */ lw $a1, 0x0184($sp) /* 00EF4 8091C9F4 C6460190 */ lwc1 $f6, 0x0190($s2) ## 00000190 @@ -646,7 +646,7 @@ glabel L8091CB1C /* 01044 8091CB44 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3E19999A /* 01048 8091CB48 4407B000 */ mfc1 $a3, $f22 /* 0104C 8091CB4C 264401E0 */ addiu $a0, $s2, 0x01E0 ## $a0 = 000001E0 -/* 01050 8091CB50 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01050 8091CB50 0C01E107 */ jal Math_ApproachF /* 01054 8091CB54 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 01058 8091CB58 3C014316 */ lui $at, 0x4316 ## $at = 43160000 @@ -656,7 +656,7 @@ glabel L8091CB1C /* 01068 8091CB68 4406E000 */ mfc1 $a2, $f28 /* 0106C 8091CB6C 4405A000 */ mfc1 $a1, $f20 /* 01070 8091CB70 4407D000 */ mfc1 $a3, $f26 -/* 01074 8091CB74 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01074 8091CB74 0C01E107 */ jal Math_ApproachF /* 01078 8091CB78 264401A4 */ addiu $a0, $s2, 0x01A4 ## $a0 = 000001A4 /* 0107C 8091CB7C C65201A4 */ lwc1 $f18, 0x01A4($s2) ## 000001A4 @@ -715,11 +715,11 @@ glabel L8091CB1C /* 01134 8091CC34 3C014248 */ lui $at, 0x4248 ## $at = 42480000 .L8091CC38: /* 01138 8091CC38 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 0113C 8091CC3C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0113C 8091CC3C 0C00CFBE */ jal Rand_ZeroFloat /* 01140 8091CC40 00000000 */ nop /* 01144 8091CC44 46000506 */ mov.s $f20, $f0 -/* 01148 8091CC48 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01148 8091CC48 0C00CFBE */ jal Rand_ZeroFloat /* 0114C 8091CC4C 4600C306 */ mov.s $f12, $f24 /* 01150 8091CC50 8E6D0000 */ lw $t5, 0x0000($s3) ## 00000024 @@ -787,7 +787,7 @@ glabel L8091CD0C /* 01234 8091CD34 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3ECCCCCD /* 01238 8091CD38 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0123C 8091CD3C 264401C8 */ addiu $a0, $s2, 0x01C8 ## $a0 = 000001C8 -/* 01240 8091CD40 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01240 8091CD40 0C01E107 */ jal Math_ApproachF /* 01244 8091CD44 3C05C0A0 */ lui $a1, 0xC0A0 ## $a1 = C0A00000 /* 01248 8091CD48 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -807,7 +807,7 @@ glabel L8091CD0C /* 0127C 8091CD7C 00004012 */ mflo $t0 /* 01280 8091CD80 01092021 */ addu $a0, $t0, $t1 /* 01284 8091CD84 00042400 */ sll $a0, $a0, 16 -/* 01288 8091CD88 0C01DE1C */ jal Math_Sins +/* 01288 8091CD88 0C01DE1C */ jal Math_SinS ## sins? /* 0128C 8091CD8C 00042403 */ sra $a0, $a0, 16 /* 01290 8091CD90 44918000 */ mtc1 $s1, $f16 ## $f16 = 0.00 @@ -830,7 +830,7 @@ glabel L8091CD0C /* 012D4 8091CDD4 00007812 */ mflo $t7 /* 012D8 8091CDD8 01EB2021 */ addu $a0, $t7, $t3 /* 012DC 8091CDDC 00042400 */ sll $a0, $a0, 16 -/* 012E0 8091CDE0 0C01DE1C */ jal Math_Sins +/* 012E0 8091CDE0 0C01DE1C */ jal Math_SinS ## sins? /* 012E4 8091CDE4 00042403 */ sra $a0, $a0, 16 /* 012E8 8091CDE8 02340019 */ multu $s1, $s4 @@ -846,7 +846,7 @@ glabel L8091CD0C /* 01310 8091CE10 00007012 */ mflo $t6 /* 01314 8091CE14 024E2021 */ addu $a0, $s2, $t6 /* 01318 8091CE18 44059000 */ mfc1 $a1, $f18 -/* 0131C 8091CE1C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0131C 8091CE1C 0C01E107 */ jal Math_ApproachF /* 01320 8091CE20 248406AC */ addiu $a0, $a0, 0x06AC ## $a0 = 000006AC /* 01324 8091CE24 2401001C */ addiu $at, $zero, 0x001C ## $at = 0000001C @@ -877,7 +877,7 @@ glabel L8091CD0C /* 01384 8091CE84 44062000 */ mfc1 $a2, $f4 /* 01388 8091CE88 00000000 */ nop /* 0138C 8091CE8C 00063400 */ sll $a2, $a2, 16 -/* 01390 8091CE90 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01390 8091CE90 0C01E1EF */ jal Math_ApproachS /* 01394 8091CE94 00063403 */ sra $a2, $a2, 16 /* 01398 8091CE98 C6500D64 */ lwc1 $f16, 0x0D64($s2) ## 00000D64 @@ -897,7 +897,7 @@ glabel L8091CD0C /* 013D0 8091CED0 44062000 */ mfc1 $a2, $f4 /* 013D4 8091CED4 00000000 */ nop /* 013D8 8091CED8 00063400 */ sll $a2, $a2, 16 -/* 013DC 8091CEDC 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 013DC 8091CEDC 0C01E1EF */ jal Math_ApproachS /* 013E0 8091CEE0 00063403 */ sra $a2, $a2, 16 /* 013E4 8091CEE4 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 @@ -916,7 +916,7 @@ glabel L8091CD0C /* 01418 8091CF18 26440068 */ addiu $a0, $s2, 0x0068 ## $a0 = 00000068 /* 0141C 8091CF1C 3C053F40 */ lui $a1, 0x3F40 ## $a1 = 3F400000 /* 01420 8091CF20 AE5801D8 */ sw $t8, 0x01D8($s2) ## 000001D8 -/* 01424 8091CF24 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01424 8091CF24 0C01E107 */ jal Math_ApproachF /* 01428 8091CF28 AE4801DC */ sw $t0, 0x01DC($s2) ## 000001DC /* 0142C 8091CF2C 86490158 */ lh $t1, 0x0158($s2) ## 00000158 @@ -930,7 +930,7 @@ glabel L8091CD0C /* 0144C 8091CF4C 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 /* 01450 8091CF50 01592821 */ addu $a1, $t2, $t9 /* 01454 8091CF54 00052C00 */ sll $a1, $a1, 16 -/* 01458 8091CF58 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01458 8091CF58 0C01E1EF */ jal Math_ApproachS /* 0145C 8091CF5C 00052C03 */ sra $a1, $a1, 16 /* 01460 8091CF60 4405E000 */ mfc1 $a1, $f28 @@ -938,7 +938,7 @@ glabel L8091CD0C /* 01464 8091CF64 3C073D23 */ lui $a3, 0x3D23 ## $a3 = 3D230000 /* 01468 8091CF68 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3D23D70A /* 0146C 8091CF6C 264401A0 */ addiu $a0, $s2, 0x01A0 ## $a0 = 000001A0 -/* 01470 8091CF70 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01470 8091CF70 0C01E107 */ jal Math_ApproachF /* 01474 8091CF74 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 01478 8091CF78 3C0C8092 */ lui $t4, %hi(D_80925CD0) ## $t4 = 80920000 @@ -952,13 +952,13 @@ glabel L8091CD0C /* 01498 8091CF98 4406E000 */ mfc1 $a2, $f28 /* 0149C 8091CF9C 3C073A83 */ lui $a3, 0x3A83 ## $a3 = 3A830000 /* 014A0 8091CFA0 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A83126F -/* 014A4 8091CFA4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 014A4 8091CFA4 0C01E107 */ jal Math_ApproachF /* 014A8 8091CFA8 26440D64 */ addiu $a0, $s2, 0x0D64 ## $a0 = 00000D64 /* 014AC 8091CFAC 4406E000 */ mfc1 $a2, $f28 /* 014B0 8091CFB0 26440D68 */ addiu $a0, $s2, 0x0D68 ## $a0 = 00000D68 /* 014B4 8091CFB4 3C054370 */ lui $a1, 0x4370 ## $a1 = 43700000 -/* 014B8 8091CFB8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 014B8 8091CFB8 0C01E107 */ jal Math_ApproachF /* 014BC 8091CFBC 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 014C0 8091CFC0 1000000B */ beq $zero, $zero, .L8091CFF0 @@ -966,13 +966,13 @@ glabel L8091CD0C /* 014C8 8091CFC8 4405E000 */ mfc1 $a1, $f28 .L8091CFCC: /* 014CC 8091CFCC 4406E000 */ mfc1 $a2, $f28 -/* 014D0 8091CFD0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 014D0 8091CFD0 0C01E107 */ jal Math_ApproachF /* 014D4 8091CFD4 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 0000126F /* 014D8 8091CFD8 4406E000 */ mfc1 $a2, $f28 /* 014DC 8091CFDC 26440D68 */ addiu $a0, $s2, 0x0D68 ## $a0 = 00000D68 /* 014E0 8091CFE0 3C0543C8 */ lui $a1, 0x43C8 ## $a1 = 43C80000 -/* 014E4 8091CFE4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 014E4 8091CFE4 0C01E107 */ jal Math_ApproachF /* 014E8 8091CFE8 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 /* 014EC 8091CFEC 86430158 */ lh $v1, 0x0158($s2) ## 00000158 @@ -997,7 +997,7 @@ glabel L8091CD0C /* 01530 8091D030 A658017E */ sh $t8, 0x017E($s2) ## 0000017E /* 01534 8091D034 3C014580 */ lui $at, 0x4580 ## $at = 45800000 /* 01538 8091D038 44816000 */ mtc1 $at, $f12 ## $f12 = 4096.00 -/* 0153C 8091D03C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0153C 8091D03C 0C00CFC8 */ jal Rand_CenteredFloat /* 01540 8091D040 00000000 */ nop /* 01544 8091D044 4600028D */ trunc.w.s $f10, $f0 @@ -1042,7 +1042,7 @@ glabel L8091D0B0 /* 015D4 8091D0D4 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3ECCCCCD /* 015D8 8091D0D8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 015DC 8091D0DC 264401C8 */ addiu $a0, $s2, 0x01C8 ## $a0 = 000001C8 -/* 015E0 8091D0E0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 015E0 8091D0E0 0C01E107 */ jal Math_ApproachF /* 015E4 8091D0E4 3C05C0A0 */ lui $a1, 0xC0A0 ## $a1 = C0A00000 /* 015E8 8091D0E8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -1073,7 +1073,7 @@ glabel L8091D0B0 /* 01648 8091D148 461A5400 */ add.s $f16, $f10, $f26 /* 0164C 8091D14C 46109102 */ mul.s $f4, $f18, $f16 /* 01650 8091D150 44052000 */ mfc1 $a1, $f4 -/* 01654 8091D154 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01654 8091D154 0C01E107 */ jal Math_ApproachF /* 01658 8091D158 00000000 */ nop /* 0165C 8091D15C C6460D64 */ lwc1 $f6, 0x0D64($s2) ## 00000D64 @@ -1098,7 +1098,7 @@ glabel L8091D0B0 /* 016A8 8091D1A8 44065000 */ mfc1 $a2, $f10 /* 016AC 8091D1AC 00000000 */ nop /* 016B0 8091D1B0 00063400 */ sll $a2, $a2, 16 -/* 016B4 8091D1B4 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 016B4 8091D1B4 0C01E1EF */ jal Math_ApproachS /* 016B8 8091D1B8 00063403 */ sra $a2, $a2, 16 /* 016BC 8091D1BC C6440D64 */ lwc1 $f4, 0x0D64($s2) ## 00000D64 @@ -1115,7 +1115,7 @@ glabel L8091D0B0 /* 016E8 8091D1E8 44064000 */ mfc1 $a2, $f8 /* 016EC 8091D1EC 00000000 */ nop /* 016F0 8091D1F0 00063400 */ sll $a2, $a2, 16 -/* 016F4 8091D1F4 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 016F4 8091D1F4 0C01E1EF */ jal Math_ApproachS /* 016F8 8091D1F8 00063403 */ sra $a2, $a2, 16 /* 016FC 8091D1FC 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 @@ -1135,13 +1135,13 @@ glabel L8091D0B0 /* 01734 8091D234 26440D64 */ addiu $a0, $s2, 0x0D64 ## $a0 = 00000D64 /* 01738 8091D238 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 /* 0173C 8091D23C AE4801DC */ sw $t0, 0x01DC($s2) ## 000001DC -/* 01740 8091D240 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01740 8091D240 0C01E107 */ jal Math_ApproachF /* 01744 8091D244 AE5801D8 */ sw $t8, 0x01D8($s2) ## 000001D8 /* 01748 8091D248 4406E000 */ mfc1 $a2, $f28 /* 0174C 8091D24C 26440D68 */ addiu $a0, $s2, 0x0D68 ## $a0 = 00000D68 /* 01750 8091D250 3C054320 */ lui $a1, 0x4320 ## $a1 = 43200000 -/* 01754 8091D254 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01754 8091D254 0C01E107 */ jal Math_ApproachF /* 01758 8091D258 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 0175C 8091D25C 8649017E */ lh $t1, 0x017E($s2) ## 0000017E @@ -1276,7 +1276,7 @@ glabel L8091D430 /* 01938 8091D438 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3ECCCCCD /* 0193C 8091D43C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01940 8091D440 264401C8 */ addiu $a0, $s2, 0x01C8 ## $a0 = 000001C8 -/* 01944 8091D444 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01944 8091D444 0C01E107 */ jal Math_ApproachF /* 01948 8091D448 3C05C0A0 */ lui $a1, 0xC0A0 ## $a1 = C0A00000 /* 0194C 8091D44C 8648017E */ lh $t0, 0x017E($s2) ## 0000017E @@ -1322,7 +1322,7 @@ glabel L8091D430 /* 019E4 8091D4E4 44063000 */ mfc1 $a2, $f6 /* 019E8 8091D4E8 00000000 */ nop /* 019EC 8091D4EC 00063400 */ sll $a2, $a2, 16 -/* 019F0 8091D4F0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 019F0 8091D4F0 0C01E1EF */ jal Math_ApproachS /* 019F4 8091D4F4 00063403 */ sra $a2, $a2, 16 /* 019F8 8091D4F8 10000052 */ beq $zero, $zero, .L8091D644 @@ -1350,7 +1350,7 @@ glabel L8091D430 /* 01A4C 8091D54C 44064000 */ mfc1 $a2, $f8 /* 01A50 8091D550 00000000 */ nop /* 01A54 8091D554 00063400 */ sll $a2, $a2, 16 -/* 01A58 8091D558 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01A58 8091D558 0C01E1EF */ jal Math_ApproachS /* 01A5C 8091D55C 00063403 */ sra $a2, $a2, 16 /* 01A60 8091D560 10000038 */ beq $zero, $zero, .L8091D644 @@ -1381,7 +1381,7 @@ glabel L8091D430 /* 01AC0 8091D5C0 44062000 */ mfc1 $a2, $f4 /* 01AC4 8091D5C4 00000000 */ nop /* 01AC8 8091D5C8 00063400 */ sll $a2, $a2, 16 -/* 01ACC 8091D5CC 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01ACC 8091D5CC 0C01E1EF */ jal Math_ApproachS /* 01AD0 8091D5D0 00063403 */ sra $a2, $a2, 16 /* 01AD4 8091D5D4 1000001B */ beq $zero, $zero, .L8091D644 @@ -1410,7 +1410,7 @@ glabel L8091D430 /* 01B2C 8091D62C 44068000 */ mfc1 $a2, $f16 /* 01B30 8091D630 00000000 */ nop /* 01B34 8091D634 00063400 */ sll $a2, $a2, 16 -/* 01B38 8091D638 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01B38 8091D638 0C01E1EF */ jal Math_ApproachS /* 01B3C 8091D63C 00063403 */ sra $a2, $a2, 16 /* 01B40 8091D640 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000004 @@ -1425,13 +1425,13 @@ glabel L8091D430 /* 01B60 8091D660 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 /* 01B64 8091D664 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A /* 01B68 8091D668 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD -/* 01B6C 8091D66C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01B6C 8091D66C 0C01E107 */ jal Math_ApproachF /* 01B70 8091D670 26440D64 */ addiu $a0, $s2, 0x0D64 ## $a0 = 00000D64 /* 01B74 8091D674 4406E000 */ mfc1 $a2, $f28 /* 01B78 8091D678 26440D68 */ addiu $a0, $s2, 0x0D68 ## $a0 = 00000D68 /* 01B7C 8091D67C 3C054470 */ lui $a1, 0x4470 ## $a1 = 44700000 -/* 01B80 8091D680 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01B80 8091D680 0C01E107 */ jal Math_ApproachF /* 01B84 8091D684 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 01B88 8091D688 864A017E */ lh $t2, 0x017E($s2) ## 0000017E @@ -1440,7 +1440,7 @@ glabel L8091D430 /* 01B94 8091D694 2941001E */ slti $at, $t2, 0x001E /* 01B98 8091D698 14200003 */ bne $at, $zero, .L8091D6A8 /* 01B9C 8091D69C 240700C8 */ addiu $a3, $zero, 0x00C8 ## $a3 = 000000C8 -/* 01BA0 8091D6A0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01BA0 8091D6A0 0C01E1EF */ jal Math_ApproachS /* 01BA4 8091D6A4 8645008A */ lh $a1, 0x008A($s2) ## 0000008A .L8091D6A8: @@ -1520,37 +1520,37 @@ glabel L8091D430 /* 01CB4 8091D7B4 E6BE0068 */ swc1 $f30, 0x0068($s5) ## 00000068 /* 01CB8 8091D7B8 8E4501E4 */ lw $a1, 0x01E4($s2) ## 000001E4 /* 01CBC 8091D7BC 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 01CC0 8091D7C0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01CC0 8091D7C0 0C01E107 */ jal Math_ApproachF /* 01CC4 8091D7C4 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 01CC8 8091D7C8 26A40028 */ addiu $a0, $s5, 0x0028 ## $a0 = 00000028 /* 01CCC 8091D7CC 8E4501E8 */ lw $a1, 0x01E8($s2) ## 000001E8 /* 01CD0 8091D7D0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 01CD4 8091D7D4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01CD4 8091D7D4 0C01E107 */ jal Math_ApproachF /* 01CD8 8091D7D8 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 01CDC 8091D7DC 26A4002C */ addiu $a0, $s5, 0x002C ## $a0 = 0000002C /* 01CE0 8091D7E0 8E4501EC */ lw $a1, 0x01EC($s2) ## 000001EC /* 01CE4 8091D7E4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 01CE8 8091D7E8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01CE8 8091D7E8 0C01E107 */ jal Math_ApproachF /* 01CEC 8091D7EC 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 01CF0 8091D7F0 26A400B4 */ addiu $a0, $s5, 0x00B4 ## $a0 = 000000B4 /* 01CF4 8091D7F4 864501F0 */ lh $a1, 0x01F0($s2) ## 000001F0 /* 01CF8 8091D7F8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01CFC 8091D7FC 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01CFC 8091D7FC 0C01E1EF */ jal Math_ApproachS /* 01D00 8091D800 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 01D04 8091D804 26A400B6 */ addiu $a0, $s5, 0x00B6 ## $a0 = 000000B6 /* 01D08 8091D808 864501F2 */ lh $a1, 0x01F2($s2) ## 000001F2 /* 01D0C 8091D80C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01D10 8091D810 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01D10 8091D810 0C01E1EF */ jal Math_ApproachS /* 01D14 8091D814 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 01D18 8091D818 26A400B8 */ addiu $a0, $s5, 0x00B8 ## $a0 = 000000B8 /* 01D1C 8091D81C 864501F4 */ lh $a1, 0x01F4($s2) ## 000001F4 /* 01D20 8091D820 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01D24 8091D824 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01D24 8091D824 0C01E1EF */ jal Math_ApproachS /* 01D28 8091D828 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 01D2C 8091D82C 864C017E */ lh $t4, 0x017E($s2) ## 0000017E @@ -1605,7 +1605,7 @@ glabel L8091D430 /* 01DF0 8091D8F0 46109381 */ sub.s $f14, $f18, $f16 /* 01DF4 8091D8F4 AE480F78 */ sw $t0, 0x0F78($s2) ## 00000F78 /* 01DF8 8091D8F8 8E090058 */ lw $t1, 0x0058($s0) ## 00000058 -/* 01DFC 8091D8FC 0C03F494 */ jal Math_atan2f +/* 01DFC 8091D8FC 0C03F494 */ jal Math_FAtan2F /* 01E00 8091D900 AE490F7C */ sw $t1, 0x0F7C($s2) ## 00000F7C /* 01E04 8091D904 E6401004 */ swc1 $f0, 0x1004($s2) ## 00001004 /* 01E08 8091D908 10000003 */ beq $zero, $zero, .L8091D918 @@ -1645,7 +1645,7 @@ glabel L8091D918 /* 01E7C 8091D97C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3ECCCCCD /* 01E80 8091D980 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01E84 8091D984 02002025 */ or $a0, $s0, $zero ## $a0 = 000001C8 -/* 01E88 8091D988 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01E88 8091D988 0C01E107 */ jal Math_ApproachF /* 01E8C 8091D98C 3C05C0A0 */ lui $a1, 0xC0A0 ## $a1 = C0A00000 /* 01E90 8091D990 864B0CC6 */ lh $t3, 0x0CC6($s2) ## 00000CC6 @@ -1684,7 +1684,7 @@ glabel L8091D918 /* 01F08 8091DA08 00005812 */ mflo $t3 /* 01F0C 8091DA0C 016E2021 */ addu $a0, $t3, $t6 /* 01F10 8091DA10 00042400 */ sll $a0, $a0, 16 -/* 01F14 8091DA14 0C01DE1C */ jal Math_Sins +/* 01F14 8091DA14 0C01DE1C */ jal Math_SinS ## sins? /* 01F18 8091DA18 00042403 */ sra $a0, $a0, 16 /* 01F1C 8091DA1C 44913000 */ mtc1 $s1, $f6 ## $f6 = 0.00 @@ -1707,7 +1707,7 @@ glabel L8091D918 /* 01F60 8091DA60 00006012 */ mflo $t4 /* 01F64 8091DA64 018D2021 */ addu $a0, $t4, $t5 /* 01F68 8091DA68 00042400 */ sll $a0, $a0, 16 -/* 01F6C 8091DA6C 0C01DE1C */ jal Math_Sins +/* 01F6C 8091DA6C 0C01DE1C */ jal Math_SinS ## sins? /* 01F70 8091DA70 00042403 */ sra $a0, $a0, 16 /* 01F74 8091DA74 24190028 */ addiu $t9, $zero, 0x0028 ## $t9 = 00000028 @@ -1734,7 +1734,7 @@ glabel L8091D918 /* 01FC8 8091DAC8 461A9400 */ add.s $f16, $f18, $f26 /* 01FCC 8091DACC 46102202 */ mul.s $f8, $f4, $f16 /* 01FD0 8091DAD0 44054000 */ mfc1 $a1, $f8 -/* 01FD4 8091DAD4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01FD4 8091DAD4 0C01E107 */ jal Math_ApproachF /* 01FD8 8091DAD8 00000000 */ nop /* 01FDC 8091DADC C64A0D64 */ lwc1 $f10, 0x0D64($s2) ## 00000D64 @@ -1756,7 +1756,7 @@ glabel L8091D918 /* 0201C 8091DB1C 44062000 */ mfc1 $a2, $f4 /* 02020 8091DB20 00000000 */ nop /* 02024 8091DB24 00063400 */ sll $a2, $a2, 16 -/* 02028 8091DB28 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 02028 8091DB28 0C01E1EF */ jal Math_ApproachS /* 0202C 8091DB2C 00063403 */ sra $a2, $a2, 16 /* 02030 8091DB30 C64A0D64 */ lwc1 $f10, 0x0D64($s2) ## 00000D64 @@ -1776,7 +1776,7 @@ glabel L8091D918 /* 02068 8091DB68 44062000 */ mfc1 $a2, $f4 /* 0206C 8091DB6C 00000000 */ nop /* 02070 8091DB70 00063400 */ sll $a2, $a2, 16 -/* 02074 8091DB74 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 02074 8091DB74 0C01E1EF */ jal Math_ApproachS /* 02078 8091DB78 00063403 */ sra $a2, $a2, 16 /* 0207C 8091DB7C 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000002 @@ -1810,20 +1810,20 @@ glabel L8091D918 /* 020E8 8091DBE8 E6BE0060 */ swc1 $f30, 0x0060($s5) ## 00000060 /* 020EC 8091DBEC E6BE0068 */ swc1 $f30, 0x0068($s5) ## 00000068 /* 020F0 8091DBF0 4407B000 */ mfc1 $a3, $f22 -/* 020F4 8091DBF4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 020F4 8091DBF4 0C01E107 */ jal Math_ApproachF /* 020F8 8091DBF8 A6A20034 */ sh $v0, 0x0034($s5) ## 00000034 /* 020FC 8091DBFC 4406E000 */ mfc1 $a2, $f28 /* 02100 8091DC00 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 /* 02104 8091DC04 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A /* 02108 8091DC08 8FA40088 */ lw $a0, 0x0088($sp) -/* 0210C 8091DC0C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0210C 8091DC0C 0C01E107 */ jal Math_ApproachF /* 02110 8091DC10 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 /* 02114 8091DC14 4406E000 */ mfc1 $a2, $f28 /* 02118 8091DC18 8FA40084 */ lw $a0, 0x0084($sp) /* 0211C 8091DC1C 3C0543F0 */ lui $a1, 0x43F0 ## $a1 = 43F00000 -/* 02120 8091DC20 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02120 8091DC20 0C01E107 */ jal Math_ApproachF /* 02124 8091DC24 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 02128 8091DC28 3C018092 */ lui $at, %hi(D_80926C40) ## $at = 80920000 @@ -1833,7 +1833,7 @@ glabel L8091D918 /* 02138 8091DC38 4405A000 */ mfc1 $a1, $f20 /* 0213C 8091DC3C 26440D6C */ addiu $a0, $s2, 0x0D6C ## $a0 = 00000D6C /* 02140 8091DC40 4407C000 */ mfc1 $a3, $f24 -/* 02144 8091DC44 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02144 8091DC44 0C01E107 */ jal Math_ApproachF /* 02148 8091DC48 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 0214C 8091DC4C 86590178 */ lh $t9, 0x0178($s2) ## 00000178 @@ -1900,7 +1900,7 @@ glabel L8091D918 /* 0222C 8091DD2C 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3B03126F /* 02230 8091DD30 26500F68 */ addiu $s0, $s2, 0x0F68 ## $s0 = 00000F68 /* 02234 8091DD34 26510F74 */ addiu $s1, $s2, 0x0F74 ## $s1 = 00000F74 -/* 02238 8091DD38 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02238 8091DD38 0C01E107 */ jal Math_ApproachF /* 0223C 8091DD3C E6521004 */ swc1 $f18, 0x1004($s2) ## 00001004 /* 02240 8091DD40 C64C1004 */ lwc1 $f12, 0x1004($s2) ## 00001004 @@ -1917,7 +1917,7 @@ glabel L8091D918 /* 0226C 8091DD6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000F68 /* 02270 8091DD70 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 02274 8091DD74 44054000 */ mfc1 $a1, $f8 -/* 02278 8091DD78 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02278 8091DD78 0C01E107 */ jal Math_ApproachF /* 0227C 8091DD7C 00000000 */ nop /* 02280 8091DD80 C6460028 */ lwc1 $f6, 0x0028($s2) ## 00000028 @@ -1928,7 +1928,7 @@ glabel L8091D918 /* 02294 8091DD94 26440F6C */ addiu $a0, $s2, 0x0F6C ## $a0 = 00000F6C /* 02298 8091DD98 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 0229C 8091DD9C 44059000 */ mfc1 $a1, $f18 -/* 022A0 8091DDA0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 022A0 8091DDA0 0C01E107 */ jal Math_ApproachF /* 022A4 8091DDA4 00000000 */ nop /* 022A8 8091DDA8 C644002C */ lwc1 $f4, 0x002C($s2) ## 0000002C @@ -1939,25 +1939,25 @@ glabel L8091D918 /* 022BC 8091DDBC 26440F70 */ addiu $a0, $s2, 0x0F70 ## $a0 = 00000F70 /* 022C0 8091DDC0 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 022C4 8091DDC4 44054000 */ mfc1 $a1, $f8 -/* 022C8 8091DDC8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 022C8 8091DDC8 0C01E107 */ jal Math_ApproachF /* 022CC 8091DDCC 00000000 */ nop /* 022D0 8091DDD0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000F74 /* 022D4 8091DDD4 8EA50024 */ lw $a1, 0x0024($s5) ## 00000024 /* 022D8 8091DDD8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 022DC 8091DDDC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 022DC 8091DDDC 0C01E107 */ jal Math_ApproachF /* 022E0 8091DDE0 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 022E4 8091DDE4 26440F78 */ addiu $a0, $s2, 0x0F78 ## $a0 = 00000F78 /* 022E8 8091DDE8 8EA50028 */ lw $a1, 0x0028($s5) ## 00000028 /* 022EC 8091DDEC 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 022F0 8091DDF0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 022F0 8091DDF0 0C01E107 */ jal Math_ApproachF /* 022F4 8091DDF4 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 022F8 8091DDF8 26440F7C */ addiu $a0, $s2, 0x0F7C ## $a0 = 00000F7C /* 022FC 8091DDFC 8EA5002C */ lw $a1, 0x002C($s5) ## 0000002C /* 02300 8091DE00 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 02304 8091DE04 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02304 8091DE04 0C01E107 */ jal Math_ApproachF /* 02308 8091DE08 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 0230C 8091DE0C 8FA401BC */ lw $a0, 0x01BC($sp) @@ -1984,7 +1984,7 @@ glabel L8091D918 /* 02354 8091DE54 3C053E19 */ lui $a1, 0x3E19 ## $a1 = 3E190000 /* 02358 8091DE58 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3E19999A /* 0235C 8091DE5C 4407B000 */ mfc1 $a3, $f22 -/* 02360 8091DE60 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02360 8091DE60 0C01E107 */ jal Math_ApproachF /* 02364 8091DE64 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 02368 8091DE68 864E0174 */ lh $t6, 0x0174($s2) ## 00000174 @@ -2010,28 +2010,28 @@ glabel L8091D918 /* 023B4 8091DEB4 8D2A0D74 */ lw $t2, 0x0D74($t1) ## 00000D74 /* 023B8 8091DEB8 AE2A0004 */ sw $t2, 0x0004($s1) ## FFFFFF6C /* 023BC 8091DEBC 8D2C0D78 */ lw $t4, 0x0D78($t1) ## 00000D78 -/* 023C0 8091DEC0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 023C0 8091DEC0 0C00CFC8 */ jal Rand_CenteredFloat /* 023C4 8091DEC4 AE2C0008 */ sw $t4, 0x0008($s1) ## FFFFFF70 /* 023C8 8091DEC8 C7A60120 */ lwc1 $f6, 0x0120($sp) /* 023CC 8091DECC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 023D0 8091DED0 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 023D4 8091DED4 46003280 */ add.s $f10, $f6, $f0 -/* 023D8 8091DED8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 023D8 8091DED8 0C00CFC8 */ jal Rand_CenteredFloat /* 023DC 8091DEDC E7AA0120 */ swc1 $f10, 0x0120($sp) /* 023E0 8091DEE0 C7B20124 */ lwc1 $f18, 0x0124($sp) /* 023E4 8091DEE4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 023E8 8091DEE8 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 023EC 8091DEEC 46009100 */ add.s $f4, $f18, $f0 -/* 023F0 8091DEF0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 023F0 8091DEF0 0C00CFC8 */ jal Rand_CenteredFloat /* 023F4 8091DEF4 E7A40124 */ swc1 $f4, 0x0124($sp) /* 023F8 8091DEF8 C7B00128 */ lwc1 $f16, 0x0128($sp) /* 023FC 8091DEFC 3C018092 */ lui $at, %hi(D_80926C50) ## $at = 80920000 /* 02400 8091DF00 C42C6C50 */ lwc1 $f12, %lo(D_80926C50)($at) /* 02404 8091DF04 46008200 */ add.s $f8, $f16, $f0 -/* 02408 8091DF08 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 02408 8091DF08 0C00CFBE */ jal Rand_ZeroFloat /* 0240C 8091DF0C E7A80128 */ swc1 $f8, 0x0128($sp) /* 02410 8091DF10 46140180 */ add.s $f6, $f0, $f20 @@ -2054,7 +2054,7 @@ glabel L8091D918 /* 02450 8091DF50 4406E000 */ mfc1 $a2, $f28 /* 02454 8091DF54 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 /* 02458 8091DF58 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD -/* 0245C 8091DF5C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0245C 8091DF5C 0C01E107 */ jal Math_ApproachF /* 02460 8091DF60 264401A8 */ addiu $a0, $s2, 0x01A8 ## $a0 = 000001A8 /* 02464 8091DF64 86590174 */ lh $t9, 0x0174($s2) ## 00000174 @@ -2091,19 +2091,19 @@ glabel L8091D918 /* 024D4 8091DFD4 11000038 */ beq $t0, $zero, .L8091E0B8 /* 024D8 8091DFD8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 024DC 8091DFDC 8EA50024 */ lw $a1, 0x0024($s5) ## 00000024 -/* 024E0 8091DFE0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 024E0 8091DFE0 0C01E107 */ jal Math_ApproachF /* 024E4 8091DFE4 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 024E8 8091DFE8 26440F78 */ addiu $a0, $s2, 0x0F78 ## $a0 = 00000F78 /* 024EC 8091DFEC 8EA50028 */ lw $a1, 0x0028($s5) ## 00000028 /* 024F0 8091DFF0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 024F4 8091DFF4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 024F4 8091DFF4 0C01E107 */ jal Math_ApproachF /* 024F8 8091DFF8 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 024FC 8091DFFC 26440F7C */ addiu $a0, $s2, 0x0F7C ## $a0 = 00000F7C /* 02500 8091E000 8EA5002C */ lw $a1, 0x002C($s5) ## 0000002C /* 02504 8091E004 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 02508 8091E008 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02508 8091E008 0C01E107 */ jal Math_ApproachF /* 0250C 8091E00C 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 02510 8091E010 26500F68 */ addiu $s0, $s2, 0x0F68 ## $s0 = 00000F68 @@ -2167,7 +2167,7 @@ glabel L8091D918 /* 025EC 8091E0EC 00005012 */ mflo $t2 /* 025F0 8091E0F0 014C2021 */ addu $a0, $t2, $t4 /* 025F4 8091E0F4 00042400 */ sll $a0, $a0, 16 -/* 025F8 8091E0F8 0C01DE1C */ jal Math_Sins +/* 025F8 8091E0F8 0C01DE1C */ jal Math_SinS ## sins? /* 025FC 8091E0FC 00042403 */ sra $a0, $a0, 16 /* 02600 8091E100 44912000 */ mtc1 $s1, $f4 ## $f4 = 0.00 @@ -2192,7 +2192,7 @@ glabel L8091D918 /* 0264C 8091E14C 00007012 */ mflo $t6 /* 02650 8091E150 01D82021 */ addu $a0, $t6, $t8 /* 02654 8091E154 00042400 */ sll $a0, $a0, 16 -/* 02658 8091E158 0C01DE1C */ jal Math_Sins +/* 02658 8091E158 0C01DE1C */ jal Math_SinS ## sins? /* 0265C 8091E15C 00042403 */ sra $a0, $a0, 16 /* 02660 8091E160 4600A182 */ mul.s $f6, $f20, $f0 @@ -2209,7 +2209,7 @@ glabel L8091D918 /* 0268C 8091E18C 248406AC */ addiu $a0, $a0, 0x06AC ## $a0 = 000006AC /* 02690 8091E190 461A1482 */ mul.s $f18, $f2, $f26 /* 02694 8091E194 44059000 */ mfc1 $a1, $f18 -/* 02698 8091E198 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02698 8091E198 0C01E107 */ jal Math_ApproachF /* 0269C 8091E19C 00000000 */ nop /* 026A0 8091E1A0 C6480D64 */ lwc1 $f8, 0x0D64($s2) ## 00000D64 @@ -2231,7 +2231,7 @@ glabel L8091D918 /* 026E0 8091E1E0 44065000 */ mfc1 $a2, $f10 /* 026E4 8091E1E4 00000000 */ nop /* 026E8 8091E1E8 00063400 */ sll $a2, $a2, 16 -/* 026EC 8091E1EC 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 026EC 8091E1EC 0C01E1EF */ jal Math_ApproachS /* 026F0 8091E1F0 00063403 */ sra $a2, $a2, 16 /* 026F4 8091E1F4 C6480D64 */ lwc1 $f8, 0x0D64($s2) ## 00000D64 @@ -2251,7 +2251,7 @@ glabel L8091D918 /* 0272C 8091E22C 44065000 */ mfc1 $a2, $f10 /* 02730 8091E230 00000000 */ nop /* 02734 8091E234 00063400 */ sll $a2, $a2, 16 -/* 02738 8091E238 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 02738 8091E238 0C01E1EF */ jal Math_ApproachS /* 0273C 8091E23C 00063403 */ sra $a2, $a2, 16 /* 02740 8091E240 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 @@ -2264,7 +2264,7 @@ glabel L8091D918 /* 0275C 8091E25C 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 /* 02760 8091E260 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 02764 8091E264 264401A0 */ addiu $a0, $s2, 0x01A0 ## $a0 = 000001A0 -/* 02768 8091E268 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02768 8091E268 0C01E107 */ jal Math_ApproachF /* 0276C 8091E26C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 02770 8091E270 3C018092 */ lui $at, %hi(D_80926C64) ## $at = 80920000 @@ -2272,13 +2272,13 @@ glabel L8091D918 /* 02778 8091E278 4406E000 */ mfc1 $a2, $f28 /* 0277C 8091E27C 26440D64 */ addiu $a0, $s2, 0x0D64 ## $a0 = 00000D64 /* 02780 8091E280 4407B000 */ mfc1 $a3, $f22 -/* 02784 8091E284 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02784 8091E284 0C01E107 */ jal Math_ApproachF /* 02788 8091E288 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 /* 0278C 8091E28C 4406E000 */ mfc1 $a2, $f28 /* 02790 8091E290 26440D68 */ addiu $a0, $s2, 0x0D68 ## $a0 = 00000D68 /* 02794 8091E294 3C0543A0 */ lui $a1, 0x43A0 ## $a1 = 43A00000 -/* 02798 8091E298 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02798 8091E298 0C01E107 */ jal Math_ApproachF /* 0279C 8091E29C 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 027A0 8091E2A0 864E017E */ lh $t6, 0x017E($s2) ## 0000017E @@ -2291,7 +2291,7 @@ glabel L8091D918 /* 027BC 8091E2BC 4406E000 */ mfc1 $a2, $f28 /* 027C0 8091E2C0 4407D000 */ mfc1 $a3, $f26 /* 027C4 8091E2C4 03014024 */ and $t0, $t8, $at -/* 027C8 8091E2C8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 027C8 8091E2C8 0C01E107 */ jal Math_ApproachF /* 027CC 8091E2CC AE480004 */ sw $t0, 0x0004($s2) ## 00000004 /* 027D0 8091E2D0 3C018092 */ lui $at, %hi(D_80926C68) ## $at = 80920000 @@ -2306,7 +2306,7 @@ glabel L8091D918 /* 027F4 8091E2F4 26735CD8 */ addiu $s3, $s3, %lo(D_80925CD8) ## $s3 = 80925CD8 /* 027F8 8091E2F8 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 .L8091E2FC: -/* 027FC 8091E2FC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 027FC 8091E2FC 0C00CFBE */ jal Rand_ZeroFloat /* 02800 8091E300 4600B306 */ mov.s $f12, $f22 /* 02804 8091E304 E7BE00FC */ swc1 $f30, 0x00FC($sp) @@ -2373,7 +2373,7 @@ glabel L8091D918 /* 028F4 8091E3F4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 028F8 8091E3F8 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 028FC 8091E3FC A2500156 */ sb $s0, 0x0156($s2) ## 00000156 -/* 02900 8091E400 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 02900 8091E400 0C00CFBE */ jal Rand_ZeroFloat /* 02904 8091E404 E64801DC */ swc1 $f8, 0x01DC($s2) ## 000001DC /* 02908 8091E408 4600018D */ trunc.w.s $f6, $f0 @@ -2469,7 +2469,7 @@ glabel L8091D918 /* 02A54 8091E554 4406E000 */ mfc1 $a2, $f28 /* 02A58 8091E558 01617024 */ and $t6, $t3, $at /* 02A5C 8091E55C 4407D000 */ mfc1 $a3, $f26 -/* 02A60 8091E560 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02A60 8091E560 0C01E107 */ jal Math_ApproachF /* 02A64 8091E564 AE4E0004 */ sw $t6, 0x0004($s2) ## 00000004 /* 02A68 8091E568 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -2499,7 +2499,7 @@ glabel L8091D918 /* 02AC8 8091E5C8 A64C0158 */ sh $t4, 0x0158($s2) ## 00000158 /* 02ACC 8091E5CC AE480104 */ sw $t0, 0x0104($s2) ## 00000104 /* 02AD0 8091E5D0 AE490108 */ sw $t1, 0x0108($s2) ## 00000108 -/* 02AD4 8091E5D4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 02AD4 8091E5D4 0C00CFBE */ jal Rand_ZeroFloat /* 02AD8 8091E5D8 A64A0172 */ sh $t2, 0x0172($s2) ## 00000172 /* 02ADC 8091E5DC 4600048D */ trunc.w.s $f18, $f0 @@ -2532,7 +2532,7 @@ glabel L8091E624 /* 02B3C 8091E63C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3F4CCCCD /* 02B40 8091E640 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 02B44 8091E644 3C05C396 */ lui $a1, 0xC396 ## $a1 = C3960000 -/* 02B48 8091E648 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02B48 8091E648 0C01E107 */ jal Math_ApproachF /* 02B4C 8091E64C 248401BC */ addiu $a0, $a0, 0x01BC ## $a0 = 809201BC /* 02B50 8091E650 8E490004 */ lw $t1, 0x0004($s2) ## 00000004 @@ -2556,7 +2556,7 @@ glabel L8091E624 /* 02B94 8091E694 00005812 */ mflo $t3 /* 02B98 8091E698 016E2021 */ addu $a0, $t3, $t6 /* 02B9C 8091E69C 00042400 */ sll $a0, $a0, 16 -/* 02BA0 8091E6A0 0C01DE1C */ jal Math_Sins +/* 02BA0 8091E6A0 0C01DE1C */ jal Math_SinS ## sins? /* 02BA4 8091E6A4 00042403 */ sra $a0, $a0, 16 /* 02BA8 8091E6A8 44913000 */ mtc1 $s1, $f6 ## $f6 = 0.00 @@ -2579,7 +2579,7 @@ glabel L8091E624 /* 02BEC 8091E6EC 00006012 */ mflo $t4 /* 02BF0 8091E6F0 018D2021 */ addu $a0, $t4, $t5 /* 02BF4 8091E6F4 00042400 */ sll $a0, $a0, 16 -/* 02BF8 8091E6F8 0C01DE1C */ jal Math_Sins +/* 02BF8 8091E6F8 0C01DE1C */ jal Math_SinS ## sins? /* 02BFC 8091E6FC 00042403 */ sra $a0, $a0, 16 /* 02C00 8091E700 02340019 */ multu $s1, $s4 @@ -2595,7 +2595,7 @@ glabel L8091E624 /* 02C28 8091E728 00007812 */ mflo $t7 /* 02C2C 8091E72C 024F2021 */ addu $a0, $s2, $t7 /* 02C30 8091E730 44058000 */ mfc1 $a1, $f16 -/* 02C34 8091E734 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02C34 8091E734 0C01E107 */ jal Math_ApproachF /* 02C38 8091E738 248406AC */ addiu $a0, $a0, 0x06AC ## $a0 = 000006AC /* 02C3C 8091E73C C6460D64 */ lwc1 $f6, 0x0D64($s2) ## 00000D64 @@ -2617,7 +2617,7 @@ glabel L8091E624 /* 02C7C 8091E77C 44062000 */ mfc1 $a2, $f4 /* 02C80 8091E780 00000000 */ nop /* 02C84 8091E784 00063400 */ sll $a2, $a2, 16 -/* 02C88 8091E788 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 02C88 8091E788 0C01E1EF */ jal Math_ApproachS /* 02C8C 8091E78C 00063403 */ sra $a2, $a2, 16 /* 02C90 8091E790 C6460D64 */ lwc1 $f6, 0x0D64($s2) ## 00000D64 @@ -2637,7 +2637,7 @@ glabel L8091E624 /* 02CC8 8091E7C8 44062000 */ mfc1 $a2, $f4 /* 02CCC 8091E7CC 00000000 */ nop /* 02CD0 8091E7D0 00063400 */ sll $a2, $a2, 16 -/* 02CD4 8091E7D4 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 02CD4 8091E7D4 0C01E1EF */ jal Math_ApproachS /* 02CD8 8091E7D8 00063403 */ sra $a2, $a2, 16 /* 02CDC 8091E7DC 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 @@ -2652,7 +2652,7 @@ glabel L8091E624 /* 02D00 8091E800 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3D23D70A /* 02D04 8091E804 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 4089999A /* 02D08 8091E808 264401A0 */ addiu $a0, $s2, 0x01A0 ## $a0 = 000001A0 -/* 02D0C 8091E80C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02D0C 8091E80C 0C01E107 */ jal Math_ApproachF /* 02D10 8091E810 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 02D14 8091E814 3C018092 */ lui $at, %hi(D_80926C78) ## $at = 80920000 @@ -2661,7 +2661,7 @@ glabel L8091E624 /* 02D20 8091E820 34A56666 */ ori $a1, $a1, 0x6666 ## $a1 = 3FA66666 /* 02D24 8091E824 4407B000 */ mfc1 $a3, $f22 /* 02D28 8091E828 26440D6C */ addiu $a0, $s2, 0x0D6C ## $a0 = 00000D6C -/* 02D2C 8091E82C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02D2C 8091E82C 0C01E107 */ jal Math_ApproachF /* 02D30 8091E830 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 02D34 8091E834 10000238 */ beq $zero, $zero, .L8091F118 @@ -2687,7 +2687,7 @@ glabel L8091E83C /* 02D80 8091E880 3C05C396 */ lui $a1, 0xC396 ## $a1 = C3960000 /* 02D84 8091E884 E64A0028 */ swc1 $f10, 0x0028($s2) ## 00000028 /* 02D88 8091E888 8C440000 */ lw $a0, 0x0000($v0) ## 80925CD0 -/* 02D8C 8091E88C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02D8C 8091E88C 0C01E107 */ jal Math_ApproachF /* 02D90 8091E890 248401BC */ addiu $a0, $a0, 0x01BC ## $a0 = 000001BC /* 02D94 8091E894 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -2707,7 +2707,7 @@ glabel L8091E83C /* 02DC8 8091E8C8 00004812 */ mflo $t1 /* 02DCC 8091E8CC 012A2021 */ addu $a0, $t1, $t2 /* 02DD0 8091E8D0 00042400 */ sll $a0, $a0, 16 -/* 02DD4 8091E8D4 0C01DE1C */ jal Math_Sins +/* 02DD4 8091E8D4 0C01DE1C */ jal Math_SinS ## sins? /* 02DD8 8091E8D8 00042403 */ sra $a0, $a0, 16 /* 02DDC 8091E8DC 44918000 */ mtc1 $s1, $f16 ## $f16 = 0.00 @@ -2730,7 +2730,7 @@ glabel L8091E83C /* 02E20 8091E920 00005812 */ mflo $t3 /* 02E24 8091E924 016E2021 */ addu $a0, $t3, $t6 /* 02E28 8091E928 00042400 */ sll $a0, $a0, 16 -/* 02E2C 8091E92C 0C01DE1C */ jal Math_Sins +/* 02E2C 8091E92C 0C01DE1C */ jal Math_SinS ## sins? /* 02E30 8091E930 00042403 */ sra $a0, $a0, 16 /* 02E34 8091E934 02340019 */ multu $s1, $s4 @@ -2746,7 +2746,7 @@ glabel L8091E83C /* 02E5C 8091E95C 0000C012 */ mflo $t8 /* 02E60 8091E960 02582021 */ addu $a0, $s2, $t8 /* 02E64 8091E964 44058000 */ mfc1 $a1, $f16 -/* 02E68 8091E968 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02E68 8091E968 0C01E107 */ jal Math_ApproachF /* 02E6C 8091E96C 248406AC */ addiu $a0, $a0, 0x06AC ## $a0 = 000006AC /* 02E70 8091E970 C6500D64 */ lwc1 $f16, 0x0D64($s2) ## 00000D64 @@ -2768,7 +2768,7 @@ glabel L8091E83C /* 02EB0 8091E9B0 44063000 */ mfc1 $a2, $f6 /* 02EB4 8091E9B4 00000000 */ nop /* 02EB8 8091E9B8 00063400 */ sll $a2, $a2, 16 -/* 02EBC 8091E9BC 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 02EBC 8091E9BC 0C01E1EF */ jal Math_ApproachS /* 02EC0 8091E9C0 00063403 */ sra $a2, $a2, 16 /* 02EC4 8091E9C4 C6500D64 */ lwc1 $f16, 0x0D64($s2) ## 00000D64 @@ -2788,7 +2788,7 @@ glabel L8091E83C /* 02EFC 8091E9FC 44063000 */ mfc1 $a2, $f6 /* 02F00 8091EA00 00000000 */ nop /* 02F04 8091EA04 00063400 */ sll $a2, $a2, 16 -/* 02F08 8091EA08 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 02F08 8091EA08 0C01E1EF */ jal Math_ApproachS /* 02F0C 8091EA0C 00063403 */ sra $a2, $a2, 16 /* 02F10 8091EA10 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 @@ -2804,7 +2804,7 @@ glabel L8091E83C /* 02F38 8091EA38 4407B000 */ mfc1 $a3, $f22 /* 02F3C 8091EA3C 34A56666 */ ori $a1, $a1, 0x6666 ## $a1 = 3FA66666 /* 02F40 8091EA40 26440D6C */ addiu $a0, $s2, 0x0D6C ## $a0 = 00000D6C -/* 02F44 8091EA44 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02F44 8091EA44 0C01E107 */ jal Math_ApproachF /* 02F48 8091EA48 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 02F4C 8091EA4C 100001B2 */ beq $zero, $zero, .L8091F118 @@ -2820,7 +2820,7 @@ glabel L8091EA54 /* 02F70 8091EA70 34E76666 */ ori $a3, $a3, 0x6666 ## $a3 = 3FA66666 /* 02F74 8091EA74 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 02F78 8091EA78 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = C3938000 -/* 02F7C 8091EA7C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02F7C 8091EA7C 0C01E107 */ jal Math_ApproachF /* 02F80 8091EA80 248401BC */ addiu $a0, $a0, 0x01BC ## $a0 = 809201BC /* 02F84 8091EA84 3C0E8092 */ lui $t6, %hi(D_80925CD0) ## $t6 = 80920000 @@ -2847,7 +2847,7 @@ glabel L8091EA54 /* 02FD4 8091EAD4 00006012 */ mflo $t4 /* 02FD8 8091EAD8 018D2021 */ addu $a0, $t4, $t5 /* 02FDC 8091EADC 00042400 */ sll $a0, $a0, 16 -/* 02FE0 8091EAE0 0C01DE1C */ jal Math_Sins +/* 02FE0 8091EAE0 0C01DE1C */ jal Math_SinS ## sins? /* 02FE4 8091EAE4 00042403 */ sra $a0, $a0, 16 /* 02FE8 8091EAE8 44912000 */ mtc1 $s1, $f4 ## $f4 = 0.00 @@ -2870,7 +2870,7 @@ glabel L8091EA54 /* 0302C 8091EB2C 0000C012 */ mflo $t8 /* 03030 8091EB30 03082021 */ addu $a0, $t8, $t0 /* 03034 8091EB34 00042400 */ sll $a0, $a0, 16 -/* 03038 8091EB38 0C01DE1C */ jal Math_Sins +/* 03038 8091EB38 0C01DE1C */ jal Math_SinS ## sins? /* 0303C 8091EB3C 00042403 */ sra $a0, $a0, 16 /* 03040 8091EB40 02340019 */ multu $s1, $s4 @@ -2886,7 +2886,7 @@ glabel L8091EA54 /* 03068 8091EB68 00004812 */ mflo $t1 /* 0306C 8091EB6C 02492021 */ addu $a0, $s2, $t1 /* 03070 8091EB70 44058000 */ mfc1 $a1, $f16 -/* 03074 8091EB74 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03074 8091EB74 0C01E107 */ jal Math_ApproachF /* 03078 8091EB78 248406AC */ addiu $a0, $a0, 0x06AC ## $a0 = 000006AC /* 0307C 8091EB7C C6440D64 */ lwc1 $f4, 0x0D64($s2) ## 00000D64 @@ -2908,7 +2908,7 @@ glabel L8091EA54 /* 030BC 8091EBBC 44068000 */ mfc1 $a2, $f16 /* 030C0 8091EBC0 00000000 */ nop /* 030C4 8091EBC4 00063400 */ sll $a2, $a2, 16 -/* 030C8 8091EBC8 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 030C8 8091EBC8 0C01E1EF */ jal Math_ApproachS /* 030CC 8091EBCC 00063403 */ sra $a2, $a2, 16 /* 030D0 8091EBD0 C6440D64 */ lwc1 $f4, 0x0D64($s2) ## 00000D64 @@ -2928,7 +2928,7 @@ glabel L8091EA54 /* 03108 8091EC08 44068000 */ mfc1 $a2, $f16 /* 0310C 8091EC0C 00000000 */ nop /* 03110 8091EC10 00063400 */ sll $a2, $a2, 16 -/* 03114 8091EC14 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 03114 8091EC14 0C01E1EF */ jal Math_ApproachS /* 03118 8091EC18 00063403 */ sra $a2, $a2, 16 /* 0311C 8091EC1C 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 @@ -2947,7 +2947,7 @@ glabel L8091EA54 /* 03150 8091EC50 E65E0068 */ swc1 $f30, 0x0068($s2) ## 00000068 /* 03154 8091EC54 A648017A */ sh $t0, 0x017A($s2) ## 0000017A /* 03158 8091EC58 34E7C28F */ ori $a3, $a3, 0xC28F ## $a3 = 3CF5C28F -/* 0315C 8091EC5C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0315C 8091EC5C 0C01E107 */ jal Math_ApproachF /* 03160 8091EC60 264401A0 */ addiu $a0, $s2, 0x01A0 ## $a0 = 000001A0 /* 03164 8091EC64 3C053CA3 */ lui $a1, 0x3CA3 ## $a1 = 3CA30000 @@ -2955,7 +2955,7 @@ glabel L8091EA54 /* 0316C 8091EC6C 34E7C28F */ ori $a3, $a3, 0xC28F ## $a3 = 3C75C28F /* 03170 8091EC70 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3CA3D70A /* 03174 8091EC74 26440D6C */ addiu $a0, $s2, 0x0D6C ## $a0 = 00000D6C -/* 03178 8091EC78 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03178 8091EC78 0C01E107 */ jal Math_ApproachF /* 0317C 8091EC7C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 03180 8091EC80 8642017E */ lh $v0, 0x017E($s2) ## 0000017E @@ -2968,7 +2968,7 @@ glabel L8091EA54 /* 0319C 8091EC9C 3C053D0F */ lui $a1, 0x3D0F ## $a1 = 3D0F0000 /* 031A0 8091ECA0 34A55C29 */ ori $a1, $a1, 0x5C29 ## $a1 = 3D0F5C29 /* 031A4 8091ECA4 4406B000 */ mfc1 $a2, $f22 -/* 031A8 8091ECA8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 031A8 8091ECA8 0C01E107 */ jal Math_ApproachF /* 031AC 8091ECAC 8E4701C0 */ lw $a3, 0x01C0($s2) ## 000001C0 /* 031B0 8091ECB0 8649017E */ lh $t1, 0x017E($s2) ## 0000017E @@ -2986,7 +2986,7 @@ glabel L8091EA54 /* 031DC 8091ECDC 4405A000 */ mfc1 $a1, $f20 /* 031E0 8091ECE0 26440050 */ addiu $a0, $s2, 0x0050 ## $a0 = 00000050 /* 031E4 8091ECE4 4406B000 */ mfc1 $a2, $f22 -/* 031E8 8091ECE8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 031E8 8091ECE8 0C01E107 */ jal Math_ApproachF /* 031EC 8091ECEC 8E4701C0 */ lw $a3, 0x01C0($s2) ## 000001C0 .L8091ECF0: @@ -2997,7 +2997,7 @@ glabel L8091EA54 /* 031FC 8091ECFC 34E7C5AC */ ori $a3, $a3, 0xC5AC ## $a3 = 3727C5AC /* 03200 8091ED00 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 03204 8091ED04 34A5EDFA */ ori $a1, $a1, 0xEDFA ## $a1 = 39EBEDFA -/* 03208 8091ED08 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03208 8091ED08 0C01E107 */ jal Math_ApproachF /* 0320C 8091ED0C 264401C0 */ addiu $a0, $s2, 0x01C0 ## $a0 = 000001C0 /* 03210 8091ED10 10000101 */ beq $zero, $zero, .L8091F118 @@ -3024,7 +3024,7 @@ glabel L8091ED18 /* 0325C 8091ED5C 00006012 */ mflo $t4 /* 03260 8091ED60 024C2021 */ addu $a0, $s2, $t4 /* 03264 8091ED64 44052000 */ mfc1 $a1, $f4 -/* 03268 8091ED68 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03268 8091ED68 0C01E107 */ jal Math_ApproachF /* 0326C 8091ED6C 248406AC */ addiu $a0, $a0, 0x06AC ## $a0 = 000006AC /* 03270 8091ED70 1000000B */ beq $zero, $zero, .L8091EDA0 @@ -3038,7 +3038,7 @@ glabel L8091ED18 /* 0328C 8091ED8C 00006812 */ mflo $t5 /* 03290 8091ED90 024D2021 */ addu $a0, $s2, $t5 /* 03294 8091ED94 44058000 */ mfc1 $a1, $f16 -/* 03298 8091ED98 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03298 8091ED98 0C01E107 */ jal Math_ApproachF /* 0329C 8091ED9C 248406AC */ addiu $a0, $a0, 0x06AC ## $a0 = 000006AC .L8091EDA0: @@ -3070,7 +3070,7 @@ glabel L8091ED18 /* 03304 8091EE04 26440050 */ addiu $a0, $s2, 0x0050 ## $a0 = 00000050 /* 03308 8091EE08 E64A0028 */ swc1 $f10, 0x0028($s2) ## 00000028 /* 0330C 8091EE0C 8E470D64 */ lw $a3, 0x0D64($s2) ## 00000D64 -/* 03310 8091EE10 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03310 8091EE10 0C01E107 */ jal Math_ApproachF /* 03314 8091EE14 E64401A0 */ swc1 $f4, 0x01A0($s2) ## 000001A0 /* 03318 8091EE18 3C0539B7 */ lui $a1, 0x39B7 ## $a1 = 39B70000 @@ -3078,7 +3078,7 @@ glabel L8091ED18 /* 03320 8091EE20 3C073792 */ lui $a3, 0x3792 ## $a3 = 37920000 /* 03324 8091EE24 34E7CCF7 */ ori $a3, $a3, 0xCCF7 ## $a3 = 3792CCF7 /* 03328 8091EE28 34A58034 */ ori $a1, $a1, 0x8034 ## $a1 = 39B78034 -/* 0332C 8091EE2C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0332C 8091EE2C 0C01E107 */ jal Math_ApproachF /* 03330 8091EE30 26440D64 */ addiu $a0, $s2, 0x0D64 ## $a0 = 00000D64 /* 03334 8091EE34 3C053DCC */ lui $a1, 0x3DCC ## $a1 = 3DCC0000 @@ -3086,7 +3086,7 @@ glabel L8091ED18 /* 0333C 8091EE3C 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 /* 03340 8091EE40 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A /* 03344 8091EE44 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD -/* 03348 8091EE48 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03348 8091EE48 0C01E107 */ jal Math_ApproachF /* 0334C 8091EE4C 26440D68 */ addiu $a0, $s2, 0x0D68 ## $a0 = 00000D68 /* 03350 8091EE50 100000B0 */ beq $zero, $zero, .L8091F114 @@ -3098,7 +3098,7 @@ glabel L8091ED18 /* 03364 8091EE64 00042340 */ sll $a0, $a0, 13 /* 03368 8091EE68 00042400 */ sll $a0, $a0, 16 /* 0336C 8091EE6C 00042403 */ sra $a0, $a0, 16 -/* 03370 8091EE70 0C01DE1C */ jal Math_Sins +/* 03370 8091EE70 0C01DE1C */ jal Math_SinS ## sins? /* 03374 8091EE74 E65201A0 */ swc1 $f18, 0x01A0($s2) ## 000001A0 /* 03378 8091EE78 46160202 */ mul.s $f8, $f0, $f22 @@ -3108,7 +3108,7 @@ glabel L8091ED18 /* 03388 8091EE88 00042400 */ sll $a0, $a0, 16 /* 0338C 8091EE8C 46088180 */ add.s $f6, $f16, $f8 /* 03390 8091EE90 00042403 */ sra $a0, $a0, 16 -/* 03394 8091EE94 0C01DE0D */ jal Math_Coss +/* 03394 8091EE94 0C01DE0D */ jal Math_CosS ## coss? /* 03398 8091EE98 E64601A0 */ swc1 $f6, 0x01A0($s2) ## 000001A0 /* 0339C 8091EE9C 3C018092 */ lui $at, %hi(D_80926CB0) ## $at = 80920000 @@ -3121,7 +3121,7 @@ glabel L8091ED18 /* 033B8 8091EEB8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 033BC 8091EEBC 46045480 */ add.s $f18, $f10, $f4 /* 033C0 8091EEC0 44059000 */ mfc1 $a1, $f18 -/* 033C4 8091EEC4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 033C4 8091EEC4 0C01E107 */ jal Math_ApproachF /* 033C8 8091EEC8 00000000 */ nop /* 033CC 8091EECC C6400060 */ lwc1 $f0, 0x0060($s2) ## 00000060 @@ -3178,7 +3178,7 @@ glabel L8091ED18 /* 03494 8091EF94 27A400C8 */ addiu $a0, $sp, 0x00C8 ## $a0 = FFFFFF10 /* 03498 8091EF98 0C0346BD */ jal Matrix_MultVec3f /* 0349C 8091EF9C 02002825 */ or $a1, $s0, $zero ## $a1 = FFFFFF28 -/* 034A0 8091EFA0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 034A0 8091EFA0 0C00CFBE */ jal Rand_ZeroFloat /* 034A4 8091EFA4 4600E306 */ mov.s $f12, $f28 /* 034A8 8091EFA8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 @@ -3296,7 +3296,7 @@ glabel L8091F118 /* 03644 8091F144 5461005F */ bnel $v1, $at, .L8091F2C4 /* 03648 8091F148 8FBF007C */ lw $ra, 0x007C($sp) .L8091F14C: -/* 0364C 8091F14C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0364C 8091F14C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 03650 8091F150 00000000 */ nop /* 03654 8091F154 3C018092 */ lui $at, %hi(D_80926CC8) ## $at = 80920000 @@ -3329,7 +3329,7 @@ glabel L8091F118 /* 036C0 8091F1C0 29A100CA */ slti $at, $t5, 0x00CA /* 036C4 8091F1C4 1420000B */ bne $at, $zero, .L8091F1F4 /* 036C8 8091F1C8 3C018092 */ lui $at, %hi(D_80926CD0) ## $at = 80920000 -/* 036CC 8091F1CC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 036CC 8091F1CC 0C00CFBE */ jal Rand_ZeroFloat /* 036D0 8091F1D0 C42C6CD0 */ lwc1 $f12, %lo(D_80926CD0)($at) /* 036D4 8091F1D4 3C018092 */ lui $at, %hi(D_80926CD4) ## $at = 80920000 @@ -3343,7 +3343,7 @@ glabel L8091F118 .L8091F1F4: /* 036F4 8091F1F4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 036F8 8091F1F8 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 036FC 8091F1FC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 036FC 8091F1FC 0C00CFBE */ jal Rand_ZeroFloat /* 03700 8091F200 00000000 */ nop /* 03704 8091F204 4600010D */ trunc.w.s $f4, $f0 @@ -3356,7 +3356,7 @@ glabel L8091F118 /* 03720 8091F220 00118C03 */ sra $s1, $s1, 16 /* 03724 8091F224 26310012 */ addiu $s1, $s1, 0x0012 ## $s1 = 00000013 /* 03728 8091F228 00118C00 */ sll $s1, $s1, 16 -/* 0372C 8091F22C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0372C 8091F22C 0C00CFBE */ jal Rand_ZeroFloat /* 03730 8091F230 00118C03 */ sra $s1, $s1, 16 /* 03734 8091F234 02340019 */ multu $s1, $s4 @@ -3379,13 +3379,13 @@ glabel L8091F118 /* 03774 8091F274 46045182 */ mul.s $f6, $f10, $f4 /* 03778 8091F278 00000000 */ nop /* 0377C 8091F27C 46123582 */ mul.s $f22, $f6, $f18 -/* 03780 8091F280 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 03780 8091F280 0C00CFC8 */ jal Rand_CenteredFloat /* 03784 8091F284 4600B306 */ mov.s $f12, $f22 /* 03788 8091F288 C6080D70 */ lwc1 $f8, 0x0D70($s0) ## 00000F38 /* 0378C 8091F28C 4600B306 */ mov.s $f12, $f22 /* 03790 8091F290 46080400 */ add.s $f16, $f0, $f8 -/* 03794 8091F294 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 03794 8091F294 0C00CFC8 */ jal Rand_CenteredFloat /* 03798 8091F298 E7B000BC */ swc1 $f16, 0x00BC($sp) /* 0379C 8091F29C C60A0D78 */ lwc1 $f10, 0x0D78($s0) ## 00000F40 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F2FC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F2FC.s index c5795e30f1..2d4346aff2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F2FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F2FC.s @@ -114,16 +114,16 @@ glabel func_8091F2FC /* 03984 8091F484 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 03988 8091F488 27B40078 */ addiu $s4, $sp, 0x0078 ## $s4 = FFFFFFE0 .L8091F48C: -/* 0398C 8091F48C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0398C 8091F48C 0C00CFC8 */ jal Rand_CenteredFloat /* 03990 8091F490 4600A306 */ mov.s $f12, $f20 /* 03994 8091F494 E7A00078 */ swc1 $f0, 0x0078($sp) -/* 03998 8091F498 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 03998 8091F498 0C00CFBE */ jal Rand_ZeroFloat /* 0399C 8091F49C 4600C306 */ mov.s $f12, $f24 /* 039A0 8091F4A0 461A0200 */ add.s $f8, $f0, $f26 /* 039A4 8091F4A4 4600A306 */ mov.s $f12, $f20 -/* 039A8 8091F4A8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 039A8 8091F4A8 0C00CFC8 */ jal Rand_CenteredFloat /* 039AC 8091F4AC E7A8007C */ swc1 $f8, 0x007C($sp) /* 039B0 8091F4B0 E7A00080 */ swc1 $f0, 0x0080($sp) @@ -143,7 +143,7 @@ glabel func_8091F2FC /* 039E8 8091F4E8 46125100 */ add.s $f4, $f10, $f18 /* 039EC 8091F4EC 46083400 */ add.s $f16, $f6, $f8 /* 039F0 8091F4F0 E7A40084 */ swc1 $f4, 0x0084($sp) -/* 039F4 8091F4F4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 039F4 8091F4F4 0C00CFBE */ jal Rand_ZeroFloat /* 039F8 8091F4F8 E7B0008C */ swc1 $f16, 0x008C($sp) /* 039FC 8091F4FC 461E0280 */ add.s $f10, $f0, $f30 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s index 6efa32460c..7f07b30da0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s @@ -263,7 +263,7 @@ glabel L8091F7D0 /* 03D90 8091F890 C42C6D00 */ lwc1 $f12, %lo(D_80926D00)($at) /* 03D94 8091F894 E7A80064 */ swc1 $f8, 0x0064($sp) /* 03D98 8091F898 C6040F70 */ lwc1 $f4, 0x0F70($s0) ## 00000F70 -/* 03D9C 8091F89C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 03D9C 8091F89C 0C00CFBE */ jal Rand_ZeroFloat /* 03DA0 8091F8A0 E7A4006C */ swc1 $f4, 0x006C($sp) /* 03DA4 8091F8A4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -294,7 +294,7 @@ glabel L8091F8F8 /* 03E00 8091F900 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3B03126F /* 03E04 8091F904 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD /* 03E08 8091F908 2604100C */ addiu $a0, $s0, 0x100C ## $a0 = 0000100C -/* 03E0C 8091F90C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03E0C 8091F90C 0C01E107 */ jal Math_ApproachF /* 03E10 8091F910 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03E14 8091F914 86180F64 */ lh $t8, 0x0F64($s0) ## 00000F64 @@ -319,7 +319,7 @@ glabel L8091F8F8 /* 03E60 8091F960 00812021 */ addu $a0, $a0, $at /* 03E64 8091F964 00042200 */ sll $a0, $a0, 8 /* 03E68 8091F968 00042400 */ sll $a0, $a0, 16 -/* 03E6C 8091F96C 0C01DE1C */ jal Math_Sins +/* 03E6C 8091F96C 0C01DE1C */ jal Math_SinS ## sins? /* 03E70 8091F970 00042403 */ sra $a0, $a0, 16 /* 03E74 8091F974 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -335,7 +335,7 @@ glabel L8091F8F8 /* 03E98 8091F998 00812021 */ addu $a0, $a0, $at /* 03E9C 8091F99C 00042200 */ sll $a0, $a0, 8 /* 03EA0 8091F9A0 00042400 */ sll $a0, $a0, 16 -/* 03EA4 8091F9A4 0C01DE1C */ jal Math_Sins +/* 03EA4 8091F9A4 0C01DE1C */ jal Math_SinS ## sins? /* 03EA8 8091F9A8 00042403 */ sra $a0, $a0, 16 /* 03EAC 8091F9AC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -356,7 +356,7 @@ glabel L8091F8F8 /* 03EE4 8091F9E4 C60401DC */ lwc1 $f4, 0x01DC($s0) ## 000001DC /* 03EE8 8091F9E8 E7AC0098 */ swc1 $f12, 0x0098($sp) /* 03EEC 8091F9EC 46062381 */ sub.s $f14, $f4, $f6 -/* 03EF0 8091F9F0 0C03F494 */ jal Math_atan2f +/* 03EF0 8091F9F0 0C03F494 */ jal Math_FAtan2F /* 03EF4 8091F9F4 E7AE0090 */ swc1 $f14, 0x0090($sp) /* 03EF8 8091F9F8 C7B00098 */ lwc1 $f16, 0x0098($sp) /* 03EFC 8091F9FC C7B20090 */ lwc1 $f18, 0x0090($sp) @@ -366,7 +366,7 @@ glabel L8091F8F8 /* 03F0C 8091FA0C 46129282 */ mul.s $f10, $f18, $f18 /* 03F10 8091FA10 460A4100 */ add.s $f4, $f8, $f10 /* 03F14 8091FA14 E7A4003C */ swc1 $f4, 0x003C($sp) -/* 03F18 8091FA18 0C03F494 */ jal Math_atan2f +/* 03F18 8091FA18 0C03F494 */ jal Math_FAtan2F /* 03F1C 8091FA1C 46002384 */ sqrt.s $f14, $f4 /* 03F20 8091FA20 3C018092 */ lui $at, %hi(D_80926D08) ## $at = 80920000 /* 03F24 8091FA24 C7A20088 */ lwc1 $f2, 0x0088($sp) @@ -383,7 +383,7 @@ glabel L8091F8F8 /* 03F50 8091FA50 00073C00 */ sll $a3, $a3, 16 /* 03F54 8091FA54 00073C03 */ sra $a3, $a3, 16 /* 03F58 8091FA58 00052C00 */ sll $a1, $a1, 16 -/* 03F5C 8091FA5C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 03F5C 8091FA5C 0C01E1EF */ jal Math_ApproachS /* 03F60 8091FA60 00052C03 */ sra $a1, $a1, 16 /* 03F64 8091FA64 3C018092 */ lui $at, %hi(D_80926D0C) ## $at = 80920000 @@ -400,7 +400,7 @@ glabel L8091F8F8 /* 03F90 8091FA90 00073C00 */ sll $a3, $a3, 16 /* 03F94 8091FA94 00073C03 */ sra $a3, $a3, 16 /* 03F98 8091FA98 00052C00 */ sll $a1, $a1, 16 -/* 03F9C 8091FA9C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 03F9C 8091FA9C 0C01E1EF */ jal Math_ApproachS /* 03FA0 8091FAA0 00052C03 */ sra $a1, $a1, 16 /* 03FA4 8091FAA4 8603015A */ lh $v1, 0x015A($s0) ## 0000015A @@ -439,7 +439,7 @@ glabel L8091F8F8 /* 04024 8091FB24 26040F74 */ addiu $a0, $s0, 0x0F74 ## $a0 = 00000F74 /* 04028 8091FB28 8D450024 */ lw $a1, 0x0024($t2) ## 00000024 /* 0402C 8091FB2C 44072000 */ mfc1 $a3, $f4 -/* 04030 8091FB30 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04030 8091FB30 0C01E107 */ jal Math_ApproachF /* 04034 8091FB34 00000000 */ nop /* 04038 8091FB38 8FAB0074 */ lw $t3, 0x0074($sp) @@ -455,7 +455,7 @@ glabel L8091F8F8 /* 04060 8091FB60 46062202 */ mul.s $f8, $f4, $f6 /* 04064 8091FB64 44055000 */ mfc1 $a1, $f10 /* 04068 8091FB68 44074000 */ mfc1 $a3, $f8 -/* 0406C 8091FB6C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0406C 8091FB6C 0C01E107 */ jal Math_ApproachF /* 04070 8091FB70 00000000 */ nop /* 04074 8091FB74 C60A0FB8 */ lwc1 $f10, 0x0FB8($s0) ## 00000FB8 @@ -467,7 +467,7 @@ glabel L8091F8F8 /* 0408C 8091FB8C 26040F7C */ addiu $a0, $s0, 0x0F7C ## $a0 = 00000F7C /* 04090 8091FB90 8D85002C */ lw $a1, 0x002C($t4) ## 0000002C /* 04094 8091FB94 44073000 */ mfc1 $a3, $f6 -/* 04098 8091FB98 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04098 8091FB98 0C01E107 */ jal Math_ApproachF /* 0409C 8091FB9C 00000000 */ nop /* 040A0 8091FBA0 3C053CA3 */ lui $a1, 0x3CA3 ## $a1 = 3CA30000 @@ -475,7 +475,7 @@ glabel L8091F8F8 /* 040A8 8091FBA8 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A83126F /* 040AC 8091FBAC 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3CA3D70A /* 040B0 8091FBB0 26040FEC */ addiu $a0, $s0, 0x0FEC ## $a0 = 00000FEC -/* 040B4 8091FBB4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 040B4 8091FBB4 0C01E107 */ jal Math_ApproachF /* 040B8 8091FBB8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 040BC 8091FBBC 8603015A */ lh $v1, 0x015A($s0) ## 0000015A @@ -506,7 +506,7 @@ glabel L8091F8F8 /* 04118 8091FC18 C42C6D10 */ lwc1 $f12, %lo(D_80926D10)($at) /* 0411C 8091FC1C E7A80058 */ swc1 $f8, 0x0058($sp) /* 04120 8091FC20 C6040F70 */ lwc1 $f4, 0x0F70($s0) ## 00000F70 -/* 04124 8091FC24 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 04124 8091FC24 0C00CFBE */ jal Rand_ZeroFloat /* 04128 8091FC28 E7A40060 */ swc1 $f4, 0x0060($sp) /* 0412C 8091FC2C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -569,7 +569,7 @@ glabel L8091F8F8 /* 041F4 8091FCF4 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 041F8 8091FCF8 E7AC0080 */ swc1 $f12, 0x0080($sp) /* 041FC 8091FCFC E7AE0078 */ swc1 $f14, 0x0078($sp) -/* 04200 8091FD00 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04200 8091FD00 0C01E107 */ jal Math_ApproachF /* 04204 8091FD04 E7B0007C */ swc1 $f16, 0x007C($sp) /* 04208 8091FD08 C7AC0080 */ lwc1 $f12, 0x0080($sp) @@ -607,14 +607,14 @@ glabel L8091F8F8 .L8091FD80: /* 04280 8091FD80 44056000 */ mfc1 $a1, $f12 .L8091FD84: -/* 04284 8091FD84 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04284 8091FD84 0C01E107 */ jal Math_ApproachF /* 04288 8091FD88 E7B0007C */ swc1 $f16, 0x007C($sp) /* 0428C 8091FD8C C7B0007C */ lwc1 $f16, 0x007C($sp) /* 04290 8091FD90 26041008 */ addiu $a0, $s0, 0x1008 ## $a0 = 00001008 /* 04294 8091FD94 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04298 8091FD98 44058000 */ mfc1 $a1, $f16 -/* 0429C 8091FD9C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0429C 8091FD9C 0C01E107 */ jal Math_ApproachF /* 042A0 8091FDA0 3C074300 */ lui $a3, 0x4300 ## $a3 = 43000000 /* 042A4 8091FDA4 8603015A */ lh $v1, 0x015A($s0) ## 0000015A @@ -1060,7 +1060,7 @@ glabel L80920280 /* 04948 80920448 AFAC0038 */ sw $t4, 0x0038($sp) /* 0494C 8092044C AFAA003C */ sw $t2, 0x003C($sp) /* 04950 80920450 44072000 */ mfc1 $a3, $f4 -/* 04954 80920454 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04954 80920454 0C01E107 */ jal Math_ApproachF /* 04958 80920458 01002025 */ or $a0, $t0, $zero ## $a0 = 00000F68 /* 0495C 8092045C C6060FA8 */ lwc1 $f6, 0x0FA8($s0) ## 00000FA8 @@ -1070,7 +1070,7 @@ glabel L80920280 /* 0496C 8092046C 46083282 */ mul.s $f10, $f6, $f8 /* 04970 80920470 8E060FCC */ lw $a2, 0x0FCC($s0) ## 00000FCC /* 04974 80920474 44075000 */ mfc1 $a3, $f10 -/* 04978 80920478 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04978 80920478 0C01E107 */ jal Math_ApproachF /* 0497C 8092047C 00000000 */ nop /* 04980 80920480 C6040FAC */ lwc1 $f4, 0x0FAC($s0) ## 00000FAC @@ -1080,7 +1080,7 @@ glabel L80920280 /* 04990 80920490 46062202 */ mul.s $f8, $f4, $f6 /* 04994 80920494 8E060FD0 */ lw $a2, 0x0FD0($s0) ## 00000FD0 /* 04998 80920498 44074000 */ mfc1 $a3, $f8 -/* 0499C 8092049C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0499C 8092049C 0C01E107 */ jal Math_ApproachF /* 049A0 809204A0 00000000 */ nop /* 049A4 809204A4 C60A0FB0 */ lwc1 $f10, 0x0FB0($s0) ## 00000FB0 @@ -1090,7 +1090,7 @@ glabel L80920280 /* 049B4 809204B4 46045182 */ mul.s $f6, $f10, $f4 /* 049B8 809204B8 8E060FE0 */ lw $a2, 0x0FE0($s0) ## 00000FE0 /* 049BC 809204BC 44073000 */ mfc1 $a3, $f6 -/* 049C0 809204C0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 049C0 809204C0 0C01E107 */ jal Math_ApproachF /* 049C4 809204C4 00000000 */ nop /* 049C8 809204C8 C6080FB4 */ lwc1 $f8, 0x0FB4($s0) ## 00000FB4 @@ -1100,7 +1100,7 @@ glabel L80920280 /* 049D8 809204D8 460A4102 */ mul.s $f4, $f8, $f10 /* 049DC 809204DC 8E060FE4 */ lw $a2, 0x0FE4($s0) ## 00000FE4 /* 049E0 809204E0 44072000 */ mfc1 $a3, $f4 -/* 049E4 809204E4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 049E4 809204E4 0C01E107 */ jal Math_ApproachF /* 049E8 809204E8 00000000 */ nop /* 049EC 809204EC C6060FB8 */ lwc1 $f6, 0x0FB8($s0) ## 00000FB8 @@ -1110,7 +1110,7 @@ glabel L80920280 /* 049FC 809204FC 46083282 */ mul.s $f10, $f6, $f8 /* 04A00 80920500 8E060FE8 */ lw $a2, 0x0FE8($s0) ## 00000FE8 /* 04A04 80920504 44075000 */ mfc1 $a3, $f10 -/* 04A08 80920508 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04A08 80920508 0C01E107 */ jal Math_ApproachF /* 04A0C 8092050C 00000000 */ nop /* 04A10 80920510 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -1119,7 +1119,7 @@ glabel L80920280 /* 04A1C 8092051C 8E070FF0 */ lw $a3, 0x0FF0($s0) ## 00000FF0 /* 04A20 80920520 44050000 */ mfc1 $a1, $f0 /* 04A24 80920524 44060000 */ mfc1 $a2, $f0 -/* 04A28 80920528 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04A28 80920528 0C01E107 */ jal Math_ApproachF /* 04A2C 8092052C 00000000 */ nop /* 04A30 80920530 10000014 */ beq $zero, $zero, .L80920584 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809206C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809206C4.s index 9eb908fd2d..d0e86a0f8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809206C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809206C4.s @@ -115,7 +115,7 @@ glabel L80920734 /* 04CB8 809207B8 C62A0F70 */ lwc1 $f10, 0x0F70($s1) ## 00000F70 /* 04CBC 809207BC E7AC0088 */ swc1 $f12, 0x0088($sp) /* 04CC0 809207C0 460A4381 */ sub.s $f14, $f8, $f10 -/* 04CC4 809207C4 0C03F494 */ jal Math_atan2f +/* 04CC4 809207C4 0C03F494 */ jal Math_FAtan2F /* 04CC8 809207C8 E7AE0084 */ swc1 $f14, 0x0084($sp) /* 04CCC 809207CC C7AC0088 */ lwc1 $f12, 0x0088($sp) /* 04CD0 809207D0 C7AE0084 */ lwc1 $f14, 0x0084($sp) @@ -149,7 +149,7 @@ glabel L80920734 /* 04D34 80920834 3C073B03 */ lui $a3, 0x3B03 ## $a3 = 3B030000 /* 04D38 80920838 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3B03126F /* 04D3C 8092083C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 04D40 80920840 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04D40 80920840 0C01E107 */ jal Math_ApproachF /* 04D44 80920844 E7A2007C */ swc1 $f2, 0x007C($sp) /* 04D48 80920848 C7A2007C */ lwc1 $f2, 0x007C($sp) @@ -159,7 +159,7 @@ glabel L80920734 /* 04D58 80920858 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3B03126F /* 04D5C 8092085C 26240054 */ addiu $a0, $s1, 0x0054 ## $a0 = 00000054 /* 04D60 80920860 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 04D64 80920864 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04D64 80920864 0C01E107 */ jal Math_ApproachF /* 04D68 80920868 E6280058 */ swc1 $f8, 0x0058($s1) ## 00000058 /* 04D6C 8092086C C62A1004 */ lwc1 $f10, 0x1004($s1) ## 00001004 @@ -175,7 +175,7 @@ glabel L80920734 /* 04D94 80920894 44070000 */ mfc1 $a3, $f0 /* 04D98 80920898 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3D4CCCCD /* 04D9C 8092089C 26241008 */ addiu $a0, $s1, 0x1008 ## $a0 = 00001008 -/* 04DA0 809208A0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04DA0 809208A0 0C01E107 */ jal Math_ApproachF /* 04DA4 809208A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04DA8 809208A8 10000007 */ beq $zero, $zero, .L809208C8 @@ -184,7 +184,7 @@ glabel L80920734 /* 04DB0 809208B0 44070000 */ mfc1 $a3, $f0 /* 04DB4 809208B4 26241008 */ addiu $a0, $s1, 0x1008 ## $a0 = 00001008 /* 04DB8 809208B8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 04DBC 809208BC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04DBC 809208BC 0C01E107 */ jal Math_ApproachF /* 04DC0 809208C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04DC4 809208C4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 @@ -192,14 +192,14 @@ glabel L80920734 /* 04DC8 809208C8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04DCC 809208CC 26240028 */ addiu $a0, $s1, 0x0028 ## $a0 = 00000028 /* 04DD0 809208D0 3C054316 */ lui $a1, 0x4316 ## $a1 = 43160000 -/* 04DD4 809208D4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04DD4 809208D4 0C01E107 */ jal Math_ApproachF /* 04DD8 809208D8 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 04DDC 809208DC 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 04DE0 809208E0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04DE4 809208E4 26240F6C */ addiu $a0, $s1, 0x0F6C ## $a0 = 00000F6C /* 04DE8 809208E8 3C0542C8 */ lui $a1, 0x42C8 ## $a1 = 42C80000 -/* 04DEC 809208EC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04DEC 809208EC 0C01E107 */ jal Math_ApproachF /* 04DF0 809208F0 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 04DF4 809208F4 262F0024 */ addiu $t7, $s1, 0x0024 ## $t7 = 00000024 @@ -242,17 +242,17 @@ glabel L80920734 /* 04E80 80920980 3C014120 */ lui $at, 0x4120 ## $at = 41200000 .L80920984: /* 04E84 80920984 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 04E88 80920988 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 04E88 80920988 0C00CFC8 */ jal Rand_CenteredFloat /* 04E8C 8092098C 00000000 */ nop /* 04E90 80920990 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 04E94 80920994 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 04E98 80920998 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 04E98 80920998 0C00CFC8 */ jal Rand_CenteredFloat /* 04E9C 8092099C E7A00054 */ swc1 $f0, 0x0054($sp) /* 04EA0 809209A0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 04EA4 809209A4 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 04EA8 809209A8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 04EA8 809209A8 0C00CFC8 */ jal Rand_CenteredFloat /* 04EAC 809209AC E7A00058 */ swc1 $f0, 0x0058($sp) /* 04EB0 809209B0 8FB9002C */ lw $t9, 0x002C($sp) @@ -279,7 +279,7 @@ glabel L80920734 /* 04F04 80920A04 46000280 */ add.s $f10, $f0, $f0 /* 04F08 80920A08 E7A8004C */ swc1 $f8, 0x004C($sp) /* 04F0C 80920A0C 460A3400 */ add.s $f16, $f6, $f10 -/* 04F10 80920A10 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 04F10 80920A10 0C00CFBE */ jal Rand_ZeroFloat /* 04F14 80920A14 E7B00050 */ swc1 $f16, 0x0050($sp) /* 04F18 80920A18 3C018092 */ lui $at, %hi(D_80926D80) ## $at = 80920000 @@ -518,7 +518,7 @@ glabel L80920D8C /* 05294 80920D94 34E79BA4 */ ori $a3, $a3, 0x9BA4 ## $a3 = 3B449BA4 /* 05298 80920D98 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 0529C 80920D9C 26241004 */ addiu $a0, $s1, 0x1004 ## $a0 = 00001004 -/* 052A0 80920DA0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 052A0 80920DA0 0C01E107 */ jal Math_ApproachF /* 052A4 80920DA4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 052A8 80920DA8 3C0143F5 */ lui $at, 0x43F5 ## $at = 43F50000 @@ -527,7 +527,7 @@ glabel L80920D8C /* 052B4 80920DB4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 052B8 80920DB8 44050000 */ mfc1 $a1, $f0 /* 052BC 80920DBC 26240FFC */ addiu $a0, $s1, 0x0FFC ## $a0 = 00000FFC -/* 052C0 80920DC0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 052C0 80920DC0 0C01E107 */ jal Math_ApproachF /* 052C4 80920DC4 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 052C8 80920DC8 862D017E */ lh $t5, 0x017E($s1) ## 0000017E @@ -586,14 +586,14 @@ glabel L80920DFC /* 05390 80920E90 26240F6C */ addiu $a0, $s1, 0x0F6C ## $a0 = 00000F6C /* 05394 80920E94 3C0744FA */ lui $a3, 0x44FA ## $a3 = 44FA0000 /* 05398 80920E98 44054000 */ mfc1 $a1, $f8 -/* 0539C 80920E9C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0539C 80920E9C 0C01E107 */ jal Math_ApproachF /* 053A0 80920EA0 00000000 */ nop /* 053A4 80920EA4 3C088092 */ lui $t0, %hi(D_80925CD4) ## $t0 = 80920000 /* 053A8 80920EA8 10000005 */ beq $zero, $zero, .L80920EC0 /* 053AC 80920EAC 25085CD4 */ addiu $t0, $t0, %lo(D_80925CD4) ## $t0 = 80925CD4 .L80920EB0: -/* 053B0 80920EB0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 053B0 80920EB0 0C01E107 */ jal Math_ApproachF /* 053B4 80920EB4 3C0744FA */ lui $a3, 0x44FA ## $a3 = 44FA0000 /* 053B8 80920EB8 3C088092 */ lui $t0, %hi(D_80925CD4) ## $t0 = 80920000 @@ -611,7 +611,7 @@ glabel L80920DFC /* 053E4 80920EE4 3C0744FA */ lui $a3, 0x44FA ## $a3 = 44FA0000 /* 053E8 80920EE8 46048480 */ add.s $f18, $f16, $f4 /* 053EC 80920EEC 44059000 */ mfc1 $a1, $f18 -/* 053F0 80920EF0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 053F0 80920EF0 0C01E107 */ jal Math_ApproachF /* 053F4 80920EF4 00000000 */ nop /* 053F8 80920EF8 C6280F78 */ lwc1 $f8, 0x0F78($s1) ## 00000F78 @@ -622,7 +622,7 @@ glabel L80920DFC /* 05408 80920F08 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 0540C 80920F0C 26240F6C */ addiu $a0, $s1, 0x0F6C ## $a0 = 00000F6C /* 05410 80920F10 3C054396 */ lui $a1, 0x4396 ## $a1 = 43960000 -/* 05414 80920F14 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05414 80920F14 0C01E107 */ jal Math_ApproachF /* 05418 80920F18 8E271000 */ lw $a3, 0x1000($s1) ## 00001000 .L80920F1C: @@ -631,14 +631,14 @@ glabel L80920DFC /* 05424 80920F24 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 05428 80920F28 34A50FDB */ ori $a1, $a1, 0x0FDB ## $a1 = BFC90FDB /* 0542C 80920F2C 26241004 */ addiu $a0, $s1, 0x1004 ## $a0 = 00001004 -/* 05430 80920F30 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05430 80920F30 0C01E107 */ jal Math_ApproachF /* 05434 80920F34 8E271008 */ lw $a3, 0x1008($s1) ## 00001008 /* 05438 80920F38 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 0543C 80920F3C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 05440 80920F40 26241000 */ addiu $a0, $s1, 0x1000 ## $a0 = 00001000 /* 05444 80920F44 3C054040 */ lui $a1, 0x4040 ## $a1 = 40400000 -/* 05448 80920F48 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05448 80920F48 0C01E107 */ jal Math_ApproachF /* 0544C 80920F4C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05450 80920F50 3C053C54 */ lui $a1, 0x3C54 ## $a1 = 3C540000 @@ -646,7 +646,7 @@ glabel L80920DFC /* 05458 80920F58 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A03126F /* 0545C 80920F5C 34A5FDF3 */ ori $a1, $a1, 0xFDF3 ## $a1 = 3C54FDF3 /* 05460 80920F60 26241008 */ addiu $a0, $s1, 0x1008 ## $a0 = 00001008 -/* 05464 80920F64 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05464 80920F64 0C01E107 */ jal Math_ApproachF /* 05468 80920F68 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0546C 80920F6C 3C088092 */ lui $t0, %hi(D_80925CD4) ## $t0 = 80920000 @@ -659,7 +659,7 @@ glabel L80920DFC /* 05488 80920F88 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3CA3D70A /* 0548C 80920F8C 26240FFC */ addiu $a0, $s1, 0x0FFC ## $a0 = 00000FFC /* 05490 80920F90 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 -/* 05494 80920F94 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05494 80920F94 0C01E107 */ jal Math_ApproachF /* 05498 80920F98 8E271000 */ lw $a3, 0x1000($s1) ## 00001000 /* 0549C 80920F9C 3C088092 */ lui $t0, %hi(D_80925CD4) ## $t0 = 80920000 @@ -716,7 +716,7 @@ glabel L80920DFC /* 05564 80921064 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 05568 80921068 26240FFC */ addiu $a0, $s1, 0x0FFC ## $a0 = 00000FFC /* 0556C 8092106C 3C054316 */ lui $a1, 0x4316 ## $a1 = 43160000 -/* 05570 80921070 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05570 80921070 0C01E107 */ jal Math_ApproachF /* 05574 80921074 8E271000 */ lw $a3, 0x1000($s1) ## 00001000 .L80921078: @@ -796,7 +796,7 @@ glabel L8092107C /* 05684 80921184 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 05688 80921188 8D040000 */ lw $a0, 0x0000($t0) ## 80925CD4 /* 0568C 8092118C 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 05690 80921190 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05690 80921190 0C01E107 */ jal Math_ApproachF /* 05694 80921194 248401C4 */ addiu $a0, $a0, 0x01C4 ## $a0 = 000001C4 /* 05698 80921198 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 @@ -805,7 +805,7 @@ glabel L8092107C /* 056A0 809211A0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 056A4 809211A4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 056A8 809211A8 2624018C */ addiu $a0, $s1, 0x018C ## $a0 = 0000018C -/* 056AC 809211AC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 056AC 809211AC 0C01E107 */ jal Math_ApproachF /* 056B0 809211B0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 056B4 809211B4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -839,7 +839,7 @@ glabel L8092107C /* 05724 80921224 8E250FD8 */ lw $a1, 0x0FD8($s1) ## 00000FD8 /* 05728 80921228 26240F78 */ addiu $a0, $s1, 0x0F78 ## $a0 = 00000F78 /* 0572C 8092122C 44078000 */ mfc1 $a3, $f16 -/* 05730 80921230 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05730 80921230 0C01E107 */ jal Math_ApproachF /* 05734 80921234 00000000 */ nop /* 05738 80921238 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -848,7 +848,7 @@ glabel L8092107C /* 05744 80921244 8E270FF0 */ lw $a3, 0x0FF0($s1) ## 00000FF0 /* 05748 80921248 44050000 */ mfc1 $a1, $f0 /* 0574C 8092124C 44060000 */ mfc1 $a2, $f0 -/* 05750 80921250 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05750 80921250 0C01E107 */ jal Math_ApproachF /* 05754 80921254 00000000 */ nop /* 05758 80921258 86250F62 */ lh $a1, 0x0F62($s1) ## 00000F62 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80921280.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80921280.s index f9c6dd7c38..79e234d632 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80921280.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80921280.s @@ -275,17 +275,17 @@ glabel func_80921280 /* 05ADC 809215DC 27B10054 */ addiu $s1, $sp, 0x0054 ## $s1 = FFFFFFE4 /* 05AE0 809215E0 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 .L809215E4: -/* 05AE4 809215E4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 05AE4 809215E4 0C00CFC8 */ jal Rand_CenteredFloat /* 05AE8 809215E8 4600B306 */ mov.s $f12, $f22 /* 05AEC 809215EC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 05AF0 809215F0 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 05AF4 809215F4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 05AF4 809215F4 0C00CFBE */ jal Rand_ZeroFloat /* 05AF8 809215F8 E7A00048 */ swc1 $f0, 0x0048($sp) /* 05AFC 809215FC 46140400 */ add.s $f16, $f0, $f20 /* 05B00 80921600 4600B306 */ mov.s $f12, $f22 -/* 05B04 80921604 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 05B04 80921604 0C00CFC8 */ jal Rand_CenteredFloat /* 05B08 80921608 E7B0004C */ swc1 $f16, 0x004C($sp) /* 05B0C 8092160C 8FA90040 */ lw $t1, 0x0040($sp) @@ -306,7 +306,7 @@ glabel func_80921280 /* 05B48 80921648 46069200 */ add.s $f8, $f18, $f6 /* 05B4C 8092164C 46105100 */ add.s $f4, $f10, $f16 /* 05B50 80921650 E7A80054 */ swc1 $f8, 0x0054($sp) -/* 05B54 80921654 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 05B54 80921654 0C00CFBE */ jal Rand_ZeroFloat /* 05B58 80921658 E7A4005C */ swc1 $f4, 0x005C($sp) /* 05B5C 8092165C 3C018092 */ lui $at, %hi(D_80926DA8) ## $at = 80920000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809216D0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809216D0.s index 8a532713e1..bca7c4aa08 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809216D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809216D0.s @@ -116,7 +116,7 @@ glabel func_809216D0 /* 05C30 80921730 E4880014 */ swc1 $f8, 0x0014($a0) ## 000001B8 /* 05C34 80921734 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05C38 80921738 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 05C3C 8092173C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05C3C 8092173C 0C01E107 */ jal Math_ApproachF /* 05C40 80921740 E4920010 */ swc1 $f18, 0x0010($a0) ## 000001B4 /* 05C44 80921744 86220F60 */ lh $v0, 0x0F60($s1) ## 00000F60 @@ -190,7 +190,7 @@ glabel func_809216D0 /* 05D3C 8092183C 44050000 */ mfc1 $a1, $f0 /* 05D40 80921840 3C073A83 */ lui $a3, 0x3A83 ## $a3 = 3A830000 /* 05D44 80921844 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A83126F -/* 05D48 80921848 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05D48 80921848 0C01E107 */ jal Math_ApproachF /* 05D4C 8092184C E7A200BC */ swc1 $f2, 0x00BC($sp) /* 05D50 80921850 C7A200BC */ lwc1 $f2, 0x00BC($sp) @@ -201,7 +201,7 @@ glabel func_809216D0 /* 05D64 80921864 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A83126F /* 05D68 80921868 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 05D6C 8092186C 26240054 */ addiu $a0, $s1, 0x0054 ## $a0 = 00000054 -/* 05D70 80921870 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05D70 80921870 0C01E107 */ jal Math_ApproachF /* 05D74 80921874 E6280058 */ swc1 $f8, 0x0058($s1) ## 00000058 /* 05D78 80921878 26240024 */ addiu $a0, $s1, 0x0024 ## $a0 = 00000024 @@ -417,7 +417,7 @@ glabel L80921B08 /* 0607C 80921B7C 00812023 */ subu $a0, $a0, $at /* 06080 80921B80 00042200 */ sll $a0, $a0, 8 /* 06084 80921B84 00042400 */ sll $a0, $a0, 16 -/* 06088 80921B88 0C01DE1C */ jal Math_Sins +/* 06088 80921B88 0C01DE1C */ jal Math_SinS ## sins? /* 0608C 80921B8C 00042403 */ sra $a0, $a0, 16 /* 06090 80921B90 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -479,7 +479,7 @@ glabel L80921B08 /* 0615C 80921C5C 27280001 */ addiu $t0, $t9, 0x0001 ## $t0 = 00000001 /* 06160 80921C60 AE380004 */ sw $t8, 0x0004($s1) ## 00000004 /* 06164 80921C64 A6280164 */ sh $t0, 0x0164($s1) ## 00000164 -/* 06168 80921C68 0C01DE1C */ jal Math_Sins +/* 06168 80921C68 0C01DE1C */ jal Math_SinS ## sins? /* 0616C 80921C6C 00042403 */ sra $a0, $a0, 16 /* 06170 80921C70 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -585,7 +585,7 @@ glabel L80921B08 /* 062E0 80921DE0 A7A3008E */ sh $v1, 0x008E($sp) /* 062E4 80921DE4 46089280 */ add.s $f10, $f18, $f8 /* 062E8 80921DE8 44055000 */ mfc1 $a1, $f10 -/* 062EC 80921DEC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 062EC 80921DEC 0C01E107 */ jal Math_ApproachF /* 062F0 80921DF0 00000000 */ nop /* 062F4 80921DF4 3C108092 */ lui $s0, %hi(D_80925CD4) ## $s0 = 80920000 @@ -626,19 +626,19 @@ glabel L80921B08 .L80921E7C: /* 0637C 80921E7C 8FA40040 */ lw $a0, 0x0040($sp) /* 06380 80921E80 8E2501D4 */ lw $a1, 0x01D4($s1) ## 000001D4 -/* 06384 80921E84 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06384 80921E84 0C01E107 */ jal Math_ApproachF /* 06388 80921E88 8E270068 */ lw $a3, 0x0068($s1) ## 00000068 /* 0638C 80921E8C 26240028 */ addiu $a0, $s1, 0x0028 ## $a0 = 00000028 /* 06390 80921E90 8E2501D8 */ lw $a1, 0x01D8($s1) ## 000001D8 /* 06394 80921E94 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 06398 80921E98 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06398 80921E98 0C01E107 */ jal Math_ApproachF /* 0639C 80921E9C 8E270068 */ lw $a3, 0x0068($s1) ## 00000068 /* 063A0 80921EA0 2624002C */ addiu $a0, $s1, 0x002C ## $a0 = 0000002C /* 063A4 80921EA4 8E2501DC */ lw $a1, 0x01DC($s1) ## 000001DC /* 063A8 80921EA8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 063AC 80921EAC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 063AC 80921EAC 0C01E107 */ jal Math_ApproachF /* 063B0 80921EB0 8E270068 */ lw $a3, 0x0068($s1) ## 00000068 /* 063B4 80921EB4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -647,7 +647,7 @@ glabel L80921B08 /* 063C0 80921EC0 3C0541F0 */ lui $a1, 0x41F0 ## $a1 = 41F00000 /* 063C4 80921EC4 44060000 */ mfc1 $a2, $f0 /* 063C8 80921EC8 44070000 */ mfc1 $a3, $f0 -/* 063CC 80921ECC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 063CC 80921ECC 0C01E107 */ jal Math_ApproachF /* 063D0 80921ED0 00000000 */ nop /* 063D4 80921ED4 8FA900EC */ lw $t1, 0x00EC($sp) @@ -669,7 +669,7 @@ glabel L80921B08 /* 0640C 80921F0C 8624015C */ lh $a0, 0x015C($s1) ## 0000015C /* 06410 80921F10 000422C0 */ sll $a0, $a0, 11 /* 06414 80921F14 00042400 */ sll $a0, $a0, 16 -/* 06418 80921F18 0C01DE1C */ jal Math_Sins +/* 06418 80921F18 0C01DE1C */ jal Math_SinS ## sins? /* 0641C 80921F1C 00042403 */ sra $a0, $a0, 16 /* 06420 80921F20 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -680,7 +680,7 @@ glabel L80921B08 /* 06434 80921F34 8624015C */ lh $a0, 0x015C($s1) ## 0000015C /* 06438 80921F38 000422C0 */ sll $a0, $a0, 11 /* 0643C 80921F3C 00042400 */ sll $a0, $a0, 16 -/* 06440 80921F40 0C01DE0D */ jal Math_Coss +/* 06440 80921F40 0C01DE0D */ jal Math_CosS ## coss? /* 06444 80921F44 00042403 */ sra $a0, $a0, 16 /* 06448 80921F48 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -697,7 +697,7 @@ glabel L80921B08 /* 06474 80921F74 8E270068 */ lw $a3, 0x0068($s1) ## 00000068 /* 06478 80921F78 46123200 */ add.s $f8, $f6, $f18 /* 0647C 80921F7C 44054000 */ mfc1 $a1, $f8 -/* 06480 80921F80 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06480 80921F80 0C01E107 */ jal Math_ApproachF /* 06484 80921F84 00000000 */ nop /* 06488 80921F88 3C0E8092 */ lui $t6, %hi(D_80925CD4) ## $t6 = 80920000 @@ -710,26 +710,26 @@ glabel L80921B08 /* 064A4 80921FA4 46045180 */ add.s $f6, $f10, $f4 /* 064A8 80921FA8 8E270068 */ lw $a3, 0x0068($s1) ## 00000068 /* 064AC 80921FAC 44053000 */ mfc1 $a1, $f6 -/* 064B0 80921FB0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 064B0 80921FB0 0C01E107 */ jal Math_ApproachF /* 064B4 80921FB4 00000000 */ nop /* 064B8 80921FB8 26240068 */ addiu $a0, $s1, 0x0068 ## $a0 = 00000068 /* 064BC 80921FBC 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 064C0 80921FC0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 064C4 80921FC4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 064C4 80921FC4 0C01E107 */ jal Math_ApproachF /* 064C8 80921FC8 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 064CC 80921FCC 86230158 */ lh $v1, 0x0158($s1) ## 00000158 /* 064D0 80921FD0 10000014 */ beq $zero, $zero, .L80922024 /* 064D4 80921FD4 C6220028 */ lwc1 $f2, 0x0028($s1) ## 00000028 .L80921FD8: -/* 064D8 80921FD8 0C01DE1C */ jal Math_Sins +/* 064D8 80921FD8 0C01DE1C */ jal Math_SinS ## sins? /* 064DC 80921FDC 86240032 */ lh $a0, 0x0032($s1) ## 00000032 /* 064E0 80921FE0 C6320068 */ lwc1 $f18, 0x0068($s1) ## 00000068 /* 064E4 80921FE4 86240032 */ lh $a0, 0x0032($s1) ## 00000032 /* 064E8 80921FE8 46120202 */ mul.s $f8, $f0, $f18 -/* 064EC 80921FEC 0C01DE0D */ jal Math_Coss +/* 064EC 80921FEC 0C01DE0D */ jal Math_CosS ## coss? /* 064F0 80921FF0 E628005C */ swc1 $f8, 0x005C($s1) ## 0000005C /* 064F4 80921FF4 C62A0068 */ lwc1 $f10, 0x0068($s1) ## 00000068 @@ -779,28 +779,28 @@ glabel L80921B08 /* 0659C 8092209C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 .L809220A0: /* 065A0 809220A0 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 065A4 809220A4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 065A4 809220A4 0C00CFC8 */ jal Rand_CenteredFloat /* 065A8 809220A8 00000000 */ nop /* 065AC 809220AC C62A0024 */ lwc1 $f10, 0x0024($s1) ## 00000024 /* 065B0 809220B0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 065B4 809220B4 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 065B8 809220B8 460A0100 */ add.s $f4, $f0, $f10 -/* 065BC 809220BC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 065BC 809220BC 0C00CFC8 */ jal Rand_CenteredFloat /* 065C0 809220C0 E7A400B0 */ swc1 $f4, 0x00B0($sp) /* 065C4 809220C4 C6260028 */ lwc1 $f6, 0x0028($s1) ## 00000028 /* 065C8 809220C8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 065CC 809220CC 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 065D0 809220D0 46060480 */ add.s $f18, $f0, $f6 -/* 065D4 809220D4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 065D4 809220D4 0C00CFC8 */ jal Rand_CenteredFloat /* 065D8 809220D8 E7B200B4 */ swc1 $f18, 0x00B4($sp) /* 065DC 809220DC C628002C */ lwc1 $f8, 0x002C($s1) ## 0000002C /* 065E0 809220E0 3C018092 */ lui $at, %hi(D_80926E04) ## $at = 80920000 /* 065E4 809220E4 C42C6E04 */ lwc1 $f12, %lo(D_80926E04)($at) /* 065E8 809220E8 46080280 */ add.s $f10, $f0, $f8 -/* 065EC 809220EC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 065EC 809220EC 0C00CFBE */ jal Rand_ZeroFloat /* 065F0 809220F0 E7AA00B8 */ swc1 $f10, 0x00B8($sp) /* 065F4 809220F4 3C018092 */ lui $at, %hi(D_80926E08) ## $at = 80920000 @@ -855,12 +855,12 @@ glabel L80921B08 /* 066AC 809221AC 3C014080 */ lui $at, 0x4080 ## $at = 40800000 .L809221B0: /* 066B0 809221B0 44816000 */ mtc1 $at, $f12 ## $f12 = 4.00 -/* 066B4 809221B4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 066B4 809221B4 0C00CFC8 */ jal Rand_CenteredFloat /* 066B8 809221B8 00000000 */ nop /* 066BC 809221BC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 066C0 809221C0 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 066C4 809221C4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 066C4 809221C4 0C00CFBE */ jal Rand_ZeroFloat /* 066C8 809221C8 E7A000A4 */ swc1 $f0, 0x00A4($sp) /* 066CC 809221CC 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -868,7 +868,7 @@ glabel L80921B08 /* 066D4 809221D4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 066D8 809221D8 44816000 */ mtc1 $at, $f12 ## $f12 = 4.00 /* 066DC 809221DC 460A0100 */ add.s $f4, $f0, $f10 -/* 066E0 809221E0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 066E0 809221E0 0C00CFC8 */ jal Rand_CenteredFloat /* 066E4 809221E4 E7A400A8 */ swc1 $f4, 0x00A8($sp) /* 066E8 809221E8 8FAB0040 */ lw $t3, 0x0040($sp) @@ -887,7 +887,7 @@ glabel L80921B08 /* 0671C 8092221C 46123200 */ add.s $f8, $f6, $f18 /* 06720 80922220 46005100 */ add.s $f4, $f10, $f0 /* 06724 80922224 E7A800B0 */ swc1 $f8, 0x00B0($sp) -/* 06728 80922228 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06728 80922228 0C00CFBE */ jal Rand_ZeroFloat /* 0672C 8092222C E7A400B8 */ swc1 $f4, 0x00B8($sp) /* 06730 80922230 3C018092 */ lui $at, %hi(D_80926E14) ## $at = 80920000 @@ -1020,7 +1020,7 @@ glabel L80921B08 /* 06910 80922410 E62601D8 */ swc1 $f6, 0x01D8($s1) ## 000001D8 /* 06914 80922414 8D6B5CD4 */ lw $t3, %lo(D_80925CD4)($t3) /* 06918 80922418 C57201DC */ lwc1 $f18, 0x01DC($t3) ## 809201DC -/* 0691C 8092241C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0691C 8092241C 0C01E107 */ jal Math_ApproachF /* 06920 80922420 E63201DC */ swc1 $f18, 0x01DC($s1) ## 000001DC /* 06924 80922424 10000066 */ beq $zero, $zero, .L809225C0 @@ -1088,7 +1088,7 @@ glabel L80921B08 /* 06A14 80922514 C7AA006C */ lwc1 $f10, 0x006C($sp) /* 06A18 80922518 C648002C */ lwc1 $f8, 0x002C($s2) ## FFFFFFF4 /* 06A1C 8092251C 460A4100 */ add.s $f4, $f8, $f10 -/* 06A20 80922520 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06A20 80922520 0C01E107 */ jal Math_ApproachF /* 06A24 80922524 E62401DC */ swc1 $f4, 0x01DC($s1) ## 000001DC /* 06A28 80922528 862F017E */ lh $t7, 0x017E($s1) ## 0000017E @@ -1097,7 +1097,7 @@ glabel L80921B08 /* 06A34 80922534 55E00022 */ bnel $t7, $zero, .L809225C0 /* 06A38 80922538 8628015A */ lh $t0, 0x015A($s1) ## 0000015A /* 06A3C 8092253C 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 06A40 80922540 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06A40 80922540 0C00CFBE */ jal Rand_ZeroFloat /* 06A44 80922544 A6380168 */ sh $t8, 0x0168($s1) ## 00000168 /* 06A48 80922548 4600018D */ trunc.w.s $f6, $f0 @@ -1113,7 +1113,7 @@ glabel L80921B08 /* 06A6C 8092256C 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 06A70 80922570 44050000 */ mfc1 $a1, $f0 /* 06A74 80922574 44060000 */ mfc1 $a2, $f0 -/* 06A78 80922578 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06A78 80922578 0C01E107 */ jal Math_ApproachF /* 06A7C 8092257C 00000000 */ nop /* 06A80 80922580 862C017E */ lh $t4, 0x017E($s1) ## 0000017E @@ -1121,7 +1121,7 @@ glabel L80921B08 /* 06A88 80922588 5580000D */ bnel $t4, $zero, .L809225C0 /* 06A8C 8092258C 8628015A */ lh $t0, 0x015A($s1) ## 0000015A /* 06A90 80922590 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 06A94 80922594 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06A94 80922594 0C00CFBE */ jal Rand_ZeroFloat /* 06A98 80922598 A6200168 */ sh $zero, 0x0168($s1) ## 00000168 /* 06A9C 8092259C 4600048D */ trunc.w.s $f18, $f0 @@ -1146,7 +1146,7 @@ glabel L80921B08 /* 06ADC 809225DC 44049000 */ mfc1 $a0, $f18 /* 06AE0 809225E0 00000000 */ nop /* 06AE4 809225E4 00042400 */ sll $a0, $a0, 16 -/* 06AE8 809225E8 0C01DE1C */ jal Math_Sins +/* 06AE8 809225E8 0C01DE1C */ jal Math_SinS ## sins? /* 06AEC 809225EC 00042403 */ sra $a0, $a0, 16 /* 06AF0 809225F0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -1166,7 +1166,7 @@ glabel L80921B08 /* 06B28 80922628 44043000 */ mfc1 $a0, $f6 /* 06B2C 8092262C 00000000 */ nop /* 06B30 80922630 00042400 */ sll $a0, $a0, 16 -/* 06B34 80922634 0C01DE1C */ jal Math_Sins +/* 06B34 80922634 0C01DE1C */ jal Math_SinS ## sins? /* 06B38 80922638 00042403 */ sra $a0, $a0, 16 /* 06B3C 8092263C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -1185,7 +1185,7 @@ glabel L80921B08 /* 06B70 80922670 44042000 */ mfc1 $a0, $f4 /* 06B74 80922674 00000000 */ nop /* 06B78 80922678 00042400 */ sll $a0, $a0, 16 -/* 06B7C 8092267C 0C01DE1C */ jal Math_Sins +/* 06B7C 8092267C 0C01DE1C */ jal Math_SinS ## sins? /* 06B80 80922680 00042403 */ sra $a0, $a0, 16 /* 06B84 80922684 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -1211,7 +1211,7 @@ glabel L80921B08 /* 06BD4 809226D4 C62601DC */ lwc1 $f6, 0x01DC($s1) ## 000001DC /* 06BD8 809226D8 E7AC00DC */ swc1 $f12, 0x00DC($sp) /* 06BDC 809226DC 46123381 */ sub.s $f14, $f6, $f18 -/* 06BE0 809226E0 0C03F494 */ jal Math_atan2f +/* 06BE0 809226E0 0C03F494 */ jal Math_FAtan2F /* 06BE4 809226E4 E7AE00D4 */ swc1 $f14, 0x00D4($sp) /* 06BE8 809226E8 3C018092 */ lui $at, %hi(D_80926E28) ## $at = 80920000 /* 06BEC 809226EC C4286E28 */ lwc1 $f8, %lo(D_80926E28)($at) @@ -1230,7 +1230,7 @@ glabel L80921B08 /* 06C20 80922720 46044000 */ add.s $f0, $f8, $f4 /* 06C24 80922724 468034A0 */ cvt.s.w $f18, $f6 /* 06C28 80922728 46000384 */ sqrt.s $f14, $f0 -/* 06C2C 8092272C 0C03F494 */ jal Math_atan2f +/* 06C2C 8092272C 0C03F494 */ jal Math_FAtan2F /* 06C30 80922730 E7B200CC */ swc1 $f18, 0x00CC($sp) /* 06C34 80922734 3C018092 */ lui $at, %hi(D_80926E2C) ## $at = 80920000 /* 06C38 80922738 C42A6E2C */ lwc1 $f10, %lo(D_80926E2C)($at) @@ -1258,7 +1258,7 @@ glabel L80921B08 /* 06C90 80922790 00073C00 */ sll $a3, $a3, 16 /* 06C94 80922794 00073C03 */ sra $a3, $a3, 16 /* 06C98 80922798 00063400 */ sll $a2, $a2, 16 -/* 06C9C 8092279C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 06C9C 8092279C 0C01E1EF */ jal Math_ApproachS /* 06CA0 809227A0 00063403 */ sra $a2, $a2, 16 /* 06CA4 809227A4 C7A600D0 */ lwc1 $f6, 0x00D0($sp) @@ -1276,7 +1276,7 @@ glabel L80921B08 /* 06CD4 809227D4 00063400 */ sll $a2, $a2, 16 /* 06CD8 809227D8 00063403 */ sra $a2, $a2, 16 /* 06CDC 809227DC 00073C00 */ sll $a3, $a3, 16 -/* 06CE0 809227E0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 06CE0 809227E0 0C01E1EF */ jal Math_ApproachS /* 06CE4 809227E4 00073C03 */ sra $a3, $a3, 16 /* 06CE8 809227E8 0C00B642 */ jal func_8002D908 @@ -1409,12 +1409,12 @@ glabel L80921B08 /* 06EB4 809229B4 AFA9004C */ sw $t1, 0x004C($sp) .L809229B8: /* 06EB8 809229B8 3C018092 */ lui $at, %hi(D_80926E34) ## $at = 80920000 -/* 06EBC 809229BC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06EBC 809229BC 0C00CFBE */ jal Rand_ZeroFloat /* 06EC0 809229C0 C42C6E34 */ lwc1 $f12, %lo(D_80926E34)($at) /* 06EC4 809229C4 3C018092 */ lui $at, %hi(D_80926E38) ## $at = 80920000 /* 06EC8 809229C8 E7A0005C */ swc1 $f0, 0x005C($sp) -/* 06ECC 809229CC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06ECC 809229CC 0C00CFBE */ jal Rand_ZeroFloat /* 06ED0 809229D0 C42C6E38 */ lwc1 $f12, %lo(D_80926E38)($at) /* 06ED4 809229D4 44905000 */ mtc1 $s0, $f10 ## $f10 = 0.00 @@ -1437,20 +1437,20 @@ glabel L80921B08 /* 06F18 80922A18 00000000 */ nop /* 06F1C 80922A1C 00042400 */ sll $a0, $a0, 16 /* 06F20 80922A20 00042403 */ sra $a0, $a0, 16 -/* 06F24 80922A24 0C01DE1C */ jal Math_Sins +/* 06F24 80922A24 0C01DE1C */ jal Math_SinS ## sins? /* 06F28 80922A28 AFA40048 */ sw $a0, 0x0048($sp) /* 06F2C 80922A2C C7A40060 */ lwc1 $f4, 0x0060($sp) /* 06F30 80922A30 8FA40048 */ lw $a0, 0x0048($sp) /* 06F34 80922A34 46040282 */ mul.s $f10, $f0, $f4 -/* 06F38 80922A38 0C01DE0D */ jal Math_Coss +/* 06F38 80922A38 0C01DE0D */ jal Math_CosS ## coss? /* 06F3C 80922A3C E7AA00A4 */ swc1 $f10, 0x00A4($sp) /* 06F40 80922A40 C7A60060 */ lwc1 $f6, 0x0060($sp) /* 06F44 80922A44 3C018092 */ lui $at, %hi(D_80926E40) ## $at = 80920000 /* 06F48 80922A48 C42C6E40 */ lwc1 $f12, %lo(D_80926E40)($at) /* 06F4C 80922A4C 46060482 */ mul.s $f18, $f0, $f6 -/* 06F50 80922A50 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06F50 80922A50 0C00CFBE */ jal Rand_ZeroFloat /* 06F54 80922A54 E7B200AC */ swc1 $f18, 0x00AC($sp) /* 06F58 80922A58 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -1483,7 +1483,7 @@ glabel L80921B08 /* 06FC4 80922AC4 468042A0 */ cvt.s.w $f10, $f8 /* 06FC8 80922AC8 46122200 */ add.s $f8, $f4, $f18 /* 06FCC 80922ACC E7AA00B4 */ swc1 $f10, 0x00B4($sp) -/* 06FD0 80922AD0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06FD0 80922AD0 0C00CFBE */ jal Rand_ZeroFloat /* 06FD4 80922AD4 E7A800B8 */ swc1 $f8, 0x00B8($sp) /* 06FD8 80922AD8 3C018092 */ lui $at, %hi(D_80926E48) ## $at = 80920000 @@ -1597,26 +1597,26 @@ glabel L80921B08 /* 07174 80922C74 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 07178 80922C78 E7AA009C */ swc1 $f10, 0x009C($sp) .L80922C7C: -/* 0717C 80922C7C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0717C 80922C7C 0C00CFC8 */ jal Rand_CenteredFloat /* 07180 80922C80 E7AC0058 */ swc1 $f12, 0x0058($sp) /* 07184 80922C84 C6260024 */ lwc1 $f6, 0x0024($s1) ## 00000024 /* 07188 80922C88 C7AC0058 */ lwc1 $f12, 0x0058($sp) /* 0718C 80922C8C 46060100 */ add.s $f4, $f0, $f6 -/* 07190 80922C90 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 07190 80922C90 0C00CFC8 */ jal Rand_CenteredFloat /* 07194 80922C94 E7A400B0 */ swc1 $f4, 0x00B0($sp) /* 07198 80922C98 C6320028 */ lwc1 $f18, 0x0028($s1) ## 00000028 /* 0719C 80922C9C C7AC0058 */ lwc1 $f12, 0x0058($sp) /* 071A0 80922CA0 46120200 */ add.s $f8, $f0, $f18 -/* 071A4 80922CA4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 071A4 80922CA4 0C00CFC8 */ jal Rand_CenteredFloat /* 071A8 80922CA8 E7A800B4 */ swc1 $f8, 0x00B4($sp) /* 071AC 80922CAC C62A002C */ lwc1 $f10, 0x002C($s1) ## 0000002C /* 071B0 80922CB0 3C018092 */ lui $at, %hi(D_80926E50) ## $at = 80920000 /* 071B4 80922CB4 C42C6E50 */ lwc1 $f12, %lo(D_80926E50)($at) /* 071B8 80922CB8 460A0180 */ add.s $f6, $f0, $f10 -/* 071BC 80922CBC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 071BC 80922CBC 0C00CFBE */ jal Rand_ZeroFloat /* 071C0 80922CC0 E7A600B8 */ swc1 $f6, 0x00B8($sp) /* 071C4 80922CC4 3C018092 */ lui $at, %hi(D_80926E54) ## $at = 80920000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s index c9d2a68344..f1da4063f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s @@ -491,7 +491,7 @@ glabel func_80924228 /* 08DEC 809248EC C6280F7C */ lwc1 $f8, 0x0F7C($s1) ## 00000F7C /* 08DF0 809248F0 E7AC008C */ swc1 $f12, 0x008C($sp) /* 08DF4 809248F4 46064381 */ sub.s $f14, $f8, $f6 -/* 08DF8 809248F8 0C03F494 */ jal Math_atan2f +/* 08DF8 809248F8 0C03F494 */ jal Math_FAtan2F /* 08DFC 809248FC E7AE0084 */ swc1 $f14, 0x0084($sp) /* 08E00 80924900 C7B0008C */ lwc1 $f16, 0x008C($sp) /* 08E04 80924904 C7A20084 */ lwc1 $f2, 0x0084($sp) @@ -500,7 +500,7 @@ glabel func_80924228 /* 08E10 80924910 C7AC0088 */ lwc1 $f12, 0x0088($sp) /* 08E14 80924914 46021482 */ mul.s $f18, $f2, $f2 /* 08E18 80924918 46125000 */ add.s $f0, $f10, $f18 -/* 08E1C 8092491C 0C03F494 */ jal Math_atan2f +/* 08E1C 8092491C 0C03F494 */ jal Math_FAtan2F /* 08E20 80924920 46000384 */ sqrt.s $f14, $f0 /* 08E24 80924924 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 08E28 80924928 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924D70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924D70.s index a03d7d9df7..84671c789d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924D70.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924D70.s @@ -95,7 +95,7 @@ glabel func_80924D70 /* 093C4 80924EC4 E6060004 */ swc1 $f6, 0x0004($s0) ## 00000004 /* 093C8 80924EC8 8E050034 */ lw $a1, 0x0034($s0) ## 00000034 .L80924ECC: -/* 093CC 80924ECC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 093CC 80924ECC 0C01E107 */ jal Math_ApproachF /* 093D0 80924ED0 8E070038 */ lw $a3, 0x0038($s0) ## 00000038 /* 093D4 80924ED4 8619002C */ lh $t9, 0x002C($s0) ## 0000002C @@ -183,7 +183,7 @@ glabel func_80924D70 /* 09508 80925008 C6060034 */ lwc1 $f6, 0x0034($s0) ## 00000034 /* 0950C 8092500C 460A8301 */ sub.s $f12, $f16, $f10 /* 09510 80925010 E7A600A8 */ swc1 $f6, 0x00A8($sp) -/* 09514 80925014 0C03F494 */ jal Math_atan2f +/* 09514 80925014 0C03F494 */ jal Math_FAtan2F /* 09518 80925018 46049381 */ sub.s $f14, $f18, $f4 /* 0951C 8092501C 46000306 */ mov.s $f12, $f0 /* 09520 80925020 0C034348 */ jal Matrix_RotateY @@ -199,7 +199,7 @@ glabel func_80924D70 .L80925048: /* 09548 80925048 26040034 */ addiu $a0, $s0, 0x0034 ## $a0 = 00000034 /* 0954C 8092504C 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 09550 80925050 0C01E107 */ jal Math_SmoothScaleMaxF +/* 09550 80925050 0C01E107 */ jal Math_ApproachF /* 09554 80925054 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 09558 80925058 920E0025 */ lbu $t6, 0x0025($s0) ## 00000025 @@ -267,7 +267,7 @@ glabel func_80924D70 /* 0963C 8092513C 00000000 */ nop /* 09640 80925140 44050000 */ mfc1 $a1, $f0 .L80925144: -/* 09644 80925144 0C01E107 */ jal Math_SmoothScaleMaxF +/* 09644 80925144 0C01E107 */ jal Math_ApproachF /* 09648 80925148 3C0742A0 */ lui $a3, 0x42A0 ## $a3 = 42A00000 /* 0964C 8092514C 92020024 */ lbu $v0, 0x0024($s0) ## 00000024 @@ -278,7 +278,7 @@ glabel func_80924D70 /* 09660 80925160 3C073F19 */ lui $a3, 0x3F19 ## $a3 = 3F190000 /* 09664 80925164 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3F19999A /* 09668 80925168 8E050038 */ lw $a1, 0x0038($s0) ## 00000038 -/* 0966C 8092516C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0966C 8092516C 0C01E107 */ jal Math_ApproachF /* 09670 80925170 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 09674 80925174 8619002A */ lh $t9, 0x002A($s0) ## 0000002A @@ -301,7 +301,7 @@ glabel func_80924D70 /* 096B4 809251B4 A60B002A */ sh $t3, 0x002A($s0) ## 0000002A /* 096B8 809251B8 4405A000 */ mfc1 $a1, $f20 /* 096BC 809251BC 4406B000 */ mfc1 $a2, $f22 -/* 096C0 809251C0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 096C0 809251C0 0C01E107 */ jal Math_ApproachF /* 096C4 809251C4 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 096C8 809251C8 C60A0030 */ lwc1 $f10, 0x0030($s0) ## 00000030 @@ -352,7 +352,7 @@ glabel func_80924D70 /* 09770 80925270 3C073E19 */ lui $a3, 0x3E19 ## $a3 = 3E190000 /* 09774 80925274 45020013 */ bc1fl .L809252C4 /* 09778 80925278 C6000004 */ lwc1 $f0, 0x0004($s0) ## 00000004 -/* 0977C 8092527C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0977C 8092527C 0C01E107 */ jal Math_ApproachF /* 09780 80925280 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E19999A /* 09784 80925284 1000000F */ beq $zero, $zero, .L809252C4 @@ -361,12 +361,12 @@ glabel func_80924D70 /* 0978C 8092528C 1441000C */ bne $v0, $at, .L809252C0 /* 09790 80925290 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 09794 80925294 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 -/* 09798 80925298 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 09798 80925298 0C00CFC8 */ jal Rand_CenteredFloat /* 0979C 8092529C 00000000 */ nop /* 097A0 809252A0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 097A4 809252A4 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 -/* 097A8 809252A8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 097A8 809252A8 0C00CFC8 */ jal Rand_CenteredFloat /* 097AC 809252AC E600000C */ swc1 $f0, 0x000C($s0) ## 0000000C /* 097B0 809252B0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB4C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB4C.s index db020a7137..bb3457e946 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB4C.s @@ -63,7 +63,7 @@ glabel func_8092DB4C /* 0165C 8092DC2C 31CF6080 */ andi $t7, $t6, 0x6080 ## $t7 = 00000000 /* 01660 8092DC30 15E00014 */ bne $t7, $zero, .L8092DC84 /* 01664 8092DC34 00000000 */ nop -/* 01668 8092DC38 0C03F66B */ jal Math_Rand_ZeroOne +/* 01668 8092DC38 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0166C 8092DC3C 00000000 */ nop /* 01670 8092DC40 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -96,7 +96,7 @@ glabel func_8092DB4C /* 016D0 8092DCA0 00052C03 */ sra $a1, $a1, 16 /* 016D4 8092DCA4 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 016D8 8092DCA8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 016DC 8092DCAC 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 016DC 8092DCAC 0C01E1EF */ jal Math_ApproachS /* 016E0 8092DCB0 24070400 */ addiu $a3, $zero, 0x0400 ## $a3 = 00000400 /* 016E4 8092DCB4 86020198 */ lh $v0, 0x0198($s0) ## 00000198 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DEA0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DEA0.s index 002f94c7f8..dc47ee1d5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DEA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DEA0.s @@ -36,7 +36,7 @@ glabel func_8092DEA0 /* 01950 8092DF20 8505008A */ lh $a1, 0x008A($t0) ## 0000008A .L8092DF24: /* 01954 8092DF24 AFAA0010 */ sw $t2, 0x0010($sp) -/* 01958 8092DF28 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01958 8092DF28 0C01E1A7 */ jal Math_SmoothStepToS /* 0195C 8092DF2C 250400B6 */ addiu $a0, $t0, 0x00B6 ## $a0 = 000000B6 /* 01960 8092DF30 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DFFC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DFFC.s index 3dc4126e95..132bb1ed40 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DFFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DFFC.s @@ -65,7 +65,7 @@ glabel func_8092DFFC /* 01AF8 8092E0C8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3ECCCCCD /* 01AFC 8092E0CC 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = 44228000 /* 01B00 8092E0D0 260403C4 */ addiu $a0, $s0, 0x03C4 ## $a0 = 000003C4 -/* 01B04 8092E0D4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01B04 8092E0D4 0C01E0C4 */ jal Math_SmoothStepToF /* 01B08 8092E0D8 E7B20010 */ swc1 $f18, 0x0010($sp) /* 01B0C 8092E0DC 3C018093 */ lui $at, %hi(D_809379B0) ## $at = 80930000 @@ -118,7 +118,7 @@ glabel func_8092DFFC /* 01BB8 8092E188 10000017 */ beq $zero, $zero, .L8092E1E8 /* 01BBC 8092E18C 920903E4 */ lbu $t1, 0x03E4($s0) ## 000003E4 .L8092E190: -/* 01BC0 8092E190 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01BC0 8092E190 0C01E107 */ jal Math_ApproachF /* 01BC4 8092E194 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 /* 01BC8 8092E198 3C014334 */ lui $at, 0x4334 ## $at = 43340000 @@ -128,7 +128,7 @@ glabel func_8092DFFC /* 01BD8 8092E1A8 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 /* 01BDC 8092E1AC 46028481 */ sub.s $f18, $f16, $f2 /* 01BE0 8092E1B0 44059000 */ mfc1 $a1, $f18 -/* 01BE4 8092E1B4 0C01DE80 */ jal Math_ApproxF +/* 01BE4 8092E1B4 0C01DE80 */ jal Math_StepToF /* 01BE8 8092E1B8 00000000 */ nop /* 01BEC 8092E1BC 3C038094 */ lui $v1, %hi(D_80938CA8) ## $v1 = 80940000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E2E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E2E0.s index 5aba3b5216..42ef4c1996 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E2E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E2E0.s @@ -12,7 +12,7 @@ glabel func_8092E2E0 /* 01D34 8092E304 846501A4 */ lh $a1, 0x01A4($v1) ## 000001A4 /* 01D38 8092E308 AFAE0010 */ sw $t6, 0x0010($sp) /* 01D3C 8092E30C 24070800 */ addiu $a3, $zero, 0x0800 ## $a3 = 00000800 -/* 01D40 8092E310 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01D40 8092E310 0C01E1A7 */ jal Math_SmoothStepToS /* 01D44 8092E314 246400B6 */ addiu $a0, $v1, 0x00B6 ## $a0 = 000000B6 /* 01D48 8092E318 14400008 */ bne $v0, $zero, .L8092E33C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E510.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E510.s index f1a35b6992..dfd820fbf5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E510.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E510.s @@ -16,25 +16,25 @@ glabel func_8092E510 /* 01F54 8092E524 3C048094 */ lui $a0, %hi(D_80938CB0) ## $a0 = 80940000 /* 01F58 8092E528 24848CB0 */ addiu $a0, $a0, %lo(D_80938CB0) ## $a0 = 80938CB0 /* 01F5C 8092E52C 3C054416 */ lui $a1, 0x4416 ## $a1 = 44160000 -/* 01F60 8092E530 0C01DE80 */ jal Math_ApproxF +/* 01F60 8092E530 0C01DE80 */ jal Math_StepToF /* 01F64 8092E534 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 /* 01F68 8092E538 3C048094 */ lui $a0, %hi(D_80938CBC) ## $a0 = 80940000 /* 01F6C 8092E53C 24848CBC */ addiu $a0, $a0, %lo(D_80938CBC) ## $a0 = 80938CBC /* 01F70 8092E540 3C054416 */ lui $a1, 0x4416 ## $a1 = 44160000 -/* 01F74 8092E544 0C01DE80 */ jal Math_ApproxF +/* 01F74 8092E544 0C01DE80 */ jal Math_StepToF /* 01F78 8092E548 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 /* 01F7C 8092E54C 3C048094 */ lui $a0, %hi(D_80938CA8) ## $a0 = 80940000 /* 01F80 8092E550 24848CA8 */ addiu $a0, $a0, %lo(D_80938CA8) ## $a0 = 80938CA8 /* 01F84 8092E554 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 -/* 01F88 8092E558 0C01DE80 */ jal Math_ApproxF +/* 01F88 8092E558 0C01DE80 */ jal Math_StepToF /* 01F8C 8092E55C 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 /* 01F90 8092E560 3C048094 */ lui $a0, %hi(D_80938CB4) ## $a0 = 80940000 /* 01F94 8092E564 24848CB4 */ addiu $a0, $a0, %lo(D_80938CB4) ## $a0 = 80938CB4 /* 01F98 8092E568 3C05C348 */ lui $a1, 0xC348 ## $a1 = C3480000 -/* 01F9C 8092E56C 0C01DE80 */ jal Math_ApproxF +/* 01F9C 8092E56C 0C01DE80 */ jal Math_StepToF /* 01FA0 8092E570 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 /* 01FA4 8092E574 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 @@ -146,7 +146,7 @@ glabel func_8092E510 /* 02124 8092E6F4 44050000 */ mfc1 $a1, $f0 /* 02128 8092E6F8 260403C4 */ addiu $a0, $s0, 0x03C4 ## $a0 = 000003C4 /* 0212C 8092E6FC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02130 8092E700 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02130 8092E700 0C01E0C4 */ jal Math_SmoothStepToF /* 02134 8092E704 E7A60010 */ swc1 $f6, 0x0010($sp) /* 02138 8092E708 1000000A */ beq $zero, $zero, .L8092E734 @@ -154,7 +154,7 @@ glabel func_8092E510 /* 02140 8092E710 44814000 */ mtc1 $at, $f8 ## $f8 = 400.00 .L8092E714: /* 02144 8092E714 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 -/* 02148 8092E718 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02148 8092E718 0C01E0C4 */ jal Math_SmoothStepToF /* 0214C 8092E71C E7A80010 */ swc1 $f8, 0x0010($sp) /* 02150 8092E720 C60A03C4 */ lwc1 $f10, 0x03C4($s0) ## 000003C4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E830.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E830.s index b11bca94f0..b19ca14b83 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E830.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E830.s @@ -10,25 +10,25 @@ glabel func_8092E830 /* 0227C 8092E84C 3C048094 */ lui $a0, %hi(D_80938CB0) ## $a0 = 80940000 /* 02280 8092E850 24848CB0 */ addiu $a0, $a0, %lo(D_80938CB0) ## $a0 = 80938CB0 /* 02284 8092E854 3C054416 */ lui $a1, 0x4416 ## $a1 = 44160000 -/* 02288 8092E858 0C01DE80 */ jal Math_ApproxF +/* 02288 8092E858 0C01DE80 */ jal Math_StepToF /* 0228C 8092E85C 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 /* 02290 8092E860 3C048094 */ lui $a0, %hi(D_80938CBC) ## $a0 = 80940000 /* 02294 8092E864 24848CBC */ addiu $a0, $a0, %lo(D_80938CBC) ## $a0 = 80938CBC /* 02298 8092E868 3C054416 */ lui $a1, 0x4416 ## $a1 = 44160000 -/* 0229C 8092E86C 0C01DE80 */ jal Math_ApproxF +/* 0229C 8092E86C 0C01DE80 */ jal Math_StepToF /* 022A0 8092E870 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 /* 022A4 8092E874 3C048094 */ lui $a0, %hi(D_80938CA8) ## $a0 = 80940000 /* 022A8 8092E878 24848CA8 */ addiu $a0, $a0, %lo(D_80938CA8) ## $a0 = 80938CA8 /* 022AC 8092E87C 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 -/* 022B0 8092E880 0C01DE80 */ jal Math_ApproxF +/* 022B0 8092E880 0C01DE80 */ jal Math_StepToF /* 022B4 8092E884 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 /* 022B8 8092E888 3C048094 */ lui $a0, %hi(D_80938CB4) ## $a0 = 80940000 /* 022BC 8092E88C 24848CB4 */ addiu $a0, $a0, %lo(D_80938CB4) ## $a0 = 80938CB4 /* 022C0 8092E890 3C05C348 */ lui $a1, 0xC348 ## $a1 = C3480000 -/* 022C4 8092E894 0C01DE80 */ jal Math_ApproxF +/* 022C4 8092E894 0C01DE80 */ jal Math_StepToF /* 022C8 8092E898 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 /* 022CC 8092E89C 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EAE0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EAE0.s index ffe13191bd..7738b4ec2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EAE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EAE0.s @@ -42,7 +42,7 @@ glabel func_8092EAE0 /* 02598 8092EB68 E44A0004 */ swc1 $f10, 0x0004($v0) ## 80938CAC /* 0259C 8092EB6C E4520010 */ swc1 $f18, 0x0010($v0) ## 80938CB8 /* 025A0 8092EB70 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 -/* 025A4 8092EB74 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 025A4 8092EB74 0C01E0C4 */ jal Math_SmoothStepToF /* 025A8 8092EB78 E7A40010 */ swc1 $f4, 0x0010($sp) /* 025AC 8092EB7C 10000021 */ beq $zero, $zero, .L8092EC04 @@ -66,7 +66,7 @@ glabel func_8092EAE0 /* 025F0 8092EBC0 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 .L8092EBC4: /* 025F4 8092EBC4 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 -/* 025F8 8092EBC8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 025F8 8092EBC8 0C01E0C4 */ jal Math_SmoothStepToF /* 025FC 8092EBCC E7B00010 */ swc1 $f16, 0x0010($sp) /* 02600 8092EBD0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -76,7 +76,7 @@ glabel func_8092EAE0 /* 02610 8092EBE0 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 02614 8092EBE4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 02618 8092EBE8 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 0261C 8092EBEC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0261C 8092EBEC 0C01E0C4 */ jal Math_SmoothStepToF /* 02620 8092EBF0 E7B20010 */ swc1 $f18, 0x0010($sp) /* 02624 8092EBF4 C7A4002C */ lwc1 $f4, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092ED9C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092ED9C.s index edc8c760bd..477480d584 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092ED9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092ED9C.s @@ -36,11 +36,11 @@ glabel func_8092ED9C /* 02854 8092EE24 E4720000 */ swc1 $f18, 0x0000($v1) ## 80937358 /* 02858 8092EE28 E4700004 */ swc1 $f16, 0x0004($v1) ## 8093735C /* 0285C 8092EE2C E46E0008 */ swc1 $f14, 0x0008($v1) ## 80937360 -/* 02860 8092EE30 0C01DE1C */ jal Math_Sins +/* 02860 8092EE30 0C01DE1C */ jal Math_SinS ## sins? /* 02864 8092EE34 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 /* 02868 8092EE38 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 0286C 8092EE3C 0C01DE0D */ jal Math_Coss +/* 0286C 8092EE3C 0C01DE0D */ jal Math_CosS ## coss? /* 02870 8092EE40 E7A0002C */ swc1 $f0, 0x002C($sp) /* 02874 8092EE44 3C028093 */ lui $v0, %hi(D_8093734C) ## $v0 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F0BC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F0BC.s index 2f81172dc8..3afb4ab16c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F0BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F0BC.s @@ -25,7 +25,7 @@ glabel func_8092F0BC /* 02B2C 8092F0FC 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 /* 02B30 8092F100 46062201 */ sub.s $f8, $f4, $f6 /* 02B34 8092F104 44054000 */ mfc1 $a1, $f8 -/* 02B38 8092F108 0C01DE80 */ jal Math_ApproxF +/* 02B38 8092F108 0C01DE80 */ jal Math_StepToF /* 02B3C 8092F10C 00000000 */ nop /* 02B40 8092F110 86030198 */ lh $v1, 0x0198($s0) ## 00000198 @@ -52,7 +52,7 @@ glabel func_8092F0BC /* 02B90 8092F160 26060038 */ addiu $a2, $s0, 0x0038 ## $a2 = 00000038 /* 02B94 8092F164 260403C4 */ addiu $a0, $s0, 0x03C4 ## $a0 = 000003C4 /* 02B98 8092F168 3C05C3AF */ lui $a1, 0xC3AF ## $a1 = C3AF0000 -/* 02B9C 8092F16C 0C01DE80 */ jal Math_ApproxF +/* 02B9C 8092F16C 0C01DE80 */ jal Math_StepToF /* 02BA0 8092F170 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 02BA4 8092F174 10000061 */ beq $zero, $zero, .L8092F2FC @@ -63,11 +63,11 @@ glabel func_8092F0BC /* 02BB4 8092F184 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02BB8 8092F188 8E2F1C44 */ lw $t7, 0x1C44($s1) ## 8093A8DC /* 02BBC 8092F18C AFAF0024 */ sw $t7, 0x0024($sp) -/* 02BC0 8092F190 0C01DE1C */ jal Math_Sins +/* 02BC0 8092F190 0C01DE1C */ jal Math_SinS ## sins? /* 02BC4 8092F194 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 02BC8 8092F198 E7A00020 */ swc1 $f0, 0x0020($sp) -/* 02BCC 8092F19C 0C01DE0D */ jal Math_Coss +/* 02BCC 8092F19C 0C01DE0D */ jal Math_CosS ## coss? /* 02BD0 8092F1A0 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 02BD4 8092F1A4 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 @@ -83,11 +83,11 @@ glabel func_8092F0BC /* 02BFC 8092F1CC 46122180 */ add.s $f6, $f4, $f18 /* 02C00 8092F1D0 46065400 */ add.s $f16, $f10, $f6 /* 02C04 8092F1D4 E7100024 */ swc1 $f16, 0x0024($t8) ## 00000024 -/* 02C08 8092F1D8 0C01DE0D */ jal Math_Coss +/* 02C08 8092F1D8 0C01DE0D */ jal Math_CosS ## coss? /* 02C0C 8092F1DC 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 02C10 8092F1E0 E7A00020 */ swc1 $f0, 0x0020($sp) -/* 02C14 8092F1E4 0C01DE1C */ jal Math_Sins +/* 02C14 8092F1E4 0C01DE1C */ jal Math_SinS ## sins? /* 02C18 8092F1E8 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 02C1C 8092F1EC 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 @@ -128,7 +128,7 @@ glabel func_8092F0BC /* 02CA8 8092F278 3C01C3AF */ lui $at, 0xC3AF ## $at = C3AF0000 /* 02CAC 8092F27C 44815000 */ mtc1 $at, $f10 ## $f10 = -350.00 /* 02CB0 8092F280 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 02CB4 8092F284 0C01DE1C */ jal Math_Sins +/* 02CB4 8092F284 0C01DE1C */ jal Math_SinS ## sins? /* 02CB8 8092F288 E60A03C4 */ swc1 $f10, 0x03C4($s0) ## 000003C4 /* 02CBC 8092F28C 3C018093 */ lui $at, %hi(D_80937340) ## $at = 80930000 @@ -138,7 +138,7 @@ glabel func_8092F0BC /* 02CCC 8092F29C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 02CD0 8092F2A0 46100182 */ mul.s $f6, $f0, $f16 /* 02CD4 8092F2A4 46064101 */ sub.s $f4, $f8, $f6 -/* 02CD8 8092F2A8 0C01DE0D */ jal Math_Coss +/* 02CD8 8092F2A8 0C01DE0D */ jal Math_CosS ## coss? /* 02CDC 8092F2AC E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 /* 02CE0 8092F2B0 3C018093 */ lui $at, %hi(D_80937348) ## $at = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F6F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F6F0.s index f7d6c35ea3..d1843266eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F6F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F6F0.s @@ -16,7 +16,7 @@ glabel func_8092F6F0 /* 03158 8092F728 AFA70018 */ sw $a3, 0x0018($sp) /* 0315C 8092F72C 46105481 */ sub.s $f18, $f10, $f16 /* 03160 8092F730 44059000 */ mfc1 $a1, $f18 -/* 03164 8092F734 0C01DE80 */ jal Math_ApproxF +/* 03164 8092F734 0C01DE80 */ jal Math_StepToF /* 03168 8092F738 00000000 */ nop /* 0316C 8092F73C 10400005 */ beq $v0, $zero, .L8092F754 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F8F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F8F0.s index 8220c4be3d..2b20b47f82 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F8F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F8F0.s @@ -88,11 +88,11 @@ glabel func_8092F8F0 /* 03460 8092FA30 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn /* 03464 8092FA34 E7B60014 */ swc1 $f22, 0x0014($sp) -/* 03468 8092FA38 0C01DE1C */ jal Math_Sins +/* 03468 8092FA38 0C01DE1C */ jal Math_SinS ## sins? /* 0346C 8092FA3C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 03470 8092FA40 46000506 */ mov.s $f20, $f0 -/* 03474 8092FA44 0C01DE0D */ jal Math_Coss +/* 03474 8092FA44 0C01DE0D */ jal Math_CosS ## coss? /* 03478 8092FA48 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 0347C 8092FA4C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -162,12 +162,12 @@ glabel func_8092F8F0 /* 0356C 8092FB3C 24150005 */ addiu $s5, $zero, 0x0005 ## $s5 = 00000005 /* 03570 8092FB40 27B2007C */ addiu $s2, $sp, 0x007C ## $s2 = FFFFFFF4 .L8092FB44: -/* 03574 8092FB44 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 03574 8092FB44 0C00CFC8 */ jal Rand_CenteredFloat /* 03578 8092FB48 4600A306 */ mov.s $f12, $f20 /* 0357C 8092FB4C C60A0000 */ lwc1 $f10, 0x0000($s0) ## 80937340 /* 03580 8092FB50 460A0400 */ add.s $f16, $f0, $f10 -/* 03584 8092FB54 0C03F66B */ jal Math_Rand_ZeroOne +/* 03584 8092FB54 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 03588 8092FB58 E7B0007C */ swc1 $f16, 0x007C($sp) /* 0358C 8092FB5C 46160482 */ mul.s $f18, $f0, $f22 @@ -175,7 +175,7 @@ glabel func_8092F8F0 /* 03594 8092FB64 4600A306 */ mov.s $f12, $f20 /* 03598 8092FB68 46182180 */ add.s $f6, $f4, $f24 /* 0359C 8092FB6C 46069200 */ add.s $f8, $f18, $f6 -/* 035A0 8092FB70 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 035A0 8092FB70 0C00CFC8 */ jal Rand_CenteredFloat /* 035A4 8092FB74 E7A80080 */ swc1 $f8, 0x0080($sp) /* 035A8 8092FB78 C60A0008 */ lwc1 $f10, 0x0008($s0) ## 80937348 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FC60.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FC60.s index 155d5b4fcc..0c3bb503fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FC60.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FC60.s @@ -9,17 +9,17 @@ glabel func_8092FC60 /* 036A8 8092FC78 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 036AC 8092FC7C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 036B0 8092FC80 8E050080 */ lw $a1, 0x0080($s0) ## 00000080 -/* 036B4 8092FC84 0C01DE80 */ jal Math_ApproxF +/* 036B4 8092FC84 0C01DE80 */ jal Math_StepToF /* 036B8 8092FC88 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 /* 036BC 8092FC8C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 036C0 8092FC90 8E050008 */ lw $a1, 0x0008($s0) ## 00000008 -/* 036C4 8092FC94 0C01DE80 */ jal Math_ApproxF +/* 036C4 8092FC94 0C01DE80 */ jal Math_StepToF /* 036C8 8092FC98 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 036CC 8092FC9C 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 036D0 8092FCA0 8E050010 */ lw $a1, 0x0010($s0) ## 00000010 -/* 036D4 8092FCA4 0C01DE80 */ jal Math_ApproxF +/* 036D4 8092FCA4 0C01DE80 */ jal Math_StepToF /* 036D8 8092FCA8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 036DC 8092FCAC 8E0E011C */ lw $t6, 0x011C($s0) ## 0000011C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FE44.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FE44.s index 95b8c89f59..fb922b9fb8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FE44.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FE44.s @@ -36,7 +36,7 @@ glabel func_8092FE44 /* 038F0 8092FEC0 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 038F4 8092FEC4 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 /* 038F8 8092FEC8 252AFF00 */ addiu $t2, $t1, 0xFF00 ## $t2 = FFFFFF00 -/* 038FC 8092FECC 0C01DE80 */ jal Math_ApproxF +/* 038FC 8092FECC 0C01DE80 */ jal Math_StepToF /* 03900 8092FED0 A60A00B4 */ sh $t2, 0x00B4($s0) ## 000000B4 /* 03904 8092FED4 10000008 */ beq $zero, $zero, .L8092FEF8 @@ -46,7 +46,7 @@ glabel func_8092FE44 /* 03910 8092FEE0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 03914 8092FEE4 3C064270 */ lui $a2, 0x4270 ## $a2 = 42700000 /* 03918 8092FEE8 256C0300 */ addiu $t4, $t3, 0x0300 ## $t4 = 00000300 -/* 0391C 8092FEEC 0C01DE80 */ jal Math_ApproxF +/* 0391C 8092FEEC 0C01DE80 */ jal Math_StepToF /* 03920 8092FEF0 A60C00B4 */ sh $t4, 0x00B4($s0) ## 000000B4 /* 03924 8092FEF4 860D0198 */ lh $t5, 0x0198($s0) ## 00000198 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FFF0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FFF0.s index e3541dfcfd..4d9cc14479 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FFF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FFF0.s @@ -27,22 +27,22 @@ glabel func_8092FFF0 .L80930050: /* 03A80 80930050 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 /* 03A84 80930054 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 03A88 80930058 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03A88 80930058 0C01E0C4 */ jal Math_SmoothStepToF /* 03A8C 8093005C E7A40010 */ swc1 $f4, 0x0010($sp) /* 03A90 80930060 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 03A94 80930064 2405F800 */ addiu $a1, $zero, 0xF800 ## $a1 = FFFFF800 -/* 03A98 80930068 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 03A98 80930068 0C01DE2B */ jal Math_ScaledStepToS /* 03A9C 8093006C 24060100 */ addiu $a2, $zero, 0x0100 ## $a2 = 00000100 /* 03AA0 80930070 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 03AA4 80930074 8E050008 */ lw $a1, 0x0008($s0) ## 00000008 -/* 03AA8 80930078 0C01DE80 */ jal Math_ApproxF +/* 03AA8 80930078 0C01DE80 */ jal Math_StepToF /* 03AAC 8093007C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03AB0 80930080 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 03AB4 80930084 8E050010 */ lw $a1, 0x0010($s0) ## 00000010 -/* 03AB8 80930088 0C01DE80 */ jal Math_ApproxF +/* 03AB8 80930088 0C01DE80 */ jal Math_StepToF /* 03ABC 8093008C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03AC0 80930090 3C028094 */ lui $v0, %hi(D_80938C90) ## $v0 = 80940000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930158.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930158.s index 386914937e..3e2244d21b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930158.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930158.s @@ -35,7 +35,7 @@ glabel func_80930158 /* 03C00 809301D0 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 03C04 809301D4 3C064170 */ lui $a2, 0x4170 ## $a2 = 41700000 /* 03C08 809301D8 252AFEC0 */ addiu $t2, $t1, 0xFEC0 ## $t2 = FFFFFEC0 -/* 03C0C 809301DC 0C01DE80 */ jal Math_ApproxF +/* 03C0C 809301DC 0C01DE80 */ jal Math_StepToF /* 03C10 809301E0 A60A00B4 */ sh $t2, 0x00B4($s0) ## 000000B4 /* 03C14 809301E4 10000008 */ beq $zero, $zero, .L80930208 @@ -45,7 +45,7 @@ glabel func_80930158 /* 03C20 809301F0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 03C24 809301F4 3C064270 */ lui $a2, 0x4270 ## $a2 = 42700000 /* 03C28 809301F8 256C0500 */ addiu $t4, $t3, 0x0500 ## $t4 = 00000500 -/* 03C2C 809301FC 0C01DE80 */ jal Math_ApproxF +/* 03C2C 809301FC 0C01DE80 */ jal Math_StepToF /* 03C30 80930200 A60C00B4 */ sh $t4, 0x00B4($s0) ## 000000B4 /* 03C34 80930204 860D0198 */ lh $t5, 0x0198($s0) ## 00000198 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930284.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930284.s index 49a9290c4a..cb61f9dbca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930284.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930284.s @@ -27,22 +27,22 @@ glabel func_80930284 .L809302E4: /* 03D14 809302E4 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 /* 03D18 809302E8 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 03D1C 809302EC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03D1C 809302EC 0C01E0C4 */ jal Math_SmoothStepToF /* 03D20 809302F0 E7A40010 */ swc1 $f4, 0x0010($sp) /* 03D24 809302F4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 03D28 809302F8 2405FC00 */ addiu $a1, $zero, 0xFC00 ## $a1 = FFFFFC00 -/* 03D2C 809302FC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 03D2C 809302FC 0C01DE2B */ jal Math_ScaledStepToS /* 03D30 80930300 240600A0 */ addiu $a2, $zero, 0x00A0 ## $a2 = 000000A0 /* 03D34 80930304 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 03D38 80930308 8E050008 */ lw $a1, 0x0008($s0) ## 00000008 -/* 03D3C 8093030C 0C01DE80 */ jal Math_ApproxF +/* 03D3C 8093030C 0C01DE80 */ jal Math_StepToF /* 03D40 80930310 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03D44 80930314 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 03D48 80930318 8E050010 */ lw $a1, 0x0010($s0) ## 00000010 -/* 03D4C 8093031C 0C01DE80 */ jal Math_ApproxF +/* 03D4C 8093031C 0C01DE80 */ jal Math_StepToF /* 03D50 80930320 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03D54 80930324 3C028094 */ lui $v0, %hi(D_80938C90) ## $v0 = 80940000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s index c6b0ac53e6..01dfce74a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s @@ -39,7 +39,7 @@ glabel func_8093051C .L8093058C: /* 03FBC 8093058C 8E050008 */ lw $a1, 0x0008($s0) ## 00000008 /* 03FC0 80930590 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 -/* 03FC4 80930594 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03FC4 80930594 0C01E0C4 */ jal Math_SmoothStepToF /* 03FC8 80930598 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 03FCC 8093059C E7A0003C */ swc1 $f0, 0x003C($sp) @@ -50,7 +50,7 @@ glabel func_8093051C /* 03FE0 809305B0 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 /* 03FE4 809305B4 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 03FE8 809305B8 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 03FEC 809305BC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03FEC 809305BC 0C01E0C4 */ jal Math_SmoothStepToF /* 03FF0 809305C0 E7B00010 */ swc1 $f16, 0x0010($sp) /* 03FF4 809305C4 C7B2003C */ lwc1 $f18, 0x003C($sp) @@ -104,13 +104,13 @@ glabel func_8093051C /* 040A8 80930678 1000002F */ beq $zero, $zero, .L80930738 /* 040AC 8093067C 8FBF0024 */ lw $ra, 0x0024($sp) .L80930680: -/* 040B0 80930680 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 040B0 80930680 0C01DE2B */ jal Math_ScaledStepToS /* 040B4 80930684 86050016 */ lh $a1, 0x0016($s0) ## 00000016 /* 040B8 80930688 AFA20038 */ sw $v0, 0x0038($sp) /* 040BC 8093068C 86050018 */ lh $a1, 0x0018($s0) ## 00000018 /* 040C0 80930690 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 -/* 040C4 80930694 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 040C4 80930694 0C01DE2B */ jal Math_ScaledStepToS /* 040C8 80930698 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 /* 040CC 8093069C 8FB90038 */ lw $t9, 0x0038($sp) @@ -118,7 +118,7 @@ glabel func_8093051C /* 040D4 809306A4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 040D8 809306A8 03224024 */ and $t0, $t9, $v0 /* 040DC 809306AC AFA80038 */ sw $t0, 0x0038($sp) -/* 040E0 809306B0 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 040E0 809306B0 0C01DE2B */ jal Math_ScaledStepToS /* 040E4 809306B4 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 040E8 809306B8 8FA90038 */ lw $t1, 0x0038($sp) @@ -133,7 +133,7 @@ glabel func_8093051C /* 0410C 809306DC 3C05437A */ lui $a1, 0x437A ## $a1 = 437A0000 /* 04110 809306E0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 04114 809306E4 3C07428C */ lui $a3, 0x428C ## $a3 = 428C0000 -/* 04118 809306E8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04118 809306E8 0C01E0C4 */ jal Math_SmoothStepToF /* 0411C 809306EC E7B00010 */ swc1 $f16, 0x0010($sp) /* 04120 809306F0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809307B4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809307B4.s index 8b42cd09e0..0012928529 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809307B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809307B4.s @@ -26,7 +26,7 @@ glabel func_809307B4 .L8093080C: /* 0423C 8093080C 8DF81C44 */ lw $t8, 0x1C44($t7) ## 00001C44 /* 04240 80930810 3C0641F0 */ lui $a2, 0x41F0 ## $a2 = 41F00000 -/* 04244 80930814 0C01DE80 */ jal Math_ApproxF +/* 04244 80930814 0C01DE80 */ jal Math_StepToF /* 04248 80930818 AFB80024 */ sw $t8, 0x0024($sp) /* 0424C 8093081C 1040000A */ beq $v0, $zero, .L80930848 @@ -43,21 +43,21 @@ glabel func_809307B4 .L80930848: /* 04278 80930848 2405F000 */ addiu $a1, $zero, 0xF000 ## $a1 = FFFFF000 .L8093084C: -/* 0427C 8093084C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 0427C 8093084C 0C01DE2B */ jal Math_ScaledStepToS /* 04280 80930850 24060100 */ addiu $a2, $zero, 0x0100 ## $a2 = 00000100 /* 04284 80930854 8FA80024 */ lw $t0, 0x0024($sp) /* 04288 80930858 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 0428C 8093085C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 04290 80930860 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 -/* 04294 80930864 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04294 80930864 0C01E107 */ jal Math_ApproachF /* 04298 80930868 8D050024 */ lw $a1, 0x0024($t0) ## 00000024 /* 0429C 8093086C 8FA90024 */ lw $t1, 0x0024($sp) /* 042A0 80930870 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 042A4 80930874 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 042A8 80930878 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 -/* 042AC 8093087C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 042AC 8093087C 0C01E107 */ jal Math_ApproachF /* 042B0 80930880 8D25002C */ lw $a1, 0x002C($t1) ## 0000002C /* 042B4 80930884 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930934.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930934.s index 43b46ca13a..0f80eec8f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930934.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930934.s @@ -9,18 +9,18 @@ glabel func_80930934 /* 0437C 8093094C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 04380 80930950 2604019E */ addiu $a0, $s0, 0x019E ## $a0 = 0000019E /* 04384 80930954 2405F254 */ addiu $a1, $zero, 0xF254 ## $a1 = FFFFF254 -/* 04388 80930958 0C01DE5F */ jal Math_ApproxS +/* 04388 80930958 0C01DE5F */ jal Math_StepToS /* 0438C 8093095C 240601F4 */ addiu $a2, $zero, 0x01F4 ## $a2 = 000001F4 /* 04390 80930960 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 04394 80930964 AFA40028 */ sw $a0, 0x0028($sp) /* 04398 80930968 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0439C 8093096C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 0439C 8093096C 0C01DE2B */ jal Math_ScaledStepToS /* 043A0 80930970 24061000 */ addiu $a2, $zero, 0x1000 ## $a2 = 00001000 /* 043A4 80930974 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 043A8 80930978 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 043AC 8093097C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 043AC 8093097C 0C01DE2B */ jal Math_ScaledStepToS /* 043B0 80930980 24061000 */ addiu $a2, $zero, 0x1000 ## $a2 = 00001000 /* 043B4 80930984 86030198 */ lh $v1, 0x0198($s0) ## 00000198 @@ -65,7 +65,7 @@ glabel func_80930934 /* 04440 80930A10 8E050080 */ lw $a1, 0x0080($s0) ## 00000080 /* 04444 80930A14 46062202 */ mul.s $f8, $f4, $f6 /* 04448 80930A18 E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -/* 0444C 80930A1C 0C01DE80 */ jal Math_ApproxF +/* 0444C 80930A1C 0C01DE80 */ jal Math_StepToF /* 04450 80930A20 8E060060 */ lw $a2, 0x0060($s0) ## 00000060 /* 04454 80930A24 10400010 */ beq $v0, $zero, .L80930A68 @@ -95,7 +95,7 @@ glabel func_80930934 /* 044A8 80930A78 8FA40028 */ lw $a0, 0x0028($sp) /* 044AC 80930A7C 8F281C44 */ lw $t0, 0x1C44($t9) ## 00001C44 /* 044B0 80930A80 AFA8002C */ sw $t0, 0x002C($sp) -/* 044B4 80930A84 0C01DE1C */ jal Math_Sins +/* 044B4 80930A84 0C01DE1C */ jal Math_SinS ## sins? /* 044B8 80930A88 8604008A */ lh $a0, 0x008A($s0) ## 0000008A /* 044BC 80930A8C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -105,7 +105,7 @@ glabel func_80930934 /* 044CC 80930A9C 460A0402 */ mul.s $f16, $f0, $f10 /* 044D0 80930AA0 46128100 */ add.s $f4, $f16, $f18 /* 044D4 80930AA4 E5240024 */ swc1 $f4, 0x0024($t1) ## 00000024 -/* 044D8 80930AA8 0C01DE0D */ jal Math_Coss +/* 044D8 80930AA8 0C01DE0D */ jal Math_CosS ## coss? /* 044DC 80930AAC 8604008A */ lh $a0, 0x008A($s0) ## 0000008A /* 044E0 80930AB0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -128,7 +128,7 @@ glabel func_80930934 /* 04524 80930AF4 8FA40028 */ lw $a0, 0x0028($sp) .L80930AF8: /* 04528 80930AF8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0452C 80930AFC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 0452C 80930AFC 0C01DE2B */ jal Math_ScaledStepToS /* 04530 80930B00 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 /* 04534 80930B04 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930BC0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930BC0.s index 0d80a8f5ea..463a703c9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930BC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930BC0.s @@ -10,19 +10,19 @@ glabel func_80930BC0 /* 0460C 80930BDC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 04610 80930BE0 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 04614 80930BE4 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 04618 80930BE8 0C01DE80 */ jal Math_ApproxF +/* 04618 80930BE8 0C01DE80 */ jal Math_StepToF /* 0461C 80930BEC 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 04620 80930BF0 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 /* 04624 80930BF4 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 04628 80930BF8 860501A4 */ lh $a1, 0x01A4($s0) ## 000001A4 -/* 0462C 80930BFC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 0462C 80930BFC 0C01DE2B */ jal Math_ScaledStepToS /* 04630 80930C00 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 /* 04634 80930C04 02228824 */ and $s1, $s1, $v0 /* 04638 80930C08 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 0463C 80930C0C 860501A4 */ lh $a1, 0x01A4($s0) ## 000001A4 -/* 04640 80930C10 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 04640 80930C10 0C01DE2B */ jal Math_ScaledStepToS /* 04644 80930C14 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 /* 04648 80930C18 3C0E8094 */ lui $t6, %hi(D_80938C90) ## $t6 = 80940000 @@ -34,7 +34,7 @@ glabel func_80930BC0 /* 04660 80930C30 260403C4 */ addiu $a0, $s0, 0x03C4 ## $a0 = 000003C4 /* 04664 80930C34 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 04668 80930C38 3C074270 */ lui $a3, 0x4270 ## $a3 = 42700000 -/* 0466C 80930C3C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0466C 80930C3C 0C01E0C4 */ jal Math_SmoothStepToF /* 04670 80930C40 E7A40010 */ swc1 $f4, 0x0010($sp) /* 04674 80930C44 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -47,7 +47,7 @@ glabel func_80930BC0 /* 04690 80930C60 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 04694 80930C64 022F8824 */ and $s1, $s1, $t7 .L80930C68: -/* 04698 80930C68 0C01DE1C */ jal Math_Sins +/* 04698 80930C68 0C01DE1C */ jal Math_SinS ## sins? /* 0469C 80930C6C 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 046A0 80930C70 C60803C4 */ lwc1 $f8, 0x03C4($s0) ## 000003C4 @@ -57,7 +57,7 @@ glabel func_80930BC0 /* 046B0 80930C80 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 046B4 80930C84 C7100024 */ lwc1 $f16, 0x0024($t8) ## 80940024 /* 046B8 80930C88 46105480 */ add.s $f18, $f10, $f16 -/* 046BC 80930C8C 0C01DE0D */ jal Math_Coss +/* 046BC 80930C8C 0C01DE0D */ jal Math_CosS ## coss? /* 046C0 80930C90 E6120024 */ swc1 $f18, 0x0024($s0) ## 00000024 /* 046C4 80930C94 C60403C4 */ lwc1 $f4, 0x03C4($s0) ## 000003C4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930D70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930D70.s index e3b64d286c..8f3d1c3189 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930D70.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930D70.s @@ -26,7 +26,7 @@ glabel func_80930D70 /* 047F8 80930DC8 860501A4 */ lh $a1, 0x01A4($s0) ## 000001A4 /* 047FC 80930DCC 8607019A */ lh $a3, 0x019A($s0) ## 0000019A /* 04800 80930DD0 AFA80010 */ sw $t0, 0x0010($sp) -/* 04804 80930DD4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 04804 80930DD4 0C01E1A7 */ jal Math_SmoothStepToS /* 04808 80930DD8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 0480C 80930DDC 54400009 */ bnel $v0, $zero, .L80930E04 @@ -117,7 +117,7 @@ glabel func_80930D70 /* 0494C 80930F1C 354B0004 */ ori $t3, $t2, 0x0004 ## $t3 = 00000004 /* 04950 80930F20 A20B03E6 */ sb $t3, 0x03E6($s0) ## 000003E6 .L80930F24: -/* 04954 80930F24 0C01DE1C */ jal Math_Sins +/* 04954 80930F24 0C01DE1C */ jal Math_SinS ## sins? /* 04958 80930F28 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 0495C 80930F2C C60403C4 */ lwc1 $f4, 0x03C4($s0) ## 000003C4 @@ -127,7 +127,7 @@ glabel func_80930D70 /* 0496C 80930F3C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 04970 80930F40 C5860024 */ lwc1 $f6, 0x0024($t4) ## 80940024 /* 04974 80930F44 46064280 */ add.s $f10, $f8, $f6 -/* 04978 80930F48 0C01DE0D */ jal Math_Coss +/* 04978 80930F48 0C01DE0D */ jal Math_CosS ## coss? /* 0497C 80930F4C E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 /* 04980 80930F50 C61003C4 */ lwc1 $f16, 0x03C4($s0) ## 000003C4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930FE8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930FE8.s index e30145c4d2..ca6381237b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930FE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930FE8.s @@ -6,7 +6,7 @@ glabel func_80930FE8 /* 04A28 80930FF8 84E5008A */ lh $a1, 0x008A($a3) ## 0000008A /* 04A2C 80930FFC AFA70020 */ sw $a3, 0x0020($sp) /* 04A30 80931000 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 -/* 04A34 80931004 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 04A34 80931004 0C01DE2B */ jal Math_ScaledStepToS /* 04A38 80931008 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 /* 04A3C 8093100C 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809310CC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809310CC.s index 711edb902e..208e8aa6a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809310CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809310CC.s @@ -9,12 +9,12 @@ glabel func_809310CC /* 04B14 809310E4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 04B18 809310E8 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 04B1C 809310EC 3C0542A0 */ lui $a1, 0x42A0 ## $a1 = 42A00000 -/* 04B20 809310F0 0C01DE80 */ jal Math_ApproxF +/* 04B20 809310F0 0C01DE80 */ jal Math_StepToF /* 04B24 809310F4 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 /* 04B28 809310F8 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 /* 04B2C 809310FC 860501A6 */ lh $a1, 0x01A6($s0) ## 000001A6 -/* 04B30 80931100 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 04B30 80931100 0C01DE2B */ jal Math_ScaledStepToS /* 04B34 80931104 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 /* 04B38 80931108 10400004 */ beq $v0, $zero, .L8093111C @@ -38,7 +38,7 @@ glabel func_809310CC /* 04B7C 8093114C E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 /* 04B80 80931150 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 .L80931154: -/* 04B84 80931154 0C01DE1C */ jal Math_Sins +/* 04B84 80931154 0C01DE1C */ jal Math_SinS ## sins? /* 04B88 80931158 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 04B8C 8093115C C6100068 */ lwc1 $f16, 0x0068($s0) ## 00000068 @@ -46,7 +46,7 @@ glabel func_809310CC /* 04B94 80931164 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 04B98 80931168 46008482 */ mul.s $f18, $f16, $f0 /* 04B9C 8093116C 46125100 */ add.s $f4, $f10, $f18 -/* 04BA0 80931170 0C01DE0D */ jal Math_Coss +/* 04BA0 80931170 0C01DE0D */ jal Math_CosS ## coss? /* 04BA4 80931174 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 /* 04BA8 80931178 C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931300.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931300.s index 3491f81f00..5b08037bd1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931300.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931300.s @@ -32,7 +32,7 @@ glabel func_80931300 /* 04D9C 8093136C A2020195 */ sb $v0, 0x0195($s0) ## 00000195 /* 04DA0 80931370 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 04DA4 80931374 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04DA8 80931378 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 04DA8 80931378 0C01DE2B */ jal Math_ScaledStepToS /* 04DAC 8093137C 24060600 */ addiu $a2, $zero, 0x0600 ## $a2 = 00000600 /* 04DB0 80931380 82190195 */ lb $t9, 0x0195($s0) ## 00000195 @@ -40,7 +40,7 @@ glabel func_80931300 /* 04DB8 80931388 860501A6 */ lh $a1, 0x01A6($s0) ## 000001A6 /* 04DBC 8093138C 03224024 */ and $t0, $t9, $v0 /* 04DC0 80931390 A2080195 */ sb $t0, 0x0195($s0) ## 00000195 -/* 04DC4 80931394 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 04DC4 80931394 0C01DE2B */ jal Math_ScaledStepToS /* 04DC8 80931398 24060600 */ addiu $a2, $zero, 0x0600 ## $a2 = 00000600 /* 04DCC 8093139C 82090195 */ lb $t1, 0x0195($s0) ## 00000195 @@ -48,7 +48,7 @@ glabel func_80931300 /* 04DD4 809313A4 860501A4 */ lh $a1, 0x01A4($s0) ## 000001A4 /* 04DD8 809313A8 01225024 */ and $t2, $t1, $v0 /* 04DDC 809313AC A20A0195 */ sb $t2, 0x0195($s0) ## 00000195 -/* 04DE0 809313B0 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 04DE0 809313B0 0C01DE2B */ jal Math_ScaledStepToS /* 04DE4 809313B4 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 /* 04DE8 809313B8 820B0195 */ lb $t3, 0x0195($s0) ## 00000195 @@ -56,7 +56,7 @@ glabel func_80931300 /* 04DF0 809313C0 860501A4 */ lh $a1, 0x01A4($s0) ## 000001A4 /* 04DF4 809313C4 01626024 */ and $t4, $t3, $v0 /* 04DF8 809313C8 A20C0195 */ sb $t4, 0x0195($s0) ## 00000195 -/* 04DFC 809313CC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 04DFC 809313CC 0C01DE2B */ jal Math_ScaledStepToS /* 04E00 809313D0 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 /* 04E04 809313D4 820D0195 */ lb $t5, 0x0195($s0) ## 00000195 @@ -70,7 +70,7 @@ glabel func_80931300 /* 04E24 809313F4 8DE50090 */ lw $a1, 0x0090($t7) ## 80940090 /* 04E28 809313F8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 04E2C 809313FC 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 04E30 80931400 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04E30 80931400 0C01E0C4 */ jal Math_SmoothStepToF /* 04E34 80931404 E7A60010 */ swc1 $f6, 0x0010($sp) /* 04E38 80931408 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -89,7 +89,7 @@ glabel func_80931300 /* 04E68 80931438 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 /* 04E6C 8093143C 03194024 */ and $t0, $t8, $t9 /* 04E70 80931440 A2080195 */ sb $t0, 0x0195($s0) ## 00000195 -/* 04E74 80931444 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04E74 80931444 0C01E0C4 */ jal Math_SmoothStepToF /* 04E78 80931448 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 04E7C 8093144C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -104,7 +104,7 @@ glabel func_80931300 /* 04EA0 80931470 012A5824 */ and $t3, $t1, $t2 .L80931474: /* 04EA4 80931474 A20B0195 */ sb $t3, 0x0195($s0) ## 00000195 -/* 04EA8 80931478 0C01DE1C */ jal Math_Sins +/* 04EA8 80931478 0C01DE1C */ jal Math_SinS ## sins? /* 04EAC 8093147C 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 04EB0 80931480 C61203C4 */ lwc1 $f18, 0x03C4($s0) ## 000003C4 @@ -114,7 +114,7 @@ glabel func_80931300 /* 04EC0 80931490 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 04EC4 80931494 C5860024 */ lwc1 $f6, 0x0024($t4) ## 80940024 /* 04EC8 80931498 46062200 */ add.s $f8, $f4, $f6 -/* 04ECC 8093149C 0C01DE0D */ jal Math_Coss +/* 04ECC 8093149C 0C01DE0D */ jal Math_CosS ## coss? /* 04ED0 809314A0 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 /* 04ED4 809314A4 C60A03C4 */ lwc1 $f10, 0x03C4($s0) ## 000003C4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931560.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931560.s index 4cf98350c3..5b939a6b1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931560.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931560.s @@ -22,7 +22,7 @@ glabel func_80931560 /* 04FD8 809315A8 8F3978A8 */ lw $t9, %lo(D_809378A8)($t9) /* 04FDC 809315AC 53200013 */ beql $t9, $zero, .L809315FC /* 04FE0 809315B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04FE4 809315B4 0C03F66B */ jal Math_Rand_ZeroOne +/* 04FE4 809315B4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 04FE8 809315B8 00000000 */ nop /* 04FEC 809315BC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -98,7 +98,7 @@ glabel func_80931560 /* 050EC 809316BC A602019A */ sh $v0, 0x019A($s0) ## 0000019A .L809316C0: /* 050F0 809316C0 86050016 */ lh $a1, 0x0016($s0) ## 00000016 -/* 050F4 809316C4 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 050F4 809316C4 0C01DE2B */ jal Math_ScaledStepToS /* 050F8 809316C8 8606019A */ lh $a2, 0x019A($s0) ## 0000019A /* 050FC 809316CC 1040000A */ beq $v0, $zero, .L809316F8 @@ -118,7 +118,7 @@ glabel func_80931560 /* 05128 809316F8 0C00BE5D */ jal func_8002F974 /* 0512C 809316FC 24053167 */ addiu $a1, $zero, 0x3167 ## $a1 = 00003167 .L80931700: -/* 05130 80931700 0C01DE1C */ jal Math_Sins +/* 05130 80931700 0C01DE1C */ jal Math_SinS ## sins? /* 05134 80931704 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 05138 80931708 C60603C4 */ lwc1 $f6, 0x03C4($s0) ## 000003C4 @@ -128,7 +128,7 @@ glabel func_80931560 /* 05148 80931718 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 0514C 8093171C C5CA0024 */ lwc1 $f10, 0x0024($t6) ## 80940024 /* 05150 80931720 460A4400 */ add.s $f16, $f8, $f10 -/* 05154 80931724 0C01DE0D */ jal Math_Coss +/* 05154 80931724 0C01DE0D */ jal Math_CosS ## coss? /* 05158 80931728 E6100024 */ swc1 $f16, 0x0024($s0) ## 00000024 /* 0515C 8093172C C61203C4 */ lwc1 $f18, 0x03C4($s0) ## 000003C4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809317F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809317F8.s index a55f06bb60..cc8dc060fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809317F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809317F8.s @@ -9,12 +9,12 @@ glabel func_809317F8 /* 05240 80931810 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 05244 80931814 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 /* 05248 80931818 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0524C 8093181C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 0524C 8093181C 0C01DE2B */ jal Math_ScaledStepToS /* 05250 80931820 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 /* 05254 80931824 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 05258 80931828 860501A4 */ lh $a1, 0x01A4($s0) ## 000001A4 -/* 0525C 8093182C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 0525C 8093182C 0C01DE2B */ jal Math_ScaledStepToS /* 05260 80931830 24060100 */ addiu $a2, $zero, 0x0100 ## $a2 = 00000100 /* 05264 80931834 10400003 */ beq $v0, $zero, .L80931844 @@ -22,7 +22,7 @@ glabel func_809317F8 /* 0526C 8093183C 0C24C11D */ jal func_80930474 /* 05270 80931840 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80931844: -/* 05274 80931844 0C01DE1C */ jal Math_Sins +/* 05274 80931844 0C01DE1C */ jal Math_SinS ## sins? /* 05278 80931848 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 0527C 8093184C C60403C4 */ lwc1 $f4, 0x03C4($s0) ## 000003C4 @@ -32,7 +32,7 @@ glabel func_809317F8 /* 0528C 8093185C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 05290 80931860 C5C80024 */ lwc1 $f8, 0x0024($t6) ## 80940024 /* 05294 80931864 46083280 */ add.s $f10, $f6, $f8 -/* 05298 80931868 0C01DE0D */ jal Math_Coss +/* 05298 80931868 0C01DE0D */ jal Math_CosS ## coss? /* 0529C 8093186C E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 /* 052A0 80931870 C61003C4 */ lwc1 $f16, 0x03C4($s0) ## 000003C4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931928.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931928.s index 9cbb082461..908aafa4e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931928.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931928.s @@ -12,7 +12,7 @@ glabel func_80931928 /* 0537C 8093194C AFAE0010 */ sw $t6, 0x0010($sp) /* 05380 80931950 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 /* 05384 80931954 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 05388 80931958 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 05388 80931958 0C01E1A7 */ jal Math_SmoothStepToS /* 0538C 8093195C 24070800 */ addiu $a3, $zero, 0x0800 ## $a3 = 00000800 /* 05390 80931960 2C4F0001 */ sltiu $t7, $v0, 0x0001 @@ -23,7 +23,7 @@ glabel func_80931928 /* 053A4 80931974 24060A00 */ addiu $a2, $zero, 0x0A00 ## $a2 = 00000A00 /* 053A8 80931978 03192821 */ addu $a1, $t8, $t9 /* 053AC 8093197C 00052C00 */ sll $a1, $a1, 16 -/* 053B0 80931980 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 053B0 80931980 0C01DE2B */ jal Math_ScaledStepToS /* 053B4 80931984 00052C03 */ sra $a1, $a1, 16 /* 053B8 80931988 8FA8002C */ lw $t0, 0x002C($sp) @@ -32,7 +32,7 @@ glabel func_80931928 /* 053C4 80931994 01024824 */ and $t1, $t0, $v0 /* 053C8 80931998 AFA9002C */ sw $t1, 0x002C($sp) /* 053CC 8093199C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 053D0 809319A0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 053D0 809319A0 0C01E107 */ jal Math_ApproachF /* 053D4 809319A4 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 053D8 809319A8 8FAA002C */ lw $t2, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931A5C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931A5C.s index 4106811689..7fe6162aef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931A5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931A5C.s @@ -57,7 +57,7 @@ glabel func_80931A5C /* 05544 80931B14 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 05548 80931B18 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 0554C 80931B1C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 05550 80931B20 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 05550 80931B20 0C01E0C4 */ jal Math_SmoothStepToF /* 05554 80931B24 E7A40010 */ swc1 $f4, 0x0010($sp) /* 05558 80931B28 0C02927F */ jal SkelAnime_FrameUpdateMatrix @@ -75,7 +75,7 @@ glabel func_80931A5C /* 05584 80931B54 31090080 */ andi $t1, $t0, 0x0080 ## $t1 = 00000000 /* 05588 80931B58 11200012 */ beq $t1, $zero, .L80931BA4 /* 0558C 80931B5C 00000000 */ nop -/* 05590 80931B60 0C03F66B */ jal Math_Rand_ZeroOne +/* 05590 80931B60 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 05594 80931B64 00000000 */ nop /* 05598 80931B68 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -95,7 +95,7 @@ glabel func_80931A5C /* 055CC 80931B9C 10000026 */ beq $zero, $zero, .L80931C38 /* 055D0 80931BA0 920203E4 */ lbu $v0, 0x03E4($s0) ## 000003E4 .L80931BA4: -/* 055D4 80931BA4 0C03F66B */ jal Math_Rand_ZeroOne +/* 055D4 80931BA4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 055D8 80931BA8 00000000 */ nop /* 055DC 80931BAC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -158,7 +158,7 @@ glabel func_80931A5C /* 056A8 80931C78 A60C0198 */ sh $t4, 0x0198($s0) ## 00000198 /* 056AC 80931C7C A6020198 */ sh $v0, 0x0198($s0) ## 00000198 .L80931C80: -/* 056B0 80931C80 0C01DE1C */ jal Math_Sins +/* 056B0 80931C80 0C01DE1C */ jal Math_SinS ## sins? /* 056B4 80931C84 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 056B8 80931C88 C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 @@ -166,7 +166,7 @@ glabel func_80931A5C /* 056C0 80931C90 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 056C4 80931C94 46003282 */ mul.s $f10, $f6, $f0 /* 056C8 80931C98 460A4480 */ add.s $f18, $f8, $f10 -/* 056CC 80931C9C 0C01DE0D */ jal Math_Coss +/* 056CC 80931C9C 0C01DE0D */ jal Math_CosS ## coss? /* 056D0 80931CA0 E6120024 */ swc1 $f18, 0x0024($s0) ## 00000024 /* 056D4 80931CA4 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EF8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EF8.s index b970a2f2eb..0c34e5410f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EF8.s @@ -7,7 +7,7 @@ glabel func_80931EF8 /* 0593C 80931F0C A48E01A2 */ sh $t6, 0x01A2($a0) ## 000001A2 /* 05940 80931F10 A48F0198 */ sh $t7, 0x0198($a0) ## 00000198 /* 05944 80931F14 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 05948 80931F18 0C01DE1C */ jal Math_Sins +/* 05948 80931F18 0C01DE1C */ jal Math_SinS ## sins? /* 0594C 80931F1C AFA50018 */ sw $a1, 0x0018($sp) /* 05950 80931F20 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -19,7 +19,7 @@ glabel func_80931EF8 /* 05968 80931F38 84A400B6 */ lh $a0, 0x00B6($a1) ## 000000B6 /* 0596C 80931F3C E4B003CC */ swc1 $f16, 0x03CC($a1) ## 000003CC /* 05970 80931F40 46082281 */ sub.s $f10, $f4, $f8 -/* 05974 80931F44 0C01DE0D */ jal Math_Coss +/* 05974 80931F44 0C01DE0D */ jal Math_CosS ## coss? /* 05978 80931F48 E4AA03C8 */ swc1 $f10, 0x03C8($a1) ## 000003C8 /* 0597C 80931F4C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931F84.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931F84.s index 5865d8db0d..731f282320 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931F84.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931F84.s @@ -17,7 +17,7 @@ glabel func_80931F84 /* 059F0 80931FC0 24C601C8 */ addiu $a2, $a2, 0x01C8 ## $a2 = 000001C8 /* 059F4 80931FC4 00063400 */ sll $a2, $a2, 16 /* 059F8 80931FC8 00063403 */ sra $a2, $a2, 16 -/* 059FC 80931FCC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 059FC 80931FCC 0C01DE2B */ jal Math_ScaledStepToS /* 05A00 80931FD0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 05A04 80931FD4 50400027 */ beql $v0, $zero, .L80932074 @@ -68,7 +68,7 @@ glabel func_80931F84 .L80932074: /* 05AA4 80932074 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 /* 05AA8 80932078 00042400 */ sll $a0, $a0, 16 -/* 05AAC 8093207C 0C01DE0D */ jal Math_Coss +/* 05AAC 8093207C 0C01DE0D */ jal Math_CosS ## coss? /* 05AB0 80932080 00042403 */ sra $a0, $a0, 16 /* 05AB4 80932084 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -80,7 +80,7 @@ glabel func_80931F84 /* 05ACC 8093209C 00042400 */ sll $a0, $a0, 16 /* 05AD0 809320A0 00042403 */ sra $a0, $a0, 16 /* 05AD4 809320A4 46083280 */ add.s $f10, $f6, $f8 -/* 05AD8 809320A8 0C01DE1C */ jal Math_Sins +/* 05AD8 809320A8 0C01DE1C */ jal Math_SinS ## sins? /* 05ADC 809320AC E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 05AE0 809320B0 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -88,7 +88,7 @@ glabel func_80931F84 /* 05AE8 809320B8 00000000 */ nop /* 05AEC 809320BC 46100482 */ mul.s $f18, $f0, $f16 /* 05AF0 809320C0 E7B20028 */ swc1 $f18, 0x0028($sp) -/* 05AF4 809320C4 0C01DE1C */ jal Math_Sins +/* 05AF4 809320C4 0C01DE1C */ jal Math_SinS ## sins? /* 05AF8 809320C8 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 05AFC 809320CC C7A40028 */ lwc1 $f4, 0x0028($sp) @@ -96,7 +96,7 @@ glabel func_80931F84 /* 05B04 809320D4 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 05B08 809320D8 46040182 */ mul.s $f6, $f0, $f4 /* 05B0C 809320DC 46083280 */ add.s $f10, $f6, $f8 -/* 05B10 809320E0 0C01DE0D */ jal Math_Coss +/* 05B10 809320E0 0C01DE0D */ jal Math_CosS ## coss? /* 05B14 809320E4 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 /* 05B18 809320E8 C7B00028 */ lwc1 $f16, 0x0028($sp) @@ -118,7 +118,7 @@ glabel func_80931F84 /* 05B58 80932128 10000004 */ beq $zero, $zero, .L8093213C /* 05B5C 8093212C 8E280680 */ lw $t0, 0x0680($s1) ## 00000680 .L80932130: -/* 05B60 80932130 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 05B60 80932130 0C01DE2B */ jal Math_ScaledStepToS /* 05B64 80932134 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 05B68 80932138 8E280680 */ lw $t0, 0x0680($s1) ## 00000680 @@ -143,15 +143,15 @@ glabel func_80931F84 /* 05BAC 8093217C 10000017 */ beq $zero, $zero, .L809321DC /* 05BB0 80932180 A62E00B8 */ sh $t6, 0x00B8($s1) ## 000000B8 .L80932184: -/* 05BB4 80932184 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 05BB4 80932184 0C01DE2B */ jal Math_ScaledStepToS /* 05BB8 80932188 24060600 */ addiu $a2, $zero, 0x0600 ## $a2 = 00000600 /* 05BBC 8093218C 262400B8 */ addiu $a0, $s1, 0x00B8 ## $a0 = 000000B8 /* 05BC0 80932190 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 05BC4 80932194 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 05BC4 80932194 0C01DE2B */ jal Math_ScaledStepToS /* 05BC8 80932198 24060600 */ addiu $a2, $zero, 0x0600 ## $a2 = 00000600 -/* 05BCC 8093219C 0C01DE1C */ jal Math_Sins +/* 05BCC 8093219C 0C01DE1C */ jal Math_SinS ## sins? /* 05BD0 809321A0 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 05BD4 809321A4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -160,7 +160,7 @@ glabel func_80931F84 /* 05BE0 809321B0 46005402 */ mul.s $f16, $f10, $f0 /* 05BE4 809321B4 46104480 */ add.s $f18, $f8, $f16 /* 05BE8 809321B8 E6320024 */ swc1 $f18, 0x0024($s1) ## 00000024 -/* 05BEC 809321BC 0C01DE0D */ jal Math_Coss +/* 05BEC 809321BC 0C01DE0D */ jal Math_CosS ## coss? /* 05BF0 809321C0 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 05BF4 809321C4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -190,7 +190,7 @@ glabel func_80931F84 /* 05C4C 8093221C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 05C50 80932220 0C24CE5E */ jal func_80933978 /* 05C54 80932224 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 05C58 80932228 0C01DE1C */ jal Math_Sins +/* 05C58 80932228 0C01DE1C */ jal Math_SinS ## sins? /* 05C5C 8093222C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 05C60 80932230 3C01428C */ lui $at, 0x428C ## $at = 428C0000 @@ -199,7 +199,7 @@ glabel func_80931F84 /* 05C6C 8093223C 46009182 */ mul.s $f6, $f18, $f0 /* 05C70 80932240 46068100 */ add.s $f4, $f16, $f6 /* 05C74 80932244 E6240024 */ swc1 $f4, 0x0024($s1) ## 00000024 -/* 05C78 80932248 0C01DE0D */ jal Math_Coss +/* 05C78 80932248 0C01DE0D */ jal Math_CosS ## coss? /* 05C7C 8093224C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 05C80 80932250 3C01428C */ lui $at, 0x428C ## $at = 428C0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093234C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093234C.s index 7bfa70f4c5..5072c7718a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093234C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093234C.s @@ -52,21 +52,21 @@ glabel func_8093234C .L80932400: /* 05E30 80932400 240B00C8 */ addiu $t3, $zero, 0x00C8 ## $t3 = 000000C8 /* 05E34 80932404 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 05E38 80932408 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 05E38 80932408 0C00CFC8 */ jal Rand_CenteredFloat /* 05E3C 8093240C A20B0114 */ sb $t3, 0x0114($s0) ## 00000114 /* 05E40 80932410 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 05E44 80932414 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 05E48 80932418 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 05E4C 8093241C 46002180 */ add.s $f6, $f4, $f0 -/* 05E50 80932420 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 05E50 80932420 0C00CFC8 */ jal Rand_CenteredFloat /* 05E54 80932424 E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 /* 05E58 80932428 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 05E5C 8093242C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 05E60 80932430 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 05E64 80932434 46004280 */ add.s $f10, $f8, $f0 -/* 05E68 80932438 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 05E68 80932438 0C00CFC8 */ jal Rand_CenteredFloat /* 05E6C 8093243C E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 05E70 80932440 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -82,7 +82,7 @@ glabel func_8093234C /* 05E98 80932468 45020005 */ bc1fl .L80932480 /* 05E9C 8093246C 860C0198 */ lh $t4, 0x0198($s0) ## 00000198 /* 05EA0 80932470 44051000 */ mfc1 $a1, $f2 -/* 05EA4 80932474 0C01DE80 */ jal Math_ApproxF +/* 05EA4 80932474 0C01DE80 */ jal Math_StepToF /* 05EA8 80932478 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 /* 05EAC 8093247C 860C0198 */ lh $t4, 0x0198($s0) ## 00000198 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324F4.s index 02a8c89091..43b9c45980 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324F4.s @@ -12,7 +12,7 @@ glabel func_809324F4 /* 05F4C 8093251C 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 /* 05F50 80932520 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 05F54 80932524 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 05F58 80932528 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 05F58 80932528 0C01E0C4 */ jal Math_SmoothStepToF /* 05F5C 8093252C E7A40010 */ swc1 $f4, 0x0010($sp) /* 05F60 80932530 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -22,7 +22,7 @@ glabel func_809324F4 /* 05F70 80932540 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 05F74 80932544 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 05F78 80932548 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 05F7C 8093254C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 05F7C 8093254C 0C01E0C4 */ jal Math_SmoothStepToF /* 05F80 80932550 E7A60010 */ swc1 $f6, 0x0010($sp) /* 05F84 80932554 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -37,31 +37,31 @@ glabel func_809324F4 /* 05FA8 80932578 44058000 */ mfc1 $a1, $f16 /* 05FAC 8093257C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 05FB0 80932580 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 05FB4 80932584 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 05FB4 80932584 0C01E0C4 */ jal Math_SmoothStepToF /* 05FB8 80932588 E7B20010 */ swc1 $f18, 0x0010($sp) /* 05FBC 8093258C 4600A500 */ add.s $f20, $f20, $f0 /* 05FC0 80932590 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 05FC4 80932594 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 05FC8 80932598 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 05FC8 80932598 0C01DE2B */ jal Math_ScaledStepToS /* 05FCC 8093259C 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 /* 05FD0 809325A0 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 /* 05FD4 809325A4 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 /* 05FD8 809325A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 05FDC 809325AC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 05FDC 809325AC 0C01DE2B */ jal Math_ScaledStepToS /* 05FE0 809325B0 24061000 */ addiu $a2, $zero, 0x1000 ## $a2 = 00001000 /* 05FE4 809325B4 02228824 */ and $s1, $s1, $v0 /* 05FE8 809325B8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 05FEC 809325BC 86050016 */ lh $a1, 0x0016($s0) ## 00000016 -/* 05FF0 809325C0 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 05FF0 809325C0 0C01DE2B */ jal Math_ScaledStepToS /* 05FF4 809325C4 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 05FF8 809325C8 02228824 */ and $s1, $s1, $v0 /* 05FFC 809325CC 2604019E */ addiu $a0, $s0, 0x019E ## $a0 = 0000019E /* 06000 809325D0 2405FA24 */ addiu $a1, $zero, 0xFA24 ## $a1 = FFFFFA24 -/* 06004 809325D4 0C01DE5F */ jal Math_ApproxS +/* 06004 809325D4 0C01DE5F */ jal Math_StepToS /* 06008 809325D8 240601F4 */ addiu $a2, $zero, 0x01F4 ## $a2 = 000001F4 /* 0600C 809325DC 82050194 */ lb $a1, 0x0194($s0) ## 00000194 @@ -71,7 +71,7 @@ glabel func_809324F4 /* 0601C 809325EC 00202825 */ or $a1, $at, $zero ## $a1 = 00000000 /* 06020 809325F0 00052F40 */ sll $a1, $a1, 29 /* 06024 809325F4 00052C03 */ sra $a1, $a1, 16 -/* 06028 809325F8 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 06028 809325F8 0C01DE2B */ jal Math_ScaledStepToS /* 0602C 809325FC 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 06030 80932600 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093285C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093285C.s index 6831cd82cf..433cede788 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093285C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093285C.s @@ -13,7 +13,7 @@ glabel func_8093285C /* 062B4 80932884 A2020195 */ sb $v0, 0x0195($s0) ## 00000195 /* 062B8 80932888 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 062BC 8093288C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 062C0 80932890 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 062C0 80932890 0C01DE2B */ jal Math_ScaledStepToS /* 062C4 80932894 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 062C8 80932898 820A0194 */ lb $t2, 0x0194($s0) ## 00000194 @@ -26,7 +26,7 @@ glabel func_8093285C /* 062E4 809328B4 A2180195 */ sb $t8, 0x0195($s0) ## 00000195 /* 062E8 809328B8 00052C03 */ sra $a1, $a1, 16 /* 062EC 809328BC 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 062F0 809328C0 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 062F0 809328C0 0C01DE2B */ jal Math_ScaledStepToS /* 062F4 809328C4 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 062F8 809328C8 820C0195 */ lb $t4, 0x0195($s0) ## 00000195 @@ -34,7 +34,7 @@ glabel func_8093285C /* 06300 809328D0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 06304 809328D4 01826824 */ and $t5, $t4, $v0 /* 06308 809328D8 A20D0195 */ sb $t5, 0x0195($s0) ## 00000195 -/* 0630C 809328DC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 0630C 809328DC 0C01DE2B */ jal Math_ScaledStepToS /* 06310 809328E0 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 06314 809328E4 82050194 */ lb $a1, 0x0194($s0) ## 00000194 @@ -48,7 +48,7 @@ glabel func_8093285C /* 06334 80932904 01C27824 */ and $t7, $t6, $v0 /* 06338 80932908 A20F0195 */ sb $t7, 0x0195($s0) ## 00000195 /* 0633C 8093290C 00052C03 */ sra $a1, $a1, 16 -/* 06340 80932910 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 06340 80932910 0C01DE2B */ jal Math_ScaledStepToS /* 06344 80932914 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 06348 80932918 82180195 */ lb $t8, 0x0195($s0) ## 00000195 @@ -56,7 +56,7 @@ glabel func_8093285C /* 06350 80932920 2405F254 */ addiu $a1, $zero, 0xF254 ## $a1 = FFFFF254 /* 06354 80932924 03025024 */ and $t2, $t8, $v0 /* 06358 80932928 A20A0195 */ sb $t2, 0x0195($s0) ## 00000195 -/* 0635C 8093292C 0C01DE5F */ jal Math_ApproxS +/* 0635C 8093292C 0C01DE5F */ jal Math_StepToS /* 06360 80932930 240601F4 */ addiu $a2, $zero, 0x01F4 ## $a2 = 000001F4 /* 06364 80932934 82190195 */ lb $t9, 0x0195($s0) ## 00000195 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932A80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932A80.s index 2cdb92d1dd..8e8b70f976 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932A80.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932A80.s @@ -10,7 +10,7 @@ glabel func_80932A80 /* 064CC 80932A9C AFA40020 */ sw $a0, 0x0020($sp) /* 064D0 80932AA0 3C0E8094 */ lui $t6, %hi(D_80938C90) ## $t6 = 80940000 /* 064D4 80932AA4 8DCE8C90 */ lw $t6, %lo(D_80938C90)($t6) -/* 064D8 80932AA8 0C01DE0D */ jal Math_Coss +/* 064D8 80932AA8 0C01DE0D */ jal Math_CosS ## coss? /* 064DC 80932AAC 85C400B6 */ lh $a0, 0x00B6($t6) ## 809400B6 /* 064E0 80932AB0 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -22,12 +22,12 @@ glabel func_80932A80 /* 064F8 80932AC8 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 /* 064FC 80932ACC 46083280 */ add.s $f10, $f6, $f8 /* 06500 80932AD0 44055000 */ mfc1 $a1, $f10 -/* 06504 80932AD4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06504 80932AD4 0C01E107 */ jal Math_ApproachF /* 06508 80932AD8 00000000 */ nop /* 0650C 80932ADC 3C0F8094 */ lui $t7, %hi(D_80938C90) ## $t7 = 80940000 /* 06510 80932AE0 8DEF8C90 */ lw $t7, %lo(D_80938C90)($t7) -/* 06514 80932AE4 0C01DE1C */ jal Math_Sins +/* 06514 80932AE4 0C01DE1C */ jal Math_SinS ## sins? /* 06518 80932AE8 85E400B6 */ lh $a0, 0x00B6($t7) ## 809400B6 /* 0651C 80932AEC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -39,7 +39,7 @@ glabel func_80932A80 /* 06534 80932B04 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 /* 06538 80932B08 46049180 */ add.s $f6, $f18, $f4 /* 0653C 80932B0C 44053000 */ mfc1 $a1, $f6 -/* 06540 80932B10 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06540 80932B10 0C01E107 */ jal Math_ApproachF /* 06544 80932B14 00000000 */ nop /* 06548 80932B18 82180195 */ lb $t8, 0x0195($s0) ## 00000195 @@ -48,27 +48,27 @@ glabel func_80932A80 /* 06554 80932B24 17000026 */ bne $t8, $zero, .L80932BC0 /* 06558 80932B28 3C0641F0 */ lui $a2, 0x41F0 ## $a2 = 41F00000 /* 0655C 80932B2C 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 06560 80932B30 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 06560 80932B30 0C01DE2B */ jal Math_ScaledStepToS /* 06564 80932B34 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 06568 80932B38 2604019E */ addiu $a0, $s0, 0x019E ## $a0 = 0000019E /* 0656C 80932B3C 2405F254 */ addiu $a1, $zero, 0xF254 ## $a1 = FFFFF254 -/* 06570 80932B40 0C01DE5F */ jal Math_ApproxS +/* 06570 80932B40 0C01DE5F */ jal Math_StepToS /* 06574 80932B44 240601F4 */ addiu $a2, $zero, 0x01F4 ## $a2 = 000001F4 /* 06578 80932B48 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0657C 80932B4C 86050014 */ lh $a1, 0x0014($s0) ## 00000014 -/* 06580 80932B50 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 06580 80932B50 0C01DE2B */ jal Math_ScaledStepToS /* 06584 80932B54 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 06588 80932B58 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 /* 0658C 80932B5C 86050018 */ lh $a1, 0x0018($s0) ## 00000018 -/* 06590 80932B60 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 06590 80932B60 0C01DE2B */ jal Math_ScaledStepToS /* 06594 80932B64 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 06598 80932B68 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 0659C 80932B6C 86050016 */ lh $a1, 0x0016($s0) ## 00000016 -/* 065A0 80932B70 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 065A0 80932B70 0C01DE2B */ jal Math_ScaledStepToS /* 065A4 80932B74 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 065A8 80932B78 3C088094 */ lui $t0, %hi(D_80938C90) ## $t0 = 80940000 @@ -90,7 +90,7 @@ glabel func_80932A80 /* 065E8 80932BB8 10000004 */ beq $zero, $zero, .L80932BCC /* 065EC 80932BBC 8FBF001C */ lw $ra, 0x001C($sp) .L80932BC0: -/* 065F0 80932BC0 0C01DE80 */ jal Math_ApproxF +/* 065F0 80932BC0 0C01DE80 */ jal Math_StepToF /* 065F4 80932BC4 8E050080 */ lw $a1, 0x0080($s0) ## 00000080 .L80932BC8: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932C38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932C38.s index dccd1dbd37..cbf865df33 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932C38.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932C38.s @@ -26,7 +26,7 @@ glabel func_80932C38 /* 066C0 80932C90 A61900B4 */ sh $t9, 0x00B4($s0) ## 000000B4 /* 066C4 80932C94 3C064248 */ lui $a2, 0x4248 ## $a2 = 42480000 /* 066C8 80932C98 44054000 */ mfc1 $a1, $f8 -/* 066CC 80932C9C 0C01DE80 */ jal Math_ApproxF +/* 066CC 80932C9C 0C01DE80 */ jal Math_StepToF /* 066D0 80932CA0 00000000 */ nop /* 066D4 80932CA4 10000008 */ beq $zero, $zero, .L80932CC8 @@ -36,7 +36,7 @@ glabel func_80932C38 /* 066E0 80932CB0 8E050080 */ lw $a1, 0x0080($s0) ## 00000080 /* 066E4 80932CB4 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 /* 066E8 80932CB8 25090400 */ addiu $t1, $t0, 0x0400 ## $t1 = 00000400 -/* 066EC 80932CBC 0C01DE80 */ jal Math_ApproxF +/* 066EC 80932CBC 0C01DE80 */ jal Math_StepToF /* 066F0 80932CC0 A60900B4 */ sh $t1, 0x00B4($s0) ## 000000B4 /* 066F4 80932CC4 860A0198 */ lh $t2, 0x0198($s0) ## 00000198 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932DAC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932DAC.s index f3668430a6..24e23ae57f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932DAC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932DAC.s @@ -15,7 +15,7 @@ glabel func_80932DAC /* 06808 80932DD8 AFA40020 */ sw $a0, 0x0020($sp) /* 0680C 80932DDC 3C0F8094 */ lui $t7, %hi(D_80938C90) ## $t7 = 80940000 /* 06810 80932DE0 8DEF8C90 */ lw $t7, %lo(D_80938C90)($t7) -/* 06814 80932DE4 0C01DE0D */ jal Math_Coss +/* 06814 80932DE4 0C01DE0D */ jal Math_CosS ## coss? /* 06818 80932DE8 85E400B6 */ lh $a0, 0x00B6($t7) ## 809400B6 /* 0681C 80932DEC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -27,12 +27,12 @@ glabel func_80932DAC /* 06834 80932E04 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 /* 06838 80932E08 46083280 */ add.s $f10, $f6, $f8 /* 0683C 80932E0C 44055000 */ mfc1 $a1, $f10 -/* 06840 80932E10 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06840 80932E10 0C01E107 */ jal Math_ApproachF /* 06844 80932E14 00000000 */ nop /* 06848 80932E18 3C188094 */ lui $t8, %hi(D_80938C90) ## $t8 = 80940000 /* 0684C 80932E1C 8F188C90 */ lw $t8, %lo(D_80938C90)($t8) -/* 06850 80932E20 0C01DE1C */ jal Math_Sins +/* 06850 80932E20 0C01DE1C */ jal Math_SinS ## sins? /* 06854 80932E24 870400B6 */ lh $a0, 0x00B6($t8) ## 809400B6 /* 06858 80932E28 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -44,12 +44,12 @@ glabel func_80932DAC /* 06870 80932E40 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 /* 06874 80932E44 46049180 */ add.s $f6, $f18, $f4 /* 06878 80932E48 44053000 */ mfc1 $a1, $f6 -/* 0687C 80932E4C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0687C 80932E4C 0C01E107 */ jal Math_ApproachF /* 06880 80932E50 00000000 */ nop /* 06884 80932E54 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 06888 80932E58 860501A2 */ lh $a1, 0x01A2($s0) ## 000001A2 -/* 0688C 80932E5C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 0688C 80932E5C 0C01DE2B */ jal Math_ScaledStepToS /* 06890 80932E60 8606019A */ lh $a2, 0x019A($s0) ## 0000019A /* 06894 80932E64 50400031 */ beql $v0, $zero, .L80932F2C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FF0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FF0.s index 3a5ac33ea9..d71bff96ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FF0.s @@ -9,12 +9,12 @@ glabel func_80932FF0 /* 06A38 80933008 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 06A3C 8093300C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 06A40 80933010 2405F800 */ addiu $a1, $zero, 0xF800 ## $a1 = FFFFF800 -/* 06A44 80933014 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 06A44 80933014 0C01DE2B */ jal Math_ScaledStepToS /* 06A48 80933018 8606019A */ lh $a2, 0x019A($s0) ## 0000019A /* 06A4C 8093301C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 06A50 80933020 3C0542B4 */ lui $a1, 0x42B4 ## $a1 = 42B40000 -/* 06A54 80933024 0C01DE80 */ jal Math_ApproxF +/* 06A54 80933024 0C01DE80 */ jal Math_StepToF /* 06A58 80933028 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 06A5C 8093302C 3C0F8094 */ lui $t7, %hi(D_80938C90) ## $t7 = 80940000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809330B4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809330B4.s index c47f6f5c94..6e94f9b64e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809330B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809330B4.s @@ -9,7 +9,7 @@ glabel func_809330B4 /* 06AFC 809330CC 8FA40018 */ lw $a0, 0x0018($sp) /* 06B00 809330D0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 06B04 809330D4 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 -/* 06B08 809330D8 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 06B08 809330D8 0C01DE2B */ jal Math_ScaledStepToS /* 06B0C 809330DC 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 06B10 809330E0 3C028094 */ lui $v0, %hi(D_80938C90) ## $v0 = 80940000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933290.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933290.s index e5856144e0..a05652792e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933290.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933290.s @@ -10,7 +10,7 @@ glabel func_80933290 /* 06CE0 809332B0 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 06CE4 809332B4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 06CE8 809332B8 3C07428C */ lui $a3, 0x428C ## $a3 = 428C0000 -/* 06CEC 809332BC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 06CEC 809332BC 0C01E0C4 */ jal Math_SmoothStepToF /* 06CF0 809332C0 E7A40010 */ swc1 $f4, 0x0010($sp) /* 06CF4 809332C4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809333F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809333F4.s index 7aacf19de7..4c92bede74 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809333F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809333F4.s @@ -36,7 +36,7 @@ glabel func_809333F4 /* 06EA0 80933470 51400034 */ beql $t2, $zero, .L80933544 /* 06EA4 80933474 8FBF001C */ lw $ra, 0x001C($sp) /* 06EA8 80933478 8E0B011C */ lw $t3, 0x011C($s0) ## 0000011C -/* 06EAC 8093347C 0C01DE1C */ jal Math_Sins +/* 06EAC 8093347C 0C01DE1C */ jal Math_SinS ## sins? /* 06EB0 80933480 856400B4 */ lh $a0, 0x00B4($t3) ## 000000B4 /* 06EB4 80933484 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -44,7 +44,7 @@ glabel func_809333F4 /* 06EBC 8093348C 8E0C011C */ lw $t4, 0x011C($s0) ## 0000011C /* 06EC0 80933490 46040082 */ mul.s $f2, $f0, $f4 /* 06EC4 80933494 858400B4 */ lh $a0, 0x00B4($t4) ## 000000B4 -/* 06EC8 80933498 0C01DE0D */ jal Math_Coss +/* 06EC8 80933498 0C01DE0D */ jal Math_CosS ## coss? /* 06ECC 8093349C E7A20024 */ swc1 $f2, 0x0024($sp) /* 06ED0 809334A0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -66,7 +66,7 @@ glabel func_809333F4 /* 06F0C 809334DC 8E0F011C */ lw $t7, 0x011C($s0) ## 0000011C /* 06F10 809334E0 85E400B6 */ lh $a0, 0x00B6($t7) ## 000000B6 /* 06F14 809334E4 E7AC0020 */ swc1 $f12, 0x0020($sp) -/* 06F18 809334E8 0C01DE0D */ jal Math_Coss +/* 06F18 809334E8 0C01DE0D */ jal Math_CosS ## coss? /* 06F1C 809334EC E7A20024 */ swc1 $f2, 0x0024($sp) /* 06F20 809334F0 C7AC0020 */ lwc1 $f12, 0x0020($sp) @@ -79,7 +79,7 @@ glabel func_809333F4 /* 06F3C 8093350C 460A4400 */ add.s $f16, $f8, $f10 /* 06F40 80933510 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 /* 06F44 80933514 E6100024 */ swc1 $f16, 0x0024($s0) ## 00000024 -/* 06F48 80933518 0C01DE1C */ jal Math_Sins +/* 06F48 80933518 0C01DE1C */ jal Math_SinS ## sins? /* 06F4C 8093351C 870400B6 */ lh $a0, 0x00B6($t8) ## 000000B6 /* 06F50 80933520 C7AC0020 */ lwc1 $f12, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933608.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933608.s index 8d81e9765f..ef8c45c074 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933608.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933608.s @@ -7,25 +7,25 @@ glabel func_80933608 /* 0704C 8093361C AFA50024 */ sw $a1, 0x0024($sp) /* 07050 80933620 860501A4 */ lh $a1, 0x01A4($s0) ## 000001A4 /* 07054 80933624 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 -/* 07058 80933628 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 07058 80933628 0C01DE2B */ jal Math_ScaledStepToS /* 0705C 8093362C 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 /* 07060 80933630 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 /* 07064 80933634 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 07068 80933638 24051000 */ addiu $a1, $zero, 0x1000 ## $a1 = 00001000 -/* 0706C 8093363C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 0706C 8093363C 0C01DE2B */ jal Math_ScaledStepToS /* 07070 80933640 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 /* 07074 80933644 02228824 */ and $s1, $s1, $v0 /* 07078 80933648 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 /* 0707C 8093364C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 07080 80933650 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 07080 80933650 0C01DE2B */ jal Math_ScaledStepToS /* 07084 80933654 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 07088 80933658 02228824 */ and $s1, $s1, $v0 /* 0708C 8093365C 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 07090 80933660 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 07094 80933664 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 07094 80933664 0C01DE2B */ jal Math_ScaledStepToS /* 07098 80933668 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 /* 0709C 8093366C 8E0E011C */ lw $t6, 0x011C($s0) ## 0000011C @@ -37,17 +37,17 @@ glabel func_80933608 /* 070B4 80933684 46062200 */ add.s $f8, $f4, $f6 /* 070B8 80933688 3C064248 */ lui $a2, 0x4248 ## $a2 = 42480000 /* 070BC 8093368C 44054000 */ mfc1 $a1, $f8 -/* 070C0 80933690 0C01DE80 */ jal Math_ApproxF +/* 070C0 80933690 0C01DE80 */ jal Math_StepToF /* 070C4 80933694 00000000 */ nop /* 070C8 80933698 02228824 */ and $s1, $s1, $v0 /* 070CC 8093369C 260403C4 */ addiu $a0, $s0, 0x03C4 ## $a0 = 000003C4 /* 070D0 809336A0 3C0543C8 */ lui $a1, 0x43C8 ## $a1 = 43C80000 -/* 070D4 809336A4 0C01DE80 */ jal Math_ApproxF +/* 070D4 809336A4 0C01DE80 */ jal Math_StepToF /* 070D8 809336A8 3C064270 */ lui $a2, 0x4270 ## $a2 = 42700000 /* 070DC 809336AC 02228824 */ and $s1, $s1, $v0 -/* 070E0 809336B0 0C01DE1C */ jal Math_Sins +/* 070E0 809336B0 0C01DE1C */ jal Math_SinS ## sins? /* 070E4 809336B4 860401A4 */ lh $a0, 0x01A4($s0) ## 000001A4 /* 070E8 809336B8 C61003C4 */ lwc1 $f16, 0x03C4($s0) ## 000003C4 @@ -56,7 +56,7 @@ glabel func_80933608 /* 070F4 809336C4 46100482 */ mul.s $f18, $f0, $f16 /* 070F8 809336C8 C5EA03C8 */ lwc1 $f10, 0x03C8($t7) ## 000003C8 /* 070FC 809336CC 46125101 */ sub.s $f4, $f10, $f18 -/* 07100 809336D0 0C01DE0D */ jal Math_Coss +/* 07100 809336D0 0C01DE0D */ jal Math_CosS ## coss? /* 07104 809336D4 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 /* 07108 809336D8 C60803C4 */ lwc1 $f8, 0x03C4($s0) ## 000003C4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933748.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933748.s index 62b598a44e..63ad1085d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933748.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933748.s @@ -34,7 +34,7 @@ glabel func_80933748 /* 071D8 809337A8 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 .L809337AC: /* 071DC 809337AC 260403C4 */ addiu $a0, $s0, 0x03C4 ## $a0 = 000003C4 -/* 071E0 809337B0 0C01DE80 */ jal Math_ApproxF +/* 071E0 809337B0 0C01DE80 */ jal Math_StepToF /* 071E4 809337B4 8E060068 */ lw $a2, 0x0068($s0) ## 00000068 /* 071E8 809337B8 10400024 */ beq $v0, $zero, .L8093384C @@ -65,7 +65,7 @@ glabel func_80933748 /* 0723C 8093380C 3C0543FA */ lui $a1, 0x43FA ## $a1 = 43FA0000 /* 07240 80933810 46105482 */ mul.s $f18, $f10, $f16 /* 07244 80933814 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 07248 80933818 0C01DE80 */ jal Math_ApproxF +/* 07248 80933818 0C01DE80 */ jal Math_StepToF /* 0724C 8093381C 8E060068 */ lw $a2, 0x0068($s0) ## 00000068 /* 07250 80933820 3C014000 */ lui $at, 0x4000 ## $at = 40000000 @@ -80,7 +80,7 @@ glabel func_80933748 /* 07274 80933844 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF /* 07278 80933848 A6090198 */ sh $t1, 0x0198($s0) ## 00000198 .L8093384C: -/* 0727C 8093384C 0C01DE1C */ jal Math_Sins +/* 0727C 8093384C 0C01DE1C */ jal Math_SinS ## sins? /* 07280 80933850 860401A4 */ lh $a0, 0x01A4($s0) ## 000001A4 /* 07284 80933854 C60A03C4 */ lwc1 $f10, 0x03C4($s0) ## 000003C4 @@ -89,7 +89,7 @@ glabel func_80933748 /* 07290 80933860 460A0402 */ mul.s $f16, $f0, $f10 /* 07294 80933864 C54803C8 */ lwc1 $f8, 0x03C8($t2) ## 000003C8 /* 07298 80933868 46104481 */ sub.s $f18, $f8, $f16 -/* 0729C 8093386C 0C01DE0D */ jal Math_Coss +/* 0729C 8093386C 0C01DE0D */ jal Math_CosS ## coss? /* 072A0 80933870 E6120024 */ swc1 $f18, 0x0024($s0) ## 00000024 /* 072A4 80933874 C60203C4 */ lwc1 $f2, 0x03C4($s0) ## 000003C4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809339F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809339F8.s index fb3a8270d0..89170404ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809339F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809339F8.s @@ -3,12 +3,12 @@ glabel func_809339F8 /* 0742C 809339FC AFBF0014 */ sw $ra, 0x0014($sp) /* 07430 80933A00 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 07434 80933A04 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 07438 80933A08 0C01DE1C */ jal Math_Sins +/* 07438 80933A08 0C01DE1C */ jal Math_SinS ## sins? /* 0743C 80933A0C AFA50028 */ sw $a1, 0x0028($sp) /* 07440 80933A10 8FA50028 */ lw $a1, 0x0028($sp) /* 07444 80933A14 84A400B6 */ lh $a0, 0x00B6($a1) ## 000000B6 -/* 07448 80933A18 0C01DE0D */ jal Math_Coss +/* 07448 80933A18 0C01DE0D */ jal Math_CosS ## coss? /* 0744C 80933A1C E7A0001C */ swc1 $f0, 0x001C($sp) /* 07450 80933A20 8FA50028 */ lw $a1, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933B84.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933B84.s index 122e3a4b13..4cb7e9a79c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933B84.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933B84.s @@ -6,7 +6,7 @@ glabel D_80937A10 glabel func_80933B84 /* 075B4 80933B84 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 075B8 80933B88 AFBF0014 */ sw $ra, 0x0014($sp) -/* 075BC 80933B8C 0C03F66B */ jal Math_Rand_ZeroOne +/* 075BC 80933B8C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 075C0 80933B90 AFA40018 */ sw $a0, 0x0018($sp) /* 075C4 80933B94 8FA40018 */ lw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D54.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D54.s index 457adce4ba..e55a1da9b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D54.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D54.s @@ -79,7 +79,7 @@ glabel func_80933D54 /* 078A8 80933E78 8C848C90 */ lw $a0, %lo(D_80938C90)($a0) /* 078AC 80933E7C 0C24B73B */ jal func_8092DCEC /* 078B0 80933E80 8FA50024 */ lw $a1, 0x0024($sp) -/* 078B4 80933E84 0C03F66B */ jal Math_Rand_ZeroOne +/* 078B4 80933E84 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 078B8 80933E88 00000000 */ nop /* 078BC 80933E8C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934A44.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934A44.s index 17c020311e..a1e90790fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934A44.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934A44.s @@ -70,7 +70,7 @@ glabel func_80934A44 /* 08510 80934AE0 0C0400A4 */ jal sinf /* 08514 80934AE4 00000000 */ nop -/* 08518 80934AE8 0C03F66B */ jal Math_Rand_ZeroOne +/* 08518 80934AE8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0851C 80934AEC E7A00024 */ swc1 $f0, 0x0024($sp) /* 08520 80934AF0 3C0144A0 */ lui $at, 0x44A0 ## $at = 44A00000 @@ -113,7 +113,7 @@ glabel func_80934A44 /* 085B4 80934B84 0C0400A4 */ jal sinf /* 085B8 80934B88 00000000 */ nop -/* 085BC 80934B8C 0C03F66B */ jal Math_Rand_ZeroOne +/* 085BC 80934B8C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 085C0 80934B90 E7A00024 */ swc1 $f0, 0x0024($sp) /* 085C4 80934B94 3C014580 */ lui $at, 0x4580 ## $at = 45800000 @@ -153,7 +153,7 @@ glabel func_80934A44 /* 0864C 80934C1C 0C0400A4 */ jal sinf /* 08650 80934C20 00000000 */ nop -/* 08654 80934C24 0C03F66B */ jal Math_Rand_ZeroOne +/* 08654 80934C24 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 08658 80934C28 E7A00024 */ swc1 $f0, 0x0024($sp) /* 0865C 80934C2C 3C0144A0 */ lui $at, 0x44A0 ## $at = 44A00000 @@ -207,7 +207,7 @@ glabel func_80934A44 /* 0870C 80934CDC 0C0400A4 */ jal sinf /* 08710 80934CE0 00000000 */ nop -/* 08714 80934CE4 0C03F66B */ jal Math_Rand_ZeroOne +/* 08714 80934CE4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 08718 80934CE8 E7A00024 */ swc1 $f0, 0x0024($sp) /* 0871C 80934CEC 3C0144A0 */ lui $at, 0x44A0 ## $at = 44A00000 @@ -248,7 +248,7 @@ glabel func_80934A44 /* 087A8 80934D78 0C0400A4 */ jal sinf /* 087AC 80934D7C 00000000 */ nop -/* 087B0 80934D80 0C03F66B */ jal Math_Rand_ZeroOne +/* 087B0 80934D80 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 087B4 80934D84 E7A00024 */ swc1 $f0, 0x0024($sp) /* 087B8 80934D88 3C0144A0 */ lui $at, 0x44A0 ## $at = 44A00000 @@ -284,7 +284,7 @@ glabel func_80934A44 /* 08830 80934E00 0C0400A4 */ jal sinf /* 08834 80934E04 00000000 */ nop -/* 08838 80934E08 0C03F66B */ jal Math_Rand_ZeroOne +/* 08838 80934E08 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0883C 80934E0C E7A00024 */ swc1 $f0, 0x0024($sp) /* 08840 80934E10 3C0144A0 */ lui $at, 0x44A0 ## $at = 44A00000 @@ -321,7 +321,7 @@ glabel func_80934A44 /* 088B8 80934E88 0C0400A4 */ jal sinf /* 088BC 80934E8C 00000000 */ nop -/* 088C0 80934E90 0C03F66B */ jal Math_Rand_ZeroOne +/* 088C0 80934E90 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 088C4 80934E94 E7A00024 */ swc1 $f0, 0x0024($sp) /* 088C8 80934E98 3C014400 */ lui $at, 0x4400 ## $at = 44000000 @@ -362,7 +362,7 @@ glabel func_80934A44 /* 08954 80934F24 0C0400A4 */ jal sinf /* 08958 80934F28 00000000 */ nop -/* 0895C 80934F2C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0895C 80934F2C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 08960 80934F30 E7A00024 */ swc1 $f0, 0x0024($sp) /* 08964 80934F34 3C014400 */ lui $at, 0x4400 ## $at = 44000000 @@ -400,7 +400,7 @@ glabel func_80934A44 /* 089E4 80934FB4 0C0400A4 */ jal sinf /* 089E8 80934FB8 00000000 */ nop -/* 089EC 80934FBC 0C03F66B */ jal Math_Rand_ZeroOne +/* 089EC 80934FBC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 089F0 80934FC0 E7A00024 */ swc1 $f0, 0x0024($sp) /* 089F4 80934FC4 3C014380 */ lui $at, 0x4380 ## $at = 43800000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s index b0a002c62c..3daad1c38f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s @@ -130,13 +130,13 @@ glabel func_809352DC /* 08E98 80935468 2529F374 */ addiu $t1, $t1, %lo(func_8092F374) ## $t1 = 8092F374 /* 08E9C 8093546C 552B002A */ bnel $t1, $t3, .L80935518 /* 08EA0 80935470 8E2A0004 */ lw $t2, 0x0004($s1) ## 00000004 -/* 08EA4 80935474 0C03F66B */ jal Math_Rand_ZeroOne +/* 08EA4 80935474 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 08EA8 80935478 00000000 */ nop /* 08EAC 8093547C 3C018093 */ lui $at, %hi(D_80937A4C) ## $at = 80930000 /* 08EB0 80935480 C4247A4C */ lwc1 $f4, %lo(D_80937A4C)($at) /* 08EB4 80935484 46040182 */ mul.s $f6, $f0, $f4 -/* 08EB8 80935488 0C03F66B */ jal Math_Rand_ZeroOne +/* 08EB8 80935488 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 08EBC 8093548C E7A60068 */ swc1 $f6, 0x0068($sp) /* 08EC0 80935490 3C018093 */ lui $at, %hi(D_80937A50) ## $at = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935764.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935764.s index fd1da950a8..e91427584a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935764.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935764.s @@ -5,11 +5,11 @@ glabel func_80935764 /* 091A0 80935770 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 091A4 80935774 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 091A8 80935778 A08E0196 */ sb $t6, 0x0196($a0) ## 00000196 -/* 091AC 8093577C 0C01DE1C */ jal Math_Sins +/* 091AC 8093577C 0C01DE1C */ jal Math_SinS ## sins? /* 091B0 80935780 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 /* 091B4 80935784 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 091B8 80935788 0C01DE0D */ jal Math_Coss +/* 091B8 80935788 0C01DE0D */ jal Math_CosS ## coss? /* 091BC 8093578C E7A00024 */ swc1 $f0, 0x0024($sp) /* 091C0 80935790 3C038093 */ lui $v1, %hi(D_809378C4) ## $v1 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935890.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935890.s index e37a212f69..49985b6260 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935890.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935890.s @@ -5,7 +5,7 @@ glabel func_80935890 /* 092CC 8093589C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 092D0 809358A0 A08E0196 */ sb $t6, 0x0196($a0) ## 00000196 /* 092D4 809358A4 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 092D8 809358A8 0C01DE0D */ jal Math_Coss +/* 092D8 809358A8 0C01DE0D */ jal Math_CosS ## coss? /* 092DC 809358AC AFA50018 */ sw $a1, 0x0018($sp) /* 092E0 809358B0 8FA50018 */ lw $a1, 0x0018($sp) @@ -19,7 +19,7 @@ glabel func_80935890 /* 09300 809358D0 468042A0 */ cvt.s.w $f10, $f8 /* 09304 809358D4 460A3402 */ mul.s $f16, $f6, $f10 /* 09308 809358D8 46128100 */ add.s $f4, $f16, $f18 -/* 0930C 809358DC 0C01DE1C */ jal Math_Sins +/* 0930C 809358DC 0C01DE1C */ jal Math_SinS ## sins? /* 09310 809358E0 E4A40700 */ swc1 $f4, 0x0700($a1) ## 00000700 /* 09314 809358E4 8FA50018 */ lw $a1, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935A20.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935A20.s index c87f6ca376..d19307c25a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935A20.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935A20.s @@ -123,7 +123,7 @@ glabel func_80935A20 /* 095EC 80935BBC A6000022 */ sh $zero, 0x0022($s0) ## 00000E22 /* 095F0 80935BC0 46062281 */ sub.s $f10, $f4, $f6 /* 095F4 80935BC4 E60A0008 */ swc1 $f10, 0x0008($s0) ## 00000E08 -/* 095F8 80935BC8 0C03F66B */ jal Math_Rand_ZeroOne +/* 095F8 80935BC8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 095FC 80935BCC AFA50024 */ sw $a1, 0x0024($sp) /* 09600 80935BD0 3C014780 */ lui $at, 0x4780 ## $at = 47800000 @@ -132,7 +132,7 @@ glabel func_80935A20 /* 0960C 80935BDC 46080402 */ mul.s $f16, $f0, $f8 /* 09610 80935BE0 4600848D */ trunc.w.s $f18, $f16 /* 09614 80935BE4 44089000 */ mfc1 $t0, $f18 -/* 09618 80935BE8 0C03F66B */ jal Math_Rand_ZeroOne +/* 09618 80935BE8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0961C 80935BEC A6080018 */ sh $t0, 0x0018($s0) ## 00000E18 /* 09620 80935BF0 3C014780 */ lui $at, 0x4780 ## $at = 47800000 @@ -141,7 +141,7 @@ glabel func_80935A20 /* 0962C 80935BFC 46040182 */ mul.s $f6, $f0, $f4 /* 09630 80935C00 4600328D */ trunc.w.s $f10, $f6 /* 09634 80935C04 440A5000 */ mfc1 $t2, $f10 -/* 09638 80935C08 0C03F66B */ jal Math_Rand_ZeroOne +/* 09638 80935C08 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0963C 80935C0C A60A001A */ sh $t2, 0x001A($s0) ## 00000E1A /* 09640 80935C10 3C014780 */ lui $at, 0x4780 ## $at = 47800000 @@ -153,7 +153,7 @@ glabel func_80935A20 /* 09658 80935C28 A60E0020 */ sh $t6, 0x0020($s0) ## 00000E20 /* 0965C 80935C2C 4600848D */ trunc.w.s $f18, $f16 /* 09660 80935C30 440C9000 */ mfc1 $t4, $f18 -/* 09664 80935C34 0C03F66B */ jal Math_Rand_ZeroOne +/* 09664 80935C34 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 09668 80935C38 A60C001C */ sh $t4, 0x001C($s0) ## 00000E1C /* 0966C 80935C3C 3C018093 */ lui $at, %hi(D_80937A5C) ## $at = 80930000 @@ -164,7 +164,7 @@ glabel func_80935A20 /* 09680 80935C50 C6100000 */ lwc1 $f16, 0x0000($s0) ## 00000E00 /* 09684 80935C54 460A3200 */ add.s $f8, $f6, $f10 /* 09688 80935C58 46104482 */ mul.s $f18, $f8, $f16 -/* 0968C 80935C5C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0968C 80935C5C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 09690 80935C60 E612000C */ swc1 $f18, 0x000C($s0) ## 00000E0C /* 09694 80935C64 3C014170 */ lui $at, 0x4170 ## $at = 41700000 @@ -173,7 +173,7 @@ glabel func_80935A20 /* 096A0 80935C70 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 /* 096A4 80935C74 46040182 */ mul.s $f6, $f0, $f4 /* 096A8 80935C78 460A3200 */ add.s $f8, $f6, $f10 -/* 096AC 80935C7C 0C03F66B */ jal Math_Rand_ZeroOne +/* 096AC 80935C7C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 096B0 80935C80 E6080010 */ swc1 $f8, 0x0010($s0) ## 00000E10 /* 096B4 80935C84 3C018093 */ lui $at, %hi(D_80937A64) ## $at = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935CDC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935CDC.s index 1f75a7ebbf..21f01a38c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935CDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935CDC.s @@ -17,21 +17,21 @@ glabel func_80935CDC /* 09748 80935D18 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 0974C 80935D1C 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 /* 09750 80935D20 A08E0196 */ sb $t6, 0x0196($a0) ## 00000196 -/* 09754 80935D24 0C01DE0D */ jal Math_Coss +/* 09754 80935D24 0C01DE0D */ jal Math_CosS ## coss? /* 09758 80935D28 848400B4 */ lh $a0, 0x00B4($a0) ## 000000B4 /* 0975C 80935D2C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 09760 80935D30 4481B000 */ mtc1 $at, $f22 ## $f22 = 50.00 /* 09764 80935D34 864400B6 */ lh $a0, 0x00B6($s2) ## 000000B6 /* 09768 80935D38 46160502 */ mul.s $f20, $f0, $f22 -/* 0976C 80935D3C 0C01DE0D */ jal Math_Coss +/* 0976C 80935D3C 0C01DE0D */ jal Math_CosS ## coss? /* 09770 80935D40 00000000 */ nop /* 09774 80935D44 46140102 */ mul.s $f4, $f0, $f20 /* 09778 80935D48 C6460024 */ lwc1 $f6, 0x0024($s2) ## 00000024 /* 0977C 80935D4C 46062200 */ add.s $f8, $f4, $f6 /* 09780 80935D50 E7A80078 */ swc1 $f8, 0x0078($sp) -/* 09784 80935D54 0C01DE1C */ jal Math_Sins +/* 09784 80935D54 0C01DE1C */ jal Math_SinS ## sins? /* 09788 80935D58 864400B4 */ lh $a0, 0x00B4($s2) ## 000000B4 /* 0978C 80935D5C 46160282 */ mul.s $f10, $f0, $f22 @@ -41,7 +41,7 @@ glabel func_80935CDC /* 0979C 80935D6C 46105480 */ add.s $f18, $f10, $f16 /* 097A0 80935D70 461E9101 */ sub.s $f4, $f18, $f30 /* 097A4 80935D74 E7A4007C */ swc1 $f4, 0x007C($sp) -/* 097A8 80935D78 0C01DE1C */ jal Math_Sins +/* 097A8 80935D78 0C01DE1C */ jal Math_SinS ## sins? /* 097AC 80935D7C 864400B6 */ lh $a0, 0x00B6($s2) ## 000000B6 /* 097B0 80935D80 46140182 */ mul.s $f6, $f0, $f20 @@ -70,19 +70,19 @@ glabel func_80935CDC /* 09808 80935DD8 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy /* 0980C 80935DDC 02802825 */ or $a1, $s4, $zero ## $a1 = FFFFFFF0 -/* 09810 80935DE0 0C03F66B */ jal Math_Rand_ZeroOne +/* 09810 80935DE0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 09814 80935DE4 A6130022 */ sh $s3, 0x0022($s0) ## 00000722 /* 09818 80935DE8 46140402 */ mul.s $f16, $f0, $f20 /* 0981C 80935DEC 4600848D */ trunc.w.s $f18, $f16 /* 09820 80935DF0 44189000 */ mfc1 $t8, $f18 -/* 09824 80935DF4 0C03F66B */ jal Math_Rand_ZeroOne +/* 09824 80935DF4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 09828 80935DF8 A6180018 */ sh $t8, 0x0018($s0) ## 00000718 /* 0982C 80935DFC 46140102 */ mul.s $f4, $f0, $f20 /* 09830 80935E00 4600218D */ trunc.w.s $f6, $f4 /* 09834 80935E04 44083000 */ mfc1 $t0, $f6 -/* 09838 80935E08 0C03F66B */ jal Math_Rand_ZeroOne +/* 09838 80935E08 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0983C 80935E0C A608001A */ sh $t0, 0x001A($s0) ## 0000071A /* 09840 80935E10 46140202 */ mul.s $f8, $f0, $f20 @@ -91,19 +91,19 @@ glabel func_80935CDC /* 0984C 80935E1C 4600B306 */ mov.s $f12, $f22 /* 09850 80935E20 4600428D */ trunc.w.s $f10, $f8 /* 09854 80935E24 440A5000 */ mfc1 $t2, $f10 -/* 09858 80935E28 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 09858 80935E28 0C00CFC8 */ jal Rand_CenteredFloat /* 0985C 80935E2C A60A001C */ sh $t2, 0x001C($s0) ## 0000071C -/* 09860 80935E30 0C03F66B */ jal Math_Rand_ZeroOne +/* 09860 80935E30 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 09864 80935E34 E600000C */ swc1 $f0, 0x000C($s0) ## 0000070C /* 09868 80935E38 461E0402 */ mul.s $f16, $f0, $f30 /* 0986C 80935E3C 4600B306 */ mov.s $f12, $f22 /* 09870 80935E40 46188480 */ add.s $f18, $f16, $f24 -/* 09874 80935E44 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 09874 80935E44 0C00CFC8 */ jal Rand_CenteredFloat /* 09878 80935E48 E6120010 */ swc1 $f18, 0x0010($s0) ## 00000710 -/* 0987C 80935E4C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0987C 80935E4C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 09880 80935E50 E6000014 */ swc1 $f0, 0x0014($s0) ## 00000714 /* 09884 80935E54 461A0102 */ mul.s $f4, $f0, $f26 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s index 7bccf26414..ec824ab0be 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s @@ -203,7 +203,7 @@ glabel BossTw_Init /* 00CC8 80939998 3C018095 */ lui $at, %hi(D_8094C858) ## $at = 80950000 /* 00CCC 8093999C E426C858 */ swc1 $f6, %lo(D_8094C858)($at) /* 00CD0 809399A0 3C018095 */ lui $at, %hi(D_8094AEC4) ## $at = 80950000 -/* 00CD4 809399A4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00CD4 809399A4 0C00CFBE */ jal Rand_ZeroFloat /* 00CD8 809399A8 C42CAEC4 */ lwc1 $f12, %lo(D_8094AEC4)($at) /* 00CDC 809399AC 444EF800 */ cfc1 $t6, $31 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Update.s index 6a3d18588c..a9cc2f774e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Update.s @@ -41,7 +41,7 @@ glabel BossTw_Update /* 07A70 80940740 44052000 */ mfc1 $a1, $f4 /* 07A74 80940744 4406B000 */ mfc1 $a2, $f22 /* 07A78 80940748 4407A000 */ mfc1 $a3, $f20 -/* 07A7C 8094074C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07A7C 8094074C 0C01E107 */ jal Math_ApproachF /* 07A80 80940750 00000000 */ nop /* 07A84 80940754 927807B0 */ lbu $t8, 0x07B0($s3) ## 000007B0 @@ -57,7 +57,7 @@ glabel BossTw_Update /* 07AAC 8094077C 460A4200 */ add.s $f8, $f8, $f10 .L80940780: /* 07AB0 80940780 44054000 */ mfc1 $a1, $f8 -/* 07AB4 80940784 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07AB4 80940784 0C01E107 */ jal Math_ApproachF /* 07AB8 80940788 00000000 */ nop /* 07ABC 8094078C 927907B1 */ lbu $t9, 0x07B1($s3) ## 000007B1 @@ -73,7 +73,7 @@ glabel BossTw_Update /* 07AE4 809407B4 46128400 */ add.s $f16, $f16, $f18 .L809407B8: /* 07AE8 809407B8 44058000 */ mfc1 $a1, $f16 -/* 07AEC 809407BC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07AEC 809407BC 0C01E107 */ jal Math_ApproachF /* 07AF0 809407C0 00000000 */ nop /* 07AF4 809407C4 866807B2 */ lh $t0, 0x07B2($s3) ## 000007B2 @@ -83,13 +83,13 @@ glabel BossTw_Update /* 07B04 809407D4 262401E0 */ addiu $a0, $s1, 0x01E0 ## $a0 = 000001E0 /* 07B08 809407D8 46802120 */ cvt.s.w $f4, $f4 /* 07B0C 809407DC 44052000 */ mfc1 $a1, $f4 -/* 07B10 809407E0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07B10 809407E0 0C01E107 */ jal Math_ApproachF /* 07B14 809407E4 00000000 */ nop /* 07B18 809407E8 4406B000 */ mfc1 $a2, $f22 /* 07B1C 809407EC 4407A000 */ mfc1 $a3, $f20 /* 07B20 809407F0 262401E4 */ addiu $a0, $s1, 0x01E4 ## $a0 = 000001E4 -/* 07B24 809407F4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07B24 809407F4 0C01E107 */ jal Math_ApproachF /* 07B28 809407F8 3C05447A */ lui $a1, 0x447A ## $a1 = 447A0000 /* 07B2C 809407FC 862D0156 */ lh $t5, 0x0156($s1) ## 00000156 @@ -259,7 +259,7 @@ glabel BossTw_Update /* 07D78 80940A48 314B001F */ andi $t3, $t2, 0x001F ## $t3 = 00000000 /* 07D7C 80940A4C 5560000C */ bnel $t3, $zero, .L80940A80 /* 07D80 80940A50 86220158 */ lh $v0, 0x0158($s1) ## 00000158 -/* 07D84 80940A54 0C03F66B */ jal Math_Rand_ZeroOne +/* 07D84 80940A54 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 07D88 80940A58 00000000 */ nop /* 07D8C 80940A5C 3C018095 */ lui $at, %hi(D_8094B014) ## $at = 80950000 @@ -329,35 +329,35 @@ glabel BossTw_Update /* 07E80 80940B50 8C590004 */ lw $t9, 0x0004($v0) ## 00000454 /* 07E84 80940B54 AE590004 */ sw $t9, 0x0004($s2) ## FFFFFFE8 /* 07E88 80940B58 8C480008 */ lw $t0, 0x0008($v0) ## 00000458 -/* 07E8C 80940B5C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 07E8C 80940B5C 0C00CFC8 */ jal Rand_CenteredFloat /* 07E90 80940B60 AE480008 */ sw $t0, 0x0008($s2) ## FFFFFFEC /* 07E94 80940B64 C7A60074 */ lwc1 $f6, 0x0074($sp) /* 07E98 80940B68 4600A306 */ mov.s $f12, $f20 /* 07E9C 80940B6C 46003200 */ add.s $f8, $f6, $f0 -/* 07EA0 80940B70 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 07EA0 80940B70 0C00CFC8 */ jal Rand_CenteredFloat /* 07EA4 80940B74 E7A80074 */ swc1 $f8, 0x0074($sp) /* 07EA8 80940B78 C7AA0078 */ lwc1 $f10, 0x0078($sp) /* 07EAC 80940B7C 4600A306 */ mov.s $f12, $f20 /* 07EB0 80940B80 46005400 */ add.s $f16, $f10, $f0 -/* 07EB4 80940B84 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 07EB4 80940B84 0C00CFC8 */ jal Rand_CenteredFloat /* 07EB8 80940B88 E7B00078 */ swc1 $f16, 0x0078($sp) /* 07EBC 80940B8C C7B2007C */ lwc1 $f18, 0x007C($sp) /* 07EC0 80940B90 E7B80060 */ swc1 $f24, 0x0060($sp) /* 07EC4 80940B94 4600B306 */ mov.s $f12, $f22 /* 07EC8 80940B98 46009100 */ add.s $f4, $f18, $f0 -/* 07ECC 80940B9C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 07ECC 80940B9C 0C00CFC8 */ jal Rand_CenteredFloat /* 07ED0 80940BA0 E7A4007C */ swc1 $f4, 0x007C($sp) /* 07ED4 80940BA4 E7A0005C */ swc1 $f0, 0x005C($sp) -/* 07ED8 80940BA8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 07ED8 80940BA8 0C00CFC8 */ jal Rand_CenteredFloat /* 07EDC 80940BAC 4600B306 */ mov.s $f12, $f22 /* 07EE0 80940BB0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 07EE4 80940BB4 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 07EE8 80940BB8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 07EE8 80940BB8 0C00CFBE */ jal Rand_ZeroFloat /* 07EEC 80940BBC E7A00064 */ swc1 $f0, 0x0064($sp) /* 07EF0 80940BC0 4600018D */ trunc.w.s $f6, $f0 @@ -402,35 +402,35 @@ glabel BossTw_Update /* 07F84 80940C54 8C580004 */ lw $t8, 0x0004($v0) ## 00000448 /* 07F88 80940C58 AE580004 */ sw $t8, 0x0004($s2) ## FFFFFFE8 /* 07F8C 80940C5C 8C590008 */ lw $t9, 0x0008($v0) ## 0000044C -/* 07F90 80940C60 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 07F90 80940C60 0C00CFC8 */ jal Rand_CenteredFloat /* 07F94 80940C64 AE590008 */ sw $t9, 0x0008($s2) ## FFFFFFEC /* 07F98 80940C68 C7B00074 */ lwc1 $f16, 0x0074($sp) /* 07F9C 80940C6C 4600A306 */ mov.s $f12, $f20 /* 07FA0 80940C70 46008480 */ add.s $f18, $f16, $f0 -/* 07FA4 80940C74 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 07FA4 80940C74 0C00CFC8 */ jal Rand_CenteredFloat /* 07FA8 80940C78 E7B20074 */ swc1 $f18, 0x0074($sp) /* 07FAC 80940C7C C7A40078 */ lwc1 $f4, 0x0078($sp) /* 07FB0 80940C80 4600A306 */ mov.s $f12, $f20 /* 07FB4 80940C84 46002180 */ add.s $f6, $f4, $f0 -/* 07FB8 80940C88 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 07FB8 80940C88 0C00CFC8 */ jal Rand_CenteredFloat /* 07FBC 80940C8C E7A60078 */ swc1 $f6, 0x0078($sp) /* 07FC0 80940C90 C7A8007C */ lwc1 $f8, 0x007C($sp) /* 07FC4 80940C94 E7B80060 */ swc1 $f24, 0x0060($sp) /* 07FC8 80940C98 4600B306 */ mov.s $f12, $f22 /* 07FCC 80940C9C 46004280 */ add.s $f10, $f8, $f0 -/* 07FD0 80940CA0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 07FD0 80940CA0 0C00CFC8 */ jal Rand_CenteredFloat /* 07FD4 80940CA4 E7AA007C */ swc1 $f10, 0x007C($sp) /* 07FD8 80940CA8 E7A0005C */ swc1 $f0, 0x005C($sp) -/* 07FDC 80940CAC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 07FDC 80940CAC 0C00CFC8 */ jal Rand_CenteredFloat /* 07FE0 80940CB0 4600B306 */ mov.s $f12, $f22 /* 07FE4 80940CB4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 07FE8 80940CB8 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 07FEC 80940CBC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 07FEC 80940CBC 0C00CFBE */ jal Rand_ZeroFloat /* 07FF0 80940CC0 E7A00064 */ swc1 $f0, 0x0064($sp) /* 07FF4 80940CC4 4600040D */ trunc.w.s $f16, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938CD0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938CD0.s index 4f75d340d4..e0795564d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938CD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938CD0.s @@ -43,7 +43,7 @@ glabel func_80938CD0 /* 000A0 80938D70 A46C002C */ sh $t4, 0x002C($v1) ## 0001002C /* 000A4 80938D74 46062203 */ div.s $f8, $f4, $f6 /* 000A8 80938D78 E4680034 */ swc1 $f8, 0x0034($v1) ## 00010034 -/* 000AC 80938D7C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 000AC 80938D7C 0C00CFBE */ jal Rand_ZeroFloat /* 000B0 80938D80 AFA30020 */ sw $v1, 0x0020($sp) /* 000B4 80938D84 4600028D */ trunc.w.s $f10, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938DC4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938DC4.s index 46c58cf94b..57a35ece97 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938DC4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938DC4.s @@ -48,7 +48,7 @@ glabel func_80938DC4 /* 001A8 80938E78 A46C002E */ sh $t4, 0x002E($v1) ## 0001002E /* 001AC 80938E7C 87AD0042 */ lh $t5, 0x0042($sp) /* 001B0 80938E80 A46D002C */ sh $t5, 0x002C($v1) ## 0001002C -/* 001B4 80938E84 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 001B4 80938E84 0C00CFBE */ jal Rand_ZeroFloat /* 001B8 80938E88 AFA30020 */ sw $v1, 0x0020($sp) /* 001BC 80938E8C 4600028D */ trunc.w.s $f10, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938EC0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938EC0.s index b4e51a5682..3b15bbf14d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938EC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80938EC0.s @@ -60,7 +60,7 @@ glabel func_80938EC0 /* 002B4 80938F84 87AE0032 */ lh $t6, 0x0032($sp) /* 002B8 80938F88 A46E002C */ sh $t6, 0x002C($v1) ## 0001002C /* 002BC 80938F8C AFA30018 */ sw $v1, 0x0018($sp) -/* 002C0 80938F90 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 002C0 80938F90 0C00CFBE */ jal Rand_ZeroFloat /* 002C4 80938F94 C42CAEAC */ lwc1 $f12, %lo(D_8094AEAC)($at) /* 002C8 80938F98 8FA30018 */ lw $v1, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939070.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939070.s index 08377ff03c..fa649ee6e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939070.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939070.s @@ -40,7 +40,7 @@ glabel func_80939070 /* 00434 80939104 A4400030 */ sh $zero, 0x0030($v0) ## 00010030 /* 00438 80939108 A440002C */ sh $zero, 0x002C($v0) ## 0001002C /* 0043C 8093910C A44C002E */ sh $t4, 0x002E($v0) ## 0001002E -/* 00440 80939110 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00440 80939110 0C00CFBE */ jal Rand_ZeroFloat /* 00444 80939114 AFA20018 */ sw $v0, 0x0018($sp) /* 00448 80939118 4600020D */ trunc.w.s $f8, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939148.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939148.s index b1350bcef9..a32c1d6dc6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939148.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939148.s @@ -51,14 +51,14 @@ glabel func_80939148 /* 00524 809391F4 C7A8002C */ lwc1 $f8, 0x002C($sp) /* 00528 809391F8 E4680038 */ swc1 $f8, 0x0038($v1) ## 00010038 /* 0052C 809391FC AFA30018 */ sw $v1, 0x0018($sp) -/* 00530 80939200 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00530 80939200 0C00CFBE */ jal Rand_ZeroFloat /* 00534 80939204 C42CAEB0 */ lwc1 $f12, %lo(D_8094AEB0)($at) /* 00538 80939208 8FA30018 */ lw $v1, 0x0018($sp) /* 0053C 8093920C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 00540 80939210 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 /* 00544 80939214 E460003C */ swc1 $f0, 0x003C($v1) ## 0000003C -/* 00548 80939218 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00548 80939218 0C00CFBE */ jal Rand_ZeroFloat /* 0054C 8093921C A460002C */ sh $zero, 0x002C($v1) ## 0000002C /* 00550 80939220 4600028D */ trunc.w.s $f10, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939250.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939250.s index c9f44d7bd3..752ac5ce56 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939250.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939250.s @@ -44,7 +44,7 @@ glabel func_80939250 /* 00624 809392F4 A44C002E */ sh $t4, 0x002E($v0) ## 0001002E /* 00628 809392F8 87AD003A */ lh $t5, 0x003A($sp) /* 0062C 809392FC A44D002C */ sh $t5, 0x002C($v0) ## 0001002C -/* 00630 80939300 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00630 80939300 0C00CFBE */ jal Rand_ZeroFloat /* 00634 80939304 AFA20018 */ sw $v0, 0x0018($sp) /* 00638 80939308 4600040D */ trunc.w.s $f16, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939338.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939338.s index 6860ba377f..399fd704ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939338.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939338.s @@ -91,7 +91,7 @@ glabel func_80939338 /* 007A4 80939474 A614002E */ sh $s4, 0x002E($s0) ## 0000002E /* 007A8 80939478 A6000030 */ sh $zero, 0x0030($s0) ## 00000030 /* 007AC 8093947C A617002C */ sh $s7, 0x002C($s0) ## 0000002C -/* 007B0 80939480 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 007B0 80939480 0C00CFBE */ jal Rand_ZeroFloat /* 007B4 80939484 AE0D0024 */ sw $t5, 0x0024($s0) ## 00000024 /* 007B8 80939488 4600040D */ trunc.w.s $f16, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809394FC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809394FC.s index e875be36f4..76c79fe71d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809394FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809394FC.s @@ -91,7 +91,7 @@ glabel func_809394FC /* 00968 80939638 A614002E */ sh $s4, 0x002E($s0) ## 0000002E /* 0096C 8093963C A6000030 */ sh $zero, 0x0030($s0) ## 00000030 /* 00970 80939640 A617002C */ sh $s7, 0x002C($s0) ## 0000002C -/* 00974 80939644 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00974 80939644 0C00CFBE */ jal Rand_ZeroFloat /* 00978 80939648 AE0D0024 */ sw $t5, 0x0024($s0) ## 00000024 /* 0097C 8093964C 4600040D */ trunc.w.s $f16, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939F88.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939F88.s index c5fc87402e..b98af58f40 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939F88.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80939F88.s @@ -15,7 +15,7 @@ glabel func_80939F88 /* 012E8 80939FB8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 012EC 80939FBC 44060000 */ mfc1 $a2, $f0 /* 012F0 80939FC0 44070000 */ mfc1 $a3, $f0 -/* 012F4 80939FC4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 012F4 80939FC4 0C01E107 */ jal Math_ApproachF /* 012F8 80939FC8 00000000 */ nop /* 012FC 80939FCC C60404C8 */ lwc1 $f4, 0x04C8($s0) ## 000004C8 @@ -26,7 +26,7 @@ glabel func_80939F88 /* 01310 80939FE0 44073000 */ mfc1 $a3, $f6 /* 01314 80939FE4 00000000 */ nop /* 01318 80939FE8 00073C00 */ sll $a3, $a3, 16 -/* 0131C 80939FEC 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0131C 80939FEC 0C01E1EF */ jal Math_ApproachS /* 01320 80939FF0 00073C03 */ sra $a3, $a3, 16 /* 01324 80939FF4 C60804C8 */ lwc1 $f8, 0x04C8($s0) ## 000004C8 @@ -37,13 +37,13 @@ glabel func_80939F88 /* 01338 8093A008 44075000 */ mfc1 $a3, $f10 /* 0133C 8093A00C 00000000 */ nop /* 01340 8093A010 00073C00 */ sll $a3, $a3, 16 -/* 01344 8093A014 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01344 8093A014 0C01E1EF */ jal Math_ApproachS /* 01348 8093A018 00073C03 */ sra $a3, $a3, 16 /* 0134C 8093A01C 260404C8 */ addiu $a0, $s0, 0x04C8 ## $a0 = 000004C8 /* 01350 8093A020 3C054580 */ lui $a1, 0x4580 ## $a1 = 45800000 /* 01354 8093A024 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01358 8093A028 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01358 8093A028 0C01E107 */ jal Math_ApproachF /* 0135C 8093A02C 3C074348 */ lui $a3, 0x4348 ## $a3 = 43480000 /* 01360 8093A030 0C00B642 */ jal func_8002D908 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s index c7951e9e0a..0f01bf83f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s @@ -26,7 +26,7 @@ glabel func_8093A0A8 /* 01424 8093A0F4 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 01428 8093A0F8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0142C 8093A0FC E484FF60 */ swc1 $f4, -0x00A0($a0) ## 000004C8 -/* 01430 8093A100 0C03F66B */ jal Math_Rand_ZeroOne +/* 01430 8093A100 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01434 8093A104 00000000 */ nop /* 01438 8093A108 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -44,7 +44,7 @@ glabel func_8093A0A8 /* 01468 8093A138 152A001F */ bne $t1, $t2, .L8093A1B8 /* 0146C 8093A13C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 01470 8093A140 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 -/* 01474 8093A144 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01474 8093A144 0C00CFC8 */ jal Rand_CenteredFloat /* 01478 8093A148 00000000 */ nop /* 0147C 8093A14C 8FAB0024 */ lw $t3, 0x0024($sp) @@ -52,7 +52,7 @@ glabel func_8093A0A8 /* 01484 8093A154 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 /* 01488 8093A158 C5680024 */ lwc1 $f8, 0x0024($t3) ## 00000024 /* 0148C 8093A15C 46080280 */ add.s $f10, $f0, $f8 -/* 01490 8093A160 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01490 8093A160 0C00CFBE */ jal Rand_ZeroFloat /* 01494 8093A164 E60A04B0 */ swc1 $f10, 0x04B0($s0) ## 000004B0 /* 01498 8093A168 3C0143AA */ lui $at, 0x43AA ## $at = 43AA0000 @@ -60,7 +60,7 @@ glabel func_8093A0A8 /* 014A0 8093A170 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 014A4 8093A174 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 /* 014A8 8093A178 46100480 */ add.s $f18, $f0, $f16 -/* 014AC 8093A17C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 014AC 8093A17C 0C00CFC8 */ jal Rand_CenteredFloat /* 014B0 8093A180 E61204B4 */ swc1 $f18, 0x04B4($s0) ## 000004B4 /* 014B4 8093A184 8FAC0024 */ lw $t4, 0x0024($sp) @@ -68,7 +68,7 @@ glabel func_8093A0A8 /* 014BC 8093A18C 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 014C0 8093A190 C584002C */ lwc1 $f4, 0x002C($t4) ## 0000002C /* 014C4 8093A194 46040180 */ add.s $f6, $f0, $f4 -/* 014C8 8093A198 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 014C8 8093A198 0C00CFBE */ jal Rand_ZeroFloat /* 014CC 8093A19C E60604B8 */ swc1 $f6, 0x04B8($s0) ## 000004B8 /* 014D0 8093A1A0 4600020D */ trunc.w.s $f8, $f0 @@ -78,7 +78,7 @@ glabel func_8093A0A8 /* 014E0 8093A1B0 10000039 */ beq $zero, $zero, .L8093A298 /* 014E4 8093A1B4 A6190178 */ sh $t9, 0x0178($s0) ## 00000178 .L8093A1B8: -/* 014E8 8093A1B8 0C03F66B */ jal Math_Rand_ZeroOne +/* 014E8 8093A1B8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 014EC 8093A1BC 00000000 */ nop /* 014F0 8093A1C0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -90,12 +90,12 @@ glabel func_8093A0A8 /* 01508 8093A1D8 00000000 */ nop /* 0150C 8093A1DC 3C014448 */ lui $at, 0x4448 ## $at = 44480000 /* 01510 8093A1E0 44816000 */ mtc1 $at, $f12 ## $f12 = 800.00 -/* 01514 8093A1E4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01514 8093A1E4 0C00CFC8 */ jal Rand_CenteredFloat /* 01518 8093A1E8 00000000 */ nop /* 0151C 8093A1EC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 01520 8093A1F0 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 -/* 01524 8093A1F4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01524 8093A1F4 0C00CFBE */ jal Rand_ZeroFloat /* 01528 8093A1F8 E60004B0 */ swc1 $f0, 0x04B0($s0) ## 000004B0 /* 0152C 8093A1FC 3C0143AA */ lui $at, 0x43AA ## $at = 43AA0000 @@ -103,12 +103,12 @@ glabel func_8093A0A8 /* 01534 8093A204 3C014448 */ lui $at, 0x4448 ## $at = 44480000 /* 01538 8093A208 44816000 */ mtc1 $at, $f12 ## $f12 = 800.00 /* 0153C 8093A20C 46100480 */ add.s $f18, $f0, $f16 -/* 01540 8093A210 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01540 8093A210 0C00CFC8 */ jal Rand_CenteredFloat /* 01544 8093A214 E61204B4 */ swc1 $f18, 0x04B4($s0) ## 000004B4 /* 01548 8093A218 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 0154C 8093A21C 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 01550 8093A220 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01550 8093A220 0C00CFBE */ jal Rand_ZeroFloat /* 01554 8093A224 E60004B8 */ swc1 $f0, 0x04B8($s0) ## 000004B8 /* 01558 8093A228 4600010D */ trunc.w.s $f4, $f0 @@ -118,7 +118,7 @@ glabel func_8093A0A8 /* 01568 8093A238 10000017 */ beq $zero, $zero, .L8093A298 /* 0156C 8093A23C A60C0178 */ sh $t4, 0x0178($s0) ## 00000178 .L8093A240: -/* 01570 8093A240 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01570 8093A240 0C00CFBE */ jal Rand_ZeroFloat /* 01574 8093A244 C42CAEC8 */ lwc1 $f12, %lo(D_8094AEC8)($at) /* 01578 8093A248 4600018D */ trunc.w.s $f6, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A2AC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A2AC.s index 2972d2f6b4..6f558cae06 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A2AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A2AC.s @@ -17,7 +17,7 @@ glabel func_8093A2AC /* 015F8 8093A2C8 260404D0 */ addiu $a0, $s0, 0x04D0 ## $a0 = 000004D0 /* 015FC 8093A2CC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 01600 8093A2D0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01604 8093A2D4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01604 8093A2D4 0C01E107 */ jal Math_ApproachF /* 01608 8093A2D8 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 0160C 8093A2DC 0C02927F */ jal SkelAnime_FrameUpdateMatrix @@ -34,7 +34,7 @@ glabel func_8093A2AC /* 01634 8093A304 C60404B8 */ lwc1 $f4, 0x04B8($s0) ## 000004B8 /* 01638 8093A308 E7AC003C */ swc1 $f12, 0x003C($sp) /* 0163C 8093A30C 46062381 */ sub.s $f14, $f4, $f6 -/* 01640 8093A310 0C03F494 */ jal Math_atan2f +/* 01640 8093A310 0C03F494 */ jal Math_FAtan2F /* 01644 8093A314 E7AE0034 */ swc1 $f14, 0x0034($sp) /* 01648 8093A318 3C018095 */ lui $at, %hi(D_8094AECC) ## $at = 80950000 /* 0164C 8093A31C C428AECC */ lwc1 $f8, %lo(D_8094AECC)($at) @@ -54,7 +54,7 @@ glabel func_8093A2AC /* 01684 8093A354 46000384 */ sqrt.s $f14, $f0 /* 01688 8093A358 468021A0 */ cvt.s.w $f6, $f4 /* 0168C 8093A35C E7AE0028 */ swc1 $f14, 0x0028($sp) -/* 01690 8093A360 0C03F494 */ jal Math_atan2f +/* 01690 8093A360 0C03F494 */ jal Math_FAtan2F /* 01694 8093A364 E7A6002C */ swc1 $f6, 0x002C($sp) /* 01698 8093A368 3C018095 */ lui $at, %hi(D_8094AED0) ## $at = 80950000 /* 0169C 8093A36C C432AED0 */ lwc1 $f18, %lo(D_8094AED0)($at) @@ -78,7 +78,7 @@ glabel func_8093A2AC /* 016E4 8093A3B4 00052C00 */ sll $a1, $a1, 16 /* 016E8 8093A3B8 00052C03 */ sra $a1, $a1, 16 /* 016EC 8093A3BC 00073C00 */ sll $a3, $a3, 16 -/* 016F0 8093A3C0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 016F0 8093A3C0 0C01E1EF */ jal Math_ApproachS /* 016F4 8093A3C4 00073C03 */ sra $a3, $a3, 16 /* 016F8 8093A3C8 C7A6002C */ lwc1 $f6, 0x002C($sp) @@ -93,7 +93,7 @@ glabel func_8093A2AC /* 0171C 8093A3EC 00052C03 */ sra $a1, $a1, 16 /* 01720 8093A3F0 00073C00 */ sll $a3, $a3, 16 /* 01724 8093A3F4 00073C03 */ sra $a3, $a3, 16 -/* 01728 8093A3F8 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01728 8093A3F8 0C01E1EF */ jal Math_ApproachS /* 0172C 8093A3FC AFA50024 */ sw $a1, 0x0024($sp) /* 01730 8093A400 C60404C8 */ lwc1 $f4, 0x04C8($s0) ## 000004C8 @@ -104,7 +104,7 @@ glabel func_8093A2AC /* 01744 8093A414 44073000 */ mfc1 $a3, $f6 /* 01748 8093A418 00000000 */ nop /* 0174C 8093A41C 00073C00 */ sll $a3, $a3, 16 -/* 01750 8093A420 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01750 8093A420 0C01E1EF */ jal Math_ApproachS /* 01754 8093A424 00073C03 */ sra $a3, $a3, 16 /* 01758 8093A428 C7A80030 */ lwc1 $f8, 0x0030($sp) @@ -118,19 +118,19 @@ glabel func_8093A2AC /* 01778 8093A448 00052C00 */ sll $a1, $a1, 16 /* 0177C 8093A44C 00052C03 */ sra $a1, $a1, 16 /* 01780 8093A450 00073C00 */ sll $a3, $a3, 16 -/* 01784 8093A454 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01784 8093A454 0C01E1EF */ jal Math_ApproachS /* 01788 8093A458 00073C03 */ sra $a3, $a3, 16 /* 0178C 8093A45C 260404C8 */ addiu $a0, $s0, 0x04C8 ## $a0 = 000004C8 /* 01790 8093A460 3C054580 */ lui $a1, 0x4580 ## $a1 = 45800000 /* 01794 8093A464 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01798 8093A468 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01798 8093A468 0C01E107 */ jal Math_ApproachF /* 0179C 8093A46C 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 017A0 8093A470 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 017A4 8093A474 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 017A8 8093A478 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 017AC 8093A47C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 017AC 8093A47C 0C01E107 */ jal Math_ApproachF /* 017B0 8093A480 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 017B4 8093A484 0C00B642 */ jal func_8002D908 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A5C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A5C4.s index e512ce9b1a..5353fbd371 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A5C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A5C4.s @@ -46,24 +46,24 @@ glabel func_8093A5C4 /* 01978 8093A648 27B40098 */ addiu $s4, $sp, 0x0098 ## $s4 = FFFFFFE0 /* 0197C 8093A64C 27B5008C */ addiu $s5, $sp, 0x008C ## $s5 = FFFFFFD4 .L8093A650: -/* 01980 8093A650 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01980 8093A650 0C00CFC8 */ jal Rand_CenteredFloat /* 01984 8093A654 4600A306 */ mov.s $f12, $f20 /* 01988 8093A658 E7A00098 */ swc1 $f0, 0x0098($sp) -/* 0198C 8093A65C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0198C 8093A65C 0C00CFBE */ jal Rand_ZeroFloat /* 01990 8093A660 4600C306 */ mov.s $f12, $f24 /* 01994 8093A664 E7A0009C */ swc1 $f0, 0x009C($sp) -/* 01998 8093A668 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01998 8093A668 0C00CFC8 */ jal Rand_CenteredFloat /* 0199C 8093A66C 4600A306 */ mov.s $f12, $f20 /* 019A0 8093A670 E7A000A0 */ swc1 $f0, 0x00A0($sp) /* 019A4 8093A674 E7BA0090 */ swc1 $f26, 0x0090($sp) -/* 019A8 8093A678 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 019A8 8093A678 0C00CFC8 */ jal Rand_CenteredFloat /* 019AC 8093A67C 4600B306 */ mov.s $f12, $f22 /* 019B0 8093A680 E7A0008C */ swc1 $f0, 0x008C($sp) -/* 019B4 8093A684 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 019B4 8093A684 0C00CFC8 */ jal Rand_CenteredFloat /* 019B8 8093A688 4600B306 */ mov.s $f12, $f22 /* 019BC 8093A68C E7A00094 */ swc1 $f0, 0x0094($sp) @@ -73,7 +73,7 @@ glabel func_8093A5C4 /* 019CC 8093A69C 8E4E0004 */ lw $t6, 0x0004($s2) ## 00000504 /* 019D0 8093A6A0 AE2E0004 */ sw $t6, 0x0004($s1) ## FFFFFFF0 /* 019D4 8093A6A4 8E4F0008 */ lw $t7, 0x0008($s2) ## 00000508 -/* 019D8 8093A6A8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 019D8 8093A6A8 0C00CFBE */ jal Rand_ZeroFloat /* 019DC 8093A6AC AE2F0008 */ sw $t7, 0x0008($s1) ## FFFFFFF4 /* 019E0 8093A6B0 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A940.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A940.s index bad62ef936..1d8b057005 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A940.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A940.s @@ -101,7 +101,7 @@ glabel func_8093A940 /* 01DF8 8093AAC8 15600012 */ bne $t3, $zero, .L8093AB14 .L8093AACC: /* 01DFC 8093AACC 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 01E00 8093AAD0 0C01DF64 */ jal Math_Rand_S16Offset +/* 01E00 8093AAD0 0C01DF64 */ jal Rand_S16Offset /* 01E04 8093AAD4 240500C8 */ addiu $a1, $zero, 0x00C8 ## $a1 = 000000C8 /* 01E08 8093AAD8 02306021 */ addu $t4, $s1, $s0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s index 9c04090116..0e9fa110fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s @@ -41,7 +41,7 @@ glabel func_8093B1AC /* 0252C 8093B1FC AFAF0120 */ sw $t7, 0x0120($sp) /* 02530 8093B200 8EA70068 */ lw $a3, 0x0068($s5) ## 00000068 /* 02534 8093B204 3C0543C8 */ lui $a1, 0x43C8 ## $a1 = 43C80000 -/* 02538 8093B208 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02538 8093B208 0C01E107 */ jal Math_ApproachF /* 0253C 8093B20C 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 02540 8093B210 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -49,7 +49,7 @@ glabel func_8093B1AC /* 02548 8093B218 26A40068 */ addiu $a0, $s5, 0x0068 ## $a0 = 00000068 /* 0254C 8093B21C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02550 8093B220 4405A000 */ mfc1 $a1, $f20 -/* 02554 8093B224 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02554 8093B224 0C01E107 */ jal Math_ApproachF /* 02558 8093B228 3C073E80 */ lui $a3, 0x3E80 ## $a3 = 3E800000 /* 0255C 8093B22C 26A40568 */ addiu $a0, $s5, 0x0568 ## $a0 = 00000568 @@ -71,7 +71,7 @@ glabel func_8093B1AC /* 02598 8093B268 44079000 */ mfc1 $a3, $f18 /* 0259C 8093B26C 00000000 */ nop /* 025A0 8093B270 00073C00 */ sll $a3, $a3, 16 -/* 025A4 8093B274 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 025A4 8093B274 0C01E1EF */ jal Math_ApproachS /* 025A8 8093B278 00073C03 */ sra $a3, $a3, 16 /* 025AC 8093B27C 8FA30124 */ lw $v1, 0x0124($sp) @@ -97,27 +97,27 @@ glabel func_8093B1AC /* 025FC 8093B2CC 26A404B0 */ addiu $a0, $s5, 0x04B0 ## $a0 = 000004B0 /* 02600 8093B2D0 8C6509BC */ lw $a1, 0x09BC($v1) ## 000009BC /* 02604 8093B2D4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02608 8093B2D8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02608 8093B2D8 0C01E107 */ jal Math_ApproachF /* 0260C 8093B2DC 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 /* 02610 8093B2E0 8FAC0124 */ lw $t4, 0x0124($sp) /* 02614 8093B2E4 26A404B4 */ addiu $a0, $s5, 0x04B4 ## $a0 = 000004B4 /* 02618 8093B2E8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0261C 8093B2EC 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 -/* 02620 8093B2F0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02620 8093B2F0 0C01E107 */ jal Math_ApproachF /* 02624 8093B2F4 8D8509C0 */ lw $a1, 0x09C0($t4) ## 000009C0 /* 02628 8093B2F8 8FAD0124 */ lw $t5, 0x0124($sp) /* 0262C 8093B2FC 26A404B8 */ addiu $a0, $s5, 0x04B8 ## $a0 = 000004B8 /* 02630 8093B300 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02634 8093B304 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 -/* 02638 8093B308 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02638 8093B308 0C01E107 */ jal Math_ApproachF /* 0263C 8093B30C 8DA509C4 */ lw $a1, 0x09C4($t5) ## 000009C4 /* 02640 8093B310 10000015 */ beq $zero, $zero, .L8093B368 /* 02644 8093B314 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 .L8093B318: -/* 02648 8093B318 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02648 8093B318 0C01E107 */ jal Math_ApproachF /* 0264C 8093B31C 8C650024 */ lw $a1, 0x0024($v1) ## 00000024 /* 02650 8093B320 8FAE0124 */ lw $t6, 0x0124($sp) @@ -129,14 +129,14 @@ glabel func_8093B1AC /* 02668 8093B338 46062200 */ add.s $f8, $f4, $f6 /* 0266C 8093B33C 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 /* 02670 8093B340 44054000 */ mfc1 $a1, $f8 -/* 02674 8093B344 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02674 8093B344 0C01E107 */ jal Math_ApproachF /* 02678 8093B348 00000000 */ nop /* 0267C 8093B34C 8FAF0124 */ lw $t7, 0x0124($sp) /* 02680 8093B350 26A404B8 */ addiu $a0, $s5, 0x04B8 ## $a0 = 000004B8 /* 02684 8093B354 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02688 8093B358 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 -/* 0268C 8093B35C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0268C 8093B35C 0C01E107 */ jal Math_ApproachF /* 02690 8093B360 8DE5002C */ lw $a1, 0x002C($t7) ## 0000002C /* 02694 8093B364 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 @@ -161,13 +161,13 @@ glabel func_8093B1AC /* 026DC 8093B3AC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 026E0 8093B3B0 46043200 */ add.s $f8, $f6, $f4 /* 026E4 8093B3B4 E6A804EC */ swc1 $f8, 0x04EC($s5) ## 000004EC -/* 026E8 8093B3B8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 026E8 8093B3B8 0C01E107 */ jal Math_ApproachF /* 026EC 8093B3BC AFA4006C */ sw $a0, 0x006C($sp) /* 026F0 8093B3C0 26A404F0 */ addiu $a0, $s5, 0x04F0 ## $a0 = 000004F0 /* 026F4 8093B3C4 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 /* 026F8 8093B3C8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 026FC 8093B3CC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 026FC 8093B3CC 0C01E107 */ jal Math_ApproachF /* 02700 8093B3D0 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 02704 8093B3D4 86A2017A */ lh $v0, 0x017A($s5) ## 0000017A @@ -222,22 +222,22 @@ glabel func_8093B1AC /* 027B4 8093B484 C4440454 */ lwc1 $f4, 0x0454($v0) ## 00000454 /* 027B8 8093B488 E7A40110 */ swc1 $f4, 0x0110($sp) /* 027BC 8093B48C C4480458 */ lwc1 $f8, 0x0458($v0) ## 00000458 -/* 027C0 8093B490 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 027C0 8093B490 0C00CFC8 */ jal Rand_CenteredFloat /* 027C4 8093B494 E7A80114 */ swc1 $f8, 0x0114($sp) /* 027C8 8093B498 E7A00100 */ swc1 $f0, 0x0100($sp) -/* 027CC 8093B49C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 027CC 8093B49C 0C00CFC8 */ jal Rand_CenteredFloat /* 027D0 8093B4A0 4600A306 */ mov.s $f12, $f20 /* 027D4 8093B4A4 E7A00104 */ swc1 $f0, 0x0104($sp) -/* 027D8 8093B4A8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 027D8 8093B4A8 0C00CFC8 */ jal Rand_CenteredFloat /* 027DC 8093B4AC 4600A306 */ mov.s $f12, $f20 /* 027E0 8093B4B0 E7A00108 */ swc1 $f0, 0x0108($sp) /* 027E4 8093B4B4 E7B600F4 */ swc1 $f22, 0x00F4($sp) /* 027E8 8093B4B8 E7B600F8 */ swc1 $f22, 0x00F8($sp) /* 027EC 8093B4BC E7B600FC */ swc1 $f22, 0x00FC($sp) -/* 027F0 8093B4C0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 027F0 8093B4C0 0C00CFBE */ jal Rand_ZeroFloat /* 027F4 8093B4C4 4600A306 */ mov.s $f12, $f20 /* 027F8 8093B4C8 46180280 */ add.s $f10, $f0, $f24 @@ -272,13 +272,13 @@ glabel func_8093B1AC /* 02868 8093B538 26A404D4 */ addiu $a0, $s5, 0x04D4 ## $a0 = 000004D4 /* 0286C 8093B53C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02870 8093B540 4407D000 */ mfc1 $a3, $f26 -/* 02874 8093B544 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02874 8093B544 0C01E107 */ jal Math_ApproachF /* 02878 8093B548 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0287C 8093B54C 8FA4006C */ lw $a0, 0x006C($sp) /* 02880 8093B550 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02884 8093B554 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02888 8093B558 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02888 8093B558 0C01E107 */ jal Math_ApproachF /* 0288C 8093B55C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 02890 8093B560 10000010 */ beq $zero, $zero, .L8093B5A4 @@ -286,7 +286,7 @@ glabel func_8093B1AC .L8093B568: /* 02898 8093B568 4405D000 */ mfc1 $a1, $f26 /* 0289C 8093B56C 4407A000 */ mfc1 $a3, $f20 -/* 028A0 8093B570 0C01E107 */ jal Math_SmoothScaleMaxF +/* 028A0 8093B570 0C01E107 */ jal Math_ApproachF /* 028A4 8093B574 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 028A8 8093B578 86B8001C */ lh $t8, 0x001C($s5) ## 0000001C @@ -315,13 +315,13 @@ glabel func_8093B1AC /* 028F4 8093B5C4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 028F8 8093B5C8 26A404E0 */ addiu $a0, $s5, 0x04E0 ## $a0 = 000004E0 /* 028FC 8093B5CC 46049200 */ add.s $f8, $f18, $f4 -/* 02900 8093B5D0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02900 8093B5D0 0C01E107 */ jal Math_ApproachF /* 02904 8093B5D4 E6A804E8 */ swc1 $f8, 0x04E8($s5) ## 000004E8 /* 02908 8093B5D8 26A404E4 */ addiu $a0, $s5, 0x04E4 ## $a0 = 000004E4 /* 0290C 8093B5DC 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 /* 02910 8093B5E0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02914 8093B5E4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02914 8093B5E4 0C01E107 */ jal Math_ApproachF /* 02918 8093B5E8 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 .L8093B5EC: @@ -420,7 +420,7 @@ glabel func_8093B1AC /* 02A68 8093B738 46082601 */ sub.s $f24, $f4, $f8 /* 02A6C 8093B73C 4600A306 */ mov.s $f12, $f20 /* 02A70 8093B740 46123681 */ sub.s $f26, $f6, $f18 -/* 02A74 8093B744 0C03F494 */ jal Math_atan2f +/* 02A74 8093B744 0C03F494 */ jal Math_FAtan2F /* 02A78 8093B748 4600C386 */ mov.s $f14, $f24 /* 02A7C 8093B74C 4614A082 */ mul.s $f2, $f20, $f20 /* 02A80 8093B750 E6A0051C */ swc1 $f0, 0x051C($s5) ## 0000051C @@ -429,7 +429,7 @@ glabel func_8093B1AC /* 02A8C 8093B75C E7A20074 */ swc1 $f2, 0x0074($sp) /* 02A90 8093B760 46101000 */ add.s $f0, $f2, $f16 /* 02A94 8093B764 E7B00070 */ swc1 $f16, 0x0070($sp) -/* 02A98 8093B768 0C03F494 */ jal Math_atan2f +/* 02A98 8093B768 0C03F494 */ jal Math_FAtan2F /* 02A9C 8093B76C 46000384 */ sqrt.s $f14, $f0 /* 02AA0 8093B770 86A204FC */ lh $v0, 0x04FC($s5) ## 000004FC /* 02AA4 8093B774 46000287 */ neg.s $f10, $f0 @@ -473,15 +473,15 @@ glabel func_8093B1AC /* 02B34 8093B804 8FB20124 */ lw $s2, 0x0124($sp) /* 02B38 8093B808 265209BC */ addiu $s2, $s2, 0x09BC ## $s2 = 00000978 .L8093B80C: -/* 02B3C 8093B80C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02B3C 8093B80C 0C00CFC8 */ jal Rand_CenteredFloat /* 02B40 8093B810 4600A306 */ mov.s $f12, $f20 /* 02B44 8093B814 E7A000D8 */ swc1 $f0, 0x00D8($sp) -/* 02B48 8093B818 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02B48 8093B818 0C00CFC8 */ jal Rand_CenteredFloat /* 02B4C 8093B81C 4600A306 */ mov.s $f12, $f20 /* 02B50 8093B820 E7A000DC */ swc1 $f0, 0x00DC($sp) -/* 02B54 8093B824 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02B54 8093B824 0C00CFC8 */ jal Rand_CenteredFloat /* 02B58 8093B828 4600A306 */ mov.s $f12, $f20 /* 02B5C 8093B82C E7A000E0 */ swc1 $f0, 0x00E0($sp) @@ -492,7 +492,7 @@ glabel func_8093B1AC /* 02B70 8093B840 8E4E0004 */ lw $t6, 0x0004($s2) ## 0000097C /* 02B74 8093B844 AE2E0004 */ sw $t6, 0x0004($s1) ## FFFFFF98 /* 02B78 8093B848 8E4F0008 */ lw $t7, 0x0008($s2) ## 00000980 -/* 02B7C 8093B84C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 02B7C 8093B84C 0C00CFBE */ jal Rand_ZeroFloat /* 02B80 8093B850 AE2F0008 */ sw $t7, 0x0008($s1) ## FFFFFF9C /* 02B84 8093B854 4600018D */ trunc.w.s $f6, $f0 @@ -572,7 +572,7 @@ glabel func_8093B1AC /* 02CA8 8093B978 46000004 */ sqrt.s $f0, $f0 /* 02CAC 8093B97C 46000480 */ add.s $f18, $f0, $f0 /* 02CB0 8093B980 44059000 */ mfc1 $a1, $f18 -/* 02CB4 8093B984 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02CB4 8093B984 0C01E107 */ jal Math_ApproachF /* 02CB8 8093B988 00000000 */ nop .L8093B98C: @@ -631,25 +631,25 @@ glabel func_8093B1AC /* 02D78 8093BA48 4604A200 */ add.s $f8, $f20, $f4 /* 02D7C 8093BA4C 46184000 */ add.s $f0, $f8, $f24 /* 02D80 8093BA50 46000004 */ sqrt.s $f0, $f0 -/* 02D84 8093BA54 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02D84 8093BA54 0C01E107 */ jal Math_ApproachF /* 02D88 8093BA58 E6A0052C */ swc1 $f0, 0x052C($s5) ## 0000052C /* 02D8C 8093BA5C 26A404B0 */ addiu $a0, $s5, 0x04B0 ## $a0 = 000004B0 /* 02D90 8093BA60 8E0509BC */ lw $a1, 0x09BC($s0) ## 801309BC /* 02D94 8093BA64 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02D98 8093BA68 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02D98 8093BA68 0C01E107 */ jal Math_ApproachF /* 02D9C 8093BA6C 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 /* 02DA0 8093BA70 26A404B4 */ addiu $a0, $s5, 0x04B4 ## $a0 = 000004B4 /* 02DA4 8093BA74 8E0509C0 */ lw $a1, 0x09C0($s0) ## 801309C0 /* 02DA8 8093BA78 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02DAC 8093BA7C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02DAC 8093BA7C 0C01E107 */ jal Math_ApproachF /* 02DB0 8093BA80 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 /* 02DB4 8093BA84 26A404B8 */ addiu $a0, $s5, 0x04B8 ## $a0 = 000004B8 /* 02DB8 8093BA88 8E0509C4 */ lw $a1, 0x09C4($s0) ## 801309C4 /* 02DBC 8093BA8C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02DC0 8093BA90 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02DC0 8093BA90 0C01E107 */ jal Math_ApproachF /* 02DC4 8093BA94 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 /* 02DC8 8093BA98 86AF0150 */ lh $t7, 0x0150($s5) ## 00000150 @@ -751,7 +751,7 @@ glabel func_8093B1AC /* 02F18 8093BBE8 26A404F8 */ addiu $a0, $s5, 0x04F8 ## $a0 = 000004F8 /* 02F1C 8093BBEC 4405B000 */ mfc1 $a1, $f22 /* 02F20 8093BBF0 3C073A03 */ lui $a3, 0x3A03 ## $a3 = 3A030000 -/* 02F24 8093BBF4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02F24 8093BBF4 0C01E107 */ jal Math_ApproachF /* 02F28 8093BBF8 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A03126F /* 02F2C 8093BBFC C6AA04F8 */ lwc1 $f10, 0x04F8($s5) ## 000004F8 @@ -845,13 +845,13 @@ glabel func_8093B1AC /* 0307C 8093BD4C A7A50128 */ sh $a1, 0x0128($sp) /* 03080 8093BD50 26A40524 */ addiu $a0, $s5, 0x0524 ## $a0 = 00000524 /* 03084 8093BD54 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 03088 8093BD58 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 03088 8093BD58 0C01E1EF */ jal Math_ApproachS /* 0308C 8093BD5C 24072000 */ addiu $a3, $zero, 0x2000 ## $a3 = 00002000 /* 03090 8093BD60 26A40526 */ addiu $a0, $s5, 0x0526 ## $a0 = 00000526 /* 03094 8093BD64 87A5012A */ lh $a1, 0x012A($sp) /* 03098 8093BD68 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 0309C 8093BD6C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0309C 8093BD6C 0C01E1EF */ jal Math_ApproachS /* 030A0 8093BD70 24072000 */ addiu $a3, $zero, 0x2000 ## $a3 = 00002000 /* 030A4 8093BD74 86AB0524 */ lh $t3, 0x0524($s5) ## 00000524 @@ -941,22 +941,22 @@ glabel func_8093B1AC /* 031EC 8093BEBC 10000036 */ beq $zero, $zero, .L8093BF98 /* 031F0 8093BEC0 A6B80178 */ sh $t8, 0x0178($s5) ## 00000178 .L8093BEC4: -/* 031F4 8093BEC4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 031F4 8093BEC4 0C00CFC8 */ jal Rand_CenteredFloat /* 031F8 8093BEC8 4600D306 */ mov.s $f12, $f26 /* 031FC 8093BECC E7A000B0 */ swc1 $f0, 0x00B0($sp) -/* 03200 8093BED0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 03200 8093BED0 0C00CFC8 */ jal Rand_CenteredFloat /* 03204 8093BED4 4600D306 */ mov.s $f12, $f26 /* 03208 8093BED8 E7A000B4 */ swc1 $f0, 0x00B4($sp) -/* 0320C 8093BEDC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0320C 8093BEDC 0C00CFC8 */ jal Rand_CenteredFloat /* 03210 8093BEE0 4600D306 */ mov.s $f12, $f26 /* 03214 8093BEE4 E7A000B8 */ swc1 $f0, 0x00B8($sp) /* 03218 8093BEE8 E7B600A4 */ swc1 $f22, 0x00A4($sp) /* 0321C 8093BEEC E7B600A8 */ swc1 $f22, 0x00A8($sp) /* 03220 8093BEF0 E7B600AC */ swc1 $f22, 0x00AC($sp) -/* 03224 8093BEF4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 03224 8093BEF4 0C00CFBE */ jal Rand_ZeroFloat /* 03228 8093BEF8 4600A306 */ mov.s $f12, $f20 /* 0322C 8093BEFC 46180480 */ add.s $f18, $f0, $f24 @@ -983,7 +983,7 @@ glabel func_8093B1AC /* 03280 8093BF50 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3F4CCCCD /* 03284 8093BF54 02C12021 */ addu $a0, $s6, $at /* 03288 8093BF58 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0328C 8093BF5C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0328C 8093BF5C 0C01E107 */ jal Math_ApproachF /* 03290 8093BF60 E6A40548 */ swc1 $f4, 0x0548($s5) ## 00000548 /* 03294 8093BF64 1000000D */ beq $zero, $zero, .L8093BF9C @@ -1042,7 +1042,7 @@ glabel func_8093B1AC /* 03354 8093C024 3C014248 */ lui $at, 0x4248 ## $at = 42480000 .L8093C028: /* 03358 8093C028 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 0335C 8093C02C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0335C 8093C02C 0C00CFC8 */ jal Rand_CenteredFloat /* 03360 8093C030 00000000 */ nop /* 03364 8093C034 8FA80120 */ lw $t0, 0x0120($sp) @@ -1050,7 +1050,7 @@ glabel func_8093B1AC /* 0336C 8093C03C 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 03370 8093C040 C5120024 */ lwc1 $f18, 0x0024($t0) ## 00000024 /* 03374 8093C044 46120100 */ add.s $f4, $f0, $f18 -/* 03378 8093C048 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 03378 8093C048 0C00CFC8 */ jal Rand_CenteredFloat /* 0337C 8093C04C E7A40098 */ swc1 $f4, 0x0098($sp) /* 03380 8093C050 8FB90120 */ lw $t9, 0x0120($sp) @@ -1058,29 +1058,29 @@ glabel func_8093B1AC /* 03388 8093C058 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 0338C 8093C05C C7280028 */ lwc1 $f8, 0x0028($t9) ## 00000028 /* 03390 8093C060 46080180 */ add.s $f6, $f0, $f8 -/* 03394 8093C064 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 03394 8093C064 0C00CFC8 */ jal Rand_CenteredFloat /* 03398 8093C068 E7A6009C */ swc1 $f6, 0x009C($sp) /* 0339C 8093C06C 8FA90120 */ lw $t1, 0x0120($sp) /* 033A0 8093C070 4600D306 */ mov.s $f12, $f26 /* 033A4 8093C074 C52A002C */ lwc1 $f10, 0x002C($t1) ## 0000002C /* 033A8 8093C078 460A0480 */ add.s $f18, $f0, $f10 -/* 033AC 8093C07C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 033AC 8093C07C 0C00CFC8 */ jal Rand_CenteredFloat /* 033B0 8093C080 E7B200A0 */ swc1 $f18, 0x00A0($sp) /* 033B4 8093C084 E7A0008C */ swc1 $f0, 0x008C($sp) -/* 033B8 8093C088 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 033B8 8093C088 0C00CFC8 */ jal Rand_CenteredFloat /* 033BC 8093C08C 4600D306 */ mov.s $f12, $f26 /* 033C0 8093C090 E7A00090 */ swc1 $f0, 0x0090($sp) -/* 033C4 8093C094 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 033C4 8093C094 0C00CFC8 */ jal Rand_CenteredFloat /* 033C8 8093C098 4600D306 */ mov.s $f12, $f26 /* 033CC 8093C09C E7A00094 */ swc1 $f0, 0x0094($sp) /* 033D0 8093C0A0 E7B60080 */ swc1 $f22, 0x0080($sp) /* 033D4 8093C0A4 E7B60084 */ swc1 $f22, 0x0084($sp) /* 033D8 8093C0A8 E7B60088 */ swc1 $f22, 0x0088($sp) -/* 033DC 8093C0AC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 033DC 8093C0AC 0C00CFBE */ jal Rand_ZeroFloat /* 033E0 8093C0B0 4600A306 */ mov.s $f12, $f20 /* 033E4 8093C0B4 46180100 */ add.s $f4, $f0, $f24 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C1C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C1C4.s index 8e85abe99e..6c729f9b21 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C1C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C1C4.s @@ -11,7 +11,7 @@ glabel func_8093C1C4 /* 03514 8093C1E4 260404D0 */ addiu $a0, $s0, 0x04D0 ## $a0 = 000004D0 /* 03518 8093C1E8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0351C 8093C1EC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03520 8093C1F0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03520 8093C1F0 0C01E107 */ jal Math_ApproachF /* 03524 8093C1F4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 03528 8093C1F8 8FA40024 */ lw $a0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C2C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C2C4.s index b6871778b6..520fdd11a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C2C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C2C4.s @@ -19,21 +19,21 @@ glabel func_8093C2C4 /* 03620 8093C2F0 55E00032 */ bnel $t7, $zero, .L8093C3BC /* 03624 8093C2F4 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 03628 8093C2F8 44816000 */ mtc1 $at, $f12 ## $f12 = 80.00 -/* 0362C 8093C2FC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0362C 8093C2FC 0C00CFC8 */ jal Rand_CenteredFloat /* 03630 8093C300 00000000 */ nop /* 03634 8093C304 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 03638 8093C308 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 0363C 8093C30C 44816000 */ mtc1 $at, $f12 ## $f12 = 80.00 /* 03640 8093C310 46040180 */ add.s $f6, $f0, $f4 -/* 03644 8093C314 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 03644 8093C314 0C00CFC8 */ jal Rand_CenteredFloat /* 03648 8093C318 E7A6005C */ swc1 $f6, 0x005C($sp) /* 0364C 8093C31C C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 03650 8093C320 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 03654 8093C324 44816000 */ mtc1 $at, $f12 ## $f12 = 80.00 /* 03658 8093C328 46080280 */ add.s $f10, $f0, $f8 -/* 0365C 8093C32C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0365C 8093C32C 0C00CFC8 */ jal Rand_CenteredFloat /* 03660 8093C330 E7AA0060 */ swc1 $f10, 0x0060($sp) /* 03664 8093C334 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C @@ -49,7 +49,7 @@ glabel func_8093C2C4 /* 0368C 8093C35C E7A20058 */ swc1 $f2, 0x0058($sp) /* 03690 8093C360 E7A20044 */ swc1 $f2, 0x0044($sp) /* 03694 8093C364 E7A2004C */ swc1 $f2, 0x004C($sp) -/* 03698 8093C368 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 03698 8093C368 0C00CFBE */ jal Rand_ZeroFloat /* 0369C 8093C36C E7A40048 */ swc1 $f4, 0x0048($sp) /* 036A0 8093C370 3C014170 */ lui $at, 0x4170 ## $at = 41700000 @@ -77,32 +77,32 @@ glabel func_8093C2C4 /* 036F4 8093C3C4 15010019 */ bne $t0, $at, .L8093C42C /* 036F8 8093C3C8 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 036FC 8093C3CC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03700 8093C3D0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03700 8093C3D0 0C01E107 */ jal Math_ApproachF /* 03704 8093C3D4 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 03708 8093C3D8 260401D8 */ addiu $a0, $s0, 0x01D8 ## $a0 = 000001D8 /* 0370C 8093C3DC 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 03710 8093C3E0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03714 8093C3E4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03714 8093C3E4 0C01E107 */ jal Math_ApproachF /* 03718 8093C3E8 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 0371C 8093C3EC 260401DC */ addiu $a0, $s0, 0x01DC ## $a0 = 000001DC /* 03720 8093C3F0 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 03724 8093C3F4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03728 8093C3F8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03728 8093C3F8 0C01E107 */ jal Math_ApproachF /* 0372C 8093C3FC 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 03730 8093C400 260401E0 */ addiu $a0, $s0, 0x01E0 ## $a0 = 000001E0 /* 03734 8093C404 3C054461 */ lui $a1, 0x4461 ## $a1 = 44610000 /* 03738 8093C408 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0373C 8093C40C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0373C 8093C40C 0C01E107 */ jal Math_ApproachF /* 03740 8093C410 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 03744 8093C414 3C054489 */ lui $a1, 0x4489 ## $a1 = 44890000 /* 03748 8093C418 34A56000 */ ori $a1, $a1, 0x6000 ## $a1 = 44896000 /* 0374C 8093C41C 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 /* 03750 8093C420 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03754 8093C424 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03754 8093C424 0C01E107 */ jal Math_ApproachF /* 03758 8093C428 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 .L8093C42C: @@ -116,7 +116,7 @@ glabel func_8093C2C4 /* 03778 8093C448 00812023 */ subu $a0, $a0, $at /* 0377C 8093C44C 00042080 */ sll $a0, $a0, 2 /* 03780 8093C450 00042400 */ sll $a0, $a0, 16 -/* 03784 8093C454 0C01DE1C */ jal Math_Sins +/* 03784 8093C454 0C01DE1C */ jal Math_SinS ## sins? /* 03788 8093C458 00042403 */ sra $a0, $a0, 16 /* 0378C 8093C45C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -133,13 +133,13 @@ glabel func_8093C2C4 /* 037B8 8093C488 46128100 */ add.s $f4, $f16, $f18 /* 037BC 8093C48C 46062200 */ add.s $f8, $f4, $f6 /* 037C0 8093C490 44054000 */ mfc1 $a1, $f8 -/* 037C4 8093C494 0C01E107 */ jal Math_SmoothScaleMaxF +/* 037C4 8093C494 0C01E107 */ jal Math_ApproachF /* 037C8 8093C498 00000000 */ nop /* 037CC 8093C49C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 037D0 8093C4A0 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 /* 037D4 8093C4A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 037D8 8093C4A8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 037D8 8093C4A8 0C01E107 */ jal Math_ApproachF /* 037DC 8093C4AC 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 037E0 8093C4B0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C700.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C700.s index 66c18a90ee..0026be33a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C700.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C700.s @@ -27,7 +27,7 @@ glabel func_8093C700 /* 03A88 8093C758 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 03A8C 8093C75C 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 03A90 8093C760 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 03A94 8093C764 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 03A94 8093C764 0C01E1EF */ jal Math_ApproachS /* 03A98 8093C768 24072000 */ addiu $a3, $zero, 0x2000 ## $a3 = 00002000 /* 03A9C 8093C76C 8FA40024 */ lw $a0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C7E4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C7E4.s index 0899d69774..79372bc1f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C7E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C7E4.s @@ -6,7 +6,7 @@ glabel func_8093C7E4 /* 03B24 8093C7F4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 03B28 8093C7F8 248404D0 */ addiu $a0, $a0, 0x04D0 ## $a0 = 000004D0 /* 03B2C 8093C7FC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03B30 8093C800 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03B30 8093C800 0C01E107 */ jal Math_ApproachF /* 03B34 8093C804 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 03B38 8093C808 8FA40018 */ lw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s index 2ab01f1a20..f8e3e57519 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s @@ -140,14 +140,14 @@ glabel func_8093C910 /* 03DF8 8093CAC8 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3CA3D70A /* 03DFC 8093CACC 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3E99999A /* 03E00 8093CAD0 262406AC */ addiu $a0, $s1, 0x06AC ## $a0 = 000006AC -/* 03E04 8093CAD4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03E04 8093CAD4 0C01E107 */ jal Math_ApproachF /* 03E08 8093CAD8 E6260608 */ swc1 $f6, 0x0608($s1) ## 00000608 /* 03E0C 8093CADC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 03E10 8093CAE0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 03E14 8093CAE4 262406A4 */ addiu $a0, $s1, 0x06A4 ## $a0 = 000006A4 /* 03E18 8093CAE8 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 -/* 03E1C 8093CAEC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03E1C 8093CAEC 0C01E107 */ jal Math_ApproachF /* 03E20 8093CAF0 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 03E24 8093CAF4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -179,7 +179,7 @@ glabel func_8093C910 /* 03E88 8093CB58 3C0543D2 */ lui $a1, 0x43D2 ## $a1 = 43D20000 /* 03E8C 8093CB5C E6300608 */ swc1 $f16, 0x0608($s1) ## 00000608 /* 03E90 8093CB60 44073000 */ mfc1 $a3, $f6 -/* 03E94 8093CB64 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03E94 8093CB64 0C01E107 */ jal Math_ApproachF /* 03E98 8093CB68 00000000 */ nop /* 03E9C 8093CB6C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 @@ -191,7 +191,7 @@ glabel func_8093C910 /* 03EB4 8093CB84 26240610 */ addiu $a0, $s1, 0x0610 ## $a0 = 00000610 /* 03EB8 8093CB88 3C0543EB */ lui $a1, 0x43EB ## $a1 = 43EB0000 /* 03EBC 8093CB8C 44078000 */ mfc1 $a3, $f16 -/* 03EC0 8093CB90 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03EC0 8093CB90 0C01E107 */ jal Math_ApproachF /* 03EC4 8093CB94 00000000 */ nop /* 03EC8 8093CB98 3C053E99 */ lui $a1, 0x3E99 ## $a1 = 3E990000 @@ -200,7 +200,7 @@ glabel func_8093C910 /* 03ED4 8093CBA4 34E7C28F */ ori $a3, $a3, 0xC28F ## $a3 = 3CF5C28F /* 03ED8 8093CBA8 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3CA3D70A /* 03EDC 8093CBAC 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3E99999A -/* 03EE0 8093CBB0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03EE0 8093CBB0 0C01E107 */ jal Math_ApproachF /* 03EE4 8093CBB4 262406AC */ addiu $a0, $s1, 0x06AC ## $a0 = 000006AC /* 03EE8 8093CBB8 3C014200 */ lui $at, 0x4200 ## $at = 42000000 @@ -212,7 +212,7 @@ glabel func_8093C910 /* 03F00 8093CBD0 262406A4 */ addiu $a0, $s1, 0x06A4 ## $a0 = 000006A4 /* 03F04 8093CBD4 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 /* 03F08 8093CBD8 44073000 */ mfc1 $a3, $f6 -/* 03F0C 8093CBDC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03F0C 8093CBDC 0C01E107 */ jal Math_ApproachF /* 03F10 8093CBE0 00000000 */ nop /* 03F14 8093CBE4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -221,7 +221,7 @@ glabel func_8093C910 /* 03F20 8093CBF0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 03F24 8093CBF4 4405A000 */ mfc1 $a1, $f20 /* 03F28 8093CBF8 4406A000 */ mfc1 $a2, $f20 -/* 03F2C 8093CBFC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03F2C 8093CBFC 0C01E107 */ jal Math_ApproachF /* 03F30 8093CC00 2624069C */ addiu $a0, $s1, 0x069C ## $a0 = 0000069C /* 03F34 8093CC04 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC @@ -325,7 +325,7 @@ glabel func_8093C910 /* 040A4 8093CD74 46004280 */ add.s $f10, $f8, $f0 /* 040A8 8093CD78 4600540D */ trunc.w.s $f16, $f10 /* 040AC 8093CD7C 440B8000 */ mfc1 $t3, $f16 -/* 040B0 8093CD80 0C01E107 */ jal Math_SmoothScaleMaxF +/* 040B0 8093CD80 0C01E107 */ jal Math_ApproachF /* 040B4 8093CD84 A58B00B6 */ sh $t3, 0x00B6($t4) ## 000000B6 /* 040B8 8093CD88 C63201A8 */ lwc1 $f18, 0x01A8($s1) ## 000001A8 @@ -336,7 +336,7 @@ glabel func_8093C910 /* 040CC 8093CD9C 34E7126E */ ori $a3, $a3, 0x126E ## $a3 = 3B83126E /* 040D0 8093CDA0 262401AC */ addiu $a0, $s1, 0x01AC ## $a0 = 000001AC /* 040D4 8093CDA4 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 040D8 8093CDA8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 040D8 8093CDA8 0C01E107 */ jal Math_ApproachF /* 040DC 8093CDAC E62601A8 */ swc1 $f6, 0x01A8($s1) ## 000001A8 /* 040E0 8093CDB0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -364,7 +364,7 @@ glabel func_8093C910 /* 04130 8093CE00 3C0739C4 */ lui $a3, 0x39C4 ## $a3 = 39C40000 /* 04134 8093CE04 34E79BA9 */ ori $a3, $a3, 0x9BA9 ## $a3 = 39C49BA9 /* 04138 8093CE08 34A5D70C */ ori $a1, $a1, 0xD70C ## $a1 = 3BA3D70C -/* 0413C 8093CE0C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0413C 8093CE0C 0C01E107 */ jal Math_ApproachF /* 04140 8093CE10 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 80950050 /* 04144 8093CE14 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 @@ -375,7 +375,7 @@ glabel func_8093C910 /* 04154 8093CE24 C432AF1C */ lwc1 $f18, %lo(D_8094AF1C)($at) /* 04158 8093CE28 C5F00050 */ lwc1 $f16, 0x0050($t7) ## 80950050 /* 0415C 8093CE2C 46128502 */ mul.s $f20, $f16, $f18 -/* 04160 8093CE30 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 04160 8093CE30 0C00CFC8 */ jal Rand_CenteredFloat /* 04164 8093CE34 4614A300 */ add.s $f12, $f20, $f20 /* 04168 8093CE38 3C018095 */ lui $at, %hi(D_8094AF20) ## $at = 80950000 @@ -388,7 +388,7 @@ glabel func_8093C910 /* 04184 8093CE54 E7B6009C */ swc1 $f22, 0x009C($sp) /* 04188 8093CE58 E7A00090 */ swc1 $f0, 0x0090($sp) /* 0418C 8093CE5C E7A40094 */ swc1 $f4, 0x0094($sp) -/* 04190 8093CE60 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 04190 8093CE60 0C00CFBE */ jal Rand_ZeroFloat /* 04194 8093CE64 E7A80098 */ swc1 $f8, 0x0098($sp) /* 04198 8093CE68 4614A282 */ mul.s $f10, $f20, $f20 @@ -399,7 +399,7 @@ glabel func_8093C910 /* 041AC 8093CE7C C42CAF24 */ lwc1 $f12, %lo(D_8094AF24)($at) /* 041B0 8093CE80 46105001 */ sub.s $f0, $f10, $f16 /* 041B4 8093CE84 46000004 */ sqrt.s $f0, $f0 -/* 041B8 8093CE88 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 041B8 8093CE88 0C00CFBE */ jal Rand_ZeroFloat /* 041BC 8093CE8C E7A00058 */ swc1 $f0, 0x0058($sp) /* 041C0 8093CE90 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -446,17 +446,17 @@ glabel func_8093C910 /* 04260 8093CF30 8C4A0004 */ lw $t2, 0x0004($v0) ## 00000028 /* 04264 8093CF34 AD2A0004 */ sw $t2, 0x0004($t1) ## FFFFFFC4 /* 04268 8093CF38 8C4B0008 */ lw $t3, 0x0008($v0) ## 0000002C -/* 0426C 8093CF3C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0426C 8093CF3C 0C00CFC8 */ jal Rand_CenteredFloat /* 04270 8093CF40 AD2B0008 */ sw $t3, 0x0008($t1) ## FFFFFFC8 /* 04274 8093CF44 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 04278 8093CF48 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 0427C 8093CF4C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0427C 8093CF4C 0C00CFC8 */ jal Rand_CenteredFloat /* 04280 8093CF50 E7A00074 */ swc1 $f0, 0x0074($sp) /* 04284 8093CF54 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 04288 8093CF58 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 0428C 8093CF5C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0428C 8093CF5C 0C00CFC8 */ jal Rand_CenteredFloat /* 04290 8093CF60 E7A00078 */ swc1 $f0, 0x0078($sp) /* 04294 8093CF64 C7A40080 */ lwc1 $f4, 0x0080($sp) @@ -475,7 +475,7 @@ glabel func_8093C910 /* 042C8 8093CF98 E7B60068 */ swc1 $f22, 0x0068($sp) /* 042CC 8093CF9C E7A60088 */ swc1 $f6, 0x0088($sp) /* 042D0 8093CFA0 E7B6006C */ swc1 $f22, 0x006C($sp) -/* 042D4 8093CFA4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 042D4 8093CFA4 0C00CFBE */ jal Rand_ZeroFloat /* 042D8 8093CFA8 E7B60070 */ swc1 $f22, 0x0070($sp) /* 042DC 8093CFAC C7AA0074 */ lwc1 $f10, 0x0074($sp) @@ -585,7 +585,7 @@ glabel func_8093C910 /* 0445C 8093D12C 4406A000 */ mfc1 $a2, $f20 /* 04460 8093D130 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 04464 8093D134 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 04468 8093D138 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04468 8093D138 0C01E107 */ jal Math_ApproachF /* 0446C 8093D13C 02412021 */ addu $a0, $s2, $at .L8093D140: @@ -597,7 +597,7 @@ glabel func_8093C910 /* 04480 8093D150 3C073A37 */ lui $a3, 0x3A37 ## $a3 = 3A370000 /* 04484 8093D154 34E78033 */ ori $a3, $a3, 0x8033 ## $a3 = 3A378033 /* 04488 8093D158 34A56040 */ ori $a1, $a1, 0x6040 ## $a1 = 3BE56040 -/* 0448C 8093D15C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0448C 8093D15C 0C01E107 */ jal Math_ApproachF /* 04490 8093D160 26240050 */ addiu $a0, $s1, 0x0050 ## $a0 = 00000050 /* 04494 8093D164 C6200050 */ lwc1 $f0, 0x0050($s1) ## 00000050 @@ -675,7 +675,7 @@ glabel func_8093C910 /* 045A8 8093D278 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 045AC 8093D27C 2624062C */ addiu $a0, $s1, 0x062C ## $a0 = 0000062C /* 045B0 8093D280 3C054372 */ lui $a1, 0x4372 ## $a1 = 43720000 -/* 045B4 8093D284 0C01E107 */ jal Math_SmoothScaleMaxF +/* 045B4 8093D284 0C01E107 */ jal Math_ApproachF /* 045B8 8093D288 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 045BC 8093D28C 10000003 */ beq $zero, $zero, .L8093D29C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s index ba680ef82c..dc5d04599d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s @@ -15,7 +15,7 @@ glabel func_8093D3D8 /* 0473C 8093D40C 8FAF0018 */ lw $t7, 0x0018($sp) /* 04740 8093D410 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 04744 8093D414 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 04748 8093D418 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 04748 8093D418 0C00CFBE */ jal Rand_ZeroFloat /* 0474C 8093D41C A1E005F8 */ sb $zero, 0x05F8($t7) ## 000005F8 /* 04750 8093D420 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D444.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D444.s index eda980adbd..a060b75f44 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D444.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D444.s @@ -20,7 +20,7 @@ glabel func_8093D444 /* 047B4 8093D484 44073000 */ mfc1 $a3, $f6 /* 047B8 8093D488 00000000 */ nop /* 047BC 8093D48C 00073C00 */ sll $a3, $a3, 16 -/* 047C0 8093D490 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 047C0 8093D490 0C01E1EF */ jal Math_ApproachS /* 047C4 8093D494 00073C03 */ sra $a3, $a3, 16 /* 047C8 8093D498 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -28,7 +28,7 @@ glabel func_8093D444 /* 047D0 8093D4A0 260404C8 */ addiu $a0, $s0, 0x04C8 ## $a0 = 000004C8 /* 047D4 8093D4A4 3C0546A0 */ lui $a1, 0x46A0 ## $a1 = 46A00000 /* 047D8 8093D4A8 4406A000 */ mfc1 $a2, $f20 -/* 047DC 8093D4AC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 047DC 8093D4AC 0C01E107 */ jal Math_ApproachF /* 047E0 8093D4B0 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 /* 047E4 8093D4B4 3C188095 */ lui $t8, %hi(D_8094C84C) ## $t8 = 80950000 @@ -40,33 +40,33 @@ glabel func_8093D444 /* 047FC 8093D4CC 5420001B */ bnel $at, $zero, .L8093D53C /* 04800 8093D4D0 8FBF0024 */ lw $ra, 0x0024($sp) /* 04804 8093D4D4 4406A000 */ mfc1 $a2, $f20 -/* 04808 8093D4D8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04808 8093D4D8 0C01E107 */ jal Math_ApproachF /* 0480C 8093D4DC 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 /* 04810 8093D4E0 4406A000 */ mfc1 $a2, $f20 /* 04814 8093D4E4 260401D8 */ addiu $a0, $s0, 0x01D8 ## $a0 = 000001D8 /* 04818 8093D4E8 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 -/* 0481C 8093D4EC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0481C 8093D4EC 0C01E107 */ jal Math_ApproachF /* 04820 8093D4F0 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 /* 04824 8093D4F4 4406A000 */ mfc1 $a2, $f20 /* 04828 8093D4F8 260401DC */ addiu $a0, $s0, 0x01DC ## $a0 = 000001DC /* 0482C 8093D4FC 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 -/* 04830 8093D500 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04830 8093D500 0C01E107 */ jal Math_ApproachF /* 04834 8093D504 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 /* 04838 8093D508 3C054454 */ lui $a1, 0x4454 ## $a1 = 44540000 /* 0483C 8093D50C 4406A000 */ mfc1 $a2, $f20 /* 04840 8093D510 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = 44548000 /* 04844 8093D514 260401E0 */ addiu $a0, $s0, 0x01E0 ## $a0 = 000001E0 -/* 04848 8093D518 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04848 8093D518 0C01E107 */ jal Math_ApproachF /* 0484C 8093D51C 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 /* 04850 8093D520 3C054489 */ lui $a1, 0x4489 ## $a1 = 44890000 /* 04854 8093D524 4406A000 */ mfc1 $a2, $f20 /* 04858 8093D528 34A56000 */ ori $a1, $a1, 0x6000 ## $a1 = 44896000 /* 0485C 8093D52C 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 -/* 04860 8093D530 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04860 8093D530 0C01E107 */ jal Math_ApproachF /* 04864 8093D534 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 /* 04868 8093D538 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s index 675bfa61de..3ad532fdcc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s @@ -235,7 +235,7 @@ glabel L8093D7EC /* 04B48 8093D818 34E7B717 */ ori $a3, $a3, 0xB717 ## $a3 = 38D1B717 /* 04B4C 8093D81C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 04B50 8093D820 2624069C */ addiu $a0, $s1, 0x069C ## $a0 = 0000069C -/* 04B54 8093D824 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04B54 8093D824 0C01E107 */ jal Math_ApproachF /* 04B58 8093D828 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04B5C 8093D82C 86230150 */ lh $v1, 0x0150($s1) ## 00000150 @@ -252,7 +252,7 @@ glabel L8093D7EC /* 04B88 8093D858 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 04B8C 8093D85C 3C073CF5 */ lui $a3, 0x3CF5 ## $a3 = 3CF50000 /* 04B90 8093D860 34E7C28F */ ori $a3, $a3, 0xC28F ## $a3 = 3CF5C28F -/* 04B94 8093D864 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04B94 8093D864 0C01E107 */ jal Math_ApproachF /* 04B98 8093D868 00812021 */ addu $a0, $a0, $at /* 04B9C 8093D86C 86230150 */ lh $v1, 0x0150($s1) ## 00000150 @@ -271,7 +271,7 @@ glabel L8093D7EC /* 04BC8 8093D898 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 04BCC 8093D89C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04BD0 8093D8A0 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 04BD4 8093D8A4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04BD4 8093D8A4 0C01E107 */ jal Math_ApproachF /* 04BD8 8093D8A8 E62804E0 */ swc1 $f8, 0x04E0($s1) ## 000004E0 /* 04BDC 8093D8AC 862C0150 */ lh $t4, 0x0150($s1) ## 00000150 @@ -342,7 +342,7 @@ glabel L8093D988 /* 04CD4 8093D9A4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04CD8 8093D9A8 3C054370 */ lui $a1, 0x4370 ## $a1 = 43700000 /* 04CDC 8093D9AC 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 04CE0 8093D9B0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04CE0 8093D9B0 0C01E107 */ jal Math_ApproachF /* 04CE4 8093D9B4 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 04CE8 8093D9B8 3C018095 */ lui $at, %hi(D_8094AF90) ## $at = 80950000 @@ -423,14 +423,14 @@ glabel L8093DAB8 /* 04E0C 8093DADC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04E10 8093DAE0 3C054370 */ lui $a1, 0x4370 ## $a1 = 43700000 /* 04E14 8093DAE4 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 04E18 8093DAE8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04E18 8093DAE8 0C01E107 */ jal Math_ApproachF /* 04E1C 8093DAEC 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 04E20 8093DAF0 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 /* 04E24 8093DAF4 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 04E28 8093DAF8 2624069C */ addiu $a0, $s1, 0x069C ## $a0 = 0000069C /* 04E2C 8093DAFC 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 04E30 8093DB00 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04E30 8093DB00 0C01E107 */ jal Math_ApproachF /* 04E34 8093DB04 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04E38 8093DB08 86230150 */ lh $v1, 0x0150($s1) ## 00000150 @@ -538,21 +538,21 @@ glabel L8093DC4C /* 04FC0 8093DC90 8E270068 */ lw $a3, 0x0068($s1) ## 00000068 /* 04FC4 8093DC94 E62A0688 */ swc1 $f10, 0x0688($s1) ## 00000688 /* 04FC8 8093DC98 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 -/* 04FCC 8093DC9C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04FCC 8093DC9C 0C01E107 */ jal Math_ApproachF /* 04FD0 8093DCA0 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 04FD4 8093DCA4 3C073F66 */ lui $a3, 0x3F66 ## $a3 = 3F660000 /* 04FD8 8093DCA8 34E76666 */ ori $a3, $a3, 0x6666 ## $a3 = 3F666666 /* 04FDC 8093DCAC 26240068 */ addiu $a0, $s1, 0x0068 ## $a0 = 00000068 /* 04FE0 8093DCB0 3C054110 */ lui $a1, 0x4110 ## $a1 = 41100000 -/* 04FE4 8093DCB4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04FE4 8093DCB4 0C01E107 */ jal Math_ApproachF /* 04FE8 8093DCB8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04FEC 8093DCBC 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 /* 04FF0 8093DCC0 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 04FF4 8093DCC4 2624069C */ addiu $a0, $s1, 0x069C ## $a0 = 0000069C /* 04FF8 8093DCC8 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 04FFC 8093DCCC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04FFC 8093DCCC 0C01E107 */ jal Math_ApproachF /* 05000 8093DCD0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05004 8093DCD4 86230150 */ lh $v1, 0x0150($s1) ## 00000150 @@ -584,7 +584,7 @@ glabel L8093DC4C /* 05068 8093DD38 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 0506C 8093DD3C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 05070 8093DD40 00812021 */ addu $a0, $a0, $at -/* 05074 8093DD44 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 05074 8093DD44 0C01E123 */ jal Math_ApproachZeroF /* 05078 8093DD48 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 .L8093DD4C: @@ -596,7 +596,7 @@ glabel L8093DC4C /* 05090 8093DD60 3C014248 */ lui $at, 0x4248 ## $at = 42480000 .L8093DD64: /* 05094 8093DD64 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 05098 8093DD68 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 05098 8093DD68 0C00CFC8 */ jal Rand_CenteredFloat /* 0509C 8093DD6C 00000000 */ nop /* 050A0 8093DD70 8E4E0000 */ lw $t6, 0x0000($s2) ## 8094C848 @@ -604,7 +604,7 @@ glabel L8093DC4C /* 050A8 8093DD78 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 050AC 8093DD7C C5C60024 */ lwc1 $f6, 0x0024($t6) ## 00000024 /* 050B0 8093DD80 46060200 */ add.s $f8, $f0, $f6 -/* 050B4 8093DD84 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 050B4 8093DD84 0C00CFC8 */ jal Rand_CenteredFloat /* 050B8 8093DD88 E7A80074 */ swc1 $f8, 0x0074($sp) /* 050BC 8093DD8C 8E4F0000 */ lw $t7, 0x0000($s2) ## 8094C848 @@ -612,7 +612,7 @@ glabel L8093DC4C /* 050C4 8093DD94 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 050C8 8093DD98 C5EA0028 */ lwc1 $f10, 0x0028($t7) ## 00000028 /* 050CC 8093DD9C 460A0100 */ add.s $f4, $f0, $f10 -/* 050D0 8093DDA0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 050D0 8093DDA0 0C00CFC8 */ jal Rand_CenteredFloat /* 050D4 8093DDA4 E7A40078 */ swc1 $f4, 0x0078($sp) /* 050D8 8093DDA8 8E580000 */ lw $t8, 0x0000($s2) ## 8094C848 @@ -620,22 +620,22 @@ glabel L8093DC4C /* 050E0 8093DDB0 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 050E4 8093DDB4 C706002C */ lwc1 $f6, 0x002C($t8) ## 0000002C /* 050E8 8093DDB8 46060200 */ add.s $f8, $f0, $f6 -/* 050EC 8093DDBC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 050EC 8093DDBC 0C00CFC8 */ jal Rand_CenteredFloat /* 050F0 8093DDC0 E7A8007C */ swc1 $f8, 0x007C($sp) /* 050F4 8093DDC4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 050F8 8093DDC8 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 050FC 8093DDCC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 050FC 8093DDCC 0C00CFC8 */ jal Rand_CenteredFloat /* 05100 8093DDD0 E7A00068 */ swc1 $f0, 0x0068($sp) /* 05104 8093DDD4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 05108 8093DDD8 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 0510C 8093DDDC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0510C 8093DDDC 0C00CFC8 */ jal Rand_CenteredFloat /* 05110 8093DDE0 E7A0006C */ swc1 $f0, 0x006C($sp) /* 05114 8093DDE4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 05118 8093DDE8 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 0511C 8093DDEC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0511C 8093DDEC 0C00CFBE */ jal Rand_ZeroFloat /* 05120 8093DDF0 E7A00070 */ swc1 $f0, 0x0070($sp) /* 05124 8093DDF4 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 @@ -675,7 +675,7 @@ glabel L8093DC4C /* 051A4 8093DE74 00832021 */ addu $a0, $a0, $v1 /* 051A8 8093DE78 00042240 */ sll $a0, $a0, 9 /* 051AC 8093DE7C 00042400 */ sll $a0, $a0, 16 -/* 051B0 8093DE80 0C01DE1C */ jal Math_Sins +/* 051B0 8093DE80 0C01DE1C */ jal Math_SinS ## sins? /* 051B4 8093DE84 00042403 */ sra $a0, $a0, 16 /* 051B8 8093DE88 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -693,7 +693,7 @@ glabel L8093DC4C /* 051E8 8093DEB8 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 /* 051EC 8093DEBC 46083280 */ add.s $f10, $f6, $f8 /* 051F0 8093DEC0 44055000 */ mfc1 $a1, $f10 -/* 051F4 8093DEC4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 051F4 8093DEC4 0C01E107 */ jal Math_ApproachF /* 051F8 8093DEC8 00000000 */ nop /* 051FC 8093DECC 1000002E */ beq $zero, $zero, .L8093DF88 @@ -746,7 +746,7 @@ glabel L8093DC4C /* 052A0 8093DF70 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A /* 052A4 8093DF74 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 052A8 8093DF78 34A5CCCC */ ori $a1, $a1, 0xCCCC ## $a1 = 3CCCCCCC -/* 052AC 8093DF7C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 052AC 8093DF7C 0C01E107 */ jal Math_ApproachF /* 052B0 8093DF80 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 /* 052B4 8093DF84 8E500000 */ lw $s0, 0x0000($s2) ## 8094C848 @@ -846,7 +846,7 @@ glabel L8093DC4C /* 05410 8093E0E0 440C2000 */ mfc1 $t4, $f4 /* 05414 8093E0E4 3C0743C0 */ lui $a3, 0x43C0 ## $a3 = 43C00000 /* 05418 8093E0E8 032C6821 */ addu $t5, $t9, $t4 -/* 0541C 8093E0EC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0541C 8093E0EC 0C01E107 */ jal Math_ApproachF /* 05420 8093E0F0 A60D00B6 */ sh $t5, 0x00B6($s0) ## 000000B7 /* 05424 8093E0F4 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 @@ -876,7 +876,7 @@ glabel L8093E130 /* 0547C 8093E14C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 05480 8093E150 3C054370 */ lui $a1, 0x4370 ## $a1 = 43700000 /* 05484 8093E154 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 05488 8093E158 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05488 8093E158 0C01E107 */ jal Math_ApproachF /* 0548C 8093E15C 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 05490 8093E160 3C018095 */ lui $at, %hi(D_8094AFAC) ## $at = 80950000 @@ -955,14 +955,14 @@ glabel L8093E258 /* 055AC 8093E27C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 055B0 8093E280 3C054370 */ lui $a1, 0x4370 ## $a1 = 43700000 /* 055B4 8093E284 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 055B8 8093E288 0C01E107 */ jal Math_SmoothScaleMaxF +/* 055B8 8093E288 0C01E107 */ jal Math_ApproachF /* 055BC 8093E28C 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 055C0 8093E290 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 /* 055C4 8093E294 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 055C8 8093E298 2624069C */ addiu $a0, $s1, 0x069C ## $a0 = 0000069C /* 055CC 8093E29C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 055D0 8093E2A0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 055D0 8093E2A0 0C01E107 */ jal Math_ApproachF /* 055D4 8093E2A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 055D8 8093E2A8 86230150 */ lh $v1, 0x0150($s1) ## 00000150 @@ -1069,14 +1069,14 @@ glabel L8093E3E8 /* 0575C 8093E42C 8E270068 */ lw $a3, 0x0068($s1) ## 00000068 /* 05760 8093E430 E6240688 */ swc1 $f4, 0x0688($s1) ## 00000688 /* 05764 8093E434 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 -/* 05768 8093E438 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05768 8093E438 0C01E107 */ jal Math_ApproachF /* 0576C 8093E43C 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 05770 8093E440 3C073F66 */ lui $a3, 0x3F66 ## $a3 = 3F660000 /* 05774 8093E444 34E76666 */ ori $a3, $a3, 0x6666 ## $a3 = 3F666666 /* 05778 8093E448 26240068 */ addiu $a0, $s1, 0x0068 ## $a0 = 00000068 /* 0577C 8093E44C 3C054110 */ lui $a1, 0x4110 ## $a1 = 41100000 -/* 05780 8093E450 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05780 8093E450 0C01E107 */ jal Math_ApproachF /* 05784 8093E454 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05788 8093E458 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -1085,7 +1085,7 @@ glabel L8093E3E8 /* 05794 8093E464 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 05798 8093E468 44050000 */ mfc1 $a1, $f0 /* 0579C 8093E46C 44060000 */ mfc1 $a2, $f0 -/* 057A0 8093E470 0C01E107 */ jal Math_SmoothScaleMaxF +/* 057A0 8093E470 0C01E107 */ jal Math_ApproachF /* 057A4 8093E474 2624069C */ addiu $a0, $s1, 0x069C ## $a0 = 0000069C /* 057A8 8093E478 86230150 */ lh $v1, 0x0150($s1) ## 00000150 @@ -1113,7 +1113,7 @@ glabel L8093E3E8 /* 057FC 8093E4CC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 05800 8093E4D0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 05804 8093E4D4 00812021 */ addu $a0, $a0, $at -/* 05808 8093E4D8 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 05808 8093E4D8 0C01E123 */ jal Math_ApproachZeroF /* 0580C 8093E4DC 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 .L8093E4E0: @@ -1125,7 +1125,7 @@ glabel L8093E3E8 /* 05824 8093E4F4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 .L8093E4F8: /* 05828 8093E4F8 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 0582C 8093E4FC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0582C 8093E4FC 0C00CFC8 */ jal Rand_CenteredFloat /* 05830 8093E500 00000000 */ nop /* 05834 8093E504 8E6F0000 */ lw $t7, 0x0000($s3) ## 8094C844 @@ -1133,7 +1133,7 @@ glabel L8093E3E8 /* 0583C 8093E50C 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 05840 8093E510 C5E80024 */ lwc1 $f8, 0x0024($t7) ## 00000024 /* 05844 8093E514 46080280 */ add.s $f10, $f0, $f8 -/* 05848 8093E518 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 05848 8093E518 0C00CFC8 */ jal Rand_CenteredFloat /* 0584C 8093E51C E7AA005C */ swc1 $f10, 0x005C($sp) /* 05850 8093E520 8E780000 */ lw $t8, 0x0000($s3) ## 8094C844 @@ -1141,7 +1141,7 @@ glabel L8093E3E8 /* 05858 8093E528 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 0585C 8093E52C C7040028 */ lwc1 $f4, 0x0028($t8) ## 00000028 /* 05860 8093E530 46040180 */ add.s $f6, $f0, $f4 -/* 05864 8093E534 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 05864 8093E534 0C00CFC8 */ jal Rand_CenteredFloat /* 05868 8093E538 E7A60060 */ swc1 $f6, 0x0060($sp) /* 0586C 8093E53C 8E680000 */ lw $t0, 0x0000($s3) ## 8094C844 @@ -1149,22 +1149,22 @@ glabel L8093E3E8 /* 05874 8093E544 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 05878 8093E548 C508002C */ lwc1 $f8, 0x002C($t0) ## 0000002C /* 0587C 8093E54C 46080280 */ add.s $f10, $f0, $f8 -/* 05880 8093E550 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 05880 8093E550 0C00CFC8 */ jal Rand_CenteredFloat /* 05884 8093E554 E7AA0064 */ swc1 $f10, 0x0064($sp) /* 05888 8093E558 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0588C 8093E55C 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 05890 8093E560 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 05890 8093E560 0C00CFC8 */ jal Rand_CenteredFloat /* 05894 8093E564 E7A00050 */ swc1 $f0, 0x0050($sp) /* 05898 8093E568 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0589C 8093E56C 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 058A0 8093E570 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 058A0 8093E570 0C00CFC8 */ jal Rand_CenteredFloat /* 058A4 8093E574 E7A00054 */ swc1 $f0, 0x0054($sp) /* 058A8 8093E578 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 058AC 8093E57C 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 058B0 8093E580 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 058B0 8093E580 0C00CFBE */ jal Rand_ZeroFloat /* 058B4 8093E584 E7A00058 */ swc1 $f0, 0x0058($sp) /* 058B8 8093E588 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 @@ -1203,7 +1203,7 @@ glabel L8093E3E8 /* 05934 8093E604 00832021 */ addu $a0, $a0, $v1 /* 05938 8093E608 00042240 */ sll $a0, $a0, 9 /* 0593C 8093E60C 00042400 */ sll $a0, $a0, 16 -/* 05940 8093E610 0C01DE1C */ jal Math_Sins +/* 05940 8093E610 0C01DE1C */ jal Math_SinS ## sins? /* 05944 8093E614 00042403 */ sra $a0, $a0, 16 /* 05948 8093E618 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -1221,7 +1221,7 @@ glabel L8093E3E8 /* 05978 8093E648 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 /* 0597C 8093E64C 460A4100 */ add.s $f4, $f8, $f10 /* 05980 8093E650 44052000 */ mfc1 $a1, $f4 -/* 05984 8093E654 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05984 8093E654 0C01E107 */ jal Math_ApproachF /* 05988 8093E658 00000000 */ nop /* 0598C 8093E65C 1000002E */ beq $zero, $zero, .L8093E718 @@ -1274,7 +1274,7 @@ glabel L8093E3E8 /* 05A30 8093E700 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A /* 05A34 8093E704 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 05A38 8093E708 34A5CCCC */ ori $a1, $a1, 0xCCCC ## $a1 = 3CCCCCCC -/* 05A3C 8093E70C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05A3C 8093E70C 0C01E107 */ jal Math_ApproachF /* 05A40 8093E710 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 /* 05A44 8093E714 8E700000 */ lw $s0, 0x0000($s3) ## 8094C844 @@ -1346,7 +1346,7 @@ glabel L8093E3E8 /* 05B34 8093E804 440F5000 */ mfc1 $t7, $f10 /* 05B38 8093E808 3C0743C0 */ lui $a3, 0x43C0 ## $a3 = 43C00000 /* 05B3C 8093E80C 032FC021 */ addu $t8, $t9, $t7 -/* 05B40 8093E810 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05B40 8093E810 0C01E107 */ jal Math_ApproachF /* 05B44 8093E814 A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B7 /* 05B48 8093E818 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 @@ -1384,7 +1384,7 @@ glabel L8093E854 /* 05BC4 8093E894 44050000 */ mfc1 $a1, $f0 /* 05BC8 8093E898 44060000 */ mfc1 $a2, $f0 /* 05BCC 8093E89C 34E7C28F */ ori $a3, $a3, 0xC28F ## $a3 = 3C75C28F -/* 05BD0 8093E8A0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05BD0 8093E8A0 0C01E107 */ jal Math_ApproachF /* 05BD4 8093E8A4 00812021 */ addu $a0, $a0, $at /* 05BD8 8093E8A8 86230150 */ lh $v1, 0x0150($s1) ## 00000150 @@ -1470,20 +1470,20 @@ glabel L8093E854 /* 05CFC 8093E9CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000600 /* 05D00 8093E9D0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 05D04 8093E9D4 44073000 */ mfc1 $a3, $f6 -/* 05D08 8093E9D8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05D08 8093E9D8 0C01E107 */ jal Math_ApproachF /* 05D0C 8093E9DC 00000000 */ nop /* 05D10 8093E9E0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 05D14 8093E9E4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 05D18 8093E9E8 26240608 */ addiu $a0, $s1, 0x0608 ## $a0 = 00000608 /* 05D1C 8093E9EC 3C05447A */ lui $a1, 0x447A ## $a1 = 447A0000 -/* 05D20 8093E9F0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05D20 8093E9F0 0C01E107 */ jal Math_ApproachF /* 05D24 8093E9F4 8E270654 */ lw $a3, 0x0654($s1) ## 00000654 /* 05D28 8093E9F8 26240654 */ addiu $a0, $s1, 0x0654 ## $a0 = 00000654 /* 05D2C 8093E9FC 3C054220 */ lui $a1, 0x4220 ## $a1 = 42200000 /* 05D30 8093EA00 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 05D34 8093EA04 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05D34 8093EA04 0C01E107 */ jal Math_ApproachF /* 05D38 8093EA08 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 05D3C 8093EA0C 1000000D */ beq $zero, $zero, .L8093EA44 @@ -1493,13 +1493,13 @@ glabel L8093E854 /* 05D48 8093EA18 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 05D4C 8093EA1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000600 /* 05D50 8093EA20 3C054396 */ lui $a1, 0x4396 ## $a1 = 43960000 -/* 05D54 8093EA24 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05D54 8093EA24 0C01E107 */ jal Math_ApproachF /* 05D58 8093EA28 8E270654 */ lw $a3, 0x0654($s1) ## 00000654 /* 05D5C 8093EA2C 26240654 */ addiu $a0, $s1, 0x0654 ## $a0 = 00000654 /* 05D60 8093EA30 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 /* 05D64 8093EA34 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 05D68 8093EA38 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05D68 8093EA38 0C01E107 */ jal Math_ApproachF /* 05D6C 8093EA3C 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 05D70 8093EA40 86230150 */ lh $v1, 0x0150($s1) ## 00000150 @@ -1584,7 +1584,7 @@ glabel L8093E854 /* 05EA0 8093EB70 00021403 */ sra $v0, $v0, 16 /* 05EA4 8093EB74 A5A20032 */ sh $v0, 0x0032($t5) ## 00000032 /* 05EA8 8093EB78 8E6E0000 */ lw $t6, 0x0000($s3) ## 8094C844 -/* 05EAC 8093EB7C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05EAC 8093EB7C 0C01E107 */ jal Math_ApproachF /* 05EB0 8093EB80 A5C200B6 */ sh $v0, 0x00B6($t6) ## 000000B6 /* 05EB4 8093EB84 C62801A8 */ lwc1 $f8, 0x01A8($s1) ## 000001A8 @@ -1596,7 +1596,7 @@ glabel L8093E854 /* 05ECC 8093EB9C 34A5CCCC */ ori $a1, $a1, 0xCCCC ## $a1 = 3E4CCCCC /* 05ED0 8093EBA0 262401AC */ addiu $a0, $s1, 0x01AC ## $a0 = 000001AC /* 05ED4 8093EBA4 E62401A8 */ swc1 $f4, 0x01A8($s1) ## 000001A8 -/* 05ED8 8093EBA8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05ED8 8093EBA8 0C01E107 */ jal Math_ApproachF /* 05EDC 8093EBAC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05EE0 8093EBB0 86230150 */ lh $v1, 0x0150($s1) ## 00000150 @@ -1697,7 +1697,7 @@ glabel L8093ECEC /* 06048 8093ED18 8E2606A0 */ lw $a2, 0x06A0($s1) ## 000006A0 /* 0604C 8093ED1C 26320608 */ addiu $s2, $s1, 0x0608 ## $s2 = 00000608 /* 06050 8093ED20 44073000 */ mfc1 $a3, $f6 -/* 06054 8093ED24 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06054 8093ED24 0C01E107 */ jal Math_ApproachF /* 06058 8093ED28 00000000 */ nop /* 0605C 8093ED2C C6280658 */ lwc1 $f8, 0x0658($s1) ## 00000658 @@ -1707,7 +1707,7 @@ glabel L8093ECEC /* 0606C 8093ED3C 460A4102 */ mul.s $f4, $f8, $f10 /* 06070 8093ED40 8E2606A0 */ lw $a2, 0x06A0($s1) ## 000006A0 /* 06074 8093ED44 44072000 */ mfc1 $a3, $f4 -/* 06078 8093ED48 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06078 8093ED48 0C01E107 */ jal Math_ApproachF /* 0607C 8093ED4C 00000000 */ nop /* 06080 8093ED50 C626065C */ lwc1 $f6, 0x065C($s1) ## 0000065C @@ -1717,7 +1717,7 @@ glabel L8093ECEC /* 06090 8093ED60 46083282 */ mul.s $f10, $f6, $f8 /* 06094 8093ED64 8E2606A0 */ lw $a2, 0x06A0($s1) ## 000006A0 /* 06098 8093ED68 44075000 */ mfc1 $a3, $f10 -/* 0609C 8093ED6C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0609C 8093ED6C 0C01E107 */ jal Math_ApproachF /* 060A0 8093ED70 00000000 */ nop /* 060A4 8093ED74 C6240660 */ lwc1 $f4, 0x0660($s1) ## 00000660 @@ -1727,7 +1727,7 @@ glabel L8093ECEC /* 060B4 8093ED84 46062202 */ mul.s $f8, $f4, $f6 /* 060B8 8093ED88 8E2606A0 */ lw $a2, 0x06A0($s1) ## 000006A0 /* 060BC 8093ED8C 44074000 */ mfc1 $a3, $f8 -/* 060C0 8093ED90 0C01E107 */ jal Math_SmoothScaleMaxF +/* 060C0 8093ED90 0C01E107 */ jal Math_ApproachF /* 060C4 8093ED94 00000000 */ nop /* 060C8 8093ED98 C62A0664 */ lwc1 $f10, 0x0664($s1) ## 00000664 @@ -1737,7 +1737,7 @@ glabel L8093ECEC /* 060D8 8093EDA8 46045182 */ mul.s $f6, $f10, $f4 /* 060DC 8093EDAC 8E2606A0 */ lw $a2, 0x06A0($s1) ## 000006A0 /* 060E0 8093EDB0 44073000 */ mfc1 $a3, $f6 -/* 060E4 8093EDB4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 060E4 8093EDB4 0C01E107 */ jal Math_ApproachF /* 060E8 8093EDB8 00000000 */ nop /* 060EC 8093EDBC C6280668 */ lwc1 $f8, 0x0668($s1) ## 00000668 @@ -1747,7 +1747,7 @@ glabel L8093ECEC /* 060FC 8093EDCC 460A4102 */ mul.s $f4, $f8, $f10 /* 06100 8093EDD0 8E2606A0 */ lw $a2, 0x06A0($s1) ## 000006A0 /* 06104 8093EDD4 44072000 */ mfc1 $a3, $f4 -/* 06108 8093EDD8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06108 8093EDD8 0C01E107 */ jal Math_ApproachF /* 0610C 8093EDDC 00000000 */ nop /* 06110 8093EDE0 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093EE10.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093EE10.s index caaab21c49..6be5b3301e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093EE10.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093EE10.s @@ -35,7 +35,7 @@ glabel func_8093EE10 /* 06190 8093EE60 55000019 */ bnel $t0, $zero, .L8093EEC8 /* 06194 8093EE64 3C014600 */ lui $at, 0x4600 ## $at = 46000000 /* 06198 8093EE68 44816000 */ mtc1 $at, $f12 ## $f12 = 8192.00 -/* 0619C 8093EE6C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0619C 8093EE6C 0C00CFC8 */ jal Rand_CenteredFloat /* 061A0 8093EE70 A6090178 */ sh $t1, 0x0178($s0) ## 00000178 /* 061A4 8093EE74 3C0A8095 */ lui $t2, %hi(D_8094C84C) ## $t2 = 80950000 @@ -44,7 +44,7 @@ glabel func_8093EE10 /* 061B0 8093EE80 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 061B4 8093EE84 C5440024 */ lwc1 $f4, 0x0024($t2) ## 80950024 /* 061B8 8093EE88 46040180 */ add.s $f6, $f0, $f4 -/* 061BC 8093EE8C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 061BC 8093EE8C 0C00CFC8 */ jal Rand_CenteredFloat /* 061C0 8093EE90 E60604B0 */ swc1 $f6, 0x04B0($s0) ## 000004B0 /* 061C4 8093EE94 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 @@ -52,7 +52,7 @@ glabel func_8093EE10 /* 061CC 8093EE9C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 061D0 8093EEA0 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 061D4 8093EEA4 46080280 */ add.s $f10, $f0, $f8 -/* 061D8 8093EEA8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 061D8 8093EEA8 0C00CFC8 */ jal Rand_CenteredFloat /* 061DC 8093EEAC E60A04B4 */ swc1 $f10, 0x04B4($s0) ## 000004B4 /* 061E0 8093EEB0 3C0B8095 */ lui $t3, %hi(D_8094C84C) ## $t3 = 80950000 @@ -126,7 +126,7 @@ glabel func_8093EE10 /* 062D8 8093EFA8 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = 43838000 /* 062DC 8093EFAC 260404B4 */ addiu $a0, $s0, 0x04B4 ## $a0 = 000004B4 /* 062E0 8093EFB0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 062E4 8093EFB4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 062E4 8093EFB4 0C01E107 */ jal Math_ApproachF /* 062E8 8093EFB8 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 062EC 8093EFBC 3C018095 */ lui $at, %hi(D_8094AFD4) ## $at = 80950000 @@ -139,7 +139,7 @@ glabel func_8093EE10 /* 06308 8093EFD8 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 /* 0630C 8093EFDC 4502000C */ bc1fl .L8093F010 /* 06310 8093EFE0 C61204B4 */ lwc1 $f18, 0x04B4($s0) ## 000004B4 -/* 06314 8093EFE4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06314 8093EFE4 0C01E107 */ jal Math_ApproachF /* 06318 8093EFE8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD /* 0631C 8093EFEC 3C0D8095 */ lui $t5, %hi(D_8094C84C) ## $t5 = 80950000 @@ -164,7 +164,7 @@ glabel func_8093EE10 /* 0635C 8093F02C C60804B8 */ lwc1 $f8, 0x04B8($s0) ## 000004B8 /* 06360 8093F030 E7AC0034 */ swc1 $f12, 0x0034($sp) /* 06364 8093F034 460A4381 */ sub.s $f14, $f8, $f10 -/* 06368 8093F038 0C03F494 */ jal Math_atan2f +/* 06368 8093F038 0C03F494 */ jal Math_FAtan2F /* 0636C 8093F03C E7AE002C */ swc1 $f14, 0x002C($sp) /* 06370 8093F040 3C018095 */ lui $at, %hi(D_8094AFD8) ## $at = 80950000 /* 06374 8093F044 C432AFD8 */ lwc1 $f18, %lo(D_8094AFD8)($at) @@ -179,7 +179,7 @@ glabel func_8093EE10 /* 06398 8093F068 460A4000 */ add.s $f0, $f8, $f10 /* 0639C 8093F06C 44183000 */ mfc1 $t8, $f6 /* 063A0 8093F070 46000384 */ sqrt.s $f14, $f0 -/* 063A4 8093F074 0C03F494 */ jal Math_atan2f +/* 063A4 8093F074 0C03F494 */ jal Math_FAtan2F /* 063A8 8093F078 A7B80024 */ sh $t8, 0x0024($sp) /* 063AC 8093F07C 3C018095 */ lui $at, %hi(D_8094AFDC) ## $at = 80950000 /* 063B0 8093F080 C432AFDC */ lwc1 $f18, %lo(D_8094AFDC)($at) @@ -195,7 +195,7 @@ glabel func_8093EE10 /* 063D8 8093F0A8 44053000 */ mfc1 $a1, $f6 /* 063DC 8093F0AC 00000000 */ nop /* 063E0 8093F0B0 00052C00 */ sll $a1, $a1, 16 -/* 063E4 8093F0B4 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 063E4 8093F0B4 0C01E1EF */ jal Math_ApproachS /* 063E8 8093F0B8 00052C03 */ sra $a1, $a1, 16 /* 063EC 8093F0BC C61204C8 */ lwc1 $f18, 0x04C8($s0) ## 000004C8 @@ -206,7 +206,7 @@ glabel func_8093EE10 /* 06400 8093F0D0 44072000 */ mfc1 $a3, $f4 /* 06404 8093F0D4 00000000 */ nop /* 06408 8093F0D8 00073C00 */ sll $a3, $a3, 16 -/* 0640C 8093F0DC 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0640C 8093F0DC 0C01E1EF */ jal Math_ApproachS /* 06410 8093F0E0 00073C03 */ sra $a3, $a3, 16 /* 06414 8093F0E4 0C00B642 */ jal func_8002D908 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s index ddf935b879..17e3a4318d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s @@ -408,7 +408,7 @@ glabel func_8093F1C4 /* 06A48 8093F718 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 06A4C 8093F71C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 06A50 8093F720 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 -/* 06A54 8093F724 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06A54 8093F724 0C01E107 */ jal Math_ApproachF /* 06A58 8093F728 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 06A5C 8093F72C 86020152 */ lh $v0, 0x0152($s0) ## 00000152 @@ -424,7 +424,7 @@ glabel func_8093F1C4 /* 06A80 8093F750 00812021 */ addu $a0, $a0, $at /* 06A84 8093F754 00042100 */ sll $a0, $a0, 4 /* 06A88 8093F758 00042400 */ sll $a0, $a0, 16 -/* 06A8C 8093F75C 0C01DE1C */ jal Math_Sins +/* 06A8C 8093F75C 0C01DE1C */ jal Math_SinS ## sins? /* 06A90 8093F760 00042403 */ sra $a0, $a0, 16 /* 06A94 8093F764 3C018095 */ lui $at, %hi(D_8094AFE0) ## $at = 80950000 @@ -441,7 +441,7 @@ glabel func_8093F1C4 /* 06AC0 8093F790 46049180 */ add.s $f6, $f18, $f4 /* 06AC4 8093F794 248401C8 */ addiu $a0, $a0, 0x01C8 ## $a0 = 809501C8 /* 06AC8 8093F798 44053000 */ mfc1 $a1, $f6 -/* 06ACC 8093F79C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06ACC 8093F79C 0C01E107 */ jal Math_ApproachF /* 06AD0 8093F7A0 00000000 */ nop /* 06AD4 8093F7A4 86040150 */ lh $a0, 0x0150($s0) ## 00000150 @@ -456,7 +456,7 @@ glabel func_8093F1C4 /* 06AF8 8093F7C8 00812021 */ addu $a0, $a0, $at /* 06AFC 8093F7CC 00042080 */ sll $a0, $a0, 2 /* 06B00 8093F7D0 00042400 */ sll $a0, $a0, 16 -/* 06B04 8093F7D4 0C01DE0D */ jal Math_Coss +/* 06B04 8093F7D4 0C01DE0D */ jal Math_CosS ## coss? /* 06B08 8093F7D8 00042403 */ sra $a0, $a0, 16 /* 06B0C 8093F7DC 3C018095 */ lui $at, %hi(D_8094AFE8) ## $at = 80950000 @@ -473,7 +473,7 @@ glabel func_8093F1C4 /* 06B38 8093F808 46105480 */ add.s $f18, $f10, $f16 /* 06B3C 8093F80C 248401C8 */ addiu $a0, $a0, 0x01C8 ## $a0 = 809501C8 /* 06B40 8093F810 44059000 */ mfc1 $a1, $f18 -/* 06B44 8093F814 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06B44 8093F814 0C01E107 */ jal Math_ApproachF /* 06B48 8093F818 00000000 */ nop /* 06B4C 8093F81C 86020152 */ lh $v0, 0x0152($s0) ## 00000152 @@ -485,7 +485,7 @@ glabel func_8093F1C4 /* 06B64 8093F834 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 /* 06B68 8093F838 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 06B6C 8093F83C 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 -/* 06B70 8093F840 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06B70 8093F840 0C01E107 */ jal Math_ApproachF /* 06B74 8093F844 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 80950028 /* 06B78 8093F848 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 @@ -493,13 +493,13 @@ glabel func_8093F1C4 /* 06B80 8093F850 3C0544FA */ lui $a1, 0x44FA ## $a1 = 44FA0000 /* 06B84 8093F854 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06B88 8093F858 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 -/* 06B8C 8093F85C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06B8C 8093F85C 0C01E107 */ jal Math_ApproachF /* 06B90 8093F860 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 80950028 /* 06B94 8093F864 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 06B98 8093F868 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 06B9C 8093F86C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 06BA0 8093F870 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06BA0 8093F870 0C01E107 */ jal Math_ApproachF /* 06BA4 8093F874 3C073E80 */ lui $a3, 0x3E80 ## $a3 = 3E800000 /* 06BA8 8093F878 860D0152 */ lh $t5, 0x0152($s0) ## 00000152 @@ -511,13 +511,13 @@ glabel func_8093F1C4 /* 06BC0 8093F890 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 06BC4 8093F894 260E01CC */ addiu $t6, $s0, 0x01CC ## $t6 = 000001CC /* 06BC8 8093F898 AFAE0024 */ sw $t6, 0x0024($sp) -/* 06BCC 8093F89C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06BCC 8093F89C 0C01E107 */ jal Math_ApproachF /* 06BD0 8093F8A0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 06BD4 8093F8A4 8FA40024 */ lw $a0, 0x0024($sp) /* 06BD8 8093F8A8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 06BDC 8093F8AC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 06BE0 8093F8B0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06BE0 8093F8B0 0C01E107 */ jal Math_ApproachF /* 06BE4 8093F8B4 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 .L8093F8B8: @@ -537,7 +537,7 @@ glabel func_8093F1C4 /* 06C14 8093F8E4 00822021 */ addu $a0, $a0, $v0 /* 06C18 8093F8E8 00042080 */ sll $a0, $a0, 2 /* 06C1C 8093F8EC 00042400 */ sll $a0, $a0, 16 -/* 06C20 8093F8F0 0C01DE0D */ jal Math_Coss +/* 06C20 8093F8F0 0C01DE0D */ jal Math_CosS ## coss? /* 06C24 8093F8F4 00042403 */ sra $a0, $a0, 16 /* 06C28 8093F8F8 3C018095 */ lui $at, %hi(D_8094AFF0) ## $at = 80950000 @@ -556,7 +556,7 @@ glabel func_8093F1C4 /* 06C5C 8093F92C 46082280 */ add.s $f10, $f4, $f8 /* 06C60 8093F930 46105480 */ add.s $f18, $f10, $f16 /* 06C64 8093F934 44059000 */ mfc1 $a1, $f18 -/* 06C68 8093F938 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06C68 8093F938 0C01E107 */ jal Math_ApproachF /* 06C6C 8093F93C 00000000 */ nop /* 06C70 8093F940 86040152 */ lh $a0, 0x0152($s0) ## 00000152 @@ -569,7 +569,7 @@ glabel func_8093F1C4 /* 06C8C 8093F95C 00812023 */ subu $a0, $a0, $at /* 06C90 8093F960 00042080 */ sll $a0, $a0, 2 /* 06C94 8093F964 00042400 */ sll $a0, $a0, 16 -/* 06C98 8093F968 0C01DE1C */ jal Math_Sins +/* 06C98 8093F968 0C01DE1C */ jal Math_SinS ## sins? /* 06C9C 8093F96C 00042403 */ sra $a0, $a0, 16 /* 06CA0 8093F970 3C018095 */ lui $at, %hi(D_8094AFF4) ## $at = 80950000 @@ -588,14 +588,14 @@ glabel func_8093F1C4 /* 06CD4 8093F9A4 46083280 */ add.s $f10, $f6, $f8 /* 06CD8 8093F9A8 46105480 */ add.s $f18, $f10, $f16 /* 06CDC 8093F9AC 44059000 */ mfc1 $a1, $f18 -/* 06CE0 8093F9B0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06CE0 8093F9B0 0C01E107 */ jal Math_ApproachF /* 06CE4 8093F9B4 00000000 */ nop /* 06CE8 8093F9B8 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 06CEC 8093F9BC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 06CF0 8093F9C0 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 06CF4 8093F9C4 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 06CF8 8093F9C8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06CF8 8093F9C8 0C01E107 */ jal Math_ApproachF /* 06CFC 8093F9CC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06D00 8093F9D0 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s index 302480a5f7..b299b16117 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s @@ -45,7 +45,7 @@ glabel func_8093F9E4 /* 06D84 8093FA54 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 06D88 8093FA58 A6480160 */ sh $t0, 0x0160($s2) ## 00000160 .L8093FA5C: -/* 06D8C 8093FA5C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06D8C 8093FA5C 0C01E107 */ jal Math_ApproachF /* 06D90 8093FA60 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 06D94 8093FA64 86420440 */ lh $v0, 0x0440($s2) ## 00000440 @@ -74,7 +74,7 @@ glabel func_8093F9E4 /* 06DE8 8093FAB8 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 06DEC 8093FABC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 06DF0 8093FAC0 3C0543C8 */ lui $a1, 0x43C8 ## $a1 = 43C80000 -/* 06DF4 8093FAC4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06DF4 8093FAC4 0C01E107 */ jal Math_ApproachF /* 06DF8 8093FAC8 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 06DFC 8093FACC 86420150 */ lh $v0, 0x0150($s2) ## 00000150 @@ -104,7 +104,7 @@ glabel func_8093F9E4 /* 06E54 8093FB24 34E7C28F */ ori $a3, $a3, 0xC28F ## $a3 = 3C75C28F /* 06E58 8093FB28 02612021 */ addu $a0, $s3, $at /* 06E5C 8093FB2C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 06E60 8093FB30 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06E60 8093FB30 0C01E107 */ jal Math_ApproachF /* 06E64 8093FB34 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06E68 8093FB38 3C053983 */ lui $a1, 0x3983 ## $a1 = 39830000 @@ -113,7 +113,7 @@ glabel func_8093F9E4 /* 06E74 8093FB44 34E7B717 */ ori $a3, $a3, 0xB717 ## $a3 = 3851B717 /* 06E78 8093FB48 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 06E7C 8093FB4C 34A5126E */ ori $a1, $a1, 0x126E ## $a1 = 3983126E -/* 06E80 8093FB50 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06E80 8093FB50 0C01E107 */ jal Math_ApproachF /* 06E84 8093FB54 26440050 */ addiu $a0, $s2, 0x0050 ## $a0 = 00000050 /* 06E88 8093FB58 C6400068 */ lwc1 $f0, 0x0068($s2) ## 00000068 @@ -142,7 +142,7 @@ glabel func_8093F9E4 .L8093FBB0: /* 06EE0 8093FBB0 3C054640 */ lui $a1, 0x4640 ## $a1 = 46400000 /* 06EE4 8093FBB4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 06EE8 8093FBB8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06EE8 8093FBB8 0C01E107 */ jal Math_ApproachF /* 06EEC 8093FBBC 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 /* 06EF0 8093FBC0 86480150 */ lh $t0, 0x0150($s2) ## 00000150 @@ -166,17 +166,17 @@ glabel func_8093F9E4 /* 06F38 8093FC08 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 .L8093FC0C: /* 06F3C 8093FC0C 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 06F40 8093FC10 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 06F40 8093FC10 0C00CFC8 */ jal Rand_CenteredFloat /* 06F44 8093FC14 00000000 */ nop /* 06F48 8093FC18 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 06F4C 8093FC1C 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 06F50 8093FC20 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 06F50 8093FC20 0C00CFC8 */ jal Rand_CenteredFloat /* 06F54 8093FC24 E7A000B0 */ swc1 $f0, 0x00B0($sp) /* 06F58 8093FC28 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 06F5C 8093FC2C 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 06F60 8093FC30 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 06F60 8093FC30 0C00CFC8 */ jal Rand_CenteredFloat /* 06F64 8093FC34 E7A000B4 */ swc1 $f0, 0x00B4($sp) /* 06F68 8093FC38 8FAF0064 */ lw $t7, 0x0064($sp) @@ -199,12 +199,12 @@ glabel func_8093F9E4 /* 06FAC 8093FC7C E7A600BC */ swc1 $f6, 0x00BC($sp) /* 06FB0 8093FC80 46009100 */ add.s $f4, $f18, $f0 /* 06FB4 8093FC84 E7B000C0 */ swc1 $f16, 0x00C0($sp) -/* 06FB8 8093FC88 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06FB8 8093FC88 0C00CFBE */ jal Rand_ZeroFloat /* 06FBC 8093FC8C E7A400C4 */ swc1 $f4, 0x00C4($sp) /* 06FC0 8093FC90 3C018095 */ lui $at, %hi(D_8094AFF8) ## $at = 80950000 /* 06FC4 8093FC94 C42CAFF8 */ lwc1 $f12, %lo(D_8094AFF8)($at) -/* 06FC8 8093FC98 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 06FC8 8093FC98 0C00CFBE */ jal Rand_ZeroFloat /* 06FCC 8093FC9C 46000506 */ mov.s $f20, $f0 /* 06FD0 8093FCA0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -325,7 +325,7 @@ glabel L8093FDC0 /* 07180 8093FE50 10000212 */ beq $zero, $zero, .L8094069C /* 07184 8093FE54 864505FC */ lh $a1, 0x05FC($s2) ## 000005FC glabel L8093FE58 -/* 07188 8093FE58 0C01DE1C */ jal Math_Sins +/* 07188 8093FE58 0C01DE1C */ jal Math_SinS ## sins? /* 0718C 8093FE5C 86440032 */ lh $a0, 0x0032($s2) ## 00000032 /* 07190 8093FE60 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -333,7 +333,7 @@ glabel L8093FE58 /* 07198 8093FE68 00000000 */ nop /* 0719C 8093FE6C 46120102 */ mul.s $f4, $f0, $f18 /* 071A0 8093FE70 E7A400D0 */ swc1 $f4, 0x00D0($sp) -/* 071A4 8093FE74 0C01DE0D */ jal Math_Coss +/* 071A4 8093FE74 0C01DE0D */ jal Math_CosS ## coss? /* 071A8 8093FE78 86440032 */ lh $a0, 0x0032($s2) ## 00000032 /* 071AC 8093FE7C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -350,14 +350,14 @@ glabel L8093FE58 /* 071D8 8093FEA8 C64A0024 */ lwc1 $f10, 0x0024($s2) ## 00000024 /* 071DC 8093FEAC 46105480 */ add.s $f18, $f10, $f16 /* 071E0 8093FEB0 44059000 */ mfc1 $a1, $f18 -/* 071E4 8093FEB4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 071E4 8093FEB4 0C01E107 */ jal Math_ApproachF /* 071E8 8093FEB8 00000000 */ nop /* 071EC 8093FEBC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 071F0 8093FEC0 4407A000 */ mfc1 $a3, $f20 /* 071F4 8093FEC4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 071F8 8093FEC8 26440604 */ addiu $a0, $s2, 0x0604 ## $a0 = 00000604 -/* 071FC 8093FECC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 071FC 8093FECC 0C01E107 */ jal Math_ApproachF /* 07200 8093FED0 3C054396 */ lui $a1, 0x4396 ## $a1 = 43960000 /* 07204 8093FED4 C644002C */ lwc1 $f4, 0x002C($s2) ## 0000002C @@ -368,28 +368,28 @@ glabel L8093FE58 /* 07218 8093FEE8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0721C 8093FEEC 26440608 */ addiu $a0, $s2, 0x0608 ## $a0 = 00000608 /* 07220 8093FEF0 44054000 */ mfc1 $a1, $f8 -/* 07224 8093FEF4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07224 8093FEF4 0C01E107 */ jal Math_ApproachF /* 07228 8093FEF8 00000000 */ nop /* 0722C 8093FEFC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 07230 8093FF00 4407A000 */ mfc1 $a3, $f20 /* 07234 8093FF04 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 07238 8093FF08 2644060C */ addiu $a0, $s2, 0x060C ## $a0 = 0000060C -/* 0723C 8093FF0C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0723C 8093FF0C 0C01E107 */ jal Math_ApproachF /* 07240 8093FF10 8E450024 */ lw $a1, 0x0024($s2) ## 00000024 /* 07244 8093FF14 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 07248 8093FF18 4407A000 */ mfc1 $a3, $f20 /* 0724C 8093FF1C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 07250 8093FF20 26440610 */ addiu $a0, $s2, 0x0610 ## $a0 = 00000610 -/* 07254 8093FF24 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07254 8093FF24 0C01E107 */ jal Math_ApproachF /* 07258 8093FF28 8E450028 */ lw $a1, 0x0028($s2) ## 00000028 /* 0725C 8093FF2C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 07260 8093FF30 4407A000 */ mfc1 $a3, $f20 /* 07264 8093FF34 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 07268 8093FF38 26440614 */ addiu $a0, $s2, 0x0614 ## $a0 = 00000614 -/* 0726C 8093FF3C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0726C 8093FF3C 0C01E107 */ jal Math_ApproachF /* 07270 8093FF40 8E45002C */ lw $a1, 0x002C($s2) ## 0000002C /* 07274 8093FF44 864A0150 */ lh $t2, 0x0150($s2) ## 00000150 @@ -508,15 +508,15 @@ glabel L809400CC /* 07434 80940104 ADAF0004 */ sw $t7, 0x0004($t5) ## FFFFFFA4 /* 07438 80940108 ADAC0008 */ sw $t4, 0x0008($t5) ## FFFFFFA8 .L8094010C: -/* 0743C 8094010C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0743C 8094010C 0C00CFC8 */ jal Rand_CenteredFloat /* 07440 80940110 4600A306 */ mov.s $f12, $f20 /* 07444 80940114 E7A0008C */ swc1 $f0, 0x008C($sp) -/* 07448 80940118 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 07448 80940118 0C00CFC8 */ jal Rand_CenteredFloat /* 0744C 8094011C 4600A306 */ mov.s $f12, $f20 /* 07450 80940120 E7A00090 */ swc1 $f0, 0x0090($sp) -/* 07454 80940124 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 07454 80940124 0C00CFC8 */ jal Rand_CenteredFloat /* 07458 80940128 4600A306 */ mov.s $f12, $f20 /* 0745C 8094012C 3C188095 */ lui $t8, %hi(D_8094C848) ## $t8 = 80950000 @@ -543,7 +543,7 @@ glabel L809400CC /* 074B0 80940180 46000100 */ add.s $f4, $f0, $f0 /* 074B4 80940184 E7B2009C */ swc1 $f18, 0x009C($sp) /* 074B8 80940188 46048180 */ add.s $f6, $f16, $f4 -/* 074BC 8094018C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 074BC 8094018C 0C00CFBE */ jal Rand_ZeroFloat /* 074C0 80940190 E7A600A0 */ swc1 $f6, 0x00A0($sp) /* 074C4 80940194 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -557,15 +557,15 @@ glabel L809400CC /* 074E4 809401B4 E7A80010 */ swc1 $f8, 0x0010($sp) /* 074E8 809401B8 0C24E41C */ jal func_80939070 /* 074EC 809401BC 27A70080 */ addiu $a3, $sp, 0x0080 ## $a3 = FFFFFFA0 -/* 074F0 809401C0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 074F0 809401C0 0C00CFC8 */ jal Rand_CenteredFloat /* 074F4 809401C4 4600A306 */ mov.s $f12, $f20 /* 074F8 809401C8 E7A0008C */ swc1 $f0, 0x008C($sp) -/* 074FC 809401CC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 074FC 809401CC 0C00CFC8 */ jal Rand_CenteredFloat /* 07500 809401D0 4600A306 */ mov.s $f12, $f20 /* 07504 809401D4 E7A00090 */ swc1 $f0, 0x0090($sp) -/* 07508 809401D8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 07508 809401D8 0C00CFC8 */ jal Rand_CenteredFloat /* 0750C 809401DC 4600A306 */ mov.s $f12, $f20 /* 07510 809401E0 3C0A8095 */ lui $t2, %hi(D_8094C844) ## $t2 = 80950000 @@ -592,7 +592,7 @@ glabel L809400CC /* 07564 80940234 46000180 */ add.s $f6, $f0, $f0 /* 07568 80940238 E7A4009C */ swc1 $f4, 0x009C($sp) /* 0756C 8094023C 46068280 */ add.s $f10, $f16, $f6 -/* 07570 80940240 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 07570 80940240 0C00CFBE */ jal Rand_ZeroFloat /* 07574 80940244 E7AA00A0 */ swc1 $f10, 0x00A0($sp) /* 07578 80940248 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -665,7 +665,7 @@ glabel L809402FC /* 07674 80940344 A0200AE1 */ sb $zero, 0x0AE1($at) ## 00010AE1 /* 07678 80940348 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0767C 8094034C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000001 -/* 07680 80940350 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 07680 80940350 0C01E123 */ jal Math_ApproachZeroF /* 07684 80940354 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 07688 80940358 10000019 */ beq $zero, $zero, .L809403C0 @@ -680,7 +680,7 @@ glabel L809402FC /* 076A8 80940378 86440152 */ lh $a0, 0x0152($s2) ## 00000152 /* 076AC 8094037C 00042300 */ sll $a0, $a0, 12 /* 076B0 80940380 00042400 */ sll $a0, $a0, 16 -/* 076B4 80940384 0C01DE1C */ jal Math_Sins +/* 076B4 80940384 0C01DE1C */ jal Math_SinS ## sins? /* 076B8 80940388 00042403 */ sra $a0, $a0, 16 /* 076BC 8094038C 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 @@ -694,7 +694,7 @@ glabel L809402FC /* 076DC 809403AC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 076E0 809403B0 46068280 */ add.s $f10, $f16, $f6 /* 076E4 809403B4 44055000 */ mfc1 $a1, $f10 -/* 076E8 809403B8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 076E8 809403B8 0C01E107 */ jal Math_ApproachF /* 076EC 809403BC 00000000 */ nop .L809403C0: @@ -709,7 +709,7 @@ glabel L809402FC /* 07710 809403E0 26440610 */ addiu $a0, $s2, 0x0610 ## $a0 = 00000610 /* 07714 809403E4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 07718 809403E8 44052000 */ mfc1 $a1, $f4 -/* 0771C 809403EC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0771C 809403EC 0C01E107 */ jal Math_ApproachF /* 07720 809403F0 00000000 */ nop /* 07724 809403F4 864E0152 */ lh $t6, 0x0152($s2) ## 00000152 @@ -719,7 +719,7 @@ glabel L809402FC /* 07734 80940404 1420002E */ bne $at, $zero, .L809404C0 /* 07738 80940408 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 0773C 8094040C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 07740 80940410 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07740 80940410 0C01E107 */ jal Math_ApproachF /* 07744 80940414 8E4706A0 */ lw $a3, 0x06A0($s2) ## 000006A0 /* 07748 80940418 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -728,7 +728,7 @@ glabel L809402FC /* 07754 80940424 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3CCCCCCD /* 07758 80940428 44050000 */ mfc1 $a1, $f0 /* 0775C 8094042C 44060000 */ mfc1 $a2, $f0 -/* 07760 80940430 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07760 80940430 0C01E107 */ jal Math_ApproachF /* 07764 80940434 264406A0 */ addiu $a0, $s2, 0x06A0 ## $a0 = 000006A0 /* 07768 80940438 0C0400A4 */ jal sinf @@ -759,7 +759,7 @@ glabel L809402FC /* 077C4 80940494 34E7B717 */ ori $a3, $a3, 0xB717 ## $a3 = 38D1B717 /* 077C8 80940498 264406B0 */ addiu $a0, $s2, 0x06B0 ## $a0 = 000006B0 /* 077CC 8094049C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 077D0 809404A0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 077D0 809404A0 0C01E107 */ jal Math_ApproachF /* 077D4 809404A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 077D8 809404A8 10000005 */ beq $zero, $zero, .L809404C0 @@ -767,7 +767,7 @@ glabel L809402FC .L809404B0: /* 077E0 809404B0 3C0738D1 */ lui $a3, 0x38D1 ## $a3 = 38D10000 /* 077E4 809404B4 34E7B717 */ ori $a3, $a3, 0xB717 ## $a3 = 38D1B717 -/* 077E8 809404B8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 077E8 809404B8 0C01E107 */ jal Math_ApproachF /* 077EC 809404BC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 .L809404C0: @@ -779,7 +779,7 @@ glabel L809402FC /* 07804 809404D4 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A83126F /* 07808 809404D8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0780C 809404DC 34A5D709 */ ori $a1, $a1, 0xD709 ## $a1 = 3C23D709 -/* 07810 809404E0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07810 809404E0 0C01E107 */ jal Math_ApproachF /* 07814 809404E4 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 80950050 /* 07818 809404E8 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80940D48.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80940D48.s index aa03fc86e3..ae8c140e03 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80940D48.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80940D48.s @@ -62,7 +62,7 @@ glabel func_80940D48 .L80940DC0: /* 080F0 80940DC0 44052000 */ mfc1 $a1, $f4 /* 080F4 80940DC4 4407A000 */ mfc1 $a3, $f20 -/* 080F8 80940DC8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 080F8 80940DC8 0C01E107 */ jal Math_ApproachF /* 080FC 80940DCC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 08100 80940DD0 926907B0 */ lbu $t1, 0x07B0($s3) ## 000007B0 @@ -77,7 +77,7 @@ glabel func_80940D48 /* 08124 80940DF4 460A4200 */ add.s $f8, $f8, $f10 .L80940DF8: /* 08128 80940DF8 44054000 */ mfc1 $a1, $f8 -/* 0812C 80940DFC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0812C 80940DFC 0C01E107 */ jal Math_ApproachF /* 08130 80940E00 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 08134 80940E04 926A07B1 */ lbu $t2, 0x07B1($s3) ## 000007B1 @@ -92,7 +92,7 @@ glabel func_80940D48 /* 08158 80940E28 46128400 */ add.s $f16, $f16, $f18 .L80940E2C: /* 0815C 80940E2C 44058000 */ mfc1 $a1, $f16 -/* 08160 80940E30 0C01E107 */ jal Math_SmoothScaleMaxF +/* 08160 80940E30 0C01E107 */ jal Math_ApproachF /* 08164 80940E34 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 08168 80940E38 866B07B2 */ lh $t3, 0x07B2($s3) ## 000007B2 @@ -102,13 +102,13 @@ glabel func_80940D48 /* 08178 80940E48 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0817C 80940E4C 46802120 */ cvt.s.w $f4, $f4 /* 08180 80940E50 44052000 */ mfc1 $a1, $f4 -/* 08184 80940E54 0C01E107 */ jal Math_SmoothScaleMaxF +/* 08184 80940E54 0C01E107 */ jal Math_ApproachF /* 08188 80940E58 00000000 */ nop /* 0818C 80940E5C 4407A000 */ mfc1 $a3, $f20 /* 08190 80940E60 264401E4 */ addiu $a0, $s2, 0x01E4 ## $a0 = 000001E4 /* 08194 80940E64 3C05447A */ lui $a1, 0x447A ## $a1 = 447A0000 -/* 08198 80940E68 0C01E107 */ jal Math_SmoothScaleMaxF +/* 08198 80940E68 0C01E107 */ jal Math_ApproachF /* 0819C 80940E6C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 081A0 80940E70 864C0150 */ lh $t4, 0x0150($s2) ## 00000150 @@ -201,7 +201,7 @@ glabel func_80940D48 /* 082E0 80940FB0 25ADC910 */ addiu $t5, $t5, %lo(func_8093C910) ## $t5 = 8093C910 /* 082E4 80940FB4 51AF000C */ beql $t5, $t7, .L80940FE8 /* 082E8 80940FB8 8E42014C */ lw $v0, 0x014C($s2) ## 0000014C -/* 082EC 80940FBC 0C03F66B */ jal Math_Rand_ZeroOne +/* 082EC 80940FBC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 082F0 80940FC0 00000000 */ nop /* 082F4 80940FC4 3C018095 */ lui $at, %hi(D_8094B020) ## $at = 80950000 @@ -274,7 +274,7 @@ glabel func_80940D48 .L809410BC: /* 083EC 809410BC 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 .L809410C0: -/* 083F0 809410C0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 083F0 809410C0 0C01E107 */ jal Math_ApproachF /* 083F4 809410C4 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 083F8 809410C8 3C018095 */ lui $at, %hi(D_8094B024) ## $at = 80950000 @@ -296,34 +296,34 @@ glabel func_80940D48 /* 08434 80941104 8C4D0004 */ lw $t5, 0x0004($v0) ## 0000049C /* 08438 80941108 AE2D0004 */ sw $t5, 0x0004($s1) ## FFFFFFE8 /* 0843C 8094110C 8C4F0008 */ lw $t7, 0x0008($v0) ## 000004A0 -/* 08440 80941110 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 08440 80941110 0C00CFC8 */ jal Rand_CenteredFloat /* 08444 80941114 AE2F0008 */ sw $t7, 0x0008($s1) ## FFFFFFEC /* 08448 80941118 C7AA007C */ lwc1 $f10, 0x007C($sp) /* 0844C 8094111C 4600A306 */ mov.s $f12, $f20 /* 08450 80941120 46005400 */ add.s $f16, $f10, $f0 -/* 08454 80941124 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 08454 80941124 0C00CFC8 */ jal Rand_CenteredFloat /* 08458 80941128 E7B0007C */ swc1 $f16, 0x007C($sp) /* 0845C 8094112C C7B20080 */ lwc1 $f18, 0x0080($sp) /* 08460 80941130 4600A306 */ mov.s $f12, $f20 /* 08464 80941134 46009100 */ add.s $f4, $f18, $f0 -/* 08468 80941138 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 08468 80941138 0C00CFC8 */ jal Rand_CenteredFloat /* 0846C 8094113C E7A40080 */ swc1 $f4, 0x0080($sp) /* 08470 80941140 C7A60084 */ lwc1 $f6, 0x0084($sp) /* 08474 80941144 4600B306 */ mov.s $f12, $f22 /* 08478 80941148 46003200 */ add.s $f8, $f6, $f0 -/* 0847C 8094114C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0847C 8094114C 0C00CFC8 */ jal Rand_CenteredFloat /* 08480 80941150 E7A80084 */ swc1 $f8, 0x0084($sp) /* 08484 80941154 E7A00064 */ swc1 $f0, 0x0064($sp) -/* 08488 80941158 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 08488 80941158 0C00CFC8 */ jal Rand_CenteredFloat /* 0848C 8094115C 4600B306 */ mov.s $f12, $f22 /* 08490 80941160 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 08494 80941164 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 08498 80941168 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 08498 80941168 0C00CFBE */ jal Rand_ZeroFloat /* 0849C 8094116C E7A0006C */ swc1 $f0, 0x006C($sp) /* 084A0 80941170 4600028D */ trunc.w.s $f10, $f0 @@ -359,34 +359,34 @@ glabel func_80940D48 /* 08514 809411E4 8C4B0004 */ lw $t3, 0x0004($v0) ## 000004A8 /* 08518 809411E8 AE2B0004 */ sw $t3, 0x0004($s1) ## FFFFFFE8 /* 0851C 809411EC 8C4C0008 */ lw $t4, 0x0008($v0) ## 000004AC -/* 08520 809411F0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 08520 809411F0 0C00CFC8 */ jal Rand_CenteredFloat /* 08524 809411F4 AE2C0008 */ sw $t4, 0x0008($s1) ## FFFFFFEC /* 08528 809411F8 C7A4007C */ lwc1 $f4, 0x007C($sp) /* 0852C 809411FC 4600A306 */ mov.s $f12, $f20 /* 08530 80941200 46002180 */ add.s $f6, $f4, $f0 -/* 08534 80941204 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 08534 80941204 0C00CFC8 */ jal Rand_CenteredFloat /* 08538 80941208 E7A6007C */ swc1 $f6, 0x007C($sp) /* 0853C 8094120C C7A80080 */ lwc1 $f8, 0x0080($sp) /* 08540 80941210 4600A306 */ mov.s $f12, $f20 /* 08544 80941214 46004280 */ add.s $f10, $f8, $f0 -/* 08548 80941218 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 08548 80941218 0C00CFC8 */ jal Rand_CenteredFloat /* 0854C 8094121C E7AA0080 */ swc1 $f10, 0x0080($sp) /* 08550 80941220 C7B00084 */ lwc1 $f16, 0x0084($sp) /* 08554 80941224 4600B306 */ mov.s $f12, $f22 /* 08558 80941228 46008480 */ add.s $f18, $f16, $f0 -/* 0855C 8094122C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0855C 8094122C 0C00CFC8 */ jal Rand_CenteredFloat /* 08560 80941230 E7B20084 */ swc1 $f18, 0x0084($sp) /* 08564 80941234 E7A00064 */ swc1 $f0, 0x0064($sp) -/* 08568 80941238 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 08568 80941238 0C00CFC8 */ jal Rand_CenteredFloat /* 0856C 8094123C 4600B306 */ mov.s $f12, $f22 /* 08570 80941240 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 08574 80941244 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 08578 80941248 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 08578 80941248 0C00CFBE */ jal Rand_ZeroFloat /* 0857C 8094124C E7A0006C */ swc1 $f0, 0x006C($sp) /* 08580 80941250 4600010D */ trunc.w.s $f4, $f0 @@ -546,7 +546,7 @@ glabel L80941470 /* 087A8 80941478 3C063CA3 */ lui $a2, 0x3CA3 ## $a2 = 3CA30000 /* 087AC 8094147C 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3CA3D70A /* 087B0 80941480 02612021 */ addu $a0, $s3, $at -/* 087B4 80941484 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 087B4 80941484 0C01E123 */ jal Math_ApproachZeroF /* 087B8 80941488 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 087BC 8094148C 10000062 */ beq $zero, $zero, .L80941618 @@ -562,7 +562,7 @@ glabel L80941494 /* 087E0 809414B0 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 087E4 809414B4 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 087E8 809414B8 02612021 */ addu $a0, $s3, $at -/* 087EC 809414BC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 087EC 809414BC 0C01E107 */ jal Math_ApproachF /* 087F0 809414C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 087F4 809414C4 10000054 */ beq $zero, $zero, .L80941618 @@ -577,7 +577,7 @@ glabel L809414CC /* 08814 809414E4 00812023 */ subu $a0, $a0, $at /* 08818 809414E8 00042300 */ sll $a0, $a0, 12 /* 0881C 809414EC 00042400 */ sll $a0, $a0, 16 -/* 08820 809414F0 0C01DE1C */ jal Math_Sins +/* 08820 809414F0 0C01DE1C */ jal Math_SinS ## sins? /* 08824 809414F4 00042403 */ sra $a0, $a0, 16 /* 08828 809414F8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -591,7 +591,7 @@ glabel L809414CC /* 08848 80941518 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0884C 8094151C 46168480 */ add.s $f18, $f16, $f22 /* 08850 80941520 44059000 */ mfc1 $a1, $f18 -/* 08854 80941524 0C01E107 */ jal Math_SmoothScaleMaxF +/* 08854 80941524 0C01E107 */ jal Math_ApproachF /* 08858 80941528 00000000 */ nop /* 0885C 8094152C 1000003A */ beq $zero, $zero, .L80941618 @@ -609,7 +609,7 @@ glabel L80941534 /* 08888 80941558 44050000 */ mfc1 $a1, $f0 /* 0888C 8094155C 44060000 */ mfc1 $a2, $f0 /* 08890 80941560 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 08894 80941564 0C01E107 */ jal Math_SmoothScaleMaxF +/* 08894 80941564 0C01E107 */ jal Math_ApproachF /* 08898 80941568 02612021 */ addu $a0, $s3, $at /* 0889C 8094156C 1000002A */ beq $zero, $zero, .L80941618 @@ -624,7 +624,7 @@ glabel L80941574 /* 088BC 8094158C 00812023 */ subu $a0, $a0, $at /* 088C0 80941590 00042240 */ sll $a0, $a0, 9 /* 088C4 80941594 00042400 */ sll $a0, $a0, 16 -/* 088C8 80941598 0C01DE1C */ jal Math_Sins +/* 088C8 80941598 0C01DE1C */ jal Math_SinS ## sins? /* 088CC 8094159C 00042403 */ sra $a0, $a0, 16 /* 088D0 809415A0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -640,7 +640,7 @@ glabel L80941574 /* 088F8 809415C8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 088FC 809415CC 46083280 */ add.s $f10, $f6, $f8 /* 08900 809415D0 44055000 */ mfc1 $a1, $f10 -/* 08904 809415D4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 08904 809415D4 0C01E107 */ jal Math_ApproachF /* 08908 809415D8 00000000 */ nop /* 0890C 809415DC 1000000E */ beq $zero, $zero, .L80941618 @@ -657,7 +657,7 @@ glabel L809415E4 /* 08934 80941604 44050000 */ mfc1 $a1, $f0 /* 08938 80941608 44060000 */ mfc1 $a2, $f0 /* 0893C 8094160C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD -/* 08940 80941610 0C01E107 */ jal Math_SmoothScaleMaxF +/* 08940 80941610 0C01E107 */ jal Math_ApproachF /* 08944 80941614 02612021 */ addu $a0, $s3, $at glabel L80941618 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s index 794a645685..0c216eeb9d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s @@ -82,7 +82,7 @@ glabel func_80943F08 /* 0B2FC 80943FCC 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 0B300 80943FD0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0B304 80943FD4 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 0B308 80943FD8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0B308 80943FD8 0C01E107 */ jal Math_ApproachF /* 0B30C 80943FDC A7A800AE */ sh $t0, 0x00AE($sp) /* 0B310 80943FE0 87A800AE */ lh $t0, 0x00AE($sp) @@ -105,7 +105,7 @@ glabel func_80943F08 /* 0B34C 8094401C 2484C854 */ addiu $a0, $a0, %lo(D_8094C854) ## $a0 = 8094C854 /* 0B350 80944020 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0B354 80944024 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0B358 80944028 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0B358 80944028 0C01E107 */ jal Math_ApproachF /* 0B35C 8094402C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 0B360 80944030 3C018095 */ lui $at, %hi(D_8094C854) ## $at = 80950000 @@ -166,7 +166,7 @@ glabel func_80943F08 /* 0B434 80944104 01C80019 */ multu $t6, $t0 /* 0B438 80944108 00002012 */ mflo $a0 /* 0B43C 8094410C 00042400 */ sll $a0, $a0, 16 -/* 0B440 80944110 0C01DE1C */ jal Math_Sins +/* 0B440 80944110 0C01DE1C */ jal Math_SinS ## sins? /* 0B444 80944114 00042403 */ sra $a0, $a0, 16 /* 0B448 80944118 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -415,7 +415,7 @@ glabel func_80943F08 .L809444D8: /* 0B808 809444D8 A0790000 */ sb $t9, 0x0000($v1) ## 8094C86F /* 0B80C 809444DC 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 -/* 0B810 809444E0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0B810 809444E0 0C01E107 */ jal Math_ApproachF /* 0B814 809444E4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0B818 809444E8 1000000F */ beq $zero, $zero, .L80944528 @@ -435,7 +435,7 @@ glabel func_80943F08 /* 0B848 80944518 00000000 */ nop /* 0B84C 8094451C 44070000 */ mfc1 $a3, $f0 .L80944520: -/* 0B850 80944520 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0B850 80944520 0C01E107 */ jal Math_ApproachF /* 0B854 80944524 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 .L80944528: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809453EC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809453EC.s index 5b0737e38d..42a223578f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809453EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809453EC.s @@ -75,7 +75,7 @@ glabel func_809453EC /* 0C7D4 809454A4 C628002C */ lwc1 $f8, 0x002C($s1) ## 0000002C /* 0C7D8 809454A8 C446002C */ lwc1 $f6, 0x002C($v0) ## 0000002C /* 0C7DC 809454AC 46083381 */ sub.s $f14, $f6, $f8 -/* 0C7E0 809454B0 0C03F494 */ jal Math_atan2f +/* 0C7E0 809454B0 0C03F494 */ jal Math_FAtan2F /* 0C7E4 809454B4 E7AE00C0 */ swc1 $f14, 0x00C0($sp) /* 0C7E8 809454B8 3C018095 */ lui $at, %hi(D_8094B170) ## $at = 80950000 /* 0C7EC 809454BC C42AB170 */ lwc1 $f10, %lo(D_8094B170)($at) @@ -91,7 +91,7 @@ glabel func_809453EC /* 0C814 809454E4 00000000 */ nop /* 0C818 809454E8 A6280032 */ sh $t0, 0x0032($s1) ## 00000032 /* 0C81C 809454EC 46000384 */ sqrt.s $f14, $f0 -/* 0C820 809454F0 0C03F494 */ jal Math_atan2f +/* 0C820 809454F0 0C03F494 */ jal Math_FAtan2F /* 0C824 809454F4 C7AC00C4 */ lwc1 $f12, 0x00C4($sp) /* 0C828 809454F8 3C018095 */ lui $at, %hi(D_8094B174) ## $at = 80950000 /* 0C82C 809454FC C428B174 */ lwc1 $f8, %lo(D_8094B174)($at) @@ -171,13 +171,13 @@ glabel func_809453EC /* 0C940 80945610 A7A50094 */ sh $a1, 0x0094($sp) /* 0C944 80945614 26240524 */ addiu $a0, $s1, 0x0524 ## $a0 = 00000524 /* 0C948 80945618 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 0C94C 8094561C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0C94C 8094561C 0C01E1EF */ jal Math_ApproachS /* 0C950 80945620 24070800 */ addiu $a3, $zero, 0x0800 ## $a3 = 00000800 /* 0C954 80945624 26240526 */ addiu $a0, $s1, 0x0526 ## $a0 = 00000526 /* 0C958 80945628 87A50096 */ lh $a1, 0x0096($sp) /* 0C95C 8094562C 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 0C960 80945630 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0C960 80945630 0C01E1EF */ jal Math_ApproachS /* 0C964 80945634 24070800 */ addiu $a3, $zero, 0x0800 ## $a3 = 00000800 /* 0C968 80945638 86220178 */ lh $v0, 0x0178($s1) ## 00000178 @@ -314,17 +314,17 @@ glabel func_809453EC /* 0CB54 80945824 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 .L80945828: /* 0CB58 80945828 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 0CB5C 8094582C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0CB5C 8094582C 0C00CFC8 */ jal Rand_CenteredFloat /* 0CB60 80945830 00000000 */ nop /* 0CB64 80945834 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0CB68 80945838 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 0CB6C 8094583C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0CB6C 8094583C 0C00CFC8 */ jal Rand_CenteredFloat /* 0CB70 80945840 E7A00084 */ swc1 $f0, 0x0084($sp) /* 0CB74 80945844 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0CB78 80945848 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 0CB7C 8094584C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0CB7C 8094584C 0C00CFC8 */ jal Rand_CenteredFloat /* 0CB80 80945850 E7A00088 */ swc1 $f0, 0x0088($sp) /* 0CB84 80945854 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -332,7 +332,7 @@ glabel func_809453EC /* 0CB8C 8094585C E7A0008C */ swc1 $f0, 0x008C($sp) /* 0CB90 80945860 E7B40078 */ swc1 $f20, 0x0078($sp) /* 0CB94 80945864 E7B4007C */ swc1 $f20, 0x007C($sp) -/* 0CB98 80945868 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0CB98 80945868 0C00CFBE */ jal Rand_ZeroFloat /* 0CB9C 8094586C E7B40080 */ swc1 $f20, 0x0080($sp) /* 0CBA0 80945870 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 @@ -383,7 +383,7 @@ glabel func_809453EC /* 0CC4C 8094591C AF2A0008 */ sw $t2, 0x0008($t9) ## 00000008 .L80945920: /* 0CC50 80945920 3C018095 */ lui $at, %hi(D_8094B184) ## $at = 80950000 -/* 0CC54 80945924 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0CC54 80945924 0C00CFBE */ jal Rand_ZeroFloat /* 0CC58 80945928 C42CB184 */ lwc1 $f12, %lo(D_8094B184)($at) /* 0CC5C 8094592C 4600028D */ trunc.w.s $f10, $f0 @@ -402,19 +402,19 @@ glabel func_809453EC /* 0CC90 80945960 8F2801EC */ lw $t0, 0x01EC($t9) ## 000001EC /* 0CC94 80945964 AD680004 */ sw $t0, 0x0004($t3) ## FFFFFFA0 /* 0CC98 80945968 8F2901F0 */ lw $t1, 0x01F0($t9) ## 000001F0 -/* 0CC9C 8094596C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0CC9C 8094596C 0C00CFC8 */ jal Rand_CenteredFloat /* 0CCA0 80945970 AD690008 */ sw $t1, 0x0008($t3) ## FFFFFFA4 /* 0CCA4 80945974 C7B0006C */ lwc1 $f16, 0x006C($sp) /* 0CCA8 80945978 4600A306 */ mov.s $f12, $f20 /* 0CCAC 8094597C 46008480 */ add.s $f18, $f16, $f0 -/* 0CCB0 80945980 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0CCB0 80945980 0C00CFC8 */ jal Rand_CenteredFloat /* 0CCB4 80945984 E7B2006C */ swc1 $f18, 0x006C($sp) /* 0CCB8 80945988 C7A40070 */ lwc1 $f4, 0x0070($sp) /* 0CCBC 8094598C 4600A306 */ mov.s $f12, $f20 /* 0CCC0 80945990 46002180 */ add.s $f6, $f4, $f0 -/* 0CCC4 80945994 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0CCC4 80945994 0C00CFC8 */ jal Rand_CenteredFloat /* 0CCC8 80945998 E7A60070 */ swc1 $f6, 0x0070($sp) /* 0CCCC 8094599C C7A80074 */ lwc1 $f8, 0x0074($sp) @@ -424,17 +424,17 @@ glabel func_809453EC /* 0CCDC 809459AC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0CCE0 809459B0 44816000 */ mtc1 $at, $f12 ## $f12 = 0.50 /* 0CCE4 809459B4 E7B00058 */ swc1 $f16, 0x0058($sp) -/* 0CCE8 809459B8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0CCE8 809459B8 0C00CFC8 */ jal Rand_CenteredFloat /* 0CCEC 809459BC E7AA0074 */ swc1 $f10, 0x0074($sp) /* 0CCF0 809459C0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0CCF4 809459C4 44816000 */ mtc1 $at, $f12 ## $f12 = 0.50 -/* 0CCF8 809459C8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0CCF8 809459C8 0C00CFC8 */ jal Rand_CenteredFloat /* 0CCFC 809459CC E7A00054 */ swc1 $f0, 0x0054($sp) /* 0CD00 809459D0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 0CD04 809459D4 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 0CD08 809459D8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0CD08 809459D8 0C00CFBE */ jal Rand_ZeroFloat /* 0CD0C 809459DC E7A0005C */ swc1 $f0, 0x005C($sp) /* 0CD10 809459E0 4600048D */ trunc.w.s $f18, $f0 @@ -467,7 +467,7 @@ glabel func_809453EC /* 0CD78 80945A48 262401AC */ addiu $a0, $s1, 0x01AC ## $a0 = 000001AC /* 0CD7C 80945A4C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0CD80 80945A50 4405A000 */ mfc1 $a1, $f20 -/* 0CD84 80945A54 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0CD84 80945A54 0C01E107 */ jal Math_ApproachF /* 0CD88 80945A58 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 /* 0CD8C 80945A5C 86390178 */ lh $t9, 0x0178($s1) ## 00000178 @@ -539,7 +539,7 @@ glabel func_809453EC .L80945B50: /* 0CE80 80945B50 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 0CE84 80945B54 240500C8 */ addiu $a1, $zero, 0x00C8 ## $a1 = 000000C8 -/* 0CE88 80945B58 0C01DF64 */ jal Math_Rand_S16Offset +/* 0CE88 80945B58 0C01DF64 */ jal Rand_S16Offset /* 0CE8C 80945B5C A7A30052 */ sh $v1, 0x0052($sp) /* 0CE90 80945B60 87A30052 */ lh $v1, 0x0052($sp) @@ -578,7 +578,7 @@ glabel func_809453EC /* 0CF08 80945BD8 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3B03126F /* 0CF0C 80945BDC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0CF10 80945BE0 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3D23D70A -/* 0CF14 80945BE4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0CF14 80945BE4 0C01E107 */ jal Math_ApproachF /* 0CF18 80945BE8 244401B8 */ addiu $a0, $v0, 0x01B8 ## $a0 = 809501B8 /* 0CF1C 80945BEC 10000044 */ beq $zero, $zero, .L80945D00 @@ -609,7 +609,7 @@ glabel func_809453EC /* 0CF74 80945C44 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0CF78 80945C48 248401A8 */ addiu $a0, $a0, 0x01A8 ## $a0 = 000001A8 /* 0CF7C 80945C4C 44072000 */ mfc1 $a3, $f4 -/* 0CF80 80945C50 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0CF80 80945C50 0C01E107 */ jal Math_ApproachF /* 0CF84 80945C54 00000000 */ nop /* 0CF88 80945C58 3C018095 */ lui $at, %hi(D_8094B190) ## $at = 80950000 @@ -621,7 +621,7 @@ glabel func_809453EC /* 0CFA0 80945C70 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0CFA4 80945C74 248401B4 */ addiu $a0, $a0, 0x01B4 ## $a0 = 000001B4 /* 0CFA8 80945C78 44075000 */ mfc1 $a3, $f10 -/* 0CFAC 80945C7C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0CFAC 80945C7C 0C01E107 */ jal Math_ApproachF /* 0CFB0 80945C80 00000000 */ nop /* 0CFB4 80945C84 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -633,7 +633,7 @@ glabel func_809453EC /* 0CFCC 80945C9C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0CFD0 80945CA0 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC /* 0CFD4 80945CA4 44072000 */ mfc1 $a3, $f4 -/* 0CFD8 80945CA8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0CFD8 80945CA8 0C01E107 */ jal Math_ApproachF /* 0CFDC 80945CAC 00000000 */ nop /* 0CFE0 80945CB0 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 @@ -645,7 +645,7 @@ glabel func_809453EC /* 0CFF8 80945CC8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0CFFC 80945CCC 248401B0 */ addiu $a0, $a0, 0x01B0 ## $a0 = 000001B0 /* 0D000 80945CD0 44075000 */ mfc1 $a3, $f10 -/* 0D004 80945CD4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0D004 80945CD4 0C01E107 */ jal Math_ApproachF /* 0D008 80945CD8 00000000 */ nop /* 0D00C 80945CDC 8E0A0000 */ lw $t2, 0x0000($s0) ## 8094C848 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945D14.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945D14.s index 7f6bf39309..f254b76c1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945D14.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945D14.s @@ -82,7 +82,7 @@ glabel func_80945D14 /* 0D100 80945DD0 C628002C */ lwc1 $f8, 0x002C($s1) ## 0000002C /* 0D104 80945DD4 C446002C */ lwc1 $f6, 0x002C($v0) ## 0000002C /* 0D108 80945DD8 46083381 */ sub.s $f14, $f6, $f8 -/* 0D10C 80945DDC 0C03F494 */ jal Math_atan2f +/* 0D10C 80945DDC 0C03F494 */ jal Math_FAtan2F /* 0D110 80945DE0 E7AE0118 */ swc1 $f14, 0x0118($sp) /* 0D114 80945DE4 3C018095 */ lui $at, %hi(D_8094B194) ## $at = 80950000 /* 0D118 80945DE8 C42AB194 */ lwc1 $f10, %lo(D_8094B194)($at) @@ -98,7 +98,7 @@ glabel func_80945D14 /* 0D140 80945E10 00000000 */ nop /* 0D144 80945E14 A6390032 */ sh $t9, 0x0032($s1) ## 00000032 /* 0D148 80945E18 46000384 */ sqrt.s $f14, $f0 -/* 0D14C 80945E1C 0C03F494 */ jal Math_atan2f +/* 0D14C 80945E1C 0C03F494 */ jal Math_FAtan2F /* 0D150 80945E20 C7AC011C */ lwc1 $f12, 0x011C($sp) /* 0D154 80945E24 3C018095 */ lui $at, %hi(D_8094B198) ## $at = 80950000 /* 0D158 80945E28 C428B198 */ lwc1 $f8, %lo(D_8094B198)($at) @@ -178,13 +178,13 @@ glabel func_80945D14 /* 0D26C 80945F3C A7A500EC */ sh $a1, 0x00EC($sp) /* 0D270 80945F40 26240524 */ addiu $a0, $s1, 0x0524 ## $a0 = 00000524 /* 0D274 80945F44 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 0D278 80945F48 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0D278 80945F48 0C01E1EF */ jal Math_ApproachS /* 0D27C 80945F4C 24070800 */ addiu $a3, $zero, 0x0800 ## $a3 = 00000800 /* 0D280 80945F50 26240526 */ addiu $a0, $s1, 0x0526 ## $a0 = 00000526 /* 0D284 80945F54 87A500EE */ lh $a1, 0x00EE($sp) /* 0D288 80945F58 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 0D28C 80945F5C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0D28C 80945F5C 0C01E1EF */ jal Math_ApproachS /* 0D290 80945F60 24070800 */ addiu $a3, $zero, 0x0800 ## $a3 = 00000800 /* 0D294 80945F64 86220178 */ lh $v0, 0x0178($s1) ## 00000178 @@ -318,17 +318,17 @@ glabel func_80945D14 /* 0D474 80946144 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 .L80946148: /* 0D478 80946148 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 0D47C 8094614C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D47C 8094614C 0C00CFC8 */ jal Rand_CenteredFloat /* 0D480 80946150 00000000 */ nop /* 0D484 80946154 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0D488 80946158 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 0D48C 8094615C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D48C 8094615C 0C00CFC8 */ jal Rand_CenteredFloat /* 0D490 80946160 E7A000DC */ swc1 $f0, 0x00DC($sp) /* 0D494 80946164 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0D498 80946168 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 0D49C 8094616C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D49C 8094616C 0C00CFC8 */ jal Rand_CenteredFloat /* 0D4A0 80946170 E7A000E0 */ swc1 $f0, 0x00E0($sp) /* 0D4A4 80946174 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -336,7 +336,7 @@ glabel func_80945D14 /* 0D4AC 8094617C E7A000E4 */ swc1 $f0, 0x00E4($sp) /* 0D4B0 80946180 E7B400D0 */ swc1 $f20, 0x00D0($sp) /* 0D4B4 80946184 E7B400D4 */ swc1 $f20, 0x00D4($sp) -/* 0D4B8 80946188 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0D4B8 80946188 0C00CFBE */ jal Rand_ZeroFloat /* 0D4BC 8094618C E7B400D8 */ swc1 $f20, 0x00D8($sp) /* 0D4C0 80946190 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 @@ -386,7 +386,7 @@ glabel func_80945D14 /* 0D568 80946238 ADB80008 */ sw $t8, 0x0008($t5) ## 00000008 .L8094623C: /* 0D56C 8094623C 3C018095 */ lui $at, %hi(D_8094B1A8) ## $at = 80950000 -/* 0D570 80946240 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0D570 80946240 0C00CFBE */ jal Rand_ZeroFloat /* 0D574 80946244 C42CB1A8 */ lwc1 $f12, %lo(D_8094B1A8)($at) /* 0D578 80946248 4600028D */ trunc.w.s $f10, $f0 @@ -405,19 +405,19 @@ glabel func_80945D14 /* 0D5AC 8094627C 8DAE01EC */ lw $t6, 0x01EC($t5) ## 000001EC /* 0D5B0 80946280 AF2E0004 */ sw $t6, 0x0004($t9) ## FFFFFFA0 /* 0D5B4 80946284 8DAF01F0 */ lw $t7, 0x01F0($t5) ## 000001F0 -/* 0D5B8 80946288 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D5B8 80946288 0C00CFC8 */ jal Rand_CenteredFloat /* 0D5BC 8094628C AF2F0008 */ sw $t7, 0x0008($t9) ## FFFFFFA4 /* 0D5C0 80946290 C7B000C4 */ lwc1 $f16, 0x00C4($sp) /* 0D5C4 80946294 4600A306 */ mov.s $f12, $f20 /* 0D5C8 80946298 46008480 */ add.s $f18, $f16, $f0 -/* 0D5CC 8094629C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D5CC 8094629C 0C00CFC8 */ jal Rand_CenteredFloat /* 0D5D0 809462A0 E7B200C4 */ swc1 $f18, 0x00C4($sp) /* 0D5D4 809462A4 C7A400C8 */ lwc1 $f4, 0x00C8($sp) /* 0D5D8 809462A8 4600A306 */ mov.s $f12, $f20 /* 0D5DC 809462AC 46002180 */ add.s $f6, $f4, $f0 -/* 0D5E0 809462B0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D5E0 809462B0 0C00CFC8 */ jal Rand_CenteredFloat /* 0D5E4 809462B4 E7A600C8 */ swc1 $f6, 0x00C8($sp) /* 0D5E8 809462B8 C7A800CC */ lwc1 $f8, 0x00CC($sp) @@ -427,17 +427,17 @@ glabel func_80945D14 /* 0D5F8 809462C8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0D5FC 809462CC 44816000 */ mtc1 $at, $f12 ## $f12 = 0.50 /* 0D600 809462D0 E7B000B0 */ swc1 $f16, 0x00B0($sp) -/* 0D604 809462D4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D604 809462D4 0C00CFC8 */ jal Rand_CenteredFloat /* 0D608 809462D8 E7AA00CC */ swc1 $f10, 0x00CC($sp) /* 0D60C 809462DC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0D610 809462E0 44816000 */ mtc1 $at, $f12 ## $f12 = 0.50 -/* 0D614 809462E4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D614 809462E4 0C00CFC8 */ jal Rand_CenteredFloat /* 0D618 809462E8 E7A000AC */ swc1 $f0, 0x00AC($sp) /* 0D61C 809462EC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 0D620 809462F0 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 0D624 809462F4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0D624 809462F4 0C00CFBE */ jal Rand_ZeroFloat /* 0D628 809462F8 E7A000B4 */ swc1 $f0, 0x00B4($sp) /* 0D62C 809462FC 4600048D */ trunc.w.s $f18, $f0 @@ -469,7 +469,7 @@ glabel func_80945D14 /* 0D690 80946360 262401AC */ addiu $a0, $s1, 0x01AC ## $a0 = 000001AC /* 0D694 80946364 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0D698 80946368 4405A000 */ mfc1 $a1, $f20 -/* 0D69C 8094636C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0D69C 8094636C 0C01E107 */ jal Math_ApproachF /* 0D6A0 80946370 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 /* 0D6A4 80946374 86390178 */ lh $t9, 0x0178($s1) ## 00000178 @@ -515,7 +515,7 @@ glabel func_80945D14 /* 0D72C 809463FC 10200060 */ beq $at, $zero, .L80946580 /* 0D730 80946400 3C0143A0 */ lui $at, 0x43A0 ## $at = 43A00000 /* 0D734 80946404 4481A000 */ mtc1 $at, $f20 ## $f20 = 320.00 -/* 0D738 80946408 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D738 80946408 0C00CFC8 */ jal Rand_CenteredFloat /* 0D73C 8094640C 4600A306 */ mov.s $f12, $f20 /* 0D740 80946410 3C098095 */ lui $t1, %hi(D_8094C844) ## $t1 = 80950000 @@ -523,7 +523,7 @@ glabel func_80945D14 /* 0D748 80946418 4600A306 */ mov.s $f12, $f20 /* 0D74C 8094641C C52804BC */ lwc1 $f8, 0x04BC($t1) ## 809504BC /* 0D750 80946420 46080280 */ add.s $f10, $f0, $f8 -/* 0D754 80946424 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D754 80946424 0C00CFC8 */ jal Rand_CenteredFloat /* 0D758 80946428 E7AA009C */ swc1 $f10, 0x009C($sp) /* 0D75C 8094642C 3C028095 */ lui $v0, %hi(D_8094C844) ## $v0 = 80950000 @@ -543,7 +543,7 @@ glabel func_80945D14 /* 0D794 80946464 E7B40084 */ swc1 $f20, 0x0084($sp) /* 0D798 80946468 E7B4008C */ swc1 $f20, 0x008C($sp) /* 0D79C 8094646C E7A60088 */ swc1 $f6, 0x0088($sp) -/* 0D7A0 80946470 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0D7A0 80946470 0C00CFBE */ jal Rand_ZeroFloat /* 0D7A4 80946474 E7A400A0 */ swc1 $f4, 0x00A0($sp) /* 0D7A8 80946478 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -564,17 +564,17 @@ glabel func_80945D14 /* 0D7E4 809464B4 AFA0001C */ sw $zero, 0x001C($sp) /* 0D7E8 809464B8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0D7EC 809464BC 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 0D7F0 809464C0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D7F0 809464C0 0C00CFC8 */ jal Rand_CenteredFloat /* 0D7F4 809464C4 00000000 */ nop /* 0D7F8 809464C8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0D7FC 809464CC 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 0D800 809464D0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D800 809464D0 0C00CFC8 */ jal Rand_CenteredFloat /* 0D804 809464D4 E7A00090 */ swc1 $f0, 0x0090($sp) /* 0D808 809464D8 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 0D80C 809464DC 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 -/* 0D810 809464E0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0D810 809464E0 0C00CFBE */ jal Rand_ZeroFloat /* 0D814 809464E4 E7A00098 */ swc1 $f0, 0x0098($sp) /* 0D818 809464E8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -596,7 +596,7 @@ glabel func_80945D14 /* 0D858 80946528 E7AA009C */ swc1 $f10, 0x009C($sp) /* 0D85C 8094652C C45004C4 */ lwc1 $f16, 0x04C4($v0) ## 809504C4 /* 0D860 80946530 46068100 */ add.s $f4, $f16, $f6 -/* 0D864 80946534 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0D864 80946534 0C00CFBE */ jal Rand_ZeroFloat /* 0D868 80946538 E7A400A4 */ swc1 $f4, 0x00A4($sp) /* 0D86C 8094653C 3C014170 */ lui $at, 0x4170 ## $at = 41700000 @@ -622,7 +622,7 @@ glabel func_80945D14 /* 0D8B8 80946588 3C0542A0 */ lui $a1, 0x42A0 ## $a1 = 42A00000 /* 0D8BC 8094658C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0D8C0 80946590 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 0D8C4 80946594 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0D8C4 80946594 0C01E107 */ jal Math_ApproachF /* 0D8C8 80946598 248401A8 */ addiu $a0, $a0, 0x01A8 ## $a0 = 809501A8 /* 0D8CC 8094659C 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 @@ -630,7 +630,7 @@ glabel func_80945D14 /* 0D8D4 809465A4 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 0D8D8 809465A8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0D8DC 809465AC 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 0D8E0 809465B0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0D8E0 809465B0 0C01E107 */ jal Math_ApproachF /* 0D8E4 809465B4 248401B0 */ addiu $a0, $a0, 0x01B0 ## $a0 = 809501B0 /* 0D8E8 809465B8 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 @@ -641,7 +641,7 @@ glabel func_80945D14 /* 0D8FC 809465CC 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3B03126F /* 0D900 809465D0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0D904 809465D4 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3D23D70A -/* 0D908 809465D8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0D908 809465D8 0C01E107 */ jal Math_ApproachF /* 0D90C 809465DC 248401B4 */ addiu $a0, $a0, 0x01B4 ## $a0 = 809501B4 /* 0D910 809465E0 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 @@ -649,7 +649,7 @@ glabel func_80945D14 /* 0D918 809465E8 3C05428C */ lui $a1, 0x428C ## $a1 = 428C0000 /* 0D91C 809465EC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0D920 809465F0 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 0D924 809465F4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0D924 809465F4 0C01E107 */ jal Math_ApproachF /* 0D928 809465F8 248401C4 */ addiu $a0, $a0, 0x01C4 ## $a0 = 809501C4 /* 0D92C 809465FC 86220178 */ lh $v0, 0x0178($s1) ## 00000178 @@ -668,7 +668,7 @@ glabel func_80945D14 /* 0D958 80946628 30580003 */ andi $t8, $v0, 0x0003 ## $t8 = 00000000 /* 0D95C 8094662C 1700008C */ bne $t8, $zero, .L80946860 /* 0D960 80946630 3C018095 */ lui $at, %hi(D_8094B1B4) ## $at = 80950000 -/* 0D964 80946634 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0D964 80946634 0C00CFBE */ jal Rand_ZeroFloat /* 0D968 80946638 C42CB1B4 */ lwc1 $f12, %lo(D_8094B1B4)($at) /* 0D96C 8094663C 4600040D */ trunc.w.s $f16, $f0 @@ -708,7 +708,7 @@ glabel func_80945D14 /* 0D9F0 809466C0 3C01438C */ lui $at, 0x438C ## $at = 438C0000 .L809466C4: /* 0D9F4 809466C4 44816000 */ mtc1 $at, $f12 ## $f12 = 280.00 -/* 0D9F8 809466C8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D9F8 809466C8 0C00CFC8 */ jal Rand_CenteredFloat /* 0D9FC 809466CC 00000000 */ nop /* 0DA00 809466D0 3C0D8095 */ lui $t5, %hi(D_8094C844) ## $t5 = 80950000 @@ -717,7 +717,7 @@ glabel func_80945D14 /* 0DA0C 809466DC 44816000 */ mtc1 $at, $f12 ## $f12 = 280.00 /* 0DA10 809466E0 C5A404BC */ lwc1 $f4, 0x04BC($t5) ## 809504BC /* 0DA14 809466E4 46040200 */ add.s $f8, $f0, $f4 -/* 0DA18 809466E8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0DA18 809466E8 0C00CFC8 */ jal Rand_CenteredFloat /* 0DA1C 809466EC E7A80074 */ swc1 $f8, 0x0074($sp) /* 0DA20 809466F0 3C028095 */ lui $v0, %hi(D_8094C844) ## $v0 = 80950000 @@ -739,7 +739,7 @@ glabel func_80945D14 /* 0DA60 80946730 E7B4005C */ swc1 $f20, 0x005C($sp) /* 0DA64 80946734 E7B40064 */ swc1 $f20, 0x0064($sp) /* 0DA68 80946738 E7A40078 */ swc1 $f4, 0x0078($sp) -/* 0DA6C 8094673C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0DA6C 8094673C 0C00CFBE */ jal Rand_ZeroFloat /* 0DA70 80946740 E7A80060 */ swc1 $f8, 0x0060($sp) /* 0DA74 80946744 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -785,7 +785,7 @@ glabel func_80945D14 /* 0DB08 809467D8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0DB0C 809467DC E7A00080 */ swc1 $f0, 0x0080($sp) /* 0DB10 809467E0 44073000 */ mfc1 $a3, $f6 -/* 0DB14 809467E4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0DB14 809467E4 0C01E107 */ jal Math_ApproachF /* 0DB18 809467E8 00000000 */ nop /* 0DB1C 809467EC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -798,7 +798,7 @@ glabel func_80945D14 /* 0DB38 80946808 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0DB3C 8094680C 248401B0 */ addiu $a0, $a0, 0x01B0 ## $a0 = 809501B0 /* 0DB40 80946810 44074000 */ mfc1 $a3, $f8 -/* 0DB44 80946814 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0DB44 80946814 0C01E107 */ jal Math_ApproachF /* 0DB48 80946818 00000000 */ nop /* 0DB4C 8094681C C7A00080 */ lwc1 $f0, 0x0080($sp) @@ -807,7 +807,7 @@ glabel func_80945D14 /* 0DB58 80946828 4405A000 */ mfc1 $a1, $f20 /* 0DB5C 8094682C 44070000 */ mfc1 $a3, $f0 /* 0DB60 80946830 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0DB64 80946834 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0DB64 80946834 0C01E107 */ jal Math_ApproachF /* 0DB68 80946838 248401A8 */ addiu $a0, $a0, 0x01A8 ## $a0 = 809501A8 /* 0DB6C 8094683C 3C188095 */ lui $t8, %hi(D_8094C844) ## $t8 = 80950000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809477E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809477E0.s index 0097f1bb0a..2729a62ca6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809477E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809477E0.s @@ -240,7 +240,7 @@ glabel func_809477E0 /* 0EE2C 80947AFC 3C073B44 */ lui $a3, 0x3B44 ## $a3 = 3B440000 .L80947B00: /* 0EE30 80947B00 34E79BA6 */ ori $a3, $a3, 0x9BA6 ## $a3 = 3B449BA6 -/* 0EE34 80947B04 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0EE34 80947B04 0C01E107 */ jal Math_ApproachF /* 0EE38 80947B08 8E250038 */ lw $a1, 0x0038($s1) ## 00000038 /* 0EE3C 80947B0C 8E420000 */ lw $v0, 0x0000($s2) ## 8094C84C @@ -271,43 +271,43 @@ glabel func_809477E0 /* 0EEA0 80947B70 45020254 */ bc1fl .L809484C4 /* 0EEA4 80947B74 87A20110 */ lh $v0, 0x0110($sp) .L80947B78: -/* 0EEA8 80947B78 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0EEA8 80947B78 0C00CFC8 */ jal Rand_CenteredFloat /* 0EEAC 80947B7C 4600D306 */ mov.s $f12, $f26 /* 0EEB0 80947B80 8E490000 */ lw $t1, 0x0000($s2) ## 8094C84C /* 0EEB4 80947B84 4600F306 */ mov.s $f12, $f30 /* 0EEB8 80947B88 C5280024 */ lwc1 $f8, 0x0024($t1) ## 00000024 /* 0EEBC 80947B8C 46080280 */ add.s $f10, $f0, $f8 -/* 0EEC0 80947B90 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0EEC0 80947B90 0C00CFC8 */ jal Rand_CenteredFloat /* 0EEC4 80947B94 E7AA00F4 */ swc1 $f10, 0x00F4($sp) /* 0EEC8 80947B98 8E480000 */ lw $t0, 0x0000($s2) ## 8094C84C /* 0EECC 80947B9C 4600D306 */ mov.s $f12, $f26 /* 0EED0 80947BA0 C5100028 */ lwc1 $f16, 0x0028($t0) ## 00000028 /* 0EED4 80947BA4 46100480 */ add.s $f18, $f0, $f16 -/* 0EED8 80947BA8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0EED8 80947BA8 0C00CFC8 */ jal Rand_CenteredFloat /* 0EEDC 80947BAC E7B200F8 */ swc1 $f18, 0x00F8($sp) /* 0EEE0 80947BB0 8E4A0000 */ lw $t2, 0x0000($s2) ## 8094C84C /* 0EEE4 80947BB4 4600C306 */ mov.s $f12, $f24 /* 0EEE8 80947BB8 C544002C */ lwc1 $f4, 0x002C($t2) ## 0000002C /* 0EEEC 80947BBC 46040180 */ add.s $f6, $f0, $f4 -/* 0EEF0 80947BC0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0EEF0 80947BC0 0C00CFC8 */ jal Rand_CenteredFloat /* 0EEF4 80947BC4 E7A600FC */ swc1 $f6, 0x00FC($sp) /* 0EEF8 80947BC8 E7A000E8 */ swc1 $f0, 0x00E8($sp) -/* 0EEFC 80947BCC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0EEFC 80947BCC 0C00CFC8 */ jal Rand_CenteredFloat /* 0EF00 80947BD0 4600C306 */ mov.s $f12, $f24 /* 0EF04 80947BD4 E7A000EC */ swc1 $f0, 0x00EC($sp) -/* 0EF08 80947BD8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0EF08 80947BD8 0C00CFC8 */ jal Rand_CenteredFloat /* 0EF0C 80947BDC 4600C306 */ mov.s $f12, $f24 /* 0EF10 80947BE0 E7A000F0 */ swc1 $f0, 0x00F0($sp) /* 0EF14 80947BE4 E7B400DC */ swc1 $f20, 0x00DC($sp) /* 0EF18 80947BE8 E7B400E0 */ swc1 $f20, 0x00E0($sp) /* 0EF1C 80947BEC E7B400E4 */ swc1 $f20, 0x00E4($sp) -/* 0EF20 80947BF0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0EF20 80947BF0 0C00CFBE */ jal Rand_ZeroFloat /* 0EF24 80947BF4 4600E306 */ mov.s $f12, $f28 /* 0EF28 80947BF8 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 @@ -439,7 +439,7 @@ glabel func_809477E0 /* 0F114 80947DE4 46128100 */ add.s $f4, $f16, $f18 /* 0F118 80947DE8 10200005 */ beq $at, $zero, .L80947E00 /* 0F11C 80947DEC E624000C */ swc1 $f4, 0x000C($s1) ## 0000000C -/* 0F120 80947DF0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0F120 80947DF0 0C01E107 */ jal Math_ApproachF /* 0F124 80947DF4 26240038 */ addiu $a0, $s1, 0x0038 ## $a0 = 00000038 /* 0F128 80947DF8 10000047 */ beq $zero, $zero, .L80947F18 @@ -447,13 +447,13 @@ glabel func_809477E0 .L80947E00: /* 0F130 80947E00 4405A000 */ mfc1 $a1, $f20 /* 0F134 80947E04 4407E000 */ mfc1 $a3, $f28 -/* 0F138 80947E08 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0F138 80947E08 0C01E107 */ jal Math_ApproachF /* 0F13C 80947E0C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 0F140 80947E10 4407E000 */ mfc1 $a3, $f28 /* 0F144 80947E14 26240038 */ addiu $a0, $s1, 0x0038 ## $a0 = 00000038 /* 0F148 80947E18 3C05447A */ lui $a1, 0x447A ## $a1 = 447A0000 -/* 0F14C 80947E1C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0F14C 80947E1C 0C01E107 */ jal Math_ApproachF /* 0F150 80947E20 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0F154 80947E24 86220030 */ lh $v0, 0x0030($s1) ## 00000030 @@ -595,14 +595,14 @@ glabel func_809477E0 /* 0F358 80948028 10200006 */ beq $at, $zero, .L80948044 /* 0F35C 8094802C E624000C */ swc1 $f4, 0x000C($s1) ## 0000000C /* 0F360 80948030 26240038 */ addiu $a0, $s1, 0x0038 ## $a0 = 00000038 -/* 0F364 80948034 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0F364 80948034 0C01E107 */ jal Math_ApproachF /* 0F368 80948038 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 0F36C 8094803C 10000011 */ beq $zero, $zero, .L80948084 /* 0F370 80948040 3C014120 */ lui $at, 0x4120 ## $at = 41200000 .L80948044: /* 0F374 80948044 4405A000 */ mfc1 $a1, $f20 -/* 0F378 80948048 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0F378 80948048 0C01E107 */ jal Math_ApproachF /* 0F37C 8094804C 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 0F380 80948050 862E0030 */ lh $t6, 0x0030($s1) ## 00000030 @@ -644,7 +644,7 @@ glabel func_809477E0 /* 0F408 809480D8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 0F40C 809480DC 26240034 */ addiu $a0, $s1, 0x0034 ## $a0 = 00000034 /* 0F410 809480E0 8E250038 */ lw $a1, 0x0038($s1) ## 00000038 -/* 0F414 809480E4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0F414 809480E4 0C01E107 */ jal Math_ApproachF /* 0F418 809480E8 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 0F41C 809480EC 922A0001 */ lbu $t2, 0x0001($s1) ## 00000001 @@ -662,7 +662,7 @@ glabel func_809477E0 /* 0F44C 8094811C A2200000 */ sb $zero, 0x0000($s1) ## 00000000 .L80948120: /* 0F450 80948120 8E250038 */ lw $a1, 0x0038($s1) ## 00000038 -/* 0F454 80948124 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0F454 80948124 0C01E107 */ jal Math_ApproachF /* 0F458 80948128 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 0F45C 8094812C 862E002C */ lh $t6, 0x002C($s1) ## 0000002C @@ -709,7 +709,7 @@ glabel func_809477E0 /* 0F4F4 809481C4 46008482 */ mul.s $f18, $f16, $f0 /* 0F4F8 809481C8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0F4FC 809481CC 44079000 */ mfc1 $a3, $f18 -/* 0F500 809481D0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0F500 809481D0 0C01E107 */ jal Math_ApproachF /* 0F504 809481D4 00000000 */ nop /* 0F508 809481D8 C6240034 */ lwc1 $f4, 0x0034($s1) ## 00000034 @@ -740,7 +740,7 @@ glabel func_809477E0 .L80948238: /* 0F568 80948238 3C073D23 */ lui $a3, 0x3D23 ## $a3 = 3D230000 /* 0F56C 8094823C 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3D23D70A -/* 0F570 80948240 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0F570 80948240 0C01E107 */ jal Math_ApproachF /* 0F574 80948244 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 0F578 80948248 8E380044 */ lw $t8, 0x0044($s1) ## 00000044 @@ -753,7 +753,7 @@ glabel func_809477E0 /* 0F594 80948264 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3B03126F /* 0F598 80948268 34A59BA6 */ ori $a1, $a1, 0x9BA6 ## $a1 = 3C449BA6 /* 0F59C 8094826C 26240034 */ addiu $a0, $s1, 0x0034 ## $a0 = 00000034 -/* 0F5A0 80948270 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0F5A0 80948270 0C01E107 */ jal Math_ApproachF /* 0F5A4 80948274 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0F5A8 80948278 C626003C */ lwc1 $f6, 0x003C($s1) ## 0000003C @@ -813,7 +813,7 @@ glabel func_809477E0 .L80948344: /* 0F674 80948344 3C073B03 */ lui $a3, 0x3B03 ## $a3 = 3B030000 /* 0F678 80948348 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3B03126F -/* 0F67C 8094834C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0F67C 8094834C 0C01E107 */ jal Math_ApproachF /* 0F680 80948350 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 .L80948354: @@ -829,7 +829,7 @@ glabel func_809477E0 /* 0F6A8 80948378 33090007 */ andi $t1, $t8, 0x0007 ## $t1 = 00000000 /* 0F6AC 8094837C 55200051 */ bnel $t1, $zero, .L809484C4 /* 0F6B0 80948380 87A20110 */ lh $v0, 0x0110($sp) -/* 0F6B4 80948384 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0F6B4 80948384 0C00CFBE */ jal Rand_ZeroFloat /* 0F6B8 80948388 C42CB1F4 */ lwc1 $f12, %lo(D_8094B1F4)($at) /* 0F6BC 8094838C 4600040D */ trunc.w.s $f16, $f0 @@ -843,7 +843,7 @@ glabel func_809477E0 /* 0F6DC 809483AC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0F6E0 809483B0 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 0F6E4 809483B4 4600E586 */ mov.s $f22, $f28 -/* 0F6E8 809483B8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0F6E8 809483B8 0C00CFC8 */ jal Rand_CenteredFloat /* 0F6EC 809483BC A7A300A6 */ sh $v1, 0x00A6($sp) /* 0F6F0 809483C0 87A300A6 */ lh $v1, 0x00A6($sp) @@ -855,14 +855,14 @@ glabel func_809477E0 /* 0F708 809483D8 02EA8021 */ addu $s0, $s7, $t2 /* 0F70C 809483DC C6120908 */ lwc1 $f18, 0x0908($s0) ## 00000908 /* 0F710 809483E0 46120100 */ add.s $f4, $f0, $f18 -/* 0F714 809483E4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0F714 809483E4 0C00CFC8 */ jal Rand_CenteredFloat /* 0F718 809483E8 E7A400C0 */ swc1 $f4, 0x00C0($sp) /* 0F71C 809483EC C606090C */ lwc1 $f6, 0x090C($s0) ## 0000090C /* 0F720 809483F0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0F724 809483F4 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 0F728 809483F8 46060200 */ add.s $f8, $f0, $f6 -/* 0F72C 809483FC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0F72C 809483FC 0C00CFC8 */ jal Rand_CenteredFloat /* 0F730 80948400 E7A800C4 */ swc1 $f8, 0x00C4($sp) /* 0F734 80948404 C60A0910 */ lwc1 $f10, 0x0910($s0) ## 00000910 @@ -871,21 +871,21 @@ glabel func_809477E0 /* 0F740 80948410 E7B000C8 */ swc1 $f16, 0x00C8($sp) .L80948414: /* 0F744 80948414 44816000 */ mtc1 $at, $f12 ## $f12 = 0.00 -/* 0F748 80948418 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0F748 80948418 0C00CFC8 */ jal Rand_CenteredFloat /* 0F74C 8094841C 4600C586 */ mov.s $f22, $f24 /* 0F750 80948420 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 /* 0F754 80948424 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 0F758 80948428 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 0F75C 8094842C 46120100 */ add.s $f4, $f0, $f18 -/* 0F760 80948430 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0F760 80948430 0C00CFC8 */ jal Rand_CenteredFloat /* 0F764 80948434 E7A400C0 */ swc1 $f4, 0x00C0($sp) /* 0F768 80948438 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 0F76C 8094843C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 0F770 80948440 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 0F774 80948444 46060200 */ add.s $f8, $f0, $f6 -/* 0F778 80948448 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0F778 80948448 0C00CFC8 */ jal Rand_CenteredFloat /* 0F77C 8094844C E7A800C4 */ swc1 $f8, 0x00C4($sp) /* 0F780 80948450 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C @@ -902,7 +902,7 @@ glabel func_809477E0 /* 0F7A8 80948478 E7B400BC */ swc1 $f20, 0x00BC($sp) /* 0F7AC 8094847C E7B400A8 */ swc1 $f20, 0x00A8($sp) /* 0F7B0 80948480 E7B400B0 */ swc1 $f20, 0x00B0($sp) -/* 0F7B4 80948484 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0F7B4 80948484 0C00CFBE */ jal Rand_ZeroFloat /* 0F7B8 80948488 E7B200AC */ swc1 $f18, 0x00AC($sp) /* 0F7BC 8094848C 46160180 */ add.s $f6, $f0, $f22 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s index e5907157b3..d483666391 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s @@ -14,7 +14,7 @@ glabel func_80949530 /* 10890 80949560 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 10894 80949564 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 10898 80949568 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 1089C 8094956C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 1089C 8094956C 0C00CFBE */ jal Rand_ZeroFloat /* 108A0 80949570 00000000 */ nop /* 108A4 80949574 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809495A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809495A4.s index fad2363c35..a879a4f49a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809495A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809495A4.s @@ -17,7 +17,7 @@ glabel func_809495A4 /* 1090C 809495DC 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 10910 809495E0 8E0504B0 */ lw $a1, 0x04B0($s0) ## 000004B0 /* 10914 809495E4 44073000 */ mfc1 $a3, $f6 -/* 10918 809495E8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 10918 809495E8 0C01E107 */ jal Math_ApproachF /* 1091C 809495EC 00000000 */ nop /* 10920 809495F0 C6000060 */ lwc1 $f0, 0x0060($s0) ## 00000060 @@ -30,13 +30,13 @@ glabel func_809495A4 /* 1093C 8094960C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 10940 80949610 8E0504B4 */ lw $a1, 0x04B4($s0) ## 000004B4 /* 10944 80949614 44075000 */ mfc1 $a3, $f10 -/* 10948 80949618 0C01E107 */ jal Math_SmoothScaleMaxF +/* 10948 80949618 0C01E107 */ jal Math_ApproachF /* 1094C 8094961C 00000000 */ nop /* 10950 80949620 260404B4 */ addiu $a0, $s0, 0x04B4 ## $a0 = 000004B4 /* 10954 80949624 3C0543BE */ lui $a1, 0x43BE ## $a1 = 43BE0000 /* 10958 80949628 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 1095C 8094962C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 1095C 8094962C 0C01E107 */ jal Math_ApproachF /* 10960 80949630 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 10964 80949634 C6000064 */ lwc1 $f0, 0x0064($s0) ## 00000064 @@ -49,7 +49,7 @@ glabel func_809495A4 /* 10980 80949650 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 10984 80949654 8E0504B8 */ lw $a1, 0x04B8($s0) ## 000004B8 /* 10988 80949658 44079000 */ mfc1 $a3, $f18 -/* 1098C 8094965C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 1098C 8094965C 0C01E107 */ jal Math_ApproachF /* 10990 80949660 00000000 */ nop /* 10994 80949664 860E017A */ lh $t6, 0x017A($s0) ## 0000017A @@ -68,13 +68,13 @@ glabel func_809495A4 /* 109C4 80949694 44073000 */ mfc1 $a3, $f6 /* 109C8 80949698 00000000 */ nop /* 109CC 8094969C 00073C00 */ sll $a3, $a3, 16 -/* 109D0 809496A0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 109D0 809496A0 0C01E1EF */ jal Math_ApproachS /* 109D4 809496A4 00073C03 */ sra $a3, $a3, 16 /* 109D8 809496A8 260404C8 */ addiu $a0, $s0, 0x04C8 ## $a0 = 000004C8 /* 109DC 809496AC 3C054580 */ lui $a1, 0x4580 ## $a1 = 45800000 /* 109E0 809496B0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 109E4 809496B4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 109E4 809496B4 0C01E107 */ jal Math_ApproachF /* 109E8 809496B8 3C0743AF */ lui $a3, 0x43AF ## $a3 = 43AF0000 /* 109EC 809496BC 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949734.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949734.s index 73003ce3ee..0222f78de5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949734.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949734.s @@ -23,7 +23,7 @@ glabel func_80949734 /* 10AA0 80949770 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 10AA4 80949774 8E0504B0 */ lw $a1, 0x04B0($s0) ## 000004B0 /* 10AA8 80949778 44073000 */ mfc1 $a3, $f6 -/* 10AAC 8094977C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 10AAC 8094977C 0C01E107 */ jal Math_ApproachF /* 10AB0 80949780 00000000 */ nop /* 10AB4 80949784 C6000060 */ lwc1 $f0, 0x0060($s0) ## 00000060 @@ -36,7 +36,7 @@ glabel func_80949734 /* 10AD0 809497A0 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 10AD4 809497A4 8E0504B4 */ lw $a1, 0x04B4($s0) ## 000004B4 /* 10AD8 809497A8 44075000 */ mfc1 $a3, $f10 -/* 10ADC 809497AC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 10ADC 809497AC 0C01E107 */ jal Math_ApproachF /* 10AE0 809497B0 00000000 */ nop /* 10AE4 809497B4 C6000064 */ lwc1 $f0, 0x0064($s0) ## 00000064 @@ -49,13 +49,13 @@ glabel func_80949734 /* 10B00 809497D0 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 10B04 809497D4 8E0504B8 */ lw $a1, 0x04B8($s0) ## 000004B8 /* 10B08 809497D8 44079000 */ mfc1 $a3, $f18 -/* 10B0C 809497DC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 10B0C 809497DC 0C01E107 */ jal Math_ApproachF /* 10B10 809497E0 00000000 */ nop /* 10B14 809497E4 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 10B18 809497E8 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 10B1C 809497EC 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 10B20 809497F0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 10B20 809497F0 0C01E1EF */ jal Math_ApproachS /* 10B24 809497F4 24071000 */ addiu $a3, $zero, 0x1000 ## $a3 = 00001000 /* 10B28 809497F8 8FA40024 */ lw $a0, 0x0024($sp) @@ -69,7 +69,7 @@ glabel func_80949734 /* 10B48 80949818 29C1000A */ slti $at, $t6, 0x000A /* 10B4C 8094981C 10200026 */ beq $at, $zero, .L809498B8 /* 10B50 80949820 3C018095 */ lui $at, %hi(D_8094B210) ## $at = 80950000 -/* 10B54 80949824 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 10B54 80949824 0C00CFBE */ jal Rand_ZeroFloat /* 10B58 80949828 C42CB210 */ lwc1 $f12, %lo(D_8094B210)($at) /* 10B5C 8094982C 444FF800 */ cfc1 $t7, $31 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809499AC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809499AC.s index 7ca8e28367..d50ee15a07 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809499AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809499AC.s @@ -97,19 +97,19 @@ glabel func_809499AC /* 10E38 80949B08 8D6D0008 */ lw $t5, 0x0008($t3) ## 8094AA54 /* 10E3C 80949B0C AE4D0008 */ sw $t5, 0x0008($s2) ## FFFFFFE0 .L80949B10: -/* 10E40 80949B10 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 10E40 80949B10 0C00CFC8 */ jal Rand_CenteredFloat /* 10E44 80949B14 4600A306 */ mov.s $f12, $f20 /* 10E48 80949B18 E7A0007C */ swc1 $f0, 0x007C($sp) -/* 10E4C 80949B1C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 10E4C 80949B1C 0C00CFC8 */ jal Rand_CenteredFloat /* 10E50 80949B20 4600A306 */ mov.s $f12, $f20 /* 10E54 80949B24 E7A00080 */ swc1 $f0, 0x0080($sp) -/* 10E58 80949B28 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 10E58 80949B28 0C00CFC8 */ jal Rand_CenteredFloat /* 10E5C 80949B2C 4600A306 */ mov.s $f12, $f20 /* 10E60 80949B30 E7A00084 */ swc1 $f0, 0x0084($sp) -/* 10E64 80949B34 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 10E64 80949B34 0C00CFBE */ jal Rand_ZeroFloat /* 10E68 80949B38 4600B306 */ mov.s $f12, $f22 /* 10E6C 80949B3C 4600028D */ trunc.w.s $f10, $f0 @@ -148,7 +148,7 @@ glabel func_809499AC /* 10EE8 80949BB8 26C400B6 */ addiu $a0, $s6, 0x00B6 ## $a0 = 000000B6 /* 10EEC 80949BBC 86C5008A */ lh $a1, 0x008A($s6) ## 0000008A /* 10EF0 80949BC0 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 10EF4 80949BC4 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 10EF4 80949BC4 0C01E1EF */ jal Math_ApproachS /* 10EF8 80949BC8 24071000 */ addiu $a3, $zero, 0x1000 ## $a3 = 00001000 /* 10EFC 80949BCC 8FBF0064 */ lw $ra, 0x0064($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949C4C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949C4C.s index 1e87b83abe..281fc79526 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949C4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949C4C.s @@ -33,7 +33,7 @@ glabel func_80949C4C /* 10FEC 80949CBC 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 10FF0 80949CC0 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 10FF4 80949CC4 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 10FF8 80949CC8 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 10FF8 80949CC8 0C01E1EF */ jal Math_ApproachS /* 10FFC 80949CCC 24071000 */ addiu $a3, $zero, 0x1000 ## $a3 = 00001000 /* 11000 80949CD0 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s index 2f6a436fc8..6369a78ca7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s @@ -30,14 +30,14 @@ glabel func_80949E10 /* 11194 80949E64 55600031 */ bnel $t3, $zero, .L80949F2C /* 11198 80949E68 26040568 */ addiu $a0, $s0, 0x0568 ## $a0 = 00000568 /* 1119C 80949E6C 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 111A0 80949E70 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 111A0 80949E70 0C00CFC8 */ jal Rand_CenteredFloat /* 111A4 80949E74 00000000 */ nop /* 111A8 80949E78 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 111AC 80949E7C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 111B0 80949E80 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 111B4 80949E84 46040180 */ add.s $f6, $f0, $f4 -/* 111B8 80949E88 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 111B8 80949E88 0C00CFC8 */ jal Rand_CenteredFloat /* 111BC 80949E8C E7A60058 */ swc1 $f6, 0x0058($sp) /* 111C0 80949E90 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 @@ -46,7 +46,7 @@ glabel func_80949E10 /* 111CC 80949E9C 46080280 */ add.s $f10, $f0, $f8 /* 111D0 80949EA0 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 111D4 80949EA4 46105480 */ add.s $f18, $f10, $f16 -/* 111D8 80949EA8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 111D8 80949EA8 0C00CFC8 */ jal Rand_CenteredFloat /* 111DC 80949EAC E7B2005C */ swc1 $f18, 0x005C($sp) /* 111E0 80949EB0 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C @@ -62,7 +62,7 @@ glabel func_80949E10 /* 11208 80949ED8 E7A20054 */ swc1 $f2, 0x0054($sp) /* 1120C 80949EDC E7A20040 */ swc1 $f2, 0x0040($sp) /* 11210 80949EE0 E7A20048 */ swc1 $f2, 0x0048($sp) -/* 11214 80949EE4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 11214 80949EE4 0C00CFBE */ jal Rand_ZeroFloat /* 11218 80949EE8 E7A80044 */ swc1 $f8, 0x0044($sp) /* 1121C 80949EEC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -98,7 +98,7 @@ glabel func_80949E10 /* 1128C 80949F5C 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 11290 80949F60 A6190160 */ sh $t9, 0x0160($s0) ## 00000160 .L80949F64: -/* 11294 80949F64 0C01E107 */ jal Math_SmoothScaleMaxF +/* 11294 80949F64 0C01E107 */ jal Math_ApproachF /* 11298 80949F68 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 1129C 80949F6C C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 @@ -108,7 +108,7 @@ glabel func_80949E10 /* 112AC 80949F7C 46049180 */ add.s $f6, $f18, $f4 /* 112B0 80949F80 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 112B4 80949F84 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 112B8 80949F88 0C01E107 */ jal Math_SmoothScaleMaxF +/* 112B8 80949F88 0C01E107 */ jal Math_ApproachF /* 112BC 80949F8C E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 /* 112C0 80949F90 3C014248 */ lui $at, 0x4248 ## $at = 42480000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s index 9e7a46b424..5602629b69 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s @@ -12,7 +12,7 @@ glabel func_8094A12C /* 11480 8094A150 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 11484 8094A154 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 11488 8094A158 8E0504B4 */ lw $a1, 0x04B4($s0) ## 000004B4 -/* 1148C 8094A15C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 1148C 8094A15C 0C01E107 */ jal Math_ApproachF /* 11490 8094A160 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 11494 8094A164 8FA40024 */ lw $a0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s index e99672b112..931c9c2626 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s @@ -30,7 +30,7 @@ glabel func_8094A1C0 /* 1153C 8094A20C 249204B0 */ addiu $s2, $a0, 0x04B0 ## $s2 = 000004B0 /* 11540 8094A210 2414000C */ addiu $s4, $zero, 0x000C ## $s4 = 0000000C .L8094A214: -/* 11544 8094A214 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 11544 8094A214 0C00CFBE */ jal Rand_ZeroFloat /* 11548 8094A218 4600C306 */ mov.s $f12, $f24 /* 1154C 8094A21C 4600010D */ trunc.w.s $f4, $f0 @@ -92,7 +92,7 @@ glabel func_8094A1C0 /* 11628 8094A2F8 E60004B4 */ swc1 $f0, 0x04B4($s0) ## 000004B4 /* 1162C 8094A2FC E61204C8 */ swc1 $f18, 0x04C8($s0) ## 000004C8 /* 11630 8094A300 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 11634 8094A304 0C03F494 */ jal Math_atan2f +/* 11634 8094A304 0C03F494 */ jal Math_FAtan2F /* 11638 8094A308 460A0601 */ sub.s $f24, $f0, $f10 /* 1163C 8094A30C 3C018095 */ lui $at, %hi(D_8094B220) ## $at = 80950000 /* 11640 8094A310 C43AB220 */ lwc1 $f26, %lo(D_8094B220)($at) @@ -106,7 +106,7 @@ glabel func_8094A1C0 /* 11660 8094A330 46045000 */ add.s $f0, $f10, $f4 /* 11664 8094A334 440C4000 */ mfc1 $t4, $f8 /* 11668 8094A338 46000384 */ sqrt.s $f14, $f0 -/* 1166C 8094A33C 0C03F494 */ jal Math_atan2f +/* 1166C 8094A33C 0C03F494 */ jal Math_FAtan2F /* 11670 8094A340 A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 /* 11674 8094A344 461A0182 */ mul.s $f6, $f0, $f26 /* 11678 8094A348 3C050603 */ lui $a1, %hi(D_06032BF8) ## $a1 = 06030000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A398.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A398.s index f4e9a79d08..e6178b0066 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A398.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A398.s @@ -28,7 +28,7 @@ glabel func_8094A398 /* 1170C 8094A3DC C60404B8 */ lwc1 $f4, 0x04B8($s0) ## 000004B8 /* 11710 8094A3E0 E7AC003C */ swc1 $f12, 0x003C($sp) /* 11714 8094A3E4 46062381 */ sub.s $f14, $f4, $f6 -/* 11718 8094A3E8 0C03F494 */ jal Math_atan2f +/* 11718 8094A3E8 0C03F494 */ jal Math_FAtan2F /* 1171C 8094A3EC E7AE0034 */ swc1 $f14, 0x0034($sp) /* 11720 8094A3F0 3C018095 */ lui $at, %hi(D_8094B224) ## $at = 80950000 /* 11724 8094A3F4 C428B224 */ lwc1 $f8, %lo(D_8094B224)($at) @@ -48,7 +48,7 @@ glabel func_8094A398 /* 1175C 8094A42C 46000384 */ sqrt.s $f14, $f0 /* 11760 8094A430 468021A0 */ cvt.s.w $f6, $f4 /* 11764 8094A434 E7AE0028 */ swc1 $f14, 0x0028($sp) -/* 11768 8094A438 0C03F494 */ jal Math_atan2f +/* 11768 8094A438 0C03F494 */ jal Math_FAtan2F /* 1176C 8094A43C E7A6002C */ swc1 $f6, 0x002C($sp) /* 11770 8094A440 3C018095 */ lui $at, %hi(D_8094B228) ## $at = 80950000 /* 11774 8094A444 C432B228 */ lwc1 $f18, %lo(D_8094B228)($at) @@ -70,7 +70,7 @@ glabel func_8094A398 /* 117B4 8094A484 44059000 */ mfc1 $a1, $f18 /* 117B8 8094A488 00000000 */ nop /* 117BC 8094A48C 00052C00 */ sll $a1, $a1, 16 -/* 117C0 8094A490 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 117C0 8094A490 0C01E1EF */ jal Math_ApproachS /* 117C4 8094A494 00052C03 */ sra $a1, $a1, 16 /* 117C8 8094A498 C7A8002C */ lwc1 $f8, 0x002C($sp) @@ -85,7 +85,7 @@ glabel func_8094A398 /* 117EC 8094A4BC 00052C03 */ sra $a1, $a1, 16 /* 117F0 8094A4C0 00073C00 */ sll $a3, $a3, 16 /* 117F4 8094A4C4 00073C03 */ sra $a3, $a3, 16 -/* 117F8 8094A4C8 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 117F8 8094A4C8 0C01E1EF */ jal Math_ApproachS /* 117FC 8094A4CC AFA50020 */ sw $a1, 0x0020($sp) /* 11800 8094A4D0 C60604C8 */ lwc1 $f6, 0x04C8($s0) ## 000004C8 @@ -96,19 +96,19 @@ glabel func_8094A398 /* 11814 8094A4E4 44074000 */ mfc1 $a3, $f8 /* 11818 8094A4E8 00000000 */ nop /* 1181C 8094A4EC 00073C00 */ sll $a3, $a3, 16 -/* 11820 8094A4F0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 11820 8094A4F0 0C01E1EF */ jal Math_ApproachS /* 11824 8094A4F4 00073C03 */ sra $a3, $a3, 16 /* 11828 8094A4F8 260404C8 */ addiu $a0, $s0, 0x04C8 ## $a0 = 000004C8 /* 1182C 8094A4FC 3C0544FA */ lui $a1, 0x44FA ## $a1 = 44FA0000 /* 11830 8094A500 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 11834 8094A504 0C01E107 */ jal Math_SmoothScaleMaxF +/* 11834 8094A504 0C01E107 */ jal Math_ApproachF /* 11838 8094A508 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 1183C 8094A50C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 11840 8094A510 3C0541F0 */ lui $a1, 0x41F0 ## $a1 = 41F00000 /* 11844 8094A514 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 11848 8094A518 0C01E107 */ jal Math_SmoothScaleMaxF +/* 11848 8094A518 0C01E107 */ jal Math_ApproachF /* 1184C 8094A51C 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 11850 8094A520 0C00B642 */ jal func_8002D908 @@ -123,7 +123,7 @@ glabel func_8094A398 /* 11874 8094A544 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 11878 8094A548 8E0504B0 */ lw $a1, 0x04B0($s0) ## 000004B0 /* 1187C 8094A54C 44079000 */ mfc1 $a3, $f18 -/* 11880 8094A550 0C01E107 */ jal Math_SmoothScaleMaxF +/* 11880 8094A550 0C01E107 */ jal Math_ApproachF /* 11884 8094A554 00000000 */ nop /* 11888 8094A558 C6000060 */ lwc1 $f0, 0x0060($s0) ## 00000060 @@ -136,13 +136,13 @@ glabel func_8094A398 /* 118A4 8094A574 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 118A8 8094A578 8E0504B4 */ lw $a1, 0x04B4($s0) ## 000004B4 /* 118AC 8094A57C 44073000 */ mfc1 $a3, $f6 -/* 118B0 8094A580 0C01E107 */ jal Math_SmoothScaleMaxF +/* 118B0 8094A580 0C01E107 */ jal Math_ApproachF /* 118B4 8094A584 00000000 */ nop /* 118B8 8094A588 260404B4 */ addiu $a0, $s0, 0x04B4 ## $a0 = 000004B4 /* 118BC 8094A58C 3C0543BE */ lui $a1, 0x43BE ## $a1 = 43BE0000 /* 118C0 8094A590 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 118C4 8094A594 0C01E107 */ jal Math_SmoothScaleMaxF +/* 118C4 8094A594 0C01E107 */ jal Math_ApproachF /* 118C8 8094A598 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 118CC 8094A59C C6000064 */ lwc1 $f0, 0x0064($s0) ## 00000064 @@ -155,7 +155,7 @@ glabel func_8094A398 /* 118E8 8094A5B8 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 118EC 8094A5BC 8E0504B8 */ lw $a1, 0x04B8($s0) ## 000004B8 /* 118F0 8094A5C0 44075000 */ mfc1 $a3, $f10 -/* 118F4 8094A5C4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 118F4 8094A5C4 0C01E107 */ jal Math_ApproachF /* 118F8 8094A5C8 00000000 */ nop /* 118FC 8094A5CC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Update.s index 580997748a..a381e91974 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Update.s @@ -133,7 +133,7 @@ glabel L80957E74 /* 08C0C 80957ECC 00042400 */ sll $a0, $a0, 16 /* 08C10 80957ED0 ACD90040 */ sw $t9, 0x0040($a2) ## 00000040 /* 08C14 80957ED4 AFA60018 */ sw $a2, 0x0018($sp) -/* 08C18 80957ED8 0C01DE0D */ jal Math_Coss +/* 08C18 80957ED8 0C01DE0D */ jal Math_CosS ## coss? /* 08C1C 80957EDC 00042403 */ sra $a0, $a0, 16 /* 08C20 80957EE0 8FA60018 */ lw $a2, 0x0018($sp) @@ -154,7 +154,7 @@ glabel L80957E74 /* 08C5C 80957F1C 00042080 */ sll $a0, $a0, 2 /* 08C60 80957F20 00042400 */ sll $a0, $a0, 16 /* 08C64 80957F24 00042403 */ sra $a0, $a0, 16 -/* 08C68 80957F28 0C01DE1C */ jal Math_Sins +/* 08C68 80957F28 0C01DE1C */ jal Math_SinS ## sins? /* 08C6C 80957F2C E4C401DC */ swc1 $f4, 0x01DC($a2) ## 000001DC /* 08C70 80957F30 3C018096 */ lui $at, %hi(D_8095C81C) ## $at = 80960000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C8.s index 3f2692155b..07bb6572c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C8.s @@ -72,7 +72,7 @@ glabel L8094F39C /* 000F0 8094F3B0 01091021 */ addu $v0, $t0, $t1 /* 000F4 8094F3B4 844A0002 */ lh $t2, 0x0002($v0) ## 00000002 /* 000F8 8094F3B8 A60A00B6 */ sh $t2, 0x00B6($s0) ## 000000B6 -/* 000FC 8094F3BC 0C01DE0D */ jal Math_Coss +/* 000FC 8094F3BC 0C01DE0D */ jal Math_CosS ## coss? /* 00100 8094F3C0 84440002 */ lh $a0, 0x0002($v0) ## 00000002 /* 00104 8094F3C4 E7A00020 */ swc1 $f0, 0x0020($sp) @@ -82,7 +82,7 @@ glabel L8094F39C /* 00114 8094F3D4 018B6023 */ subu $t4, $t4, $t3 /* 00118 8094F3D8 000C6040 */ sll $t4, $t4, 1 /* 0011C 8094F3DC 008C2021 */ addu $a0, $a0, $t4 -/* 00120 8094F3E0 0C01DE1C */ jal Math_Sins +/* 00120 8094F3E0 0C01DE1C */ jal Math_SinS ## sins? /* 00124 8094F3E4 8484C17E */ lh $a0, %lo(D_8095C17E)($a0) /* 00128 8094F3E8 860D001C */ lh $t5, 0x001C($s0) ## 0000001C @@ -110,7 +110,7 @@ glabel L8094F39C /* 00180 8094F440 016A6021 */ addu $t4, $t3, $t2 /* 00184 8094F444 01994023 */ subu $t0, $t4, $t9 /* 00188 8094F448 A60800B4 */ sh $t0, 0x00B4($s0) ## 000000B4 -/* 0018C 8094F44C 0C01DE0D */ jal Math_Coss +/* 0018C 8094F44C 0C01DE0D */ jal Math_CosS ## coss? /* 00190 8094F450 84440002 */ lh $a0, 0x0002($v0) ## 00000002 /* 00194 8094F454 E7A00020 */ swc1 $f0, 0x0020($sp) @@ -120,7 +120,7 @@ glabel L8094F39C /* 001A4 8094F464 01695823 */ subu $t3, $t3, $t1 /* 001A8 8094F468 000B5840 */ sll $t3, $t3, 1 /* 001AC 8094F46C 008B2021 */ addu $a0, $a0, $t3 -/* 001B0 8094F470 0C01DE1C */ jal Math_Sins +/* 001B0 8094F470 0C01DE1C */ jal Math_SinS ## sins? /* 001B4 8094F474 8484C17E */ lh $a0, %lo(D_8095C17E)($a0) /* 001B8 8094F478 862A00B4 */ lh $t2, 0x00B4($s1) ## 000000B4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F50C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F50C.s index de7d3a4d45..2370b4ee4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F50C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F50C.s @@ -27,19 +27,19 @@ glabel func_8094F50C /* 002B0 8094F570 24100002 */ addiu $s0, $zero, 0x0002 ## $s0 = 00000002 /* 002B4 8094F574 27B30050 */ addiu $s3, $sp, 0x0050 ## $s3 = FFFFFFF0 .L8094F578: -/* 002B8 8094F578 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 002B8 8094F578 0C00CFC8 */ jal Rand_CenteredFloat /* 002BC 8094F57C 4600A306 */ mov.s $f12, $f20 /* 002C0 8094F580 C6240000 */ lwc1 $f4, 0x0000($s1) ## 00000000 /* 002C4 8094F584 46040180 */ add.s $f6, $f0, $f4 -/* 002C8 8094F588 0C03F66B */ jal Math_Rand_ZeroOne +/* 002C8 8094F588 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 002CC 8094F58C E7A60050 */ swc1 $f6, 0x0050($sp) /* 002D0 8094F590 46160282 */ mul.s $f10, $f0, $f22 /* 002D4 8094F594 C6280004 */ lwc1 $f8, 0x0004($s1) ## 00000004 /* 002D8 8094F598 4600A306 */ mov.s $f12, $f20 /* 002DC 8094F59C 460A4401 */ sub.s $f16, $f8, $f10 -/* 002E0 8094F5A0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 002E0 8094F5A0 0C00CFC8 */ jal Rand_CenteredFloat /* 002E4 8094F5A4 E7B00054 */ swc1 $f16, 0x0054($sp) /* 002E8 8094F5A8 C6320008 */ lwc1 $f18, 0x0008($s1) ## 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F60C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F60C.s index 068bac3526..3edcdda7b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F60C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F60C.s @@ -36,25 +36,25 @@ glabel func_8094F60C /* 003C0 8094F680 26B5DF50 */ addiu $s5, $s5, %lo(D_8095DF50) ## $s5 = 8095DF50 /* 003C4 8094F684 27B60060 */ addiu $s6, $sp, 0x0060 ## $s6 = FFFFFFF0 .L8094F688: -/* 003C8 8094F688 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 003C8 8094F688 0C00CFC8 */ jal Rand_CenteredFloat /* 003CC 8094F68C 4600A306 */ mov.s $f12, $f20 /* 003D0 8094F690 C6240000 */ lwc1 $f4, 0x0000($s1) ## 00000000 /* 003D4 8094F694 46040180 */ add.s $f6, $f0, $f4 -/* 003D8 8094F698 0C03F66B */ jal Math_Rand_ZeroOne +/* 003D8 8094F698 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 003DC 8094F69C E7A60060 */ swc1 $f6, 0x0060($sp) /* 003E0 8094F6A0 46160282 */ mul.s $f10, $f0, $f22 /* 003E4 8094F6A4 C6280004 */ lwc1 $f8, 0x0004($s1) ## 00000004 /* 003E8 8094F6A8 4600A306 */ mov.s $f12, $f20 /* 003EC 8094F6AC 460A4401 */ sub.s $f16, $f8, $f10 -/* 003F0 8094F6B0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 003F0 8094F6B0 0C00CFC8 */ jal Rand_CenteredFloat /* 003F4 8094F6B4 E7B00064 */ swc1 $f16, 0x0064($sp) /* 003F8 8094F6B8 C6320008 */ lwc1 $f18, 0x0008($s1) ## 00000008 /* 003FC 8094F6BC 4600C306 */ mov.s $f12, $f24 /* 00400 8094F6C0 46120100 */ add.s $f4, $f0, $f18 -/* 00404 8094F6C4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00404 8094F6C4 0C00CFC8 */ jal Rand_CenteredFloat /* 00408 8094F6C8 E7A40068 */ swc1 $f4, 0x0068($sp) /* 0040C 8094F6CC 4600018D */ trunc.w.s $f6, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F734.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F734.s index a8bfab5c6d..3647c7b520 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F734.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F734.s @@ -41,25 +41,25 @@ glabel func_8094F734 /* 004F4 8094F7B4 2652DF50 */ addiu $s2, $s2, %lo(D_8095DF50) ## $s2 = 8095DF50 /* 004F8 8094F7B8 27B30058 */ addiu $s3, $sp, 0x0058 ## $s3 = FFFFFFF0 .L8094F7BC: -/* 004FC 8094F7BC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 004FC 8094F7BC 0C00CFC8 */ jal Rand_CenteredFloat /* 00500 8094F7C0 4600A306 */ mov.s $f12, $f20 /* 00504 8094F7C4 C6240000 */ lwc1 $f4, 0x0000($s1) ## 00000000 /* 00508 8094F7C8 4600A306 */ mov.s $f12, $f20 /* 0050C 8094F7CC 46040180 */ add.s $f6, $f0, $f4 -/* 00510 8094F7D0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00510 8094F7D0 0C00CFC8 */ jal Rand_CenteredFloat /* 00514 8094F7D4 E7A60058 */ swc1 $f6, 0x0058($sp) /* 00518 8094F7D8 C6280004 */ lwc1 $f8, 0x0004($s1) ## 00000004 /* 0051C 8094F7DC 4600A306 */ mov.s $f12, $f20 /* 00520 8094F7E0 46080280 */ add.s $f10, $f0, $f8 -/* 00524 8094F7E4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00524 8094F7E4 0C00CFC8 */ jal Rand_CenteredFloat /* 00528 8094F7E8 E7AA005C */ swc1 $f10, 0x005C($sp) /* 0052C 8094F7EC C6300008 */ lwc1 $f16, 0x0008($s1) ## 00000008 /* 00530 8094F7F0 4600B306 */ mov.s $f12, $f22 /* 00534 8094F7F4 46100480 */ add.s $f18, $f0, $f16 -/* 00538 8094F7F8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00538 8094F7F8 0C00CFC8 */ jal Rand_CenteredFloat /* 0053C 8094F7FC E7B20060 */ swc1 $f18, 0x0060($sp) /* 00540 8094F800 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F864.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F864.s index 030e3a8c65..cd49a6d6ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F864.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F864.s @@ -38,7 +38,7 @@ glabel func_8094F864 .L8094F8E0: /* 00620 8094F8E0 5680000B */ bnel $s4, $zero, .L8094F910 /* 00624 8094F8E4 4600B40D */ trunc.w.s $f16, $f22 -/* 00628 8094F8E8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00628 8094F8E8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0062C 8094F8EC 00000000 */ nop /* 00630 8094F8F0 46160202 */ mul.s $f8, $f0, $f22 @@ -55,7 +55,7 @@ glabel func_8094F864 /* 00658 8094F918 00118C00 */ sll $s1, $s1, 16 /* 0065C 8094F91C 00118C03 */ sra $s1, $s1, 16 .L8094F920: -/* 00660 8094F920 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00660 8094F920 0C00CFC8 */ jal Rand_CenteredFloat /* 00664 8094F924 4600A306 */ mov.s $f12, $f20 /* 00668 8094F928 02360019 */ multu $s1, $s6 @@ -66,7 +66,7 @@ glabel func_8094F864 /* 0067C 8094F93C C61201FC */ lwc1 $f18, 0x01FC($s0) ## 000001FC /* 00680 8094F940 46009100 */ add.s $f4, $f18, $f0 /* 00684 8094F944 46062201 */ sub.s $f8, $f4, $f6 -/* 00688 8094F948 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00688 8094F948 0C00CFC8 */ jal Rand_CenteredFloat /* 0068C 8094F94C E7A8006C */ swc1 $f8, 0x006C($sp) /* 00690 8094F950 C60A0200 */ lwc1 $f10, 0x0200($s0) ## 00000200 @@ -74,7 +74,7 @@ glabel func_8094F864 /* 00698 8094F958 4600A306 */ mov.s $f12, $f20 /* 0069C 8094F95C 46005400 */ add.s $f16, $f10, $f0 /* 006A0 8094F960 46128101 */ sub.s $f4, $f16, $f18 -/* 006A4 8094F964 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 006A4 8094F964 0C00CFC8 */ jal Rand_CenteredFloat /* 006A8 8094F968 E7A40070 */ swc1 $f4, 0x0070($sp) /* 006AC 8094F96C C6060204 */ lwc1 $f6, 0x0204($s0) ## 00000204 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F9E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F9E8.s index 4de3d2bb14..cbdd1d9f59 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F9E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F9E8.s @@ -38,7 +38,7 @@ glabel func_8094F9E8 .L8094FA64: /* 007A4 8094FA64 5680000B */ bnel $s4, $zero, .L8094FA94 /* 007A8 8094FA68 4600B40D */ trunc.w.s $f16, $f22 -/* 007AC 8094FA6C 0C03F66B */ jal Math_Rand_ZeroOne +/* 007AC 8094FA6C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 007B0 8094FA70 00000000 */ nop /* 007B4 8094FA74 46160202 */ mul.s $f8, $f0, $f22 @@ -55,7 +55,7 @@ glabel func_8094F9E8 /* 007DC 8094FA9C 00118C00 */ sll $s1, $s1, 16 /* 007E0 8094FAA0 00118C03 */ sra $s1, $s1, 16 .L8094FAA4: -/* 007E4 8094FAA4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 007E4 8094FAA4 0C00CFC8 */ jal Rand_CenteredFloat /* 007E8 8094FAA8 4600A306 */ mov.s $f12, $f20 /* 007EC 8094FAAC 02360019 */ multu $s1, $s6 @@ -66,7 +66,7 @@ glabel func_8094F9E8 /* 00800 8094FAC0 C61201FC */ lwc1 $f18, 0x01FC($s0) ## 000001FC /* 00804 8094FAC4 46009100 */ add.s $f4, $f18, $f0 /* 00808 8094FAC8 46062201 */ sub.s $f8, $f4, $f6 -/* 0080C 8094FACC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0080C 8094FACC 0C00CFC8 */ jal Rand_CenteredFloat /* 00810 8094FAD0 E7A8006C */ swc1 $f8, 0x006C($sp) /* 00814 8094FAD4 C60A0200 */ lwc1 $f10, 0x0200($s0) ## 00000200 @@ -74,7 +74,7 @@ glabel func_8094F9E8 /* 0081C 8094FADC 4600A306 */ mov.s $f12, $f20 /* 00820 8094FAE0 46005400 */ add.s $f16, $f10, $f0 /* 00824 8094FAE4 46128101 */ sub.s $f4, $f16, $f18 -/* 00828 8094FAE8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00828 8094FAE8 0C00CFC8 */ jal Rand_CenteredFloat /* 0082C 8094FAEC E7A40070 */ swc1 $f4, 0x0070($sp) /* 00830 8094FAF0 C6060204 */ lwc1 $f6, 0x0204($s0) ## 00000204 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FC70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FC70.s index 502c07dd0a..3411726ac1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FC70.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FC70.s @@ -49,13 +49,13 @@ glabel func_8094FC70 /* 00A58 8094FD18 4481A000 */ mtc1 $at, $f20 ## $f20 = 60.00 /* 00A5C 8094FD1C 00000000 */ nop .L8094FD20: -/* 00A60 8094FD20 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00A60 8094FD20 0C00CFC8 */ jal Rand_CenteredFloat /* 00A64 8094FD24 4600A306 */ mov.s $f12, $f20 /* 00A68 8094FD28 C6240024 */ lwc1 $f4, 0x0024($s1) ## 00000024 /* 00A6C 8094FD2C 4600B306 */ mov.s $f12, $f22 /* 00A70 8094FD30 46040180 */ add.s $f6, $f0, $f4 -/* 00A74 8094FD34 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00A74 8094FD34 0C00CFC8 */ jal Rand_CenteredFloat /* 00A78 8094FD38 E7A60084 */ swc1 $f6, 0x0084($sp) /* 00A7C 8094FD3C C62800BC */ lwc1 $f8, 0x00BC($s1) ## 000000BC @@ -65,22 +65,22 @@ glabel func_8094FC70 /* 00A8C 8094FD4C 460A4402 */ mul.s $f16, $f8, $f10 /* 00A90 8094FD50 46109100 */ add.s $f4, $f18, $f16 /* 00A94 8094FD54 46040180 */ add.s $f6, $f0, $f4 -/* 00A98 8094FD58 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00A98 8094FD58 0C00CFC8 */ jal Rand_CenteredFloat /* 00A9C 8094FD5C E7A60088 */ swc1 $f6, 0x0088($sp) /* 00AA0 8094FD60 C628002C */ lwc1 $f8, 0x002C($s1) ## 0000002C /* 00AA4 8094FD64 46080280 */ add.s $f10, $f0, $f8 -/* 00AA8 8094FD68 0C03F66B */ jal Math_Rand_ZeroOne +/* 00AA8 8094FD68 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00AAC 8094FD6C E7AA008C */ swc1 $f10, 0x008C($sp) /* 00AB0 8094FD70 46180480 */ add.s $f18, $f0, $f24 /* 00AB4 8094FD74 24040050 */ addiu $a0, $zero, 0x0050 ## $a0 = 00000050 /* 00AB8 8094FD78 24050064 */ addiu $a1, $zero, 0x0064 ## $a1 = 00000064 -/* 00ABC 8094FD7C 0C01DF64 */ jal Math_Rand_S16Offset +/* 00ABC 8094FD7C 0C01DF64 */ jal Rand_S16Offset /* 00AC0 8094FD80 E7B2007C */ swc1 $f18, 0x007C($sp) /* 00AC4 8094FD84 00028400 */ sll $s0, $v0, 16 -/* 00AC8 8094FD88 0C03F66B */ jal Math_Rand_ZeroOne +/* 00AC8 8094FD88 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00ACC 8094FD8C 00108403 */ sra $s0, $s0, 16 /* 00AD0 8094FD90 461A003C */ c.lt.s $f0, $f26 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s index 89223e5999..ee2c3a4bbe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s @@ -72,7 +72,7 @@ glabel func_80950780 /* 014E8 809507A8 848F01AC */ lh $t7, 0x01AC($a0) ## 000001AC /* 014EC 809507AC 25F80C31 */ addiu $t8, $t7, 0x0C31 ## $t8 = 00000C31 /* 014F0 809507B0 A49801AC */ sh $t8, 0x01AC($a0) ## 000001AC -/* 014F4 809507B4 0C01DE0D */ jal Math_Coss +/* 014F4 809507B4 0C01DE0D */ jal Math_CosS ## coss? /* 014F8 809507B8 848401AC */ lh $a0, 0x01AC($a0) ## 000001AC /* 014FC 809507BC 3C018096 */ lui $at, %hi(D_8095C634) ## $at = 80960000 @@ -83,7 +83,7 @@ glabel func_80950780 /* 01510 809507D0 8FB00068 */ lw $s0, 0x0068($sp) /* 01514 809507D4 862401AC */ lh $a0, 0x01AC($s1) ## 000001AC /* 01518 809507D8 46083280 */ add.s $f10, $f6, $f8 -/* 0151C 809507DC 0C01DE1C */ jal Math_Sins +/* 0151C 809507DC 0C01DE1C */ jal Math_SinS ## sins? /* 01520 809507E0 E62A01A0 */ swc1 $f10, 0x01A0($s1) ## 000001A0 /* 01524 809507E4 3C018096 */ lui $at, %hi(D_8095C638) ## $at = 80960000 @@ -256,7 +256,7 @@ glabel L80950A4C /* 017A0 80950A60 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 /* 017A4 80950A64 A2790000 */ sb $t9, 0x0000($s3) ## 809668D2 .L80950A68: -/* 017A8 80950A68 0C03F66B */ jal Math_Rand_ZeroOne +/* 017A8 80950A68 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 017AC 80950A6C 00000000 */ nop /* 017B0 80950A70 3C018096 */ lui $at, %hi(D_8095C688) ## $at = 80960000 @@ -452,7 +452,7 @@ glabel L80950CDC /* 01A88 80950D48 24846918 */ addiu $a0, $a0, %lo(D_80966918) ## $a0 = 80966918 /* 01A8C 80950D4C 3C0540E0 */ lui $a1, 0x40E0 ## $a1 = 40E00000 /* 01A90 80950D50 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 01A94 80950D54 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01A94 80950D54 0C01E0C4 */ jal Math_SmoothStepToF /* 01A98 80950D58 E4266910 */ swc1 $f6, %lo(D_80966910)($at) /* 01A9C 80950D5C 3C018096 */ lui $at, %hi(D_80966918) ## $at = 80960000 @@ -547,7 +547,7 @@ glabel L80950E78 /* 01BF4 80950EB4 E7A20010 */ swc1 $f2, 0x0010($sp) /* 01BF8 80950EB8 E44A0000 */ swc1 $f10, 0x0000($v0) ## 80966908 /* 01BFC 80950EBC E4500004 */ swc1 $f16, 0x0004($v0) ## 8096690C -/* 01C00 80950EC0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01C00 80950EC0 0C01E0C4 */ jal Math_SmoothStepToF /* 01C04 80950EC4 E4520008 */ swc1 $f18, 0x0008($v0) ## 80966910 /* 01C08 80950EC8 3C028096 */ lui $v0, %hi(D_80966918) ## $v0 = 80960000 @@ -638,7 +638,7 @@ glabel L80950FF8 /* 01D4C 8095100C 24846918 */ addiu $a0, $a0, %lo(D_80966918) ## $a0 = 80966918 /* 01D50 80951010 3C054160 */ lui $a1, 0x4160 ## $a1 = 41600000 /* 01D54 80951014 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 01D58 80951018 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01D58 80951018 0C01E0C4 */ jal Math_SmoothStepToF /* 01D5C 8095101C E7B20010 */ swc1 $f18, 0x0010($sp) /* 01D60 80951020 3C088096 */ lui $t0, %hi(D_80966918) ## $t0 = 80960000 @@ -744,7 +744,7 @@ glabel L809510AC /* 01ECC 8095118C 24050280 */ addiu $a1, $zero, 0x0280 ## $a1 = 00000280 /* 01ED0 80951190 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01ED4 80951194 24070032 */ addiu $a3, $zero, 0x0032 ## $a3 = 00000032 -/* 01ED8 80951198 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01ED8 80951198 0C01E1A7 */ jal Math_SmoothStepToS /* 01EDC 8095119C AFA00010 */ sw $zero, 0x0010($sp) /* 01EE0 809511A0 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 @@ -755,7 +755,7 @@ glabel L809510AC /* 01EF4 809511B4 24846918 */ addiu $a0, $a0, %lo(D_80966918) ## $a0 = 80966918 /* 01EF8 809511B8 3C054160 */ lui $a1, 0x4160 ## $a1 = 41600000 /* 01EFC 809511BC 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 01F00 809511C0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01F00 809511C0 0C01E0C4 */ jal Math_SmoothStepToF /* 01F04 809511C4 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 01F08 809511C8 3C088096 */ lui $t0, %hi(D_80966918) ## $t0 = 80960000 @@ -862,7 +862,7 @@ glabel L809510AC /* 0208C 8095134C 240700A0 */ addiu $a3, $zero, 0x00A0 ## $a3 = 000000A0 .L80951350: -/* 02090 80951350 0C03F66B */ jal Math_Rand_ZeroOne +/* 02090 80951350 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02094 80951354 00000000 */ nop /* 02098 80951358 3C018096 */ lui $at, %hi(D_8095C694) ## $at = 80960000 @@ -887,7 +887,7 @@ glabel L809510AC /* 020D8 80951398 3C018096 */ lui $at, %hi(D_809668FC) ## $at = 80960000 /* 020DC 8095139C E5040004 */ swc1 $f4, 0x0004($t0) ## 00000004 /* 020E0 809513A0 E42668FC */ swc1 $f6, %lo(D_809668FC)($at) -/* 020E4 809513A4 0C01DE1C */ jal Math_Sins +/* 020E4 809513A4 0C01DE1C */ jal Math_SinS ## sins? /* 020E8 809513A8 8624019A */ lh $a0, 0x019A($s1) ## 0000019A /* 020EC 809513AC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -895,7 +895,7 @@ glabel L809510AC /* 020F4 809513B4 3C018096 */ lui $at, %hi(D_809668F8) ## $at = 80960000 /* 020F8 809513B8 46080282 */ mul.s $f10, $f0, $f8 /* 020FC 809513BC E42A68F8 */ swc1 $f10, %lo(D_809668F8)($at) -/* 02100 809513C0 0C01DE0D */ jal Math_Coss +/* 02100 809513C0 0C01DE0D */ jal Math_CosS ## coss? /* 02104 809513C4 8624019A */ lh $a0, 0x019A($s1) ## 0000019A /* 02108 809513C8 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -1052,7 +1052,7 @@ glabel L80951578 .L809515F8: /* 02338 809515F8 25AE0CE4 */ addiu $t6, $t5, 0x0CE4 ## $t6 = 00000CE4 /* 0233C 809515FC A62E01B0 */ sh $t6, 0x01B0($s1) ## 000001B0 -/* 02340 80951600 0C01DE1C */ jal Math_Sins +/* 02340 80951600 0C01DE1C */ jal Math_SinS ## sins? /* 02344 80951604 862401B0 */ lh $a0, 0x01B0($s1) ## 000001B0 /* 02348 80951608 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -1080,7 +1080,7 @@ glabel L80951578 /* 023A0 80951660 8CE76918 */ lw $a3, %lo(D_80966918)($a3) /* 023A4 80951664 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 023A8 80951668 8CA568F8 */ lw $a1, %lo(D_809668F8)($a1) -/* 023AC 8095166C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 023AC 8095166C 0C01E0C4 */ jal Math_SmoothStepToF /* 023B0 80951670 E7A80010 */ swc1 $f8, 0x0010($sp) /* 023B4 80951674 3C018096 */ lui $at, %hi(D_8095C6A0) ## $at = 80960000 @@ -1093,7 +1093,7 @@ glabel L80951578 /* 023D0 80951690 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 023D4 80951694 8CA568FC */ lw $a1, %lo(D_809668FC)($a1) /* 023D8 80951698 248468DC */ addiu $a0, $a0, %lo(D_809668DC) ## $a0 = 809668DC -/* 023DC 8095169C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 023DC 8095169C 0C01E0C4 */ jal Math_SmoothStepToF /* 023E0 809516A0 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 023E4 809516A4 3C018096 */ lui $at, %hi(D_8095C6A4) ## $at = 80960000 @@ -1106,7 +1106,7 @@ glabel L80951578 /* 02400 809516C0 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 02404 809516C4 8CA56900 */ lw $a1, %lo(D_80966900)($a1) /* 02408 809516C8 248468E0 */ addiu $a0, $a0, %lo(D_809668E0) ## $a0 = 809668E0 -/* 0240C 809516CC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0240C 809516CC 0C01E0C4 */ jal Math_SmoothStepToF /* 02410 809516D0 E7B00010 */ swc1 $f16, 0x0010($sp) /* 02414 809516D4 3C018096 */ lui $at, %hi(D_8095C6A8) ## $at = 80960000 @@ -1119,7 +1119,7 @@ glabel L80951578 /* 02430 809516F0 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 02434 809516F4 8CA56908 */ lw $a1, %lo(D_80966908)($a1) /* 02438 809516F8 248468E8 */ addiu $a0, $a0, %lo(D_809668E8) ## $a0 = 809668E8 -/* 0243C 809516FC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0243C 809516FC 0C01E0C4 */ jal Math_SmoothStepToF /* 02440 80951700 E7B20010 */ swc1 $f18, 0x0010($sp) /* 02444 80951704 3C018096 */ lui $at, %hi(D_8095C6AC) ## $at = 80960000 @@ -1132,7 +1132,7 @@ glabel L80951578 /* 02460 80951720 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 02464 80951724 8CA5690C */ lw $a1, %lo(D_8096690C)($a1) /* 02468 80951728 248468EC */ addiu $a0, $a0, %lo(D_809668EC) ## $a0 = 809668EC -/* 0246C 8095172C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0246C 8095172C 0C01E0C4 */ jal Math_SmoothStepToF /* 02470 80951730 E7A40010 */ swc1 $f4, 0x0010($sp) /* 02474 80951734 3C018096 */ lui $at, %hi(D_8095C6B0) ## $at = 80960000 @@ -1145,7 +1145,7 @@ glabel L80951578 /* 02490 80951750 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 02494 80951754 8CA56910 */ lw $a1, %lo(D_80966910)($a1) /* 02498 80951758 248468F0 */ addiu $a0, $a0, %lo(D_809668F0) ## $a0 = 809668F0 -/* 0249C 8095175C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0249C 8095175C 0C01E0C4 */ jal Math_SmoothStepToF /* 024A0 80951760 E7A60010 */ swc1 $f6, 0x0010($sp) /* 024A4 80951764 3C058096 */ lui $a1, %hi(D_8095C23C) ## $a1 = 80960000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951844.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951844.s index 8ba9302f82..7ee326a92f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951844.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951844.s @@ -20,7 +20,7 @@ glabel func_80951844 /* 025A0 80951860 849801B0 */ lh $t8, 0x01B0($a0) ## 000001B0 /* 025A4 80951864 27190CE4 */ addiu $t9, $t8, 0x0CE4 ## $t9 = 00000CE4 /* 025A8 80951868 A49901B0 */ sh $t9, 0x01B0($a0) ## 000001B0 -/* 025AC 8095186C 0C01DE1C */ jal Math_Sins +/* 025AC 8095186C 0C01DE1C */ jal Math_SinS ## sins? /* 025B0 80951870 848401B0 */ lh $a0, 0x01B0($a0) ## 000001B0 /* 025B4 80951874 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -97,20 +97,20 @@ glabel func_80951844 /* 026B4 80951974 AFA00010 */ sw $zero, 0x0010($sp) /* 026B8 80951978 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 026BC 8095197C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 026C0 80951980 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 026C0 80951980 0C01E1A7 */ jal Math_SmoothStepToS /* 026C4 80951984 240700C8 */ addiu $a3, $zero, 0x00C8 ## $a3 = 000000C8 /* 026C8 80951988 86050034 */ lh $a1, 0x0034($s0) ## 00000034 /* 026CC 8095198C AFA00010 */ sw $zero, 0x0010($sp) /* 026D0 80951990 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 /* 026D4 80951994 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 026D8 80951998 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 026D8 80951998 0C01E1A7 */ jal Math_SmoothStepToS /* 026DC 8095199C 240700C8 */ addiu $a3, $zero, 0x00C8 ## $a3 = 000000C8 /* 026E0 809519A0 860F01AC */ lh $t7, 0x01AC($s0) ## 000001AC /* 026E4 809519A4 25F80C31 */ addiu $t8, $t7, 0x0C31 ## $t8 = 00000C31 /* 026E8 809519A8 A61801AC */ sh $t8, 0x01AC($s0) ## 000001AC -/* 026EC 809519AC 0C01DE0D */ jal Math_Coss +/* 026EC 809519AC 0C01DE0D */ jal Math_CosS ## coss? /* 026F0 809519B0 860401AC */ lh $a0, 0x01AC($s0) ## 000001AC /* 026F4 809519B4 3C018096 */ lui $at, %hi(D_8095C6B4) ## $at = 80960000 @@ -120,7 +120,7 @@ glabel func_80951844 /* 02704 809519C4 46100482 */ mul.s $f18, $f0, $f16 /* 02708 809519C8 860401AC */ lh $a0, 0x01AC($s0) ## 000001AC /* 0270C 809519CC 46049180 */ add.s $f6, $f18, $f4 -/* 02710 809519D0 0C01DE1C */ jal Math_Sins +/* 02710 809519D0 0C01DE1C */ jal Math_SinS ## sins? /* 02714 809519D4 E60601A0 */ swc1 $f6, 0x01A0($s0) ## 000001A0 /* 02718 809519D8 3C018096 */ lui $at, %hi(D_8095C6B8) ## $at = 80960000 @@ -153,7 +153,7 @@ glabel func_80951844 /* 02784 80951A44 0C253E19 */ jal func_8094F864 /* 02788 80951A48 E7A40010 */ swc1 $f4, 0x0010($sp) .L80951A4C: -/* 0278C 80951A4C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0278C 80951A4C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02790 80951A50 00000000 */ nop /* 02794 80951A54 3C018096 */ lui $at, %hi(D_8095C6BC) ## $at = 80960000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951C04.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951C04.s index 69f3b63b66..abbb00e316 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951C04.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951C04.s @@ -185,7 +185,7 @@ glabel func_80951C04 .L80951E80: /* 02BC0 80951E80 260F0024 */ addiu $t7, $s0, 0x0024 ## $t7 = 00000024 .L80951E84: -/* 02BC4 80951E84 0C03F66B */ jal Math_Rand_ZeroOne +/* 02BC4 80951E84 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02BC8 80951E88 AFAF0044 */ sw $t7, 0x0044($sp) /* 02BCC 80951E8C 3C018096 */ lui $at, %hi(D_8095C6C0) ## $at = 80960000 @@ -202,14 +202,14 @@ glabel func_80951C04 /* 02BF0 80951EB0 AFA00010 */ sw $zero, 0x0010($sp) /* 02BF4 80951EB4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 02BF8 80951EB8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02BFC 80951EBC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 02BFC 80951EBC 0C01E1A7 */ jal Math_SmoothStepToS /* 02C00 80951EC0 240700C8 */ addiu $a3, $zero, 0x00C8 ## $a3 = 000000C8 /* 02C04 80951EC4 86050034 */ lh $a1, 0x0034($s0) ## 00000034 /* 02C08 80951EC8 AFA00010 */ sw $zero, 0x0010($sp) /* 02C0C 80951ECC 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 /* 02C10 80951ED0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02C14 80951ED4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 02C14 80951ED4 0C01E1A7 */ jal Math_SmoothStepToS /* 02C18 80951ED8 240700C8 */ addiu $a3, $zero, 0x00C8 ## $a3 = 000000C8 /* 02C1C 80951EDC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 @@ -217,7 +217,7 @@ glabel func_80951C04 /* 02C24 80951EE4 3C05C47A */ lui $a1, 0xC47A ## $a1 = C47A0000 /* 02C28 80951EE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02C2C 80951EEC 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 02C30 80951EF0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02C30 80951EF0 0C01E0C4 */ jal Math_SmoothStepToF /* 02C34 80951EF4 E7B20010 */ swc1 $f18, 0x0010($sp) /* 02C38 80951EF8 3C188096 */ lui $t8, %hi(D_8096693E) ## $t8 = 80960000 @@ -256,7 +256,7 @@ glabel func_80951C04 .L80951F6C: /* 02CAC 80951F6C 25CF0C31 */ addiu $t7, $t6, 0x0C31 ## $t7 = 00000C31 /* 02CB0 80951F70 A60F01AC */ sh $t7, 0x01AC($s0) ## 000001AC -/* 02CB4 80951F74 0C01DE0D */ jal Math_Coss +/* 02CB4 80951F74 0C01DE0D */ jal Math_CosS ## coss? /* 02CB8 80951F78 860401AC */ lh $a0, 0x01AC($s0) ## 000001AC /* 02CBC 80951F7C 3C018096 */ lui $at, %hi(D_8095C6C4) ## $at = 80960000 @@ -266,7 +266,7 @@ glabel func_80951C04 /* 02CCC 80951F8C 46040202 */ mul.s $f8, $f0, $f4 /* 02CD0 80951F90 860401AC */ lh $a0, 0x01AC($s0) ## 000001AC /* 02CD4 80951F94 460A4480 */ add.s $f18, $f8, $f10 -/* 02CD8 80951F98 0C01DE1C */ jal Math_Sins +/* 02CD8 80951F98 0C01DE1C */ jal Math_SinS ## sins? /* 02CDC 80951F9C E61201A0 */ swc1 $f18, 0x01A0($s0) ## 000001A0 /* 02CE0 80951FA0 3C018096 */ lui $at, %hi(D_8095C6C8) ## $at = 80960000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095213C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095213C.s index 31d8f37e67..db0d1c3906 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095213C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095213C.s @@ -35,7 +35,7 @@ glabel func_8095213C /* 02EBC 8095217C 866E01B0 */ lh $t6, 0x01B0($s3) ## 000001B0 /* 02EC0 80952180 25CF0CE4 */ addiu $t7, $t6, 0x0CE4 ## $t7 = 00000CE4 /* 02EC4 80952184 A66F01B0 */ sh $t7, 0x01B0($s3) ## 000001B0 -/* 02EC8 80952188 0C01DE1C */ jal Math_Sins +/* 02EC8 80952188 0C01DE1C */ jal Math_SinS ## sins? /* 02ECC 8095218C 866401B0 */ lh $a0, 0x01B0($s3) ## 000001B0 /* 02ED0 80952190 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -62,7 +62,7 @@ glabel func_8095213C /* 02F24 809521E4 0C00BDC7 */ jal func_8002F71C /* 02F28 809521E8 E7A00010 */ swc1 $f0, 0x0010($sp) /* 02F2C 809521EC 3C018096 */ lui $at, %hi(D_8095C6D0) ## $at = 80960000 -/* 02F30 809521F0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02F30 809521F0 0C00CFC8 */ jal Rand_CenteredFloat /* 02F34 809521F4 C42CC6D0 */ lwc1 $f12, %lo(D_8095C6D0)($at) /* 02F38 809521F8 4600028D */ trunc.w.s $f10, $f0 @@ -119,7 +119,7 @@ glabel func_8095213C /* 02FF4 809522B4 24050FA0 */ addiu $a1, $zero, 0x0FA0 ## $a1 = 00000FA0 /* 02FF8 809522B8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 02FFC 809522BC 2407012C */ addiu $a3, $zero, 0x012C ## $a3 = 0000012C -/* 03000 809522C0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 03000 809522C0 0C01E1A7 */ jal Math_SmoothStepToS /* 03004 809522C4 AFA00010 */ sw $zero, 0x0010($sp) /* 03008 809522C8 1440000F */ bne $v0, $zero, .L80952308 @@ -137,7 +137,7 @@ glabel func_8095213C /* 03038 809522F8 A6680032 */ sh $t0, 0x0032($s3) ## 00000032 /* 0303C 809522FC 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E19999A .L80952300: -/* 03040 80952300 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03040 80952300 0C01E0C4 */ jal Math_SmoothStepToF /* 03044 80952304 E7A60010 */ swc1 $f6, 0x0010($sp) .L80952308: @@ -155,7 +155,7 @@ glabel func_8095213C .L80952330: /* 03070 80952330 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 03074 80952334 2407012C */ addiu $a3, $zero, 0x012C ## $a3 = 0000012C -/* 03078 80952338 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 03078 80952338 0C01E1A7 */ jal Math_SmoothStepToS /* 0307C 8095233C AFA00010 */ sw $zero, 0x0010($sp) /* 03080 80952340 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 @@ -164,7 +164,7 @@ glabel func_8095213C /* 0308C 8095234C 26640068 */ addiu $a0, $s3, 0x0068 ## $a0 = 00000068 /* 03090 80952350 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 03094 80952354 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03098 80952358 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03098 80952358 0C01E0C4 */ jal Math_SmoothStepToF /* 0309C 8095235C E7A80010 */ swc1 $f8, 0x0010($sp) /* 030A0 80952360 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 @@ -174,7 +174,7 @@ glabel func_8095213C /* 030B0 80952370 02002025 */ or $a0, $s0, $zero ## $a0 = 000000BC /* 030B4 80952374 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 030B8 80952378 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 030BC 8095237C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 030BC 8095237C 0C01E0C4 */ jal Math_SmoothStepToF /* 030C0 80952380 E7AA0010 */ swc1 $f10, 0x0010($sp) .L80952384: @@ -192,7 +192,7 @@ glabel func_8095213C /* 030EC 809523AC 87A50062 */ lh $a1, 0x0062($sp) /* 030F0 809523B0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 030F4 809523B4 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 030F8 809523B8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 030F8 809523B8 0C01E1A7 */ jal Math_SmoothStepToS /* 030FC 809523BC AFA00010 */ sw $zero, 0x0010($sp) /* 03100 809523C0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -212,7 +212,7 @@ glabel func_8095213C /* 03134 809523F4 00052C00 */ sll $a1, $a1, 16 /* 03138 809523F8 00052C03 */ sra $a1, $a1, 16 /* 0313C 809523FC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 03140 80952400 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 03140 80952400 0C01E1A7 */ jal Math_SmoothStepToS /* 03144 80952404 2407012C */ addiu $a3, $zero, 0x012C ## $a3 = 0000012C /* 03148 80952408 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -231,14 +231,14 @@ glabel func_8095213C /* 03178 80952438 AFA00010 */ sw $zero, 0x0010($sp) /* 0317C 8095243C 26640032 */ addiu $a0, $s3, 0x0032 ## $a0 = 00000032 /* 03180 80952440 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 03184 80952444 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 03184 80952444 0C01E1A7 */ jal Math_SmoothStepToS /* 03188 80952448 2407012C */ addiu $a3, $zero, 0x012C ## $a3 = 0000012C /* 0318C 8095244C 10000004 */ beq $zero, $zero, .L80952460 /* 03190 80952450 00000000 */ nop .L80952454: /* 03194 80952454 24070258 */ addiu $a3, $zero, 0x0258 ## $a3 = 00000258 -/* 03198 80952458 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 03198 80952458 0C01E1A7 */ jal Math_SmoothStepToS /* 0319C 8095245C AFA00010 */ sw $zero, 0x0010($sp) .L80952460: @@ -281,7 +281,7 @@ glabel func_8095213C /* 0321C 809524DC 3C05C3E1 */ lui $a1, 0xC3E1 ## $a1 = C3E10000 /* 03220 809524E0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03224 809524E4 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 -/* 03228 809524E8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03228 809524E8 0C01E0C4 */ jal Math_SmoothStepToF /* 0322C 809524EC E7A40010 */ swc1 $f4, 0x0010($sp) /* 03230 809524F0 1000000A */ beq $zero, $zero, .L8095251C @@ -293,7 +293,7 @@ glabel func_8095213C /* 03244 80952504 02002025 */ or $a0, $s0, $zero ## $a0 = 000000BC /* 03248 80952508 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0324C 8095250C 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 -/* 03250 80952510 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03250 80952510 0C01E0C4 */ jal Math_SmoothStepToF /* 03254 80952514 E7A60010 */ swc1 $f6, 0x0010($sp) /* 03258 80952518 3C01C3FA */ lui $at, 0xC3FA ## $at = C3FA0000 @@ -359,7 +359,7 @@ glabel func_8095213C /* 03338 809525F8 866901AC */ lh $t1, 0x01AC($s3) ## 000001AC /* 0333C 809525FC 252A0C31 */ addiu $t2, $t1, 0x0C31 ## $t2 = 00000C31 /* 03340 80952600 A66A01AC */ sh $t2, 0x01AC($s3) ## 000001AC -/* 03344 80952604 0C01DE0D */ jal Math_Coss +/* 03344 80952604 0C01DE0D */ jal Math_CosS ## coss? /* 03348 80952608 866401AC */ lh $a0, 0x01AC($s3) ## 000001AC /* 0334C 8095260C 3C018096 */ lui $at, %hi(D_8095C6D4) ## $at = 80960000 @@ -369,7 +369,7 @@ glabel func_8095213C /* 0335C 8095261C 46060202 */ mul.s $f8, $f0, $f6 /* 03360 80952620 866401AC */ lh $a0, 0x01AC($s3) ## 000001AC /* 03364 80952624 460A4400 */ add.s $f16, $f8, $f10 -/* 03368 80952628 0C01DE1C */ jal Math_Sins +/* 03368 80952628 0C01DE1C */ jal Math_SinS ## sins? /* 0336C 8095262C E67001A0 */ swc1 $f16, 0x01A0($s3) ## 000001A0 /* 03370 80952630 3C018096 */ lui $at, %hi(D_8095C6D8) ## $at = 80960000 @@ -411,7 +411,7 @@ glabel func_8095213C /* 033FC 809526BC 8F0E0008 */ lw $t6, 0x0008($t8) ## 00000008 /* 03400 809526C0 46128100 */ add.s $f4, $f16, $f18 /* 03404 809526C4 AE6E0040 */ sw $t6, 0x0040($s3) ## 00000040 -/* 03408 809526C8 0C03F66B */ jal Math_Rand_ZeroOne +/* 03408 809526C8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0340C 809526CC E664003C */ swc1 $f4, 0x003C($s3) ## 0000003C /* 03410 809526D0 3C018096 */ lui $at, %hi(D_8095C6DC) ## $at = 80960000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809527A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809527A4.s index 8154117313..ccb6bd41b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809527A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809527A4.s @@ -10,7 +10,7 @@ glabel func_809527A4 /* 03504 809527C4 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 /* 03508 809527C8 A49801F8 */ sh $t8, 0x01F8($a0) ## 000001F8 /* 0350C 809527CC A4990032 */ sh $t9, 0x0032($a0) ## 00000032 -/* 03510 809527D0 0C03F66B */ jal Math_Rand_ZeroOne +/* 03510 809527D0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 03514 809527D4 AFA40018 */ sw $a0, 0x0018($sp) /* 03518 809527D8 3C014316 */ lui $at, 0x4316 ## $at = 43160000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80952858.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80952858.s index 1420380ac5..b8e5873cc9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80952858.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80952858.s @@ -39,7 +39,7 @@ glabel func_80952858 /* 035E4 809528A4 018B6821 */ addu $t5, $t4, $t3 /* 035E8 809528A8 25AE0CE4 */ addiu $t6, $t5, 0x0CE4 ## $t6 = 00000CE4 /* 035EC 809528AC A48E01B0 */ sh $t6, 0x01B0($a0) ## 000001B0 -/* 035F0 809528B0 0C01DE1C */ jal Math_Sins +/* 035F0 809528B0 0C01DE1C */ jal Math_SinS ## sins? /* 035F4 809528B4 848401B0 */ lh $a0, 0x01B0($a0) ## 000001B0 /* 035F8 809528B8 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -68,7 +68,7 @@ glabel func_80952858 /* 03654 80952914 0C00BDC7 */ jal func_8002F71C /* 03658 80952918 E7A00010 */ swc1 $f0, 0x0010($sp) /* 0365C 8095291C 3C018096 */ lui $at, %hi(D_8095C6E4) ## $at = 80960000 -/* 03660 80952920 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 03660 80952920 0C00CFC8 */ jal Rand_CenteredFloat /* 03664 80952924 C42CC6E4 */ lwc1 $f12, %lo(D_8095C6E4)($at) /* 03668 80952928 4600020D */ trunc.w.s $f8, $f0 @@ -84,7 +84,7 @@ glabel func_80952858 /* 03690 80952950 8FA40054 */ lw $a0, 0x0054($sp) .L80952954: -/* 03694 80952954 0C03F66B */ jal Math_Rand_ZeroOne +/* 03694 80952954 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 03698 80952958 00000000 */ nop /* 0369C 8095295C 3C018096 */ lui $at, %hi(D_8095C6E8) ## $at = 80960000 @@ -160,7 +160,7 @@ glabel func_80952858 .L80952A68: /* 037A8 80952A68 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 037AC 80952A6C 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 037B0 80952A70 0C03F66B */ jal Math_Rand_ZeroOne +/* 037B0 80952A70 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 037B4 80952A74 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 /* 037B8 80952A78 3C014316 */ lui $at, 0x4316 ## $at = 43160000 @@ -178,7 +178,7 @@ glabel func_80952858 .L80952AA8: /* 037E8 80952AA8 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 037EC 80952AAC 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 -/* 037F0 80952AB0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 037F0 80952AB0 0C00CFC8 */ jal Rand_CenteredFloat /* 037F4 80952AB4 00000000 */ nop /* 037F8 80952AB8 4600028D */ trunc.w.s $f10, $f0 @@ -230,7 +230,7 @@ glabel func_80952858 /* 038A0 80952B60 00000000 */ nop /* 038A4 80952B64 4500000F */ bc1f .L80952BA4 /* 038A8 80952B68 00000000 */ nop -/* 038AC 80952B6C 0C03F66B */ jal Math_Rand_ZeroOne +/* 038AC 80952B6C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 038B0 80952B70 00000000 */ nop /* 038B4 80952B74 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -272,7 +272,7 @@ glabel func_80952858 /* 03938 80952BF8 46049182 */ mul.s $f6, $f18, $f4 /* 0393C 80952BFC 46083280 */ add.s $f10, $f6, $f8 /* 03940 80952C00 44075000 */ mfc1 $a3, $f10 -/* 03944 80952C04 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03944 80952C04 0C01E0C4 */ jal Math_SmoothStepToF /* 03948 80952C08 00000000 */ nop /* 0394C 80952C0C 3C0D8096 */ lui $t5, %hi(D_809668D1) ## $t5 = 80960000 @@ -294,7 +294,7 @@ glabel func_80952858 /* 0398C 80952C4C 00052C03 */ sra $a1, $a1, 16 /* 03990 80952C50 24A50FA0 */ addiu $a1, $a1, 0x0FA0 ## $a1 = 00000FA0 /* 03994 80952C54 00052C00 */ sll $a1, $a1, 16 -/* 03998 80952C58 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 03998 80952C58 0C01E1A7 */ jal Math_SmoothStepToS /* 0399C 80952C5C 00052C03 */ sra $a1, $a1, 16 /* 039A0 80952C60 54400028 */ bnel $v0, $zero, .L80952D04 @@ -307,7 +307,7 @@ glabel func_80952858 /* 039BC 80952C7C 00000000 */ nop /* 039C0 80952C80 860E008A */ lh $t6, 0x008A($s0) ## 0000008A /* 039C4 80952C84 A2000114 */ sb $zero, 0x0114($s0) ## 00000114 -/* 039C8 80952C88 0C03F66B */ jal Math_Rand_ZeroOne +/* 039C8 80952C88 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 039CC 80952C8C A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 /* 039D0 80952C90 3C014316 */ lui $at, 0x4316 ## $at = 43160000 @@ -337,7 +337,7 @@ glabel func_80952858 /* 03A2C 80952CEC 46105482 */ mul.s $f18, $f10, $f16 /* 03A30 80952CF0 46049180 */ add.s $f6, $f18, $f4 /* 03A34 80952CF4 44053000 */ mfc1 $a1, $f6 -/* 03A38 80952CF8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03A38 80952CF8 0C01E0C4 */ jal Math_SmoothStepToF /* 03A3C 80952CFC 00000000 */ nop /* 03A40 80952D00 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010 @@ -354,7 +354,7 @@ glabel func_80952858 /* 03A64 80952D24 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03A68 80952D28 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 03A6C 80952D2C 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 03A70 80952D30 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 03A70 80952D30 0C01E1A7 */ jal Math_SmoothStepToS /* 03A74 80952D34 AFA00010 */ sw $zero, 0x0010($sp) /* 03A78 80952D38 8E030198 */ lw $v1, 0x0198($s0) ## 00000198 @@ -374,7 +374,7 @@ glabel func_80952858 /* 03AB0 80952D70 AE0A0198 */ sw $t2, 0x0198($s0) ## 00000198 .L80952D74: /* 03AB4 80952D74 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 03AB8 80952D78 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03AB8 80952D78 0C01E0C4 */ jal Math_SmoothStepToF /* 03ABC 80952D7C E7AA0010 */ swc1 $f10, 0x0010($sp) /* 03AC0 80952D80 8E0C0198 */ lw $t4, 0x0198($s0) ## 00000198 @@ -439,7 +439,7 @@ glabel func_80952858 /* 03BA0 80952E60 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 03BA4 80952E64 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 03BA8 80952E68 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 03BAC 80952E6C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03BAC 80952E6C 0C01E0C4 */ jal Math_SmoothStepToF /* 03BB0 80952E70 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 03BB4 80952E74 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 @@ -448,7 +448,7 @@ glabel func_80952858 /* 03BBC 80952E7C 3C05C4AF */ lui $a1, 0xC4AF ## $a1 = C4AF0000 /* 03BC0 80952E80 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03BC4 80952E84 3C074270 */ lui $a3, 0x4270 ## $a3 = 42700000 -/* 03BC8 80952E88 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03BC8 80952E88 0C01E0C4 */ jal Math_SmoothStepToF /* 03BCC 80952E8C E7B00010 */ swc1 $f16, 0x0010($sp) /* 03BD0 80952E90 10000034 */ beq $zero, $zero, .L80952F64 @@ -463,7 +463,7 @@ glabel func_80952858 /* 03BF0 80952EB0 8619008A */ lh $t9, 0x008A($s0) ## 0000008A /* 03BF4 80952EB4 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 03BF8 80952EB8 03214021 */ addu $t0, $t9, $at -/* 03BFC 80952EBC 0C03F66B */ jal Math_Rand_ZeroOne +/* 03BFC 80952EBC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 03C00 80952EC0 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 /* 03C04 80952EC4 3C014316 */ lui $at, 0x4316 ## $at = 43160000 @@ -480,7 +480,7 @@ glabel func_80952858 /* 03C2C 80952EEC 24050FA0 */ addiu $a1, $zero, 0x0FA0 ## $a1 = 00000FA0 /* 03C30 80952EF0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 03C34 80952EF4 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 03C38 80952EF8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 03C38 80952EF8 0C01E1A7 */ jal Math_SmoothStepToS /* 03C3C 80952EFC AFA00010 */ sw $zero, 0x0010($sp) /* 03C40 80952F00 3C0F8096 */ lui $t7, %hi(D_809668D1) ## $t7 = 80960000 @@ -498,7 +498,7 @@ glabel func_80952858 /* 03C70 80952F30 46000480 */ add.s $f18, $f0, $f0 /* 03C74 80952F34 46049180 */ add.s $f6, $f18, $f4 /* 03C78 80952F38 44053000 */ mfc1 $a1, $f6 -/* 03C7C 80952F3C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03C7C 80952F3C 0C01E0C4 */ jal Math_SmoothStepToF /* 03C80 80952F40 00000000 */ nop /* 03C84 80952F44 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 @@ -506,7 +506,7 @@ glabel func_80952858 /* 03C8C 80952F4C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 03C90 80952F50 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03C94 80952F54 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 03C98 80952F58 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03C98 80952F58 0C01E0C4 */ jal Math_SmoothStepToF /* 03C9C 80952F5C E7AA0010 */ swc1 $f10, 0x0010($sp) /* 03CA0 80952F60 8E0E0198 */ lw $t6, 0x0198($s0) ## 00000198 @@ -527,14 +527,14 @@ glabel func_80952858 /* 03CD4 80952F94 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 03CD8 80952F98 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03CDC 80952F9C 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 03CE0 80952FA0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03CE0 80952FA0 0C01E0C4 */ jal Math_SmoothStepToF /* 03CE4 80952FA4 E7A00010 */ swc1 $f0, 0x0010($sp) /* 03CE8 80952FA8 860C01AC */ lh $t4, 0x01AC($s0) ## 000001AC .L80952FAC: /* 03CEC 80952FAC 258D0C31 */ addiu $t5, $t4, 0x0C31 ## $t5 = 00000C31 /* 03CF0 80952FB0 A60D01AC */ sh $t5, 0x01AC($s0) ## 000001AC -/* 03CF4 80952FB4 0C01DE0D */ jal Math_Coss +/* 03CF4 80952FB4 0C01DE0D */ jal Math_CosS ## coss? /* 03CF8 80952FB8 860401AC */ lh $a0, 0x01AC($s0) ## 000001AC /* 03CFC 80952FBC 3C018096 */ lui $at, %hi(D_8095C6EC) ## $at = 80960000 @@ -544,7 +544,7 @@ glabel func_80952858 /* 03D0C 80952FCC 46120102 */ mul.s $f4, $f0, $f18 /* 03D10 80952FD0 860401AC */ lh $a0, 0x01AC($s0) ## 000001AC /* 03D14 80952FD4 46062200 */ add.s $f8, $f4, $f6 -/* 03D18 80952FD8 0C01DE1C */ jal Math_Sins +/* 03D18 80952FD8 0C01DE1C */ jal Math_SinS ## sins? /* 03D1C 80952FDC E60801A0 */ swc1 $f8, 0x01A0($s0) ## 000001A0 /* 03D20 80952FE0 3C018096 */ lui $at, %hi(D_8095C6F0) ## $at = 80960000 @@ -560,7 +560,7 @@ glabel func_80952858 /* 03D48 80953008 1140000A */ beq $t2, $zero, .L80953034 /* 03D4C 8095300C E60401A4 */ swc1 $f4, 0x01A4($s0) ## 000001A4 /* 03D50 80953010 A60F0088 */ sh $t7, 0x0088($s0) ## 00000088 -/* 03D54 80953014 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 03D54 80953014 0C00CFC8 */ jal Rand_CenteredFloat /* 03D58 80953018 C42CC6F4 */ lwc1 $f12, %lo(D_8095C6F4)($at) /* 03D5C 8095301C 4600018D */ trunc.w.s $f6, $f0 @@ -597,7 +597,7 @@ glabel func_80952858 /* 03DCC 8095308C 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 03DD0 80953090 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 03DD4 80953094 240705DC */ addiu $a3, $zero, 0x05DC ## $a3 = 000005DC -/* 03DD8 80953098 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 03DD8 80953098 0C01E1A7 */ jal Math_SmoothStepToS /* 03DDC 8095309C AFA00010 */ sw $zero, 0x0010($sp) /* 03DE0 809530A0 1000002A */ beq $zero, $zero, .L8095314C @@ -614,7 +614,7 @@ glabel func_80952858 /* 03E08 809530C8 00A12821 */ addu $a1, $a1, $at /* 03E0C 809530CC 00052C00 */ sll $a1, $a1, 16 /* 03E10 809530D0 00052C03 */ sra $a1, $a1, 16 -/* 03E14 809530D4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 03E14 809530D4 0C01E1A7 */ jal Math_SmoothStepToS /* 03E18 809530D8 2407012C */ addiu $a3, $zero, 0x012C ## $a3 = 0000012C /* 03E1C 809530DC 1000001B */ beq $zero, $zero, .L8095314C @@ -643,7 +643,7 @@ glabel func_80952858 /* 03E74 80953134 00073C03 */ sra $a3, $a3, 16 /* 03E78 80953138 24E70064 */ addiu $a3, $a3, 0x0064 ## $a3 = 00000064 /* 03E7C 8095313C 00073C00 */ sll $a3, $a3, 16 -/* 03E80 80953140 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 03E80 80953140 0C01E1A7 */ jal Math_SmoothStepToS /* 03E84 80953144 00073C03 */ sra $a3, $a3, 16 .L80953148: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809533F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809533F4.s index 5404b97b23..1ed33d2104 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809533F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809533F4.s @@ -194,7 +194,7 @@ glabel L8095361C /* 04364 80953624 02818021 */ addu $s0, $s4, $at /* 04368 80953628 258D0100 */ addiu $t5, $t4, 0x0100 ## $t5 = 00000100 /* 0436C 8095362C A66D01AC */ sh $t5, 0x01AC($s3) ## 000001AC -/* 04370 80953630 0C01DE1C */ jal Math_Sins +/* 04370 80953630 0C01DE1C */ jal Math_SinS ## sins? /* 04374 80953634 866401AC */ lh $a0, 0x01AC($s3) ## 000001AC /* 04378 80953638 3C014320 */ lui $at, 0x4320 ## $at = 43200000 @@ -207,7 +207,7 @@ glabel L8095361C /* 04394 80953654 46040182 */ mul.s $f6, $f0, $f4 /* 04398 80953658 46083280 */ add.s $f10, $f6, $f8 /* 0439C 8095365C E42A68F8 */ swc1 $f10, %lo(D_809668F8)($at) -/* 043A0 80953660 0C01DE0D */ jal Math_Coss +/* 043A0 80953660 0C01DE0D */ jal Math_CosS ## coss? /* 043A4 80953664 866401AC */ lh $a0, 0x01AC($s3) ## 000001AC /* 043A8 80953668 C67001A8 */ lwc1 $f16, 0x01A8($s3) ## 000001A8 @@ -226,7 +226,7 @@ glabel L8095361C /* 043DC 8095369C E4286900 */ swc1 $f8, %lo(D_80966900)($at) /* 043E0 809536A0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 043E4 809536A4 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 043E8 809536A8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 043E8 809536A8 0C01E0C4 */ jal Math_SmoothStepToF /* 043EC 809536AC E7AA0010 */ swc1 $f10, 0x0010($sp) /* 043F0 809536B0 3C028096 */ lui $v0, %hi(D_80966918) ## $v0 = 80960000 @@ -244,7 +244,7 @@ glabel L8095361C /* 04420 809536E0 8C4F0004 */ lw $t7, 0x0004($v0) ## 8096691C /* 04424 809536E4 ADCF0004 */ sw $t7, 0x0004($t6) ## 8096692C /* 04428 809536E8 8C580008 */ lw $t8, 0x0008($v0) ## 80966920 -/* 0442C 809536EC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0442C 809536EC 0C00CFC8 */ jal Rand_CenteredFloat /* 04430 809536F0 ADD80008 */ sw $t8, 0x0008($t6) ## 80966930 /* 04434 809536F4 3C018096 */ lui $at, %hi(D_80966918) ## $at = 80960000 @@ -347,7 +347,7 @@ glabel L80953868 /* 045A8 80953868 866901AC */ lh $t1, 0x01AC($s3) ## 000001AC /* 045AC 8095386C 252A1862 */ addiu $t2, $t1, 0x1862 ## $t2 = 00001863 /* 045B0 80953870 A66A01AC */ sh $t2, 0x01AC($s3) ## 000001AC -/* 045B4 80953874 0C01DE0D */ jal Math_Coss +/* 045B4 80953874 0C01DE0D */ jal Math_CosS ## coss? /* 045B8 80953878 866401AC */ lh $a0, 0x01AC($s3) ## 000001AC /* 045BC 8095387C 3C018096 */ lui $at, %hi(D_8095C72C) ## $at = 80960000 @@ -357,7 +357,7 @@ glabel L80953868 /* 045CC 8095388C 460A0402 */ mul.s $f16, $f0, $f10 /* 045D0 80953890 866401AC */ lh $a0, 0x01AC($s3) ## 000001AC /* 045D4 80953894 46128100 */ add.s $f4, $f16, $f18 -/* 045D8 80953898 0C01DE1C */ jal Math_Sins +/* 045D8 80953898 0C01DE1C */ jal Math_SinS ## sins? /* 045DC 8095389C E66401A0 */ swc1 $f4, 0x01A0($s3) ## 000001A0 /* 045E0 809538A0 3C018096 */ lui $at, %hi(D_8095C730) ## $at = 80960000 @@ -426,7 +426,7 @@ glabel L80953940 /* 046D0 80953990 C66A002C */ lwc1 $f10, 0x002C($s3) ## 0000002C /* 046D4 80953994 3C018096 */ lui $at, %hi(D_80966910) ## $at = 80960000 /* 046D8 80953998 E42A6910 */ swc1 $f10, %lo(D_80966910)($at) -/* 046DC 8095399C 0C01DE1C */ jal Math_Sins +/* 046DC 8095399C 0C01DE1C */ jal Math_SinS ## sins? /* 046E0 809539A0 858400B6 */ lh $a0, 0x00B6($t4) ## 000000B6 /* 046E4 809539A4 3C01C302 */ lui $at, 0xC302 ## $at = C3020000 @@ -437,7 +437,7 @@ glabel L80953940 /* 046F8 809539B8 C6320024 */ lwc1 $f18, 0x0024($s1) ## 00000025 /* 046FC 809539BC 46128100 */ add.s $f4, $f16, $f18 /* 04700 809539C0 E42468F8 */ swc1 $f4, %lo(D_809668F8)($at) -/* 04704 809539C4 0C01DE0D */ jal Math_Coss +/* 04704 809539C4 0C01DE0D */ jal Math_CosS ## coss? /* 04708 809539C8 862400B6 */ lh $a0, 0x00B6($s1) ## 000000B7 /* 0470C 809539CC 46140182 */ mul.s $f6, $f0, $f20 @@ -496,7 +496,7 @@ glabel L80953A84 /* 047DC 80953A9C 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 047E0 80953AA0 24846918 */ addiu $a0, $a0, %lo(D_80966918) ## $a0 = 80966918 /* 047E4 80953AA4 3C053FC0 */ lui $a1, 0x3FC0 ## $a1 = 3FC00000 -/* 047E8 80953AA8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 047E8 80953AA8 0C01E0C4 */ jal Math_SmoothStepToF /* 047EC 80953AAC E7A60010 */ swc1 $f6, 0x0010($sp) /* 047F0 80953AB0 3C018096 */ lui $at, %hi(D_80966918) ## $at = 80960000 @@ -640,7 +640,7 @@ glabel L80953CBC .L80953CBC: /* 049FC 80953CBC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 04A00 80953CC0 44816000 */ mtc1 $at, $f12 ## $f12 = 0.50 -/* 04A04 80953CC4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 04A04 80953CC4 0C00CFC8 */ jal Rand_CenteredFloat /* 04A08 80953CC8 00000000 */ nop /* 04A0C 80953CCC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -664,7 +664,7 @@ glabel L80953CD8 /* 04A4C 80953D0C 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 04A50 80953D10 8CA568F8 */ lw $a1, %lo(D_809668F8)($a1) /* 04A54 80953D14 248468D8 */ addiu $a0, $a0, %lo(D_809668D8) ## $a0 = 809668D8 -/* 04A58 80953D18 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04A58 80953D18 0C01E0C4 */ jal Math_SmoothStepToF /* 04A5C 80953D1C E7A60010 */ swc1 $f6, 0x0010($sp) /* 04A60 80953D20 3C018096 */ lui $at, %hi(D_8095C73C) ## $at = 80960000 @@ -677,7 +677,7 @@ glabel L80953CD8 /* 04A7C 80953D3C 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 04A80 80953D40 8CA568FC */ lw $a1, %lo(D_809668FC)($a1) /* 04A84 80953D44 248468DC */ addiu $a0, $a0, %lo(D_809668DC) ## $a0 = 809668DC -/* 04A88 80953D48 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04A88 80953D48 0C01E0C4 */ jal Math_SmoothStepToF /* 04A8C 80953D4C E7A80010 */ swc1 $f8, 0x0010($sp) /* 04A90 80953D50 3C018096 */ lui $at, %hi(D_8095C740) ## $at = 80960000 @@ -690,7 +690,7 @@ glabel L80953CD8 /* 04AAC 80953D6C 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 04AB0 80953D70 8CA56900 */ lw $a1, %lo(D_80966900)($a1) /* 04AB4 80953D74 248468E0 */ addiu $a0, $a0, %lo(D_809668E0) ## $a0 = 809668E0 -/* 04AB8 80953D78 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04AB8 80953D78 0C01E0C4 */ jal Math_SmoothStepToF /* 04ABC 80953D7C E7AA0010 */ swc1 $f10, 0x0010($sp) /* 04AC0 80953D80 3C018096 */ lui $at, %hi(D_8095C744) ## $at = 80960000 @@ -703,7 +703,7 @@ glabel L80953CD8 /* 04ADC 80953D9C 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 04AE0 80953DA0 8CA56908 */ lw $a1, %lo(D_80966908)($a1) /* 04AE4 80953DA4 248468E8 */ addiu $a0, $a0, %lo(D_809668E8) ## $a0 = 809668E8 -/* 04AE8 80953DA8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04AE8 80953DA8 0C01E0C4 */ jal Math_SmoothStepToF /* 04AEC 80953DAC E7B00010 */ swc1 $f16, 0x0010($sp) /* 04AF0 80953DB0 3C018096 */ lui $at, %hi(D_8095C748) ## $at = 80960000 @@ -716,7 +716,7 @@ glabel L80953CD8 /* 04B0C 80953DCC 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 04B10 80953DD0 8CA5690C */ lw $a1, %lo(D_8096690C)($a1) /* 04B14 80953DD4 248468EC */ addiu $a0, $a0, %lo(D_809668EC) ## $a0 = 809668EC -/* 04B18 80953DD8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04B18 80953DD8 0C01E0C4 */ jal Math_SmoothStepToF /* 04B1C 80953DDC E7B20010 */ swc1 $f18, 0x0010($sp) /* 04B20 80953DE0 3C018096 */ lui $at, %hi(D_8095C74C) ## $at = 80960000 @@ -729,7 +729,7 @@ glabel L80953CD8 /* 04B3C 80953DFC 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 04B40 80953E00 8CA56910 */ lw $a1, %lo(D_80966910)($a1) /* 04B44 80953E04 248468F0 */ addiu $a0, $a0, %lo(D_809668F0) ## $a0 = 809668F0 -/* 04B48 80953E08 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04B48 80953E08 0C01E0C4 */ jal Math_SmoothStepToF /* 04B4C 80953E0C E7A40010 */ swc1 $f4, 0x0010($sp) /* 04B50 80953E10 3C058096 */ lui $a1, %hi(D_8095C23C) ## $a1 = 80960000 @@ -748,28 +748,28 @@ glabel L80953CD8 /* 04B7C 80953E3C 3C05C3F0 */ lui $a1, 0xC3F0 ## $a1 = C3F00000 /* 04B80 80953E40 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04B84 80953E44 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 04B88 80953E48 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04B88 80953E48 0C01E0C4 */ jal Math_SmoothStepToF /* 04B8C 80953E4C E7B40010 */ swc1 $f20, 0x0010($sp) /* 04B90 80953E50 266401F8 */ addiu $a0, $s3, 0x01F8 ## $a0 = 000001F8 /* 04B94 80953E54 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04B98 80953E58 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 04B9C 80953E5C 240700C8 */ addiu $a3, $zero, 0x00C8 ## $a3 = 000000C8 -/* 04BA0 80953E60 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 04BA0 80953E60 0C01E1A7 */ jal Math_SmoothStepToS /* 04BA4 80953E64 AFA00010 */ sw $zero, 0x0010($sp) /* 04BA8 80953E68 266401F6 */ addiu $a0, $s3, 0x01F6 ## $a0 = 000001F6 /* 04BAC 80953E6C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04BB0 80953E70 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 04BB4 80953E74 240700C8 */ addiu $a3, $zero, 0x00C8 ## $a3 = 000000C8 -/* 04BB8 80953E78 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 04BB8 80953E78 0C01E1A7 */ jal Math_SmoothStepToS /* 04BBC 80953E7C AFA00010 */ sw $zero, 0x0010($sp) /* 04BC0 80953E80 266401AE */ addiu $a0, $s3, 0x01AE ## $a0 = 000001AE /* 04BC4 80953E84 240500C8 */ addiu $a1, $zero, 0x00C8 ## $a1 = 000000C8 /* 04BC8 80953E88 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 04BCC 80953E8C 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 04BD0 80953E90 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 04BD0 80953E90 0C01E1A7 */ jal Math_SmoothStepToS /* 04BD4 80953E94 AFA00010 */ sw $zero, 0x0010($sp) /* 04BD8 80953E98 92030B09 */ lbu $v1, 0x0B09($s0) ## 00000B09 @@ -781,7 +781,7 @@ glabel L80953CD8 /* 04BF0 80953EB0 A20D0B09 */ sb $t5, 0x0B09($s0) ## 00000B09 .L80953EB4: /* 04BF4 80953EB4 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 04BF8 80953EB8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04BF8 80953EB8 0C01E0C4 */ jal Math_SmoothStepToF /* 04BFC 80953EBC E7B40010 */ swc1 $f20, 0x0010($sp) /* 04C00 80953EC0 867901AC */ lh $t9, 0x01AC($s3) ## 000001AC @@ -792,7 +792,7 @@ glabel L80953CD8 /* 04C14 80953ED4 A66901AC */ sh $t1, 0x01AC($s3) ## 000001AC /* 04C18 80953ED8 01CFC021 */ addu $t8, $t6, $t7 /* 04C1C 80953EDC A67800B6 */ sh $t8, 0x00B6($s3) ## 000000B6 -/* 04C20 80953EE0 0C01DE0D */ jal Math_Coss +/* 04C20 80953EE0 0C01DE0D */ jal Math_CosS ## coss? /* 04C24 80953EE4 866401AC */ lh $a0, 0x01AC($s3) ## 000001AC /* 04C28 80953EE8 3C018096 */ lui $at, %hi(D_8095C750) ## $at = 80960000 @@ -802,7 +802,7 @@ glabel L80953CD8 /* 04C38 80953EF8 46060202 */ mul.s $f8, $f0, $f6 /* 04C3C 80953EFC 866401AC */ lh $a0, 0x01AC($s3) ## 000001AC /* 04C40 80953F00 460A4400 */ add.s $f16, $f8, $f10 -/* 04C44 80953F04 0C01DE1C */ jal Math_Sins +/* 04C44 80953F04 0C01DE1C */ jal Math_SinS ## sins? /* 04C48 80953F08 E67001A0 */ swc1 $f16, 0x01A0($s3) ## 000001A0 /* 04C4C 80953F0C 3C018096 */ lui $at, %hi(D_8095C754) ## $at = 80960000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80953FC4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80953FC4.s index 9692b0f657..b9553b4292 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80953FC4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80953FC4.s @@ -61,10 +61,10 @@ glabel func_80953FC4 /* 04DD0 80954090 44060000 */ mfc1 $a2, $f0 /* 04DD4 80954094 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 04DD8 80954098 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 -/* 04DDC 8095409C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04DDC 8095409C 0C01E0C4 */ jal Math_SmoothStepToF /* 04DE0 809540A0 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 04DE4 809540A4 0C03F66B */ jal Math_Rand_ZeroOne +/* 04DE4 809540A4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 04DE8 809540A8 00000000 */ nop /* 04DEC 809540AC 3C018096 */ lui $at, %hi(D_8095C758) ## $at = 80960000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954168.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954168.s index 610f82e0cf..d983612102 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954168.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954168.s @@ -22,7 +22,7 @@ glabel func_80954168 /* 04EE4 809541A4 2408000C */ addiu $t0, $zero, 0x000C ## $t0 = 0000000C /* 04EE8 809541A8 0C00D09B */ jal func_8003426C /* 04EEC 809541AC AFA80010 */ sw $t0, 0x0010($sp) -/* 04EF0 809541B0 0C03F66B */ jal Math_Rand_ZeroOne +/* 04EF0 809541B0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 04EF4 809541B4 00000000 */ nop /* 04EF8 809541B8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -97,7 +97,7 @@ glabel func_80954168 .L809542A4: /* 04FE4 809542A4 0C253CB2 */ jal func_8094F2C8 /* 04FE8 809542A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04FEC 809542AC 0C03F66B */ jal Math_Rand_ZeroOne +/* 04FEC 809542AC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 04FF0 809542B0 00000000 */ nop /* 04FF4 809542B4 3C018096 */ lui $at, %hi(D_8095C75C) ## $at = 80960000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954454.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954454.s index f6c311d586..ac05b28353 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954454.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954454.s @@ -18,7 +18,7 @@ glabel func_80954454 /* 051D0 80954490 00000000 */ nop /* 051D4 80954494 468021A0 */ cvt.s.w $f6, $f4 /* 051D8 80954498 E7A60048 */ swc1 $f6, 0x0048($sp) -/* 051DC 8095449C 0C03F66B */ jal Math_Rand_ZeroOne +/* 051DC 8095449C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 051E0 809544A0 A2000194 */ sb $zero, 0x0194($s0) ## 00000194 /* 051E4 809544A4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -113,7 +113,7 @@ glabel func_80954454 /* 05330 809545F0 00052C00 */ sll $a1, $a1, 16 /* 05334 809545F4 00052C03 */ sra $a1, $a1, 16 /* 05338 809545F8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0533C 809545FC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0533C 809545FC 0C01E1A7 */ jal Math_SmoothStepToS /* 05340 80954600 240704B0 */ addiu $a3, $zero, 0x04B0 ## $a3 = 000004B0 /* 05344 80954604 0C02927F */ jal SkelAnime_FrameUpdateMatrix @@ -151,7 +151,7 @@ glabel func_80954454 /* 053B4 80954674 2B01000E */ slti $at, $t8, 0x000E /* 053B8 80954678 10200010 */ beq $at, $zero, .L809546BC /* 053BC 8095467C 00000000 */ nop -/* 053C0 80954680 0C03F66B */ jal Math_Rand_ZeroOne +/* 053C0 80954680 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 053C4 80954684 00000000 */ nop /* 053C8 80954688 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -179,7 +179,7 @@ glabel func_80954454 /* 0541C 809546DC 44814000 */ mtc1 $at, $f8 ## $f8 = 0.12 /* 05420 809546E0 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 05424 809546E4 3C073E80 */ lui $a3, 0x3E80 ## $a3 = 3E800000 -/* 05428 809546E8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 05428 809546E8 0C01E0C4 */ jal Math_SmoothStepToF /* 0542C 809546EC E7A80010 */ swc1 $f8, 0x0010($sp) /* 05430 809546F0 3C028096 */ lui $v0, %hi(D_809668D2) ## $v0 = 80960000 @@ -221,7 +221,7 @@ glabel func_80954454 /* 054B8 80954778 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 054BC 8095477C ADAF0008 */ sw $t7, 0x0008($t5) ## 809668F0 /* 054C0 80954780 8C450000 */ lw $a1, 0x0000($v0) ## 80966908 -/* 054C4 80954784 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 054C4 80954784 0C01E0C4 */ jal Math_SmoothStepToF /* 054C8 80954788 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 054CC 8095478C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 @@ -231,7 +231,7 @@ glabel func_80954454 /* 054DC 8095479C 248468E0 */ addiu $a0, $a0, %lo(D_809668E0) ## $a0 = 809668E0 /* 054E0 809547A0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 054E4 809547A4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 054E8 809547A8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 054E8 809547A8 0C01E0C4 */ jal Math_SmoothStepToF /* 054EC 809547AC E7B00010 */ swc1 $f16, 0x0010($sp) /* 054F0 809547B0 3C028096 */ lui $v0, %hi(D_809668D8) ## $v0 = 80960000 @@ -259,7 +259,7 @@ glabel func_80954454 /* 05540 80954800 51600020 */ beql $t3, $zero, .L80954884 /* 05544 80954804 8608019C */ lh $t0, 0x019C($s0) ## 0000019C /* 05548 80954808 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 0554C 8095480C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0554C 8095480C 0C00CFC8 */ jal Rand_CenteredFloat /* 05550 80954810 00000000 */ nop /* 05554 80954814 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809549A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809549A8.s index 46245494fb..456df888fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809549A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809549A8.s @@ -13,7 +13,7 @@ glabel func_809549A8 /* 056FC 809549BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 05700 809549C0 10400012 */ beq $v0, $zero, .L80954A0C /* 05704 809549C4 00000000 */ nop -/* 05708 809549C8 0C03F66B */ jal Math_Rand_ZeroOne +/* 05708 809549C8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0570C 809549CC 00000000 */ nop /* 05710 809549D0 3C018096 */ lui $at, %hi(D_8095C760) ## $at = 80960000 @@ -22,7 +22,7 @@ glabel func_809549A8 /* 0571C 809549DC 00000000 */ nop /* 05720 809549E0 4500000A */ bc1f .L80954A0C /* 05724 809549E4 00000000 */ nop -/* 05728 809549E8 0C03F66B */ jal Math_Rand_ZeroOne +/* 05728 809549E8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0572C 809549EC 00000000 */ nop /* 05730 809549F0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954AD0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954AD0.s index efb0d04850..cfdad8ccc1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954AD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954AD0.s @@ -36,7 +36,7 @@ glabel func_80954AD0 /* 05888 80954B48 00052C00 */ sll $a1, $a1, 16 /* 0588C 80954B4C 00052C03 */ sra $a1, $a1, 16 /* 05890 80954B50 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 05894 80954B54 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 05894 80954B54 0C01E1A7 */ jal Math_SmoothStepToS /* 05898 80954B58 240702EE */ addiu $a3, $zero, 0x02EE ## $a3 = 000002EE /* 0589C 80954B5C 8E18016C */ lw $t8, 0x016C($s0) ## 0000016C @@ -44,7 +44,7 @@ glabel func_80954AD0 /* 058A4 80954B64 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 058A8 80954B68 8705002E */ lh $a1, 0x002E($t8) ## 0000002E /* 058AC 80954B6C AFA00010 */ sw $zero, 0x0010($sp) -/* 058B0 80954B70 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 058B0 80954B70 0C01E1A7 */ jal Math_SmoothStepToS /* 058B4 80954B74 240702EE */ addiu $a3, $zero, 0x02EE ## $a3 = 000002EE /* 058B8 80954B78 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954C20.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954C20.s index bf9df3d606..1c4cd2dd73 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954C20.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954C20.s @@ -138,7 +138,7 @@ glabel func_80954C20 /* 05B2C 80954DEC 44063000 */ mfc1 $a2, $f6 /* 05B30 80954DF0 00000000 */ nop /* 05B34 80954DF4 00063400 */ sll $a2, $a2, 16 -/* 05B38 80954DF8 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 05B38 80954DF8 0C01DE2B */ jal Math_ScaledStepToS /* 05B3C 80954DFC 00063403 */ sra $a2, $a2, 16 /* 05B40 80954E00 87A70054 */ lh $a3, 0x0054($sp) @@ -152,10 +152,10 @@ glabel func_80954C20 /* 05B60 80954E20 44069000 */ mfc1 $a2, $f18 /* 05B64 80954E24 00000000 */ nop /* 05B68 80954E28 00063400 */ sll $a2, $a2, 16 -/* 05B6C 80954E2C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 05B6C 80954E2C 0C01DE2B */ jal Math_ScaledStepToS /* 05B70 80954E30 00063403 */ sra $a2, $a2, 16 -/* 05B74 80954E34 0C01DE1C */ jal Math_Sins +/* 05B74 80954E34 0C01DE1C */ jal Math_SinS ## sins? /* 05B78 80954E38 87A40056 */ lh $a0, 0x0056($sp) /* 05B7C 80954E3C 3C014140 */ lui $at, 0x4140 ## $at = 41400000 @@ -163,20 +163,20 @@ glabel func_80954C20 /* 05B84 80954E44 46000107 */ neg.s $f4, $f0 /* 05B88 80954E48 87A40056 */ lh $a0, 0x0056($sp) /* 05B8C 80954E4C 46062202 */ mul.s $f8, $f4, $f6 -/* 05B90 80954E50 0C01DE0D */ jal Math_Coss +/* 05B90 80954E50 0C01DE0D */ jal Math_CosS ## coss? /* 05B94 80954E54 E7A80068 */ swc1 $f8, 0x0068($sp) /* 05B98 80954E58 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 05B9C 80954E5C 44815000 */ mtc1 $at, $f10 ## $f10 = 12.00 /* 05BA0 80954E60 87A4006C */ lh $a0, 0x006C($sp) /* 05BA4 80954E64 460A0402 */ mul.s $f16, $f0, $f10 -/* 05BA8 80954E68 0C01DE1C */ jal Math_Sins +/* 05BA8 80954E68 0C01DE1C */ jal Math_SinS ## sins? /* 05BAC 80954E6C E7B0005C */ swc1 $f16, 0x005C($sp) /* 05BB0 80954E70 C7B2005C */ lwc1 $f18, 0x005C($sp) /* 05BB4 80954E74 87A4006C */ lh $a0, 0x006C($sp) /* 05BB8 80954E78 46120102 */ mul.s $f4, $f0, $f18 -/* 05BBC 80954E7C 0C01DE0D */ jal Math_Coss +/* 05BBC 80954E7C 0C01DE0D */ jal Math_CosS ## coss? /* 05BC0 80954E80 E7A40064 */ swc1 $f4, 0x0064($sp) /* 05BC4 80954E84 C7A20074 */ lwc1 $f2, 0x0074($sp) @@ -305,7 +305,7 @@ glabel func_80954C20 /* 05D7C 8095503C 240706D6 */ addiu $a3, $zero, 0x06D6 ## $a3 = 000006D6 /* 05D80 80955040 AFA00010 */ sw $zero, 0x0010($sp) /* 05D84 80955044 A7A50094 */ sh $a1, 0x0094($sp) -/* 05D88 80955048 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 05D88 80955048 0C01E1A7 */ jal Math_SmoothStepToS /* 05D8C 8095504C A7A80098 */ sh $t0, 0x0098($sp) /* 05D90 80955050 87A50094 */ lh $a1, 0x0094($sp) @@ -341,7 +341,7 @@ glabel func_80954C20 /* 05DF8 809550B8 2405E890 */ addiu $a1, $zero, 0xE890 ## $a1 = FFFFE890 .L809550BC: /* 05DFC 809550BC 240706D6 */ addiu $a3, $zero, 0x06D6 ## $a3 = 000006D6 -/* 05E00 809550C0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 05E00 809550C0 0C01E1A7 */ jal Math_SmoothStepToS /* 05E04 809550C4 AFA00010 */ sw $zero, 0x0010($sp) /* 05E08 809550C8 04400004 */ bltz $v0, .L809550DC @@ -367,7 +367,7 @@ glabel func_80954C20 /* 05E4C 8095510C 260401F2 */ addiu $a0, $s0, 0x01F2 ## $a0 = 000001F2 /* 05E50 80955110 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 05E54 80955114 240709C4 */ addiu $a3, $zero, 0x09C4 ## $a3 = 000009C4 -/* 05E58 80955118 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 05E58 80955118 0C01E1A7 */ jal Math_SmoothStepToS /* 05E5C 8095511C AFA00010 */ sw $zero, 0x0010($sp) /* 05E60 80955120 04400004 */ bltz $v0, .L80955134 @@ -406,7 +406,7 @@ glabel func_80954C20 /* 05ED8 80955198 00052C00 */ sll $a1, $a1, 16 /* 05EDC 8095519C 00052C03 */ sra $a1, $a1, 16 /* 05EE0 809551A0 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 05EE4 809551A4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 05EE4 809551A4 0C01E1A7 */ jal Math_SmoothStepToS /* 05EE8 809551A8 AFA00010 */ sw $zero, 0x0010($sp) /* 05EEC 809551AC 04400004 */ bltz $v0, .L809551C0 @@ -431,7 +431,7 @@ glabel func_80954C20 /* 05F2C 809551EC 260401F0 */ addiu $a0, $s0, 0x01F0 ## $a0 = 000001F0 /* 05F30 809551F0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 05F34 809551F4 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 05F38 809551F8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 05F38 809551F8 0C01E1A7 */ jal Math_SmoothStepToS /* 05F3C 809551FC AFA00010 */ sw $zero, 0x0010($sp) /* 05F40 80955200 04400004 */ bltz $v0, .L80955214 @@ -454,7 +454,7 @@ glabel func_80954C20 /* 05F7C 8095523C 44060000 */ mfc1 $a2, $f0 /* 05F80 80955240 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 05F84 80955244 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 -/* 05F88 80955248 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 05F88 80955248 0C01E0C4 */ jal Math_SmoothStepToF /* 05F8C 8095524C E7A20010 */ swc1 $f2, 0x0010($sp) /* 05F90 80955250 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -478,7 +478,7 @@ glabel func_80954C20 /* 05FD8 80955298 8D6D0008 */ lw $t5, 0x0008($t3) ## FFFFFFDC /* 05FDC 8095529C AE0D01E0 */ sw $t5, 0x01E0($s0) ## 000001E0 .L809552A0: -/* 05FE0 809552A0 0C03F66B */ jal Math_Rand_ZeroOne +/* 05FE0 809552A0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 05FE4 809552A4 00000000 */ nop /* 05FE8 809552A8 3C018096 */ lui $at, %hi(D_8095C76C) ## $at = 80960000 @@ -550,21 +550,21 @@ glabel func_80954C20 /* 060CC 8095538C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 060D0 80955390 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 060D4 80955394 240706D6 */ addiu $a3, $zero, 0x06D6 ## $a3 = 000006D6 -/* 060D8 80955398 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 060D8 80955398 0C01E1A7 */ jal Math_SmoothStepToS /* 060DC 8095539C AFA00010 */ sw $zero, 0x0010($sp) /* 060E0 809553A0 260401EC */ addiu $a0, $s0, 0x01EC ## $a0 = 000001EC /* 060E4 809553A4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 060E8 809553A8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 060EC 809553AC 240706D6 */ addiu $a3, $zero, 0x06D6 ## $a3 = 000006D6 -/* 060F0 809553B0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 060F0 809553B0 0C01E1A7 */ jal Math_SmoothStepToS /* 060F4 809553B4 AFA00010 */ sw $zero, 0x0010($sp) /* 060F8 809553B8 260401EA */ addiu $a0, $s0, 0x01EA ## $a0 = 000001EA /* 060FC 809553BC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 06100 809553C0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 06104 809553C4 240706D6 */ addiu $a3, $zero, 0x06D6 ## $a3 = 000006D6 -/* 06108 809553C8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 06108 809553C8 0C01E1A7 */ jal Math_SmoothStepToS /* 0610C 809553CC AFA00010 */ sw $zero, 0x0010($sp) /* 06110 809553D0 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 @@ -575,7 +575,7 @@ glabel func_80954C20 /* 06124 809553E4 00052C00 */ sll $a1, $a1, 16 /* 06128 809553E8 00052C03 */ sra $a1, $a1, 16 /* 0612C 809553EC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 06130 809553F0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 06130 809553F0 0C01E1A7 */ jal Math_SmoothStepToS /* 06134 809553F4 240706D6 */ addiu $a3, $zero, 0x06D6 ## $a3 = 000006D6 /* 06138 809553F8 8E09016C */ lw $t1, 0x016C($s0) ## 0000016C @@ -583,7 +583,7 @@ glabel func_80954C20 /* 06140 80955400 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 06144 80955404 8525002E */ lh $a1, 0x002E($t1) ## 0000002E /* 06148 80955408 AFA00010 */ sw $zero, 0x0010($sp) -/* 0614C 8095540C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0614C 8095540C 0C01E1A7 */ jal Math_SmoothStepToS /* 06150 80955410 240706D6 */ addiu $a3, $zero, 0x06D6 ## $a3 = 000006D6 /* 06154 80955414 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -594,7 +594,7 @@ glabel func_80954C20 /* 06168 80955428 44060000 */ mfc1 $a2, $f0 /* 0616C 8095542C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 06170 80955430 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 -/* 06174 80955434 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 06174 80955434 0C01E0C4 */ jal Math_SmoothStepToF /* 06178 80955438 E7B20010 */ swc1 $f18, 0x0010($sp) /* 0617C 8095543C A2000195 */ sb $zero, 0x0195($s0) ## 00000195 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955658.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955658.s index d66bd3dfb4..4f0fd45558 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955658.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955658.s @@ -3,7 +3,7 @@ glabel func_80955658 /* 0639C 8095565C AFBF002C */ sw $ra, 0x002C($sp) /* 063A0 80955660 AFB00028 */ sw $s0, 0x0028($sp) /* 063A4 80955664 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 063A8 80955668 0C03F66B */ jal Math_Rand_ZeroOne +/* 063A8 80955668 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 063AC 8095566C AFA50034 */ sw $a1, 0x0034($sp) /* 063B0 80955670 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095575C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095575C.s index 47cef02a1a..465c40001a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095575C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095575C.s @@ -9,28 +9,28 @@ glabel func_8095575C /* 064B8 80955778 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 064BC 8095577C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 064C0 80955780 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 064C4 80955784 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 064C4 80955784 0C01E1A7 */ jal Math_SmoothStepToS /* 064C8 80955788 AFA00010 */ sw $zero, 0x0010($sp) /* 064CC 8095578C 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 /* 064D0 80955790 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 064D4 80955794 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 064D8 80955798 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 064DC 8095579C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 064DC 8095579C 0C01E1A7 */ jal Math_SmoothStepToS /* 064E0 809557A0 AFA00010 */ sw $zero, 0x0010($sp) /* 064E4 809557A4 260401EC */ addiu $a0, $s0, 0x01EC ## $a0 = 000001EC /* 064E8 809557A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 064EC 809557AC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 064F0 809557B0 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 064F4 809557B4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 064F4 809557B4 0C01E1A7 */ jal Math_SmoothStepToS /* 064F8 809557B8 AFA00010 */ sw $zero, 0x0010($sp) /* 064FC 809557BC 260401EA */ addiu $a0, $s0, 0x01EA ## $a0 = 000001EA /* 06500 809557C0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 06504 809557C4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 06508 809557C8 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 0650C 809557CC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0650C 809557CC 0C01E1A7 */ jal Math_SmoothStepToS /* 06510 809557D0 AFA00010 */ sw $zero, 0x0010($sp) /* 06514 809557D4 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 @@ -41,7 +41,7 @@ glabel func_8095575C /* 06528 809557E8 00052C00 */ sll $a1, $a1, 16 /* 0652C 809557EC 00052C03 */ sra $a1, $a1, 16 /* 06530 809557F0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 06534 809557F4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 06534 809557F4 0C01E1A7 */ jal Math_SmoothStepToS /* 06538 809557F8 240702EE */ addiu $a3, $zero, 0x02EE ## $a3 = 000002EE /* 0653C 809557FC 8E18016C */ lw $t8, 0x016C($s0) ## 0000016C @@ -49,7 +49,7 @@ glabel func_8095575C /* 06544 80955804 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 06548 80955808 8705002E */ lh $a1, 0x002E($t8) ## 0000002E /* 0654C 8095580C AFA00010 */ sw $zero, 0x0010($sp) -/* 06550 80955810 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 06550 80955810 0C01E1A7 */ jal Math_SmoothStepToS /* 06554 80955814 240702EE */ addiu $a3, $zero, 0x02EE ## $a3 = 000002EE /* 06558 80955818 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095586C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095586C.s index 9e6b18975a..da8f7f936a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095586C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095586C.s @@ -11,10 +11,10 @@ glabel func_8095586C /* 065CC 8095588C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 065D0 80955890 00000000 */ nop /* 065D4 80955894 468021A0 */ cvt.s.w $f6, $f4 -/* 065D8 80955898 0C03F66B */ jal Math_Rand_ZeroOne +/* 065D8 80955898 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 065DC 8095589C E7A6003C */ swc1 $f6, 0x003C($sp) -/* 065E0 809558A0 0C03F66B */ jal Math_Rand_ZeroOne +/* 065E0 809558A0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 065E4 809558A4 E7A00034 */ swc1 $f0, 0x0034($sp) /* 065E8 809558A8 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955940.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955940.s index 474a44f71a..675d1e7a10 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955940.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955940.s @@ -25,21 +25,21 @@ glabel func_80955940 /* 066C8 80955988 10200019 */ beq $at, $zero, .L809559F0 /* 066CC 8095598C 3C014680 */ lui $at, 0x4680 ## $at = 46800000 /* 066D0 80955990 44816000 */ mtc1 $at, $f12 ## $f12 = 16384.00 -/* 066D4 80955994 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 066D4 80955994 0C00CFC8 */ jal Rand_CenteredFloat /* 066D8 80955998 00000000 */ nop /* 066DC 8095599C 4600018D */ trunc.w.s $f6, $f0 /* 066E0 809559A0 3C014680 */ lui $at, 0x4680 ## $at = 46800000 /* 066E4 809559A4 44816000 */ mtc1 $at, $f12 ## $f12 = 16384.00 /* 066E8 809559A8 44093000 */ mfc1 $t1, $f6 -/* 066EC 809559AC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 066EC 809559AC 0C00CFC8 */ jal Rand_CenteredFloat /* 066F0 809559B0 A60901E8 */ sh $t1, 0x01E8($s0) ## 000001E8 /* 066F4 809559B4 4600020D */ trunc.w.s $f8, $f0 /* 066F8 809559B8 3C014680 */ lui $at, 0x4680 ## $at = 46800000 /* 066FC 809559BC 44816000 */ mtc1 $at, $f12 ## $f12 = 16384.00 /* 06700 809559C0 440B4000 */ mfc1 $t3, $f8 -/* 06704 809559C4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 06704 809559C4 0C00CFC8 */ jal Rand_CenteredFloat /* 06708 809559C8 A60B01EE */ sh $t3, 0x01EE($s0) ## 000001EE /* 0670C 809559CC 4600028D */ trunc.w.s $f10, $f0 @@ -58,7 +58,7 @@ glabel func_80955940 /* 0673C 809559FC 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 /* 06740 80955A00 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 06744 80955A04 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 06748 80955A08 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 06748 80955A08 0C01E0C4 */ jal Math_SmoothStepToF /* 0674C 80955A0C E7B00010 */ swc1 $f16, 0x0010($sp) .L80955A10: @@ -67,7 +67,7 @@ glabel func_80955940 /* 06754 80955A14 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 06758 80955A18 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 0675C 80955A1C 44816000 */ mtc1 $at, $f12 ## $f12 = 500.00 -/* 06760 80955A20 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 06760 80955A20 0C00CFC8 */ jal Rand_CenteredFloat /* 06764 80955A24 00000000 */ nop /* 06768 80955A28 4600048D */ trunc.w.s $f18, $f0 @@ -80,19 +80,19 @@ glabel func_80955940 /* 06784 80955A44 00073C03 */ sra $a3, $a3, 16 /* 06788 80955A48 24E701F4 */ addiu $a3, $a3, 0x01F4 ## $a3 = 000001F4 /* 0678C 80955A4C 00073C00 */ sll $a3, $a3, 16 -/* 06790 80955A50 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 06790 80955A50 0C01E1A7 */ jal Math_SmoothStepToS /* 06794 80955A54 00073C03 */ sra $a3, $a3, 16 /* 06798 80955A58 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 /* 0679C 80955A5C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 067A0 80955A60 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 067A4 80955A64 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 067A8 80955A68 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 067A8 80955A68 0C01E1A7 */ jal Math_SmoothStepToS /* 067AC 80955A6C AFA00010 */ sw $zero, 0x0010($sp) /* 067B0 80955A70 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 067B4 80955A74 44816000 */ mtc1 $at, $f12 ## $f12 = 500.00 -/* 067B8 80955A78 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 067B8 80955A78 0C00CFC8 */ jal Rand_CenteredFloat /* 067BC 80955A7C 00000000 */ nop /* 067C0 80955A80 4600010D */ trunc.w.s $f4, $f0 @@ -105,19 +105,19 @@ glabel func_80955940 /* 067DC 80955A9C 00073C03 */ sra $a3, $a3, 16 /* 067E0 80955AA0 24E701F4 */ addiu $a3, $a3, 0x01F4 ## $a3 = 000001F4 /* 067E4 80955AA4 00073C00 */ sll $a3, $a3, 16 -/* 067E8 80955AA8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 067E8 80955AA8 0C01E1A7 */ jal Math_SmoothStepToS /* 067EC 80955AAC 00073C03 */ sra $a3, $a3, 16 /* 067F0 80955AB0 260401EA */ addiu $a0, $s0, 0x01EA ## $a0 = 000001EA /* 067F4 80955AB4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 067F8 80955AB8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 067FC 80955ABC 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 06800 80955AC0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 06800 80955AC0 0C01E1A7 */ jal Math_SmoothStepToS /* 06804 80955AC4 AFA00010 */ sw $zero, 0x0010($sp) /* 06808 80955AC8 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 0680C 80955ACC 44816000 */ mtc1 $at, $f12 ## $f12 = 500.00 -/* 06810 80955AD0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 06810 80955AD0 0C00CFC8 */ jal Rand_CenteredFloat /* 06814 80955AD4 00000000 */ nop /* 06818 80955AD8 4600018D */ trunc.w.s $f6, $f0 @@ -130,7 +130,7 @@ glabel func_80955940 /* 06834 80955AF4 00073C03 */ sra $a3, $a3, 16 /* 06838 80955AF8 24E701F4 */ addiu $a3, $a3, 0x01F4 ## $a3 = 000001F4 /* 0683C 80955AFC 00073C00 */ sll $a3, $a3, 16 -/* 06840 80955B00 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 06840 80955B00 0C01E1A7 */ jal Math_SmoothStepToS /* 06844 80955B04 00073C03 */ sra $a3, $a3, 16 /* 06848 80955B08 3C058096 */ lui $a1, %hi(D_809668D2) ## $a1 = 80960000 @@ -183,7 +183,7 @@ glabel func_80955940 /* 068EC 80955BAC 1020001B */ beq $at, $zero, .L80955C1C /* 068F0 80955BB0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 068F4 80955BB4 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 068F8 80955BB8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 068F8 80955BB8 0C00CFC8 */ jal Rand_CenteredFloat /* 068FC 80955BBC 00000000 */ nop /* 06900 80955BC0 4600028D */ trunc.w.s $f10, $f0 @@ -212,7 +212,7 @@ glabel func_80955940 .L80955C1C: /* 0695C 80955C1C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 06960 80955C20 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 06964 80955C24 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 06964 80955C24 0C00CFC8 */ jal Rand_CenteredFloat /* 06968 80955C28 00000000 */ nop /* 0696C 80955C2C 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 @@ -319,7 +319,7 @@ glabel func_80955940 /* 06AE4 80955DA4 016C2021 */ addu $a0, $t3, $t4 /* 06AE8 80955DA8 00042023 */ subu $a0, $zero, $a0 /* 06AEC 80955DAC 00042400 */ sll $a0, $a0, 16 -/* 06AF0 80955DB0 0C01DE0D */ jal Math_Coss +/* 06AF0 80955DB0 0C01DE0D */ jal Math_CosS ## coss? /* 06AF4 80955DB4 00042403 */ sra $a0, $a0, 16 /* 06AF8 80955DB8 C7A4003C */ lwc1 $f4, 0x003C($sp) @@ -333,7 +333,7 @@ glabel func_80955940 /* 06B18 80955DD8 01AE2021 */ addu $a0, $t5, $t6 /* 06B1C 80955DDC 00042023 */ subu $a0, $zero, $a0 /* 06B20 80955DE0 00042400 */ sll $a0, $a0, 16 -/* 06B24 80955DE4 0C01DE1C */ jal Math_Sins +/* 06B24 80955DE4 0C01DE1C */ jal Math_SinS ## sins? /* 06B28 80955DE8 00042403 */ sra $a0, $a0, 16 /* 06B2C 80955DEC C7B0003C */ lwc1 $f16, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955EEC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955EEC.s index b47d4609f0..c2acd1139a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955EEC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955EEC.s @@ -111,7 +111,7 @@ glabel func_80955EEC /* 06DA8 80956068 24070DAC */ addiu $a3, $zero, 0x0DAC ## $a3 = 00000DAC /* 06DAC 8095606C AFA00010 */ sw $zero, 0x0010($sp) /* 06DB0 80956070 A7A50068 */ sh $a1, 0x0068($sp) -/* 06DB4 80956074 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 06DB4 80956074 0C01E1A7 */ jal Math_SmoothStepToS /* 06DB8 80956078 A7A8006C */ sh $t0, 0x006C($sp) /* 06DBC 8095607C 87A50068 */ lh $a1, 0x0068($sp) @@ -143,7 +143,7 @@ glabel func_80955EEC /* 06E14 809560D4 2405E890 */ addiu $a1, $zero, 0xE890 ## $a1 = FFFFE890 .L809560D8: /* 06E18 809560D8 24070DAC */ addiu $a3, $zero, 0x0DAC ## $a3 = 00000DAC -/* 06E1C 809560DC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 06E1C 809560DC 0C01E1A7 */ jal Math_SmoothStepToS /* 06E20 809560E0 AFA00010 */ sw $zero, 0x0010($sp) /* 06E24 809560E4 04400003 */ bltz $v0, .L809560F4 @@ -166,7 +166,7 @@ glabel func_80955EEC /* 06E5C 8095611C 260401F2 */ addiu $a0, $s0, 0x01F2 ## $a0 = 000001F2 /* 06E60 80956120 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 06E64 80956124 24070EA6 */ addiu $a3, $zero, 0x0EA6 ## $a3 = 00000EA6 -/* 06E68 80956128 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 06E68 80956128 0C01E1A7 */ jal Math_SmoothStepToS /* 06E6C 8095612C AFA00010 */ sw $zero, 0x0010($sp) /* 06E70 80956130 04400003 */ bltz $v0, .L80956140 @@ -202,7 +202,7 @@ glabel func_80955EEC /* 06EDC 8095619C 00052C00 */ sll $a1, $a1, 16 /* 06EE0 809561A0 00052C03 */ sra $a1, $a1, 16 /* 06EE4 809561A4 24071B58 */ addiu $a3, $zero, 0x1B58 ## $a3 = 00001B58 -/* 06EE8 809561A8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 06EE8 809561A8 0C01E1A7 */ jal Math_SmoothStepToS /* 06EEC 809561AC AFA00010 */ sw $zero, 0x0010($sp) /* 06EF0 809561B0 04400003 */ bltz $v0, .L809561C0 @@ -224,7 +224,7 @@ glabel func_80955EEC /* 06F24 809561E4 260401F0 */ addiu $a0, $s0, 0x01F0 ## $a0 = 000001F0 /* 06F28 809561E8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 06F2C 809561EC 24071B58 */ addiu $a3, $zero, 0x1B58 ## $a3 = 00001B58 -/* 06F30 809561F0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 06F30 809561F0 0C01E1A7 */ jal Math_SmoothStepToS /* 06F34 809561F4 AFA00010 */ sw $zero, 0x0010($sp) /* 06F38 809561F8 04400003 */ bltz $v0, .L80956208 @@ -244,7 +244,7 @@ glabel func_80955EEC /* 06F68 80956228 44061000 */ mfc1 $a2, $f2 /* 06F6C 8095622C 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 06F70 80956230 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 06F74 80956234 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 06F74 80956234 0C01E0C4 */ jal Math_SmoothStepToF /* 06F78 80956238 E7A00010 */ swc1 $f0, 0x0010($sp) /* 06F7C 8095623C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 @@ -265,7 +265,7 @@ glabel func_80955EEC /* 06FB8 80956278 8DF80004 */ lw $t8, 0x0004($t7) ## FFFFFFE0 /* 06FBC 8095627C AE1801DC */ sw $t8, 0x01DC($s0) ## 000001DC /* 06FC0 80956280 8DF90008 */ lw $t9, 0x0008($t7) ## FFFFFFE4 -/* 06FC4 80956284 0C03F66B */ jal Math_Rand_ZeroOne +/* 06FC4 80956284 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 06FC8 80956288 AE1901E0 */ sw $t9, 0x01E0($s0) ## 000001E0 /* 06FCC 8095628C 3C018096 */ lui $at, %hi(D_8095C774) ## $at = 80960000 @@ -339,21 +339,21 @@ glabel func_80955EEC /* 070B8 80956378 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 070BC 8095637C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 070C0 80956380 24070EA6 */ addiu $a3, $zero, 0x0EA6 ## $a3 = 00000EA6 -/* 070C4 80956384 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 070C4 80956384 0C01E1A7 */ jal Math_SmoothStepToS /* 070C8 80956388 AFA00010 */ sw $zero, 0x0010($sp) /* 070CC 8095638C 260401EC */ addiu $a0, $s0, 0x01EC ## $a0 = 000001EC /* 070D0 80956390 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 070D4 80956394 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 070D8 80956398 24070EA6 */ addiu $a3, $zero, 0x0EA6 ## $a3 = 00000EA6 -/* 070DC 8095639C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 070DC 8095639C 0C01E1A7 */ jal Math_SmoothStepToS /* 070E0 809563A0 AFA00010 */ sw $zero, 0x0010($sp) /* 070E4 809563A4 260401EA */ addiu $a0, $s0, 0x01EA ## $a0 = 000001EA /* 070E8 809563A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 070EC 809563AC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 070F0 809563B0 24070EA6 */ addiu $a3, $zero, 0x0EA6 ## $a3 = 00000EA6 -/* 070F4 809563B4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 070F4 809563B4 0C01E1A7 */ jal Math_SmoothStepToS /* 070F8 809563B8 AFA00010 */ sw $zero, 0x0010($sp) /* 070FC 809563BC 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 @@ -364,7 +364,7 @@ glabel func_80955EEC /* 07110 809563D0 00052C00 */ sll $a1, $a1, 16 /* 07114 809563D4 00052C03 */ sra $a1, $a1, 16 /* 07118 809563D8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0711C 809563DC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0711C 809563DC 0C01E1A7 */ jal Math_SmoothStepToS /* 07120 809563E0 24070EA6 */ addiu $a3, $zero, 0x0EA6 ## $a3 = 00000EA6 /* 07124 809563E4 8E0D016C */ lw $t5, 0x016C($s0) ## 0000016C @@ -372,7 +372,7 @@ glabel func_80955EEC /* 0712C 809563EC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 07130 809563F0 85A5002E */ lh $a1, 0x002E($t5) ## 0000002E /* 07134 809563F4 AFA00010 */ sw $zero, 0x0010($sp) -/* 07138 809563F8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 07138 809563F8 0C01E1A7 */ jal Math_SmoothStepToS /* 0713C 809563FC 24070EA6 */ addiu $a3, $zero, 0x0EA6 ## $a3 = 00000EA6 /* 07140 80956400 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -383,7 +383,7 @@ glabel func_80955EEC /* 07154 80956414 44061000 */ mfc1 $a2, $f2 /* 07158 80956418 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 0715C 8095641C 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 -/* 07160 80956420 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 07160 80956420 0C01E0C4 */ jal Math_SmoothStepToF /* 07164 80956424 E7A60010 */ swc1 $f6, 0x0010($sp) /* 07168 80956428 A2000195 */ sb $zero, 0x0195($s0) ## 00000195 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809566C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809566C4.s index 160dc4f598..641a354c6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809566C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809566C4.s @@ -13,28 +13,28 @@ glabel func_809566C4 /* 0742C 809566EC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 07430 809566F0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 07434 809566F4 24071770 */ addiu $a3, $zero, 0x1770 ## $a3 = 00001770 -/* 07438 809566F8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 07438 809566F8 0C01E1A7 */ jal Math_SmoothStepToS /* 0743C 809566FC AFA00010 */ sw $zero, 0x0010($sp) /* 07440 80956700 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 /* 07444 80956704 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 07448 80956708 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0744C 8095670C 24071770 */ addiu $a3, $zero, 0x1770 ## $a3 = 00001770 -/* 07450 80956710 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 07450 80956710 0C01E1A7 */ jal Math_SmoothStepToS /* 07454 80956714 AFA00010 */ sw $zero, 0x0010($sp) /* 07458 80956718 260401EC */ addiu $a0, $s0, 0x01EC ## $a0 = 000001EC /* 0745C 8095671C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 07460 80956720 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 07464 80956724 24071770 */ addiu $a3, $zero, 0x1770 ## $a3 = 00001770 -/* 07468 80956728 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 07468 80956728 0C01E1A7 */ jal Math_SmoothStepToS /* 0746C 8095672C AFA00010 */ sw $zero, 0x0010($sp) /* 07470 80956730 260401EA */ addiu $a0, $s0, 0x01EA ## $a0 = 000001EA /* 07474 80956734 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 07478 80956738 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0747C 8095673C 24071770 */ addiu $a3, $zero, 0x1770 ## $a3 = 00001770 -/* 07480 80956740 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 07480 80956740 0C01E1A7 */ jal Math_SmoothStepToS /* 07484 80956744 AFA00010 */ sw $zero, 0x0010($sp) /* 07488 80956748 860500B6 */ lh $a1, 0x00B6($s0) ## 000000B6 @@ -44,7 +44,7 @@ glabel func_809566C4 /* 07498 80956758 00052C00 */ sll $a1, $a1, 16 /* 0749C 8095675C 00052C03 */ sra $a1, $a1, 16 /* 074A0 80956760 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 074A4 80956764 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 074A4 80956764 0C01E1A7 */ jal Math_SmoothStepToS /* 074A8 80956768 24072710 */ addiu $a3, $zero, 0x2710 ## $a3 = 00002710 /* 074AC 8095676C 8E0E016C */ lw $t6, 0x016C($s0) ## 0000016C @@ -55,7 +55,7 @@ glabel func_809566C4 /* 074C0 80956780 24071770 */ addiu $a3, $zero, 0x1770 ## $a3 = 00001770 /* 074C4 80956784 24A5EC78 */ addiu $a1, $a1, 0xEC78 ## $a1 = FFFFEC78 /* 074C8 80956788 00052C00 */ sll $a1, $a1, 16 -/* 074CC 8095678C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 074CC 8095678C 0C01E1A7 */ jal Math_SmoothStepToS /* 074D0 80956790 00052C03 */ sra $a1, $a1, 16 /* 074D4 80956794 8E0F0118 */ lw $t7, 0x0118($s0) ## 00000118 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809567D0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809567D0.s index 33b9e20e8d..07ff42db53 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809567D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809567D0.s @@ -23,7 +23,7 @@ glabel func_809567D0 /* 0755C 8095681C E7A00018 */ swc1 $f0, 0x0018($sp) /* 07560 80956820 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 07564 80956824 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 -/* 07568 80956828 0C03F66B */ jal Math_Rand_ZeroOne +/* 07568 80956828 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0756C 8095682C E60801A0 */ swc1 $f8, 0x01A0($s0) ## 000001A0 /* 07570 80956830 3C0143B4 */ lui $at, 0x43B4 ## $at = 43B40000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809568E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809568E0.s index 2c6eac1c80..ee03fa6ed4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809568E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809568E0.s @@ -54,7 +54,7 @@ glabel func_809568E0 /* 07684 80956944 46105480 */ add.s $f18, $f10, $f16 /* 07688 80956948 E7B20058 */ swc1 $f18, 0x0058($sp) .L8095694C: -/* 0768C 8095694C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0768C 8095694C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 07690 80956950 00000000 */ nop /* 07694 80956954 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 @@ -89,7 +89,7 @@ glabel L80956998 /* 07704 809569C4 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 07708 809569C8 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 /* 0770C 809569CC 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 07710 809569D0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 07710 809569D0 0C01E0C4 */ jal Math_SmoothStepToF /* 07714 809569D4 E7B00010 */ swc1 $f16, 0x0010($sp) /* 07718 809569D8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 @@ -131,14 +131,14 @@ glabel L80956A1C /* 077A0 80956A60 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 077A4 80956A64 44054000 */ mfc1 $a1, $f8 /* 077A8 80956A68 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 077AC 80956A6C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 077AC 80956A6C 0C01E0C4 */ jal Math_SmoothStepToF /* 077B0 80956A70 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 077B4 80956A74 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 077B8 80956A78 44819000 */ mtc1 $at, $f18 ## $f18 = 0.25 /* 077BC 80956A7C C61001A4 */ lwc1 $f16, 0x01A4($s0) ## 000001A4 /* 077C0 80956A80 46128302 */ mul.s $f12, $f16, $f18 -/* 077C4 80956A84 0C0329C8 */ jal func_800CA720 +/* 077C4 80956A84 0C0329C8 */ jal Math_SinF /* 077C8 80956A88 00000000 */ nop /* 077CC 80956A8C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 077D0 80956A90 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 @@ -153,14 +153,14 @@ glabel L80956A1C /* 077F0 80956AB0 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 /* 077F4 80956AB4 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 077F8 80956AB8 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 077FC 80956ABC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 077FC 80956ABC 0C01E0C4 */ jal Math_SmoothStepToF /* 07800 80956AC0 E7B00010 */ swc1 $f16, 0x0010($sp) .L80956AC4: -/* 07804 80956AC4 0C0329C8 */ jal func_800CA720 +/* 07804 80956AC4 0C0329C8 */ jal Math_SinF /* 07808 80956AC8 C60C01A4 */ lwc1 $f12, 0x01A4($s0) ## 000001A4 /* 0780C 80956ACC E7A00044 */ swc1 $f0, 0x0044($sp) -/* 07810 80956AD0 0C0329C8 */ jal func_800CA720 +/* 07810 80956AD0 0C0329C8 */ jal Math_SinF /* 07814 80956AD4 C60C01A4 */ lwc1 $f12, 0x01A4($s0) ## 000001A4 /* 07818 80956AD8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 0781C 80956ADC 44819000 */ mtc1 $at, $f18 ## $f18 = 2.00 @@ -184,7 +184,7 @@ glabel L80956AFC /* 07860 80956B20 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 07864 80956B24 3C0740D0 */ lui $a3, 0x40D0 ## $a3 = 40D00000 /* 07868 80956B28 AFA4003C */ sw $a0, 0x003C($sp) -/* 0786C 80956B2C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0786C 80956B2C 0C01E0C4 */ jal Math_SmoothStepToF /* 07870 80956B30 E7B20010 */ swc1 $f18, 0x0010($sp) /* 07874 80956B34 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -192,7 +192,7 @@ glabel L80956AFC /* 0787C 80956B3C 8FA50058 */ lw $a1, 0x0058($sp) /* 07880 80956B40 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 07884 80956B44 3C0740D0 */ lui $a3, 0x40D0 ## $a3 = 40D00000 -/* 07888 80956B48 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 07888 80956B48 0C01E0C4 */ jal Math_SmoothStepToF /* 0788C 80956B4C E7A40010 */ swc1 $f4, 0x0010($sp) /* 07890 80956B50 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 @@ -200,7 +200,7 @@ glabel L80956AFC /* 07898 80956B58 8FA5005C */ lw $a1, 0x005C($sp) /* 0789C 80956B5C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 078A0 80956B60 3C0740D0 */ lui $a3, 0x40D0 ## $a3 = 40D00000 -/* 078A4 80956B64 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 078A4 80956B64 0C01E0C4 */ jal Math_SmoothStepToF /* 078A8 80956B68 E7A60010 */ swc1 $f6, 0x0010($sp) /* 078AC 80956B6C 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFF4 @@ -217,7 +217,7 @@ glabel L80956AFC /* 078D4 80956B94 4502004B */ bc1fl .L80956CC4 /* 078D8 80956B98 8E0B0198 */ lw $t3, 0x0198($s0) ## 00000198 /* 078DC 80956B9C 86050014 */ lh $a1, 0x0014($s0) ## 00000014 -/* 078E0 80956BA0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 078E0 80956BA0 0C01E1A7 */ jal Math_SmoothStepToS /* 078E4 80956BA4 AFA00010 */ sw $zero, 0x0010($sp) /* 078E8 80956BA8 04400004 */ bltz $v0, .L80956BBC @@ -234,7 +234,7 @@ glabel L80956AFC /* 0790C 80956BCC A7A3004E */ sh $v1, 0x004E($sp) /* 07910 80956BD0 AFA00010 */ sw $zero, 0x0010($sp) /* 07914 80956BD4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 07918 80956BD8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 07918 80956BD8 0C01E1A7 */ jal Math_SmoothStepToS /* 0791C 80956BDC 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 07920 80956BE0 04400003 */ bltz $v0, .L80956BF0 @@ -389,7 +389,7 @@ glabel L80956D88 /* 07B30 80956DF0 0C253E19 */ jal func_8094F864 /* 07B34 80956DF4 E7A4001C */ swc1 $f4, 0x001C($sp) .L80956DF8: -/* 07B38 80956DF8 0C03F66B */ jal Math_Rand_ZeroOne +/* 07B38 80956DF8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 07B3C 80956DFC 00000000 */ nop /* 07B40 80956E00 3C018096 */ lui $at, %hi(D_8095C7B4) ## $at = 80960000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956EE0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956EE0.s index b767a59278..6918c5cece 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956EE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956EE0.s @@ -18,7 +18,7 @@ glabel func_80956EE0 /* 07C4C 80956F0C 8F2801DC */ lw $t0, 0x01DC($t9) ## 000001DC /* 07C50 80956F10 AF080004 */ sw $t0, 0x0004($t8) ## FFFFFFF0 /* 07C54 80956F14 8F2901E0 */ lw $t1, 0x01E0($t9) ## 000001E0 -/* 07C58 80956F18 0C03F66B */ jal Math_Rand_ZeroOne +/* 07C58 80956F18 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 07C5C 80956F1C AF090008 */ sw $t1, 0x0008($t8) ## FFFFFFF4 /* 07C60 80956F20 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -40,7 +40,7 @@ glabel func_80956EE0 /* 07CA0 80956F60 31CF007F */ andi $t7, $t6, 0x007F ## $t7 = 00000000 /* 07CA4 80956F64 55E0000D */ bnel $t7, $zero, .L80956F9C /* 07CA8 80956F68 860501F6 */ lh $a1, 0x01F6($s0) ## 000001F6 -/* 07CAC 80956F6C 0C03F66B */ jal Math_Rand_ZeroOne +/* 07CAC 80956F6C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 07CB0 80956F70 00000000 */ nop /* 07CB4 80956F74 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -57,7 +57,7 @@ glabel func_80956EE0 /* 07CDC 80956F9C AFA00010 */ sw $zero, 0x0010($sp) /* 07CE0 80956FA0 260401FA */ addiu $a0, $s0, 0x01FA ## $a0 = 000001FA /* 07CE4 80956FA4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 07CE8 80956FA8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 07CE8 80956FA8 0C01E1A7 */ jal Math_SmoothStepToS /* 07CEC 80956FAC 2407001E */ addiu $a3, $zero, 0x001E ## $a3 = 0000001E /* 07CF0 80956FB0 860B01F8 */ lh $t3, 0x01F8($s0) ## 000001F8 @@ -127,7 +127,7 @@ glabel func_80956EE0 /* 07DDC 8095709C A4690032 */ sh $t1, 0x0032($v1) ## 00000032 .L809570A0: -/* 07DE0 809570A0 0C01DE1C */ jal Math_Sins +/* 07DE0 809570A0 0C01DE1C */ jal Math_SinS ## sins? /* 07DE4 809570A4 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 07DE8 809570A8 C60401A0 */ lwc1 $f4, 0x01A0($s0) ## 000001A0 @@ -135,7 +135,7 @@ glabel func_80956EE0 /* 07DF0 809570B0 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 07DF4 809570B4 46040202 */ mul.s $f8, $f0, $f4 /* 07DF8 809570B8 460A4400 */ add.s $f16, $f8, $f10 -/* 07DFC 809570BC 0C01DE0D */ jal Math_Coss +/* 07DFC 809570BC 0C01DE0D */ jal Math_CosS ## coss? /* 07E00 809570C0 E6100024 */ swc1 $f16, 0x0024($s0) ## 00000024 /* 07E04 809570C4 C61201A0 */ lwc1 $f18, 0x01A0($s0) ## 000001A0 @@ -148,10 +148,10 @@ glabel func_80956EE0 /* 07E20 809570E0 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 07E24 809570E4 46043200 */ add.s $f8, $f6, $f4 /* 07E28 809570E8 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C -/* 07E2C 809570EC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 07E2C 809570EC 0C01E0C4 */ jal Math_SmoothStepToF /* 07E30 809570F0 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 07E34 809570F4 0C0329C8 */ jal func_800CA720 +/* 07E34 809570F4 0C0329C8 */ jal Math_SinF /* 07E38 809570F8 C60C01A4 */ lwc1 $f12, 0x01A4($s0) ## 000001A4 /* 07E3C 809570FC 46000480 */ add.s $f18, $f0, $f0 /* 07E40 80957100 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 @@ -167,14 +167,14 @@ glabel func_80956EE0 /* 07E64 80957124 3C054320 */ lui $a1, 0x4320 ## $a1 = 43200000 /* 07E68 80957128 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 07E6C 8095712C 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 -/* 07E70 80957130 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 07E70 80957130 0C01E0C4 */ jal Math_SmoothStepToF /* 07E74 80957134 E7A40010 */ swc1 $f4, 0x0010($sp) /* 07E78 80957138 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 07E7C 8095713C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 07E80 80957140 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 07E84 80957144 240705DC */ addiu $a3, $zero, 0x05DC ## $a3 = 000005DC -/* 07E88 80957148 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 07E88 80957148 0C01E1A7 */ jal Math_SmoothStepToS /* 07E8C 8095714C AFA00010 */ sw $zero, 0x0010($sp) /* 07E90 80957150 860A019C */ lh $t2, 0x019C($s0) ## 0000019C @@ -253,11 +253,11 @@ glabel func_80956EE0 /* 07F98 80957258 312A0003 */ andi $t2, $t1, 0x0003 ## $t2 = 00000000 /* 07F9C 8095725C 15400003 */ bne $t2, $zero, .L8095726C /* 07FA0 80957260 00000000 */ nop -/* 07FA4 80957264 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 07FA4 80957264 0C01E1A7 */ jal Math_SmoothStepToS /* 07FA8 80957268 AFA00010 */ sw $zero, 0x0010($sp) .L8095726C: -/* 07FAC 8095726C 0C03F66B */ jal Math_Rand_ZeroOne +/* 07FAC 8095726C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 07FB0 80957270 00000000 */ nop /* 07FB4 80957274 3C018096 */ lui $at, %hi(D_8095C7B8) ## $at = 80960000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957384.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957384.s index 3d5f347576..4045b96294 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957384.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957384.s @@ -18,7 +18,7 @@ glabel func_80957384 /* 080F0 809573B0 8F2801DC */ lw $t0, 0x01DC($t9) ## 000001DC /* 080F4 809573B4 AF080004 */ sw $t0, 0x0004($t8) ## FFFFFFF0 /* 080F8 809573B8 8F2901E0 */ lw $t1, 0x01E0($t9) ## 000001E0 -/* 080FC 809573BC 0C03F66B */ jal Math_Rand_ZeroOne +/* 080FC 809573BC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 08100 809573C0 AF090008 */ sw $t1, 0x0008($t8) ## FFFFFFF4 /* 08104 809573C4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -40,7 +40,7 @@ glabel func_80957384 /* 08144 80957404 31CF007F */ andi $t7, $t6, 0x007F ## $t7 = 00000000 /* 08148 80957408 15E0000C */ bne $t7, $zero, .L8095743C /* 0814C 8095740C 00000000 */ nop -/* 08150 80957410 0C03F66B */ jal Math_Rand_ZeroOne +/* 08150 80957410 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 08154 80957414 00000000 */ nop /* 08158 80957418 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -66,7 +66,7 @@ glabel func_80957384 /* 081A4 80957464 A7AC0050 */ sh $t4, 0x0050($sp) /* 081A8 80957468 860501F6 */ lh $a1, 0x01F6($s0) ## 000001F6 /* 081AC 8095746C AFA00010 */ sw $zero, 0x0010($sp) -/* 081B0 80957470 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 081B0 80957470 0C01E1A7 */ jal Math_SmoothStepToS /* 081B4 80957474 2407001E */ addiu $a3, $zero, 0x001E ## $a3 = 0000001E /* 081B8 80957478 860E01F8 */ lh $t6, 0x01F8($s0) ## 000001F8 @@ -130,7 +130,7 @@ glabel func_80957384 /* 08288 80957548 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 /* 0828C 8095754C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 08290 80957550 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 -/* 08294 80957554 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 08294 80957554 0C01E0C4 */ jal Math_SmoothStepToF /* 08298 80957558 E7A40010 */ swc1 $f4, 0x0010($sp) /* 0829C 8095755C 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFEC @@ -147,7 +147,7 @@ glabel func_80957384 /* 082C4 80957584 312A0007 */ andi $t2, $t1, 0x0007 ## $t2 = 00000000 /* 082C8 80957588 15400015 */ bne $t2, $zero, .L809575E0 /* 082CC 8095758C 00000000 */ nop -/* 082D0 80957590 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 082D0 80957590 0C01E1A7 */ jal Math_SmoothStepToS /* 082D4 80957594 AFA00010 */ sw $zero, 0x0010($sp) /* 082D8 80957598 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 @@ -219,7 +219,7 @@ glabel func_80957384 /* 083D8 80957698 00812021 */ addu $a0, $a0, $at /* 083DC 8095769C 00042100 */ sll $a0, $a0, 4 /* 083E0 809576A0 00042400 */ sll $a0, $a0, 16 -/* 083E4 809576A4 0C01DE1C */ jal Math_Sins +/* 083E4 809576A4 0C01DE1C */ jal Math_SinS ## sins? /* 083E8 809576A8 00042403 */ sra $a0, $a0, 16 /* 083EC 809576AC C7B0004C */ lwc1 $f16, 0x004C($sp) @@ -233,7 +233,7 @@ glabel func_80957384 /* 0840C 809576CC E7A80010 */ swc1 $f8, 0x0010($sp) /* 08410 809576D0 46069100 */ add.s $f4, $f18, $f6 /* 08414 809576D4 44052000 */ mfc1 $a1, $f4 -/* 08418 809576D8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 08418 809576D8 0C01E0C4 */ jal Math_SmoothStepToF /* 0841C 809576DC 00000000 */ nop /* 08420 809576E0 87A50050 */ lh $a1, 0x0050($sp) @@ -243,10 +243,10 @@ glabel func_80957384 /* 08430 809576F0 00052C00 */ sll $a1, $a1, 16 /* 08434 809576F4 00052C03 */ sra $a1, $a1, 16 /* 08438 809576F8 2407003C */ addiu $a3, $zero, 0x003C ## $a3 = 0000003C -/* 0843C 809576FC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0843C 809576FC 0C01E1A7 */ jal Math_SmoothStepToS /* 08440 80957700 AFA00010 */ sw $zero, 0x0010($sp) -/* 08444 80957704 0C0329C8 */ jal func_800CA720 +/* 08444 80957704 0C0329C8 */ jal Math_SinF /* 08448 80957708 C60C01A4 */ lwc1 $f12, 0x01A4($s0) ## 000001A4 /* 0844C 8095770C 46000400 */ add.s $f16, $f0, $f0 /* 08450 80957710 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 @@ -301,7 +301,7 @@ glabel func_80957384 /* 084FC 809577BC 2407003C */ addiu $a3, $zero, 0x003C ## $a3 = 0000003C /* 08500 809577C0 24A50096 */ addiu $a1, $a1, 0x0096 ## $a1 = 00000096 /* 08504 809577C4 00052C00 */ sll $a1, $a1, 16 -/* 08508 809577C8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 08508 809577C8 0C01E1A7 */ jal Math_SmoothStepToS /* 0850C 809577CC 00052C03 */ sra $a1, $a1, 16 /* 08510 809577D0 8E0D0118 */ lw $t5, 0x0118($s0) ## 00000118 @@ -313,7 +313,7 @@ glabel func_80957384 /* 08528 809577E8 920C0114 */ lbu $t4, 0x0114($s0) ## 00000114 /* 0852C 809577EC 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 08530 809577F0 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 08534 809577F4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 08534 809577F4 0C01E0C4 */ jal Math_SmoothStepToF /* 08538 809577F8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0853C 809577FC 1000000D */ beq $zero, $zero, .L80957834 @@ -332,7 +332,7 @@ glabel func_80957384 /* 0856C 8095782C 0C00D09B */ jal func_8003426C /* 08570 80957830 AFAF0010 */ sw $t7, 0x0010($sp) .L80957834: -/* 08574 80957834 0C0329C8 */ jal func_800CA720 +/* 08574 80957834 0C0329C8 */ jal Math_SinF /* 08578 80957838 C60C01A4 */ lwc1 $f12, 0x01A4($s0) ## 000001A4 /* 0857C 8095783C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 08580 80957840 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 @@ -359,7 +359,7 @@ glabel func_80957384 /* 085CC 8095788C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 085D0 80957890 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 085D4 80957894 240705DC */ addiu $a3, $zero, 0x05DC ## $a3 = 000005DC -/* 085D8 80957898 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 085D8 80957898 0C01E1A7 */ jal Math_SmoothStepToS /* 085DC 8095789C AFA00010 */ sw $zero, 0x0010($sp) /* 085E0 809578A0 8FA4006C */ lw $a0, 0x006C($sp) @@ -376,11 +376,11 @@ glabel func_80957384 /* 08608 809578C8 316C0003 */ andi $t4, $t3, 0x0003 ## $t4 = 00000000 /* 0860C 809578CC 15800003 */ bne $t4, $zero, .L809578DC /* 08610 809578D0 00000000 */ nop -/* 08614 809578D4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 08614 809578D4 0C01E1A7 */ jal Math_SmoothStepToS /* 08618 809578D8 AFA00010 */ sw $zero, 0x0010($sp) .L809578DC: -/* 0861C 809578DC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0861C 809578DC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 08620 809578E0 00000000 */ nop /* 08624 809578E4 3C018096 */ lui $at, %hi(D_8095C7BC) ## $at = 80960000 @@ -413,7 +413,7 @@ glabel func_80957384 /* 08684 80957944 01AB6023 */ subu $t4, $t5, $t3 /* 08688 80957948 A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 .L8095794C: -/* 0868C 8095794C 0C01DE1C */ jal Math_Sins +/* 0868C 8095794C 0C01DE1C */ jal Math_SinS ## sins? /* 08690 80957950 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 08694 80957954 C60601A0 */ lwc1 $f6, 0x01A0($s0) ## 000001A0 @@ -421,7 +421,7 @@ glabel func_80957384 /* 0869C 8095795C 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 086A0 80957960 46060202 */ mul.s $f8, $f0, $f6 /* 086A4 80957964 46044280 */ add.s $f10, $f8, $f4 -/* 086A8 80957968 0C01DE0D */ jal Math_Coss +/* 086A8 80957968 0C01DE0D */ jal Math_CosS ## coss? /* 086AC 8095796C E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 /* 086B0 80957970 C61001A0 */ lwc1 $f16, 0x01A0($s0) ## 000001A0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809579F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809579F4.s index e4cb8b3976..78d365a7f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809579F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809579F4.s @@ -30,7 +30,7 @@ glabel func_809579F4 /* 087A0 80957A60 10000067 */ beq $zero, $zero, .L80957C00 /* 087A4 80957A64 8FBF0034 */ lw $ra, 0x0034($sp) .L80957A68: -/* 087A8 80957A68 0C03F66B */ jal Math_Rand_ZeroOne +/* 087A8 80957A68 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 087AC 80957A6C 00000000 */ nop /* 087B0 80957A70 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -44,10 +44,10 @@ glabel func_809579F4 /* 087D0 80957A90 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 087D4 80957A94 46082280 */ add.s $f10, $f4, $f8 /* 087D8 80957A98 E60A01A4 */ swc1 $f10, 0x01A4($s0) ## 000001A4 -/* 087DC 80957A9C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 087DC 80957A9C 0C01E0C4 */ jal Math_SmoothStepToF /* 087E0 80957AA0 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 087E4 80957AA4 0C0329C8 */ jal func_800CA720 +/* 087E4 80957AA4 0C0329C8 */ jal Math_SinF /* 087E8 80957AA8 C60C01A4 */ lwc1 $f12, 0x01A4($s0) ## 000001A4 /* 087EC 80957AAC 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 087F0 80957AB0 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 @@ -71,7 +71,7 @@ glabel func_809579F4 /* 08834 80957AF4 15600016 */ bne $t3, $zero, .L80957B50 /* 08838 80957AF8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0883C 80957AFC 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 08840 80957B00 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 08840 80957B00 0C01E1A7 */ jal Math_SmoothStepToS /* 08844 80957B04 AFA00010 */ sw $zero, 0x0010($sp) /* 08848 80957B08 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s index 090a54cacb..53d2841041 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s @@ -166,12 +166,12 @@ glabel func_80958150 /* 09088 80958348 2B21000E */ slti $at, $t9, 0x000E /* 0908C 8095834C 1420000C */ bne $at, $zero, .L80958380 /* 09090 80958350 3C018096 */ lui $at, %hi(D_8095C824) ## $at = 80960000 -/* 09094 80958354 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 09094 80958354 0C00CFC8 */ jal Rand_CenteredFloat /* 09098 80958358 C42CC824 */ lwc1 $f12, %lo(D_8095C824)($at) /* 0909C 8095835C 3C018096 */ lui $at, %hi(D_8095C828) ## $at = 80960000 /* 090A0 80958360 E7A00078 */ swc1 $f0, 0x0078($sp) -/* 090A4 80958364 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 090A4 80958364 0C00CFC8 */ jal Rand_CenteredFloat /* 090A8 80958368 C42CC828 */ lwc1 $f12, %lo(D_8095C828)($at) /* 090AC 8095836C 3C01C270 */ lui $at, 0xC270 ## $at = C2700000 @@ -334,7 +334,7 @@ glabel func_80958150 /* 09304 809585C4 272C0274 */ addiu $t4, $t9, 0x0274 ## $t4 = 00000274 /* 09308 809585C8 3C0143A0 */ lui $at, 0x43A0 ## $at = 43A00000 /* 0930C 809585CC 44816000 */ mtc1 $at, $f12 ## $f12 = 320.00 -/* 09310 809585D0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 09310 809585D0 0C00CFC8 */ jal Rand_CenteredFloat /* 09314 809585D4 AFAC0038 */ sw $t4, 0x0038($sp) /* 09318 809585D8 3C01C37A */ lui $at, 0xC37A ## $at = C37A0000 @@ -342,12 +342,12 @@ glabel func_80958150 /* 09320 809585E0 3C0143A0 */ lui $at, 0x43A0 ## $at = 43A00000 /* 09324 809585E4 44816000 */ mtc1 $at, $f12 ## $f12 = 320.00 /* 09328 809585E8 460A0400 */ add.s $f16, $f0, $f10 -/* 0932C 809585EC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0932C 809585EC 0C00CFC8 */ jal Rand_CenteredFloat /* 09330 809585F0 E7B00078 */ swc1 $f16, 0x0078($sp) /* 09334 809585F4 3C0143A0 */ lui $at, 0x43A0 ## $at = 43A00000 /* 09338 809585F8 44816000 */ mtc1 $at, $f12 ## $f12 = 320.00 -/* 0933C 809585FC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0933C 809585FC 0C00CFC8 */ jal Rand_CenteredFloat /* 09340 80958600 E7A0007C */ swc1 $f0, 0x007C($sp) /* 09344 80958604 C7A2007C */ lwc1 $f2, 0x007C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809597F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809597F4.s index a798c7505e..a3cca92dea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809597F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809597F4.s @@ -90,7 +90,7 @@ glabel func_809597F4 /* 0A614 809598D4 54410079 */ bnel $v0, $at, .L80959ABC /* 0A618 809598D8 920D0024 */ lbu $t5, 0x0024($s0) ## 8095DF74 .L809598DC: -/* 0A61C 809598DC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0A61C 809598DC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0A620 809598E0 8E110054 */ lw $s1, 0x0054($s0) ## 8095DFA4 /* 0A624 809598E4 3C018096 */ lui $at, %hi(D_8095C898) ## $at = 80960000 @@ -102,7 +102,7 @@ glabel func_809597F4 /* 0A63C 809598FC 00000000 */ nop /* 0A640 80959900 010C6821 */ addu $t5, $t0, $t4 /* 0A644 80959904 25AE2000 */ addiu $t6, $t5, 0x2000 ## $t6 = 00002000 -/* 0A648 80959908 0C03F66B */ jal Math_Rand_ZeroOne +/* 0A648 80959908 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0A64C 8095990C A60E002E */ sh $t6, 0x002E($s0) ## 8095DF7E /* 0A650 80959910 3C018096 */ lui $at, %hi(D_8095C89C) ## $at = 80960000 @@ -129,7 +129,7 @@ glabel func_809597F4 /* 0A69C 8095995C 860C002A */ lh $t4, 0x002A($s0) ## 8095DF7A /* 0A6A0 80959960 01826823 */ subu $t5, $t4, $v0 /* 0A6A4 80959964 A7AD00AA */ sh $t5, 0x00AA($sp) -/* 0A6A8 80959968 0C01DE1C */ jal Math_Sins +/* 0A6A8 80959968 0C01DE1C */ jal Math_SinS ## sins? /* 0A6AC 8095996C 86240032 */ lh $a0, 0x0032($s1) ## 00000032 /* 0A6B0 80959970 C6060048 */ lwc1 $f6, 0x0048($s0) ## 8095DF98 @@ -137,7 +137,7 @@ glabel func_809597F4 /* 0A6B8 80959978 46003202 */ mul.s $f8, $f6, $f0 /* 0A6BC 8095997C 46082281 */ sub.s $f10, $f4, $f8 /* 0A6C0 80959980 E60A0000 */ swc1 $f10, 0x0000($s0) ## 8095DF50 -/* 0A6C4 80959984 0C01DE0D */ jal Math_Coss +/* 0A6C4 80959984 0C01DE0D */ jal Math_CosS ## coss? /* 0A6C8 80959988 86240032 */ lh $a0, 0x0032($s1) ## 00000032 /* 0A6CC 8095998C C6120048 */ lwc1 $f18, 0x0048($s0) ## 8095DF98 @@ -148,7 +148,7 @@ glabel func_809597F4 /* 0A6E0 809599A0 87A400AA */ lh $a0, 0x00AA($sp) /* 0A6E4 809599A4 00042023 */ subu $a0, $zero, $a0 /* 0A6E8 809599A8 00042400 */ sll $a0, $a0, 16 -/* 0A6EC 809599AC 0C01DE0D */ jal Math_Coss +/* 0A6EC 809599AC 0C01DE0D */ jal Math_CosS ## coss? /* 0A6F0 809599B0 00042403 */ sra $a0, $a0, 16 /* 0A6F4 809599B4 C608004C */ lwc1 $f8, 0x004C($s0) ## 8095DF9C @@ -177,14 +177,14 @@ glabel func_809597F4 /* 0A748 80959A08 1000001E */ beq $zero, $zero, .L80959A84 /* 0A74C 80959A0C E6080008 */ swc1 $f8, 0x0008($s0) ## 8095DF58 .L80959A10: -/* 0A750 80959A10 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0A750 80959A10 0C00CFBE */ jal Rand_ZeroFloat /* 0A754 80959A14 C42CC8A0 */ lwc1 $f12, %lo(D_8095C8A0)($at) /* 0A758 80959A18 4600028D */ trunc.w.s $f10, $f0 /* 0A75C 80959A1C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0A760 80959A20 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 0A764 80959A24 44185000 */ mfc1 $t8, $f10 -/* 0A768 80959A28 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0A768 80959A28 0C00CFC8 */ jal Rand_CenteredFloat /* 0A76C 80959A2C A7B800B6 */ sh $t8, 0x00B6($sp) /* 0A770 80959A30 87A900B6 */ lh $t1, 0x00B6($sp) @@ -197,14 +197,14 @@ glabel func_809597F4 /* 0A78C 80959A4C C6320908 */ lwc1 $f18, 0x0908($s1) ## 00000908 /* 0A790 80959A50 44816000 */ mtc1 $at, $f12 ## $f12 = 15.00 /* 0A794 80959A54 46120400 */ add.s $f16, $f0, $f18 -/* 0A798 80959A58 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0A798 80959A58 0C00CFC8 */ jal Rand_CenteredFloat /* 0A79C 80959A5C E6100000 */ swc1 $f16, 0x0000($s0) ## 8095DF50 /* 0A7A0 80959A60 C626090C */ lwc1 $f6, 0x090C($s1) ## 0000090C /* 0A7A4 80959A64 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0A7A8 80959A68 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 0A7AC 80959A6C 46060100 */ add.s $f4, $f0, $f6 -/* 0A7B0 80959A70 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0A7B0 80959A70 0C00CFC8 */ jal Rand_CenteredFloat /* 0A7B4 80959A74 E6040004 */ swc1 $f4, 0x0004($s0) ## 8095DF54 /* 0A7B8 80959A78 C6280910 */ lwc1 $f8, 0x0910($s1) ## 00000910 @@ -228,7 +228,7 @@ glabel func_809597F4 .L80959ABC: /* 0A7FC 80959ABC 568D001A */ bnel $s4, $t5, .L80959B28 /* 0A800 80959AC0 92090024 */ lbu $t1, 0x0024($s0) ## 8095DF74 -/* 0A804 80959AC4 0C03F66B */ jal Math_Rand_ZeroOne +/* 0A804 80959AC4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0A808 80959AC8 00000000 */ nop /* 0A80C 80959ACC 3C018096 */ lui $at, %hi(D_8095C8A4) ## $at = 80960000 @@ -260,7 +260,7 @@ glabel func_809597F4 /* 0A86C 80959B2C 55210031 */ bnel $t1, $at, .L80959BF4 /* 0A870 80959B30 920B0024 */ lbu $t3, 0x0024($s0) ## 8095DF74 /* 0A874 80959B34 8E020054 */ lw $v0, 0x0054($s0) ## 8095DFA4 -/* 0A878 80959B38 0C03F66B */ jal Math_Rand_ZeroOne +/* 0A878 80959B38 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0A87C 80959B3C AFA200A4 */ sw $v0, 0x00A4($sp) /* 0A880 80959B40 3C018096 */ lui $at, %hi(D_8095C8A8) ## $at = 80960000 @@ -510,7 +510,7 @@ glabel func_809597F4 /* 0AC1C 80959EDC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0AC20 80959EE0 02418821 */ addu $s1, $s2, $at /* 0AC24 80959EE4 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3D99999A -/* 0AC28 80959EE8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0AC28 80959EE8 0C01E0C4 */ jal Math_SmoothStepToF /* 0AC2C 80959EEC E7A80010 */ swc1 $f8, 0x0010($sp) /* 0AC30 80959EF0 3C018096 */ lui $at, %hi(D_8095C8AC) ## $at = 80960000 @@ -520,7 +520,7 @@ glabel func_809597F4 /* 0AC40 80959F00 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3F19999A /* 0AC44 80959F04 2604004C */ addiu $a0, $s0, 0x004C ## $a0 = 8095DF9C /* 0AC48 80959F08 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0AC4C 80959F0C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0AC4C 80959F0C 0C01E0C4 */ jal Math_SmoothStepToF /* 0AC50 80959F10 E7B20010 */ swc1 $f18, 0x0010($sp) /* 0AC54 80959F14 8E281DE4 */ lw $t0, 0x1DE4($s1) ## 00001DE4 @@ -532,7 +532,7 @@ glabel func_809597F4 /* 0AC6C 80959F2C 00153C00 */ sll $a3, $s5, 16 /* 0AC70 80959F30 00073C03 */ sra $a3, $a3, 16 /* 0AC74 80959F34 00063403 */ sra $a2, $a2, 16 -/* 0AC78 80959F38 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0AC78 80959F38 0C01E1A7 */ jal Math_SmoothStepToS /* 0AC7C 80959F3C AFA00010 */ sw $zero, 0x0010($sp) .L80959F40: @@ -550,7 +550,7 @@ glabel func_809597F4 /* 0ACA4 80959F64 8E110054 */ lw $s1, 0x0054($s0) ## 8095DFA4 /* 0ACA8 80959F68 25B8157C */ addiu $t8, $t5, 0x157C ## $t8 = 0000157C /* 0ACAC 80959F6C A618002E */ sh $t8, 0x002E($s0) ## 8095DF7E -/* 0ACB0 80959F70 0C01DE1C */ jal Math_Sins +/* 0ACB0 80959F70 0C01DE1C */ jal Math_SinS ## sins? /* 0ACB4 80959F74 8604002E */ lh $a0, 0x002E($s0) ## 8095DF7E /* 0ACB8 80959F78 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -566,7 +566,7 @@ glabel func_809597F4 /* 0ACE0 80959FA0 00000000 */ nop /* 0ACE4 80959FA4 25590050 */ addiu $t9, $t2, 0x0050 ## $t9 = 00000050 /* 0ACE8 80959FA8 A619003E */ sh $t9, 0x003E($s0) ## 8095DF8E -/* 0ACEC 80959FAC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0ACEC 80959FAC 0C01E0C4 */ jal Math_SmoothStepToF /* 0ACF0 80959FB0 E7B60010 */ swc1 $f22, 0x0010($sp) /* 0ACF4 80959FB4 C6040048 */ lwc1 $f4, 0x0048($s0) ## 8095DF98 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B028.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B028.s index 8264f93a75..fb56186989 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B028.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B028.s @@ -46,7 +46,7 @@ glabel func_8095B028 /* 0BDDC 8095B09C AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 /* 0BDE0 8095B0A0 8C6B0008 */ lw $t3, 0x0008($v1) ## FFFFFFF4 /* 0BDE4 8095B0A4 AE0B0008 */ sw $t3, 0x0008($s0) ## 00000008 -/* 0BDE8 8095B0A8 0C03F66B */ jal Math_Rand_ZeroOne +/* 0BDE8 8095B0A8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0BDEC 8095B0AC AFA60060 */ sw $a2, 0x0060($sp) /* 0BDF0 8095B0B0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -154,14 +154,14 @@ glabel L8095B228 /* 0BF68 8095B228 240B0003 */ addiu $t3, $zero, 0x0003 ## $t3 = 00000003 /* 0BF6C 8095B22C A20B0024 */ sb $t3, 0x0024($s0) ## 00000024 /* 0BF70 8095B230 3C018096 */ lui $at, %hi(D_8095C910) ## $at = 80960000 -/* 0BF74 8095B234 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0BF74 8095B234 0C00CFBE */ jal Rand_ZeroFloat /* 0BF78 8095B238 C42CC910 */ lwc1 $f12, %lo(D_8095C910)($at) /* 0BF7C 8095B23C 4600020D */ trunc.w.s $f8, $f0 /* 0BF80 8095B240 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0BF84 8095B244 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 0BF88 8095B248 440D4000 */ mfc1 $t5, $f8 -/* 0BF8C 8095B24C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0BF8C 8095B24C 0C00CFC8 */ jal Rand_CenteredFloat /* 0BF90 8095B250 A7AD0052 */ sh $t5, 0x0052($sp) /* 0BF94 8095B254 87AF0052 */ lh $t7, 0x0052($sp) @@ -175,7 +175,7 @@ glabel L8095B228 /* 0BFB4 8095B274 44816000 */ mtc1 $at, $f12 ## $f12 = 15.00 /* 0BFB8 8095B278 460A0400 */ add.s $f16, $f0, $f10 /* 0BFBC 8095B27C E6100000 */ swc1 $f16, 0x0000($s0) ## 00000000 -/* 0BFC0 8095B280 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0BFC0 8095B280 0C00CFC8 */ jal Rand_CenteredFloat /* 0BFC4 8095B284 AFA20024 */ sw $v0, 0x0024($sp) /* 0BFC8 8095B288 8FB90024 */ lw $t9, 0x0024($sp) @@ -183,7 +183,7 @@ glabel L8095B228 /* 0BFD0 8095B290 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 0BFD4 8095B294 C732090C */ lwc1 $f18, 0x090C($t9) ## 0000090C /* 0BFD8 8095B298 46120100 */ add.s $f4, $f0, $f18 -/* 0BFDC 8095B29C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0BFDC 8095B29C 0C00CFC8 */ jal Rand_CenteredFloat /* 0BFE0 8095B2A0 E6040004 */ swc1 $f4, 0x0004($s0) ## 00000004 /* 0BFE4 8095B2A4 8FA80024 */ lw $t0, 0x0024($sp) @@ -197,7 +197,7 @@ glabel L8095B228 /* 0C000 8095B2C0 44898000 */ mtc1 $t1, $f16 ## $f16 = 0.00 /* 0C004 8095B2C4 00000000 */ nop /* 0C008 8095B2C8 46808320 */ cvt.s.w $f12, $f16 -/* 0C00C 8095B2CC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0C00C 8095B2CC 0C00CFBE */ jal Rand_ZeroFloat /* 0C010 8095B2D0 E7AC0024 */ swc1 $f12, 0x0024($sp) /* 0C014 8095B2D4 C7AC0024 */ lwc1 $f12, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B318.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B318.s index 65e9a76071..7b10484f94 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B318.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B318.s @@ -60,7 +60,7 @@ glabel func_8095B318 /* 0C128 8095B3E8 E4A60050 */ swc1 $f6, 0x0050($a1) ## 00000050 /* 0C12C 8095B3EC C4E80004 */ lwc1 $f8, 0x0004($a3) ## 00000004 /* 0C130 8095B3F0 E4A8004C */ swc1 $f8, 0x004C($a1) ## 0000004C -/* 0C134 8095B3F4 0C03F66B */ jal Math_Rand_ZeroOne +/* 0C134 8095B3F4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0C138 8095B3F8 AFA50044 */ sw $a1, 0x0044($sp) /* 0C13C 8095B3FC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -88,7 +88,7 @@ glabel func_8095B318 /* 0C194 8095B454 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 /* 0C198 8095B458 00000000 */ nop /* 0C19C 8095B45C 46802320 */ cvt.s.w $f12, $f4 -/* 0C1A0 8095B460 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0C1A0 8095B460 0C00CFBE */ jal Rand_ZeroFloat /* 0C1A4 8095B464 E7AC001C */ swc1 $f12, 0x001C($sp) /* 0C1A8 8095B468 C7AC001C */ lwc1 $f12, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B4A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B4A4.s index d4630590c7..5aa615856a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B4A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B4A4.s @@ -46,7 +46,7 @@ glabel func_8095B4A4 /* 0C270 8095B530 8CCF0008 */ lw $t7, 0x0008($a2) ## 00000008 /* 0C274 8095B534 A6000028 */ sh $zero, 0x0028($s0) ## 00000028 /* 0C278 8095B538 AE0F0008 */ sw $t7, 0x0008($s0) ## 00000008 -/* 0C27C 8095B53C 0C01DE1C */ jal Math_Sins +/* 0C27C 8095B53C 0C01DE1C */ jal Math_SinS ## sins? /* 0C280 8095B540 87A4005A */ lh $a0, 0x005A($sp) /* 0C284 8095B544 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 @@ -54,11 +54,11 @@ glabel func_8095B4A4 /* 0C28C 8095B54C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0C290 8095B550 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 /* 0C294 8095B554 46040182 */ mul.s $f6, $f0, $f4 -/* 0C298 8095B558 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C298 8095B558 0C00CFC8 */ jal Rand_CenteredFloat /* 0C29C 8095B55C E7A60028 */ swc1 $f6, 0x0028($sp) /* 0C2A0 8095B560 E7A00024 */ swc1 $f0, 0x0024($sp) -/* 0C2A4 8095B564 0C01DE1C */ jal Math_Sins +/* 0C2A4 8095B564 0C01DE1C */ jal Math_SinS ## sins? /* 0C2A8 8095B568 87A4005E */ lh $a0, 0x005E($sp) /* 0C2AC 8095B56C C7AA0028 */ lwc1 $f10, 0x0028($sp) @@ -68,11 +68,11 @@ glabel func_8095B4A4 /* 0C2BC 8095B57C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0C2C0 8095B580 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 /* 0C2C4 8095B584 46128100 */ add.s $f4, $f16, $f18 -/* 0C2C8 8095B588 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C2C8 8095B588 0C00CFC8 */ jal Rand_CenteredFloat /* 0C2CC 8095B58C E7A4002C */ swc1 $f4, 0x002C($sp) /* 0C2D0 8095B590 E7A00024 */ swc1 $f0, 0x0024($sp) -/* 0C2D4 8095B594 0C01DE0D */ jal Math_Coss +/* 0C2D4 8095B594 0C01DE0D */ jal Math_CosS ## coss? /* 0C2D8 8095B598 87A4005E */ lh $a0, 0x005E($sp) /* 0C2DC 8095B59C C7A80028 */ lwc1 $f8, 0x0028($sp) @@ -89,7 +89,7 @@ glabel func_8095B4A4 /* 0C308 8095B5C8 AE190010 */ sw $t9, 0x0010($s0) ## 00000010 /* 0C30C 8095B5CC 8F080008 */ lw $t0, 0x0008($t8) ## FFFFFFEC /* 0C310 8095B5D0 AE080014 */ sw $t0, 0x0014($s0) ## 00000014 -/* 0C314 8095B5D4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C314 8095B5D4 0C00CFC8 */ jal Rand_CenteredFloat /* 0C318 8095B5D8 C42CC91C */ lwc1 $f12, %lo(D_8095C91C)($at) /* 0C31C 8095B5DC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -113,7 +113,7 @@ glabel func_8095B4A4 /* 0C364 8095B624 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 /* 0C368 8095B628 00000000 */ nop /* 0C36C 8095B62C 46804320 */ cvt.s.w $f12, $f8 -/* 0C370 8095B630 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0C370 8095B630 0C00CFBE */ jal Rand_ZeroFloat /* 0C374 8095B634 E7AC0020 */ swc1 $f12, 0x0020($sp) /* 0C378 8095B638 C7AC0020 */ lwc1 $f12, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B670.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B670.s index 4e34bc4a87..965bbbe683 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B670.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B670.s @@ -37,28 +37,28 @@ glabel func_8095B670 /* 0C418 8095B6D8 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 /* 0C41C 8095B6DC 8CCB0008 */ lw $t3, 0x0008($a2) ## 00000008 /* 0C420 8095B6E0 A60C0028 */ sh $t4, 0x0028($s0) ## 00000028 -/* 0C424 8095B6E4 0C03F66B */ jal Math_Rand_ZeroOne +/* 0C424 8095B6E4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0C428 8095B6E8 AE0B0008 */ sw $t3, 0x0008($s0) ## 00000008 /* 0C42C 8095B6EC 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 0C430 8095B6F0 44812000 */ mtc1 $at, $f4 ## $f4 = 7.00 /* 0C434 8095B6F4 87A4004E */ lh $a0, 0x004E($sp) /* 0C438 8095B6F8 46040182 */ mul.s $f6, $f0, $f4 -/* 0C43C 8095B6FC 0C01DE1C */ jal Math_Sins +/* 0C43C 8095B6FC 0C01DE1C */ jal Math_SinS ## sins? /* 0C440 8095B700 E7A60038 */ swc1 $f6, 0x0038($sp) /* 0C444 8095B704 C7A80038 */ lwc1 $f8, 0x0038($sp) /* 0C448 8095B708 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 0C44C 8095B70C 44816000 */ mtc1 $at, $f12 ## $f12 = 4.00 /* 0C450 8095B710 46080282 */ mul.s $f10, $f0, $f8 -/* 0C454 8095B714 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C454 8095B714 0C00CFC8 */ jal Rand_CenteredFloat /* 0C458 8095B718 E7AA0020 */ swc1 $f10, 0x0020($sp) /* 0C45C 8095B71C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 0C460 8095B720 44818000 */ mtc1 $at, $f16 ## $f16 = 4.00 /* 0C464 8095B724 87A4004E */ lh $a0, 0x004E($sp) /* 0C468 8095B728 46100480 */ add.s $f18, $f0, $f16 -/* 0C46C 8095B72C 0C01DE0D */ jal Math_Coss +/* 0C46C 8095B72C 0C01DE0D */ jal Math_CosS ## coss? /* 0C470 8095B730 E7B20024 */ swc1 $f18, 0x0024($sp) /* 0C474 8095B734 C7A40038 */ lwc1 $f4, 0x0038($sp) @@ -72,7 +72,7 @@ glabel func_8095B670 /* 0C494 8095B754 AE0E0010 */ sw $t6, 0x0010($s0) ## 00000010 /* 0C498 8095B758 8DAF0008 */ lw $t7, 0x0008($t5) ## FFFFFFE8 /* 0C49C 8095B75C AE0F0014 */ sw $t7, 0x0014($s0) ## 00000014 -/* 0C4A0 8095B760 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C4A0 8095B760 0C00CFC8 */ jal Rand_CenteredFloat /* 0C4A4 8095B764 C42CC924 */ lwc1 $f12, %lo(D_8095C924)($at) /* 0C4A8 8095B768 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B80C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B80C.s index d1fa6cabfb..e798213cee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B80C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B80C.s @@ -62,7 +62,7 @@ glabel func_8095B80C /* 0C624 8095B8E4 E4A8004C */ swc1 $f8, 0x004C($a1) ## 0000004C /* 0C628 8095B8E8 AFA50044 */ sw $a1, 0x0044($sp) /* 0C62C 8095B8EC A7A20032 */ sh $v0, 0x0032($sp) -/* 0C630 8095B8F0 0C03F66B */ jal Math_Rand_ZeroOne +/* 0C630 8095B8F0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0C634 8095B8F4 AFA40020 */ sw $a0, 0x0020($sp) /* 0C638 8095B8F8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B9B0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B9B0.s index fe659143ef..bf8fbe5def 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B9B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095B9B0.s @@ -40,7 +40,7 @@ glabel func_8095B9B0 /* 0C758 8095BA18 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 /* 0C75C 8095BA1C 8CCB0008 */ lw $t3, 0x0008($a2) ## 00000008 /* 0C760 8095BA20 E6040044 */ swc1 $f4, 0x0044($s0) ## 00000044 -/* 0C764 8095BA24 0C03F66B */ jal Math_Rand_ZeroOne +/* 0C764 8095BA24 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0C768 8095BA28 AE0B0008 */ sw $t3, 0x0008($s0) ## 00000008 /* 0C76C 8095BA2C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 @@ -48,18 +48,18 @@ glabel func_8095B9B0 /* 0C774 8095BA34 87A4005E */ lh $a0, 0x005E($sp) /* 0C778 8095BA38 46020182 */ mul.s $f6, $f0, $f2 /* 0C77C 8095BA3C 46023200 */ add.s $f8, $f6, $f2 -/* 0C780 8095BA40 0C01DE1C */ jal Math_Sins +/* 0C780 8095BA40 0C01DE1C */ jal Math_SinS ## sins? /* 0C784 8095BA44 E7A80048 */ swc1 $f8, 0x0048($sp) /* 0C788 8095BA48 C7AA0048 */ lwc1 $f10, 0x0048($sp) /* 0C78C 8095BA4C 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 0C790 8095BA50 44816000 */ mtc1 $at, $f12 ## $f12 = 8.00 /* 0C794 8095BA54 460A0402 */ mul.s $f16, $f0, $f10 -/* 0C798 8095BA58 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C798 8095BA58 0C00CFC8 */ jal Rand_CenteredFloat /* 0C79C 8095BA5C E7B00030 */ swc1 $f16, 0x0030($sp) /* 0C7A0 8095BA60 E7A00034 */ swc1 $f0, 0x0034($sp) -/* 0C7A4 8095BA64 0C01DE0D */ jal Math_Coss +/* 0C7A4 8095BA64 0C01DE0D */ jal Math_CosS ## coss? /* 0C7A8 8095BA68 87A4005E */ lh $a0, 0x005E($sp) /* 0C7AC 8095BA6C C7B20048 */ lwc1 $f18, 0x0048($sp) @@ -73,7 +73,7 @@ glabel func_8095B9B0 /* 0C7CC 8095BA8C AE0D0010 */ sw $t5, 0x0010($s0) ## 00000010 /* 0C7D0 8095BA90 8D8E0008 */ lw $t6, 0x0008($t4) ## FFFFFFE8 /* 0C7D4 8095BA94 AE0E0014 */ sw $t6, 0x0014($s0) ## 00000014 -/* 0C7D8 8095BA98 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C7D8 8095BA98 0C00CFC8 */ jal Rand_CenteredFloat /* 0C7DC 8095BA9C C42CC930 */ lwc1 $f12, %lo(D_8095C930)($at) /* 0C7E0 8095BAA0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -113,14 +113,14 @@ glabel func_8095B9B0 /* 0C864 8095BB24 A602003A */ sh $v0, 0x003A($s0) ## 0000003A /* 0C868 8095BB28 A6020038 */ sh $v0, 0x0038($s0) ## 00000038 /* 0C86C 8095BB2C A6020036 */ sh $v0, 0x0036($s0) ## 00000036 -/* 0C870 8095BB30 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C870 8095BB30 0C00CFC8 */ jal Rand_CenteredFloat /* 0C874 8095BB34 A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 /* 0C878 8095BB38 4600028D */ trunc.w.s $f10, $f0 /* 0C87C 8095BB3C 3C014780 */ lui $at, 0x4780 ## $at = 47800000 /* 0C880 8095BB40 44816000 */ mtc1 $at, $f12 ## $f12 = 65536.00 /* 0C884 8095BB44 44185000 */ mfc1 $t8, $f10 -/* 0C888 8095BB48 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C888 8095BB48 0C00CFC8 */ jal Rand_CenteredFloat /* 0C88C 8095BB4C A618002A */ sh $t8, 0x002A($s0) ## 0000002A /* 0C890 8095BB50 4600040D */ trunc.w.s $f16, $f0 @@ -131,7 +131,7 @@ glabel func_8095B9B0 /* 0C8A4 8095BB64 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 /* 0C8A8 8095BB68 00000000 */ nop /* 0C8AC 8095BB6C 46809320 */ cvt.s.w $f12, $f18 -/* 0C8B0 8095BB70 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0C8B0 8095BB70 0C00CFBE */ jal Rand_ZeroFloat /* 0C8B4 8095BB74 E7AC0024 */ swc1 $f12, 0x0024($sp) /* 0C8B8 8095BB78 C7AC0024 */ lwc1 $f12, 0x0024($sp) @@ -139,7 +139,7 @@ glabel func_8095B9B0 /* 0C8C0 8095BB80 C426C934 */ lwc1 $f6, %lo(D_8095C934)($at) /* 0C8C4 8095BB84 460C0100 */ add.s $f4, $f0, $f12 /* 0C8C8 8095BB88 46062202 */ mul.s $f8, $f4, $f6 -/* 0C8CC 8095BB8C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0C8CC 8095BB8C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0C8D0 8095BB90 E6080040 */ swc1 $f8, 0x0040($s0) ## 00000040 /* 0C8D4 8095BB94 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BBD0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BBD0.s index a0a1f31735..60b7b920cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BBD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BBD0.s @@ -61,7 +61,7 @@ glabel func_8095BBD0 /* 0C9E4 8095BCA4 A4AB002A */ sh $t3, 0x002A($a1) ## 0000002A /* 0C9E8 8095BCA8 846C0002 */ lh $t4, 0x0002($v1) ## 00000002 /* 0C9EC 8095BCAC A4AC002C */ sh $t4, 0x002C($a1) ## 0000002C -/* 0C9F0 8095BCB0 0C03F66B */ jal Math_Rand_ZeroOne +/* 0C9F0 8095BCB0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0C9F4 8095BCB4 AFA5003C */ sw $a1, 0x003C($sp) /* 0C9F8 8095BCB8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966F84.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966F84.s index b189a38d69..e7668cddf3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966F84.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966F84.s @@ -36,7 +36,7 @@ glabel func_80966F84 /* 006A0 80966FF0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 006A4 80966FF4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 006A8 80966FF8 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3F19999A -/* 006AC 80966FFC 0C01DE80 */ jal Math_ApproxF +/* 006AC 80966FFC 0C01DE80 */ jal Math_StepToF /* 006B0 80967000 26040170 */ addiu $a0, $s0, 0x0170 ## $a0 = 00000170 /* 006B4 80967004 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -68,7 +68,7 @@ glabel func_80966F84 .L80967064: /* 00714 80967064 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3CA3D70A /* 00718 80967068 2604016C */ addiu $a0, $s0, 0x016C ## $a0 = 0000016C -/* 0071C 8096706C 0C01DE80 */ jal Math_ApproxF +/* 0071C 8096706C 0C01DE80 */ jal Math_StepToF /* 00720 80967070 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 00724 80967074 9602028E */ lhu $v0, 0x028E($s0) ## 0000028E diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967244.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967244.s index 65e8b1bb5b..c252aea975 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967244.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967244.s @@ -19,14 +19,14 @@ glabel func_80967244 /* 00918 80967268 C42C95F0 */ lwc1 $f12, %lo(D_809695F0)($at) /* 0091C 8096726C E7A60048 */ swc1 $f6, 0x0048($sp) /* 00920 80967270 C488002C */ lwc1 $f8, 0x002C($a0) ## 0000002C -/* 00924 80967274 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00924 80967274 0C00CFBE */ jal Rand_ZeroFloat /* 00928 80967278 E7A8004C */ swc1 $f8, 0x004C($sp) /* 0092C 8096727C 4600028D */ trunc.w.s $f10, $f0 /* 00930 80967280 3C018097 */ lui $at, %hi(D_809695F4) ## $at = 80970000 /* 00934 80967284 C42C95F4 */ lwc1 $f12, %lo(D_809695F4)($at) /* 00938 80967288 440F5000 */ mfc1 $t7, $f10 -/* 0093C 8096728C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0093C 8096728C 0C00CFBE */ jal Rand_ZeroFloat /* 00940 80967290 A7AF0042 */ sh $t7, 0x0042($sp) /* 00944 80967294 4600040D */ trunc.w.s $f16, $f0 @@ -34,11 +34,11 @@ glabel func_80967244 /* 0094C 8096729C 00000000 */ nop /* 00950 809672A0 00022400 */ sll $a0, $v0, 16 /* 00954 809672A4 00042403 */ sra $a0, $a0, 16 -/* 00958 809672A8 0C01DE1C */ jal Math_Sins +/* 00958 809672A8 0C01DE1C */ jal Math_SinS ## sins? /* 0095C 809672AC A7A20040 */ sh $v0, 0x0040($sp) /* 00960 809672B0 E7A00038 */ swc1 $f0, 0x0038($sp) -/* 00964 809672B4 0C01DE0D */ jal Math_Coss +/* 00964 809672B4 0C01DE0D */ jal Math_CosS ## coss? /* 00968 809672B8 87A40042 */ lh $a0, 0x0042($sp) /* 0096C 809672BC C7B20038 */ lwc1 $f18, 0x0038($sp) @@ -48,11 +48,11 @@ glabel func_80967244 /* 0097C 809672CC 3C018097 */ lui $at, %hi(D_80969338) ## $at = 80970000 /* 00980 809672D0 87A40040 */ lh $a0, 0x0040($sp) /* 00984 809672D4 46062202 */ mul.s $f8, $f4, $f6 -/* 00988 809672D8 0C01DE0D */ jal Math_Coss +/* 00988 809672D8 0C01DE0D */ jal Math_CosS ## coss? /* 0098C 809672DC E4289338 */ swc1 $f8, %lo(D_80969338)($at) /* 00990 809672E0 E7A00038 */ swc1 $f0, 0x0038($sp) -/* 00994 809672E4 0C01DE0D */ jal Math_Coss +/* 00994 809672E4 0C01DE0D */ jal Math_CosS ## coss? /* 00998 809672E8 87A40042 */ lh $a0, 0x0042($sp) /* 0099C 809672EC C7AA0038 */ lwc1 $f10, 0x0038($sp) @@ -62,7 +62,7 @@ glabel func_80967244 /* 009AC 809672FC 3C018097 */ lui $at, %hi(D_80969340) ## $at = 80970000 /* 009B0 80967300 87A40042 */ lh $a0, 0x0042($sp) /* 009B4 80967304 46128102 */ mul.s $f4, $f16, $f18 -/* 009B8 80967308 0C01DE1C */ jal Math_Sins +/* 009B8 80967308 0C01DE1C */ jal Math_SinS ## sins? /* 009BC 8096730C E4249340 */ swc1 $f4, %lo(D_80969340)($at) /* 009C0 80967310 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809676A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809676A4.s index 2f3f9c2dc4..3394e82652 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809676A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809676A4.s @@ -48,37 +48,37 @@ glabel func_809676A4 /* 00DF8 80967748 27B3008C */ addiu $s3, $sp, 0x008C ## $s3 = FFFFFFF4 /* 00DFC 8096774C 241E0008 */ addiu $s8, $zero, 0x0008 ## $s8 = 00000008 .L80967750: -/* 00E00 80967750 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00E00 80967750 0C00CFC8 */ jal Rand_CenteredFloat /* 00E04 80967754 4600A306 */ mov.s $f12, $f20 /* 00E08 80967758 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 00E0C 8096775C 4600A306 */ mov.s $f12, $f20 /* 00E10 80967760 46080280 */ add.s $f10, $f0, $f8 -/* 00E14 80967764 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00E14 80967764 0C00CFC8 */ jal Rand_CenteredFloat /* 00E18 80967768 E7AA008C */ swc1 $f10, 0x008C($sp) /* 00E1C 8096776C C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 00E20 80967770 4600A306 */ mov.s $f12, $f20 /* 00E24 80967774 46100480 */ add.s $f18, $f0, $f16 -/* 00E28 80967778 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00E28 80967778 0C00CFC8 */ jal Rand_CenteredFloat /* 00E2C 8096777C E7B20090 */ swc1 $f18, 0x0090($sp) /* 00E30 80967780 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C /* 00E34 80967784 4600B306 */ mov.s $f12, $f22 /* 00E38 80967788 46040180 */ add.s $f6, $f0, $f4 -/* 00E3C 8096778C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00E3C 8096778C 0C00CFC8 */ jal Rand_CenteredFloat /* 00E40 80967790 E7A60094 */ swc1 $f6, 0x0094($sp) /* 00E44 80967794 3C018097 */ lui $at, %hi(D_80969358) ## $at = 80970000 /* 00E48 80967798 E4209358 */ swc1 $f0, %lo(D_80969358)($at) -/* 00E4C 8096779C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00E4C 8096779C 0C00CFBE */ jal Rand_ZeroFloat /* 00E50 809677A0 4600C306 */ mov.s $f12, $f24 /* 00E54 809677A4 461A0201 */ sub.s $f8, $f0, $f26 /* 00E58 809677A8 3C018097 */ lui $at, %hi(D_8096935C) ## $at = 80970000 /* 00E5C 809677AC 4600B306 */ mov.s $f12, $f22 /* 00E60 809677B0 461C4282 */ mul.s $f10, $f8, $f28 -/* 00E64 809677B4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00E64 809677B4 0C00CFC8 */ jal Rand_CenteredFloat /* 00E68 809677B8 E42A935C */ swc1 $f10, %lo(D_8096935C)($at) /* 00E6C 809677BC 3C018097 */ lui $at, %hi(D_80969360) ## $at = 80970000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096784C.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096784C.s index dfcc8de93c..0e8cc4dca8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096784C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096784C.s @@ -41,7 +41,7 @@ glabel func_8096784C /* 00F40 80967890 14200028 */ bne $at, $zero, .L80967934 /* 00F44 80967894 30790001 */ andi $t9, $v1, 0x0001 ## $t9 = 00000000 /* 00F48 80967898 3C018097 */ lui $at, %hi(D_80969610) ## $at = 80970000 -/* 00F4C 8096789C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00F4C 8096789C 0C00CFC8 */ jal Rand_CenteredFloat /* 00F50 809678A0 C42C9610 */ lwc1 $f12, %lo(D_80969610)($at) /* 00F54 809678A4 C604005C */ lwc1 $f4, 0x005C($s0) ## 0000005C @@ -53,7 +53,7 @@ glabel func_8096784C /* 00F6C 809678BC 3C018097 */ lui $at, %hi(D_80969618) ## $at = 80970000 /* 00F70 809678C0 460A4400 */ add.s $f16, $f8, $f10 /* 00F74 809678C4 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 -/* 00F78 809678C8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00F78 809678C8 0C00CFC8 */ jal Rand_CenteredFloat /* 00F7C 809678CC C42C9618 */ lwc1 $f12, %lo(D_80969618)($at) /* 00F80 809678D0 C6120064 */ lwc1 $f18, 0x0064($s0) ## 00000064 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967A04.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967A04.s index 4781ec2998..66a4e46d5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967A04.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967A04.s @@ -24,7 +24,7 @@ glabel func_80967A04 /* 010EC 80967A3C 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 010F0 80967A40 46105481 */ sub.s $f18, $f10, $f16 /* 010F4 80967A44 E6120174 */ swc1 $f18, 0x0174($s0) ## 00000174 -/* 010F8 80967A48 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 010F8 80967A48 0C00CFBE */ jal Rand_ZeroFloat /* 010FC 80967A4C AFA50024 */ sw $a1, 0x0024($sp) /* 01100 80967A50 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -32,7 +32,7 @@ glabel func_80967A04 /* 01108 80967A58 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 0110C 80967A5C 44816000 */ mtc1 $at, $f12 ## $f12 = 6.00 /* 01110 80967A60 46040180 */ add.s $f6, $f0, $f4 -/* 01114 80967A64 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01114 80967A64 0C00CFBE */ jal Rand_ZeroFloat /* 01118 80967A68 E60601B4 */ swc1 $f6, 0x01B4($s0) ## 000001B4 /* 0111C 80967A6C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 @@ -40,7 +40,7 @@ glabel func_80967A04 /* 01124 80967A74 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 01128 80967A78 44816000 */ mtc1 $at, $f12 ## $f12 = 6.00 /* 0112C 80967A7C 46004281 */ sub.s $f10, $f8, $f0 -/* 01130 80967A80 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01130 80967A80 0C00CFBE */ jal Rand_ZeroFloat /* 01134 80967A84 E60A01F4 */ swc1 $f10, 0x01F4($s0) ## 000001F4 /* 01138 80967A88 4600040D */ trunc.w.s $f16, $f0 @@ -50,7 +50,7 @@ glabel func_80967A04 /* 01148 80967A98 44198000 */ mfc1 $t9, $f16 /* 0114C 80967A9C 01095021 */ addu $t2, $t0, $t1 /* 01150 80967AA0 A1590274 */ sb $t9, 0x0274($t2) ## 00000274 -/* 01154 80967AA4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01154 80967AA4 0C00CFBE */ jal Rand_ZeroFloat /* 01158 80967AA8 C42C9628 */ lwc1 $f12, %lo(D_80969628)($at) /* 0115C 80967AAC 3C018097 */ lui $at, %hi(D_8096962C) ## $at = 80970000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967BF8.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967BF8.s index add1c85ad3..45949d7bcd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967BF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967BF8.s @@ -42,37 +42,37 @@ glabel func_80967BF8 /* 01348 80967C98 27B2008C */ addiu $s2, $sp, 0x008C ## $s2 = FFFFFFF4 /* 0134C 80967C9C 24170096 */ addiu $s7, $zero, 0x0096 ## $s7 = 00000096 .L80967CA0: -/* 01350 80967CA0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01350 80967CA0 0C00CFC8 */ jal Rand_CenteredFloat /* 01354 80967CA4 4600A306 */ mov.s $f12, $f20 /* 01358 80967CA8 C6240024 */ lwc1 $f4, 0x0024($s1) ## 00000024 /* 0135C 80967CAC 4600A306 */ mov.s $f12, $f20 /* 01360 80967CB0 46040180 */ add.s $f6, $f0, $f4 -/* 01364 80967CB4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01364 80967CB4 0C00CFC8 */ jal Rand_CenteredFloat /* 01368 80967CB8 E7A6008C */ swc1 $f6, 0x008C($sp) /* 0136C 80967CBC C6280028 */ lwc1 $f8, 0x0028($s1) ## 00000028 /* 01370 80967CC0 4600A306 */ mov.s $f12, $f20 /* 01374 80967CC4 46080280 */ add.s $f10, $f0, $f8 /* 01378 80967CC8 46185400 */ add.s $f16, $f10, $f24 -/* 0137C 80967CCC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0137C 80967CCC 0C00CFC8 */ jal Rand_CenteredFloat /* 01380 80967CD0 E7B00090 */ swc1 $f16, 0x0090($sp) /* 01384 80967CD4 C632002C */ lwc1 $f18, 0x002C($s1) ## 0000002C /* 01388 80967CD8 4600B306 */ mov.s $f12, $f22 /* 0138C 80967CDC 46120100 */ add.s $f4, $f0, $f18 -/* 01390 80967CE0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01390 80967CE0 0C00CFC8 */ jal Rand_CenteredFloat /* 01394 80967CE4 E7A40094 */ swc1 $f4, 0x0094($sp) /* 01398 80967CE8 461A0180 */ add.s $f6, $f0, $f26 /* 0139C 80967CEC 3C018097 */ lui $at, %hi(D_80969378) ## $at = 80970000 /* 013A0 80967CF0 4600E306 */ mov.s $f12, $f28 -/* 013A4 80967CF4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 013A4 80967CF4 0C00CFC8 */ jal Rand_CenteredFloat /* 013A8 80967CF8 E4269378 */ swc1 $f6, %lo(D_80969378)($at) /* 013AC 80967CFC 3C018097 */ lui $at, %hi(D_8096937C) ## $at = 80970000 /* 013B0 80967D00 E420937C */ swc1 $f0, %lo(D_8096937C)($at) -/* 013B4 80967D04 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 013B4 80967D04 0C00CFC8 */ jal Rand_CenteredFloat /* 013B8 80967D08 4600B306 */ mov.s $f12, $f22 /* 013BC 80967D0C 461E0200 */ add.s $f8, $f0, $f30 @@ -83,7 +83,7 @@ glabel func_80967BF8 /* 013D0 80967D20 E42A9388 */ swc1 $f10, %lo(D_80969388)($at) /* 013D4 80967D24 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 013D8 80967D28 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 -/* 013DC 80967D2C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 013DC 80967D2C 0C00CFBE */ jal Rand_ZeroFloat /* 013E0 80967D30 00000000 */ nop /* 013E4 80967D34 4600040D */ trunc.w.s $f16, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969AF0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969AF0.s index 02feaaad6b..c153063560 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969AF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969AF0.s @@ -18,7 +18,7 @@ glabel func_80969AF0 /* 00058 80969B28 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C /* 0005C 80969B2C 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C /* 00060 80969B30 AFA3001C */ sw $v1, 0x001C($sp) -/* 00064 80969B34 0C01DF64 */ jal Math_Rand_S16Offset +/* 00064 80969B34 0C01DF64 */ jal Rand_S16Offset /* 00068 80969B38 AFA60038 */ sw $a2, 0x0038($sp) /* 0006C 80969B3C 8FA3001C */ lw $v1, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A6E0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A6E0.s index 6c251fe24a..3d429d0d2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A6E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A6E0.s @@ -103,7 +103,7 @@ glabel func_8096A6E0 /* 00D98 8096A868 46105480 */ add.s $f18, $f10, $f16 /* 00D9C 8096A86C E7B20090 */ swc1 $f18, 0x0090($sp) .L8096A870: -/* 00DA0 8096A870 0C03F66B */ jal Math_Rand_ZeroOne +/* 00DA0 8096A870 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00DA4 8096A874 00000000 */ nop /* 00DA8 8096A878 46140102 */ mul.s $f4, $f0, $f20 @@ -128,7 +128,7 @@ glabel func_8096A6E0 /* 00DF4 8096A8C4 A3AB009E */ sb $t3, 0x009E($sp) /* 00DF8 8096A8C8 A3AD0098 */ sb $t5, 0x0098($sp) /* 00DFC 8096A8CC A3AF0099 */ sb $t7, 0x0099($sp) -/* 00E00 8096A8D0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00E00 8096A8D0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00E04 8096A8D4 A3B9009A */ sb $t9, 0x009A($sp) /* 00E08 8096A8D8 46180282 */ mul.s $f10, $f0, $f24 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978AFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978AFC.s index ed95566036..2d1568c832 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978AFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978AFC.s @@ -9,7 +9,7 @@ glabel func_80978AFC /* 001D4 80978B04 AFBF002C */ sw $ra, 0x002C($sp) /* 001D8 80978B08 AFA40030 */ sw $a0, 0x0030($sp) /* 001DC 80978B0C AFA50034 */ sw $a1, 0x0034($sp) -/* 001E0 80978B10 0C03F66B */ jal Math_Rand_ZeroOne +/* 001E0 80978B10 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 001E4 80978B14 E7AC0038 */ swc1 $f12, 0x0038($sp) /* 001E8 80978B18 3C018098 */ lui $at, %hi(D_8097C19C) ## $at = 80980000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978C20.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978C20.s index 67d3252ba1..68b5496eec 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978C20.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978C20.s @@ -49,11 +49,11 @@ glabel func_80978C20 /* 00380 80978CB0 27B700B8 */ addiu $s7, $sp, 0x00B8 ## $s7 = FFFFFFE8 .L80978CB4: /* 00384 80978CB4 00112400 */ sll $a0, $s1, 16 -/* 00388 80978CB8 0C01DE1C */ jal Math_Sins +/* 00388 80978CB8 0C01DE1C */ jal Math_SinS ## sins? /* 0038C 80978CBC 00042403 */ sra $a0, $a0, 16 /* 00390 80978CC0 46160102 */ mul.s $f4, $f0, $f22 -/* 00394 80978CC4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00394 80978CC4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00398 80978CC8 E7A400C4 */ swc1 $f4, 0x00C4($sp) /* 0039C 80978CCC 461E0182 */ mul.s $f6, $f0, $f30 @@ -62,7 +62,7 @@ glabel func_80978C20 /* 003A8 80978CD8 00112400 */ sll $a0, $s1, 16 /* 003AC 80978CDC 00042403 */ sra $a0, $a0, 16 /* 003B0 80978CE0 46083280 */ add.s $f10, $f6, $f8 -/* 003B4 80978CE4 0C01DE0D */ jal Math_Coss +/* 003B4 80978CE4 0C01DE0D */ jal Math_CosS ## coss? /* 003B8 80978CE8 E7AA00C8 */ swc1 $f10, 0x00C8($sp) /* 003BC 80978CEC 46160402 */ mul.s $f16, $f0, $f22 @@ -72,7 +72,7 @@ glabel func_80978C20 /* 003CC 80978CFC C6860000 */ lwc1 $f6, 0x0000($s4) ## 00000000 /* 003D0 80978D00 4606D202 */ mul.s $f8, $f26, $f6 /* 003D4 80978D04 46082280 */ add.s $f10, $f4, $f8 -/* 003D8 80978D08 0C03F66B */ jal Math_Rand_ZeroOne +/* 003D8 80978D08 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 003DC 80978D0C E7AA00B8 */ swc1 $f10, 0x00B8($sp) /* 003E0 80978D10 3C014210 */ lui $at, 0x4210 ## $at = 42100000 @@ -98,7 +98,7 @@ glabel func_80978C20 /* 00430 80978D60 E7A400C8 */ swc1 $f4, 0x00C8($sp) /* 00434 80978D64 C6500008 */ lwc1 $f16, 0x0008($s2) ## 00000008 /* 00438 80978D68 46104280 */ add.s $f10, $f8, $f16 -/* 0043C 80978D6C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0043C 80978D6C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00440 80978D70 E7AA00CC */ swc1 $f10, 0x00CC($sp) /* 00444 80978D74 3C018098 */ lui $at, %hi(D_8097C1A4) ## $at = 80980000 @@ -120,10 +120,10 @@ glabel func_80978C20 /* 00480 80978DB0 10000001 */ beq $zero, $zero, .L80978DB8 /* 00484 80978DB4 24100041 */ addiu $s0, $zero, 0x0041 ## $s0 = 00000041 .L80978DB8: -/* 00488 80978DB8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00488 80978DB8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0048C 80978DBC 00000000 */ nop -/* 00490 80978DC0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00490 80978DC0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00494 80978DC4 46000506 */ mov.s $f20, $f0 /* 00498 80978DC8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979860.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979860.s index 4892d41d07..43e2f61035 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979860.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979860.s @@ -491,7 +491,7 @@ glabel L80979DE0 /* 01608 80979F38 45030014 */ bc1tl .L80979F8C /* 0160C 80979F3C 8FBF001C */ lw $ra, 0x001C($sp) .L80979F40: -/* 01610 80979F40 0C03F494 */ jal Math_atan2f +/* 01610 80979F40 0C03F494 */ jal Math_FAtan2F /* 01614 80979F44 00000000 */ nop /* 01618 80979F48 3C018098 */ lui $at, %hi(D_8097C220) ## $at = 80980000 /* 0161C 80979F4C C428C220 */ lwc1 $f8, %lo(D_8097C220)($at) @@ -501,7 +501,7 @@ glabel L80979DE0 /* 0162C 80979F5C 1000000A */ beq $zero, $zero, .L80979F88 /* 01630 80979F60 A6090032 */ sh $t1, 0x0032($s0) ## 00000032 .L80979F64: -/* 01634 80979F64 0C03F494 */ jal Math_atan2f +/* 01634 80979F64 0C03F494 */ jal Math_FAtan2F /* 01638 80979F68 00000000 */ nop /* 0163C 80979F6C 3C018098 */ lui $at, %hi(D_8097C224) ## $at = 80980000 /* 01640 80979F70 C432C224 */ lwc1 $f18, %lo(D_8097C224)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AEE8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AEE8.s index aafe1fa97c..01554873e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AEE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AEE8.s @@ -6,11 +6,11 @@ glabel func_8097AEE8 /* 025C8 8097AEF8 AFA40038 */ sw $a0, 0x0038($sp) /* 025CC 8097AEFC 84840032 */ lh $a0, 0x0032($a0) ## 00000032 /* 025D0 8097AF00 AFA50038 */ sw $a1, 0x0038($sp) -/* 025D4 8097AF04 0C01DE0D */ jal Math_Coss +/* 025D4 8097AF04 0C01DE0D */ jal Math_CosS ## coss? /* 025D8 8097AF08 A7A40022 */ sh $a0, 0x0022($sp) /* 025DC 8097AF0C 87A40022 */ lh $a0, 0x0022($sp) -/* 025E0 8097AF10 0C01DE1C */ jal Math_Sins +/* 025E0 8097AF10 0C01DE1C */ jal Math_SinS ## sins? /* 025E4 8097AF14 E7A0001C */ swc1 $f0, 0x001C($sp) /* 025E8 8097AF18 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B450.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B450.s index bbed9a3d3b..ee2723be5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B450.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B450.s @@ -6,11 +6,11 @@ glabel func_8097B450 /* 02B30 8097B460 AFA40038 */ sw $a0, 0x0038($sp) /* 02B34 8097B464 84840032 */ lh $a0, 0x0032($a0) ## 00000032 /* 02B38 8097B468 AFA50038 */ sw $a1, 0x0038($sp) -/* 02B3C 8097B46C 0C01DE0D */ jal Math_Coss +/* 02B3C 8097B46C 0C01DE0D */ jal Math_CosS ## coss? /* 02B40 8097B470 A7A40022 */ sh $a0, 0x0022($sp) /* 02B44 8097B474 87A40022 */ lh $a0, 0x0022($sp) -/* 02B48 8097B478 0C01DE1C */ jal Math_Sins +/* 02B48 8097B478 0C01DE1C */ jal Math_SinS ## sins? /* 02B4C 8097B47C E7A0001C */ swc1 $f0, 0x001C($sp) /* 02B50 8097B480 3C01420C */ lui $at, 0x420C ## $at = 420C0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s index 589683b8ce..7e0b811a88 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s @@ -131,7 +131,7 @@ glabel L80988F2C glabel L80988FCC /* 0014C 80988FCC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00150 80988FD0 00300821 */ addu $at, $at, $s0 -/* 00154 80988FD4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00154 80988FD4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00158 80988FD8 AC201CC8 */ sw $zero, 0x1CC8($at) ## 00011CC8 /* 0015C 80988FDC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -141,7 +141,7 @@ glabel L80988FCC /* 0016C 80988FEC 460C2080 */ add.s $f2, $f4, $f12 /* 00170 80988FF0 E6620058 */ swc1 $f2, 0x0058($s3) ## 00000058 /* 00174 80988FF4 E6620054 */ swc1 $f2, 0x0054($s3) ## 00000054 -/* 00178 80988FF8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00178 80988FF8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0017C 80988FFC E6620050 */ swc1 $f2, 0x0050($s3) ## 00000050 /* 00180 80989000 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -151,7 +151,7 @@ glabel L80988FCC /* 00190 80989010 00000000 */ nop /* 00194 80989014 46060202 */ mul.s $f8, $f0, $f6 /* 00198 80989018 46024280 */ add.s $f10, $f8, $f2 -/* 0019C 8098901C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0019C 8098901C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 001A0 80989020 E66A0150 */ swc1 $f10, 0x0150($s3) ## 00000150 /* 001A4 80989024 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -161,7 +161,7 @@ glabel L80988FCC /* 001B4 80989034 00000000 */ nop /* 001B8 80989038 46100482 */ mul.s $f18, $f0, $f16 /* 001BC 8098903C 46029100 */ add.s $f4, $f18, $f2 -/* 001C0 80989040 0C03F66B */ jal Math_Rand_ZeroOne +/* 001C0 80989040 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 001C4 80989044 E6640154 */ swc1 $f4, 0x0154($s3) ## 00000154 /* 001C8 80989048 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -177,7 +177,7 @@ glabel L8098906C /* 001EC 8098906C 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 001F0 80989070 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 .L80989074: -/* 001F4 80989074 0C03F66B */ jal Math_Rand_ZeroOne +/* 001F4 80989074 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 001F8 80989078 00000000 */ nop /* 001FC 8098907C 3C018099 */ lui $at, %hi(D_8098CA98) ## $at = 80990000 @@ -188,7 +188,7 @@ glabel L8098906C /* 00210 80989090 00006812 */ mflo $t5 /* 00214 80989094 026D8821 */ addu $s1, $s3, $t5 /* 00218 80989098 440F2000 */ mfc1 $t7, $f4 -/* 0021C 8098909C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0021C 8098909C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00220 809890A0 A62F0170 */ sh $t7, 0x0170($s1) ## 00000170 /* 00224 809890A4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989B54.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989B54.s index 750bd506f6..21b72868ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989B54.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989B54.s @@ -20,7 +20,7 @@ glabel func_80989B54 /* 00D1C 80989B9C 1000004E */ beq $zero, $zero, .L80989CD8 /* 00D20 80989BA0 008E8021 */ addu $s0, $a0, $t6 .L80989BA4: -/* 00D24 80989BA4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00D24 80989BA4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00D28 80989BA8 A7A6002A */ sh $a2, 0x002A($sp) /* 00D2C 80989BAC 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 @@ -35,7 +35,7 @@ glabel func_80989B54 /* 00D50 80989BD0 46023202 */ mul.s $f8, $f6, $f2 /* 00D54 80989BD4 022F8021 */ addu $s0, $s1, $t7 /* 00D58 80989BD8 E6020154 */ swc1 $f2, 0x0154($s0) ## 00000154 -/* 00D5C 80989BDC 0C03F66B */ jal Math_Rand_ZeroOne +/* 00D5C 80989BDC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00D60 80989BE0 E6080150 */ swc1 $f8, 0x0150($s0) ## 00000150 /* 00D64 80989BE4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -54,7 +54,7 @@ glabel func_80989B54 /* 00D94 80989C14 02388021 */ addu $s0, $s1, $t8 /* 00D98 80989C18 E600015C */ swc1 $f0, 0x015C($s0) ## 0000015C /* 00D9C 80989C1C E6000160 */ swc1 $f0, 0x0160($s0) ## 00000160 -/* 00DA0 80989C20 0C03F66B */ jal Math_Rand_ZeroOne +/* 00DA0 80989C20 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00DA4 80989C24 E6000164 */ swc1 $f0, 0x0164($s0) ## 00000164 /* 00DA8 80989C28 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -66,7 +66,7 @@ glabel func_80989B54 /* 00DC0 80989C40 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 00DC4 80989C44 460A4402 */ mul.s $f16, $f8, $f10 /* 00DC8 80989C48 E6120154 */ swc1 $f18, 0x0154($s0) ## 00000154 -/* 00DCC 80989C4C 0C03F66B */ jal Math_Rand_ZeroOne +/* 00DCC 80989C4C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00DD0 80989C50 E6100150 */ swc1 $f16, 0x0150($s0) ## 00000150 /* 00DD4 80989C54 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -78,7 +78,7 @@ glabel func_80989B54 /* 00DEC 80989C6C 1000001A */ beq $zero, $zero, .L80989CD8 /* 00DF0 80989C70 E60A0158 */ swc1 $f10, 0x0158($s0) ## 00000158 .L80989C74: -/* 00DF4 80989C74 0C03F66B */ jal Math_Rand_ZeroOne +/* 00DF4 80989C74 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00DF8 80989C78 A7A6002A */ sh $a2, 0x002A($sp) /* 00DFC 80989C7C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -95,7 +95,7 @@ glabel func_80989B54 /* 00E28 80989CA8 0019C8C0 */ sll $t9, $t9, 3 /* 00E2C 80989CAC 02398021 */ addu $s0, $s1, $t9 /* 00E30 80989CB0 E6080154 */ swc1 $f8, 0x0154($s0) ## 00000154 -/* 00E34 80989CB4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00E34 80989CB4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00E38 80989CB8 E6060150 */ swc1 $f6, 0x0150($s0) ## 00000150 /* 00E3C 80989CBC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -106,7 +106,7 @@ glabel func_80989B54 /* 00E50 80989CD0 46128102 */ mul.s $f4, $f16, $f18 /* 00E54 80989CD4 E6040158 */ swc1 $f4, 0x0158($s0) ## 00000158 .L80989CD8: -/* 00E58 80989CD8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00E58 80989CD8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00E5C 80989CDC 00000000 */ nop /* 00E60 80989CE0 3C088099 */ lui $t0, %hi(D_8098CF80) ## $t0 = 80990000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s index 3ee26d48a3..d26d92eaee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s @@ -136,7 +136,7 @@ glabel func_80989D24 /* 01050 80989ED0 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 /* 01054 80989ED4 15410009 */ bne $t2, $at, .L80989EFC /* 01058 80989ED8 00000000 */ nop -/* 0105C 80989EDC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0105C 80989EDC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01060 80989EE0 00000000 */ nop /* 01064 80989EE4 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 @@ -146,7 +146,7 @@ glabel func_80989D24 /* 01074 80989EF4 10000008 */ beq $zero, $zero, .L80989F18 /* 01078 80989EF8 E6640154 */ swc1 $f4, 0x0154($s3) ## 00000154 .L80989EFC: -/* 0107C 80989EFC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0107C 80989EFC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01080 80989F00 00000000 */ nop /* 01084 80989F04 3C01C3FA */ lui $at, 0xC3FA ## $at = C3FA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s index 56c7ab8b1e..0f359ac824 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s @@ -71,7 +71,7 @@ glabel func_8098A4F0 /* 01748 8098A5C8 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 0174C 8098A5CC 00812021 */ addu $a0, $a0, $at /* 01750 8098A5D0 00042400 */ sll $a0, $a0, 16 -/* 01754 8098A5D4 0C01DE1C */ jal Math_Sins +/* 01754 8098A5D4 0C01DE1C */ jal Math_SinS ## sins? /* 01758 8098A5D8 00042403 */ sra $a0, $a0, 16 /* 0175C 8098A5DC 44922000 */ mtc1 $s2, $f4 ## $f4 = 0.00 @@ -90,7 +90,7 @@ glabel func_8098A4F0 /* 01790 8098A610 460AF580 */ add.s $f22, $f30, $f10 /* 01794 8098A614 46008487 */ neg.s $f18, $f16 /* 01798 8098A618 46169602 */ mul.s $f24, $f18, $f22 -/* 0179C 8098A61C 0C01DE0D */ jal Math_Coss +/* 0179C 8098A61C 0C01DE0D */ jal Math_CosS ## coss? /* 017A0 8098A620 00000000 */ nop /* 017A4 8098A624 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -103,7 +103,7 @@ glabel func_8098A4F0 /* 017C0 8098A640 00812021 */ addu $a0, $a0, $at /* 017C4 8098A644 00042400 */ sll $a0, $a0, 16 /* 017C8 8098A648 00042403 */ sra $a0, $a0, 16 -/* 017CC 8098A64C 0C01DE0D */ jal Math_Coss +/* 017CC 8098A64C 0C01DE0D */ jal Math_CosS ## coss? /* 017D0 8098A650 46083680 */ add.s $f26, $f6, $f8 /* 017D4 8098A654 3C014140 */ lui $at, 0x4140 ## $at = 41400000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s index 4baac2b68a..fc24acd7aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s @@ -104,7 +104,7 @@ glabel func_8098ABC0 .L8098ACE4: /* 01E64 8098ACE4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 01E68 8098ACE8 A6000170 */ sh $zero, 0x0170($s0) ## 00000170 -/* 01E6C 8098ACEC 0C03F66B */ jal Math_Rand_ZeroOne +/* 01E6C 8098ACEC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01E70 8098ACF0 E604016C */ swc1 $f4, 0x016C($s0) ## 0000016C /* 01E74 8098ACF4 46180201 */ sub.s $f8, $f0, $f24 @@ -119,7 +119,7 @@ glabel func_8098ABC0 /* 01E98 8098AD18 448B9000 */ mtc1 $t3, $f18 ## $f18 = 0.00 /* 01E9C 8098AD1C 00000000 */ nop /* 01EA0 8098AD20 46809120 */ cvt.s.w $f4, $f18 -/* 01EA4 8098AD24 0C03F66B */ jal Math_Rand_ZeroOne +/* 01EA4 8098AD24 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01EA8 8098AD28 E6040150 */ swc1 $f4, 0x0150($s0) ## 00000150 /* 01EAC 8098AD2C 46180201 */ sub.s $f8, $f0, $f24 @@ -134,7 +134,7 @@ glabel func_8098ABC0 /* 01ED0 8098AD50 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 /* 01ED4 8098AD54 00000000 */ nop /* 01ED8 8098AD58 46809120 */ cvt.s.w $f4, $f18 -/* 01EDC 8098AD5C 0C03F66B */ jal Math_Rand_ZeroOne +/* 01EDC 8098AD5C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01EE0 8098AD60 E6040154 */ swc1 $f4, 0x0154($s0) ## 00000154 /* 01EE4 8098AD64 46180201 */ sub.s $f8, $f0, $f24 @@ -283,7 +283,7 @@ glabel func_8098ABC0 /* 020F4 8098AF74 10000054 */ beq $zero, $zero, .L8098B0C8 /* 020F8 8098AF78 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 .L8098AF7C: -/* 020FC 8098AF7C 0C03F66B */ jal Math_Rand_ZeroOne +/* 020FC 8098AF7C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02100 8098AF80 00000000 */ nop /* 02104 8098AF84 92180173 */ lbu $t8, 0x0173($s0) ## 00000173 @@ -298,7 +298,7 @@ glabel func_8098ABC0 /* 02124 8098AFA4 3C073ECC */ lui $a3, 0x3ECC ## $a3 = 3ECC0000 /* 02128 8098AFA8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3ECCCCCD /* 0212C 8098AFAC 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 -/* 02130 8098AFB0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02130 8098AFB0 0C01E0C4 */ jal Math_SmoothStepToF /* 02134 8098AFB4 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 02138 8098AFB8 C6120168 */ lwc1 $f18, 0x0168($s0) ## 00000168 @@ -316,7 +316,7 @@ glabel func_8098ABC0 /* 02164 8098AFE4 4406C000 */ mfc1 $a2, $f24 /* 02168 8098AFE8 3C073E99 */ lui $a3, 0x3E99 ## $a3 = 3E990000 /* 0216C 8098AFEC 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E99999A -/* 02170 8098AFF0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02170 8098AFF0 0C01E0C4 */ jal Math_SmoothStepToF /* 02174 8098AFF4 E7A40010 */ swc1 $f4, 0x0010($sp) /* 02178 8098AFF8 C6080168 */ lwc1 $f8, 0x0168($s0) ## 00000168 @@ -324,7 +324,7 @@ glabel func_8098ABC0 /* 02180 8098B000 00000000 */ nop /* 02184 8098B004 45020030 */ bc1fl .L8098B0C8 /* 02188 8098B008 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -/* 0218C 8098B00C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0218C 8098B00C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02190 8098B010 00000000 */ nop /* 02194 8098B014 46180401 */ sub.s $f16, $f0, $f24 @@ -339,7 +339,7 @@ glabel func_8098ABC0 /* 021B8 8098B038 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 /* 021BC 8098B03C 00000000 */ nop /* 021C0 8098B040 46802220 */ cvt.s.w $f8, $f4 -/* 021C4 8098B044 0C03F66B */ jal Math_Rand_ZeroOne +/* 021C4 8098B044 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 021C8 8098B048 E6080150 */ swc1 $f8, 0x0150($s0) ## 00000150 /* 021CC 8098B04C 46180401 */ sub.s $f16, $f0, $f24 @@ -354,7 +354,7 @@ glabel func_8098ABC0 /* 021F0 8098B070 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 021F4 8098B074 00000000 */ nop /* 021F8 8098B078 46802220 */ cvt.s.w $f8, $f4 -/* 021FC 8098B07C 0C03F66B */ jal Math_Rand_ZeroOne +/* 021FC 8098B07C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02200 8098B080 E6080154 */ swc1 $f8, 0x0154($s0) ## 00000154 /* 02204 8098B084 46180401 */ sub.s $f16, $f0, $f24 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s index 44206c11f6..de57a07989 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s @@ -102,7 +102,7 @@ glabel func_8098B354 .L8098B478: /* 025F8 8098B478 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 025FC 8098B47C A6000170 */ sh $zero, 0x0170($s0) ## 00000170 -/* 02600 8098B480 0C03F66B */ jal Math_Rand_ZeroOne +/* 02600 8098B480 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02604 8098B484 E604016C */ swc1 $f4, 0x016C($s0) ## 0000016C /* 02608 8098B488 46160201 */ sub.s $f8, $f0, $f22 @@ -117,7 +117,7 @@ glabel func_8098B354 /* 0262C 8098B4AC 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 /* 02630 8098B4B0 00000000 */ nop /* 02634 8098B4B4 46809120 */ cvt.s.w $f4, $f18 -/* 02638 8098B4B8 0C03F66B */ jal Math_Rand_ZeroOne +/* 02638 8098B4B8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0263C 8098B4BC E6040150 */ swc1 $f4, 0x0150($s0) ## 00000150 /* 02640 8098B4C0 46160201 */ sub.s $f8, $f0, $f22 @@ -132,7 +132,7 @@ glabel func_8098B354 /* 02664 8098B4E4 448D9000 */ mtc1 $t5, $f18 ## $f18 = 0.00 /* 02668 8098B4E8 00000000 */ nop /* 0266C 8098B4EC 46809120 */ cvt.s.w $f4, $f18 -/* 02670 8098B4F0 0C03F66B */ jal Math_Rand_ZeroOne +/* 02670 8098B4F0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02674 8098B4F4 E6040154 */ swc1 $f4, 0x0154($s0) ## 00000154 /* 02678 8098B4F8 46160201 */ sub.s $f8, $f0, $f22 @@ -206,7 +206,7 @@ glabel func_8098B354 /* 02774 8098B5F4 10000050 */ beq $zero, $zero, .L8098B738 /* 02778 8098B5F8 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 .L8098B5FC: -/* 0277C 8098B5FC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0277C 8098B5FC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02780 8098B600 00000000 */ nop /* 02784 8098B604 92180173 */ lbu $t8, 0x0173($s0) ## 00000173 @@ -219,7 +219,7 @@ glabel func_8098B354 /* 0279C 8098B61C 3C073ECC */ lui $a3, 0x3ECC ## $a3 = 3ECC0000 /* 027A0 8098B620 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3ECCCCCD /* 027A4 8098B624 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 -/* 027A8 8098B628 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 027A8 8098B628 0C01E0C4 */ jal Math_SmoothStepToF /* 027AC 8098B62C E7BE0010 */ swc1 $f30, 0x0010($sp) /* 027B0 8098B630 C60A0168 */ lwc1 $f10, 0x0168($s0) ## 00000168 @@ -235,7 +235,7 @@ glabel func_8098B354 /* 027D4 8098B654 4406B000 */ mfc1 $a2, $f22 /* 027D8 8098B658 3C073E99 */ lui $a3, 0x3E99 ## $a3 = 3E990000 /* 027DC 8098B65C 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E99999A -/* 027E0 8098B660 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 027E0 8098B660 0C01E0C4 */ jal Math_SmoothStepToF /* 027E4 8098B664 E7BE0010 */ swc1 $f30, 0x0010($sp) /* 027E8 8098B668 C6120168 */ lwc1 $f18, 0x0168($s0) ## 00000168 @@ -243,7 +243,7 @@ glabel func_8098B354 /* 027F0 8098B670 00000000 */ nop /* 027F4 8098B674 45020030 */ bc1fl .L8098B738 /* 027F8 8098B678 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -/* 027FC 8098B67C 0C03F66B */ jal Math_Rand_ZeroOne +/* 027FC 8098B67C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02800 8098B680 00000000 */ nop /* 02804 8098B684 46160101 */ sub.s $f4, $f0, $f22 @@ -258,7 +258,7 @@ glabel func_8098B354 /* 02828 8098B6A8 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 /* 0282C 8098B6AC 00000000 */ nop /* 02830 8098B6B0 468054A0 */ cvt.s.w $f18, $f10 -/* 02834 8098B6B4 0C03F66B */ jal Math_Rand_ZeroOne +/* 02834 8098B6B4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02838 8098B6B8 E6120150 */ swc1 $f18, 0x0150($s0) ## 00000150 /* 0283C 8098B6BC 46160101 */ sub.s $f4, $f0, $f22 @@ -273,7 +273,7 @@ glabel func_8098B354 /* 02860 8098B6E0 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 /* 02864 8098B6E4 00000000 */ nop /* 02868 8098B6E8 468054A0 */ cvt.s.w $f18, $f10 -/* 0286C 8098B6EC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0286C 8098B6EC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02870 8098B6F0 E6120154 */ swc1 $f18, 0x0154($s0) ## 00000154 /* 02874 8098B6F4 46160101 */ sub.s $f4, $f0, $f22 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D280.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D280.s index 2ee2906a3f..99d98813a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D280.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D280.s @@ -42,7 +42,7 @@ glabel func_8098D280 /* 0033C 8098D30C 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 /* 00340 8098D310 27B40094 */ addiu $s4, $sp, 0x0094 ## $s4 = FFFFFFF4 .L8098D314: -/* 00344 8098D314 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00344 8098D314 0C00CFBE */ jal Rand_ZeroFloat /* 00348 8098D318 4600C306 */ mov.s $f12, $f24 /* 0034C 8098D31C 4600010D */ trunc.w.s $f4, $f0 @@ -50,7 +50,7 @@ glabel func_8098D280 /* 00354 8098D324 44112000 */ mfc1 $s1, $f4 /* 00358 8098D328 00000000 */ nop /* 0035C 8098D32C 00118C00 */ sll $s1, $s1, 16 -/* 00360 8098D330 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00360 8098D330 0C00CFBE */ jal Rand_ZeroFloat /* 00364 8098D334 00118C03 */ sra $s1, $s1, 16 /* 00368 8098D338 4600018D */ trunc.w.s $f6, $f0 @@ -59,16 +59,16 @@ glabel func_8098D280 /* 00374 8098D344 44103000 */ mfc1 $s0, $f6 /* 00378 8098D348 00000000 */ nop /* 0037C 8098D34C 00108400 */ sll $s0, $s0, 16 -/* 00380 8098D350 0C01DE0D */ jal Math_Coss +/* 00380 8098D350 0C01DE0D */ jal Math_CosS ## coss? /* 00384 8098D354 00108403 */ sra $s0, $s0, 16 /* 00388 8098D358 00102400 */ sll $a0, $s0, 16 /* 0038C 8098D35C 00042403 */ sra $a0, $a0, 16 -/* 00390 8098D360 0C01DE1C */ jal Math_Sins +/* 00390 8098D360 0C01DE1C */ jal Math_SinS ## sins? /* 00394 8098D364 46000586 */ mov.s $f22, $f0 /* 00398 8098D368 46000506 */ mov.s $f20, $f0 -/* 0039C 8098D36C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0039C 8098D36C 0C00CFBE */ jal Rand_ZeroFloat /* 003A0 8098D370 4600D306 */ mov.s $f12, $f26 /* 003A4 8098D374 4616A202 */ mul.s $f8, $f20, $f22 @@ -76,16 +76,16 @@ glabel func_8098D280 /* 003AC 8098D37C 00112400 */ sll $a0, $s1, 16 /* 003B0 8098D380 00042403 */ sra $a0, $a0, 16 /* 003B4 8098D384 46080282 */ mul.s $f10, $f0, $f8 -/* 003B8 8098D388 0C01DE0D */ jal Math_Coss +/* 003B8 8098D388 0C01DE0D */ jal Math_CosS ## coss? /* 003BC 8098D38C E42AE11C */ swc1 $f10, %lo(D_8098E11C)($at) /* 003C0 8098D390 00102400 */ sll $a0, $s0, 16 /* 003C4 8098D394 00042403 */ sra $a0, $a0, 16 -/* 003C8 8098D398 0C01DE0D */ jal Math_Coss +/* 003C8 8098D398 0C01DE0D */ jal Math_CosS ## coss? /* 003CC 8098D39C 46000586 */ mov.s $f22, $f0 /* 003D0 8098D3A0 46000506 */ mov.s $f20, $f0 -/* 003D4 8098D3A4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 003D4 8098D3A4 0C00CFBE */ jal Rand_ZeroFloat /* 003D8 8098D3A8 4600D306 */ mov.s $f12, $f26 /* 003DC 8098D3AC 4616A402 */ mul.s $f16, $f20, $f22 @@ -93,11 +93,11 @@ glabel func_8098D280 /* 003E4 8098D3B4 00112400 */ sll $a0, $s1, 16 /* 003E8 8098D3B8 00042403 */ sra $a0, $a0, 16 /* 003EC 8098D3BC 46100482 */ mul.s $f18, $f0, $f16 -/* 003F0 8098D3C0 0C01DE1C */ jal Math_Sins +/* 003F0 8098D3C0 0C01DE1C */ jal Math_SinS ## sins? /* 003F4 8098D3C4 E432E124 */ swc1 $f18, %lo(D_8098E124)($at) /* 003F8 8098D3C8 46000506 */ mov.s $f20, $f0 -/* 003FC 8098D3CC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 003FC 8098D3CC 0C00CFBE */ jal Rand_ZeroFloat /* 00400 8098D3D0 4600F306 */ mov.s $f12, $f30 /* 00404 8098D3D4 46140102 */ mul.s $f4, $f0, $f20 @@ -127,7 +127,7 @@ glabel func_8098D280 /* 00464 8098D434 E7B20098 */ swc1 $f18, 0x0098($sp) /* 00468 8098D438 C668002C */ lwc1 $f8, 0x002C($s3) ## 0000002C /* 0046C 8098D43C 46083280 */ add.s $f10, $f6, $f8 -/* 00470 8098D440 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00470 8098D440 0C00CFBE */ jal Rand_ZeroFloat /* 00474 8098D444 E7AA009C */ swc1 $f10, 0x009C($sp) /* 00478 8098D448 4600040D */ trunc.w.s $f16, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s index be58c48303..681d81b9c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s @@ -186,20 +186,20 @@ glabel L80994E88 /* 00260 80994EB0 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 00264 80994EB4 44816000 */ mtc1 $at, $f12 ## $f12 = 8.00 /* 00268 80994EB8 E644006C */ swc1 $f4, 0x006C($s2) ## 0000006C -/* 0026C 80994EBC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0026C 80994EBC 0C00CFC8 */ jal Rand_CenteredFloat /* 00270 80994EC0 E6460070 */ swc1 $f6, 0x0070($s2) ## 00000070 /* 00274 80994EC4 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 00278 80994EC8 44816000 */ mtc1 $at, $f12 ## $f12 = 8.00 -/* 0027C 80994ECC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0027C 80994ECC 0C00CFBE */ jal Rand_ZeroFloat /* 00280 80994ED0 E7A00050 */ swc1 $f0, 0x0050($sp) /* 00284 80994ED4 E6400064 */ swc1 $f0, 0x0064($s2) ## 00000064 -/* 00288 80994ED8 0C01DE0D */ jal Math_Coss +/* 00288 80994ED8 0C01DE0D */ jal Math_CosS ## coss? /* 0028C 80994EDC 86440032 */ lh $a0, 0x0032($s2) ## 00000032 /* 00290 80994EE0 E7A00040 */ swc1 $f0, 0x0040($sp) -/* 00294 80994EE4 0C01DE1C */ jal Math_Sins +/* 00294 80994EE4 0C01DE1C */ jal Math_SinS ## sins? /* 00298 80994EE8 86440032 */ lh $a0, 0x0032($s2) ## 00000032 /* 0029C 80994EEC C7A80040 */ lwc1 $f8, 0x0040($sp) @@ -210,11 +210,11 @@ glabel L80994E88 /* 002B0 80994F00 00000000 */ nop /* 002B4 80994F04 46120102 */ mul.s $f4, $f0, $f18 /* 002B8 80994F08 46102180 */ add.s $f6, $f4, $f16 -/* 002BC 80994F0C 0C01DE1C */ jal Math_Sins +/* 002BC 80994F0C 0C01DE1C */ jal Math_SinS ## sins? /* 002C0 80994F10 E646005C */ swc1 $f6, 0x005C($s2) ## 0000005C /* 002C4 80994F14 E7A00040 */ swc1 $f0, 0x0040($sp) -/* 002C8 80994F18 0C01DE0D */ jal Math_Coss +/* 002C8 80994F18 0C01DE0D */ jal Math_CosS ## coss? /* 002CC 80994F1C 86440032 */ lh $a0, 0x0032($s2) ## 00000032 /* 002D0 80994F20 C7A80040 */ lwc1 $f8, 0x0040($sp) @@ -226,7 +226,7 @@ glabel L80994E88 /* 002E8 80994F38 44816000 */ mtc1 $at, $f12 ## $f12 = 4.00 /* 002EC 80994F3C 46100182 */ mul.s $f6, $f0, $f16 /* 002F0 80994F40 46043200 */ add.s $f8, $f6, $f4 -/* 002F4 80994F44 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 002F4 80994F44 0C00CFBE */ jal Rand_ZeroFloat /* 002F8 80994F48 E6480064 */ swc1 $f8, 0x0064($s2) ## 00000064 /* 002FC 80994F4C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 @@ -234,21 +234,21 @@ glabel L80994E88 /* 00304 80994F54 3C014580 */ lui $at, 0x4580 ## $at = 45800000 /* 00308 80994F58 44816000 */ mtc1 $at, $f12 ## $f12 = 4096.00 /* 0030C 80994F5C 460A0480 */ add.s $f18, $f0, $f10 -/* 00310 80994F60 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00310 80994F60 0C00CFC8 */ jal Rand_CenteredFloat /* 00314 80994F64 E6520060 */ swc1 $f18, 0x0060($s2) ## 00000060 /* 00318 80994F68 4600040D */ trunc.w.s $f16, $f0 /* 0031C 80994F6C 3C014580 */ lui $at, 0x4580 ## $at = 45800000 /* 00320 80994F70 44816000 */ mtc1 $at, $f12 ## $f12 = 4096.00 /* 00324 80994F74 440B8000 */ mfc1 $t3, $f16 -/* 00328 80994F78 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00328 80994F78 0C00CFC8 */ jal Rand_CenteredFloat /* 0032C 80994F7C A64B0030 */ sh $t3, 0x0030($s2) ## 00000030 /* 00330 80994F80 4600018D */ trunc.w.s $f6, $f0 /* 00334 80994F84 3C014580 */ lui $at, 0x4580 ## $at = 45800000 /* 00338 80994F88 44816000 */ mtc1 $at, $f12 ## $f12 = 4096.00 /* 0033C 80994F8C 440D3000 */ mfc1 $t5, $f6 -/* 00340 80994F90 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00340 80994F90 0C00CFC8 */ jal Rand_CenteredFloat /* 00344 80994F94 A64D0032 */ sh $t5, 0x0032($s2) ## 00000032 /* 00348 80994F98 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995368.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995368.s index e711fd90c2..e696a94dc4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995368.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995368.s @@ -78,7 +78,7 @@ glabel func_80995368 /* 00828 80995478 00402025 */ or $a0, $v0, $zero ## $a0 = 00000012 /* 0082C 8099547C 00042740 */ sll $a0, $a0, 29 /* 00830 80995480 00042403 */ sra $a0, $a0, 16 -/* 00834 80995484 0C01DE1C */ jal Math_Sins +/* 00834 80995484 0C01DE1C */ jal Math_SinS ## sins? /* 00838 80995488 AFA60018 */ sw $a2, 0x0018($sp) /* 0083C 8099548C 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995518.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995518.s index 51e3137cee..e3ae17ecd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995518.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995518.s @@ -121,20 +121,20 @@ glabel func_80995518 .L809956B8: /* 00A68 809956B8 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00A6C 809956BC 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 -/* 00A70 809956C0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00A70 809956C0 0C00CFC8 */ jal Rand_CenteredFloat /* 00A74 809956C4 E7A40070 */ swc1 $f4, 0x0070($sp) /* 00A78 809956C8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00A7C 809956CC 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 00A80 809956D0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00A80 809956D0 0C00CFBE */ jal Rand_ZeroFloat /* 00A84 809956D4 46000586 */ mov.s $f22, $f0 /* 00A88 809956D8 E7A00074 */ swc1 $f0, 0x0074($sp) -/* 00A8C 809956DC 0C01DE0D */ jal Math_Coss +/* 00A8C 809956DC 0C01DE0D */ jal Math_CosS ## coss? /* 00A90 809956E0 86240032 */ lh $a0, 0x0032($s1) ## 00000032 /* 00A94 809956E4 46000506 */ mov.s $f20, $f0 -/* 00A98 809956E8 0C01DE1C */ jal Math_Sins +/* 00A98 809956E8 0C01DE1C */ jal Math_SinS ## sins? /* 00A9C 809956EC 86240032 */ lh $a0, 0x0032($s1) ## 00000032 /* 00AA0 809956F0 C7A60074 */ lwc1 $f6, 0x0074($sp) @@ -143,11 +143,11 @@ glabel func_80995518 /* 00AAC 809956FC 4616A282 */ mul.s $f10, $f20, $f22 /* 00AB0 80995700 460A4400 */ add.s $f16, $f8, $f10 /* 00AB4 80995704 E7B0006C */ swc1 $f16, 0x006C($sp) -/* 00AB8 80995708 0C01DE1C */ jal Math_Sins +/* 00AB8 80995708 0C01DE1C */ jal Math_SinS ## sins? /* 00ABC 8099570C 86240032 */ lh $a0, 0x0032($s1) ## 00000032 /* 00AC0 80995710 46000506 */ mov.s $f20, $f0 -/* 00AC4 80995714 0C01DE0D */ jal Math_Coss +/* 00AC4 80995714 0C01DE0D */ jal Math_CosS ## coss? /* 00AC8 80995718 86240032 */ lh $a0, 0x0032($s1) ## 00000032 /* 00ACC 8099571C C7B20074 */ lwc1 $f18, 0x0074($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_809958E4.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_809958E4.s index 0daefbfe35..1bd5092c46 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_809958E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_809958E4.s @@ -36,7 +36,7 @@ glabel func_809958E4 /* 00D08 80995958 9604021A */ lhu $a0, 0x021A($s0) ## 0000021A /* 00D0C 8099595C 00042340 */ sll $a0, $a0, 13 /* 00D10 80995960 00042400 */ sll $a0, $a0, 16 -/* 00D14 80995964 0C01DE1C */ jal Math_Sins +/* 00D14 80995964 0C01DE1C */ jal Math_SinS ## sins? /* 00D18 80995968 00042403 */ sra $a0, $a0, 16 /* 00D1C 8099596C 9609021A */ lhu $t1, 0x021A($s0) ## 0000021A @@ -68,7 +68,7 @@ glabel func_809958E4 /* 00D7C 809959CC 9604021A */ lhu $a0, 0x021A($s0) ## 0000021A /* 00D80 809959D0 00042300 */ sll $a0, $a0, 12 /* 00D84 809959D4 00042400 */ sll $a0, $a0, 16 -/* 00D88 809959D8 0C01DE0D */ jal Math_Coss +/* 00D88 809959D8 0C01DE0D */ jal Math_CosS ## coss? /* 00D8C 809959DC 00042403 */ sra $a0, $a0, 16 /* 00D90 809959E0 3C01447A */ lui $at, 0x447A ## $at = 447A0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999214.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999214.s index bb3529fd8b..948b44f1fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999214.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999214.s @@ -17,7 +17,7 @@ glabel func_80999214 /* 00ABC 8099923C 248401A8 */ addiu $a0, $a0, 0x01A8 ## $a0 = 000001A8 /* 00AC0 80999240 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 00AC4 80999244 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 00AC8 80999248 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00AC8 80999248 0C01E0C4 */ jal Math_SmoothStepToF /* 00ACC 8099924C E7A40010 */ swc1 $f4, 0x0010($sp) /* 00AD0 80999250 962E0192 */ lhu $t6, 0x0192($s1) ## 00000192 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999348.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999348.s index 32d0ad69ef..4840ab76d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999348.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999348.s @@ -21,7 +21,7 @@ glabel func_80999348 /* 00C00 80999380 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00C04 80999384 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 00C08 80999388 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 00C0C 8099938C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00C0C 8099938C 0C01E0C4 */ jal Math_SmoothStepToF /* 00C10 80999390 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00C14 80999394 3C014316 */ lui $at, 0x4316 ## $at = 43160000 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999428.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999428.s index af4d9703c4..98b49fee6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999428.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999428.s @@ -31,7 +31,7 @@ glabel func_80999428 /* 00CE4 80999464 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 00CE8 80999468 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 /* 00CEC 8099946C 34A563F1 */ ori $a1, $a1, 0x63F1 ## $a1 = 3D4C63F1 -/* 00CF0 80999470 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00CF0 80999470 0C01E0C4 */ jal Math_SmoothStepToF /* 00CF4 80999474 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00CF8 80999478 3C01809A */ lui $at, %hi(D_8099C74C) ## $at = 809A0000 @@ -43,7 +43,7 @@ glabel func_80999428 /* 00D10 80999490 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 00D14 80999494 34A5B22D */ ori $a1, $a1, 0xB22D ## $a1 = 3D9DB22D /* 00D18 80999498 26040054 */ addiu $a0, $s0, 0x0054 ## $a0 = 00000054 -/* 00D1C 8099949C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00D1C 8099949C 0C01E0C4 */ jal Math_SmoothStepToF /* 00D20 809994A0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00D24 809994A4 3C01809A */ lui $at, %hi(D_8099C750) ## $at = 809A0000 @@ -55,7 +55,7 @@ glabel func_80999428 /* 00D3C 809994BC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 00D40 809994C0 34A551EC */ ori $a1, $a1, 0x51EC ## $a1 = 3DB851EC /* 00D44 809994C4 26040058 */ addiu $a0, $s0, 0x0058 ## $a0 = 00000058 -/* 00D48 809994C8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00D48 809994C8 0C01E0C4 */ jal Math_SmoothStepToF /* 00D4C 809994CC E7A80010 */ swc1 $f8, 0x0010($sp) /* 00D50 809994D0 3C01809A */ lui $at, %hi(D_8099C754) ## $at = 809A0000 @@ -65,7 +65,7 @@ glabel func_80999428 /* 00D60 809994E0 260401A8 */ addiu $a0, $s0, 0x01A8 ## $a0 = 000001A8 /* 00D64 809994E4 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 00D68 809994E8 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 00D6C 809994EC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00D6C 809994EC 0C01E0C4 */ jal Math_SmoothStepToF /* 00D70 809994F0 E7AA0010 */ swc1 $f10, 0x0010($sp) .L809994F4: diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999724.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999724.s index 4a9cd85542..9d310c8e1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999724.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999724.s @@ -22,7 +22,7 @@ glabel func_80999724 /* 00FD0 80999750 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 00FD4 80999754 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 00FD8 80999758 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 00FDC 8099975C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00FDC 8099975C 0C01E0C4 */ jal Math_SmoothStepToF /* 00FE0 80999760 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00FE4 80999764 3C01809A */ lui $at, %hi(D_8099C798) ## $at = 809A0000 @@ -32,7 +32,7 @@ glabel func_80999724 /* 00FF4 80999774 260401A4 */ addiu $a0, $s0, 0x01A4 ## $a0 = 000001A4 /* 00FF8 80999778 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 00FFC 8099977C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 01000 80999780 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01000 80999780 0C01E0C4 */ jal Math_SmoothStepToF /* 01004 80999784 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01008 80999788 8602001C */ lh $v0, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809998A4.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809998A4.s index 995d4087e7..e3d0976d06 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809998A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_809998A4.s @@ -30,7 +30,7 @@ glabel func_809998A4 /* 0116C 809998EC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 01170 809998F0 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 01174 809998F4 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01178 809998F8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01178 809998F8 0C01E0C4 */ jal Math_SmoothStepToF /* 0117C 809998FC 248401A0 */ addiu $a0, $a0, 0x01A0 ## $a0 = 000001A0 /* 01180 80999900 3C01809A */ lui $at, %hi(D_8099C7A0) ## $at = 809A0000 @@ -41,7 +41,7 @@ glabel func_809998A4 /* 01194 80999914 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 01198 80999918 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 0119C 8099991C E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 011A0 80999920 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 011A0 80999920 0C01E0C4 */ jal Math_SmoothStepToF /* 011A4 80999924 248401A4 */ addiu $a0, $a0, 0x01A4 ## $a0 = 000001A4 /* 011A8 80999928 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999A68.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999A68.s index 7e66188ca3..b56ef5a0f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999A68.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999A68.s @@ -58,7 +58,7 @@ glabel func_80999A68 /* 01364 80999AE4 262401A0 */ addiu $a0, $s1, 0x01A0 ## $a0 = 000001A0 /* 01368 80999AE8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0136C 80999AEC 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 01370 80999AF0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01370 80999AF0 0C01E0C4 */ jal Math_SmoothStepToF /* 01374 80999AF4 E7B00010 */ swc1 $f16, 0x0010($sp) /* 01378 80999AF8 962F0192 */ lhu $t7, 0x0192($s1) ## 00000192 @@ -175,13 +175,13 @@ glabel func_80999A68 .L80999C80: /* 01500 80999C80 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3C23D70A /* 01504 80999C84 26240194 */ addiu $a0, $s1, 0x0194 ## $a0 = 00000194 -/* 01508 80999C88 0C01DE80 */ jal Math_ApproxF +/* 01508 80999C88 0C01DE80 */ jal Math_StepToF /* 0150C 80999C8C 3C054000 */ lui $a1, 0x4000 ## $a1 = 40000000 /* 01510 80999C90 3C063CA3 */ lui $a2, 0x3CA3 ## $a2 = 3CA30000 /* 01514 80999C94 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3CA3D70A /* 01518 80999C98 26240198 */ addiu $a0, $s1, 0x0198 ## $a0 = 00000198 -/* 0151C 80999C9C 0C01DE80 */ jal Math_ApproxF +/* 0151C 80999C9C 0C01DE80 */ jal Math_StepToF /* 01520 80999CA0 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 01524 80999CA4 C6520024 */ lwc1 $f18, 0x0024($s2) ## 00000024 @@ -290,7 +290,7 @@ glabel func_80999A68 /* 016B8 80999E38 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 016BC 80999E3C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 016C0 80999E40 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 -/* 016C4 80999E44 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 016C4 80999E44 0C01E0C4 */ jal Math_SmoothStepToF /* 016C8 80999E48 E7B20010 */ swc1 $f18, 0x0010($sp) /* 016CC 80999E4C 8FBF0034 */ lw $ra, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A098.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A098.s index 0b6c2b19cc..0a3a1b647a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A098.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A098.s @@ -47,7 +47,7 @@ glabel func_8099A098 /* 01994 8099A114 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 01998 8099A118 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0199C 8099A11C 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 019A0 8099A120 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 019A0 8099A120 0C01E0C4 */ jal Math_SmoothStepToF /* 019A4 8099A124 E7B00010 */ swc1 $f16, 0x0010($sp) /* 019A8 8099A128 960F0192 */ lhu $t7, 0x0192($s0) ## 00000192 @@ -91,13 +91,13 @@ glabel func_8099A098 .L8099A1C0: /* 01A40 8099A1C0 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3C23D70A /* 01A44 8099A1C4 26040194 */ addiu $a0, $s0, 0x0194 ## $a0 = 00000194 -/* 01A48 8099A1C8 0C01DE80 */ jal Math_ApproxF +/* 01A48 8099A1C8 0C01DE80 */ jal Math_StepToF /* 01A4C 8099A1CC 3C054000 */ lui $a1, 0x4000 ## $a1 = 40000000 /* 01A50 8099A1D0 3C063CA3 */ lui $a2, 0x3CA3 ## $a2 = 3CA30000 /* 01A54 8099A1D4 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3CA3D70A /* 01A58 8099A1D8 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 -/* 01A5C 8099A1DC 0C01DE80 */ jal Math_ApproxF +/* 01A5C 8099A1DC 0C01DE80 */ jal Math_StepToF /* 01A60 8099A1E0 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 01A64 8099A1E4 C6320024 */ lwc1 $f18, 0x0024($s1) ## 00000024 @@ -206,7 +206,7 @@ glabel func_8099A098 /* 01BF8 8099A378 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 01BFC 8099A37C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 01C00 8099A380 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 -/* 01C04 8099A384 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01C04 8099A384 0C01E0C4 */ jal Math_SmoothStepToF /* 01C08 8099A388 E7B20010 */ swc1 $f18, 0x0010($sp) /* 01C0C 8099A38C 8FBF0034 */ lw $ra, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A3A4.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A3A4.s index f92f794710..ee03ef6c64 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A3A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A3A4.s @@ -22,7 +22,7 @@ glabel func_8099A3A4 /* 01C50 8099A3D0 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 01C54 8099A3D4 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 01C58 8099A3D8 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 -/* 01C5C 8099A3DC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01C5C 8099A3DC 0C01E0C4 */ jal Math_SmoothStepToF /* 01C60 8099A3E0 E7A40010 */ swc1 $f4, 0x0010($sp) /* 01C64 8099A3E4 3C01809A */ lui $at, %hi(D_8099C7C0) ## $at = 809A0000 @@ -32,7 +32,7 @@ glabel func_8099A3A4 /* 01C74 8099A3F4 260401A4 */ addiu $a0, $s0, 0x01A4 ## $a0 = 000001A4 /* 01C78 8099A3F8 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 01C7C 8099A3FC 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 -/* 01C80 8099A400 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01C80 8099A400 0C01E0C4 */ jal Math_SmoothStepToF /* 01C84 8099A404 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01C88 8099A408 860201AC */ lh $v0, 0x01AC($s0) ## 000001AC diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A5EC.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A5EC.s index 0af25810bd..30ac2b76f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A5EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A5EC.s @@ -105,7 +105,7 @@ glabel func_8099A5EC /* 01F6C 8099A6EC C430C7C8 */ lwc1 $f16, %lo(D_8099C7C8)($at) /* 01F70 8099A6F0 8E250024 */ lw $a1, 0x0024($s1) ## 00000024 /* 01F74 8099A6F4 AFA80034 */ sw $t0, 0x0034($sp) -/* 01F78 8099A6F8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01F78 8099A6F8 0C01E0C4 */ jal Math_SmoothStepToF /* 01F7C 8099A6FC E7B00010 */ swc1 $f16, 0x0010($sp) /* 01F80 8099A700 3C01809A */ lui $at, %hi(D_8099C7CC) ## $at = 809A0000 @@ -116,7 +116,7 @@ glabel func_8099A5EC /* 01F94 8099A714 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 01F98 8099A718 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 01F9C 8099A71C 2504002C */ addiu $a0, $t0, 0x002C ## $a0 = 0000002C -/* 01FA0 8099A720 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01FA0 8099A720 0C01E0C4 */ jal Math_SmoothStepToF /* 01FA4 8099A724 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01FA8 8099A728 8FA80034 */ lw $t0, 0x0034($sp) @@ -531,7 +531,7 @@ glabel func_8099A5EC /* 02594 8099AD14 3C054448 */ lui $a1, 0x4448 ## $a1 = 44480000 /* 02598 8099AD18 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 0259C 8099AD1C 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 -/* 025A0 8099AD20 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 025A0 8099AD20 0C01E0C4 */ jal Math_SmoothStepToF /* 025A4 8099AD24 E7A40010 */ swc1 $f4, 0x0010($sp) /* 025A8 8099AD28 862A00B6 */ lh $t2, 0x00B6($s1) ## 000000B6 @@ -546,19 +546,19 @@ glabel func_8099A5EC /* 025CC 8099AD4C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 025D0 8099AD50 34A5A3D7 */ ori $a1, $a1, 0xA3D7 ## $a1 = 3F90A3D7 /* 025D4 8099AD54 262401BC */ addiu $a0, $s1, 0x01BC ## $a0 = 000001BC -/* 025D8 8099AD58 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 025D8 8099AD58 0C01E0C4 */ jal Math_SmoothStepToF /* 025DC 8099AD5C E7A80010 */ swc1 $f8, 0x0010($sp) /* 025E0 8099AD60 3C063B44 */ lui $a2, 0x3B44 ## $a2 = 3B440000 /* 025E4 8099AD64 34C69BA6 */ ori $a2, $a2, 0x9BA6 ## $a2 = 3B449BA6 /* 025E8 8099AD68 26240194 */ addiu $a0, $s1, 0x0194 ## $a0 = 00000194 -/* 025EC 8099AD6C 0C01DE80 */ jal Math_ApproxF +/* 025EC 8099AD6C 0C01DE80 */ jal Math_StepToF /* 025F0 8099AD70 3C054000 */ lui $a1, 0x4000 ## $a1 = 40000000 /* 025F4 8099AD74 3C063BC4 */ lui $a2, 0x3BC4 ## $a2 = 3BC40000 /* 025F8 8099AD78 34C69BA6 */ ori $a2, $a2, 0x9BA6 ## $a2 = 3BC49BA6 /* 025FC 8099AD7C 26240198 */ addiu $a0, $s1, 0x0198 ## $a0 = 00000198 -/* 02600 8099AD80 0C01DE80 */ jal Math_ApproxF +/* 02600 8099AD80 0C01DE80 */ jal Math_StepToF /* 02604 8099AD84 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 02608 8099AD88 3C01809A */ lui $at, %hi(D_8099C7D8) ## $at = 809A0000 @@ -568,7 +568,7 @@ glabel func_8099A5EC /* 02618 8099AD98 262401A0 */ addiu $a0, $s1, 0x01A0 ## $a0 = 000001A0 /* 0261C 8099AD9C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02620 8099ADA0 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 02624 8099ADA4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02624 8099ADA4 0C01E0C4 */ jal Math_SmoothStepToF /* 02628 8099ADA8 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 0262C 8099ADAC 3C01809A */ lui $at, %hi(D_8099C7DC) ## $at = 809A0000 @@ -578,7 +578,7 @@ glabel func_8099A5EC /* 0263C 8099ADBC 262401A4 */ addiu $a0, $s1, 0x01A4 ## $a0 = 000001A4 /* 02640 8099ADC0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02644 8099ADC4 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 -/* 02648 8099ADC8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02648 8099ADC8 0C01E0C4 */ jal Math_SmoothStepToF /* 0264C 8099ADCC E7B00010 */ swc1 $f16, 0x0010($sp) /* 02650 8099ADD0 3C01809A */ lui $at, %hi(D_8099C7E0) ## $at = 809A0000 @@ -588,7 +588,7 @@ glabel func_8099A5EC /* 02660 8099ADE0 262401A8 */ addiu $a0, $s1, 0x01A8 ## $a0 = 000001A8 /* 02664 8099ADE4 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 02668 8099ADE8 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 0266C 8099ADEC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0266C 8099ADEC 0C01E0C4 */ jal Math_SmoothStepToF /* 02670 8099ADF0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 02674 8099ADF4 3C02809A */ lui $v0, %hi(D_8099CCA0) ## $v0 = 809A0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B020.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B020.s index 9d067b9d72..39ad5f8e82 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B020.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B020.s @@ -19,7 +19,7 @@ glabel func_8099B020 /* 028C4 8099B044 3C054300 */ lui $a1, 0x4300 ## $a1 = 43000000 /* 028C8 8099B048 248401A0 */ addiu $a0, $a0, 0x01A0 ## $a0 = 000001A0 /* 028CC 8099B04C 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 -/* 028D0 8099B050 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 028D0 8099B050 0C01E0C4 */ jal Math_SmoothStepToF /* 028D4 8099B054 E7A40010 */ swc1 $f4, 0x0010($sp) /* 028D8 8099B058 3C01809A */ lui $at, %hi(D_8099C7E8) ## $at = 809A0000 @@ -29,7 +29,7 @@ glabel func_8099B020 /* 028E8 8099B068 260401A4 */ addiu $a0, $s0, 0x01A4 ## $a0 = 000001A4 /* 028EC 8099B06C 3C054300 */ lui $a1, 0x4300 ## $a1 = 43000000 /* 028F0 8099B070 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 -/* 028F4 8099B074 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 028F4 8099B074 0C01E0C4 */ jal Math_SmoothStepToF /* 028F8 8099B078 E7A60010 */ swc1 $f6, 0x0010($sp) /* 028FC 8099B07C 3C014300 */ lui $at, 0x4300 ## $at = 43000000 @@ -41,13 +41,13 @@ glabel func_8099B020 /* 02914 8099B094 3C063C23 */ lui $a2, 0x3C23 ## $a2 = 3C230000 /* 02918 8099B098 45020009 */ bc1fl .L8099B0C0 /* 0291C 8099B09C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02920 8099B0A0 0C01DE80 */ jal Math_ApproxF +/* 02920 8099B0A0 0C01DE80 */ jal Math_StepToF /* 02924 8099B0A4 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3C23D70A /* 02928 8099B0A8 3C063CA3 */ lui $a2, 0x3CA3 ## $a2 = 3CA30000 /* 0292C 8099B0AC 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3CA3D70A /* 02930 8099B0B0 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 -/* 02934 8099B0B4 0C01DE80 */ jal Math_ApproxF +/* 02934 8099B0B4 0C01DE80 */ jal Math_StepToF /* 02938 8099B0B8 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 0293C 8099B0BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B33C.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B33C.s index 9215632c0c..d84ef68335 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B33C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B33C.s @@ -21,7 +21,7 @@ glabel func_8099B33C /* 02BE0 8099B360 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 02BE4 8099B364 00002012 */ mflo $a0 /* 02BE8 8099B368 00042400 */ sll $a0, $a0, 16 -/* 02BEC 8099B36C 0C01DE1C */ jal Math_Sins +/* 02BEC 8099B36C 0C01DE1C */ jal Math_SinS ## sins? /* 02BF0 8099B370 00042403 */ sra $a0, $a0, 16 /* 02BF4 8099B374 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 @@ -36,7 +36,7 @@ glabel func_8099B33C /* 02C18 8099B398 01F00019 */ multu $t7, $s0 /* 02C1C 8099B39C 00002012 */ mflo $a0 /* 02C20 8099B3A0 00042400 */ sll $a0, $a0, 16 -/* 02C24 8099B3A4 0C01DE0D */ jal Math_Coss +/* 02C24 8099B3A4 0C01DE0D */ jal Math_CosS ## coss? /* 02C28 8099B3A8 00042403 */ sra $a0, $a0, 16 /* 02C2C 8099B3AC 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 @@ -51,7 +51,7 @@ glabel func_8099B33C /* 02C50 8099B3D0 03100019 */ multu $t8, $s0 /* 02C54 8099B3D4 00002012 */ mflo $a0 /* 02C58 8099B3D8 00042400 */ sll $a0, $a0, 16 -/* 02C5C 8099B3DC 0C01DE0D */ jal Math_Coss +/* 02C5C 8099B3DC 0C01DE0D */ jal Math_CosS ## coss? /* 02C60 8099B3E0 00042403 */ sra $a0, $a0, 16 /* 02C64 8099B3E4 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 diff --git a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099CD2C.s b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099CD2C.s index d1a6b747a4..3136f8e2df 100644 --- a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099CD2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099CD2C.s @@ -119,27 +119,27 @@ glabel func_8099CD2C /* 00210 8099CEC0 4481A000 */ mtc1 $at, $f20 ## $f20 = 100.00 /* 00214 8099CEC4 26320158 */ addiu $s2, $s1, 0x0158 ## $s2 = 00000158 .L8099CEC8: -/* 00218 8099CEC8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00218 8099CEC8 0C00CFC8 */ jal Rand_CenteredFloat /* 0021C 8099CECC 4600A306 */ mov.s $f12, $f20 /* 00220 8099CED0 C62A0024 */ lwc1 $f10, 0x0024($s1) ## 00000024 /* 00224 8099CED4 4600A306 */ mov.s $f12, $f20 /* 00228 8099CED8 460A0400 */ add.s $f16, $f0, $f10 -/* 0022C 8099CEDC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0022C 8099CEDC 0C00CFC8 */ jal Rand_CenteredFloat /* 00230 8099CEE0 E7B00074 */ swc1 $f16, 0x0074($sp) /* 00234 8099CEE4 C632002C */ lwc1 $f18, 0x002C($s1) ## 0000002C /* 00238 8099CEE8 4600A306 */ mov.s $f12, $f20 /* 0023C 8099CEEC 46120100 */ add.s $f4, $f0, $f18 -/* 00240 8099CEF0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00240 8099CEF0 0C00CFC8 */ jal Rand_CenteredFloat /* 00244 8099CEF4 E7A4007C */ swc1 $f4, 0x007C($sp) /* 00248 8099CEF8 E7A00068 */ swc1 $f0, 0x0068($sp) -/* 0024C 8099CEFC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0024C 8099CEFC 0C00CFBE */ jal Rand_ZeroFloat /* 00250 8099CF00 4600A306 */ mov.s $f12, $f20 /* 00254 8099CF04 E7A0006C */ swc1 $f0, 0x006C($sp) -/* 00258 8099CF08 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00258 8099CF08 0C00CFC8 */ jal Rand_CenteredFloat /* 0025C 8099CF0C 4600A306 */ mov.s $f12, $f20 /* 00260 8099CF10 E7A00070 */ swc1 $f0, 0x0070($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D650.s b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D650.s index 07d9e1a261..fe8a621ae9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D650.s +++ b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D650.s @@ -37,7 +37,7 @@ glabel func_8099D650 /* 00A28 8099D6D8 A48C002A */ sh $t4, 0x002A($a0) ## 0000002A /* 00A2C 8099D6DC 46062203 */ div.s $f8, $f4, $f6 /* 00A30 8099D6E0 E4880030 */ swc1 $f8, 0x0030($a0) ## 00000030 -/* 00A34 8099D6E4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00A34 8099D6E4 0C00CFBE */ jal Rand_ZeroFloat /* 00A38 8099D6E8 AFA40018 */ sw $a0, 0x0018($sp) /* 00A3C 8099D6EC 4600028D */ trunc.w.s $f10, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DB28.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DB28.s index 64ec51fd2a..6c57650c7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DB28.s +++ b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DB28.s @@ -89,7 +89,7 @@ glabel func_8099DB28 /* 00388 8099DC58 00000000 */ nop /* 0038C 8099DC5C 45020031 */ bc1fl .L8099DD24 /* 00390 8099DC60 26B50001 */ addiu $s5, $s5, 0x0001 ## $s5 = 00000001 -/* 00394 8099DC64 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00394 8099DC64 0C00CFC8 */ jal Rand_CenteredFloat /* 00398 8099DC68 4600D306 */ mov.s $f12, $f26 /* 0039C 8099DC6C 4600048D */ trunc.w.s $f18, $f0 @@ -97,7 +97,7 @@ glabel func_8099DB28 /* 003A4 8099DC74 44129000 */ mfc1 $s2, $f18 /* 003A8 8099DC78 00000000 */ nop /* 003AC 8099DC7C 00129400 */ sll $s2, $s2, 16 -/* 003B0 8099DC80 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 003B0 8099DC80 0C00CFC8 */ jal Rand_CenteredFloat /* 003B4 8099DC84 00129403 */ sra $s2, $s2, 16 /* 003B8 8099DC88 4600010D */ trunc.w.s $f4, $f0 @@ -106,12 +106,12 @@ glabel func_8099DB28 /* 003C4 8099DC94 44102000 */ mfc1 $s0, $f4 /* 003C8 8099DC98 00000000 */ nop /* 003CC 8099DC9C 00108400 */ sll $s0, $s0, 16 -/* 003D0 8099DCA0 0C01DE0D */ jal Math_Coss +/* 003D0 8099DCA0 0C01DE0D */ jal Math_CosS ## coss? /* 003D4 8099DCA4 00108403 */ sra $s0, $s0, 16 /* 003D8 8099DCA8 00102400 */ sll $a0, $s0, 16 /* 003DC 8099DCAC 00042403 */ sra $a0, $a0, 16 -/* 003E0 8099DCB0 0C01DE0D */ jal Math_Coss +/* 003E0 8099DCB0 0C01DE0D */ jal Math_CosS ## coss? /* 003E4 8099DCB4 46000506 */ mov.s $f20, $f0 /* 003E8 8099DCB8 4614C182 */ mul.s $f6, $f24, $f20 @@ -121,18 +121,18 @@ glabel func_8099DB28 /* 003F8 8099DCC8 46060202 */ mul.s $f8, $f0, $f6 /* 003FC 8099DCCC 0000C812 */ mflo $t9 /* 00400 8099DCD0 02D98821 */ addu $s1, $s6, $t9 -/* 00404 8099DCD4 0C01DE1C */ jal Math_Sins +/* 00404 8099DCD4 0C01DE1C */ jal Math_SinS ## sins? /* 00408 8099DCD8 E628024C */ swc1 $f8, 0x024C($s1) ## 0000024C /* 0040C 8099DCDC 46180282 */ mul.s $f10, $f0, $f24 /* 00410 8099DCE0 00122400 */ sll $a0, $s2, 16 /* 00414 8099DCE4 00042403 */ sra $a0, $a0, 16 -/* 00418 8099DCE8 0C01DE1C */ jal Math_Sins +/* 00418 8099DCE8 0C01DE1C */ jal Math_SinS ## sins? /* 0041C 8099DCEC E62A0250 */ swc1 $f10, 0x0250($s1) ## 00000250 /* 00420 8099DCF0 00102400 */ sll $a0, $s0, 16 /* 00424 8099DCF4 00042403 */ sra $a0, $a0, 16 -/* 00428 8099DCF8 0C01DE0D */ jal Math_Coss +/* 00428 8099DCF8 0C01DE0D */ jal Math_CosS ## coss? /* 0042C 8099DCFC 46000506 */ mov.s $f20, $f0 /* 00430 8099DD00 4614C402 */ mul.s $f16, $f24, $f20 diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DD74.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DD74.s index 3729343991..6f3c772649 100644 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DD74.s +++ b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DD74.s @@ -89,7 +89,7 @@ glabel func_8099DD74 /* 005D4 8099DEA4 00000000 */ nop /* 005D8 8099DEA8 45020031 */ bc1fl .L8099DF70 /* 005DC 8099DEAC 26B50001 */ addiu $s5, $s5, 0x0001 ## $s5 = 00000001 -/* 005E0 8099DEB0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 005E0 8099DEB0 0C00CFC8 */ jal Rand_CenteredFloat /* 005E4 8099DEB4 4600D306 */ mov.s $f12, $f26 /* 005E8 8099DEB8 4600048D */ trunc.w.s $f18, $f0 @@ -97,7 +97,7 @@ glabel func_8099DD74 /* 005F0 8099DEC0 44129000 */ mfc1 $s2, $f18 /* 005F4 8099DEC4 00000000 */ nop /* 005F8 8099DEC8 00129400 */ sll $s2, $s2, 16 -/* 005FC 8099DECC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 005FC 8099DECC 0C00CFBE */ jal Rand_ZeroFloat /* 00600 8099DED0 00129403 */ sra $s2, $s2, 16 /* 00604 8099DED4 4600010D */ trunc.w.s $f4, $f0 @@ -106,12 +106,12 @@ glabel func_8099DD74 /* 00610 8099DEE0 44102000 */ mfc1 $s0, $f4 /* 00614 8099DEE4 00000000 */ nop /* 00618 8099DEE8 00108400 */ sll $s0, $s0, 16 -/* 0061C 8099DEEC 0C01DE0D */ jal Math_Coss +/* 0061C 8099DEEC 0C01DE0D */ jal Math_CosS ## coss? /* 00620 8099DEF0 00108403 */ sra $s0, $s0, 16 /* 00624 8099DEF4 00102400 */ sll $a0, $s0, 16 /* 00628 8099DEF8 00042403 */ sra $a0, $a0, 16 -/* 0062C 8099DEFC 0C01DE0D */ jal Math_Coss +/* 0062C 8099DEFC 0C01DE0D */ jal Math_CosS ## coss? /* 00630 8099DF00 46000506 */ mov.s $f20, $f0 /* 00634 8099DF04 4614C182 */ mul.s $f6, $f24, $f20 @@ -121,18 +121,18 @@ glabel func_8099DD74 /* 00644 8099DF14 46060202 */ mul.s $f8, $f0, $f6 /* 00648 8099DF18 0000C812 */ mflo $t9 /* 0064C 8099DF1C 02D98821 */ addu $s1, $s6, $t9 -/* 00650 8099DF20 0C01DE1C */ jal Math_Sins +/* 00650 8099DF20 0C01DE1C */ jal Math_SinS ## sins? /* 00654 8099DF24 E628024C */ swc1 $f8, 0x024C($s1) ## 0000024C /* 00658 8099DF28 46180282 */ mul.s $f10, $f0, $f24 /* 0065C 8099DF2C 00122400 */ sll $a0, $s2, 16 /* 00660 8099DF30 00042403 */ sra $a0, $a0, 16 -/* 00664 8099DF34 0C01DE1C */ jal Math_Sins +/* 00664 8099DF34 0C01DE1C */ jal Math_SinS ## sins? /* 00668 8099DF38 E62A0250 */ swc1 $f10, 0x0250($s1) ## 00000250 /* 0066C 8099DF3C 00102400 */ sll $a0, $s0, 16 /* 00670 8099DF40 00042403 */ sra $a0, $a0, 16 -/* 00674 8099DF44 0C01DE0D */ jal Math_Coss +/* 00674 8099DF44 0C01DE0D */ jal Math_CosS ## coss? /* 00678 8099DF48 46000506 */ mov.s $f20, $f0 /* 0067C 8099DF4C 4614C402 */ mul.s $f16, $f24, $f20 diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DFC0.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DFC0.s index 72c7e3d257..160758606d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DFC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DFC0.s @@ -182,7 +182,7 @@ glabel func_8099DFC0 /* 0091C 8099E1EC 450200A6 */ bc1fl .L8099E488 /* 00920 8099E1F0 26D60001 */ addiu $s6, $s6, 0x0001 ## $s6 = 00000001 /* 00924 8099E1F4 44816000 */ mtc1 $at, $f12 ## $f12 = 65536.00 -/* 00928 8099E1F8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00928 8099E1F8 0C00CFC8 */ jal Rand_CenteredFloat /* 0092C 8099E1FC 00000000 */ nop /* 00930 8099E200 4600028D */ trunc.w.s $f10, $f0 @@ -201,7 +201,7 @@ glabel func_8099DFC0 /* 00964 8099E234 1000008E */ beq $zero, $zero, .L8099E470 /* 00968 8099E238 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 .L8099E23C: -/* 0096C 8099E23C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0096C 8099E23C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00970 8099E240 00000000 */ nop /* 00974 8099E244 3C01809A */ lui $at, %hi(D_8099EC14) ## $at = 809A0000 @@ -218,23 +218,23 @@ glabel func_8099DFC0 /* 009A0 8099E270 E602024C */ swc1 $f2, 0x024C($s0) ## 0000024C /* 009A4 8099E274 45000015 */ bc1f .L8099E2CC /* 009A8 8099E278 00000000 */ nop -/* 009AC 8099E27C 0C03F66B */ jal Math_Rand_ZeroOne +/* 009AC 8099E27C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 009B0 8099E280 00000000 */ nop /* 009B4 8099E284 00112400 */ sll $a0, $s1, 16 /* 009B8 8099E288 00042403 */ sra $a0, $a0, 16 -/* 009BC 8099E28C 0C01DE1C */ jal Math_Sins +/* 009BC 8099E28C 0C01DE1C */ jal Math_SinS ## sins? /* 009C0 8099E290 46000506 */ mov.s $f20, $f0 /* 009C4 8099E294 4614D182 */ mul.s $f6, $f26, $f20 /* 009C8 8099E298 00000000 */ nop /* 009CC 8099E29C 46060202 */ mul.s $f8, $f0, $f6 -/* 009D0 8099E2A0 0C03F66B */ jal Math_Rand_ZeroOne +/* 009D0 8099E2A0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 009D4 8099E2A4 E6080250 */ swc1 $f8, 0x0250($s0) ## 00000250 /* 009D8 8099E2A8 00112400 */ sll $a0, $s1, 16 /* 009DC 8099E2AC 00042403 */ sra $a0, $a0, 16 -/* 009E0 8099E2B0 0C01DE0D */ jal Math_Coss +/* 009E0 8099E2B0 0C01DE0D */ jal Math_CosS ## coss? /* 009E4 8099E2B4 46000506 */ mov.s $f20, $f0 /* 009E8 8099E2B8 4614D282 */ mul.s $f10, $f26, $f20 @@ -243,20 +243,20 @@ glabel func_8099DFC0 /* 009F4 8099E2C4 10000069 */ beq $zero, $zero, .L8099E46C /* 009F8 8099E2C8 E6100254 */ swc1 $f16, 0x0254($s0) ## 00000254 .L8099E2CC: -/* 009FC 8099E2CC 0C01DE1C */ jal Math_Sins +/* 009FC 8099E2CC 0C01DE1C */ jal Math_SinS ## sins? /* 00A00 8099E2D0 00042403 */ sra $a0, $a0, 16 /* 00A04 8099E2D4 461A0482 */ mul.s $f18, $f0, $f26 /* 00A08 8099E2D8 00112400 */ sll $a0, $s1, 16 /* 00A0C 8099E2DC 00042403 */ sra $a0, $a0, 16 -/* 00A10 8099E2E0 0C01DE0D */ jal Math_Coss +/* 00A10 8099E2E0 0C01DE0D */ jal Math_CosS ## coss? /* 00A14 8099E2E4 E6120250 */ swc1 $f18, 0x0250($s0) ## 00000250 /* 00A18 8099E2E8 461A0102 */ mul.s $f4, $f0, $f26 /* 00A1C 8099E2EC 1000005F */ beq $zero, $zero, .L8099E46C /* 00A20 8099E2F0 E6040254 */ swc1 $f4, 0x0254($s0) ## 00000254 .L8099E2F4: -/* 00A24 8099E2F4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00A24 8099E2F4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A28 8099E2F8 00000000 */ nop /* 00A2C 8099E2FC 3C01809A */ lui $at, %hi(D_8099EC18) ## $at = 809A0000 @@ -273,23 +273,23 @@ glabel func_8099DFC0 /* 00A58 8099E328 E602024C */ swc1 $f2, 0x024C($s0) ## 0000024C /* 00A5C 8099E32C 45000015 */ bc1f .L8099E384 /* 00A60 8099E330 00000000 */ nop -/* 00A64 8099E334 0C03F66B */ jal Math_Rand_ZeroOne +/* 00A64 8099E334 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A68 8099E338 00000000 */ nop /* 00A6C 8099E33C 00112400 */ sll $a0, $s1, 16 /* 00A70 8099E340 00042403 */ sra $a0, $a0, 16 -/* 00A74 8099E344 0C01DE1C */ jal Math_Sins +/* 00A74 8099E344 0C01DE1C */ jal Math_SinS ## sins? /* 00A78 8099E348 46000506 */ mov.s $f20, $f0 /* 00A7C 8099E34C 4614C402 */ mul.s $f16, $f24, $f20 /* 00A80 8099E350 00000000 */ nop /* 00A84 8099E354 46100482 */ mul.s $f18, $f0, $f16 -/* 00A88 8099E358 0C03F66B */ jal Math_Rand_ZeroOne +/* 00A88 8099E358 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A8C 8099E35C E6120250 */ swc1 $f18, 0x0250($s0) ## 00000250 /* 00A90 8099E360 00112400 */ sll $a0, $s1, 16 /* 00A94 8099E364 00042403 */ sra $a0, $a0, 16 -/* 00A98 8099E368 0C01DE0D */ jal Math_Coss +/* 00A98 8099E368 0C01DE0D */ jal Math_CosS ## coss? /* 00A9C 8099E36C 46000506 */ mov.s $f20, $f0 /* 00AA0 8099E370 4614C102 */ mul.s $f4, $f24, $f20 @@ -298,20 +298,20 @@ glabel func_8099DFC0 /* 00AAC 8099E37C 1000003B */ beq $zero, $zero, .L8099E46C /* 00AB0 8099E380 E6060254 */ swc1 $f6, 0x0254($s0) ## 00000254 .L8099E384: -/* 00AB4 8099E384 0C01DE1C */ jal Math_Sins +/* 00AB4 8099E384 0C01DE1C */ jal Math_SinS ## sins? /* 00AB8 8099E388 00042403 */ sra $a0, $a0, 16 /* 00ABC 8099E38C 46180202 */ mul.s $f8, $f0, $f24 /* 00AC0 8099E390 00112400 */ sll $a0, $s1, 16 /* 00AC4 8099E394 00042403 */ sra $a0, $a0, 16 -/* 00AC8 8099E398 0C01DE0D */ jal Math_Coss +/* 00AC8 8099E398 0C01DE0D */ jal Math_CosS ## coss? /* 00ACC 8099E39C E6080250 */ swc1 $f8, 0x0250($s0) ## 00000250 /* 00AD0 8099E3A0 46180282 */ mul.s $f10, $f0, $f24 /* 00AD4 8099E3A4 10000031 */ beq $zero, $zero, .L8099E46C /* 00AD8 8099E3A8 E60A0254 */ swc1 $f10, 0x0254($s0) ## 00000254 .L8099E3AC: -/* 00ADC 8099E3AC 0C03F66B */ jal Math_Rand_ZeroOne +/* 00ADC 8099E3AC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00AE0 8099E3B0 00000000 */ nop /* 00AE4 8099E3B4 3C01809A */ lui $at, %hi(D_8099EC1C) ## $at = 809A0000 @@ -331,23 +331,23 @@ glabel func_8099DFC0 /* 00B1C 8099E3EC 00000000 */ nop /* 00B20 8099E3F0 45000015 */ bc1f .L8099E448 /* 00B24 8099E3F4 00000000 */ nop -/* 00B28 8099E3F8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00B28 8099E3F8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00B2C 8099E3FC 00000000 */ nop /* 00B30 8099E400 00112400 */ sll $a0, $s1, 16 /* 00B34 8099E404 00042403 */ sra $a0, $a0, 16 -/* 00B38 8099E408 0C01DE1C */ jal Math_Sins +/* 00B38 8099E408 0C01DE1C */ jal Math_SinS ## sins? /* 00B3C 8099E40C 46000506 */ mov.s $f20, $f0 /* 00B40 8099E410 4614E202 */ mul.s $f8, $f28, $f20 /* 00B44 8099E414 00000000 */ nop /* 00B48 8099E418 46080282 */ mul.s $f10, $f0, $f8 -/* 00B4C 8099E41C 0C03F66B */ jal Math_Rand_ZeroOne +/* 00B4C 8099E41C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00B50 8099E420 E60A0250 */ swc1 $f10, 0x0250($s0) ## 00000250 /* 00B54 8099E424 00112400 */ sll $a0, $s1, 16 /* 00B58 8099E428 00042403 */ sra $a0, $a0, 16 -/* 00B5C 8099E42C 0C01DE0D */ jal Math_Coss +/* 00B5C 8099E42C 0C01DE0D */ jal Math_CosS ## coss? /* 00B60 8099E430 46000506 */ mov.s $f20, $f0 /* 00B64 8099E434 4614E402 */ mul.s $f16, $f28, $f20 @@ -356,13 +356,13 @@ glabel func_8099DFC0 /* 00B70 8099E440 1000000A */ beq $zero, $zero, .L8099E46C /* 00B74 8099E444 E6120254 */ swc1 $f18, 0x0254($s0) ## 00000254 .L8099E448: -/* 00B78 8099E448 0C01DE1C */ jal Math_Sins +/* 00B78 8099E448 0C01DE1C */ jal Math_SinS ## sins? /* 00B7C 8099E44C 00042403 */ sra $a0, $a0, 16 /* 00B80 8099E450 461C0102 */ mul.s $f4, $f0, $f28 /* 00B84 8099E454 00112400 */ sll $a0, $s1, 16 /* 00B88 8099E458 00042403 */ sra $a0, $a0, 16 -/* 00B8C 8099E45C 0C01DE0D */ jal Math_Coss +/* 00B8C 8099E45C 0C01DE0D */ jal Math_CosS ## coss? /* 00B90 8099E460 E6040250 */ swc1 $f4, 0x0250($s0) ## 00000250 /* 00B94 8099E464 461C0182 */ mul.s $f6, $f0, $f28 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Update.s index cb05242bc5..59e320b6ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Update.s @@ -100,7 +100,7 @@ glabel EnAm_Update /* 01C2C 809AFB4C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01C30 809AFB50 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 01C34 809AFB54 46128100 */ add.s $f4, $f16, $f18 -/* 01C38 809AFB58 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01C38 809AFB58 0C00CFC8 */ jal Rand_CenteredFloat /* 01C3C 809AFB5C E7A40070 */ swc1 $f4, 0x0070($sp) /* 01C40 809AFB60 3C014220 */ lui $at, 0x4220 ## $at = 42200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809ADF28.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809ADF28.s index cc28d1ce2f..572a9a305c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809ADF28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809ADF28.s @@ -17,13 +17,13 @@ glabel func_809ADF28 /* 00044 809ADF64 94990088 */ lhu $t9, 0x0088($a0) ## 00000088 /* 00048 809ADF68 AFA2002C */ sw $v0, 0x002C($sp) /* 0004C 809ADF6C 87A40056 */ lh $a0, 0x0056($sp) -/* 00050 809ADF70 0C01DE1C */ jal Math_Sins +/* 00050 809ADF70 0C01DE1C */ jal Math_SinS ## sins? /* 00054 809ADF74 A7B90044 */ sh $t9, 0x0044($sp) /* 00058 809ADF78 C7A40050 */ lwc1 $f4, 0x0050($sp) /* 0005C 809ADF7C 87A40056 */ lh $a0, 0x0056($sp) /* 00060 809ADF80 46040182 */ mul.s $f6, $f0, $f4 -/* 00064 809ADF84 0C01DE0D */ jal Math_Coss +/* 00064 809ADF84 0C01DE0D */ jal Math_CosS ## coss? /* 00068 809ADF88 E7A60040 */ swc1 $f6, 0x0040($sp) /* 0006C 809ADF8C C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE270.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE270.s index 835345bfe2..1d7f34e06d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE270.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE270.s @@ -40,14 +40,14 @@ glabel func_809AE270 /* 003E8 809AE308 27B20080 */ addiu $s2, $sp, 0x0080 ## $s2 = FFFFFFF0 /* 003EC 809AE30C AEE90000 */ sw $t1, 0x0000($s7) ## FFFFFFE8 .L809AE310: -/* 003F0 809AE310 0C03F66B */ jal Math_Rand_ZeroOne +/* 003F0 809AE310 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 003F4 809AE314 00000000 */ nop /* 003F8 809AE318 46140101 */ sub.s $f4, $f0, $f20 /* 003FC 809AE31C C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 00400 809AE320 46162182 */ mul.s $f6, $f4, $f22 /* 00404 809AE324 46083280 */ add.s $f10, $f6, $f8 -/* 00408 809AE328 0C03F66B */ jal Math_Rand_ZeroOne +/* 00408 809AE328 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0040C 809AE32C E7AA0080 */ swc1 $f10, 0x0080($sp) /* 00410 809AE330 46140401 */ sub.s $f16, $f0, $f20 @@ -55,7 +55,7 @@ glabel func_809AE270 /* 00418 809AE338 46188482 */ mul.s $f18, $f16, $f24 /* 0041C 809AE33C 461A2180 */ add.s $f6, $f4, $f26 /* 00420 809AE340 46069200 */ add.s $f8, $f18, $f6 -/* 00424 809AE344 0C03F66B */ jal Math_Rand_ZeroOne +/* 00424 809AE344 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00428 809AE348 E7A80084 */ swc1 $f8, 0x0084($sp) /* 0042C 809AE34C 46140281 */ sub.s $f10, $f0, $f20 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE8A8.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE8A8.s index 4744b00ebf..daa5b68235 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE8A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE8A8.s @@ -58,7 +58,7 @@ glabel func_809AE8A8 /* 00A54 809AE974 10000063 */ beq $zero, $zero, .L809AEB04 /* 00A58 809AE978 8FBF0024 */ lw $ra, 0x0024($sp) .L809AE97C: -/* 00A5C 809AE97C 0C03F66B */ jal Math_Rand_ZeroOne +/* 00A5C 809AE97C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A60 809AE980 00000000 */ nop /* 00A64 809AE984 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -68,13 +68,13 @@ glabel func_809AE8A8 /* 00A74 809AE994 46040181 */ sub.s $f6, $f0, $f4 /* 00A78 809AE998 46083282 */ mul.s $f10, $f6, $f8 /* 00A7C 809AE99C E7AA002C */ swc1 $f10, 0x002C($sp) -/* 00A80 809AE9A0 0C01DE0D */ jal Math_Coss +/* 00A80 809AE9A0 0C01DE0D */ jal Math_CosS ## coss? /* 00A84 809AE9A4 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00A88 809AE9A8 C7B0002C */ lwc1 $f16, 0x002C($sp) /* 00A8C 809AE9AC 46100482 */ mul.s $f18, $f0, $f16 /* 00A90 809AE9B0 E7B20034 */ swc1 $f18, 0x0034($sp) -/* 00A94 809AE9B4 0C01DE1C */ jal Math_Sins +/* 00A94 809AE9B4 0C01DE1C */ jal Math_SinS ## sins? /* 00A98 809AE9B8 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00A9C 809AE9BC C6040268 */ lwc1 $f4, 0x0268($s0) ## 00000268 @@ -149,7 +149,7 @@ glabel func_809AE8A8 /* 00B98 809AEAB8 44060000 */ mfc1 $a2, $f0 /* 00B9C 809AEABC 44070000 */ mfc1 $a3, $f0 /* 00BA0 809AEAC0 44051000 */ mfc1 $a1, $f2 -/* 00BA4 809AEAC4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00BA4 809AEAC4 0C01E0C4 */ jal Math_SmoothStepToF /* 00BA8 809AEAC8 E7A20010 */ swc1 $f2, 0x0010($sp) /* 00BAC 809AEACC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEB14.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEB14.s index cf736c42d7..bf63b1d311 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEB14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEB14.s @@ -20,7 +20,7 @@ glabel func_809AEB14 /* 00C38 809AEB58 3C014130 */ lui $at, 0x4130 ## $at = 41300000 /* 00C3C 809AEB5C 45020008 */ bc1fl .L809AEB80 /* 00C40 809AEB60 44814000 */ mtc1 $at, $f8 ## $f8 = 11.00 -/* 00C44 809AEB64 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00C44 809AEB64 0C01E1A7 */ jal Math_SmoothStepToS /* 00C48 809AEB68 AFA00010 */ sw $zero, 0x0010($sp) /* 00C4C 809AEB6C 3C014140 */ lui $at, 0x4140 ## $at = 41400000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEC1C.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEC1C.s index 56f476ccb2..9f480295f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEC1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEC1C.s @@ -26,7 +26,7 @@ glabel func_809AEC1C /* 00D5C 809AEC7C 45020005 */ bc1fl .L809AEC94 /* 00D60 809AEC80 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 00D64 809AEC84 86050016 */ lh $a1, 0x0016($s0) ## 00000016 -/* 00D68 809AEC88 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00D68 809AEC88 0C01E1A7 */ jal Math_SmoothStepToS /* 00D6C 809AEC8C AFA00010 */ sw $zero, 0x0010($sp) /* 00D70 809AEC90 3C014140 */ lui $at, 0x4140 ## $at = 41400000 @@ -75,7 +75,7 @@ glabel func_809AEC1C /* 00E04 809AED24 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 00E08 809AED28 8E050008 */ lw $a1, 0x0008($s0) ## 00000008 /* 00E0C 809AED2C 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 -/* 00E10 809AED30 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00E10 809AED30 0C01E0C4 */ jal Math_SmoothStepToF /* 00E14 809AED34 E7B00010 */ swc1 $f16, 0x0010($sp) /* 00E18 809AED38 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 @@ -83,7 +83,7 @@ glabel func_809AEC1C /* 00E20 809AED40 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 00E24 809AED44 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00E28 809AED48 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 -/* 00E2C 809AED4C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00E2C 809AED4C 0C01E0C4 */ jal Math_SmoothStepToF /* 00E30 809AED50 E7B20010 */ swc1 $f18, 0x0010($sp) .L809AED54: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AED8C.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AED8C.s index 16b7e2017c..09adf30460 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AED8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AED8C.s @@ -43,7 +43,7 @@ glabel func_809AED8C /* 00F08 809AEE28 1000001E */ beq $zero, $zero, .L809AEEA4 /* 00F0C 809AEE2C E610017C */ swc1 $f16, 0x017C($s0) ## 0000017C .L809AEE30: -/* 00F10 809AEE30 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00F10 809AEE30 0C01E1A7 */ jal Math_SmoothStepToS /* 00F14 809AEE34 AFA00010 */ sw $zero, 0x0010($sp) /* 00F18 809AEE38 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEFA4.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEFA4.s index 9b6230bf70..2b83781a66 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEFA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AEFA4.s @@ -32,7 +32,7 @@ glabel func_809AEFA4 /* 010F4 809AF014 45020009 */ bc1fl .L809AF03C /* 010F8 809AF018 44814000 */ mtc1 $at, $f8 ## $f8 = 11.00 /* 010FC 809AF01C 87A5002A */ lh $a1, 0x002A($sp) -/* 01100 809AF020 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01100 809AF020 0C01E1A7 */ jal Math_SmoothStepToS /* 01104 809AF024 AFA00010 */ sw $zero, 0x0010($sp) /* 01108 809AF028 3C014140 */ lui $at, 0x4140 ## $at = 41400000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF0DC.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF0DC.s index 6e02fd1513..b90f377f69 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF0DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF0DC.s @@ -57,7 +57,7 @@ glabel func_809AF0DC /* 0128C 809AF1AC E612017C */ swc1 $f18, 0x017C($s0) ## 0000017C .L809AF1B0: /* 01290 809AF1B0 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 01294 809AF1B4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01294 809AF1B4 0C01E1A7 */ jal Math_SmoothStepToS /* 01298 809AF1B8 AFA00010 */ sw $zero, 0x0010($sp) /* 0129C 809AF1BC 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF30C.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF30C.s index ab11260f79..6a1a611644 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF30C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF30C.s @@ -79,7 +79,7 @@ glabel func_809AF30C /* 0150C 809AF42C 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 /* 01510 809AF430 51E00025 */ beql $t7, $zero, .L809AF4C8 /* 01514 809AF434 8FA20034 */ lw $v0, 0x0034($sp) -/* 01518 809AF438 0C01DE1C */ jal Math_Sins +/* 01518 809AF438 0C01DE1C */ jal Math_SinS ## sins? /* 0151C 809AF43C A7A3002E */ sh $v1, 0x002E($sp) /* 01520 809AF440 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -130,7 +130,7 @@ glabel func_809AF30C /* 015C8 809AF4E8 860C0158 */ lh $t4, 0x0158($s0) ## 00000158 .L809AF4EC: /* 015CC 809AF4EC 86040258 */ lh $a0, 0x0258($s0) ## 00000258 -/* 015D0 809AF4F0 0C01DE1C */ jal Math_Sins +/* 015D0 809AF4F0 0C01DE1C */ jal Math_SinS ## sins? /* 015D4 809AF4F4 A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 /* 015D8 809AF4F8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF644.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF644.s index 9cb0031b3d..060f226d1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF644.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF644.s @@ -8,7 +8,7 @@ glabel func_809AF644 /* 0173C 809AF65C AFA00010 */ sw $zero, 0x0010($sp) /* 01740 809AF660 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 /* 01744 809AF664 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01748 809AF668 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01748 809AF668 0C01E1A7 */ jal Math_SmoothStepToS /* 0174C 809AF66C 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 01750 809AF670 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Update.s index 740ab9e5fc..4a5490bf61 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Update.s @@ -163,14 +163,14 @@ glabel EnAnubice_Update /* 00E30 809B1F50 8E0502A4 */ lw $a1, 0x02A4($s0) ## 000002A4 /* 00E34 809B1F54 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 00E38 809B1F58 256C1964 */ addiu $t4, $t3, 0x1964 ## $t4 = 00001964 -/* 00E3C 809B1F5C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00E3C 809B1F5C 0C01E107 */ jal Math_ApproachF /* 00E40 809B1F60 A60C00B6 */ sh $t4, 0x00B6($s0) ## 000000B6 /* 00E44 809B1F64 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 /* 00E48 809B1F68 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 00E4C 809B1F6C 26040064 */ addiu $a0, $s0, 0x0064 ## $a0 = 00000064 /* 00E50 809B1F70 8E0502AC */ lw $a1, 0x02AC($s0) ## 000002AC -/* 00E54 809B1F74 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00E54 809B1F74 0C01E107 */ jal Math_ApproachF /* 00E58 809B1F78 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 00E5C 809B1F7C 860D025C */ lh $t5, 0x025C($s0) ## 0000025C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1120.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1120.s index cf70703b0e..716bf54b1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1120.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1120.s @@ -23,14 +23,14 @@ glabel func_809B1120 /* 00040 809B1160 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 00044 809B1164 46105480 */ add.s $f18, $f10, $f16 /* 00048 809B1168 E4920248 */ swc1 $f18, 0x0248($a0) ## 00000270 -/* 0004C 809B116C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0004C 809B116C 0C01E107 */ jal Math_ApproachF /* 00050 809B1170 8E050270 */ lw $a1, 0x0270($s0) ## 00000270 /* 00054 809B1174 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00058 809B1178 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0005C 809B117C 26040274 */ addiu $a0, $s0, 0x0274 ## $a0 = 00000274 /* 00060 809B1180 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 00064 809B1184 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00064 809B1184 0C01E107 */ jal Math_ApproachF /* 00068 809B1188 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 0006C 809B118C C6040268 */ lwc1 $f4, 0x0268($s0) ## 00000268 @@ -38,7 +38,7 @@ glabel func_809B1120 /* 00074 809B1194 44043000 */ mfc1 $a0, $f6 /* 00078 809B1198 00000000 */ nop /* 0007C 809B119C 00042400 */ sll $a0, $a0, 16 -/* 00080 809B11A0 0C01DE1C */ jal Math_Sins +/* 00080 809B11A0 0C01DE1C */ jal Math_SinS ## sins? /* 00084 809B11A4 00042403 */ sra $a0, $a0, 16 /* 00088 809B11A8 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B11C0.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B11C0.s index d5c880e974..6fd17dc810 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B11C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B11C0.s @@ -27,7 +27,7 @@ glabel func_809B11C0 /* 000E8 809B1208 46108482 */ mul.s $f18, $f16, $f16 /* 000EC 809B120C E7B00018 */ swc1 $f16, 0x0018($sp) /* 000F0 809B1210 46125000 */ add.s $f0, $f10, $f18 -/* 000F4 809B1214 0C03F494 */ jal Math_atan2f +/* 000F4 809B1214 0C03F494 */ jal Math_FAtan2F /* 000F8 809B1218 46000384 */ sqrt.s $f14, $f0 /* 000FC 809B121C 3C01809B */ lui $at, %hi(D_809B2414) ## $at = 809B0000 /* 00100 809B1220 C4242414 */ lwc1 $f4, %lo(D_809B2414)($at) @@ -44,7 +44,7 @@ glabel func_809B11C0 /* 0012C 809B124C 468054A0 */ cvt.s.w $f18, $f10 /* 00130 809B1250 E492028C */ swc1 $f18, 0x028C($a0) ## 0000028C /* 00134 809B1254 C7AE0018 */ lwc1 $f14, 0x0018($sp) -/* 00138 809B1258 0C03F494 */ jal Math_atan2f +/* 00138 809B1258 0C03F494 */ jal Math_FAtan2F /* 0013C 809B125C C7AC0020 */ lwc1 $f12, 0x0020($sp) /* 00140 809B1260 3C01809B */ lui $at, %hi(D_809B2418) ## $at = 809B0000 /* 00144 809B1264 C4242418 */ lwc1 $f4, %lo(D_809B2418)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B15CC.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B15CC.s index 27aa0cc4c5..d9213958a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B15CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B15CC.s @@ -10,13 +10,13 @@ glabel func_809B15CC /* 004C8 809B15E8 AFAE002C */ sw $t6, 0x002C($sp) /* 004CC 809B15EC 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC /* 004D0 809B15F0 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 004D4 809B15F4 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 004D4 809B15F4 0C01E123 */ jal Math_ApproachZeroF /* 004D8 809B15F8 3C064396 */ lui $a2, 0x4396 ## $a2 = 43960000 /* 004DC 809B15FC 2604027C */ addiu $a0, $s0, 0x027C ## $a0 = 0000027C /* 004E0 809B1600 3C05428C */ lui $a1, 0x428C ## $a1 = 428C0000 /* 004E4 809B1604 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 004E8 809B1608 0C01E107 */ jal Math_SmoothScaleMaxF +/* 004E8 809B1608 0C01E107 */ jal Math_ApproachF /* 004EC 809B160C 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 004F0 809B1610 860F0262 */ lh $t7, 0x0262($s0) ## 00000262 @@ -25,7 +25,7 @@ glabel func_809B15CC /* 004FC 809B161C 15E00004 */ bne $t7, $zero, .L809B1630 /* 00500 809B1620 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 00504 809B1624 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 00508 809B1628 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00508 809B1628 0C01E1A7 */ jal Math_SmoothStepToS /* 0050C 809B162C AFA00010 */ sw $zero, 0x0010($sp) .L809B1630: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B16AC.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B16AC.s index d8d631a885..7a50fdd329 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B16AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B16AC.s @@ -18,12 +18,12 @@ glabel func_809B16AC /* 005AC 809B16CC 34A53000 */ ori $a1, $a1, 0x3000 ## $a1 = C5843000 /* 005B0 809B16D0 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC /* 005B4 809B16D4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 005B8 809B16D8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 005B8 809B16D8 0C01E107 */ jal Math_ApproachF /* 005BC 809B16DC 3C074396 */ lui $a3, 0x4396 ## $a3 = 43960000 /* 005C0 809B16E0 2604027C */ addiu $a0, $s0, 0x027C ## $a0 = 0000027C /* 005C4 809B16E4 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 005C8 809B16E8 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 005C8 809B16E8 0C01E123 */ jal Math_ApproachZeroF /* 005CC 809B16EC 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 005D0 809B16F0 860E0262 */ lh $t6, 0x0262($s0) ## 00000262 @@ -32,7 +32,7 @@ glabel func_809B16AC /* 005DC 809B16FC 15C00004 */ bne $t6, $zero, .L809B1710 /* 005E0 809B1700 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 005E4 809B1704 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 005E8 809B1708 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 005E8 809B1708 0C01E1A7 */ jal Math_SmoothStepToS /* 005EC 809B170C AFA00010 */ sw $zero, 0x0010($sp) .L809B1710: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1884.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1884.s index f1593dc0bb..798b4f33f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1884.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1884.s @@ -15,7 +15,7 @@ glabel func_809B1884 /* 00794 809B18B4 15C00004 */ bne $t6, $zero, .L809B18C8 /* 00798 809B18B8 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 0079C 809B18BC 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 007A0 809B18C0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 007A0 809B18C0 0C01E1A7 */ jal Math_SmoothStepToS /* 007A4 809B18C4 AFA00010 */ sw $zero, 0x0010($sp) .L809B18C8: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1A54.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1A54.s index 12c81ab569..b282f66afd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1A54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1A54.s @@ -39,7 +39,7 @@ glabel func_809B1A54 /* 00998 809B1AB8 3C053ECC */ lui $a1, 0x3ECC ## $a1 = 3ECC0000 /* 0099C 809B1ABC 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3ECCCCCD /* 009A0 809B1AC0 260400C4 */ addiu $a0, $s0, 0x00C4 ## $a0 = 000000C4 -/* 009A4 809B1AC4 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 009A4 809B1AC4 0C01E123 */ jal Math_ApproachZeroF /* 009A8 809B1AC8 3C063E80 */ lui $a2, 0x3E80 ## $a2 = 3E800000 /* 009AC 809B1ACC 860C0256 */ lh $t4, 0x0256($s0) ## 00000256 @@ -49,7 +49,7 @@ glabel func_809B1A54 /* 009BC 809B1ADC AFA00010 */ sw $zero, 0x0010($sp) /* 009C0 809B1AE0 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 009C4 809B1AE4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 009C8 809B1AE8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 009C8 809B1AE8 0C01E1A7 */ jal Math_SmoothStepToS /* 009CC 809B1AEC 24072710 */ addiu $a3, $zero, 0x2710 ## $a3 = 00002710 /* 009D0 809B1AF0 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 @@ -105,7 +105,7 @@ glabel func_809B1A54 /* 00A90 809B1BB0 00000000 */ nop /* 00A94 809B1BB4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00A98 809B1BB8 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 00A9C 809B1BBC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00A9C 809B1BBC 0C00CFC8 */ jal Rand_CenteredFloat /* 00AA0 809B1BC0 00000000 */ nop /* 00AA4 809B1BC4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -117,7 +117,7 @@ glabel func_809B1A54 /* 00ABC 809B1BDC E7A40050 */ swc1 $f4, 0x0050($sp) /* 00AC0 809B1BE0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00AC4 809B1BE4 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 -/* 00AC8 809B1BE8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00AC8 809B1BE8 0C00CFC8 */ jal Rand_CenteredFloat /* 00ACC 809B1BEC 00000000 */ nop /* 00AD0 809B1BF0 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 @@ -126,7 +126,7 @@ glabel func_809B1A54 /* 00ADC 809B1BFC 46004280 */ add.s $f10, $f8, $f0 /* 00AE0 809B1C00 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 00AE4 809B1C04 460A3400 */ add.s $f16, $f6, $f10 -/* 00AE8 809B1C08 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00AE8 809B1C08 0C00CFC8 */ jal Rand_CenteredFloat /* 00AEC 809B1C0C E7B00040 */ swc1 $f16, 0x0040($sp) /* 00AF0 809B1C10 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 @@ -135,7 +135,7 @@ glabel func_809B1A54 /* 00AFC 809B1C1C 46002200 */ add.s $f8, $f4, $f0 /* 00B00 809B1C20 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 00B04 809B1C24 46089180 */ add.s $f6, $f18, $f8 -/* 00B08 809B1C28 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00B08 809B1C28 0C00CFC8 */ jal Rand_CenteredFloat /* 00B0C 809B1C2C E7A60044 */ swc1 $f6, 0x0044($sp) /* 00B10 809B1C30 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C @@ -172,7 +172,7 @@ glabel func_809B1A54 /* 00B8C 809B1CAC 11200011 */ beq $t1, $zero, .L809B1CF4 /* 00B90 809B1CB0 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC /* 00B94 809B1CB4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 00B98 809B1CB8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00B98 809B1CB8 0C01E107 */ jal Math_ApproachF /* 00B9C 809B1CBC 3C074396 */ lui $a3, 0x4396 ## $a3 = 43960000 /* 00BA0 809B1CC0 3C01C4FA */ lui $at, 0xC4FA ## $at = C4FA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B27D8.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B27D8.s index 3b0b492bbc..fac888a5cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B27D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B27D8.s @@ -80,7 +80,7 @@ glabel func_809B27D8 .L809B28F4: /* 00354 809B28F4 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 /* 00358 809B28F8 26240150 */ addiu $a0, $s1, 0x0150 ## $a0 = 00000150 -/* 0035C 809B28FC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0035C 809B28FC 0C01E107 */ jal Math_ApproachF /* 00360 809B2900 8E250154 */ lw $a1, 0x0154($s1) ## 00000154 /* 00364 809B2904 862D015A */ lh $t5, 0x015A($s1) ## 0000015A @@ -185,7 +185,7 @@ glabel func_809B27D8 /* 004D8 809B2A78 44134000 */ mfc1 $s3, $f8 /* 004DC 809B2A7C 00129403 */ sra $s2, $s2, 16 .L809B2A80: -/* 004E0 809B2A80 0C03F66B */ jal Math_Rand_ZeroOne +/* 004E0 809B2A80 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 004E4 809B2A84 00000000 */ nop /* 004E8 809B2A88 C6300150 */ lwc1 $f16, 0x0150($s1) ## 00000150 @@ -195,7 +195,7 @@ glabel func_809B27D8 /* 004F8 809B2A98 00000000 */ nop /* 004FC 809B2A9C 46125102 */ mul.s $f4, $f10, $f18 /* 00500 809B2AA0 46062200 */ add.s $f8, $f4, $f6 -/* 00504 809B2AA4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00504 809B2AA4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00508 809B2AA8 E7A80098 */ swc1 $f8, 0x0098($sp) /* 0050C 809B2AAC C62A0150 */ lwc1 $f10, 0x0150($s1) ## 00000150 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B2B48.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B2B48.s index fa40d338c0..0781ceed08 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B2B48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B2B48.s @@ -59,15 +59,15 @@ glabel func_809B2B48 /* 00688 809B2C28 C6260028 */ lwc1 $f6, 0x0028($s1) ## 00000028 /* 0068C 809B2C2C E7A60078 */ swc1 $f6, 0x0078($sp) /* 00690 809B2C30 C628002C */ lwc1 $f8, 0x002C($s1) ## 0000002C -/* 00694 809B2C34 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00694 809B2C34 0C00CFC8 */ jal Rand_CenteredFloat /* 00698 809B2C38 E7A8007C */ swc1 $f8, 0x007C($sp) /* 0069C 809B2C3C E7A00080 */ swc1 $f0, 0x0080($sp) -/* 006A0 809B2C40 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 006A0 809B2C40 0C00CFC8 */ jal Rand_CenteredFloat /* 006A4 809B2C44 4600B306 */ mov.s $f12, $f22 /* 006A8 809B2C48 E7A00084 */ swc1 $f0, 0x0084($sp) -/* 006AC 809B2C4C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 006AC 809B2C4C 0C00CFC8 */ jal Rand_CenteredFloat /* 006B0 809B2C50 4600A306 */ mov.s $f12, $f20 /* 006B4 809B2C54 241907D0 */ addiu $t9, $zero, 0x07D0 ## $t9 = 000007D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s index b6a0cd73f9..ff6aa709a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s @@ -72,7 +72,7 @@ glabel EnArrow_Draw /* 01108 809B4A28 00812021 */ addu $a0, $a0, $at /* 0110C 809B4A2C 000420C0 */ sll $a0, $a0, 3 /* 01110 809B4A30 00042400 */ sll $a0, $a0, 16 -/* 01114 809B4A34 0C01DE0D */ jal Math_Coss +/* 01114 809B4A34 0C01DE0D */ jal Math_CosS ## coss? /* 01118 809B4A38 00042403 */ sra $a0, $a0, 16 /* 0111C 809B4A3C 3C0142FF */ lui $at, 0x42FF ## $at = 42FF0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3CEC.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3CEC.s index b63ff2bdb1..51a2182677 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3CEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3CEC.s @@ -21,7 +21,7 @@ glabel func_809B3CEC /* 003F4 809B3D14 24A54310 */ addiu $a1, $a1, %lo(D_04004310) ## $a1 = 04004310 /* 003F8 809B3D18 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 003FC 809B3D1C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00400 809B3D20 0C03F66B */ jal Math_Rand_ZeroOne +/* 00400 809B3D20 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00404 809B3D24 00000000 */ nop /* 00408 809B3D28 3C0146C0 */ lui $at, 0x46C0 ## $at = 46C00000 @@ -37,7 +37,7 @@ glabel func_809B3CEC /* 00430 809B3D50 00000000 */ nop /* 00434 809B3D54 030FC821 */ addu $t9, $t8, $t7 /* 00438 809B3D58 03214021 */ addu $t0, $t9, $at -/* 0043C 809B3D5C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0043C 809B3D5C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00440 809B3D60 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 /* 00444 809B3D64 3C01809B */ lui $at, %hi(D_809B4F48) ## $at = 809B0000 @@ -48,7 +48,7 @@ glabel func_809B3CEC /* 00458 809B3D78 46061100 */ add.s $f4, $f2, $f6 /* 0045C 809B3D7C 46049202 */ mul.s $f8, $f18, $f4 /* 00460 809B3D80 46085400 */ add.s $f16, $f10, $f8 -/* 00464 809B3D84 0C03F66B */ jal Math_Rand_ZeroOne +/* 00464 809B3D84 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00468 809B3D88 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 /* 0046C 809B3D8C 3C01809B */ lui $at, %hi(D_809B4F4C) ## $at = 809B0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s index 32d5d6503d..31af4d0ad1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s @@ -297,7 +297,7 @@ glabel func_809B3FDC /* 00ACC 809B43EC 8E02024C */ lw $v0, 0x024C($s0) ## 0000024C /* 00AD0 809B43F0 C60E0060 */ lwc1 $f14, 0x0060($s0) ## 00000060 /* 00AD4 809B43F4 C60C0068 */ lwc1 $f12, 0x0068($s0) ## 00000068 -/* 00AD8 809B43F8 0C034199 */ jal atan2s +/* 00AD8 809B43F8 0C034199 */ jal Math_Atan2S /* 00ADC 809B43FC 46007387 */ neg.s $f14, $f14 /* 00AE0 809B4400 A60200B4 */ sh $v0, 0x00B4($s0) ## 000000B4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B65A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B65A8.s index 4f384f7972..ff60a43131 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B65A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B65A8.s @@ -33,7 +33,7 @@ glabel func_809B65A8 /* 002D4 809B6624 3C0740E0 */ lui $a3, 0x40E0 ## $a3 = 40E00000 /* 002D8 809B6628 E7B20010 */ swc1 $f18, 0x0010($sp) /* 002DC 809B662C 44058000 */ mfc1 $a1, $f16 -/* 002E0 809B6630 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 002E0 809B6630 0C01E0C4 */ jal Math_SmoothStepToF /* 002E4 809B6634 00000000 */ nop /* 002E8 809B6638 10000010 */ beq $zero, $zero, .L809B667C @@ -52,7 +52,7 @@ glabel func_809B65A8 /* 00314 809B6664 44054000 */ mfc1 $a1, $f8 /* 00318 809B6668 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0031C 809B666C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 00320 809B6670 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00320 809B6670 0C01E0C4 */ jal Math_SmoothStepToF /* 00324 809B6674 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00328 809B6678 8EC90024 */ lw $t1, 0x0024($s6) ## 00000024 @@ -70,26 +70,26 @@ glabel func_809B65A8 /* 00354 809B66A4 1560001A */ bne $t3, $zero, .L809B6710 /* 00358 809B66A8 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 0035C 809B66AC 44816000 */ mtc1 $at, $f12 ## $f12 = 180.00 -/* 00360 809B66B0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00360 809B66B0 0C00CFC8 */ jal Rand_CenteredFloat /* 00364 809B66B4 00000000 */ nop /* 00368 809B66B8 C6D00310 */ lwc1 $f16, 0x0310($s6) ## 00000310 /* 0036C 809B66BC 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 00370 809B66C0 44816000 */ mtc1 $at, $f12 ## $f12 = 180.00 /* 00374 809B66C4 46008480 */ add.s $f18, $f16, $f0 -/* 00378 809B66C8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00378 809B66C8 0C00CFC8 */ jal Rand_CenteredFloat /* 0037C 809B66CC E6D20310 */ swc1 $f18, 0x0310($s6) ## 00000310 /* 00380 809B66D0 C6C40314 */ lwc1 $f4, 0x0314($s6) ## 00000314 /* 00384 809B66D4 C6CC0310 */ lwc1 $f12, 0x0310($s6) ## 00000310 /* 00388 809B66D8 46002180 */ add.s $f6, $f4, $f0 -/* 0038C 809B66DC 0C0329C8 */ jal func_800CA720 +/* 0038C 809B66DC 0C0329C8 */ jal Math_SinF /* 00390 809B66E0 E6C60314 */ swc1 $f6, 0x0314($s6) ## 00000314 /* 00394 809B66E4 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 00398 809B66E8 44814000 */ mtc1 $at, $f8 ## $f8 = 80.00 /* 0039C 809B66EC C6CC0314 */ lwc1 $f12, 0x0314($s6) ## 00000314 /* 003A0 809B66F0 46080282 */ mul.s $f10, $f0, $f8 -/* 003A4 809B66F4 0C0329DD */ jal func_800CA774 +/* 003A4 809B66F4 0C0329DD */ jal Math_CosF /* 003A8 809B66F8 E6CA0308 */ swc1 $f10, 0x0308($s6) ## 00000308 /* 003AC 809B66FC 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 003B0 809B6700 44818000 */ mtc1 $at, $f16 ## $f16 = 80.00 @@ -165,7 +165,7 @@ glabel func_809B65A8 /* 004C0 809B6810 240C00B6 */ addiu $t4, $zero, 0x00B6 ## $t4 = 000000B6 /* 004C4 809B6814 AFAC0010 */ sw $t4, 0x0010($sp) /* 004C8 809B6818 26C400B6 */ addiu $a0, $s6, 0x00B6 ## $a0 = 000000B6 -/* 004CC 809B681C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 004CC 809B681C 0C01E1A7 */ jal Math_SmoothStepToS /* 004D0 809B6820 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 004D4 809B6824 86C502A8 */ lh $a1, 0x02A8($s6) ## 000002A8 @@ -173,7 +173,7 @@ glabel func_809B65A8 /* 004DC 809B682C 240D00B6 */ addiu $t5, $zero, 0x00B6 ## $t5 = 000000B6 /* 004E0 809B6830 AFAD0010 */ sw $t5, 0x0010($sp) /* 004E4 809B6834 26C400B4 */ addiu $a0, $s6, 0x00B4 ## $a0 = 000000B4 -/* 004E8 809B6838 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 004E8 809B6838 0C01E1A7 */ jal Math_SmoothStepToS /* 004EC 809B683C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 004F0 809B6840 86C400B4 */ lh $a0, 0x00B4($s6) ## 000000B4 @@ -211,7 +211,7 @@ glabel func_809B65A8 /* 0056C 809B68BC 241900B6 */ addiu $t9, $zero, 0x00B6 ## $t9 = 000000B6 /* 00570 809B68C0 AFB90010 */ sw $t9, 0x0010($sp) /* 00574 809B68C4 02802025 */ or $a0, $s4, $zero ## $a0 = 000002AA -/* 00578 809B68C8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00578 809B68C8 0C01E1A7 */ jal Math_SmoothStepToS /* 0057C 809B68CC 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 00580 809B68D0 862502AE */ lh $a1, 0x02AE($s1) ## 000002AE @@ -219,7 +219,7 @@ glabel func_809B65A8 /* 00588 809B68D8 240800B6 */ addiu $t0, $zero, 0x00B6 ## $t0 = 000000B6 /* 0058C 809B68DC AFA80010 */ sw $t0, 0x0010($sp) /* 00590 809B68E0 02A02025 */ or $a0, $s5, $zero ## $a0 = 000002A8 -/* 00594 809B68E4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00594 809B68E4 0C01E1A7 */ jal Math_SmoothStepToS /* 00598 809B68E8 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 0059C 809B68EC 862402A8 */ lh $a0, 0x02A8($s1) ## 000002A8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B69D4.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B69D4.s index 22247652c4..a3a10bf068 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B69D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B69D4.s @@ -9,13 +9,13 @@ glabel func_809B69D4 /* 0068C 809B69DC 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 00690 809B69E0 AC80014C */ sw $zero, 0x014C($a0) ## 0000014C /* 00694 809B69E4 44816000 */ mtc1 $at, $f12 ## $f12 = 8.00 -/* 00698 809B69E8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00698 809B69E8 0C00CFC8 */ jal Rand_CenteredFloat /* 0069C 809B69EC AFA40018 */ sw $a0, 0x0018($sp) /* 006A0 809B69F0 8FA40018 */ lw $a0, 0x0018($sp) /* 006A4 809B69F4 3C01809C */ lui $at, %hi(D_809B8180) ## $at = 809C0000 /* 006A8 809B69F8 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 -/* 006AC 809B69FC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 006AC 809B69FC 0C00CFC8 */ jal Rand_CenteredFloat /* 006B0 809B6A00 C42C8180 */ lwc1 $f12, %lo(D_809B8180)($at) /* 006B4 809B6A04 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s index f15e90f69e..e62979ded6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s @@ -24,7 +24,7 @@ glabel func_809B6B58 /* 00860 809B6BB0 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 00864 809B6BB4 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00868 809B6BB8 44054000 */ mfc1 $a1, $f8 -/* 0086C 809B6BBC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0086C 809B6BBC 0C01E0C4 */ jal Math_SmoothStepToF /* 00870 809B6BC0 00000000 */ nop /* 00874 809B6BC4 3C01432F */ lui $at, 0x432F ## $at = 432F0000 @@ -87,7 +87,7 @@ glabel func_809B6B58 /* 00940 809B6C90 240505DC */ addiu $a1, $zero, 0x05DC ## $a1 = 000005DC /* 00944 809B6C94 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00948 809B6C98 2407001E */ addiu $a3, $zero, 0x001E ## $a3 = 0000001E -/* 0094C 809B6C9C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0094C 809B6C9C 0C01E1A7 */ jal Math_SmoothStepToS /* 00950 809B6CA0 AFA00010 */ sw $zero, 0x0010($sp) /* 00954 809B6CA4 26710158 */ addiu $s1, $s3, 0x0158 ## $s1 = 00000158 @@ -100,7 +100,7 @@ glabel func_809B6B58 /* 00970 809B6CC0 AFA00010 */ sw $zero, 0x0010($sp) /* 00974 809B6CC4 266400B6 */ addiu $a0, $s3, 0x00B6 ## $a0 = 000000B6 /* 00978 809B6CC8 87A5005A */ lh $a1, 0x005A($sp) -/* 0097C 809B6CCC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0097C 809B6CCC 0C01E1A7 */ jal Math_SmoothStepToS /* 00980 809B6CD0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00984 809B6CD4 87A50058 */ lh $a1, 0x0058($sp) @@ -111,7 +111,7 @@ glabel func_809B6B58 /* 00998 809B6CE8 00052C03 */ sra $a1, $a1, 16 /* 0099C 809B6CEC AFA00010 */ sw $zero, 0x0010($sp) /* 009A0 809B6CF0 266400B4 */ addiu $a0, $s3, 0x00B4 ## $a0 = 000000B4 -/* 009A4 809B6CF4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 009A4 809B6CF4 0C01E1A7 */ jal Math_SmoothStepToS /* 009A8 809B6CF8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 009AC 809B6CFC C66C0024 */ lwc1 $f12, 0x0024($s3) ## 00000024 @@ -149,7 +149,7 @@ glabel func_809B6B58 /* 00A28 809B6D78 00002812 */ mflo $a1 /* 00A2C 809B6D7C 24A5C000 */ addiu $a1, $a1, 0xC000 ## $a1 = FFFFC000 /* 00A30 809B6D80 00052C00 */ sll $a1, $a1, 16 -/* 00A34 809B6D84 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00A34 809B6D84 0C01E1A7 */ jal Math_SmoothStepToS /* 00A38 809B6D88 00052C03 */ sra $a1, $a1, 16 /* 00A3C 809B6D8C 001E2C00 */ sll $a1, $s8, 16 @@ -157,7 +157,7 @@ glabel func_809B6B58 /* 00A44 809B6D94 AFA00010 */ sw $zero, 0x0010($sp) /* 00A48 809B6D98 00052C03 */ sra $a1, $a1, 16 /* 00A4C 809B6D9C 260402AA */ addiu $a0, $s0, 0x02AA ## $a0 = 000002CE -/* 00A50 809B6DA0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00A50 809B6DA0 0C01E1A7 */ jal Math_SmoothStepToS /* 00A54 809B6DA4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00A58 809B6DA8 02560019 */ multu $s2, $s6 @@ -227,7 +227,7 @@ glabel func_809B6B58 /* 00B44 809B6E94 AFA00010 */ sw $zero, 0x0010($sp) /* 00B48 809B6E98 00052C03 */ sra $a1, $a1, 16 /* 00B4C 809B6E9C 266400B6 */ addiu $a0, $s3, 0x00B6 ## $a0 = 000000B6 -/* 00B50 809B6EA0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00B50 809B6EA0 0C01E1A7 */ jal Math_SmoothStepToS /* 00B54 809B6EA4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00B58 809B6EA8 00102C00 */ sll $a1, $s0, 16 @@ -235,7 +235,7 @@ glabel func_809B6B58 /* 00B60 809B6EB0 AFA00010 */ sw $zero, 0x0010($sp) /* 00B64 809B6EB4 00052C03 */ sra $a1, $a1, 16 /* 00B68 809B6EB8 266400B4 */ addiu $a0, $s3, 0x00B4 ## $a0 = 000000B4 -/* 00B6C 809B6EBC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00B6C 809B6EBC 0C01E1A7 */ jal Math_SmoothStepToS /* 00B70 809B6EC0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00B74 809B6EC4 C66C0024 */ lwc1 $f12, 0x0024($s3) ## 00000024 @@ -267,7 +267,7 @@ glabel func_809B6B58 /* 00BD8 809B6F28 00810019 */ multu $a0, $at /* 00BDC 809B6F2C 00002012 */ mflo $a0 /* 00BE0 809B6F30 00042400 */ sll $a0, $a0, 16 -/* 00BE4 809B6F34 0C01DE0D */ jal Math_Coss +/* 00BE4 809B6F34 0C01DE0D */ jal Math_CosS ## coss? /* 00BE8 809B6F38 00042403 */ sra $a0, $a0, 16 /* 00BEC 809B6F3C 02540019 */ multu $s2, $s4 @@ -291,7 +291,7 @@ glabel func_809B6B58 /* 00C34 809B6F84 00052C03 */ sra $a1, $a1, 16 /* 00C38 809B6F88 24A5C000 */ addiu $a1, $a1, 0xC000 ## $a1 = FFFFC000 /* 00C3C 809B6F8C 00052C00 */ sll $a1, $a1, 16 -/* 00C40 809B6F90 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00C40 809B6F90 0C01E1A7 */ jal Math_SmoothStepToS /* 00C44 809B6F94 00052C03 */ sra $a1, $a1, 16 /* 00C48 809B6F98 001E2C00 */ sll $a1, $s8, 16 @@ -299,7 +299,7 @@ glabel func_809B6B58 /* 00C50 809B6FA0 AFA00010 */ sw $zero, 0x0010($sp) /* 00C54 809B6FA4 00052C03 */ sra $a1, $a1, 16 /* 00C58 809B6FA8 260402AA */ addiu $a0, $s0, 0x02AA ## $a0 = 000002CE -/* 00C5C 809B6FAC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00C5C 809B6FAC 0C01E1A7 */ jal Math_SmoothStepToS /* 00C60 809B6FB0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00C64 809B6FB4 02560019 */ multu $s2, $s6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B71F0.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B71F0.s index e771f51243..ecd7052945 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B71F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B71F0.s @@ -21,7 +21,7 @@ glabel func_809B71F0 /* 00EEC 809B723C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00EF0 809B7240 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 00EF4 809B7244 44054000 */ mfc1 $a1, $f8 -/* 00EF8 809B7248 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00EF8 809B7248 0C01E0C4 */ jal Math_SmoothStepToF /* 00EFC 809B724C E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00F00 809B7250 26F40024 */ addiu $s4, $s7, 0x0024 ## $s4 = 00000024 @@ -39,26 +39,26 @@ glabel func_809B71F0 /* 00F30 809B7280 1720001A */ bne $t9, $zero, .L809B72EC /* 00F34 809B7284 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 00F38 809B7288 44816000 */ mtc1 $at, $f12 ## $f12 = 180.00 -/* 00F3C 809B728C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00F3C 809B728C 0C00CFC8 */ jal Rand_CenteredFloat /* 00F40 809B7290 00000000 */ nop /* 00F44 809B7294 C6F00310 */ lwc1 $f16, 0x0310($s7) ## 00000310 /* 00F48 809B7298 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 00F4C 809B729C 44816000 */ mtc1 $at, $f12 ## $f12 = 180.00 /* 00F50 809B72A0 46008480 */ add.s $f18, $f16, $f0 -/* 00F54 809B72A4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00F54 809B72A4 0C00CFC8 */ jal Rand_CenteredFloat /* 00F58 809B72A8 E6F20310 */ swc1 $f18, 0x0310($s7) ## 00000310 /* 00F5C 809B72AC C6E40314 */ lwc1 $f4, 0x0314($s7) ## 00000314 /* 00F60 809B72B0 C6EC0310 */ lwc1 $f12, 0x0310($s7) ## 00000310 /* 00F64 809B72B4 46002180 */ add.s $f6, $f4, $f0 -/* 00F68 809B72B8 0C0329C8 */ jal func_800CA720 +/* 00F68 809B72B8 0C0329C8 */ jal Math_SinF /* 00F6C 809B72BC E6E60314 */ swc1 $f6, 0x0314($s7) ## 00000314 /* 00F70 809B72C0 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 00F74 809B72C4 44814000 */ mtc1 $at, $f8 ## $f8 = 80.00 /* 00F78 809B72C8 C6EC0314 */ lwc1 $f12, 0x0314($s7) ## 00000314 /* 00F7C 809B72CC 46080282 */ mul.s $f10, $f0, $f8 -/* 00F80 809B72D0 0C0329DD */ jal func_800CA774 +/* 00F80 809B72D0 0C0329DD */ jal Math_CosF /* 00F84 809B72D4 E6EA0308 */ swc1 $f10, 0x0308($s7) ## 00000308 /* 00F88 809B72D8 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 00F8C 809B72DC 44818000 */ mtc1 $at, $f16 ## $f16 = 80.00 @@ -133,7 +133,7 @@ glabel func_809B71F0 /* 01098 809B73E8 AFA80010 */ sw $t0, 0x0010($sp) /* 0109C 809B73EC 26E400B6 */ addiu $a0, $s7, 0x00B6 ## $a0 = 000000B6 /* 010A0 809B73F0 87A5006E */ lh $a1, 0x006E($sp) -/* 010A4 809B73F4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 010A4 809B73F4 0C01E1A7 */ jal Math_SmoothStepToS /* 010A8 809B73F8 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 010AC 809B73FC 87A5006C */ lh $a1, 0x006C($sp) @@ -145,7 +145,7 @@ glabel func_809B71F0 /* 010C4 809B7414 AFA90010 */ sw $t1, 0x0010($sp) /* 010C8 809B7418 00052C03 */ sra $a1, $a1, 16 /* 010CC 809B741C 26E400B4 */ addiu $a0, $s7, 0x00B4 ## $a0 = 000000B4 -/* 010D0 809B7420 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 010D0 809B7420 0C01E1A7 */ jal Math_SmoothStepToS /* 010D4 809B7424 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 010D8 809B7428 86E400B4 */ lh $a0, 0x00B4($s7) ## 000000B4 @@ -184,7 +184,7 @@ glabel func_809B71F0 /* 01158 809B74A8 AFAA0010 */ sw $t2, 0x0010($sp) /* 0115C 809B74AC 02A02025 */ or $a0, $s5, $zero ## $a0 = 000002AA /* 01160 809B74B0 87A5006E */ lh $a1, 0x006E($sp) -/* 01164 809B74B4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01164 809B74B4 0C01E1A7 */ jal Math_SmoothStepToS /* 01168 809B74B8 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 0116C 809B74BC 87A5006C */ lh $a1, 0x006C($sp) @@ -196,7 +196,7 @@ glabel func_809B71F0 /* 01184 809B74D4 AFAB0010 */ sw $t3, 0x0010($sp) /* 01188 809B74D8 00052C03 */ sra $a1, $a1, 16 /* 0118C 809B74DC 02C02025 */ or $a0, $s6, $zero ## $a0 = 000002A8 -/* 01190 809B74E0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01190 809B74E0 0C01E1A7 */ jal Math_SmoothStepToS /* 01194 809B74E4 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 01198 809B74E8 866402A8 */ lh $a0, 0x02A8($s3) ## 000002A8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B75A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B75A0.s index dde9b7a3bd..8e6ec1a034 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B75A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B75A0.s @@ -69,7 +69,7 @@ glabel func_809B75A0 /* 01350 809B76A0 00118C03 */ sra $s1, $s1, 16 /* 01354 809B76A4 AFA00010 */ sw $zero, 0x0010($sp) /* 01358 809B76A8 266400B6 */ addiu $a0, $s3, 0x00B6 ## $a0 = 000000B6 -/* 0135C 809B76AC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0135C 809B76AC 0C01E1A7 */ jal Math_SmoothStepToS /* 01360 809B76B0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01364 809B76B4 00112C00 */ sll $a1, $s1, 16 @@ -77,7 +77,7 @@ glabel func_809B75A0 /* 0136C 809B76BC AFA00010 */ sw $zero, 0x0010($sp) /* 01370 809B76C0 00052C03 */ sra $a1, $a1, 16 /* 01374 809B76C4 266400B4 */ addiu $a0, $s3, 0x00B4 ## $a0 = 000000B4 -/* 01378 809B76C8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01378 809B76C8 0C01E1A7 */ jal Math_SmoothStepToS /* 0137C 809B76CC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01380 809B76D0 C66C0024 */ lwc1 $f12, 0x0024($s3) ## 00000024 @@ -114,14 +114,14 @@ glabel func_809B75A0 /* 013F8 809B7748 8667031C */ lh $a3, 0x031C($s3) ## 0000031C /* 013FC 809B774C AFA00010 */ sw $zero, 0x0010($sp) /* 01400 809B7750 02802025 */ or $a0, $s4, $zero ## $a0 = 000002C6 -/* 01404 809B7754 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01404 809B7754 0C01E1A7 */ jal Math_SmoothStepToS /* 01408 809B7758 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0140C 809B775C 866502C8 */ lh $a1, 0x02C8($s3) ## 000002C8 /* 01410 809B7760 8667031C */ lh $a3, 0x031C($s3) ## 0000031C /* 01414 809B7764 AFA00010 */ sw $zero, 0x0010($sp) /* 01418 809B7768 02A02025 */ or $a0, $s5, $zero ## $a0 = 000002C8 -/* 0141C 809B776C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0141C 809B776C 0C01E1A7 */ jal Math_SmoothStepToS /* 01420 809B7770 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01424 809B7774 C60C0158 */ lwc1 $f12, 0x0158($s0) ## 00000194 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B781C.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B781C.s index b59c8c4a9a..c8531492ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B781C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B781C.s @@ -46,7 +46,7 @@ glabel func_809B781C /* 01578 809B78C8 00118C03 */ sra $s1, $s1, 16 /* 0157C 809B78CC AFA00010 */ sw $zero, 0x0010($sp) /* 01580 809B78D0 264400B6 */ addiu $a0, $s2, 0x00B6 ## $a0 = 000000B6 -/* 01584 809B78D4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01584 809B78D4 0C01E1A7 */ jal Math_SmoothStepToS /* 01588 809B78D8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0158C 809B78DC 00112C00 */ sll $a1, $s1, 16 @@ -54,7 +54,7 @@ glabel func_809B781C /* 01594 809B78E4 AFA00010 */ sw $zero, 0x0010($sp) /* 01598 809B78E8 00052C03 */ sra $a1, $a1, 16 /* 0159C 809B78EC 264400B4 */ addiu $a0, $s2, 0x00B4 ## $a0 = 000000B4 -/* 015A0 809B78F0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 015A0 809B78F0 0C01E1A7 */ jal Math_SmoothStepToS /* 015A4 809B78F4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 015A8 809B78F8 C64C0024 */ lwc1 $f12, 0x0024($s2) ## 00000024 @@ -92,7 +92,7 @@ glabel func_809B781C /* 01624 809B7974 00812021 */ addu $a0, $a0, $at /* 01628 809B7978 00042080 */ sll $a0, $a0, 2 /* 0162C 809B797C 00042400 */ sll $a0, $a0, 16 -/* 01630 809B7980 0C01DE0D */ jal Math_Coss +/* 01630 809B7980 0C01DE0D */ jal Math_CosS ## coss? /* 01634 809B7984 00042403 */ sra $a0, $a0, 16 /* 01638 809B7988 44979000 */ mtc1 $s7, $f18 ## $f18 = 0.00 @@ -110,14 +110,14 @@ glabel func_809B781C /* 01668 809B79B8 00052C03 */ sra $a1, $a1, 16 /* 0166C 809B79BC 24A5C000 */ addiu $a1, $a1, 0xC000 ## $a1 = FFFFC000 /* 01670 809B79C0 00052C00 */ sll $a1, $a1, 16 -/* 01674 809B79C4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01674 809B79C4 0C01E1A7 */ jal Math_SmoothStepToS /* 01678 809B79C8 00052C03 */ sra $a1, $a1, 16 /* 0167C 809B79CC 8645008A */ lh $a1, 0x008A($s2) ## 0000008A /* 01680 809B79D0 8647031C */ lh $a3, 0x031C($s2) ## 0000031C /* 01684 809B79D4 AFA00010 */ sw $zero, 0x0010($sp) /* 01688 809B79D8 02802025 */ or $a0, $s4, $zero ## $a0 = 000002AA -/* 0168C 809B79DC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0168C 809B79DC 0C01E1A7 */ jal Math_SmoothStepToS /* 01690 809B79E0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01694 809B79E4 C60C0158 */ lwc1 $f12, 0x0158($s0) ## 00000158 @@ -158,14 +158,14 @@ glabel func_809B781C /* 0171C 809B7A6C 8647031C */ lh $a3, 0x031C($s2) ## 0000031C /* 01720 809B7A70 AFA00010 */ sw $zero, 0x0010($sp) /* 01724 809B7A74 02602025 */ or $a0, $s3, $zero ## $a0 = 000002C6 -/* 01728 809B7A78 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01728 809B7A78 0C01E1A7 */ jal Math_SmoothStepToS /* 0172C 809B7A7C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01730 809B7A80 864502C8 */ lh $a1, 0x02C8($s2) ## 000002C8 /* 01734 809B7A84 8647031C */ lh $a3, 0x031C($s2) ## 0000031C /* 01738 809B7A88 AFA00010 */ sw $zero, 0x0010($sp) /* 0173C 809B7A8C 02802025 */ or $a0, $s4, $zero ## $a0 = 000002C8 -/* 01740 809B7A90 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01740 809B7A90 0C01E1A7 */ jal Math_SmoothStepToS /* 01744 809B7A94 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01748 809B7A98 C60C0158 */ lwc1 $f12, 0x0158($s0) ## 00000194 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8984.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8984.s index 63113e8d2f..b6e285adad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8984.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8984.s @@ -41,7 +41,7 @@ glabel func_809B8984 /* 00720 809B8A00 26040288 */ addiu $a0, $s0, 0x0288 ## $a0 = 00000288 /* 00724 809B8A04 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00728 809B8A08 44074000 */ mfc1 $a3, $f8 -/* 0072C 809B8A0C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0072C 809B8A0C 0C01E0C4 */ jal Math_SmoothStepToF /* 00730 809B8A10 00000000 */ nop /* 00734 809B8A14 3C01809C */ lui $at, %hi(D_809BBC84) ## $at = 809C0000 @@ -54,7 +54,7 @@ glabel func_809B8984 /* 00750 809B8A30 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00754 809B8A34 E7B20010 */ swc1 $f18, 0x0010($sp) /* 00758 809B8A38 44078000 */ mfc1 $a3, $f16 -/* 0075C 809B8A3C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0075C 809B8A3C 0C01E0C4 */ jal Math_SmoothStepToF /* 00760 809B8A40 00000000 */ nop /* 00764 809B8A44 9202029F */ lbu $v0, 0x029F($s0) ## 0000029F diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8B94.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8B94.s index 486fb97e73..72d5960914 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8B94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8B94.s @@ -32,7 +32,7 @@ glabel func_809B8B94 /* 0092C 809B8C0C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00930 809B8C10 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 00934 809B8C14 44050000 */ mfc1 $a1, $f0 -/* 00938 809B8C18 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00938 809B8C18 0C01E0C4 */ jal Math_SmoothStepToF /* 0093C 809B8C1C E7A00010 */ swc1 $f0, 0x0010($sp) /* 00940 809B8C20 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -40,7 +40,7 @@ glabel func_809B8B94 /* 00948 809B8C28 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0094C 809B8C2C 44050000 */ mfc1 $a1, $f0 /* 00950 809B8C30 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 00954 809B8C34 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00954 809B8C34 0C01E0C4 */ jal Math_SmoothStepToF /* 00958 809B8C38 E7A00010 */ swc1 $f0, 0x0010($sp) /* 0095C 809B8C3C 8E020260 */ lw $v0, 0x0260($s0) ## 00000260 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8DCC.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8DCC.s index afa2512066..e4644aa806 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8DCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8DCC.s @@ -8,7 +8,7 @@ glabel func_809B8DCC /* 00B04 809B8DE4 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 /* 00B08 809B8DE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00B0C 809B8DEC 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 00B10 809B8DF0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00B10 809B8DF0 0C01E0C4 */ jal Math_SmoothStepToF /* 00B14 809B8DF4 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00B18 809B8DF8 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s index 913d792973..531592a7e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s @@ -7,7 +7,7 @@ glabel func_809B8E34 /* 00B68 809B8E48 24A50444 */ addiu $a1, $a1, %lo(D_06000444) ## $a1 = 06000444 /* 00B6C 809B8E4C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00B70 809B8E50 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00B74 809B8E54 0C03F66B */ jal Math_Rand_ZeroOne +/* 00B74 809B8E54 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00B78 809B8E58 00000000 */ nop /* 00B7C 809B8E5C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -15,7 +15,7 @@ glabel func_809B8E34 /* 00B84 809B8E64 00000000 */ nop /* 00B88 809B8E68 46020102 */ mul.s $f4, $f0, $f2 /* 00B8C 809B8E6C 46022180 */ add.s $f6, $f4, $f2 -/* 00B90 809B8E70 0C03F66B */ jal Math_Rand_ZeroOne +/* 00B90 809B8E70 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00B94 809B8E74 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 /* 00B98 809B8E78 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -26,7 +26,7 @@ glabel func_809B8E34 /* 00BAC 809B8E8C 46105480 */ add.s $f18, $f10, $f16 /* 00BB0 809B8E90 4600910D */ trunc.w.s $f4, $f18 /* 00BB4 809B8E94 440F2000 */ mfc1 $t7, $f4 -/* 00BB8 809B8E98 0C03F66B */ jal Math_Rand_ZeroOne +/* 00BB8 809B8E98 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00BBC 809B8E9C AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 /* 00BC0 809B8EA0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s index a9ad725a5e..3e43fcfcc1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s @@ -18,7 +18,7 @@ glabel func_809B8EF4 /* 00C30 809B8F10 24840288 */ addiu $a0, $a0, 0x0288 ## $a0 = 00000288 /* 00C34 809B8F14 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00C38 809B8F18 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 00C3C 809B8F1C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00C3C 809B8F1C 0C01E0C4 */ jal Math_SmoothStepToF /* 00C40 809B8F20 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00C44 809B8F24 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 @@ -26,7 +26,7 @@ glabel func_809B8EF4 /* 00C4C 809B8F2C 3C0542C8 */ lui $a1, 0x42C8 ## $a1 = 42C80000 /* 00C50 809B8F30 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00C54 809B8F34 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 00C58 809B8F38 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00C58 809B8F38 0C01E0C4 */ jal Math_SmoothStepToF /* 00C5C 809B8F3C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00C60 809B8F40 3C01C6FA */ lui $at, 0xC6FA ## $at = C6FA0000 @@ -46,7 +46,7 @@ glabel func_809B8EF4 /* 00C98 809B8F78 46128100 */ add.s $f4, $f16, $f18 /* 00C9C 809B8F7C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00CA0 809B8F80 44052000 */ mfc1 $a1, $f4 -/* 00CA4 809B8F84 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00CA4 809B8F84 0C01E0C4 */ jal Math_SmoothStepToF /* 00CA8 809B8F88 00000000 */ nop .L809B8F8C: @@ -54,7 +54,7 @@ glabel func_809B8EF4 /* 00CB0 809B8F90 0C02927F */ jal SkelAnime_FrameUpdateMatrix /* 00CB4 809B8F94 AFA40034 */ sw $a0, 0x0034($sp) -/* 00CB8 809B8F98 0C0329DD */ jal func_800CA774 +/* 00CB8 809B8F98 0C0329DD */ jal Math_CosF /* 00CBC 809B8F9C C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 /* 00CC0 809B8FA0 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00CC4 809B8FA4 00000000 */ nop @@ -65,14 +65,14 @@ glabel func_809B8EF4 /* 00CD8 809B8FB8 860E026A */ lh $t6, 0x026A($s0) ## 0000026A /* 00CDC 809B8FBC 11C00006 */ beq $t6, $zero, .L809B8FD8 /* 00CE0 809B8FC0 00000000 */ nop -/* 00CE4 809B8FC4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00CE4 809B8FC4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00CE8 809B8FC8 00000000 */ nop /* 00CEC 809B8FCC 46000280 */ add.s $f10, $f0, $f0 /* 00CF0 809B8FD0 10000008 */ beq $zero, $zero, .L809B8FF4 /* 00CF4 809B8FD4 E60A0284 */ swc1 $f10, 0x0284($s0) ## 00000284 .L809B8FD8: -/* 00CF8 809B8FD8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00CF8 809B8FD8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00CFC 809B8FDC 00000000 */ nop /* 00D00 809B8FE0 3C014080 */ lui $at, 0x4080 ## $at = 40800000 @@ -81,7 +81,7 @@ glabel func_809B8EF4 /* 00D0C 809B8FEC 46100482 */ mul.s $f18, $f0, $f16 /* 00D10 809B8FF0 E6120284 */ swc1 $f18, 0x0284($s0) ## 00000284 .L809B8FF4: -/* 00D14 809B8FF4 0C0329DD */ jal func_800CA774 +/* 00D14 809B8FF4 0C0329DD */ jal Math_CosF /* 00D18 809B8FF8 C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 /* 00D1C 809B8FFC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00D20 809B9000 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 @@ -101,7 +101,7 @@ glabel func_809B8EF4 /* 00D58 809B9038 C426BC8C */ lwc1 $f6, %lo(D_809BBC8C)($at) /* 00D5C 809B903C 46069200 */ add.s $f8, $f18, $f6 /* 00D60 809B9040 E6080274 */ swc1 $f8, 0x0274($s0) ## 00000274 -/* 00D64 809B9044 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00D64 809B9044 0C01E0C4 */ jal Math_SmoothStepToF /* 00D68 809B9048 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00D6C 809B904C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 @@ -126,7 +126,7 @@ glabel func_809B8EF4 /* 00DB0 809B9090 AFA4002C */ sw $a0, 0x002C($sp) /* 00DB4 809B9094 AFA00010 */ sw $zero, 0x0010($sp) /* 00DB8 809B9098 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00DBC 809B909C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00DBC 809B909C 0C01E1A7 */ jal Math_SmoothStepToS /* 00DC0 809B90A0 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 00DC4 809B90A4 1000011F */ beq $zero, $zero, .L809B9524 @@ -139,7 +139,7 @@ glabel func_809B8EF4 /* 00DDC 809B90BC 860A026A */ lh $t2, 0x026A($s0) ## 0000026A /* 00DE0 809B90C0 C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 /* 00DE4 809B90C4 394B0001 */ xori $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 00DE8 809B90C8 0C0329DD */ jal func_800CA774 +/* 00DE8 809B90C8 0C0329DD */ jal Math_CosF /* 00DEC 809B90CC A60B026A */ sh $t3, 0x026A($s0) ## 0000026A /* 00DF0 809B90D0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00DF4 809B90D4 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 @@ -177,7 +177,7 @@ glabel func_809B8EF4 /* 00E74 809B9154 860B008A */ lh $t3, 0x008A($s0) ## 0000008A /* 00E78 809B9158 A60B026E */ sh $t3, 0x026E($s0) ## 0000026E .L809B915C: -/* 00E7C 809B915C 0C03F66B */ jal Math_Rand_ZeroOne +/* 00E7C 809B915C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00E80 809B9160 00000000 */ nop /* 00E84 809B9164 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 @@ -186,7 +186,7 @@ glabel func_809B8EF4 /* 00E90 809B9170 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 /* 00E94 809B9174 46060202 */ mul.s $f8, $f0, $f6 /* 00E98 809B9178 46044280 */ add.s $f10, $f8, $f4 -/* 00E9C 809B917C 0C03F66B */ jal Math_Rand_ZeroOne +/* 00E9C 809B917C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00EA0 809B9180 E60A027C */ swc1 $f10, 0x027C($s0) ## 0000027C /* 00EA4 809B9184 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -203,7 +203,7 @@ glabel func_809B8EF4 .L809B91B0: /* 00ED0 809B91B0 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00ED4 809B91B4 8FA40034 */ lw $a0, 0x0034($sp) -/* 00ED8 809B91B8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00ED8 809B91B8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00EDC 809B91BC 00000000 */ nop /* 00EE0 809B91C0 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 @@ -212,7 +212,7 @@ glabel func_809B8EF4 /* 00EEC 809B91CC 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 /* 00EF0 809B91D0 460A0402 */ mul.s $f16, $f0, $f10 /* 00EF4 809B91D4 46128180 */ add.s $f6, $f16, $f18 -/* 00EF8 809B91D8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00EF8 809B91D8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00EFC 809B91DC E606027C */ swc1 $f6, 0x027C($s0) ## 0000027C /* 00F00 809B91E0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -224,7 +224,7 @@ glabel func_809B8EF4 /* 00F18 809B91F8 460A2400 */ add.s $f16, $f4, $f10 /* 00F1C 809B91FC 4600848D */ trunc.w.s $f18, $f16 /* 00F20 809B9200 440F9000 */ mfc1 $t7, $f18 -/* 00F24 809B9204 0C0329C8 */ jal func_800CA720 +/* 00F24 809B9204 0C0329C8 */ jal Math_SinF /* 00F28 809B9208 AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 /* 00F2C 809B920C 3C01809C */ lui $at, %hi(D_809BBC90) ## $at = 809C0000 /* 00F30 809B9210 C426BC90 */ lwc1 $f6, %lo(D_809BBC90)($at) @@ -252,7 +252,7 @@ glabel func_809B8EF4 /* 00F84 809B9264 8E020324 */ lw $v0, 0x0324($s0) ## 00000324 /* 00F88 809B9268 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00F8C 809B926C 24A50184 */ addiu $a1, $a1, %lo(D_06000184) ## $a1 = 06000184 -/* 00F90 809B9270 0C03F66B */ jal Math_Rand_ZeroOne +/* 00F90 809B9270 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00F94 809B9274 00000000 */ nop /* 00F98 809B9278 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 @@ -261,7 +261,7 @@ glabel func_809B8EF4 /* 00FA4 809B9284 44813000 */ mtc1 $at, $f6 ## $f6 = 6.00 /* 00FA8 809B9288 46100482 */ mul.s $f18, $f0, $f16 /* 00FAC 809B928C 46069200 */ add.s $f8, $f18, $f6 -/* 00FB0 809B9290 0C03F66B */ jal Math_Rand_ZeroOne +/* 00FB0 809B9290 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00FB4 809B9294 E608027C */ swc1 $f8, 0x027C($s0) ## 0000027C /* 00FB8 809B9298 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -339,7 +339,7 @@ glabel func_809B8EF4 .L809B93A0: /* 010C0 809B93A0 AFA4002C */ sw $a0, 0x002C($sp) /* 010C4 809B93A4 AFA00010 */ sw $zero, 0x0010($sp) -/* 010C8 809B93A8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 010C8 809B93A8 0C01E1A7 */ jal Math_SmoothStepToS /* 010CC 809B93AC 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 /* 010D0 809B93B0 8FAA004C */ lw $t2, 0x004C($sp) @@ -348,7 +348,7 @@ glabel func_809B8EF4 /* 010DC 809B93BC 8D450024 */ lw $a1, 0x0024($t2) ## 00000024 /* 010E0 809B93C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 010E4 809B93C4 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 010E8 809B93C8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 010E8 809B93C8 0C01E0C4 */ jal Math_SmoothStepToF /* 010EC 809B93CC E7B20010 */ swc1 $f18, 0x0010($sp) /* 010F0 809B93D0 8FAB004C */ lw $t3, 0x004C($sp) @@ -362,7 +362,7 @@ glabel func_809B8EF4 /* 01110 809B93F0 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 /* 01114 809B93F4 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 01118 809B93F8 44052000 */ mfc1 $a1, $f4 -/* 0111C 809B93FC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0111C 809B93FC 0C01E0C4 */ jal Math_SmoothStepToF /* 01120 809B9400 00000000 */ nop /* 01124 809B9404 8FAC004C */ lw $t4, 0x004C($sp) @@ -371,7 +371,7 @@ glabel func_809B8EF4 /* 01130 809B9410 8D85002C */ lw $a1, 0x002C($t4) ## 0000002C /* 01134 809B9414 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01138 809B9418 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 0113C 809B941C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0113C 809B941C 0C01E0C4 */ jal Math_SmoothStepToF /* 01140 809B9420 E7B00010 */ swc1 $f16, 0x0010($sp) /* 01144 809B9424 10000004 */ beq $zero, $zero, .L809B9438 @@ -383,7 +383,7 @@ glabel func_809B8EF4 .L809B9438: /* 01158 809B9438 50800014 */ beql $a0, $zero, .L809B948C /* 0115C 809B943C 8608007E */ lh $t0, 0x007E($s0) ## 0000007E -/* 01160 809B9440 0C01DE0D */ jal Math_Coss +/* 01160 809B9440 0C01DE0D */ jal Math_CosS ## coss? /* 01164 809B9444 00000000 */ nop /* 01168 809B9448 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -400,7 +400,7 @@ glabel func_809B8EF4 /* 01194 809B9474 46082280 */ add.s $f10, $f4, $f8 /* 01198 809B9478 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 0119C 809B947C AFA00010 */ sw $zero, 0x0010($sp) -/* 011A0 809B9480 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 011A0 809B9480 0C01E1A7 */ jal Math_SmoothStepToS /* 011A4 809B9484 8FA4002C */ lw $a0, 0x002C($sp) /* 011A8 809B9488 8608007E */ lh $t0, 0x007E($s0) ## 0000007E @@ -443,7 +443,7 @@ glabel func_809B8EF4 /* 0122C 809B950C AFA00010 */ sw $zero, 0x0010($sp) /* 01230 809B9510 8FA4002C */ lw $a0, 0x002C($sp) /* 01234 809B9514 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01238 809B9518 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01238 809B9518 0C01E1A7 */ jal Math_SmoothStepToS /* 0123C 809B951C 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 01240 809B9520 8605026E */ lh $a1, 0x026E($s0) ## 0000026E @@ -452,7 +452,7 @@ glabel func_809B8EF4 .L809B9528: /* 01248 809B9528 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0124C 809B952C 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 01250 809B9530 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01250 809B9530 0C01E1A7 */ jal Math_SmoothStepToS /* 01254 809B9534 AFA00010 */ sw $zero, 0x0010($sp) /* 01258 809B9538 920302BD */ lbu $v1, 0x02BD($s0) ## 000002BD @@ -560,7 +560,7 @@ glabel func_809B8EF4 .L809B969C: /* 013BC 809B969C 5440000D */ bnel $v0, $zero, .L809B96D4 /* 013C0 809B96A0 86180032 */ lh $t8, 0x0032($s0) ## 00000032 -/* 013C4 809B96A4 0C03F66B */ jal Math_Rand_ZeroOne +/* 013C4 809B96A4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 013C8 809B96A8 00000000 */ nop /* 013CC 809B96AC 3C01809C */ lui $at, %hi(D_809BBC94) ## $at = 809C0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B977C.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B977C.s index 2d476bc83b..b14b7f3e29 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B977C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B977C.s @@ -127,7 +127,7 @@ glabel func_809B977C /* 01654 809B9934 00052C00 */ sll $a1, $a1, 16 /* 01658 809B9938 00052C03 */ sra $a1, $a1, 16 /* 0165C 809B993C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01660 809B9940 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01660 809B9940 0C01E1A7 */ jal Math_SmoothStepToS /* 01664 809B9944 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 01668 809B9948 C6120164 */ lwc1 $f18, 0x0164($s0) ## 00000164 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9B64.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9B64.s index 33fdedfa0a..bdb1b08e37 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9B64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9B64.s @@ -92,7 +92,7 @@ glabel func_809B9B64 /* 019B8 809B9C98 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 /* 019BC 809B9C9C AE080004 */ sw $t0, 0x0004($s0) ## 00000004 .L809B9CA0: -/* 019C0 809B9CA0 0C03F66B */ jal Math_Rand_ZeroOne +/* 019C0 809B9CA0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 019C4 809B9CA4 00000000 */ nop /* 019C8 809B9CA8 C6100274 */ lwc1 $f16, 0x0274($s0) ## 00000274 @@ -103,7 +103,7 @@ glabel func_809B9B64 /* 019DC 809B9CBC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 019E0 809B9CC0 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 019E4 809B9CC4 E6120274 */ swc1 $f18, 0x0274($s0) ## 00000274 -/* 019E8 809B9CC8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 019E8 809B9CC8 0C01E0C4 */ jal Math_SmoothStepToF /* 019EC 809B9CCC E7A20010 */ swc1 $f2, 0x0010($sp) /* 019F0 809B9CD0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 @@ -111,7 +111,7 @@ glabel func_809B9B64 /* 019F8 809B9CD8 3C0542C8 */ lui $a1, 0x42C8 ## $a1 = 42C80000 /* 019FC 809B9CDC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01A00 809B9CE0 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 01A04 809B9CE4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01A04 809B9CE4 0C01E0C4 */ jal Math_SmoothStepToF /* 01A08 809B9CE8 E7A20010 */ swc1 $f2, 0x0010($sp) /* 01A0C 809B9CEC 96040088 */ lhu $a0, 0x0088($s0) ## 00000088 @@ -182,7 +182,7 @@ glabel func_809B9B64 /* 01AFC 809B9DDC 00000000 */ nop /* 01B00 809B9DE0 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 .L809B9DE4: -/* 01B04 809B9DE4 0C0329C8 */ jal func_800CA720 +/* 01B04 809B9DE4 0C0329C8 */ jal Math_SinF /* 01B08 809B9DE8 C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 /* 01B0C 809B9DEC 3C01809C */ lui $at, %hi(D_809BBCA0) ## $at = 809C0000 /* 01B10 809B9DF0 C430BCA0 */ lwc1 $f16, %lo(D_809BBCA0)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s index fe529c368b..3d2e364585 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s @@ -21,7 +21,7 @@ glabel func_809BA028 /* 01D94 809BA074 E4CA0028 */ swc1 $f10, 0x0028($a2) ## 00000028 /* 01D98 809BA078 A0C0029D */ sb $zero, 0x029D($a2) ## 0000029D /* 01D9C 809BA07C E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 01DA0 809BA080 0C03F66B */ jal Math_Rand_ZeroOne +/* 01DA0 809BA080 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01DA4 809BA084 E4D0028C */ swc1 $f16, 0x028C($a2) ## 0000028C /* 01DA8 809BA088 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s index d78ded7614..1682279ae4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s @@ -27,25 +27,25 @@ glabel func_809BA0D8 /* 01E34 809BA114 AFA4002C */ sw $a0, 0x002C($sp) /* 01E38 809BA118 00022400 */ sll $a0, $v0, 16 /* 01E3C 809BA11C A7A20042 */ sh $v0, 0x0042($sp) -/* 01E40 809BA120 0C01DE1C */ jal Math_Sins +/* 01E40 809BA120 0C01DE1C */ jal Math_SinS ## sins? /* 01E44 809BA124 00042403 */ sra $a0, $a0, 16 /* 01E48 809BA128 C606027C */ lwc1 $f6, 0x027C($s0) ## 0000027C /* 01E4C 809BA12C 87A40042 */ lh $a0, 0x0042($sp) /* 01E50 809BA130 46060202 */ mul.s $f8, $f0, $f6 -/* 01E54 809BA134 0C01DE0D */ jal Math_Coss +/* 01E54 809BA134 0C01DE0D */ jal Math_CosS ## coss? /* 01E58 809BA138 E7A8003C */ swc1 $f8, 0x003C($sp) /* 01E5C 809BA13C C60A027C */ lwc1 $f10, 0x027C($s0) ## 0000027C /* 01E60 809BA140 460A0402 */ mul.s $f16, $f0, $f10 /* 01E64 809BA144 E7B00038 */ swc1 $f16, 0x0038($sp) -/* 01E68 809BA148 0C01DE1C */ jal Math_Sins +/* 01E68 809BA148 0C01DE1C */ jal Math_SinS ## sins? /* 01E6C 809BA14C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 01E70 809BA150 C7B20038 */ lwc1 $f18, 0x0038($sp) /* 01E74 809BA154 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 01E78 809BA158 46120082 */ mul.s $f2, $f0, $f18 -/* 01E7C 809BA15C 0C01DE0D */ jal Math_Coss +/* 01E7C 809BA15C 0C01DE0D */ jal Math_CosS ## coss? /* 01E80 809BA160 E7A20048 */ swc1 $f2, 0x0048($sp) /* 01E84 809BA164 C7A20048 */ lwc1 $f2, 0x0048($sp) @@ -65,7 +65,7 @@ glabel func_809BA0D8 /* 01EB8 809BA198 8E050290 */ lw $a1, 0x0290($s0) ## 00000290 /* 01EBC 809BA19C 44070000 */ mfc1 $a3, $f0 /* 01EC0 809BA1A0 E7AC0044 */ swc1 $f12, 0x0044($sp) -/* 01EC4 809BA1A4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01EC4 809BA1A4 0C01E0C4 */ jal Math_SmoothStepToF /* 01EC8 809BA1A8 E7A80010 */ swc1 $f8, 0x0010($sp) /* 01ECC 809BA1AC C7AE003C */ lwc1 $f14, 0x003C($sp) @@ -86,7 +86,7 @@ glabel func_809BA0D8 /* 01F04 809BA1E4 44070000 */ mfc1 $a3, $f0 /* 01F08 809BA1E8 E7AC0044 */ swc1 $f12, 0x0044($sp) /* 01F0C 809BA1EC E7A2004C */ swc1 $f2, 0x004C($sp) -/* 01F10 809BA1F0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01F10 809BA1F0 0C01E0C4 */ jal Math_SmoothStepToF /* 01F14 809BA1F4 E7B00010 */ swc1 $f16, 0x0010($sp) /* 01F18 809BA1F8 C7AC0044 */ lwc1 $f12, 0x0044($sp) @@ -106,12 +106,12 @@ glabel func_809BA0D8 /* 01F4C 809BA22C 8E050298 */ lw $a1, 0x0298($s0) ## 00000298 /* 01F50 809BA230 44070000 */ mfc1 $a3, $f0 /* 01F54 809BA234 E7A2004C */ swc1 $f2, 0x004C($sp) -/* 01F58 809BA238 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01F58 809BA238 0C01E0C4 */ jal Math_SmoothStepToF /* 01F5C 809BA23C E7A40010 */ swc1 $f4, 0x0010($sp) /* 01F60 809BA240 C7A2004C */ lwc1 $f2, 0x004C($sp) /* 01F64 809BA244 46001080 */ add.s $f2, $f2, $f0 -/* 01F68 809BA248 0C03F66B */ jal Math_Rand_ZeroOne +/* 01F68 809BA248 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01F6C 809BA24C E7A2004C */ swc1 $f2, 0x004C($sp) /* 01F70 809BA250 3C01809C */ lui $at, %hi(D_809BBCA4) ## $at = 809C0000 @@ -141,7 +141,7 @@ glabel func_809BA0D8 /* 01FD0 809BA2B0 24A50184 */ addiu $a1, $a1, %lo(D_06000184) ## $a1 = 06000184 /* 01FD4 809BA2B4 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 01FD8 809BA2B8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01FDC 809BA2BC 0C03F66B */ jal Math_Rand_ZeroOne +/* 01FDC 809BA2BC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01FE0 809BA2C0 00000000 */ nop /* 01FE4 809BA2C4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -195,7 +195,7 @@ glabel func_809BA0D8 /* 02088 809BA368 44050000 */ mfc1 $a1, $f0 .L809BA36C: /* 0208C 809BA36C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 02090 809BA370 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02090 809BA370 0C01E0C4 */ jal Math_SmoothStepToF /* 02094 809BA374 E7A00010 */ swc1 $f0, 0x0010($sp) /* 02098 809BA378 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 @@ -216,7 +216,7 @@ glabel func_809BA0D8 /* 020CC 809BA3AC 00000000 */ nop /* 020D0 809BA3B0 5520000D */ bnel $t1, $zero, .L809BA3E8 /* 020D4 809BA3B4 C6080164 */ lwc1 $f8, 0x0164($s0) ## 00000164 -/* 020D8 809BA3B8 0C03F66B */ jal Math_Rand_ZeroOne +/* 020D8 809BA3B8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 020DC 809BA3BC 00000000 */ nop /* 020E0 809BA3C0 3C01809C */ lui $at, %hi(D_809BBCAC) ## $at = 809C0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s index f114966024..d57de245ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s @@ -19,7 +19,7 @@ glabel func_809BA458 /* 021BC 809BA49C ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC /* 021C0 809BA4A0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 021C4 809BA4A4 AE08025C */ sw $t0, 0x025C($s0) ## 0000025C -/* 021C8 809BA4A8 0C03F66B */ jal Math_Rand_ZeroOne +/* 021C8 809BA4A8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 021CC 809BA4AC A6000268 */ sh $zero, 0x0268($s0) ## 00000268 /* 021D0 809BA4B0 860B001C */ lh $t3, 0x001C($s0) ## 0000001C @@ -59,7 +59,7 @@ glabel func_809BA458 /* 02254 809BA534 240C0009 */ addiu $t4, $zero, 0x0009 ## $t4 = 00000009 /* 02258 809BA538 AE000324 */ sw $zero, 0x0324($s0) ## 00000324 /* 0225C 809BA53C AE0C0250 */ sw $t4, 0x0250($s0) ## 00000250 -/* 02260 809BA540 0C03F66B */ jal Math_Rand_ZeroOne +/* 02260 809BA540 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02264 809BA544 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 /* 02268 809BA548 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s index 47007ed707..8200b7e9f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s @@ -15,7 +15,7 @@ glabel func_809BA590 /* 022E4 809BA5C4 A4C00268 */ sh $zero, 0x0268($a2) ## 00000268 /* 022E8 809BA5C8 ACC00324 */ sw $zero, 0x0324($a2) ## 00000324 /* 022EC 809BA5CC ACCF0250 */ sw $t7, 0x0250($a2) ## 00000250 -/* 022F0 809BA5D0 0C03F66B */ jal Math_Rand_ZeroOne +/* 022F0 809BA5D0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 022F4 809BA5D4 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 /* 022F8 809BA5D8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s index 088b6838cd..f401383abc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s @@ -64,13 +64,13 @@ glabel func_809BA628 /* 02400 809BA6E0 8FA4002C */ lw $a0, 0x002C($sp) /* 02404 809BA6E4 A7A20050 */ sh $v0, 0x0050($sp) -/* 02408 809BA6E8 0C01DE1C */ jal Math_Sins +/* 02408 809BA6E8 0C01DE1C */ jal Math_SinS ## sins? /* 0240C 809BA6EC 87A40052 */ lh $a0, 0x0052($sp) /* 02410 809BA6F0 C610027C */ lwc1 $f16, 0x027C($s0) ## 0000027C /* 02414 809BA6F4 87A40052 */ lh $a0, 0x0052($sp) /* 02418 809BA6F8 46100482 */ mul.s $f18, $f0, $f16 -/* 0241C 809BA6FC 0C01DE0D */ jal Math_Coss +/* 0241C 809BA6FC 0C01DE0D */ jal Math_CosS ## coss? /* 02420 809BA700 E7B2004C */ swc1 $f18, 0x004C($sp) /* 02424 809BA704 C604027C */ lwc1 $f4, 0x027C($s0) ## 0000027C @@ -80,16 +80,16 @@ glabel func_809BA628 /* 02434 809BA714 87A50050 */ lh $a1, 0x0050($sp) /* 02438 809BA718 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0243C 809BA71C 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 02440 809BA720 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 02440 809BA720 0C01E1A7 */ jal Math_SmoothStepToS /* 02444 809BA724 E7A60048 */ swc1 $f6, 0x0048($sp) -/* 02448 809BA728 0C01DE1C */ jal Math_Sins +/* 02448 809BA728 0C01DE1C */ jal Math_SinS ## sins? /* 0244C 809BA72C 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 02450 809BA730 C7A80048 */ lwc1 $f8, 0x0048($sp) /* 02454 809BA734 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 02458 809BA738 46080082 */ mul.s $f2, $f0, $f8 -/* 0245C 809BA73C 0C01DE0D */ jal Math_Coss +/* 0245C 809BA73C 0C01DE0D */ jal Math_CosS ## coss? /* 02460 809BA740 E7A20040 */ swc1 $f2, 0x0040($sp) /* 02464 809BA744 C7A20040 */ lwc1 $f2, 0x0040($sp) @@ -109,7 +109,7 @@ glabel func_809BA628 /* 02498 809BA778 8E050290 */ lw $a1, 0x0290($s0) ## 00000290 /* 0249C 809BA77C 44070000 */ mfc1 $a3, $f0 /* 024A0 809BA780 E7AC003C */ swc1 $f12, 0x003C($sp) -/* 024A4 809BA784 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 024A4 809BA784 0C01E0C4 */ jal Math_SmoothStepToF /* 024A8 809BA788 E7B20010 */ swc1 $f18, 0x0010($sp) /* 024AC 809BA78C C7AE004C */ lwc1 $f14, 0x004C($sp) @@ -130,7 +130,7 @@ glabel func_809BA628 /* 024E4 809BA7C4 44070000 */ mfc1 $a3, $f0 /* 024E8 809BA7C8 E7AC003C */ swc1 $f12, 0x003C($sp) /* 024EC 809BA7CC E7A20044 */ swc1 $f2, 0x0044($sp) -/* 024F0 809BA7D0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 024F0 809BA7D0 0C01E0C4 */ jal Math_SmoothStepToF /* 024F4 809BA7D4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 024F8 809BA7D8 C7AC003C */ lwc1 $f12, 0x003C($sp) @@ -150,12 +150,12 @@ glabel func_809BA628 /* 0252C 809BA80C 8E050298 */ lw $a1, 0x0298($s0) ## 00000298 /* 02530 809BA810 44070000 */ mfc1 $a3, $f0 /* 02534 809BA814 E7A20044 */ swc1 $f2, 0x0044($sp) -/* 02538 809BA818 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02538 809BA818 0C01E0C4 */ jal Math_SmoothStepToF /* 0253C 809BA81C E7AA0010 */ swc1 $f10, 0x0010($sp) /* 02540 809BA820 C7A20044 */ lwc1 $f2, 0x0044($sp) /* 02544 809BA824 46001080 */ add.s $f2, $f2, $f0 -/* 02548 809BA828 0C03F66B */ jal Math_Rand_ZeroOne +/* 02548 809BA828 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0254C 809BA82C E7A20044 */ swc1 $f2, 0x0044($sp) /* 02550 809BA830 3C01809C */ lui $at, %hi(D_809BBCB0) ## $at = 809C0000 @@ -191,7 +191,7 @@ glabel func_809BA628 /* 025C0 809BA8A0 3319FFFD */ andi $t9, $t8, 0xFFFD ## $t9 = 00000000 /* 025C4 809BA8A4 A21902BC */ sb $t9, 0x02BC($s0) ## 000002BC .L809BA8A8: -/* 025C8 809BA8A8 0C0329DD */ jal func_800CA774 +/* 025C8 809BA8A8 0C0329DD */ jal Math_CosF /* 025CC 809BA8AC C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 /* 025D0 809BA8B0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 025D4 809BA8B4 00000000 */ nop @@ -202,13 +202,13 @@ glabel func_809BA628 /* 025E8 809BA8C8 8608026A */ lh $t0, 0x026A($s0) ## 0000026A /* 025EC 809BA8CC 11000005 */ beq $t0, $zero, .L809BA8E4 /* 025F0 809BA8D0 00000000 */ nop -/* 025F4 809BA8D4 0C03F66B */ jal Math_Rand_ZeroOne +/* 025F4 809BA8D4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 025F8 809BA8D8 00000000 */ nop /* 025FC 809BA8DC 1000000A */ beq $zero, $zero, .L809BA908 /* 02600 809BA8E0 E6000284 */ swc1 $f0, 0x0284($s0) ## 00000284 .L809BA8E4: -/* 02604 809BA8E4 0C03F66B */ jal Math_Rand_ZeroOne +/* 02604 809BA8E4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02608 809BA8E8 00000000 */ nop /* 0260C 809BA8EC 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -227,7 +227,7 @@ glabel func_809BA628 /* 02634 809BA914 44050000 */ mfc1 $a1, $f0 .L809BA918: /* 02638 809BA918 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 0263C 809BA91C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0263C 809BA91C 0C01E0C4 */ jal Math_SmoothStepToF /* 02640 809BA920 E7A00010 */ swc1 $f0, 0x0010($sp) /* 02644 809BA924 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 @@ -248,7 +248,7 @@ glabel func_809BA628 /* 02674 809BA954 AFA00010 */ sw $zero, 0x0010($sp) /* 02678 809BA958 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 0267C 809BA95C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02680 809BA960 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 02680 809BA960 0C01E1A7 */ jal Math_SmoothStepToS /* 02684 809BA964 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 02688 809BA968 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 @@ -261,14 +261,14 @@ glabel func_809BA628 /* 026A0 809BA980 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 026A4 809BA984 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 026A8 809BA988 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 026AC 809BA98C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 026AC 809BA98C 0C01E1A7 */ jal Math_SmoothStepToS /* 026B0 809BA990 AFA00010 */ sw $zero, 0x0010($sp) .L809BA994: /* 026B4 809BA994 0C02927F */ jal SkelAnime_FrameUpdateMatrix /* 026B8 809BA998 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 026BC 809BA99C 0C0329DD */ jal func_800CA774 +/* 026BC 809BA99C 0C0329DD */ jal Math_CosF /* 026C0 809BA9A0 C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 /* 026C4 809BA9A4 3C01809C */ lui $at, %hi(D_809BBCB8) ## $at = 809C0000 /* 026C8 809BA9A8 C432BCB8 */ lwc1 $f18, %lo(D_809BBCB8)($at) @@ -276,7 +276,7 @@ glabel func_809BA628 /* 026D0 809BA9B0 00000000 */ nop /* 026D4 809BA9B4 45020008 */ bc1fl .L809BA9D8 /* 026D8 809BA9B8 C60C0008 */ lwc1 $f12, 0x0008($s0) ## 00000008 -/* 026DC 809BA9BC 0C03F66B */ jal Math_Rand_ZeroOne +/* 026DC 809BA9BC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 026E0 809BA9C0 00000000 */ nop /* 026E4 809BA9C4 3C01809C */ lui $at, %hi(D_809BBCBC) ## $at = 809C0000 @@ -312,7 +312,7 @@ glabel func_809BA628 /* 02758 809BAA38 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0275C 809BAA3C E7B00010 */ swc1 $f16, 0x0010($sp) /* 02760 809BAA40 44079000 */ mfc1 $a3, $f18 -/* 02764 809BAA44 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02764 809BAA44 0C01E0C4 */ jal Math_SmoothStepToF /* 02768 809BAA48 00000000 */ nop /* 0276C 809BAA4C 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 @@ -325,7 +325,7 @@ glabel func_809BA628 /* 02788 809BAA68 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0278C 809BAA6C E7AA0010 */ swc1 $f10, 0x0010($sp) /* 02790 809BAA70 44073000 */ mfc1 $a3, $f6 -/* 02794 809BAA74 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02794 809BAA74 0C01E0C4 */ jal Math_SmoothStepToF /* 02798 809BAA78 00000000 */ nop /* 0279C 809BAA7C 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 @@ -338,7 +338,7 @@ glabel func_809BA628 /* 027B8 809BAA98 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 027BC 809BAA9C E7A80010 */ swc1 $f8, 0x0010($sp) /* 027C0 809BAAA0 44072000 */ mfc1 $a3, $f4 -/* 027C4 809BAAA4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 027C4 809BAAA4 0C01E0C4 */ jal Math_SmoothStepToF /* 027C8 809BAAA8 00000000 */ nop /* 027CC 809BAAAC 3C01809C */ lui $at, %hi(D_809BBCC0) ## $at = 809C0000 @@ -362,7 +362,7 @@ glabel func_809BA628 /* 02814 809BAAF4 860E0268 */ lh $t6, 0x0268($s0) ## 00000268 .L809BAAF8: /* 02818 809BAAF8 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 0281C 809BAAFC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0281C 809BAAFC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02820 809BAB00 A60F0268 */ sh $t7, 0x0268($s0) ## 00000268 /* 02824 809BAB04 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -394,7 +394,7 @@ glabel func_809BA628 /* 02880 809BAB60 258DFFFF */ addiu $t5, $t4, 0xFFFF ## $t5 = FFFFFFFF /* 02884 809BAB64 15A0000F */ bne $t5, $zero, .L809BABA4 /* 02888 809BAB68 AE0D0260 */ sw $t5, 0x0260($s0) ## 00000260 -/* 0288C 809BAB6C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0288C 809BAB6C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02890 809BAB70 A6000268 */ sh $zero, 0x0268($s0) ## 00000268 /* 02894 809BAB74 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -416,7 +416,7 @@ glabel func_809BA628 /* 028CC 809BABAC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 028D0 809BABB0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 028D4 809BABB4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 028D8 809BABB8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 028D8 809BABB8 0C01E0C4 */ jal Math_SmoothStepToF /* 028DC 809BABBC E7B20010 */ swc1 $f18, 0x0010($sp) /* 028E0 809BABC0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -424,7 +424,7 @@ glabel func_809BA628 /* 028E8 809BABC8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 028EC 809BABCC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 028F0 809BABD0 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 028F4 809BABD4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 028F4 809BABD4 0C01E0C4 */ jal Math_SmoothStepToF /* 028F8 809BABD8 E7A40010 */ swc1 $f4, 0x0010($sp) /* 028FC 809BABDC 1000000D */ beq $zero, $zero, .L809BAC14 @@ -432,7 +432,7 @@ glabel func_809BA628 .L809BABE4: /* 02904 809BABE4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 02908 809BABE8 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 0290C 809BABEC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0290C 809BABEC 0C01E0C4 */ jal Math_SmoothStepToF /* 02910 809BABF0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 02914 809BABF4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 @@ -440,7 +440,7 @@ glabel func_809BA628 /* 0291C 809BABFC 3C0542C8 */ lui $a1, 0x42C8 ## $a1 = 42C80000 /* 02920 809BAC00 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02924 809BAC04 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 02928 809BAC08 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02928 809BAC08 0C01E0C4 */ jal Math_SmoothStepToF /* 0292C 809BAC0C E7A60010 */ swc1 $f6, 0x0010($sp) /* 02930 809BAC10 C60A0164 */ lwc1 $f10, 0x0164($s0) ## 00000164 @@ -462,7 +462,7 @@ glabel func_809BA628 .L809BAC48: /* 02968 809BAC48 5440000D */ bnel $v0, $zero, .L809BAC80 /* 0296C 809BAC4C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02970 809BAC50 0C03F66B */ jal Math_Rand_ZeroOne +/* 02970 809BAC50 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02974 809BAC54 00000000 */ nop /* 02978 809BAC58 3C01809C */ lui $at, %hi(D_809BBCC4) ## $at = 809C0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Init.s index 78bdfcdb9c..628b7db595 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/EnBdfire_Init.s @@ -144,7 +144,7 @@ glabel EnBdfire_Init /* 001F8 809BC228 00000000 */ nop /* 001FC 809BC22C E60C018C */ swc1 $f12, 0x018C($s0) ## 0000018C .L809BC230: -/* 00200 809BC230 0C03F66B */ jal Math_Rand_ZeroOne +/* 00200 809BC230 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00204 809BC234 00000000 */ nop /* 00208 809BC238 3C014100 */ lui $at, 0x4100 ## $at = 41000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC2A4.s b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC2A4.s index 4cb9f20d29..cde003b22e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC2A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC2A4.s @@ -21,14 +21,14 @@ glabel func_809BC2A4 /* 002C0 809BC2F0 3C073F19 */ lui $a3, 0x3F19 ## $a3 = 3F190000 /* 002C4 809BC2F4 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3F19999A /* 002C8 809BC2F8 4405A000 */ mfc1 $a1, $f20 -/* 002CC 809BC2FC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 002CC 809BC2FC 0C01E0C4 */ jal Math_SmoothStepToF /* 002D0 809BC300 E7B40010 */ swc1 $f20, 0x0010($sp) /* 002D4 809BC304 4405A000 */ mfc1 $a1, $f20 /* 002D8 809BC308 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C /* 002DC 809BC30C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 002E0 809BC310 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 002E4 809BC314 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 002E4 809BC314 0C01E0C4 */ jal Math_SmoothStepToF /* 002E8 809BC318 E7B40010 */ swc1 $f20, 0x0010($sp) /* 002EC 809BC31C 46140032 */ c.eq.s $f0, $f20 @@ -50,7 +50,7 @@ glabel func_809BC2A4 /* 00324 809BC354 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 /* 00328 809BC358 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0032C 809BC35C 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 00330 809BC360 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00330 809BC360 0C01E0C4 */ jal Math_SmoothStepToF /* 00334 809BC364 E7B40010 */ swc1 $f20, 0x0010($sp) /* 00338 809BC368 3C074074 */ lui $a3, 0x4074 ## $a3 = 40740000 @@ -58,14 +58,14 @@ glabel func_809BC2A4 /* 00340 809BC370 26040190 */ addiu $a0, $s0, 0x0190 ## $a0 = 00000190 /* 00344 809BC374 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 00348 809BC378 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0034C 809BC37C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0034C 809BC37C 0C01E0C4 */ jal Math_SmoothStepToF /* 00350 809BC380 E7B40010 */ swc1 $f20, 0x0010($sp) /* 00354 809BC384 26040194 */ addiu $a0, $s0, 0x0194 ## $a0 = 00000194 /* 00358 809BC388 3C0542C8 */ lui $a1, 0x42C8 ## $a1 = 42C80000 /* 0035C 809BC38C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00360 809BC390 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 00364 809BC394 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00364 809BC394 0C01E0C4 */ jal Math_SmoothStepToF /* 00368 809BC398 E7B40010 */ swc1 $f20, 0x0010($sp) /* 0036C 809BC39C 86020154 */ lh $v0, 0x0154($s0) ## 00000154 @@ -91,28 +91,28 @@ glabel func_809BC2A4 /* 003B0 809BC3E0 AFB8003C */ sw $t8, 0x003C($sp) /* 003B4 809BC3E4 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E99999A /* 003B8 809BC3E8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 003BC 809BC3EC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 003BC 809BC3EC 0C01E0C4 */ jal Math_SmoothStepToF /* 003C0 809BC3F0 E7B40010 */ swc1 $f20, 0x0010($sp) /* 003C4 809BC3F4 4405A000 */ mfc1 $a1, $f20 /* 003C8 809BC3F8 8FA40038 */ lw $a0, 0x0038($sp) /* 003CC 809BC3FC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 003D0 809BC400 3C0741CC */ lui $a3, 0x41CC ## $a3 = 41CC0000 -/* 003D4 809BC404 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 003D4 809BC404 0C01E0C4 */ jal Math_SmoothStepToF /* 003D8 809BC408 E7B40010 */ swc1 $f20, 0x0010($sp) /* 003DC 809BC40C 4405A000 */ mfc1 $a1, $f20 /* 003E0 809BC410 8FA40034 */ lw $a0, 0x0034($sp) /* 003E4 809BC414 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 003E8 809BC418 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 003EC 809BC41C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 003EC 809BC41C 0C01E0C4 */ jal Math_SmoothStepToF /* 003F0 809BC420 E7B40010 */ swc1 $f20, 0x0010($sp) /* 003F4 809BC424 4405A000 */ mfc1 $a1, $f20 /* 003F8 809BC428 8FA4003C */ lw $a0, 0x003C($sp) /* 003FC 809BC42C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00400 809BC430 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 00404 809BC434 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00404 809BC434 0C01E0C4 */ jal Math_SmoothStepToF /* 00408 809BC438 E7B40010 */ swc1 $f20, 0x0010($sp) /* 0040C 809BC43C 46140032 */ c.eq.s $f0, $f20 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC598.s b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC598.s index 10215375bf..4bba17a674 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC598.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC598.s @@ -49,7 +49,7 @@ glabel func_809BC598 /* 005DC 809BC60C A7A3003E */ sh $v1, 0x003E($sp) /* 005E0 809BC610 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 /* 005E4 809BC614 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 005E8 809BC618 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 005E8 809BC618 0C01E0C4 */ jal Math_SmoothStepToF /* 005EC 809BC61C E7A40010 */ swc1 $f4, 0x0010($sp) /* 005F0 809BC620 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -157,7 +157,7 @@ glabel func_809BC598 /* 00760 809BC790 44076000 */ mfc1 $a3, $f12 /* 00764 809BC794 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00768 809BC798 44050000 */ mfc1 $a1, $f0 -/* 0076C 809BC79C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0076C 809BC79C 0C01E0C4 */ jal Math_SmoothStepToF /* 00770 809BC7A0 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00774 809BC7A4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -192,7 +192,7 @@ glabel func_809BC598 .L809BC810: /* 007E0 809BC810 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 007E4 809BC814 240500C8 */ addiu $a1, $zero, 0x00C8 ## $a1 = 000000C8 -/* 007E8 809BC818 0C01DF64 */ jal Math_Rand_S16Offset +/* 007E8 809BC818 0C01DF64 */ jal Rand_S16Offset /* 007EC 809BC81C A7A3002E */ sh $v1, 0x002E($sp) /* 007F0 809BC820 87A3002E */ lh $v1, 0x002E($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s index 0b88b42527..0732b0ef79 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s @@ -90,13 +90,13 @@ glabel EnBigokuta_Draw /* 0253C 809BF19C 54200021 */ bnel $at, $zero, .L809BF224 /* 02540 809BF1A0 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 .L809BF1A4: -/* 02544 809BF1A4 0C03F66B */ jal Math_Rand_ZeroOne +/* 02544 809BF1A4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02548 809BF1A8 00000000 */ nop /* 0254C 809BF1AC 3C01809C */ lui $at, %hi(D_809BF580) ## $at = 809C0000 /* 02550 809BF1B0 C424F580 */ lwc1 $f4, %lo(D_809BF580)($at) /* 02554 809BF1B4 46040182 */ mul.s $f6, $f0, $f4 -/* 02558 809BF1B8 0C03F66B */ jal Math_Rand_ZeroOne +/* 02558 809BF1B8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0255C 809BF1BC E7A6004C */ swc1 $f6, 0x004C($sp) /* 02560 809BF1C0 3C01809C */ lui $at, %hi(D_809BF584) ## $at = 809C0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCE3C.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCE3C.s index 870f84aa85..5d9fb12a67 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCE3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCE3C.s @@ -16,7 +16,7 @@ glabel func_809BCE3C /* 001F8 809BCE58 01D8C821 */ addu $t9, $t6, $t8 /* 001FC 809BCE5C A4990032 */ sh $t9, 0x0032($a0) ## 00000032 /* 00200 809BCE60 84840032 */ lh $a0, 0x0032($a0) ## 00000032 -/* 00204 809BCE64 0C01DE1C */ jal Math_Sins +/* 00204 809BCE64 0C01DE1C */ jal Math_SinS ## sins? /* 00208 809BCE68 AFA50018 */ sw $a1, 0x0018($sp) /* 0020C 809BCE6C 3C01809C */ lui $at, %hi(D_809BF52C) ## $at = 809C0000 @@ -26,7 +26,7 @@ glabel func_809BCE3C /* 0021C 809BCE7C C4A80008 */ lwc1 $f8, 0x0008($a1) ## 00000008 /* 00220 809BCE80 84A40032 */ lh $a0, 0x0032($a1) ## 00000032 /* 00224 809BCE84 46083280 */ add.s $f10, $f6, $f8 -/* 00228 809BCE88 0C01DE0D */ jal Math_Coss +/* 00228 809BCE88 0C01DE0D */ jal Math_CosS ## coss? /* 0022C 809BCE8C E4AA0024 */ swc1 $f10, 0x0024($a1) ## 00000024 /* 00230 809BCE90 3C01809C */ lui $at, %hi(D_809BF530) ## $at = 809C0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCF68.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCF68.s index fa30f8c7bc..07081351db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCF68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCF68.s @@ -13,7 +13,7 @@ glabel func_809BCF68 /* 00334 809BCF94 24050C00 */ addiu $a1, $zero, 0x0C00 ## $a1 = 00000C00 /* 00338 809BCF98 24041200 */ addiu $a0, $zero, 0x1200 ## $a0 = 00001200 /* 0033C 809BCF9C 24050C00 */ addiu $a1, $zero, 0x0C00 ## $a1 = 00000C00 -/* 00340 809BCFA0 0C01DF64 */ jal Math_Rand_S16Offset +/* 00340 809BCFA0 0C01DF64 */ jal Rand_S16Offset /* 00344 809BCFA4 AFA30034 */ sw $v1, 0x0034($sp) /* 00348 809BCFA8 82080194 */ lb $t0, 0x0194($s0) ## 00000194 @@ -28,7 +28,7 @@ glabel func_809BCF68 /* 0036C 809BCFCC 1000000D */ beq $zero, $zero, .L809BD004 /* 00370 809BCFD0 00042403 */ sra $a0, $a0, 16 .L809BCFD4: -/* 00374 809BCFD4 0C01DF64 */ jal Math_Rand_S16Offset +/* 00374 809BCFD4 0C01DF64 */ jal Rand_S16Offset /* 00378 809BCFD8 AFA30034 */ sw $v1, 0x0034($sp) /* 0037C 809BCFDC 820B0194 */ lb $t3, 0x0194($s0) ## 00000194 @@ -57,7 +57,7 @@ glabel func_809BCF68 /* 003D4 809BD034 1100001E */ beq $t0, $zero, .L809BD0B0 /* 003D8 809BD038 00000000 */ nop .L809BD03C: -/* 003DC 809BD03C 0C01DE1C */ jal Math_Sins +/* 003DC 809BD03C 0C01DE1C */ jal Math_SinS ## sins? /* 003E0 809BD040 A7A4003A */ sh $a0, 0x003A($sp) /* 003E4 809BD044 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 @@ -66,7 +66,7 @@ glabel func_809BCF68 /* 003F0 809BD050 87A4003A */ lh $a0, 0x003A($sp) /* 003F4 809BD054 46060202 */ mul.s $f8, $f0, $f6 /* 003F8 809BD058 46082281 */ sub.s $f10, $f4, $f8 -/* 003FC 809BD05C 0C01DE0D */ jal Math_Coss +/* 003FC 809BD05C 0C01DE0D */ jal Math_CosS ## coss? /* 00400 809BD060 E7AA003C */ swc1 $f10, 0x003C($sp) /* 00404 809BD064 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 @@ -89,7 +89,7 @@ glabel func_809BCF68 /* 00448 809BD0A8 10000033 */ beq $zero, $zero, .L809BD178 /* 0044C 809BD0AC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 .L809BD0B0: -/* 00450 809BD0B0 0C01DE1C */ jal Math_Sins +/* 00450 809BD0B0 0C01DE1C */ jal Math_SinS ## sins? /* 00454 809BD0B4 A7A4003A */ sh $a0, 0x003A($sp) /* 00458 809BD0B8 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 @@ -98,7 +98,7 @@ glabel func_809BCF68 /* 00464 809BD0C4 87A4003A */ lh $a0, 0x003A($sp) /* 00468 809BD0C8 46060102 */ mul.s $f4, $f0, $f6 /* 0046C 809BD0CC 46048201 */ sub.s $f8, $f16, $f4 -/* 00470 809BD0D0 0C01DE0D */ jal Math_Coss +/* 00470 809BD0D0 0C01DE0D */ jal Math_CosS ## coss? /* 00474 809BD0D4 E7A8003C */ swc1 $f8, 0x003C($sp) /* 00478 809BD0D8 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 @@ -114,7 +114,7 @@ glabel func_809BCF68 /* 004A0 809BD100 1000001C */ beq $zero, $zero, .L809BD174 /* 004A4 809BD104 E7B20040 */ swc1 $f18, 0x0040($sp) .L809BD108: -/* 004A8 809BD108 0C01DE1C */ jal Math_Sins +/* 004A8 809BD108 0C01DE1C */ jal Math_SinS ## sins? /* 004AC 809BD10C A7A4003A */ sh $a0, 0x003A($sp) /* 004B0 809BD110 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -123,7 +123,7 @@ glabel func_809BCF68 /* 004BC 809BD11C 87A4003A */ lh $a0, 0x003A($sp) /* 004C0 809BD120 46060402 */ mul.s $f16, $f0, $f6 /* 004C4 809BD124 46105101 */ sub.s $f4, $f10, $f16 -/* 004C8 809BD128 0C01DE0D */ jal Math_Coss +/* 004C8 809BD128 0C01DE0D */ jal Math_CosS ## coss? /* 004CC 809BD12C E7A4003C */ swc1 $f4, 0x003C($sp) /* 004D0 809BD130 3C014248 */ lui $at, 0x4248 ## $at = 42480000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD2E4.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD2E4.s index 32d9d23032..138290cec9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD2E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD2E4.s @@ -6,7 +6,7 @@ glabel func_809BD2E4 /* 00694 809BD2F4 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 /* 00698 809BD2F8 10400003 */ beq $v0, $zero, .L809BD308 /* 0069C 809BD2FC 24440032 */ addiu $a0, $v0, 0x0032 ## $a0 = 00000032 -/* 006A0 809BD300 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 006A0 809BD300 0C01DE2B */ jal Math_ScaledStepToS /* 006A4 809BD304 84E5019A */ lh $a1, 0x019A($a3) ## 0000019A .L809BD308: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD6B8.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD6B8.s index b2ab122ff8..506c8aa8d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD6B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD6B8.s @@ -4,7 +4,7 @@ glabel func_809BD6B8 /* 00A60 809BD6C0 908E0195 */ lbu $t6, 0x0195($a0) ## 00000195 /* 00A64 809BD6C4 55C00010 */ bnel $t6, $zero, .L809BD708 /* 00A68 809BD6C8 849900B6 */ lh $t9, 0x00B6($a0) ## 000000B6 -/* 00A6C 809BD6CC 0C03F66B */ jal Math_Rand_ZeroOne +/* 00A6C 809BD6CC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A70 809BD6D0 AFA40018 */ sw $a0, 0x0018($sp) /* 00A74 809BD6D4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD768.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD768.s index 3e49f0c610..f97f6b4224 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD768.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD768.s @@ -1,7 +1,7 @@ glabel func_809BD768 /* 00B08 809BD768 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00B0C 809BD76C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B10 809BD770 0C03F66B */ jal Math_Rand_ZeroOne +/* 00B10 809BD770 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00B14 809BD774 AFA40018 */ sw $a0, 0x0018($sp) /* 00B18 809BD778 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD8DC.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD8DC.s index 1eea72ed76..2e7fcf1581 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD8DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD8DC.s @@ -29,7 +29,7 @@ glabel func_809BD8DC /* 00CBC 809BD91C 46062200 */ add.s $f8, $f4, $f6 /* 00CC0 809BD920 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 /* 00CC4 809BD924 44054000 */ mfc1 $a1, $f8 -/* 00CC8 809BD928 0C01DE80 */ jal Math_ApproxF +/* 00CC8 809BD928 0C01DE80 */ jal Math_StepToF /* 00CCC 809BD92C 00000000 */ nop /* 00CD0 809BD930 86020196 */ lh $v0, 0x0196($s0) ## 00000196 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDAE8.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDAE8.s index 8832ada0f8..e3c3e98f05 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDAE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDAE8.s @@ -9,7 +9,7 @@ glabel func_809BDAE8 /* 00EA4 809BDB04 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 /* 00EA8 809BDB08 24A54000 */ addiu $a1, $a1, 0x4000 ## $a1 = 00004000 /* 00EAC 809BDB0C 00052C00 */ sll $a1, $a1, 16 -/* 00EB0 809BDB10 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00EB0 809BDB10 0C01DE2B */ jal Math_ScaledStepToS /* 00EB4 809BDB14 00052C03 */ sra $a1, $a1, 16 /* 00EB8 809BDB18 50400019 */ beql $v0, $zero, .L809BDB80 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDC08.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDC08.s index 2d0b5165b7..6ed668c30a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDC08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDC08.s @@ -215,7 +215,7 @@ glabel func_809BDC08 /* 01284 809BDEE4 28413F01 */ slti $at, $v0, 0x3F01 /* 01288 809BDEE8 5420000E */ bnel $at, $zero, .L809BDF24 /* 0128C 809BDEEC 8FBF001C */ lw $ra, 0x001C($sp) -/* 01290 809BDEF0 0C03F66B */ jal Math_Rand_ZeroOne +/* 01290 809BDEF0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01294 809BDEF4 00000000 */ nop /* 01298 809BDEF8 3C01809C */ lui $at, %hi(D_809BF558) ## $at = 809C0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDFC8.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDFC8.s index 3a54fe4b90..8aa9af64b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDFC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDFC8.s @@ -25,7 +25,7 @@ glabel func_809BDFC8 /* 013B4 809BE014 1460000B */ bne $v1, $zero, .L809BE044 /* 013B8 809BE018 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 013BC 809BE01C 86050030 */ lh $a1, 0x0030($s0) ## 00000030 -/* 013C0 809BE020 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 013C0 809BE020 0C01DE2B */ jal Math_ScaledStepToS /* 013C4 809BE024 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 013C8 809BE028 50400007 */ beql $v0, $zero, .L809BE048 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE058.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE058.s index aa684aef7c..775450c5da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE058.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE058.s @@ -52,7 +52,7 @@ glabel func_809BE058 /* 014B0 809BE110 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 .L809BE114: /* 014B4 809BE114 E7A20020 */ swc1 $f2, 0x0020($sp) -/* 014B8 809BE118 0C01DE1C */ jal Math_Sins +/* 014B8 809BE118 0C01DE1C */ jal Math_SinS ## sins? /* 014BC 809BE11C AFA30024 */ sw $v1, 0x0024($sp) /* 014C0 809BE120 C7A20020 */ lwc1 $f2, 0x0020($sp) @@ -61,7 +61,7 @@ glabel func_809BE058 /* 014CC 809BE12C C4660024 */ lwc1 $f6, 0x0024($v1) ## 00000024 /* 014D0 809BE130 46083281 */ sub.s $f10, $f6, $f8 /* 014D4 809BE134 E46A0024 */ swc1 $f10, 0x0024($v1) ## 00000024 -/* 014D8 809BE138 0C01DE0D */ jal Math_Coss +/* 014D8 809BE138 0C01DE0D */ jal Math_CosS ## coss? /* 014DC 809BE13C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 014E0 809BE140 C7A20020 */ lwc1 $f2, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE26C.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE26C.s index b8de82b9c0..2111e16437 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE26C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE26C.s @@ -67,7 +67,7 @@ glabel func_809BE26C /* 016F8 809BE358 26040054 */ addiu $a0, $s0, 0x0054 ## $a0 = 00000054 /* 016FC 809BE35C 3C063A83 */ lui $a2, 0x3A83 ## $a2 = 3A830000 /* 01700 809BE360 34C6126F */ ori $a2, $a2, 0x126F ## $a2 = 3A83126F -/* 01704 809BE364 0C01DE80 */ jal Math_ApproxF +/* 01704 809BE364 0C01DE80 */ jal Math_StepToF /* 01708 809BE368 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0170C 809BE36C 10400018 */ beq $v0, $zero, .L809BE3D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE518.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE518.s index e134f19136..87ffca0d34 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE518.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE518.s @@ -6,7 +6,7 @@ glabel func_809BE518 /* 018C8 809BE528 8CE5000C */ lw $a1, 0x000C($a3) ## 0000000C /* 018CC 809BE52C AFA70018 */ sw $a3, 0x0018($sp) /* 018D0 809BE530 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 018D4 809BE534 0C01DE80 */ jal Math_ApproxF +/* 018D4 809BE534 0C01DE80 */ jal Math_StepToF /* 018D8 809BE538 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 018DC 809BE53C 10400006 */ beq $v0, $zero, .L809BE558 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE568.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE568.s index 4302ecebd4..0c3ccbc2e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE568.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE568.s @@ -3,12 +3,12 @@ glabel func_809BE568 /* 0190C 809BE56C AFBF0014 */ sw $ra, 0x0014($sp) /* 01910 809BE570 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 01914 809BE574 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 01918 809BE578 0C01DE1C */ jal Math_Sins +/* 01918 809BE578 0C01DE1C */ jal Math_SinS ## sins? /* 0191C 809BE57C AFA50020 */ sw $a1, 0x0020($sp) /* 01920 809BE580 8FA50020 */ lw $a1, 0x0020($sp) /* 01924 809BE584 84A400B6 */ lh $a0, 0x00B6($a1) ## 000000B6 -/* 01928 809BE588 0C01DE0D */ jal Math_Coss +/* 01928 809BE588 0C01DE0D */ jal Math_CosS ## coss? /* 0192C 809BE58C E7A00018 */ swc1 $f0, 0x0018($sp) /* 01930 809BE590 8FA50020 */ lw $a1, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFD94.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFD94.s index 1df626919b..d3184b7e29 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFD94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFD94.s @@ -72,7 +72,7 @@ glabel func_809BFD94 .L809BFE7C: /* 005DC 809BFE7C C62A002C */ lwc1 $f10, 0x002C($s1) ## 0000002C /* 005E0 809BFE80 460A0400 */ add.s $f16, $f0, $f10 -/* 005E4 809BFE84 0C03F66B */ jal Math_Rand_ZeroOne +/* 005E4 809BFE84 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 005E8 809BFE88 E7B00088 */ swc1 $f16, 0x0088($sp) /* 005EC 809BFE8C 461A0482 */ mul.s $f18, $f0, $f26 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C008C.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C008C.s index 3570ec2133..9ef9d3e563 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C008C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C008C.s @@ -37,7 +37,7 @@ glabel func_809C008C /* 00858 809C00F8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0085C 809C00FC AFA70018 */ sw $a3, 0x0018($sp) /* 00860 809C0100 44054000 */ mfc1 $a1, $f8 -/* 00864 809C0104 0C01DE80 */ jal Math_ApproxF +/* 00864 809C0104 0C01DE80 */ jal Math_StepToF /* 00868 809C0108 00000000 */ nop /* 0086C 809C010C 8FA70018 */ lw $a3, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0174.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0174.s index 27cffa03d1..24ff2c19b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0174.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0174.s @@ -27,7 +27,7 @@ glabel func_809C0174 .L809C01BC: /* 0091C 809C01BC 15E0000C */ bne $t7, $zero, .L809C01F0 /* 00920 809C01C0 00000000 */ nop -/* 00924 809C01C4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00924 809C01C4 0C00CFC8 */ jal Rand_CenteredFloat /* 00928 809C01C8 C42C174C */ lwc1 $f12, %lo(D_809C174C)($at) /* 0092C 809C01CC 86180032 */ lh $t8, 0x0032($s0) ## 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C02B8.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C02B8.s index 6f7c80eb11..e22c4f61dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C02B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C02B8.s @@ -41,7 +41,7 @@ glabel func_809C02B8 .L809C0350: /* 00AB0 809C0350 57200027 */ bnel $t9, $zero, .L809C03F0 /* 00AB4 809C0354 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 00AB8 809C0358 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00AB8 809C0358 0C00CFC8 */ jal Rand_CenteredFloat /* 00ABC 809C035C 4600B306 */ mov.s $f12, $f22 /* 00AC0 809C0360 4600010D */ trunc.w.s $f4, $f0 @@ -51,12 +51,12 @@ glabel func_809C02B8 /* 00AD0 809C0370 01728821 */ addu $s1, $t3, $s2 /* 00AD4 809C0374 26312000 */ addiu $s1, $s1, 0x2000 ## $s1 = 00002000 /* 00AD8 809C0378 00118C00 */ sll $s1, $s1, 16 -/* 00ADC 809C037C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00ADC 809C037C 0C00CFC8 */ jal Rand_CenteredFloat /* 00AE0 809C0380 00118C03 */ sra $s1, $s1, 16 /* 00AE4 809C0384 C6660024 */ lwc1 $f6, 0x0024($s3) ## 00000024 /* 00AE8 809C0388 46060200 */ add.s $f8, $f0, $f6 -/* 00AEC 809C038C 0C03F66B */ jal Math_Rand_ZeroOne +/* 00AEC 809C038C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00AF0 809C0390 E7A80078 */ swc1 $f8, 0x0078($sp) /* 00AF4 809C0394 46140282 */ mul.s $f10, $f0, $f20 @@ -64,7 +64,7 @@ glabel func_809C02B8 /* 00AFC 809C039C 4600A306 */ mov.s $f12, $f20 /* 00B00 809C03A0 46105480 */ add.s $f18, $f10, $f16 /* 00B04 809C03A4 46189100 */ add.s $f4, $f18, $f24 -/* 00B08 809C03A8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00B08 809C03A8 0C00CFC8 */ jal Rand_CenteredFloat /* 00B0C 809C03AC E7A4007C */ swc1 $f4, 0x007C($sp) /* 00B10 809C03B0 C666002C */ lwc1 $f6, 0x002C($s3) ## 0000002C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C04B4.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C04B4.s index 0e5e689ab2..047e944355 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C04B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C04B4.s @@ -37,7 +37,7 @@ glabel func_809C04B4 /* 00C94 809C0534 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 00C98 809C0538 46049180 */ add.s $f6, $f18, $f4 /* 00C9C 809C053C 44053000 */ mfc1 $a1, $f6 -/* 00CA0 809C0540 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00CA0 809C0540 0C01E107 */ jal Math_ApproachF /* 00CA4 809C0544 00000000 */ nop /* 00CA8 809C0548 8FAE002C */ lw $t6, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0570.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0570.s index 933f7af0e6..9625bfb185 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0570.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0570.s @@ -10,7 +10,7 @@ glabel func_809C0570 /* 00CEC 809C058C 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 00CF0 809C0590 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 00CF4 809C0594 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00CF8 809C0598 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 00CF8 809C0598 0C01E1EF */ jal Math_ApproachS /* 00CFC 809C059C 2407071C */ addiu $a3, $zero, 0x071C ## $a3 = 0000071C /* 00D00 809C05A0 86020196 */ lh $v0, 0x0196($s0) ## 00000196 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0600.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0600.s index bf54613bcf..3ce982ea48 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0600.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0600.s @@ -18,7 +18,7 @@ glabel func_809C0600 /* 00D98 809C0638 2406038E */ addiu $a2, $zero, 0x038E ## $a2 = 0000038E /* 00D9C 809C063C 00A12821 */ addu $a1, $a1, $at /* 00DA0 809C0640 00052C00 */ sll $a1, $a1, 16 -/* 00DA4 809C0644 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00DA4 809C0644 0C01DE2B */ jal Math_ScaledStepToS /* 00DA8 809C0648 00052C03 */ sra $a1, $a1, 16 /* 00DAC 809C064C 0C270023 */ jal func_809C008C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C067C.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C067C.s index 9bbfbe9b20..d0cb7ab6dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C067C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C067C.s @@ -11,7 +11,7 @@ glabel func_809C067C /* 00DFC 809C069C 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 /* 00E00 809C06A0 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 00E04 809C06A4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00E08 809C06A8 0C01DE80 */ jal Math_ApproxF +/* 00E08 809C06A8 0C01DE80 */ jal Math_StepToF /* 00E0C 809C06AC 24E40068 */ addiu $a0, $a3, 0x0068 ## $a0 = 00000068 /* 00E10 809C06B0 10400007 */ beq $v0, $zero, .L809C06D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0754.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0754.s index a9913226d3..98efa0e7b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0754.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0754.s @@ -61,39 +61,39 @@ glabel func_809C0754 /* 00F80 809C0820 26B516B4 */ addiu $s5, $s5, %lo(D_809C16B4) ## $s5 = 809C16B4 /* 00F84 809C0824 27B30078 */ addiu $s3, $sp, 0x0078 ## $s3 = FFFFFFF0 .L809C0828: -/* 00F88 809C0828 0C03F66B */ jal Math_Rand_ZeroOne +/* 00F88 809C0828 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00F8C 809C082C 00000000 */ nop /* 00F90 809C0830 46160102 */ mul.s $f4, $f0, $f22 /* 00F94 809C0834 C6460024 */ lwc1 $f6, 0x0024($s2) ## 00000024 /* 00F98 809C0838 46062200 */ add.s $f8, $f4, $f6 /* 00F9C 809C083C 46144281 */ sub.s $f10, $f8, $f20 -/* 00FA0 809C0840 0C03F66B */ jal Math_Rand_ZeroOne +/* 00FA0 809C0840 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00FA4 809C0844 E7AA0078 */ swc1 $f10, 0x0078($sp) /* 00FA8 809C0848 46140402 */ mul.s $f16, $f0, $f20 /* 00FAC 809C084C C6520028 */ lwc1 $f18, 0x0028($s2) ## 00000028 /* 00FB0 809C0850 46128100 */ add.s $f4, $f16, $f18 /* 00FB4 809C0854 46182181 */ sub.s $f6, $f4, $f24 -/* 00FB8 809C0858 0C03F66B */ jal Math_Rand_ZeroOne +/* 00FB8 809C0858 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00FBC 809C085C E7A6007C */ swc1 $f6, 0x007C($sp) /* 00FC0 809C0860 46160202 */ mul.s $f8, $f0, $f22 /* 00FC4 809C0864 C64A002C */ lwc1 $f10, 0x002C($s2) ## 0000002C /* 00FC8 809C0868 460A4400 */ add.s $f16, $f8, $f10 /* 00FCC 809C086C 46148481 */ sub.s $f18, $f16, $f20 -/* 00FD0 809C0870 0C03F66B */ jal Math_Rand_ZeroOne +/* 00FD0 809C0870 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00FD4 809C0874 E7B20080 */ swc1 $f18, 0x0080($sp) /* 00FD8 809C0878 461A0100 */ add.s $f4, $f0, $f26 /* 00FDC 809C087C 3C01809C */ lui $at, %hi(D_809C16AC) ## $at = 809C0000 /* 00FE0 809C0880 24040028 */ addiu $a0, $zero, 0x0028 ## $a0 = 00000028 /* 00FE4 809C0884 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 -/* 00FE8 809C0888 0C01DF64 */ jal Math_Rand_S16Offset +/* 00FE8 809C0888 0C01DF64 */ jal Rand_S16Offset /* 00FEC 809C088C E42416AC */ swc1 $f4, %lo(D_809C16AC)($at) /* 00FF0 809C0890 00028400 */ sll $s0, $v0, 16 -/* 00FF4 809C0894 0C03F66B */ jal Math_Rand_ZeroOne +/* 00FF4 809C0894 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00FF8 809C0898 00108403 */ sra $s0, $s0, 16 /* 00FFC 809C089C 461C003C */ c.lt.s $f0, $f28 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Update.s index d52f2242b6..253741fda4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Update.s @@ -23,13 +23,13 @@ glabel EnBomChu_Update /* 00DF4 809C6624 00073C03 */ sra $a3, $a3, 16 /* 00DF8 809C6628 00072400 */ sll $a0, $a3, 16 /* 00DFC 809C662C 00042403 */ sra $a0, $a0, 16 -/* 00E00 809C6630 0C01DE1C */ jal Math_Sins +/* 00E00 809C6630 0C01DE1C */ jal Math_SinS ## sins? /* 00E04 809C6634 A7A7006E */ sh $a3, 0x006E($sp) /* 00E08 809C6638 87A7006E */ lh $a3, 0x006E($sp) /* 00E0C 809C663C E7A00068 */ swc1 $f0, 0x0068($sp) /* 00E10 809C6640 00072400 */ sll $a0, $a3, 16 -/* 00E14 809C6644 0C01DE0D */ jal Math_Coss +/* 00E14 809C6644 0C01DE0D */ jal Math_CosS ## coss? /* 00E18 809C6648 00042403 */ sra $a0, $a0, 16 /* 00E1C 809C664C C7AC0068 */ lwc1 $f12, 0x0068($sp) @@ -118,10 +118,10 @@ glabel EnBomChu_Update /* 00F54 809C6784 25085F48 */ addiu $t0, $t0, %lo(func_809C5F48) ## $t0 = 809C5F48 /* 00F58 809C6788 1509007D */ bne $t0, $t1, .L809C6980 /* 00F5C 809C678C 262A07C0 */ addiu $t2, $s1, 0x07C0 ## $t2 = 000007C0 -/* 00F60 809C6790 0C03F66B */ jal Math_Rand_ZeroOne +/* 00F60 809C6790 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00F64 809C6794 AFAA0030 */ sw $t2, 0x0030($sp) -/* 00F68 809C6798 0C03F66B */ jal Math_Rand_ZeroOne +/* 00F68 809C6798 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00F6C 809C679C E7A00038 */ swc1 $f0, 0x0038($sp) /* 00F70 809C67A0 3C014400 */ lui $at, 0x4400 ## $at = 44000000 @@ -138,7 +138,7 @@ glabel EnBomChu_Update /* 00F9C 809C67CC 44043000 */ mfc1 $a0, $f6 /* 00FA0 809C67D0 00000000 */ nop /* 00FA4 809C67D4 00042400 */ sll $a0, $a0, 16 -/* 00FA8 809C67D8 0C01DE1C */ jal Math_Sins +/* 00FA8 809C67D8 0C01DE1C */ jal Math_SinS ## sins? /* 00FAC 809C67DC 00042403 */ sra $a0, $a0, 16 /* 00FB0 809C67E0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5BA8.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5BA8.s index 54b1396a4d..a3f689fcbc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5BA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5BA8.s @@ -51,7 +51,7 @@ glabel func_809C5BA8 /* 00414 809C5C44 00000000 */ nop /* 00418 809C5C48 4501005F */ bc1t .L809C5DC8 /* 0041C 809C5C4C 00000000 */ nop -/* 00420 809C5C50 0C03F4DA */ jal Math_acosf +/* 00420 809C5C50 0C03F4DA */ jal Math_FAcosF /* 00424 809C5C54 00000000 */ nop /* 00428 809C5C58 3C01809C */ lui $at, %hi(D_809C6DE0) ## $at = 809C0000 /* 0042C 809C5C5C C4306DE0 */ lwc1 $f16, %lo(D_809C6DE0)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5DDC.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5DDC.s index 5b36393f29..70b1bcc5cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5DDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5DDC.s @@ -44,12 +44,12 @@ glabel func_809C5DDC /* 0064C 809C5E7C 8FAA0034 */ lw $t2, 0x0034($sp) /* 00650 809C5E80 854B00B6 */ lh $t3, 0x00B6($t2) ## 000000B6 /* 00654 809C5E84 A60B00B6 */ sh $t3, 0x00B6($s0) ## 000000B6 -/* 00658 809C5E88 0C01DE1C */ jal Math_Sins +/* 00658 809C5E88 0C01DE1C */ jal Math_SinS ## sins? /* 0065C 809C5E8C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00660 809C5E90 E6000154 */ swc1 $f0, 0x0154($s0) ## 00000154 /* 00664 809C5E94 E6140158 */ swc1 $f20, 0x0158($s0) ## 00000158 -/* 00668 809C5E98 0C01DE0D */ jal Math_Coss +/* 00668 809C5E98 0C01DE0D */ jal Math_CosS ## coss? /* 0066C 809C5E9C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00670 809C5EA0 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 @@ -61,7 +61,7 @@ glabel func_809C5DDC /* 00688 809C5EB8 E6140160 */ swc1 $f20, 0x0160($s0) ## 00000160 /* 0068C 809C5EBC E6140168 */ swc1 $f20, 0x0168($s0) ## 00000168 /* 00690 809C5EC0 00042403 */ sra $a0, $a0, 16 -/* 00694 809C5EC4 0C01DE1C */ jal Math_Sins +/* 00694 809C5EC4 0C01DE1C */ jal Math_SinS ## sins? /* 00698 809C5EC8 E6040164 */ swc1 $f4, 0x0164($s0) ## 00000164 /* 0069C 809C5ECC 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 @@ -70,7 +70,7 @@ glabel func_809C5DDC /* 006A8 809C5ED8 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 /* 006AC 809C5EDC 00042400 */ sll $a0, $a0, 16 /* 006B0 809C5EE0 00042403 */ sra $a0, $a0, 16 -/* 006B4 809C5EE4 0C01DE0D */ jal Math_Coss +/* 006B4 809C5EE4 0C01DE0D */ jal Math_CosS ## coss? /* 006B8 809C5EE8 E6060170 */ swc1 $f6, 0x0170($s0) ## 00000170 /* 006BC 809C5EEC 3C014100 */ lui $at, 0x4100 ## $at = 41000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5F48.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5F48.s index 8190416bec..10cca5ef22 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5F48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5F48.s @@ -318,17 +318,17 @@ glabel func_809C5F48 /* 00BD0 809C6400 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 00BD4 809C6404 00052823 */ subu $a1, $zero, $a1 /* 00BD8 809C6408 00052C00 */ sll $a1, $a1, 16 -/* 00BDC 809C640C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00BDC 809C640C 0C01DE2B */ jal Math_ScaledStepToS /* 00BE0 809C6410 00052C03 */ sra $a1, $a1, 16 /* 00BE4 809C6414 262400B6 */ addiu $a0, $s1, 0x00B6 ## $a0 = 000000B6 /* 00BE8 809C6418 86250032 */ lh $a1, 0x0032($s1) ## 00000032 -/* 00BEC 809C641C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00BEC 809C641C 0C01DE2B */ jal Math_ScaledStepToS /* 00BF0 809C6420 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 00BF4 809C6424 262400B8 */ addiu $a0, $s1, 0x00B8 ## $a0 = 000000B8 /* 00BF8 809C6428 86250034 */ lh $a1, 0x0034($s1) ## 00000034 -/* 00BFC 809C642C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00BFC 809C642C 0C01DE2B */ jal Math_ScaledStepToS /* 00C00 809C6430 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 00C04 809C6434 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB458.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB458.s index 5f27845b57..112175461c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB458.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB458.s @@ -99,7 +99,7 @@ glabel func_809CB458 /* 00A8C 809CB59C 4600B587 */ neg.s $f22, $f22 /* 00A90 809CB5A0 E7B20094 */ swc1 $f18, 0x0094($sp) .L809CB5A4: -/* 00A94 809CB5A4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00A94 809CB5A4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A98 809CB5A8 00000000 */ nop /* 00A9C 809CB5AC 46180102 */ mul.s $f4, $f0, $f24 @@ -108,7 +108,7 @@ glabel func_809CB458 /* 00AA8 809CB5B8 461A2180 */ add.s $f6, $f4, $f26 /* 00AAC 809CB5BC 46083282 */ mul.s $f10, $f6, $f8 /* 00AB0 809CB5C0 46105480 */ add.s $f18, $f10, $f16 -/* 00AB4 809CB5C4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00AB4 809CB5C4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00AB8 809CB5C8 E7B20090 */ swc1 $f18, 0x0090($sp) /* 00ABC 809CB5CC C6240054 */ lwc1 $f4, 0x0054($s1) ## 00000054 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Draw.s index 6a218a393a..05341bca84 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Draw.s @@ -48,7 +48,7 @@ glabel EnBubble_Draw /* 01030 809CCC30 26040210 */ addiu $a0, $s0, 0x0210 ## $a0 = 00000210 /* 01034 809CCC34 3C054180 */ lui $a1, 0x4180 ## $a1 = 41800000 /* 01038 809CCC38 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 -/* 0103C 809CCC3C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0103C 809CCC3C 0C01E0C4 */ jal Math_SmoothStepToF /* 01040 809CCC40 E7A40010 */ swc1 $f4, 0x0010($sp) /* 01044 809CCC44 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 @@ -58,7 +58,7 @@ glabel EnBubble_Draw /* 01054 809CCC54 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3DA3D70A /* 01058 809CCC58 26040214 */ addiu $a0, $s0, 0x0214 ## $a0 = 00000214 /* 0105C 809CCC5C 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 -/* 01060 809CCC60 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01060 809CCC60 0C01E0C4 */ jal Math_SmoothStepToF /* 01064 809CCC64 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01068 809CCC68 3C010001 */ lui $at, 0x0001 ## $at = 00010000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Init.s index 64dc0af461..6d781953bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Init.s @@ -33,13 +33,13 @@ glabel EnBubble_Init /* 00D00 809CC900 0C0187BF */ jal func_80061EFC /* 00D04 809CC904 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 00D08 809CC908 240F0016 */ addiu $t7, $zero, 0x0016 ## $t7 = 00000016 -/* 00D0C 809CC90C 0C03F66B */ jal Math_Rand_ZeroOne +/* 00D0C 809CC90C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00D10 809CC910 A20F0117 */ sb $t7, 0x0117($s0) ## 00000117 -/* 00D14 809CC914 0C03F66B */ jal Math_Rand_ZeroOne +/* 00D14 809CC914 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00D18 809CC918 E600022C */ swc1 $f0, 0x022C($s0) ## 0000022C -/* 00D1C 809CC91C 0C03F66B */ jal Math_Rand_ZeroOne +/* 00D1C 809CC91C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00D20 809CC920 E6000230 */ swc1 $f0, 0x0230($s0) ## 00000230 /* 00D24 809CC924 E6000234 */ swc1 $f0, 0x0234($s0) ## 00000234 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBC00.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBC00.s index 591a83162a..064521aa65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBC00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBC00.s @@ -24,13 +24,13 @@ glabel func_809CBC00 /* 00040 809CBC40 C424CEEC */ lwc1 $f4, %lo(D_809CCEEC)($at) /* 00044 809CBC44 E6020220 */ swc1 $f2, 0x0220($s0) ## 00000220 /* 00048 809CBC48 E6020224 */ swc1 $f2, 0x0224($s0) ## 00000224 -/* 0004C 809CBC4C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0004C 809CBC4C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00050 809CBC50 E6040214 */ swc1 $f4, 0x0214($s0) ## 00000214 -/* 00054 809CBC54 0C03F66B */ jal Math_Rand_ZeroOne +/* 00054 809CBC54 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00058 809CBC58 E7A00024 */ swc1 $f0, 0x0024($sp) -/* 0005C 809CBC5C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0005C 809CBC5C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00060 809CBC60 E7A00020 */ swc1 $f0, 0x0020($sp) /* 00064 809CBC64 C7AC0024 */ lwc1 $f12, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBD78.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBD78.s index a525d521a4..5737ecb1fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBD78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBD78.s @@ -37,7 +37,7 @@ glabel func_809CBD78 /* 001F0 809CBDF0 AFD80008 */ sw $t8, 0x0008($s8) ## FFFFFFF8 /* 001F4 809CBDF4 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 /* 001F8 809CBDF8 24840220 */ addiu $a0, $a0, 0x0220 ## $a0 = 00000220 -/* 001FC 809CBDFC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 001FC 809CBDFC 0C01E0C4 */ jal Math_SmoothStepToF /* 00200 809CBE00 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00204 809CBE04 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 @@ -45,7 +45,7 @@ glabel func_809CBD78 /* 0020C 809CBE0C 4407B000 */ mfc1 $a3, $f22 /* 00210 809CBE10 26C40224 */ addiu $a0, $s6, 0x0224 ## $a0 = 00000224 /* 00214 809CBE14 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 -/* 00218 809CBE18 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00218 809CBE18 0C01E0C4 */ jal Math_SmoothStepToF /* 0021C 809CBE1C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00220 809CBE20 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 @@ -53,7 +53,7 @@ glabel func_809CBD78 /* 00228 809CBE28 4407B000 */ mfc1 $a3, $f22 /* 0022C 809CBE2C 26C40210 */ addiu $a0, $s6, 0x0210 ## $a0 = 00000210 /* 00230 809CBE30 3C054258 */ lui $a1, 0x4258 ## $a1 = 42580000 -/* 00234 809CBE34 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00234 809CBE34 0C01E0C4 */ jal Math_SmoothStepToF /* 00238 809CBE38 E7A80010 */ swc1 $f8, 0x0010($sp) /* 0023C 809CBE3C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 @@ -62,7 +62,7 @@ glabel func_809CBD78 /* 00248 809CBE48 4407B000 */ mfc1 $a3, $f22 /* 0024C 809CBE4C 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3E4CCCCD /* 00250 809CBE50 26C40214 */ addiu $a0, $s6, 0x0214 ## $a0 = 00000214 -/* 00254 809CBE54 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00254 809CBE54 0C01E0C4 */ jal Math_SmoothStepToF /* 00258 809CBE58 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 0025C 809CBE5C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -108,23 +108,23 @@ glabel func_809CBD78 /* 002F0 809CBEF0 27B10078 */ addiu $s1, $sp, 0x0078 ## $s1 = FFFFFFD8 /* 002F4 809CBEF4 E7A60080 */ swc1 $f6, 0x0080($sp) .L809CBEF8: -/* 002F8 809CBEF8 0C03F66B */ jal Math_Rand_ZeroOne +/* 002F8 809CBEF8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 002FC 809CBEFC 00000000 */ nop /* 00300 809CBF00 46160201 */ sub.s $f8, $f0, $f22 /* 00304 809CBF04 46144282 */ mul.s $f10, $f8, $f20 -/* 00308 809CBF08 0C03F66B */ jal Math_Rand_ZeroOne +/* 00308 809CBF08 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0030C 809CBF0C E7AA0084 */ swc1 $f10, 0x0084($sp) /* 00310 809CBF10 46140402 */ mul.s $f16, $f0, $f20 -/* 00314 809CBF14 0C03F66B */ jal Math_Rand_ZeroOne +/* 00314 809CBF14 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00318 809CBF18 E7B00088 */ swc1 $f16, 0x0088($sp) /* 0031C 809CBF1C 46160481 */ sub.s $f18, $f0, $f22 /* 00320 809CBF20 24040064 */ addiu $a0, $zero, 0x0064 ## $a0 = 00000064 /* 00324 809CBF24 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 /* 00328 809CBF28 46149102 */ mul.s $f4, $f18, $f20 -/* 0032C 809CBF2C 0C01DF64 */ jal Math_Rand_S16Offset +/* 0032C 809CBF2C 0C01DF64 */ jal Rand_S16Offset /* 00330 809CBF30 E7A4008C */ swc1 $f4, 0x008C($sp) /* 00334 809CBF34 24080019 */ addiu $t0, $zero, 0x0019 ## $t0 = 00000019 @@ -152,7 +152,7 @@ glabel func_809CBD78 /* 00388 809CBF88 2404005A */ addiu $a0, $zero, 0x005A ## $a0 = 0000005A /* 0038C 809CBF8C 01215024 */ and $t2, $t1, $at /* 00390 809CBF90 AECA0004 */ sw $t2, 0x0004($s6) ## 00000004 -/* 00394 809CBF94 0C01DF64 */ jal Math_Rand_S16Offset +/* 00394 809CBF94 0C01DF64 */ jal Rand_S16Offset /* 00398 809CBF98 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C .L809CBF9C: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC16C.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC16C.s index a5929dd5fc..0ffba984e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC16C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC16C.s @@ -165,7 +165,7 @@ glabel func_809CC16C /* 007B0 809CC3B0 8D4C0008 */ lw $t4, 0x0008($t2) ## FFFFFFC4 /* 007B4 809CC3B4 A2020228 */ sb $v0, 0x0228($s0) ## 00000228 /* 007B8 809CC3B8 AE0C0234 */ sw $t4, 0x0234($s0) ## 00000234 -/* 007BC 809CC3BC 0C03F66B */ jal Math_Rand_ZeroOne +/* 007BC 809CC3BC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 007C0 809CC3C0 A3A2004B */ sb $v0, 0x004B($sp) /* 007C4 809CC3C4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -247,7 +247,7 @@ glabel func_809CC16C /* 008E0 809CC4E0 8D4C0008 */ lw $t4, 0x0008($t2) ## FFFFFFC4 /* 008E4 809CC4E4 A2020228 */ sb $v0, 0x0228($s0) ## 00000228 /* 008E8 809CC4E8 AE0C0234 */ sw $t4, 0x0234($s0) ## 00000234 -/* 008EC 809CC4EC 0C03F66B */ jal Math_Rand_ZeroOne +/* 008EC 809CC4EC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 008F0 809CC4F0 A3A2004B */ sb $v0, 0x004B($sp) /* 008F4 809CC4F4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -320,7 +320,7 @@ glabel func_809CC16C /* 009E8 809CC5E8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 009EC 809CC5EC E60A0064 */ swc1 $f10, 0x0064($s0) ## 00000064 /* 009F0 809CC5F0 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 009F4 809CC5F4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 009F4 809CC5F4 0C01E107 */ jal Math_ApproachF /* 009F8 809CC5F8 26040250 */ addiu $a0, $s0, 0x0250 ## $a0 = 00000250 /* 009FC 809CC5FC 4405A000 */ mfc1 $a1, $f20 @@ -328,7 +328,7 @@ glabel func_809CC16C /* 00A04 809CC604 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 00A08 809CC608 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 00A0C 809CC60C 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 00A10 809CC610 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00A10 809CC610 0C01E107 */ jal Math_ApproachF /* 00A14 809CC614 26040254 */ addiu $a0, $s0, 0x0254 ## $a0 = 00000254 /* 00A18 809CC618 4405A000 */ mfc1 $a1, $f20 @@ -336,7 +336,7 @@ glabel func_809CC16C /* 00A20 809CC620 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 00A24 809CC624 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 00A28 809CC628 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 00A2C 809CC62C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00A2C 809CC62C 0C01E107 */ jal Math_ApproachF /* 00A30 809CC630 26040258 */ addiu $a0, $s0, 0x0258 ## $a0 = 00000258 /* 00A34 809CC634 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Update.s index c4c6a81850..a290833912 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Update.s @@ -81,7 +81,7 @@ glabel EnBw_Update /* 022B0 809D0990 E7A40064 */ swc1 $f4, 0x0064($sp) /* 022B4 809D0994 C6060248 */ lwc1 $f6, 0x0248($s0) ## 00000248 /* 022B8 809D0998 46083302 */ mul.s $f12, $f6, $f8 -/* 022BC 809D099C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 022BC 809D099C 0C00CFC8 */ jal Rand_CenteredFloat /* 022C0 809D09A0 00000000 */ nop /* 022C4 809D09A4 E7A0006C */ swc1 $f0, 0x006C($sp) @@ -94,7 +94,7 @@ glabel EnBw_Update /* 022E0 809D09C0 E7B20070 */ swc1 $f18, 0x0070($sp) /* 022E4 809D09C4 C6040248 */ lwc1 $f4, 0x0248($s0) ## 00000248 /* 022E8 809D09C8 46062302 */ mul.s $f12, $f4, $f6 -/* 022EC 809D09CC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 022EC 809D09CC 0C00CFC8 */ jal Rand_CenteredFloat /* 022F0 809D09D0 00000000 */ nop /* 022F4 809D09D4 3C01809D */ lui $at, %hi(D_809D16A0) ## $at = 809D0000 @@ -147,12 +147,12 @@ glabel EnBw_Update /* 023AC 809D0A8C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 023B0 809D0A90 44816000 */ mtc1 $at, $f12 ## $f12 = 4.00 /* 023B4 809D0A94 AFB80040 */ sw $t8, 0x0040($sp) -/* 023B8 809D0A98 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 023B8 809D0A98 0C00CFC8 */ jal Rand_CenteredFloat /* 023BC 809D0A9C E7A60064 */ swc1 $f6, 0x0064($sp) /* 023C0 809D0AA0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 023C4 809D0AA4 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 023C8 809D0AA8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 023C8 809D0AA8 0C00CFC8 */ jal Rand_CenteredFloat /* 023CC 809D0AAC E7A0006C */ swc1 $f0, 0x006C($sp) /* 023D0 809D0AB0 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 @@ -160,7 +160,7 @@ glabel EnBw_Update /* 023D8 809D0AB8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 023DC 809D0ABC 44816000 */ mtc1 $at, $f12 ## $f12 = 4.00 /* 023E0 809D0AC0 46080280 */ add.s $f10, $f0, $f8 -/* 023E4 809D0AC4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 023E4 809D0AC4 0C00CFC8 */ jal Rand_CenteredFloat /* 023E8 809D0AC8 E7AA0070 */ swc1 $f10, 0x0070($sp) /* 023EC 809D0ACC 3C01809D */ lui $at, %hi(D_809D16AC) ## $at = 809D0000 @@ -172,12 +172,12 @@ glabel EnBw_Update /* 02404 809D0AE4 E7A00074 */ swc1 $f0, 0x0074($sp) /* 02408 809D0AE8 46020102 */ mul.s $f4, $f0, $f2 /* 0240C 809D0AEC E7B20060 */ swc1 $f18, 0x0060($sp) -/* 02410 809D0AF0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02410 809D0AF0 0C00CFC8 */ jal Rand_CenteredFloat /* 02414 809D0AF4 E7A40068 */ swc1 $f4, 0x0068($sp) /* 02418 809D0AF8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 0241C 809D0AFC 44816000 */ mtc1 $at, $f12 ## $f12 = 4.00 -/* 02420 809D0B00 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02420 809D0B00 0C00CFC8 */ jal Rand_CenteredFloat /* 02424 809D0B04 00000000 */ nop /* 02428 809D0B08 9219022F */ lbu $t9, 0x022F($s0) ## 0000022F diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE884.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE884.s index d0cfd73077..90992f4a6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE884.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE884.s @@ -33,7 +33,7 @@ glabel func_809CE884 /* 001C0 809CE8A0 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 /* 001C4 809CE8A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 001C8 809CE8A8 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 001CC 809CE8AC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 001CC 809CE8AC 0C01E0C4 */ jal Math_SmoothStepToF /* 001D0 809CE8B0 E7A00010 */ swc1 $f0, 0x0010($sp) /* 001D4 809CE8B4 860E0222 */ lh $t6, 0x0222($s0) ## 00000222 @@ -46,7 +46,7 @@ glabel func_809CE884 /* 001F0 809CE8D0 00000000 */ nop /* 001F4 809CE8D4 468021A0 */ cvt.s.w $f6, $f4 /* 001F8 809CE8D8 46083302 */ mul.s $f12, $f6, $f8 -/* 001FC 809CE8DC 0C0329C8 */ jal func_800CA720 +/* 001FC 809CE8DC 0C0329C8 */ jal Math_SinF /* 00200 809CE8E0 00000000 */ nop /* 00204 809CE8E4 3C01809D */ lui $at, %hi(D_809D15A8) ## $at = 809D0000 /* 00208 809CE8E8 C42A15A8 */ lwc1 $f10, %lo(D_809D15A8)($at) @@ -61,7 +61,7 @@ glabel func_809CE884 /* 0022C 809CE90C E6040050 */ swc1 $f4, 0x0050($s0) ## 00000050 /* 00230 809CE910 C42A15B0 */ lwc1 $f10, %lo(D_809D15B0)($at) /* 00234 809CE914 460A4302 */ mul.s $f12, $f8, $f10 -/* 00238 809CE918 0C0329C8 */ jal func_800CA720 +/* 00238 809CE918 0C0329C8 */ jal Math_SinF /* 0023C 809CE91C 00000000 */ nop /* 00240 809CE920 3C01809D */ lui $at, %hi(D_809D15B4) ## $at = 809D0000 /* 00244 809CE924 C43015B4 */ lwc1 $f16, %lo(D_809D15B4)($at) @@ -77,7 +77,7 @@ glabel func_809CE884 /* 0026C 809CE94C E6060054 */ swc1 $f6, 0x0054($s0) ## 00000054 /* 00270 809CE950 C43215BC */ lwc1 $f18, %lo(D_809D15BC)($at) /* 00274 809CE954 46125302 */ mul.s $f12, $f10, $f18 -/* 00278 809CE958 0C0329C8 */ jal func_800CA720 +/* 00278 809CE958 0C0329C8 */ jal Math_SinF /* 0027C 809CE95C 00000000 */ nop /* 00280 809CE960 3C01809D */ lui $at, %hi(D_809D15C0) ## $at = 809D0000 /* 00284 809CE964 C43015C0 */ lwc1 $f16, %lo(D_809D15C0)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s index 5d6a581189..360c86c892 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s @@ -10,7 +10,7 @@ glabel func_809CE9A8 /* 002E8 809CE9C8 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 /* 002EC 809CE9CC 8FA70018 */ lw $a3, 0x0018($sp) /* 002F0 809CE9D0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 002F4 809CE9D4 0C03F66B */ jal Math_Rand_ZeroOne +/* 002F4 809CE9D4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 002F8 809CE9D8 A0EE0220 */ sb $t6, 0x0220($a3) ## 00000220 /* 002FC 809CE9DC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CEA24.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CEA24.s index b46c41b163..a880b74674 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CEA24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CEA24.s @@ -54,7 +54,7 @@ glabel func_809CEA24 /* 0037C 809CEA5C C6040250 */ lwc1 $f4, 0x0250($s0) ## 00000250 /* 00380 809CEA60 C60C0240 */ lwc1 $f12, 0x0240($s0) ## 00000240 /* 00384 809CEA64 46062200 */ add.s $f8, $f4, $f6 -/* 00388 809CEA68 0C0329DD */ jal func_800CA774 +/* 00388 809CEA68 0C0329DD */ jal Math_CosF /* 0038C 809CEA6C E6080244 */ swc1 $f8, 0x0244($s0) ## 00000244 /* 00390 809CEA70 C60A0240 */ lwc1 $f10, 0x0240($s0) ## 00000240 /* 00394 809CEA74 C6100244 */ lwc1 $f16, 0x0244($s0) ## 00000244 @@ -74,7 +74,7 @@ glabel func_809CEA24 /* 003CC 809CEAAC E608024C */ swc1 $f8, 0x024C($s0) ## 0000024C /* 003D0 809CEAB0 C60C0240 */ lwc1 $f12, 0x0240($s0) ## 00000240 .L809CEAB4: -/* 003D4 809CEAB4 0C0329C8 */ jal func_800CA720 +/* 003D4 809CEAB4 0C0329C8 */ jal Math_SinF /* 003D8 809CEAB8 E7A20058 */ swc1 $f2, 0x0058($sp) /* 003DC 809CEABC 3C01809D */ lui $at, %hi(D_809D15D4) ## $at = 809D0000 /* 003E0 809CEAC0 C43015D4 */ lwc1 $f16, %lo(D_809D15D4)($at) @@ -85,7 +85,7 @@ glabel func_809CEA24 /* 003F4 809CEAD4 C60C0240 */ lwc1 $f12, 0x0240($s0) ## 00000240 /* 003F8 809CEAD8 46120102 */ mul.s $f4, $f0, $f18 /* 003FC 809CEADC 46043201 */ sub.s $f8, $f6, $f4 -/* 00400 809CEAE0 0C0329C8 */ jal func_800CA720 +/* 00400 809CEAE0 0C0329C8 */ jal Math_SinF /* 00404 809CEAE4 E6080050 */ swc1 $f8, 0x0050($s0) ## 00000050 /* 00408 809CEAE8 3C01809D */ lui $at, %hi(D_809D15DC) ## $at = 809D0000 /* 0040C 809CEAEC C43015DC */ lwc1 $f16, %lo(D_809D15DC)($at) @@ -96,7 +96,7 @@ glabel func_809CEA24 /* 00420 809CEB00 C60C0240 */ lwc1 $f12, 0x0240($s0) ## 00000240 /* 00424 809CEB04 46120182 */ mul.s $f6, $f0, $f18 /* 00428 809CEB08 46062201 */ sub.s $f8, $f4, $f6 -/* 0042C 809CEB0C 0C0329C8 */ jal func_800CA720 +/* 0042C 809CEB0C 0C0329C8 */ jal Math_SinF /* 00430 809CEB10 E6080054 */ swc1 $f8, 0x0054($s0) ## 00000054 /* 00434 809CEB14 3C01809D */ lui $at, %hi(D_809D15E4) ## $at = 809D0000 /* 00438 809CEB18 C43015E4 */ lwc1 $f16, %lo(D_809D15E4)($at) @@ -107,7 +107,7 @@ glabel func_809CEA24 /* 0044C 809CEB2C C60C0240 */ lwc1 $f12, 0x0240($s0) ## 00000240 /* 00450 809CEB30 46120102 */ mul.s $f4, $f0, $f18 /* 00454 809CEB34 46062200 */ add.s $f8, $f4, $f6 -/* 00458 809CEB38 0C0329DD */ jal func_800CA774 +/* 00458 809CEB38 0C0329DD */ jal Math_CosF /* 0045C 809CEB3C E6080058 */ swc1 $f8, 0x0058($s0) ## 00000058 /* 00460 809CEB40 92020232 */ lbu $v0, 0x0232($s0) ## 00000232 /* 00464 809CEB44 C7A20058 */ lwc1 $f2, 0x0058($sp) @@ -194,7 +194,7 @@ glabel func_809CEA24 /* 00580 809CEC60 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00584 809CEC64 53010013 */ beql $t8, $at, .L809CECB4 /* 00588 809CEC68 8FAB007C */ lw $t3, 0x007C($sp) -/* 0058C 809CEC6C 0C0329C8 */ jal func_800CA720 +/* 0058C 809CEC6C 0C0329C8 */ jal Math_SinF /* 00590 809CEC70 C60C0240 */ lwc1 $f12, 0x0240($s0) ## 00000240 /* 00594 809CEC74 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00598 809CEC78 3C0142AA */ lui $at, 0x42AA ## $at = 42AA0000 @@ -274,7 +274,7 @@ glabel func_809CEA24 /* 006AC 809CED8C 44894000 */ mtc1 $t1, $f8 ## $f8 = -0.00 /* 006B0 809CED90 448A8000 */ mtc1 $t2, $f16 ## $f16 = -0.00 /* 006B4 809CED94 46804320 */ cvt.s.w $f12, $f8 -/* 006B8 809CED98 0C03F494 */ jal Math_atan2f +/* 006B8 809CED98 0C03F494 */ jal Math_FAtan2F /* 006BC 809CED9C 468083A0 */ cvt.s.w $f14, $f16 /* 006C0 809CEDA0 3C01809D */ lui $at, %hi(D_809D15EC) ## $at = 809D0000 /* 006C4 809CEDA4 C42A15EC */ lwc1 $f10, %lo(D_809D15EC)($at) @@ -427,7 +427,7 @@ glabel L809CEF9C /* 008C8 809CEFA8 00000000 */ nop /* 008CC 809CEFAC A6030236 */ sh $v1, 0x0236($s0) ## 00000236 .L809CEFB0: -/* 008D0 809CEFB0 0C03F66B */ jal Math_Rand_ZeroOne +/* 008D0 809CEFB0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 008D4 809CEFB4 00000000 */ nop /* 008D8 809CEFB8 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -472,7 +472,7 @@ glabel L809CEF9C .L809CF050: /* 00970 809CF050 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 /* 00974 809CF054 318BFFF7 */ andi $t3, $t4, 0xFFF7 ## $t3 = 00000000 -/* 00978 809CF058 0C03F66B */ jal Math_Rand_ZeroOne +/* 00978 809CF058 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0097C 809CF05C A60B0088 */ sh $t3, 0x0088($s0) ## 00000088 /* 00980 809CF060 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -549,7 +549,7 @@ glabel L809CEF9C /* 00A90 809CF170 44995000 */ mtc1 $t9, $f10 ## $f10 = -0.00 /* 00A94 809CF174 448A9000 */ mtc1 $t2, $f18 ## $f18 = -0.00 /* 00A98 809CF178 46805320 */ cvt.s.w $f12, $f10 -/* 00A9C 809CF17C 0C03F494 */ jal Math_atan2f +/* 00A9C 809CF17C 0C03F494 */ jal Math_FAtan2F /* 00AA0 809CF180 468093A0 */ cvt.s.w $f14, $f18 /* 00AA4 809CF184 3C01809D */ lui $at, %hi(D_809D1610) ## $at = 809D0000 /* 00AA8 809CF188 C4241610 */ lwc1 $f4, %lo(D_809D1610)($at) @@ -627,7 +627,7 @@ glabel L809CEF9C /* 00BAC 809CF28C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 00BB0 809CF290 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3F19999A /* 00BB4 809CF294 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00BB8 809CF298 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00BB8 809CF298 0C01E0C4 */ jal Math_SmoothStepToF /* 00BBC 809CF29C E7B00010 */ swc1 $f16, 0x0010($sp) /* 00BC0 809CF2A0 86190224 */ lh $t9, 0x0224($s0) ## 00000224 @@ -682,7 +682,7 @@ glabel L809CEF9C /* 00C7C 809CF35C 44079000 */ mfc1 $a3, $f18 /* 00C80 809CF360 00000000 */ nop /* 00C84 809CF364 00073C00 */ sll $a3, $a3, 16 -/* 00C88 809CF368 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00C88 809CF368 0C01E1A7 */ jal Math_SmoothStepToS /* 00C8C 809CF36C 00073C03 */ sra $a3, $a3, 16 /* 00C90 809CF370 100000E8 */ beq $zero, $zero, .L809CF714 @@ -692,7 +692,7 @@ glabel L809CEF9C /* 00C9C 809CF37C 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 00CA0 809CF380 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 00CA4 809CF384 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00CA8 809CF388 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00CA8 809CF388 0C01E0C4 */ jal Math_SmoothStepToF /* 00CAC 809CF38C E7A40010 */ swc1 $f4, 0x0010($sp) /* 00CB0 809CF390 8FAF0064 */ lw $t7, 0x0064($sp) @@ -711,7 +711,7 @@ glabel L809CEF9C /* 00CE4 809CF3C4 44075000 */ mfc1 $a3, $f10 /* 00CE8 809CF3C8 00000000 */ nop /* 00CEC 809CF3CC 00073C00 */ sll $a3, $a3, 16 -/* 00CF0 809CF3D0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00CF0 809CF3D0 0C01E1A7 */ jal Math_SmoothStepToS /* 00CF4 809CF3D4 00073C03 */ sra $a3, $a3, 16 /* 00CF8 809CF3D8 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 @@ -760,7 +760,7 @@ glabel L809CEF9C /* 00DA0 809CF480 44072000 */ mfc1 $a3, $f4 /* 00DA4 809CF484 00000000 */ nop /* 00DA8 809CF488 00073C00 */ sll $a3, $a3, 16 -/* 00DAC 809CF48C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00DAC 809CF48C 0C01E1A7 */ jal Math_SmoothStepToS /* 00DB0 809CF490 00073C03 */ sra $a3, $a3, 16 .L809CF494: @@ -835,7 +835,7 @@ glabel L809CEF9C /* 00EA4 809CF584 44073000 */ mfc1 $a3, $f6 /* 00EA8 809CF588 00000000 */ nop /* 00EAC 809CF58C 00073C00 */ sll $a3, $a3, 16 -/* 00EB0 809CF590 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00EB0 809CF590 0C01E1A7 */ jal Math_SmoothStepToS /* 00EB4 809CF594 00073C03 */ sra $a3, $a3, 16 /* 00EB8 809CF598 10000013 */ beq $zero, $zero, .L809CF5E8 @@ -856,7 +856,7 @@ glabel L809CEF9C /* 00EF0 809CF5D0 44079000 */ mfc1 $a3, $f18 /* 00EF4 809CF5D4 00000000 */ nop /* 00EF8 809CF5D8 00073C00 */ sll $a3, $a3, 16 -/* 00EFC 809CF5DC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00EFC 809CF5DC 0C01E1A7 */ jal Math_SmoothStepToS /* 00F00 809CF5E0 00073C03 */ sra $a3, $a3, 16 /* 00F04 809CF5E4 86020224 */ lh $v0, 0x0224($s0) ## 00000224 @@ -868,7 +868,7 @@ glabel L809CEF9C /* 00F18 809CF5F8 004C0019 */ multu $v0, $t4 /* 00F1C 809CF5FC 00002012 */ mflo $a0 /* 00F20 809CF600 00042400 */ sll $a0, $a0, 16 -/* 00F24 809CF604 0C01DE1C */ jal Math_Sins +/* 00F24 809CF604 0C01DE1C */ jal Math_SinS ## sins? /* 00F28 809CF608 00042403 */ sra $a0, $a0, 16 /* 00F2C 809CF60C 3C01425C */ lui $at, 0x425C ## $at = 425C0000 @@ -894,7 +894,7 @@ glabel L809CEF9C /* 00F78 809CF658 A218022C */ sb $t8, 0x022C($s0) ## 0000022C /* 00F7C 809CF65C 00002012 */ mflo $a0 /* 00F80 809CF660 00042400 */ sll $a0, $a0, 16 -/* 00F84 809CF664 0C01DE1C */ jal Math_Sins +/* 00F84 809CF664 0C01DE1C */ jal Math_SinS ## sins? /* 00F88 809CF668 00042403 */ sra $a0, $a0, 16 /* 00F8C 809CF66C 3C0142E6 */ lui $at, 0x42E6 ## $at = 42E60000 @@ -916,7 +916,7 @@ glabel L809CEF9C /* 00FC8 809CF6A8 A20A022D */ sb $t2, 0x022D($s0) ## 0000022D /* 00FCC 809CF6AC 01ED2023 */ subu $a0, $t7, $t5 /* 00FD0 809CF6B0 00042400 */ sll $a0, $a0, 16 -/* 00FD4 809CF6B4 0C01DE1C */ jal Math_Sins +/* 00FD4 809CF6B4 0C01DE1C */ jal Math_SinS ## sins? /* 00FD8 809CF6B8 00042403 */ sra $a0, $a0, 16 /* 00FDC 809CF6BC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF7AC.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF7AC.s index a821d8a16f..701a9343ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF7AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF7AC.s @@ -58,7 +58,7 @@ glabel func_809CF7AC /* 01138 809CF818 00000000 */ nop /* 0113C 809CF81C 468021A0 */ cvt.s.w $f6, $f4 /* 01140 809CF820 46083302 */ mul.s $f12, $f6, $f8 -/* 01144 809CF824 0C0329C8 */ jal func_800CA720 +/* 01144 809CF824 0C0329C8 */ jal Math_SinF /* 01148 809CF828 00000000 */ nop /* 0114C 809CF82C 3C01809D */ lui $at, %hi(D_809D161C) ## $at = 809D0000 /* 01150 809CF830 C42A161C */ lwc1 $f10, %lo(D_809D161C)($at) @@ -74,7 +74,7 @@ glabel func_809CF7AC /* 01178 809CF858 E6040050 */ swc1 $f4, 0x0050($s0) ## 00000050 /* 0117C 809CF85C C4301624 */ lwc1 $f16, %lo(D_809D1624)($at) /* 01180 809CF860 46104302 */ mul.s $f12, $f8, $f16 -/* 01184 809CF864 0C0329C8 */ jal func_800CA720 +/* 01184 809CF864 0C0329C8 */ jal Math_SinF /* 01188 809CF868 00000000 */ nop /* 0118C 809CF86C 3C01809D */ lui $at, %hi(D_809D1628) ## $at = 809D0000 /* 01190 809CF870 C42A1628 */ lwc1 $f10, %lo(D_809D1628)($at) @@ -89,7 +89,7 @@ glabel func_809CF7AC /* 011B4 809CF894 E6060054 */ swc1 $f6, 0x0054($s0) ## 00000054 /* 011B8 809CF898 C42A1630 */ lwc1 $f10, %lo(D_809D1630)($at) /* 011BC 809CF89C 460A8302 */ mul.s $f12, $f16, $f10 -/* 011C0 809CF8A0 0C0329C8 */ jal func_800CA720 +/* 011C0 809CF8A0 0C0329C8 */ jal Math_SinF /* 011C4 809CF8A4 00000000 */ nop /* 011C8 809CF8A8 3C01809D */ lui $at, %hi(D_809D1634) ## $at = 809D0000 /* 011CC 809CF8AC C4321634 */ lwc1 $f18, %lo(D_809D1634)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF984.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF984.s index 8c0ba63955..232d1ec7b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF984.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF984.s @@ -35,7 +35,7 @@ glabel func_809CF984 /* 012C8 809CF9A8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 012CC 809CF9AC 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 012D0 809CF9B0 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 012D4 809CF9B4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 012D4 809CF9B4 0C01E0C4 */ jal Math_SmoothStepToF /* 012D8 809CF9B8 AFAF003C */ sw $t7, 0x003C($sp) /* 012DC 809CF9BC 86180222 */ lh $t8, 0x0222($s0) ## 00000222 @@ -48,7 +48,7 @@ glabel func_809CF984 /* 012F8 809CF9D8 00000000 */ nop /* 012FC 809CF9DC 468021A0 */ cvt.s.w $f6, $f4 /* 01300 809CF9E0 46083302 */ mul.s $f12, $f6, $f8 -/* 01304 809CF9E4 0C0329C8 */ jal func_800CA720 +/* 01304 809CF9E4 0C0329C8 */ jal Math_SinF /* 01308 809CF9E8 00000000 */ nop /* 0130C 809CF9EC 3C01809D */ lui $at, %hi(D_809D1640) ## $at = 809D0000 /* 01310 809CF9F0 C42A1640 */ lwc1 $f10, %lo(D_809D1640)($at) @@ -64,7 +64,7 @@ glabel func_809CF984 /* 01338 809CFA18 E6040050 */ swc1 $f4, 0x0050($s0) ## 00000050 /* 0133C 809CFA1C C4301648 */ lwc1 $f16, %lo(D_809D1648)($at) /* 01340 809CFA20 46104302 */ mul.s $f12, $f8, $f16 -/* 01344 809CFA24 0C0329C8 */ jal func_800CA720 +/* 01344 809CFA24 0C0329C8 */ jal Math_SinF /* 01348 809CFA28 00000000 */ nop /* 0134C 809CFA2C 3C01809D */ lui $at, %hi(D_809D164C) ## $at = 809D0000 /* 01350 809CFA30 C42A164C */ lwc1 $f10, %lo(D_809D164C)($at) @@ -79,7 +79,7 @@ glabel func_809CF984 /* 01374 809CFA54 E6060054 */ swc1 $f6, 0x0054($s0) ## 00000054 /* 01378 809CFA58 C42A1654 */ lwc1 $f10, %lo(D_809D1654)($at) /* 0137C 809CFA5C 460A8302 */ mul.s $f12, $f16, $f10 -/* 01380 809CFA60 0C0329C8 */ jal func_800CA720 +/* 01380 809CFA60 0C0329C8 */ jal Math_SinF /* 01384 809CFA64 00000000 */ nop /* 01388 809CFA68 3C01809D */ lui $at, %hi(D_809D1658) ## $at = 809D0000 /* 0138C 809CFA6C C4321658 */ lwc1 $f18, %lo(D_809D1658)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s index ce76210ccd..df95a05800 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s @@ -17,7 +17,7 @@ glabel func_809CFBA8 /* 01504 809CFBE4 A60F0222 */ sh $t7, 0x0222($s0) ## 00000222 /* 01508 809CFBE8 E6000260 */ swc1 $f0, 0x0260($s0) ## 00000260 /* 0150C 809CFBEC E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 01510 809CFBF0 0C03F66B */ jal Math_Rand_ZeroOne +/* 01510 809CFBF0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01514 809CFBF4 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 /* 01518 809CFBF8 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFC4C.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFC4C.s index 800ba3eac0..a326c60ca8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFC4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFC4C.s @@ -35,7 +35,7 @@ glabel func_809CFC4C /* 01584 809CFC64 248400B8 */ addiu $a0, $a0, 0x00B8 ## $a0 = 000000B8 /* 01588 809CFC68 AFA00010 */ sw $zero, 0x0010($sp) /* 0158C 809CFC6C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01590 809CFC70 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01590 809CFC70 0C01E1A7 */ jal Math_SmoothStepToS /* 01594 809CFC74 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 01598 809CFC78 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -44,7 +44,7 @@ glabel func_809CFC4C /* 015A4 809CFC84 44050000 */ mfc1 $a1, $f0 /* 015A8 809CFC88 26040248 */ addiu $a0, $s0, 0x0248 ## $a0 = 00000248 /* 015AC 809CFC8C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 015B0 809CFC90 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 015B0 809CFC90 0C01E0C4 */ jal Math_SmoothStepToF /* 015B4 809CFC94 E7A00010 */ swc1 $f0, 0x0010($sp) /* 015B8 809CFC98 0C02927F */ jal SkelAnime_FrameUpdateMatrix @@ -60,7 +60,7 @@ glabel func_809CFC4C /* 015DC 809CFCBC 3328007F */ andi $t0, $t9, 0x007F ## $t0 = 00000000 /* 015E0 809CFCC0 5500000B */ bnel $t0, $zero, .L809CFCF0 /* 015E4 809CFCC4 C6100258 */ lwc1 $f16, 0x0258($s0) ## 00000258 -/* 015E8 809CFCC8 0C03F66B */ jal Math_Rand_ZeroOne +/* 015E8 809CFCC8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 015EC 809CFCCC 00000000 */ nop /* 015F0 809CFCD0 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 @@ -84,7 +84,7 @@ glabel func_809CFC4C /* 01634 809CFD14 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3D99999A /* 01638 809CFD18 26040260 */ addiu $a0, $s0, 0x0260 ## $a0 = 00000260 /* 0163C 809CFD1C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01640 809CFD20 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01640 809CFD20 0C01E0C4 */ jal Math_SmoothStepToF /* 01644 809CFD24 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01648 809CFD28 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 @@ -119,7 +119,7 @@ glabel func_809CFC4C /* 016B4 809CFD94 00000000 */ nop /* 016B8 809CFD98 46805420 */ cvt.s.w $f16, $f10 /* 016BC 809CFD9C 46128302 */ mul.s $f12, $f16, $f18 -/* 016C0 809CFDA0 0C0329C8 */ jal func_800CA720 +/* 016C0 809CFDA0 0C0329C8 */ jal Math_SinF /* 016C4 809CFDA4 00000000 */ nop /* 016C8 809CFDA8 3C01809D */ lui $at, %hi(D_809D1668) ## $at = 809D0000 /* 016CC 809CFDAC C4241668 */ lwc1 $f4, %lo(D_809D1668)($at) @@ -134,7 +134,7 @@ glabel func_809CFC4C /* 016F0 809CFDD0 E60A0050 */ swc1 $f10, 0x0050($s0) ## 00000050 /* 016F4 809CFDD4 C4241670 */ lwc1 $f4, %lo(D_809D1670)($at) /* 016F8 809CFDD8 46049302 */ mul.s $f12, $f18, $f4 -/* 016FC 809CFDDC 0C0329C8 */ jal func_800CA720 +/* 016FC 809CFDDC 0C0329C8 */ jal Math_SinF /* 01700 809CFDE0 00000000 */ nop /* 01704 809CFDE4 3C01809D */ lui $at, %hi(D_809D1674) ## $at = 809D0000 /* 01708 809CFDE8 C4261674 */ lwc1 $f6, %lo(D_809D1674)($at) @@ -150,7 +150,7 @@ glabel func_809CFC4C /* 01730 809CFE10 E6100054 */ swc1 $f16, 0x0054($s0) ## 00000054 /* 01734 809CFE14 C428167C */ lwc1 $f8, %lo(D_809D167C)($at) /* 01738 809CFE18 46082302 */ mul.s $f12, $f4, $f8 -/* 0173C 809CFE1C 0C0329C8 */ jal func_800CA720 +/* 0173C 809CFE1C 0C0329C8 */ jal Math_SinF /* 01740 809CFE20 00000000 */ nop /* 01744 809CFE24 3C01809D */ lui $at, %hi(D_809D1680) ## $at = 809D0000 /* 01748 809CFE28 C4261680 */ lwc1 $f6, %lo(D_809D1680)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF98.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF98.s index 4ed5e7dc50..6735db80ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF98.s @@ -8,7 +8,7 @@ glabel func_809CFF98 /* 018D0 809CFFB0 248400B8 */ addiu $a0, $a0, 0x00B8 ## $a0 = 000000B8 /* 018D4 809CFFB4 AFA00010 */ sw $zero, 0x0010($sp) /* 018D8 809CFFB8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 018DC 809CFFBC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 018DC 809CFFBC 0C01E1A7 */ jal Math_SmoothStepToS /* 018E0 809CFFC0 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 018E4 809CFFC4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -18,7 +18,7 @@ glabel func_809CFF98 /* 018F4 809CFFD4 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3F19999A /* 018F8 809CFFD8 26040248 */ addiu $a0, $s0, 0x0248 ## $a0 = 00000248 /* 018FC 809CFFDC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01900 809CFFE0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01900 809CFFE0 0C01E0C4 */ jal Math_SmoothStepToF /* 01904 809CFFE4 E7A40010 */ swc1 $f4, 0x0010($sp) /* 01908 809CFFE8 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D01CC.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D01CC.s index 73a1e64b1e..2c82eea450 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D01CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D01CC.s @@ -5,7 +5,7 @@ glabel func_809D01CC /* 01AF8 809D01D8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 01AFC 809D01DC A08E0220 */ sb $t6, 0x0220($a0) ## 00000220 /* 01B00 809D01E0 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 01B04 809D01E4 0C03F66B */ jal Math_Rand_ZeroOne +/* 01B04 809D01E4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01B08 809D01E8 AFA40018 */ sw $a0, 0x0018($sp) /* 01B0C 809D01EC 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0268.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0268.s index 8ae0e9cd95..95acc1baac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0268.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0268.s @@ -46,7 +46,7 @@ glabel func_809D0268 /* 01C18 809D02F8 3109007F */ andi $t1, $t0, 0x007F ## $t1 = 00000000 /* 01C1C 809D02FC 5520000B */ bnel $t1, $zero, .L809D032C /* 01C20 809D0300 C6100258 */ lwc1 $f16, 0x0258($s0) ## 00000258 -/* 01C24 809D0304 0C03F66B */ jal Math_Rand_ZeroOne +/* 01C24 809D0304 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01C28 809D0308 00000000 */ nop /* 01C2C 809D030C 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 @@ -68,7 +68,7 @@ glabel func_809D0268 /* 01C68 809D0348 E6040258 */ swc1 $f4, 0x0258($s0) ## 00000258 /* 01C6C 809D034C 26040260 */ addiu $a0, $s0, 0x0260 ## $a0 = 00000260 /* 01C70 809D0350 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01C74 809D0354 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01C74 809D0354 0C01E0C4 */ jal Math_SmoothStepToF /* 01C78 809D0358 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01C7C 809D035C 860A0222 */ lh $t2, 0x0222($s0) ## 00000222 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Draw.s index daf7dd9014..5a67ebe86e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Draw.s @@ -172,7 +172,7 @@ glabel EnClearTag_Draw /* 01620 809D4BD0 00812023 */ subu $a0, $a0, $at /* 01624 809D4BD4 00042300 */ sll $a0, $a0, 12 /* 01628 809D4BD8 00042400 */ sll $a0, $a0, 16 -/* 0162C 809D4BDC 0C01DE1C */ jal Math_Sins +/* 0162C 809D4BDC 0C01DE1C */ jal Math_SinS ## sins? /* 01630 809D4BE0 00042403 */ sra $a0, $a0, 16 /* 01634 809D4BE4 C7B00060 */ lwc1 $f16, 0x0060($sp) @@ -186,7 +186,7 @@ glabel EnClearTag_Draw /* 01654 809D4C04 00812023 */ subu $a0, $a0, $at /* 01658 809D4C08 00042200 */ sll $a0, $a0, 8 /* 0165C 809D4C0C 00042400 */ sll $a0, $a0, 16 -/* 01660 809D4C10 0C01DE1C */ jal Math_Sins +/* 01660 809D4C10 0C01DE1C */ jal Math_SinS ## sins? /* 01664 809D4C14 00042403 */ sra $a0, $a0, 16 /* 01668 809D4C18 C7A40060 */ lwc1 $f4, 0x0060($sp) @@ -375,7 +375,7 @@ glabel EnClearTag_Draw /* 0193C 809D4EEC 00812023 */ subu $a0, $a0, $at /* 01940 809D4EF0 00042300 */ sll $a0, $a0, 12 /* 01944 809D4EF4 00042400 */ sll $a0, $a0, 16 -/* 01948 809D4EF8 0C01DE1C */ jal Math_Sins +/* 01948 809D4EF8 0C01DE1C */ jal Math_SinS ## sins? /* 0194C 809D4EFC 00042403 */ sra $a0, $a0, 16 /* 01950 809D4F00 C7A40034 */ lwc1 $f4, 0x0034($sp) @@ -389,7 +389,7 @@ glabel EnClearTag_Draw /* 01970 809D4F20 00812023 */ subu $a0, $a0, $at /* 01974 809D4F24 00042200 */ sll $a0, $a0, 8 /* 01978 809D4F28 00042400 */ sll $a0, $a0, 16 -/* 0197C 809D4F2C 0C01DE1C */ jal Math_Sins +/* 0197C 809D4F2C 0C01DE1C */ jal Math_SinS ## sins? /* 01980 809D4F30 00042403 */ sra $a0, $a0, 16 /* 01984 809D4F34 C7A80034 */ lwc1 $f8, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Update.s index 5c3b826ad6..2b55bed368 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Update.s @@ -101,17 +101,17 @@ glabel EnClearTag_Update /* 00774 809D3D24 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00778 809D3D28 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 0077C 809D3D2C 44816000 */ mtc1 $at, $f12 ## $f12 = 15.00 -/* 00780 809D3D30 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00780 809D3D30 0C00CFC8 */ jal Rand_CenteredFloat /* 00784 809D3D34 00000000 */ nop /* 00788 809D3D38 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 0078C 809D3D3C 44816000 */ mtc1 $at, $f12 ## $f12 = 15.00 -/* 00790 809D3D40 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00790 809D3D40 0C00CFC8 */ jal Rand_CenteredFloat /* 00794 809D3D44 E6200170 */ swc1 $f0, 0x0170($s1) ## 00000170 /* 00798 809D3D48 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 0079C 809D3D4C 44816000 */ mtc1 $at, $f12 ## $f12 = 15.00 -/* 007A0 809D3D50 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 007A0 809D3D50 0C00CFC8 */ jal Rand_CenteredFloat /* 007A4 809D3D54 E6200174 */ swc1 $f0, 0x0174($s1) ## 00000174 /* 007A8 809D3D58 E6200178 */ swc1 $f0, 0x0178($s1) ## 00000178 @@ -153,7 +153,7 @@ glabel EnClearTag_Update /* 00828 809D3DD8 A62D0150 */ sh $t5, 0x0150($s1) ## 00000150 .L809D3DDC: /* 0082C 809D3DDC 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 00830 809D3DE0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00830 809D3DE0 0C00CFBE */ jal Rand_ZeroFloat /* 00834 809D3DE4 A220014E */ sb $zero, 0x014E($s1) ## 0000014E /* 00838 809D3DE8 4600020D */ trunc.w.s $f8, $f0 @@ -164,7 +164,7 @@ glabel EnClearTag_Update /* 0084C 809D3DFC 27280014 */ addiu $t0, $t9, 0x0014 ## $t0 = 00000014 /* 00850 809D3E00 15210028 */ bne $t1, $at, .L809D3EA4 /* 00854 809D3E04 A6280150 */ sh $t0, 0x0150($s1) ## 00000150 -/* 00858 809D3E08 0C01DE1C */ jal Math_Sins +/* 00858 809D3E08 0C01DE1C */ jal Math_SinS ## sins? /* 0085C 809D3E0C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B7 /* 00860 809D3E10 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 @@ -172,7 +172,7 @@ glabel EnClearTag_Update /* 00868 809D3E18 00000000 */ nop /* 0086C 809D3E1C 460A0482 */ mul.s $f18, $f0, $f10 /* 00870 809D3E20 E7B20094 */ swc1 $f18, 0x0094($sp) -/* 00874 809D3E24 0C01DE0D */ jal Math_Coss +/* 00874 809D3E24 0C01DE0D */ jal Math_CosS ## coss? /* 00878 809D3E28 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B7 /* 0087C 809D3E2C 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 @@ -180,7 +180,7 @@ glabel EnClearTag_Update /* 00884 809D3E34 3C01442F */ lui $at, 0x442F ## $at = 442F0000 /* 00888 809D3E38 44816000 */ mtc1 $at, $f12 ## $f12 = 700.00 /* 0088C 809D3E3C 46040182 */ mul.s $f6, $f0, $f4 -/* 00890 809D3E40 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00890 809D3E40 0C00CFC8 */ jal Rand_CenteredFloat /* 00894 809D3E44 E7A60090 */ swc1 $f6, 0x0090($sp) /* 00898 809D3E48 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000025 @@ -189,7 +189,7 @@ glabel EnClearTag_Update /* 008A4 809D3E54 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 /* 008A8 809D3E58 460A4480 */ add.s $f18, $f8, $f10 /* 008AC 809D3E5C 46120100 */ add.s $f4, $f0, $f18 -/* 008B0 809D3E60 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 008B0 809D3E60 0C00CFBE */ jal Rand_ZeroFloat /* 008B4 809D3E64 E6240158 */ swc1 $f4, 0x0158($s1) ## 00000158 /* 008B8 809D3E68 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000029 @@ -199,7 +199,7 @@ glabel EnClearTag_Update /* 008C8 809D3E78 3C01442F */ lui $at, 0x442F ## $at = 442F0000 /* 008CC 809D3E7C 44816000 */ mtc1 $at, $f12 ## $f12 = 700.00 /* 008D0 809D3E80 460A4480 */ add.s $f18, $f8, $f10 -/* 008D4 809D3E84 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 008D4 809D3E84 0C00CFC8 */ jal Rand_CenteredFloat /* 008D8 809D3E88 E632015C */ swc1 $f18, 0x015C($s1) ## 0000015C /* 008DC 809D3E8C C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002D @@ -211,12 +211,12 @@ glabel EnClearTag_Update .L809D3EA4: /* 008F4 809D3EA4 3C01442F */ lui $at, 0x442F ## $at = 442F0000 /* 008F8 809D3EA8 44816000 */ mtc1 $at, $f12 ## $f12 = 700.00 -/* 008FC 809D3EAC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 008FC 809D3EAC 0C00CFC8 */ jal Rand_CenteredFloat /* 00900 809D3EB0 00000000 */ nop /* 00904 809D3EB4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 00908 809D3EB8 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 -/* 0090C 809D3EBC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0090C 809D3EBC 0C00CFBE */ jal Rand_ZeroFloat /* 00910 809D3EC0 E6200158 */ swc1 $f0, 0x0158($s1) ## 00000158 /* 00914 809D3EC4 3C014316 */ lui $at, 0x4316 ## $at = 43160000 @@ -224,7 +224,7 @@ glabel EnClearTag_Update /* 0091C 809D3ECC 3C01442F */ lui $at, 0x442F ## $at = 442F0000 /* 00920 809D3ED0 44816000 */ mtc1 $at, $f12 ## $f12 = 700.00 /* 00924 809D3ED4 46120100 */ add.s $f4, $f0, $f18 -/* 00928 809D3ED8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00928 809D3ED8 0C00CFC8 */ jal Rand_CenteredFloat /* 0092C 809D3EDC E624015C */ swc1 $f4, 0x015C($s1) ## 0000015C /* 00930 809D3EE0 E6200160 */ swc1 $f0, 0x0160($s1) ## 00000160 @@ -297,7 +297,7 @@ glabel EnClearTag_Update /* 00A28 809D3FD8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 00A2C 809D3FDC 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD /* 00A30 809D3FE0 26240180 */ addiu $a0, $s1, 0x0180 ## $a0 = 00000180 -/* 00A34 809D3FE4 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 00A34 809D3FE4 0C01E123 */ jal Math_ApproachZeroF /* 00A38 809D3FE8 E7AC00A0 */ swc1 $f12, 0x00A0($sp) /* 00A3C 809D3FEC C7AC00A0 */ lwc1 $f12, 0x00A0($sp) @@ -334,7 +334,7 @@ glabel EnClearTag_Update /* 00AB4 809D4064 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 00AB8 809D4068 E7A2003C */ swc1 $f2, 0x003C($sp) /* 00ABC 809D406C E7AE00A8 */ swc1 $f14, 0x00A8($sp) -/* 00AC0 809D4070 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00AC0 809D4070 0C00CFBE */ jal Rand_ZeroFloat /* 00AC4 809D4074 E7B00038 */ swc1 $f16, 0x0038($sp) /* 00AC8 809D4078 4600028D */ trunc.w.s $f10, $f0 @@ -350,7 +350,7 @@ glabel EnClearTag_Update .L809D409C: /* 00AEC 809D409C C7AC00B0 */ lwc1 $f12, 0x00B0($sp) /* 00AF0 809D40A0 E7A2003C */ swc1 $f2, 0x003C($sp) -/* 00AF4 809D40A4 0C03F494 */ jal Math_atan2f +/* 00AF4 809D40A4 0C03F494 */ jal Math_FAtan2F /* 00AF8 809D40A8 E7B00038 */ swc1 $f16, 0x0038($sp) /* 00AFC 809D40AC 3C01809E */ lui $at, %hi(D_809DC0F0) ## $at = 809E0000 /* 00B00 809D40B0 C432C0F0 */ lwc1 $f18, %lo(D_809DC0F0)($at) @@ -364,7 +364,7 @@ glabel EnClearTag_Update /* 00B20 809D40D0 44103000 */ mfc1 $s0, $f6 /* 00B24 809D40D4 00000000 */ nop /* 00B28 809D40D8 00108400 */ sll $s0, $s0, 16 -/* 00B2C 809D40DC 0C03F494 */ jal Math_atan2f +/* 00B2C 809D40DC 0C03F494 */ jal Math_FAtan2F /* 00B30 809D40E0 00108403 */ sra $s0, $s0, 16 /* 00B34 809D40E4 3C01809E */ lui $at, %hi(D_809DC0F4) ## $at = 809E0000 /* 00B38 809D40E8 C428C0F4 */ lwc1 $f8, %lo(D_809DC0F4)($at) @@ -397,7 +397,7 @@ glabel EnClearTag_Update /* 00B9C 809D414C 44073000 */ mfc1 $a3, $f6 /* 00BA0 809D4150 00000000 */ nop /* 00BA4 809D4154 00073C00 */ sll $a3, $a3, 16 -/* 00BA8 809D4158 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 00BA8 809D4158 0C01E1EF */ jal Math_ApproachS /* 00BAC 809D415C 00073C03 */ sra $a3, $a3, 16 /* 00BB0 809D4160 C6280168 */ lwc1 $f8, 0x0168($s1) ## 00000168 @@ -410,7 +410,7 @@ glabel EnClearTag_Update /* 00BCC 809D417C 44072000 */ mfc1 $a3, $f4 /* 00BD0 809D4180 00000000 */ nop /* 00BD4 809D4184 00073C00 */ sll $a3, $a3, 16 -/* 00BD8 809D4188 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00BD8 809D4188 0C01E1A7 */ jal Math_SmoothStepToS /* 00BDC 809D418C 00073C03 */ sra $a3, $a3, 16 /* 00BE0 809D4190 87B800C2 */ lh $t8, 0x00C2($sp) @@ -422,7 +422,7 @@ glabel EnClearTag_Update /* 00BF8 809D41A8 468052A0 */ cvt.s.w $f10, $f10 /* 00BFC 809D41AC 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 /* 00C00 809D41B0 44055000 */ mfc1 $a1, $f10 -/* 00C04 809D41B4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00C04 809D41B4 0C01E107 */ jal Math_ApproachF /* 00C08 809D41B8 00000000 */ nop /* 00C0C 809D41BC C6320164 */ lwc1 $f18, 0x0164($s1) ## 00000164 @@ -443,20 +443,20 @@ glabel EnClearTag_Update /* 00C44 809D41F4 44074000 */ mfc1 $a3, $f8 /* 00C48 809D41F8 00000000 */ nop /* 00C4C 809D41FC 00073C00 */ sll $a3, $a3, 16 -/* 00C50 809D4200 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 00C50 809D4200 0C01E1EF */ jal Math_ApproachS /* 00C54 809D4204 00073C03 */ sra $a3, $a3, 16 /* 00C58 809D4208 2624016C */ addiu $a0, $s1, 0x016C ## $a0 = 0000016C /* 00C5C 809D420C 3C0544A0 */ lui $a1, 0x44A0 ## $a1 = 44A00000 /* 00C60 809D4210 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00C64 809D4214 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00C64 809D4214 0C01E107 */ jal Math_ApproachF /* 00C68 809D4218 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 /* 00C6C 809D421C 9228017C */ lbu $t0, 0x017C($s1) ## 0000017C /* 00C70 809D4220 31090003 */ andi $t1, $t0, 0x0003 ## $t1 = 00000000 /* 00C74 809D4224 55200027 */ bnel $t1, $zero, .L809D42C4 /* 00C78 809D4228 8FAD003C */ lw $t5, 0x003C($sp) -/* 00C7C 809D422C 0C03F66B */ jal Math_Rand_ZeroOne +/* 00C7C 809D422C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00C80 809D4230 00000000 */ nop /* 00C84 809D4234 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 @@ -489,13 +489,13 @@ glabel EnClearTag_Update /* 00CE8 809D4298 44079000 */ mfc1 $a3, $f18 /* 00CEC 809D429C 00000000 */ nop /* 00CF0 809D42A0 00073C00 */ sll $a3, $a3, 16 -/* 00CF4 809D42A4 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 00CF4 809D42A4 0C01E1EF */ jal Math_ApproachS /* 00CF8 809D42A8 00073C03 */ sra $a3, $a3, 16 /* 00CFC 809D42AC 2624016C */ addiu $a0, $s1, 0x016C ## $a0 = 0000016C /* 00D00 809D42B0 3C054580 */ lui $a1, 0x4580 ## $a1 = 45800000 /* 00D04 809D42B4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00D08 809D42B8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00D08 809D42B8 0C01E107 */ jal Math_ApproachF /* 00D0C 809D42BC 3C074400 */ lui $a3, 0x4400 ## $a3 = 44000000 .L809D42C0: @@ -528,17 +528,17 @@ glabel EnClearTag_Update /* 00D74 809D4324 46044280 */ add.s $f10, $f8, $f4 /* 00D78 809D4328 E6260060 */ swc1 $f6, 0x0060($s1) ## 00000060 /* 00D7C 809D432C 26240170 */ addiu $a0, $s1, 0x0170 ## $a0 = 00000170 -/* 00D80 809D4330 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 00D80 809D4330 0C01E123 */ jal Math_ApproachZeroF /* 00D84 809D4334 E62A0064 */ swc1 $f10, 0x0064($s1) ## 00000064 /* 00D88 809D4338 26240174 */ addiu $a0, $s1, 0x0174 ## $a0 = 00000174 /* 00D8C 809D433C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00D90 809D4340 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 00D90 809D4340 0C01E123 */ jal Math_ApproachZeroF /* 00D94 809D4344 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00D98 809D4348 26240178 */ addiu $a0, $s1, 0x0178 ## $a0 = 00000178 /* 00D9C 809D434C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00DA0 809D4350 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 00DA0 809D4350 0C01E123 */ jal Math_ApproachZeroF /* 00DA4 809D4354 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00DA8 809D4358 9228017D */ lbu $t0, 0x017D($s1) ## 0000017D @@ -773,7 +773,7 @@ glabel EnClearTag_Update /* 010D0 809D4680 00108400 */ sll $s0, $s0, 16 /* 010D4 809D4684 00108403 */ sra $s0, $s0, 16 /* 010D8 809D4688 00102400 */ sll $a0, $s0, 16 -/* 010DC 809D468C 0C01DE1C */ jal Math_Sins +/* 010DC 809D468C 0C01DE1C */ jal Math_SinS ## sins? /* 010E0 809D4690 00042403 */ sra $a0, $a0, 16 /* 010E4 809D4694 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -781,7 +781,7 @@ glabel EnClearTag_Update /* 010EC 809D469C 00102400 */ sll $a0, $s0, 16 /* 010F0 809D46A0 00042403 */ sra $a0, $a0, 16 /* 010F4 809D46A4 46120182 */ mul.s $f6, $f0, $f18 -/* 010F8 809D46A8 0C01DE0D */ jal Math_Coss +/* 010F8 809D46A8 0C01DE0D */ jal Math_CosS ## coss? /* 010FC 809D46AC E7A6008C */ swc1 $f6, 0x008C($sp) /* 01100 809D46B0 C6280024 */ lwc1 $f8, 0x0024($s1) ## 00000024 @@ -812,21 +812,21 @@ glabel EnClearTag_Update /* 01160 809D4710 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01164 809D4714 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01168 809D4718 3C0743FA */ lui $a3, 0x43FA ## $a3 = 43FA0000 -/* 0116C 809D471C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0116C 809D471C 0C01E107 */ jal Math_ApproachF /* 01170 809D4720 AFA40038 */ sw $a0, 0x0038($sp) /* 01174 809D4724 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01178 809D4728 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0117C 809D472C 262401E8 */ addiu $a0, $s1, 0x01E8 ## $a0 = 000001E8 /* 01180 809D4730 8FA5007C */ lw $a1, 0x007C($sp) -/* 01184 809D4734 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01184 809D4734 0C01E107 */ jal Math_ApproachF /* 01188 809D4738 3C0743FA */ lui $a3, 0x43FA ## $a3 = 43FA0000 /* 0118C 809D473C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01190 809D4740 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01194 809D4744 262401EC */ addiu $a0, $s1, 0x01EC ## $a0 = 000001EC /* 01198 809D4748 8FA50080 */ lw $a1, 0x0080($sp) -/* 0119C 809D474C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0119C 809D474C 0C01E107 */ jal Math_ApproachF /* 011A0 809D4750 3C0743FA */ lui $a3, 0x43FA ## $a3 = 43FA0000 /* 011A4 809D4754 263001F0 */ addiu $s0, $s1, 0x01F0 ## $s0 = 000001F0 @@ -834,21 +834,21 @@ glabel EnClearTag_Update /* 011AC 809D475C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 011B0 809D4760 02002025 */ or $a0, $s0, $zero ## $a0 = 000001F0 /* 011B4 809D4764 8FA5006C */ lw $a1, 0x006C($sp) -/* 011B8 809D4768 0C01E107 */ jal Math_SmoothScaleMaxF +/* 011B8 809D4768 0C01E107 */ jal Math_ApproachF /* 011BC 809D476C 3C0743FA */ lui $a3, 0x43FA ## $a3 = 43FA0000 /* 011C0 809D4770 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 011C4 809D4774 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 011C8 809D4778 262401F4 */ addiu $a0, $s1, 0x01F4 ## $a0 = 000001F4 /* 011CC 809D477C 8FA50070 */ lw $a1, 0x0070($sp) -/* 011D0 809D4780 0C01E107 */ jal Math_SmoothScaleMaxF +/* 011D0 809D4780 0C01E107 */ jal Math_ApproachF /* 011D4 809D4784 3C0743FA */ lui $a3, 0x43FA ## $a3 = 43FA0000 /* 011D8 809D4788 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 011DC 809D478C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 011E0 809D4790 262401F8 */ addiu $a0, $s1, 0x01F8 ## $a0 = 000001F8 /* 011E4 809D4794 8FA50074 */ lw $a1, 0x0074($sp) -/* 011E8 809D4798 0C01E107 */ jal Math_SmoothScaleMaxF +/* 011E8 809D4798 0C01E107 */ jal Math_ApproachF /* 011EC 809D479C 3C0743FA */ lui $a3, 0x43FA ## $a3 = 43FA0000 /* 011F0 809D47A0 8FA400CC */ lw $a0, 0x00CC($sp) @@ -942,7 +942,7 @@ glabel EnClearTag_Update /* 01334 809D48E4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 01338 809D48E8 44816000 */ mtc1 $at, $f12 ## $f12 = 6.00 /* 0133C 809D48EC 46089182 */ mul.s $f6, $f18, $f8 -/* 01340 809D48F0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01340 809D48F0 0C00CFBE */ jal Rand_ZeroFloat /* 01344 809D48F4 E7A6005C */ swc1 $f6, 0x005C($sp) /* 01348 809D48F8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -950,14 +950,14 @@ glabel EnClearTag_Update /* 01350 809D4900 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 01354 809D4904 44816000 */ mtc1 $at, $f12 ## $f12 = 0.50 /* 01358 809D4908 46040280 */ add.s $f10, $f0, $f4 -/* 0135C 809D490C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0135C 809D490C 0C00CFC8 */ jal Rand_CenteredFloat /* 01360 809D4910 E7AA0058 */ swc1 $f10, 0x0058($sp) /* 01364 809D4914 C7B20054 */ lwc1 $f18, 0x0054($sp) /* 01368 809D4918 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0136C 809D491C 44816000 */ mtc1 $at, $f12 ## $f12 = 0.50 /* 01370 809D4920 46009200 */ add.s $f8, $f18, $f0 -/* 01374 809D4924 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01374 809D4924 0C00CFC8 */ jal Rand_CenteredFloat /* 01378 809D4928 E7A80054 */ swc1 $f8, 0x0054($sp) /* 0137C 809D492C C7A6005C */ lwc1 $f6, 0x005C($sp) @@ -970,7 +970,7 @@ glabel EnClearTag_Update /* 01398 809D4948 E7A4005C */ swc1 $f4, 0x005C($sp) /* 0139C 809D494C E7A20048 */ swc1 $f2, 0x0048($sp) /* 013A0 809D4950 E7A20050 */ swc1 $f2, 0x0050($sp) -/* 013A4 809D4954 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 013A4 809D4954 0C00CFBE */ jal Rand_ZeroFloat /* 013A8 809D4958 E7AA004C */ swc1 $f10, 0x004C($sp) /* 013AC 809D495C 3C01809E */ lui $at, %hi(D_809DC10C) ## $at = 809E0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D35B0.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D35B0.s index 1b90a517d0..67170bf2e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D35B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D35B0.s @@ -43,12 +43,12 @@ glabel func_809D35B0 /* 00080 809D3630 AE0B0024 */ sw $t3, 0x0024($s0) ## 00010024 /* 00084 809D3634 C7A40030 */ lwc1 $f4, 0x0030($sp) /* 00088 809D3638 E604004C */ swc1 $f4, 0x004C($s0) ## 0001004C -/* 0008C 809D363C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0008C 809D363C 0C00CFBE */ jal Rand_ZeroFloat /* 00090 809D3640 C42CC0D8 */ lwc1 $f12, %lo(D_809DC0D8)($at) /* 00094 809D3644 E6000054 */ swc1 $f0, 0x0054($s0) ## 00010054 /* 00098 809D3648 3C01809E */ lui $at, %hi(D_809DC0DC) ## $at = 809E0000 -/* 0009C 809D364C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0009C 809D364C 0C00CFBE */ jal Rand_ZeroFloat /* 000A0 809D3650 C42CC0DC */ lwc1 $f12, %lo(D_809DC0DC)($at) /* 000A4 809D3654 A6000048 */ sh $zero, 0x0048($s0) ## 00010048 @@ -58,7 +58,7 @@ glabel func_809D35B0 /* 000B4 809D3664 A60C004A */ sh $t4, 0x004A($s0) ## 0001004A /* 000B8 809D3668 C7A60034 */ lwc1 $f6, 0x0034($sp) /* 000BC 809D366C 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 000C0 809D3670 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 000C0 809D3670 0C00CFBE */ jal Rand_ZeroFloat /* 000C4 809D3674 E606005C */ swc1 $f6, 0x005C($s0) ## 0001005C /* 000C8 809D3678 4600020D */ trunc.w.s $f8, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D36A8.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D36A8.s index b375cdfb81..39a4f8a6ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D36A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D36A8.s @@ -17,7 +17,7 @@ glabel func_809D36A8 /* 0011C 809D36CC 15C00028 */ bne $t6, $zero, .L809D3770 /* 00120 809D36D0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00124 809D36D4 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 00128 809D36D8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00128 809D36D8 0C00CFBE */ jal Rand_ZeroFloat /* 0012C 809D36DC AFA20018 */ sw $v0, 0x0018($sp) /* 00130 809D36E0 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D3798.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D3798.s index 35bfafde48..f742f58010 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D3798.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D3798.s @@ -13,7 +13,7 @@ glabel func_809D3798 /* 00210 809D37C0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00214 809D37C4 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 00218 809D37C8 AFA20018 */ sw $v0, 0x0018($sp) -/* 0021C 809D37CC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0021C 809D37CC 0C00CFBE */ jal Rand_ZeroFloat /* 00220 809D37D0 E7AE0028 */ swc1 $f14, 0x0028($sp) /* 00224 809D37D4 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D3B80.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D3B80.s index 7f2f829b0c..257a3c0516 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D3B80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D3B80.s @@ -31,7 +31,7 @@ glabel func_809D3B80 /* 00630 809D3BE0 E7B00018 */ swc1 $f16, 0x0018($sp) /* 00634 809D3BE4 46000207 */ neg.s $f8, $f0 /* 00638 809D3BE8 46104302 */ mul.s $f12, $f8, $f16 -/* 0063C 809D3BEC 0C03F494 */ jal Math_atan2f +/* 0063C 809D3BEC 0C03F494 */ jal Math_FAtan2F /* 00640 809D3BF0 00000000 */ nop /* 00644 809D3BF4 8FA80020 */ lw $t0, 0x0020($sp) /* 00648 809D3BF8 46000287 */ neg.s $f10, $f0 @@ -42,7 +42,7 @@ glabel func_809D3B80 /* 0065C 809D3C0C 44817000 */ mtc1 $at, $f14 ## $f14 = 1.00 /* 00660 809D3C10 46009107 */ neg.s $f4, $f18 /* 00664 809D3C14 46102302 */ mul.s $f12, $f4, $f16 -/* 00668 809D3C18 0C03F494 */ jal Math_atan2f +/* 00668 809D3C18 0C03F494 */ jal Math_FAtan2F /* 0066C 809D3C1C 00000000 */ nop /* 00670 809D3C20 8FA90020 */ lw $t1, 0x0020($sp) /* 00674 809D3C24 E5200190 */ swc1 $f0, 0x0190($t1) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D5004.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D5004.s index 456050d7ee..39880a8117 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D5004.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D5004.s @@ -104,7 +104,7 @@ glabel func_809D5004 /* 01BD0 809D5180 46049182 */ mul.s $f6, $f18, $f4 /* 01BD4 809D5184 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 01BD8 809D5188 A6090048 */ sh $t1, 0x0048($s0) ## 00010048 -/* 01BDC 809D518C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01BDC 809D518C 0C00CFBE */ jal Rand_ZeroFloat /* 01BE0 809D5190 E6060014 */ swc1 $f6, 0x0014($s0) ## 00010014 /* 01BE4 809D5194 4600020D */ trunc.w.s $f8, $f0 @@ -161,7 +161,7 @@ glabel func_809D5004 /* 01C98 809D5248 1441000B */ bne $v0, $at, .L809D5278 /* 01C9C 809D524C 26040034 */ addiu $a0, $s0, 0x0034 ## $a0 = 00010034 /* 01CA0 809D5250 4405B000 */ mfc1 $a1, $f22 -/* 01CA4 809D5254 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01CA4 809D5254 0C01E123 */ jal Math_ApproachZeroF /* 01CA8 809D5258 3C064170 */ lui $a2, 0x4170 ## $a2 = 41700000 /* 01CAC 809D525C C60A0034 */ lwc1 $f10, 0x0034($s0) ## 00010034 @@ -176,27 +176,27 @@ glabel func_809D5004 /* 01CCC 809D527C 1441002B */ bne $v0, $at, .L809D532C /* 01CD0 809D5280 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00010028 /* 01CD4 809D5284 4405B000 */ mfc1 $a1, $f22 -/* 01CD8 809D5288 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01CD8 809D5288 0C01E123 */ jal Math_ApproachZeroF /* 01CDC 809D528C 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 /* 01CE0 809D5290 4405B000 */ mfc1 $a1, $f22 /* 01CE4 809D5294 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0001002C -/* 01CE8 809D5298 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01CE8 809D5298 0C01E123 */ jal Math_ApproachZeroF /* 01CEC 809D529C 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 01CF0 809D52A0 4405B000 */ mfc1 $a1, $f22 /* 01CF4 809D52A4 4406D000 */ mfc1 $a2, $f26 -/* 01CF8 809D52A8 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01CF8 809D52A8 0C01E123 */ jal Math_ApproachZeroF /* 01CFC 809D52AC 26040038 */ addiu $a0, $s0, 0x0038 ## $a0 = 00010038 /* 01D00 809D52B0 4405B000 */ mfc1 $a1, $f22 /* 01D04 809D52B4 2604003C */ addiu $a0, $s0, 0x003C ## $a0 = 0001003C -/* 01D08 809D52B8 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01D08 809D52B8 0C01E123 */ jal Math_ApproachZeroF /* 01D0C 809D52BC 3C0641AC */ lui $a2, 0x41AC ## $a2 = 41AC0000 /* 01D10 809D52C0 4405B000 */ mfc1 $a1, $f22 /* 01D14 809D52C4 4406D000 */ mfc1 $a2, $f26 -/* 01D18 809D52C8 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01D18 809D52C8 0C01E123 */ jal Math_ApproachZeroF /* 01D1C 809D52CC 26040040 */ addiu $a0, $s0, 0x0040 ## $a0 = 00010040 /* 01D20 809D52D0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 @@ -204,7 +204,7 @@ glabel func_809D5004 /* 01D28 809D52D8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 01D2C 809D52DC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 01D30 809D52E0 2604004C */ addiu $a0, $s0, 0x004C ## $a0 = 0001004C -/* 01D34 809D52E4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01D34 809D52E4 0C01E107 */ jal Math_ApproachF /* 01D38 809D52E8 8E050050 */ lw $a1, 0x0050($s0) ## 00010050 /* 01D3C 809D52EC C6120028 */ lwc1 $f18, 0x0028($s0) ## 00010028 @@ -214,7 +214,7 @@ glabel func_809D5004 /* 01D4C 809D52FC 8602004A */ lh $v0, 0x004A($s0) ## 0001004A /* 01D50 809D5300 4405B000 */ mfc1 $a1, $f22 /* 01D54 809D5304 4406E000 */ mfc1 $a2, $f28 -/* 01D58 809D5308 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01D58 809D5308 0C01E123 */ jal Math_ApproachZeroF /* 01D5C 809D530C 26040034 */ addiu $a0, $s0, 0x0034 ## $a0 = 00010034 /* 01D60 809D5310 C6040034 */ lwc1 $f4, 0x0034($s0) ## 00010034 @@ -230,12 +230,12 @@ glabel func_809D5004 /* 01D84 809D5334 2604004C */ addiu $a0, $s0, 0x004C ## $a0 = 0001004C /* 01D88 809D5338 4406B000 */ mfc1 $a2, $f22 /* 01D8C 809D533C 4407E000 */ mfc1 $a3, $f28 -/* 01D90 809D5340 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01D90 809D5340 0C01E107 */ jal Math_ApproachF /* 01D94 809D5344 8E050050 */ lw $a1, 0x0050($s0) ## 00010050 /* 01D98 809D5348 4405B000 */ mfc1 $a1, $f22 /* 01D9C 809D534C 26040034 */ addiu $a0, $s0, 0x0034 ## $a0 = 00010034 -/* 01DA0 809D5350 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01DA0 809D5350 0C01E123 */ jal Math_ApproachZeroF /* 01DA4 809D5354 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 01DA8 809D5358 C6060034 */ lwc1 $f6, 0x0034($s0) ## 00010034 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1F20.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1F20.s index 06a84b16d3..be2f0ef4c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1F20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1F20.s @@ -32,7 +32,7 @@ glabel func_809E1F20 /* 006CC 809E1F7C 46062501 */ sub.s $f20, $f4, $f6 /* 006D0 809E1F80 460A4581 */ sub.s $f22, $f8, $f10 /* 006D4 809E1F84 4600A306 */ mov.s $f12, $f20 -/* 006D8 809E1F88 0C03F494 */ jal Math_atan2f +/* 006D8 809E1F88 0C03F494 */ jal Math_FAtan2F /* 006DC 809E1F8C 4600B386 */ mov.s $f14, $f22 /* 006E0 809E1F90 3C01809E */ lui $at, %hi(D_809E29CC) ## $at = 809E0000 /* 006E4 809E1F94 C43829CC */ lwc1 $f24, %lo(D_809E29CC)($at) @@ -84,7 +84,7 @@ glabel func_809E1F20 /* 00790 809E2040 46128501 */ sub.s $f20, $f16, $f18 /* 00794 809E2044 46062581 */ sub.s $f22, $f4, $f6 /* 00798 809E2048 4600A306 */ mov.s $f12, $f20 -/* 0079C 809E204C 0C03F494 */ jal Math_atan2f +/* 0079C 809E204C 0C03F494 */ jal Math_FAtan2F /* 007A0 809E2050 4600B386 */ mov.s $f14, $f22 /* 007A4 809E2054 46180202 */ mul.s $f8, $f0, $f24 /* 007A8 809E2058 00000000 */ nop @@ -115,7 +115,7 @@ glabel func_809E1F20 /* 00808 809E20B8 44055000 */ mfc1 $a1, $f10 /* 0080C 809E20BC 00000000 */ nop /* 00810 809E20C0 00052C00 */ sll $a1, $a1, 16 -/* 00814 809E20C4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00814 809E20C4 0C01E1A7 */ jal Math_SmoothStepToS /* 00818 809E20C8 00052C03 */ sra $a1, $a1, 16 /* 0081C 809E20CC 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2134.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2134.s index aacbc7ef31..4d5a7f79bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2134.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2134.s @@ -25,7 +25,7 @@ glabel func_809E2134 /* 008D8 809E2188 33280400 */ andi $t0, $t9, 0x0400 ## $t0 = 00000000 /* 008DC 809E218C 1100000B */ beq $t0, $zero, .L809E21BC /* 008E0 809E2190 00000000 */ nop -/* 008E4 809E2194 0C03F66B */ jal Math_Rand_ZeroOne +/* 008E4 809E2194 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 008E8 809E2198 AFA70018 */ sw $a3, 0x0018($sp) /* 008EC 809E219C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -37,7 +37,7 @@ glabel func_809E2134 /* 00904 809E21B4 1000000A */ beq $zero, $zero, .L809E21E0 /* 00908 809E21B8 00000000 */ nop .L809E21BC: -/* 0090C 809E21BC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0090C 809E21BC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00910 809E21C0 AFA70018 */ sw $a3, 0x0018($sp) /* 00914 809E21C4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -56,7 +56,7 @@ glabel func_809E2134 /* 00944 809E21F4 316C0400 */ andi $t4, $t3, 0x0400 ## $t4 = 00000000 /* 00948 809E21F8 1180000E */ beq $t4, $zero, .L809E2234 /* 0094C 809E21FC 00000000 */ nop -/* 00950 809E2200 0C03F66B */ jal Math_Rand_ZeroOne +/* 00950 809E2200 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00954 809E2204 AFA70018 */ sw $a3, 0x0018($sp) /* 00958 809E2208 46000100 */ add.s $f4, $f0, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s index 4d5305f63b..6798fb3832 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s @@ -194,7 +194,7 @@ glabel EnDaikuKakariko_Init /* 00368 809E4688 0C2790C8 */ jal func_809E4320 /* 0036C 809E468C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 .L809E4690: -/* 00370 809E4690 0C03F66B */ jal Math_Rand_ZeroOne +/* 00370 809E4690 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00374 809E4694 00000000 */ nop /* 00378 809E4698 C606015C */ lwc1 $f6, 0x015C($s0) ## 0000015C @@ -211,7 +211,7 @@ glabel EnDaikuKakariko_Init /* 003A0 809E46C0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 003A4 809E46C4 0C2790C8 */ jal func_809E4320 /* 003A8 809E46C8 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC -/* 003AC 809E46CC 0C03F66B */ jal Math_Rand_ZeroOne +/* 003AC 809E46CC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 003B0 809E46D0 00000000 */ nop /* 003B4 809E46D4 C604015C */ lwc1 $f4, 0x015C($s0) ## 0000015C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Update.s index cc2066ef1f..82792e9788 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Update.s @@ -94,7 +94,7 @@ glabel EnDaikuKakariko_Update /* 00D6C 809E508C AFA00010 */ sw $zero, 0x0010($sp) /* 00D70 809E5090 260402FC */ addiu $a0, $s0, 0x02FC ## $a0 = 000002FC /* 00D74 809E5094 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00D78 809E5098 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00D78 809E5098 0C01E1A7 */ jal Math_SmoothStepToS /* 00D7C 809E509C 2407071C */ addiu $a3, $zero, 0x071C ## $a3 = 0000071C /* 00D80 809E50A0 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4BC4.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4BC4.s index 7caa23b96d..b52f3f216a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4BC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4BC4.s @@ -56,7 +56,7 @@ glabel func_809E4BC4 /* 00964 809E4C84 46083501 */ sub.s $f20, $f6, $f8 /* 00968 809E4C88 46128581 */ sub.s $f22, $f16, $f18 /* 0096C 809E4C8C 4600A306 */ mov.s $f12, $f20 -/* 00970 809E4C90 0C03F494 */ jal Math_atan2f +/* 00970 809E4C90 0C03F494 */ jal Math_FAtan2F /* 00974 809E4C94 4600B386 */ mov.s $f14, $f22 /* 00978 809E4C98 3C01809E */ lui $at, %hi(D_809E5618) ## $at = 809E0000 /* 0097C 809E4C9C C4245618 */ lwc1 $f4, %lo(D_809E5618)($at) @@ -145,7 +145,7 @@ glabel func_809E4BC4 /* 00AB4 809E4DD4 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 00AB8 809E4DD8 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 /* 00ABC 809E4DDC AFA00010 */ sw $zero, 0x0010($sp) -/* 00AC0 809E4DE0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00AC0 809E4DE0 0C01E1A7 */ jal Math_SmoothStepToS /* 00AC4 809E4DE4 E7A2004C */ swc1 $f2, 0x004C($sp) /* 00AC8 809E4DE8 8E0301FC */ lw $v1, 0x01FC($s0) ## 000001FC @@ -169,7 +169,7 @@ glabel func_809E4BC4 /* 00B08 809E4E28 3C063F4C */ lui $a2, 0x3F4C ## $a2 = 3F4C0000 /* 00B0C 809E4E2C 44071000 */ mfc1 $a3, $f2 /* 00B10 809E4E30 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3F4CCCCD -/* 00B14 809E4E34 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00B14 809E4E34 0C01E0C4 */ jal Math_SmoothStepToF /* 00B18 809E4E38 E7B40010 */ swc1 $f20, 0x0010($sp) .L809E4E3C: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E65A0.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E65A0.s index 9910800b9b..4602648ec3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E65A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E65A0.s @@ -49,7 +49,7 @@ glabel func_809E65A0 /* 00E50 809E6620 46124082 */ mul.s $f2, $f8, $f18 /* 00E54 809E6624 E6020058 */ swc1 $f2, 0x0058($s0) ## 00000058 /* 00E58 809E6628 E6020054 */ swc1 $f2, 0x0054($s0) ## 00000054 -/* 00E5C 809E662C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00E5C 809E662C 0C01DE2B */ jal Math_ScaledStepToS /* 00E60 809E6630 E6020050 */ swc1 $f2, 0x0050($s0) ## 00000050 /* 00E64 809E6634 860A01C6 */ lh $t2, 0x01C6($s0) ## 000001C6 @@ -95,10 +95,10 @@ glabel func_809E65A0 /* 00EF8 809E66C8 1020000C */ beq $at, $zero, .L809E66FC /* 00EFC 809E66CC 260401CA */ addiu $a0, $s0, 0x01CA ## $a0 = 000001CA /* 00F00 809E66D0 2405AAAB */ addiu $a1, $zero, 0xAAAB ## $a1 = FFFFAAAB -/* 00F04 809E66D4 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00F04 809E66D4 0C01DE2B */ jal Math_ScaledStepToS /* 00F08 809E66D8 2406038E */ addiu $a2, $zero, 0x038E ## $a2 = 0000038E -/* 00F0C 809E66DC 0C01DE0D */ jal Math_Coss +/* 00F0C 809E66DC 0C01DE0D */ jal Math_CosS ## coss? /* 00F10 809E66E0 860401CA */ lh $a0, 0x01CA($s0) ## 000001CA /* 00F14 809E66E4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -113,40 +113,40 @@ glabel func_809E65A0 /* 00F34 809E6704 260401CA */ addiu $a0, $s0, 0x01CA ## $a0 = 000001CA /* 00F38 809E6708 260401CA */ addiu $a0, $s0, 0x01CA ## $a0 = 000001CA /* 00F3C 809E670C 2405F556 */ addiu $a1, $zero, 0xF556 ## $a1 = FFFFF556 -/* 00F40 809E6710 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00F40 809E6710 0C01DE2B */ jal Math_ScaledStepToS /* 00F44 809E6714 2406038E */ addiu $a2, $zero, 0x038E ## $a2 = 0000038E /* 00F48 809E6718 260401CC */ addiu $a0, $s0, 0x01CC ## $a0 = 000001CC /* 00F4C 809E671C 2405AAAB */ addiu $a1, $zero, 0xAAAB ## $a1 = FFFFAAAB -/* 00F50 809E6720 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00F50 809E6720 0C01DE2B */ jal Math_ScaledStepToS /* 00F54 809E6724 2406038E */ addiu $a2, $zero, 0x038E ## $a2 = 0000038E /* 00F58 809E6728 260401CE */ addiu $a0, $s0, 0x01CE ## $a0 = 000001CE /* 00F5C 809E672C 2405AAAB */ addiu $a1, $zero, 0xAAAB ## $a1 = FFFFAAAB -/* 00F60 809E6730 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00F60 809E6730 0C01DE2B */ jal Math_ScaledStepToS /* 00F64 809E6734 24060222 */ addiu $a2, $zero, 0x0222 ## $a2 = 00000222 -/* 00F68 809E6738 0C01DE0D */ jal Math_Coss +/* 00F68 809E6738 0C01DE0D */ jal Math_CosS ## coss? /* 00F6C 809E673C 860401CC */ lh $a0, 0x01CC($s0) ## 000001CC /* 00F70 809E6740 E7A00040 */ swc1 $f0, 0x0040($sp) -/* 00F74 809E6744 0C01DE0D */ jal Math_Coss +/* 00F74 809E6744 0C01DE0D */ jal Math_CosS ## coss? /* 00F78 809E6748 860401CA */ lh $a0, 0x01CA($s0) ## 000001CA /* 00F7C 809E674C E7A00044 */ swc1 $f0, 0x0044($sp) -/* 00F80 809E6750 0C01DE0D */ jal Math_Coss +/* 00F80 809E6750 0C01DE0D */ jal Math_CosS ## coss? /* 00F84 809E6754 860401CE */ lh $a0, 0x01CE($s0) ## 000001CE /* 00F88 809E6758 E7A00048 */ swc1 $f0, 0x0048($sp) -/* 00F8C 809E675C 0C01DE1C */ jal Math_Sins +/* 00F8C 809E675C 0C01DE1C */ jal Math_SinS ## sins? /* 00F90 809E6760 860401CC */ lh $a0, 0x01CC($s0) ## 000001CC /* 00F94 809E6764 860401CA */ lh $a0, 0x01CA($s0) ## 000001CA -/* 00F98 809E6768 0C01DE1C */ jal Math_Sins +/* 00F98 809E6768 0C01DE1C */ jal Math_SinS ## sins? /* 00F9C 809E676C E7A0004C */ swc1 $f0, 0x004C($sp) /* 00FA0 809E6770 860401CE */ lh $a0, 0x01CE($s0) ## 000001CE -/* 00FA4 809E6774 0C01DE1C */ jal Math_Sins +/* 00FA4 809E6774 0C01DE1C */ jal Math_SinS ## sins? /* 00FA8 809E6778 E7A00050 */ swc1 $f0, 0x0050($sp) /* 00FAC 809E677C C7AE0050 */ lwc1 $f14, 0x0050($sp) @@ -170,40 +170,40 @@ glabel func_809E65A0 /* 00FF4 809E67C4 46083300 */ add.s $f12, $f6, $f8 .L809E67C8: /* 00FF8 809E67C8 2405F556 */ addiu $a1, $zero, 0xF556 ## $a1 = FFFFF556 -/* 00FFC 809E67CC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00FFC 809E67CC 0C01DE2B */ jal Math_ScaledStepToS /* 01000 809E67D0 2406038E */ addiu $a2, $zero, 0x038E ## $a2 = 0000038E /* 01004 809E67D4 260401CC */ addiu $a0, $s0, 0x01CC ## $a0 = 000001CC /* 01008 809E67D8 2405CE39 */ addiu $a1, $zero, 0xCE39 ## $a1 = FFFFCE39 -/* 0100C 809E67DC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 0100C 809E67DC 0C01DE2B */ jal Math_ScaledStepToS /* 01010 809E67E0 24060222 */ addiu $a2, $zero, 0x0222 ## $a2 = 00000222 /* 01014 809E67E4 260401CE */ addiu $a0, $s0, 0x01CE ## $a0 = 000001CE /* 01018 809E67E8 2405AAAB */ addiu $a1, $zero, 0xAAAB ## $a1 = FFFFAAAB -/* 0101C 809E67EC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 0101C 809E67EC 0C01DE2B */ jal Math_ScaledStepToS /* 01020 809E67F0 24060222 */ addiu $a2, $zero, 0x0222 ## $a2 = 00000222 -/* 01024 809E67F4 0C01DE0D */ jal Math_Coss +/* 01024 809E67F4 0C01DE0D */ jal Math_CosS ## coss? /* 01028 809E67F8 860401CC */ lh $a0, 0x01CC($s0) ## 000001CC /* 0102C 809E67FC E7A00040 */ swc1 $f0, 0x0040($sp) -/* 01030 809E6800 0C01DE0D */ jal Math_Coss +/* 01030 809E6800 0C01DE0D */ jal Math_CosS ## coss? /* 01034 809E6804 860401CA */ lh $a0, 0x01CA($s0) ## 000001CA /* 01038 809E6808 E7A00044 */ swc1 $f0, 0x0044($sp) -/* 0103C 809E680C 0C01DE0D */ jal Math_Coss +/* 0103C 809E680C 0C01DE0D */ jal Math_CosS ## coss? /* 01040 809E6810 860401CE */ lh $a0, 0x01CE($s0) ## 000001CE /* 01044 809E6814 E7A00048 */ swc1 $f0, 0x0048($sp) -/* 01048 809E6818 0C01DE1C */ jal Math_Sins +/* 01048 809E6818 0C01DE1C */ jal Math_SinS ## sins? /* 0104C 809E681C 860401CC */ lh $a0, 0x01CC($s0) ## 000001CC /* 01050 809E6820 860401CA */ lh $a0, 0x01CA($s0) ## 000001CA -/* 01054 809E6824 0C01DE1C */ jal Math_Sins +/* 01054 809E6824 0C01DE1C */ jal Math_SinS ## sins? /* 01058 809E6828 E7A0004C */ swc1 $f0, 0x004C($sp) /* 0105C 809E682C 860401CE */ lh $a0, 0x01CE($s0) ## 000001CE -/* 01060 809E6830 0C01DE1C */ jal Math_Sins +/* 01060 809E6830 0C01DE1C */ jal Math_SinS ## sins? /* 01064 809E6834 E7A00050 */ swc1 $f0, 0x0050($sp) /* 01068 809E6838 C7AE0050 */ lwc1 $f14, 0x0050($sp) @@ -239,7 +239,7 @@ glabel func_809E65A0 /* 010D4 809E68A4 00052C03 */ sra $a1, $a1, 16 /* 010D8 809E68A8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 010DC 809E68AC 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 010E0 809E68B0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 010E0 809E68B0 0C01E1EF */ jal Math_ApproachS /* 010E4 809E68B4 24070E38 */ addiu $a3, $zero, 0x0E38 ## $a3 = 00000E38 /* 010E8 809E68B8 C7AC0060 */ lwc1 $f12, 0x0060($sp) @@ -253,7 +253,7 @@ glabel func_809E65A0 /* 01104 809E68D4 46043280 */ add.s $f10, $f6, $f4 /* 01108 809E68D8 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 0110C 809E68DC E7AC0060 */ swc1 $f12, 0x0060($sp) -/* 01110 809E68E0 0C01DE1C */ jal Math_Sins +/* 01110 809E68E0 0C01DE1C */ jal Math_SinS ## sins? /* 01114 809E68E4 AFAE0038 */ sw $t6, 0x0038($sp) /* 01118 809E68E8 C7AC0060 */ lwc1 $f12, 0x0060($sp) @@ -262,7 +262,7 @@ glabel func_809E65A0 /* 01124 809E68F4 00000000 */ nop /* 01128 809E68F8 46120182 */ mul.s $f6, $f0, $f18 /* 0112C 809E68FC E7A60058 */ swc1 $f6, 0x0058($sp) -/* 01130 809E6900 0C01DE0D */ jal Math_Coss +/* 01130 809E6900 0C01DE0D */ jal Math_CosS ## coss? /* 01134 809E6904 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 01138 809E6908 C7B20060 */ lwc1 $f18, 0x0060($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6A04.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6A04.s index cc1c13a90d..82c4e52449 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6A04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6A04.s @@ -46,7 +46,7 @@ glabel func_809E6A04 /* 012A0 809E6A70 46124082 */ mul.s $f2, $f8, $f18 /* 012A4 809E6A74 E6020058 */ swc1 $f2, 0x0058($s0) ## 00000058 /* 012A8 809E6A78 E6020054 */ swc1 $f2, 0x0054($s0) ## 00000054 -/* 012AC 809E6A7C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 012AC 809E6A7C 0C01DE2B */ jal Math_ScaledStepToS /* 012B0 809E6A80 E6020050 */ swc1 $f2, 0x0050($s0) ## 00000050 /* 012B4 809E6A84 861801C6 */ lh $t8, 0x01C6($s0) ## 000001C6 @@ -90,10 +90,10 @@ glabel func_809E6A04 /* 01340 809E6B10 1020000C */ beq $at, $zero, .L809E6B44 /* 01344 809E6B14 260401CA */ addiu $a0, $s0, 0x01CA ## $a0 = 000001CA /* 01348 809E6B18 2405C000 */ addiu $a1, $zero, 0xC000 ## $a1 = FFFFC000 -/* 0134C 809E6B1C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 0134C 809E6B1C 0C01DE2B */ jal Math_ScaledStepToS /* 01350 809E6B20 24060555 */ addiu $a2, $zero, 0x0555 ## $a2 = 00000555 -/* 01354 809E6B24 0C01DE0D */ jal Math_Coss +/* 01354 809E6B24 0C01DE0D */ jal Math_CosS ## coss? /* 01358 809E6B28 860401CA */ lh $a0, 0x01CA($s0) ## 000001CA /* 0135C 809E6B2C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -108,40 +108,40 @@ glabel func_809E6A04 /* 0137C 809E6B4C 260401CA */ addiu $a0, $s0, 0x01CA ## $a0 = 000001CA /* 01380 809E6B50 260401CA */ addiu $a0, $s0, 0x01CA ## $a0 = 000001CA /* 01384 809E6B54 2405AAAB */ addiu $a1, $zero, 0xAAAB ## $a1 = FFFFAAAB -/* 01388 809E6B58 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01388 809E6B58 0C01DE2B */ jal Math_ScaledStepToS /* 0138C 809E6B5C 24060555 */ addiu $a2, $zero, 0x0555 ## $a2 = 00000555 /* 01390 809E6B60 260401CC */ addiu $a0, $s0, 0x01CC ## $a0 = 000001CC /* 01394 809E6B64 2405C000 */ addiu $a1, $zero, 0xC000 ## $a1 = FFFFC000 -/* 01398 809E6B68 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01398 809E6B68 0C01DE2B */ jal Math_ScaledStepToS /* 0139C 809E6B6C 24060555 */ addiu $a2, $zero, 0x0555 ## $a2 = 00000555 /* 013A0 809E6B70 260401CE */ addiu $a0, $s0, 0x01CE ## $a0 = 000001CE /* 013A4 809E6B74 2405C000 */ addiu $a1, $zero, 0xC000 ## $a1 = FFFFC000 -/* 013A8 809E6B78 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 013A8 809E6B78 0C01DE2B */ jal Math_ScaledStepToS /* 013AC 809E6B7C 24060333 */ addiu $a2, $zero, 0x0333 ## $a2 = 00000333 -/* 013B0 809E6B80 0C01DE0D */ jal Math_Coss +/* 013B0 809E6B80 0C01DE0D */ jal Math_CosS ## coss? /* 013B4 809E6B84 860401CC */ lh $a0, 0x01CC($s0) ## 000001CC /* 013B8 809E6B88 E7A0003C */ swc1 $f0, 0x003C($sp) -/* 013BC 809E6B8C 0C01DE0D */ jal Math_Coss +/* 013BC 809E6B8C 0C01DE0D */ jal Math_CosS ## coss? /* 013C0 809E6B90 860401CA */ lh $a0, 0x01CA($s0) ## 000001CA /* 013C4 809E6B94 E7A00040 */ swc1 $f0, 0x0040($sp) -/* 013C8 809E6B98 0C01DE0D */ jal Math_Coss +/* 013C8 809E6B98 0C01DE0D */ jal Math_CosS ## coss? /* 013CC 809E6B9C 860401CE */ lh $a0, 0x01CE($s0) ## 000001CE /* 013D0 809E6BA0 E7A00044 */ swc1 $f0, 0x0044($sp) -/* 013D4 809E6BA4 0C01DE1C */ jal Math_Sins +/* 013D4 809E6BA4 0C01DE1C */ jal Math_SinS ## sins? /* 013D8 809E6BA8 860401CC */ lh $a0, 0x01CC($s0) ## 000001CC /* 013DC 809E6BAC 860401CA */ lh $a0, 0x01CA($s0) ## 000001CA -/* 013E0 809E6BB0 0C01DE1C */ jal Math_Sins +/* 013E0 809E6BB0 0C01DE1C */ jal Math_SinS ## sins? /* 013E4 809E6BB4 E7A00048 */ swc1 $f0, 0x0048($sp) /* 013E8 809E6BB8 860401CE */ lh $a0, 0x01CE($s0) ## 000001CE -/* 013EC 809E6BBC 0C01DE1C */ jal Math_Sins +/* 013EC 809E6BBC 0C01DE1C */ jal Math_SinS ## sins? /* 013F0 809E6BC0 E7A0004C */ swc1 $f0, 0x004C($sp) /* 013F4 809E6BC4 C7AE004C */ lwc1 $f14, 0x004C($sp) @@ -165,40 +165,40 @@ glabel func_809E6A04 /* 0143C 809E6C0C 46085300 */ add.s $f12, $f10, $f8 .L809E6C10: /* 01440 809E6C10 2405AAAB */ addiu $a1, $zero, 0xAAAB ## $a1 = FFFFAAAB -/* 01444 809E6C14 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01444 809E6C14 0C01DE2B */ jal Math_ScaledStepToS /* 01448 809E6C18 24060555 */ addiu $a2, $zero, 0x0555 ## $a2 = 00000555 /* 0144C 809E6C1C 260401CC */ addiu $a0, $s0, 0x01CC ## $a0 = 000001CC /* 01450 809E6C20 2405AAAB */ addiu $a1, $zero, 0xAAAB ## $a1 = FFFFAAAB -/* 01454 809E6C24 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01454 809E6C24 0C01DE2B */ jal Math_ScaledStepToS /* 01458 809E6C28 24060333 */ addiu $a2, $zero, 0x0333 ## $a2 = 00000333 /* 0145C 809E6C2C 260401CE */ addiu $a0, $s0, 0x01CE ## $a0 = 000001CE /* 01460 809E6C30 2405C000 */ addiu $a1, $zero, 0xC000 ## $a1 = FFFFC000 -/* 01464 809E6C34 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01464 809E6C34 0C01DE2B */ jal Math_ScaledStepToS /* 01468 809E6C38 24060333 */ addiu $a2, $zero, 0x0333 ## $a2 = 00000333 -/* 0146C 809E6C3C 0C01DE0D */ jal Math_Coss +/* 0146C 809E6C3C 0C01DE0D */ jal Math_CosS ## coss? /* 01470 809E6C40 860401CC */ lh $a0, 0x01CC($s0) ## 000001CC /* 01474 809E6C44 E7A0003C */ swc1 $f0, 0x003C($sp) -/* 01478 809E6C48 0C01DE0D */ jal Math_Coss +/* 01478 809E6C48 0C01DE0D */ jal Math_CosS ## coss? /* 0147C 809E6C4C 860401CA */ lh $a0, 0x01CA($s0) ## 000001CA /* 01480 809E6C50 E7A00040 */ swc1 $f0, 0x0040($sp) -/* 01484 809E6C54 0C01DE0D */ jal Math_Coss +/* 01484 809E6C54 0C01DE0D */ jal Math_CosS ## coss? /* 01488 809E6C58 860401CE */ lh $a0, 0x01CE($s0) ## 000001CE /* 0148C 809E6C5C E7A00044 */ swc1 $f0, 0x0044($sp) -/* 01490 809E6C60 0C01DE1C */ jal Math_Sins +/* 01490 809E6C60 0C01DE1C */ jal Math_SinS ## sins? /* 01494 809E6C64 860401CC */ lh $a0, 0x01CC($s0) ## 000001CC /* 01498 809E6C68 860401CA */ lh $a0, 0x01CA($s0) ## 000001CA -/* 0149C 809E6C6C 0C01DE1C */ jal Math_Sins +/* 0149C 809E6C6C 0C01DE1C */ jal Math_SinS ## sins? /* 014A0 809E6C70 E7A00048 */ swc1 $f0, 0x0048($sp) /* 014A4 809E6C74 860401CE */ lh $a0, 0x01CE($s0) ## 000001CE -/* 014A8 809E6C78 0C01DE1C */ jal Math_Sins +/* 014A8 809E6C78 0C01DE1C */ jal Math_SinS ## sins? /* 014AC 809E6C7C E7A0004C */ swc1 $f0, 0x004C($sp) /* 014B0 809E6C80 C7AE004C */ lwc1 $f14, 0x004C($sp) @@ -228,7 +228,7 @@ glabel func_809E6A04 /* 01508 809E6CD8 46124102 */ mul.s $f4, $f8, $f18 /* 0150C 809E6CDC 46045180 */ add.s $f6, $f10, $f4 /* 01510 809E6CE0 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 01514 809E6CE4 0C01DE1C */ jal Math_Sins +/* 01514 809E6CE4 0C01DE1C */ jal Math_SinS ## sins? /* 01518 809E6CE8 E7AC005C */ swc1 $f12, 0x005C($sp) /* 0151C 809E6CEC C7AC005C */ lwc1 $f12, 0x005C($sp) @@ -237,7 +237,7 @@ glabel func_809E6A04 /* 01528 809E6CF8 00000000 */ nop /* 0152C 809E6CFC 46120282 */ mul.s $f10, $f0, $f18 /* 01530 809E6D00 E7AA0054 */ swc1 $f10, 0x0054($sp) -/* 01534 809E6D04 0C01DE0D */ jal Math_Coss +/* 01534 809E6D04 0C01DE0D */ jal Math_CosS ## coss? /* 01538 809E6D08 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 0153C 809E6D0C C7B2005C */ lwc1 $f18, 0x005C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6DCC.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6DCC.s index 415ab5aa0e..5405831780 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6DCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6DCC.s @@ -3,15 +3,15 @@ glabel func_809E6DCC /* 01600 809E6DD0 AFB00018 */ sw $s0, 0x0018($sp) /* 01604 809E6DD4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01608 809E6DD8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0160C 809E6DDC 0C01DE0D */ jal Math_Coss +/* 0160C 809E6DDC 0C01DE0D */ jal Math_CosS ## coss? /* 01610 809E6DE0 848401CC */ lh $a0, 0x01CC($a0) ## 000001CC /* 01614 809E6DE4 E7A00024 */ swc1 $f0, 0x0024($sp) -/* 01618 809E6DE8 0C01DE0D */ jal Math_Coss +/* 01618 809E6DE8 0C01DE0D */ jal Math_CosS ## coss? /* 0161C 809E6DEC 860401CA */ lh $a0, 0x01CA($s0) ## 000001CA /* 01620 809E6DF0 E7A00028 */ swc1 $f0, 0x0028($sp) -/* 01624 809E6DF4 0C01DE0D */ jal Math_Coss +/* 01624 809E6DF4 0C01DE0D */ jal Math_CosS ## coss? /* 01628 809E6DF8 860401CE */ lh $a0, 0x01CE($s0) ## 000001CE /* 0162C 809E6DFC C7A40028 */ lwc1 $f4, 0x0028($sp) @@ -22,7 +22,7 @@ glabel func_809E6DCC /* 01640 809E6E10 46080280 */ add.s $f10, $f0, $f8 /* 01644 809E6E14 46105482 */ mul.s $f18, $f10, $f16 /* 01648 809E6E18 E7B2002C */ swc1 $f18, 0x002C($sp) -/* 0164C 809E6E1C 0C01DE1C */ jal Math_Sins +/* 0164C 809E6E1C 0C01DE1C */ jal Math_SinS ## sins? /* 01650 809E6E20 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 01654 809E6E24 C7A4002C */ lwc1 $f4, 0x002C($sp) @@ -33,15 +33,15 @@ glabel func_809E6DCC /* 01668 809E6E38 00000000 */ nop /* 0166C 809E6E3C 46080282 */ mul.s $f10, $f0, $f8 /* 01670 809E6E40 46105480 */ add.s $f18, $f10, $f16 -/* 01674 809E6E44 0C01DE1C */ jal Math_Sins +/* 01674 809E6E44 0C01DE1C */ jal Math_SinS ## sins? /* 01678 809E6E48 E6120024 */ swc1 $f18, 0x0024($s0) ## 00000024 /* 0167C 809E6E4C E7A00024 */ swc1 $f0, 0x0024($sp) -/* 01680 809E6E50 0C01DE1C */ jal Math_Sins +/* 01680 809E6E50 0C01DE1C */ jal Math_SinS ## sins? /* 01684 809E6E54 860401CA */ lh $a0, 0x01CA($s0) ## 000001CA /* 01688 809E6E58 E7A00028 */ swc1 $f0, 0x0028($sp) -/* 0168C 809E6E5C 0C01DE1C */ jal Math_Sins +/* 0168C 809E6E5C 0C01DE1C */ jal Math_SinS ## sins? /* 01690 809E6E60 860401CE */ lh $a0, 0x01CE($s0) ## 000001CE /* 01694 809E6E64 C7A40028 */ lwc1 $f4, 0x0028($sp) @@ -57,7 +57,7 @@ glabel func_809E6DCC /* 016BC 809E6E8C 00000000 */ nop /* 016C0 809E6E90 46049182 */ mul.s $f6, $f18, $f4 /* 016C4 809E6E94 46064281 */ sub.s $f10, $f8, $f6 -/* 016C8 809E6E98 0C01DE0D */ jal Math_Coss +/* 016C8 809E6E98 0C01DE0D */ jal Math_CosS ## coss? /* 016CC 809E6E9C E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 016D0 809E6EA0 C7B0002C */ lwc1 $f16, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6ED4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6ED4.s index 68a16b4d97..b7781f8779 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6ED4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6ED4.s @@ -61,7 +61,7 @@ glabel func_809E6ED4 /* 017D0 809E6FA0 00073C03 */ sra $a3, $a3, 16 /* 017D4 809E6FA4 00052C03 */ sra $a1, $a1, 16 /* 017D8 809E6FA8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 017DC 809E6FAC 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 017DC 809E6FAC 0C01E1EF */ jal Math_ApproachS /* 017E0 809E6FB0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 017E4 809E6FB4 860201C6 */ lh $v0, 0x01C6($s0) ## 000001C6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s index b29757ffcf..4e5c48bf3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s @@ -33,7 +33,7 @@ glabel func_809E7104 /* 019A0 809E7170 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 .L809E7174: /* 019A4 809E7174 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 019A8 809E7178 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 019A8 809E7178 0C01DE2B */ jal Math_ScaledStepToS /* 019AC 809E717C 24060222 */ addiu $a2, $zero, 0x0222 ## $a2 = 00000222 /* 019B0 809E7180 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -50,7 +50,7 @@ glabel func_809E7104 /* 019DC 809E71AC 2466038E */ addiu $a2, $v1, 0x038E ## $a2 = 0000038E /* 019E0 809E71B0 00063400 */ sll $a2, $a2, 16 /* 019E4 809E71B4 00063403 */ sra $a2, $a2, 16 -/* 019E8 809E71B8 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 019E8 809E71B8 0C01DE2B */ jal Math_ScaledStepToS /* 019EC 809E71BC A7A3004A */ sh $v1, 0x004A($sp) /* 019F0 809E71C0 87A6004A */ lh $a2, 0x004A($sp) @@ -60,7 +60,7 @@ glabel func_809E7104 /* 01A00 809E71D0 00063400 */ sll $a2, $a2, 16 /* 01A04 809E71D4 00063403 */ sra $a2, $a2, 16 /* 01A08 809E71D8 260401CC */ addiu $a0, $s0, 0x01CC ## $a0 = 000001CC -/* 01A0C 809E71DC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01A0C 809E71DC 0C01DE2B */ jal Math_ScaledStepToS /* 01A10 809E71E0 2405F1C8 */ addiu $a1, $zero, 0xF1C8 ## $a1 = FFFFF1C8 /* 01A14 809E71E4 87A6004A */ lh $a2, 0x004A($sp) @@ -71,7 +71,7 @@ glabel func_809E7104 /* 01A28 809E71F8 00621824 */ and $v1, $v1, $v0 /* 01A2C 809E71FC AFA3004C */ sw $v1, 0x004C($sp) /* 01A30 809E7200 00063403 */ sra $a2, $a2, 16 -/* 01A34 809E7204 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01A34 809E7204 0C01DE2B */ jal Math_ScaledStepToS /* 01A38 809E7208 2405F1C8 */ addiu $a1, $zero, 0xF1C8 ## $a1 = FFFFF1C8 /* 01A3C 809E720C 8FA3004C */ lw $v1, 0x004C($sp) @@ -82,7 +82,7 @@ glabel func_809E7104 /* 01A50 809E7220 8FA40034 */ lw $a0, 0x0034($sp) /* 01A54 809E7224 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 01A58 809E7228 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 01A5C 809E722C 0C01DE1C */ jal Math_Sins +/* 01A5C 809E722C 0C01DE1C */ jal Math_SinS ## sins? /* 01A60 809E7230 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 01A64 809E7234 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -91,7 +91,7 @@ glabel func_809E7104 /* 01A70 809E7240 46100482 */ mul.s $f18, $f0, $f16 /* 01A74 809E7244 E7A40040 */ swc1 $f4, 0x0040($sp) /* 01A78 809E7248 E7B2003C */ swc1 $f18, 0x003C($sp) -/* 01A7C 809E724C 0C01DE0D */ jal Math_Coss +/* 01A7C 809E724C 0C01DE0D */ jal Math_CosS ## coss? /* 01A80 809E7250 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 01A84 809E7254 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -145,7 +145,7 @@ glabel func_809E7104 /* 01B3C 809E730C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 01B40 809E7310 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 01B44 809E7314 2406000F */ addiu $a2, $zero, 0x000F ## $a2 = 0000000F -/* 01B48 809E7318 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01B48 809E7318 0C01E1EF */ jal Math_ApproachS /* 01B4C 809E731C 2407071C */ addiu $a3, $zero, 0x071C ## $a3 = 0000071C .L809E7320: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E738C.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E738C.s index 2ee21994d3..17033a768c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E738C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E738C.s @@ -15,7 +15,7 @@ glabel func_809E738C /* 01BEC 809E73BC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01BF0 809E73C0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 01BF4 809E73C4 24070E38 */ addiu $a3, $zero, 0x0E38 ## $a3 = 00000E38 -/* 01BF8 809E73C8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01BF8 809E73C8 0C01E1A7 */ jal Math_SmoothStepToS /* 01BFC 809E73CC AFA3002C */ sw $v1, 0x002C($sp) /* 01C00 809E73D0 8FA3002C */ lw $v1, 0x002C($sp) @@ -27,22 +27,22 @@ glabel func_809E738C /* 01C14 809E73E4 00052C03 */ sra $a1, $a1, 16 /* 01C18 809E73E8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 01C1C 809E73EC 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01C20 809E73F0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01C20 809E73F0 0C01E1EF */ jal Math_ApproachS /* 01C24 809E73F4 24070E38 */ addiu $a3, $zero, 0x0E38 ## $a3 = 00000E38 /* 01C28 809E73F8 260401CA */ addiu $a0, $s0, 0x01CA ## $a0 = 000001CA /* 01C2C 809E73FC 24050AAA */ addiu $a1, $zero, 0x0AAA ## $a1 = 00000AAA -/* 01C30 809E7400 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01C30 809E7400 0C01DE2B */ jal Math_ScaledStepToS /* 01C34 809E7404 24060444 */ addiu $a2, $zero, 0x0444 ## $a2 = 00000444 /* 01C38 809E7408 260401CC */ addiu $a0, $s0, 0x01CC ## $a0 = 000001CC /* 01C3C 809E740C 2405B8E8 */ addiu $a1, $zero, 0xB8E8 ## $a1 = FFFFB8E8 -/* 01C40 809E7410 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01C40 809E7410 0C01DE2B */ jal Math_ScaledStepToS /* 01C44 809E7414 24060888 */ addiu $a2, $zero, 0x0888 ## $a2 = 00000888 /* 01C48 809E7418 260401CE */ addiu $a0, $s0, 0x01CE ## $a0 = 000001CE /* 01C4C 809E741C 2405955C */ addiu $a1, $zero, 0x955C ## $a1 = FFFF955C -/* 01C50 809E7420 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01C50 809E7420 0C01DE2B */ jal Math_ScaledStepToS /* 01C54 809E7424 24060888 */ addiu $a2, $zero, 0x0888 ## $a2 = 00000888 /* 01C58 809E7428 861801C6 */ lh $t8, 0x01C6($s0) ## 000001C6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7458.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7458.s index 16c15d4cfc..188395158c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7458.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7458.s @@ -13,27 +13,27 @@ glabel func_809E7458 /* 01CB0 809E7480 2405F6C2 */ addiu $a1, $zero, 0xF6C2 ## $a1 = FFFFF6C2 /* 01CB4 809E7484 1460004E */ bne $v1, $zero, .L809E75C0 /* 01CB8 809E7488 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 01CBC 809E748C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01CBC 809E748C 0C01DE2B */ jal Math_ScaledStepToS /* 01CC0 809E7490 2406038E */ addiu $a2, $zero, 0x038E ## $a2 = 0000038E /* 01CC4 809E7494 262401CA */ addiu $a0, $s1, 0x01CA ## $a0 = 000001CA /* 01CC8 809E7498 2405F778 */ addiu $a1, $zero, 0xF778 ## $a1 = FFFFF778 -/* 01CCC 809E749C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01CCC 809E749C 0C01DE2B */ jal Math_ScaledStepToS /* 01CD0 809E74A0 2406016C */ addiu $a2, $zero, 0x016C ## $a2 = 0000016C /* 01CD4 809E74A4 262401CC */ addiu $a0, $s1, 0x01CC ## $a0 = 000001CC /* 01CD8 809E74A8 2405F778 */ addiu $a1, $zero, 0xF778 ## $a1 = FFFFF778 -/* 01CDC 809E74AC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01CDC 809E74AC 0C01DE2B */ jal Math_ScaledStepToS /* 01CE0 809E74B0 2406016C */ addiu $a2, $zero, 0x016C ## $a2 = 0000016C /* 01CE4 809E74B4 262401CE */ addiu $a0, $s1, 0x01CE ## $a0 = 000001CE /* 01CE8 809E74B8 2405F778 */ addiu $a1, $zero, 0xF778 ## $a1 = FFFFF778 -/* 01CEC 809E74BC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01CEC 809E74BC 0C01DE2B */ jal Math_ScaledStepToS /* 01CF0 809E74C0 2406016C */ addiu $a2, $zero, 0x016C ## $a2 = 0000016C /* 01CF4 809E74C4 104000C0 */ beq $v0, $zero, .L809E77C8 /* 01CF8 809E74C8 00000000 */ nop -/* 01CFC 809E74CC 0C01DE1C */ jal Math_Sins +/* 01CFC 809E74CC 0C01DE1C */ jal Math_SinS ## sins? /* 01D00 809E74D0 862400B6 */ lh $a0, 0x00B6($s1) ## 000000B6 /* 01D04 809E74D4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -43,7 +43,7 @@ glabel func_809E7458 /* 01D14 809E74E4 00000000 */ nop /* 01D18 809E74E8 46083282 */ mul.s $f10, $f6, $f8 /* 01D1C 809E74EC E7AA0038 */ swc1 $f10, 0x0038($sp) -/* 01D20 809E74F0 0C01DE0D */ jal Math_Coss +/* 01D20 809E74F0 0C01DE0D */ jal Math_CosS ## coss? /* 01D24 809E74F4 862400B6 */ lh $a0, 0x00B6($s1) ## 000000B6 /* 01D28 809E74F8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -101,22 +101,22 @@ glabel func_809E7458 /* 01DF0 809E75C0 14610014 */ bne $v1, $at, .L809E7614 /* 01DF4 809E75C4 262400B4 */ addiu $a0, $s1, 0x00B4 ## $a0 = 000000B4 /* 01DF8 809E75C8 2405F6C2 */ addiu $a1, $zero, 0xF6C2 ## $a1 = FFFFF6C2 -/* 01DFC 809E75CC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01DFC 809E75CC 0C01DE2B */ jal Math_ScaledStepToS /* 01E00 809E75D0 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 /* 01E04 809E75D4 262401CA */ addiu $a0, $s1, 0x01CA ## $a0 = 000001CA /* 01E08 809E75D8 2405F556 */ addiu $a1, $zero, 0xF556 ## $a1 = FFFFF556 -/* 01E0C 809E75DC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01E0C 809E75DC 0C01DE2B */ jal Math_ScaledStepToS /* 01E10 809E75E0 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 /* 01E14 809E75E4 262401CE */ addiu $a0, $s1, 0x01CE ## $a0 = 000001CE /* 01E18 809E75E8 2405A38F */ addiu $a1, $zero, 0xA38F ## $a1 = FFFFA38F -/* 01E1C 809E75EC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01E1C 809E75EC 0C01DE2B */ jal Math_ScaledStepToS /* 01E20 809E75F0 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 /* 01E24 809E75F4 262401CC */ addiu $a0, $s1, 0x01CC ## $a0 = 000001CC /* 01E28 809E75F8 2405238C */ addiu $a1, $zero, 0x238C ## $a1 = 0000238C -/* 01E2C 809E75FC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01E2C 809E75FC 0C01DE2B */ jal Math_ScaledStepToS /* 01E30 809E7600 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 /* 01E34 809E7604 10400070 */ beq $v0, $zero, .L809E77C8 @@ -128,12 +128,12 @@ glabel func_809E7458 /* 01E48 809E7618 14610015 */ bne $v1, $at, .L809E7670 /* 01E4C 809E761C 262400B4 */ addiu $a0, $s1, 0x00B4 ## $a0 = 000000B4 /* 01E50 809E7620 24052AA8 */ addiu $a1, $zero, 0x2AA8 ## $a1 = 00002AA8 -/* 01E54 809E7624 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01E54 809E7624 0C01DE2B */ jal Math_ScaledStepToS /* 01E58 809E7628 24060AAA */ addiu $a2, $zero, 0x0AAA ## $a2 = 00000AAA /* 01E5C 809E762C 262401CA */ addiu $a0, $s1, 0x01CA ## $a0 = 000001CA /* 01E60 809E7630 24051554 */ addiu $a1, $zero, 0x1554 ## $a1 = 00001554 -/* 01E64 809E7634 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01E64 809E7634 0C01DE2B */ jal Math_ScaledStepToS /* 01E68 809E7638 240605B0 */ addiu $a2, $zero, 0x05B0 ## $a2 = 000005B0 /* 01E6C 809E763C 10400003 */ beq $v0, $zero, .L809E764C @@ -142,12 +142,12 @@ glabel func_809E7458 /* 01E78 809E7648 A62C01C6 */ sh $t4, 0x01C6($s1) ## 000001C6 .L809E764C: /* 01E7C 809E764C 2405C71D */ addiu $a1, $zero, 0xC71D ## $a1 = FFFFC71D -/* 01E80 809E7650 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01E80 809E7650 0C01DE2B */ jal Math_ScaledStepToS /* 01E84 809E7654 24060AAA */ addiu $a2, $zero, 0x0AAA ## $a2 = 00000AAA /* 01E88 809E7658 262401CE */ addiu $a0, $s1, 0x01CE ## $a0 = 000001CE /* 01E8C 809E765C 2405A38F */ addiu $a1, $zero, 0xA38F ## $a1 = FFFFA38F -/* 01E90 809E7660 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01E90 809E7660 0C01DE2B */ jal Math_ScaledStepToS /* 01E94 809E7664 240602D8 */ addiu $a2, $zero, 0x02D8 ## $a2 = 000002D8 /* 01E98 809E7668 10000057 */ beq $zero, $zero, .L809E77C8 @@ -157,12 +157,12 @@ glabel func_809E7458 /* 01EA4 809E7674 14610015 */ bne $v1, $at, .L809E76CC /* 01EA8 809E7678 262400B4 */ addiu $a0, $s1, 0x00B4 ## $a0 = 000000B4 /* 01EAC 809E767C 2405AAB0 */ addiu $a1, $zero, 0xAAB0 ## $a1 = FFFFAAB0 -/* 01EB0 809E7680 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01EB0 809E7680 0C01DE2B */ jal Math_ScaledStepToS /* 01EB4 809E7684 24060AAA */ addiu $a2, $zero, 0x0AAA ## $a2 = 00000AAA /* 01EB8 809E7688 262401CA */ addiu $a0, $s1, 0x01CA ## $a0 = 000001CA /* 01EBC 809E768C 24059C78 */ addiu $a1, $zero, 0x9C78 ## $a1 = FFFF9C78 -/* 01EC0 809E7690 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01EC0 809E7690 0C01DE2B */ jal Math_ScaledStepToS /* 01EC4 809E7694 2406093E */ addiu $a2, $zero, 0x093E ## $a2 = 0000093E /* 01EC8 809E7698 10400003 */ beq $v0, $zero, .L809E76A8 @@ -171,12 +171,12 @@ glabel func_809E7458 /* 01ED4 809E76A4 A62D01C6 */ sh $t5, 0x01C6($s1) ## 000001C6 .L809E76A8: /* 01ED8 809E76A8 2405C004 */ addiu $a1, $zero, 0xC004 ## $a1 = FFFFC004 -/* 01EDC 809E76AC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01EDC 809E76AC 0C01DE2B */ jal Math_ScaledStepToS /* 01EE0 809E76B0 240604FA */ addiu $a2, $zero, 0x04FA ## $a2 = 000004FA /* 01EE4 809E76B4 262401CE */ addiu $a0, $s1, 0x01CE ## $a0 = 000001CE /* 01EE8 809E76B8 2405DC74 */ addiu $a1, $zero, 0xDC74 ## $a1 = FFFFDC74 -/* 01EEC 809E76BC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01EEC 809E76BC 0C01DE2B */ jal Math_ScaledStepToS /* 01EF0 809E76C0 24060444 */ addiu $a2, $zero, 0x0444 ## $a2 = 00000444 /* 01EF4 809E76C4 10000040 */ beq $zero, $zero, .L809E77C8 @@ -186,12 +186,12 @@ glabel func_809E7458 /* 01F00 809E76D0 14610015 */ bne $v1, $at, .L809E7728 /* 01F04 809E76D4 262400B4 */ addiu $a0, $s1, 0x00B4 ## $a0 = 000000B4 /* 01F08 809E76D8 24051800 */ addiu $a1, $zero, 0x1800 ## $a1 = 00001800 -/* 01F0C 809E76DC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01F0C 809E76DC 0C01DE2B */ jal Math_ScaledStepToS /* 01F10 809E76E0 2406093E */ addiu $a2, $zero, 0x093E ## $a2 = 0000093E /* 01F14 809E76E4 262401CA */ addiu $a0, $s1, 0x01CA ## $a0 = 000001CA /* 01F18 809E76E8 2405EAAB */ addiu $a1, $zero, 0xEAAB ## $a1 = FFFFEAAB -/* 01F1C 809E76EC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01F1C 809E76EC 0C01DE2B */ jal Math_ScaledStepToS /* 01F20 809E76F0 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C /* 01F24 809E76F4 10400003 */ beq $v0, $zero, .L809E7704 @@ -200,12 +200,12 @@ glabel func_809E7458 /* 01F30 809E7700 A62E01C6 */ sh $t6, 0x01C6($s1) ## 000001C6 .L809E7704: /* 01F34 809E7704 2405C71D */ addiu $a1, $zero, 0xC71D ## $a1 = FFFFC71D -/* 01F38 809E7708 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01F38 809E7708 0C01DE2B */ jal Math_ScaledStepToS /* 01F3C 809E770C 240602D8 */ addiu $a2, $zero, 0x02D8 ## $a2 = 000002D8 /* 01F40 809E7710 262401CE */ addiu $a0, $s1, 0x01CE ## $a0 = 000001CE /* 01F44 809E7714 2405A38F */ addiu $a1, $zero, 0xA38F ## $a1 = FFFFA38F -/* 01F48 809E7718 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01F48 809E7718 0C01DE2B */ jal Math_ScaledStepToS /* 01F4C 809E771C 240605B0 */ addiu $a2, $zero, 0x05B0 ## $a2 = 000005B0 /* 01F50 809E7720 10000029 */ beq $zero, $zero, .L809E77C8 @@ -253,7 +253,7 @@ glabel func_809E7458 /* 01FE4 809E77B4 14200004 */ bne $at, $zero, .L809E77C8 /* 01FE8 809E77B8 262401CE */ addiu $a0, $s1, 0x01CE ## $a0 = 000001CE /* 01FEC 809E77BC 2405A38F */ addiu $a1, $zero, 0xA38F ## $a1 = FFFFA38F -/* 01FF0 809E77C0 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01FF0 809E77C0 0C01DE2B */ jal Math_ScaledStepToS /* 01FF4 809E77C4 24060088 */ addiu $a2, $zero, 0x0088 ## $a2 = 00000088 .L809E77C8: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E77E4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E77E4.s index 3ac1c2f993..4add381e1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E77E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E77E4.s @@ -16,7 +16,7 @@ glabel func_809E77E4 /* 02048 809E7818 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0204C 809E781C 240E071C */ addiu $t6, $zero, 0x071C ## $t6 = 0000071C /* 02050 809E7820 AFAE0010 */ sw $t6, 0x0010($sp) -/* 02054 809E7824 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 02054 809E7824 0C01E1A7 */ jal Math_SmoothStepToS /* 02058 809E7828 240711C6 */ addiu $a3, $zero, 0x11C6 ## $a3 = 000011C6 /* 0205C 809E782C 240F071C */ addiu $t7, $zero, 0x071C ## $t7 = 0000071C @@ -25,7 +25,7 @@ glabel func_809E77E4 /* 02068 809E7838 262401CA */ addiu $a0, $s1, 0x01CA ## $a0 = 000001CA /* 0206C 809E783C 2405EAAB */ addiu $a1, $zero, 0xEAAB ## $a1 = FFFFEAAB /* 02070 809E7840 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02074 809E7844 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 02074 809E7844 0C01E1A7 */ jal Math_SmoothStepToS /* 02078 809E7848 24070AAA */ addiu $a3, $zero, 0x0AAA ## $a3 = 00000AAA /* 0207C 809E784C 2418071C */ addiu $t8, $zero, 0x071C ## $t8 = 0000071C @@ -34,7 +34,7 @@ glabel func_809E77E4 /* 02088 809E7858 262401CC */ addiu $a0, $s1, 0x01CC ## $a0 = 000001CC /* 0208C 809E785C 2405C71D */ addiu $a1, $zero, 0xC71D ## $a1 = FFFFC71D /* 02090 809E7860 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02094 809E7864 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 02094 809E7864 0C01E1A7 */ jal Math_SmoothStepToS /* 02098 809E7868 24070E38 */ addiu $a3, $zero, 0x0E38 ## $a3 = 00000E38 /* 0209C 809E786C 2419071C */ addiu $t9, $zero, 0x071C ## $t9 = 0000071C @@ -43,7 +43,7 @@ glabel func_809E77E4 /* 020A8 809E7878 262401CE */ addiu $a0, $s1, 0x01CE ## $a0 = 000001CE /* 020AC 809E787C 2405A38F */ addiu $a1, $zero, 0xA38F ## $a1 = FFFFA38F /* 020B0 809E7880 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 020B4 809E7884 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 020B4 809E7884 0C01E1A7 */ jal Math_SmoothStepToS /* 020B8 809E7888 240711C6 */ addiu $a3, $zero, 0x11C6 ## $a3 = 000011C6 /* 020BC 809E788C 02028025 */ or $s0, $s0, $v0 ## $s0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E78DC.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E78DC.s index 8eff03bba1..683ee97010 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E78DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E78DC.s @@ -10,25 +10,25 @@ glabel func_809E78DC /* 02128 809E78F8 2484017C */ addiu $a0, $a0, 0x017C ## $a0 = 0000017C /* 0212C 809E78FC 262400B4 */ addiu $a0, $s1, 0x00B4 ## $a0 = 000000B4 /* 02130 809E7900 2405C000 */ addiu $a1, $zero, 0xC000 ## $a1 = FFFFC000 -/* 02134 809E7904 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 02134 809E7904 0C01DE2B */ jal Math_ScaledStepToS /* 02138 809E7908 24060E38 */ addiu $a2, $zero, 0x0E38 ## $a2 = 00000E38 /* 0213C 809E790C 30500001 */ andi $s0, $v0, 0x0001 ## $s0 = 00000000 /* 02140 809E7910 262401CA */ addiu $a0, $s1, 0x01CA ## $a0 = 000001CA /* 02144 809E7914 2405C000 */ addiu $a1, $zero, 0xC000 ## $a1 = FFFFC000 -/* 02148 809E7918 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 02148 809E7918 0C01DE2B */ jal Math_ScaledStepToS /* 0214C 809E791C 24060E38 */ addiu $a2, $zero, 0x0E38 ## $a2 = 00000E38 /* 02150 809E7920 02028024 */ and $s0, $s0, $v0 /* 02154 809E7924 262401CC */ addiu $a0, $s1, 0x01CC ## $a0 = 000001CC /* 02158 809E7928 2405C000 */ addiu $a1, $zero, 0xC000 ## $a1 = FFFFC000 -/* 0215C 809E792C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 0215C 809E792C 0C01DE2B */ jal Math_ScaledStepToS /* 02160 809E7930 24060E38 */ addiu $a2, $zero, 0x0E38 ## $a2 = 00000E38 /* 02164 809E7934 02028024 */ and $s0, $s0, $v0 /* 02168 809E7938 262401CE */ addiu $a0, $s1, 0x01CE ## $a0 = 000001CE /* 0216C 809E793C 2405C000 */ addiu $a1, $zero, 0xC000 ## $a1 = FFFFC000 -/* 02170 809E7940 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 02170 809E7940 0C01DE2B */ jal Math_ScaledStepToS /* 02174 809E7944 24060E38 */ addiu $a2, $zero, 0x0E38 ## $a2 = 00000E38 /* 02178 809E7948 02028024 */ and $s0, $s0, $v0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7A88.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7A88.s index 253e8a7d8e..92348659a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7A88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7A88.s @@ -14,22 +14,22 @@ glabel func_809E7A88 /* 022D0 809E7AA0 2484017C */ addiu $a0, $a0, 0x017C ## $a0 = 0000017C /* 022D4 809E7AA4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 022D8 809E7AA8 860501CA */ lh $a1, 0x01CA($s0) ## 000001CA -/* 022DC 809E7AAC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 022DC 809E7AAC 0C01DE2B */ jal Math_ScaledStepToS /* 022E0 809E7AB0 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C /* 022E4 809E7AB4 260401CA */ addiu $a0, $s0, 0x01CA ## $a0 = 000001CA /* 022E8 809E7AB8 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC -/* 022EC 809E7ABC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 022EC 809E7ABC 0C01DE2B */ jal Math_ScaledStepToS /* 022F0 809E7AC0 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C /* 022F4 809E7AC4 260401CC */ addiu $a0, $s0, 0x01CC ## $a0 = 000001CC /* 022F8 809E7AC8 860501CE */ lh $a1, 0x01CE($s0) ## 000001CE -/* 022FC 809E7ACC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 022FC 809E7ACC 0C01DE2B */ jal Math_ScaledStepToS /* 02300 809E7AD0 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C /* 02304 809E7AD4 260401CE */ addiu $a0, $s0, 0x01CE ## $a0 = 000001CE /* 02308 809E7AD8 860501C8 */ lh $a1, 0x01C8($s0) ## 000001C8 -/* 0230C 809E7ADC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 0230C 809E7ADC 0C01DE2B */ jal Math_ScaledStepToS /* 02310 809E7AE0 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C /* 02314 809E7AE4 50400010 */ beql $v0, $zero, .L809E7B28 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7BB0.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7BB0.s index 10641c0113..ac638d558f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7BB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7BB0.s @@ -28,7 +28,7 @@ glabel func_809E7BB0 /* 02428 809E7BF8 4405A000 */ mfc1 $a1, $f20 /* 0242C 809E7BFC 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 /* 02430 809E7C00 44064000 */ mfc1 $a2, $f8 -/* 02434 809E7C04 0C01DE80 */ jal Math_ApproxF +/* 02434 809E7C04 0C01DE80 */ jal Math_StepToF /* 02438 809E7C08 00000000 */ nop /* 0243C 809E7C0C 866201C6 */ lh $v0, 0x01C6($s3) ## 000001C6 @@ -36,17 +36,17 @@ glabel func_809E7BB0 /* 02444 809E7C14 24054800 */ addiu $a1, $zero, 0x4800 ## $a1 = 00004800 /* 02448 809E7C18 1440005F */ bne $v0, $zero, .L809E7D98 /* 0244C 809E7C1C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02450 809E7C20 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 02450 809E7C20 0C01DE2B */ jal Math_ScaledStepToS /* 02454 809E7C24 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C /* 02458 809E7C28 266401CA */ addiu $a0, $s3, 0x01CA ## $a0 = 000001CA /* 0245C 809E7C2C 24054800 */ addiu $a1, $zero, 0x4800 ## $a1 = 00004800 -/* 02460 809E7C30 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 02460 809E7C30 0C01DE2B */ jal Math_ScaledStepToS /* 02464 809E7C34 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C /* 02468 809E7C38 266401CC */ addiu $a0, $s3, 0x01CC ## $a0 = 000001CC /* 0246C 809E7C3C 24054800 */ addiu $a1, $zero, 0x4800 ## $a1 = 00004800 -/* 02470 809E7C40 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 02470 809E7C40 0C01DE2B */ jal Math_ScaledStepToS /* 02474 809E7C44 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C /* 02478 809E7C48 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -146,18 +146,18 @@ glabel func_809E7BB0 /* 025E0 809E7DB0 AE8F0004 */ sw $t7, 0x0004($s4) ## FFFFFFF4 /* 025E4 809E7DB4 8E78002C */ lw $t8, 0x002C($s3) ## 0000002C /* 025E8 809E7DB8 AE980008 */ sw $t8, 0x0008($s4) ## FFFFFFF8 -/* 025EC 809E7DBC 0C01DE1C */ jal Math_Sins +/* 025EC 809E7DBC 0C01DE1C */ jal Math_SinS ## sins? /* 025F0 809E7DC0 866400B4 */ lh $a0, 0x00B4($s3) ## 000000B4 /* 025F4 809E7DC4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 025F8 809E7DC8 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 /* 025FC 809E7DCC 866400B4 */ lh $a0, 0x00B4($s3) ## 000000B4 /* 02600 809E7DD0 46120602 */ mul.s $f24, $f0, $f18 -/* 02604 809E7DD4 0C01DE0D */ jal Math_Coss +/* 02604 809E7DD4 0C01DE0D */ jal Math_CosS ## coss? /* 02608 809E7DD8 00000000 */ nop /* 0260C 809E7DDC E7A00068 */ swc1 $f0, 0x0068($sp) -/* 02610 809E7DE0 0C01DE1C */ jal Math_Sins +/* 02610 809E7DE0 0C01DE1C */ jal Math_SinS ## sins? /* 02614 809E7DE4 866400B6 */ lh $a0, 0x00B6($s3) ## 000000B6 /* 02618 809E7DE8 3C01C1A0 */ lui $at, 0xC1A0 ## $at = C1A00000 @@ -167,11 +167,11 @@ glabel func_809E7BB0 /* 02628 809E7DF8 46062202 */ mul.s $f8, $f4, $f6 /* 0262C 809E7DFC 00000000 */ nop /* 02630 809E7E00 46080502 */ mul.s $f20, $f0, $f8 -/* 02634 809E7E04 0C01DE0D */ jal Math_Coss +/* 02634 809E7E04 0C01DE0D */ jal Math_CosS ## coss? /* 02638 809E7E08 00000000 */ nop /* 0263C 809E7E0C E7A00068 */ swc1 $f0, 0x0068($sp) -/* 02640 809E7E10 0C01DE0D */ jal Math_Coss +/* 02640 809E7E10 0C01DE0D */ jal Math_CosS ## coss? /* 02644 809E7E14 866400B6 */ lh $a0, 0x00B6($s3) ## 000000B6 /* 02648 809E7E18 3C01C1A0 */ lui $at, 0xC1A0 ## $at = C1A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7F14.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7F14.s index c42b54b546..298b717a16 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7F14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7F14.s @@ -20,7 +20,7 @@ glabel func_809E7F14 /* 0276C 809E7F3C 46062202 */ mul.s $f8, $f4, $f6 /* 02770 809E7F40 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 02774 809E7F44 44064000 */ mfc1 $a2, $f8 -/* 02778 809E7F48 0C01DE80 */ jal Math_ApproxF +/* 02778 809E7F48 0C01DE80 */ jal Math_StepToF /* 0277C 809E7F4C 00000000 */ nop /* 02780 809E7F50 3C01809F */ lui $at, %hi(D_809E91C0) ## $at = 809F0000 @@ -33,7 +33,7 @@ glabel func_809E7F14 /* 0279C 809E7F6C 46049002 */ mul.s $f0, $f18, $f4 /* 027A0 809E7F70 44050000 */ mfc1 $a1, $f0 /* 027A4 809E7F74 44060000 */ mfc1 $a2, $f0 -/* 027A8 809E7F78 0C01DE80 */ jal Math_ApproxF +/* 027A8 809E7F78 0C01DE80 */ jal Math_StepToF /* 027AC 809E7F7C 00000000 */ nop /* 027B0 809E7F80 1040002E */ beq $v0, $zero, .L809E803C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s index 25d3e28500..47821fe53a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s @@ -98,7 +98,7 @@ glabel func_809E86B8 /* 03014 809E87E4 261E0238 */ addiu $s8, $s0, 0x0238 ## $s8 = 00000238 /* 03018 809E87E8 24170034 */ addiu $s7, $zero, 0x0034 ## $s7 = 00000034 .L809E87EC: -/* 0301C 809E87EC 0C01DE1C */ jal Math_Sins +/* 0301C 809E87EC 0C01DE1C */ jal Math_SinS ## sins? /* 03020 809E87F0 866401CA */ lh $a0, 0x01CA($s3) ## 000001CA /* 03024 809E87F4 4600B182 */ mul.s $f6, $f22, $f0 @@ -107,21 +107,21 @@ glabel func_809E86B8 /* 03030 809E8800 46083282 */ mul.s $f10, $f6, $f8 /* 03034 809E8804 460A8480 */ add.s $f18, $f16, $f10 /* 03038 809E8808 E7B200E4 */ swc1 $f18, 0x00E4($sp) -/* 0303C 809E880C 0C01DE0D */ jal Math_Coss +/* 0303C 809E880C 0C01DE0D */ jal Math_CosS ## coss? /* 03040 809E8810 866401CA */ lh $a0, 0x01CA($s3) ## 000001CA /* 03044 809E8814 46160102 */ mul.s $f4, $f0, $f22 /* 03048 809E8818 C6060230 */ lwc1 $f6, 0x0230($s0) ## 00000230 /* 0304C 809E881C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 03050 809E8820 46062502 */ mul.s $f20, $f4, $f6 -/* 03054 809E8824 0C01DE1C */ jal Math_Sins +/* 03054 809E8824 0C01DE1C */ jal Math_SinS ## sins? /* 03058 809E8828 00000000 */ nop /* 0305C 809E882C 4600A402 */ mul.s $f16, $f20, $f0 /* 03060 809E8830 C7A800E0 */ lwc1 $f8, 0x00E0($sp) /* 03064 809E8834 46104281 */ sub.s $f10, $f8, $f16 /* 03068 809E8838 E7AA00E0 */ swc1 $f10, 0x00E0($sp) -/* 0306C 809E883C 0C01DE0D */ jal Math_Coss +/* 0306C 809E883C 0C01DE0D */ jal Math_CosS ## coss? /* 03070 809E8840 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 03074 809E8844 4600A102 */ mul.s $f4, $f20, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E96FC.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E96FC.s index 2df23afd42..38ddc66b0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E96FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E96FC.s @@ -9,7 +9,7 @@ glabel func_809E96FC /* 001B8 809E9718 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 001BC 809E971C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 001C0 809E9720 24040064 */ addiu $a0, $zero, 0x0064 ## $a0 = 00000064 -/* 001C4 809E9724 0C01DF64 */ jal Math_Rand_S16Offset +/* 001C4 809E9724 0C01DF64 */ jal Rand_S16Offset /* 001C8 809E9728 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 /* 001CC 809E972C 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9E80.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9E80.s index d02021a6e0..0e2f619587 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9E80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9E80.s @@ -24,7 +24,7 @@ glabel func_809E9E80 /* 00970 809E9ED0 304F1000 */ andi $t7, $v0, 0x1000 ## $t7 = 00000000 /* 00974 809E9ED4 55E00005 */ bnel $t7, $zero, .L809E9EEC /* 00978 809E9ED8 24011000 */ addiu $at, $zero, 0x1000 ## $at = 00001000 -/* 0097C 809E9EDC 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0097C 809E9EDC 0C01E1EF */ jal Math_ApproachS /* 00980 809E9EE0 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 00984 809E9EE4 86020196 */ lh $v0, 0x0196($s0) ## 00000196 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9F6C.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9F6C.s index 50e73d30e4..845c1bee12 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9F6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9F6C.s @@ -7,7 +7,7 @@ glabel func_809E9F6C /* 00A20 809E9F80 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 00A24 809E9F84 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 /* 00A28 809E9F88 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00A2C 809E9F8C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 00A2C 809E9F8C 0C01E1EF */ jal Math_ApproachS /* 00A30 809E9F90 24070E38 */ addiu $a3, $zero, 0x0E38 ## $a3 = 00000E38 /* 00A34 809E9F94 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C @@ -25,7 +25,7 @@ glabel func_809E9F6C /* 00A5C 809E9FBC 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 /* 00A60 809E9FC0 5040002B */ beql $v0, $zero, .L809EA070 /* 00A64 809E9FC4 86190196 */ lh $t9, 0x0196($s0) ## 00000196 -/* 00A68 809E9FC8 0C01DE1C */ jal Math_Sins +/* 00A68 809E9FC8 0C01DE1C */ jal Math_SinS ## sins? /* 00A6C 809E9FCC 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00A70 809E9FD0 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 @@ -39,7 +39,7 @@ glabel func_809E9F6C /* 00A90 809E9FF0 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 00A94 809E9FF4 46128100 */ add.s $f4, $f16, $f18 /* 00A98 809E9FF8 E7A40040 */ swc1 $f4, 0x0040($sp) -/* 00A9C 809E9FFC 0C01DE0D */ jal Math_Coss +/* 00A9C 809E9FFC 0C01DE0D */ jal Math_CosS ## coss? /* 00AA0 809EA000 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00AA4 809EA004 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA0C4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA0C4.s index 087c4e04e4..777a24c6bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA0C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA0C4.s @@ -63,13 +63,13 @@ glabel func_809EA0C4 .L809EA1A0: /* 00C40 809EA1A0 8E050008 */ lw $a1, 0x0008($s0) ## 00000008 /* 00C44 809EA1A4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 00C48 809EA1A8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00C48 809EA1A8 0C01E107 */ jal Math_ApproachF /* 00C4C 809EA1AC 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 00C50 809EA1B0 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 00C54 809EA1B4 8E050010 */ lw $a1, 0x0010($s0) ## 00000010 /* 00C58 809EA1B8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 00C5C 809EA1BC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00C5C 809EA1BC 0C01E107 */ jal Math_ApproachF /* 00C60 809EA1C0 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 00C64 809EA1C4 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA1D8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA1D8.s index 019f443b8d..65d0acb4a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA1D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA1D8.s @@ -20,7 +20,7 @@ glabel func_809EA1D8 /* 00CB8 809EA218 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 00CBC 809EA21C 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 00CC0 809EA220 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00CC4 809EA224 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 00CC4 809EA224 0C01E1EF */ jal Math_ApproachS /* 00CC8 809EA228 24070E38 */ addiu $a3, $zero, 0x0E38 ## $a3 = 00000E38 /* 00CCC 809EA22C 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA240.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA240.s index b73d3ec967..dad5e5dcea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA240.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA240.s @@ -31,7 +31,7 @@ glabel func_809EA240 .L809EA2A8: /* 00D48 809EA2A8 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 00D4C 809EA2AC 3C0540F0 */ lui $a1, 0x40F0 ## $a1 = 40F00000 -/* 00D50 809EA2B0 0C01DE80 */ jal Math_ApproxF +/* 00D50 809EA2B0 0C01DE80 */ jal Math_StepToF /* 00D54 809EA2B4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00D58 809EA2B8 86050198 */ lh $a1, 0x0198($s0) ## 00000198 @@ -39,7 +39,7 @@ glabel func_809EA240 /* 00D60 809EA2C0 AFB90010 */ sw $t9, 0x0010($sp) /* 00D64 809EA2C4 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 00D68 809EA2C8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00D6C 809EA2CC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00D6C 809EA2CC 0C01E1A7 */ jal Math_SmoothStepToS /* 00D70 809EA2D0 24070E38 */ addiu $a3, $zero, 0x0E38 ## $a3 = 00000E38 /* 00D74 809EA2D4 5440003F */ bnel $v0, $zero, .L809EA3D4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA4E8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA4E8.s index d4ebd95504..01c94f284d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA4E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA4E8.s @@ -5,7 +5,7 @@ glabel func_809EA4E8 /* 00F94 809EA4F4 AFA5001C */ sw $a1, 0x001C($sp) /* 00F98 809EA4F8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00F9C 809EA4FC 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 00FA0 809EA500 0C01DE80 */ jal Math_ApproxF +/* 00FA0 809EA500 0C01DE80 */ jal Math_StepToF /* 00FA4 809EA504 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00FA8 809EA508 8FA40018 */ lw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s index 6c95fc6922..6dae03039f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s @@ -47,7 +47,7 @@ glabel EnDivingGame_Update /* 013C0 809EEC30 14200009 */ bne $at, $zero, .L809EEC58 /* 013C4 809EEC34 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 013C8 809EEC38 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 -/* 013CC 809EEC3C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 013CC 809EEC3C 0C00CFBE */ jal Rand_ZeroFloat /* 013D0 809EEC40 A600029E */ sh $zero, 0x029E($s0) ## 0000029E /* 013D4 809EEC44 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809ED9E0.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809ED9E0.s index 7de55bb30d..08a0d282b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809ED9E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809ED9E0.s @@ -8,7 +8,7 @@ glabel func_809ED9E0 /* 00174 809ED9E4 AFBF003C */ sw $ra, 0x003C($sp) /* 00178 809ED9E8 AFB00038 */ sw $s0, 0x0038($sp) /* 0017C 809ED9EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00180 809ED9F0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00180 809ED9F0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00184 809ED9F4 AFA50054 */ sw $a1, 0x0054($sp) /* 00188 809ED9F8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -19,7 +19,7 @@ glabel func_809ED9E0 /* 0019C 809EDA0C C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 /* 001A0 809EDA10 46083282 */ mul.s $f10, $f6, $f8 /* 001A4 809EDA14 46105480 */ add.s $f18, $f10, $f16 -/* 001A8 809EDA18 0C03F66B */ jal Math_Rand_ZeroOne +/* 001A8 809EDA18 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 001AC 809EDA1C E7B20040 */ swc1 $f18, 0x0040($sp) /* 001B0 809EDA20 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -33,7 +33,7 @@ glabel func_809ED9E0 /* 001D0 809EDA40 46083282 */ mul.s $f10, $f6, $f8 /* 001D4 809EDA44 46128100 */ add.s $f4, $f16, $f18 /* 001D8 809EDA48 46045180 */ add.s $f6, $f10, $f4 -/* 001DC 809EDA4C 0C03F66B */ jal Math_Rand_ZeroOne +/* 001DC 809EDA4C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 001E0 809EDA50 E7A60044 */ swc1 $f6, 0x0044($sp) /* 001E4 809EDA54 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -46,7 +46,7 @@ glabel func_809ED9E0 /* 00200 809EDA70 C42CF1B8 */ lwc1 $f12, %lo(D_809EF1B8)($at) /* 00204 809EDA74 46128282 */ mul.s $f10, $f16, $f18 /* 00208 809EDA78 46045180 */ add.s $f6, $f10, $f4 -/* 0020C 809EDA7C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0020C 809EDA7C 0C00CFC8 */ jal Rand_CenteredFloat /* 00210 809EDA80 E7A60048 */ swc1 $f6, 0x0048($sp) /* 00214 809EDA84 4600028D */ trunc.w.s $f10, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE408.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE408.s index ae905cfbfa..a324ec5dbf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE408.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE408.s @@ -25,7 +25,7 @@ glabel func_809EE408 /* 00BEC 809EE45C 46062202 */ mul.s $f8, $f4, $f6 /* 00BF0 809EE460 8E0602DC */ lw $a2, 0x02DC($s0) ## 000002DC /* 00BF4 809EE464 44074000 */ mfc1 $a3, $f8 -/* 00BF8 809EE468 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00BF8 809EE468 0C01E107 */ jal Math_ApproachF /* 00BFC 809EE46C 00000000 */ nop /* 00C00 809EE470 C60A02F0 */ lwc1 $f10, 0x02F0($s0) ## 000002F0 @@ -35,7 +35,7 @@ glabel func_809EE408 /* 00C10 809EE480 46105482 */ mul.s $f18, $f10, $f16 /* 00C14 809EE484 8E0602E4 */ lw $a2, 0x02E4($s0) ## 000002E4 /* 00C18 809EE488 44079000 */ mfc1 $a3, $f18 -/* 00C1C 809EE48C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00C1C 809EE48C 0C01E107 */ jal Math_ApproachF /* 00C20 809EE490 00000000 */ nop /* 00C24 809EE494 C604030C */ lwc1 $f4, 0x030C($s0) ## 0000030C @@ -45,7 +45,7 @@ glabel func_809EE408 /* 00C34 809EE4A4 46062202 */ mul.s $f8, $f4, $f6 /* 00C38 809EE4A8 8E060300 */ lw $a2, 0x0300($s0) ## 00000300 /* 00C3C 809EE4AC 44074000 */ mfc1 $a3, $f8 -/* 00C40 809EE4B0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00C40 809EE4B0 0C01E107 */ jal Math_ApproachF /* 00C44 809EE4B4 00000000 */ nop /* 00C48 809EE4B8 C60A0310 */ lwc1 $f10, 0x0310($s0) ## 00000310 @@ -55,7 +55,7 @@ glabel func_809EE408 /* 00C58 809EE4C8 46105482 */ mul.s $f18, $f10, $f16 /* 00C5C 809EE4CC 8E060304 */ lw $a2, 0x0304($s0) ## 00000304 /* 00C60 809EE4D0 44079000 */ mfc1 $a3, $f18 -/* 00C64 809EE4D4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00C64 809EE4D4 0C01E107 */ jal Math_ApproachF /* 00C68 809EE4D8 00000000 */ nop /* 00C6C 809EE4DC C6040314 */ lwc1 $f4, 0x0314($s0) ## 00000314 @@ -65,7 +65,7 @@ glabel func_809EE408 /* 00C7C 809EE4EC 46062202 */ mul.s $f8, $f4, $f6 /* 00C80 809EE4F0 8E060308 */ lw $a2, 0x0308($s0) ## 00000308 /* 00C84 809EE4F4 44074000 */ mfc1 $a3, $f8 -/* 00C88 809EE4F8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00C88 809EE4F8 0C01E107 */ jal Math_ApproachF /* 00C8C 809EE4FC 00000000 */ nop /* 00C90 809EE500 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -74,7 +74,7 @@ glabel func_809EE408 /* 00C9C 809EE50C 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 00CA0 809EE510 44050000 */ mfc1 $a1, $f0 /* 00CA4 809EE514 44060000 */ mfc1 $a2, $f0 -/* 00CA8 809EE518 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00CA8 809EE518 0C01E107 */ jal Math_ApproachF /* 00CAC 809EE51C 26040318 */ addiu $a0, $s0, 0x0318 ## $a0 = 00000318 /* 00CB0 809EE520 860502A0 */ lh $a1, 0x02A0($s0) ## 000002A0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDE4.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDE4.s index 9b1a04b693..2171d4b370 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDE4.s @@ -49,7 +49,7 @@ glabel func_809EEDE4 /* 01624 809EEE94 AFA30018 */ sw $v1, 0x0018($sp) /* 01628 809EEE98 00002012 */ mflo $a0 /* 0162C 809EEE9C 00042400 */ sll $a0, $a0, 16 -/* 01630 809EEEA0 0C01DE1C */ jal Math_Sins +/* 01630 809EEEA0 0C01DE1C */ jal Math_SinS ## sins? /* 01634 809EEEA4 00042403 */ sra $a0, $a0, 16 /* 01638 809EEEA8 8FA20038 */ lw $v0, 0x0038($sp) @@ -71,7 +71,7 @@ glabel func_809EEDE4 /* 01678 809EEEE8 016C0019 */ multu $t3, $t4 /* 0167C 809EEEEC 00002012 */ mflo $a0 /* 01680 809EEEF0 00042400 */ sll $a0, $a0, 16 -/* 01684 809EEEF4 0C01DE0D */ jal Math_Coss +/* 01684 809EEEF4 0C01DE0D */ jal Math_CosS ## coss? /* 01688 809EEEF8 00042403 */ sra $a0, $a0, 16 /* 0168C 809EEEFC 8FA20038 */ lw $v0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F0AA4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F0AA4.s index 20fb80f49e..c05a84e8a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F0AA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F0AA4.s @@ -317,7 +317,7 @@ glabel L809F0D80 glabel L809F0E1C .L809F0E1C: /* 0053C 809F0E1C 3C01809F */ lui $at, %hi(D_809F19A0) ## $at = 809F0000 -/* 00540 809F0E20 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00540 809F0E20 0C00CFBE */ jal Rand_ZeroFloat /* 00544 809F0E24 C42C19A0 */ lwc1 $f12, %lo(D_809F19A0)($at) /* 00548 809F0E28 4600020D */ trunc.w.s $f8, $f0 @@ -366,7 +366,7 @@ glabel L809F0E1C /* 005E0 809F0EC0 2484183C */ addiu $a0, $a0, %lo(D_809F183C) ## $a0 = 809F183C /* 005E4 809F0EC4 3C01809F */ lui $at, %hi(D_809F19A4) ## $at = 809F0000 -/* 005E8 809F0EC8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 005E8 809F0EC8 0C00CFBE */ jal Rand_ZeroFloat /* 005EC 809F0ECC C42C19A4 */ lwc1 $f12, %lo(D_809F19A4)($at) /* 005F0 809F0ED0 4600028D */ trunc.w.s $f10, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1100.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1100.s index daa423c72a..be4d383f1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1100.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1100.s @@ -128,7 +128,7 @@ glabel func_809F1100 /* 00A00 809F12E0 A596025A */ sh $s6, 0x025A($t4) ## 0000025A /* 00A04 809F12E4 46183202 */ mul.s $f8, $f6, $f24 /* 00A08 809F12E8 46184500 */ add.s $f20, $f8, $f24 -/* 00A0C 809F12EC 0C01DE1C */ jal Math_Sins +/* 00A0C 809F12EC 0C01DE1C */ jal Math_SinS ## sins? /* 00A10 809F12F0 4600A586 */ mov.s $f22, $f20 /* 00A14 809F12F4 46140282 */ mul.s $f10, $f0, $f20 @@ -140,7 +140,7 @@ glabel func_809F1100 /* 00A2C 809F130C E5B20288 */ swc1 $f18, 0x0288($t5) ## 00000288 /* 00A30 809F1310 8E0E01D8 */ lw $t6, 0x01D8($s0) ## 000001D8 /* 00A34 809F1314 C7A40068 */ lwc1 $f4, 0x0068($sp) -/* 00A38 809F1318 0C01DE0D */ jal Math_Coss +/* 00A38 809F1318 0C01DE0D */ jal Math_CosS ## coss? /* 00A3C 809F131C E5C4028C */ swc1 $f4, 0x028C($t6) ## 0000028C /* 00A40 809F1320 46160182 */ mul.s $f6, $f0, $f22 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s index 26f0ffbfea..b6c6f15a77 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s @@ -102,7 +102,7 @@ glabel EnDntJiji_Update /* 01264 809F2D44 14200009 */ bne $at, $zero, .L809F2D6C /* 01268 809F2D48 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 0126C 809F2D4C 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 -/* 01270 809F2D50 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01270 809F2D50 0C00CFBE */ jal Rand_ZeroFloat /* 01274 809F2D54 A600024C */ sh $zero, 0x024C($s0) ## 0000024C /* 01278 809F2D58 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1E8C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1E8C.s index 4b831df3be..be125e4d03 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1E8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1E8C.s @@ -11,7 +11,7 @@ glabel func_809F1E8C /* 003CC 809F1EAC AFA00010 */ sw $zero, 0x0010($sp) /* 003D0 809F1EB0 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 003D4 809F1EB4 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 003D8 809F1EB8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 003D8 809F1EB8 0C01E1A7 */ jal Math_SmoothStepToS /* 003DC 809F1EBC 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 /* 003E0 809F1EC0 3C014316 */ lui $at, 0x4316 ## $at = 43160000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2118.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2118.s index 9bd3f84672..55070f6b57 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2118.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2118.s @@ -11,7 +11,7 @@ glabel func_809F2118 /* 00658 809F2138 AFA00010 */ sw $zero, 0x0010($sp) /* 0065C 809F213C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 00660 809F2140 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 00664 809F2144 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00664 809F2144 0C01E1A7 */ jal Math_SmoothStepToS /* 00668 809F2148 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 0066C 809F214C 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 @@ -21,7 +21,7 @@ glabel func_809F2118 /* 0067C 809F215C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 00680 809F2160 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 00684 809F2164 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00688 809F2168 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00688 809F2168 0C01E107 */ jal Math_ApproachF /* 0068C 809F216C A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 /* 00690 809F2170 860F0242 */ lh $t7, 0x0242($s0) ## 00000242 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F24AC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F24AC.s index 63d93293f9..be87ec3e15 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F24AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F24AC.s @@ -13,7 +13,7 @@ glabel func_809F24AC /* 009F4 809F24D4 AFA00010 */ sw $zero, 0x0010($sp) /* 009F8 809F24D8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 009FC 809F24DC 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00A00 809F24E0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00A00 809F24E0 0C01E1A7 */ jal Math_SmoothStepToS /* 00A04 809F24E4 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 /* 00A08 809F24E8 860E0248 */ lh $t6, 0x0248($s0) ## 00000248 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F25E4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F25E4.s index b010087a72..4e05d2052f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F25E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F25E4.s @@ -12,7 +12,7 @@ glabel func_809F25E4 /* 00B28 809F2608 AFA00010 */ sw $zero, 0x0010($sp) /* 00B2C 809F260C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 00B30 809F2610 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00B34 809F2614 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00B34 809F2614 0C01E1A7 */ jal Math_SmoothStepToS /* 00B38 809F2618 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 /* 00B3C 809F261C 0C042F6F */ jal func_8010BDBC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2A90.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2A90.s index 7953cc0ac5..13943c1ccc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2A90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2A90.s @@ -19,7 +19,7 @@ glabel func_809F2A90 /* 00FDC 809F2ABC 46062301 */ sub.s $f12, $f4, $f6 /* 00FE0 809F2AC0 460A4381 */ sub.s $f14, $f8, $f10 /* 00FE4 809F2AC4 E7AC002C */ swc1 $f12, 0x002C($sp) -/* 00FE8 809F2AC8 0C03F494 */ jal Math_atan2f +/* 00FE8 809F2AC8 0C03F494 */ jal Math_FAtan2F /* 00FEC 809F2ACC E7AE0028 */ swc1 $f14, 0x0028($sp) /* 00FF0 809F2AD0 3C01809F */ lui $at, %hi(D_809F30F4) ## $at = 809F0000 /* 00FF4 809F2AD4 C43030F4 */ lwc1 $f16, %lo(D_809F30F4)($at) @@ -32,7 +32,7 @@ glabel func_809F2A90 /* 01010 809F2AF0 44052000 */ mfc1 $a1, $f4 /* 01014 809F2AF4 00000000 */ nop /* 01018 809F2AF8 00052C00 */ sll $a1, $a1, 16 -/* 0101C 809F2AFC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0101C 809F2AFC 0C01E1A7 */ jal Math_SmoothStepToS /* 01020 809F2B00 00052C03 */ sra $a1, $a1, 16 /* 01024 809F2B04 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Update.s index 9156f550bb..e5c4eb78d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Update.s @@ -84,7 +84,7 @@ glabel L809F5714 /* 02454 809F5714 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 02458 809F5718 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 /* 0245C 809F571C A6000274 */ sh $zero, 0x0274($s0) ## 00000274 -/* 02460 809F5720 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 02460 809F5720 0C00CFBE */ jal Rand_ZeroFloat /* 02464 809F5724 A20000AE */ sb $zero, 0x00AE($s0) ## 000000AE /* 02468 809F5728 860B026A */ lh $t3, 0x026A($s0) ## 0000026A @@ -143,7 +143,7 @@ glabel L809F57B0 /* 02520 809F57E0 14200009 */ bne $at, $zero, .L809F5808 /* 02524 809F57E4 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 02528 809F57E8 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 -/* 0252C 809F57EC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0252C 809F57EC 0C00CFBE */ jal Rand_ZeroFloat /* 02530 809F57F0 A6000268 */ sh $zero, 0x0268($s0) ## 00000268 /* 02534 809F57F4 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3BE4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3BE4.s index ac25f7ecee..e236d08ba3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3BE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3BE4.s @@ -21,7 +21,7 @@ glabel func_809F3BE4 /* 00950 809F3C10 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00954 809F3C14 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 00958 809F3C18 46062301 */ sub.s $f12, $f4, $f6 -/* 0095C 809F3C1C 0C03F494 */ jal Math_atan2f +/* 0095C 809F3C1C 0C03F494 */ jal Math_FAtan2F /* 00960 809F3C20 460A4381 */ sub.s $f14, $f8, $f10 /* 00964 809F3C24 3C01809F */ lui $at, %hi(D_809F6040) ## $at = 809F0000 /* 00968 809F3C28 C4306040 */ lwc1 $f16, %lo(D_809F6040)($at) @@ -34,7 +34,7 @@ glabel func_809F3BE4 /* 00984 809F3C44 44052000 */ mfc1 $a1, $f4 /* 00988 809F3C48 00000000 */ nop /* 0098C 809F3C4C 00052C00 */ sll $a1, $a1, 16 -/* 00990 809F3C50 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00990 809F3C50 0C01E1A7 */ jal Math_SmoothStepToS /* 00994 809F3C54 00052C03 */ sra $a1, $a1, 16 /* 00998 809F3C58 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3CD0.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3CD0.s index f867032027..49fa64f9e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3CD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3CD0.s @@ -12,7 +12,7 @@ glabel func_809F3CD0 /* 00A34 809F3CF4 AFA00010 */ sw $zero, 0x0010($sp) /* 00A38 809F3CF8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 00A3C 809F3CFC 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00A40 809F3D00 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00A40 809F3D00 0C01E1A7 */ jal Math_SmoothStepToS /* 00A44 809F3D04 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 /* 00A48 809F3D08 8FA4002C */ lw $a0, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F40D4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F40D4.s index aea1ecc123..9b060001c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F40D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F40D4.s @@ -24,7 +24,7 @@ glabel func_809F40D4 /* 00E4C 809F410C 46062301 */ sub.s $f12, $f4, $f6 /* 00E50 809F4110 460A4381 */ sub.s $f14, $f8, $f10 /* 00E54 809F4114 E7AC0034 */ swc1 $f12, 0x0034($sp) -/* 00E58 809F4118 0C03F494 */ jal Math_atan2f +/* 00E58 809F4118 0C03F494 */ jal Math_FAtan2F /* 00E5C 809F411C E7AE0030 */ swc1 $f14, 0x0030($sp) /* 00E60 809F4120 3C01809F */ lui $at, %hi(D_809F6044) ## $at = 809F0000 /* 00E64 809F4124 C4306044 */ lwc1 $f16, %lo(D_809F6044)($at) @@ -37,11 +37,11 @@ glabel func_809F40D4 /* 00E80 809F4140 44052000 */ mfc1 $a1, $f4 /* 00E84 809F4144 00000000 */ nop /* 00E88 809F4148 00052C00 */ sll $a1, $a1, 16 -/* 00E8C 809F414C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00E8C 809F414C 0C01E1A7 */ jal Math_SmoothStepToS /* 00E90 809F4150 00052C03 */ sra $a1, $a1, 16 /* 00E94 809F4154 C7AC0034 */ lwc1 $f12, 0x0034($sp) -/* 00E98 809F4158 0C03F494 */ jal Math_atan2f +/* 00E98 809F4158 0C03F494 */ jal Math_FAtan2F /* 00E9C 809F415C C7AE0030 */ lwc1 $f14, 0x0030($sp) /* 00EA0 809F4160 3C01809F */ lui $at, %hi(D_809F6048) ## $at = 809F0000 /* 00EA4 809F4164 C4266048 */ lwc1 $f6, %lo(D_809F6048)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F44FC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F44FC.s index a7bc638ca5..9284ed5b01 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F44FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F44FC.s @@ -43,7 +43,7 @@ glabel func_809F44FC /* 012C0 809F4580 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 012C4 809F4584 E7A0002C */ swc1 $f0, 0x002C($sp) /* 012C8 809F4588 AFA00010 */ sw $zero, 0x0010($sp) -/* 012CC 809F458C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 012CC 809F458C 0C01E1A7 */ jal Math_SmoothStepToS /* 012D0 809F4590 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 /* 012D4 809F4594 10000018 */ beq $zero, $zero, .L809F45F8 @@ -54,7 +54,7 @@ glabel func_809F44FC /* 012E4 809F45A4 C6040290 */ lwc1 $f4, 0x0290($s0) ## 00000290 /* 012E8 809F45A8 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C /* 012EC 809F45AC 46128301 */ sub.s $f12, $f16, $f18 -/* 012F0 809F45B0 0C03F494 */ jal Math_atan2f +/* 012F0 809F45B0 0C03F494 */ jal Math_FAtan2F /* 012F4 809F45B4 46082381 */ sub.s $f14, $f4, $f8 /* 012F8 809F45B8 3C01809F */ lui $at, %hi(D_809F604C) ## $at = 809F0000 /* 012FC 809F45BC C426604C */ lwc1 $f6, %lo(D_809F604C)($at) @@ -67,7 +67,7 @@ glabel func_809F44FC /* 01318 809F45D8 44058000 */ mfc1 $a1, $f16 /* 0131C 809F45DC 00000000 */ nop /* 01320 809F45E0 00052C00 */ sll $a1, $a1, 16 -/* 01324 809F45E4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01324 809F45E4 0C01E1A7 */ jal Math_SmoothStepToS /* 01328 809F45E8 00052C03 */ sra $a1, $a1, 16 /* 0132C 809F45EC 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 @@ -76,7 +76,7 @@ glabel func_809F44FC .L809F45F8: /* 01338 809F45F8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0133C 809F45FC 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 01340 809F4600 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01340 809F4600 0C00CFBE */ jal Rand_ZeroFloat /* 01344 809F4604 46009300 */ add.s $f12, $f18, $f0 /* 01348 809F4608 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -91,7 +91,7 @@ glabel func_809F44FC /* 0136C 809F462C 11410031 */ beq $t2, $at, .L809F46F4 /* 01370 809F4630 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 01374 809F4634 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 01378 809F4638 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01378 809F4638 0C00CFBE */ jal Rand_ZeroFloat /* 0137C 809F463C 00000000 */ nop /* 01380 809F4640 4600020D */ trunc.w.s $f8, $f0 @@ -116,7 +116,7 @@ glabel func_809F44FC /* 013C8 809F4688 3C014120 */ lui $at, 0x4120 ## $at = 41200000 .L809F468C: /* 013CC 809F468C 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 013D0 809F4690 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 013D0 809F4690 0C00CFBE */ jal Rand_ZeroFloat /* 013D4 809F4694 00000000 */ nop /* 013D8 809F4698 4600018D */ trunc.w.s $f6, $f0 @@ -142,7 +142,7 @@ glabel func_809F44FC /* 01424 809F46E4 00052C03 */ sra $a1, $a1, 16 .L809F46E8: /* 01428 809F46E8 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 -/* 0142C 809F46EC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0142C 809F46EC 0C01E1A7 */ jal Math_SmoothStepToS /* 01430 809F46F0 AFA00010 */ sw $zero, 0x0010($sp) .L809F46F4: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4824.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4824.s index 4db99e003b..d4d98e9555 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4824.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4824.s @@ -27,7 +27,7 @@ glabel func_809F4824 /* 015C4 809F4884 3C08809F */ lui $t0, %hi(func_809F4BA4) ## $t0 = 809F0000 /* 015C8 809F4888 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 015CC 809F488C 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 015D0 809F4890 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 015D0 809F4890 0C00CFBE */ jal Rand_ZeroFloat /* 015D4 809F4894 AFA50020 */ sw $a1, 0x0020($sp) /* 015D8 809F4898 8FA50020 */ lw $a1, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F49A4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F49A4.s index fa0c452923..4a3423dc46 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F49A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F49A4.s @@ -53,7 +53,7 @@ glabel func_809F49A4 /* 01798 809F4A58 1000004D */ beq $zero, $zero, .L809F4B90 /* 0179C 809F4A5C E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 .L809F4A60: -/* 017A0 809F4A60 0C03F494 */ jal Math_atan2f +/* 017A0 809F4A60 0C03F494 */ jal Math_FAtan2F /* 017A4 809F4A64 00000000 */ nop /* 017A8 809F4A68 3C01809F */ lui $at, %hi(D_809F6050) ## $at = 809F0000 /* 017AC 809F4A6C C4326050 */ lwc1 $f18, %lo(D_809F6050)($at) @@ -66,7 +66,7 @@ glabel func_809F49A4 /* 017C8 809F4A88 44053000 */ mfc1 $a1, $f6 /* 017CC 809F4A8C 00000000 */ nop /* 017D0 809F4A90 00052C00 */ sll $a1, $a1, 16 -/* 017D4 809F4A94 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 017D4 809F4A94 0C01E1A7 */ jal Math_SmoothStepToS /* 017D8 809F4A98 00052C03 */ sra $a1, $a1, 16 /* 017DC 809F4A9C 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 @@ -76,7 +76,7 @@ glabel func_809F49A4 /* 017E8 809F4AA8 14610013 */ bne $v1, $at, .L809F4AF8 /* 017EC 809F4AAC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 017F0 809F4AB0 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 017F4 809F4AB4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 017F4 809F4AB4 0C00CFBE */ jal Rand_ZeroFloat /* 017F8 809F4AB8 00000000 */ nop /* 017FC 809F4ABC 4600020D */ trunc.w.s $f8, $f0 @@ -99,14 +99,14 @@ glabel func_809F49A4 /* 0183C 809F4AFC AFA00010 */ sw $zero, 0x0010($sp) /* 01840 809F4B00 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 01844 809F4B04 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 01848 809F4B08 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01848 809F4B08 0C01E1A7 */ jal Math_SmoothStepToS /* 0184C 809F4B0C 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 /* 01850 809F4B10 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 01854 809F4B14 AFA00010 */ sw $zero, 0x0010($sp) /* 01858 809F4B18 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 0185C 809F4B1C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 01860 809F4B20 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01860 809F4B20 0C01E1A7 */ jal Math_SmoothStepToS /* 01864 809F4B24 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 .L809F4B28: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4BA4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4BA4.s index 6fbbfcbfdf..42db7b4993 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4BA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4BA4.s @@ -38,7 +38,7 @@ glabel func_809F4BA4 /* 01958 809F4C18 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0195C 809F4C1C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 01960 809F4C20 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 01964 809F4C24 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01964 809F4C24 0C00CFBE */ jal Rand_ZeroFloat /* 01968 809F4C28 A2190218 */ sb $t9, 0x0218($s0) ## 00000218 /* 0196C 809F4C2C 4600010D */ trunc.w.s $f4, $f0 @@ -58,7 +58,7 @@ glabel func_809F4BA4 /* 019A4 809F4C64 440D9000 */ mfc1 $t5, $f18 /* 019A8 809F4C68 00000000 */ nop /* 019AC 809F4C6C A60D0264 */ sh $t5, 0x0264($s0) ## 00000264 -/* 019B0 809F4C70 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 019B0 809F4C70 0C00CFBE */ jal Rand_ZeroFloat /* 019B4 809F4C74 C42C6054 */ lwc1 $f12, %lo(D_809F6054)($at) /* 019B8 809F4C78 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4CB4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4CB4.s index e230fbba85..e05f07bb75 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4CB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4CB4.s @@ -32,7 +32,7 @@ glabel func_809F4CB4 /* 01A60 809F4D20 1120001B */ beq $t1, $zero, .L809F4D90 /* 01A64 809F4D24 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 /* 01A68 809F4D28 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 01A6C 809F4D2C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01A6C 809F4D2C 0C01E1A7 */ jal Math_SmoothStepToS /* 01A70 809F4D30 AFA00010 */ sw $zero, 0x0010($sp) /* 01A74 809F4D34 860A0264 */ lh $t2, 0x0264($s0) ## 00000264 @@ -40,7 +40,7 @@ glabel func_809F4CB4 /* 01A7C 809F4D3C 15410031 */ bne $t2, $at, .L809F4E04 /* 01A80 809F4D40 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 01A84 809F4D44 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 01A88 809F4D48 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01A88 809F4D48 0C00CFBE */ jal Rand_ZeroFloat /* 01A8C 809F4D4C 00000000 */ nop /* 01A90 809F4D50 4600010D */ trunc.w.s $f4, $f0 @@ -72,7 +72,7 @@ glabel func_809F4CB4 /* 01AF4 809F4DB4 A60C00B6 */ sh $t4, 0x00B6($s0) ## 000000B6 /* 01AF8 809F4DB8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 01AFC 809F4DBC 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 01B00 809F4DC0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01B00 809F4DC0 0C00CFBE */ jal Rand_ZeroFloat /* 01B04 809F4DC4 00000000 */ nop /* 01B08 809F4DC8 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4EF4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4EF4.s index 3872aafc96..d3e83a9812 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4EF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4EF4.s @@ -92,7 +92,7 @@ glabel func_809F4EF4 /* 01D6C 809F502C A4620150 */ sh $v0, 0x0150($v1) ## 00000150 /* 01D70 809F5030 AFA30044 */ sw $v1, 0x0044($sp) /* 01D74 809F5034 A7A2003E */ sh $v0, 0x003E($sp) -/* 01D78 809F5038 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01D78 809F5038 0C00CFBE */ jal Rand_ZeroFloat /* 01D7C 809F503C C42C6058 */ lwc1 $f12, %lo(D_809F6058)($at) /* 01D80 809F5040 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F51B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F51B8.s index 369c25187b..a7217cb9a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F51B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F51B8.s @@ -25,7 +25,7 @@ glabel func_809F51B8 /* 01F28 809F51E8 AFA00010 */ sw $zero, 0x0010($sp) /* 01F2C 809F51EC 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 01F30 809F51F0 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 01F34 809F51F4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01F34 809F51F4 0C01E1A7 */ jal Math_SmoothStepToS /* 01F38 809F51F8 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 /* 01F3C 809F51FC 8FA3007C */ lw $v1, 0x007C($sp) @@ -44,7 +44,7 @@ glabel func_809F51B8 /* 01F70 809F5230 46062301 */ sub.s $f12, $f4, $f6 /* 01F74 809F5234 46108102 */ mul.s $f4, $f16, $f16 /* 01F78 809F5238 46049000 */ add.s $f0, $f18, $f4 -/* 01F7C 809F523C 0C03F494 */ jal Math_atan2f +/* 01F7C 809F523C 0C03F494 */ jal Math_FAtan2F /* 01F80 809F5240 46000384 */ sqrt.s $f14, $f0 /* 01F84 809F5244 3C01809F */ lui $at, %hi(D_809F605C) ## $at = 809F0000 /* 01F88 809F5248 C426605C */ lwc1 $f6, %lo(D_809F605C)($at) @@ -60,7 +60,7 @@ glabel func_809F51B8 /* 01FB0 809F5270 00052C03 */ sra $a1, $a1, 16 /* 01FB4 809F5274 00052823 */ subu $a1, $zero, $a1 /* 01FB8 809F5278 00052C00 */ sll $a1, $a1, 16 -/* 01FBC 809F527C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01FBC 809F527C 0C01E1A7 */ jal Math_SmoothStepToS /* 01FC0 809F5280 00052C03 */ sra $a1, $a1, 16 /* 01FC4 809F5284 8618026E */ lh $t8, 0x026E($s0) ## 0000026E @@ -77,7 +77,7 @@ glabel func_809F51B8 /* 01FF0 809F52B0 5720000A */ bnel $t9, $zero, .L809F52DC /* 01FF4 809F52B4 860D025A */ lh $t5, 0x025A($s0) ## 0000025A /* 01FF8 809F52B8 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 01FFC 809F52BC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01FFC 809F52BC 0C00CFBE */ jal Rand_ZeroFloat /* 02000 809F52C0 00000000 */ nop /* 02004 809F52C4 4600020D */ trunc.w.s $f8, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F551C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F551C.s index a5ba2077a0..408b11ed13 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F551C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F551C.s @@ -19,7 +19,7 @@ glabel func_809F551C /* 02288 809F5548 46062301 */ sub.s $f12, $f4, $f6 /* 0228C 809F554C 460A4381 */ sub.s $f14, $f8, $f10 /* 02290 809F5550 E7AC002C */ swc1 $f12, 0x002C($sp) -/* 02294 809F5554 0C03F494 */ jal Math_atan2f +/* 02294 809F5554 0C03F494 */ jal Math_FAtan2F /* 02298 809F5558 E7AE0028 */ swc1 $f14, 0x0028($sp) /* 0229C 809F555C 3C01809F */ lui $at, %hi(D_809F6068) ## $at = 809F0000 /* 022A0 809F5560 C4306068 */ lwc1 $f16, %lo(D_809F6068)($at) @@ -32,7 +32,7 @@ glabel func_809F551C /* 022BC 809F557C 44052000 */ mfc1 $a1, $f4 /* 022C0 809F5580 00000000 */ nop /* 022C4 809F5584 00052C00 */ sll $a1, $a1, 16 -/* 022C8 809F5588 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 022C8 809F5588 0C01E1A7 */ jal Math_SmoothStepToS /* 022CC 809F558C 00052C03 */ sra $a1, $a1, 16 /* 022D0 809F5590 8602025E */ lh $v0, 0x025E($s0) ## 0000025E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6510.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6510.s index e9080da218..7fd307f57b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6510.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6510.s @@ -43,7 +43,7 @@ glabel func_809F6510 /* 001F4 809F65B4 AFCE0004 */ sw $t6, 0x0004($s8) ## FFFFFFE4 /* 001F8 809F65B8 8DAF0008 */ lw $t7, 0x0008($t5) ## 809F7F04 /* 001FC 809F65BC AFCF0008 */ sw $t7, 0x0008($s8) ## FFFFFFE8 -/* 00200 809F65C0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00200 809F65C0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00204 809F65C4 AFA600B0 */ sw $a2, 0x00B0($sp) /* 00208 809F65C8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -83,19 +83,19 @@ glabel func_809F6510 /* 00288 809F6648 4481B000 */ mtc1 $at, $f22 ## $f22 = 4.00 /* 0028C 809F664C 00139C03 */ sra $s3, $s3, 16 .L809F6650: -/* 00290 809F6650 0C03F66B */ jal Math_Rand_ZeroOne +/* 00290 809F6650 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00294 809F6654 00000000 */ nop /* 00298 809F6658 46140481 */ sub.s $f18, $f0, $f20 /* 0029C 809F665C 46169102 */ mul.s $f4, $f18, $f22 -/* 002A0 809F6660 0C03F66B */ jal Math_Rand_ZeroOne +/* 002A0 809F6660 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 002A4 809F6664 E7A40088 */ swc1 $f4, 0x0088($sp) /* 002A8 809F6668 46140181 */ sub.s $f6, $f0, $f20 /* 002AC 809F666C 00102400 */ sll $a0, $s0, 16 /* 002B0 809F6670 00042403 */ sra $a0, $a0, 16 /* 002B4 809F6674 46163202 */ mul.s $f8, $f6, $f22 -/* 002B8 809F6678 0C01DE1C */ jal Math_Sins +/* 002B8 809F6678 0C01DE1C */ jal Math_SinS ## sins? /* 002BC 809F667C E7A80090 */ swc1 $f8, 0x0090($sp) /* 002C0 809F6680 46180282 */ mul.s $f10, $f0, $f24 @@ -103,7 +103,7 @@ glabel func_809F6510 /* 002C8 809F6688 00102400 */ sll $a0, $s0, 16 /* 002CC 809F668C 00042403 */ sra $a0, $a0, 16 /* 002D0 809F6690 46105480 */ add.s $f18, $f10, $f16 -/* 002D4 809F6694 0C01DE0D */ jal Math_Coss +/* 002D4 809F6694 0C01DE0D */ jal Math_CosS ## coss? /* 002D8 809F6698 E7B2007C */ swc1 $f18, 0x007C($sp) /* 002DC 809F669C 46180102 */ mul.s $f4, $f0, $f24 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6730.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6730.s index 73b34bf195..e08f319fc7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6730.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6730.s @@ -27,7 +27,7 @@ glabel func_809F6730 /* 003D4 809F6794 AD4D0000 */ sw $t5, 0x0000($t2) ## FFFFFFE0 /* 003D8 809F6798 8D6D0008 */ lw $t5, 0x0008($t3) ## 809F7F24 /* 003DC 809F679C AD4C0004 */ sw $t4, 0x0004($t2) ## FFFFFFE4 -/* 003E0 809F67A0 0C03F66B */ jal Math_Rand_ZeroOne +/* 003E0 809F67A0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 003E4 809F67A4 AD4D0008 */ sw $t5, 0x0008($t2) ## FFFFFFE8 /* 003E8 809F67A8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -42,7 +42,7 @@ glabel func_809F6730 /* 0040C 809F67CC 00000000 */ nop /* 00410 809F67D0 A7AF0032 */ sh $t7, 0x0032($sp) /* 00414 809F67D4 C7120080 */ lwc1 $f18, 0x0080($t8) ## 00000080 -/* 00418 809F67D8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00418 809F67D8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0041C 809F67DC E7B20038 */ swc1 $f18, 0x0038($sp) /* 00420 809F67E0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -51,7 +51,7 @@ glabel func_809F6730 /* 0042C 809F67EC 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 /* 00430 809F67F0 46040181 */ sub.s $f6, $f0, $f4 /* 00434 809F67F4 46083282 */ mul.s $f10, $f6, $f8 -/* 00438 809F67F8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00438 809F67F8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0043C 809F67FC E7AA0040 */ swc1 $f10, 0x0040($sp) /* 00440 809F6800 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -61,7 +61,7 @@ glabel func_809F6730 /* 00450 809F6810 46100481 */ sub.s $f18, $f0, $f16 /* 00454 809F6814 87A40032 */ lh $a0, 0x0032($sp) /* 00458 809F6818 46049182 */ mul.s $f6, $f18, $f4 -/* 0045C 809F681C 0C01DE1C */ jal Math_Sins +/* 0045C 809F681C 0C01DE1C */ jal Math_SinS ## sins? /* 00460 809F6820 E7A60048 */ swc1 $f6, 0x0048($sp) /* 00464 809F6824 3C014130 */ lui $at, 0x4130 ## $at = 41300000 @@ -71,7 +71,7 @@ glabel func_809F6730 /* 00474 809F6834 46080282 */ mul.s $f10, $f0, $f8 /* 00478 809F6838 C7300000 */ lwc1 $f16, 0x0000($t9) ## 00000000 /* 0047C 809F683C 46105480 */ add.s $f18, $f10, $f16 -/* 00480 809F6840 0C01DE0D */ jal Math_Coss +/* 00480 809F6840 0C01DE0D */ jal Math_CosS ## coss? /* 00484 809F6844 E7B20034 */ swc1 $f18, 0x0034($sp) /* 00488 809F6848 3C014130 */ lui $at, 0x4130 ## $at = 41300000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6E54.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6E54.s index c9efb69945..e89b3e356c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6E54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6E54.s @@ -137,7 +137,7 @@ glabel func_809F6E54 /* 00C7C 809F703C 00052C03 */ sra $a1, $a1, 16 /* 00C80 809F7040 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 00C84 809F7044 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00C88 809F7048 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00C88 809F7048 0C01E1A7 */ jal Math_SmoothStepToS /* 00C8C 809F704C 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 00C90 809F7050 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F74C4.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F74C4.s index b7fe877a56..51427ad4da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F74C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F74C4.s @@ -14,7 +14,7 @@ glabel func_809F74C4 /* 01120 809F74E0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01124 809F74E4 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 01128 809F74E8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 0112C 809F74EC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0112C 809F74EC 0C01E1A7 */ jal Math_SmoothStepToS /* 01130 809F74F0 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 01134 809F74F4 860F00B4 */ lh $t7, 0x00B4($s0) ## 000000B4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F786C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F786C.s index c55e5659a8..251ccfb234 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F786C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F786C.s @@ -21,7 +21,7 @@ glabel func_809F786C /* 014F4 809F78B4 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 014F8 809F78B8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 014FC 809F78BC 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01500 809F78C0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01500 809F78C0 0C01E1A7 */ jal Math_SmoothStepToS /* 01504 809F78C4 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 01508 809F78C8 861800B4 */ lh $t8, 0x00B4($s0) ## 000000B4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7A00.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7A00.s index 97b3b45ebb..1edd610764 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7A00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7A00.s @@ -9,7 +9,7 @@ glabel func_809F7A00 /* 0165C 809F7A1C 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 01660 809F7A20 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 01664 809F7A24 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01668 809F7A28 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01668 809F7A28 0C01E1A7 */ jal Math_SmoothStepToS /* 0166C 809F7A2C 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 01670 809F7A30 86020202 */ lh $v0, 0x0202($s0) ## 00000202 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7AB8.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7AB8.s index 2e73b2bc4b..83da537a05 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7AB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7AB8.s @@ -10,7 +10,7 @@ glabel func_809F7AB8 /* 01718 809F7AD8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 0171C 809F7ADC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01720 809F7AE0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01724 809F7AE4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01724 809F7AE4 0C01E1A7 */ jal Math_SmoothStepToS /* 01728 809F7AE8 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 0172C 809F7AEC 860F00B4 */ lh $t7, 0x00B4($s0) ## 000000B4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE9C.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE9C.s index 0f09f09617..2c48c9f2b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE9C.s @@ -32,7 +32,7 @@ glabel func_809FDE9C /* 002D4 809FDF04 14600006 */ bne $v1, $zero, .L809FDF20 /* 002D8 809FDF08 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E /* 002DC 809FDF0C 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 002E0 809FDF10 0C01DF64 */ jal Math_Rand_S16Offset +/* 002E0 809FDF10 0C01DF64 */ jal Rand_S16Offset /* 002E4 809FDF14 AFA60018 */ sw $a2, 0x0018($sp) /* 002E8 809FDF18 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Update.s index e4ea0b6afd..01cbe3ee3f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Update.s @@ -128,7 +128,7 @@ glabel EnEiyer_Update /* 01784 80A01724 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 /* 01788 80A01728 53000014 */ beql $t8, $zero, .L80A0177C /* 0178C 80A0172C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01790 80A01730 0C01DE1C */ jal Math_Sins +/* 01790 80A01730 0C01DE1C */ jal Math_SinS ## sins? /* 01794 80A01734 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 01798 80A01738 3C014148 */ lui $at, 0x4148 ## $at = 41480000 @@ -137,7 +137,7 @@ glabel EnEiyer_Update /* 017A4 80A01744 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 017A8 80A01748 46060202 */ mul.s $f8, $f0, $f6 /* 017AC 80A0174C 460A4400 */ add.s $f16, $f8, $f10 -/* 017B0 80A01750 0C01DE0D */ jal Math_Coss +/* 017B0 80A01750 0C01DE0D */ jal Math_CosS ## coss? /* 017B4 80A01754 E6100038 */ swc1 $f16, 0x0038($s0) ## 00000038 /* 017B8 80A01758 3C014148 */ lui $at, 0x4148 ## $at = 41480000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A001A4.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A001A4.s index 267a42a6f9..21d3a74804 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A001A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A001A4.s @@ -3,7 +3,7 @@ glabel func_80A001A4 /* 00208 80A001A8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0020C 80A001AC 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 00210 80A001B0 84840032 */ lh $a0, 0x0032($a0) ## 00000032 -/* 00214 80A001B4 0C01DE1C */ jal Math_Sins +/* 00214 80A001B4 0C01DE1C */ jal Math_SinS ## sins? /* 00218 80A001B8 AFA50018 */ sw $a1, 0x0018($sp) /* 0021C 80A001BC 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 @@ -13,7 +13,7 @@ glabel func_80A001A4 /* 0022C 80A001CC C4A80008 */ lwc1 $f8, 0x0008($a1) ## 00000008 /* 00230 80A001D0 84A40032 */ lh $a0, 0x0032($a1) ## 00000032 /* 00234 80A001D4 46083280 */ add.s $f10, $f6, $f8 -/* 00238 80A001D8 0C01DE0D */ jal Math_Coss +/* 00238 80A001D8 0C01DE0D */ jal Math_CosS ## coss? /* 0023C 80A001DC E4AA0024 */ swc1 $f10, 0x0024($a1) ## 00000024 /* 00240 80A001E0 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s index d483471876..ccbfbcb0ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s @@ -27,7 +27,7 @@ glabel func_80A00218 /* 002DC 80A0027C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 002E0 80A00280 5440000C */ bnel $v0, $zero, .L80A002B4 /* 002E4 80A00284 8E190118 */ lw $t9, 0x0118($s0) ## 00000118 -/* 002E8 80A00288 0C03F66B */ jal Math_Rand_ZeroOne +/* 002E8 80A00288 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 002EC 80A0028C 00000000 */ nop /* 002F0 80A00290 3C014780 */ lui $at, 0x4780 ## $at = 47800000 @@ -50,7 +50,7 @@ glabel func_80A00218 /* 0032C 80A002CC 1000000D */ beq $zero, $zero, .L80A00304 /* 00330 80A002D0 920C0298 */ lbu $t4, 0x0298($s0) ## 00000298 .L80A002D4: -/* 00334 80A002D4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00334 80A002D4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00338 80A002D8 00000000 */ nop /* 0033C 80A002DC 3C014780 */ lui $at, 0x4780 ## $at = 47800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00858.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00858.s index f650eaf4cf..8c9371e19e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00858.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00858.s @@ -9,7 +9,7 @@ glabel func_80A00858 /* 008D0 80A00870 8FA30018 */ lw $v1, 0x0018($sp) /* 008D4 80A00874 3C063F40 */ lui $a2, 0x3F40 ## $a2 = 3F400000 /* 008D8 80A00878 24640028 */ addiu $a0, $v1, 0x0028 ## $a0 = 00000028 -/* 008DC 80A0087C 0C01DE80 */ jal Math_ApproxF +/* 008DC 80A0087C 0C01DE80 */ jal Math_StepToF /* 008E0 80A00880 8C65000C */ lw $a1, 0x000C($v1) ## 0000000C /* 008E4 80A00884 50400004 */ beql $v0, $zero, .L80A00898 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00950.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00950.s index e11a095501..e078659c60 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00950.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00950.s @@ -34,7 +34,7 @@ glabel func_80A00950 /* 00A14 80A009B4 86180196 */ lh $t8, 0x0196($s0) ## 00000196 /* 00A18 80A009B8 55F80027 */ bnel $t7, $t8, .L80A00A58 /* 00A1C 80A009BC 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 00A20 80A009C0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00A20 80A009C0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A24 80A009C4 00000000 */ nop /* 00A28 80A009C8 3C0180A0 */ lui $at, %hi(D_80A019F4) ## $at = 80A00000 @@ -43,7 +43,7 @@ glabel func_80A00950 /* 00A34 80A009D4 00000000 */ nop /* 00A38 80A009D8 4502001F */ bc1fl .L80A00A58 /* 00A3C 80A009DC 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 00A40 80A009E0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00A40 80A009E0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A44 80A009E4 00000000 */ nop /* 00A48 80A009E8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -56,7 +56,7 @@ glabel func_80A00950 /* 00A64 80A00A04 10000001 */ beq $zero, $zero, .L80A00A0C /* 00A68 80A00A08 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF .L80A00A0C: -/* 00A6C 80A00A0C 0C03F66B */ jal Math_Rand_ZeroOne +/* 00A6C 80A00A0C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A70 80A00A10 AFA20024 */ sw $v0, 0x0024($sp) /* 00A74 80A00A14 3C014600 */ lui $at, 0x4600 ## $at = 46000000 @@ -79,7 +79,7 @@ glabel func_80A00950 /* 00AB4 80A00A54 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 .L80A00A58: /* 00AB8 80A00A58 86050196 */ lh $a1, 0x0196($s0) ## 00000196 -/* 00ABC 80A00A5C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00ABC 80A00A5C 0C01DE2B */ jal Math_ScaledStepToS /* 00AC0 80A00A60 240600B6 */ addiu $a2, $zero, 0x00B6 ## $a2 = 000000B6 /* 00AC4 80A00A64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00B18.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00B18.s index 6d2718f49b..f675d19232 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00B18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00B18.s @@ -46,7 +46,7 @@ glabel func_80A00B18 /* 00C00 80A00BA0 00000000 */ nop /* 00C04 80A00BA4 46080282 */ mul.s $f10, $f0, $f8 /* 00C08 80A00BA8 E7AA0034 */ swc1 $f10, 0x0034($sp) -/* 00C0C 80A00BAC 0C01DE1C */ jal Math_Sins +/* 00C0C 80A00BAC 0C01DE1C */ jal Math_SinS ## sins? /* 00C10 80A00BB0 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00C14 80A00BB4 C7B00034 */ lwc1 $f16, 0x0034($sp) @@ -54,7 +54,7 @@ glabel func_80A00B18 /* 00C1C 80A00BBC 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00C20 80A00BC0 46100482 */ mul.s $f18, $f0, $f16 /* 00C24 80A00BC4 46049180 */ add.s $f6, $f18, $f4 -/* 00C28 80A00BC8 0C01DE0D */ jal Math_Coss +/* 00C28 80A00BC8 0C01DE0D */ jal Math_CosS ## coss? /* 00C2C 80A00BCC E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 /* 00C30 80A00BD0 C7A80034 */ lwc1 $f8, 0x0034($sp) @@ -70,7 +70,7 @@ glabel func_80A00B18 /* 00C54 80A00BF4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 00C58 80A00BF8 46062200 */ add.s $f8, $f4, $f6 /* 00C5C 80A00BFC 44054000 */ mfc1 $a1, $f8 -/* 00C60 80A00C00 0C01DE80 */ jal Math_ApproxF +/* 00C60 80A00C00 0C01DE80 */ jal Math_StepToF /* 00C64 80A00C04 00000000 */ nop /* 00C68 80A00C08 3C0180A0 */ lui $at, %hi(D_80A019FC) ## $at = 80A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00C70.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00C70.s index 92f5f6719d..481611a9d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00C70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00C70.s @@ -33,7 +33,7 @@ glabel func_80A00C70 /* 00D28 80A00CC8 46105480 */ add.s $f18, $f10, $f16 /* 00D2C 80A00CCC 26040280 */ addiu $a0, $s0, 0x0280 ## $a0 = 00000280 /* 00D30 80A00CD0 44059000 */ mfc1 $a1, $f18 -/* 00D34 80A00CD4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00D34 80A00CD4 0C01E107 */ jal Math_ApproachF /* 00D38 80A00CD8 00000000 */ nop /* 00D3C 80A00CDC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -65,13 +65,13 @@ glabel func_80A00C70 /* 00DA0 80A00D40 3C063CF5 */ lui $a2, 0x3CF5 ## $a2 = 3CF50000 /* 00DA4 80A00D44 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 3CF5C28F /* 00DA8 80A00D48 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00DAC 80A00D4C 0C01DE80 */ jal Math_ApproxF +/* 00DAC 80A00D4C 0C01DE80 */ jal Math_StepToF /* 00DB0 80A00D50 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 00DB4 80A00D54 10000004 */ beq $zero, $zero, .L80A00D68 /* 00DB8 80A00D58 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 .L80A00D5C: -/* 00DBC 80A00D5C 0C01DE80 */ jal Math_ApproxF +/* 00DBC 80A00D5C 0C01DE80 */ jal Math_StepToF /* 00DC0 80A00D60 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 0000C28F /* 00DC4 80A00D64 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 @@ -84,7 +84,7 @@ glabel func_80A00C70 /* 00DDC 80A00D7C 8619007E */ lh $t9, 0x007E($s0) ## 0000007E /* 00DE0 80A00D80 A6190196 */ sh $t9, 0x0196($s0) ## 00000196 .L80A00D84: -/* 00DE4 80A00D84 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00DE4 80A00D84 0C01DE2B */ jal Math_ScaledStepToS /* 00DE8 80A00D88 86050196 */ lh $a1, 0x0196($s0) ## 00000196 /* 00DEC 80A00D8C 50400025 */ beql $v0, $zero, .L80A00E24 @@ -92,7 +92,7 @@ glabel func_80A00C70 /* 00DF4 80A00D94 86080194 */ lh $t0, 0x0194($s0) ## 00000194 /* 00DF8 80A00D98 5500000B */ bnel $t0, $zero, .L80A00DC8 /* 00DFC 80A00D9C 86090032 */ lh $t1, 0x0032($s0) ## 00000032 -/* 00E00 80A00DA0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00E00 80A00DA0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00E04 80A00DA4 00000000 */ nop /* 00E08 80A00DA8 3C0180A0 */ lui $at, %hi(D_80A01A04) ## $at = 80A00000 @@ -108,10 +108,10 @@ glabel func_80A00C70 /* 00E2C 80A00DCC 10000014 */ beq $zero, $zero, .L80A00E20 /* 00E30 80A00DD0 A60A0032 */ sh $t2, 0x0032($s0) ## 00000032 .L80A00DD4: -/* 00E34 80A00DD4 0C01DF64 */ jal Math_Rand_S16Offset +/* 00E34 80A00DD4 0C01DF64 */ jal Rand_S16Offset /* 00E38 80A00DD8 24052000 */ addiu $a1, $zero, 0x2000 ## $a1 = 00002000 -/* 00E3C 80A00DDC 0C03F66B */ jal Math_Rand_ZeroOne +/* 00E3C 80A00DDC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00E40 80A00DE0 A7A20026 */ sh $v0, 0x0026($sp) /* 00E44 80A00DE4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00E8C.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00E8C.s index d4bed04642..53c0b9ae6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00E8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00E8C.s @@ -31,7 +31,7 @@ glabel func_80A00E8C /* 00F5C 80A00EFC 00022C00 */ sll $a1, $v0, 16 /* 00F60 80A00F00 00052C03 */ sra $a1, $a1, 16 /* 00F64 80A00F04 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00F68 80A00F08 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00F68 80A00F08 0C01DE2B */ jal Math_ScaledStepToS /* 00F6C 80A00F0C 24061000 */ addiu $a2, $zero, 0x1000 ## $a2 = 00001000 /* 00F70 80A00F10 10400007 */ beq $v0, $zero, .L80A00F30 @@ -52,13 +52,13 @@ glabel func_80A00E8C /* 00F9C 80A00F3C 0018C823 */ subu $t9, $zero, $t8 /* 00FA0 80A00F40 A6190030 */ sh $t9, 0x0030($s0) ## 00000030 /* 00FA4 80A00F44 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00FA8 80A00F48 0C01DE80 */ jal Math_ApproxF +/* 00FA8 80A00F48 0C01DE80 */ jal Math_StepToF /* 00FAC 80A00F4C 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 /* 00FB0 80A00F50 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 00FB4 80A00F54 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 00FB8 80A00F58 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00FBC 80A00F5C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 00FBC 80A00F5C 0C01E1EF */ jal Math_ApproachS /* 00FC0 80A00F60 2407071C */ addiu $a3, $zero, 0x071C ## $a3 = 0000071C /* 00FC4 80A00F64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01010.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01010.s index e2a354992d..2a9c8fc5ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01010.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01010.s @@ -9,12 +9,12 @@ glabel func_80A01010 /* 01088 80A01028 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0108C 80A0102C 26040030 */ addiu $a0, $s0, 0x0030 ## $a0 = 00000030 /* 01090 80A01030 2405C000 */ addiu $a1, $zero, 0xC000 ## $a1 = FFFFC000 -/* 01094 80A01034 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01094 80A01034 0C01DE2B */ jal Math_ScaledStepToS /* 01098 80A01038 24060450 */ addiu $a2, $zero, 0x0450 ## $a2 = 00000450 /* 0109C 80A0103C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 010A0 80A01040 3C0540E0 */ lui $a1, 0x40E0 ## $a1 = 40E00000 -/* 010A4 80A01044 0C01DE80 */ jal Math_ApproxF +/* 010A4 80A01044 0C01DE80 */ jal Math_StepToF /* 010A8 80A01048 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 010AC 80A0104C 86020194 */ lh $v0, 0x0194($s0) ## 00000194 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01104.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01104.s index 473425ec56..27213ca6a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01104.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01104.s @@ -28,7 +28,7 @@ glabel func_80A01104 /* 011B0 80A01150 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 /* 011B4 80A01154 460A4400 */ add.s $f16, $f8, $f10 /* 011B8 80A01158 44058000 */ mfc1 $a1, $f16 -/* 011BC 80A0115C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 011BC 80A0115C 0C01E107 */ jal Math_ApproachF /* 011C0 80A01160 00000000 */ nop /* 011C4 80A01164 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -50,12 +50,12 @@ glabel func_80A01104 /* 01200 80A011A0 01014821 */ addu $t1, $t0, $at /* 01204 80A011A4 A6090196 */ sh $t1, 0x0196($s0) ## 00000196 .L80A011A8: -/* 01208 80A011A8 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01208 80A011A8 0C01DE2B */ jal Math_ScaledStepToS /* 0120C 80A011AC 86050196 */ lh $a1, 0x0196($s0) ## 00000196 /* 01210 80A011B0 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01214 80A011B4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01218 80A011B8 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01218 80A011B8 0C01DE2B */ jal Math_ScaledStepToS /* 0121C 80A011BC 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 /* 01220 80A011C0 860A0194 */ lh $t2, 0x0194($s0) ## 00000194 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01240.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01240.s index fb237ce42b..49b8d02b7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01240.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01240.s @@ -16,13 +16,13 @@ glabel func_80A01240 /* 012D4 80A01274 45000006 */ bc1f .L80A01290 /* 012D8 80A01278 00000000 */ nop /* 012DC 80A0127C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 012E0 80A01280 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 012E0 80A01280 0C01DE2B */ jal Math_ScaledStepToS /* 012E4 80A01284 2405C000 */ addiu $a1, $zero, 0xC000 ## $a1 = FFFFC000 /* 012E8 80A01288 10000004 */ beq $zero, $zero, .L80A0129C /* 012EC 80A0128C 860E00B8 */ lh $t6, 0x00B8($s0) ## 000000B8 .L80A01290: -/* 012F0 80A01290 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 012F0 80A01290 0C01DE2B */ jal Math_ScaledStepToS /* 012F4 80A01294 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 /* 012F8 80A01298 860E00B8 */ lh $t6, 0x00B8($s0) ## 000000B8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01374.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01374.s index f44d743719..7af01dd5a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01374.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01374.s @@ -11,7 +11,7 @@ glabel func_80A01374 /* 013F8 80A01398 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF /* 013FC 80A0139C A48E0194 */ sh $t6, 0x0194($a0) ## 00000194 .L80A013A0: -/* 01400 80A013A0 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01400 80A013A0 0C01DE2B */ jal Math_ScaledStepToS /* 01404 80A013A4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01408 80A013A8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07CA4.s b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07CA4.s index 1384a3d02e..6d890a6700 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07CA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07CA4.s @@ -205,7 +205,7 @@ glabel func_80A07CA4 /* 00578 80A07F08 460A3202 */ mul.s $f8, $f6, $f10 /* 0057C 80A07F0C E7A40088 */ swc1 $f4, 0x0088($sp) /* 00580 80A07F10 46088100 */ add.s $f4, $f16, $f8 -/* 00584 80A07F14 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00584 80A07F14 0C00CFC8 */ jal Rand_CenteredFloat /* 00588 80A07F18 E7A40084 */ swc1 $f4, 0x0084($sp) /* 0058C 80A07F1C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -218,14 +218,14 @@ glabel func_80A07CA4 /* 005A8 80A07F38 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 005AC 80A07F3C 46082180 */ add.s $f6, $f4, $f8 /* 005B0 80A07F40 46060280 */ add.s $f10, $f0, $f6 -/* 005B4 80A07F44 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 005B4 80A07F44 0C00CFC8 */ jal Rand_CenteredFloat /* 005B8 80A07F48 E7AA0064 */ swc1 $f10, 0x0064($sp) /* 005BC 80A07F4C C7A40088 */ lwc1 $f4, 0x0088($sp) /* 005C0 80A07F50 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 005C4 80A07F54 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 /* 005C8 80A07F58 46040200 */ add.s $f8, $f0, $f4 -/* 005CC 80A07F5C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 005CC 80A07F5C 0C00CFC8 */ jal Rand_CenteredFloat /* 005D0 80A07F60 E7A80068 */ swc1 $f8, 0x0068($sp) /* 005D4 80A07F64 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -238,7 +238,7 @@ glabel func_80A07CA4 /* 005F0 80A07F80 C42C8D60 */ lwc1 $f12, %lo(D_80A08D60)($at) /* 005F4 80A07F84 46044180 */ add.s $f6, $f8, $f4 /* 005F8 80A07F88 46060280 */ add.s $f10, $f0, $f6 -/* 005FC 80A07F8C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 005FC 80A07F8C 0C00CFC8 */ jal Rand_CenteredFloat /* 00600 80A07F90 E7AA006C */ swc1 $f10, 0x006C($sp) /* 00604 80A07F94 3C0180A1 */ lui $at, %hi(D_80A08D64) ## $at = 80A10000 @@ -280,7 +280,7 @@ glabel func_80A07CA4 /* 0068C 80A0801C A60D0156 */ sh $t5, 0x0156($s0) ## 00000156 /* 00690 80A08020 3C0180A1 */ lui $at, %hi(D_80A08D68) ## $at = 80A10000 /* 00694 80A08024 A7A00062 */ sh $zero, 0x0062($sp) -/* 00698 80A08028 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00698 80A08028 0C00CFBE */ jal Rand_ZeroFloat /* 0069C 80A0802C C42C8D68 */ lwc1 $f12, %lo(D_80A08D68)($at) /* 006A0 80A08030 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -296,7 +296,7 @@ glabel func_80A07CA4 /* 006C8 80A08058 51C00011 */ beql $t6, $zero, .L80A080A0 /* 006CC 80A0805C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 006D0 80A08060 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 006D4 80A08064 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 006D4 80A08064 0C00CFC8 */ jal Rand_CenteredFloat /* 006D8 80A08068 00000000 */ nop /* 006DC 80A0806C 8FAF0094 */ lw $t7, 0x0094($sp) @@ -304,7 +304,7 @@ glabel func_80A07CA4 /* 006E4 80A08074 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 006E8 80A08078 C5E60024 */ lwc1 $f6, 0x0024($t7) ## 00000024 /* 006EC 80A0807C 46060280 */ add.s $f10, $f0, $f6 -/* 006F0 80A08080 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 006F0 80A08080 0C00CFC8 */ jal Rand_CenteredFloat /* 006F4 80A08084 E7AA007C */ swc1 $f10, 0x007C($sp) /* 006F8 80A08088 8FB80094 */ lw $t8, 0x0094($sp) @@ -322,7 +322,7 @@ glabel func_80A07CA4 /* 00724 80A080B4 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 00728 80A080B8 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 0072C 80A080BC 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 -/* 00730 80A080C0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00730 80A080C0 0C00CFC8 */ jal Rand_CenteredFloat /* 00734 80A080C4 00000000 */ nop /* 00738 80A080C8 3C014396 */ lui $at, 0x4396 ## $at = 43960000 @@ -335,7 +335,7 @@ glabel func_80A07CA4 /* 00754 80A080E4 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 00758 80A080E8 46065200 */ add.s $f8, $f10, $f6 /* 0075C 80A080EC 46080100 */ add.s $f4, $f0, $f8 -/* 00760 80A080F0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00760 80A080F0 0C00CFC8 */ jal Rand_CenteredFloat /* 00764 80A080F4 E7A4007C */ swc1 $f4, 0x007C($sp) /* 00768 80A080F8 3C014416 */ lui $at, 0x4416 ## $at = 44160000 @@ -350,7 +350,7 @@ glabel func_80A07CA4 /* 0078C 80A0811C E7A60074 */ swc1 $f6, 0x0074($sp) /* 00790 80A08120 44816000 */ mtc1 $at, $f12 ## $f12 = 600.00 .L80A08124: -/* 00794 80A08124 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00794 80A08124 0C00CFC8 */ jal Rand_CenteredFloat /* 00798 80A08128 00000000 */ nop /* 0079C 80A0812C 8FAA0094 */ lw $t2, 0x0094($sp) @@ -358,7 +358,7 @@ glabel func_80A07CA4 /* 007A4 80A08134 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 007A8 80A08138 C5440024 */ lwc1 $f4, 0x0024($t2) ## 00000024 /* 007AC 80A0813C 46040200 */ add.s $f8, $f0, $f4 -/* 007B0 80A08140 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 007B0 80A08140 0C00CFC8 */ jal Rand_CenteredFloat /* 007B4 80A08144 E7A8007C */ swc1 $f8, 0x007C($sp) /* 007B8 80A08148 8FAB0094 */ lw $t3, 0x0094($sp) @@ -374,21 +374,21 @@ glabel func_80A07CA4 /* 007D8 80A08168 A60D0156 */ sh $t5, 0x0156($s0) ## 00000156 /* 007DC 80A0816C 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 007E0 80A08170 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 007E4 80A08174 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 007E4 80A08174 0C00CFC8 */ jal Rand_CenteredFloat /* 007E8 80A08178 A7AE0062 */ sh $t6, 0x0062($sp) /* 007EC 80A0817C C7A4008C */ lwc1 $f4, 0x008C($sp) /* 007F0 80A08180 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 007F4 80A08184 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 007F8 80A08188 46040200 */ add.s $f8, $f0, $f4 -/* 007FC 80A0818C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 007FC 80A0818C 0C00CFC8 */ jal Rand_CenteredFloat /* 00800 80A08190 E7A8007C */ swc1 $f8, 0x007C($sp) /* 00804 80A08194 C7AA0084 */ lwc1 $f10, 0x0084($sp) /* 00808 80A08198 3C0180A1 */ lui $at, %hi(D_80A08D6C) ## $at = 80A10000 /* 0080C 80A0819C C42C8D6C */ lwc1 $f12, %lo(D_80A08D6C)($at) /* 00810 80A081A0 460A0180 */ add.s $f6, $f0, $f10 -/* 00814 80A081A4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00814 80A081A4 0C00CFBE */ jal Rand_ZeroFloat /* 00818 80A081A8 E7A60074 */ swc1 $f6, 0x0074($sp) /* 0081C 80A081AC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -399,7 +399,7 @@ glabel func_80A07CA4 /* 00830 80A081C0 45020010 */ bc1fl .L80A08204 /* 00834 80A081C4 8FA6009C */ lw $a2, 0x009C($sp) /* 00838 80A081C8 44816000 */ mtc1 $at, $f12 ## $f12 = 70.00 -/* 0083C 80A081CC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0083C 80A081CC 0C00CFC8 */ jal Rand_CenteredFloat /* 00840 80A081D0 00000000 */ nop /* 00844 80A081D4 8FAF0094 */ lw $t7, 0x0094($sp) @@ -407,7 +407,7 @@ glabel func_80A07CA4 /* 0084C 80A081DC 44816000 */ mtc1 $at, $f12 ## $f12 = 70.00 /* 00850 80A081E0 C5E80024 */ lwc1 $f8, 0x0024($t7) ## 00000024 /* 00854 80A081E4 46080280 */ add.s $f10, $f0, $f8 -/* 00858 80A081E8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00858 80A081E8 0C00CFC8 */ jal Rand_CenteredFloat /* 0085C 80A081EC E7AA007C */ swc1 $f10, 0x007C($sp) /* 00860 80A081F0 8FB80094 */ lw $t8, 0x0094($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A08694.s b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A08694.s index f673cb95b4..763cf97b60 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A08694.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A08694.s @@ -23,7 +23,7 @@ glabel func_80A08694 /* 00D54 80A086E4 E4600024 */ swc1 $f0, 0x0024($v1) ## 000001AC /* 00D58 80A086E8 E4600028 */ swc1 $f0, 0x0028($v1) ## 000001B0 /* 00D5C 80A086EC AC780008 */ sw $t8, 0x0008($v1) ## 00000190 -/* 00D60 80A086F0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00D60 80A086F0 0C00CFC8 */ jal Rand_CenteredFloat /* 00D64 80A086F4 AFA3001C */ sw $v1, 0x001C($sp) /* 00D68 80A086F8 3C01C1A0 */ lui $at, 0xC1A0 ## $at = C1A00000 @@ -32,7 +32,7 @@ glabel func_80A08694 /* 00D74 80A08704 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00D78 80A08708 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 00D7C 80A0870C E4600014 */ swc1 $f0, 0x0014($v1) ## 00000014 -/* 00D80 80A08710 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00D80 80A08710 0C00CFC8 */ jal Rand_CenteredFloat /* 00D84 80A08714 E4640018 */ swc1 $f4, 0x0018($v1) ## 00000018 /* 00D88 80A08718 8FA3001C */ lw $v1, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A08748.s b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A08748.s index e67d7ab957..94660208dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A08748.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A08748.s @@ -40,19 +40,19 @@ glabel func_80A08748 /* 00E20 80A087B0 920E0010 */ lbu $t6, 0x0010($s0) ## 00000198 /* 00E24 80A087B4 51C00046 */ beql $t6, $zero, .L80A088D0 /* 00E28 80A087B8 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 00E2C 80A087BC 0C03F66B */ jal Math_Rand_ZeroOne +/* 00E2C 80A087BC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00E30 80A087C0 00000000 */ nop /* 00E34 80A087C4 46180182 */ mul.s $f6, $f0, $f24 /* 00E38 80A087C8 C6040020 */ lwc1 $f4, 0x0020($s0) ## 000001A8 /* 00E3C 80A087CC 46062200 */ add.s $f8, $f4, $f6 -/* 00E40 80A087D0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00E40 80A087D0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00E44 80A087D4 E6080020 */ swc1 $f8, 0x0020($s0) ## 000001A8 /* 00E48 80A087D8 46180402 */ mul.s $f16, $f0, $f24 /* 00E4C 80A087DC C60A0024 */ lwc1 $f10, 0x0024($s0) ## 000001AC /* 00E50 80A087E0 46105480 */ add.s $f18, $f10, $f16 -/* 00E54 80A087E4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00E54 80A087E4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00E58 80A087E8 E6120024 */ swc1 $f18, 0x0024($s0) ## 000001AC /* 00E5C 80A087EC 46180482 */ mul.s $f18, $f0, $f24 @@ -71,26 +71,26 @@ glabel func_80A08748 /* 00E90 80A08820 4407E000 */ mfc1 $a3, $f28 /* 00E94 80A08824 460E4580 */ add.s $f22, $f8, $f14 /* 00E98 80A08828 E6120028 */ swc1 $f18, 0x0028($s0) ## 000001B0 -/* 00E9C 80A0882C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00E9C 80A0882C 0C01E107 */ jal Math_ApproachF /* 00EA0 80A08830 02002025 */ or $a0, $s0, $zero ## $a0 = 00000188 /* 00EA4 80A08834 4405A000 */ mfc1 $a1, $f20 /* 00EA8 80A08838 4406F000 */ mfc1 $a2, $f30 /* 00EAC 80A0883C 26040004 */ addiu $a0, $s0, 0x0004 ## $a0 = 0000018C -/* 00EB0 80A08840 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00EB0 80A08840 0C01E107 */ jal Math_ApproachF /* 00EB4 80A08844 3C07437A */ lui $a3, 0x437A ## $a3 = 437A0000 /* 00EB8 80A08848 4405B000 */ mfc1 $a1, $f22 /* 00EBC 80A0884C 4406D000 */ mfc1 $a2, $f26 /* 00EC0 80A08850 4407E000 */ mfc1 $a3, $f28 -/* 00EC4 80A08854 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00EC4 80A08854 0C01E107 */ jal Math_ApproachF /* 00EC8 80A08858 26040008 */ addiu $a0, $s0, 0x0008 ## $a0 = 00000190 /* 00ECC 80A0885C 3C063F66 */ lui $a2, 0x3F66 ## $a2 = 3F660000 /* 00ED0 80A08860 34C66666 */ ori $a2, $a2, 0x6666 ## $a2 = 3F666666 /* 00ED4 80A08864 26040018 */ addiu $a0, $s0, 0x0018 ## $a0 = 000001A0 /* 00ED8 80A08868 3C05C1A0 */ lui $a1, 0xC1A0 ## $a1 = C1A00000 -/* 00EDC 80A0886C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00EDC 80A0886C 0C01E107 */ jal Math_ApproachF /* 00EE0 80A08870 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 00EE4 80A08874 866F00A4 */ lh $t7, 0x00A4($s3) ## 000000A4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09434.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09434.s index a07564ff06..c19089a0fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09434.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09434.s @@ -40,7 +40,7 @@ glabel func_80A09434 /* 005F0 80A09490 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 005F4 80A09494 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 005F8 80A09498 24071000 */ addiu $a3, $zero, 0x1000 ## $a3 = 00001000 -/* 005FC 80A0949C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 005FC 80A0949C 0C01E1A7 */ jal Math_SmoothStepToS /* 00600 80A094A0 AFA00010 */ sw $zero, 0x0010($sp) .L80A094A4: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09724.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09724.s index ca43400e07..8f3c6e4acc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09724.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09724.s @@ -11,7 +11,7 @@ glabel func_80A09724 /* 008A8 80A09748 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 008AC 80A0974C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 008B0 80A09750 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3F4CCCCD -/* 008B4 80A09754 0C01E107 */ jal Math_SmoothScaleMaxF +/* 008B4 80A09754 0C01E107 */ jal Math_ApproachF /* 008B8 80A09758 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 /* 008BC 80A0975C 860A0158 */ lh $t2, 0x0158($s0) ## 00000158 @@ -35,7 +35,7 @@ glabel func_80A09724 /* 00904 80A097A4 A6190158 */ sh $t9, 0x0158($s0) ## 00000158 .L80A097A8: /* 00908 80A097A8 24071000 */ addiu $a3, $zero, 0x1000 ## $a3 = 00001000 -/* 0090C 80A097AC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0090C 80A097AC 0C01E1A7 */ jal Math_SmoothStepToS /* 00910 80A097B0 AFA00010 */ sw $zero, 0x0010($sp) .L80A097B4: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s index b633b0722b..3be6e59479 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s @@ -112,7 +112,7 @@ glabel func_80A10220 /* 010B8 80A10318 3C0540A8 */ lui $a1, 0x40A8 ## $a1 = 40A80000 .L80A1031C: -/* 010BC 80A1031C 0C03F66B */ jal Math_Rand_ZeroOne +/* 010BC 80A1031C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 010C0 80A10320 00000000 */ nop /* 010C4 80A10324 3C0180A1 */ lui $at, %hi(D_80A119DC) ## $at = 80A10000 @@ -154,19 +154,19 @@ glabel func_80A10220 .L80A103B4: /* 01154 80A103B4 A3A200E3 */ sb $v0, 0x00E3($sp) .L80A103B8: -/* 01158 80A103B8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01158 80A103B8 0C00CFC8 */ jal Rand_CenteredFloat /* 0115C 80A103BC 4600A306 */ mov.s $f12, $f20 /* 01160 80A103C0 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 01164 80A103C4 4600A306 */ mov.s $f12, $f20 /* 01168 80A103C8 46060200 */ add.s $f8, $f0, $f6 -/* 0116C 80A103CC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0116C 80A103CC 0C00CFC8 */ jal Rand_CenteredFloat /* 01170 80A103D0 E7A800D4 */ swc1 $f8, 0x00D4($sp) /* 01174 80A103D4 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 01178 80A103D8 4600A306 */ mov.s $f12, $f20 /* 0117C 80A103DC 460A0100 */ add.s $f4, $f0, $f10 -/* 01180 80A103E0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01180 80A103E0 0C00CFC8 */ jal Rand_CenteredFloat /* 01184 80A103E4 E7A400D8 */ swc1 $f4, 0x00D8($sp) /* 01188 80A103E8 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C @@ -174,7 +174,7 @@ glabel func_80A10220 /* 01190 80A103F0 C42A19E0 */ lwc1 $f10, %lo(D_80A119E0)($at) /* 01194 80A103F4 46060200 */ add.s $f8, $f0, $f6 /* 01198 80A103F8 E7AA00C0 */ swc1 $f10, 0x00C0($sp) -/* 0119C 80A103FC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0119C 80A103FC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 011A0 80A10400 E7A800DC */ swc1 $f8, 0x00DC($sp) /* 011A4 80A10404 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 @@ -281,18 +281,18 @@ glabel func_80A10220 /* 01320 80A10580 AFA90050 */ sw $t1, 0x0050($sp) /* 01324 80A10584 A7A000B6 */ sh $zero, 0x00B6($sp) .L80A10588: -/* 01328 80A10588 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01328 80A10588 0C00CFC8 */ jal Rand_CenteredFloat /* 0132C 80A1058C 4600A306 */ mov.s $f12, $f20 /* 01330 80A10590 E7A000A8 */ swc1 $f0, 0x00A8($sp) -/* 01334 80A10594 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01334 80A10594 0C00CFC8 */ jal Rand_CenteredFloat /* 01338 80A10598 4600A306 */ mov.s $f12, $f20 /* 0133C 80A1059C E7A000AC */ swc1 $f0, 0x00AC($sp) -/* 01340 80A105A0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01340 80A105A0 0C00CFC8 */ jal Rand_CenteredFloat /* 01344 80A105A4 4600A306 */ mov.s $f12, $f20 -/* 01348 80A105A8 0C03F66B */ jal Math_Rand_ZeroOne +/* 01348 80A105A8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0134C 80A105AC E7A000B0 */ swc1 $f0, 0x00B0($sp) /* 01350 80A105B0 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 @@ -354,14 +354,14 @@ glabel func_80A10220 /* 01424 80A10684 15010012 */ bne $t0, $at, .L80A106D0 /* 01428 80A10688 3C014600 */ lui $at, 0x4600 ## $at = 46000000 /* 0142C 80A1068C 44816000 */ mtc1 $at, $f12 ## $f12 = 8192.00 -/* 01430 80A10690 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01430 80A10690 0C00CFC8 */ jal Rand_CenteredFloat /* 01434 80A10694 00000000 */ nop /* 01438 80A10698 4600028D */ trunc.w.s $f10, $f0 /* 0143C 80A1069C 3C014600 */ lui $at, 0x4600 ## $at = 46000000 /* 01440 80A106A0 44816000 */ mtc1 $at, $f12 ## $f12 = 8192.00 /* 01444 80A106A4 440B5000 */ mfc1 $t3, $f10 -/* 01448 80A106A8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01448 80A106A8 0C00CFC8 */ jal Rand_CenteredFloat /* 0144C 80A106AC A7AB009A */ sh $t3, 0x009A($sp) /* 01450 80A106B0 4600010D */ trunc.w.s $f4, $f0 @@ -383,7 +383,7 @@ glabel func_80A10220 /* 0148C 80A106EC 1420000D */ bne $at, $zero, .L80A10724 /* 01490 80A106F0 00000000 */ nop /* 01494 80A106F4 AFA20050 */ sw $v0, 0x0050($sp) -/* 01498 80A106F8 0C03F66B */ jal Math_Rand_ZeroOne +/* 01498 80A106F8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0149C 80A106FC A7A00098 */ sh $zero, 0x0098($sp) /* 014A0 80A10700 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -416,7 +416,7 @@ glabel func_80A10220 .L80A10760: /* 01500 80A10760 C7AC00FC */ lwc1 $f12, 0x00FC($sp) /* 01504 80A10764 C7AE00F4 */ lwc1 $f14, 0x00F4($sp) -/* 01508 80A10768 0C03F494 */ jal Math_atan2f +/* 01508 80A10768 0C03F494 */ jal Math_FAtan2F /* 0150C 80A1076C A7A30098 */ sh $v1, 0x0098($sp) /* 01510 80A10770 3C0180A1 */ lui $at, %hi(D_80A119E4) ## $at = 80A10000 /* 01514 80A10774 C42819E4 */ lwc1 $f8, %lo(D_80A119E4)($at) @@ -434,7 +434,7 @@ glabel func_80A10220 /* 01544 80A107A4 00000000 */ nop /* 01548 80A107A8 460A5102 */ mul.s $f4, $f10, $f10 /* 0154C 80A107AC 46044000 */ add.s $f0, $f8, $f4 -/* 01550 80A107B0 0C03F494 */ jal Math_atan2f +/* 01550 80A107B0 0C03F494 */ jal Math_FAtan2F /* 01554 80A107B4 46000384 */ sqrt.s $f14, $f0 /* 01558 80A107B8 3C0180A1 */ lui $at, %hi(D_80A119E8) ## $at = 80A10000 /* 0155C 80A107BC C42619E8 */ lwc1 $f6, %lo(D_80A119E8)($at) @@ -525,7 +525,7 @@ glabel func_80A10220 /* 01694 80A108F4 29C10064 */ slti $at, $t6, 0x0064 /* 01698 80A108F8 50200024 */ beql $at, $zero, .L80A1098C /* 0169C 80A108FC 8608015A */ lh $t0, 0x015A($s0) ## 0000015A -/* 016A0 80A10900 0C03F494 */ jal Math_atan2f +/* 016A0 80A10900 0C03F494 */ jal Math_FAtan2F /* 016A4 80A10904 C7AE00F4 */ lwc1 $f14, 0x00F4($sp) /* 016A8 80A10908 3C0180A1 */ lui $at, %hi(D_80A119EC) ## $at = 80A10000 /* 016AC 80A1090C C42A19EC */ lwc1 $f10, %lo(D_80A119EC)($at) @@ -583,7 +583,7 @@ glabel func_80A10220 /* 01778 80A109D8 A16C01CA */ sb $t4, 0x01CA($t3) ## 000001CA .L80A109DC: /* 0177C 80A109DC E7A20050 */ swc1 $f2, 0x0050($sp) -/* 01780 80A109E0 0C03F494 */ jal Math_atan2f +/* 01780 80A109E0 0C03F494 */ jal Math_FAtan2F /* 01784 80A109E4 E7B0004C */ swc1 $f16, 0x004C($sp) /* 01788 80A109E8 3C0180A1 */ lui $at, %hi(D_80A119F0) ## $at = 80A10000 /* 0178C 80A109EC C42819F0 */ lwc1 $f8, %lo(D_80A119F0)($at) @@ -596,7 +596,7 @@ glabel func_80A10220 /* 017A8 80A10A08 440F5000 */ mfc1 $t7, $f10 /* 017AC 80A10A0C 00000000 */ nop /* 017B0 80A10A10 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 -/* 017B4 80A10A14 0C03F494 */ jal Math_atan2f +/* 017B4 80A10A14 0C03F494 */ jal Math_FAtan2F /* 017B8 80A10A18 C7AC00F8 */ lwc1 $f12, 0x00F8($sp) /* 017BC 80A10A1C 3C0180A1 */ lui $at, %hi(D_80A119F4) ## $at = 80A10000 /* 017C0 80A10A20 C42619F4 */ lwc1 $f6, %lo(D_80A119F4)($at) @@ -674,18 +674,18 @@ glabel func_80A10220 /* 018CC 80A10B2C AFA90050 */ sw $t1, 0x0050($sp) /* 018D0 80A10B30 A7A00096 */ sh $zero, 0x0096($sp) .L80A10B34: -/* 018D4 80A10B34 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 018D4 80A10B34 0C00CFC8 */ jal Rand_CenteredFloat /* 018D8 80A10B38 4600A306 */ mov.s $f12, $f20 /* 018DC 80A10B3C E7A00088 */ swc1 $f0, 0x0088($sp) -/* 018E0 80A10B40 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 018E0 80A10B40 0C00CFC8 */ jal Rand_CenteredFloat /* 018E4 80A10B44 4600A306 */ mov.s $f12, $f20 /* 018E8 80A10B48 E7A0008C */ swc1 $f0, 0x008C($sp) -/* 018EC 80A10B4C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 018EC 80A10B4C 0C00CFC8 */ jal Rand_CenteredFloat /* 018F0 80A10B50 4600A306 */ mov.s $f12, $f20 -/* 018F4 80A10B54 0C03F66B */ jal Math_Rand_ZeroOne +/* 018F4 80A10B54 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 018F8 80A10B58 E7A00090 */ swc1 $f0, 0x0090($sp) /* 018FC 80A10B5C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 @@ -712,7 +712,7 @@ glabel func_80A10220 /* 01950 80A10BB0 1420FFE0 */ bne $at, $zero, .L80A10B34 /* 01954 80A10BB4 A7A20096 */ sh $v0, 0x0096($sp) /* 01958 80A10BB8 C7AC010C */ lwc1 $f12, 0x010C($sp) -/* 0195C 80A10BBC 0C03F494 */ jal Math_atan2f +/* 0195C 80A10BBC 0C03F494 */ jal Math_FAtan2F /* 01960 80A10BC0 C7AE0104 */ lwc1 $f14, 0x0104($sp) /* 01964 80A10BC4 3C0180A1 */ lui $at, %hi(D_80A119F8) ## $at = 80A10000 /* 01968 80A10BC8 C42A19F8 */ lwc1 $f10, %lo(D_80A119F8)($at) @@ -729,7 +729,7 @@ glabel func_80A10220 /* 01994 80A10BF4 00000000 */ nop /* 01998 80A10BF8 A6180032 */ sh $t8, 0x0032($s0) ## 00000032 /* 0199C 80A10BFC 46000384 */ sqrt.s $f14, $f0 -/* 019A0 80A10C00 0C03F494 */ jal Math_atan2f +/* 019A0 80A10C00 0C03F494 */ jal Math_FAtan2F /* 019A4 80A10C04 C7AC0108 */ lwc1 $f12, 0x0108($sp) /* 019A8 80A10C08 3C0180A1 */ lui $at, %hi(D_80A119FC) ## $at = 80A10000 /* 019AC 80A10C0C C42619FC */ lwc1 $f6, %lo(D_80A119FC)($at) @@ -800,21 +800,21 @@ glabel func_80A10220 .L80A10CFC: /* 01A9C 80A10CFC A3A2007B */ sb $v0, 0x007B($sp) .L80A10D00: -/* 01AA0 80A10D00 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01AA0 80A10D00 0C00CFC8 */ jal Rand_CenteredFloat /* 01AA4 80A10D04 4600A306 */ mov.s $f12, $f20 /* 01AA8 80A10D08 E7A0006C */ swc1 $f0, 0x006C($sp) -/* 01AAC 80A10D0C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01AAC 80A10D0C 0C00CFC8 */ jal Rand_CenteredFloat /* 01AB0 80A10D10 4600A306 */ mov.s $f12, $f20 /* 01AB4 80A10D14 E7A00070 */ swc1 $f0, 0x0070($sp) -/* 01AB8 80A10D18 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01AB8 80A10D18 0C00CFC8 */ jal Rand_CenteredFloat /* 01ABC 80A10D1C 4600A306 */ mov.s $f12, $f20 /* 01AC0 80A10D20 3C0180A1 */ lui $at, %hi(D_80A11A00) ## $at = 80A10000 /* 01AC4 80A10D24 C42A1A00 */ lwc1 $f10, %lo(D_80A11A00)($at) /* 01AC8 80A10D28 E7A00074 */ swc1 $f0, 0x0074($sp) -/* 01ACC 80A10D2C 0C03F66B */ jal Math_Rand_ZeroOne +/* 01ACC 80A10D2C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01AD0 80A10D30 E7AA0064 */ swc1 $f10, 0x0064($sp) /* 01AD4 80A10D34 3C014248 */ lui $at, 0x4248 ## $at = 42480000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Init.s index 114f7967f9..adc1512b59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Init.s @@ -66,7 +66,7 @@ glabel EnFireRock_Init /* 00054 80A11C74 10410017 */ beq $v0, $at, .L80A11CD4 /* 00058 80A11C78 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0005C 80A11C7C 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 00060 80A11C80 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00060 80A11C80 0C00CFBE */ jal Rand_ZeroFloat /* 00064 80A11C84 00000000 */ nop /* 00068 80A11C88 3C014170 */ lui $at, 0x4170 ## $at = 41700000 @@ -74,7 +74,7 @@ glabel EnFireRock_Init /* 00070 80A11C90 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00074 80A11C94 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 00078 80A11C98 46040180 */ add.s $f6, $f0, $f4 -/* 0007C 80A11C9C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0007C 80A11C9C 0C00CFBE */ jal Rand_ZeroFloat /* 00080 80A11CA0 E606014C */ swc1 $f6, 0x014C($s0) ## 0000014C /* 00084 80A11CA4 3C014170 */ lui $at, 0x4170 ## $at = 41700000 @@ -82,7 +82,7 @@ glabel EnFireRock_Init /* 0008C 80A11CAC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00090 80A11CB0 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 00094 80A11CB4 46080280 */ add.s $f10, $f0, $f8 -/* 00098 80A11CB8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00098 80A11CB8 0C00CFBE */ jal Rand_ZeroFloat /* 0009C 80A11CBC E60A0150 */ swc1 $f10, 0x0150($s0) ## 00000150 /* 000A0 80A11CC0 3C014170 */ lui $at, 0x4170 ## $at = 41700000 @@ -153,7 +153,7 @@ glabel L80A11D14 glabel L80A11D9C /* 0017C 80A11D9C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 00180 80A11DA0 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 00184 80A11DA4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00184 80A11DA4 0C00CFC8 */ jal Rand_CenteredFloat /* 00188 80A11DA8 00000000 */ nop /* 0018C 80A11DAC 8FAE0030 */ lw $t6, 0x0030($sp) @@ -161,7 +161,7 @@ glabel L80A11D9C /* 00194 80A11DB4 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 00198 80A11DB8 C5C40024 */ lwc1 $f4, 0x0024($t6) ## 00000024 /* 0019C 80A11DBC 46040180 */ add.s $f6, $f0, $f4 -/* 001A0 80A11DC0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 001A0 80A11DC0 0C00CFC8 */ jal Rand_CenteredFloat /* 001A4 80A11DC4 E606017C */ swc1 $f6, 0x017C($s0) ## 0000017C /* 001A8 80A11DC8 8FAF0030 */ lw $t7, 0x0030($sp) @@ -171,7 +171,7 @@ glabel L80A11D9C glabel L80A11DD8 /* 001B8 80A11DD8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 001BC 80A11DDC 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 001C0 80A11DE0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 001C0 80A11DE0 0C00CFBE */ jal Rand_ZeroFloat /* 001C4 80A11DE4 00000000 */ nop /* 001C8 80A11DE8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -198,7 +198,7 @@ glabel L80A11DD8 /* 00214 80A11E34 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00218 80A11E38 3C0180A1 */ lui $at, %hi(D_80A12EB4) ## $at = 80A10000 -/* 0021C 80A11E3C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0021C 80A11E3C 0C00CFC8 */ jal Rand_CenteredFloat /* 00220 80A11E40 C42C2EB4 */ lwc1 $f12, %lo(D_80A12EB4)($at) /* 00224 80A11E44 4600018D */ trunc.w.s $f6, $f0 @@ -215,7 +215,7 @@ glabel L80A11DD8 glabel L80A11E70 /* 00250 80A11E70 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 00254 80A11E74 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 -/* 00258 80A11E78 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00258 80A11E78 0C00CFBE */ jal Rand_ZeroFloat /* 0025C 80A11E7C 00000000 */ nop /* 00260 80A11E80 3C014080 */ lui $at, 0x4080 ## $at = 40800000 @@ -223,7 +223,7 @@ glabel L80A11E70 /* 00268 80A11E88 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 0026C 80A11E8C 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 /* 00270 80A11E90 460A0400 */ add.s $f16, $f0, $f10 -/* 00274 80A11E94 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00274 80A11E94 0C00CFBE */ jal Rand_ZeroFloat /* 00278 80A11E98 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 /* 0027C 80A11E9C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -231,7 +231,7 @@ glabel L80A11E70 /* 00284 80A11EA4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00288 80A11EA8 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 /* 0028C 80A11EAC 46120100 */ add.s $f4, $f0, $f18 -/* 00290 80A11EB0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00290 80A11EB0 0C00CFBE */ jal Rand_ZeroFloat /* 00294 80A11EB4 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 00298 80A11EB8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -264,7 +264,7 @@ glabel L80A11E70 /* 002F8 80A11F18 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 002FC 80A11F1C 3C0180A1 */ lui $at, %hi(D_80A12EBC) ## $at = 80A10000 /* 00300 80A11F20 E61200C4 */ swc1 $f18, 0x00C4($s0) ## 000000C4 -/* 00304 80A11F24 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00304 80A11F24 0C00CFC8 */ jal Rand_CenteredFloat /* 00308 80A11F28 C42C2EBC */ lwc1 $f12, %lo(D_80A12EBC)($at) /* 0030C 80A11F2C 4600010D */ trunc.w.s $f4, $f0 @@ -279,7 +279,7 @@ glabel L80A11E70 glabel L80A11F50 /* 00330 80A11F50 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 00334 80A11F54 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 -/* 00338 80A11F58 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00338 80A11F58 0C00CFBE */ jal Rand_ZeroFloat /* 0033C 80A11F5C 00000000 */ nop /* 00340 80A11F60 3C014080 */ lui $at, 0x4080 ## $at = 40800000 @@ -287,7 +287,7 @@ glabel L80A11F50 /* 00348 80A11F68 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 0034C 80A11F6C 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 /* 00350 80A11F70 46060200 */ add.s $f8, $f0, $f6 -/* 00354 80A11F74 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00354 80A11F74 0C00CFBE */ jal Rand_ZeroFloat /* 00358 80A11F78 E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 /* 0035C 80A11F7C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 @@ -295,7 +295,7 @@ glabel L80A11F50 /* 00364 80A11F84 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00368 80A11F88 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 /* 0036C 80A11F8C 460A0400 */ add.s $f16, $f0, $f10 -/* 00370 80A11F90 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00370 80A11F90 0C00CFBE */ jal Rand_ZeroFloat /* 00374 80A11F94 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 /* 00378 80A11F98 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 @@ -316,7 +316,7 @@ glabel L80A11F50 /* 003B0 80A11FD0 3C0180A1 */ lui $at, %hi(D_80A12EC8) ## $at = 80A10000 /* 003B4 80A11FD4 E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C /* 003B8 80A11FD8 E60A00C4 */ swc1 $f10, 0x00C4($s0) ## 000000C4 -/* 003BC 80A11FDC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 003BC 80A11FDC 0C00CFC8 */ jal Rand_CenteredFloat /* 003C0 80A11FE0 C42C2EC8 */ lwc1 $f12, %lo(D_80A12EC8)($at) /* 003C4 80A11FE4 4600040D */ trunc.w.s $f16, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A120CC.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A120CC.s index 8ea700e3bf..1f9cf019d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A120CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A120CC.s @@ -86,32 +86,32 @@ glabel func_80A120CC /* 005C4 80A121E4 44051000 */ mfc1 $a1, $f2 /* 005C8 80A121E8 26240024 */ addiu $a0, $s1, 0x0024 ## $a0 = 00000024 /* 005CC 80A121EC 4406A000 */ mfc1 $a2, $f20 -/* 005D0 80A121F0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 005D0 80A121F0 0C01E107 */ jal Math_ApproachF /* 005D4 80A121F4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 005D8 80A121F8 4406A000 */ mfc1 $a2, $f20 /* 005DC 80A121FC 2624002C */ addiu $a0, $s1, 0x002C ## $a0 = 0000002C /* 005E0 80A12200 8E05002C */ lw $a1, 0x002C($s0) ## 0000002C -/* 005E4 80A12204 0C01E107 */ jal Math_SmoothScaleMaxF +/* 005E4 80A12204 0C01E107 */ jal Math_ApproachF /* 005E8 80A12208 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 .L80A1220C: /* 005EC 80A1220C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 .L80A12210: /* 005F0 80A12210 4481A000 */ mtc1 $at, $f20 ## $f20 = 20.00 -/* 005F4 80A12214 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 005F4 80A12214 0C00CFC8 */ jal Rand_CenteredFloat /* 005F8 80A12218 4600A306 */ mov.s $f12, $f20 /* 005FC 80A1221C C6280024 */ lwc1 $f8, 0x0024($s1) ## 00000024 /* 00600 80A12220 4600A306 */ mov.s $f12, $f20 /* 00604 80A12224 46080280 */ add.s $f10, $f0, $f8 -/* 00608 80A12228 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00608 80A12228 0C00CFC8 */ jal Rand_CenteredFloat /* 0060C 80A1222C E7AA0058 */ swc1 $f10, 0x0058($sp) /* 00610 80A12230 C6300028 */ lwc1 $f16, 0x0028($s1) ## 00000028 /* 00614 80A12234 4600A306 */ mov.s $f12, $f20 /* 00618 80A12238 46100480 */ add.s $f18, $f0, $f16 -/* 0061C 80A1223C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0061C 80A1223C 0C00CFC8 */ jal Rand_CenteredFloat /* 00620 80A12240 E7B2005C */ swc1 $f18, 0x005C($sp) /* 00624 80A12244 C624002C */ lwc1 $f4, 0x002C($s1) ## 0000002C @@ -182,7 +182,7 @@ glabel func_80A120CC /* 00710 80A12330 E7A80014 */ swc1 $f8, 0x0014($sp) /* 00714 80A12334 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 .L80A12338: -/* 00718 80A12338 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00718 80A12338 0C00CFC8 */ jal Rand_CenteredFloat /* 0071C 80A1233C 4600A306 */ mov.s $f12, $f20 /* 00720 80A12340 C62A0024 */ lwc1 $f10, 0x0024($s1) ## 00000024 @@ -190,7 +190,7 @@ glabel func_80A120CC /* 00728 80A12348 460A0400 */ add.s $f16, $f0, $f10 /* 0072C 80A1234C E7B00058 */ swc1 $f16, 0x0058($sp) /* 00730 80A12350 C6320080 */ lwc1 $f18, 0x0080($s1) ## 00000080 -/* 00734 80A12354 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00734 80A12354 0C00CFC8 */ jal Rand_CenteredFloat /* 00738 80A12358 E7B2005C */ swc1 $f18, 0x005C($sp) /* 0073C 80A1235C C624002C */ lwc1 $f4, 0x002C($s1) ## 0000002C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A1241C.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A1241C.s index 8216d0d029..a21ba811a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A1241C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A1241C.s @@ -54,15 +54,15 @@ glabel func_80A1241C /* 00898 80A124B8 26D21C24 */ addiu $s2, $s6, 0x1C24 ## $s2 = 00001C24 /* 0089C 80A124BC 24140002 */ addiu $s4, $zero, 0x0002 ## $s4 = 00000002 .L80A124C0: -/* 008A0 80A124C0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 008A0 80A124C0 0C00CFC8 */ jal Rand_CenteredFloat /* 008A4 80A124C4 4600C306 */ mov.s $f12, $f24 /* 008A8 80A124C8 46000506 */ mov.s $f20, $f0 -/* 008AC 80A124CC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 008AC 80A124CC 0C00CFC8 */ jal Rand_CenteredFloat /* 008B0 80A124D0 4600C306 */ mov.s $f12, $f24 /* 008B4 80A124D4 46000586 */ mov.s $f22, $f0 -/* 008B8 80A124D8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 008B8 80A124D8 0C00CFC8 */ jal Rand_CenteredFloat /* 008BC 80A124DC 4600C306 */ mov.s $f12, $f24 /* 008C0 80A124E0 C6280028 */ lwc1 $f8, 0x0028($s1) ## 00000028 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A125B8.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A125B8.s index 4b6de95c2b..721df0822e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A125B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A125B8.s @@ -26,12 +26,12 @@ glabel func_80A125B8 /* 009E0 80A12600 55E00025 */ bnel $t7, $zero, .L80A12698 /* 009E4 80A12604 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 009E8 80A12608 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 -/* 009EC 80A1260C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 009EC 80A1260C 0C00CFC8 */ jal Rand_CenteredFloat /* 009F0 80A12610 A498018A */ sh $t8, 0x018A($a0) ## 0000018A /* 009F4 80A12614 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 009F8 80A12618 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 -/* 009FC 80A1261C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 009FC 80A1261C 0C00CFC8 */ jal Rand_CenteredFloat /* 00A00 80A12620 E7A00054 */ swc1 $f0, 0x0054($sp) /* 00A04 80A12624 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A12730.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A12730.s index 77c69a01a7..6642dc7ad9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A12730.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A12730.s @@ -9,28 +9,28 @@ glabel func_80A12730 /* 00B2C 80A1274C 55C0002D */ bnel $t6, $zero, .L80A12804 /* 00B30 80A12750 8FBF002C */ lw $ra, 0x002C($sp) /* 00B34 80A12754 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 00B38 80A12758 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00B38 80A12758 0C00CFC8 */ jal Rand_CenteredFloat /* 00B3C 80A1275C 00000000 */ nop /* 00B40 80A12760 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 00B44 80A12764 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00B48 80A12768 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 00B4C 80A1276C 46040180 */ add.s $f6, $f0, $f4 -/* 00B50 80A12770 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00B50 80A12770 0C00CFC8 */ jal Rand_CenteredFloat /* 00B54 80A12774 E7A60034 */ swc1 $f6, 0x0034($sp) /* 00B58 80A12778 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 00B5C 80A1277C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00B60 80A12780 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 00B64 80A12784 46080280 */ add.s $f10, $f0, $f8 -/* 00B68 80A12788 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00B68 80A12788 0C00CFC8 */ jal Rand_CenteredFloat /* 00B6C 80A1278C E7AA0038 */ swc1 $f10, 0x0038($sp) /* 00B70 80A12790 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C /* 00B74 80A12794 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 00B78 80A12798 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 /* 00B7C 80A1279C 46100480 */ add.s $f18, $f0, $f16 -/* 00B80 80A127A0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00B80 80A127A0 0C00CFC8 */ jal Rand_CenteredFloat /* 00B84 80A127A4 E7B2003C */ swc1 $f18, 0x003C($sp) /* 00B88 80A127A8 4600010D */ trunc.w.s $f4, $f0 @@ -39,7 +39,7 @@ glabel func_80A12730 /* 00B94 80A127B4 44082000 */ mfc1 $t0, $f4 /* 00B98 80A127B8 00000000 */ nop /* 00B9C 80A127BC 25090082 */ addiu $t1, $t0, 0x0082 ## $t1 = 00000082 -/* 00BA0 80A127C0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00BA0 80A127C0 0C00CFBE */ jal Rand_ZeroFloat /* 00BA4 80A127C4 A7A90032 */ sh $t1, 0x0032($sp) /* 00BA8 80A127C8 4600018D */ trunc.w.s $f6, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s index 265cae7a9a..24de815b3f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s @@ -43,7 +43,7 @@ glabel EnFish_Init /* 0026C 80A154EC 0C017014 */ jal Collider_SetJntSph /* 00270 80A154F0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00274 80A154F4 24090032 */ addiu $t1, $zero, 0x0032 ## $t1 = 00000032 -/* 00278 80A154F8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00278 80A154F8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0027C 80A154FC A20900AE */ sb $t1, 0x00AE($s0) ## 000000AE /* 00280 80A15500 3C0180A1 */ lui $at, %hi(D_80A17194) ## $at = 80A10000 @@ -51,7 +51,7 @@ glabel EnFish_Init /* 00288 80A15508 46040182 */ mul.s $f6, $f0, $f4 /* 0028C 80A1550C 4600320D */ trunc.w.s $f8, $f6 /* 00290 80A15510 440B4000 */ mfc1 $t3, $f8 -/* 00294 80A15514 0C03F66B */ jal Math_Rand_ZeroOne +/* 00294 80A15514 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00298 80A15518 A60B024C */ sh $t3, 0x024C($s0) ## 0000024C /* 0029C 80A1551C 3C0180A1 */ lui $at, %hi(D_80A17198) ## $at = 80A10000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A155D0.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A155D0.s index f72ddf9c01..21dbfa5367 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A155D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A155D0.s @@ -3,12 +3,12 @@ glabel func_80A155D0 /* 00354 80A155D4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00358 80A155D8 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 0035C 80A155DC 8484024E */ lh $a0, 0x024E($a0) ## 0000024E -/* 00360 80A155E0 0C01DE1C */ jal Math_Sins +/* 00360 80A155E0 0C01DE1C */ jal Math_SinS ## sins? /* 00364 80A155E4 AFA50020 */ sw $a1, 0x0020($sp) /* 00368 80A155E8 8FA50020 */ lw $a1, 0x0020($sp) /* 0036C 80A155EC E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00370 80A155F0 0C01DE1C */ jal Math_Sins +/* 00370 80A155F0 0C01DE1C */ jal Math_SinS ## sins? /* 00374 80A155F4 84A4024C */ lh $a0, 0x024C($a1) ## 0000024C /* 00378 80A155F8 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15688.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15688.s index 5e69dc1bd4..5e152627c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15688.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15688.s @@ -15,7 +15,7 @@ glabel func_80A15688 /* 0043C 80A156BC AFA20028 */ sw $v0, 0x0028($sp) /* 00440 80A156C0 00812021 */ addu $a0, $a0, $at /* 00444 80A156C4 00042400 */ sll $a0, $a0, 16 -/* 00448 80A156C8 0C01DE1C */ jal Math_Sins +/* 00448 80A156C8 0C01DE1C */ jal Math_SinS ## sins? /* 0044C 80A156CC 00042403 */ sra $a0, $a0, 16 /* 00450 80A156D0 3C014180 */ lui $at, 0x4180 ## $at = 41800000 @@ -32,7 +32,7 @@ glabel func_80A15688 /* 0047C 80A156FC 85C4008A */ lh $a0, 0x008A($t6) ## 0000008A /* 00480 80A15700 00812021 */ addu $a0, $a0, $at /* 00484 80A15704 00042400 */ sll $a0, $a0, 16 -/* 00488 80A15708 0C01DE0D */ jal Math_Coss +/* 00488 80A15708 0C01DE0D */ jal Math_CosS ## coss? /* 0048C 80A1570C 00042403 */ sra $a0, $a0, 16 /* 00490 80A15710 3C014180 */ lui $at, 0x4180 ## $at = 41800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A157A4.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A157A4.s index 9bd3bc7ecd..5efc9634e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A157A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A157A4.s @@ -7,7 +7,7 @@ glabel func_80A157A4 /* 00538 80A157B8 E4800070 */ swc1 $f0, 0x0070($a0) ## 00000070 /* 0053C 80A157BC AFA60018 */ sw $a2, 0x0018($sp) /* 00540 80A157C0 24040005 */ addiu $a0, $zero, 0x0005 ## $a0 = 00000005 -/* 00544 80A157C4 0C01DF64 */ jal Math_Rand_S16Offset +/* 00544 80A157C4 0C01DF64 */ jal Rand_S16Offset /* 00548 80A157C8 24050023 */ addiu $a1, $zero, 0x0023 ## $a1 = 00000023 /* 0054C 80A157CC 8FA40018 */ lw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A157FC.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A157FC.s index e7392d30bc..e7f3d5fb2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A157FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A157FC.s @@ -20,7 +20,7 @@ glabel func_80A157FC /* 005A4 80A15824 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E99999A /* 005A8 80A15828 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 005AC 80A1582C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 005B0 80A15830 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 005B0 80A15830 0C01E0C4 */ jal Math_SmoothStepToF /* 005B4 80A15834 E7A00010 */ swc1 $f0, 0x0010($sp) /* 005B8 80A15838 3C014000 */ lui $at, 0x4000 ## $at = 40000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A158EC.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A158EC.s index fd3bb4e7e5..5f8c77afe2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A158EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A158EC.s @@ -7,7 +7,7 @@ glabel func_80A158EC /* 00680 80A15900 E4800070 */ swc1 $f0, 0x0070($a0) ## 00000070 /* 00684 80A15904 AFA60018 */ sw $a2, 0x0018($sp) /* 00688 80A15908 2404000F */ addiu $a0, $zero, 0x000F ## $a0 = 0000000F -/* 0068C 80A1590C 0C01DF64 */ jal Math_Rand_S16Offset +/* 0068C 80A1590C 0C01DF64 */ jal Rand_S16Offset /* 00690 80A15910 2405002D */ addiu $a1, $zero, 0x002D ## $a1 = 0000002D /* 00694 80A15914 8FA40018 */ lw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15944.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15944.s index 946f64b02b..3e1b4315ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15944.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15944.s @@ -18,7 +18,7 @@ glabel func_80A15944 /* 006F0 80A15970 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3DA3D70A /* 006F4 80A15974 34A56666 */ ori $a1, $a1, 0x6666 ## $a1 = 3FE66666 /* 006F8 80A15978 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 006FC 80A1597C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 006FC 80A1597C 0C01E0C4 */ jal Math_SmoothStepToF /* 00700 80A15980 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00704 80A15984 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 @@ -45,7 +45,7 @@ glabel func_80A15944 /* 00750 80A159D0 00022C00 */ sll $a1, $v0, 16 /* 00754 80A159D4 00052C03 */ sra $a1, $a1, 16 /* 00758 80A159D8 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 0075C 80A159DC 0C01DED6 */ jal func_80077B58 +/* 0075C 80A159DC 0C01DED6 */ jal Math_StepToAngleS /* 00760 80A159E0 24060BB8 */ addiu $a2, $zero, 0x0BB8 ## $a2 = 00000BB8 /* 00764 80A159E4 1000000E */ beq $zero, $zero, .L80A15A20 /* 00768 80A159E8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 @@ -61,7 +61,7 @@ glabel func_80A15944 /* 00788 80A15A08 00022C00 */ sll $a1, $v0, 16 /* 0078C 80A15A0C 00052C03 */ sra $a1, $a1, 16 /* 00790 80A15A10 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 00794 80A15A14 0C01DED6 */ jal func_80077B58 +/* 00794 80A15A14 0C01DED6 */ jal Math_StepToAngleS /* 00798 80A15A18 24060BB8 */ addiu $a2, $zero, 0x0BB8 ## $a2 = 00000BB8 /* 0079C 80A15A1C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 .L80A15A20: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15AD4.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15AD4.s index 58faecf505..fab4ad8d6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15AD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15AD4.s @@ -7,7 +7,7 @@ glabel func_80A15AD4 /* 00868 80A15AE8 E4800070 */ swc1 $f0, 0x0070($a0) ## 00000070 /* 0086C 80A15AEC AFA60018 */ sw $a2, 0x0018($sp) /* 00870 80A15AF0 2404000A */ addiu $a0, $zero, 0x000A ## $a0 = 0000000A -/* 00874 80A15AF4 0C01DF64 */ jal Math_Rand_S16Offset +/* 00874 80A15AF4 0C01DF64 */ jal Rand_S16Offset /* 00878 80A15AF8 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 /* 0087C 80A15AFC 8FA40018 */ lw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15B2C.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15B2C.s index 460550e8be..3d32d53443 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15B2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15B2C.s @@ -22,7 +22,7 @@ glabel func_80A15B2C /* 008E8 80A15B68 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3DA3D70A /* 008EC 80A15B6C 34A56666 */ ori $a1, $a1, 0x6666 ## $a1 = 40866666 /* 008F0 80A15B70 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 008F4 80A15B74 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 008F4 80A15B74 0C01E0C4 */ jal Math_SmoothStepToF /* 008F8 80A15B78 E7A40010 */ swc1 $f4, 0x0010($sp) /* 008FC 80A15B7C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 @@ -44,7 +44,7 @@ glabel func_80A15B2C /* 00938 80A15BB8 00022C00 */ sll $a1, $v0, 16 /* 0093C 80A15BBC 00052C03 */ sra $a1, $a1, 16 /* 00940 80A15BC0 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 00944 80A15BC4 0C01DED6 */ jal func_80077B58 +/* 00944 80A15BC4 0C01DED6 */ jal Math_StepToAngleS /* 00948 80A15BC8 24060BB8 */ addiu $a2, $zero, 0x0BB8 ## $a2 = 00000BB8 /* 0094C 80A15BCC 1000002B */ beq $zero, $zero, .L80A15C7C /* 00950 80A15BD0 3C014080 */ lui $at, 0x4080 ## $at = 40800000 @@ -61,7 +61,7 @@ glabel func_80A15B2C /* 00974 80A15BF4 00022C00 */ sll $a1, $v0, 16 /* 00978 80A15BF8 00052C03 */ sra $a1, $a1, 16 /* 0097C 80A15BFC 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 00980 80A15C00 0C01DED6 */ jal func_80077B58 +/* 00980 80A15C00 0C01DED6 */ jal Math_StepToAngleS /* 00984 80A15C04 240607D0 */ addiu $a2, $zero, 0x07D0 ## $a2 = 000007D0 /* 00988 80A15C08 1000001C */ beq $zero, $zero, .L80A15C7C /* 0098C 80A15C0C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 @@ -93,7 +93,7 @@ glabel func_80A15B2C .L80A15C6C: /* 009EC 80A15C6C 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 .L80A15C70: -/* 009F0 80A15C70 0C01DED6 */ jal func_80077B58 +/* 009F0 80A15C70 0C01DED6 */ jal Math_StepToAngleS /* 009F4 80A15C74 240607D0 */ addiu $a2, $zero, 0x07D0 ## $a2 = 000007D0 .L80A15C78: /* 009F8 80A15C78 3C014080 */ lui $at, 0x4080 ## $at = 40800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15D18.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15D18.s index 5b90be2a26..0318805b7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15D18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15D18.s @@ -7,7 +7,7 @@ glabel func_80A15D18 /* 00AAC 80A15D2C 0C2854AB */ jal func_80A152AC /* 00AB0 80A15D30 AFA40018 */ sw $a0, 0x0018($sp) /* 00AB4 80A15D34 2404000A */ addiu $a0, $zero, 0x000A ## $a0 = 0000000A -/* 00AB8 80A15D38 0C01DF64 */ jal Math_Rand_S16Offset +/* 00AB8 80A15D38 0C01DF64 */ jal Rand_S16Offset /* 00ABC 80A15D3C 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 /* 00AC0 80A15D40 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15D68.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15D68.s index 400e0d5c4c..3d1f9ffb1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15D68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15D68.s @@ -19,7 +19,7 @@ glabel func_80A15D68 /* 00B18 80A15D98 34A56666 */ ori $a1, $a1, 0x6666 ## $a1 = 3FE66666 /* 00B1C 80A15D9C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 00B20 80A15DA0 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 00B24 80A15DA4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00B24 80A15DA4 0C01E0C4 */ jal Math_SmoothStepToF /* 00B28 80A15DA8 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00B2C 80A15DAC 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 @@ -41,7 +41,7 @@ glabel func_80A15D68 /* 00B68 80A15DE8 00022C00 */ sll $a1, $v0, 16 /* 00B6C 80A15DEC 00052C03 */ sra $a1, $a1, 16 /* 00B70 80A15DF0 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 00B74 80A15DF4 0C01DED6 */ jal func_80077B58 +/* 00B74 80A15DF4 0C01DED6 */ jal Math_StepToAngleS /* 00B78 80A15DF8 24060BB8 */ addiu $a2, $zero, 0x0BB8 ## $a2 = 00000BB8 /* 00B7C 80A15DFC 1000002C */ beq $zero, $zero, .L80A15EB0 /* 00B80 80A15E00 3C014080 */ lui $at, 0x4080 ## $at = 40800000 @@ -62,7 +62,7 @@ glabel func_80A15D68 /* 00BB4 80A15E34 00042400 */ sll $a0, $a0, 16 /* 00BB8 80A15E38 00042403 */ sra $a0, $a0, 16 .L80A15E3C: -/* 00BBC 80A15E3C 0C01DE1C */ jal Math_Sins +/* 00BBC 80A15E3C 0C01DE1C */ jal Math_SinS ## sins? /* 00BC0 80A15E40 A7A40034 */ sh $a0, 0x0034($sp) /* 00BC4 80A15E44 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -74,7 +74,7 @@ glabel func_80A15D68 /* 00BDC 80A15E5C 46105480 */ add.s $f18, $f10, $f16 /* 00BE0 80A15E60 E7B20038 */ swc1 $f18, 0x0038($sp) /* 00BE4 80A15E64 C4440028 */ lwc1 $f4, 0x0028($v0) ## 00000028 -/* 00BE8 80A15E68 0C01DE0D */ jal Math_Coss +/* 00BE8 80A15E68 0C01DE0D */ jal Math_CosS ## coss? /* 00BEC 80A15E6C E7A4003C */ swc1 $f4, 0x003C($sp) /* 00BF0 80A15E70 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -91,7 +91,7 @@ glabel func_80A15D68 /* 00C18 80A15E98 00022C00 */ sll $a1, $v0, 16 /* 00C1C 80A15E9C 00052C03 */ sra $a1, $a1, 16 /* 00C20 80A15EA0 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 00C24 80A15EA4 0C01DED6 */ jal func_80077B58 +/* 00C24 80A15EA4 0C01DED6 */ jal Math_StepToAngleS /* 00C28 80A15EA8 24060BB8 */ addiu $a2, $zero, 0x0BB8 ## $a2 = 00000BB8 /* 00C2C 80A15EAC 3C014080 */ lui $at, 0x4080 ## $at = 40800000 .L80A15EB0: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15F84.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15F84.s index 8dce597918..5c4df04174 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15F84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15F84.s @@ -35,16 +35,16 @@ glabel func_80A15F84 /* 00D28 80A15FA8 44071000 */ mfc1 $a3, $f2 /* 00D2C 80A15FAC 44050000 */ mfc1 $a1, $f0 /* 00D30 80A15FB0 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 00D34 80A15FB4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00D34 80A15FB4 0C01E0C4 */ jal Math_SmoothStepToF /* 00D38 80A15FB8 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00D3C 80A15FBC 26040030 */ addiu $a0, $s0, 0x0030 ## $a0 = 00000030 /* 00D40 80A15FC0 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 00D44 80A15FC4 0C01DED6 */ jal func_80077B58 +/* 00D44 80A15FC4 0C01DED6 */ jal Math_StepToAngleS /* 00D48 80A15FC8 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 /* 00D4C 80A15FCC 26040034 */ addiu $a0, $s0, 0x0034 ## $a0 = 00000034 /* 00D50 80A15FD0 2405C000 */ addiu $a1, $zero, 0xC000 ## $a1 = FFFFC000 -/* 00D54 80A15FD4 0C01DED6 */ jal func_80077B58 +/* 00D54 80A15FD4 0C01DED6 */ jal Math_StepToAngleS /* 00D58 80A15FD8 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 /* 00D5C 80A15FDC 860E0030 */ lh $t6, 0x0030($s0) ## 00000030 /* 00D60 80A15FE0 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A160BC.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A160BC.s index 6491fa9035..c90bf8ee6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A160BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A160BC.s @@ -25,7 +25,7 @@ glabel func_80A160BC /* 00E54 80A160D4 AFB00018 */ sw $s0, 0x0018($sp) /* 00E58 80A160D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00E5C 80A160DC E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C -/* 00E60 80A160E0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00E60 80A160E0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00E64 80A160E4 E4860070 */ swc1 $f6, 0x0070($a0) ## 00000070 /* 00E68 80A160E8 3C0180A1 */ lui $at, %hi(D_80A171B8) ## $at = 80A10000 @@ -35,7 +35,7 @@ glabel func_80A160BC /* 00E78 80A160F8 00000000 */ nop /* 00E7C 80A160FC 4500000C */ bc1f .L80A16130 /* 00E80 80A16100 00000000 */ nop -/* 00E84 80A16104 0C03F66B */ jal Math_Rand_ZeroOne +/* 00E84 80A16104 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00E88 80A16108 00000000 */ nop /* 00E8C 80A1610C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -53,7 +53,7 @@ glabel func_80A160BC /* 00EB8 80A16138 00000000 */ nop /* 00EBC 80A1613C 4502000D */ bc1fl .L80A16174 /* 00EC0 80A16140 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00EC4 80A16144 0C03F66B */ jal Math_Rand_ZeroOne +/* 00EC4 80A16144 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00EC8 80A16148 00000000 */ nop /* 00ECC 80A1614C 3C0180A1 */ lui $at, %hi(D_80A171C0) ## $at = 80A10000 @@ -67,7 +67,7 @@ glabel func_80A160BC /* 00EEC 80A1616C E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 /* 00EF0 80A16170 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L80A16174: -/* 00EF4 80A16174 0C03F66B */ jal Math_Rand_ZeroOne +/* 00EF4 80A16174 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00EF8 80A16178 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 /* 00EFC 80A1617C 3C0180A1 */ lui $at, %hi(D_80A171C8) ## $at = 80A10000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16200.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16200.s index 4b26179d34..0af3dd24a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16200.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16200.s @@ -15,7 +15,7 @@ glabel func_80A16200 /* 00F88 80A16208 AFB00020 */ sw $s0, 0x0020($sp) /* 00F8C 80A1620C 84A2009E */ lh $v0, 0x009E($a1) ## 0000009E /* 00F90 80A16210 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F94 80A16214 0C03F66B */ jal Math_Rand_ZeroOne +/* 00F94 80A16214 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00F98 80A16218 A7A20042 */ sh $v0, 0x0042($sp) /* 00F9C 80A1621C 3C0180A1 */ lui $at, %hi(D_80A171CC) ## $at = 80A10000 @@ -29,7 +29,7 @@ glabel func_80A16200 /* 00FBC 80A1623C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 00FC0 80A16240 E7A80010 */ swc1 $f8, 0x0010($sp) /* 00FC4 80A16244 44053000 */ mfc1 $a1, $f6 -/* 00FC8 80A16248 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00FC8 80A16248 0C01E0C4 */ jal Math_SmoothStepToF /* 00FCC 80A1624C 00000000 */ nop /* 00FD0 80A16250 87A20042 */ lh $v0, 0x0042($sp) @@ -60,21 +60,21 @@ glabel func_80A16200 /* 01034 80A162B4 00052C03 */ sra $a1, $a1, 16 .L80A162B8: /* 01038 80A162B8 AFA40030 */ sw $a0, 0x0030($sp) -/* 0103C 80A162BC 0C01DED6 */ jal func_80077B58 +/* 0103C 80A162BC 0C01DED6 */ jal Math_StepToAngleS /* 01040 80A162C0 AFA7002C */ sw $a3, 0x002C($sp) /* 01044 80A162C4 26040034 */ addiu $a0, $s0, 0x0034 ## $a0 = 00000034 /* 01048 80A162C8 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 0104C 80A162CC 0C01DED6 */ jal func_80077B58 +/* 0104C 80A162CC 0C01DED6 */ jal Math_StepToAngleS /* 01050 80A162D0 240603E8 */ addiu $a2, $zero, 0x03E8 ## $a2 = 000003E8 -/* 01054 80A162D4 0C03F66B */ jal Math_Rand_ZeroOne +/* 01054 80A162D4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01058 80A162D8 00000000 */ nop /* 0105C 80A162DC E7A00034 */ swc1 $f0, 0x0034($sp) -/* 01060 80A162E0 0C01DE1C */ jal Math_Sins +/* 01060 80A162E0 0C01DE1C */ jal Math_SinS ## sins? /* 01064 80A162E4 8604024E */ lh $a0, 0x024E($s0) ## 0000024E /* 01068 80A162E8 E7A00038 */ swc1 $f0, 0x0038($sp) -/* 0106C 80A162EC 0C01DE1C */ jal Math_Sins +/* 0106C 80A162EC 0C01DE1C */ jal Math_SinS ## sins? /* 01070 80A162F0 8604024C */ lh $a0, 0x024C($s0) ## 0000024C /* 01074 80A162F4 3C01447A */ lui $at, 0x447A ## $at = 447A0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16450.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16450.s index bbe9c5bd9e..5b759a7c89 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16450.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16450.s @@ -17,7 +17,7 @@ glabel func_80A16450 /* 011F8 80A16478 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 011FC 80A1647C 34A53333 */ ori $a1, $a1, 0x3333 ## $a1 = 40333333 /* 01200 80A16480 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 01204 80A16484 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01204 80A16484 0C01E0C4 */ jal Math_SmoothStepToF /* 01208 80A16488 E7A40010 */ swc1 $f4, 0x0010($sp) /* 0120C 80A1648C 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 @@ -41,15 +41,15 @@ glabel func_80A16450 .L80A164CC: /* 0124C 80A164CC AFA40028 */ sw $a0, 0x0028($sp) /* 01250 80A164D0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01254 80A164D4 0C01DED6 */ jal func_80077B58 +/* 01254 80A164D4 0C01DED6 */ jal Math_StepToAngleS /* 01258 80A164D8 240605DC */ addiu $a2, $zero, 0x05DC ## $a2 = 000005DC /* 0125C 80A164DC 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 01260 80A164E0 86050016 */ lh $a1, 0x0016($s0) ## 00000016 -/* 01264 80A164E4 0C01DED6 */ jal func_80077B58 +/* 01264 80A164E4 0C01DED6 */ jal Math_StepToAngleS /* 01268 80A164E8 24060BB8 */ addiu $a2, $zero, 0x0BB8 ## $a2 = 00000BB8 /* 0126C 80A164EC 26040034 */ addiu $a0, $s0, 0x0034 ## $a0 = 00000034 /* 01270 80A164F0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01274 80A164F4 0C01DED6 */ jal func_80077B58 +/* 01274 80A164F4 0C01DED6 */ jal Math_StepToAngleS /* 01278 80A164F8 240603E8 */ addiu $a2, $zero, 0x03E8 ## $a2 = 000003E8 /* 0127C 80A164FC 8FB80028 */ lw $t8, 0x0028($sp) /* 01280 80A16500 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 @@ -69,7 +69,7 @@ glabel func_80A16450 /* 012B8 80A16538 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 012BC 80A1653C 46128101 */ sub.s $f4, $f16, $f18 /* 012C0 80A16540 44052000 */ mfc1 $a1, $f4 -/* 012C4 80A16544 0C01DE80 */ jal Math_ApproxF +/* 012C4 80A16544 0C01DE80 */ jal Math_StepToF /* 012C8 80A16548 00000000 */ nop /* 012CC 80A1654C 1000000A */ beq $zero, $zero, .L80A16578 @@ -81,7 +81,7 @@ glabel func_80A16450 /* 012E0 80A16560 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 012E4 80A16564 46083281 */ sub.s $f10, $f6, $f8 /* 012E8 80A16568 44055000 */ mfc1 $a1, $f10 -/* 012EC 80A1656C 0C01DE80 */ jal Math_ApproxF +/* 012EC 80A1656C 0C01DE80 */ jal Math_StepToF /* 012F0 80A16570 00000000 */ nop /* 012F4 80A16574 860B0248 */ lh $t3, 0x0248($s0) ## 00000248 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16618.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16618.s index c959d5fa46..7e1e4d0263 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16618.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16618.s @@ -7,7 +7,7 @@ glabel func_80A16618 /* 013AC 80A1662C E4800070 */ swc1 $f0, 0x0070($a0) ## 00000070 /* 013B0 80A16630 AFA60018 */ sw $a2, 0x0018($sp) /* 013B4 80A16634 24040005 */ addiu $a0, $zero, 0x0005 ## $a0 = 00000005 -/* 013B8 80A16638 0C01DF64 */ jal Math_Rand_S16Offset +/* 013B8 80A16638 0C01DF64 */ jal Rand_S16Offset /* 013BC 80A1663C 24050023 */ addiu $a1, $zero, 0x0023 ## $a1 = 00000023 /* 013C0 80A16640 8FA40018 */ lw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16670.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16670.s index 21e96b80d6..443ff3a82e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16670.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16670.s @@ -53,7 +53,7 @@ glabel func_80A16670 /* 01490 80A16710 8C450000 */ lw $a1, 0x0000($v0) ## 00000000 /* 01494 80A16714 8C460004 */ lw $a2, 0x0004($v0) ## 00000004 /* 01498 80A16718 8C470008 */ lw $a3, 0x0008($v0) ## 00000008 -/* 0149C 80A1671C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0149C 80A1671C 0C01E0C4 */ jal Math_SmoothStepToF /* 014A0 80A16720 E7A80010 */ swc1 $f8, 0x0010($sp) /* 014A4 80A16724 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 @@ -77,7 +77,7 @@ glabel func_80A16670 /* 014E8 80A16768 00022C00 */ sll $a1, $v0, 16 /* 014EC 80A1676C 00052C03 */ sra $a1, $a1, 16 /* 014F0 80A16770 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 014F4 80A16774 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 014F4 80A16774 0C01DE2B */ jal Math_ScaledStepToS /* 014F8 80A16778 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 /* 014FC 80A1677C 14400013 */ bne $v0, $zero, .L80A167CC @@ -94,7 +94,7 @@ glabel func_80A16670 /* 01524 80A167A4 000529C0 */ sll $a1, $a1, 7 /* 01528 80A167A8 00052C00 */ sll $a1, $a1, 16 /* 0152C 80A167AC 00052C03 */ sra $a1, $a1, 16 -/* 01530 80A167B0 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01530 80A167B0 0C01DE2B */ jal Math_ScaledStepToS /* 01534 80A167B4 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 01538 80A167B8 14400004 */ bne $v0, $zero, .L80A167CC @@ -150,7 +150,7 @@ glabel func_80A16670 /* 015EC 80A1686C 24040005 */ addiu $a0, $zero, 0x0005 ## $a0 = 00000005 /* 015F0 80A16870 5D200005 */ bgtzl $t1, .L80A16888 /* 015F4 80A16874 8FBF0024 */ lw $ra, 0x0024($sp) -/* 015F8 80A16878 0C01DF64 */ jal Math_Rand_S16Offset +/* 015F8 80A16878 0C01DF64 */ jal Rand_S16Offset /* 015FC 80A1687C 24050050 */ addiu $a1, $zero, 0x0050 ## $a1 = 00000050 /* 01600 80A16880 A6020248 */ sh $v0, 0x0248($s0) ## 00000248 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16898.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16898.s index decc2cb657..982d79cd65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16898.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16898.s @@ -12,11 +12,11 @@ glabel func_80A16898 /* 01620 80A168A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01624 80A168A4 AFBF001C */ sw $ra, 0x001C($sp) /* 01628 80A168A8 AFA5002C */ sw $a1, 0x002C($sp) -/* 0162C 80A168AC 0C01DE1C */ jal Math_Sins +/* 0162C 80A168AC 0C01DE1C */ jal Math_SinS ## sins? /* 01630 80A168B0 8484024C */ lh $a0, 0x024C($a0) ## 0000024C /* 01634 80A168B4 E7A00024 */ swc1 $f0, 0x0024($sp) -/* 01638 80A168B8 0C01DE1C */ jal Math_Sins +/* 01638 80A168B8 0C01DE1C */ jal Math_SinS ## sins? /* 0163C 80A168BC 8604024E */ lh $a0, 0x024E($s0) ## 0000024E /* 01640 80A168C0 3C0280A1 */ lui $v0, %hi(D_80A17014) ## $v0 = 80A10000 @@ -36,7 +36,7 @@ glabel func_80A16898 /* 01678 80A168F8 00000000 */ nop /* 0167C 80A168FC 4500001E */ bc1f .L80A16978 /* 01680 80A16900 00000000 */ nop -/* 01684 80A16904 0C03F66B */ jal Math_Rand_ZeroOne +/* 01684 80A16904 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01688 80A16908 E44C0000 */ swc1 $f12, 0x0000($v0) ## 80A17014 /* 0168C 80A1690C 3C0180A1 */ lui $at, %hi(D_80A171E4) ## $at = 80A10000 @@ -47,7 +47,7 @@ glabel func_80A16898 /* 016A0 80A16920 00000000 */ nop /* 016A4 80A16924 45020012 */ bc1fl .L80A16970 /* 016A8 80A16928 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 016AC 80A1692C 0C03F66B */ jal Math_Rand_ZeroOne +/* 016AC 80A1692C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 016B0 80A16930 00000000 */ nop /* 016B4 80A16934 3C014040 */ lui $at, 0x4040 ## $at = 40400000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A169C8.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A169C8.s index 89adfc0708..cb017c67b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A169C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A169C8.s @@ -4,11 +4,11 @@ glabel func_80A169C8 /* 01750 80A169D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01754 80A169D4 AFBF001C */ sw $ra, 0x001C($sp) /* 01758 80A169D8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0175C 80A169DC 0C01DE1C */ jal Math_Sins +/* 0175C 80A169DC 0C01DE1C */ jal Math_SinS ## sins? /* 01760 80A169E0 8484024C */ lh $a0, 0x024C($a0) ## 0000024C /* 01764 80A169E4 E7A00028 */ swc1 $f0, 0x0028($sp) -/* 01768 80A169E8 0C01DE1C */ jal Math_Sins +/* 01768 80A169E8 0C01DE1C */ jal Math_SinS ## sins? /* 0176C 80A169EC 8604024E */ lh $a0, 0x024E($s0) ## 0000024E /* 01770 80A169F0 E7A00024 */ swc1 $f0, 0x0024($sp) @@ -21,7 +21,7 @@ glabel func_80A169C8 /* 0178C 80A16A0C A61900B8 */ sh $t9, 0x00B8($s0) ## 000000B8 /* 01790 80A16A10 24847014 */ addiu $a0, $a0, %lo(D_80A17014) ## $a0 = 80A17014 /* 01794 80A16A14 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01798 80A16A18 0C01DE80 */ jal Math_ApproxF +/* 01798 80A16A18 0C01DE80 */ jal Math_StepToF /* 0179C 80A16A1C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 017A0 80A16A20 C7A40028 */ lwc1 $f4, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s index fb95c6686a..8471cd2307 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s @@ -137,7 +137,7 @@ glabel EnFr_Update /* 00480 80A1AE20 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 00484 80A1AE24 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00488 80A1AE28 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 -/* 0048C 80A1AE2C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0048C 80A1AE2C 0C00CFBE */ jal Rand_ZeroFloat /* 00490 80A1AE30 A2180378 */ sb $t8, 0x0378($s0) ## 00000378 /* 00494 80A1AE34 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -179,7 +179,7 @@ glabel EnFr_Update /* 00524 80A1AEC4 2739BB34 */ addiu $t9, $t9, %lo(func_80A1BB34) ## $t9 = 80A1BB34 /* 00528 80A1AEC8 44816000 */ mtc1 $at, $f12 ## $f12 = 255.00 /* 0052C 80A1AECC AE190130 */ sw $t9, 0x0130($s0) ## 00000130 -/* 00530 80A1AED0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00530 80A1AED0 0C00CFBE */ jal Rand_ZeroFloat /* 00534 80A1AED4 A20003A8 */ sb $zero, 0x03A8($s0) ## 000003A8 /* 00538 80A1AED8 C602038C */ lwc1 $f2, 0x038C($s0) ## 0000038C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B19C.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B19C.s index 8b23e55cd1..78d8369fc6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B19C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B19C.s @@ -14,7 +14,7 @@ glabel func_80A1B19C /* 00828 80A1B1C8 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 0082C 80A1B1CC A0800378 */ sb $zero, 0x0378($a0) ## 00000378 /* 00830 80A1B1D0 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 -/* 00834 80A1B1D4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00834 80A1B1D4 0C00CFBE */ jal Rand_ZeroFloat /* 00838 80A1B1D8 AFA40018 */ sw $a0, 0x0018($sp) /* 0083C 80A1B1DC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B2C8.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B2C8.s index 03fc3d5bc7..96bc7c3d53 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B2C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B2C8.s @@ -78,7 +78,7 @@ glabel func_80A1B2C8 /* 00A3C 80A1B3DC 4405A000 */ mfc1 $a1, $f20 /* 00A40 80A1B3E0 26040398 */ addiu $a0, $s0, 0x0398 ## $a0 = 00000398 /* 00A44 80A1B3E4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00A48 80A1B3E8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00A48 80A1B3E8 0C01E107 */ jal Math_ApproachF /* 00A4C 80A1B3EC 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 .L80A1B3F0: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B464.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B464.s index 3884837dfd..96964f143b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B464.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B464.s @@ -9,7 +9,7 @@ glabel func_80A1B464 /* 00AE0 80A1B480 AFAE0010 */ sw $t6, 0x0010($sp) /* 00AE4 80A1B484 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 /* 00AE8 80A1B488 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00AEC 80A1B48C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00AEC 80A1B48C 0C01E1A7 */ jal Math_SmoothStepToS /* 00AF0 80A1B490 24072710 */ addiu $a3, $zero, 0x2710 ## $a3 = 00002710 /* 00AF4 80A1B494 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B778.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B778.s index ac0095cd15..04e35daf56 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B778.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B778.s @@ -19,7 +19,7 @@ glabel func_80A1B778 /* 00E1C 80A1B7BC 24072710 */ addiu $a3, $zero, 0x2710 ## $a3 = 00002710 /* 00E20 80A1B7C0 E7A80034 */ swc1 $f8, 0x0034($sp) /* 00E24 80A1B7C4 86050032 */ lh $a1, 0x0032($s0) ## 00000032 -/* 00E28 80A1B7C8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00E28 80A1B7C8 0C01E1A7 */ jal Math_SmoothStepToS /* 00E2C 80A1B7CC AFB80010 */ sw $t8, 0x0010($sp) /* 00E30 80A1B7D0 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B8D0.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B8D0.s index 58d3513a4a..6c445fc628 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B8D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B8D0.s @@ -19,7 +19,7 @@ glabel func_80A1B8D0 /* 00F70 80A1B910 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 /* 00F74 80A1B914 000E7880 */ sll $t7, $t6, 2 /* 00F78 80A1B918 00AF2821 */ addu $a1, $a1, $t7 -/* 00F7C 80A1B91C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00F7C 80A1B91C 0C01E107 */ jal Math_ApproachF /* 00F80 80A1B920 8CA5D0CC */ lw $a1, %lo(D_80A1D0CC)($a1) /* 00F84 80A1B924 9202037E */ lbu $v0, 0x037E($s0) ## 0000037E @@ -45,7 +45,7 @@ glabel func_80A1B8D0 .L80A1B970: /* 00FD0 80A1B970 3C054316 */ lui $a1, 0x4316 ## $a1 = 43160000 /* 00FD4 80A1B974 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 00FD8 80A1B978 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00FD8 80A1B978 0C01E107 */ jal Math_ApproachF /* 00FDC 80A1B97C 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 /* 00FE0 80A1B980 3C014316 */ lui $at, 0x4316 ## $at = 43160000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s index 75ca549b41..1ec288c18c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s @@ -31,14 +31,14 @@ glabel func_80A1B9D8 /* 010AC 80A1BA4C 860403AA */ lh $a0, 0x03AA($s0) ## 000003AA /* 010B0 80A1BA50 00042040 */ sll $a0, $a0, 1 /* 010B4 80A1BA54 00042400 */ sll $a0, $a0, 16 -/* 010B8 80A1BA58 0C01DE1C */ jal Math_Sins +/* 010B8 80A1BA58 0C01DE1C */ jal Math_SinS ## sins? /* 010BC 80A1BA5C 00042403 */ sra $a0, $a0, 16 /* 010C0 80A1BA60 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 010C4 80A1BA64 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 /* 010C8 80A1BA68 87A4003E */ lh $a0, 0x003E($sp) /* 010CC 80A1BA6C 46060202 */ mul.s $f8, $f0, $f6 -/* 010D0 80A1BA70 0C01DE1C */ jal Math_Sins +/* 010D0 80A1BA70 0C01DE1C */ jal Math_SinS ## sins? /* 010D4 80A1BA74 E7A80038 */ swc1 $f8, 0x0038($sp) /* 010D8 80A1BA78 C7AA0038 */ lwc1 $f10, 0x0038($sp) @@ -46,7 +46,7 @@ glabel func_80A1B9D8 /* 010E0 80A1BA80 860403AA */ lh $a0, 0x03AA($s0) ## 000003AA /* 010E4 80A1BA84 460A0402 */ mul.s $f16, $f0, $f10 /* 010E8 80A1BA88 46128100 */ add.s $f4, $f16, $f18 -/* 010EC 80A1BA8C 0C01DE0D */ jal Math_Coss +/* 010EC 80A1BA8C 0C01DE0D */ jal Math_CosS ## coss? /* 010F0 80A1BA90 E60403AC */ swc1 $f4, 0x03AC($s0) ## 000003AC /* 010F4 80A1BA94 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -56,7 +56,7 @@ glabel func_80A1B9D8 /* 01104 80A1BAA4 46083280 */ add.s $f10, $f6, $f8 /* 01108 80A1BAA8 460A8480 */ add.s $f18, $f16, $f10 /* 0110C 80A1BAAC E61203B0 */ swc1 $f18, 0x03B0($s0) ## 000003B0 -/* 01110 80A1BAB0 0C01DE0D */ jal Math_Coss +/* 01110 80A1BAB0 0C01DE0D */ jal Math_CosS ## coss? /* 01114 80A1BAB4 87A4003E */ lh $a0, 0x003E($sp) /* 01118 80A1BAB8 C7A40038 */ lwc1 $f4, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C388.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C388.s index 177ae9e4ec..210552e6ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C388.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C388.s @@ -15,7 +15,7 @@ glabel func_80A1C388 .L80A1C3BC: /* 01A1C 80A1C3BC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 01A20 80A1C3C0 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 -/* 01A24 80A1C3C4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01A24 80A1C3C4 0C00CFBE */ jal Rand_ZeroFloat /* 01A28 80A1C3C8 00000000 */ nop /* 01A2C 80A1C3CC 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Update.s index afa377b6ad..8bd30cae79 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Update.s @@ -78,7 +78,7 @@ glabel EnFz_Update .L80A211C4: /* 01404 80A211C4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 01408 80A211C8 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 0140C 80A211CC 0C01DE80 */ jal Math_ApproxF +/* 0140C 80A211CC 0C01DE80 */ jal Math_StepToF /* 01410 80A211D0 8E050254 */ lw $a1, 0x0254($s0) ## 00000254 /* 01414 80A211D4 0C00B638 */ jal Actor_MoveForward diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20100.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20100.s index 89f328f1cc..7d7ebcf413 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20100.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20100.s @@ -65,46 +65,46 @@ glabel func_80A20100 /* 0041C 80A201DC 27B5009C */ addiu $s5, $sp, 0x009C ## $s5 = FFFFFFE4 /* 00420 80A201E0 27B400A8 */ addiu $s4, $sp, 0x00A8 ## $s4 = FFFFFFF0 .L80A201E4: -/* 00424 80A201E4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00424 80A201E4 0C00CFC8 */ jal Rand_CenteredFloat /* 00428 80A201E8 4600D306 */ mov.s $f12, $f26 /* 0042C 80A201EC 461C0600 */ add.s $f24, $f0, $f28 -/* 00430 80A201F0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00430 80A201F0 0C00CFC8 */ jal Rand_CenteredFloat /* 00434 80A201F4 4600F306 */ mov.s $f12, $f30 /* 00438 80A201F8 4600018D */ trunc.w.s $f6, $f0 /* 0043C 80A201FC 4600A306 */ mov.s $f12, $f20 /* 00440 80A20200 44113000 */ mfc1 $s1, $f6 -/* 00444 80A20204 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00444 80A20204 0C00CFC8 */ jal Rand_CenteredFloat /* 00448 80A20208 2631000C */ addiu $s1, $s1, 0x000C ## $s1 = 0000000C /* 0044C 80A2020C C6480000 */ lwc1 $f8, 0x0000($s2) ## 00000000 /* 00450 80A20210 4600A306 */ mov.s $f12, $f20 /* 00454 80A20214 46080280 */ add.s $f10, $f0, $f8 -/* 00458 80A20218 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00458 80A20218 0C00CFBE */ jal Rand_ZeroFloat /* 0045C 80A2021C E7AA00A8 */ swc1 $f10, 0x00A8($sp) /* 00460 80A20220 C6500004 */ lwc1 $f16, 0x0004($s2) ## 00000004 /* 00464 80A20224 4600A306 */ mov.s $f12, $f20 /* 00468 80A20228 46100480 */ add.s $f18, $f0, $f16 -/* 0046C 80A2022C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0046C 80A2022C 0C00CFC8 */ jal Rand_CenteredFloat /* 00470 80A20230 E7B200AC */ swc1 $f18, 0x00AC($sp) /* 00474 80A20234 C6440008 */ lwc1 $f4, 0x0008($s2) ## 00000008 /* 00478 80A20238 4600B306 */ mov.s $f12, $f22 /* 0047C 80A2023C 46040180 */ add.s $f6, $f0, $f4 -/* 00480 80A20240 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00480 80A20240 0C00CFC8 */ jal Rand_CenteredFloat /* 00484 80A20244 E7A600B0 */ swc1 $f6, 0x00B0($sp) /* 00488 80A20248 E7A0009C */ swc1 $f0, 0x009C($sp) -/* 0048C 80A2024C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0048C 80A2024C 0C00CFBE */ jal Rand_ZeroFloat /* 00490 80A20250 4600B306 */ mov.s $f12, $f22 /* 00494 80A20254 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 00498 80A20258 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 /* 0049C 80A2025C 4600B306 */ mov.s $f12, $f22 /* 004A0 80A20260 46080280 */ add.s $f10, $f0, $f8 -/* 004A4 80A20264 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 004A4 80A20264 0C00CFC8 */ jal Rand_CenteredFloat /* 004A8 80A20268 E7AA00A0 */ swc1 $f10, 0x00A0($sp) /* 004AC 80A2026C 4406C000 */ mfc1 $a2, $f24 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A202FC.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A202FC.s index 5eba1cb3bd..26ff7adf95 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A202FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A202FC.s @@ -14,14 +14,14 @@ glabel func_80A202FC /* 00558 80A20318 55E0002C */ bnel $t7, $zero, .L80A203CC /* 0055C 80A2031C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00560 80A20320 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 -/* 00564 80A20324 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00564 80A20324 0C00CFC8 */ jal Rand_CenteredFloat /* 00568 80A20328 00000000 */ nop /* 0056C 80A2032C C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 00570 80A20330 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00574 80A20334 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 00578 80A20338 46040180 */ add.s $f6, $f0, $f4 -/* 0057C 80A2033C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0057C 80A2033C 0C00CFC8 */ jal Rand_CenteredFloat /* 00580 80A20340 E7A60044 */ swc1 $f6, 0x0044($sp) /* 00584 80A20344 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 @@ -31,7 +31,7 @@ glabel func_80A202FC /* 00594 80A20354 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00598 80A20358 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 0059C 80A2035C 46105480 */ add.s $f18, $f10, $f16 -/* 005A0 80A20360 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 005A0 80A20360 0C00CFC8 */ jal Rand_CenteredFloat /* 005A4 80A20364 E7B20048 */ swc1 $f18, 0x0048($sp) /* 005A8 80A20368 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C @@ -47,7 +47,7 @@ glabel func_80A202FC /* 005D0 80A20390 E7A20040 */ swc1 $f2, 0x0040($sp) /* 005D4 80A20394 E7A2003C */ swc1 $f2, 0x003C($sp) /* 005D8 80A20398 E7A20038 */ swc1 $f2, 0x0038($sp) -/* 005DC 80A2039C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 005DC 80A2039C 0C00CFBE */ jal Rand_ZeroFloat /* 005E0 80A203A0 E7A80030 */ swc1 $f8, 0x0030($sp) /* 005E4 80A203A4 3C014170 */ lui $at, 0x4170 ## $at = 41700000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A203DC.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A203DC.s index 55c5892558..c0c63a5f2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A203DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A203DC.s @@ -14,7 +14,7 @@ glabel func_80A203DC /* 00638 80A203F8 55E00025 */ bnel $t7, $zero, .L80A20490 /* 0063C 80A203FC 8FBF0024 */ lw $ra, 0x0024($sp) /* 00640 80A20400 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 -/* 00644 80A20404 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00644 80A20404 0C00CFC8 */ jal Rand_CenteredFloat /* 00648 80A20408 00000000 */ nop /* 0064C 80A2040C C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 @@ -23,7 +23,7 @@ glabel func_80A203DC /* 00658 80A20418 46040180 */ add.s $f6, $f0, $f4 /* 0065C 80A2041C E7A60044 */ swc1 $f6, 0x0044($sp) /* 00660 80A20420 C608024C */ lwc1 $f8, 0x024C($s0) ## 0000024C -/* 00664 80A20424 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00664 80A20424 0C00CFC8 */ jal Rand_CenteredFloat /* 00668 80A20428 E7A80048 */ swc1 $f8, 0x0048($sp) /* 0066C 80A2042C C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C @@ -39,7 +39,7 @@ glabel func_80A203DC /* 00694 80A20454 E7A20040 */ swc1 $f2, 0x0040($sp) /* 00698 80A20458 E7A2003C */ swc1 $f2, 0x003C($sp) /* 0069C 80A2045C E7A20038 */ swc1 $f2, 0x0038($sp) -/* 006A0 80A20460 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 006A0 80A20460 0C00CFBE */ jal Rand_ZeroFloat /* 006A4 80A20464 E7B20030 */ swc1 $f18, 0x0030($sp) /* 006A8 80A20468 3C014170 */ lui $at, 0x4170 ## $at = 41700000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20704.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20704.s index 6288730e5f..107e3989c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20704.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20704.s @@ -7,7 +7,7 @@ glabel func_80A20704 /* 00958 80A20718 AFA00010 */ sw $zero, 0x0010($sp) /* 0095C 80A2071C 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 /* 00960 80A20720 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00964 80A20724 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00964 80A20724 0C01E1A7 */ jal Math_SmoothStepToS /* 00968 80A20728 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 0096C 80A2072C 8FA20020 */ lw $v0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20774.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20774.s index 8cf060ef02..e9b79a9f28 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20774.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20774.s @@ -17,7 +17,7 @@ glabel func_80A20774 /* 009EC 80A207AC 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A03126F /* 009F0 80A207B0 26040054 */ addiu $a0, $s0, 0x0054 ## $a0 = 00000054 /* 009F4 80A207B4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 009F8 80A207B8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 009F8 80A207B8 0C01E0C4 */ jal Math_SmoothStepToF /* 009FC 80A207BC E7A40010 */ swc1 $f4, 0x0010($sp) /* 00A00 80A207C0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A208A8.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A208A8.s index fca8d32420..ca2dc77fc1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A208A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A208A8.s @@ -21,7 +21,7 @@ glabel func_80A208A8 /* 00B30 80A208F0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00B34 80A208F4 26040054 */ addiu $a0, $s0, 0x0054 ## $a0 = 00000054 /* 00B38 80A208F8 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A03126F -/* 00B3C 80A208FC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00B3C 80A208FC 0C01E0C4 */ jal Math_SmoothStepToF /* 00B40 80A20900 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00B44 80A20904 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20DBC.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20DBC.s index 00b791361a..741b6431ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20DBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20DBC.s @@ -17,7 +17,7 @@ glabel func_80A20DBC /* 01014 80A20DD4 34C6B717 */ ori $a2, $a2, 0xB717 ## $a2 = 3951B717 /* 01018 80A20DD8 34A54952 */ ori $a1, $a1, 0x4952 ## $a1 = 3A1D4952 /* 0101C 80A20DDC AFA70018 */ sw $a3, 0x0018($sp) -/* 01020 80A20DE0 0C01DE80 */ jal Math_ApproxF +/* 01020 80A20DE0 0C01DE80 */ jal Math_StepToF /* 01024 80A20DE4 24840054 */ addiu $a0, $a0, 0x0054 ## $a0 = 00000054 /* 01028 80A20DE8 8FA70018 */ lw $a3, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A215BC.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A215BC.s index 90cbad8561..6fa106d897 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A215BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A215BC.s @@ -100,7 +100,7 @@ glabel func_80A215BC /* 01964 80A21724 46140103 */ div.s $f4, $f0, $f20 /* 01968 80A21728 44050000 */ mfc1 $a1, $f0 /* 0196C 80A2172C 44072000 */ mfc1 $a3, $f4 -/* 01970 80A21730 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01970 80A21730 0C01E107 */ jal Math_ApproachF /* 01974 80A21734 00000000 */ nop /* 01978 80A21738 8602002E */ lh $v0, 0x002E($s0) ## 000002A2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/EnGanonMant_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/EnGanonMant_Draw.s index 074d9e5e2f..382500fe8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/EnGanonMant_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/EnGanonMant_Draw.s @@ -86,7 +86,7 @@ glabel EnGanonMant_Draw /* 00D90 80A24AF0 46081280 */ add.s $f10, $f2, $f8 /* 00D94 80A24AF4 46048180 */ add.s $f6, $f16, $f4 /* 00D98 80A24AF8 E7AA0090 */ swc1 $f10, 0x0090($sp) -/* 00D9C 80A24AFC 0C0341F5 */ jal atan2f +/* 00D9C 80A24AFC 0C0341F5 */ jal Math_Atan2F /* 00DA0 80A24B00 E7A60094 */ swc1 $f6, 0x0094($sp) /* 00DA4 80A24B04 4614A702 */ mul.s $f28, $f20, $f20 @@ -95,7 +95,7 @@ glabel EnGanonMant_Draw /* 00DB0 80A24B10 4616B082 */ mul.s $f2, $f22, $f22 /* 00DB4 80A24B14 4602E000 */ add.s $f0, $f28, $f2 /* 00DB8 80A24B18 E7A2007C */ swc1 $f2, 0x007C($sp) -/* 00DBC 80A24B1C 0C0341F5 */ jal atan2f +/* 00DBC 80A24B1C 0C0341F5 */ jal Math_Atan2F /* 00DC0 80A24B20 46000304 */ sqrt.s $f12, $f0 /* 00DC4 80A24B24 4618C202 */ mul.s $f8, $f24, $f24 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A23D84.s b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A23D84.s index c5e54f2b62..74376d4554 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A23D84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A23D84.s @@ -21,18 +21,18 @@ glabel func_80A23D84 /* 00048 80A23DA8 F7BA0030 */ sdc1 $f26, 0x0030($sp) /* 0004C 80A23DAC F7B60020 */ sdc1 $f22, 0x0020($sp) /* 00050 80A23DB0 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 00054 80A23DB4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00054 80A23DB4 0C00CFBE */ jal Rand_ZeroFloat /* 00058 80A23DB8 4600C306 */ mov.s $f12, $f24 /* 0005C 80A23DBC 3C014280 */ lui $at, 0x4280 ## $at = 42800000 /* 00060 80A23DC0 4481D000 */ mtc1 $at, $f26 ## $f26 = 64.00 /* 00064 80A23DC4 E7A00050 */ swc1 $f0, 0x0050($sp) -/* 00068 80A23DC8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00068 80A23DC8 0C00CFBE */ jal Rand_ZeroFloat /* 0006C 80A23DCC 4600D306 */ mov.s $f12, $f26 /* 00070 80A23DD0 3C0180A2 */ lui $at, %hi(D_80A27EC8) ## $at = 80A20000 /* 00074 80A23DD4 C42C7EC8 */ lwc1 $f12, %lo(D_80A27EC8)($at) -/* 00078 80A23DD8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00078 80A23DD8 0C00CFBE */ jal Rand_ZeroFloat /* 0007C 80A23DDC E7A0004C */ swc1 $f0, 0x004C($sp) /* 00080 80A23DE0 46000586 */ mov.s $f22, $f0 @@ -45,7 +45,7 @@ glabel func_80A23D84 /* 00094 80A23DF4 4600B306 */ mov.s $f12, $f22 /* 00098 80A23DF8 3C0180A2 */ lui $at, %hi(D_80A27ECC) ## $at = 80A20000 /* 0009C 80A23DFC 46000586 */ mov.s $f22, $f0 -/* 000A0 80A23E00 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 000A0 80A23E00 0C00CFBE */ jal Rand_ZeroFloat /* 000A4 80A23E04 C42C7ECC */ lwc1 $f12, %lo(D_80A27ECC)($at) /* 000A8 80A23E08 4600010D */ trunc.w.s $f4, $f0 @@ -138,11 +138,11 @@ glabel func_80A23D84 /* 001E8 80A23F48 3C0180A2 */ lui $at, %hi(D_80A27ED0) ## $at = 80A20000 /* 001EC 80A23F4C C4367ED0 */ lwc1 $f22, %lo(D_80A27ED0)($at) .L80A23F50: -/* 001F0 80A23F50 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 001F0 80A23F50 0C00CFBE */ jal Rand_ZeroFloat /* 001F4 80A23F54 4600B306 */ mov.s $f12, $f22 /* 001F8 80A23F58 46000506 */ mov.s $f20, $f0 -/* 001FC 80A23F5C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 001FC 80A23F5C 0C00CFBE */ jal Rand_ZeroFloat /* 00200 80A23F60 4600B306 */ mov.s $f12, $f22 /* 00204 80A23F64 4600028D */ trunc.w.s $f10, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A23FE0.s b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A23FE0.s index be68c37c98..bc01d2b206 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A23FE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A23FE0.s @@ -127,19 +127,19 @@ glabel func_80A23FE0 /* 00428 80A24188 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 0042C 80A2418C 46128503 */ div.s $f20, $f16, $f18 /* 00430 80A24190 44818000 */ mtc1 $at, $f16 ## $f16 = 11.00 -/* 00434 80A24194 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 00434 80A24194 0C01E123 */ jal Math_ApproachZeroF /* 00438 80A24198 46105583 */ div.s $f22, $f10, $f16 /* 0043C 80A2419C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00440 80A241A0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 00444 80A241A4 26240004 */ addiu $a0, $s1, 0x0004 ## $a0 = 00000004 -/* 00448 80A241A8 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 00448 80A241A8 0C01E123 */ jal Math_ApproachZeroF /* 0044C 80A241AC 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 00450 80A241B0 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00454 80A241B4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 00458 80A241B8 26240008 */ addiu $a0, $s1, 0x0008 ## $a0 = 00000008 -/* 0045C 80A241BC 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 0045C 80A241BC 0C01E123 */ jal Math_ApproachZeroF /* 00460 80A241C0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 00464 80A241C4 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 @@ -204,7 +204,7 @@ glabel func_80A23FE0 /* 00548 80A242A8 460A4481 */ sub.s $f18, $f8, $f10 /* 0054C 80A242AC 46048180 */ add.s $f6, $f16, $f4 /* 00550 80A242B0 46069580 */ add.s $f22, $f18, $f6 -/* 00554 80A242B4 0C0341F5 */ jal atan2f +/* 00554 80A242B4 0C0341F5 */ jal Math_Atan2F /* 00558 80A242B8 4600B306 */ mov.s $f12, $f22 /* 0055C 80A242BC 4614A202 */ mul.s $f8, $f20, $f20 @@ -212,7 +212,7 @@ glabel func_80A23FE0 /* 00564 80A242C4 4600C386 */ mov.s $f14, $f24 /* 00568 80A242C8 4616B282 */ mul.s $f10, $f22, $f22 /* 0056C 80A242CC 460A4000 */ add.s $f0, $f8, $f10 -/* 00570 80A242D0 0C0341F5 */ jal atan2f +/* 00570 80A242D0 0C0341F5 */ jal Math_Atan2F /* 00574 80A242D4 46000304 */ sqrt.s $f12, $f0 /* 00578 80A242D8 46000507 */ neg.s $f20, $f0 @@ -266,7 +266,7 @@ glabel func_80A23FE0 /* 00638 80A24398 00000000 */ nop /* 0063C 80A2439C 45000016 */ bc1f .L80A243F8 /* 00640 80A243A0 00000000 */ nop -/* 00644 80A243A4 0C0341F5 */ jal atan2f +/* 00644 80A243A4 0C0341F5 */ jal Math_Atan2F /* 00648 80A243A8 AFA20070 */ sw $v0, 0x0070($sp) /* 0064C 80A243AC 8FA20070 */ lw $v0, 0x0070($sp) @@ -370,7 +370,7 @@ glabel func_80A23FE0 /* 007A8 80A24508 C6120008 */ lwc1 $f18, 0x0008($s0) ## 00000008 /* 007AC 80A2450C C6E60008 */ lwc1 $f6, 0x0008($s7) ## 00000008 /* 007B0 80A24510 46048381 */ sub.s $f14, $f16, $f4 -/* 007B4 80A24514 0C0341F5 */ jal atan2f +/* 007B4 80A24514 0C0341F5 */ jal Math_Atan2F /* 007B8 80A24518 46069301 */ sub.s $f12, $f18, $f6 /* 007BC 80A2451C E6C0FFF8 */ swc1 $f0, -0x0008($s6) ## FFFFFFF8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s index 5f6da4aea2..a88ffbd840 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s @@ -136,7 +136,7 @@ glabel EnGb_Init /* 00208 80A2F388 A24E00AE */ sb $t6, 0x00AE($s2) ## 000000AE /* 0020C 80A2F38C E6580068 */ swc1 $f24, 0x0068($s2) ## 00000068 /* 00210 80A2F390 E6580060 */ swc1 $f24, 0x0060($s2) ## 00000060 -/* 00214 80A2F394 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00214 80A2F394 0C00CFBE */ jal Rand_ZeroFloat /* 00218 80A2F398 E644006C */ swc1 $f4, 0x006C($s2) ## 0000006C /* 0021C 80A2F39C 4600018D */ trunc.w.s $f6, $f0 @@ -157,7 +157,7 @@ glabel EnGb_Init /* 00258 80A2F3D8 24140001 */ addiu $s4, $zero, 0x0001 ## $s4 = 00000001 /* 0025C 80A2F3DC 24130003 */ addiu $s3, $zero, 0x0003 ## $s3 = 00000003 .L80A2F3E0: -/* 00260 80A2F3E0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00260 80A2F3E0 0C00CFBE */ jal Rand_ZeroFloat /* 00264 80A2F3E4 4600D306 */ mov.s $f12, $f26 /* 00268 80A2F3E8 4600020D */ trunc.w.s $f8, $f0 @@ -198,7 +198,7 @@ glabel EnGb_Init /* 002EC 80A2F46C E61803A8 */ swc1 $f24, 0x03A8($s0) ## 000003A8 /* 002F0 80A2F470 E61803AC */ swc1 $f24, 0x03AC($s0) ## 000003AC /* 002F4 80A2F474 E6020398 */ swc1 $f2, 0x0398($s0) ## 00000398 -/* 002F8 80A2F478 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 002F8 80A2F478 0C00CFBE */ jal Rand_ZeroFloat /* 002FC 80A2F47C E60203A4 */ swc1 $f2, 0x03A4($s0) ## 000003A4 /* 00300 80A2F480 4600028D */ trunc.w.s $f10, $f0 @@ -212,7 +212,7 @@ glabel EnGb_Init /* 00320 80A2F4A0 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 /* 00324 80A2F4A4 1635FFCE */ bne $s1, $s5, .L80A2F3E0 /* 00328 80A2F4A8 A2190360 */ sb $t9, 0x0360($s0) ## 0000038C -/* 0032C 80A2F4AC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0032C 80A2F4AC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00330 80A2F4B0 00000000 */ nop /* 00334 80A2F4B4 461A0402 */ mul.s $f16, $f0, $f26 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Update.s index ae8b7f890c..3d7a7a1a9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Update.s @@ -44,7 +44,7 @@ glabel EnGb_Update /* 00C8C 80A2FE0C 2610004C */ addiu $s0, $s0, 0x004C ## $s0 = 0000004C /* 00C90 80A2FE10 1615FFFA */ bne $s0, $s5, .L80A2FDFC /* 00C94 80A2FE14 2631004C */ addiu $s1, $s1, 0x004C ## $s1 = 000002D4 -/* 00C98 80A2FE18 0C03F66B */ jal Math_Rand_ZeroOne +/* 00C98 80A2FE18 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00C9C 80A2FE1C 00000000 */ nop /* 00CA0 80A2FE20 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FC70.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FC70.s index 35759874ed..e3a7698b0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FC70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FC70.s @@ -53,7 +53,7 @@ glabel func_80A2FC70 /* 00BAC 80A2FD2C A203040D */ sb $v1, 0x040D($s0) ## 0000040D /* 00BB0 80A2FD30 A204040F */ sb $a0, 0x040F($s0) ## 0000040F /* 00BB4 80A2FD34 A2030389 */ sb $v1, 0x0389($s0) ## 00000389 -/* 00BB8 80A2FD38 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00BB8 80A2FD38 0C00CFBE */ jal Rand_ZeroFloat /* 00BBC 80A2FD3C A204038B */ sb $a0, 0x038B($s0) ## 0000038B /* 00BC0 80A2FD40 4600048D */ trunc.w.s $f18, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FFFC.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FFFC.s index 0e407e2ed7..a5bcb83789 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FFFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FFFC.s @@ -58,14 +58,14 @@ glabel func_80A2FFFC .L80A300AC: /* 00F2C 80A300AC 4405C000 */ mfc1 $a1, $f24 /* 00F30 80A300B0 8E0703AC */ lw $a3, 0x03AC($s0) ## 000003AC -/* 00F34 80A300B4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00F34 80A300B4 0C01E107 */ jal Math_ApproachF /* 00F38 80A300B8 261103AC */ addiu $s1, $s0, 0x03AC ## $s1 = 000003AC /* 00F3C 80A300BC 4405C000 */ mfc1 $a1, $f24 /* 00F40 80A300C0 3C063A83 */ lui $a2, 0x3A83 ## $a2 = 3A830000 /* 00F44 80A300C4 4407C000 */ mfc1 $a3, $f24 /* 00F48 80A300C8 34C6126F */ ori $a2, $a2, 0x126F ## $a2 = 3A83126F -/* 00F4C 80A300CC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00F4C 80A300CC 0C01E107 */ jal Math_ApproachF /* 00F50 80A300D0 02202025 */ or $a0, $s1, $zero ## $a0 = 000003AC /* 00F54 80A300D4 3C0180A3 */ lui $at, %hi(D_80A307FC) ## $at = 80A30000 @@ -104,14 +104,14 @@ glabel func_80A2FFFC /* 00FC8 80A30148 3C063CA3 */ lui $a2, 0x3CA3 ## $a2 = 3CA30000 /* 00FCC 80A3014C 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3CA3D70A /* 00FD0 80A30150 8E0703AC */ lw $a3, 0x03AC($s0) ## 000003AC -/* 00FD4 80A30154 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00FD4 80A30154 0C01E107 */ jal Math_ApproachF /* 00FD8 80A30158 261103AC */ addiu $s1, $s0, 0x03AC ## $s1 = 000003AC /* 00FDC 80A3015C 4405C000 */ mfc1 $a1, $f24 /* 00FE0 80A30160 3C063A83 */ lui $a2, 0x3A83 ## $a2 = 3A830000 /* 00FE4 80A30164 4407C000 */ mfc1 $a3, $f24 /* 00FE8 80A30168 34C6126F */ ori $a2, $a2, 0x126F ## $a2 = 3A83126F -/* 00FEC 80A3016C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00FEC 80A3016C 0C01E107 */ jal Math_ApproachF /* 00FF0 80A30170 02202025 */ or $a0, $s1, $zero ## $a0 = 000003AC /* 00FF4 80A30174 C60203A8 */ lwc1 $f2, 0x03A8($s0) ## 000003A8 @@ -139,7 +139,7 @@ glabel func_80A2FFFC .L80A301C8: /* 01048 80A301C8 4405B000 */ mfc1 $a1, $f22 /* 0104C 80A301CC 4407C000 */ mfc1 $a3, $f24 -/* 01050 80A301D0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01050 80A301D0 0C01E107 */ jal Math_ApproachF /* 01054 80A301D4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 01058 80A301D8 C60203A8 */ lwc1 $f2, 0x03A8($s0) ## 000003A8 @@ -152,7 +152,7 @@ glabel func_80A2FFFC /* 01074 80A301F4 E61603AC */ swc1 $f22, 0x03AC($s0) ## 000003AC /* 01078 80A301F8 A2130389 */ sb $s3, 0x0389($s0) ## 00000389 /* 0107C 80A301FC A200038A */ sb $zero, 0x038A($s0) ## 0000038A -/* 01080 80A30200 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01080 80A30200 0C00CFBE */ jal Rand_ZeroFloat /* 01084 80A30204 4600D306 */ mov.s $f12, $f26 /* 01088 80A30208 4600048D */ trunc.w.s $f18, $f0 @@ -184,7 +184,7 @@ glabel func_80A2FFFC /* 010E4 80A30264 00118C00 */ sll $s1, $s1, 16 /* 010E8 80A30268 00118C03 */ sra $s1, $s1, 16 /* 010EC 80A3026C 00112400 */ sll $a0, $s1, 16 -/* 010F0 80A30270 0C01DE1C */ jal Math_Sins +/* 010F0 80A30270 0C01DE1C */ jal Math_SinS ## sins? /* 010F4 80A30274 00042403 */ sra $a0, $a0, 16 /* 010F8 80A30278 46140402 */ mul.s $f16, $f0, $f20 @@ -192,7 +192,7 @@ glabel func_80A2FFFC /* 01100 80A30280 00112400 */ sll $a0, $s1, 16 /* 01104 80A30284 00042403 */ sra $a0, $a0, 16 /* 01108 80A30288 46128100 */ add.s $f4, $f16, $f18 -/* 0110C 80A3028C 0C01DE0D */ jal Math_Coss +/* 0110C 80A3028C 0C01DE0D */ jal Math_CosS ## coss? /* 01110 80A30290 E6040390 */ swc1 $f4, 0x0390($s0) ## 00000390 /* 01114 80A30294 46140182 */ mul.s $f6, $f0, $f20 @@ -208,7 +208,7 @@ glabel func_80A2FFFC /* 01138 80A302B8 00118C00 */ sll $s1, $s1, 16 /* 0113C 80A302BC 00118C03 */ sra $s1, $s1, 16 /* 01140 80A302C0 00112400 */ sll $a0, $s1, 16 -/* 01144 80A302C4 0C01DE1C */ jal Math_Sins +/* 01144 80A302C4 0C01DE1C */ jal Math_SinS ## sins? /* 01148 80A302C8 00042403 */ sra $a0, $a0, 16 /* 0114C 80A302CC 46140482 */ mul.s $f18, $f0, $f20 @@ -216,7 +216,7 @@ glabel func_80A2FFFC /* 01154 80A302D4 00112400 */ sll $a0, $s1, 16 /* 01158 80A302D8 00042403 */ sra $a0, $a0, 16 /* 0115C 80A302DC 46049180 */ add.s $f6, $f18, $f4 -/* 01160 80A302E0 0C01DE0D */ jal Math_Coss +/* 01160 80A302E0 0C01DE0D */ jal Math_CosS ## coss? /* 01164 80A302E4 E6060390 */ swc1 $f6, 0x0390($s0) ## 00000390 /* 01168 80A302E8 46140202 */ mul.s $f8, $f0, $f20 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Update.s index efe08b7ede..d72dad1da6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Update.s @@ -72,7 +72,7 @@ glabel EnGe1_Update .L80A3236C: /* 019FC 80A3236C 54400006 */ bnel $v0, $zero, .L80A32388 /* 01A00 80A32370 A60302A8 */ sh $v1, 0x02A8($s0) ## 000002A8 -/* 01A04 80A32374 0C01DF64 */ jal Math_Rand_S16Offset +/* 01A04 80A32374 0C01DF64 */ jal Rand_S16Offset /* 01A08 80A32378 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C /* 01A0C 80A3237C A60202AA */ sh $v0, 0x02AA($s0) ## 000002AA diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32078.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32078.s index 0cf1a45301..3d29c1a91c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32078.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32078.s @@ -22,7 +22,7 @@ glabel func_80A32078 /* 01754 80A320C4 10200013 */ beq $at, $zero, .L80A32114 /* 01758 80A320C8 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 0175C 80A320CC 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 -/* 01760 80A320D0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01760 80A320D0 0C01E1A7 */ jal Math_SmoothStepToS /* 01764 80A320D4 AFB90010 */ sw $t9, 0x0010($sp) /* 01768 80A320D8 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 @@ -48,7 +48,7 @@ glabel func_80A32078 /* 017B4 80A32124 2604029E */ addiu $a0, $s0, 0x029E ## $a0 = 0000029E /* 017B8 80A32128 2405E000 */ addiu $a1, $zero, 0xE000 ## $a1 = FFFFE000 /* 017BC 80A3212C 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 017C0 80A32130 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 017C0 80A32130 0C01E1A7 */ jal Math_SmoothStepToS /* 017C4 80A32134 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 017C8 80A32138 10000008 */ beq $zero, $zero, .L80A3215C @@ -58,7 +58,7 @@ glabel func_80A32078 /* 017D4 80A32144 AFAC0010 */ sw $t4, 0x0010($sp) /* 017D8 80A32148 24052000 */ addiu $a1, $zero, 0x2000 ## $a1 = 00002000 /* 017DC 80A3214C 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 017E0 80A32150 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 017E0 80A32150 0C01E1A7 */ jal Math_SmoothStepToS /* 017E4 80A32154 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 017E8 80A32158 8605008A */ lh $a1, 0x008A($s0) ## 0000008A @@ -67,7 +67,7 @@ glabel func_80A32078 /* 017F0 80A32160 AFAD0010 */ sw $t5, 0x0010($sp) /* 017F4 80A32164 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 017F8 80A32168 2406000C */ addiu $a2, $zero, 0x000C ## $a2 = 0000000C -/* 017FC 80A3216C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 017FC 80A3216C 0C01E1A7 */ jal Math_SmoothStepToS /* 01800 80A32170 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 01804 80A32174 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32190.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32190.s index 17f3bda004..d8905a1c47 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32190.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32190.s @@ -43,7 +43,7 @@ glabel func_80A32190 .L80A3222C: /* 018BC 80A3222C AFA80010 */ sw $t0, 0x0010($sp) /* 018C0 80A32230 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 018C4 80A32234 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 018C4 80A32234 0C01E1A7 */ jal Math_SmoothStepToS /* 018C8 80A32238 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 018CC 80A3223C 24090064 */ addiu $t1, $zero, 0x0064 ## $t1 = 00000064 @@ -51,7 +51,7 @@ glabel func_80A32190 /* 018D4 80A32244 2604029E */ addiu $a0, $s0, 0x029E ## $a0 = 0000029E /* 018D8 80A32248 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 018DC 80A3224C 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 018E0 80A32250 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 018E0 80A32250 0C01E1A7 */ jal Math_SmoothStepToS /* 018E4 80A32254 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 018E8 80A32258 8FBF002C */ lw $ra, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32444.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32444.s index 10f051b751..185adf2b69 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32444.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32444.s @@ -46,7 +46,7 @@ glabel func_80A32444 /* 01B78 80A324E8 AFA30018 */ sw $v1, 0x0018($sp) /* 01B7C 80A324EC 00002012 */ mflo $a0 /* 01B80 80A324F0 00042400 */ sll $a0, $a0, 16 -/* 01B84 80A324F4 0C01DE1C */ jal Math_Sins +/* 01B84 80A324F4 0C01DE1C */ jal Math_SinS ## sins? /* 01B88 80A324F8 00042403 */ sra $a0, $a0, 16 /* 01B8C 80A324FC 8FA20038 */ lw $v0, 0x0038($sp) @@ -68,7 +68,7 @@ glabel func_80A32444 /* 01BCC 80A3253C 012A0019 */ multu $t1, $t2 /* 01BD0 80A32540 00002012 */ mflo $a0 /* 01BD4 80A32544 00042400 */ sll $a0, $a0, 16 -/* 01BD8 80A32548 0C01DE0D */ jal Math_Coss +/* 01BD8 80A32548 0C01DE0D */ jal Math_CosS ## coss? /* 01BDC 80A3254C 00042403 */ sra $a0, $a0, 16 /* 01BE0 80A32550 8FA20038 */ lw $v0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A331A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A331A0.s index 9556f0e835..88f0581507 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A331A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A331A0.s @@ -10,7 +10,7 @@ glabel func_80A331A0 /* 005F0 80A331C0 AFAE0010 */ sw $t6, 0x0010($sp) /* 005F4 80A331C4 24840032 */ addiu $a0, $a0, 0x0032 ## $a0 = 00000032 /* 005F8 80A331C8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 005FC 80A331CC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 005FC 80A331CC 0C01E1A7 */ jal Math_SmoothStepToS /* 00600 80A331D0 24070400 */ addiu $a3, $zero, 0x0400 ## $a3 = 00000400 /* 00604 80A331D4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A332D4.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A332D4.s index 05e37eb421..85affe701d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A332D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A332D4.s @@ -9,7 +9,7 @@ glabel func_80A332D4 /* 00720 80A332F0 AFAE0010 */ sw $t6, 0x0010($sp) /* 00724 80A332F4 24840032 */ addiu $a0, $a0, 0x0032 ## $a0 = 00000032 /* 00728 80A332F8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0072C 80A332FC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0072C 80A332FC 0C01E1A7 */ jal Math_SmoothStepToS /* 00730 80A33300 24070400 */ addiu $a3, $zero, 0x0400 ## $a3 = 00000400 /* 00734 80A33304 86020032 */ lh $v0, 0x0032($s0) ## 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3334C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3334C.s index c00db7e506..a9414b8a1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3334C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3334C.s @@ -18,7 +18,7 @@ glabel func_80A3334C /* 007BC 80A3338C 000212C0 */ sll $v0, $v0, 11 /* 007C0 80A33390 00022400 */ sll $a0, $v0, 16 /* 007C4 80A33394 00042403 */ sra $a0, $a0, 16 -/* 007C8 80A33398 0C01DE0D */ jal Math_Coss +/* 007C8 80A33398 0C01DE0D */ jal Math_CosS ## coss? /* 007CC 80A3339C AFA40034 */ sw $a0, 0x0034($sp) /* 007D0 80A333A0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -32,7 +32,7 @@ glabel func_80A3334C /* 007F0 80A333C0 E7AA0038 */ swc1 $f10, 0x0038($sp) /* 007F4 80A333C4 C610003C */ lwc1 $f16, 0x003C($s0) ## 0000003C /* 007F8 80A333C8 46128100 */ add.s $f4, $f16, $f18 -/* 007FC 80A333CC 0C01DE1C */ jal Math_Sins +/* 007FC 80A333CC 0C01DE1C */ jal Math_SinS ## sins? /* 00800 80A333D0 E7A4003C */ swc1 $f4, 0x003C($sp) /* 00804 80A333D4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33444.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33444.s index cba9f54325..9ad25a5be5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33444.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33444.s @@ -53,7 +53,7 @@ glabel func_80A33444 /* 0092C 80A334FC 860502F8 */ lh $a1, 0x02F8($s0) ## 000002F8 /* 00930 80A33500 240B0100 */ addiu $t3, $zero, 0x0100 ## $t3 = 00000100 /* 00934 80A33504 AFAB0010 */ sw $t3, 0x0010($sp) -/* 00938 80A33508 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00938 80A33508 0C01E1A7 */ jal Math_SmoothStepToS /* 0093C 80A3350C 24070200 */ addiu $a3, $zero, 0x0200 ## $a3 = 00000200 /* 00940 80A33510 10000008 */ beq $zero, $zero, .L80A33534 @@ -63,7 +63,7 @@ glabel func_80A33444 /* 0094C 80A3351C 240C0180 */ addiu $t4, $zero, 0x0180 ## $t4 = 00000180 /* 00950 80A33520 AFAC0010 */ sw $t4, 0x0010($sp) /* 00954 80A33524 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00958 80A33528 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00958 80A33528 0C01E1A7 */ jal Math_SmoothStepToS /* 0095C 80A3352C 24070600 */ addiu $a3, $zero, 0x0600 ## $a3 = 00000600 /* 00960 80A33530 86030032 */ lh $v1, 0x0032($s0) ## 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3354C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3354C.s index 9066c6b594..d886d63424 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3354C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3354C.s @@ -29,7 +29,7 @@ glabel func_80A3354C /* 009E4 80A335B4 24070400 */ addiu $a3, $zero, 0x0400 ## $a3 = 00000400 /* 009E8 80A335B8 860502F6 */ lh $a1, 0x02F6($s0) ## 000002F6 /* 009EC 80A335BC 24080200 */ addiu $t0, $zero, 0x0200 ## $t0 = 00000200 -/* 009F0 80A335C0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 009F0 80A335C0 0C01E1A7 */ jal Math_SmoothStepToS /* 009F4 80A335C4 AFA80010 */ sw $t0, 0x0010($sp) /* 009F8 80A335C8 86090032 */ lh $t1, 0x0032($s0) ## 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A336C4.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A336C4.s index 479be053ff..de72c2eb72 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A336C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A336C4.s @@ -9,7 +9,7 @@ glabel func_80A336C4 /* 00B10 80A336E0 AFAF0010 */ sw $t7, 0x0010($sp) /* 00B14 80A336E4 24840032 */ addiu $a0, $a0, 0x0032 ## $a0 = 00000032 /* 00B18 80A336E8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00B1C 80A336EC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00B1C 80A336EC 0C01E1A7 */ jal Math_SmoothStepToS /* 00B20 80A336F0 24070400 */ addiu $a3, $zero, 0x0400 ## $a3 = 00000400 /* 00B24 80A336F4 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33704.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33704.s index bf17d1e652..e9bab1e72b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33704.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33704.s @@ -22,7 +22,7 @@ glabel func_80A33704 /* 00B80 80A33750 10200013 */ beq $at, $zero, .L80A337A0 /* 00B84 80A33754 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 00B88 80A33758 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 -/* 00B8C 80A3375C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00B8C 80A3375C 0C01E1A7 */ jal Math_SmoothStepToS /* 00B90 80A33760 AFB90010 */ sw $t9, 0x0010($sp) /* 00B94 80A33764 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 @@ -48,7 +48,7 @@ glabel func_80A33704 /* 00BE0 80A337B0 260402EA */ addiu $a0, $s0, 0x02EA ## $a0 = 000002EA /* 00BE4 80A337B4 2405E000 */ addiu $a1, $zero, 0xE000 ## $a1 = FFFFE000 /* 00BE8 80A337B8 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00BEC 80A337BC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00BEC 80A337BC 0C01E1A7 */ jal Math_SmoothStepToS /* 00BF0 80A337C0 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 00BF4 80A337C4 10000008 */ beq $zero, $zero, .L80A337E8 @@ -58,7 +58,7 @@ glabel func_80A33704 /* 00C00 80A337D0 AFAC0010 */ sw $t4, 0x0010($sp) /* 00C04 80A337D4 24052000 */ addiu $a1, $zero, 0x2000 ## $a1 = 00002000 /* 00C08 80A337D8 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00C0C 80A337DC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00C0C 80A337DC 0C01E1A7 */ jal Math_SmoothStepToS /* 00C10 80A337E0 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 00C14 80A337E4 8605008A */ lh $a1, 0x008A($s0) ## 0000008A @@ -67,7 +67,7 @@ glabel func_80A33704 /* 00C1C 80A337EC AFAD0010 */ sw $t5, 0x0010($sp) /* 00C20 80A337F0 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 00C24 80A337F4 2406000C */ addiu $a2, $zero, 0x000C ## $a2 = 0000000C -/* 00C28 80A337F8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00C28 80A337F8 0C01E1A7 */ jal Math_SmoothStepToS /* 00C2C 80A337FC 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 00C30 80A33800 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3381C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3381C.s index 728704fd5c..4ae461b01c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3381C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3381C.s @@ -43,7 +43,7 @@ glabel func_80A3381C .L80A338B8: /* 00CE8 80A338B8 AFA80010 */ sw $t0, 0x0010($sp) /* 00CEC 80A338BC 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00CF0 80A338C0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00CF0 80A338C0 0C01E1A7 */ jal Math_SmoothStepToS /* 00CF4 80A338C4 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 00CF8 80A338C8 24090064 */ addiu $t1, $zero, 0x0064 ## $t1 = 00000064 @@ -51,7 +51,7 @@ glabel func_80A3381C /* 00D00 80A338D0 260402EA */ addiu $a0, $s0, 0x02EA ## $a0 = 000002EA /* 00D04 80A338D4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00D08 80A338D8 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00D0C 80A338DC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00D0C 80A338DC 0C01E1A7 */ jal Math_SmoothStepToS /* 00D10 80A338E0 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 00D14 80A338E4 240A0064 */ addiu $t2, $zero, 0x0064 ## $t2 = 00000064 @@ -59,7 +59,7 @@ glabel func_80A3381C /* 00D1C 80A338EC 260402EE */ addiu $a0, $s0, 0x02EE ## $a0 = 000002EE /* 00D20 80A338F0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00D24 80A338F4 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00D28 80A338F8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00D28 80A338F8 0C01E1A7 */ jal Math_SmoothStepToS /* 00D2C 80A338FC 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 00D30 80A33900 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064 @@ -67,7 +67,7 @@ glabel func_80A3381C /* 00D38 80A33908 260402F0 */ addiu $a0, $s0, 0x02F0 ## $a0 = 000002F0 /* 00D3C 80A3390C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00D40 80A33910 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00D44 80A33914 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00D44 80A33914 0C01E1A7 */ jal Math_SmoothStepToS /* 00D48 80A33918 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 00D4C 80A3391C 8FBF002C */ lw $ra, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33C8C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33C8C.s index 60c8f2e88b..704468eb92 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33C8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33C8C.s @@ -20,7 +20,7 @@ glabel func_80A33C8C .L80A33CCC: /* 010FC 80A33CCC 54400007 */ bnel $v0, $zero, .L80A33CEC /* 01100 80A33CD0 A4C302E4 */ sh $v1, 0x02E4($a2) ## 000002E4 -/* 01104 80A33CD4 0C01DF64 */ jal Math_Rand_S16Offset +/* 01104 80A33CD4 0C01DF64 */ jal Rand_S16Offset /* 01108 80A33CD8 AFA60018 */ sw $a2, 0x0018($sp) /* 0110C 80A33CDC 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A347F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A347F4.s index cc970083b2..50af4ab9e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A347F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A347F4.s @@ -22,7 +22,7 @@ glabel func_80A347F4 /* 00220 80A34840 10200013 */ beq $at, $zero, .L80A34890 /* 00224 80A34844 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 00228 80A34848 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 -/* 0022C 80A3484C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0022C 80A3484C 0C01E1A7 */ jal Math_SmoothStepToS /* 00230 80A34850 AFB90010 */ sw $t9, 0x0010($sp) /* 00234 80A34854 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 @@ -48,7 +48,7 @@ glabel func_80A347F4 /* 00280 80A348A0 26040302 */ addiu $a0, $s0, 0x0302 ## $a0 = 00000302 /* 00284 80A348A4 2405E000 */ addiu $a1, $zero, 0xE000 ## $a1 = FFFFE000 /* 00288 80A348A8 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 0028C 80A348AC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0028C 80A348AC 0C01E1A7 */ jal Math_SmoothStepToS /* 00290 80A348B0 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 00294 80A348B4 10000008 */ beq $zero, $zero, .L80A348D8 @@ -58,7 +58,7 @@ glabel func_80A347F4 /* 002A0 80A348C0 AFAC0010 */ sw $t4, 0x0010($sp) /* 002A4 80A348C4 24052000 */ addiu $a1, $zero, 0x2000 ## $a1 = 00002000 /* 002A8 80A348C8 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 002AC 80A348CC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 002AC 80A348CC 0C01E1A7 */ jal Math_SmoothStepToS /* 002B0 80A348D0 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 002B4 80A348D4 8605008A */ lh $a1, 0x008A($s0) ## 0000008A @@ -67,7 +67,7 @@ glabel func_80A347F4 /* 002BC 80A348DC AFAD0010 */ sw $t5, 0x0010($sp) /* 002C0 80A348E0 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 002C4 80A348E4 2406000C */ addiu $a2, $zero, 0x000C ## $a2 = 0000000C -/* 002C8 80A348E8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 002C8 80A348E8 0C01E1A7 */ jal Math_SmoothStepToS /* 002CC 80A348EC 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 002D0 80A348F0 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A3490C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A3490C.s index 2b034cd13a..32a43d7572 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A3490C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A3490C.s @@ -43,7 +43,7 @@ glabel func_80A3490C .L80A349A8: /* 00388 80A349A8 AFA80010 */ sw $t0, 0x0010($sp) /* 0038C 80A349AC 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00390 80A349B0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00390 80A349B0 0C01E1A7 */ jal Math_SmoothStepToS /* 00394 80A349B4 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 00398 80A349B8 24090064 */ addiu $t1, $zero, 0x0064 ## $t1 = 00000064 @@ -51,7 +51,7 @@ glabel func_80A3490C /* 003A0 80A349C0 26040302 */ addiu $a0, $s0, 0x0302 ## $a0 = 00000302 /* 003A4 80A349C4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 003A8 80A349C8 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 003AC 80A349CC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 003AC 80A349CC 0C01E1A7 */ jal Math_SmoothStepToS /* 003B0 80A349D0 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 003B4 80A349D4 240A0064 */ addiu $t2, $zero, 0x0064 ## $t2 = 00000064 @@ -59,7 +59,7 @@ glabel func_80A3490C /* 003BC 80A349DC 26040306 */ addiu $a0, $s0, 0x0306 ## $a0 = 00000306 /* 003C0 80A349E0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 003C4 80A349E4 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 003C8 80A349E8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 003C8 80A349E8 0C01E1A7 */ jal Math_SmoothStepToS /* 003CC 80A349EC 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 003D0 80A349F0 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064 @@ -67,7 +67,7 @@ glabel func_80A3490C /* 003D8 80A349F8 26040308 */ addiu $a0, $s0, 0x0308 ## $a0 = 00000308 /* 003DC 80A349FC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 003E0 80A34A00 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 003E4 80A34A04 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 003E4 80A34A04 0C01E1A7 */ jal Math_SmoothStepToS /* 003E8 80A34A08 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 003EC 80A34A0C 8FBF002C */ lw $ra, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34CE4.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34CE4.s index 3f5732e8d8..16483912a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34CE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34CE4.s @@ -20,7 +20,7 @@ glabel func_80A34CE4 .L80A34D24: /* 00704 80A34D24 54400007 */ bnel $v0, $zero, .L80A34D44 /* 00708 80A34D28 A4C302FC */ sh $v1, 0x02FC($a2) ## 000002FC -/* 0070C 80A34D2C 0C01DF64 */ jal Math_Rand_S16Offset +/* 0070C 80A34D2C 0C01DF64 */ jal Rand_S16Offset /* 00710 80A34D30 AFA60018 */ sw $a2, 0x0018($sp) /* 00714 80A34D34 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F0E4.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F0E4.s index 50b8a2c2ed..70d4741192 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F0E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F0E4.s @@ -22,7 +22,7 @@ glabel func_80A3F0E4 /* 00BBC 80A3F12C 2B210003 */ slti $at, $t9, 0x0003 /* 00BC0 80A3F130 54200007 */ bnel $at, $zero, .L80A3F150 /* 00BC4 80A3F134 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00BC8 80A3F138 0C01DF64 */ jal Math_Rand_S16Offset +/* 00BC8 80A3F138 0C01DF64 */ jal Rand_S16Offset /* 00BCC 80A3F13C AFA60018 */ sw $a2, 0x0018($sp) /* 00BD0 80A3F140 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F274.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F274.s index 05a812f662..d9ae9304b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F274.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F274.s @@ -28,7 +28,7 @@ glabel func_80A3F274 /* 00D60 80A3F2D0 AFB90010 */ sw $t9, 0x0010($sp) /* 00D64 80A3F2D4 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A /* 00D68 80A3F2D8 2407003C */ addiu $a3, $zero, 0x003C ## $a3 = 0000003C -/* 00D6C 80A3F2DC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00D6C 80A3F2DC 0C01E1A7 */ jal Math_SmoothStepToS /* 00D70 80A3F2E0 A7B8002E */ sh $t8, 0x002E($sp) /* 00D74 80A3F2E4 87A8002E */ lh $t0, 0x002E($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F300.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F300.s index bf0385387f..60a73e33df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F300.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F300.s @@ -47,7 +47,7 @@ glabel func_80A3F300 /* 00E40 80A3F3B0 46083301 */ sub.s $f12, $f6, $f8 /* 00E44 80A3F3B4 46128381 */ sub.s $f14, $f16, $f18 /* 00E48 80A3F3B8 E7AC002C */ swc1 $f12, 0x002C($sp) -/* 00E4C 80A3F3BC 0C03F494 */ jal Math_atan2f +/* 00E4C 80A3F3BC 0C03F494 */ jal Math_FAtan2F /* 00E50 80A3F3C0 E7AE0028 */ swc1 $f14, 0x0028($sp) /* 00E54 80A3F3C4 3C0180A4 */ lui $at, %hi(D_80A420D8) ## $at = 80A40000 /* 00E58 80A3F3C8 C42420D8 */ lwc1 $f4, %lo(D_80A420D8)($at) @@ -61,7 +61,7 @@ glabel func_80A3F300 /* 00E78 80A3F3E8 44054000 */ mfc1 $a1, $f8 /* 00E7C 80A3F3EC 00000000 */ nop /* 00E80 80A3F3F0 00052C00 */ sll $a1, $a1, 16 -/* 00E84 80A3F3F4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00E84 80A3F3F4 0C01E1A7 */ jal Math_SmoothStepToS /* 00E88 80A3F3F8 00052C03 */ sra $a1, $a1, 16 /* 00E8C 80A3F3FC C7AC002C */ lwc1 $f12, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F594.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F594.s index 3f372e13f6..183ac07c97 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F594.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F594.s @@ -53,7 +53,7 @@ glabel func_80A3F594 /* 010F0 80A3F660 8C8E002C */ lw $t6, 0x002C($a0) ## 0000002C /* 010F4 80A3F664 AE8E0008 */ sw $t6, 0x0008($s4) ## FFFFFFFC /* 010F8 80A3F668 C4840080 */ lwc1 $f4, 0x0080($a0) ## 00000080 -/* 010FC 80A3F66C 0C03F66B */ jal Math_Rand_ZeroOne +/* 010FC 80A3F66C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01100 80A3F670 E7A40098 */ swc1 $f4, 0x0098($sp) /* 01104 80A3F674 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -88,19 +88,19 @@ glabel func_80A3F594 /* 01174 80A3F6E4 00000000 */ nop /* 01178 80A3F6E8 0006000D */ break 6 .L80A3F6EC: -/* 0117C 80A3F6EC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0117C 80A3F6EC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01180 80A3F6F0 00000000 */ nop /* 01184 80A3F6F4 46180481 */ sub.s $f18, $f0, $f24 /* 01188 80A3F6F8 46149102 */ mul.s $f4, $f18, $f20 -/* 0118C 80A3F6FC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0118C 80A3F6FC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01190 80A3F700 E7A4007C */ swc1 $f4, 0x007C($sp) /* 01194 80A3F704 46180181 */ sub.s $f6, $f0, $f24 /* 01198 80A3F708 00102400 */ sll $a0, $s0, 16 /* 0119C 80A3F70C 00042403 */ sra $a0, $a0, 16 /* 011A0 80A3F710 46143202 */ mul.s $f8, $f6, $f20 -/* 011A4 80A3F714 0C01DE1C */ jal Math_Sins +/* 011A4 80A3F714 0C01DE1C */ jal Math_SinS ## sins? /* 011A8 80A3F718 E7A80084 */ swc1 $f8, 0x0084($sp) /* 011AC 80A3F71C 46160282 */ mul.s $f10, $f0, $f22 @@ -108,7 +108,7 @@ glabel func_80A3F594 /* 011B4 80A3F724 00102400 */ sll $a0, $s0, 16 /* 011B8 80A3F728 00042403 */ sra $a0, $a0, 16 /* 011BC 80A3F72C 46105480 */ add.s $f18, $f10, $f16 -/* 011C0 80A3F730 0C01DE0D */ jal Math_Coss +/* 011C0 80A3F730 0C01DE0D */ jal Math_CosS ## coss? /* 011C4 80A3F734 E7B20094 */ swc1 $f18, 0x0094($sp) /* 011C8 80A3F738 46160102 */ mul.s $f4, $f0, $f22 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F7C0.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F7C0.s index 53132a67f3..b3bb93108d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F7C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F7C0.s @@ -65,7 +65,7 @@ glabel func_80A3F7C0 /* 01330 80A3F8A0 1460000B */ bne $v1, $zero, .L80A3F8D0 /* 01334 80A3F8A4 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C /* 01338 80A3F8A8 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 0133C 80A3F8AC 0C01DF64 */ jal Math_Rand_S16Offset +/* 0133C 80A3F8AC 0C01DF64 */ jal Rand_S16Offset /* 01340 80A3F8B0 AFA60018 */ sw $a2, 0x0018($sp) /* 01344 80A3F8B4 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40318.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40318.s index bf1821ab76..a760ea4c05 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40318.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40318.s @@ -33,7 +33,7 @@ glabel func_80A40318 /* 01E1C 80A4038C 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 /* 01E20 80A40390 E7A20010 */ swc1 $f2, 0x0010($sp) /* 01E24 80A40394 44055000 */ mfc1 $a1, $f10 -/* 01E28 80A40398 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01E28 80A40398 0C01E0C4 */ jal Math_SmoothStepToF /* 01E2C 80A4039C 00000000 */ nop /* 01E30 80A403A0 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40494.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40494.s index 66909432c2..825cc1b5a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40494.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40494.s @@ -27,7 +27,7 @@ glabel func_80A40494 /* 01F80 80A404F0 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 /* 01F84 80A404F4 E7A20010 */ swc1 $f2, 0x0010($sp) /* 01F88 80A404F8 44053000 */ mfc1 $a1, $f6 -/* 01F8C 80A404FC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01F8C 80A404FC 0C01E0C4 */ jal Math_SmoothStepToF /* 01F90 80A40500 00000000 */ nop /* 01F94 80A40504 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 @@ -69,7 +69,7 @@ glabel func_80A40494 /* 02020 80A40590 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E /* 02024 80A40594 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E /* 02028 80A40598 E6000168 */ swc1 $f0, 0x0168($s0) ## 00000168 -/* 0202C 80A4059C 0C01DF64 */ jal Math_Rand_S16Offset +/* 0202C 80A4059C 0C01DF64 */ jal Rand_S16Offset /* 02030 80A405A0 E6000164 */ swc1 $f0, 0x0164($s0) ## 00000164 /* 02034 80A405A4 3C0580A4 */ lui $a1, %hi(func_80A40218) ## $a1 = 80A40000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A405CC.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A405CC.s index 5657fe1c50..b07e31a477 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A405CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A405CC.s @@ -30,7 +30,7 @@ glabel func_80A405CC /* 020C0 80A40630 44066000 */ mfc1 $a2, $f12 /* 020C4 80A40634 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 /* 020C8 80A40638 E7A2002C */ swc1 $f2, 0x002C($sp) -/* 020CC 80A4063C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 020CC 80A4063C 0C01E0C4 */ jal Math_SmoothStepToF /* 020D0 80A40640 E7AC0010 */ swc1 $f12, 0x0010($sp) /* 020D4 80A40644 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 @@ -45,7 +45,7 @@ glabel func_80A405CC /* 020F8 80A40668 8FBF0024 */ lw $ra, 0x0024($sp) /* 020FC 80A4066C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 02100 80A40670 E6020164 */ swc1 $f2, 0x0164($s0) ## 00000164 -/* 02104 80A40674 0C01DF64 */ jal Math_Rand_S16Offset +/* 02104 80A40674 0C01DF64 */ jal Rand_S16Offset /* 02108 80A40678 E6080168 */ swc1 $f8, 0x0168($s0) ## 00000168 /* 0210C 80A4067C 8618001C */ lh $t8, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A408D8.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A408D8.s index 30c31a541f..aa5a9560fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A408D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A408D8.s @@ -33,7 +33,7 @@ glabel func_80A408D8 /* 023DC 80A4094C 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 /* 023E0 80A40950 E7A20010 */ swc1 $f2, 0x0010($sp) /* 023E4 80A40954 44055000 */ mfc1 $a1, $f10 -/* 023E8 80A40958 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 023E8 80A40958 0C01E0C4 */ jal Math_SmoothStepToF /* 023EC 80A4095C 00000000 */ nop /* 023F0 80A40960 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40A54.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40A54.s index 3063324796..1ea1068f2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40A54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40A54.s @@ -19,7 +19,7 @@ glabel func_80A40A54 /* 02524 80A40A94 44049000 */ mfc1 $a0, $f18 /* 02528 80A40A98 00000000 */ nop /* 0252C 80A40A9C 00042400 */ sll $a0, $a0, 16 -/* 02530 80A40AA0 0C01DE1C */ jal Math_Sins +/* 02530 80A40AA0 0C01DE1C */ jal Math_SinS ## sins? /* 02534 80A40AA4 00042403 */ sra $a0, $a0, 16 /* 02538 80A40AA8 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A411C8.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A411C8.s index cc8cfe4746..b16222030c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A411C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A411C8.s @@ -99,7 +99,7 @@ glabel func_80A411C8 /* 02DD0 80A41340 0010C840 */ sll $t9, $s0, 1 /* 02DD4 80A41344 03191821 */ addu $v1, $t8, $t9 /* 02DD8 80A41348 84640220 */ lh $a0, 0x0220($v1) ## 00000220 -/* 02DDC 80A4134C 0C01DE1C */ jal Math_Sins +/* 02DDC 80A4134C 0C01DE1C */ jal Math_SinS ## sins? /* 02DE0 80A41350 AFA30024 */ sw $v1, 0x0024($sp) /* 02DE4 80A41354 8FA20048 */ lw $v0, 0x0048($sp) @@ -116,7 +116,7 @@ glabel func_80A411C8 /* 02E10 80A41380 440A3000 */ mfc1 $t2, $f6 /* 02E14 80A41384 00000000 */ nop /* 02E18 80A41388 A44A0002 */ sh $t2, 0x0002($v0) ## 00000002 -/* 02E1C 80A4138C 0C01DE0D */ jal Math_Coss +/* 02E1C 80A4138C 0C01DE0D */ jal Math_CosS ## coss? /* 02E20 80A41390 84640244 */ lh $a0, 0x0244($v1) ## 00000244 /* 02E24 80A41394 8FA20048 */ lw $v0, 0x0048($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A416A8.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A416A8.s index 902030ab59..9eabe5b3a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A416A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A416A8.s @@ -22,12 +22,12 @@ glabel func_80A416A8 /* 03184 80A416F4 A2180001 */ sb $t8, 0x0001($s0) ## 00000269 /* 03188 80A416F8 A2000000 */ sb $zero, 0x0000($s0) ## 00000268 .L80A416FC: -/* 0318C 80A416FC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0318C 80A416FC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 03190 80A41700 00000000 */ nop /* 03194 80A41704 46140102 */ mul.s $f4, $f0, $f20 /* 03198 80A41708 46162181 */ sub.s $f6, $f4, $f22 -/* 0319C 80A4170C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0319C 80A4170C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 031A0 80A41710 E606002C */ swc1 $f6, 0x002C($s0) ## 00000294 /* 031A4 80A41714 C60C0020 */ lwc1 $f12, 0x0020($s0) ## 00000288 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42DD4.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42DD4.s index 339701efc1..6a073cf7d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42DD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42DD4.s @@ -30,12 +30,12 @@ glabel func_80A42DD4 /* 000F0 80A42E20 A2180001 */ sb $t8, 0x0001($s0) ## 00000271 /* 000F4 80A42E24 A2000000 */ sb $zero, 0x0000($s0) ## 00000270 .L80A42E28: -/* 000F8 80A42E28 0C03F66B */ jal Math_Rand_ZeroOne +/* 000F8 80A42E28 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 000FC 80A42E2C 00000000 */ nop /* 00100 80A42E30 46140102 */ mul.s $f4, $f0, $f20 /* 00104 80A42E34 46162181 */ sub.s $f6, $f4, $f22 -/* 00108 80A42E38 0C03F66B */ jal Math_Rand_ZeroOne +/* 00108 80A42E38 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0010C 80A42E3C E606002C */ swc1 $f6, 0x002C($s0) ## 0000029C /* 00110 80A42E40 C60C0020 */ lwc1 $f12, 0x0020($s0) ## 00000290 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4320C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4320C.s index 6afd6b4879..f97a466e56 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4320C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4320C.s @@ -52,7 +52,7 @@ glabel func_80A4320C /* 005A4 80A432D4 8C8E002C */ lw $t6, 0x002C($a0) ## 0000002C /* 005A8 80A432D8 AE8E0008 */ sw $t6, 0x0008($s4) ## FFFFFFFC /* 005AC 80A432DC C4840080 */ lwc1 $f4, 0x0080($a0) ## 00000080 -/* 005B0 80A432E0 0C03F66B */ jal Math_Rand_ZeroOne +/* 005B0 80A432E0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 005B4 80A432E4 E7A40098 */ swc1 $f4, 0x0098($sp) /* 005B8 80A432E8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -87,7 +87,7 @@ glabel func_80A4320C /* 00628 80A43358 00000000 */ nop /* 0062C 80A4335C 0006000D */ break 6 .L80A43360: -/* 00630 80A43360 0C03F66B */ jal Math_Rand_ZeroOne +/* 00630 80A43360 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00634 80A43364 00000000 */ nop /* 00638 80A43368 46160182 */ mul.s $f6, $f0, $f22 @@ -95,7 +95,7 @@ glabel func_80A4320C /* 00640 80A43370 00102400 */ sll $a0, $s0, 16 /* 00644 80A43374 00042403 */ sra $a0, $a0, 16 /* 00648 80A43378 46062200 */ add.s $f8, $f4, $f6 -/* 0064C 80A4337C 0C01DE1C */ jal Math_Sins +/* 0064C 80A4337C 0C01DE1C */ jal Math_SinS ## sins? /* 00650 80A43380 E7A80080 */ swc1 $f8, 0x0080($sp) /* 00654 80A43384 46140282 */ mul.s $f10, $f0, $f20 @@ -103,7 +103,7 @@ glabel func_80A4320C /* 0065C 80A4338C 00102400 */ sll $a0, $s0, 16 /* 00660 80A43390 00042403 */ sra $a0, $a0, 16 /* 00664 80A43394 46105480 */ add.s $f18, $f10, $f16 -/* 00668 80A43398 0C01DE0D */ jal Math_Coss +/* 00668 80A43398 0C01DE0D */ jal Math_CosS ## coss? /* 0066C 80A4339C E7B20094 */ swc1 $f18, 0x0094($sp) /* 00670 80A433A0 46140102 */ mul.s $f4, $f0, $f20 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44940.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44940.s index 576bd25b11..7203eb892d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44940.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44940.s @@ -31,7 +31,7 @@ glabel func_80A44940 /* 01C84 80A449B4 468021A0 */ cvt.s.w $f6, $f4 /* 01C88 80A449B8 E7A60024 */ swc1 $f6, 0x0024($sp) /* 01C8C 80A449BC 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 01C90 80A449C0 0C01DE1C */ jal Math_Sins +/* 01C90 80A449C0 0C01DE1C */ jal Math_SinS ## sins? /* 01C94 80A449C4 AFA70030 */ sw $a3, 0x0030($sp) /* 01C98 80A449C8 C7A80024 */ lwc1 $f8, 0x0024($sp) @@ -43,7 +43,7 @@ glabel func_80A44940 /* 01CB0 80A449E0 00000000 */ nop /* 01CB4 80A449E4 01C84821 */ addu $t1, $t6, $t0 /* 01CB8 80A449E8 A7A90028 */ sh $t1, 0x0028($sp) -/* 01CBC 80A449EC 0C01DE0D */ jal Math_Coss +/* 01CBC 80A449EC 0C01DE0D */ jal Math_CosS ## coss? /* 01CC0 80A449F0 84E400B6 */ lh $a0, 0x00B6($a3) ## 000000B6 /* 01CC4 80A449F4 C7B20024 */ lwc1 $f18, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44CE4.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44CE4.s index 8907249c44..e8765d4093 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44CE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44CE4.s @@ -14,7 +14,7 @@ glabel func_80A44CE4 /* 01FE4 80A44D14 87A5002E */ lh $a1, 0x002E($sp) /* 01FE8 80A44D18 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 /* 01FEC 80A44D1C 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 01FF0 80A44D20 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01FF0 80A44D20 0C01E1A7 */ jal Math_SmoothStepToS /* 01FF4 80A44D24 E7A00028 */ swc1 $f0, 0x0028($sp) /* 01FF8 80A44D28 C7A20028 */ lwc1 $f2, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44EF0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44EF0.s index a1d333e299..42202d2065 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44EF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44EF0.s @@ -88,7 +88,7 @@ glabel func_80A44EF0 /* 022E8 80A45018 87AB001E */ lh $t3, 0x001E($sp) /* 022EC 80A4501C 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C /* 022F0 80A45020 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 022F4 80A45024 0C01DF64 */ jal Math_Rand_S16Offset +/* 022F4 80A45024 0C01DF64 */ jal Rand_S16Offset /* 022F8 80A45028 AFA60018 */ sw $a2, 0x0018($sp) /* 022FC 80A4502C 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45360.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45360.s index d8165830d5..f02910dbd9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45360.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45360.s @@ -27,7 +27,7 @@ glabel func_80A45360 .L80A453BC: /* 0268C 80A453BC 8FA4001C */ lw $a0, 0x001C($sp) /* 02690 80A453C0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3ECCCCCD -/* 02694 80A453C4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02694 80A453C4 0C01E107 */ jal Math_ApproachF /* 02698 80A453C8 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 0269C 80A453CC 8FB9001C */ lw $t9, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4592C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4592C.s index 9c7d046c33..b81df19652 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4592C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4592C.s @@ -48,7 +48,7 @@ glabel func_80A4592C /* 02C9C 80A459CC 29210004 */ slti $at, $t1, 0x0004 /* 02CA0 80A459D0 14200007 */ bne $at, $zero, .L80A459F0 /* 02CA4 80A459D4 A0C80214 */ sb $t0, 0x0214($a2) ## 00000214 -/* 02CA8 80A459D8 0C01DF64 */ jal Math_Rand_S16Offset +/* 02CA8 80A459D8 0C01DF64 */ jal Rand_S16Offset /* 02CAC 80A459DC AFA60018 */ sw $a2, 0x0018($sp) /* 02CB0 80A459E0 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s index c07950a160..c8054edd1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s @@ -26,7 +26,7 @@ glabel func_80A462D8 /* 03604 80A46334 24430E38 */ addiu $v1, $v0, 0x0E38 ## $v1 = 00000E38 /* 03608 80A46338 00032400 */ sll $a0, $v1, 16 /* 0360C 80A4633C A7A30026 */ sh $v1, 0x0026($sp) -/* 03610 80A46340 0C01DE1C */ jal Math_Sins +/* 03610 80A46340 0C01DE1C */ jal Math_SinS ## sins? /* 03614 80A46344 00042403 */ sra $a0, $a0, 16 /* 03618 80A46348 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -35,7 +35,7 @@ glabel func_80A462D8 /* 03624 80A46354 46040182 */ mul.s $f6, $f0, $f4 /* 03628 80A46358 46083280 */ add.s $f10, $f6, $f8 /* 0362C 80A4635C E60A04A0 */ swc1 $f10, 0x04A0($s0) ## 000004A0 -/* 03630 80A46360 0C01DE0D */ jal Math_Coss +/* 03630 80A46360 0C01DE0D */ jal Math_CosS ## coss? /* 03634 80A46364 87A40026 */ lh $a0, 0x0026($sp) /* 03638 80A46368 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46418.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46418.s index 6021c176b4..1a77a41e46 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46418.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46418.s @@ -33,7 +33,7 @@ glabel func_80A46418 .L80A46490: /* 03760 80A46490 5460000B */ bnel $v1, $zero, .L80A464C0 /* 03764 80A46494 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03768 80A46498 0C01DF64 */ jal Math_Rand_S16Offset +/* 03768 80A46498 0C01DF64 */ jal Rand_S16Offset /* 0376C 80A4649C AFA70018 */ sw $a3, 0x0018($sp) /* 03770 80A464A0 8FA70018 */ lw $a3, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46CD8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46CD8.s index 470e68104b..3114a985a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46CD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46CD8.s @@ -14,7 +14,7 @@ glabel func_80A46CD8 /* 03FD8 80A46D08 44045000 */ mfc1 $a0, $f10 /* 03FDC 80A46D0C 00000000 */ nop /* 03FE0 80A46D10 00042400 */ sll $a0, $a0, 16 -/* 03FE4 80A46D14 0C01DE1C */ jal Math_Sins +/* 03FE4 80A46D14 0C01DE1C */ jal Math_SinS ## sins? /* 03FE8 80A46D18 00042403 */ sra $a0, $a0, 16 /* 03FEC 80A46D1C 8FA40018 */ lw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46E54.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46E54.s index 9ba4bbe180..66686e6cb3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46E54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46E54.s @@ -67,7 +67,7 @@ glabel func_80A46E54 /* 04218 80A46F48 3C073F19 */ lui $a3, 0x3F19 ## $a3 = 3F190000 /* 0421C 80A46F4C 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3F19999A /* 04220 80A46F50 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3ECCCCCD -/* 04224 80A46F54 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04224 80A46F54 0C01E107 */ jal Math_ApproachF /* 04228 80A46F58 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0422C 80A46F5C 8A080030 */ lwl $t0, 0x0030($s0) ## 00000030 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47024.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47024.s index 792f94e149..eaaea752c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47024.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47024.s @@ -11,7 +11,7 @@ glabel func_80A47024 /* 04318 80A47048 3C073F4C */ lui $a3, 0x3F4C ## $a3 = 3F4C0000 /* 0431C 80A4704C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3F4CCCCD /* 04320 80A47050 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3F19999A -/* 04324 80A47054 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04324 80A47054 0C01E107 */ jal Math_ApproachF /* 04328 80A47058 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0432C 80A4705C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47578.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47578.s index 937eb232ca..6c60c6a30d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47578.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47578.s @@ -91,7 +91,7 @@ glabel L80A475D4 /* 04984 80A476B4 A46F0032 */ sh $t7, 0x0032($v1) ## 00000032 /* 04988 80A476B8 86180032 */ lh $t8, 0x0032($s0) ## 00000032 /* 0498C 80A476BC A47800B6 */ sh $t8, 0x00B6($v1) ## 000000B6 -/* 04990 80A476C0 0C01DE1C */ jal Math_Sins +/* 04990 80A476C0 0C01DE1C */ jal Math_SinS ## sins? /* 04994 80A476C4 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 04998 80A476C8 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 @@ -101,7 +101,7 @@ glabel L80A475D4 /* 049A8 80A476D8 460A0402 */ mul.s $f16, $f0, $f10 /* 049AC 80A476DC 46128100 */ add.s $f4, $f16, $f18 /* 049B0 80A476E0 E7240024 */ swc1 $f4, 0x0024($t9) ## 00000024 -/* 049B4 80A476E4 0C01DE0D */ jal Math_Coss +/* 049B4 80A476E4 0C01DE0D */ jal Math_CosS ## coss? /* 049B8 80A476E8 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 049BC 80A476EC 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47C20.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47C20.s index 994df7625f..533eb463ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47C20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47C20.s @@ -113,7 +113,7 @@ glabel func_80A47C20 /* 05068 80A47D98 0010C840 */ sll $t9, $s0, 1 /* 0506C 80A47D9C 03191821 */ addu $v1, $t8, $t9 /* 05070 80A47DA0 84640226 */ lh $a0, 0x0226($v1) ## 00000226 -/* 05074 80A47DA4 0C01DE1C */ jal Math_Sins +/* 05074 80A47DA4 0C01DE1C */ jal Math_SinS ## sins? /* 05078 80A47DA8 AFA30024 */ sw $v1, 0x0024($sp) /* 0507C 80A47DAC 8FA20048 */ lw $v0, 0x0048($sp) @@ -130,7 +130,7 @@ glabel func_80A47C20 /* 050A8 80A47DD8 440A3000 */ mfc1 $t2, $f6 /* 050AC 80A47DDC 00000000 */ nop /* 050B0 80A47DE0 A44A0002 */ sh $t2, 0x0002($v0) ## 00000002 -/* 050B4 80A47DE4 0C01DE0D */ jal Math_Coss +/* 050B4 80A47DE4 0C01DE0D */ jal Math_CosS ## coss? /* 050B8 80A47DE8 8464024A */ lh $a0, 0x024A($v1) ## 0000024A /* 050BC 80A47DEC 8FA20048 */ lw $v0, 0x0048($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s index c704d1642c..4467907384 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s @@ -33,7 +33,7 @@ glabel EnGoma_Init /* 00004 80A48EC4 AFBF002C */ sw $ra, 0x002C($sp) /* 00008 80A48EC8 AFB00028 */ sw $s0, 0x0028($sp) /* 0000C 80A48ECC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00010 80A48ED0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00010 80A48ED0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00014 80A48ED4 AFA50044 */ sw $a1, 0x0044($sp) /* 00018 80A48ED8 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -99,7 +99,7 @@ glabel EnGoma_Init /* 000F4 80A48FB4 A60E02CC */ sh $t6, 0x02CC($s0) ## 000002CC /* 000F8 80A48FB8 A60F02B8 */ sh $t7, 0x02B8($s0) ## 000002B8 /* 000FC 80A48FBC E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -/* 00100 80A48FC0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00100 80A48FC0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00104 80A48FC4 E61002D0 */ swc1 $f16, 0x02D0($s0) ## 000002D0 /* 00108 80A48FC8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -109,7 +109,7 @@ glabel EnGoma_Init /* 00118 80A48FD8 46020482 */ mul.s $f18, $f0, $f2 /* 0011C 80A48FDC AE1802B0 */ sw $t8, 0x02B0($s0) ## 000002B0 /* 00120 80A48FE0 46029100 */ add.s $f4, $f18, $f2 -/* 00124 80A48FE4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00124 80A48FE4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00128 80A48FE8 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 /* 0012C 80A48FEC 3C0180A5 */ lui $at, %hi(D_80A4B8F4) ## $at = 80A50000 @@ -120,7 +120,7 @@ glabel EnGoma_Init /* 00140 80A49000 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E /* 00144 80A49004 A61902CC */ sh $t9, 0x02CC($s0) ## 000002CC /* 00148 80A49008 460A4400 */ add.s $f16, $f8, $f10 -/* 0014C 80A4900C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0014C 80A4900C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00150 80A49010 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 /* 00154 80A49014 3C0180A5 */ lui $at, %hi(D_80A4B8F8) ## $at = 80A50000 @@ -129,7 +129,7 @@ glabel EnGoma_Init /* 00160 80A49020 C426B8FC */ lwc1 $f6, %lo(D_80A4B8FC)($at) /* 00164 80A49024 46120102 */ mul.s $f4, $f0, $f18 /* 00168 80A49028 46062200 */ add.s $f8, $f4, $f6 -/* 0016C 80A4902C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0016C 80A4902C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00170 80A49030 E6080050 */ swc1 $f8, 0x0050($s0) ## 00000050 /* 00174 80A49034 3C0180A5 */ lui $at, %hi(D_80A4B900) ## $at = 80A50000 @@ -138,7 +138,7 @@ glabel EnGoma_Init /* 00180 80A49040 C432B904 */ lwc1 $f18, %lo(D_80A4B904)($at) /* 00184 80A49044 460A0402 */ mul.s $f16, $f0, $f10 /* 00188 80A49048 46128100 */ add.s $f4, $f16, $f18 -/* 0018C 80A4904C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0018C 80A4904C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00190 80A49050 E6040054 */ swc1 $f4, 0x0054($s0) ## 00000054 /* 00194 80A49054 3C0180A5 */ lui $at, %hi(D_80A4B908) ## $at = 80A50000 @@ -244,7 +244,7 @@ glabel EnGoma_Init /* 002F8 80A491B8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 002FC 80A491BC 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 /* 00300 80A491C0 A60902B8 */ sh $t1, 0x02B8($s0) ## 000002B8 -/* 00304 80A491C4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00304 80A491C4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00308 80A491C8 E60802D0 */ swc1 $f8, 0x02D0($s0) ## 000002D0 /* 0030C 80A491CC 3C01447A */ lui $at, 0x447A ## $at = 447A0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Update.s index e1120ec397..57b4497fe9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Update.s @@ -46,12 +46,12 @@ glabel EnGoma_Update /* 01C2C 80A4AAEC 46105480 */ add.s $f18, $f10, $f16 /* 01C30 80A4AAF0 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 /* 01C34 80A4AAF4 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 01C38 80A4AAF8 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01C38 80A4AAF8 0C01E123 */ jal Math_ApproachZeroF /* 01C3C 80A4AAFC E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C /* 01C40 80A4AB00 26040304 */ addiu $a0, $s0, 0x0304 ## $a0 = 00000304 /* 01C44 80A4AB04 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 01C48 80A4AB08 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01C48 80A4AB08 0C01E123 */ jal Math_ApproachZeroF /* 01C4C 80A4AB0C 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 01C50 80A4AB10 8608001C */ lh $t0, 0x001C($s0) ## 0000001C @@ -68,7 +68,7 @@ glabel EnGoma_Update /* 01C7C 80A4AB3C C424B940 */ lwc1 $f4, %lo(D_80A4B940)($at) /* 01C80 80A4AB40 34E79BA6 */ ori $a3, $a3, 0x9BA6 ## $a3 = 3A449BA6 /* 01C84 80A4AB44 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 01C88 80A4AB48 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01C88 80A4AB48 0C01E0C4 */ jal Math_SmoothStepToF /* 01C8C 80A4AB4C E7A40010 */ swc1 $f4, 0x0010($sp) /* 01C90 80A4AB50 3C0180A5 */ lui $at, %hi(D_80A4B944) ## $at = 80A50000 @@ -79,7 +79,7 @@ glabel EnGoma_Update /* 01CA4 80A4AB64 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 01CA8 80A4AB68 26040054 */ addiu $a0, $s0, 0x0054 ## $a0 = 00000054 /* 01CAC 80A4AB6C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 01CB0 80A4AB70 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01CB0 80A4AB70 0C01E0C4 */ jal Math_SmoothStepToF /* 01CB4 80A4AB74 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01CB8 80A4AB78 3C0180A5 */ lui $at, %hi(D_80A4B948) ## $at = 80A50000 @@ -90,7 +90,7 @@ glabel EnGoma_Update /* 01CCC 80A4AB8C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 01CD0 80A4AB90 26040058 */ addiu $a0, $s0, 0x0058 ## $a0 = 00000058 /* 01CD4 80A4AB94 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 01CD8 80A4AB98 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01CD8 80A4AB98 0C01E0C4 */ jal Math_SmoothStepToF /* 01CDC 80A4AB9C E7A80010 */ swc1 $f8, 0x0010($sp) /* 01CE0 80A4ABA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49338.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49338.s index 3990bd418e..6527cd5900 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49338.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49338.s @@ -11,7 +11,7 @@ glabel func_80A49338 /* 00498 80A49358 34A55555 */ ori $a1, $a1, 0x5555 ## $a1 = 40D55555 /* 0049C 80A4935C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 004A0 80A49360 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 004A4 80A49364 0C01E107 */ jal Math_SmoothScaleMaxF +/* 004A4 80A49364 0C01E107 */ jal Math_ApproachF /* 004A8 80A49368 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 004AC 80A4936C 8FAE0024 */ lw $t6, 0x0024($sp) @@ -24,13 +24,13 @@ glabel func_80A49338 /* 004C8 80A49388 00052C03 */ sra $a1, $a1, 16 /* 004CC 80A4938C 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 004D0 80A49390 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 004D4 80A49394 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 004D4 80A49394 0C01E1EF */ jal Math_ApproachS /* 004D8 80A49398 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 004DC 80A4939C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 004E0 80A493A0 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 004E4 80A493A4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 004E8 80A493A8 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 004E8 80A493A8 0C01E1EF */ jal Math_ApproachS /* 004EC 80A493AC 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 004F0 80A493B0 860F02CC */ lh $t7, 0x02CC($s0) ## 000002CC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A493D8.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A493D8.s index 23ccf03f51..ada3bc9c90 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A493D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A493D8.s @@ -32,7 +32,7 @@ glabel func_80A493D8 /* 00568 80A49428 248402EC */ addiu $a0, $a0, 0x02EC ## $a0 = 000002EC /* 0056C 80A4942C 46120100 */ add.s $f4, $f0, $f18 /* 00570 80A49430 46048180 */ add.s $f6, $f16, $f4 -/* 00574 80A49434 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 00574 80A49434 0C01E123 */ jal Math_ApproachZeroF /* 00578 80A49438 E486FFEC */ swc1 $f6, -0x0014($a0) ## 000002D8 /* 0057C 80A4943C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -41,7 +41,7 @@ glabel func_80A493D8 /* 00588 80A49448 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = 44BB8000 /* 0058C 80A4944C 44060000 */ mfc1 $a2, $f0 /* 00590 80A49450 260402F0 */ addiu $a0, $s0, 0x02F0 ## $a0 = 000002F0 -/* 00594 80A49454 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00594 80A49454 0C01E107 */ jal Math_ApproachF /* 00598 80A49458 3C074316 */ lui $a3, 0x4316 ## $a3 = 43160000 /* 0059C 80A4945C 860202BE */ lh $v0, 0x02BE($s0) ## 000002BE @@ -101,7 +101,7 @@ glabel func_80A493D8 /* 0065C 80A4951C A61802BE */ sh $t8, 0x02BE($s0) ## 000002BE /* 00660 80A49520 A61902CC */ sh $t9, 0x02CC($s0) ## 000002CC /* 00664 80A49524 3C053FC0 */ lui $a1, 0x3FC0 ## $a1 = 3FC00000 -/* 00668 80A49528 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00668 80A49528 0C01E107 */ jal Math_ApproachF /* 0066C 80A4952C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 00670 80A49530 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 @@ -119,7 +119,7 @@ glabel func_80A493D8 /* 0069C 80A4955C A60A02CC */ sh $t2, 0x02CC($s0) ## 000002CC /* 006A0 80A49560 260402D0 */ addiu $a0, $s0, 0x02D0 ## $a0 = 000002D0 /* 006A4 80A49564 3C053F40 */ lui $a1, 0x3F40 ## $a1 = 3F400000 -/* 006A8 80A49568 0C01E107 */ jal Math_SmoothScaleMaxF +/* 006A8 80A49568 0C01E107 */ jal Math_ApproachF /* 006AC 80A4956C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 006B0 80A49570 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -131,7 +131,7 @@ glabel func_80A493D8 /* 006C8 80A49588 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 .L80A4958C: /* 006CC 80A4958C 44070000 */ mfc1 $a3, $f0 -/* 006D0 80A49590 0C01E107 */ jal Math_SmoothScaleMaxF +/* 006D0 80A49590 0C01E107 */ jal Math_ApproachF /* 006D4 80A49594 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 .L80A49598: @@ -150,7 +150,7 @@ glabel func_80A493D8 /* 00704 80A495C4 A60D02CC */ sh $t5, 0x02CC($s0) ## 000002CC .L80A495C8: /* 00708 80A495C8 44070000 */ mfc1 $a3, $f0 -/* 0070C 80A495CC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0070C 80A495CC 0C01E107 */ jal Math_ApproachF /* 00710 80A495D0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 .L80A495D4: @@ -161,7 +161,7 @@ glabel func_80A493D8 /* 00720 80A495E0 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00724 80A495E4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 00728 80A495E8 44050000 */ mfc1 $a1, $f0 -/* 0072C 80A495EC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0072C 80A495EC 0C01E107 */ jal Math_ApproachF /* 00730 80A495F0 00C03821 */ addu $a3, $a2, $zero /* 00734 80A495F4 860E02CC */ lh $t6, 0x02CC($s0) ## 000002CC @@ -179,7 +179,7 @@ glabel func_80A493D8 /* 0075C 80A4961C 3C053E4C */ lui $a1, 0x3E4C ## $a1 = 3E4C0000 /* 00760 80A49620 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 00764 80A49624 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 00768 80A49628 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 00768 80A49628 0C01E123 */ jal Math_ApproachZeroF /* 0076C 80A4962C 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3E4CCCCD .L80A49630: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49668.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49668.s index 9688a75525..ede2c7dc8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49668.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49668.s @@ -25,7 +25,7 @@ glabel func_80A49668 /* 00804 80A496C4 E48602D8 */ swc1 $f6, 0x02D8($a0) ## 000002D8 /* 00808 80A496C8 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A /* 0080C 80A496CC 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD -/* 00810 80A496D0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00810 80A496D0 0C01E107 */ jal Math_ApproachF /* 00814 80A496D4 248402EC */ addiu $a0, $a0, 0x02EC ## $a0 = 000002EC /* 00818 80A496D8 C6280024 */ lwc1 $f8, 0x0024($s1) ## 00000024 @@ -64,7 +64,7 @@ glabel func_80A49668 /* 00894 80A49754 3109000F */ andi $t1, $t0, 0x000F ## $t1 = 00000000 /* 00898 80A49758 55200046 */ bnel $t1, $zero, .L80A49874 /* 0089C 80A4975C 8FBF0064 */ lw $ra, 0x0064($sp) -/* 008A0 80A49760 0C03F66B */ jal Math_Rand_ZeroOne +/* 008A0 80A49760 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 008A4 80A49764 00000000 */ nop /* 008A8 80A49768 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -97,24 +97,24 @@ glabel func_80A49668 /* 00910 80A497D0 AE4A0004 */ sw $t2, 0x0004($s2) ## FFFFFFF0 /* 00914 80A497D4 AE4B0008 */ sw $t3, 0x0008($s2) ## FFFFFFF4 /* 00918 80A497D8 AE6D0008 */ sw $t5, 0x0008($s3) ## FFFFFFE8 -/* 0091C 80A497DC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0091C 80A497DC 0C00CFC8 */ jal Rand_CenteredFloat /* 00920 80A497E0 AE6C0004 */ sw $t4, 0x0004($s3) ## FFFFFFE4 /* 00924 80A497E4 C6260024 */ lwc1 $f6, 0x0024($s1) ## 00000024 /* 00928 80A497E8 4600A306 */ mov.s $f12, $f20 /* 0092C 80A497EC 46060200 */ add.s $f8, $f0, $f6 -/* 00930 80A497F0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00930 80A497F0 0C00CFBE */ jal Rand_ZeroFloat /* 00934 80A497F4 E7A8006C */ swc1 $f8, 0x006C($sp) /* 00938 80A497F8 C62A0028 */ lwc1 $f10, 0x0028($s1) ## 00000028 /* 0093C 80A497FC 4600A306 */ mov.s $f12, $f20 /* 00940 80A49800 460A0400 */ add.s $f16, $f0, $f10 -/* 00944 80A49804 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00944 80A49804 0C00CFC8 */ jal Rand_CenteredFloat /* 00948 80A49808 E7B00070 */ swc1 $f16, 0x0070($sp) /* 0094C 80A4980C C632002C */ lwc1 $f18, 0x002C($s1) ## 0000002C /* 00950 80A49810 46120100 */ add.s $f4, $f0, $f18 -/* 00954 80A49814 0C03F66B */ jal Math_Rand_ZeroOne +/* 00954 80A49814 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00958 80A49818 E7A40074 */ swc1 $f4, 0x0074($sp) /* 0095C 80A4981C 46160182 */ mul.s $f6, $f0, $f22 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49AA8.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49AA8.s index 61cf17eb90..eca9ce234a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49AA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49AA8.s @@ -15,7 +15,7 @@ glabel func_80A49AA8 /* 00C18 80A49AD8 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 /* 00C1C 80A49ADC 51E00005 */ beql $t7, $zero, .L80A49AF4 /* 00C20 80A49AE0 84F802CC */ lh $t8, 0x02CC($a3) ## 000002CC -/* 00C24 80A49AE4 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 00C24 80A49AE4 0C01E123 */ jal Math_ApproachZeroF /* 00C28 80A49AE8 AFA70018 */ sw $a3, 0x0018($sp) /* 00C2C 80A49AEC 8FA70018 */ lw $a3, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49BF0.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49BF0.s index 3e809b5a9d..70d31147a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49BF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49BF0.s @@ -13,7 +13,7 @@ glabel func_80A49BF0 /* 00D58 80A49C18 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 /* 00D5C 80A49C1C 51E00004 */ beql $t7, $zero, .L80A49C30 /* 00D60 80A49C20 860202CC */ lh $v0, 0x02CC($s0) ## 000002CC -/* 00D64 80A49C24 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 00D64 80A49C24 0C01E123 */ jal Math_ApproachZeroF /* 00D68 80A49C28 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 00D6C 80A49C2C 860202CC */ lh $v0, 0x02CC($s0) ## 000002CC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49D0C.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49D0C.s index 9bdc4178be..c3676561d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49D0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49D0C.s @@ -20,7 +20,7 @@ glabel func_80A49D0C /* 00E64 80A49D24 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00E68 80A49D28 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 00E6C 80A49D2C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00E70 80A49D30 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 00E70 80A49D30 0C01E123 */ jal Math_ApproachZeroF /* 00E74 80A49D34 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 00E78 80A49D38 860202CC */ lh $v0, 0x02CC($s0) ## 000002CC @@ -67,7 +67,7 @@ glabel func_80A49D0C /* 00F18 80A49DD8 34E774BC */ ori $a3, $a3, 0x74BC ## $a3 = 3B1374BC /* 00F1C 80A49DDC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00F20 80A49DE0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 00F24 80A49DE4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00F24 80A49DE4 0C01E0C4 */ jal Math_SmoothStepToF /* 00F28 80A49DE8 E7A80010 */ swc1 $f8, 0x0010($sp) /* 00F2C 80A49DEC 3C0180A5 */ lui $at, %hi(D_80A4B92C) ## $at = 80A50000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49E80.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49E80.s index 24ae3a3410..36e5a6f123 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49E80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49E80.s @@ -10,7 +10,7 @@ glabel func_80A49E80 /* 00FDC 80A49E9C 2404000A */ addiu $a0, $zero, 0x000A ## $a0 = 0000000A /* 00FE0 80A49EA0 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E /* 00FE4 80A49EA4 468021A0 */ cvt.s.w $f6, $f4 -/* 00FE8 80A49EA8 0C01DF64 */ jal Math_Rand_S16Offset +/* 00FE8 80A49EA8 0C01DF64 */ jal Rand_S16Offset /* 00FEC 80A49EAC E7A6002C */ swc1 $f6, 0x002C($sp) /* 00FF0 80A49EB0 8FA30030 */ lw $v1, 0x0030($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F10.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F10.s index 8847368226..16cf9b7799 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F10.s @@ -26,7 +26,7 @@ glabel func_80A49F10 /* 010A8 80A49F68 25CEA368 */ addiu $t6, $t6, %lo(func_80A4A368) ## $t6 = 80A4A368 /* 010AC 80A49F6C 24040046 */ addiu $a0, $zero, 0x0046 ## $a0 = 00000046 /* 010B0 80A49F70 2405006E */ addiu $a1, $zero, 0x006E ## $a1 = 0000006E -/* 010B4 80A49F74 0C01DF64 */ jal Math_Rand_S16Offset +/* 010B4 80A49F74 0C01DF64 */ jal Rand_S16Offset /* 010B8 80A49F78 ADEE02B0 */ sw $t6, 0x02B0($t7) ## 000002B0 /* 010BC 80A49F7C 8FB80028 */ lw $t8, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A010.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A010.s index 54ac0fd843..01591e11fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A010.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A010.s @@ -9,7 +9,7 @@ glabel func_80A4A010 /* 01168 80A4A028 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0116C 80A4A02C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 01170 80A4A030 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 01174 80A4A034 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01174 80A4A034 0C01E123 */ jal Math_ApproachZeroF /* 01178 80A4A038 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 0117C 80A4A03C 8FAE002C */ lw $t6, 0x002C($sp) @@ -21,13 +21,13 @@ glabel func_80A4A010 /* 01194 80A4A054 00052C03 */ sra $a1, $a1, 16 /* 01198 80A4A058 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 0119C 80A4A05C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 011A0 80A4A060 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 011A0 80A4A060 0C01E1EF */ jal Math_ApproachS /* 011A4 80A4A064 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 011A8 80A4A068 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 011AC 80A4A06C 87A50026 */ lh $a1, 0x0026($sp) /* 011B0 80A4A070 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 011B4 80A4A074 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 011B4 80A4A074 0C01E1EF */ jal Math_ApproachS /* 011B8 80A4A078 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 011BC 80A4A07C 860F02CC */ lh $t7, 0x02CC($s0) ## 000002CC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A120.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A120.s index 34c21e338a..d84f8cb7fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A120.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A120.s @@ -15,7 +15,7 @@ glabel func_80A4A120 /* 01290 80A4A150 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 /* 01294 80A4A154 51E00005 */ beql $t7, $zero, .L80A4A16C /* 01298 80A4A158 84F802CC */ lh $t8, 0x02CC($a3) ## 000002CC -/* 0129C 80A4A15C 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 0129C 80A4A15C 0C01E123 */ jal Math_ApproachZeroF /* 012A0 80A4A160 AFA70018 */ sw $a3, 0x0018($sp) /* 012A4 80A4A164 8FA70018 */ lw $a3, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A234.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A234.s index d49e2e0151..3a485ed7c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A234.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A234.s @@ -14,7 +14,7 @@ glabel func_80A4A234 /* 013A0 80A4A260 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 013A4 80A4A264 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 013A8 80A4A268 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 013AC 80A4A26C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 013AC 80A4A26C 0C01E107 */ jal Math_ApproachF /* 013B0 80A4A270 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 013B4 80A4A274 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A2EC.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A2EC.s index 591fb152cd..30727f3e66 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A2EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A2EC.s @@ -9,7 +9,7 @@ glabel func_80A4A2EC /* 01444 80A4A304 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01448 80A4A308 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0144C 80A4A30C 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 01450 80A4A310 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01450 80A4A310 0C01E123 */ jal Math_ApproachZeroF /* 01454 80A4A314 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 01458 80A4A318 8FAE0024 */ lw $t6, 0x0024($sp) @@ -20,7 +20,7 @@ glabel func_80A4A2EC /* 0146C 80A4A32C 00052C03 */ sra $a1, $a1, 16 /* 01470 80A4A330 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 01474 80A4A334 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01478 80A4A338 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01478 80A4A338 0C01E1EF */ jal Math_ApproachS /* 0147C 80A4A33C 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 01480 80A4A340 860F02CC */ lh $t7, 0x02CC($s0) ## 000002CC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A368.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A368.s index d26876c2d4..30c71cf19a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A368.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A368.s @@ -38,19 +38,19 @@ glabel func_80A4A368 /* 01520 80A4A3E0 34A55555 */ ori $a1, $a1, 0x5555 ## $a1 = 40555555 /* 01524 80A4A3E4 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 01528 80A4A3E8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 0152C 80A4A3EC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0152C 80A4A3EC 0C01E107 */ jal Math_ApproachF /* 01530 80A4A3F0 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 01534 80A4A3F4 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 01538 80A4A3F8 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 0153C 80A4A3FC 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 01540 80A4A400 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01540 80A4A400 0C01E1EF */ jal Math_ApproachS /* 01544 80A4A404 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 01548 80A4A408 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 0154C 80A4A40C 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 01550 80A4A410 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01554 80A4A414 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01554 80A4A414 0C01E1EF */ jal Math_ApproachS /* 01558 80A4A418 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 0155C 80A4A41C 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s index bff07f09e7..0ea5750f8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s @@ -16,7 +16,7 @@ glabel func_80A4A470 /* 015E8 80A4A4A8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 015EC 80A4A4AC 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 015F0 80A4A4B0 44816000 */ mtc1 $at, $f12 ## $f12 = 15.00 -/* 015F4 80A4A4B4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 015F4 80A4A4B4 0C00CFBE */ jal Rand_ZeroFloat /* 015F8 80A4A4B8 00000000 */ nop /* 015FC 80A4A4BC 4600010D */ trunc.w.s $f4, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A50C.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A50C.s index ffb8e75805..4f309269b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A50C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A50C.s @@ -27,7 +27,7 @@ glabel func_80A4A50C /* 016A8 80A4A568 860202F8 */ lh $v0, 0x02F8($s0) ## 000002F8 /* 016AC 80A4A56C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 016B0 80A4A570 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 016B4 80A4A574 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 016B4 80A4A574 0C01E123 */ jal Math_ApproachZeroF /* 016B8 80A4A578 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 /* 016BC 80A4A57C 860202F8 */ lh $v0, 0x02F8($s0) ## 000002F8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A608.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A608.s index 742bc0efc9..06988e1d8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A608.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A608.s @@ -30,13 +30,13 @@ glabel func_80A4A608 .L80A4A674: /* 017B4 80A4A674 00112C00 */ sll $a1, $s1, 16 /* 017B8 80A4A678 00052C03 */ sra $a1, $a1, 16 -/* 017BC 80A4A67C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 017BC 80A4A67C 0C01E1EF */ jal Math_ApproachS /* 017C0 80A4A680 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 017C4 80A4A684 260402BA */ addiu $a0, $s0, 0x02BA ## $a0 = 000002BA /* 017C8 80A4A688 87A50026 */ lh $a1, 0x0026($sp) /* 017CC 80A4A68C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 017D0 80A4A690 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 017D0 80A4A690 0C01E1EF */ jal Math_ApproachS /* 017D4 80A4A694 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 017D8 80A4A698 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A8D4.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A8D4.s index 1116c8a7ae..b5fb162339 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A8D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A8D4.s @@ -10,7 +10,7 @@ glabel func_80A4A8D4 /* 01A34 80A4A8F4 00AF2821 */ addu $a1, $a1, $t7 /* 01A38 80A4A8F8 8CA5B83C */ lw $a1, %lo(D_80A4B83C)($a1) /* 01A3C 80A4A8FC 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 01A40 80A4A900 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01A40 80A4A900 0C01E107 */ jal Math_ApproachF /* 01A44 80A4A904 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 01A48 80A4A908 861802C4 */ lh $t8, 0x02C4($s0) ## 000002C4 @@ -20,7 +20,7 @@ glabel func_80A4A8D4 /* 01A58 80A4A918 00B92821 */ addu $a1, $a1, $t9 /* 01A5C 80A4A91C 8CA5B848 */ lw $a1, %lo(D_80A4B848)($a1) /* 01A60 80A4A920 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 01A64 80A4A924 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01A64 80A4A924 0C01E107 */ jal Math_ApproachF /* 01A68 80A4A928 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 01A6C 80A4A92C 860802C4 */ lh $t0, 0x02C4($s0) ## 000002C4 @@ -30,7 +30,7 @@ glabel func_80A4A8D4 /* 01A7C 80A4A93C 00A92821 */ addu $a1, $a1, $t1 /* 01A80 80A4A940 8CA5B854 */ lw $a1, %lo(D_80A4B854)($a1) /* 01A84 80A4A944 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 01A88 80A4A948 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01A88 80A4A948 0C01E107 */ jal Math_ApproachF /* 01A8C 80A4A94C 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 01A90 80A4A950 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A964.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A964.s index 376ab66b60..4d98ceaf93 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A964.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A964.s @@ -35,7 +35,7 @@ glabel func_80A4A964 /* 01B04 80A4A9C4 E7B00018 */ swc1 $f16, 0x0018($sp) /* 01B08 80A4A9C8 46000207 */ neg.s $f8, $f0 /* 01B0C 80A4A9CC 46104302 */ mul.s $f12, $f8, $f16 -/* 01B10 80A4A9D0 0C03F494 */ jal Math_atan2f +/* 01B10 80A4A9D0 0C03F494 */ jal Math_FAtan2F /* 01B14 80A4A9D4 00000000 */ nop /* 01B18 80A4A9D8 3C0180A5 */ lui $at, %hi(D_80A4B938) ## $at = 80A50000 /* 01B1C 80A4A9DC C432B938 */ lwc1 $f18, %lo(D_80A4B938)($at) @@ -49,7 +49,7 @@ glabel func_80A4A964 /* 01B3C 80A4A9FC 44053000 */ mfc1 $a1, $f6 /* 01B40 80A4AA00 00000000 */ nop /* 01B44 80A4AA04 00052C00 */ sll $a1, $a1, 16 -/* 01B48 80A4AA08 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01B48 80A4AA08 0C01E1EF */ jal Math_ApproachS /* 01B4C 80A4AA0C 00052C03 */ sra $a1, $a1, 16 /* 01B50 80A4AA10 C7A8001C */ lwc1 $f8, 0x001C($sp) @@ -58,7 +58,7 @@ glabel func_80A4A964 /* 01B5C 80A4AA1C 46004287 */ neg.s $f10, $f8 /* 01B60 80A4AA20 44817000 */ mtc1 $at, $f14 ## $f14 = 1.00 /* 01B64 80A4AA24 46125302 */ mul.s $f12, $f10, $f18 -/* 01B68 80A4AA28 0C03F494 */ jal Math_atan2f +/* 01B68 80A4AA28 0C03F494 */ jal Math_FAtan2F /* 01B6C 80A4AA2C 00000000 */ nop /* 01B70 80A4AA30 3C0180A5 */ lui $at, %hi(D_80A4B93C) ## $at = 80A50000 /* 01B74 80A4AA34 C424B93C */ lwc1 $f4, %lo(D_80A4B93C)($at) @@ -71,7 +71,7 @@ glabel func_80A4A964 /* 01B90 80A4AA50 44054000 */ mfc1 $a1, $f8 /* 01B94 80A4AA54 00000000 */ nop /* 01B98 80A4AA58 00052C00 */ sll $a1, $a1, 16 -/* 01B9C 80A4AA5C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01B9C 80A4AA5C 0C01E1EF */ jal Math_ApproachS /* 01BA0 80A4AA60 00052C03 */ sra $a1, $a1, 16 /* 01BA4 80A4AA64 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4ACC0.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4ACC0.s index d7216bd593..a1bf06846d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4ACC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4ACC0.s @@ -71,13 +71,13 @@ glabel func_80A4ACC0 /* 01EE8 80A4ADA8 246C0008 */ addiu $t4, $v1, 0x0008 ## $t4 = 00000008 /* 01EEC 80A4ADAC AD0C02C0 */ sw $t4, 0x02C0($t0) ## 000002C0 /* 01EF0 80A4ADB0 AC660000 */ sw $a2, 0x0000($v1) ## 00000000 -/* 01EF4 80A4ADB4 0C03F66B */ jal Math_Rand_ZeroOne +/* 01EF4 80A4ADB4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01EF8 80A4ADB8 AFA30028 */ sw $v1, 0x0028($sp) -/* 01EFC 80A4ADBC 0C03F66B */ jal Math_Rand_ZeroOne +/* 01EFC 80A4ADBC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01F00 80A4ADC0 E7A00020 */ swc1 $f0, 0x0020($sp) -/* 01F04 80A4ADC4 0C03F66B */ jal Math_Rand_ZeroOne +/* 01F04 80A4ADC4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01F08 80A4ADC8 E7A00024 */ swc1 $f0, 0x0024($sp) /* 01F0C 80A4ADCC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B3F0.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B3F0.s index 5bc5fb23dc..1167a2cde9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B3F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B3F0.s @@ -46,19 +46,19 @@ glabel func_80A4B3F0 /* 025BC 80A4B47C 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 025C0 80A4B480 26531C24 */ addiu $s3, $s2, 0x1C24 ## $s3 = 00001C24 .L80A4B484: -/* 025C4 80A4B484 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 025C4 80A4B484 0C00CFC8 */ jal Rand_CenteredFloat /* 025C8 80A4B488 4600D306 */ mov.s $f12, $f26 /* 025CC 80A4B48C 46000506 */ mov.s $f20, $f0 -/* 025D0 80A4B490 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 025D0 80A4B490 0C00CFC8 */ jal Rand_CenteredFloat /* 025D4 80A4B494 4600D306 */ mov.s $f12, $f26 /* 025D8 80A4B498 46000586 */ mov.s $f22, $f0 -/* 025DC 80A4B49C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 025DC 80A4B49C 0C00CFC8 */ jal Rand_CenteredFloat /* 025E0 80A4B4A0 4600D306 */ mov.s $f12, $f26 /* 025E4 80A4B4A4 46000606 */ mov.s $f24, $f0 -/* 025E8 80A4B4A8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 025E8 80A4B4A8 0C00CFC8 */ jal Rand_CenteredFloat /* 025EC 80A4B4AC 4600E306 */ mov.s $f12, $f28 /* 025F0 80A4B4B0 C6240024 */ lwc1 $f4, 0x0024($s1) ## 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B554.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B554.s index 61fa387815..a88f4fb50d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B554.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B554.s @@ -88,7 +88,7 @@ glabel func_80A4B554 /* 027C8 80A4B688 3C073A44 */ lui $a3, 0x3A44 ## $a3 = 3A440000 /* 027CC 80A4B68C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 027D0 80A4B690 34E79BA6 */ ori $a3, $a3, 0x9BA6 ## $a3 = 3A449BA6 -/* 027D4 80A4B694 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 027D4 80A4B694 0C01E0C4 */ jal Math_SmoothStepToF /* 027D8 80A4B698 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 027DC 80A4B69C 3C0180A5 */ lui $at, %hi(D_80A4B984) ## $at = 80A50000 @@ -112,21 +112,21 @@ glabel func_80A4B554 /* 02818 80A4B6D8 10400022 */ beq $v0, $zero, .L80A4B764 /* 0281C 80A4B6DC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 02820 80A4B6E0 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 02824 80A4B6E4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02824 80A4B6E4 0C00CFC8 */ jal Rand_CenteredFloat /* 02828 80A4B6E8 00000000 */ nop /* 0282C 80A4B6EC C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 /* 02830 80A4B6F0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 02834 80A4B6F4 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 02838 80A4B6F8 46120100 */ add.s $f4, $f0, $f18 -/* 0283C 80A4B6FC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0283C 80A4B6FC 0C00CFC8 */ jal Rand_CenteredFloat /* 02840 80A4B700 E7A40044 */ swc1 $f4, 0x0044($sp) /* 02844 80A4B704 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 02848 80A4B708 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0284C 80A4B70C 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 02850 80A4B710 46060200 */ add.s $f8, $f0, $f6 -/* 02854 80A4B714 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02854 80A4B714 0C00CFC8 */ jal Rand_CenteredFloat /* 02858 80A4B718 E7A80048 */ swc1 $f8, 0x0048($sp) /* 0285C 80A4B71C C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Update.s index 64a0d15223..9f49de6e41 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Update.s @@ -25,7 +25,7 @@ glabel EnHonotrap_Update /* 00ED8 80A5AB08 A2000240 */ sb $zero, 0x0240($s0) ## 00000240 /* 00EDC 80A5AB0C 27280640 */ addiu $t0, $t9, 0x0640 ## $t0 = 00000640 /* 00EE0 80A5AB10 A608023C */ sh $t0, 0x023C($s0) ## 0000023C -/* 00EE4 80A5AB14 0C01DE1C */ jal Math_Sins +/* 00EE4 80A5AB14 0C01DE1C */ jal Math_SinS ## sins? /* 00EE8 80A5AB18 8604023C */ lh $a0, 0x023C($s0) ## 0000023C /* 00EEC 80A5AB1C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59D70.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59D70.s index 8d9d7c70f0..b570089fdb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59D70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59D70.s @@ -18,11 +18,11 @@ glabel func_80A59D70 /* 00180 80A59DB0 0C00B58B */ jal Actor_SetScale /* 00184 80A59DB4 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD -/* 00188 80A59DB8 0C01DE1C */ jal Math_Sins +/* 00188 80A59DB8 0C01DE1C */ jal Math_SinS ## sins? /* 0018C 80A59DBC 87C40016 */ lh $a0, 0x0016($s8) ## 00000016 /* 00190 80A59DC0 46000586 */ mov.s $f22, $f0 -/* 00194 80A59DC4 0C01DE0D */ jal Math_Coss +/* 00194 80A59DC4 0C01DE0D */ jal Math_CosS ## coss? /* 00198 80A59DC8 87C40016 */ lh $a0, 0x0016($s8) ## 00000016 /* 0019C 80A59DCC 27D70150 */ addiu $s7, $s8, 0x0150 ## $s7 = 00000150 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59F08.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59F08.s index e997c84812..69bd498832 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59F08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59F08.s @@ -58,7 +58,7 @@ glabel func_80A59F08 /* 00390 80A59FC0 8F08002C */ lw $t0, 0x002C($t8) ## 0000002C /* 00394 80A59FC4 46083280 */ add.s $f10, $f6, $f8 /* 00398 80A59FC8 AE080234 */ sw $t0, 0x0234($s0) ## 00000234 -/* 0039C 80A59FCC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0039C 80A59FCC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 003A0 80A59FD0 E60A0230 */ swc1 $f10, 0x0230($s0) ## 00000230 /* 003A4 80A59FD4 3C0180A6 */ lui $at, %hi(D_80A5B124) ## $at = 80A60000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A208.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A208.s index 00f38c9ed4..eaf4a74f5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A208.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A208.s @@ -12,11 +12,11 @@ glabel func_80A5A208 /* 00600 80A5A230 8FBF003C */ lw $ra, 0x003C($sp) /* 00604 80A5A234 0C2968B6 */ jal func_80A5A2D8 /* 00608 80A5A238 00000000 */ nop -/* 0060C 80A5A23C 0C01DE1C */ jal Math_Sins +/* 0060C 80A5A23C 0C01DE1C */ jal Math_SinS ## sins? /* 00610 80A5A240 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00614 80A5A244 E7A00040 */ swc1 $f0, 0x0040($sp) -/* 00618 80A5A248 0C01DE0D */ jal Math_Coss +/* 00618 80A5A248 0C01DE0D */ jal Math_CosS ## coss? /* 0061C 80A5A24C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00620 80A5A250 3C014140 */ lui $at, 0x4140 ## $at = 41400000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A388.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A388.s index da9a61175e..f2a917a894 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A388.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A388.s @@ -24,7 +24,7 @@ glabel func_80A5A388 /* 0078C 80A5A3BC 44050000 */ mfc1 $a1, $f0 /* 00790 80A5A3C0 3C063A1D */ lui $a2, 0x3A1D ## $a2 = 3A1D0000 /* 00794 80A5A3C4 34C64952 */ ori $a2, $a2, 0x4952 ## $a2 = 3A1D4952 -/* 00798 80A5A3C8 0C01DE80 */ jal Math_ApproxF +/* 00798 80A5A3C8 0C01DE80 */ jal Math_StepToF /* 0079C 80A5A3CC AFA70018 */ sw $a3, 0x0018($sp) /* 007A0 80A5A3D0 8FA70018 */ lw $a3, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A41C.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A41C.s index 8a8d8720db..35f1dcd37b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A41C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A41C.s @@ -8,13 +8,13 @@ glabel func_80A5A41C /* 00804 80A5A434 A48E0228 */ sh $t6, 0x0228($a0) ## 00000228 /* 00808 80A5A438 E4840060 */ swc1 $f4, 0x0060($a0) ## 00000060 /* 0080C 80A5A43C 84840032 */ lh $a0, 0x0032($a0) ## 00000032 -/* 00810 80A5A440 0C01DE1C */ jal Math_Sins +/* 00810 80A5A440 0C01DE1C */ jal Math_SinS ## sins? /* 00814 80A5A444 AFA50018 */ sw $a1, 0x0018($sp) /* 00818 80A5A448 46000180 */ add.s $f6, $f0, $f0 /* 0081C 80A5A44C 8FA50018 */ lw $a1, 0x0018($sp) /* 00820 80A5A450 E4A6005C */ swc1 $f6, 0x005C($a1) ## 0000005C -/* 00824 80A5A454 0C01DE0D */ jal Math_Coss +/* 00824 80A5A454 0C01DE0D */ jal Math_CosS ## coss? /* 00828 80A5A458 84A40032 */ lh $a0, 0x0032($a1) ## 00000032 /* 0082C 80A5A45C 46000200 */ add.s $f8, $f0, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A484.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A484.s index 93b9305b00..f0e4253504 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A484.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A484.s @@ -64,7 +64,7 @@ glabel func_80A5A484 /* 0093C 80A5A56C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 00940 80A5A570 46105480 */ add.s $f18, $f10, $f16 /* 00944 80A5A574 44059000 */ mfc1 $a1, $f18 -/* 00948 80A5A578 0C01DE80 */ jal Math_ApproxF +/* 00948 80A5A578 0C01DE80 */ jal Math_StepToF /* 0094C 80A5A57C 00000000 */ nop /* 00950 80A5A580 14400007 */ bne $v0, $zero, .L80A5A5A0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A658.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A658.s index e4b5297b21..f3acd94963 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A658.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A658.s @@ -7,7 +7,7 @@ glabel func_80A5A658 /* 00A3C 80A5A66C AFB10020 */ sw $s1, 0x0020($sp) /* 00A40 80A5A670 3C054150 */ lui $a1, 0x4150 ## $a1 = 41500000 /* 00A44 80A5A674 24840238 */ addiu $a0, $a0, 0x0238 ## $a0 = 00000238 -/* 00A48 80A5A678 0C01DE80 */ jal Math_ApproxF +/* 00A48 80A5A678 0C01DE80 */ jal Math_StepToF /* 00A4C 80A5A67C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 00A50 80A5A680 C6020238 */ lwc1 $f2, 0x0238($s0) ## 00000238 @@ -24,19 +24,19 @@ glabel func_80A5A658 /* 00A7C 80A5A6AC 46081002 */ mul.s $f0, $f2, $f8 /* 00A80 80A5A6B0 46000005 */ abs.s $f0, $f0 /* 00A84 80A5A6B4 E7A00068 */ swc1 $f0, 0x0068($sp) -/* 00A88 80A5A6B8 0C01DE80 */ jal Math_ApproxF +/* 00A88 80A5A6B8 0C01DE80 */ jal Math_StepToF /* 00A8C 80A5A6BC 8E05022C */ lw $a1, 0x022C($s0) ## 0000022C /* 00A90 80A5A6C0 30510001 */ andi $s1, $v0, 0x0001 ## $s1 = 00000000 /* 00A94 80A5A6C4 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 00A98 80A5A6C8 8E050230 */ lw $a1, 0x0230($s0) ## 00000230 -/* 00A9C 80A5A6CC 0C01DE80 */ jal Math_ApproxF +/* 00A9C 80A5A6CC 0C01DE80 */ jal Math_StepToF /* 00AA0 80A5A6D0 8FA60064 */ lw $a2, 0x0064($sp) /* 00AA4 80A5A6D4 02228824 */ and $s1, $s1, $v0 /* 00AA8 80A5A6D8 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 00AAC 80A5A6DC 8E050234 */ lw $a1, 0x0234($s0) ## 00000234 -/* 00AB0 80A5A6E0 0C01DE80 */ jal Math_ApproxF +/* 00AB0 80A5A6E0 0C01DE80 */ jal Math_StepToF /* 00AB4 80A5A6E4 8FA60068 */ lw $a2, 0x0068($sp) /* 00AB8 80A5A6E8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 @@ -85,7 +85,7 @@ glabel func_80A5A658 /* 00B64 80A5A794 C60C0064 */ lwc1 $f12, 0x0064($s0) ## 00000064 /* 00B68 80A5A798 C60E005C */ lwc1 $f14, 0x005C($s0) ## 0000005C /* 00B6C 80A5A79C 46128102 */ mul.s $f4, $f16, $f18 -/* 00B70 80A5A7A0 0C034199 */ jal atan2s +/* 00B70 80A5A7A0 0C034199 */ jal Math_Atan2S /* 00B74 80A5A7A4 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 00B78 80A5A7A8 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A860.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A860.s index 9799636dbf..a46bb2b62b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A860.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A860.s @@ -18,13 +18,13 @@ glabel func_80A5A860 /* 00C40 80A5A870 AFA50044 */ sw $a1, 0x0044($sp) /* 00C44 80A5A874 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 00C48 80A5A878 24840032 */ addiu $a0, $a0, 0x0032 ## $a0 = 00000032 -/* 00C4C 80A5A87C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00C4C 80A5A87C 0C01DE2B */ jal Math_ScaledStepToS /* 00C50 80A5A880 24060300 */ addiu $a2, $zero, 0x0300 ## $a2 = 00000300 /* 00C54 80A5A884 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00C58 80A5A888 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 00C5C 80A5A88C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00C60 80A5A890 0C01DE80 */ jal Math_ApproxF +/* 00C60 80A5A890 0C01DE80 */ jal Math_StepToF /* 00C64 80A5A894 3C054040 */ lui $a1, 0x4040 ## $a1 = 40400000 /* 00C68 80A5A898 C6040094 */ lwc1 $f4, 0x0094($s0) ## 00000094 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AA24.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AA24.s index a4413baec5..3ed73bd5dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AA24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AA24.s @@ -8,7 +8,7 @@ glabel func_80A5AA24 /* 00E0C 80A5AA3C 3C06391D */ lui $a2, 0x391D ## $a2 = 391D0000 /* 00E10 80A5AA40 34C64952 */ ori $a2, $a2, 0x4952 ## $a2 = 391D4952 /* 00E14 80A5AA44 34A5B717 */ ori $a1, $a1, 0xB717 ## $a1 = 38D1B717 -/* 00E18 80A5AA48 0C01DE80 */ jal Math_ApproxF +/* 00E18 80A5AA48 0C01DE80 */ jal Math_StepToF /* 00E1C 80A5AA4C 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 /* 00E20 80A5AA50 AFA20028 */ sw $v0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Update.s index 56fcdca3df..9becf35c10 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Update.s @@ -215,7 +215,7 @@ glabel EnHorse_Update /* 096C0 80A649B0 0C0189B7 */ jal Collider_CylinderUpdate /* 096C4 80A649B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 096C8 80A649B8 0C01DE1C */ jal Math_Sins +/* 096C8 80A649B8 0C01DE1C */ jal Math_SinS ## sins? /* 096CC 80A649BC 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 096D0 80A649C0 3C014130 */ lui $at, 0x4130 ## $at = 41300000 @@ -227,7 +227,7 @@ glabel EnHorse_Update /* 096E8 80A649D8 440E9000 */ mfc1 $t6, $f18 /* 096EC 80A649DC 00000000 */ nop /* 096F0 80A649E0 01CFC021 */ addu $t8, $t6, $t7 -/* 096F4 80A649E4 0C01DE0D */ jal Math_Coss +/* 096F4 80A649E4 0C01DE0D */ jal Math_CosS ## coss? /* 096F8 80A649E8 A61802BE */ sh $t8, 0x02BE($s0) ## 000002BE /* 096FC 80A649EC 3C014130 */ lui $at, 0x4130 ## $at = 41300000 @@ -239,7 +239,7 @@ glabel EnHorse_Update /* 09714 80A64A04 440B4000 */ mfc1 $t3, $f8 /* 09718 80A64A08 00000000 */ nop /* 0971C 80A64A0C 016C6821 */ addu $t5, $t3, $t4 -/* 09720 80A64A10 0C01DE1C */ jal Math_Sins +/* 09720 80A64A10 0C01DE1C */ jal Math_SinS ## sins? /* 09724 80A64A14 A60D02C2 */ sh $t5, 0x02C2($s0) ## 000002C2 /* 09728 80A64A18 3C01C190 */ lui $at, 0xC190 ## $at = C1900000 @@ -251,7 +251,7 @@ glabel EnHorse_Update /* 09740 80A64A30 44189000 */ mfc1 $t8, $f18 /* 09744 80A64A34 00000000 */ nop /* 09748 80A64A38 03084821 */ addu $t1, $t8, $t0 -/* 0974C 80A64A3C 0C01DE0D */ jal Math_Coss +/* 0974C 80A64A3C 0C01DE0D */ jal Math_CosS ## coss? /* 09750 80A64A40 A609030A */ sh $t1, 0x030A($s0) ## 0000030A /* 09754 80A64A44 3C01C190 */ lui $at, 0xC190 ## $at = C1900000 @@ -368,7 +368,7 @@ glabel EnHorse_Update /* 098E8 80A64BD8 8F2F0008 */ lw $t7, 0x0008($t9) ## 00000008 /* 098EC 80A64BDC 46049180 */ add.s $f6, $f18, $f4 /* 098F0 80A64BE0 AE0F0040 */ sw $t7, 0x0040($s0) ## 00000040 -/* 098F4 80A64BE4 0C03F66B */ jal Math_Rand_ZeroOne +/* 098F4 80A64BE4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 098F8 80A64BE8 E606003C */ swc1 $f6, 0x003C($s0) ## 0000003C /* 098FC 80A64BEC 3C0180A6 */ lui $at, %hi(D_80A669BC) ## $at = 80A60000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B61C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B61C.s index cfbce29b4a..f55100aa9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B61C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B61C.s @@ -122,7 +122,7 @@ glabel func_80A5B61C /* 004BC 80A5B7AC 860D0032 */ lh $t5, 0x0032($s0) ## 00000032 /* 004C0 80A5B7B0 01CD2023 */ subu $a0, $t6, $t5 /* 004C4 80A5B7B4 00042400 */ sll $a0, $a0, 16 -/* 004C8 80A5B7B8 0C01DE1C */ jal Math_Sins +/* 004C8 80A5B7B8 0C01DE1C */ jal Math_SinS ## sins? /* 004CC 80A5B7BC 00042403 */ sra $a0, $a0, 16 /* 004D0 80A5B7C0 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 @@ -151,7 +151,7 @@ glabel func_80A5B61C /* 00524 80A5B814 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 /* 00528 80A5B818 012A2023 */ subu $a0, $t1, $t2 /* 0052C 80A5B81C 00042400 */ sll $a0, $a0, 16 -/* 00530 80A5B820 0C01DE1C */ jal Math_Sins +/* 00530 80A5B820 0C01DE1C */ jal Math_SinS ## sins? /* 00534 80A5B824 00042403 */ sra $a0, $a0, 16 /* 00538 80A5B828 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 @@ -192,7 +192,7 @@ glabel func_80A5B61C /* 005B4 80A5B8A4 00042403 */ sra $a0, $a0, 16 /* 005B8 80A5B8A8 45030014 */ bc1tl .L80A5B8FC /* 005BC 80A5B8AC C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 005C0 80A5B8B0 0C01DE1C */ jal Math_Sins +/* 005C0 80A5B8B0 0C01DE1C */ jal Math_SinS ## sins? /* 005C4 80A5B8B4 A7A4004E */ sh $a0, 0x004E($sp) /* 005C8 80A5B8B8 3C0180A6 */ lui $at, %hi(D_80A66858) ## $at = 80A60000 @@ -203,7 +203,7 @@ glabel func_80A5B61C /* 005DC 80A5B8CC 00000000 */ nop /* 005E0 80A5B8D0 4502001D */ bc1fl .L80A5B948 /* 005E4 80A5B8D4 8FAB0078 */ lw $t3, 0x0078($sp) -/* 005E8 80A5B8D8 0C01DE0D */ jal Math_Coss +/* 005E8 80A5B8D8 0C01DE0D */ jal Math_CosS ## coss? /* 005EC 80A5B8DC 00000000 */ nop /* 005F0 80A5B8E0 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB14.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB14.s index 75254d184e..d5901412ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB14.s @@ -13,7 +13,7 @@ glabel func_80A5BB14 /* 00834 80A5BB24 AFA40020 */ sw $a0, 0x0020($sp) /* 00838 80A5BB28 AFA50024 */ sw $a1, 0x0024($sp) /* 0083C 80A5BB2C E7A4001C */ swc1 $f4, 0x001C($sp) -/* 00840 80A5BB30 0C01DE0D */ jal Math_Coss +/* 00840 80A5BB30 0C01DE0D */ jal Math_CosS ## coss? /* 00844 80A5BB34 848400B4 */ lh $a0, 0x00B4($a0) ## 000000B4 /* 00848 80A5BB38 3C0180A6 */ lui $at, %hi(D_80A6686C) ## $at = 80A60000 @@ -23,7 +23,7 @@ glabel func_80A5BB14 /* 00858 80A5BB48 00000000 */ nop /* 0085C 80A5BB4C 4502000C */ bc1fl .L80A5BB80 /* 00860 80A5BB50 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00864 80A5BB54 0C01DE1C */ jal Math_Sins +/* 00864 80A5BB54 0C01DE1C */ jal Math_SinS ## sins? /* 00868 80A5BB58 85E400B4 */ lh $a0, 0x00B4($t7) ## 000000B4 /* 0086C 80A5BB5C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CAEC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CAEC.s index f3b570df7c..f1724366a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CAEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CAEC.s @@ -53,7 +53,7 @@ glabel func_80A5CAEC /* 01888 80A5CB78 27A6003E */ addiu $a2, $sp, 0x003E ## $a2 = FFFFFFF6 /* 0188C 80A5CB7C 0C298C52 */ jal func_80A63148 /* 01890 80A5CB80 E7AC0060 */ swc1 $f12, 0x0060($sp) -/* 01894 80A5CB84 0C01DE0D */ jal Math_Coss +/* 01894 80A5CB84 0C01DE0D */ jal Math_CosS ## coss? /* 01898 80A5CB88 87A4003E */ lh $a0, 0x003E($sp) /* 0189C 80A5CB8C C7AA0054 */ lwc1 $f10, 0x0054($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D0A0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D0A0.s index 8d184190f4..d6e325f735 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D0A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D0A0.s @@ -29,7 +29,7 @@ glabel func_80A5D0A0 /* 01E08 80A5D0F8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 01E0C 80A5D0FC 1441001D */ bne $v0, $at, .L80A5D174 /* 01E10 80A5D100 00000000 */ nop -/* 01E14 80A5D104 0C01DE0D */ jal Math_Coss +/* 01E14 80A5D104 0C01DE0D */ jal Math_CosS ## coss? /* 01E18 80A5D108 87A40022 */ lh $a0, 0x0022($sp) /* 01E1C 80A5D10C 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 @@ -44,7 +44,7 @@ glabel func_80A5D0A0 /* 01E40 80A5D130 10000010 */ beq $zero, $zero, .L80A5D174 /* 01E44 80A5D134 00000000 */ nop .L80A5D138: -/* 01E48 80A5D138 0C01DE0D */ jal Math_Coss +/* 01E48 80A5D138 0C01DE0D */ jal Math_CosS ## coss? /* 01E4C 80A5D13C 87A40022 */ lh $a0, 0x0022($sp) /* 01E50 80A5D140 3C0180A6 */ lui $at, %hi(D_80A66898) ## $at = 80A60000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D2C0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D2C0.s index cfbcbdba2a..d79262e9f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D2C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D2C0.s @@ -29,7 +29,7 @@ glabel func_80A5D2C0 /* 02028 80A5D318 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0202C 80A5D31C 1441001D */ bne $v0, $at, .L80A5D394 /* 02030 80A5D320 00000000 */ nop -/* 02034 80A5D324 0C01DE0D */ jal Math_Coss +/* 02034 80A5D324 0C01DE0D */ jal Math_CosS ## coss? /* 02038 80A5D328 87A40022 */ lh $a0, 0x0022($sp) /* 0203C 80A5D32C 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 @@ -44,7 +44,7 @@ glabel func_80A5D2C0 /* 02060 80A5D350 10000010 */ beq $zero, $zero, .L80A5D394 /* 02064 80A5D354 00000000 */ nop .L80A5D358: -/* 02068 80A5D358 0C01DE0D */ jal Math_Coss +/* 02068 80A5D358 0C01DE0D */ jal Math_CosS ## coss? /* 0206C 80A5D35C 87A40022 */ lh $a0, 0x0022($sp) /* 02070 80A5D360 3C0180A6 */ lui $at, %hi(D_80A668A0) ## $at = 80A60000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D468.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D468.s index 7d985b63a7..a7cca9f5cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D468.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D468.s @@ -35,7 +35,7 @@ glabel func_80A5D468 /* 021E0 80A5D4D0 1000003D */ beq $zero, $zero, .L80A5D5C8 /* 021E4 80A5D4D4 00000000 */ nop .L80A5D4D8: -/* 021E8 80A5D4D8 0C01DE0D */ jal Math_Coss +/* 021E8 80A5D4D8 0C01DE0D */ jal Math_CosS ## coss? /* 021EC 80A5D4DC 87A40028 */ lh $a0, 0x0028($sp) /* 021F0 80A5D4E0 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 @@ -50,7 +50,7 @@ glabel func_80A5D468 /* 02214 80A5D504 10000030 */ beq $zero, $zero, .L80A5D5C8 /* 02218 80A5D508 00000000 */ nop .L80A5D50C: -/* 0221C 80A5D50C 0C01DE0D */ jal Math_Coss +/* 0221C 80A5D50C 0C01DE0D */ jal Math_CosS ## coss? /* 02220 80A5D510 87A40028 */ lh $a0, 0x0028($sp) /* 02224 80A5D514 3C0180A6 */ lui $at, %hi(D_80A668A8) ## $at = 80A60000 @@ -108,7 +108,7 @@ glabel func_80A5D468 /* 022DC 80A5D5CC 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 022E0 80A5D5D0 50400011 */ beql $v0, $zero, .L80A5D618 /* 022E4 80A5D5D4 8FBF001C */ lw $ra, 0x001C($sp) -/* 022E8 80A5D5D8 0C01DE0D */ jal Math_Coss +/* 022E8 80A5D5D8 0C01DE0D */ jal Math_CosS ## coss? /* 022EC 80A5D5DC 87A40028 */ lh $a0, 0x0028($sp) /* 022F0 80A5D5E0 3C0180A6 */ lui $at, %hi(D_80A668B0) ## $at = 80A60000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D79C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D79C.s index 3c7ec28b91..957fa578d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D79C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D79C.s @@ -169,7 +169,7 @@ glabel func_80A5D79C /* 02708 80A5D9F8 00000000 */ nop /* 0270C 80A5D9FC 4501000A */ bc1t .L80A5DA28 /* 02710 80A5DA00 00000000 */ nop -/* 02714 80A5DA04 0C01DE0D */ jal Math_Coss +/* 02714 80A5DA04 0C01DE0D */ jal Math_CosS ## coss? /* 02718 80A5DA08 87A4003A */ lh $a0, 0x003A($sp) /* 0271C 80A5DA0C 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DE38.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DE38.s index a7905df23a..25fb7a8957 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DE38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DE38.s @@ -92,7 +92,7 @@ glabel func_80A5DE38 /* 02C84 80A5DF74 00000000 */ nop /* 02C88 80A5DF78 4502000F */ bc1fl .L80A5DFB8 /* 02C8C 80A5DF7C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 02C90 80A5DF80 0C01DE0D */ jal Math_Coss +/* 02C90 80A5DF80 0C01DE0D */ jal Math_CosS ## coss? /* 02C94 80A5DF84 87A4003A */ lh $a0, 0x003A($sp) /* 02C98 80A5DF88 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E12C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E12C.s index 6ae1ad4d79..4334f31ced 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E12C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E12C.s @@ -76,7 +76,7 @@ glabel func_80A5E12C /* 02F50 80A5E240 10000015 */ beq $zero, $zero, .L80A5E298 /* 02F54 80A5E244 8FBF0024 */ lw $ra, 0x0024($sp) .L80A5E248: -/* 02F58 80A5E248 0C01DE0D */ jal Math_Coss +/* 02F58 80A5E248 0C01DE0D */ jal Math_CosS ## coss? /* 02F5C 80A5E24C 87A40032 */ lh $a0, 0x0032($sp) /* 02F60 80A5E250 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E39C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E39C.s index d85a8c6d3a..b510ae0c10 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E39C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E39C.s @@ -37,7 +37,7 @@ glabel func_80A5E39C /* 03120 80A5E410 00000000 */ nop /* 03124 80A5E414 4502002F */ bc1fl .L80A5E4D4 /* 03128 80A5E418 3C0141E8 */ lui $at, 0x41E8 ## $at = 41E80000 -/* 0312C 80A5E41C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0312C 80A5E41C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 03130 80A5E420 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 /* 03134 80A5E424 3C013FE0 */ lui $at, 0x3FE0 ## $at = 3FE00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E650.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E650.s index 3faddb1068..7700f8e03b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E650.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E650.s @@ -75,7 +75,7 @@ glabel func_80A5E650 /* 0347C 80A5E76C 10000025 */ beq $zero, $zero, .L80A5E804 /* 03480 80A5E770 A7A90032 */ sh $t1, 0x0032($sp) .L80A5E774: -/* 03484 80A5E774 0C01DE0D */ jal Math_Coss +/* 03484 80A5E774 0C01DE0D */ jal Math_CosS ## coss? /* 03488 80A5E778 87A40032 */ lh $a0, 0x0032($sp) /* 0348C 80A5E77C 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 @@ -216,7 +216,7 @@ glabel func_80A5E650 /* 0367C 80A5E96C 00000000 */ nop /* 03680 80A5E970 4502000F */ bc1fl .L80A5E9B0 /* 03684 80A5E974 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 03688 80A5E978 0C01DE0D */ jal Math_Coss +/* 03688 80A5E978 0C01DE0D */ jal Math_CosS ## coss? /* 0368C 80A5E97C 87A40032 */ lh $a0, 0x0032($sp) /* 03690 80A5E980 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s index 2635bfb589..0a4aa0384d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s @@ -102,7 +102,7 @@ glabel func_80A5F414 /* 04298 80A5F588 00000000 */ nop /* 0429C 80A5F58C 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 .L80A5F590: -/* 042A0 80A5F590 0C03F66B */ jal Math_Rand_ZeroOne +/* 042A0 80A5F590 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 042A4 80A5F594 AFA30034 */ sw $v1, 0x0034($sp) /* 042A8 80A5F598 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A28.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A28.s index 36164c8261..430447db07 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A28.s @@ -191,7 +191,7 @@ glabel func_80A61A28 /* 069BC 80A61CAC 10000015 */ beq $zero, $zero, .L80A61D04 /* 069C0 80A61CB0 8FA6004C */ lw $a2, 0x004C($sp) .L80A61CB4: -/* 069C4 80A61CB4 0C03F66B */ jal Math_Rand_ZeroOne +/* 069C4 80A61CB4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 069C8 80A61CB8 00000000 */ nop /* 069CC 80A61CBC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -409,7 +409,7 @@ glabel func_80A61A28 /* 06CBC 80A61FAC 100000AE */ beq $zero, $zero, .L80A62268 /* 06CC0 80A61FB0 8FBF002C */ lw $ra, 0x002C($sp) .L80A61FB4: -/* 06CC4 80A61FB4 0C03F66B */ jal Math_Rand_ZeroOne +/* 06CC4 80A61FB4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 06CC8 80A61FB8 00000000 */ nop /* 06CCC 80A61FBC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627E8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627E8.s index 72fd4dbbfe..9d4c751118 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627E8.s @@ -5,7 +5,7 @@ glabel func_80A627E8 /* 07504 80A627F4 AFA5001C */ sw $a1, 0x001C($sp) /* 07508 80A627F8 AFA60020 */ sw $a2, 0x0020($sp) /* 0750C 80A627FC AFA70024 */ sw $a3, 0x0024($sp) -/* 07510 80A62800 0C01DE1C */ jal Math_Sins +/* 07510 80A62800 0C01DE1C */ jal Math_SinS ## sins? /* 07514 80A62804 87A4001E */ lh $a0, 0x001E($sp) /* 07518 80A62808 C7A40020 */ lwc1 $f4, 0x0020($sp) @@ -19,7 +19,7 @@ glabel func_80A627E8 /* 07538 80A62828 C4700004 */ lwc1 $f16, 0x0004($v1) ## 00000004 /* 0753C 80A6282C 46128100 */ add.s $f4, $f16, $f18 /* 07540 80A62830 E4440004 */ swc1 $f4, 0x0004($v0) ## 00000004 -/* 07544 80A62834 0C01DE0D */ jal Math_Coss +/* 07544 80A62834 0C01DE0D */ jal Math_CosS ## coss? /* 07548 80A62838 87A4001E */ lh $a0, 0x001E($sp) /* 0754C 80A6283C C7A60020 */ lwc1 $f6, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62ACC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62ACC.s index 2c6d50c1b8..fdeb8bfec2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62ACC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62ACC.s @@ -146,7 +146,7 @@ glabel func_80A62ACC /* 079CC 80A62CBC C6120248 */ lwc1 $f18, 0x0248($s0) ## 00000248 /* 079D0 80A62CC0 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 079D4 80A62CC4 44817000 */ mtc1 $at, $f14 ## $f14 = 60.00 -/* 079D8 80A62CC8 0C03F494 */ jal Math_atan2f +/* 079D8 80A62CC8 0C03F494 */ jal Math_FAtan2F /* 079DC 80A62CCC 46128301 */ sub.s $f12, $f16, $f18 /* 079E0 80A62CD0 3C0180A6 */ lui $at, %hi(D_80A6695C) ## $at = 80A60000 /* 079E4 80A62CD4 C424695C */ lwc1 $f4, %lo(D_80A6695C)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63148.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63148.s index 7ef73146af..dbdd1afd14 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63148.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63148.s @@ -27,7 +27,7 @@ glabel func_80A63148 .L80A63194: /* 07EA4 80A63194 C48C0000 */ lwc1 $f12, 0x0000($a0) ## 00000000 /* 07EA8 80A63198 C48E0004 */ lwc1 $f14, 0x0004($a0) ## 00000004 -/* 07EAC 80A6319C 0C03F494 */ jal Math_atan2f +/* 07EAC 80A6319C 0C03F494 */ jal Math_FAtan2F /* 07EB0 80A631A0 46006307 */ neg.s $f12, $f12 /* 07EB4 80A631A4 3C0180A6 */ lui $at, %hi(D_80A6696C) ## $at = 80A60000 /* 07EB8 80A631A8 C42A696C */ lwc1 $f10, %lo(D_80A6696C)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63210.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63210.s index 0dc36c2963..528833e302 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63210.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63210.s @@ -33,7 +33,7 @@ glabel func_80A63210 /* 07F78 80A63268 00000000 */ nop /* 07F7C 80A6326C 468083A0 */ cvt.s.w $f14, $f16 /* 07F80 80A63270 46007582 */ mul.s $f22, $f14, $f0 -/* 07F84 80A63274 0C03F494 */ jal Math_atan2f +/* 07F84 80A63274 0C03F494 */ jal Math_FAtan2F /* 07F88 80A63278 00000000 */ nop /* 07F8C 80A6327C 3C0180A6 */ lui $at, %hi(D_80A66974) ## $at = 80A60000 /* 07F90 80A63280 C4326974 */ lwc1 $f18, %lo(D_80A66974)($at) @@ -45,7 +45,7 @@ glabel func_80A63210 /* 07FA8 80A63298 032B2023 */ subu $a0, $t9, $t3 /* 07FAC 80A6329C 24848001 */ addiu $a0, $a0, 0x8001 ## $a0 = FFFF8001 /* 07FB0 80A632A0 00042400 */ sll $a0, $a0, 16 -/* 07FB4 80A632A4 0C01DE0D */ jal Math_Coss +/* 07FB4 80A632A4 0C01DE0D */ jal Math_CosS ## coss? /* 07FB8 80A632A8 00042403 */ sra $a0, $a0, 16 /* 07FBC 80A632AC 3C0180A6 */ lui $at, %hi(D_80A66978) ## $at = 80A60000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63364.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63364.s index df70bda023..5c7e46ee4b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63364.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63364.s @@ -29,7 +29,7 @@ glabel func_80A63364 /* 080D4 80A633C4 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy /* 080D8 80A633C8 E7A60064 */ swc1 $f6, 0x0064($sp) -/* 080DC 80A633CC 0C01DE1C */ jal Math_Sins +/* 080DC 80A633CC 0C01DE1C */ jal Math_SinS ## sins? /* 080E0 80A633D0 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 080E4 80A633D4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -41,7 +41,7 @@ glabel func_80A63364 /* 080FC 80A633EC 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 /* 08100 80A633F0 00042023 */ subu $a0, $zero, $a0 /* 08104 80A633F4 00042400 */ sll $a0, $a0, 16 -/* 08108 80A633F8 0C01DE1C */ jal Math_Sins +/* 08108 80A633F8 0C01DE1C */ jal Math_SinS ## sins? /* 0810C 80A633FC 00042403 */ sra $a0, $a0, 16 /* 08110 80A63400 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -50,7 +50,7 @@ glabel func_80A63364 /* 0811C 80A6340C 46003282 */ mul.s $f10, $f6, $f0 /* 08120 80A63410 460A2200 */ add.s $f8, $f4, $f10 /* 08124 80A63414 E7A80058 */ swc1 $f8, 0x0058($sp) -/* 08128 80A63418 0C01DE0D */ jal Math_Coss +/* 08128 80A63418 0C01DE0D */ jal Math_CosS ## coss? /* 0812C 80A6341C 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 08130 80A63420 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A634A0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A634A0.s index f61f70d600..5d3c1e2ad7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A634A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A634A0.s @@ -66,7 +66,7 @@ glabel func_80A634A0 /* 08244 80A63534 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 /* 08248 80A63538 012A2023 */ subu $a0, $t1, $t2 /* 0824C 80A6353C 00042400 */ sll $a0, $a0, 16 -/* 08250 80A63540 0C01DE0D */ jal Math_Coss +/* 08250 80A63540 0C01DE0D */ jal Math_CosS ## coss? /* 08254 80A63544 00042403 */ sra $a0, $a0, 16 /* 08258 80A63548 3C0180A6 */ lui $at, %hi(D_80A6697C) ## $at = 80A60000 @@ -167,7 +167,7 @@ glabel func_80A634A0 /* 083C0 80A636B0 8C4A0008 */ lw $t2, 0x0008($v0) ## FFFFFFF4 /* 083C4 80A636B4 AD0A0008 */ sw $t2, 0x0008($t0) ## FFFFFFE8 /* 083C8 80A636B8 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 083CC 80A636BC 0C01DE1C */ jal Math_Sins +/* 083CC 80A636BC 0C01DE1C */ jal Math_SinS ## sins? /* 083D0 80A636C0 AFA30044 */ sw $v1, 0x0044($sp) /* 083D4 80A636C4 C7A8008C */ lwc1 $f8, 0x008C($sp) @@ -178,7 +178,7 @@ glabel func_80A634A0 /* 083E8 80A636D8 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 /* 083EC 80A636DC 00042023 */ subu $a0, $zero, $a0 /* 083F0 80A636E0 00042400 */ sll $a0, $a0, 16 -/* 083F4 80A636E4 0C01DE1C */ jal Math_Sins +/* 083F4 80A636E4 0C01DE1C */ jal Math_SinS ## sins? /* 083F8 80A636E8 00042403 */ sra $a0, $a0, 16 /* 083FC 80A636EC C7A4008C */ lwc1 $f4, 0x008C($sp) @@ -186,7 +186,7 @@ glabel func_80A634A0 /* 08404 80A636F4 46002202 */ mul.s $f8, $f4, $f0 /* 08408 80A636F8 46089180 */ add.s $f6, $f18, $f8 /* 0840C 80A636FC E7A600A4 */ swc1 $f6, 0x00A4($sp) -/* 08410 80A63700 0C01DE0D */ jal Math_Coss +/* 08410 80A63700 0C01DE0D */ jal Math_CosS ## coss? /* 08414 80A63704 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 08418 80A63708 C7B0008C */ lwc1 $f16, 0x008C($sp) @@ -252,7 +252,7 @@ glabel func_80A634A0 /* 08500 80A637F0 448B5000 */ mtc1 $t3, $f10 ## $f10 = 0.00 /* 08504 80A637F4 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 /* 08508 80A637F8 46805320 */ cvt.s.w $f12, $f10 -/* 0850C 80A637FC 0C03F494 */ jal Math_atan2f +/* 0850C 80A637FC 0C03F494 */ jal Math_FAtan2F /* 08510 80A63800 468023A0 */ cvt.s.w $f14, $f4 /* 08514 80A63804 3C0180A6 */ lui $at, %hi(D_80A66984) ## $at = 80A60000 /* 08518 80A63808 C4326984 */ lwc1 $f18, %lo(D_80A66984)($at) @@ -264,7 +264,7 @@ glabel func_80A634A0 /* 08530 80A63820 01B92023 */ subu $a0, $t5, $t9 /* 08534 80A63824 24848001 */ addiu $a0, $a0, 0x8001 ## $a0 = FFFF8001 /* 08538 80A63828 00042400 */ sll $a0, $a0, 16 -/* 0853C 80A6382C 0C01DE0D */ jal Math_Coss +/* 0853C 80A6382C 0C01DE0D */ jal Math_CosS ## coss? /* 08540 80A63830 00042403 */ sra $a0, $a0, 16 /* 08544 80A63834 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -368,7 +368,7 @@ glabel func_80A634A0 /* 086A4 80A63994 ADA80004 */ sw $t0, 0x0004($t5) ## FFFFFFD8 /* 086A8 80A63998 8F290008 */ lw $t1, 0x0008($t9) ## FFFFFFF4 /* 086AC 80A6399C ADA90008 */ sw $t1, 0x0008($t5) ## FFFFFFDC -/* 086B0 80A639A0 0C01DE1C */ jal Math_Sins +/* 086B0 80A639A0 0C01DE1C */ jal Math_SinS ## sins? /* 086B4 80A639A4 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 086B8 80A639A8 C7B2008C */ lwc1 $f18, 0x008C($sp) @@ -381,7 +381,7 @@ glabel func_80A634A0 /* 086D4 80A639C4 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 086D8 80A639C8 460A8480 */ add.s $f18, $f16, $f10 /* 086DC 80A639CC E7B20098 */ swc1 $f18, 0x0098($sp) -/* 086E0 80A639D0 0C01DE0D */ jal Math_Coss +/* 086E0 80A639D0 0C01DE0D */ jal Math_CosS ## coss? /* 086E4 80A639D4 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 086E8 80A639D8 C7A8008C */ lwc1 $f8, 0x008C($sp) @@ -566,7 +566,7 @@ glabel func_80A634A0 /* 089A0 80A63C90 46062400 */ add.s $f16, $f4, $f6 /* 089A4 80A63C94 15E00012 */ bne $t7, $zero, .L80A63CE0 /* 089A8 80A63C98 E7B00098 */ swc1 $f16, 0x0098($sp) -/* 089AC 80A63C9C 0C01DE1C */ jal Math_Sins +/* 089AC 80A63C9C 0C01DE1C */ jal Math_SinS ## sins? /* 089B0 80A63CA0 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 089B4 80A63CA4 3C01438A */ lui $at, 0x438A ## $at = 438A0000 @@ -575,7 +575,7 @@ glabel func_80A634A0 /* 089C0 80A63CB0 46009202 */ mul.s $f8, $f18, $f0 /* 089C4 80A63CB4 46085100 */ add.s $f4, $f10, $f8 /* 089C8 80A63CB8 E7A40094 */ swc1 $f4, 0x0094($sp) -/* 089CC 80A63CBC 0C01DE0D */ jal Math_Coss +/* 089CC 80A63CBC 0C01DE0D */ jal Math_CosS ## coss? /* 089D0 80A63CC0 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 089D4 80A63CC4 3C01438A */ lui $at, 0x438A ## $at = 438A0000 @@ -586,7 +586,7 @@ glabel func_80A634A0 /* 089E8 80A63CD8 10000011 */ beq $zero, $zero, .L80A63D20 /* 089EC 80A63CDC E7AA009C */ swc1 $f10, 0x009C($sp) .L80A63CE0: -/* 089F0 80A63CE0 0C01DE1C */ jal Math_Sins +/* 089F0 80A63CE0 0C01DE1C */ jal Math_SinS ## sins? /* 089F4 80A63CE4 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 089F8 80A63CE8 3C0143C3 */ lui $at, 0x43C3 ## $at = 43C30000 @@ -595,7 +595,7 @@ glabel func_80A634A0 /* 08A04 80A63CF4 46002402 */ mul.s $f16, $f4, $f0 /* 08A08 80A63CF8 46104180 */ add.s $f6, $f8, $f16 /* 08A0C 80A63CFC E7A60094 */ swc1 $f6, 0x0094($sp) -/* 08A10 80A63D00 0C01DE0D */ jal Math_Coss +/* 08A10 80A63D00 0C01DE0D */ jal Math_CosS ## coss? /* 08A14 80A63D04 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 08A18 80A63D08 3C0143C3 */ lui $at, 0x43C3 ## $at = 43C30000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63FA8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63FA8.s index 9639f5acad..40ec36a14e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63FA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63FA8.s @@ -94,7 +94,7 @@ glabel func_80A63FA8 /* 08E00 80A640F0 000B6100 */ sll $t4, $t3, 4 /* 08E04 80A640F4 05830012 */ bgezl $t4, .L80A64140 /* 08E08 80A640F8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 08E0C 80A640FC 0C03F66B */ jal Math_Rand_ZeroOne +/* 08E0C 80A640FC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 08E10 80A64100 AFA50028 */ sw $a1, 0x0028($sp) /* 08E14 80A64104 3C0180A6 */ lui $at, %hi(D_80A669A8) ## $at = 80A60000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64150.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64150.s index 5a1aff152a..73faf795df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64150.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64150.s @@ -111,7 +111,7 @@ glabel func_80A64150 /* 08FE4 80A642D4 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 /* 08FE8 80A642D8 5701001F */ bnel $t8, $at, .L80A64358 /* 08FEC 80A642DC 8FAE002C */ lw $t6, 0x002C($sp) -/* 08FF0 80A642E0 0C03F66B */ jal Math_Rand_ZeroOne +/* 08FF0 80A642E0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 08FF4 80A642E4 00000000 */ nop /* 08FF8 80A642E8 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6437C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6437C.s index 77f02bd467..893b7f0864 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6437C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6437C.s @@ -16,11 +16,11 @@ glabel func_80A6437C /* 090A8 80A64398 004E2023 */ subu $a0, $v0, $t6 /* 090AC 80A6439C 00042400 */ sll $a0, $a0, 16 /* 090B0 80A643A0 00042403 */ sra $a0, $a0, 16 -/* 090B4 80A643A4 0C01DE1C */ jal Math_Sins +/* 090B4 80A643A4 0C01DE1C */ jal Math_SinS ## sins? /* 090B8 80A643A8 A7A4002A */ sh $a0, 0x002A($sp) /* 090BC 80A643AC 87A4002A */ lh $a0, 0x002A($sp) -/* 090C0 80A643B0 0C01DE0D */ jal Math_Coss +/* 090C0 80A643B0 0C01DE0D */ jal Math_CosS ## coss? /* 090C4 80A643B4 E7A00024 */ swc1 $f0, 0x0024($sp) /* 090C8 80A643B8 3C0180A6 */ lui $at, %hi(D_80A669AC) ## $at = 80A60000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6467C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6467C.s index 335f7888f8..181fa77349 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6467C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6467C.s @@ -1,7 +1,7 @@ glabel func_80A6467C /* 0938C 80A6467C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 09390 80A64680 AFBF0014 */ sw $ra, 0x0014($sp) -/* 09394 80A64684 0C03F66B */ jal Math_Rand_ZeroOne +/* 09394 80A64684 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 09398 80A64688 E7AC0018 */ swc1 $f12, 0x0018($sp) /* 0939C 80A6468C C7A40018 */ lwc1 $f4, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64F14.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64F14.s index d93fc923e3..f8b895bc3d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64F14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64F14.s @@ -40,7 +40,7 @@ glabel func_80A64F14 /* 09CA0 80A64F90 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 /* 09CA4 80A64F94 004E2023 */ subu $a0, $v0, $t6 /* 09CA8 80A64F98 00042400 */ sll $a0, $a0, 16 -/* 09CAC 80A64F9C 0C01DE0D */ jal Math_Coss +/* 09CAC 80A64F9C 0C01DE0D */ jal Math_CosS ## coss? /* 09CB0 80A64FA0 00042403 */ sra $a0, $a0, 16 /* 09CB4 80A64FA4 3C0180A6 */ lui $at, %hi(D_80A669C0) ## $at = 80A60000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6506C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6506C.s index 675c2f2e59..99167d77fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6506C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6506C.s @@ -4,7 +4,7 @@ glabel func_80A6506C /* 09D84 80A65074 4485A000 */ mtc1 $a1, $f20 ## $f20 = 0.00 /* 09D88 80A65078 AFBF001C */ sw $ra, 0x001C($sp) /* 09D8C 80A6507C AFA40028 */ sw $a0, 0x0028($sp) -/* 09D90 80A65080 0C03F66B */ jal Math_Rand_ZeroOne +/* 09D90 80A65080 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 09D94 80A65084 AFA60030 */ sw $a2, 0x0030($sp) /* 09D98 80A65088 4614A080 */ add.s $f2, $f20, $f20 @@ -15,7 +15,7 @@ glabel func_80A6506C /* 09DAC 80A6509C 46062200 */ add.s $f8, $f4, $f6 /* 09DB0 80A650A0 46144281 */ sub.s $f10, $f8, $f20 /* 09DB4 80A650A4 E5EA0000 */ swc1 $f10, 0x0000($t7) ## 00000000 -/* 09DB8 80A650A8 0C03F66B */ jal Math_Rand_ZeroOne +/* 09DB8 80A650A8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 09DBC 80A650AC E7A20024 */ swc1 $f2, 0x0024($sp) /* 09DC0 80A650B0 C7B00024 */ lwc1 $f16, 0x0024($sp) @@ -25,7 +25,7 @@ glabel func_80A6506C /* 09DD0 80A650C0 C7040004 */ lwc1 $f4, 0x0004($t8) ## 00000004 /* 09DD4 80A650C4 46049180 */ add.s $f6, $f18, $f4 /* 09DD8 80A650C8 46143201 */ sub.s $f8, $f6, $f20 -/* 09DDC 80A650CC 0C03F66B */ jal Math_Rand_ZeroOne +/* 09DDC 80A650CC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 09DE0 80A650D0 E7280004 */ swc1 $f8, 0x0004($t9) ## 00000004 /* 09DE4 80A650D4 C7AA0024 */ lwc1 $f10, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65108.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65108.s index a3b451cc67..312b1357d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65108.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65108.s @@ -156,7 +156,7 @@ glabel func_80A65108 /* 0A01C 80A6530C 55610018 */ bnel $t3, $at, .L80A65370 /* 0A020 80A65310 8E02014C */ lw $v0, 0x014C($s0) ## 0000014C .L80A65314: -/* 0A024 80A65314 0C03F66B */ jal Math_Rand_ZeroOne +/* 0A024 80A65314 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0A028 80A65318 00000000 */ nop /* 0A02C 80A6531C 3C0180A6 */ lui $at, %hi(D_80A669C4) ## $at = 80A60000 @@ -210,7 +210,7 @@ glabel func_80A65108 /* 0A0E4 80A653D4 45020030 */ bc1fl .L80A65498 /* 0A0E8 80A653D8 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 .L80A653DC: -/* 0A0EC 80A653DC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0A0EC 80A653DC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0A0F0 80A653E0 E7A20054 */ swc1 $f2, 0x0054($sp) /* 0A0F4 80A653E4 3C0180A6 */ lui $at, %hi(D_80A669C8) ## $at = 80A60000 @@ -235,7 +235,7 @@ glabel func_80A65108 /* 0A140 80A65430 260603D8 */ addiu $a2, $s0, 0x03D8 ## $a2 = 000003D8 /* 0A144 80A65434 C7A20054 */ lwc1 $f2, 0x0054($sp) .L80A65438: -/* 0A148 80A65438 0C03F66B */ jal Math_Rand_ZeroOne +/* 0A148 80A65438 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0A14C 80A6543C E7A20054 */ swc1 $f2, 0x0054($sp) /* 0A150 80A65440 3C0180A6 */ lui $at, %hi(D_80A669CC) ## $at = 80A60000 @@ -287,7 +287,7 @@ glabel func_80A65108 /* 0A200 80A654F0 45020019 */ bc1fl .L80A65558 /* 0A204 80A654F4 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 .L80A654F8: -/* 0A208 80A654F8 0C03F66B */ jal Math_Rand_ZeroOne +/* 0A208 80A654F8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0A20C 80A654FC E7A20054 */ swc1 $f2, 0x0054($sp) /* 0A210 80A65500 3C0180A6 */ lui $at, %hi(D_80A669D0) ## $at = 80A60000 @@ -339,7 +339,7 @@ glabel func_80A65108 /* 0A2C0 80A655B0 45020138 */ bc1fl .L80A65A94 /* 0A2C4 80A655B4 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 .L80A655B8: -/* 0A2C8 80A655B8 0C03F66B */ jal Math_Rand_ZeroOne +/* 0A2C8 80A655B8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0A2CC 80A655BC 00000000 */ nop /* 0A2D0 80A655C0 3C0180A6 */ lui $at, %hi(D_80A669D4) ## $at = 80A60000 @@ -482,7 +482,7 @@ glabel func_80A65108 /* 0A4E0 80A657D0 00000000 */ nop /* 0A4E4 80A657D4 4502003C */ bc1fl .L80A658C8 /* 0A4E8 80A657D8 8E18014C */ lw $t8, 0x014C($s0) ## 0000014C -/* 0A4EC 80A657DC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0A4EC 80A657DC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0A4F0 80A657E0 E7A20054 */ swc1 $f2, 0x0054($sp) /* 0A4F4 80A657E4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 @@ -499,7 +499,7 @@ glabel func_80A65108 /* 0A520 80A65810 00000000 */ nop /* 0A524 80A65814 4502002C */ bc1fl .L80A658C8 /* 0A528 80A65818 8E18014C */ lw $t8, 0x014C($s0) ## 0000014C -/* 0A52C 80A6581C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0A52C 80A6581C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0A530 80A65820 00000000 */ nop /* 0A534 80A65824 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -521,7 +521,7 @@ glabel func_80A65108 /* 0A574 80A65864 0C29941B */ jal func_80A6506C /* 0A578 80A65868 260603F0 */ addiu $a2, $s0, 0x03F0 ## $a2 = 000003F0 .L80A6586C: -/* 0A57C 80A6586C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0A57C 80A6586C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0A580 80A65870 00000000 */ nop /* 0A584 80A65874 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -556,7 +556,7 @@ glabel func_80A65108 /* 0A5F0 80A658E0 00000000 */ nop /* 0A5F4 80A658E4 4502003C */ bc1fl .L80A659D8 /* 0A5F8 80A658E8 8E0C014C */ lw $t4, 0x014C($s0) ## 0000014C -/* 0A5FC 80A658EC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0A5FC 80A658EC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0A600 80A658F0 E7A20054 */ swc1 $f2, 0x0054($sp) /* 0A604 80A658F4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -573,7 +573,7 @@ glabel func_80A65108 /* 0A630 80A65920 00000000 */ nop /* 0A634 80A65924 4502002C */ bc1fl .L80A659D8 /* 0A638 80A65928 8E0C014C */ lw $t4, 0x014C($s0) ## 0000014C -/* 0A63C 80A6592C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0A63C 80A6592C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0A640 80A65930 00000000 */ nop /* 0A644 80A65934 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -595,7 +595,7 @@ glabel func_80A65108 /* 0A684 80A65974 0C29941B */ jal func_80A6506C /* 0A688 80A65978 260603F0 */ addiu $a2, $s0, 0x03F0 ## $a2 = 000003F0 .L80A6597C: -/* 0A68C 80A6597C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0A68C 80A6597C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0A690 80A65980 00000000 */ nop /* 0A694 80A65984 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -624,7 +624,7 @@ glabel func_80A65108 /* 0A6E8 80A659D8 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 /* 0A6EC 80A659DC 5581002D */ bnel $t4, $at, .L80A65A94 /* 0A6F0 80A659E0 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 -/* 0A6F4 80A659E4 0C03F66B */ jal Math_Rand_ZeroOne +/* 0A6F4 80A659E4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0A6F8 80A659E8 00000000 */ nop /* 0A6FC 80A659EC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -634,7 +634,7 @@ glabel func_80A65108 /* 0A70C 80A659FC 00000000 */ nop /* 0A710 80A65A00 45020024 */ bc1fl .L80A65A94 /* 0A714 80A65A04 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 -/* 0A718 80A65A08 0C03F66B */ jal Math_Rand_ZeroOne +/* 0A718 80A65A08 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0A71C 80A65A0C 00000000 */ nop /* 0A720 80A65A10 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A705A4.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A705A4.s index 777c0a4154..d4d7026c10 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A705A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A705A4.s @@ -39,7 +39,7 @@ glabel func_80A705A4 /* 01080 80A70630 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000000 /* 01084 80A70634 55C00007 */ bnel $t6, $zero, .L80A70654 /* 01088 80A70638 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0108C 80A7063C 0C01DF64 */ jal Math_Rand_S16Offset +/* 0108C 80A7063C 0C01DF64 */ jal Rand_S16Offset /* 01090 80A70640 AFA60018 */ sw $a2, 0x0018($sp) /* 01094 80A70644 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A711B4.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A711B4.s index ddf6a08efc..d568b6f6e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A711B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A711B4.s @@ -14,7 +14,7 @@ glabel func_80A711B4 /* 01C34 80A711E4 87A5002E */ lh $a1, 0x002E($sp) /* 01C38 80A711E8 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A /* 01C3C 80A711EC 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 01C40 80A711F0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01C40 80A711F0 0C01E1A7 */ jal Math_SmoothStepToS /* 01C44 80A711F4 E7A00028 */ swc1 $f0, 0x0028($sp) /* 01C48 80A711F8 8A180030 */ lwl $t8, 0x0030($s0) ## 00000030 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7134C.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7134C.s index 6eacedc4df..1261c9c8a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7134C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7134C.s @@ -48,7 +48,7 @@ glabel func_80A7134C /* 01E38 80A713E8 87A50036 */ lh $a1, 0x0036($sp) /* 01E3C 80A713EC 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A /* 01E40 80A713F0 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 01E44 80A713F4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01E44 80A713F4 0C01E1A7 */ jal Math_SmoothStepToS /* 01E48 80A713F8 E7A00030 */ swc1 $f0, 0x0030($sp) /* 01E4C 80A713FC 8A0A0030 */ lwl $t2, 0x0030($s0) ## 00000030 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A716B8.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A716B8.s index ba6e90e8e2..697af756a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A716B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A716B8.s @@ -219,7 +219,7 @@ glabel func_80A716B8 .L80A719B0: /* 02400 80A719B0 014E1821 */ addu $v1, $t2, $t6 /* 02404 80A719B4 8464021C */ lh $a0, 0x021C($v1) ## 0000021C -/* 02408 80A719B8 0C01DE1C */ jal Math_Sins +/* 02408 80A719B8 0C01DE1C */ jal Math_SinS ## sins? /* 0240C 80A719BC AFA3001C */ sw $v1, 0x001C($sp) /* 02410 80A719C0 8FA20068 */ lw $v0, 0x0068($sp) @@ -236,7 +236,7 @@ glabel func_80A716B8 /* 0243C 80A719EC 44183000 */ mfc1 $t8, $f6 /* 02440 80A719F0 00000000 */ nop /* 02444 80A719F4 A4580002 */ sh $t8, 0x0002($v0) ## 00000002 -/* 02448 80A719F8 0C01DE0D */ jal Math_Coss +/* 02448 80A719F8 0C01DE0D */ jal Math_CosS ## coss? /* 0244C 80A719FC 8464023C */ lh $a0, 0x023C($v1) ## 0000023C /* 02450 80A71A00 8FA20068 */ lw $v0, 0x0068($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79A2C.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79A2C.s index 2cc43a23d2..e384abffea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79A2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79A2C.s @@ -26,7 +26,7 @@ glabel func_80A79A2C /* 00AD4 80A79A84 29010003 */ slti $at, $t0, 0x0003 /* 00AD8 80A79A88 54200007 */ bnel $at, $zero, .L80A79AA8 /* 00ADC 80A79A8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00AE0 80A79A90 0C01DF64 */ jal Math_Rand_S16Offset +/* 00AE0 80A79A90 0C01DF64 */ jal Rand_S16Offset /* 00AE4 80A79A94 AFA60018 */ sw $a2, 0x0018($sp) /* 00AE8 80A79A98 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79C78.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79C78.s index 912da11b7b..ce00915d34 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79C78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79C78.s @@ -82,7 +82,7 @@ glabel func_80A79C78 /* 00E04 80A79DB4 AE4E0004 */ sw $t6, 0x0004($s2) ## 00000028 /* 00E08 80A79DB8 8DAF0008 */ lw $t7, 0x0008($t5) ## 00000008 /* 00E0C 80A79DBC AE4F0008 */ sw $t7, 0x0008($s2) ## 0000002C -/* 00E10 80A79DC0 0C01DE1C */ jal Math_Sins +/* 00E10 80A79DC0 0C01DE1C */ jal Math_SinS ## sins? /* 00E14 80A79DC4 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00E18 80A79DC8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -91,7 +91,7 @@ glabel func_80A79C78 /* 00E24 80A79DD4 46003202 */ mul.s $f8, $f6, $f0 /* 00E28 80A79DD8 46082280 */ add.s $f10, $f4, $f8 /* 00E2C 80A79DDC E62A0024 */ swc1 $f10, 0x0024($s1) ## 00000024 -/* 00E30 80A79DE0 0C01DE0D */ jal Math_Coss +/* 00E30 80A79DE0 0C01DE0D */ jal Math_CosS ## coss? /* 00E34 80A79DE4 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00E38 80A79DE8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A304.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A304.s index 3c69584c23..81777b7ca1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A304.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A304.s @@ -79,7 +79,7 @@ glabel func_80A7A304 /* 01454 80A7A404 0C03DCE3 */ jal Audio_PlaySoundGeneral /* 01458 80A7A408 AFA70010 */ sw $a3, 0x0010($sp) -/* 0145C 80A7A40C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0145C 80A7A40C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01460 80A7A410 00000000 */ nop /* 01464 80A7A414 3C0180A8 */ lui $at, %hi(D_80A7BADC) ## $at = 80A80000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7ABD4.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7ABD4.s index b93d52d4b8..e55fa1f043 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7ABD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7ABD4.s @@ -91,7 +91,7 @@ glabel func_80A7ABD4 /* 01D64 80A7AD14 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 461C4000 /* 01D68 80A7AD18 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 3D75C28F /* 01D6C 80A7AD1C 260402F0 */ addiu $a0, $s0, 0x02F0 ## $a0 = 000002F0 -/* 01D70 80A7AD20 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01D70 80A7AD20 0C01E0C4 */ jal Math_SmoothStepToF /* 01D74 80A7AD24 E7B40010 */ swc1 $f20, 0x0010($sp) /* 01D78 80A7AD28 3C063D75 */ lui $a2, 0x3D75 ## $a2 = 3D750000 @@ -100,7 +100,7 @@ glabel func_80A7ABD4 /* 01D84 80A7AD34 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 3D75C28F /* 01D88 80A7AD38 260402F4 */ addiu $a0, $s0, 0x02F4 ## $a0 = 000002F4 /* 01D8C 80A7AD3C 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 01D90 80A7AD40 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01D90 80A7AD40 0C01E0C4 */ jal Math_SmoothStepToF /* 01D94 80A7AD44 E7B40010 */ swc1 $f20, 0x0010($sp) /* 01D98 80A7AD48 4405A000 */ mfc1 $a1, $f20 @@ -109,7 +109,7 @@ glabel func_80A7ABD4 /* 01DA4 80A7AD54 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 461C4000 /* 01DA8 80A7AD58 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 3D75C28F /* 01DAC 80A7AD5C 260402F8 */ addiu $a0, $s0, 0x02F8 ## $a0 = 000002F8 -/* 01DB0 80A7AD60 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01DB0 80A7AD60 0C01E0C4 */ jal Math_SmoothStepToF /* 01DB4 80A7AD64 E7B40010 */ swc1 $f20, 0x0010($sp) /* 01DB8 80A7AD68 4405A000 */ mfc1 $a1, $f20 @@ -118,7 +118,7 @@ glabel func_80A7ABD4 /* 01DC4 80A7AD74 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 461C4000 /* 01DC8 80A7AD78 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 3D75C28F /* 01DCC 80A7AD7C 260402FC */ addiu $a0, $s0, 0x02FC ## $a0 = 000002FC -/* 01DD0 80A7AD80 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01DD0 80A7AD80 0C01E0C4 */ jal Math_SmoothStepToF /* 01DD4 80A7AD84 E7B40010 */ swc1 $f20, 0x0010($sp) /* 01DD8 80A7AD88 3C063D75 */ lui $a2, 0x3D75 ## $a2 = 3D750000 @@ -127,7 +127,7 @@ glabel func_80A7ABD4 /* 01DE4 80A7AD94 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 3D75C28F /* 01DE8 80A7AD98 26040300 */ addiu $a0, $s0, 0x0300 ## $a0 = 00000300 /* 01DEC 80A7AD9C 3C054316 */ lui $a1, 0x4316 ## $a1 = 43160000 -/* 01DF0 80A7ADA0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01DF0 80A7ADA0 0C01E0C4 */ jal Math_SmoothStepToF /* 01DF4 80A7ADA4 E7B40010 */ swc1 $f20, 0x0010($sp) /* 01DF8 80A7ADA8 3C063D75 */ lui $a2, 0x3D75 ## $a2 = 3D750000 @@ -136,7 +136,7 @@ glabel func_80A7ABD4 /* 01E04 80A7ADB4 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 3D75C28F /* 01E08 80A7ADB8 26040304 */ addiu $a0, $s0, 0x0304 ## $a0 = 00000304 /* 01E0C 80A7ADBC 3C054396 */ lui $a1, 0x4396 ## $a1 = 43960000 -/* 01E10 80A7ADC0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01E10 80A7ADC0 0C01E0C4 */ jal Math_SmoothStepToF /* 01E14 80A7ADC4 E7B40010 */ swc1 $f20, 0x0010($sp) /* 01E18 80A7ADC8 26020024 */ addiu $v0, $s0, 0x0024 ## $v0 = 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AEF0.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AEF0.s index 3ad364fdc3..f493be9e94 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AEF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AEF0.s @@ -13,7 +13,7 @@ glabel func_80A7AEF0 /* 01F6C 80A7AF1C 8C99002C */ lw $t9, 0x002C($a0) ## 0000002C /* 01F70 80A7AF20 ADF90008 */ sw $t9, 0x0008($t7) ## FFFFFFF4 /* 01F74 80A7AF24 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 01F78 80A7AF28 0C01DE1C */ jal Math_Sins +/* 01F78 80A7AF28 0C01DE1C */ jal Math_SinS ## sins? /* 01F7C 80A7AF2C AFA50044 */ sw $a1, 0x0044($sp) /* 01F80 80A7AF30 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 @@ -22,7 +22,7 @@ glabel func_80A7AEF0 /* 01F8C 80A7AF3C 46003202 */ mul.s $f8, $f6, $f0 /* 01F90 80A7AF40 46082280 */ add.s $f10, $f4, $f8 /* 01F94 80A7AF44 E7AA002C */ swc1 $f10, 0x002C($sp) -/* 01F98 80A7AF48 0C01DE0D */ jal Math_Coss +/* 01F98 80A7AF48 0C01DE0D */ jal Math_CosS ## coss? /* 01F9C 80A7AF4C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 01FA0 80A7AF50 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B320.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B320.s index 0b381dcc64..c3bbe4cbf9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B320.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B320.s @@ -135,7 +135,7 @@ glabel func_80A7B320 /* 02524 80A7B4D4 000A5040 */ sll $t2, $t2, 1 /* 02528 80A7B4D8 012A1821 */ addu $v1, $t1, $t2 /* 0252C 80A7B4DC 84640332 */ lh $a0, 0x0332($v1) ## 00000332 -/* 02530 80A7B4E0 0C01DE1C */ jal Math_Sins +/* 02530 80A7B4E0 0C01DE1C */ jal Math_SinS ## sins? /* 02534 80A7B4E4 AFA30024 */ sw $v1, 0x0024($sp) /* 02538 80A7B4E8 8FA20048 */ lw $v0, 0x0048($sp) @@ -152,7 +152,7 @@ glabel func_80A7B320 /* 02564 80A7B514 440D3000 */ mfc1 $t5, $f6 /* 02568 80A7B518 00000000 */ nop /* 0256C 80A7B51C A44D0002 */ sh $t5, 0x0002($v0) ## 00000002 -/* 02570 80A7B520 0C01DE0D */ jal Math_Coss +/* 02570 80A7B520 0C01DE0D */ jal Math_CosS ## coss? /* 02574 80A7B524 84640334 */ lh $a0, 0x0334($v1) ## 00000334 /* 02578 80A7B528 8FA20048 */ lw $v0, 0x0048($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87B1C.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87B1C.s index e295bb578f..8fffdcfc49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87B1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87B1C.s @@ -23,7 +23,7 @@ glabel func_80A87B1C /* 0036C 80A87B6C 10000007 */ beq $zero, $zero, .L80A87B8C /* 00370 80A87B70 A0C80310 */ sb $t0, 0x0310($a2) ## 00000310 .L80A87B74: -/* 00374 80A87B74 0C01DF64 */ jal Math_Rand_S16Offset +/* 00374 80A87B74 0C01DF64 */ jal Rand_S16Offset /* 00378 80A87B78 AFA60018 */ sw $a2, 0x0018($sp) /* 0037C 80A87B7C 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87D94.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87D94.s index 440c807330..b415c837ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87D94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87D94.s @@ -27,7 +27,7 @@ glabel func_80A87D94 /* 005E0 80A87DE0 306F0002 */ andi $t7, $v1, 0x0002 ## $t7 = 00000000 /* 005E4 80A87DE4 51E00034 */ beql $t7, $zero, .L80A87EB8 /* 005E8 80A87DE8 30780001 */ andi $t8, $v1, 0x0001 ## $t8 = 00000000 -/* 005EC 80A87DEC 0C01DF64 */ jal Math_Rand_S16Offset +/* 005EC 80A87DEC 0C01DF64 */ jal Rand_S16Offset /* 005F0 80A87DF0 A200030E */ sb $zero, 0x030E($s0) ## 0000030E /* 005F4 80A87DF4 9618030A */ lhu $t8, 0x030A($s0) ## 0000030A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Draw.s index 4bc2673092..6331ed3fdc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Draw.s @@ -61,7 +61,7 @@ glabel EnJsjutan_Draw /* 00F18 80A8A6B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00F1C 80A8A6BC A20A0175 */ sb $t2, 0x0175($s0) ## 00000175 /* 00F20 80A8A6C0 844400B6 */ lh $a0, 0x00B6($v0) ## 000000B6 -/* 00F24 80A8A6C4 0C01DE1C */ jal Math_Sins +/* 00F24 80A8A6C4 0C01DE1C */ jal Math_SinS ## sins? /* 00F28 80A8A6C8 AFA20078 */ sw $v0, 0x0078($sp) /* 00F2C 80A8A6CC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 @@ -79,7 +79,7 @@ glabel EnJsjutan_Draw /* 00F5C 80A8A6FC 460A4400 */ add.s $f16, $f8, $f10 /* 00F60 80A8A700 46128101 */ sub.s $f4, $f16, $f18 /* 00F64 80A8A704 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -/* 00F68 80A8A708 0C01DE0D */ jal Math_Coss +/* 00F68 80A8A708 0C01DE0D */ jal Math_CosS ## coss? /* 00F6C 80A8A70C 844400B6 */ lh $a0, 0x00B6($v0) ## 000000B6 /* 00F70 80A8A710 3C014270 */ lui $at, 0x4270 ## $at = 42700000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Update.s index 0e099d334a..6124bb00ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Update.s @@ -16,7 +16,7 @@ glabel EnJsjutan_Update /* 00DD8 80A8A578 00812023 */ subu $a0, $a0, $at /* 00DDC 80A8A57C 000420C0 */ sll $a0, $a0, 3 /* 00DE0 80A8A580 00042400 */ sll $a0, $a0, 16 -/* 00DE4 80A8A584 0C01DE1C */ jal Math_Sins +/* 00DE4 80A8A584 0C01DE1C */ jal Math_SinS ## sins? /* 00DE8 80A8A588 00042403 */ sra $a0, $a0, 16 /* 00DEC 80A8A58C 3C014396 */ lui $at, 0x4396 ## $at = 43960000 @@ -40,7 +40,7 @@ glabel EnJsjutan_Update /* 00E34 80A8A5D4 00812023 */ subu $a0, $a0, $at /* 00E38 80A8A5D8 00042080 */ sll $a0, $a0, 2 /* 00E3C 80A8A5DC 00042400 */ sll $a0, $a0, 16 -/* 00E40 80A8A5E0 0C01DE0D */ jal Math_Coss +/* 00E40 80A8A5E0 0C01DE0D */ jal Math_CosS ## coss? /* 00E44 80A8A5E4 00042403 */ sra $a0, $a0, 16 /* 00E48 80A8A5E8 3C014396 */ lui $at, 0x4396 ## $at = 43960000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/func_80A89A6C.s b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/func_80A89A6C.s index ee0dccf253..3055b34291 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/func_80A89A6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/func_80A89A6C.s @@ -489,7 +489,7 @@ glabel func_80A89A6C /* 0097C 80A8A11C 00042400 */ sll $a0, $a0, 16 /* 00980 80A8A120 00042403 */ sra $a0, $a0, 16 /* 00984 80A8A124 E7B200A8 */ swc1 $f18, 0x00A8($sp) -/* 00988 80A8A128 0C01DE1C */ jal Math_Sins +/* 00988 80A8A128 0C01DE1C */ jal Math_SinS ## sins? /* 0098C 80A8A12C A3AB008B */ sb $t3, 0x008B($sp) /* 00990 80A8A130 92580174 */ lbu $t8, 0x0174($s2) ## 00000174 @@ -619,26 +619,26 @@ glabel func_80A89A6C /* 00B68 80A8A308 46082281 */ sub.s $f10, $f4, $f8 /* 00B6C 80A8A30C 8E470060 */ lw $a3, 0x0060($s2) ## 00000060 /* 00B70 80A8A310 44055000 */ mfc1 $a1, $f10 -/* 00B74 80A8A314 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00B74 80A8A314 0C01E107 */ jal Math_ApproachF /* 00B78 80A8A318 00000000 */ nop /* 00B7C 80A8A31C 4406A000 */ mfc1 $a2, $f20 /* 00B80 80A8A320 26440060 */ addiu $a0, $s2, 0x0060 ## $a0 = 00000060 /* 00B84 80A8A324 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 00B88 80A8A328 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00B88 80A8A328 0C01E107 */ jal Math_ApproachF /* 00B8C 80A8A32C 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 00B90 80A8A330 4405C000 */ mfc1 $a1, $f24 /* 00B94 80A8A334 4406A000 */ mfc1 $a2, $f20 /* 00B98 80A8A338 2644016C */ addiu $a0, $s2, 0x016C ## $a0 = 0000016C -/* 00B9C 80A8A33C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00B9C 80A8A33C 0C01E107 */ jal Math_ApproachF /* 00BA0 80A8A340 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 00BA4 80A8A344 3C05C59C */ lui $a1, 0xC59C ## $a1 = C59C0000 /* 00BA8 80A8A348 4406A000 */ mfc1 $a2, $f20 /* 00BAC 80A8A34C 4407D000 */ mfc1 $a3, $f26 /* 00BB0 80A8A350 34A54000 */ ori $a1, $a1, 0x4000 ## $a1 = C59C4000 -/* 00BB4 80A8A354 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00BB4 80A8A354 0C01E107 */ jal Math_ApproachF /* 00BB8 80A8A358 26440170 */ addiu $a0, $s2, 0x0170 ## $a0 = 00000170 .L80A8A35C: @@ -693,7 +693,7 @@ glabel func_80A89A6C /* 00C70 80A8A410 448E5000 */ mtc1 $t6, $f10 ## $f10 = 0.00 /* 00C74 80A8A414 00000000 */ nop /* 00C78 80A8A418 46805620 */ cvt.s.w $f24, $f10 -/* 00C7C 80A8A41C 0C0341F5 */ jal atan2f +/* 00C7C 80A8A41C 0C0341F5 */ jal Math_Atan2F /* 00C80 80A8A420 4600C386 */ mov.s $f14, $f24 /* 00C84 80A8A424 2A210084 */ slti $at, $s1, 0x0084 @@ -724,7 +724,7 @@ glabel func_80A89A6C /* 00CE4 80A8A484 46802520 */ cvt.s.w $f20, $f4 .L80A8A488: /* 00CE8 80A8A488 4600A306 */ mov.s $f12, $f20 -/* 00CEC 80A8A48C 0C0341F5 */ jal atan2f +/* 00CEC 80A8A48C 0C0341F5 */ jal Math_Atan2F /* 00CF0 80A8A490 4600C386 */ mov.s $f14, $f24 /* 00CF4 80A8A494 46000506 */ mov.s $f20, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Draw.s index 8fc0f18d55..1f17c049c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Draw.s @@ -144,14 +144,14 @@ glabel EnKanban_Draw /* 01D24 80A93CC4 46125302 */ mul.s $f12, $f10, $f18 /* 01D28 80A93CC8 0C0342DC */ jal Matrix_RotateX /* 01D2C 80A93CCC 00000000 */ nop -/* 01D30 80A93CD0 0C01DE1C */ jal Math_Sins +/* 01D30 80A93CD0 0C01DE1C */ jal Math_SinS ## sins? /* 01D34 80A93CD4 86040168 */ lh $a0, 0x0168($s0) ## 00000168 /* 01D38 80A93CD8 C6040180 */ lwc1 $f4, 0x0180($s0) ## 00000180 /* 01D3C 80A93CDC 8604016C */ lh $a0, 0x016C($s0) ## 0000016C /* 01D40 80A93CE0 46040002 */ mul.s $f0, $f0, $f4 /* 01D44 80A93CE4 46000085 */ abs.s $f2, $f0 -/* 01D48 80A93CE8 0C01DE1C */ jal Math_Sins +/* 01D48 80A93CE8 0C01DE1C */ jal Math_SinS ## sins? /* 01D4C 80A93CEC E7A20098 */ swc1 $f2, 0x0098($sp) /* 01D50 80A93CF0 C606017C */ lwc1 $f6, 0x017C($s0) ## 0000017C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s index a9f6db4387..258e095542 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s @@ -437,7 +437,7 @@ glabel L80A922CC /* 00804 80A927A4 C4880004 */ lwc1 $f8, 0x0004($a0) ## 00000004 /* 00808 80A927A8 A20B0154 */ sb $t3, 0x0154($s0) ## 00000154 /* 0080C 80A927AC E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -/* 00810 80A927B0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00810 80A927B0 0C00CFC8 */ jal Rand_CenteredFloat /* 00814 80A927B4 E6080180 */ swc1 $f8, 0x0180($s0) ## 00000180 /* 00818 80A927B8 4600010D */ trunc.w.s $f4, $f0 @@ -449,7 +449,7 @@ glabel L80A922CC /* 00830 80A927D0 01A17021 */ addu $t6, $t5, $at /* 00834 80A927D4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 00838 80A927D8 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 0083C 80A927DC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0083C 80A927DC 0C00CFBE */ jal Rand_ZeroFloat /* 00840 80A927E0 A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 /* 00844 80A927E4 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -457,7 +457,7 @@ glabel L80A922CC /* 0084C 80A927EC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 00850 80A927F0 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 /* 00854 80A927F4 46060200 */ add.s $f8, $f0, $f6 -/* 00858 80A927F8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00858 80A927F8 0C00CFBE */ jal Rand_ZeroFloat /* 0085C 80A927FC E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 /* 00860 80A92800 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -469,7 +469,7 @@ glabel L80A922CC /* 00878 80A92818 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 0087C 80A9281C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00880 80A92820 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 00884 80A92824 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00884 80A92824 0C00CFBE */ jal Rand_ZeroFloat /* 00888 80A92828 00000000 */ nop /* 0088C 80A9282C 4600018D */ trunc.w.s $f6, $f0 @@ -478,7 +478,7 @@ glabel L80A922CC /* 00898 80A92838 44093000 */ mfc1 $t1, $f6 /* 0089C 80A9283C 00000000 */ nop /* 008A0 80A92840 252A0006 */ addiu $t2, $t1, 0x0006 ## $t2 = 00000006 -/* 008A4 80A92844 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 008A4 80A92844 0C00CFBE */ jal Rand_ZeroFloat /* 008A8 80A92848 A60A0176 */ sh $t2, 0x0176($s0) ## 00000176 /* 008AC 80A9284C 4600020D */ trunc.w.s $f8, $f0 @@ -490,7 +490,7 @@ glabel L80A922CC .L80A92864: /* 008C4 80A92864 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 008C8 80A92868 44816000 */ mtc1 $at, $f12 ## $f12 = 7.00 -/* 008CC 80A9286C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 008CC 80A9286C 0C00CFBE */ jal Rand_ZeroFloat /* 008D0 80A92870 00000000 */ nop /* 008D4 80A92874 4600028D */ trunc.w.s $f10, $f0 @@ -499,7 +499,7 @@ glabel L80A922CC /* 008E0 80A92880 440A5000 */ mfc1 $t2, $f10 /* 008E4 80A92884 00000000 */ nop /* 008E8 80A92888 254C0003 */ addiu $t4, $t2, 0x0003 ## $t4 = 00000003 -/* 008EC 80A9288C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 008EC 80A9288C 0C00CFBE */ jal Rand_ZeroFloat /* 008F0 80A92890 A60C0176 */ sh $t4, 0x0176($s0) ## 00000176 /* 008F4 80A92894 4600010D */ trunc.w.s $f4, $f0 @@ -510,12 +510,12 @@ glabel L80A922CC .L80A928A8: /* 00908 80A928A8 3C0145C0 */ lui $at, 0x45C0 ## $at = 45C00000 /* 0090C 80A928AC 44816000 */ mtc1 $at, $f12 ## $f12 = 6144.00 -/* 00910 80A928B0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00910 80A928B0 0C00CFC8 */ jal Rand_CenteredFloat /* 00914 80A928B4 00000000 */ nop /* 00918 80A928B8 4600018D */ trunc.w.s $f6, $f0 /* 0091C 80A928BC 44093000 */ mfc1 $t1, $f6 -/* 00920 80A928C0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00920 80A928C0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00924 80A928C4 A6090170 */ sh $t1, 0x0170($s0) ## 00000170 /* 00928 80A928C8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -860,7 +860,7 @@ glabel L80A92A24 /* 00DFC 80A92D9C 3C014680 */ lui $at, 0x4680 ## $at = 46800000 /* 00E00 80A92DA0 44816000 */ mtc1 $at, $f12 ## $f12 = 16384.00 /* 00E04 80A92DA4 46083282 */ mul.s $f10, $f6, $f8 -/* 00E08 80A92DA8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00E08 80A92DA8 0C00CFC8 */ jal Rand_CenteredFloat /* 00E0C 80A92DAC E62A0060 */ swc1 $f10, 0x0060($s1) ## 00000060 /* 00E10 80A92DB0 4600010D */ trunc.w.s $f4, $f0 @@ -894,7 +894,7 @@ glabel L80A92A24 /* 00E78 80A92E18 00000000 */ nop /* 00E7C 80A92E1C A6200176 */ sh $zero, 0x0176($s1) ## 00000176 .L80A92E20: -/* 00E80 80A92E20 0C03F66B */ jal Math_Rand_ZeroOne +/* 00E80 80A92E20 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00E84 80A92E24 00000000 */ nop /* 00E88 80A92E28 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -928,7 +928,7 @@ glabel L80A92A24 /* 00EF0 80A92E90 00000000 */ nop /* 00EF4 80A92E94 A6200178 */ sh $zero, 0x0178($s1) ## 00000178 .L80A92E98: -/* 00EF8 80A92E98 0C03F66B */ jal Math_Rand_ZeroOne +/* 00EF8 80A92E98 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00EFC 80A92E9C 00000000 */ nop /* 00F00 80A92EA0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -949,7 +949,7 @@ glabel L80A92A24 /* 00F34 80A92ED4 00052B80 */ sll $a1, $a1, 14 /* 00F38 80A92ED8 00052C00 */ sll $a1, $a1, 16 /* 00F3C 80A92EDC 00052C03 */ sra $a1, $a1, 16 -/* 00F40 80A92EE0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 00F40 80A92EE0 0C01E1EF */ jal Math_ApproachS /* 00F44 80A92EE4 24072000 */ addiu $a3, $zero, 0x2000 ## $a3 = 00002000 /* 00F48 80A92EE8 1000000F */ beq $zero, $zero, .L80A92F28 @@ -1033,7 +1033,7 @@ glabel L80A92A24 /* 01068 80A93008 46004182 */ mul.s $f6, $f8, $f0 /* 0106C 80A9300C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 01070 80A93010 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 01074 80A93014 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01074 80A93014 0C00CFC8 */ jal Rand_CenteredFloat /* 01078 80A93018 460A3300 */ add.s $f12, $f6, $f10 /* 0107C 80A9301C C6240024 */ lwc1 $f4, 0x0024($s1) ## 00000024 @@ -1053,7 +1053,7 @@ glabel L80A92A24 /* 010B0 80A93050 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 010B4 80A93054 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 /* 010B8 80A93058 46085182 */ mul.s $f6, $f10, $f8 -/* 010BC 80A9305C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 010BC 80A9305C 0C00CFC8 */ jal Rand_CenteredFloat /* 010C0 80A93060 46043300 */ add.s $f12, $f6, $f4 /* 010C4 80A93064 C62A002C */ lwc1 $f10, 0x002C($s1) ## 0000002C @@ -1104,7 +1104,7 @@ glabel L80A930DC .L80A930FC: /* 0115C 80A930FC 3C0542C8 */ lui $a1, 0x42C8 ## $a1 = 42C80000 /* 01160 80A93100 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01164 80A93104 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01164 80A93104 0C01E107 */ jal Math_ApproachF /* 01168 80A93108 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 0116C 80A9310C 922D0154 */ lbu $t5, 0x0154($s1) ## 00000154 @@ -1136,7 +1136,7 @@ glabel L80A930DC /* 011D4 80A93174 45020028 */ bc1fl .L80A93218 /* 011D8 80A93178 962B0088 */ lhu $t3, 0x0088($s1) ## 00000088 /* 011DC 80A9317C 44050000 */ mfc1 $a1, $f0 -/* 011E0 80A93180 0C01E107 */ jal Math_SmoothScaleMaxF +/* 011E0 80A93180 0C01E107 */ jal Math_ApproachF /* 011E4 80A93184 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD /* 011E8 80A93188 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -1155,7 +1155,7 @@ glabel L80A930DC /* 01218 80A931B8 24071000 */ addiu $a3, $zero, 0x1000 ## $a3 = 00001000 /* 0121C 80A931BC 00A12821 */ addu $a1, $a1, $at /* 01220 80A931C0 00052C00 */ sll $a1, $a1, 16 -/* 01224 80A931C4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01224 80A931C4 0C01E1A7 */ jal Math_SmoothStepToS /* 01228 80A931C8 00052C03 */ sra $a1, $a1, 16 /* 0122C 80A931CC 18400009 */ blez $v0, .L80A931F4 @@ -1228,7 +1228,7 @@ glabel L80A930DC .L80A932C4: /* 01324 80A932C4 A62E0170 */ sh $t6, 0x0170($s1) ## 00000170 .L80A932C8: -/* 01328 80A932C8 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01328 80A932C8 0C01E123 */ jal Math_ApproachZeroF /* 0132C 80A932CC 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E19999A /* 01330 80A932D0 862F00B6 */ lh $t7, 0x00B6($s1) ## 000000B6 @@ -1239,7 +1239,7 @@ glabel L80A930DC /* 01340 80A932E0 01EBC021 */ addu $t8, $t7, $t3 /* 01344 80A932E4 A63800B6 */ sh $t8, 0x00B6($s1) ## 000000B6 /* 01348 80A932E8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0134C 80A932EC 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0134C 80A932EC 0C01E1EF */ jal Math_ApproachS /* 01350 80A932F0 2407003A */ addiu $a3, $zero, 0x003A ## $a3 = 0000003A /* 01354 80A932F4 86250184 */ lh $a1, 0x0184($s1) ## 00000184 @@ -1248,7 +1248,7 @@ glabel L80A930DC /* 01360 80A93300 00052B80 */ sll $a1, $a1, 14 /* 01364 80A93304 00052C00 */ sll $a1, $a1, 16 /* 01368 80A93308 00052C03 */ sra $a1, $a1, 16 -/* 0136C 80A9330C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0136C 80A9330C 0C01E1EF */ jal Math_ApproachS /* 01370 80A93310 24071000 */ addiu $a3, $zero, 0x1000 ## $a3 = 00001000 /* 01374 80A93314 92240150 */ lbu $a0, 0x0150($s1) ## 00000150 @@ -1261,7 +1261,7 @@ glabel L80A930DC /* 01390 80A93330 00812021 */ addu $a0, $a0, $at /* 01394 80A93334 00042080 */ sll $a0, $a0, 2 /* 01398 80A93338 00042400 */ sll $a0, $a0, 16 -/* 0139C 80A9333C 0C01DE1C */ jal Math_Sins +/* 0139C 80A9333C 0C01DE1C */ jal Math_SinS ## sins? /* 013A0 80A93340 00042403 */ sra $a0, $a0, 16 /* 013A4 80A93344 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 @@ -1274,7 +1274,7 @@ glabel L80A930DC /* 013C0 80A93360 44054000 */ mfc1 $a1, $f8 /* 013C4 80A93364 00000000 */ nop /* 013C8 80A93368 00052C00 */ sll $a1, $a1, 16 -/* 013CC 80A9336C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 013CC 80A9336C 0C01E1EF */ jal Math_ApproachS /* 013D0 80A93370 00052C03 */ sra $a1, $a1, 16 /* 013D4 80A93374 92240150 */ lbu $a0, 0x0150($s1) ## 00000150 @@ -1287,7 +1287,7 @@ glabel L80A930DC /* 013F0 80A93390 00812023 */ subu $a0, $a0, $at /* 013F4 80A93394 000420C0 */ sll $a0, $a0, 3 /* 013F8 80A93398 00042400 */ sll $a0, $a0, 16 -/* 013FC 80A9339C 0C01DE0D */ jal Math_Coss +/* 013FC 80A9339C 0C01DE0D */ jal Math_CosS ## coss? /* 01400 80A933A0 00042403 */ sra $a0, $a0, 16 /* 01404 80A933A4 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 @@ -1300,19 +1300,19 @@ glabel L80A930DC /* 01420 80A933C0 44055000 */ mfc1 $a1, $f10 /* 01424 80A933C4 00000000 */ nop /* 01428 80A933C8 00052C00 */ sll $a1, $a1, 16 -/* 0142C 80A933CC 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0142C 80A933CC 0C01E1EF */ jal Math_ApproachS /* 01430 80A933D0 00052C03 */ sra $a1, $a1, 16 /* 01434 80A933D4 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 01438 80A933D8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 0143C 80A933DC 26240188 */ addiu $a0, $s1, 0x0188 ## $a0 = 00000188 -/* 01440 80A933E0 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01440 80A933E0 0C01E123 */ jal Math_ApproachZeroF /* 01444 80A933E4 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 /* 01448 80A933E8 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 0144C 80A933EC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 01450 80A933F0 26240190 */ addiu $a0, $s1, 0x0190 ## $a0 = 00000190 -/* 01454 80A933F4 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01454 80A933F4 0C01E123 */ jal Math_ApproachZeroF /* 01458 80A933F8 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 /* 0145C 80A933FC C6220068 */ lwc1 $f2, 0x0068($s1) ## 00000068 @@ -1388,7 +1388,7 @@ glabel L80A930DC /* 01560 80A93500 46064102 */ mul.s $f4, $f8, $f6 /* 01564 80A93504 E7A40088 */ swc1 $f4, 0x0088($sp) /* 01568 80A93508 A22F0154 */ sb $t7, 0x0154($s1) ## 00000154 -/* 0156C 80A9350C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0156C 80A9350C 0C00CFC8 */ jal Rand_CenteredFloat /* 01570 80A93510 E62A006C */ swc1 $f10, 0x006C($s1) ## 0000006C /* 01574 80A93514 4600020D */ trunc.w.s $f8, $f0 @@ -1399,7 +1399,7 @@ glabel L80A930DC /* 01588 80A93528 A6380032 */ sh $t8, 0x0032($s1) ## 00000032 /* 0158C 80A9352C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01590 80A93530 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 01594 80A93534 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01594 80A93534 0C00CFBE */ jal Rand_ZeroFloat /* 01598 80A93538 00000000 */ nop /* 0159C 80A9353C 4600018D */ trunc.w.s $f6, $f0 @@ -1408,7 +1408,7 @@ glabel L80A930DC /* 015A8 80A93548 440C3000 */ mfc1 $t4, $f6 /* 015AC 80A9354C 00000000 */ nop /* 015B0 80A93550 258E0006 */ addiu $t6, $t4, 0x0006 ## $t6 = 00000006 -/* 015B4 80A93554 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 015B4 80A93554 0C00CFBE */ jal Rand_ZeroFloat /* 015B8 80A93558 A62E0176 */ sh $t6, 0x0176($s1) ## 00000176 /* 015BC 80A9355C 4600010D */ trunc.w.s $f4, $f0 @@ -1421,7 +1421,7 @@ glabel L80A930DC /* 015D8 80A93578 A6290178 */ sh $t1, 0x0178($s1) ## 00000178 /* 015DC 80A9357C C7A80088 */ lwc1 $f8, 0x0088($sp) /* 015E0 80A93580 46085180 */ add.s $f6, $f10, $f8 -/* 015E4 80A93584 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 015E4 80A93584 0C00CFBE */ jal Rand_ZeroFloat /* 015E8 80A93588 E6260060 */ swc1 $f6, 0x0060($s1) ## 00000060 /* 015EC 80A9358C 1000001A */ beq $zero, $zero, .L80A935F8 @@ -1429,7 +1429,7 @@ glabel L80A930DC .L80A93594: /* 015F4 80A93594 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 015F8 80A93598 44816000 */ mtc1 $at, $f12 ## $f12 = 7.00 -/* 015FC 80A9359C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 015FC 80A9359C 0C00CFBE */ jal Rand_ZeroFloat /* 01600 80A935A0 00000000 */ nop /* 01604 80A935A4 4600010D */ trunc.w.s $f4, $f0 @@ -1438,7 +1438,7 @@ glabel L80A930DC /* 01610 80A935B0 440E2000 */ mfc1 $t6, $f4 /* 01614 80A935B4 00000000 */ nop /* 01618 80A935B8 25CF0003 */ addiu $t7, $t6, 0x0003 ## $t7 = 00000003 -/* 0161C 80A935BC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0161C 80A935BC 0C00CFBE */ jal Rand_ZeroFloat /* 01620 80A935C0 A62F0176 */ sh $t7, 0x0176($s1) ## 00000176 /* 01624 80A935C4 4600028D */ trunc.w.s $f10, $f0 @@ -1451,19 +1451,19 @@ glabel L80A930DC /* 01640 80A935E0 A6390178 */ sh $t9, 0x0178($s1) ## 00000178 /* 01644 80A935E4 C7A60088 */ lwc1 $f6, 0x0088($sp) /* 01648 80A935E8 46064100 */ add.s $f4, $f8, $f6 -/* 0164C 80A935EC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0164C 80A935EC 0C00CFBE */ jal Rand_ZeroFloat /* 01650 80A935F0 E6240060 */ swc1 $f4, 0x0060($s1) ## 00000060 /* 01654 80A935F4 E6200068 */ swc1 $f0, 0x0068($s1) ## 00000068 .L80A935F8: /* 01658 80A935F8 3C0145C0 */ lui $at, 0x45C0 ## $at = 45C00000 /* 0165C 80A935FC 44816000 */ mtc1 $at, $f12 ## $f12 = 6144.00 -/* 01660 80A93600 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01660 80A93600 0C00CFC8 */ jal Rand_CenteredFloat /* 01664 80A93604 00000000 */ nop /* 01668 80A93608 4600028D */ trunc.w.s $f10, $f0 /* 0166C 80A9360C 440C5000 */ mfc1 $t4, $f10 -/* 01670 80A93610 0C03F66B */ jal Math_Rand_ZeroOne +/* 01670 80A93610 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01674 80A93614 A62C0170 */ sh $t4, 0x0170($s1) ## 00000170 /* 01678 80A93618 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -1526,7 +1526,7 @@ glabel L80A930DC /* 0174C 80A936EC 46085182 */ mul.s $f6, $f10, $f8 /* 01750 80A936F0 E7A60074 */ swc1 $f6, 0x0074($sp) /* 01754 80A936F4 A2390154 */ sb $t9, 0x0154($s1) ## 00000154 -/* 01758 80A936F8 0C03F494 */ jal Math_atan2f +/* 01758 80A936F8 0C03F494 */ jal Math_FAtan2F /* 0175C 80A936FC E624006C */ swc1 $f4, 0x006C($s1) ## 0000006C /* 01760 80A93700 3C0180A9 */ lui $at, %hi(D_80A95100) ## $at = 80A90000 /* 01764 80A93704 C42A5100 */ lwc1 $f10, %lo(D_80A95100)($at) @@ -1539,7 +1539,7 @@ glabel L80A930DC /* 01780 80A93720 A62C0032 */ sh $t4, 0x0032($s1) ## 00000032 /* 01784 80A93724 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01788 80A93728 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 0178C 80A9372C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0178C 80A9372C 0C00CFBE */ jal Rand_ZeroFloat /* 01790 80A93730 00000000 */ nop /* 01794 80A93734 4600010D */ trunc.w.s $f4, $f0 @@ -1548,7 +1548,7 @@ glabel L80A930DC /* 017A0 80A93740 440D2000 */ mfc1 $t5, $f4 /* 017A4 80A93744 00000000 */ nop /* 017A8 80A93748 25A90006 */ addiu $t1, $t5, 0x0006 ## $t1 = 00000006 -/* 017AC 80A9374C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 017AC 80A9374C 0C00CFBE */ jal Rand_ZeroFloat /* 017B0 80A93750 A6290176 */ sh $t1, 0x0176($s1) ## 00000176 /* 017B4 80A93754 4600028D */ trunc.w.s $f10, $f0 @@ -1568,7 +1568,7 @@ glabel L80A930DC .L80A9378C: /* 017EC 80A9378C 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 017F0 80A93790 44816000 */ mtc1 $at, $f12 ## $f12 = 7.00 -/* 017F4 80A93794 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 017F4 80A93794 0C00CFBE */ jal Rand_ZeroFloat /* 017F8 80A93798 00000000 */ nop /* 017FC 80A9379C 4600020D */ trunc.w.s $f8, $f0 @@ -1577,7 +1577,7 @@ glabel L80A930DC /* 01808 80A937A8 44094000 */ mfc1 $t1, $f8 /* 0180C 80A937AC 00000000 */ nop /* 01810 80A937B0 25390003 */ addiu $t9, $t1, 0x0003 ## $t9 = 00000003 -/* 01814 80A937B4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01814 80A937B4 0C00CFBE */ jal Rand_ZeroFloat /* 01818 80A937B8 A6390176 */ sh $t9, 0x0176($s1) ## 00000176 /* 0181C 80A937BC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -1596,12 +1596,12 @@ glabel L80A930DC .L80A937F0: /* 01850 80A937F0 3C0145C0 */ lui $at, 0x45C0 ## $at = 45C00000 /* 01854 80A937F4 44816000 */ mtc1 $at, $f12 ## $f12 = 6144.00 -/* 01858 80A937F8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01858 80A937F8 0C00CFC8 */ jal Rand_CenteredFloat /* 0185C 80A937FC 00000000 */ nop /* 01860 80A93800 4600010D */ trunc.w.s $f4, $f0 /* 01864 80A93804 440D2000 */ mfc1 $t5, $f4 -/* 01868 80A93808 0C03F66B */ jal Math_Rand_ZeroOne +/* 01868 80A93808 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0186C 80A9380C A62D0170 */ sh $t5, 0x0170($s1) ## 00000170 /* 01870 80A93810 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -1721,7 +1721,7 @@ glabel L80A93920 /* 01A08 80A939A8 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 01A0C 80A939AC E7A80010 */ swc1 $f8, 0x0010($sp) /* 01A10 80A939B0 44055000 */ mfc1 $a1, $f10 -/* 01A14 80A939B4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01A14 80A939B4 0C01E0C4 */ jal Math_SmoothStepToF /* 01A18 80A939B8 00000000 */ nop /* 01A1C 80A939BC E7A00070 */ swc1 $f0, 0x0070($sp) @@ -1734,7 +1734,7 @@ glabel L80A93920 /* 01A38 80A939D8 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 01A3C 80A939DC E7A80010 */ swc1 $f8, 0x0010($sp) /* 01A40 80A939E0 44055000 */ mfc1 $a1, $f10 -/* 01A44 80A939E4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01A44 80A939E4 0C01E0C4 */ jal Math_SmoothStepToF /* 01A48 80A939E8 00000000 */ nop /* 01A4C 80A939EC E7A0006C */ swc1 $f0, 0x006C($sp) @@ -1747,7 +1747,7 @@ glabel L80A93920 /* 01A68 80A93A08 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 01A6C 80A93A0C E7A80010 */ swc1 $f8, 0x0010($sp) /* 01A70 80A93A10 44055000 */ mfc1 $a1, $f10 -/* 01A74 80A93A14 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01A74 80A93A14 0C01E0C4 */ jal Math_SmoothStepToF /* 01A78 80A93A18 00000000 */ nop /* 01A7C 80A93A1C E7A00068 */ swc1 $f0, 0x0068($sp) @@ -1755,7 +1755,7 @@ glabel L80A93920 /* 01A84 80A93A24 AFA00010 */ sw $zero, 0x0010($sp) /* 01A88 80A93A28 262400B4 */ addiu $a0, $s1, 0x00B4 ## $a0 = 000000B4 /* 01A8C 80A93A2C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01A90 80A93A30 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01A90 80A93A30 0C01E1A7 */ jal Math_SmoothStepToS /* 01A94 80A93A34 24070200 */ addiu $a3, $zero, 0x0200 ## $a3 = 00000200 /* 01A98 80A93A38 A7A20066 */ sh $v0, 0x0066($sp) @@ -1763,7 +1763,7 @@ glabel L80A93920 /* 01AA0 80A93A40 AFA00010 */ sw $zero, 0x0010($sp) /* 01AA4 80A93A44 262400B6 */ addiu $a0, $s1, 0x00B6 ## $a0 = 000000B6 /* 01AA8 80A93A48 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01AAC 80A93A4C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01AAC 80A93A4C 0C01E1A7 */ jal Math_SmoothStepToS /* 01AB0 80A93A50 24070200 */ addiu $a3, $zero, 0x0200 ## $a3 = 00000200 /* 01AB4 80A93A54 A7A20064 */ sh $v0, 0x0064($sp) @@ -1771,37 +1771,37 @@ glabel L80A93920 /* 01ABC 80A93A5C AFA00010 */ sw $zero, 0x0010($sp) /* 01AC0 80A93A60 262400B8 */ addiu $a0, $s1, 0x00B8 ## $a0 = 000000B8 /* 01AC4 80A93A64 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01AC8 80A93A68 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01AC8 80A93A68 0C01E1A7 */ jal Math_SmoothStepToS /* 01ACC 80A93A6C 24070200 */ addiu $a3, $zero, 0x0200 ## $a3 = 00000200 /* 01AD0 80A93A70 A7A20062 */ sh $v0, 0x0062($sp) /* 01AD4 80A93A74 26240168 */ addiu $a0, $s1, 0x0168 ## $a0 = 00000168 /* 01AD8 80A93A78 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01ADC 80A93A7C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01AE0 80A93A80 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01AE0 80A93A80 0C01E1EF */ jal Math_ApproachS /* 01AE4 80A93A84 24070200 */ addiu $a3, $zero, 0x0200 ## $a3 = 00000200 /* 01AE8 80A93A88 2624016C */ addiu $a0, $s1, 0x016C ## $a0 = 0000016C /* 01AEC 80A93A8C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01AF0 80A93A90 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01AF4 80A93A94 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01AF4 80A93A94 0C01E1EF */ jal Math_ApproachS /* 01AF8 80A93A98 24070200 */ addiu $a3, $zero, 0x0200 ## $a3 = 00000200 /* 01AFC 80A93A9C 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 01B00 80A93AA0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 01B04 80A93AA4 26240188 */ addiu $a0, $s1, 0x0188 ## $a0 = 00000188 -/* 01B08 80A93AA8 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01B08 80A93AA8 0C01E123 */ jal Math_ApproachZeroF /* 01B0C 80A93AAC 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 01B10 80A93AB0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 01B14 80A93AB4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 01B18 80A93AB8 26240190 */ addiu $a0, $s1, 0x0190 ## $a0 = 00000190 -/* 01B1C 80A93ABC 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01B1C 80A93ABC 0C01E123 */ jal Math_ApproachZeroF /* 01B20 80A93AC0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 01B24 80A93AC4 262400BC */ addiu $a0, $s1, 0x00BC ## $a0 = 000000BC /* 01B28 80A93AC8 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 01B2C 80A93ACC 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01B2C 80A93ACC 0C01E123 */ jal Math_ApproachZeroF /* 01B30 80A93AD0 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 01B34 80A93AD4 C7A60070 */ lwc1 $f6, 0x0070($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kanban/func_80A91FA0.s b/asm/non_matchings/overlays/actors/ovl_En_Kanban/func_80A91FA0.s index d2c7c78429..e5adeced16 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kanban/func_80A91FA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kanban/func_80A91FA0.s @@ -31,7 +31,7 @@ glabel func_80A91FA0 /* 00060 80A92000 E7B00018 */ swc1 $f16, 0x0018($sp) /* 00064 80A92004 46000207 */ neg.s $f8, $f0 /* 00068 80A92008 46104302 */ mul.s $f12, $f8, $f16 -/* 0006C 80A9200C 0C03F494 */ jal Math_atan2f +/* 0006C 80A9200C 0C03F494 */ jal Math_FAtan2F /* 00070 80A92010 00000000 */ nop /* 00074 80A92014 8FA80020 */ lw $t0, 0x0020($sp) /* 00078 80A92018 46000287 */ neg.s $f10, $f0 @@ -42,7 +42,7 @@ glabel func_80A91FA0 /* 0008C 80A9202C 44817000 */ mtc1 $at, $f14 ## $f14 = 1.00 /* 00090 80A92030 46009107 */ neg.s $f4, $f18 /* 00094 80A92034 46102302 */ mul.s $f12, $f4, $f16 -/* 00098 80A92038 0C03F494 */ jal Math_atan2f +/* 00098 80A92038 0C03F494 */ jal Math_FAtan2F /* 0009C 80A9203C 00000000 */ nop /* 000A0 80A92040 8FA90020 */ lw $t1, 0x0020($sp) /* 000A4 80A92044 E5200190 */ swc1 $f0, 0x0190($t1) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98C18.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98C18.s index 85f46e490e..ea8517c7fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98C18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98C18.s @@ -40,7 +40,7 @@ glabel func_80A98C18 /* 01EF8 80A98CA8 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000000 /* 01EFC 80A98CAC 55C00007 */ bnel $t6, $zero, .L80A98CCC /* 01F00 80A98CB0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01F04 80A98CB4 0C01DF64 */ jal Math_Rand_S16Offset +/* 01F04 80A98CB4 0C01DF64 */ jal Rand_S16Offset /* 01F08 80A98CB8 AFA60018 */ sw $a2, 0x0018($sp) /* 01F0C 80A98CBC 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98DB4.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98DB4.s index b40c1e6e75..1a258c3dc1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98DB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98DB4.s @@ -54,7 +54,7 @@ glabel func_80A98DB4 .L80A98E6C: /* 020BC 80A98E6C 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 /* 020C0 80A98E70 44050000 */ mfc1 $a1, $f0 -/* 020C4 80A98E74 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 020C4 80A98E74 0C01E0C4 */ jal Math_SmoothStepToF /* 020C8 80A98E78 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 020CC 80A98E7C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A995CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A995CC.s index e0147f14e3..8ccbf5f189 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A995CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A995CC.s @@ -17,7 +17,7 @@ glabel func_80A995CC /* 02840 80A995F0 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 /* 02844 80A995F4 00022400 */ sll $a0, $v0, 16 /* 02848 80A995F8 00042403 */ sra $a0, $a0, 16 -/* 0284C 80A995FC 0C01DE1C */ jal Math_Sins +/* 0284C 80A995FC 0C01DE1C */ jal Math_SinS ## sins? /* 02850 80A99600 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 /* 02854 80A99604 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 @@ -28,7 +28,7 @@ glabel func_80A995CC /* 02868 80A99618 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C /* 0286C 80A9961C 460A3400 */ add.s $f16, $f6, $f10 /* 02870 80A99620 E6100024 */ swc1 $f16, 0x0024($s0) ## 00000024 -/* 02874 80A99624 0C01DE0D */ jal Math_Coss +/* 02874 80A99624 0C01DE0D */ jal Math_CosS ## coss? /* 02878 80A99628 87A40022 */ lh $a0, 0x0022($sp) /* 0287C 80A9962C 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99864.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99864.s index 34e32dc617..27a5dcee21 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99864.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99864.s @@ -198,7 +198,7 @@ glabel func_80A99864 .L80A99B28: /* 02D78 80A99B28 020D1821 */ addu $v1, $s0, $t5 /* 02D7C 80A99B2C 846402E4 */ lh $a0, 0x02E4($v1) ## 000002E4 -/* 02D80 80A99B30 0C01DE1C */ jal Math_Sins +/* 02D80 80A99B30 0C01DE1C */ jal Math_SinS ## sins? /* 02D84 80A99B34 AFA30028 */ sw $v1, 0x0028($sp) /* 02D88 80A99B38 8FA20060 */ lw $v0, 0x0060($sp) @@ -215,7 +215,7 @@ glabel func_80A99864 /* 02DB4 80A99B64 44183000 */ mfc1 $t8, $f6 /* 02DB8 80A99B68 00000000 */ nop /* 02DBC 80A99B6C A4580002 */ sh $t8, 0x0002($v0) ## 00000002 -/* 02DC0 80A99B70 0C01DE0D */ jal Math_Coss +/* 02DC0 80A99B70 0C01DE0D */ jal Math_CosS ## coss? /* 02DC4 80A99B74 84640304 */ lh $a0, 0x0304($v1) ## 00000304 /* 02DC8 80A99B78 8FA20060 */ lw $v0, 0x0060($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F9B4.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F9B4.s index 7dd36a6d47..7d8462841d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F9B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F9B4.s @@ -16,7 +16,7 @@ glabel func_80A9F9B4 /* 009EC 80A9F9CC 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC /* 009F0 80A9F9D0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 009F4 80A9F9D4 3C063D80 */ lui $a2, 0x3D80 ## $a2 = 3D800000 -/* 009F8 80A9F9D8 0C01DE80 */ jal Math_ApproxF +/* 009F8 80A9F9D8 0C01DE80 */ jal Math_StepToF /* 009FC 80A9F9DC AFAF002C */ sw $t7, 0x002C($sp) /* 00A00 80A9F9E0 50400006 */ beql $v0, $zero, .L80A9F9FC @@ -38,7 +38,7 @@ glabel func_80A9F9B4 /* 00A38 80A9FA18 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 /* 00A3C 80A9FA1C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00A40 80A9FA20 44052000 */ mfc1 $a1, $f4 -/* 00A44 80A9FA24 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00A44 80A9FA24 0C01E0C4 */ jal Math_SmoothStepToF /* 00A48 80A9FA28 00000000 */ nop /* 00A4C 80A9FA2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Update.s index 5007b2df8a..22ec3315cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Update.s @@ -73,7 +73,7 @@ glabel EnMk_Update .L80AAD3C4: /* 00AC4 80AAD3C4 240D0064 */ addiu $t5, $zero, 0x0064 ## $t5 = 00000064 /* 00AC8 80AAD3C8 AFAD0010 */ sw $t5, 0x0010($sp) -/* 00ACC 80AAD3CC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00ACC 80AAD3CC 0C01E1A7 */ jal Math_SmoothStepToS /* 00AD0 80AAD3D0 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 00AD4 80AAD3D4 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 @@ -81,7 +81,7 @@ glabel EnMk_Update /* 00ADC 80AAD3DC 2604027A */ addiu $a0, $s0, 0x027A ## $a0 = 0000027A /* 00AE0 80AAD3E0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00AE4 80AAD3E4 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00AE8 80AAD3E8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00AE8 80AAD3E8 0C01E1A7 */ jal Math_SmoothStepToS /* 00AEC 80AAD3EC 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 00AF0 80AAD3F0 9605027E */ lhu $a1, 0x027E($s0) ## 0000027E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADEF0.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADEF0.s index ed154798b0..44b8afca0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADEF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADEF0.s @@ -35,7 +35,7 @@ glabel func_80AADEF0 /* 007D8 80AADF48 46062501 */ sub.s $f20, $f4, $f6 /* 007DC 80AADF4C 460A4581 */ sub.s $f22, $f8, $f10 /* 007E0 80AADF50 4600A306 */ mov.s $f12, $f20 -/* 007E4 80AADF54 0C03F494 */ jal Math_atan2f +/* 007E4 80AADF54 0C03F494 */ jal Math_FAtan2F /* 007E8 80AADF58 4600B386 */ mov.s $f14, $f22 /* 007EC 80AADF5C 3C0180AB */ lui $at, %hi(D_80AAEC6C) ## $at = 80AB0000 /* 007F0 80AADF60 C430EC6C */ lwc1 $f16, %lo(D_80AAEC6C)($at) @@ -160,7 +160,7 @@ glabel func_80AADEF0 /* 00994 80AAE104 46062501 */ sub.s $f20, $f4, $f6 /* 00998 80AAE108 460A4581 */ sub.s $f22, $f8, $f10 /* 0099C 80AAE10C 4600A306 */ mov.s $f12, $f20 -/* 009A0 80AAE110 0C03F494 */ jal Math_atan2f +/* 009A0 80AAE110 0C03F494 */ jal Math_FAtan2F /* 009A4 80AAE114 4600B386 */ mov.s $f14, $f22 /* 009A8 80AAE118 3C0180AB */ lui $at, %hi(D_80AAEC74) ## $at = 80AB0000 /* 009AC 80AAE11C C430EC74 */ lwc1 $f16, %lo(D_80AAEC74)($at) @@ -197,7 +197,7 @@ glabel func_80AADEF0 /* 00A24 80AAE194 44053000 */ mfc1 $a1, $f6 /* 00A28 80AAE198 00000000 */ nop /* 00A2C 80AAE19C 00052C00 */ sll $a1, $a1, 16 -/* 00A30 80AAE1A0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00A30 80AAE1A0 0C01E1A7 */ jal Math_SmoothStepToS /* 00A34 80AAE1A4 00052C03 */ sra $a1, $a1, 16 /* 00A38 80AAE1A8 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 @@ -208,7 +208,7 @@ glabel func_80AADEF0 /* 00A4C 80AAE1BC A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 /* 00A50 80AAE1C0 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3F19999A /* 00A54 80AAE1C4 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00A58 80AAE1C8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00A58 80AAE1C8 0C01E0C4 */ jal Math_SmoothStepToF /* 00A5C 80AAE1CC E7B40010 */ swc1 $f20, 0x0010($sp) /* 00A60 80AAE1D0 0C00B638 */ jal Actor_MoveForward diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Update.s index beb5fefb1e..a49422a2c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Update.s @@ -27,7 +27,7 @@ glabel EnMm2_Update /* 009A0 80AAF7F0 AFA80010 */ sw $t0, 0x0010($sp) /* 009A4 80AAF7F4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 009A8 80AAF7F8 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 009AC 80AAF7FC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 009AC 80AAF7FC 0C01E1A7 */ jal Math_SmoothStepToS /* 009B0 80AAF800 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 009B4 80AAF804 24090064 */ addiu $t1, $zero, 0x0064 ## $t1 = 00000064 @@ -35,7 +35,7 @@ glabel EnMm2_Update /* 009BC 80AAF80C 260401EA */ addiu $a0, $s0, 0x01EA ## $a0 = 000001EA /* 009C0 80AAF810 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 009C4 80AAF814 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 009C8 80AAF818 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 009C8 80AAF818 0C01E1A7 */ jal Math_SmoothStepToS /* 009CC 80AAF81C 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 009D0 80AAF820 240A0064 */ addiu $t2, $zero, 0x0064 ## $t2 = 00000064 @@ -43,7 +43,7 @@ glabel EnMm2_Update /* 009D8 80AAF828 260401EE */ addiu $a0, $s0, 0x01EE ## $a0 = 000001EE /* 009DC 80AAF82C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 009E0 80AAF830 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 009E4 80AAF834 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 009E4 80AAF834 0C01E1A7 */ jal Math_SmoothStepToS /* 009E8 80AAF838 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 009EC 80AAF83C 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064 @@ -51,7 +51,7 @@ glabel EnMm2_Update /* 009F4 80AAF844 260401F0 */ addiu $a0, $s0, 0x01F0 ## $a0 = 000001F0 /* 009F8 80AAF848 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 009FC 80AAF84C 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00A00 80AAF850 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00A00 80AAF850 0C01E1A7 */ jal Math_SmoothStepToS /* 00A04 80AAF854 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 00A08 80AAF858 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF2BC.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF2BC.s index 0db0ebb615..4265c2d534 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF2BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAF2BC.s @@ -24,7 +24,7 @@ glabel func_80AAF2BC /* 004B8 80AAF308 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 004BC 80AAF30C 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 004C0 80AAF310 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 -/* 004C4 80AAF314 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 004C4 80AAF314 0C01E0C4 */ jal Math_SmoothStepToF /* 004C8 80AAF318 E7A40010 */ swc1 $f4, 0x0010($sp) /* 004CC 80AAF31C 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0428.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0428.s index 9d208b554a..413a32b98a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0428.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0428.s @@ -23,7 +23,7 @@ glabel func_80AB0428 /* 0005C 80AB047C 304EFFE0 */ andi $t6, $v0, 0xFFE0 ## $t6 = 00000000 /* 00060 80AB0480 A0ED0004 */ sb $t5, 0x0004($a3) ## FFFFFFF4 /* 00064 80AB0484 A50E13FE */ sh $t6, 0x13FE($t0) ## 8015FA5E -/* 00068 80AB0488 0C03F66B */ jal Math_Rand_ZeroOne +/* 00068 80AB0488 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0006C 80AB048C A3A60027 */ sb $a2, 0x0027($sp) /* 00070 80AB0490 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB08A4.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB08A4.s index 1dc604a1cf..90a87dadf7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB08A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB08A4.s @@ -24,7 +24,7 @@ glabel func_80AB08A4 /* 004D8 80AB08F8 00057840 */ sll $t7, $a1, 1 /* 004DC 80AB08FC 01CF1821 */ addu $v1, $t6, $t7 /* 004E0 80AB0900 8464020A */ lh $a0, 0x020A($v1) ## 0000020A -/* 004E4 80AB0904 0C01DE1C */ jal Math_Sins +/* 004E4 80AB0904 0C01DE1C */ jal Math_SinS ## sins? /* 004E8 80AB0908 AFA3001C */ sw $v1, 0x001C($sp) /* 004EC 80AB090C 8FA20038 */ lw $v0, 0x0038($sp) @@ -41,7 +41,7 @@ glabel func_80AB08A4 /* 00518 80AB0938 44089000 */ mfc1 $t0, $f18 /* 0051C 80AB093C 00000000 */ nop /* 00520 80AB0940 A4480002 */ sh $t0, 0x0002($v0) ## 00000002 -/* 00524 80AB0944 0C01DE0D */ jal Math_Coss +/* 00524 80AB0944 0C01DE0D */ jal Math_CosS ## coss? /* 00528 80AB0948 8464022A */ lh $a0, 0x022A($v1) ## 0000022A /* 0052C 80AB094C 8FA20038 */ lw $v0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s index 318cc37272..fc10e076b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s @@ -172,7 +172,7 @@ glabel EnNy_Draw /* 013D0 80ABDF80 A2390114 */ sb $t9, 0x0114($s1) ## 00000114 /* 013D4 80ABDF84 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 013D8 80ABDF88 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 013DC 80ABDF8C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 013DC 80ABDF8C 0C00CFC8 */ jal Rand_CenteredFloat /* 013E0 80ABDF90 A7A20036 */ sh $v0, 0x0036($sp) /* 013E4 80ABDF94 87A20036 */ lh $v0, 0x0036($sp) @@ -189,7 +189,7 @@ glabel EnNy_Draw /* 01410 80ABDFC0 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 01414 80ABDFC4 46083280 */ add.s $f10, $f6, $f8 /* 01418 80ABDFC8 460A0400 */ add.s $f16, $f0, $f10 -/* 0141C 80ABDFCC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0141C 80ABDFCC 0C00CFC8 */ jal Rand_CenteredFloat /* 01420 80ABDFD0 E7B0003C */ swc1 $f16, 0x003C($sp) /* 01424 80ABDFD4 C6320028 */ lwc1 $f18, 0x0028($s1) ## 00000028 @@ -198,7 +198,7 @@ glabel EnNy_Draw /* 01430 80ABDFE0 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 01434 80ABDFE4 46049180 */ add.s $f6, $f18, $f4 /* 01438 80ABDFE8 46060200 */ add.s $f8, $f0, $f6 -/* 0143C 80ABDFEC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0143C 80ABDFEC 0C00CFC8 */ jal Rand_CenteredFloat /* 01440 80ABDFF0 E7A80040 */ swc1 $f8, 0x0040($sp) /* 01444 80ABDFF4 C62A002C */ lwc1 $f10, 0x002C($s1) ## 0000002C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Update.s index 1b69bee109..0bac67c740 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Update.s @@ -73,7 +73,7 @@ glabel EnNy_Update /* 009E4 80ABD594 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 009E8 80ABD598 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 009EC 80ABD59C 264401E4 */ addiu $a0, $s2, 0x01E4 ## $a0 = 000001E4 -/* 009F0 80ABD5A0 0C01DE80 */ jal Math_ApproxF +/* 009F0 80ABD5A0 0C01DE80 */ jal Math_StepToF /* 009F4 80ABD5A4 8E4501E8 */ lw $a1, 0x01E8($s2) ## 000001E8 /* 009F8 80ABD5A8 8E59014C */ lw $t9, 0x014C($s2) ## 0000014C @@ -112,19 +112,19 @@ glabel EnNy_Update /* 00A7C 80ABD62C 02408025 */ or $s0, $s2, $zero ## $s0 = 00000000 /* 00A80 80ABD630 24130008 */ addiu $s3, $zero, 0x0008 ## $s3 = 00000008 .L80ABD634: -/* 00A84 80ABD634 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00A84 80ABD634 0C00CFC8 */ jal Rand_CenteredFloat /* 00A88 80ABD638 4600A306 */ mov.s $f12, $f20 /* 00A8C 80ABD63C C6500024 */ lwc1 $f16, 0x0024($s2) ## 00000024 /* 00A90 80ABD640 4600A306 */ mov.s $f12, $f20 /* 00A94 80ABD644 46100480 */ add.s $f18, $f0, $f16 -/* 00A98 80ABD648 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00A98 80ABD648 0C00CFC8 */ jal Rand_CenteredFloat /* 00A9C 80ABD64C E61201F8 */ swc1 $f18, 0x01F8($s0) ## 000001F8 /* 00AA0 80ABD650 C6440028 */ lwc1 $f4, 0x0028($s2) ## 00000028 /* 00AA4 80ABD654 4600A306 */ mov.s $f12, $f20 /* 00AA8 80ABD658 46040180 */ add.s $f6, $f0, $f4 -/* 00AAC 80ABD65C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00AAC 80ABD65C 0C00CFC8 */ jal Rand_CenteredFloat /* 00AB0 80ABD660 E60601FC */ swc1 $f6, 0x01FC($s0) ## 000001FC /* 00AB4 80ABD664 C648002C */ lwc1 $f8, 0x002C($s2) ## 0000002C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCF4C.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCF4C.s index 3b2c44cf2c..9037c4e25a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCF4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCF4C.s @@ -37,19 +37,19 @@ glabel func_80ABCF4C /* 0041C 80ABCFCC 44075000 */ mfc1 $a3, $f10 /* 00420 80ABCFD0 00000000 */ nop /* 00424 80ABCFD4 00073C00 */ sll $a3, $a3, 16 -/* 00428 80ABCFD8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00428 80ABCFD8 0C01E1A7 */ jal Math_SmoothStepToS /* 0042C 80ABCFDC 00073C03 */ sra $a3, $a3, 16 /* 00430 80ABCFE0 260401F4 */ addiu $a0, $s0, 0x01F4 ## $a0 = 000001F4 /* 00434 80ABCFE4 3C0544FA */ lui $a1, 0x44FA ## $a1 = 44FA0000 /* 00438 80ABCFE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0043C 80ABCFEC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0043C 80ABCFEC 0C01E107 */ jal Math_ApproachF /* 00440 80ABCFF0 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 00444 80ABCFF4 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 /* 00448 80ABCFF8 C60C0094 */ lwc1 $f12, 0x0094($s0) ## 00000094 /* 0044C 80ABCFFC C60E0090 */ lwc1 $f14, 0x0090($s0) ## 00000090 -/* 00450 80ABD000 0C03F494 */ jal Math_atan2f +/* 00450 80ABD000 0C03F494 */ jal Math_FAtan2F /* 00454 80ABD004 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 /* 00458 80ABD008 E7A0002C */ swc1 $f0, 0x002C($sp) /* 0045C 80ABD00C 0C041184 */ jal cosf diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD728.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD728.s index 2323f25d73..02e80f7c1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD728.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD728.s @@ -45,26 +45,26 @@ glabel func_80ABD728 /* 00C24 80ABD7D4 4481A000 */ mtc1 $at, $f20 ## $f20 = 10.00 /* 00C28 80ABD7D8 27B00074 */ addiu $s0, $sp, 0x0074 ## $s0 = FFFFFFEC .L80ABD7DC: -/* 00C2C 80ABD7DC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00C2C 80ABD7DC 0C00CFC8 */ jal Rand_CenteredFloat /* 00C30 80ABD7E0 4600A306 */ mov.s $f12, $f20 /* 00C34 80ABD7E4 C6480024 */ lwc1 $f8, 0x0024($s2) ## 00000024 /* 00C38 80ABD7E8 4600A306 */ mov.s $f12, $f20 /* 00C3C 80ABD7EC 46080280 */ add.s $f10, $f0, $f8 -/* 00C40 80ABD7F0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00C40 80ABD7F0 0C00CFC8 */ jal Rand_CenteredFloat /* 00C44 80ABD7F4 E7AA0074 */ swc1 $f10, 0x0074($sp) /* 00C48 80ABD7F8 C6500028 */ lwc1 $f16, 0x0028($s2) ## 00000028 /* 00C4C 80ABD7FC 4600A306 */ mov.s $f12, $f20 /* 00C50 80ABD800 46100480 */ add.s $f18, $f0, $f16 -/* 00C54 80ABD804 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00C54 80ABD804 0C00CFC8 */ jal Rand_CenteredFloat /* 00C58 80ABD808 E7B20078 */ swc1 $f18, 0x0078($sp) /* 00C5C 80ABD80C C644002C */ lwc1 $f4, 0x002C($s2) ## 0000002C /* 00C60 80ABD810 24040050 */ addiu $a0, $zero, 0x0050 ## $a0 = 00000050 /* 00C64 80ABD814 24050064 */ addiu $a1, $zero, 0x0064 ## $a1 = 00000064 /* 00C68 80ABD818 46040180 */ add.s $f6, $f0, $f4 -/* 00C6C 80ABD81C 0C01DF64 */ jal Math_Rand_S16Offset +/* 00C6C 80ABD81C 0C01DF64 */ jal Rand_S16Offset /* 00C70 80ABD820 E7A6007C */ swc1 $f6, 0x007C($sp) /* 00C74 80ABD824 240B0019 */ addiu $t3, $zero, 0x0019 ## $t3 = 00000019 @@ -89,19 +89,19 @@ glabel func_80ABD728 /* 00CC0 80ABD870 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 /* 00CC4 80ABD874 24130014 */ addiu $s3, $zero, 0x0014 ## $s3 = 00000014 .L80ABD878: -/* 00CC8 80ABD878 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00CC8 80ABD878 0C00CFC8 */ jal Rand_CenteredFloat /* 00CCC 80ABD87C 4600A306 */ mov.s $f12, $f20 /* 00CD0 80ABD880 C6480024 */ lwc1 $f8, 0x0024($s2) ## 00000024 /* 00CD4 80ABD884 4600A306 */ mov.s $f12, $f20 /* 00CD8 80ABD888 46080280 */ add.s $f10, $f0, $f8 -/* 00CDC 80ABD88C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00CDC 80ABD88C 0C00CFC8 */ jal Rand_CenteredFloat /* 00CE0 80ABD890 E7AA0074 */ swc1 $f10, 0x0074($sp) /* 00CE4 80ABD894 C6500028 */ lwc1 $f16, 0x0028($s2) ## 00000028 /* 00CE8 80ABD898 4600A306 */ mov.s $f12, $f20 /* 00CEC 80ABD89C 46100480 */ add.s $f18, $f0, $f16 -/* 00CF0 80ABD8A0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00CF0 80ABD8A0 0C00CFC8 */ jal Rand_CenteredFloat /* 00CF4 80ABD8A4 E7B20078 */ swc1 $f18, 0x0078($sp) /* 00CF8 80ABD8A8 C644002C */ lwc1 $f4, 0x002C($s2) ## 0000002C @@ -126,15 +126,15 @@ glabel func_80ABD728 /* 00D40 80ABD8F0 02408025 */ or $s0, $s2, $zero ## $s0 = 00000000 /* 00D44 80ABD8F4 24130008 */ addiu $s3, $zero, 0x0008 ## $s3 = 00000008 .L80ABD8F8: -/* 00D48 80ABD8F8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00D48 80ABD8F8 0C00CFC8 */ jal Rand_CenteredFloat /* 00D4C 80ABD8FC 4600B306 */ mov.s $f12, $f22 /* 00D50 80ABD900 E6000258 */ swc1 $f0, 0x0258($s0) ## 00000258 -/* 00D54 80ABD904 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00D54 80ABD904 0C00CFC8 */ jal Rand_CenteredFloat /* 00D58 80ABD908 4600B306 */ mov.s $f12, $f22 /* 00D5C 80ABD90C E6000260 */ swc1 $f0, 0x0260($s0) ## 00000260 -/* 00D60 80ABD910 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00D60 80ABD910 0C00CFBE */ jal Rand_ZeroFloat /* 00D64 80ABD914 4600A306 */ mov.s $f12, $f20 /* 00D68 80ABD918 46140200 */ add.s $f8, $f0, $f20 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD9AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD9AC.s index 49db8a01ad..05bd1c6ed7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD9AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD9AC.s @@ -64,17 +64,17 @@ glabel func_80ABD9AC /* 00EB8 80ABDA68 4406B000 */ mfc1 $a2, $f22 /* 00EBC 80ABDA6C E60401FC */ swc1 $f4, 0x01FC($s0) ## 000001FC /* 00EC0 80ABDA70 02402025 */ or $a0, $s2, $zero ## $a0 = 00000258 -/* 00EC4 80ABDA74 0C01DE80 */ jal Math_ApproxF +/* 00EC4 80ABDA74 0C01DE80 */ jal Math_StepToF /* 00EC8 80ABDA78 E60A0200 */ swc1 $f10, 0x0200($s0) ## 00000200 /* 00ECC 80ABDA7C 4405C000 */ mfc1 $a1, $f24 /* 00ED0 80ABDA80 4406D000 */ mfc1 $a2, $f26 -/* 00ED4 80ABDA84 0C01DE80 */ jal Math_ApproxF +/* 00ED4 80ABDA84 0C01DE80 */ jal Math_StepToF /* 00ED8 80ABDA88 02602025 */ or $a0, $s3, $zero ## $a0 = 0000025C /* 00EDC 80ABDA8C 4405A000 */ mfc1 $a1, $f20 /* 00EE0 80ABDA90 4406B000 */ mfc1 $a2, $f22 -/* 00EE4 80ABDA94 0C01DE80 */ jal Math_ApproxF +/* 00EE4 80ABDA94 0C01DE80 */ jal Math_StepToF /* 00EE8 80ABDA98 02802025 */ or $a0, $s4, $zero ## $a0 = 00000260 /* 00EEC 80ABDA9C 2631000C */ addiu $s1, $s1, 0x000C ## $s1 = 0000000C @@ -115,17 +115,17 @@ glabel func_80ABD9AC /* 00F6C 80ABDB1C 4406B000 */ mfc1 $a2, $f22 /* 00F70 80ABDB20 E60A01FC */ swc1 $f10, 0x01FC($s0) ## 00000208 /* 00F74 80ABDB24 02402025 */ or $a0, $s2, $zero ## $a0 = 00000264 -/* 00F78 80ABDB28 0C01DE80 */ jal Math_ApproxF +/* 00F78 80ABDB28 0C01DE80 */ jal Math_StepToF /* 00F7C 80ABDB2C E6040200 */ swc1 $f4, 0x0200($s0) ## 0000020C /* 00F80 80ABDB30 4405C000 */ mfc1 $a1, $f24 /* 00F84 80ABDB34 4406D000 */ mfc1 $a2, $f26 -/* 00F88 80ABDB38 0C01DE80 */ jal Math_ApproxF +/* 00F88 80ABDB38 0C01DE80 */ jal Math_StepToF /* 00F8C 80ABDB3C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000268 /* 00F90 80ABDB40 4405A000 */ mfc1 $a1, $f20 /* 00F94 80ABDB44 4406B000 */ mfc1 $a2, $f22 -/* 00F98 80ABDB48 0C01DE80 */ jal Math_ApproxF +/* 00F98 80ABDB48 0C01DE80 */ jal Math_StepToF /* 00F9C 80ABDB4C 02802025 */ or $a0, $s4, $zero ## $a0 = 0000026C /* 00FA0 80ABDB50 2631000C */ addiu $s1, $s1, 0x000C ## $s1 = 00000018 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBF8.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBF8.s index 2989916a9e..fa1527b7de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBF8.s @@ -72,7 +72,7 @@ glabel func_80ABDBF8 /* 0114C 80ABDCFC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01150 80ABDD00 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01154 80ABDD04 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 -/* 01158 80ABDD08 0C01DE80 */ jal Math_ApproxF +/* 01158 80ABDD08 0C01DE80 */ jal Math_StepToF /* 0115C 80ABDD0C 8E0501E8 */ lw $a1, 0x01E8($s0) ## 000001E8 /* 01160 80ABDD10 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s index 73db6b18b5..b043115d07 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s @@ -148,7 +148,7 @@ glabel func_80ABE040 /* 0167C 80ABE22C A28C0114 */ sb $t4, 0x0114($s4) ## 00000114 /* 01680 80ABE230 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 01684 80ABE234 4481A000 */ mtc1 $at, $f20 ## $f20 = 5.00 -/* 01688 80ABE238 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01688 80ABE238 0C00CFC8 */ jal Rand_CenteredFloat /* 0168C 80ABE23C 4600A306 */ mov.s $f12, $f20 /* 01690 80ABE240 322E0003 */ andi $t6, $s1, 0x0003 ## $t6 = 00000003 @@ -163,7 +163,7 @@ glabel func_80ABE040 /* 016B4 80ABE264 4600A306 */ mov.s $f12, $f20 /* 016B8 80ABE268 46082280 */ add.s $f10, $f4, $f8 /* 016BC 80ABE26C 460A0400 */ add.s $f16, $f0, $f10 -/* 016C0 80ABE270 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 016C0 80ABE270 0C00CFC8 */ jal Rand_CenteredFloat /* 016C4 80ABE274 E7B0007C */ swc1 $f16, 0x007C($sp) /* 016C8 80ABE278 C6860028 */ lwc1 $f6, 0x0028($s4) ## 00000028 @@ -171,7 +171,7 @@ glabel func_80ABE040 /* 016D0 80ABE280 4600A306 */ mov.s $f12, $f20 /* 016D4 80ABE284 46123100 */ add.s $f4, $f6, $f18 /* 016D8 80ABE288 46040200 */ add.s $f8, $f0, $f4 -/* 016DC 80ABE28C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 016DC 80ABE28C 0C00CFC8 */ jal Rand_CenteredFloat /* 016E0 80ABE290 E7A80080 */ swc1 $f8, 0x0080($sp) /* 016E4 80ABE294 C68A002C */ lwc1 $f10, 0x002C($s4) ## 0000002C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43F0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43F0.s index 53c1bd28be..13facbd059 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43F0.s @@ -9,7 +9,7 @@ glabel func_80AC43F0 /* 0176C 80AC440C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 01770 80AC4410 3C0541F0 */ lui $a1, 0x41F0 ## $a1 = 41F00000 /* 01774 80AC4414 248402D4 */ addiu $a0, $a0, 0x02D4 ## $a0 = 000002D4 -/* 01778 80AC4418 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01778 80AC4418 0C01E107 */ jal Math_ApproachF /* 0177C 80AC441C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01780 80AC4420 3C0141EC */ lui $at, 0x41EC ## $at = 41EC0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC44DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC44DC.s index 1519494d05..f93ad8b368 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC44DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC44DC.s @@ -9,7 +9,7 @@ glabel func_80AC44DC /* 01858 80AC44F8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 0185C 80AC44FC 3C05C1F0 */ lui $a1, 0xC1F0 ## $a1 = C1F00000 /* 01860 80AC4500 248402D4 */ addiu $a0, $a0, 0x02D4 ## $a0 = 000002D4 -/* 01864 80AC4504 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01864 80AC4504 0C01E107 */ jal Math_ApproachF /* 01868 80AC4508 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 0186C 80AC450C 3C01C1EC */ lui $at, 0xC1EC ## $at = C1EC0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4D20.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4D20.s index 5d9810027c..17b21da54b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4D20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4D20.s @@ -8,7 +8,7 @@ glabel func_80AC4D20 /* 02098 80AC4D38 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 0209C 80AC4D3C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 020A0 80AC4D40 248402D4 */ addiu $a0, $a0, 0x02D4 ## $a0 = 000002D4 -/* 020A4 80AC4D44 0C01E107 */ jal Math_SmoothScaleMaxF +/* 020A4 80AC4D44 0C01E107 */ jal Math_ApproachF /* 020A8 80AC4D48 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 020AC 80AC4D4C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4DDC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4DDC.s index 72f3136d93..b0abc7fe76 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4DDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4DDC.s @@ -30,7 +30,7 @@ glabel func_80AC4DDC .L80AC4E20: /* 02180 80AC4E20 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02184 80AC4E24 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 02188 80AC4E28 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02188 80AC4E28 0C01E107 */ jal Math_ApproachF /* 0218C 80AC4E2C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 02190 80AC4E30 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6490.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6490.s index aa9184b8cc..b67a3edced 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6490.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6490.s @@ -14,7 +14,7 @@ glabel func_80AC6490 /* 0380C 80AC64AC 44050000 */ mfc1 $a1, $f0 /* 03810 80AC64B0 44060000 */ mfc1 $a2, $f0 /* 03814 80AC64B4 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E19999A -/* 03818 80AC64B8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03818 80AC64B8 0C01E107 */ jal Math_ApproachF /* 0381C 80AC64BC 248402D0 */ addiu $a0, $a0, 0x02D0 ## $a0 = 000002D0 /* 03820 80AC64C0 3C0180AD */ lui $at, %hi(D_80AC9604) ## $at = 80AD0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC652C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC652C.s index ce40b7a075..40a4e41cd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC652C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC652C.s @@ -12,7 +12,7 @@ glabel func_80AC652C /* 038A0 80AC6540 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E19999A /* 038A4 80AC6544 248402D0 */ addiu $a0, $a0, 0x02D0 ## $a0 = 000002D0 /* 038A8 80AC6548 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 038AC 80AC654C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 038AC 80AC654C 0C01E107 */ jal Math_ApproachF /* 038B0 80AC6550 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 038B4 80AC6554 3C0180AD */ lui $at, %hi(D_80AC9608) ## $at = 80AD0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC69A4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC69A4.s index aa8111fb49..107a960233 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC69A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC69A4.s @@ -19,7 +19,7 @@ glabel func_80AC69A4 /* 03D44 80AC69E4 54200012 */ bnel $at, $zero, .L80AC6A30 /* 03D48 80AC69E8 A48201F2 */ sh $v0, 0x01F2($a0) ## 000001F2 /* 03D4C 80AC69EC A48001F2 */ sh $zero, 0x01F2($a0) ## 000001F2 -/* 03D50 80AC69F0 0C03F66B */ jal Math_Rand_ZeroOne +/* 03D50 80AC69F0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 03D54 80AC69F4 AFA40018 */ sw $a0, 0x0018($sp) /* 03D58 80AC69F8 3C014270 */ lui $at, 0x4270 ## $at = 42700000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC73B4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC73B4.s index 06a7567e2a..a121d23ab0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC73B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC73B4.s @@ -20,7 +20,7 @@ glabel func_80AC73B4 /* 0475C 80AC73FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04760 80AC7400 260401EE */ addiu $a0, $s0, 0x01EE ## $a0 = 000001EE /* 04764 80AC7404 860501F0 */ lh $a1, 0x01F0($s0) ## 000001F0 -/* 04768 80AC7408 0C01DE5F */ jal Math_ApproxS +/* 04768 80AC7408 0C01DE5F */ jal Math_StepToS /* 0476C 80AC740C 24060190 */ addiu $a2, $zero, 0x0190 ## $a2 = 00000190 /* 04770 80AC7410 8FA6002C */ lw $a2, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Update.s index bd011c74c9..add50d470d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Update.s @@ -156,7 +156,7 @@ glabel EnOwl_Update .L80ACC884: /* 02964 80ACC884 54400006 */ bnel $v0, $zero, .L80ACC8A0 /* 02968 80ACC888 A60303F4 */ sh $v1, 0x03F4($s0) ## 000003F4 -/* 0296C 80ACC88C 0C01DF64 */ jal Math_Rand_S16Offset +/* 0296C 80ACC88C 0C01DF64 */ jal Rand_S16Offset /* 02970 80ACC890 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C /* 02974 80ACC894 A60203F6 */ sh $v0, 0x03F6($s0) ## 000003F6 @@ -200,7 +200,7 @@ glabel EnOwl_Update /* 029F8 80ACC918 A20E0405 */ sb $t6, 0x0405($s0) ## 00000405 /* 029FC 80ACC91C 00402025 */ or $a0, $v0, $zero ## $a0 = 000000FF /* 02A00 80ACC920 00042740 */ sll $a0, $a0, 29 -/* 02A04 80ACC924 0C01DE0D */ jal Math_Coss +/* 02A04 80ACC924 0C01DE0D */ jal Math_CosS ## coss? /* 02A08 80ACC928 00042403 */ sra $a0, $a0, 16 /* 02A0C 80ACC92C 3C014580 */ lui $at, 0x4580 ## $at = 45800000 @@ -258,7 +258,7 @@ glabel EnOwl_Update /* 02AC4 80ACC9E4 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 02AC8 80ACC9E8 312AFFEF */ andi $t2, $t1, 0xFFEF ## $t2 = 00000000 /* 02ACC 80ACC9EC A60A03FC */ sh $t2, 0x03FC($s0) ## 000003FC -/* 02AD0 80ACC9F0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 02AD0 80ACC9F0 0C00CFBE */ jal Rand_ZeroFloat /* 02AD4 80ACC9F4 A7A50036 */ sh $a1, 0x0036($sp) /* 02AD8 80ACC9F8 4600040D */ trunc.w.s $f16, $f0 @@ -281,7 +281,7 @@ glabel EnOwl_Update /* 02B14 80ACCA34 92030404 */ lbu $v1, 0x0404($s0) ## 00000404 /* 02B18 80ACCA38 54600014 */ bnel $v1, $zero, .L80ACCA8C /* 02B1C 80ACCA3C 92090405 */ lbu $t1, 0x0405($s0) ## 00000405 -/* 02B20 80ACCA40 0C03F66B */ jal Math_Rand_ZeroOne +/* 02B20 80ACCA40 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02B24 80ACCA44 A7A50036 */ sh $a1, 0x0036($sp) /* 02B28 80ACCA48 3C0180AD */ lui $at, %hi(D_80ACD854) ## $at = 80AD0000 @@ -323,7 +323,7 @@ glabel EnOwl_Update /* 02BA8 80ACCAC8 00042300 */ sll $a0, $a0, 12 /* 02BAC 80ACCACC 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 /* 02BB0 80ACCAD0 00042400 */ sll $a0, $a0, 16 -/* 02BB4 80ACCAD4 0C01DE1C */ jal Math_Sins +/* 02BB4 80ACCAD4 0C01DE1C */ jal Math_SinS ## sins? /* 02BB8 80ACCAD8 00042403 */ sra $a0, $a0, 16 /* 02BBC 80ACCADC 3C0180AD */ lui $at, %hi(D_80ACD858) ## $at = 80AD0000 @@ -338,7 +338,7 @@ glabel EnOwl_Update /* 02BE0 80ACCB00 1D80004F */ bgtz $t4, .L80ACCC40 /* 02BE4 80ACCB04 00052C03 */ sra $a1, $a1, 16 /* 02BE8 80ACCB08 44816000 */ mtc1 $at, $f12 ## $f12 = 15.00 -/* 02BEC 80ACCB0C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 02BEC 80ACCB0C 0C00CFBE */ jal Rand_ZeroFloat /* 02BF0 80ACCB10 A7A50036 */ sh $a1, 0x0036($sp) /* 02BF4 80ACCB14 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -364,7 +364,7 @@ glabel EnOwl_Update /* 02C3C 80ACCB5C 92040405 */ lbu $a0, 0x0405($s0) ## 00000405 /* 02C40 80ACCB60 00042300 */ sll $a0, $a0, 12 /* 02C44 80ACCB64 00042400 */ sll $a0, $a0, 16 -/* 02C48 80ACCB68 0C01DE1C */ jal Math_Sins +/* 02C48 80ACCB68 0C01DE1C */ jal Math_SinS ## sins? /* 02C4C 80ACCB6C 00042403 */ sra $a0, $a0, 16 /* 02C50 80ACCB70 3C0180AD */ lui $at, %hi(D_80ACD85C) ## $at = 80AD0000 @@ -379,7 +379,7 @@ glabel EnOwl_Update /* 02C74 80ACCB94 1D40002A */ bgtz $t2, .L80ACCC40 /* 02C78 80ACCB98 00052C03 */ sra $a1, $a1, 16 /* 02C7C 80ACCB9C 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 02C80 80ACCBA0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 02C80 80ACCBA0 0C00CFBE */ jal Rand_ZeroFloat /* 02C84 80ACCBA4 A7A50036 */ sh $a1, 0x0036($sp) /* 02C88 80ACCBA8 4600028D */ trunc.w.s $f10, $f0 @@ -396,7 +396,7 @@ glabel EnOwl_Update .L80ACCBD4: /* 02CB4 80ACCBD4 00042340 */ sll $a0, $a0, 13 /* 02CB8 80ACCBD8 00042400 */ sll $a0, $a0, 16 -/* 02CBC 80ACCBDC 0C01DE1C */ jal Math_Sins +/* 02CBC 80ACCBDC 0C01DE1C */ jal Math_SinS ## sins? /* 02CC0 80ACCBE0 00042403 */ sra $a0, $a0, 16 /* 02CC4 80ACCBE4 3C0180AD */ lui $at, %hi(D_80ACD860) ## $at = 80AD0000 @@ -411,7 +411,7 @@ glabel EnOwl_Update /* 02CE8 80ACCC08 1DE0000D */ bgtz $t7, .L80ACCC40 /* 02CEC 80ACCC0C 00052C03 */ sra $a1, $a1, 16 /* 02CF0 80ACCC10 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 02CF4 80ACCC14 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 02CF4 80ACCC14 0C00CFBE */ jal Rand_ZeroFloat /* 02CF8 80ACCC18 A7A50036 */ sh $a1, 0x0036($sp) /* 02CFC 80ACCC1C 4600018D */ trunc.w.s $f6, $f0 @@ -469,7 +469,7 @@ glabel EnOwl_Update /* 02DB4 80ACCCD4 A61803F2 */ sh $t8, 0x03F2($s0) ## 000003F2 /* 02DB8 80ACCCD8 A2190407 */ sb $t9, 0x0407($s0) ## 00000407 /* 02DBC 80ACCCDC 44816000 */ mtc1 $at, $f12 ## $f12 = 15.00 -/* 02DC0 80ACCCE0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 02DC0 80ACCCE0 0C00CFBE */ jal Rand_ZeroFloat /* 02DC4 80ACCCE4 A7A50036 */ sh $a1, 0x0036($sp) /* 02DC8 80ACCCE8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -506,7 +506,7 @@ glabel EnOwl_Update /* 02E3C 80ACCD5C A2000407 */ sb $zero, 0x0407($s0) ## 00000407 /* 02E40 80ACCD60 A20F0408 */ sb $t7, 0x0408($s0) ## 00000408 /* 02E44 80ACCD64 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 -/* 02E48 80ACCD68 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 02E48 80ACCD68 0C00CFBE */ jal Rand_ZeroFloat /* 02E4C 80ACCD6C A7A50036 */ sh $a1, 0x0036($sp) /* 02E50 80ACCD70 4600048D */ trunc.w.s $f18, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3F4.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3F4.s index b13aa2fa40..df08f6cce4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3F4.s @@ -19,7 +19,7 @@ glabel func_80ACA3F4 /* 00518 80ACA438 1000001B */ beq $zero, $zero, .L80ACA4A8 /* 0051C 80ACA43C A61803FC */ sh $t8, 0x03FC($s0) ## 000003FC .L80ACA440: -/* 00520 80ACA440 0C03F66B */ jal Math_Rand_ZeroOne +/* 00520 80ACA440 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00524 80ACA444 00000000 */ nop /* 00528 80ACA448 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA5C8.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA5C8.s index 77f2a49219..f245466211 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA5C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA5C8.s @@ -16,7 +16,7 @@ glabel func_80ACA5C8 /* 006E0 80ACA600 8FAF0020 */ lw $t7, 0x0020($sp) /* 006E4 80ACA604 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C /* 006E8 80ACA608 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 006EC 80ACA60C 0C01DF64 */ jal Math_Rand_S16Offset +/* 006EC 80ACA60C 0C01DF64 */ jal Rand_S16Offset /* 006F0 80ACA610 A5E003F4 */ sh $zero, 0x03F4($t7) ## 000003F4 /* 006F4 80ACA614 8FB80020 */ lw $t8, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA6C0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA6C0.s index 722b839493..74e1c22773 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA6C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA6C0.s @@ -3,7 +3,7 @@ glabel func_80ACA6C0 /* 007A4 80ACA6C4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 007A8 80ACA6C8 AFBF0014 */ sw $ra, 0x0014($sp) /* 007AC 80ACA6CC 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 007B0 80ACA6D0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 007B0 80ACA6D0 0C00CFC8 */ jal Rand_CenteredFloat /* 007B4 80ACA6D4 AFA40018 */ sw $a0, 0x0018($sp) /* 007B8 80ACA6D8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBC0C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBC0C.s index 6e1ee26a27..809247364d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBC0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBC0C.s @@ -38,7 +38,7 @@ glabel func_80ACBC0C /* 01D48 80ACBC68 AFA80010 */ sw $t0, 0x0010($sp) /* 01D4C 80ACBC6C 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 01D50 80ACBC70 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01D54 80ACBC74 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01D54 80ACBC74 0C01E1A7 */ jal Math_SmoothStepToS /* 01D58 80ACBC78 24070080 */ addiu $a3, $zero, 0x0080 ## $a3 = 00000080 /* 01D5C 80ACBC7C 3C014180 */ lui $at, 0x4180 ## $at = 41800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBD4C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBD4C.s index 2936262098..3b88605c7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBD4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBD4C.s @@ -15,7 +15,7 @@ glabel func_80ACBD4C /* 01E60 80ACBD80 45020008 */ bc1fl .L80ACBDA4 /* 01E64 80ACBD84 3C014234 */ lui $at, 0x4234 ## $at = 42340000 /* 01E68 80ACBD88 86050400 */ lh $a1, 0x0400($s0) ## 00000400 -/* 01E6C 80ACBD8C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01E6C 80ACBD8C 0C01E1A7 */ jal Math_SmoothStepToS /* 01E70 80ACBD90 AFAE0010 */ sw $t6, 0x0010($sp) /* 01E74 80ACBD94 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBF50.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBF50.s index 4d584889aa..2714d79678 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBF50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBF50.s @@ -9,7 +9,7 @@ glabel func_80ACBF50 /* 0204C 80ACBF6C AFAE0010 */ sw $t6, 0x0010($sp) /* 02050 80ACBF70 24840032 */ addiu $a0, $a0, 0x0032 ## $a0 = 00000032 /* 02054 80ACBF74 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02058 80ACBF78 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 02058 80ACBF78 0C01E1A7 */ jal Math_SmoothStepToS /* 0205C 80ACBF7C 24070384 */ addiu $a3, $zero, 0x0384 ## $a3 = 00000384 /* 02060 80ACBF80 960203FC */ lhu $v0, 0x03FC($s0) ## 000003FC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC00C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC00C.s index 42ce654527..07f6c6deed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC00C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC00C.s @@ -43,7 +43,7 @@ glabel func_80ACC00C /* 02108 80ACC028 AFAE0010 */ sw $t6, 0x0010($sp) /* 0210C 80ACC02C 24840032 */ addiu $a0, $a0, 0x0032 ## $a0 = 00000032 /* 02110 80ACC030 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02114 80ACC034 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 02114 80ACC034 0C01E1A7 */ jal Math_SmoothStepToS /* 02118 80ACC038 24070384 */ addiu $a3, $zero, 0x0384 ## $a3 = 00000384 /* 0211C 80ACC03C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC23C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC23C.s index ca520f3db5..94207ad036 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC23C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC23C.s @@ -22,7 +22,7 @@ glabel func_80ACC23C /* 02368 80ACC288 86050400 */ lh $a1, 0x0400($s0) ## 00000400 /* 0236C 80ACC28C 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 02370 80ACC290 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 02374 80ACC294 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 02374 80ACC294 0C01E1A7 */ jal Math_SmoothStepToS /* 02378 80ACC298 AFAE0010 */ sw $t6, 0x0010($sp) /* 0237C 80ACC29C 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC390.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC390.s index 42146b6cb1..82727f99af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC390.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC390.s @@ -18,7 +18,7 @@ glabel func_80ACC390 /* 024AC 80ACC3CC A60E03FE */ sh $t6, 0x03FE($s0) ## 000003FE /* 024B0 80ACC3D0 00002012 */ mflo $a0 /* 024B4 80ACC3D4 00042400 */ sll $a0, $a0, 16 -/* 024B8 80ACC3D8 0C01DE1C */ jal Math_Sins +/* 024B8 80ACC3D8 0C01DE1C */ jal Math_SinS ## sins? /* 024BC 80ACC3DC 00042403 */ sra $a0, $a0, 16 /* 024C0 80ACC3E0 3C01447A */ lui $at, 0x447A ## $at = 447A0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD220.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD220.s index 29d710fcbe..2d5208176d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD220.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD220.s @@ -21,7 +21,7 @@ glabel func_80ACD220 /* 0334C 80ACD26C E7A2001C */ swc1 $f2, 0x001C($sp) /* 03350 80ACD270 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03354 80ACD274 44050000 */ mfc1 $a1, $f0 -/* 03358 80ACD278 0C01DE80 */ jal Math_ApproxF +/* 03358 80ACD278 0C01DE80 */ jal Math_StepToF /* 0335C 80ACD27C E7AE0024 */ swc1 $f14, 0x0024($sp) /* 03360 80ACD280 C7A2001C */ lwc1 $f2, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD2CC.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD2CC.s index 417b421ef7..213546eea0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD2CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD2CC.s @@ -76,7 +76,7 @@ glabel func_80ACD2CC /* 034CC 80ACD3EC 46121080 */ add.s $f2, $f2, $f18 /* 034D0 80ACD3F0 AFA40028 */ sw $a0, 0x0028($sp) .L80ACD3F4: -/* 034D4 80ACD3F4 0C01DE1C */ jal Math_Sins +/* 034D4 80ACD3F4 0C01DE1C */ jal Math_SinS ## sins? /* 034D8 80ACD3F8 E7A20030 */ swc1 $f2, 0x0030($sp) /* 034DC 80ACD3FC C7A20030 */ lwc1 $f2, 0x0030($sp) @@ -84,7 +84,7 @@ glabel func_80ACD2CC /* 034E4 80ACD404 8FA40028 */ lw $a0, 0x0028($sp) /* 034E8 80ACD408 46020182 */ mul.s $f6, $f0, $f2 /* 034EC 80ACD40C 46062281 */ sub.s $f10, $f4, $f6 -/* 034F0 80ACD410 0C01DE0D */ jal Math_Coss +/* 034F0 80ACD410 0C01DE0D */ jal Math_CosS ## coss? /* 034F4 80ACD414 E7AA003C */ swc1 $f10, 0x003C($sp) /* 034F8 80ACD418 C7A20030 */ lwc1 $f2, 0x0030($sp) @@ -112,7 +112,7 @@ glabel func_80ACD2CC .L80ACD470: /* 03550 80ACD470 00022400 */ sll $a0, $v0, 16 /* 03554 80ACD474 00042403 */ sra $a0, $a0, 16 -/* 03558 80ACD478 0C01DE1C */ jal Math_Sins +/* 03558 80ACD478 0C01DE1C */ jal Math_SinS ## sins? /* 0355C 80ACD47C AFA40028 */ sw $a0, 0x0028($sp) /* 03560 80ACD480 C60A03F8 */ lwc1 $f10, 0x03F8($s0) ## 000003F8 @@ -120,7 +120,7 @@ glabel func_80ACD2CC /* 03568 80ACD488 8FA40028 */ lw $a0, 0x0028($sp) /* 0356C 80ACD48C 460A0202 */ mul.s $f8, $f0, $f10 /* 03570 80ACD490 46083401 */ sub.s $f16, $f6, $f8 -/* 03574 80ACD494 0C01DE0D */ jal Math_Coss +/* 03574 80ACD494 0C01DE0D */ jal Math_CosS ## coss? /* 03578 80ACD498 E7B0003C */ swc1 $f16, 0x003C($sp) /* 0357C 80ACD49C C60403F8 */ lwc1 $f4, 0x03F8($s0) ## 000003F8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Update.s index 2f942099f9..6caf3a567b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Update.s @@ -63,7 +63,7 @@ glabel EnPeehat_Update /* 029F4 80AD1E94 3109007F */ andi $t1, $t0, 0x007F ## $t1 = 00000000 /* 029F8 80AD1E98 5520000B */ bnel $t1, $zero, .L80AD1EC8 /* 029FC 80AD1E9C C66402E4 */ lwc1 $f4, 0x02E4($s3) ## 000002E4 -/* 02A00 80AD1EA0 0C03F66B */ jal Math_Rand_ZeroOne +/* 02A00 80AD1EA0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02A04 80AD1EA4 00000000 */ nop /* 02A08 80AD1EA8 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 @@ -111,13 +111,13 @@ glabel EnPeehat_Update /* 02AA8 80AD1F48 24051770 */ addiu $a1, $zero, 0x1770 ## $a1 = 00001770 /* 02AAC 80AD1F4C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 02AB0 80AD1F50 2407012C */ addiu $a3, $zero, 0x012C ## $a3 = 0000012C -/* 02AB4 80AD1F54 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 02AB4 80AD1F54 0C01E1A7 */ jal Math_SmoothStepToS /* 02AB8 80AD1F58 AFA00010 */ sw $zero, 0x0010($sp) /* 02ABC 80AD1F5C 1000000C */ beq $zero, $zero, .L80AD1F90 /* 02AC0 80AD1F60 26720300 */ addiu $s2, $s3, 0x0300 ## $s2 = 00000300 .L80AD1F64: -/* 02AC4 80AD1F64 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 02AC4 80AD1F64 0C01E1A7 */ jal Math_SmoothStepToS /* 02AC8 80AD1F68 AFA00010 */ sw $zero, 0x0010($sp) /* 02ACC 80AD1F6C 10000008 */ beq $zero, $zero, .L80AD1F90 @@ -306,7 +306,7 @@ glabel EnPeehat_Update /* 02D4C 80AD21EC 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A83126F /* 02D50 80AD21F0 266402EC */ addiu $a0, $s3, 0x02EC ## $a0 = 000002EC /* 02D54 80AD21F4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02D58 80AD21F8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02D58 80AD21F8 0C01E0C4 */ jal Math_SmoothStepToF /* 02D5C 80AD21FC E7B40010 */ swc1 $f20, 0x0010($sp) /* 02D60 80AD2200 8FBF004C */ lw $ra, 0x004C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF788.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF788.s index 0b9b88b237..11cd642b8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF788.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF788.s @@ -27,7 +27,7 @@ glabel func_80ACF788 /* 00338 80ACF7D8 AD0B0000 */ sw $t3, 0x0000($t0) ## FFFFFFDC /* 0033C 80ACF7DC 8D2B0008 */ lw $t3, 0x0008($t1) ## 80AD2828 /* 00340 80ACF7E0 AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFE0 -/* 00344 80ACF7E4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00344 80ACF7E4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00348 80ACF7E8 AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFE4 /* 0034C 80ACF7EC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -39,7 +39,7 @@ glabel func_80ACF788 /* 00364 80ACF804 46083302 */ mul.s $f12, $f6, $f8 /* 00368 80ACF808 E7AC0040 */ swc1 $f12, 0x0040($sp) /* 0036C 80ACF80C C58A0080 */ lwc1 $f10, 0x0080($t4) ## 00000080 -/* 00370 80ACF810 0C0329C8 */ jal func_800CA720 +/* 00370 80ACF810 0C0329C8 */ jal Math_SinF /* 00374 80ACF814 E7AA0060 */ swc1 $f10, 0x0060($sp) /* 00378 80ACF818 C7B00074 */ lwc1 $f16, 0x0074($sp) /* 0037C 80ACF81C 8FAD0070 */ lw $t5, 0x0070($sp) @@ -47,14 +47,14 @@ glabel func_80ACF788 /* 00384 80ACF824 46100482 */ mul.s $f18, $f0, $f16 /* 00388 80ACF828 C5A40000 */ lwc1 $f4, 0x0000($t5) ## 00000000 /* 0038C 80ACF82C 46049180 */ add.s $f6, $f18, $f4 -/* 00390 80ACF830 0C0329DD */ jal func_800CA774 +/* 00390 80ACF830 0C0329DD */ jal Math_CosF /* 00394 80ACF834 E7A6005C */ swc1 $f6, 0x005C($sp) /* 00398 80ACF838 C7A80074 */ lwc1 $f8, 0x0074($sp) /* 0039C 80ACF83C 8FAE0070 */ lw $t6, 0x0070($sp) /* 003A0 80ACF840 46080282 */ mul.s $f10, $f0, $f8 /* 003A4 80ACF844 C5D00008 */ lwc1 $f16, 0x0008($t6) ## 00000008 /* 003A8 80ACF848 46105480 */ add.s $f18, $f10, $f16 -/* 003AC 80ACF84C 0C03F66B */ jal Math_Rand_ZeroOne +/* 003AC 80ACF84C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 003B0 80ACF850 E7B20064 */ swc1 $f18, 0x0064($sp) /* 003B4 80ACF854 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -62,7 +62,7 @@ glabel func_80ACF788 /* 003BC 80ACF85C C7A8007C */ lwc1 $f8, 0x007C($sp) /* 003C0 80ACF860 46040181 */ sub.s $f6, $f0, $f4 /* 003C4 80ACF864 46083282 */ mul.s $f10, $f6, $f8 -/* 003C8 80ACF868 0C03F66B */ jal Math_Rand_ZeroOne +/* 003C8 80ACF868 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 003CC 80ACF86C E7AA0044 */ swc1 $f10, 0x0044($sp) /* 003D0 80ACF870 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -70,7 +70,7 @@ glabel func_80ACF788 /* 003D8 80ACF878 C7A4007C */ lwc1 $f4, 0x007C($sp) /* 003DC 80ACF87C 46100481 */ sub.s $f18, $f0, $f16 /* 003E0 80ACF880 46049182 */ mul.s $f6, $f18, $f4 -/* 003E4 80ACF884 0C03F66B */ jal Math_Rand_ZeroOne +/* 003E4 80ACF884 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 003E8 80ACF888 E7A6004C */ swc1 $f6, 0x004C($sp) /* 003EC 80ACF88C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -81,7 +81,7 @@ glabel func_80ACF788 /* 00400 80ACF8A0 C7A40054 */ lwc1 $f4, 0x0054($sp) /* 00404 80ACF8A4 46105482 */ mul.s $f18, $f10, $f16 /* 00408 80ACF8A8 46122180 */ add.s $f6, $f4, $f18 -/* 0040C 80ACF8AC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0040C 80ACF8AC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00410 80ACF8B0 E7A60054 */ swc1 $f6, 0x0054($sp) /* 00414 80ACF8B4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF920.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF920.s index 2f703c6f90..efc3d68686 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF920.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF920.s @@ -79,15 +79,15 @@ glabel func_80ACF920 /* 00590 80ACFA30 4481C000 */ mtc1 $at, $f24 ## $f24 = 25.00 /* 00594 80ACFA34 26931C24 */ addiu $s3, $s4, 0x1C24 ## $s3 = 00001C24 .L80ACFA38: -/* 00598 80ACFA38 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00598 80ACFA38 0C00CFC8 */ jal Rand_CenteredFloat /* 0059C 80ACFA3C 4600C306 */ mov.s $f12, $f24 /* 005A0 80ACFA40 46000506 */ mov.s $f20, $f0 -/* 005A4 80ACFA44 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 005A4 80ACFA44 0C00CFC8 */ jal Rand_CenteredFloat /* 005A8 80ACFA48 4600C306 */ mov.s $f12, $f24 /* 005AC 80ACFA4C 46000586 */ mov.s $f22, $f0 -/* 005B0 80ACFA50 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 005B0 80ACFA50 0C00CFC8 */ jal Rand_CenteredFloat /* 005B4 80ACFA54 4600C306 */ mov.s $f12, $f24 /* 005B8 80ACFA58 C62A0024 */ lwc1 $f10, 0x0024($s1) ## 00000024 @@ -114,7 +114,7 @@ glabel func_80ACF920 /* 00608 80ACFAA8 1040000C */ beq $v0, $zero, .L80ACFADC /* 0060C 80ACFAAC 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 00610 80ACFAB0 E45C0060 */ swc1 $f28, 0x0060($v0) ## 00000060 -/* 00614 80ACFAB4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00614 80ACFAB4 0C00CFC8 */ jal Rand_CenteredFloat /* 00618 80ACFAB8 4600F306 */ mov.s $f12, $f30 /* 0061C 80ACFABC 4600040D */ trunc.w.s $f16, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFBCC.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFBCC.s index 3be6629d18..a5bf53e88d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFBCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFBCC.s @@ -28,7 +28,7 @@ glabel func_80ACFBCC /* 00790 80ACFC30 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC /* 00794 80ACFC34 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00798 80ACFC38 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 0079C 80ACFC3C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0079C 80ACFC3C 0C01E0C4 */ jal Math_SmoothStepToF /* 007A0 80ACFC40 E7A00010 */ swc1 $f0, 0x0010($sp) /* 007A4 80ACFC44 860802F6 */ lh $t0, 0x02F6($s0) ## 000002F6 @@ -45,7 +45,7 @@ glabel func_80ACFBCC /* 007CC 80ACFC6C 3C05C47A */ lui $a1, 0xC47A ## $a1 = C47A0000 /* 007D0 80ACFC70 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 007D4 80ACFC74 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 007D8 80ACFC78 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 007D8 80ACFC78 0C01E0C4 */ jal Math_SmoothStepToF /* 007DC 80ACFC7C E7A00010 */ swc1 $f0, 0x0010($sp) /* 007E0 80ACFC80 8E0202D4 */ lw $v0, 0x02D4($s0) ## 000002D4 @@ -63,7 +63,7 @@ glabel func_80ACFBCC /* 00810 80ACFCB0 34E7A3D7 */ ori $a3, $a3, 0xA3D7 ## $a3 = 3E70A3D7 /* 00814 80ACFCB4 34A5EB85 */ ori $a1, $a1, 0xEB85 ## $a1 = 3E51EB85 /* 00818 80ACFCB8 260402EC */ addiu $a0, $s0, 0x02EC ## $a0 = 000002EC -/* 0081C 80ACFCBC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0081C 80ACFCBC 0C01E0C4 */ jal Math_SmoothStepToF /* 00820 80ACFCC0 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00824 80ACFCC4 10000012 */ beq $zero, $zero, .L80ACFD10 @@ -74,7 +74,7 @@ glabel func_80ACFBCC /* 00834 80ACFCD4 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 /* 00838 80ACFCD8 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A /* 0083C 80ACFCDC 260402EC */ addiu $a0, $s0, 0x02EC ## $a0 = 000002EC -/* 00840 80ACFCE0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00840 80ACFCE0 0C01E0C4 */ jal Math_SmoothStepToF /* 00844 80ACFCE4 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00848 80ACFCE8 10000009 */ beq $zero, $zero, .L80ACFD10 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFDAC.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFDAC.s index 66a9aeaeac..1f97746fc5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFDAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFDAC.s @@ -23,7 +23,7 @@ glabel func_80ACFDAC /* 0095C 80ACFDFC 3C05C47A */ lui $a1, 0xC47A ## $a1 = C47A0000 /* 00960 80ACFE00 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00964 80ACFE04 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 00968 80ACFE08 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00968 80ACFE08 0C01E0C4 */ jal Math_SmoothStepToF /* 0096C 80ACFE0C E7A00010 */ swc1 $f0, 0x0010($sp) /* 00970 80ACFE10 8E0202D4 */ lw $v0, 0x02D4($s0) ## 000002D4 @@ -41,7 +41,7 @@ glabel func_80ACFDAC /* 009A0 80ACFE40 34E7A3D7 */ ori $a3, $a3, 0xA3D7 ## $a3 = 3E70A3D7 /* 009A4 80ACFE44 34A5EB85 */ ori $a1, $a1, 0xEB85 ## $a1 = 3E51EB85 /* 009A8 80ACFE48 260402EC */ addiu $a0, $s0, 0x02EC ## $a0 = 000002EC -/* 009AC 80ACFE4C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 009AC 80ACFE4C 0C01E0C4 */ jal Math_SmoothStepToF /* 009B0 80ACFE50 E7A00010 */ swc1 $f0, 0x0010($sp) /* 009B4 80ACFE54 10000012 */ beq $zero, $zero, .L80ACFEA0 @@ -52,7 +52,7 @@ glabel func_80ACFDAC /* 009C4 80ACFE64 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 /* 009C8 80ACFE68 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A /* 009CC 80ACFE6C 260402EC */ addiu $a0, $s0, 0x02EC ## $a0 = 000002EC -/* 009D0 80ACFE70 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 009D0 80ACFE70 0C01E0C4 */ jal Math_SmoothStepToF /* 009D4 80ACFE74 E7A00010 */ swc1 $f0, 0x0010($sp) /* 009D8 80ACFE78 10000009 */ beq $zero, $zero, .L80ACFEA0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEF8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEF8.s index fa43e6bdcf..3dfa7c4268 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEF8.s @@ -48,17 +48,17 @@ glabel func_80ACFEF8 /* 00AEC 80ACFF8C 55000030 */ bnel $t0, $zero, .L80AD0050 /* 00AF0 80ACFF90 860E02F2 */ lh $t6, 0x02F2($s0) ## 000002F2 /* 00AF4 80ACFF94 44816000 */ mtc1 $at, $f12 ## $f12 = 25.00 -/* 00AF8 80ACFF98 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00AF8 80ACFF98 0C00CFC8 */ jal Rand_CenteredFloat /* 00AFC 80ACFF9C 00000000 */ nop /* 00B00 80ACFFA0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00B04 80ACFFA4 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 00B08 80ACFFA8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00B08 80ACFFA8 0C00CFC8 */ jal Rand_CenteredFloat /* 00B0C 80ACFFAC E7A00040 */ swc1 $f0, 0x0040($sp) /* 00B10 80ACFFB0 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 00B14 80ACFFB4 44816000 */ mtc1 $at, $f12 ## $f12 = 25.00 -/* 00B18 80ACFFB8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00B18 80ACFFB8 0C00CFC8 */ jal Rand_CenteredFloat /* 00B1C 80ACFFBC E7A00044 */ swc1 $f0, 0x0044($sp) /* 00B20 80ACFFC0 C7A80040 */ lwc1 $f8, 0x0040($sp) @@ -86,7 +86,7 @@ glabel func_80ACFEF8 /* 00B74 80AD0014 1040000D */ beq $v0, $zero, .L80AD004C /* 00B78 80AD0018 3C0180AD */ lui $at, %hi(D_80AD291C) ## $at = 80AD0000 /* 00B7C 80AD001C C42C291C */ lwc1 $f12, %lo(D_80AD291C)($at) -/* 00B80 80AD0020 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00B80 80AD0020 0C00CFC8 */ jal Rand_CenteredFloat /* 00B84 80AD0024 AFA2004C */ sw $v0, 0x004C($sp) /* 00B88 80AD0028 4600040D */ trunc.w.s $f16, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0118.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0118.s index 2259c9c9da..4343f8aad8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0118.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0118.s @@ -14,14 +14,14 @@ glabel func_80AD0118 /* 00C94 80AD0134 248400BC */ addiu $a0, $a0, 0x00BC ## $a0 = 000000BC /* 00C98 80AD0138 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00C9C 80AD013C 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 00CA0 80AD0140 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00CA0 80AD0140 0C01E0C4 */ jal Math_SmoothStepToF /* 00CA4 80AD0144 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00CA8 80AD0148 260402F0 */ addiu $a0, $s0, 0x02F0 ## $a0 = 000002F0 /* 00CAC 80AD014C 24050FA0 */ addiu $a1, $zero, 0x0FA0 ## $a1 = 00000FA0 /* 00CB0 80AD0150 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00CB4 80AD0154 24070320 */ addiu $a3, $zero, 0x0320 ## $a3 = 00000320 -/* 00CB8 80AD0158 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00CB8 80AD0158 0C01E1A7 */ jal Math_SmoothStepToS /* 00CBC 80AD015C AFA00010 */ sw $zero, 0x0010($sp) /* 00CC0 80AD0160 14400041 */ bne $v0, $zero, .L80AD0268 @@ -116,7 +116,7 @@ glabel func_80AD0118 /* 00E0C 80AD02AC 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3D99999A /* 00E10 80AD02B0 260402EC */ addiu $a0, $s0, 0x02EC ## $a0 = 000002EC /* 00E14 80AD02B4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00E18 80AD02B8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00E18 80AD02B8 0C01E0C4 */ jal Math_SmoothStepToF /* 00E1C 80AD02BC E7A60010 */ swc1 $f6, 0x0010($sp) /* 00E20 80AD02C0 860E02F2 */ lh $t6, 0x02F2($s0) ## 000002F2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD038C.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD038C.s index a8cd9814d5..1229f58d02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD038C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD038C.s @@ -14,14 +14,14 @@ glabel func_80AD038C /* 00F08 80AD03A8 248400BC */ addiu $a0, $a0, 0x00BC ## $a0 = 000000BC /* 00F0C 80AD03AC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00F10 80AD03B0 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 00F14 80AD03B4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00F14 80AD03B4 0C01E0C4 */ jal Math_SmoothStepToF /* 00F18 80AD03B8 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00F1C 80AD03BC 260402F0 */ addiu $a0, $s0, 0x02F0 ## $a0 = 000002F0 /* 00F20 80AD03C0 24050FA0 */ addiu $a1, $zero, 0x0FA0 ## $a1 = 00000FA0 /* 00F24 80AD03C4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00F28 80AD03C8 24070320 */ addiu $a3, $zero, 0x0320 ## $a3 = 00000320 -/* 00F2C 80AD03CC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00F2C 80AD03CC 0C01E1A7 */ jal Math_SmoothStepToS /* 00F30 80AD03D0 AFA00010 */ sw $zero, 0x0010($sp) /* 00F34 80AD03D4 14400041 */ bne $v0, $zero, .L80AD04DC @@ -116,7 +116,7 @@ glabel func_80AD038C /* 01080 80AD0520 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3D99999A /* 01084 80AD0524 260402EC */ addiu $a0, $s0, 0x02EC ## $a0 = 000002EC /* 01088 80AD0528 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0108C 80AD052C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0108C 80AD052C 0C01E0C4 */ jal Math_SmoothStepToF /* 01090 80AD0530 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01094 80AD0534 860E02F2 */ lh $t6, 0x02F2($s0) ## 000002F2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD05A8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD05A8.s index d167bccdaa..1453500c37 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD05A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD05A8.s @@ -11,7 +11,7 @@ glabel func_80AD05A8 /* 0112C 80AD05CC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01130 80AD05D0 3C073E80 */ lui $a3, 0x3E80 ## $a3 = 3E800000 /* 01134 80AD05D4 AFAF002C */ sw $t7, 0x002C($sp) -/* 01138 80AD05D8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01138 80AD05D8 0C01E0C4 */ jal Math_SmoothStepToF /* 0113C 80AD05DC E7A40010 */ swc1 $f4, 0x0010($sp) /* 01140 80AD05E0 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 @@ -24,7 +24,7 @@ glabel func_80AD05A8 /* 0115C 80AD05FC 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 01160 80AD0600 E7B00010 */ swc1 $f16, 0x0010($sp) /* 01164 80AD0604 44055000 */ mfc1 $a1, $f10 -/* 01168 80AD0608 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01168 80AD0608 0C01E0C4 */ jal Math_SmoothStepToF /* 0116C 80AD060C 00000000 */ nop /* 01170 80AD0610 860202F8 */ lh $v0, 0x02F8($s0) ## 000002F8 @@ -54,7 +54,7 @@ glabel func_80AD05A8 /* 011C4 80AD0664 4500000F */ bc1f .L80AD06A4 /* 011C8 80AD0668 00000000 */ nop /* 011CC 80AD066C 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 011D0 80AD0670 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 011D0 80AD0670 0C01E1A7 */ jal Math_SmoothStepToS /* 011D4 80AD0674 AFA00010 */ sw $zero, 0x0010($sp) /* 011D8 80AD0678 860902FA */ lh $t1, 0x02FA($s0) ## 000002FA @@ -80,7 +80,7 @@ glabel func_80AD05A8 /* 01218 80AD06B8 24050FA0 */ addiu $a1, $zero, 0x0FA0 ## $a1 = 00000FA0 /* 0121C 80AD06BC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01220 80AD06C0 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 01224 80AD06C4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01224 80AD06C4 0C01E1A7 */ jal Math_SmoothStepToS /* 01228 80AD06C8 AFA00010 */ sw $zero, 0x0010($sp) /* 0122C 80AD06CC 860E02F2 */ lh $t6, 0x02F2($s0) ## 000002F2 @@ -94,7 +94,7 @@ glabel func_80AD05A8 /* 0124C 80AD06EC 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3D99999A /* 01250 80AD06F0 260402EC */ addiu $a0, $s0, 0x02EC ## $a0 = 000002EC /* 01254 80AD06F4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01258 80AD06F8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01258 80AD06F8 0C01E0C4 */ jal Math_SmoothStepToF /* 0125C 80AD06FC E7A40010 */ swc1 $f4, 0x0010($sp) /* 01260 80AD0700 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD076C.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD076C.s index d3febc81e4..dd4b411984 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD076C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD076C.s @@ -56,7 +56,7 @@ glabel func_80AD076C /* 0137C 80AD081C 34A56666 */ ori $a1, $a1, 0x6666 ## $a1 = BFA66666 /* 01380 80AD0820 26440060 */ addiu $a0, $s2, 0x0060 ## $a0 = 00000060 /* 01384 80AD0824 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 01388 80AD0828 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01388 80AD0828 0C01E0C4 */ jal Math_SmoothStepToF /* 0138C 80AD082C E7B20010 */ swc1 $f18, 0x0010($sp) /* 01390 80AD0830 10000008 */ beq $zero, $zero, .L80AD0854 @@ -66,7 +66,7 @@ glabel func_80AD076C /* 0139C 80AD083C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 013A0 80AD0840 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 0000CCCD /* 013A4 80AD0844 4406A000 */ mfc1 $a2, $f20 -/* 013A8 80AD0848 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 013A8 80AD0848 0C01E0C4 */ jal Math_SmoothStepToF /* 013AC 80AD084C E7A40010 */ swc1 $f4, 0x0010($sp) /* 013B0 80AD0850 8E4202D4 */ lw $v0, 0x02D4($s2) ## 000002D4 @@ -77,7 +77,7 @@ glabel func_80AD076C /* 013C0 80AD0860 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF /* 013C4 80AD0864 8645008A */ lh $a1, 0x008A($s2) ## 0000008A /* 013C8 80AD0868 AFA00010 */ sw $zero, 0x0010($sp) -/* 013CC 80AD086C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 013CC 80AD086C 0C01E1A7 */ jal Math_SmoothStepToS /* 013D0 80AD0870 2407033E */ addiu $a3, $zero, 0x033E ## $a3 = 0000033E /* 013D4 80AD0874 10000003 */ beq $zero, $zero, .L80AD0884 @@ -95,7 +95,7 @@ glabel func_80AD076C /* 013F8 80AD0898 24050FA0 */ addiu $a1, $zero, 0x0FA0 ## $a1 = 00000FA0 /* 013FC 80AD089C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01400 80AD08A0 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 01404 80AD08A4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01404 80AD08A4 0C01E1A7 */ jal Math_SmoothStepToS /* 01408 80AD08A8 AFA00010 */ sw $zero, 0x0010($sp) /* 0140C 80AD08AC 864802F2 */ lh $t0, 0x02F2($s2) ## 000002F2 @@ -109,7 +109,7 @@ glabel func_80AD076C /* 0142C 80AD08CC 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A /* 01430 80AD08D0 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3D99999A /* 01434 80AD08D4 264402EC */ addiu $a0, $s2, 0x02EC ## $a0 = 000002EC -/* 01438 80AD08D8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01438 80AD08D8 0C01E0C4 */ jal Math_SmoothStepToF /* 0143C 80AD08DC E7A60010 */ swc1 $f6, 0x0010($sp) /* 01440 80AD08E0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 @@ -153,7 +153,7 @@ glabel func_80AD076C /* 014C8 80AD0968 8E4D03B0 */ lw $t5, 0x03B0($s2) ## 000003B0 /* 014CC 80AD096C 158D0013 */ bne $t4, $t5, .L80AD09BC /* 014D0 80AD0970 00000000 */ nop -/* 014D4 80AD0974 0C03F66B */ jal Math_Rand_ZeroOne +/* 014D4 80AD0974 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 014D8 80AD0978 00000000 */ nop /* 014DC 80AD097C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -193,20 +193,20 @@ glabel func_80AD076C /* 01554 80AD09F4 8D6D0008 */ lw $t5, 0x0008($t3) ## 80AD2834 /* 01558 80AD09F8 AE2D0008 */ sw $t5, 0x0008($s1) ## FFFFFFF4 .L80AD09FC: -/* 0155C 80AD09FC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0155C 80AD09FC 0C00CFC8 */ jal Rand_CenteredFloat /* 01560 80AD0A00 4600A306 */ mov.s $f12, $f20 /* 01564 80AD0A04 C64A0024 */ lwc1 $f10, 0x0024($s2) ## 00000024 /* 01568 80AD0A08 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0156C 80AD0A0C 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 01570 80AD0A10 460A0400 */ add.s $f16, $f0, $f10 -/* 01574 80AD0A14 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01574 80AD0A14 0C00CFC8 */ jal Rand_CenteredFloat /* 01578 80AD0A18 E7B0006C */ swc1 $f16, 0x006C($sp) /* 0157C 80AD0A1C C6520028 */ lwc1 $f18, 0x0028($s2) ## 00000028 /* 01580 80AD0A20 4600A306 */ mov.s $f12, $f20 /* 01584 80AD0A24 46120100 */ add.s $f4, $f0, $f18 -/* 01588 80AD0A28 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01588 80AD0A28 0C00CFC8 */ jal Rand_CenteredFloat /* 0158C 80AD0A2C E7A40070 */ swc1 $f4, 0x0070($sp) /* 01590 80AD0A30 C646002C */ lwc1 $f6, 0x002C($s2) ## 0000002C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B84.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B84.s index 613eb39003..69f2695996 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B84.s @@ -14,7 +14,7 @@ glabel func_80AD0B84 /* 01700 80AD0BA0 248400BC */ addiu $a0, $a0, 0x00BC ## $a0 = 000000BC /* 01704 80AD0BA4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01708 80AD0BA8 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 0170C 80AD0BAC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0170C 80AD0BAC 0C01E0C4 */ jal Math_SmoothStepToF /* 01710 80AD0BB0 E7A40010 */ swc1 $f4, 0x0010($sp) /* 01714 80AD0BB4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -24,14 +24,14 @@ glabel func_80AD0B84 /* 01724 80AD0BC4 44060000 */ mfc1 $a2, $f0 /* 01728 80AD0BC8 44070000 */ mfc1 $a3, $f0 /* 0172C 80AD0BCC 44051000 */ mfc1 $a1, $f2 -/* 01730 80AD0BD0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01730 80AD0BD0 0C01E0C4 */ jal Math_SmoothStepToF /* 01734 80AD0BD4 E7A20010 */ swc1 $f2, 0x0010($sp) /* 01738 80AD0BD8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0173C 80AD0BDC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01740 80AD0BE0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01744 80AD0BE4 24070032 */ addiu $a3, $zero, 0x0032 ## $a3 = 00000032 -/* 01748 80AD0BE8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01748 80AD0BE8 0C01E1A7 */ jal Math_SmoothStepToS /* 0174C 80AD0BEC AFA00010 */ sw $zero, 0x0010($sp) /* 01750 80AD0BF0 0C02927F */ jal SkelAnime_FrameUpdateMatrix @@ -62,7 +62,7 @@ glabel func_80AD0B84 /* 017A8 80AD0C48 260402F0 */ addiu $a0, $s0, 0x02F0 ## $a0 = 000002F0 /* 017AC 80AD0C4C 44815000 */ mtc1 $at, $f10 ## $f10 = 0.25 /* 017B0 80AD0C50 44050000 */ mfc1 $a1, $f0 -/* 017B4 80AD0C54 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 017B4 80AD0C54 0C01E0C4 */ jal Math_SmoothStepToF /* 017B8 80AD0C58 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 017BC 80AD0C5C C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 @@ -111,7 +111,7 @@ glabel func_80AD0B84 /* 01864 80AD0D04 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01868 80AD0D08 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0186C 80AD0D0C 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 01870 80AD0D10 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01870 80AD0D10 0C01E1A7 */ jal Math_SmoothStepToS /* 01874 80AD0D14 AFA00010 */ sw $zero, 0x0010($sp) /* 01878 80AD0D18 860A02F2 */ lh $t2, 0x02F2($s0) ## 000002F2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D84.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D84.s index 789c8013c0..f77e01303e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D84.s @@ -14,7 +14,7 @@ glabel func_80AD0D84 /* 01900 80AD0DA0 248400BC */ addiu $a0, $a0, 0x00BC ## $a0 = 000000BC /* 01904 80AD0DA4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01908 80AD0DA8 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 0190C 80AD0DAC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0190C 80AD0DAC 0C01E0C4 */ jal Math_SmoothStepToF /* 01910 80AD0DB0 E7A40010 */ swc1 $f4, 0x0010($sp) /* 01914 80AD0DB4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -24,14 +24,14 @@ glabel func_80AD0D84 /* 01924 80AD0DC4 44060000 */ mfc1 $a2, $f0 /* 01928 80AD0DC8 44070000 */ mfc1 $a3, $f0 /* 0192C 80AD0DCC 44051000 */ mfc1 $a1, $f2 -/* 01930 80AD0DD0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01930 80AD0DD0 0C01E0C4 */ jal Math_SmoothStepToF /* 01934 80AD0DD4 E7A20010 */ swc1 $f2, 0x0010($sp) /* 01938 80AD0DD8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0193C 80AD0DDC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01940 80AD0DE0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01944 80AD0DE4 24070032 */ addiu $a3, $zero, 0x0032 ## $a3 = 00000032 -/* 01948 80AD0DE8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01948 80AD0DE8 0C01E1A7 */ jal Math_SmoothStepToS /* 0194C 80AD0DEC AFA00010 */ sw $zero, 0x0010($sp) /* 01950 80AD0DF0 0C02927F */ jal SkelAnime_FrameUpdateMatrix @@ -61,7 +61,7 @@ glabel func_80AD0D84 /* 019A4 80AD0E44 260402F0 */ addiu $a0, $s0, 0x02F0 ## $a0 = 000002F0 /* 019A8 80AD0E48 44815000 */ mtc1 $at, $f10 ## $f10 = 0.25 /* 019AC 80AD0E4C 44050000 */ mfc1 $a1, $f0 -/* 019B0 80AD0E50 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 019B0 80AD0E50 0C01E0C4 */ jal Math_SmoothStepToF /* 019B4 80AD0E54 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 019B8 80AD0E58 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 @@ -111,7 +111,7 @@ glabel func_80AD0D84 /* 01A60 80AD0F00 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01A64 80AD0F04 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01A68 80AD0F08 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 01A6C 80AD0F0C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01A6C 80AD0F0C 0C01E1A7 */ jal Math_SmoothStepToS /* 01A70 80AD0F10 AFA00010 */ sw $zero, 0x0010($sp) /* 01A74 80AD0F14 860A02F2 */ lh $t2, 0x02F2($s0) ## 000002F2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s index 841d42c72b..d2430e54ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s @@ -7,7 +7,7 @@ glabel func_80AD0F38 /* 01AAC 80AD0F4C 24A505C4 */ addiu $a1, $a1, %lo(D_060005C4) ## $a1 = 060005C4 /* 01AB0 80AD0F50 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 01AB4 80AD0F54 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01AB8 80AD0F58 0C03F66B */ jal Math_Rand_ZeroOne +/* 01AB8 80AD0F58 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01ABC 80AD0F5C 00000000 */ nop /* 01AC0 80AD0F60 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -16,7 +16,7 @@ glabel func_80AD0F38 /* 01ACC 80AD0F6C 44814000 */ mtc1 $at, $f8 ## $f8 = 2.50 /* 01AD0 80AD0F70 46040182 */ mul.s $f6, $f0, $f4 /* 01AD4 80AD0F74 46083280 */ add.s $f10, $f6, $f8 -/* 01AD8 80AD0F78 0C03F66B */ jal Math_Rand_ZeroOne +/* 01AD8 80AD0F78 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01ADC 80AD0F7C E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 01AE0 80AD0F80 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0FC8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0FC8.s index a2527846a7..e00037a458 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0FC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0FC8.s @@ -30,7 +30,7 @@ glabel func_80AD0FC8 /* 01B70 80AD1010 460A0401 */ sub.s $f16, $f0, $f10 /* 01B74 80AD1014 E4900028 */ swc1 $f16, 0x0028($a0) ## 00000028 .L80AD1018: -/* 01B78 80AD1018 0C0329DD */ jal func_800CA774 +/* 01B78 80AD1018 0C0329DD */ jal Math_CosF /* 01B7C 80AD101C C60C02E0 */ lwc1 $f12, 0x02E0($s0) ## 000002E0 /* 01B80 80AD1020 3C0180AD */ lui $at, %hi(D_80AD2938) ## $at = 80AD0000 /* 01B84 80AD1024 C4262938 */ lwc1 $f6, %lo(D_80AD2938)($at) @@ -38,7 +38,7 @@ glabel func_80AD0FC8 /* 01B8C 80AD102C C60C02E0 */ lwc1 $f12, 0x02E0($s0) ## 000002E0 /* 01B90 80AD1030 46060102 */ mul.s $f4, $f0, $f6 /* 01B94 80AD1034 46049200 */ add.s $f8, $f18, $f4 -/* 01B98 80AD1038 0C0329DD */ jal func_800CA774 +/* 01B98 80AD1038 0C0329DD */ jal Math_CosF /* 01B9C 80AD103C E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 /* 01BA0 80AD1040 3C0180AD */ lui $at, %hi(D_80AD293C) ## $at = 80AD0000 /* 01BA4 80AD1044 C42A293C */ lwc1 $f10, %lo(D_80AD293C)($at) @@ -62,7 +62,7 @@ glabel func_80AD0FC8 /* 01BE8 80AD1088 46043200 */ add.s $f8, $f6, $f4 /* 01BEC 80AD108C 1F20001E */ bgtz $t9, .L80AD1108 /* 01BF0 80AD1090 E60802E0 */ swc1 $f8, 0x02E0($s0) ## 000002E0 -/* 01BF4 80AD1094 0C03F66B */ jal Math_Rand_ZeroOne +/* 01BF4 80AD1094 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01BF8 80AD1098 00000000 */ nop /* 01BFC 80AD109C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -71,7 +71,7 @@ glabel func_80AD0FC8 /* 01C08 80AD10A8 44819000 */ mtc1 $at, $f18 ## $f18 = 2.50 /* 01C0C 80AD10AC 460A0402 */ mul.s $f16, $f0, $f10 /* 01C10 80AD10B0 46128180 */ add.s $f6, $f16, $f18 -/* 01C14 80AD10B4 0C03F66B */ jal Math_Rand_ZeroOne +/* 01C14 80AD10B4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01C18 80AD10B8 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 /* 01C1C 80AD10BC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -81,7 +81,7 @@ glabel func_80AD0FC8 /* 01C2C 80AD10CC 46022200 */ add.s $f8, $f4, $f2 /* 01C30 80AD10D0 4600428D */ trunc.w.s $f10, $f8 /* 01C34 80AD10D4 440A5000 */ mfc1 $t2, $f10 -/* 01C38 80AD10D8 0C03F66B */ jal Math_Rand_ZeroOne +/* 01C38 80AD10D8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01C3C 80AD10DC AE0A02D4 */ sw $t2, 0x02D4($s0) ## 000002D4 /* 01C40 80AD10E0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -148,7 +148,7 @@ glabel func_80AD0FC8 /* 01D18 80AD11B8 24050FA0 */ addiu $a1, $zero, 0x0FA0 ## $a1 = 00000FA0 /* 01D1C 80AD11BC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01D20 80AD11C0 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 01D24 80AD11C4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01D24 80AD11C4 0C01E1A7 */ jal Math_SmoothStepToS /* 01D28 80AD11C8 AFA00010 */ sw $zero, 0x0010($sp) /* 01D2C 80AD11CC 860F02F2 */ lh $t7, 0x02F2($s0) ## 000002F2 @@ -162,7 +162,7 @@ glabel func_80AD0FC8 /* 01D4C 80AD11EC 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3D99999A /* 01D50 80AD11F0 260402EC */ addiu $a0, $s0, 0x02EC ## $a0 = 000002EC /* 01D54 80AD11F4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01D58 80AD11F8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01D58 80AD11F8 0C01E0C4 */ jal Math_SmoothStepToF /* 01D5C 80AD11FC E7B00010 */ swc1 $f16, 0x0010($sp) /* 01D60 80AD1200 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1258.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1258.s index 248305039e..bc0eebd872 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1258.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1258.s @@ -37,7 +37,7 @@ glabel func_80AD1258 /* 01E18 80AD12B8 46120180 */ add.s $f6, $f0, $f18 /* 01E1C 80AD12BC E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 .L80AD12C0: -/* 01E20 80AD12C0 0C0329DD */ jal func_800CA774 +/* 01E20 80AD12C0 0C0329DD */ jal Math_CosF /* 01E24 80AD12C4 C60C02E0 */ lwc1 $f12, 0x02E0($s0) ## 000002E0 /* 01E28 80AD12C8 3C0180AD */ lui $at, %hi(D_80AD2944) ## $at = 80AD0000 /* 01E2C 80AD12CC C4282944 */ lwc1 $f8, %lo(D_80AD2944)($at) @@ -45,7 +45,7 @@ glabel func_80AD1258 /* 01E34 80AD12D4 C60C02E0 */ lwc1 $f12, 0x02E0($s0) ## 000002E0 /* 01E38 80AD12D8 46080282 */ mul.s $f10, $f0, $f8 /* 01E3C 80AD12DC 460A2400 */ add.s $f16, $f4, $f10 -/* 01E40 80AD12E0 0C0329DD */ jal func_800CA774 +/* 01E40 80AD12E0 0C0329DD */ jal Math_CosF /* 01E44 80AD12E4 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 /* 01E48 80AD12E8 3C0180AD */ lui $at, %hi(D_80AD2948) ## $at = 80AD0000 /* 01E4C 80AD12EC C4322948 */ lwc1 $f18, %lo(D_80AD2948)($at) @@ -76,14 +76,14 @@ glabel func_80AD1258 /* 01EA8 80AD1348 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 01EAC 80AD134C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01EB0 80AD1350 24070258 */ addiu $a3, $zero, 0x0258 ## $a3 = 00000258 -/* 01EB4 80AD1354 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01EB4 80AD1354 0C01E1A7 */ jal Math_SmoothStepToS /* 01EB8 80AD1358 AFA00010 */ sw $zero, 0x0010($sp) /* 01EBC 80AD135C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01EC0 80AD1360 24051194 */ addiu $a1, $zero, 0x1194 ## $a1 = 00001194 /* 01EC4 80AD1364 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01EC8 80AD1368 24070258 */ addiu $a3, $zero, 0x0258 ## $a3 = 00000258 -/* 01ECC 80AD136C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01ECC 80AD136C 0C01E1A7 */ jal Math_SmoothStepToS /* 01ED0 80AD1370 AFA00010 */ sw $zero, 0x0010($sp) /* 01ED4 80AD1374 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD14A0.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD14A0.s index df9053dcea..7fe8d84086 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD14A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD14A0.s @@ -46,19 +46,19 @@ glabel func_80AD14A0 /* 020AC 80AD154C 27B30074 */ addiu $s3, $sp, 0x0074 ## $s3 = FFFFFFE4 /* 020B0 80AD1550 AE4A0008 */ sw $t2, 0x0008($s2) ## FFFFFFFC .L80AD1554: -/* 020B4 80AD1554 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 020B4 80AD1554 0C00CFC8 */ jal Rand_CenteredFloat /* 020B8 80AD1558 4600A306 */ mov.s $f12, $f20 /* 020BC 80AD155C C6320024 */ lwc1 $f18, 0x0024($s1) ## 00000024 /* 020C0 80AD1560 4600B306 */ mov.s $f12, $f22 /* 020C4 80AD1564 46120100 */ add.s $f4, $f0, $f18 -/* 020C8 80AD1568 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 020C8 80AD1568 0C00CFC8 */ jal Rand_CenteredFloat /* 020CC 80AD156C E7A40074 */ swc1 $f4, 0x0074($sp) /* 020D0 80AD1570 C6260028 */ lwc1 $f6, 0x0028($s1) ## 00000028 /* 020D4 80AD1574 4600A306 */ mov.s $f12, $f20 /* 020D8 80AD1578 46060200 */ add.s $f8, $f0, $f6 -/* 020DC 80AD157C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 020DC 80AD157C 0C00CFC8 */ jal Rand_CenteredFloat /* 020E0 80AD1580 E7A80078 */ swc1 $f8, 0x0078($sp) /* 020E4 80AD1584 C62A002C */ lwc1 $f10, 0x002C($s1) ## 0000002C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1700.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1700.s index 6ecbad8c07..4637a5d6ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1700.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1700.s @@ -11,7 +11,7 @@ glabel func_80AD1700 /* 02284 80AD1724 44071000 */ mfc1 $a3, $f2 /* 02288 80AD1728 44050000 */ mfc1 $a1, $f0 /* 0228C 80AD172C 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 02290 80AD1730 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02290 80AD1730 0C01E0C4 */ jal Math_SmoothStepToF /* 02294 80AD1734 E7A00010 */ swc1 $f0, 0x0010($sp) /* 02298 80AD1738 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -19,7 +19,7 @@ glabel func_80AD1700 /* 022A0 80AD1740 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 022A4 80AD1744 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 022A8 80AD1748 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 -/* 022AC 80AD174C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 022AC 80AD174C 0C01E0C4 */ jal Math_SmoothStepToF /* 022B0 80AD1750 E7A40010 */ swc1 $f4, 0x0010($sp) /* 022B4 80AD1754 920E0114 */ lbu $t6, 0x0114($s0) ## 00000114 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s index 9814d76ac3..b7715558e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s @@ -54,7 +54,7 @@ glabel func_80AD17E8 /* 023F0 80AD1890 260402EC */ addiu $a0, $s0, 0x02EC ## $a0 = 000002EC /* 023F4 80AD1894 34A5EB85 */ ori $a1, $a1, 0xEB85 ## $a1 = 3E51EB85 /* 023F8 80AD1898 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 023FC 80AD189C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 023FC 80AD189C 0C01E0C4 */ jal Math_SmoothStepToF /* 02400 80AD18A0 E7A20010 */ swc1 $f2, 0x0010($sp) /* 02404 80AD18A4 1000007C */ beq $zero, $zero, .L80AD1A98 @@ -64,7 +64,7 @@ glabel func_80AD17E8 /* 02410 80AD18B0 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 /* 02414 80AD18B4 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A /* 02418 80AD18B8 44051000 */ mfc1 $a1, $f2 -/* 0241C 80AD18BC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0241C 80AD18BC 0C01E0C4 */ jal Math_SmoothStepToF /* 02420 80AD18C0 E7A20010 */ swc1 $f2, 0x0010($sp) /* 02424 80AD18C4 10000074 */ beq $zero, $zero, .L80AD1A98 @@ -81,7 +81,7 @@ glabel func_80AD17E8 /* 02448 80AD18E8 A61802F2 */ sh $t8, 0x02F2($s0) ## 000002F2 /* 0244C 80AD18EC AFA00010 */ sw $zero, 0x0010($sp) /* 02450 80AD18F0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02454 80AD18F4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 02454 80AD18F4 0C01E1A7 */ jal Math_SmoothStepToS /* 02458 80AD18F8 240700FA */ addiu $a3, $zero, 0x00FA ## $a3 = 000000FA /* 0245C 80AD18FC 921900AF */ lbu $t9, 0x00AF($s0) ## 000000AF @@ -107,7 +107,7 @@ glabel func_80AD17E8 /* 024A4 80AD1944 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 024A8 80AD1948 E7A60010 */ swc1 $f6, 0x0010($sp) /* 024AC 80AD194C 44052000 */ mfc1 $a1, $f4 -/* 024B0 80AD1950 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 024B0 80AD1950 0C01E0C4 */ jal Math_SmoothStepToF /* 024B4 80AD1954 00000000 */ nop /* 024B8 80AD1958 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1BD8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1BD8.s index 821302be62..dcf20927d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1BD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1BD8.s @@ -82,19 +82,19 @@ glabel func_80AD1BD8 /* 0285C 80AD1CFC 4481A000 */ mtc1 $at, $f20 ## $f20 = 20.00 /* 02860 80AD1D00 27B20054 */ addiu $s2, $sp, 0x0054 ## $s2 = FFFFFFF4 .L80AD1D04: -/* 02864 80AD1D04 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02864 80AD1D04 0C00CFC8 */ jal Rand_CenteredFloat /* 02868 80AD1D08 4600A306 */ mov.s $f12, $f20 /* 0286C 80AD1D0C C6240024 */ lwc1 $f4, 0x0024($s1) ## 00000024 /* 02870 80AD1D10 46040180 */ add.s $f6, $f0, $f4 -/* 02874 80AD1D14 0C03F66B */ jal Math_Rand_ZeroOne +/* 02874 80AD1D14 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02878 80AD1D18 E7A60054 */ swc1 $f6, 0x0054($sp) /* 0287C 80AD1D1C 46160202 */ mul.s $f8, $f0, $f22 /* 02880 80AD1D20 C62A0028 */ lwc1 $f10, 0x0028($s1) ## 00000028 /* 02884 80AD1D24 4600A306 */ mov.s $f12, $f20 /* 02888 80AD1D28 460A4400 */ add.s $f16, $f8, $f10 -/* 0288C 80AD1D2C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0288C 80AD1D2C 0C00CFC8 */ jal Rand_CenteredFloat /* 02890 80AD1D30 E7B00058 */ swc1 $f16, 0x0058($sp) /* 02894 80AD1D34 C632002C */ lwc1 $f18, 0x002C($s1) ## 0000002C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2438.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2438.s index 125f83354d..70b39ae24d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2438.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2438.s @@ -94,7 +94,7 @@ glabel func_80AD2438 /* 0309C 80AD253C 00822021 */ addu $a0, $a0, $v0 /* 030A0 80AD2540 00042140 */ sll $a0, $a0, 5 /* 030A4 80AD2544 00042400 */ sll $a0, $a0, 16 -/* 030A8 80AD2548 0C01DE1C */ jal Math_Sins +/* 030A8 80AD2548 0C01DE1C */ jal Math_SinS ## sins? /* 030AC 80AD254C 00042403 */ sra $a0, $a0, 16 /* 030B0 80AD2550 3C0180AD */ lui $at, %hi(D_80AD2974) ## $at = 80AD0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF609C.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF609C.s index e659a10c49..64f06bbd5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF609C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF609C.s @@ -28,7 +28,7 @@ glabel func_80AF609C /* 00B9C 80AF60FC 10000008 */ beq $zero, $zero, .L80AF6120 /* 00BA0 80AF6100 A4C20214 */ sh $v0, 0x0214($a2) ## 00000214 .L80AF6104: -/* 00BA4 80AF6104 0C01DF64 */ jal Math_Rand_S16Offset +/* 00BA4 80AF6104 0C01DF64 */ jal Rand_S16Offset /* 00BA8 80AF6108 AFA60018 */ sw $a2, 0x0018($sp) /* 00BAC 80AF610C 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA880.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA880.s index a721322dc7..4141950d2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA880.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA880.s @@ -9,7 +9,7 @@ glabel func_80AFA880 /* 0017C 80AFA89C 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 00180 80AFA8A0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 00184 80AFA8A4 24040064 */ addiu $a0, $zero, 0x0064 ## $a0 = 00000064 -/* 00188 80AFA8A8 0C01DF64 */ jal Math_Rand_S16Offset +/* 00188 80AFA8A8 0C01DF64 */ jal Rand_S16Offset /* 0018C 80AFA8AC 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 /* 00190 80AFA8B0 8FA70018 */ lw $a3, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAD64.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAD64.s index fbc6d0ce59..9f3778dd0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAD64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAD64.s @@ -24,7 +24,7 @@ glabel func_80AFAD64 /* 00694 80AFADB4 31F81000 */ andi $t8, $t7, 0x1000 ## $t8 = 00000000 /* 00698 80AFADB8 57000004 */ bnel $t8, $zero, .L80AFADCC /* 0069C 80AFADBC 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 006A0 80AFADC0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 006A0 80AFADC0 0C01E1EF */ jal Math_ApproachS /* 006A4 80AFADC4 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 006A8 80AFADC8 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAE28.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAE28.s index f725f23282..6ed33c8418 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAE28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAE28.s @@ -7,7 +7,7 @@ glabel func_80AFAE28 /* 0071C 80AFAE3C 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 00720 80AFAE40 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 /* 00724 80AFAE44 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00728 80AFAE48 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 00728 80AFAE48 0C01E1EF */ jal Math_ApproachS /* 0072C 80AFAE4C 24070E38 */ addiu $a3, $zero, 0x0E38 ## $a3 = 00000E38 /* 00730 80AFAE50 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 @@ -37,7 +37,7 @@ glabel func_80AFAE28 /* 00784 80AFAEA4 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 /* 00788 80AFAEA8 5040002A */ beql $v0, $zero, .L80AFAF54 /* 0078C 80AFAEAC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00790 80AFAEB0 0C01DE1C */ jal Math_Sins +/* 00790 80AFAEB0 0C01DE1C */ jal Math_SinS ## sins? /* 00794 80AFAEB4 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00798 80AFAEB8 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 @@ -51,7 +51,7 @@ glabel func_80AFAE28 /* 007B8 80AFAED8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 007BC 80AFAEDC 46062200 */ add.s $f8, $f4, $f6 /* 007C0 80AFAEE0 E7A80040 */ swc1 $f8, 0x0040($sp) -/* 007C4 80AFAEE4 0C01DE0D */ jal Math_Coss +/* 007C4 80AFAEE4 0C01DE0D */ jal Math_CosS ## coss? /* 007C8 80AFAEE8 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 007CC 80AFAEEC 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB028.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB028.s index c280e5e24d..67ad7af994 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB028.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB028.s @@ -35,7 +35,7 @@ glabel func_80AFB028 /* 0097C 80AFB09C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 00980 80AFB0A0 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 00984 80AFB0A4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00988 80AFB0A8 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 00988 80AFB0A8 0C01E1EF */ jal Math_ApproachS /* 0098C 80AFB0AC 24070E38 */ addiu $a3, $zero, 0x0E38 ## $a3 = 00000E38 /* 00990 80AFB0B0 8FBF0034 */ lw $ra, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A8.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A8.s index fff0081b4d..5b071a003a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A8.s @@ -29,7 +29,7 @@ glabel func_80AFC9A8 /* 00054 80AFC9F4 AD0B0000 */ sw $t3, 0x0000($t0) ## FFFFFFDC /* 00058 80AFC9F8 8D2B0008 */ lw $t3, 0x0008($t1) ## 80AFE0CC /* 0005C 80AFC9FC AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFE0 -/* 00060 80AFCA00 0C03F66B */ jal Math_Rand_ZeroOne +/* 00060 80AFCA00 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00064 80AFCA04 AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFE4 /* 00068 80AFCA08 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -41,7 +41,7 @@ glabel func_80AFC9A8 /* 00080 80AFCA20 46083302 */ mul.s $f12, $f6, $f8 /* 00084 80AFCA24 E7AC0040 */ swc1 $f12, 0x0040($sp) /* 00088 80AFCA28 C58A0080 */ lwc1 $f10, 0x0080($t4) ## 00000080 -/* 0008C 80AFCA2C 0C0329C8 */ jal func_800CA720 +/* 0008C 80AFCA2C 0C0329C8 */ jal Math_SinF /* 00090 80AFCA30 E7AA0060 */ swc1 $f10, 0x0060($sp) /* 00094 80AFCA34 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 00098 80AFCA38 44818000 */ mtc1 $at, $f16 ## $f16 = 15.00 @@ -50,7 +50,7 @@ glabel func_80AFC9A8 /* 000A4 80AFCA44 46100482 */ mul.s $f18, $f0, $f16 /* 000A8 80AFCA48 C5A40000 */ lwc1 $f4, 0x0000($t5) ## 00000000 /* 000AC 80AFCA4C 46049180 */ add.s $f6, $f18, $f4 -/* 000B0 80AFCA50 0C0329DD */ jal func_800CA774 +/* 000B0 80AFCA50 0C0329DD */ jal Math_CosF /* 000B4 80AFCA54 E7A6005C */ swc1 $f6, 0x005C($sp) /* 000B8 80AFCA58 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 000BC 80AFCA5C 44814000 */ mtc1 $at, $f8 ## $f8 = 15.00 @@ -60,15 +60,15 @@ glabel func_80AFC9A8 /* 000CC 80AFCA6C C5D00008 */ lwc1 $f16, 0x0008($t6) ## 00000008 /* 000D0 80AFCA70 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 /* 000D4 80AFCA74 46105480 */ add.s $f18, $f10, $f16 -/* 000D8 80AFCA78 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 000D8 80AFCA78 0C00CFC8 */ jal Rand_CenteredFloat /* 000DC 80AFCA7C E7B20064 */ swc1 $f18, 0x0064($sp) /* 000E0 80AFCA80 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 000E4 80AFCA84 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 000E8 80AFCA88 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 000E8 80AFCA88 0C00CFC8 */ jal Rand_CenteredFloat /* 000EC 80AFCA8C E7A00044 */ swc1 $f0, 0x0044($sp) -/* 000F0 80AFCA90 0C03F66B */ jal Math_Rand_ZeroOne +/* 000F0 80AFCA90 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 000F4 80AFCA94 E7A0004C */ swc1 $f0, 0x004C($sp) /* 000F8 80AFCA98 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -79,7 +79,7 @@ glabel func_80AFC9A8 /* 0010C 80AFCAAC C7B00054 */ lwc1 $f16, 0x0054($sp) /* 00110 80AFCAB0 46083282 */ mul.s $f10, $f6, $f8 /* 00114 80AFCAB4 460A8480 */ add.s $f18, $f16, $f10 -/* 00118 80AFCAB8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00118 80AFCAB8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0011C 80AFCABC E7B20054 */ swc1 $f18, 0x0054($sp) /* 00120 80AFCAC0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCE5C.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCE5C.s index 1084eb2ea0..cfe017c2c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCE5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCE5C.s @@ -24,7 +24,7 @@ glabel func_80AFCE5C /* 00510 80AFCEB0 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 .L80AFCEB4: /* 00514 80AFCEB4 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC -/* 00518 80AFCEB8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00518 80AFCEB8 0C01E0C4 */ jal Math_SmoothStepToF /* 0051C 80AFCEBC E7A00010 */ swc1 $f0, 0x0010($sp) /* 00520 80AFCEC0 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 @@ -32,7 +32,7 @@ glabel func_80AFCE5C /* 00528 80AFCEC8 3C0541C8 */ lui $a1, 0x41C8 ## $a1 = 41C80000 /* 0052C 80AFCECC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00530 80AFCED0 3C074020 */ lui $a3, 0x4020 ## $a3 = 40200000 -/* 00534 80AFCED4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00534 80AFCED4 0C01E0C4 */ jal Math_SmoothStepToF /* 00538 80AFCED8 E7A80010 */ swc1 $f8, 0x0010($sp) /* 0053C 80AFCEDC 8FA4002C */ lw $a0, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCFF0.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCFF0.s index e57d1cc719..e9583f117e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCFF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCFF0.s @@ -9,7 +9,7 @@ glabel func_80AFCFF0 /* 0066C 80AFD00C 248400BC */ addiu $a0, $a0, 0x00BC ## $a0 = 000000BC /* 00670 80AFD010 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00674 80AFD014 3C0743FA */ lui $a3, 0x43FA ## $a3 = 43FA0000 -/* 00678 80AFD018 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00678 80AFD018 0C01E0C4 */ jal Math_SmoothStepToF /* 0067C 80AFD01C E7A40010 */ swc1 $f4, 0x0010($sp) /* 00680 80AFD020 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 @@ -33,7 +33,7 @@ glabel func_80AFCFF0 /* 006C4 80AFD064 260400C4 */ addiu $a0, $s0, 0x00C4 ## $a0 = 000000C4 /* 006C8 80AFD068 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 006CC 80AFD06C 3C074020 */ lui $a3, 0x4020 ## $a3 = 40200000 -/* 006D0 80AFD070 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 006D0 80AFD070 0C01E0C4 */ jal Math_SmoothStepToF /* 006D4 80AFD074 E7A20010 */ swc1 $f2, 0x0010($sp) /* 006D8 80AFD078 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD13C.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD13C.s index d09e9374ca..ef40f90e01 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD13C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD13C.s @@ -20,7 +20,7 @@ glabel func_80AFD13C /* 007D0 80AFD170 3319000F */ andi $t9, $t8, 0x000F ## $t9 = 00000000 /* 007D4 80AFD174 57200008 */ bnel $t9, $zero, .L80AFD198 /* 007D8 80AFD178 860A008A */ lh $t2, 0x008A($s0) ## 0000008A -/* 007DC 80AFD17C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 007DC 80AFD17C 0C00CFC8 */ jal Rand_CenteredFloat /* 007E0 80AFD180 C42CE110 */ lwc1 $f12, %lo(D_80AFE110)($at) /* 007E4 80AFD184 4600010D */ trunc.w.s $f4, $f0 @@ -36,7 +36,7 @@ glabel func_80AFD13C /* 00808 80AFD1A8 00052C00 */ sll $a1, $a1, 16 /* 0080C 80AFD1AC 00052C03 */ sra $a1, $a1, 16 /* 00810 80AFD1B0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00814 80AFD1B4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00814 80AFD1B4 0C01E1A7 */ jal Math_SmoothStepToS /* 00818 80AFD1B8 240702EE */ addiu $a3, $zero, 0x02EE ## $a3 = 000002EE /* 0081C 80AFD1BC C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD6CC.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD6CC.s index ac65ab1875..8a63c62ad0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD6CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD6CC.s @@ -49,7 +49,7 @@ glabel func_80AFD6CC /* 00DC8 80AFD768 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 00DCC 80AFD76C 8605008A */ lh $a1, 0x008A($s0) ## 0000008A .L80AFD770: -/* 00DD0 80AFD770 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00DD0 80AFD770 0C01E1A7 */ jal Math_SmoothStepToS /* 00DD4 80AFD774 AFA00010 */ sw $zero, 0x0010($sp) /* 00DD8 80AFD778 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD968.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD968.s index b117e98b0a..6779525e7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD968.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD968.s @@ -99,18 +99,18 @@ glabel func_80AFD968 /* 01124 80AFDAC4 8C4C0004 */ lw $t4, 0x0004($v0) ## 00000028 /* 01128 80AFDAC8 AE2C0004 */ sw $t4, 0x0004($s1) ## FFFFFFF0 /* 0112C 80AFDACC 8C4D0008 */ lw $t5, 0x0008($v0) ## 0000002C -/* 01130 80AFDAD0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01130 80AFDAD0 0C00CFC8 */ jal Rand_CenteredFloat /* 01134 80AFDAD4 AE2D0008 */ sw $t5, 0x0008($s1) ## FFFFFFF4 /* 01138 80AFDAD8 C7A40054 */ lwc1 $f4, 0x0054($sp) /* 0113C 80AFDADC 4600A306 */ mov.s $f12, $f20 /* 01140 80AFDAE0 46002180 */ add.s $f6, $f4, $f0 -/* 01144 80AFDAE4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01144 80AFDAE4 0C00CFC8 */ jal Rand_CenteredFloat /* 01148 80AFDAE8 E7A60054 */ swc1 $f6, 0x0054($sp) /* 0114C 80AFDAEC C7A8005C */ lwc1 $f8, 0x005C($sp) /* 01150 80AFDAF0 46004280 */ add.s $f10, $f8, $f0 -/* 01154 80AFDAF4 0C03F66B */ jal Math_Rand_ZeroOne +/* 01154 80AFDAF4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01158 80AFDAF8 E7AA005C */ swc1 $f10, 0x005C($sp) /* 0115C 80AFDAFC 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDD30.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDD30.s index 8e73cf684a..823ce6bf0e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDD30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDD30.s @@ -41,7 +41,7 @@ glabel func_80AFDD30 /* 01404 80AFDDA4 00812023 */ subu $a0, $a0, $at /* 01408 80AFDDA8 00042100 */ sll $a0, $a0, 4 /* 0140C 80AFDDAC 00042400 */ sll $a0, $a0, 16 -/* 01410 80AFDDB0 0C01DE1C */ jal Math_Sins +/* 01410 80AFDDB0 0C01DE1C */ jal Math_SinS ## sins? /* 01414 80AFDDB4 00042403 */ sra $a0, $a0, 16 /* 01418 80AFDDB8 3C0142BE */ lui $at, 0x42BE ## $at = 42BE0000 @@ -60,7 +60,7 @@ glabel func_80AFDD30 /* 0144C 80AFDDEC 01830019 */ multu $t4, $v1 /* 01450 80AFDDF0 00002012 */ mflo $a0 /* 01454 80AFDDF4 00042400 */ sll $a0, $a0, 16 -/* 01458 80AFDDF8 0C01DE1C */ jal Math_Sins +/* 01458 80AFDDF8 0C01DE1C */ jal Math_SinS ## sins? /* 0145C 80AFDDFC 00042403 */ sra $a0, $a0, 16 /* 01460 80AFDE00 3C0142BE */ lui $at, 0x42BE ## $at = 42BE0000 @@ -78,7 +78,7 @@ glabel func_80AFDD30 /* 0148C 80AFDE2C 01C30019 */ multu $t6, $v1 /* 01490 80AFDE30 00002012 */ mflo $a0 /* 01494 80AFDE34 00042400 */ sll $a0, $a0, 16 -/* 01498 80AFDE38 0C01DE1C */ jal Math_Sins +/* 01498 80AFDE38 0C01DE1C */ jal Math_SinS ## sins? /* 0149C 80AFDE3C 00042403 */ sra $a0, $a0, 16 /* 014A0 80AFDE40 3C0142BE */ lui $at, 0x42BE ## $at = 42BE0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF424.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF424.s index c4f5be20ee..b12356ec73 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF424.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF424.s @@ -23,7 +23,7 @@ glabel func_80AFF424 /* 011C4 80AFF474 44073000 */ mfc1 $a3, $f6 /* 011C8 80AFF478 00000000 */ nop /* 011CC 80AFF47C 00073C00 */ sll $a3, $a3, 16 -/* 011D0 80AFF480 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 011D0 80AFF480 0C01E1A7 */ jal Math_SmoothStepToS /* 011D4 80AFF484 00073C03 */ sra $a3, $a3, 16 /* 011D8 80AFF488 A7A2002E */ sh $v0, 0x002E($sp) @@ -32,7 +32,7 @@ glabel func_80AFF424 /* 011E4 80AFF494 3C0544FA */ lui $a1, 0x44FA ## $a1 = 44FA0000 /* 011E8 80AFF498 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 011EC 80AFF49C 3C074348 */ lui $a3, 0x4348 ## $a3 = 43480000 -/* 011F0 80AFF4A0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 011F0 80AFF4A0 0C01E107 */ jal Math_ApproachF /* 011F4 80AFF4A4 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 /* 011F8 80AFF4A8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF688.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF688.s index afe03c7c1d..0f1acd1b09 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF688.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF688.s @@ -14,21 +14,21 @@ glabel func_80AFF688 .L80AFF6B8: /* 01408 80AFF6B8 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 0140C 80AFF6BC AE0202DC */ sw $v0, 0x02DC($s0) ## 000002DC -/* 01410 80AFF6C0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01410 80AFF6C0 0C00CFC8 */ jal Rand_CenteredFloat /* 01414 80AFF6C4 A20200C8 */ sb $v0, 0x00C8($s0) ## 000000C8 /* 01418 80AFF6C8 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 0141C 80AFF6CC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 01420 80AFF6D0 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 01424 80AFF6D4 46040180 */ add.s $f6, $f0, $f4 -/* 01428 80AFF6D8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01428 80AFF6D8 0C00CFC8 */ jal Rand_CenteredFloat /* 0142C 80AFF6DC E7A6006C */ swc1 $f6, 0x006C($sp) /* 01430 80AFF6E0 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 01434 80AFF6E4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 01438 80AFF6E8 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 0143C 80AFF6EC 46080280 */ add.s $f10, $f0, $f8 -/* 01440 80AFF6F0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01440 80AFF6F0 0C00CFC8 */ jal Rand_CenteredFloat /* 01444 80AFF6F4 E7AA0070 */ swc1 $f10, 0x0070($sp) /* 01448 80AFF6F8 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00130.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00130.s index 375881d6e8..ccc5a298c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00130.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00130.s @@ -13,13 +13,13 @@ glabel func_80B00130 /* 01EAC 80B0015C 44073000 */ mfc1 $a3, $f6 /* 01EB0 80B00160 00000000 */ nop /* 01EB4 80B00164 00073C00 */ sll $a3, $a3, 16 -/* 01EB8 80B00168 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01EB8 80B00168 0C01E1A7 */ jal Math_SmoothStepToS /* 01EBC 80B0016C 00073C03 */ sra $a3, $a3, 16 /* 01EC0 80B00170 260402F0 */ addiu $a0, $s0, 0x02F0 ## $a0 = 000002F0 /* 01EC4 80B00174 3C0544FA */ lui $a1, 0x44FA ## $a1 = 44FA0000 /* 01EC8 80B00178 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01ECC 80B0017C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01ECC 80B0017C 0C01E107 */ jal Math_ApproachF /* 01ED0 80B00180 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 01ED4 80B00184 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00A08.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00A08.s index f5cb2bf904..647e2c288a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00A08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B00A08.s @@ -8,7 +8,7 @@ glabel func_80B00A08 /* 02770 80B00A20 85C50032 */ lh $a1, 0x0032($t6) ## 00000032 /* 02774 80B00A24 AFA00010 */ sw $zero, 0x0010($sp) /* 02778 80B00A28 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 0277C 80B00A2C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0277C 80B00A2C 0C01E1A7 */ jal Math_SmoothStepToS /* 02780 80B00A30 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 02784 80B00A34 8FA30024 */ lw $v1, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B078C8.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B078C8.s index 50484eb1d1..1b6ffc81be 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B078C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B078C8.s @@ -22,7 +22,7 @@ glabel func_80B078C8 /* 003D4 80B07914 10200013 */ beq $at, $zero, .L80B07964 /* 003D8 80B07918 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 003DC 80B0791C 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 -/* 003E0 80B07920 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 003E0 80B07920 0C01E1A7 */ jal Math_SmoothStepToS /* 003E4 80B07924 AFB90010 */ sw $t9, 0x0010($sp) /* 003E8 80B07928 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 @@ -48,7 +48,7 @@ glabel func_80B078C8 /* 00434 80B07974 260402A8 */ addiu $a0, $s0, 0x02A8 ## $a0 = 000002A8 /* 00438 80B07978 2405E000 */ addiu $a1, $zero, 0xE000 ## $a1 = FFFFE000 /* 0043C 80B0797C 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00440 80B07980 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00440 80B07980 0C01E1A7 */ jal Math_SmoothStepToS /* 00444 80B07984 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 00448 80B07988 10000008 */ beq $zero, $zero, .L80B079AC @@ -58,7 +58,7 @@ glabel func_80B078C8 /* 00454 80B07994 AFAC0010 */ sw $t4, 0x0010($sp) /* 00458 80B07998 24052000 */ addiu $a1, $zero, 0x2000 ## $a1 = 00002000 /* 0045C 80B0799C 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00460 80B079A0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00460 80B079A0 0C01E1A7 */ jal Math_SmoothStepToS /* 00464 80B079A4 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 00468 80B079A8 8605008A */ lh $a1, 0x008A($s0) ## 0000008A @@ -67,7 +67,7 @@ glabel func_80B078C8 /* 00470 80B079B0 AFAD0010 */ sw $t5, 0x0010($sp) /* 00474 80B079B4 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 00478 80B079B8 2406000C */ addiu $a2, $zero, 0x000C ## $a2 = 0000000C -/* 0047C 80B079BC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0047C 80B079BC 0C01E1A7 */ jal Math_SmoothStepToS /* 00480 80B079C0 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 00484 80B079C4 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B079E0.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B079E0.s index 7b6c52291c..4be4bd778f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B079E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B079E0.s @@ -43,7 +43,7 @@ glabel func_80B079E0 .L80B07A7C: /* 0053C 80B07A7C AFA80010 */ sw $t0, 0x0010($sp) /* 00540 80B07A80 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00544 80B07A84 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00544 80B07A84 0C01E1A7 */ jal Math_SmoothStepToS /* 00548 80B07A88 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 0054C 80B07A8C 24090064 */ addiu $t1, $zero, 0x0064 ## $t1 = 00000064 @@ -51,7 +51,7 @@ glabel func_80B079E0 /* 00554 80B07A94 260402A8 */ addiu $a0, $s0, 0x02A8 ## $a0 = 000002A8 /* 00558 80B07A98 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0055C 80B07A9C 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00560 80B07AA0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00560 80B07AA0 0C01E1A7 */ jal Math_SmoothStepToS /* 00564 80B07AA4 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 00568 80B07AA8 240A0064 */ addiu $t2, $zero, 0x0064 ## $t2 = 00000064 @@ -59,7 +59,7 @@ glabel func_80B079E0 /* 00570 80B07AB0 260402AC */ addiu $a0, $s0, 0x02AC ## $a0 = 000002AC /* 00574 80B07AB4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00578 80B07AB8 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 0057C 80B07ABC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0057C 80B07ABC 0C01E1A7 */ jal Math_SmoothStepToS /* 00580 80B07AC0 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 00584 80B07AC4 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064 @@ -67,7 +67,7 @@ glabel func_80B079E0 /* 0058C 80B07ACC 260402AE */ addiu $a0, $s0, 0x02AE ## $a0 = 000002AE /* 00590 80B07AD0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00594 80B07AD4 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00598 80B07AD8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00598 80B07AD8 0C01E1A7 */ jal Math_SmoothStepToS /* 0059C 80B07ADC 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 005A0 80B07AE0 8FBF002C */ lw $ra, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07EE0.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07EE0.s index a946b0ca1c..73ac3f4886 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07EE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07EE0.s @@ -55,7 +55,7 @@ glabel func_80B07EE0 .L80B07F9C: /* 00A5C 80B07F9C 54400006 */ bnel $v0, $zero, .L80B07FB8 /* 00A60 80B07FA0 A60302B4 */ sh $v1, 0x02B4($s0) ## 000002B4 -/* 00A64 80B07FA4 0C01DF64 */ jal Math_Rand_S16Offset +/* 00A64 80B07FA4 0C01DF64 */ jal Rand_S16Offset /* 00A68 80B07FA8 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C /* 00A6C 80B07FAC A60202B6 */ sh $v0, 0x02B6($s0) ## 000002B6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07FE0.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07FE0.s index 73188b42c8..9c4f40f999 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07FE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07FE0.s @@ -48,7 +48,7 @@ glabel func_80B07FE0 /* 00B4C 80B0808C AFA30018 */ sw $v1, 0x0018($sp) /* 00B50 80B08090 00002012 */ mflo $a0 /* 00B54 80B08094 00042400 */ sll $a0, $a0, 16 -/* 00B58 80B08098 0C01DE1C */ jal Math_Sins +/* 00B58 80B08098 0C01DE1C */ jal Math_SinS ## sins? /* 00B5C 80B0809C 00042403 */ sra $a0, $a0, 16 /* 00B60 80B080A0 8FA20038 */ lw $v0, 0x0038($sp) @@ -70,7 +70,7 @@ glabel func_80B07FE0 /* 00BA0 80B080E0 014B0019 */ multu $t2, $t3 /* 00BA4 80B080E4 00002012 */ mflo $a0 /* 00BA8 80B080E8 00042400 */ sll $a0, $a0, 16 -/* 00BAC 80B080EC 0C01DE0D */ jal Math_Coss +/* 00BAC 80B080EC 0C01DE0D */ jal Math_CosS ## coss? /* 00BB0 80B080F0 00042403 */ sra $a0, $a0, 16 /* 00BB4 80B080F4 8FA20038 */ lw $v0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Init.s index c29d25d8c5..6e20290762 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Init.s @@ -137,7 +137,7 @@ glabel EnSw_Init /* 0093C 80B0C6EC C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 00940 80B0C6F0 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 00944 80B0C6F4 E6060488 */ swc1 $f6, 0x0488($s0) ## 00000488 -/* 00948 80B0C6F8 0C01DE1C */ jal Math_Sins +/* 00948 80B0C6F8 0C01DE1C */ jal Math_SinS ## sins? /* 0094C 80B0C6FC AFA20030 */ sw $v0, 0x0030($sp) /* 00950 80B0C700 3C01C270 */ lui $at, 0xC270 ## $at = C2700000 @@ -146,7 +146,7 @@ glabel EnSw_Init /* 0095C 80B0C70C 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 00960 80B0C710 46080282 */ mul.s $f10, $f0, $f8 /* 00964 80B0C714 46105480 */ add.s $f18, $f10, $f16 -/* 00968 80B0C718 0C01DE0D */ jal Math_Coss +/* 00968 80B0C718 0C01DE0D */ jal Math_CosS ## coss? /* 0096C 80B0C71C E6120484 */ swc1 $f18, 0x0484($s0) ## 00000484 /* 00970 80B0C720 3C01C270 */ lui $at, 0xC270 ## $at = C2700000 @@ -173,7 +173,7 @@ glabel EnSw_Init /* 009C0 80B0C770 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 009C4 80B0C774 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 /* 009C8 80B0C778 00042400 */ sll $a0, $a0, 16 -/* 009CC 80B0C77C 0C01DE1C */ jal Math_Sins +/* 009CC 80B0C77C 0C01DE1C */ jal Math_SinS ## sins? /* 009D0 80B0C780 00042403 */ sra $a0, $a0, 16 /* 009D4 80B0C784 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 @@ -182,7 +182,7 @@ glabel EnSw_Init /* 009E0 80B0C790 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 /* 009E4 80B0C794 00042400 */ sll $a0, $a0, 16 /* 009E8 80B0C798 00042403 */ sra $a0, $a0, 16 -/* 009EC 80B0C79C 0C01DE0D */ jal Math_Coss +/* 009EC 80B0C79C 0C01DE0D */ jal Math_CosS ## coss? /* 009F0 80B0C7A0 E6100374 */ swc1 $f16, 0x0374($s0) ## 00000374 /* 009F4 80B0C7A4 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 @@ -192,13 +192,13 @@ glabel EnSw_Init /* 00A04 80B0C7B4 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00A08 80B0C7B8 E6020364 */ swc1 $f2, 0x0364($s0) ## 00000364 /* 00A0C 80B0C7BC E602036C */ swc1 $f2, 0x036C($s0) ## 0000036C -/* 00A10 80B0C7C0 0C01DE1C */ jal Math_Sins +/* 00A10 80B0C7C0 0C01DE1C */ jal Math_SinS ## sins? /* 00A14 80B0C7C4 E6120368 */ swc1 $f18, 0x0368($s0) ## 00000368 /* 00A18 80B0C7C8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00A1C 80B0C7CC E600037C */ swc1 $f0, 0x037C($s0) ## 0000037C /* 00A20 80B0C7D0 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00A24 80B0C7D4 0C01DE0D */ jal Math_Coss +/* 00A24 80B0C7D4 0C01DE0D */ jal Math_CosS ## coss? /* 00A28 80B0C7D8 E6040380 */ swc1 $f4, 0x0380($s0) ## 00000380 /* 00A2C 80B0C7DC E6000384 */ swc1 $f0, 0x0384($s0) ## 00000384 @@ -284,7 +284,7 @@ glabel EnSw_Init /* 00B4C 80B0C8FC A20F0117 */ sb $t7, 0x0117($s0) ## 00000117 .L80B0C900: /* 00B50 80B0C900 2404000F */ addiu $a0, $zero, 0x000F ## $a0 = 0000000F -/* 00B54 80B0C904 0C01DF64 */ jal Math_Rand_S16Offset +/* 00B54 80B0C904 0C01DF64 */ jal Rand_S16Offset /* 00B58 80B0C908 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E /* 00B5C 80B0C90C A602038E */ sh $v0, 0x038E($s0) ## 0000038E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BE20.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BE20.s index 6b54180d96..f198fbc266 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BE20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BE20.s @@ -39,7 +39,7 @@ glabel func_80B0BE20 /* 000E8 80B0BE98 C492036C */ lwc1 $f18, 0x036C($a0) ## 0000036C /* 000EC 80B0BE9C 46125182 */ mul.s $f6, $f10, $f18 /* 000F0 80B0BEA0 46102200 */ add.s $f8, $f4, $f16 -/* 000F4 80B0BEA4 0C03F4DA */ jal Math_acosf +/* 000F4 80B0BEA4 0C03F4DA */ jal Math_FAcosF /* 000F8 80B0BEA8 46064300 */ add.s $f12, $f8, $f6 /* 000FC 80B0BEAC 26040364 */ addiu $a0, $s0, 0x0364 ## $a0 = 00000364 /* 00100 80B0BEB0 E7A00034 */ swc1 $f0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C0CC.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C0CC.s index 373dfa6720..48c51d6fd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C0CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C0CC.s @@ -251,7 +251,7 @@ glabel func_80B0C0CC /* 006CC 80B0C47C AFAC0010 */ sw $t4, 0x0010($sp) /* 006D0 80B0C480 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 006D4 80B0C484 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 006D8 80B0C488 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 006D8 80B0C488 0C01E1A7 */ jal Math_SmoothStepToS /* 006DC 80B0C48C 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 006E0 80B0C490 86050032 */ lh $a1, 0x0032($s0) ## 00000032 @@ -259,7 +259,7 @@ glabel func_80B0C0CC /* 006E8 80B0C498 AFAD0010 */ sw $t5, 0x0010($sp) /* 006EC 80B0C49C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 006F0 80B0C4A0 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 006F4 80B0C4A4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 006F4 80B0C4A4 0C01E1A7 */ jal Math_SmoothStepToS /* 006F8 80B0C4A8 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 006FC 80B0C4AC 86050034 */ lh $a1, 0x0034($s0) ## 00000034 @@ -267,7 +267,7 @@ glabel func_80B0C0CC /* 00704 80B0C4B4 AFAE0010 */ sw $t6, 0x0010($sp) /* 00708 80B0C4B8 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 /* 0070C 80B0C4BC 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00710 80B0C4C0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00710 80B0C4C0 0C01E1A7 */ jal Math_SmoothStepToS /* 00714 80B0C4C4 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 00718 80B0C4C8 8FBF004C */ lw $ra, 0x004C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CF44.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CF44.s index e70438c7d4..2097ce5909 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CF44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CF44.s @@ -42,7 +42,7 @@ glabel func_80B0CF44 /* 01234 80B0CFE4 AFCE0004 */ sw $t6, 0x0004($s8) ## FFFFFFE4 /* 01238 80B0CFE8 8DAF0008 */ lw $t7, 0x0008($t5) ## 80B0F108 /* 0123C 80B0CFEC AFCF0008 */ sw $t7, 0x0008($s8) ## FFFFFFE8 -/* 01240 80B0CFF0 0C03F66B */ jal Math_Rand_ZeroOne +/* 01240 80B0CFF0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01244 80B0CFF4 AFA600B0 */ sw $a2, 0x00B0($sp) /* 01248 80B0CFF8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -75,19 +75,19 @@ glabel func_80B0CF44 /* 012B0 80B0D060 00000000 */ nop /* 012B4 80B0D064 0006000D */ break 6 .L80B0D068: -/* 012B8 80B0D068 0C03F66B */ jal Math_Rand_ZeroOne +/* 012B8 80B0D068 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 012BC 80B0D06C 00000000 */ nop /* 012C0 80B0D070 46160501 */ sub.s $f20, $f0, $f22 /* 012C4 80B0D074 4614A400 */ add.s $f16, $f20, $f20 -/* 012C8 80B0D078 0C03F66B */ jal Math_Rand_ZeroOne +/* 012C8 80B0D078 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 012CC 80B0D07C E7B00088 */ swc1 $f16, 0x0088($sp) /* 012D0 80B0D080 46160501 */ sub.s $f20, $f0, $f22 /* 012D4 80B0D084 00102400 */ sll $a0, $s0, 16 /* 012D8 80B0D088 00042403 */ sra $a0, $a0, 16 /* 012DC 80B0D08C 4614A480 */ add.s $f18, $f20, $f20 -/* 012E0 80B0D090 0C01DE1C */ jal Math_Sins +/* 012E0 80B0D090 0C01DE1C */ jal Math_SinS ## sins? /* 012E4 80B0D094 E7B20090 */ swc1 $f18, 0x0090($sp) /* 012E8 80B0D098 46000100 */ add.s $f4, $f0, $f0 @@ -97,7 +97,7 @@ glabel func_80B0CF44 /* 012F8 80B0D0A8 46062200 */ add.s $f8, $f4, $f6 /* 012FC 80B0D0AC E7A8007C */ swc1 $f8, 0x007C($sp) /* 01300 80B0D0B0 C64A0028 */ lwc1 $f10, 0x0028($s2) ## 00000028 -/* 01304 80B0D0B4 0C01DE0D */ jal Math_Coss +/* 01304 80B0D0B4 0C01DE0D */ jal Math_CosS ## coss? /* 01308 80B0D0B8 E7AA0080 */ swc1 $f10, 0x0080($sp) /* 0130C 80B0D0BC 46000400 */ add.s $f16, $f0, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D14C.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D14C.s index 8d182f6557..6729c92ae0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D14C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D14C.s @@ -43,7 +43,7 @@ glabel func_80B0D14C /* 01440 80B0D1F0 AFCE0004 */ sw $t6, 0x0004($s8) ## FFFFFFE4 /* 01444 80B0D1F4 8DAF0008 */ lw $t7, 0x0008($t5) ## 80B0F128 /* 01448 80B0D1F8 AFCF0008 */ sw $t7, 0x0008($s8) ## FFFFFFE8 -/* 0144C 80B0D1FC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0144C 80B0D1FC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01450 80B0D200 AFA600B8 */ sw $a2, 0x00B8($sp) /* 01454 80B0D204 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -79,19 +79,19 @@ glabel func_80B0D14C /* 014C4 80B0D274 4481C000 */ mtc1 $at, $f24 ## $f24 = 14.00 /* 014C8 80B0D278 00139C03 */ sra $s3, $s3, 16 .L80B0D27C: -/* 014CC 80B0D27C 0C03F66B */ jal Math_Rand_ZeroOne +/* 014CC 80B0D27C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 014D0 80B0D280 00000000 */ nop /* 014D4 80B0D284 46160501 */ sub.s $f20, $f0, $f22 /* 014D8 80B0D288 4614A400 */ add.s $f16, $f20, $f20 -/* 014DC 80B0D28C 0C03F66B */ jal Math_Rand_ZeroOne +/* 014DC 80B0D28C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 014E0 80B0D290 E7B00090 */ swc1 $f16, 0x0090($sp) /* 014E4 80B0D294 46160501 */ sub.s $f20, $f0, $f22 /* 014E8 80B0D298 00102400 */ sll $a0, $s0, 16 /* 014EC 80B0D29C 00042403 */ sra $a0, $a0, 16 /* 014F0 80B0D2A0 4614A480 */ add.s $f18, $f20, $f20 -/* 014F4 80B0D2A4 0C01DE1C */ jal Math_Sins +/* 014F4 80B0D2A4 0C01DE1C */ jal Math_SinS ## sins? /* 014F8 80B0D2A8 E7B20098 */ swc1 $f18, 0x0098($sp) /* 014FC 80B0D2AC 46180102 */ mul.s $f4, $f0, $f24 @@ -101,7 +101,7 @@ glabel func_80B0D14C /* 0150C 80B0D2BC 46062200 */ add.s $f8, $f4, $f6 /* 01510 80B0D2C0 E7A80084 */ swc1 $f8, 0x0084($sp) /* 01514 80B0D2C4 C64A0028 */ lwc1 $f10, 0x0028($s2) ## 00000028 -/* 01518 80B0D2C8 0C01DE0D */ jal Math_Coss +/* 01518 80B0D2C8 0C01DE0D */ jal Math_CosS ## coss? /* 0151C 80B0D2CC E7AA0088 */ swc1 $f10, 0x0088($sp) /* 01520 80B0D2D0 46180402 */ mul.s $f16, $f0, $f24 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D3AC.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D3AC.s index 0cf2e5c616..385b9e4198 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D3AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D3AC.s @@ -42,7 +42,7 @@ glabel func_80B0D3AC /* 01678 80B0D428 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A /* 0167C 80B0D42C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 01680 80B0D430 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3CA3D70A -/* 01684 80B0D434 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01684 80B0D434 0C01E107 */ jal Math_ApproachF /* 01688 80B0D438 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 /* 0168C 80B0D43C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D590.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D590.s index 5b6851f0cb..880e362da6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D590.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D590.s @@ -64,7 +64,7 @@ glabel func_80B0D590 /* 01898 80B0D648 00000000 */ nop .L80B0D64C: /* 0189C 80B0D64C 44050000 */ mfc1 $a1, $f0 -/* 018A0 80B0D650 0C01E107 */ jal Math_SmoothScaleMaxF +/* 018A0 80B0D650 0C01E107 */ jal Math_ApproachF /* 018A4 80B0D654 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 /* 018A8 80B0D658 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -99,7 +99,7 @@ glabel func_80B0D590 /* 01910 80B0D6C0 C426F234 */ lwc1 $f6, %lo(D_80B0F234)($at) /* 01914 80B0D6C4 E6060420 */ swc1 $f6, 0x0420($s0) ## 00000420 .L80B0D6C8: -/* 01918 80B0D6C8 0C01DF64 */ jal Math_Rand_S16Offset +/* 01918 80B0D6C8 0C01DF64 */ jal Rand_S16Offset /* 0191C 80B0D6CC A609038A */ sh $t1, 0x038A($s0) ## 0000038A /* 01920 80B0D6D0 860A001C */ lh $t2, 0x001C($s0) ## 0000001C @@ -123,7 +123,7 @@ glabel func_80B0D590 /* 01964 80B0D714 8619038C */ lh $t9, 0x038C($s0) ## 0000038C /* 01968 80B0D718 57200013 */ bnel $t9, $zero, .L80B0D768 /* 0196C 80B0D71C 8602038A */ lh $v0, 0x038A($s0) ## 0000038A -/* 01970 80B0D720 0C01DF64 */ jal Math_Rand_S16Offset +/* 01970 80B0D720 0C01DF64 */ jal Rand_S16Offset /* 01974 80B0D724 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E /* 01978 80B0D728 8608001C */ lh $t0, 0x001C($s0) ## 0000001C @@ -198,7 +198,7 @@ glabel func_80B0D590 /* 01A70 80B0D820 44044000 */ mfc1 $a0, $f8 /* 01A74 80B0D824 00000000 */ nop /* 01A78 80B0D828 00042400 */ sll $a0, $a0, 16 -/* 01A7C 80B0D82C 0C01DE1C */ jal Math_Sins +/* 01A7C 80B0D82C 0C01DE1C */ jal Math_SinS ## sins? /* 01A80 80B0D830 00042403 */ sra $a0, $a0, 16 /* 01A84 80B0D834 C60A0420 */ lwc1 $f10, 0x0420($s0) ## 00000420 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s index 39d3464746..543047f7f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s @@ -104,7 +104,7 @@ glabel func_80B0D878 /* 01C40 80B0D9F0 8E180028 */ lw $t8, 0x0028($s0) ## 00000028 /* 01C44 80B0D9F4 ADF80004 */ sw $t8, 0x0004($t7) ## FFFFFFF4 /* 01C48 80B0D9F8 8E19002C */ lw $t9, 0x002C($s0) ## 0000002C -/* 01C4C 80B0D9FC 0C03F66B */ jal Math_Rand_ZeroOne +/* 01C4C 80B0D9FC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01C50 80B0DA00 ADF90008 */ sw $t9, 0x0008($t7) ## FFFFFFF8 /* 01C54 80B0DA04 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -118,7 +118,7 @@ glabel func_80B0D878 /* 01C74 80B0DA24 46128102 */ mul.s $f4, $f16, $f18 /* 01C78 80B0DA28 46047180 */ add.s $f6, $f14, $f4 /* 01C7C 80B0DA2C 46064280 */ add.s $f10, $f8, $f6 -/* 01C80 80B0DA30 0C03F66B */ jal Math_Rand_ZeroOne +/* 01C80 80B0DA30 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01C84 80B0DA34 E7AA007C */ swc1 $f10, 0x007C($sp) /* 01C88 80B0DA38 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -129,7 +129,7 @@ glabel func_80B0D878 /* 01C9C 80B0DA4C C7A60078 */ lwc1 $f6, 0x0078($sp) /* 01CA0 80B0DA50 46049202 */ mul.s $f8, $f18, $f4 /* 01CA4 80B0DA54 46083280 */ add.s $f10, $f6, $f8 -/* 01CA8 80B0DA58 0C03F66B */ jal Math_Rand_ZeroOne +/* 01CA8 80B0DA58 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01CAC 80B0DA5C E7AA0078 */ swc1 $f10, 0x0078($sp) /* 01CB0 80B0DA60 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DC7C.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DC7C.s index 46f34d4440..e869836269 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DC7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DC7C.s @@ -35,7 +35,7 @@ glabel func_80B0DC7C .L80B0DCFC: /* 01F4C 80B0DCFC 10600044 */ beq $v1, $zero, .L80B0DE10 /* 01F50 80B0DD00 8FA40074 */ lw $a0, 0x0074($sp) -/* 01F54 80B0DD04 0C03F66B */ jal Math_Rand_ZeroOne +/* 01F54 80B0DD04 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01F58 80B0DD08 00000000 */ nop /* 01F5C 80B0DD0C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -49,7 +49,7 @@ glabel func_80B0DC7C /* 01F7C 80B0DD2C 46083282 */ mul.s $f10, $f6, $f8 /* 01F80 80B0DD30 46128100 */ add.s $f4, $f16, $f18 /* 01F84 80B0DD34 46045180 */ add.s $f6, $f10, $f4 -/* 01F88 80B0DD38 0C03F66B */ jal Math_Rand_ZeroOne +/* 01F88 80B0DD38 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01F8C 80B0DD3C E7A6005C */ swc1 $f6, 0x005C($sp) /* 01F90 80B0DD40 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -60,7 +60,7 @@ glabel func_80B0DC7C /* 01FA4 80B0DD54 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 01FA8 80B0DD58 46128282 */ mul.s $f10, $f16, $f18 /* 01FAC 80B0DD5C 46045180 */ add.s $f6, $f10, $f4 -/* 01FB0 80B0DD60 0C03F66B */ jal Math_Rand_ZeroOne +/* 01FB0 80B0DD60 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01FB4 80B0DD64 E7A60058 */ swc1 $f6, 0x0058($sp) /* 01FB8 80B0DD68 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DFFC.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DFFC.s index 48e68808bb..73dc169e52 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DFFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DFFC.s @@ -155,7 +155,7 @@ glabel func_80B0DFFC /* 02478 80B0E228 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 /* 0247C 80B0E22C 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 /* 02480 80B0E230 46802320 */ cvt.s.w $f12, $f4 -/* 02484 80B0E234 0C03F494 */ jal Math_atan2f +/* 02484 80B0E234 0C03F494 */ jal Math_FAtan2F /* 02488 80B0E238 468033A0 */ cvt.s.w $f14, $f6 /* 0248C 80B0E23C 3C0180B1 */ lui $at, %hi(D_80B0F238) ## $at = 80B10000 /* 02490 80B0E240 C428F238 */ lwc1 $f8, %lo(D_80B0F238)($at) @@ -171,7 +171,7 @@ glabel func_80B0DFFC /* 024B8 80B0E268 AE380004 */ sw $t8, 0x0004($s1) ## 00000028 /* 024BC 80B0E26C 8DF90008 */ lw $t9, 0x0008($t7) ## FFFFFFF0 /* 024C0 80B0E270 AE390008 */ sw $t9, 0x0008($s1) ## 0000002C -/* 024C4 80B0E274 0C01DE1C */ jal Math_Sins +/* 024C4 80B0E274 0C01DE1C */ jal Math_SinS ## sins? /* 024C8 80B0E278 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 024CC 80B0E27C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 @@ -180,7 +180,7 @@ glabel func_80B0DFFC /* 024D8 80B0E288 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 024DC 80B0E28C 46002182 */ mul.s $f6, $f4, $f0 /* 024E0 80B0E290 46069200 */ add.s $f8, $f18, $f6 -/* 024E4 80B0E294 0C01DE0D */ jal Math_Coss +/* 024E4 80B0E294 0C01DE0D */ jal Math_CosS ## coss? /* 024E8 80B0E298 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 /* 024EC 80B0E29C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 @@ -196,13 +196,13 @@ glabel func_80B0DFFC /* 02514 80B0E2C4 8D0A0004 */ lw $t2, 0x0004($t0) ## FFFFFFEC /* 02518 80B0E2C8 AE0A0438 */ sw $t2, 0x0438($s0) ## 00000438 /* 0251C 80B0E2CC 8D0B0008 */ lw $t3, 0x0008($t0) ## FFFFFFF0 -/* 02520 80B0E2D0 0C01DE1C */ jal Math_Sins +/* 02520 80B0E2D0 0C01DE1C */ jal Math_SinS ## sins? /* 02524 80B0E2D4 AE0B043C */ sw $t3, 0x043C($s0) ## 0000043C /* 02528 80B0E2D8 C6060434 */ lwc1 $f6, 0x0434($s0) ## 00000434 /* 0252C 80B0E2DC 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 02530 80B0E2E0 46003200 */ add.s $f8, $f6, $f0 -/* 02534 80B0E2E4 0C01DE0D */ jal Math_Coss +/* 02534 80B0E2E4 0C01DE0D */ jal Math_CosS ## coss? /* 02538 80B0E2E8 E6080434 */ swc1 $f8, 0x0434($s0) ## 00000434 /* 0253C 80B0E2EC C610043C */ lwc1 $f16, 0x043C($s0) ## 0000043C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E314.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E314.s index a0cc2e6e4c..dc53a36bfa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E314.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E314.s @@ -18,7 +18,7 @@ glabel func_80B0E314 /* 02590 80B0E340 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 02594 80B0E344 8FA50060 */ lw $a1, 0x0060($sp) /* 02598 80B0E348 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 0259C 80B0E34C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0259C 80B0E34C 0C01E0C4 */ jal Math_SmoothStepToF /* 025A0 80B0E350 E7A40010 */ swc1 $f4, 0x0010($sp) /* 025A4 80B0E354 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E430.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E430.s index 541b3f7c0d..6df5b1d164 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E430.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E430.s @@ -39,7 +39,7 @@ glabel func_80B0E430 /* 026E8 80B0E498 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 /* 026EC 80B0E49C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 026F0 80B0E4A0 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 -/* 026F4 80B0E4A4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 026F4 80B0E4A4 0C01E0C4 */ jal Math_SmoothStepToF /* 026F8 80B0E4A8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 026FC 80B0E4AC 10000047 */ beq $zero, $zero, .L80B0E5CC @@ -51,7 +51,7 @@ glabel func_80B0E430 /* 02710 80B0E4C0 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3F19999A /* 02714 80B0E4C4 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 /* 02718 80B0E4C8 E7A20028 */ swc1 $f2, 0x0028($sp) -/* 0271C 80B0E4CC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0271C 80B0E4CC 0C01E0C4 */ jal Math_SmoothStepToF /* 02720 80B0E4D0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 02724 80B0E4D4 8FAF003C */ lw $t7, 0x003C($sp) @@ -110,7 +110,7 @@ glabel func_80B0E430 /* 027D8 80B0E588 86050444 */ lh $a1, 0x0444($s0) ## 00000444 /* 027DC 80B0E58C 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 /* 027E0 80B0E590 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 027E4 80B0E594 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 027E4 80B0E594 0C01E1A7 */ jal Math_SmoothStepToS /* 027E8 80B0E598 AFA70010 */ sw $a3, 0x0010($sp) /* 027EC 80B0E59C 8A0C00B4 */ lwl $t4, 0x00B4($s0) ## 000000B4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E5E0.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E5E0.s index 7f8544a757..ac2e1b3a60 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E5E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E5E0.s @@ -17,10 +17,10 @@ glabel func_80B0E5E0 /* 02858 80B0E608 AFAE0010 */ sw $t6, 0x0010($sp) /* 0285C 80B0E60C 5040002C */ beql $v0, $zero, .L80B0E6C0 /* 02860 80B0E610 86020442 */ lh $v0, 0x0442($s0) ## 00000442 -/* 02864 80B0E614 0C03F66B */ jal Math_Rand_ZeroOne +/* 02864 80B0E614 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02868 80B0E618 00000000 */ nop -/* 0286C 80B0E61C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0286C 80B0E61C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02870 80B0E620 E7A0002C */ swc1 $f0, 0x002C($sp) /* 02874 80B0E624 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -60,7 +60,7 @@ glabel func_80B0E5E0 /* 028F4 80B0E6A4 460A3400 */ add.s $f16, $f6, $f10 /* 028F8 80B0E6A8 4600848D */ trunc.w.s $f18, $f16 /* 028FC 80B0E6AC 440C9000 */ mfc1 $t4, $f18 -/* 02900 80B0E6B0 0C01DF64 */ jal Math_Rand_S16Offset +/* 02900 80B0E6B0 0C01DF64 */ jal Rand_S16Offset /* 02904 80B0E6B4 A60C0444 */ sh $t4, 0x0444($s0) ## 00000444 /* 02908 80B0E6B8 A6020388 */ sh $v0, 0x0388($s0) ## 00000388 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E728.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E728.s index 2d36292cda..f4df67eb9d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E728.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E728.s @@ -56,7 +56,7 @@ glabel func_80B0E728 /* 02A40 80B0E7F0 AFA5003C */ sw $a1, 0x003C($sp) /* 02A44 80B0E7F4 14400014 */ bne $v0, $zero, .L80B0E848 /* 02A48 80B0E7F8 24040014 */ addiu $a0, $zero, 0x0014 ## $a0 = 00000014 -/* 02A4C 80B0E7FC 0C01DF64 */ jal Math_Rand_S16Offset +/* 02A4C 80B0E7FC 0C01DF64 */ jal Rand_S16Offset /* 02A50 80B0E800 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A /* 02A54 80B0E804 A6020442 */ sh $v0, 0x0442($s0) ## 00000442 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s index 254831d9cb..0d4a6fa6d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s @@ -201,7 +201,7 @@ glabel L808638F4 /* 042F0 80863940 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 .L80863944: /* 042F4 80863944 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 042F8 80863948 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 042F8 80863948 0C01E1A7 */ jal Math_SmoothStepToS /* 042FC 8086394C AFA00010 */ sw $zero, 0x0010($sp) /* 04300 80863950 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085F938.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085F938.s index c27e27d581..db4a77fdbd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085F938.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085F938.s @@ -17,7 +17,7 @@ glabel func_8085F938 /* 002E8 8085F938 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 002EC 8085F93C AFBF0014 */ sw $ra, 0x0014($sp) /* 002F0 8085F940 AFA5001C */ sw $a1, 0x001C($sp) -/* 002F4 8085F944 0C03F66B */ jal Math_Rand_ZeroOne +/* 002F4 8085F944 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 002F8 8085F948 AFA40018 */ sw $a0, 0x0018($sp) /* 002FC 8085F94C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FAB0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FAB0.s index a1dd56a5e9..92f6d40799 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FAB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FAB0.s @@ -36,7 +36,7 @@ glabel func_8085FAB0 /* 004A0 8085FAF0 54200046 */ bnel $at, $zero, .L8085FC0C /* 004A4 8085FAF4 28413E81 */ slti $at, $v0, 0x3E81 /* 004A8 8085FAF8 AFA60020 */ sw $a2, 0x0020($sp) -/* 004AC 8085FAFC 0C03F66B */ jal Math_Rand_ZeroOne +/* 004AC 8085FAFC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 004B0 8085FB00 AFA70024 */ sw $a3, 0x0024($sp) /* 004B4 8085FB04 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -189,7 +189,7 @@ glabel L8085FBE0 /* 006D4 8085FD24 00000000 */ nop /* 006D8 8085FD28 AFA60020 */ sw $a2, 0x0020($sp) /* 006DC 8085FD2C AFA70024 */ sw $a3, 0x0024($sp) -/* 006E0 8085FD30 0C03F66B */ jal Math_Rand_ZeroOne +/* 006E0 8085FD30 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 006E4 8085FD34 AFA80018 */ sw $t0, 0x0018($sp) /* 006E8 8085FD38 3C018086 */ lui $at, %hi(D_80864774) ## $at = 80860000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s index db96192248..7fbabba5e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s @@ -9,7 +9,7 @@ glabel func_80860068 /* 00A34 80860084 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 00A38 80860088 8FA60018 */ lw $a2, 0x0018($sp) /* 00A3C 8086008C 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 00A40 80860090 0C03F66B */ jal Math_Rand_ZeroOne +/* 00A40 80860090 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A44 80860094 A0CE07C8 */ sb $t6, 0x07C8($a2) ## 000007C8 /* 00A48 80860098 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808600EC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808600EC.s index 685c981e2b..631b42095a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808600EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808600EC.s @@ -49,7 +49,7 @@ glabel func_808600EC /* 00B20 80860170 8E0207E8 */ lw $v0, 0x07E8($s0) ## 000007E8 /* 00B24 80860174 8602008A */ lh $v0, 0x008A($s0) ## 0000008A /* 00B28 80860178 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 00B2C 8086017C 0C03F66B */ jal Math_Rand_ZeroOne +/* 00B2C 8086017C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00B30 80860180 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 /* 00B34 80860184 3C018086 */ lui $at, %hi(D_80864778) ## $at = 80860000 @@ -99,7 +99,7 @@ glabel func_808600EC /* 00BD4 80860224 00000000 */ nop /* 00BD8 80860228 45000016 */ bc1f .L80860284 /* 00BDC 8086022C 00000000 */ nop -/* 00BE0 80860230 0C03F66B */ jal Math_Rand_ZeroOne +/* 00BE0 80860230 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00BE4 80860234 00000000 */ nop /* 00BE8 80860238 3C018086 */ lui $at, %hi(D_8086477C) ## $at = 80860000 @@ -123,7 +123,7 @@ glabel func_808600EC /* 00C2C 8086027C 10000022 */ beq $zero, $zero, .L80860308 /* 00C30 80860280 8FBF001C */ lw $ra, 0x001C($sp) .L80860284: -/* 00C34 80860284 0C03F66B */ jal Math_Rand_ZeroOne +/* 00C34 80860284 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00C38 80860288 00000000 */ nop /* 00C3C 8086028C 3C018086 */ lui $at, %hi(D_80864780) ## $at = 80860000 @@ -143,7 +143,7 @@ glabel func_808600EC /* 00C70 808602C0 10000011 */ beq $zero, $zero, .L80860308 /* 00C74 808602C4 8FBF001C */ lw $ra, 0x001C($sp) .L808602C8: -/* 00C78 808602C8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00C78 808602C8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00C7C 808602CC 00000000 */ nop /* 00C80 808602D0 3C018086 */ lui $at, %hi(D_80864784) ## $at = 80860000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808603CC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808603CC.s index 8744c6ba31..3df4150791 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808603CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808603CC.s @@ -10,7 +10,7 @@ glabel func_808603CC /* 00D98 808603E8 8FBF0014 */ lw $ra, 0x0014($sp) /* 00D9C 808603EC 0C21801A */ jal func_80860068 /* 00DA0 808603F0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00DA4 808603F4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00DA4 808603F4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00DA8 808603F8 00000000 */ nop /* 00DAC 808603FC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s index 20a8870335..9826405026 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s @@ -26,7 +26,7 @@ glabel func_80860438 /* 00E40 80860490 24A581B4 */ addiu $a1, $a1, %lo(D_060081B4) ## $a1 = 060081B4 /* 00E44 80860494 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00E48 80860498 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 00E4C 8086049C 0C03F66B */ jal Math_Rand_ZeroOne +/* 00E4C 8086049C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00E50 808604A0 00000000 */ nop /* 00E54 808604A4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808604FC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808604FC.s index 21284636fa..3983a1c308 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808604FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808604FC.s @@ -56,7 +56,7 @@ glabel func_808604FC /* 00F44 80860594 44815000 */ mtc1 $at, $f10 ## $f10 = 110.00 /* 00F48 80860598 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00F4C 8086059C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3F4CCCCD -/* 00F50 808605A0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00F50 808605A0 0C01E0C4 */ jal Math_SmoothStepToF /* 00F54 808605A4 E7A80010 */ swc1 $f8, 0x0010($sp) /* 00F58 808605A8 10000010 */ beq $zero, $zero, .L808605EC @@ -74,7 +74,7 @@ glabel func_808604FC /* 00F84 808605D4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00F88 808605D8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 00F8C 808605DC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3F4CCCCD -/* 00F90 808605E0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00F90 808605E0 0C01E0C4 */ jal Math_SmoothStepToF /* 00F94 808605E4 E7B20010 */ swc1 $f18, 0x0010($sp) /* 00F98 808605E8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -246,7 +246,7 @@ glabel func_808604FC /* 011E8 80860838 C61201A0 */ lwc1 $f18, 0x01A0($s0) ## 000001A0 /* 011EC 8086083C 8602008A */ lh $v0, 0x008A($s0) ## 0000008A /* 011F0 80860840 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 011F4 80860844 0C03F66B */ jal Math_Rand_ZeroOne +/* 011F4 80860844 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 011F8 80860848 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 /* 011FC 8086084C 3C018086 */ lui $at, %hi(D_80864790) ## $at = 80860000 @@ -332,7 +332,7 @@ glabel func_808604FC /* 01310 80860960 0C00BE0A */ jal Audio_PlayActorSound2 /* 01314 80860964 24053838 */ addiu $a1, $zero, 0x3838 ## $a1 = 00003838 -/* 01318 80860968 0C03F66B */ jal Math_Rand_ZeroOne +/* 01318 80860968 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0131C 8086096C 00000000 */ nop /* 01320 80860970 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -369,7 +369,7 @@ glabel func_808604FC /* 01398 808609E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0139C 808609EC 1040000D */ beq $v0, $zero, .L80860A24 /* 013A0 808609F0 8FA80054 */ lw $t0, 0x0054($sp) -/* 013A4 808609F4 0C03F66B */ jal Math_Rand_ZeroOne +/* 013A4 808609F4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 013A8 808609F8 00000000 */ nop /* 013AC 808609FC 3C018086 */ lui $at, %hi(D_80864794) ## $at = 80860000 @@ -410,7 +410,7 @@ glabel func_808604FC /* 0142C 80860A7C 0C2183B0 */ jal func_80860EC0 /* 01430 80860A80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80860A84: -/* 01434 80860A84 0C03F66B */ jal Math_Rand_ZeroOne +/* 01434 80860A84 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01438 80860A88 00000000 */ nop /* 0143C 80860A8C 3C018086 */ lui $at, %hi(D_80864798) ## $at = 80860000 @@ -430,7 +430,7 @@ glabel func_808604FC /* 01470 80860AC0 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 /* 01474 80860AC4 0C21801A */ jal func_80860068 /* 01478 80860AC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0147C 80860ACC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0147C 80860ACC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01480 80860AD0 00000000 */ nop /* 01484 80860AD4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -450,7 +450,7 @@ glabel func_808604FC /* 014B8 80860B08 00000000 */ nop /* 014BC 80860B0C 45000022 */ bc1f .L80860B98 /* 014C0 80860B10 00000000 */ nop -/* 014C4 80860B14 0C03F66B */ jal Math_Rand_ZeroOne +/* 014C4 80860B14 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 014C8 80860B18 00000000 */ nop /* 014CC 80860B1C 3C018086 */ lui $at, %hi(D_8086479C) ## $at = 80860000 @@ -488,7 +488,7 @@ glabel func_808604FC /* 01540 80860B90 1000000E */ beq $zero, $zero, .L80860BCC /* 01544 80860B94 8FBF002C */ lw $ra, 0x002C($sp) .L80860B98: -/* 01548 80860B98 0C03F66B */ jal Math_Rand_ZeroOne +/* 01548 80860B98 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0154C 80860B9C 00000000 */ nop /* 01550 80860BA0 3C018086 */ lui $at, %hi(D_808647A0) ## $at = 80860000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860C24.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860C24.s index 49b4017328..f972bbd5ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860C24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860C24.s @@ -158,7 +158,7 @@ glabel func_80860C24 /* 017E4 80860E34 AFA60028 */ sw $a2, 0x0028($sp) /* 017E8 80860E38 1040001D */ beq $v0, $zero, .L80860EB0 /* 017EC 80860E3C 8FA60028 */ lw $a2, 0x0028($sp) -/* 017F0 80860E40 0C03F66B */ jal Math_Rand_ZeroOne +/* 017F0 80860E40 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 017F4 80860E44 AFA60028 */ sw $a2, 0x0028($sp) /* 017F8 80860E48 3C018086 */ lui $at, %hi(D_808647AC) ## $at = 80860000 @@ -168,7 +168,7 @@ glabel func_80860C24 /* 01808 80860E58 00000000 */ nop /* 0180C 80860E5C 45000012 */ bc1f .L80860EA8 /* 01810 80860E60 00000000 */ nop -/* 01814 80860E64 0C03F66B */ jal Math_Rand_ZeroOne +/* 01814 80860E64 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01818 80860E68 AFA60028 */ sw $a2, 0x0028($sp) /* 0181C 80860E6C 3C018086 */ lui $at, %hi(D_808647B0) ## $at = 80860000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s index 927309aebd..259e1e0252 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s @@ -8,7 +8,7 @@ glabel func_80860EC0 /* 01888 80860ED8 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 0188C 80860EDC 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 01890 80860EE0 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F -/* 01894 80860EE4 0C03F66B */ jal Math_Rand_ZeroOne +/* 01894 80860EE4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01898 80860EE8 A20E07C8 */ sb $t6, 0x07C8($s0) ## 000007C8 /* 0189C 80860EEC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -23,7 +23,7 @@ glabel func_80860EC0 /* 018C0 80860F10 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 018C4 80860F14 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 .L80860F18: -/* 018C8 80860F18 0C03F66B */ jal Math_Rand_ZeroOne +/* 018C8 80860F18 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 018CC 80860F1C 00000000 */ nop /* 018D0 80860F20 3C014170 */ lui $at, 0x4170 ## $at = 41700000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860F84.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860F84.s index 2f5f1ea3ce..1e6f52a637 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860F84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860F84.s @@ -25,7 +25,7 @@ glabel func_80860F84 /* 01974 80860FC4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 01978 80860FC8 AFAF0010 */ sw $t7, 0x0010($sp) /* 0197C 80860FCC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01980 80860FD0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01980 80860FD0 0C01E1A7 */ jal Math_SmoothStepToS /* 01984 80860FD4 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 01988 80860FD8 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 @@ -176,7 +176,7 @@ glabel func_80860F84 /* 01B98 808611E8 44818000 */ mtc1 $at, $f16 ## $f16 = 110.00 /* 01B9C 808611EC 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 01BA0 808611F0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3F4CCCCD -/* 01BA4 808611F4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01BA4 808611F4 0C01E0C4 */ jal Math_SmoothStepToF /* 01BA8 808611F8 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 01BAC 808611FC 1000001A */ beq $zero, $zero, .L80861268 @@ -198,7 +198,7 @@ glabel func_80860F84 /* 01BE8 80861238 260407EC */ addiu $a0, $s0, 0x07EC ## $a0 = 000007EC /* 01BEC 8086123C 3C054020 */ lui $a1, 0x4020 ## $a1 = 40200000 /* 01BF0 80861240 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01BF4 80861244 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01BF4 80861244 0C01E0C4 */ jal Math_SmoothStepToF /* 01BF8 80861248 E7A40010 */ swc1 $f4, 0x0010($sp) /* 01BFC 8086124C 10000006 */ beq $zero, $zero, .L80861268 @@ -206,7 +206,7 @@ glabel func_80860F84 /* 01C04 80861254 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 .L80861258: /* 01C08 80861258 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 0000CCCD -/* 01C0C 8086125C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01C0C 8086125C 0C01E0C4 */ jal Math_SmoothStepToF /* 01C10 80861260 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01C14 80861264 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 @@ -216,7 +216,7 @@ glabel func_80860F84 /* 01C20 80861270 00000000 */ nop /* 01C24 80861274 45030010 */ bc1tl .L808612B8 /* 01C28 80861278 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01C2C 8086127C 0C01DE1C */ jal Math_Sins +/* 01C2C 8086127C 0C01DE1C */ jal Math_SinS ## sins? /* 01C30 80861280 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 01C34 80861284 C61207EC */ lwc1 $f18, 0x07EC($s0) ## 000007EC @@ -224,7 +224,7 @@ glabel func_80860F84 /* 01C3C 8086128C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 01C40 80861290 46120102 */ mul.s $f4, $f0, $f18 /* 01C44 80861294 46048180 */ add.s $f6, $f16, $f4 -/* 01C48 80861298 0C01DE0D */ jal Math_Coss +/* 01C48 80861298 0C01DE0D */ jal Math_CosS ## coss? /* 01C4C 8086129C E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 /* 01C50 808612A0 C60A07EC */ lwc1 $f10, 0x07EC($s0) ## 000007EC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086149C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086149C.s index 5f57fc4b43..1e450bc763 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086149C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086149C.s @@ -16,7 +16,7 @@ glabel func_8086149C /* 01E84 808614D4 50200009 */ beql $at, $zero, .L808614FC /* 01E88 808614D8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 /* 01E8C 808614DC 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 01E90 808614E0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01E90 808614E0 0C01E1A7 */ jal Math_SmoothStepToS /* 01E94 808614E4 AFA00010 */ sw $zero, 0x0010($sp) /* 01E98 808614E8 C60001A0 */ lwc1 $f0, 0x01A0($s0) ## 000001A0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615F4.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615F4.s index 2e898d03be..8fb803c78f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615F4.s @@ -32,7 +32,7 @@ glabel func_808615F4 /* 01FFC 8086164C 10000070 */ beq $zero, $zero, .L80861810 /* 02000 80861650 8FBF0014 */ lw $ra, 0x0014($sp) .L80861654: -/* 02004 80861654 0C03F66B */ jal Math_Rand_ZeroOne +/* 02004 80861654 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02008 80861658 AFA60020 */ sw $a2, 0x0020($sp) /* 0200C 8086165C 3C018086 */ lui $at, %hi(D_808647BC) ## $at = 80860000 @@ -46,7 +46,7 @@ glabel func_808615F4 /* 0202C 8086167C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 02030 80861680 0C21801A */ jal func_80860068 /* 02034 80861684 AFA60020 */ sw $a2, 0x0020($sp) -/* 02038 80861688 0C03F66B */ jal Math_Rand_ZeroOne +/* 02038 80861688 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0203C 8086168C 00000000 */ nop /* 02040 80861690 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -62,7 +62,7 @@ glabel func_808615F4 /* 02064 808616B4 0C00B69E */ jal func_8002DA78 /* 02068 808616B8 AFA60020 */ sw $a2, 0x0020($sp) /* 0206C 808616BC 8FA60020 */ lw $a2, 0x0020($sp) -/* 02070 808616C0 0C03F66B */ jal Math_Rand_ZeroOne +/* 02070 808616C0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02074 808616C4 A4C20032 */ sh $v0, 0x0032($a2) ## 00000032 /* 02078 808616C8 3C018086 */ lui $at, %hi(D_808647C0) ## $at = 80860000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808619EC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808619EC.s index 179b1f4ab9..264334cdb8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808619EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808619EC.s @@ -9,7 +9,7 @@ glabel func_808619EC /* 023B8 80861A08 AFAE0010 */ sw $t6, 0x0010($sp) /* 023BC 80861A0C 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 /* 023C0 80861A10 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 023C4 80861A14 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 023C4 80861A14 0C01E1A7 */ jal Math_SmoothStepToS /* 023C8 80861A18 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 023CC 80861A1C 8E0307E8 */ lw $v1, 0x07E8($s0) ## 000007E8 @@ -53,7 +53,7 @@ glabel func_808619EC .L80861AA4: /* 02454 80861AA4 0C21801A */ jal func_80860068 /* 02458 80861AA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0245C 80861AAC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0245C 80861AAC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02460 80861AB0 00000000 */ nop /* 02464 80861AB4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -83,7 +83,7 @@ glabel func_808619EC .L80861B10: /* 024C0 80861B10 0C21801A */ jal func_80860068 /* 024C4 80861B14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024C8 80861B18 0C03F66B */ jal Math_Rand_ZeroOne +/* 024C8 80861B18 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 024CC 80861B1C 00000000 */ nop /* 024D0 80861B20 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861DC8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861DC8.s index f4055b17d2..ff68af04ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861DC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861DC8.s @@ -9,7 +9,7 @@ glabel func_80861DC8 /* 02794 80861DE4 AFAE0010 */ sw $t6, 0x0010($sp) /* 02798 80861DE8 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 /* 0279C 80861DEC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 027A0 80861DF0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 027A0 80861DF0 0C01E1A7 */ jal Math_SmoothStepToS /* 027A4 80861DF4 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 027A8 80861DF8 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861EC0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861EC0.s index cc98b9655c..7cf16175da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861EC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861EC0.s @@ -25,7 +25,7 @@ glabel func_80861EC0 /* 028C4 80861F14 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 028C8 80861F18 240F0015 */ addiu $t7, $zero, 0x0015 ## $t7 = 00000015 /* 028CC 80861F1C A20F07C8 */ sb $t7, 0x07C8($s0) ## 000007C8 -/* 028D0 80861F20 0C03F66B */ jal Math_Rand_ZeroOne +/* 028D0 80861F20 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 028D4 80861F24 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 /* 028D8 80861F28 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861F80.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861F80.s index 8e0e86bf77..bf386d9050 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861F80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861F80.s @@ -9,7 +9,7 @@ glabel func_80861F80 /* 0294C 80861F9C 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 /* 02950 80861FA0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02954 80861FA4 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 02958 80861FA8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02958 80861FA8 0C01E0C4 */ jal Math_SmoothStepToF /* 0295C 80861FAC E7A00010 */ swc1 $f0, 0x0010($sp) /* 02960 80861FB0 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086209C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086209C.s index e319db34f7..8c8c703622 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086209C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086209C.s @@ -9,7 +9,7 @@ glabel func_8086209C /* 02A68 808620B8 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 /* 02A6C 808620BC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02A70 808620C0 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 02A74 808620C4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02A74 808620C4 0C01E0C4 */ jal Math_SmoothStepToF /* 02A78 808620C8 E7A00010 */ swc1 $f0, 0x0010($sp) /* 02A7C 808620CC 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808621D4.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808621D4.s index aea7112f3b..735c831819 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808621D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808621D4.s @@ -17,7 +17,7 @@ glabel func_808621D4 /* 02BAC 808621FC 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 /* 02BB0 80862200 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02BB4 80862204 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 02BB8 80862208 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02BB8 80862208 0C01E0C4 */ jal Math_SmoothStepToF /* 02BBC 8086220C AFAF002C */ sw $t7, 0x002C($sp) /* 02BC0 80862210 0C02927F */ jal SkelAnime_FrameUpdateMatrix @@ -94,7 +94,7 @@ glabel func_808621D4 /* 02CC8 80862318 10000019 */ beq $zero, $zero, .L80862380 /* 02CCC 8086231C 24090008 */ addiu $t1, $zero, 0x0008 ## $t1 = 00000008 .L80862320: -/* 02CD0 80862320 0C03F66B */ jal Math_Rand_ZeroOne +/* 02CD0 80862320 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02CD4 80862324 00000000 */ nop /* 02CD8 80862328 3C018086 */ lui $at, %hi(D_808647C4) ## $at = 80860000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862418.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862418.s index 18b2c64358..0904021aac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862418.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862418.s @@ -17,7 +17,7 @@ glabel func_80862418 /* 02DF0 80862440 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 /* 02DF4 80862444 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02DF8 80862448 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 02DFC 8086244C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02DFC 8086244C 0C01E0C4 */ jal Math_SmoothStepToF /* 02E00 80862450 AFAF002C */ sw $t7, 0x002C($sp) /* 02E04 80862454 0C02927F */ jal SkelAnime_FrameUpdateMatrix @@ -67,7 +67,7 @@ glabel func_80862418 /* 02EA8 808624F8 10000019 */ beq $zero, $zero, .L80862560 /* 02EAC 808624FC 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 .L80862500: -/* 02EB0 80862500 0C03F66B */ jal Math_Rand_ZeroOne +/* 02EB0 80862500 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02EB4 80862504 00000000 */ nop /* 02EB8 80862508 3C018086 */ lui $at, %hi(D_808647C8) ## $at = 80860000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862650.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862650.s index 95d78e11c1..b2534a63f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862650.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862650.s @@ -18,7 +18,7 @@ glabel func_80862650 /* 0302C 8086267C 44050000 */ mfc1 $a1, $f0 /* 03030 80862680 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 /* 03034 80862684 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 03038 80862688 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03038 80862688 0C01E0C4 */ jal Math_SmoothStepToF /* 0303C 8086268C AFAF002C */ sw $t7, 0x002C($sp) /* 03040 80862690 92180114 */ lbu $t8, 0x0114($s0) ## 00000114 @@ -65,7 +65,7 @@ glabel func_80862650 /* 030DC 8086272C 10000015 */ beq $zero, $zero, .L80862784 /* 030E0 80862730 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 .L80862734: -/* 030E4 80862734 0C03F66B */ jal Math_Rand_ZeroOne +/* 030E4 80862734 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 030E8 80862738 00000000 */ nop /* 030EC 8086273C 3C018086 */ lui $at, %hi(D_808647CC) ## $at = 80860000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s index f26d1a4a8c..ed6810b67b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s @@ -23,7 +23,7 @@ glabel func_808627C4 /* 031C4 80862814 AFAE0010 */ sw $t6, 0x0010($sp) /* 031C8 80862818 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 031CC 8086281C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 031D0 80862820 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 031D0 80862820 0C01E1A7 */ jal Math_SmoothStepToS /* 031D4 80862824 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 031D8 80862828 8FAF002C */ lw $t7, 0x002C($sp) @@ -45,7 +45,7 @@ glabel func_808627C4 .L80862864: /* 03214 80862864 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 /* 03218 80862868 25093FFF */ addiu $t1, $t0, 0x3FFF ## $t1 = 00003FFF -/* 0321C 8086286C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0321C 8086286C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 03220 80862870 A6090032 */ sh $t1, 0x0032($s0) ## 00000032 /* 03224 80862874 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808628C8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808628C8.s index b50530bd4c..1e593251de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808628C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808628C8.s @@ -20,7 +20,7 @@ glabel func_808628C8 /* 032A4 808628F4 AFB80010 */ sw $t8, 0x0010($sp) /* 032A8 808628F8 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 /* 032AC 808628FC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 032B0 80862900 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 032B0 80862900 0C01E1A7 */ jal Math_SmoothStepToS /* 032B4 80862904 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 032B8 80862908 920307DE */ lbu $v1, 0x07DE($s0) ## 000007DE @@ -175,7 +175,7 @@ glabel func_808628C8 /* 034D4 80862B24 44818000 */ mtc1 $at, $f16 ## $f16 = 110.00 /* 034D8 80862B28 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 034DC 80862B2C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3F4CCCCD -/* 034E0 80862B30 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 034E0 80862B30 0C01E0C4 */ jal Math_SmoothStepToF /* 034E4 80862B34 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 034E8 80862B38 1000001A */ beq $zero, $zero, .L80862BA4 @@ -197,7 +197,7 @@ glabel func_808628C8 /* 03524 80862B74 260407EC */ addiu $a0, $s0, 0x07EC ## $a0 = 000007EC /* 03528 80862B78 3C054020 */ lui $a1, 0x4020 ## $a1 = 40200000 /* 0352C 80862B7C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03530 80862B80 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03530 80862B80 0C01E0C4 */ jal Math_SmoothStepToF /* 03534 80862B84 E7A40010 */ swc1 $f4, 0x0010($sp) /* 03538 80862B88 10000006 */ beq $zero, $zero, .L80862BA4 @@ -205,7 +205,7 @@ glabel func_808628C8 /* 03540 80862B90 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 .L80862B94: /* 03544 80862B94 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 0000CCCD -/* 03548 80862B98 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03548 80862B98 0C01E0C4 */ jal Math_SmoothStepToF /* 0354C 80862B9C E7A60010 */ swc1 $f6, 0x0010($sp) /* 03550 80862BA0 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 @@ -215,7 +215,7 @@ glabel func_808628C8 /* 0355C 80862BAC 00000000 */ nop /* 03560 80862BB0 45030010 */ bc1tl .L80862BF4 /* 03564 80862BB4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 03568 80862BB8 0C01DE1C */ jal Math_Sins +/* 03568 80862BB8 0C01DE1C */ jal Math_SinS ## sins? /* 0356C 80862BBC 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 03570 80862BC0 C61207EC */ lwc1 $f18, 0x07EC($s0) ## 000007EC @@ -223,7 +223,7 @@ glabel func_808628C8 /* 03578 80862BC8 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 0357C 80862BCC 46120102 */ mul.s $f4, $f0, $f18 /* 03580 80862BD0 46048180 */ add.s $f6, $f16, $f4 -/* 03584 80862BD4 0C01DE0D */ jal Math_Coss +/* 03584 80862BD4 0C01DE0D */ jal Math_CosS ## coss? /* 03588 80862BD8 E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 /* 0358C 80862BDC C60A07EC */ lwc1 $f10, 0x07EC($s0) ## 000007EC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863044.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863044.s index 5a7e1310eb..87ff54d225 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863044.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863044.s @@ -9,7 +9,7 @@ glabel func_80863044 /* 03A0C 8086305C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 03A10 80863060 50400015 */ beql $v0, $zero, .L808630B8 /* 03A14 80863064 C60A01A0 */ lwc1 $f10, 0x01A0($s0) ## 000001A0 -/* 03A18 80863068 0C03F66B */ jal Math_Rand_ZeroOne +/* 03A18 80863068 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 03A1C 8086306C 00000000 */ nop /* 03A20 80863070 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086318C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086318C.s index d470cbac5d..b02c10729b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086318C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086318C.s @@ -9,7 +9,7 @@ glabel func_8086318C /* 03B54 808631A4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 03B58 808631A8 50400015 */ beql $v0, $zero, .L80863200 /* 03B5C 808631AC C60A01A0 */ lwc1 $f10, 0x01A0($s0) ## 000001A0 -/* 03B60 808631B0 0C03F66B */ jal Math_Rand_ZeroOne +/* 03B60 808631B0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 03B64 808631B4 00000000 */ nop /* 03B68 808631B8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863294.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863294.s index 49d2cad691..97ff1a4462 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863294.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863294.s @@ -14,7 +14,7 @@ glabel func_80863294 /* 03C5C 808632AC 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 03C60 808632B0 50400027 */ beql $v0, $zero, .L80863350 /* 03C64 808632B4 8FBF001C */ lw $ra, 0x001C($sp) -/* 03C68 808632B8 0C03F66B */ jal Math_Rand_ZeroOne +/* 03C68 808632B8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 03C6C 808632BC 00000000 */ nop /* 03C70 808632C0 3C018086 */ lui $at, %hi(D_808647D8) ## $at = 80860000 @@ -27,7 +27,7 @@ glabel func_80863294 /* 03C8C 808632DC 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00011DE4 /* 03C90 808632E0 0C21801A */ jal func_80860068 /* 03C94 808632E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03C98 808632E8 0C03F66B */ jal Math_Rand_ZeroOne +/* 03C98 808632E8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 03C9C 808632EC 00000000 */ nop /* 03CA0 808632F0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863AB8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863AB8.s index 7d7798a4d7..143d5c1062 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863AB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863AB8.s @@ -67,7 +67,7 @@ glabel func_80863AB8 /* 04540 80863B90 00812021 */ addu $a0, $a0, $at /* 04544 80863B94 00042100 */ sll $a0, $a0, 4 /* 04548 80863B98 00042400 */ sll $a0, $a0, 16 -/* 0454C 80863B9C 0C01DE1C */ jal Math_Sins +/* 0454C 80863B9C 0C01DE1C */ jal Math_SinS ## sins? /* 04550 80863BA0 00042403 */ sra $a0, $a0, 16 /* 04554 80863BA4 3C01432F */ lui $at, 0x432F ## $at = 432F0000 @@ -86,7 +86,7 @@ glabel func_80863AB8 /* 04588 80863BD8 01C30019 */ multu $t6, $v1 /* 0458C 80863BDC 00002012 */ mflo $a0 /* 04590 80863BE0 00042400 */ sll $a0, $a0, 16 -/* 04594 80863BE4 0C01DE1C */ jal Math_Sins +/* 04594 80863BE4 0C01DE1C */ jal Math_SinS ## sins? /* 04598 80863BE8 00042403 */ sra $a0, $a0, 16 /* 0459C 80863BEC 3C01432F */ lui $at, 0x432F ## $at = 432F0000 @@ -104,7 +104,7 @@ glabel func_80863AB8 /* 045C8 80863C18 03030019 */ multu $t8, $v1 /* 045CC 80863C1C 00002012 */ mflo $a0 /* 045D0 80863C20 00042400 */ sll $a0, $a0, 16 -/* 045D4 80863C24 0C01DE1C */ jal Math_Sins +/* 045D4 80863C24 0C01DE1C */ jal Math_SinS ## sins? /* 045D8 80863C28 00042403 */ sra $a0, $a0, 16 /* 045DC 80863C2C 3C01432F */ lui $at, 0x432F ## $at = 432F0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s index 8c00ac5eb5..8df5494741 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s @@ -14,7 +14,7 @@ glabel func_80864158 /* 04B38 80864188 84EE00B6 */ lh $t6, 0x00B6($a3) ## 000000B6 /* 04B3C 8086418C E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 /* 04B40 80864190 25CF3FFF */ addiu $t7, $t6, 0x3FFF ## $t7 = 00003FFF -/* 04B44 80864194 0C03F66B */ jal Math_Rand_ZeroOne +/* 04B44 80864194 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 04B48 80864198 A4EF0032 */ sh $t7, 0x0032($a3) ## 00000032 /* 04B4C 8086419C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Update.s index 8002b21c59..6c7065a6bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Update.s @@ -213,7 +213,7 @@ glabel EnTite_Update /* 02628 80B1B0A8 A60A00B8 */ sh $t2, 0x00B8($s0) ## 000000B8 .L80B1B0AC: /* 0262C 80B1B0AC 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 02630 80B1B0B0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 02630 80B1B0B0 0C01E1A7 */ jal Math_SmoothStepToS /* 02634 80B1B0B4 AFA00010 */ sw $zero, 0x0010($sp) /* 02638 80B1B0B8 920B02BD */ lbu $t3, 0x02BD($s0) ## 000002BD @@ -223,7 +223,7 @@ glabel EnTite_Update /* 02648 80B1B0C8 1020000F */ beq $at, $zero, .L80B1B108 /* 0264C 80B1B0CC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 02650 80B1B0D0 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 02654 80B1B0D4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 02654 80B1B0D4 0C01E1A7 */ jal Math_SmoothStepToS /* 02658 80B1B0D8 AFA00010 */ sw $zero, 0x0010($sp) /* 0265C 80B1B0DC C60000BC */ lwc1 $f0, 0x00BC($s0) ## 000000BC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s index 79c3227b1d..2bed6fd1f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s @@ -12,7 +12,7 @@ glabel func_80B18C5C /* 00204 80B18C84 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 00208 80B18C88 2404000F */ addiu $a0, $zero, 0x000F ## $a0 = 0000000F /* 0020C 80B18C8C 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 00210 80B18C90 0C01DF64 */ jal Math_Rand_S16Offset +/* 00210 80B18C90 0C01DF64 */ jal Rand_S16Offset /* 00214 80B18C94 A0EE02BC */ sb $t6, 0x02BC($a3) ## 000002BC /* 00218 80B18C98 8FA40018 */ lw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18CC4.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18CC4.s index abfbc12e0d..6498f14951 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18CC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18CC4.s @@ -13,7 +13,7 @@ glabel func_80B18CC4 /* 0026C 80B18CEC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00270 80B18CF0 4405A000 */ mfc1 $a1, $f20 /* 00274 80B18CF4 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 00278 80B18CF8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00278 80B18CF8 0C01E0C4 */ jal Math_SmoothStepToF /* 0027C 80B18CFC E7B40010 */ swc1 $f20, 0x0010($sp) /* 00280 80B18D00 860E001C */ lh $t6, 0x001C($s0) ## 0000001C @@ -29,7 +29,7 @@ glabel func_80B18CC4 /* 002A8 80B18D28 E614006C */ swc1 $f20, 0x006C($s0) ## 0000006C /* 002AC 80B18D2C 4405A000 */ mfc1 $a1, $f20 /* 002B0 80B18D30 E7B40010 */ swc1 $f20, 0x0010($sp) -/* 002B4 80B18D34 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 002B4 80B18D34 0C01E0C4 */ jal Math_SmoothStepToF /* 002B8 80B18D38 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 002BC 80B18D3C C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 @@ -40,7 +40,7 @@ glabel func_80B18CC4 /* 002D0 80B18D50 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 002D4 80B18D54 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 002D8 80B18D58 44054000 */ mfc1 $a1, $f8 -/* 002DC 80B18D5C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 002DC 80B18D5C 0C01E0C4 */ jal Math_SmoothStepToF /* 002E0 80B18D60 00000000 */ nop /* 002E4 80B18D64 10000005 */ beq $zero, $zero, .L80B18D7C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E08.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E08.s index f5bfbcb27f..542695e858 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E08.s @@ -12,7 +12,7 @@ glabel func_80B18E08 /* 003B0 80B18E30 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 /* 003B4 80B18E34 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 003B8 80B18E38 A0CE02BC */ sb $t6, 0x02BC($a2) ## 000002BC -/* 003BC 80B18E3C 0C01DF64 */ jal Math_Rand_S16Offset +/* 003BC 80B18E3C 0C01DF64 */ jal Rand_S16Offset /* 003C0 80B18E40 A4C002E0 */ sh $zero, 0x02E0($a2) ## 000002E0 /* 003C4 80B18E44 8FA40018 */ lw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s index 774498e231..5ce96227c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s @@ -219,7 +219,7 @@ glabel func_80B18E7C /* 006FC 80B1917C 96030088 */ lhu $v1, 0x0088($s0) ## 00000088 .L80B19180: /* 00700 80B19180 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 00704 80B19184 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00704 80B19184 0C01E1A7 */ jal Math_SmoothStepToS /* 00708 80B19188 AFA00010 */ sw $zero, 0x0010($sp) /* 0070C 80B1918C 86090032 */ lh $t1, 0x0032($s0) ## 00000032 @@ -338,7 +338,7 @@ glabel func_80B18E7C /* 008A4 80B19324 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 008A8 80B19328 AFA00010 */ sw $zero, 0x0010($sp) /* 008AC 80B1932C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 008B0 80B19330 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 008B0 80B19330 0C01E1A7 */ jal Math_SmoothStepToS /* 008B4 80B19334 240705DC */ addiu $a3, $zero, 0x05DC ## $a3 = 000005DC /* 008B8 80B19338 1000001A */ beq $zero, $zero, .L80B193A4 @@ -348,7 +348,7 @@ glabel func_80B18E7C /* 008C4 80B19344 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 008C8 80B19348 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 008CC 80B1934C 44050000 */ mfc1 $a1, $f0 -/* 008D0 80B19350 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 008D0 80B19350 0C01E0C4 */ jal Math_SmoothStepToF /* 008D4 80B19354 E7A00010 */ swc1 $f0, 0x0010($sp) /* 008D8 80B19358 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -356,7 +356,7 @@ glabel func_80B18E7C /* 008E0 80B19360 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 008E4 80B19364 44050000 */ mfc1 $a1, $f0 /* 008E8 80B19368 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 008EC 80B1936C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 008EC 80B1936C 0C01E0C4 */ jal Math_SmoothStepToF /* 008F0 80B19370 E7A00010 */ swc1 $f0, 0x0010($sp) /* 008F4 80B19374 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 @@ -368,7 +368,7 @@ glabel func_80B18E7C /* 0090C 80B1938C 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 00910 80B19390 E7B20010 */ swc1 $f18, 0x0010($sp) /* 00914 80B19394 44058000 */ mfc1 $a1, $f16 -/* 00918 80B19398 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00918 80B19398 0C01E0C4 */ jal Math_SmoothStepToF /* 0091C 80B1939C 00000000 */ nop /* 00920 80B193A0 96030088 */ lhu $v1, 0x0088($s0) ## 00000088 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s index eaaf484215..c718c0c0ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s @@ -19,7 +19,7 @@ glabel func_80B1985C /* 00E20 80B198A0 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 00E24 80B198A4 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 /* 00E28 80B198A8 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C -/* 00E2C 80B198AC 0C01DF64 */ jal Math_Rand_S16Offset +/* 00E2C 80B198AC 0C01DF64 */ jal Rand_S16Offset /* 00E30 80B198B0 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 /* 00E34 80B198B4 860F001C */ lh $t7, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19918.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19918.s index 528c293591..14633b71aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19918.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19918.s @@ -10,7 +10,7 @@ glabel func_80B19918 /* 00EB8 80B19938 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 00EBC 80B1993C 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 /* 00EC0 80B19940 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00EC4 80B19944 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00EC4 80B19944 0C01E0C4 */ jal Math_SmoothStepToF /* 00EC8 80B19948 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00ECC 80B1994C 0C02927F */ jal SkelAnime_FrameUpdateMatrix @@ -122,7 +122,7 @@ glabel func_80B19918 /* 0104C 80B19ACC 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 01050 80B19AD0 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 01054 80B19AD4 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 01058 80B19AD8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01058 80B19AD8 0C01E1A7 */ jal Math_SmoothStepToS /* 0105C 80B19ADC AFA00010 */ sw $zero, 0x0010($sp) /* 01060 80B19AE0 8618001C */ lh $t8, 0x001C($s0) ## 0000001C @@ -180,7 +180,7 @@ glabel func_80B19918 /* 01124 80B19BA4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01128 80B19BA8 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 0112C 80B19BAC 44050000 */ mfc1 $a1, $f0 -/* 01130 80B19BB0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01130 80B19BB0 0C01E0C4 */ jal Math_SmoothStepToF /* 01134 80B19BB4 E7A00010 */ swc1 $f0, 0x0010($sp) /* 01138 80B19BB8 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 @@ -192,7 +192,7 @@ glabel func_80B19918 /* 01150 80B19BD0 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 01154 80B19BD4 E7A40010 */ swc1 $f4, 0x0010($sp) /* 01158 80B19BD8 44059000 */ mfc1 $a1, $f18 -/* 0115C 80B19BDC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0115C 80B19BDC 0C01E0C4 */ jal Math_SmoothStepToF /* 01160 80B19BE0 00000000 */ nop /* 01164 80B19BE4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 @@ -319,7 +319,7 @@ glabel func_80B19918 /* 01310 80B19D90 AFA00010 */ sw $zero, 0x0010($sp) /* 01314 80B19D94 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 01318 80B19D98 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0131C 80B19D9C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0131C 80B19D9C 0C01E1A7 */ jal Math_SmoothStepToS /* 01320 80B19DA0 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 01324 80B19DA4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E94.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E94.s index 82c4297f5a..e6c1e9525a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E94.s @@ -9,7 +9,7 @@ glabel func_80B19E94 /* 01430 80B19EB0 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 /* 01434 80B19EB4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01438 80B19EB8 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 0143C 80B19EBC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0143C 80B19EBC 0C01E0C4 */ jal Math_SmoothStepToF /* 01440 80B19EC0 E7A00010 */ swc1 $f0, 0x0010($sp) /* 01444 80B19EC4 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A2A0.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A2A0.s index b19b434274..d93b3a384f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A2A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A2A0.s @@ -9,7 +9,7 @@ glabel func_80B1A2A0 /* 0183C 80B1A2BC 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 /* 01840 80B1A2C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01844 80B1A2C4 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 01848 80B1A2C8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01848 80B1A2C8 0C01E0C4 */ jal Math_SmoothStepToF /* 0184C 80B1A2CC E7A00010 */ swc1 $f0, 0x0010($sp) /* 01850 80B1A2D0 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s index c9849761b2..c255b401c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s @@ -20,7 +20,7 @@ glabel func_80B1A76C /* 01D30 80B1A7B0 A20E02BD */ sb $t6, 0x02BD($s0) ## 000002BD /* 01D34 80B1A7B4 A60F02E0 */ sh $t7, 0x02E0($s0) ## 000002E0 /* 01D38 80B1A7B8 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 01D3C 80B1A7BC 0C03F66B */ jal Math_Rand_ZeroOne +/* 01D3C 80B1A7BC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01D40 80B1A7C0 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C /* 01D44 80B1A7C4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A888.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A888.s index 7edbafb471..9a9e7f123d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A888.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A888.s @@ -8,7 +8,7 @@ glabel func_80B1A888 /* 01E20 80B1A8A0 248400B8 */ addiu $a0, $a0, 0x00B8 ## $a0 = 000000B8 /* 01E24 80B1A8A4 AFA00010 */ sw $zero, 0x0010($sp) /* 01E28 80B1A8A8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01E2C 80B1A8AC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01E2C 80B1A8AC 0C01E1A7 */ jal Math_SmoothStepToS /* 01E30 80B1A8B0 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 01E34 80B1A8B4 920E02E2 */ lbu $t6, 0x02E2($s0) ## 000002E2 @@ -16,7 +16,7 @@ glabel func_80B1A888 /* 01E3C 80B1A8BC 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 000000FF /* 01E40 80B1A8C0 1700002E */ bne $t8, $zero, .L80B1A97C /* 01E44 80B1A8C4 A20F02E2 */ sb $t7, 0x02E2($s0) ## 000002E2 -/* 01E48 80B1A8C8 0C03F66B */ jal Math_Rand_ZeroOne +/* 01E48 80B1A8C8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01E4C 80B1A8CC 00000000 */ nop /* 01E50 80B1A8D0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -58,7 +58,7 @@ glabel func_80B1A888 /* 01ED8 80B1A958 00000000 */ nop .L80B1A95C: /* 01EDC 80B1A95C 44D9F800 */ ctc1 $t9, $31 -/* 01EE0 80B1A960 0C03F66B */ jal Math_Rand_ZeroOne +/* 01EE0 80B1A960 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01EE4 80B1A964 A20802E2 */ sb $t0, 0x02E2($s0) ## 000002E2 /* 01EE8 80B1A968 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1AA94.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1AA94.s index 84bdde40bc..dc1f3a0228 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1AA94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1AA94.s @@ -8,7 +8,7 @@ glabel func_80B1AA94 /* 0202C 80B1AAAC 248400B8 */ addiu $a0, $a0, 0x00B8 ## $a0 = 000000B8 /* 02030 80B1AAB0 AFA00010 */ sw $zero, 0x0010($sp) /* 02034 80B1AAB4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02038 80B1AAB8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 02038 80B1AAB8 0C01E1A7 */ jal Math_SmoothStepToS /* 0203C 80B1AABC 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 02040 80B1AAC0 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Update.s index 67a23fd62e..af253feabc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Update.s @@ -67,7 +67,7 @@ glabel EnTorch2_Update /* 004F8 80B1DE78 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 004FC 80B1DE7C A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 /* 00500 80B1DE80 E60401CC */ swc1 $f4, 0x01CC($s0) ## 000001CC -/* 00504 80B1DE84 0C01DE1C */ jal Math_Sins +/* 00504 80B1DE84 0C01DE1C */ jal Math_SinS ## sins? /* 00508 80B1DE88 E60601D0 */ swc1 $f6, 0x01D0($s0) ## 000001D0 /* 0050C 80B1DE8C 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 @@ -77,7 +77,7 @@ glabel EnTorch2_Update /* 0051C 80B1DE9C 46080282 */ mul.s $f10, $f0, $f8 /* 00520 80B1DEA0 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 00524 80B1DEA4 46105480 */ add.s $f18, $f10, $f16 -/* 00528 80B1DEA8 0C01DE0D */ jal Math_Coss +/* 00528 80B1DEA8 0C01DE0D */ jal Math_CosS ## coss? /* 0052C 80B1DEAC E6120024 */ swc1 $f18, 0x0024($s0) ## 00000024 /* 00530 80B1DEB0 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 @@ -124,7 +124,7 @@ glabel EnTorch2_Update /* 005D0 80B1DF50 032A2023 */ subu $a0, $t9, $t2 /* 005D4 80B1DF54 00042400 */ sll $a0, $a0, 16 /* 005D8 80B1DF58 00042403 */ sra $a0, $a0, 16 -/* 005DC 80B1DF5C 0C01DE1C */ jal Math_Sins +/* 005DC 80B1DF5C 0C01DE1C */ jal Math_SinS ## sins? /* 005E0 80B1DF60 A7A40066 */ sh $a0, 0x0066($sp) /* 005E4 80B1DF64 3C0180B2 */ lui $at, %hi(D_80B1F9F0) ## $at = 80B20000 @@ -134,7 +134,7 @@ glabel EnTorch2_Update /* 005F4 80B1DF74 46060202 */ mul.s $f8, $f0, $f6 /* 005F8 80B1DF78 4600428D */ trunc.w.s $f10, $f8 /* 005FC 80B1DF7C 440C5000 */ mfc1 $t4, $f10 -/* 00600 80B1DF80 0C01DE0D */ jal Math_Coss +/* 00600 80B1DF80 0C01DE0D */ jal Math_CosS ## coss? /* 00604 80B1DF84 A02C0132 */ sb $t4, %lo(D_80B20132)($at) /* 00608 80B1DF88 3C0180B2 */ lui $at, %hi(D_80B1F9F0) ## $at = 80B20000 @@ -348,7 +348,7 @@ glabel EnTorch2_Update /* 00904 80B1E284 00042400 */ sll $a0, $a0, 16 /* 00908 80B1E288 356C0004 */ ori $t4, $t3, 0x0004 ## $t4 = 00000004 /* 0090C 80B1E28C A12C0692 */ sb $t4, 0x0692($t1) ## 00000692 -/* 00910 80B1E290 0C01DE1C */ jal Math_Sins +/* 00910 80B1E290 0C01DE1C */ jal Math_SinS ## sins? /* 00914 80B1E294 00042403 */ sra $a0, $a0, 16 /* 00918 80B1E298 3C014234 */ lui $at, 0x4234 ## $at = 42340000 @@ -363,14 +363,14 @@ glabel EnTorch2_Update /* 0093C 80B1E2BC E7A40010 */ swc1 $f4, 0x0010($sp) /* 00940 80B1E2C0 46105480 */ add.s $f18, $f10, $f16 /* 00944 80B1E2C4 44059000 */ mfc1 $a1, $f18 -/* 00948 80B1E2C8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00948 80B1E2C8 0C01E0C4 */ jal Math_SmoothStepToF /* 0094C 80B1E2CC 00000000 */ nop /* 00950 80B1E2D0 8FAE0078 */ lw $t6, 0x0078($sp) /* 00954 80B1E2D4 85C400B6 */ lh $a0, 0x00B6($t6) ## 000000B6 /* 00958 80B1E2D8 2484FC18 */ addiu $a0, $a0, 0xFC18 ## $a0 = FFFFFC18 /* 0095C 80B1E2DC 00042400 */ sll $a0, $a0, 16 -/* 00960 80B1E2E0 0C01DE0D */ jal Math_Coss +/* 00960 80B1E2E0 0C01DE0D */ jal Math_CosS ## coss? /* 00964 80B1E2E4 00042403 */ sra $a0, $a0, 16 /* 00968 80B1E2E8 3C014234 */ lui $at, 0x4234 ## $at = 42340000 @@ -385,7 +385,7 @@ glabel EnTorch2_Update /* 0098C 80B1E30C E7B20010 */ swc1 $f18, 0x0010($sp) /* 00990 80B1E310 460A4400 */ add.s $f16, $f8, $f10 /* 00994 80B1E314 44058000 */ mfc1 $a1, $f16 -/* 00998 80B1E318 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00998 80B1E318 0C01E0C4 */ jal Math_SmoothStepToF /* 0099C 80B1E31C 00000000 */ nop /* 009A0 80B1E320 3C0380B2 */ lui $v1, %hi(D_80B2015F) ## $v1 = 80B20000 @@ -758,7 +758,7 @@ glabel EnTorch2_Update /* 00F04 80B1E884 2484F9F4 */ addiu $a0, $a0, %lo(D_80B1F9F4) ## $a0 = 80B1F9F4 /* 00F08 80B1E888 24A57FFF */ addiu $a1, $a1, 0x7FFF ## $a1 = 00007FFF /* 00F0C 80B1E88C 00052C00 */ sll $a1, $a1, 16 -/* 00F10 80B1E890 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00F10 80B1E890 0C01E1A7 */ jal Math_SmoothStepToS /* 00F14 80B1E894 00052C03 */ sra $a1, $a1, 16 /* 00F18 80B1E898 1000005B */ beq $zero, $zero, .L80B1EA08 @@ -808,7 +808,7 @@ glabel EnTorch2_Update /* 00FBC 80B1E93C 2484F9F4 */ addiu $a0, $a0, %lo(D_80B1F9F4) ## $a0 = 80B1F9F4 /* 00FC0 80B1E940 24A57FFF */ addiu $a1, $a1, 0x7FFF ## $a1 = 80B2812F /* 00FC4 80B1E944 00052C00 */ sll $a1, $a1, 16 -/* 00FC8 80B1E948 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00FC8 80B1E948 0C01E1A7 */ jal Math_SmoothStepToS /* 00FCC 80B1E94C 00052C03 */ sra $a1, $a1, 16 /* 00FD0 80B1E950 1000002D */ beq $zero, $zero, .L80B1EA08 @@ -861,7 +861,7 @@ glabel EnTorch2_Update /* 01074 80B1E9F4 2484F9F4 */ addiu $a0, $a0, %lo(D_80B1F9F4) ## $a0 = 80B1F9F4 /* 01078 80B1E9F8 24A57FFF */ addiu $a1, $a1, 0x7FFF ## $a1 = 00007FFF /* 0107C 80B1E9FC 00052C00 */ sll $a1, $a1, 16 -/* 01080 80B1EA00 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 01080 80B1EA00 0C01E1A7 */ jal Math_SmoothStepToS /* 01084 80B1EA04 00052C03 */ sra $a1, $a1, 16 .L80B1EA08: @@ -940,7 +940,7 @@ glabel EnTorch2_Update /* 01194 80B1EB14 01C16821 */ addu $t5, $t6, $at /* 01198 80B1EB18 AFAD002C */ sw $t5, 0x002C($sp) /* 0119C 80B1EB1C AFAC0034 */ sw $t4, 0x0034($sp) -/* 011A0 80B1EB20 0C01DE1C */ jal Math_Sins +/* 011A0 80B1EB20 0C01DE1C */ jal Math_SinS ## sins? /* 011A4 80B1EB24 A7A40066 */ sh $a0, 0x0066($sp) /* 011A8 80B1EB28 3C0180B2 */ lui $at, %hi(D_80B1F9F0) ## $at = 80B20000 @@ -950,7 +950,7 @@ glabel EnTorch2_Update /* 011B8 80B1EB38 46040182 */ mul.s $f6, $f0, $f4 /* 011BC 80B1EB3C 4600320D */ trunc.w.s $f8, $f6 /* 011C0 80B1EB40 44184000 */ mfc1 $t8, $f8 -/* 011C4 80B1EB44 0C01DE0D */ jal Math_Coss +/* 011C4 80B1EB44 0C01DE0D */ jal Math_CosS ## coss? /* 011C8 80B1EB48 A0380132 */ sb $t8, %lo(D_80B20132)($at) /* 011CC 80B1EB4C 3C0180B2 */ lui $at, %hi(D_80B1F9F0) ## $at = 80B20000 @@ -1011,7 +1011,7 @@ glabel EnTorch2_Update /* 012A4 80B1EC24 46069200 */ add.s $f8, $f18, $f6 /* 012A8 80B1EC28 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 /* 012AC 80B1EC2C 8FAB0078 */ lw $t3, 0x0078($sp) -/* 012B0 80B1EC30 0C01DE1C */ jal Math_Sins +/* 012B0 80B1EC30 0C01DE1C */ jal Math_SinS ## sins? /* 012B4 80B1EC34 856400B6 */ lh $a0, 0x00B6($t3) ## 000000B6 /* 012B8 80B1EC38 3C01C2F0 */ lui $at, 0xC2F0 ## $at = C2F00000 @@ -1021,7 +1021,7 @@ glabel EnTorch2_Update /* 012C8 80B1EC48 C4500024 */ lwc1 $f16, 0x0024($v0) ## 00000024 /* 012CC 80B1EC4C 46105480 */ add.s $f18, $f10, $f16 /* 012D0 80B1EC50 E6120024 */ swc1 $f18, 0x0024($s0) ## 00000024 -/* 012D4 80B1EC54 0C01DE0D */ jal Math_Coss +/* 012D4 80B1EC54 0C01DE0D */ jal Math_CosS ## coss? /* 012D8 80B1EC58 844400B6 */ lh $a0, 0x00B6($v0) ## 000000B6 /* 012DC 80B1EC5C 3C01C2F0 */ lui $at, 0xC2F0 ## $at = C2F00000 @@ -1042,7 +1042,7 @@ glabel EnTorch2_Update /* 01318 80B1EC98 00000000 */ nop /* 0131C 80B1EC9C 45020035 */ bc1fl .L80B1ED74 /* 01320 80B1ECA0 C6120080 */ lwc1 $f18, 0x0080($s0) ## 00000080 -/* 01324 80B1ECA4 0C03F66B */ jal Math_Rand_ZeroOne +/* 01324 80B1ECA4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01328 80B1ECA8 00000000 */ nop /* 0132C 80B1ECAC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -1050,7 +1050,7 @@ glabel EnTorch2_Update /* 01334 80B1ECB4 3C01457A */ lui $at, 0x457A ## $at = 457A0000 /* 01338 80B1ECB8 44816000 */ mtc1 $at, $f12 ## $f12 = 4000.00 /* 0133C 80B1ECBC 46120182 */ mul.s $f6, $f0, $f18 -/* 01340 80B1ECC0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01340 80B1ECC0 0C00CFC8 */ jal Rand_CenteredFloat /* 01344 80B1ECC4 E7A60050 */ swc1 $f6, 0x0050($sp) /* 01348 80B1ECC8 4600020D */ trunc.w.s $f8, $f0 @@ -1068,7 +1068,7 @@ glabel EnTorch2_Update /* 01374 80B1ECF4 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 /* 01378 80B1ECF8 01F82021 */ addu $a0, $t7, $t8 /* 0137C 80B1ECFC 00042400 */ sll $a0, $a0, 16 -/* 01380 80B1ED00 0C01DE1C */ jal Math_Sins +/* 01380 80B1ED00 0C01DE1C */ jal Math_SinS ## sins? /* 01384 80B1ED04 00042403 */ sra $a0, $a0, 16 /* 01388 80B1ED08 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 @@ -1085,7 +1085,7 @@ glabel EnTorch2_Update /* 013B4 80B1ED34 E7A20038 */ swc1 $f2, 0x0038($sp) /* 013B8 80B1ED38 032A2021 */ addu $a0, $t9, $t2 /* 013BC 80B1ED3C 00042400 */ sll $a0, $a0, 16 -/* 013C0 80B1ED40 0C01DE0D */ jal Math_Coss +/* 013C0 80B1ED40 0C01DE0D */ jal Math_CosS ## coss? /* 013C4 80B1ED44 00042403 */ sra $a0, $a0, 16 /* 013C8 80B1ED48 C7A20038 */ lwc1 $f2, 0x0038($sp) @@ -1480,7 +1480,7 @@ glabel EnTorch2_Update /* 01964 80B1F2E4 4502007B */ bc1fl .L80B1F4D4 /* 01968 80B1F2E8 8FA30078 */ lw $v1, 0x0078($sp) /* 0196C 80B1F2EC 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 01970 80B1F2F0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01970 80B1F2F0 0C00CFC8 */ jal Rand_CenteredFloat /* 01974 80B1F2F4 00000000 */ nop /* 01978 80B1F2F8 444EF800 */ cfc1 $t6, $31 @@ -1526,7 +1526,7 @@ glabel EnTorch2_Update /* 01A0C 80B1F38C 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000005 /* 01A10 80B1F390 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 01A14 80B1F394 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 01A18 80B1F398 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 01A18 80B1F398 0C00CFC8 */ jal Rand_CenteredFloat /* 01A1C 80B1F39C 00000000 */ nop /* 01A20 80B1F3A0 444CF800 */ cfc1 $t4, $31 @@ -1747,7 +1747,7 @@ glabel EnTorch2_Update /* 01D28 80B1F6A8 2484F9F8 */ addiu $a0, $a0, %lo(D_80B1F9F8) ## $a0 = 80B1F9F8 /* 01D2C 80B1F6AC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01D30 80B1F6B0 3C0744FA */ lui $a3, 0x44FA ## $a3 = 44FA0000 -/* 01D34 80B1F6B4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01D34 80B1F6B4 0C01E0C4 */ jal Math_SmoothStepToF /* 01D38 80B1F6B8 E7B20010 */ swc1 $f18, 0x0010($sp) /* 01D3C 80B1F6BC 3C0180B2 */ lui $at, %hi(D_80B1FA6C) ## $at = 80B20000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1DBD8.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1DBD8.s index 55d0f4731d..94469fcf26 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1DBD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1DBD8.s @@ -52,7 +52,7 @@ glabel func_80B1DBD8 /* 002FC 80B1DC7C 51000038 */ beql $t0, $zero, .L80B1DD60 /* 00300 80B1DC80 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80B1DC84: -/* 00304 80B1DC84 0C03F66B */ jal Math_Rand_ZeroOne +/* 00304 80B1DC84 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00308 80B1DC88 E7A2001C */ swc1 $f2, 0x001C($sp) /* 0030C 80B1DC8C C7A2001C */ lwc1 $f2, 0x001C($sp) @@ -64,7 +64,7 @@ glabel func_80B1DBD8 /* 00324 80B1DCA4 91290148 */ lbu $t1, %lo(D_80B20148)($t1) /* 00328 80B1DCA8 55200028 */ bnel $t1, $zero, .L80B1DD4C /* 0032C 80B1DCAC 8FB80024 */ lw $t8, 0x0024($sp) -/* 00330 80B1DCB0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00330 80B1DCB0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00334 80B1DCB4 00000000 */ nop /* 00338 80B1DCB8 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Update.s index f8f408013f..76d23400fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Update.s @@ -178,7 +178,7 @@ glabel EnTp_Update /* 018DC 80B226BC C60A0064 */ lwc1 $f10, 0x0064($s0) ## 00000064 /* 018E0 80B226C0 46005407 */ neg.s $f16, $f10 /* 018E4 80B226C4 46008482 */ mul.s $f18, $f16, $f0 -/* 018E8 80B226C8 0C03F66B */ jal Math_Rand_ZeroOne +/* 018E8 80B226C8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 018EC 80B226CC E7B20058 */ swc1 $f18, 0x0058($sp) /* 018F0 80B226D0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -189,7 +189,7 @@ glabel EnTp_Update /* 01904 80B226E4 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 /* 01908 80B226E8 46083282 */ mul.s $f10, $f6, $f8 /* 0190C 80B226EC 46105480 */ add.s $f18, $f10, $f16 -/* 01910 80B226F0 0C03F66B */ jal Math_Rand_ZeroOne +/* 01910 80B226F0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01914 80B226F4 E7B20044 */ swc1 $f18, 0x0044($sp) /* 01918 80B226F8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -200,7 +200,7 @@ glabel EnTp_Update /* 0192C 80B2270C C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 01930 80B22710 46083282 */ mul.s $f10, $f6, $f8 /* 01934 80B22714 46105480 */ add.s $f18, $f10, $f16 -/* 01938 80B22718 0C03F66B */ jal Math_Rand_ZeroOne +/* 01938 80B22718 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0193C 80B2271C E7B20048 */ swc1 $f18, 0x0048($sp) /* 01940 80B22720 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B210B0.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B210B0.s index 0a96731c06..9944d73912 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B210B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B210B0.s @@ -74,7 +74,7 @@ glabel func_80B210B0 /* 003E0 80B211C0 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 003E4 80B211C4 E7A00010 */ swc1 $f0, 0x0010($sp) /* 003E8 80B211C8 44053000 */ mfc1 $a1, $f6 -/* 003EC 80B211CC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 003EC 80B211CC 0C01E0C4 */ jal Math_SmoothStepToF /* 003F0 80B211D0 00000000 */ nop /* 003F4 80B211D4 8E0201D4 */ lw $v0, 0x01D4($s0) ## 000001D4 @@ -92,11 +92,11 @@ glabel func_80B210B0 /* 00424 80B21204 00042100 */ sll $a0, $a0, 4 /* 00428 80B21208 00042400 */ sll $a0, $a0, 16 /* 0042C 80B2120C 00042403 */ sra $a0, $a0, 16 -/* 00430 80B21210 0C01DE1C */ jal Math_Sins +/* 00430 80B21210 0C01DE1C */ jal Math_SinS ## sins? /* 00434 80B21214 A7A40034 */ sh $a0, 0x0034($sp) /* 00438 80B21218 E7A0002C */ swc1 $f0, 0x002C($sp) -/* 0043C 80B2121C 0C01DE1C */ jal Math_Sins +/* 0043C 80B2121C 0C01DE1C */ jal Math_SinS ## sins? /* 00440 80B21220 87A40036 */ lh $a0, 0x0036($sp) /* 00444 80B21224 C608016C */ lwc1 $f8, 0x016C($s0) ## 0000016C @@ -107,11 +107,11 @@ glabel func_80B210B0 /* 00458 80B21238 46105482 */ mul.s $f18, $f10, $f16 /* 0045C 80B2123C 46049180 */ add.s $f6, $f18, $f4 /* 00460 80B21240 E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 -/* 00464 80B21244 0C01DE1C */ jal Math_Sins +/* 00464 80B21244 0C01DE1C */ jal Math_SinS ## sins? /* 00468 80B21248 87A40034 */ lh $a0, 0x0034($sp) /* 0046C 80B2124C E7A0002C */ swc1 $f0, 0x002C($sp) -/* 00470 80B21250 0C01DE0D */ jal Math_Coss +/* 00470 80B21250 0C01DE0D */ jal Math_CosS ## coss? /* 00474 80B21254 87A40036 */ lh $a0, 0x0036($sp) /* 00478 80B21258 C608016C */ lwc1 $f8, 0x016C($s0) ## 0000016C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B212C0.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B212C0.s index 1b168df8dc..90cb3779c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B212C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B212C0.s @@ -20,7 +20,7 @@ glabel func_80B212C0 /* 00514 80B212F4 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 00518 80B212F8 44054000 */ mfc1 $a1, $f8 /* 0051C 80B212FC AFA2002C */ sw $v0, 0x002C($sp) -/* 00520 80B21300 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00520 80B21300 0C01E0C4 */ jal Math_SmoothStepToF /* 00524 80B21304 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00528 80B21308 3C078013 */ lui $a3, %hi(D_801333E0) @@ -53,7 +53,7 @@ glabel func_80B212C0 /* 00588 80B21368 244B000F */ addiu $t3, $v0, 0x000F ## $t3 = 0000000F /* 0058C 80B2136C A60B0160 */ sh $t3, 0x0160($s0) ## 00000160 .L80B21370: -/* 00590 80B21370 0C0329DD */ jal func_800CA774 +/* 00590 80B21370 0C0329DD */ jal Math_CosF /* 00594 80B21374 C60C0168 */ lwc1 $f12, 0x0168($s0) ## 00000168 /* 00598 80B21378 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 0059C 80B2137C 00000000 */ nop @@ -61,13 +61,13 @@ glabel func_80B212C0 /* 005A4 80B21384 00000000 */ nop /* 005A8 80B21388 45000005 */ bc1f .L80B213A0 /* 005AC 80B2138C 00000000 */ nop -/* 005B0 80B21390 0C03F66B */ jal Math_Rand_ZeroOne +/* 005B0 80B21390 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 005B4 80B21394 00000000 */ nop /* 005B8 80B21398 46000480 */ add.s $f18, $f0, $f0 /* 005BC 80B2139C E6120170 */ swc1 $f18, 0x0170($s0) ## 00000170 .L80B213A0: -/* 005C0 80B213A0 0C0329DD */ jal func_800CA774 +/* 005C0 80B213A0 0C0329DD */ jal Math_CosF /* 005C4 80B213A4 C60C0168 */ lwc1 $f12, 0x0168($s0) ## 00000168 /* 005C8 80B213A8 3C0180B2 */ lui $at, %hi(D_80B22B84) ## $at = 80B20000 /* 005CC 80B213AC C4222B84 */ lwc1 $f2, %lo(D_80B22B84)($at) @@ -88,7 +88,7 @@ glabel func_80B212C0 /* 00608 80B213E8 E6060168 */ swc1 $f6, 0x0168($s0) ## 00000168 /* 0060C 80B213EC 460A8480 */ add.s $f18, $f16, $f10 /* 00610 80B213F0 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 00614 80B213F4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00614 80B213F4 0C01E0C4 */ jal Math_SmoothStepToF /* 00618 80B213F8 E7A80010 */ swc1 $f8, 0x0010($sp) /* 0061C 80B213FC 860C015A */ lh $t4, 0x015A($s0) ## 0000015A @@ -101,7 +101,7 @@ glabel func_80B212C0 /* 00638 80B21418 11C00007 */ beq $t6, $zero, .L80B21438 /* 0063C 80B2141C 00000000 */ nop /* 00640 80B21420 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 00644 80B21424 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00644 80B21424 0C01E1A7 */ jal Math_SmoothStepToS /* 00648 80B21428 AFA00010 */ sw $zero, 0x0010($sp) /* 0064C 80B2142C 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B214CC.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B214CC.s index 453104e991..1cc27fc551 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B214CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B214CC.s @@ -38,7 +38,7 @@ glabel func_80B214CC /* 0077C 80B2155C 26931C24 */ addiu $s3, $s4, 0x1C24 ## $s3 = 00001C24 /* 00780 80B21560 55A10071 */ bnel $t5, $at, .L80B21728 /* 00784 80B21564 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00788 80B21568 0C03F66B */ jal Math_Rand_ZeroOne +/* 00788 80B21568 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0078C 80B2156C 00000000 */ nop /* 00790 80B21570 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -49,7 +49,7 @@ glabel func_80B214CC /* 007A4 80B21584 C64A0024 */ lwc1 $f10, 0x0024($s2) ## 00000024 /* 007A8 80B21588 46062202 */ mul.s $f8, $f4, $f6 /* 007AC 80B2158C 460A4400 */ add.s $f16, $f8, $f10 -/* 007B0 80B21590 0C03F66B */ jal Math_Rand_ZeroOne +/* 007B0 80B21590 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 007B4 80B21594 E7B0006C */ swc1 $f16, 0x006C($sp) /* 007B8 80B21598 46140481 */ sub.s $f18, $f0, $f20 @@ -58,7 +58,7 @@ glabel func_80B214CC /* 007C4 80B215A4 C648002C */ lwc1 $f8, 0x002C($s2) ## 0000002C /* 007C8 80B215A8 46049182 */ mul.s $f6, $f18, $f4 /* 007CC 80B215AC 46083280 */ add.s $f10, $f6, $f8 -/* 007D0 80B215B0 0C03F66B */ jal Math_Rand_ZeroOne +/* 007D0 80B215B0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 007D4 80B215B4 E7AA0074 */ swc1 $f10, 0x0074($sp) /* 007D8 80B215B8 46140401 */ sub.s $f16, $f0, $f20 @@ -94,7 +94,7 @@ glabel func_80B214CC /* 00850 80B21630 02003025 */ or $a2, $s0, $zero ## $a2 = FFFFFFE8 /* 00854 80B21634 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 00858 80B21638 02003825 */ or $a3, $s0, $zero ## $a3 = FFFFFFE8 -/* 0085C 80B2163C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0085C 80B2163C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00860 80B21640 00000000 */ nop /* 00864 80B21644 46140281 */ sub.s $f10, $f0, $f20 @@ -103,7 +103,7 @@ glabel func_80B214CC /* 00870 80B21650 C6440024 */ lwc1 $f4, 0x0024($s2) ## 00000024 /* 00874 80B21654 46105482 */ mul.s $f18, $f10, $f16 /* 00878 80B21658 46049180 */ add.s $f6, $f18, $f4 -/* 0087C 80B2165C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0087C 80B2165C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00880 80B21660 E7A6006C */ swc1 $f6, 0x006C($sp) /* 00884 80B21664 46140201 */ sub.s $f8, $f0, $f20 @@ -112,7 +112,7 @@ glabel func_80B214CC /* 00890 80B21670 C652002C */ lwc1 $f18, 0x002C($s2) ## 0000002C /* 00894 80B21674 460A4402 */ mul.s $f16, $f8, $f10 /* 00898 80B21678 46128100 */ add.s $f4, $f16, $f18 -/* 0089C 80B2167C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0089C 80B2167C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 008A0 80B21680 E7A40074 */ swc1 $f4, 0x0074($sp) /* 008A4 80B21684 46140181 */ sub.s $f6, $f0, $f20 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B217FC.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B217FC.s index 1818f3d1ea..e9056adbf6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B217FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B217FC.s @@ -4,7 +4,7 @@ glabel func_80B217FC /* 00A24 80B21804 AFB00020 */ sw $s0, 0x0020($sp) /* 00A28 80B21808 F7B40018 */ sdc1 $f20, 0x0018($sp) /* 00A2C 80B2180C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A30 80B21810 0C03F66B */ jal Math_Rand_ZeroOne +/* 00A30 80B21810 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A34 80B21814 AC80014C */ sw $zero, 0x014C($a0) ## 0000014C /* 00A38 80B21818 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -15,7 +15,7 @@ glabel func_80B217FC /* 00A4C 80B2182C C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 /* 00A50 80B21830 46062202 */ mul.s $f8, $f4, $f6 /* 00A54 80B21834 46085400 */ add.s $f16, $f10, $f8 -/* 00A58 80B21838 0C03F66B */ jal Math_Rand_ZeroOne +/* 00A58 80B21838 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A5C 80B2183C E6100024 */ swc1 $f16, 0x0024($s0) ## 00000024 /* 00A60 80B21840 46140481 */ sub.s $f18, $f0, $f20 @@ -24,7 +24,7 @@ glabel func_80B217FC /* 00A6C 80B2184C C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 00A70 80B21850 46049182 */ mul.s $f6, $f18, $f4 /* 00A74 80B21854 46065200 */ add.s $f8, $f10, $f6 -/* 00A78 80B21858 0C03F66B */ jal Math_Rand_ZeroOne +/* 00A78 80B21858 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A7C 80B2185C E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 /* 00A80 80B21860 46140401 */ sub.s $f16, $f0, $f20 @@ -33,7 +33,7 @@ glabel func_80B217FC /* 00A8C 80B2186C C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 00A90 80B21870 46128102 */ mul.s $f4, $f16, $f18 /* 00A94 80B21874 46045180 */ add.s $f6, $f10, $f4 -/* 00A98 80B21878 0C03F66B */ jal Math_Rand_ZeroOne +/* 00A98 80B21878 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A9C 80B2187C E606002C */ swc1 $f6, 0x002C($s0) ## 0000002C /* 00AA0 80B21880 46140201 */ sub.s $f8, $f0, $f20 @@ -41,7 +41,7 @@ glabel func_80B217FC /* 00AA8 80B21888 44818000 */ mtc1 $at, $f16 ## $f16 = 1.50 /* 00AAC 80B2188C 00000000 */ nop /* 00AB0 80B21890 46104482 */ mul.s $f18, $f8, $f16 -/* 00AB4 80B21894 0C03F66B */ jal Math_Rand_ZeroOne +/* 00AB4 80B21894 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00AB8 80B21898 E612005C */ swc1 $f18, 0x005C($s0) ## 0000005C /* 00ABC 80B2189C 46140281 */ sub.s $f10, $f0, $f20 @@ -49,7 +49,7 @@ glabel func_80B217FC /* 00AC4 80B218A4 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 /* 00AC8 80B218A8 00000000 */ nop /* 00ACC 80B218AC 46045182 */ mul.s $f6, $f10, $f4 -/* 00AD0 80B218B0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00AD0 80B218B0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00AD4 80B218B4 E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 /* 00AD8 80B218B8 46140201 */ sub.s $f8, $f0, $f20 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B2194C.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B2194C.s index 824fee5c06..c4502e2d0e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B2194C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B2194C.s @@ -1,7 +1,7 @@ glabel func_80B2194C /* 00B6C 80B2194C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00B70 80B21950 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B74 80B21954 0C03F66B */ jal Math_Rand_ZeroOne +/* 00B74 80B21954 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00B78 80B21958 AFA40018 */ sw $a0, 0x0018($sp) /* 00B7C 80B2195C 3C014170 */ lui $at, 0x4170 ## $at = 41700000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B219A8.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B219A8.s index 714a045903..6387de71f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B219A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B219A8.s @@ -18,7 +18,7 @@ glabel func_80B219A8 /* 00BF4 80B219D4 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 /* 00BF8 80B219D8 3C054020 */ lui $a1, 0x4020 ## $a1 = 40200000 /* 00BFC 80B219DC AFAF0028 */ sw $t7, 0x0028($sp) -/* 00C00 80B219E0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00C00 80B219E0 0C01E0C4 */ jal Math_SmoothStepToF /* 00C04 80B219E4 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00C08 80B219E8 8FB80028 */ lw $t8, 0x0028($sp) @@ -38,7 +38,7 @@ glabel func_80B219A8 /* 00C40 80B21A20 44059000 */ mfc1 $a1, $f18 /* 00C44 80B21A24 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00C48 80B21A28 44074000 */ mfc1 $a3, $f8 -/* 00C4C 80B21A2C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00C4C 80B21A2C 0C01E0C4 */ jal Math_SmoothStepToF /* 00C50 80B21A30 00000000 */ nop /* 00C54 80B21A34 3C078013 */ lui $a3, %hi(D_801333E0) @@ -70,7 +70,7 @@ glabel func_80B219A8 /* 00CB0 80B21A90 244DFFF1 */ addiu $t5, $v0, 0xFFF1 ## $t5 = FFFFFFF1 /* 00CB4 80B21A94 A60D0160 */ sh $t5, 0x0160($s0) ## 00000160 .L80B21A98: -/* 00CB8 80B21A98 0C0329DD */ jal func_800CA774 +/* 00CB8 80B21A98 0C0329DD */ jal Math_CosF /* 00CBC 80B21A9C C60C0168 */ lwc1 $f12, 0x0168($s0) ## 00000168 /* 00CC0 80B21AA0 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 00CC4 80B21AA4 00000000 */ nop @@ -78,7 +78,7 @@ glabel func_80B219A8 /* 00CCC 80B21AAC 00000000 */ nop /* 00CD0 80B21AB0 45000008 */ bc1f .L80B21AD4 /* 00CD4 80B21AB4 00000000 */ nop -/* 00CD8 80B21AB8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00CD8 80B21AB8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00CDC 80B21ABC 00000000 */ nop /* 00CE0 80B21AC0 3C014080 */ lui $at, 0x4080 ## $at = 40800000 @@ -87,7 +87,7 @@ glabel func_80B219A8 /* 00CEC 80B21ACC 46120102 */ mul.s $f4, $f0, $f18 /* 00CF0 80B21AD0 E6040170 */ swc1 $f4, 0x0170($s0) ## 00000170 .L80B21AD4: -/* 00CF4 80B21AD4 0C0329DD */ jal func_800CA774 +/* 00CF4 80B21AD4 0C0329DD */ jal Math_CosF /* 00CF8 80B21AD8 C60C0168 */ lwc1 $f12, 0x0168($s0) ## 00000168 /* 00CFC 80B21ADC 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 00D00 80B21AE0 44814000 */ mtc1 $at, $f8 ## $f8 = 0.25 @@ -122,7 +122,7 @@ glabel func_80B219A8 /* 00D6C 80B21B4C 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 00D70 80B21B50 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00D74 80B21B54 240702EE */ addiu $a3, $zero, 0x02EE ## $a3 = 000002EE -/* 00D78 80B21B58 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00D78 80B21B58 0C01E1A7 */ jal Math_SmoothStepToS /* 00D7C 80B21B5C AFA00010 */ sw $zero, 0x0010($sp) /* 00D80 80B21B60 8608015A */ lh $t0, 0x015A($s0) ## 0000015A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21BDC.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21BDC.s index 1360783693..0bd72f416a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21BDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21BDC.s @@ -46,14 +46,14 @@ glabel func_80B21BDC /* 00E84 80B21C64 A60B015A */ sh $t3, 0x015A($s0) ## 0000015A /* 00E88 80B21C68 AFA00010 */ sw $zero, 0x0010($sp) /* 00E8C 80B21C6C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00E90 80B21C70 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00E90 80B21C70 0C01E1A7 */ jal Math_SmoothStepToS /* 00E94 80B21C74 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 /* 00E98 80B21C78 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 00E9C 80B21C7C AFA00010 */ sw $zero, 0x0010($sp) /* 00EA0 80B21C80 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 00EA4 80B21C84 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00EA8 80B21C88 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00EA8 80B21C88 0C01E1A7 */ jal Math_SmoothStepToS /* 00EAC 80B21C8C 240705DC */ addiu $a3, $zero, 0x05DC ## $a3 = 000005DC /* 00EB0 80B21C90 8FA50034 */ lw $a1, 0x0034($sp) @@ -74,7 +74,7 @@ glabel func_80B21BDC /* 00EE8 80B21CC8 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 00EEC 80B21CCC E7A00010 */ swc1 $f0, 0x0010($sp) /* 00EF0 80B21CD0 44058000 */ mfc1 $a1, $f16 -/* 00EF4 80B21CD4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00EF4 80B21CD4 0C01E0C4 */ jal Math_SmoothStepToF /* 00EF8 80B21CD8 00000000 */ nop /* 00EFC 80B21CDC 8604015C */ lh $a0, 0x015C($s0) ## 0000015C @@ -85,11 +85,11 @@ glabel func_80B21BDC /* 00F10 80B21CF0 00812021 */ addu $a0, $a0, $at /* 00F14 80B21CF4 00042100 */ sll $a0, $a0, 4 /* 00F18 80B21CF8 00042400 */ sll $a0, $a0, 16 -/* 00F1C 80B21CFC 0C01DE1C */ jal Math_Sins +/* 00F1C 80B21CFC 0C01DE1C */ jal Math_SinS ## sins? /* 00F20 80B21D00 00042403 */ sra $a0, $a0, 16 /* 00F24 80B21D04 46000506 */ mov.s $f20, $f0 -/* 00F28 80B21D08 0C01DE1C */ jal Math_Sins +/* 00F28 80B21D08 0C01DE1C */ jal Math_SinS ## sins? /* 00F2C 80B21D0C 87A40032 */ lh $a0, 0x0032($sp) /* 00F30 80B21D10 C612016C */ lwc1 $f18, 0x016C($s0) ## 0000016C @@ -106,11 +106,11 @@ glabel func_80B21BDC /* 00F5C 80B21D3C 00042400 */ sll $a0, $a0, 16 /* 00F60 80B21D40 00042403 */ sra $a0, $a0, 16 /* 00F64 80B21D44 46083280 */ add.s $f10, $f6, $f8 -/* 00F68 80B21D48 0C01DE1C */ jal Math_Sins +/* 00F68 80B21D48 0C01DE1C */ jal Math_SinS ## sins? /* 00F6C 80B21D4C E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 /* 00F70 80B21D50 46000506 */ mov.s $f20, $f0 -/* 00F74 80B21D54 0C01DE0D */ jal Math_Coss +/* 00F74 80B21D54 0C01DE0D */ jal Math_CosS ## coss? /* 00F78 80B21D58 87A40032 */ lh $a0, 0x0032($sp) /* 00F7C 80B21D5C C610016C */ lwc1 $f16, 0x016C($s0) ## 0000016C @@ -130,7 +130,7 @@ glabel func_80B21BDC .L80B21D90: /* 00FB0 80B21D90 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00FB4 80B21D94 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 00FB8 80B21D98 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00FB8 80B21D98 0C01E1A7 */ jal Math_SmoothStepToS /* 00FBC 80B21D9C AFA00010 */ sw $zero, 0x0010($sp) /* 00FC0 80B21DA0 3C0180B2 */ lui $at, %hi(D_80B22B90) ## $at = 80B20000 @@ -139,7 +139,7 @@ glabel func_80B21BDC /* 00FCC 80B21DAC 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 00FD0 80B21DB0 44060000 */ mfc1 $a2, $f0 /* 00FD4 80B21DB4 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 00FD8 80B21DB8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00FD8 80B21DB8 0C01E0C4 */ jal Math_SmoothStepToF /* 00FDC 80B21DBC E7A00010 */ swc1 $f0, 0x0010($sp) /* 00FE0 80B21DC0 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 @@ -164,11 +164,11 @@ glabel func_80B21BDC /* 01024 80B21E04 00812021 */ addu $a0, $a0, $at /* 01028 80B21E08 00042100 */ sll $a0, $a0, 4 /* 0102C 80B21E0C 00042400 */ sll $a0, $a0, 16 -/* 01030 80B21E10 0C01DE1C */ jal Math_Sins +/* 01030 80B21E10 0C01DE1C */ jal Math_SinS ## sins? /* 01034 80B21E14 00042403 */ sra $a0, $a0, 16 /* 01038 80B21E18 46000506 */ mov.s $f20, $f0 -/* 0103C 80B21E1C 0C01DE1C */ jal Math_Sins +/* 0103C 80B21E1C 0C01DE1C */ jal Math_SinS ## sins? /* 01040 80B21E20 87A40032 */ lh $a0, 0x0032($sp) /* 01044 80B21E24 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 @@ -186,11 +186,11 @@ glabel func_80B21BDC /* 01074 80B21E54 00042400 */ sll $a0, $a0, 16 /* 01078 80B21E58 00042403 */ sra $a0, $a0, 16 /* 0107C 80B21E5C 46062200 */ add.s $f8, $f4, $f6 -/* 01080 80B21E60 0C01DE1C */ jal Math_Sins +/* 01080 80B21E60 0C01DE1C */ jal Math_SinS ## sins? /* 01084 80B21E64 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 /* 01088 80B21E68 46000506 */ mov.s $f20, $f0 -/* 0108C 80B21E6C 0C01DE0D */ jal Math_Coss +/* 0108C 80B21E6C 0C01DE0D */ jal Math_CosS ## coss? /* 01090 80B21E70 87A40032 */ lh $a0, 0x0032($sp) /* 01094 80B21E74 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21F18.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21F18.s index 4497bd025b..23c5de78bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21F18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21F18.s @@ -97,12 +97,12 @@ glabel func_80B21F18 /* 01294 80B22074 2458FFF1 */ addiu $t8, $v0, 0xFFF1 ## $t8 = FFFFFFF1 /* 01298 80B22078 A6180160 */ sh $t8, 0x0160($s0) ## 00000160 .L80B2207C: -/* 0129C 80B2207C 0C01DE0D */ jal Math_Coss +/* 0129C 80B2207C 0C01DE0D */ jal Math_CosS ## coss? /* 012A0 80B22080 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 /* 012A4 80B22084 46000400 */ add.s $f16, $f0, $f0 /* 012A8 80B22088 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 -/* 012AC 80B2208C 0C01DE1C */ jal Math_Sins +/* 012AC 80B2208C 0C01DE1C */ jal Math_SinS ## sins? /* 012B0 80B22090 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 /* 012B4 80B22094 C6020028 */ lwc1 $f2, 0x0028($s0) ## 00000028 @@ -154,10 +154,10 @@ glabel func_80B21F18 /* 01360 80B22140 8E0F002C */ lw $t7, 0x002C($s0) ## 0000002C /* 01364 80B22144 ADAF0008 */ sw $t7, 0x0008($t5) ## FFFFFFF0 /* 01368 80B22148 C6120080 */ lwc1 $f18, 0x0080($s0) ## 00000080 -/* 0136C 80B2214C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0136C 80B2214C 0C00CFC8 */ jal Rand_CenteredFloat /* 01370 80B22150 E7B2004C */ swc1 $f18, 0x004C($sp) -/* 01374 80B22154 0C03F66B */ jal Math_Rand_ZeroOne +/* 01374 80B22154 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01378 80B22158 E7A00054 */ swc1 $f0, 0x0054($sp) /* 0137C 80B2215C 3C014060 */ lui $at, 0x4060 ## $at = 40600000 @@ -168,12 +168,12 @@ glabel func_80B21F18 /* 01390 80B22170 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 01394 80B22174 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 01398 80B22178 46043280 */ add.s $f10, $f6, $f4 -/* 0139C 80B2217C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0139C 80B2217C 0C00CFC8 */ jal Rand_CenteredFloat /* 013A0 80B22180 E7AA0058 */ swc1 $f10, 0x0058($sp) /* 013A4 80B22184 E7A0005C */ swc1 $f0, 0x005C($sp) /* 013A8 80B22188 24040064 */ addiu $a0, $zero, 0x0064 ## $a0 = 00000064 -/* 013AC 80B2218C 0C01DF64 */ jal Math_Rand_S16Offset +/* 013AC 80B2218C 0C01DF64 */ jal Rand_S16Offset /* 013B0 80B22190 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 /* 013B4 80B22194 3C1880B2 */ lui $t8, %hi(D_80B22B0C) ## $t8 = 80B20000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s index d37989a2ba..ad7e13d81e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s @@ -111,7 +111,7 @@ glabel EnTr_Update .L80B23D30: /* 01040 80B23D30 54400006 */ bnel $v0, $zero, .L80B23D4C /* 01044 80B23D34 A60302E0 */ sh $v1, 0x02E0($s0) ## 000002E0 -/* 01048 80B23D38 0C01DF64 */ jal Math_Rand_S16Offset +/* 01048 80B23D38 0C01DF64 */ jal Rand_S16Offset /* 0104C 80B23D3C 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C /* 01050 80B23D40 A60202E2 */ sh $v0, 0x02E2($s0) ## 000002E2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B230D8.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B230D8.s index f92751bdf7..b4f23888b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B230D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B230D8.s @@ -28,7 +28,7 @@ glabel func_80B230D8 /* 00450 80B23140 0C2C900E */ jal func_80B24038 /* 00454 80B23144 00000000 */ nop /* 00458 80B23148 C60C0064 */ lwc1 $f12, 0x0064($s0) ## 00000064 -/* 0045C 80B2314C 0C034199 */ jal atan2s +/* 0045C 80B2314C 0C034199 */ jal Math_Atan2S /* 00460 80B23150 C60E005C */ lwc1 $f14, 0x005C($s0) ## 0000005C /* 00464 80B23154 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 @@ -37,7 +37,7 @@ glabel func_80B230D8 /* 00470 80B23160 AFAB0010 */ sw $t3, 0x0010($sp) /* 00474 80B23164 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 00478 80B23168 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 0047C 80B2316C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 0047C 80B2316C 0C01E1A7 */ jal Math_SmoothStepToS /* 00480 80B23170 24070400 */ addiu $a3, $zero, 0x0400 ## $a3 = 00000400 /* 00484 80B23174 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 @@ -47,7 +47,7 @@ glabel func_80B230D8 .L80B23184: /* 00494 80B23184 0C2C90AD */ jal func_80B242B4 /* 00498 80B23188 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0049C 80B2318C 0C01DE1C */ jal Math_Sins +/* 0049C 80B2318C 0C01DE1C */ jal Math_SinS ## sins? /* 004A0 80B23190 860402D6 */ lh $a0, 0x02D6($s0) ## 000002D6 /* 004A4 80B23194 3C014316 */ lui $at, 0x4316 ## $at = 43160000 @@ -61,7 +61,7 @@ glabel func_80B230D8 /* 004C4 80B231B4 46128180 */ add.s $f6, $f16, $f18 /* 004C8 80B231B8 46082280 */ add.s $f10, $f4, $f8 /* 004CC 80B231BC E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 004D0 80B231C0 0C01DE0D */ jal Math_Coss +/* 004D0 80B231C0 0C01DE0D */ jal Math_CosS ## coss? /* 004D4 80B231C4 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 /* 004D8 80B231C8 3C014316 */ lui $at, 0x4316 ## $at = 43160000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23254.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23254.s index 9324a92da9..d913cd97a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23254.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23254.s @@ -36,11 +36,11 @@ glabel func_80B23254 /* 005E4 80B232D4 A7AA0040 */ sh $t2, 0x0040($sp) /* 005E8 80B232D8 00042403 */ sra $a0, $a0, 16 /* 005EC 80B232DC E7A0006C */ swc1 $f0, 0x006C($sp) -/* 005F0 80B232E0 0C01DE1C */ jal Math_Sins +/* 005F0 80B232E0 0C01DE1C */ jal Math_SinS ## sins? /* 005F4 80B232E4 E7A00064 */ swc1 $f0, 0x0064($sp) /* 005F8 80B232E8 E7A0003C */ swc1 $f0, 0x003C($sp) -/* 005FC 80B232EC 0C01DE0D */ jal Math_Coss +/* 005FC 80B232EC 0C01DE0D */ jal Math_CosS ## coss? /* 00600 80B232F0 87A40040 */ lh $a0, 0x0040($sp) /* 00604 80B232F4 C7A40094 */ lwc1 $f4, 0x0094($sp) @@ -49,18 +49,18 @@ glabel func_80B23254 /* 00610 80B23300 46062202 */ mul.s $f8, $f4, $f6 /* 00614 80B23304 00000000 */ nop /* 00618 80B23308 46080282 */ mul.s $f10, $f0, $f8 -/* 0061C 80B2330C 0C01DE1C */ jal Math_Sins +/* 0061C 80B2330C 0C01DE1C */ jal Math_SinS ## sins? /* 00620 80B23310 E7AA0070 */ swc1 $f10, 0x0070($sp) /* 00624 80B23314 C7B00094 */ lwc1 $f16, 0x0094($sp) /* 00628 80B23318 00102400 */ sll $a0, $s0, 16 /* 0062C 80B2331C 00042403 */ sra $a0, $a0, 16 /* 00630 80B23320 46100482 */ mul.s $f18, $f0, $f16 -/* 00634 80B23324 0C01DE0D */ jal Math_Coss +/* 00634 80B23324 0C01DE0D */ jal Math_CosS ## coss? /* 00638 80B23328 E7B20074 */ swc1 $f18, 0x0074($sp) /* 0063C 80B2332C E7A0003C */ swc1 $f0, 0x003C($sp) -/* 00640 80B23330 0C01DE0D */ jal Math_Coss +/* 00640 80B23330 0C01DE0D */ jal Math_CosS ## coss? /* 00644 80B23334 87A40040 */ lh $a0, 0x0040($sp) /* 00648 80B23338 C7A40094 */ lwc1 $f4, 0x0094($sp) @@ -106,7 +106,7 @@ glabel func_80B23254 /* 006E8 80B233D8 E7B2005C */ swc1 $f18, 0x005C($sp) /* 006EC 80B233DC 46024402 */ mul.s $f16, $f8, $f2 /* 006F0 80B233E0 46103281 */ sub.s $f10, $f6, $f16 -/* 006F4 80B233E4 0C01DE0D */ jal Math_Coss +/* 006F4 80B233E4 0C01DE0D */ jal Math_CosS ## coss? /* 006F8 80B233E8 E7AA0060 */ swc1 $f10, 0x0060($sp) /* 006FC 80B233EC 8FA20090 */ lw $v0, 0x0090($sp) @@ -130,7 +130,7 @@ glabel func_80B23254 /* 00744 80B23434 46064400 */ add.s $f16, $f8, $f6 /* 00748 80B23438 46122200 */ add.s $f8, $f4, $f18 /* 0074C 80B2343C E7B0007C */ swc1 $f16, 0x007C($sp) -/* 00750 80B23440 0C01DE1C */ jal Math_Sins +/* 00750 80B23440 0C01DE1C */ jal Math_SinS ## sins? /* 00754 80B23444 E7A80080 */ swc1 $f8, 0x0080($sp) /* 00758 80B23448 8FA30038 */ lw $v1, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23D74.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23D74.s index 45e7425b3b..0c19dc463a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23D74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23D74.s @@ -39,7 +39,7 @@ glabel func_80B23D74 /* 01118 80B23E08 0C016A7D */ jal Camera_GetCamDirYaw /* 0111C 80B23E0C 8DA40790 */ lw $a0, 0x0790($t5) ## 00000790 /* 01120 80B23E10 00022400 */ sll $a0, $v0, 16 -/* 01124 80B23E14 0C01DE1C */ jal Math_Sins +/* 01124 80B23E14 0C01DE1C */ jal Math_SinS ## sins? /* 01128 80B23E18 00042403 */ sra $a0, $a0, 16 /* 0112C 80B23E1C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -55,7 +55,7 @@ glabel func_80B23D74 /* 01154 80B23E44 0C016A7D */ jal Camera_GetCamDirYaw /* 01158 80B23E48 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 /* 0115C 80B23E4C 00022400 */ sll $a0, $v0, 16 -/* 01160 80B23E50 0C01DE0D */ jal Math_Coss +/* 01160 80B23E50 0C01DE0D */ jal Math_CosS ## coss? /* 01164 80B23E54 00042403 */ sra $a0, $a0, 16 /* 01168 80B23E58 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B24038.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B24038.s index 9f6bf30210..b82bdb4511 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B24038.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B24038.s @@ -121,19 +121,19 @@ glabel func_80B24038 /* 014EC 80B241DC 00000000 */ nop /* 014F0 80B241E0 44058000 */ mfc1 $a1, $f16 .L80B241E4: -/* 014F4 80B241E4 0C01DE80 */ jal Math_ApproxF +/* 014F4 80B241E4 0C01DE80 */ jal Math_StepToF /* 014F8 80B241E8 E7B2002C */ swc1 $f18, 0x002C($sp) /* 014FC 80B241EC C7B2002C */ lwc1 $f18, 0x002C($sp) /* 01500 80B241F0 26040060 */ addiu $a0, $s0, 0x0060 ## $a0 = 00000060 /* 01504 80B241F4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01508 80B241F8 44059000 */ mfc1 $a1, $f18 -/* 0150C 80B241FC 0C01DE80 */ jal Math_ApproxF +/* 0150C 80B241FC 0C01DE80 */ jal Math_StepToF /* 01510 80B24200 00000000 */ nop /* 01514 80B24204 4405A000 */ mfc1 $a1, $f20 /* 01518 80B24208 26040064 */ addiu $a0, $s0, 0x0064 ## $a0 = 00000064 -/* 0151C 80B2420C 0C01DE80 */ jal Math_ApproxF +/* 0151C 80B2420C 0C01DE80 */ jal Math_StepToF /* 01520 80B24210 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01524 80B24214 0C00B5FB */ jal func_8002D7EC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Init.s index 6b65b496da..0f5257b0bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Init.s @@ -51,7 +51,7 @@ glabel EnTrap_Init /* 000B8 80B24718 A60F0150 */ sh $t7, 0x0150($s0) ## 00000150 /* 000BC 80B2471C 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 000C0 80B24720 46105482 */ mul.s $f18, $f10, $f16 -/* 000C4 80B24724 0C01DE1C */ jal Math_Sins +/* 000C4 80B24724 0C01DE1C */ jal Math_SinS ## sins? /* 000C8 80B24728 E6120154 */ swc1 $f18, 0x0154($s0) ## 00000154 /* 000CC 80B2472C C6040154 */ lwc1 $f4, 0x0154($s0) ## 00000154 @@ -59,7 +59,7 @@ glabel EnTrap_Init /* 000D4 80B24734 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 000D8 80B24738 46040182 */ mul.s $f6, $f0, $f4 /* 000DC 80B2473C 46083280 */ add.s $f10, $f6, $f8 -/* 000E0 80B24740 0C01DE0D */ jal Math_Coss +/* 000E0 80B24740 0C01DE0D */ jal Math_CosS ## coss? /* 000E4 80B24744 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 /* 000E8 80B24748 C6100154 */ lwc1 $f16, 0x0154($s0) ## 00000154 @@ -110,14 +110,14 @@ glabel EnTrap_Init /* 00190 80B247F0 AE0C000C */ sw $t4, 0x000C($s0) ## 0000000C /* 00194 80B247F4 8C4D0008 */ lw $t5, 0x0008($v0) ## 0000002C /* 00198 80B247F8 AE0D0010 */ sw $t5, 0x0010($s0) ## 00000010 -/* 0019C 80B247FC 0C01DE0D */ jal Math_Coss +/* 0019C 80B247FC 0C01DE0D */ jal Math_CosS ## coss? /* 001A0 80B24800 AFA20030 */ sw $v0, 0x0030($sp) /* 001A4 80B24804 46140102 */ mul.s $f4, $f0, $f20 /* 001A8 80B24808 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 001AC 80B2480C 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 001B0 80B24810 46062200 */ add.s $f8, $f4, $f6 -/* 001B4 80B24814 0C01DE1C */ jal Math_Sins +/* 001B4 80B24814 0C01DE1C */ jal Math_SinS ## sins? /* 001B8 80B24818 E6080158 */ swc1 $f8, 0x0158($s0) ## 00000158 /* 001BC 80B2481C 46140402 */ mul.s $f16, $f0, $f20 @@ -128,7 +128,7 @@ glabel EnTrap_Init /* 001D0 80B24830 00042400 */ sll $a0, $a0, 16 /* 001D4 80B24834 46105481 */ sub.s $f18, $f10, $f16 /* 001D8 80B24838 00042403 */ sra $a0, $a0, 16 -/* 001DC 80B2483C 0C01DE0D */ jal Math_Coss +/* 001DC 80B2483C 0C01DE0D */ jal Math_CosS ## coss? /* 001E0 80B24840 E6120160 */ swc1 $f18, 0x0160($s0) ## 00000160 /* 001E4 80B24844 46140102 */ mul.s $f4, $f0, $f20 @@ -139,21 +139,21 @@ glabel EnTrap_Init /* 001F8 80B24858 00042400 */ sll $a0, $a0, 16 /* 001FC 80B2485C 46062200 */ add.s $f8, $f4, $f6 /* 00200 80B24860 00042403 */ sra $a0, $a0, 16 -/* 00204 80B24864 0C01DE1C */ jal Math_Sins +/* 00204 80B24864 0C01DE1C */ jal Math_SinS ## sins? /* 00208 80B24868 E6080164 */ swc1 $f8, 0x0164($s0) ## 00000164 /* 0020C 80B2486C 46140402 */ mul.s $f16, $f0, $f20 /* 00210 80B24870 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 00214 80B24874 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 00218 80B24878 46105481 */ sub.s $f18, $f10, $f16 -/* 0021C 80B2487C 0C01DE1C */ jal Math_Sins +/* 0021C 80B2487C 0C01DE1C */ jal Math_SinS ## sins? /* 00220 80B24880 E612016C */ swc1 $f18, 0x016C($s0) ## 0000016C /* 00224 80B24884 46140102 */ mul.s $f4, $f0, $f20 /* 00228 80B24888 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 0022C 80B2488C 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 00230 80B24890 46062200 */ add.s $f8, $f4, $f6 -/* 00234 80B24894 0C01DE0D */ jal Math_Coss +/* 00234 80B24894 0C01DE0D */ jal Math_CosS ## coss? /* 00238 80B24898 E6080170 */ swc1 $f8, 0x0170($s0) ## 00000170 /* 0023C 80B2489C 46140282 */ mul.s $f10, $f0, $f20 @@ -164,7 +164,7 @@ glabel EnTrap_Init /* 00250 80B248B0 00042400 */ sll $a0, $a0, 16 /* 00254 80B248B4 46105480 */ add.s $f18, $f10, $f16 /* 00258 80B248B8 00042403 */ sra $a0, $a0, 16 -/* 0025C 80B248BC 0C01DE1C */ jal Math_Sins +/* 0025C 80B248BC 0C01DE1C */ jal Math_SinS ## sins? /* 00260 80B248C0 E6120178 */ swc1 $f18, 0x0178($s0) ## 00000178 /* 00264 80B248C4 46140102 */ mul.s $f4, $f0, $f20 @@ -175,14 +175,14 @@ glabel EnTrap_Init /* 00278 80B248D8 00042400 */ sll $a0, $a0, 16 /* 0027C 80B248DC 46062200 */ add.s $f8, $f4, $f6 /* 00280 80B248E0 00042403 */ sra $a0, $a0, 16 -/* 00284 80B248E4 0C01DE0D */ jal Math_Coss +/* 00284 80B248E4 0C01DE0D */ jal Math_CosS ## coss? /* 00288 80B248E8 E608017C */ swc1 $f8, 0x017C($s0) ## 0000017C /* 0028C 80B248EC 46140282 */ mul.s $f10, $f0, $f20 /* 00290 80B248F0 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C /* 00294 80B248F4 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 00298 80B248F8 46105480 */ add.s $f18, $f10, $f16 -/* 0029C 80B248FC 0C01DE0D */ jal Math_Coss +/* 0029C 80B248FC 0C01DE0D */ jal Math_CosS ## coss? /* 002A0 80B24900 E6120184 */ swc1 $f18, 0x0184($s0) ## 00000184 /* 002A4 80B24904 C7A40048 */ lwc1 $f4, 0x0048($sp) @@ -193,7 +193,7 @@ glabel EnTrap_Init /* 002B8 80B24918 00000000 */ nop /* 002BC 80B2491C 00021400 */ sll $v0, $v0, 16 /* 002C0 80B24920 00021403 */ sra $v0, $v0, 16 -/* 002C4 80B24924 0C01DE1C */ jal Math_Sins +/* 002C4 80B24924 0C01DE1C */ jal Math_SinS ## sins? /* 002C8 80B24928 A7A20046 */ sh $v0, 0x0046($sp) /* 002CC 80B2492C C7AA0048 */ lwc1 $f10, 0x0048($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Update.s index 445a28de1e..75fcb5d19b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Update.s @@ -269,7 +269,7 @@ glabel EnTrap_Update /* 00794 80B24DF4 00000000 */ nop /* 00798 80B24DF8 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 0079C 80B24DFC A7AA0092 */ sh $t2, 0x0092($sp) -/* 007A0 80B24E00 0C01DE1C */ jal Math_Sins +/* 007A0 80B24E00 0C01DE1C */ jal Math_SinS ## sins? /* 007A4 80B24E04 AFAF0048 */ sw $t7, 0x0048($sp) /* 007A8 80B24E08 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -278,7 +278,7 @@ glabel EnTrap_Update /* 007B4 80B24E14 46100482 */ mul.s $f18, $f0, $f16 /* 007B8 80B24E18 46049180 */ add.s $f6, $f18, $f4 /* 007BC 80B24E1C E7A60070 */ swc1 $f6, 0x0070($sp) -/* 007C0 80B24E20 0C01DE0D */ jal Math_Coss +/* 007C0 80B24E20 0C01DE0D */ jal Math_CosS ## coss? /* 007C4 80B24E24 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 007C8 80B24E28 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -359,7 +359,7 @@ glabel EnTrap_Update /* 008DC 80B24F3C 1180002E */ beq $t4, $zero, .L80B24FF8 /* 008E0 80B24F40 260D0024 */ addiu $t5, $s0, 0x0024 ## $t5 = 00000024 /* 008E4 80B24F44 86040152 */ lh $a0, 0x0152($s0) ## 00000152 -/* 008E8 80B24F48 0C01DE1C */ jal Math_Sins +/* 008E8 80B24F48 0C01DE1C */ jal Math_SinS ## sins? /* 008EC 80B24F4C AFAD0048 */ sw $t5, 0x0048($sp) /* 008F0 80B24F50 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 @@ -370,7 +370,7 @@ glabel EnTrap_Update /* 00904 80B24F64 A6190152 */ sh $t9, 0x0152($s0) ## 00000152 /* 00908 80B24F68 4500000B */ bc1f .L80B24F98 /* 0090C 80B24F6C 00000000 */ nop -/* 00910 80B24F70 0C01DE1C */ jal Math_Sins +/* 00910 80B24F70 0C01DE1C */ jal Math_SinS ## sins? /* 00914 80B24F74 86040152 */ lh $a0, 0x0152($s0) ## 00000152 /* 00918 80B24F78 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 @@ -383,7 +383,7 @@ glabel EnTrap_Update /* 00934 80B24F94 240528D2 */ addiu $a1, $zero, 0x28D2 ## $a1 = 000028D2 .L80B24F98: -/* 00938 80B24F98 0C01DE1C */ jal Math_Sins +/* 00938 80B24F98 0C01DE1C */ jal Math_SinS ## sins? /* 0093C 80B24F9C 86040152 */ lh $a0, 0x0152($s0) ## 00000152 /* 00940 80B24FA0 C60A0154 */ lwc1 $f10, 0x0154($s0) ## 00000154 @@ -391,7 +391,7 @@ glabel EnTrap_Update /* 00948 80B24FA8 86040152 */ lh $a0, 0x0152($s0) ## 00000152 /* 0094C 80B24FAC 460A0402 */ mul.s $f16, $f0, $f10 /* 00950 80B24FB0 46128100 */ add.s $f4, $f16, $f18 -/* 00954 80B24FB4 0C01DE0D */ jal Math_Coss +/* 00954 80B24FB4 0C01DE0D */ jal Math_CosS ## coss? /* 00958 80B24FB8 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 /* 0095C 80B24FBC C6060154 */ lwc1 $f6, 0x0154($s0) ## 00000154 @@ -490,7 +490,7 @@ glabel EnTrap_Update /* 00AAC 80B2510C 8E07019C */ lw $a3, 0x019C($s0) ## 0000019C /* 00AB0 80B25110 E7A20010 */ swc1 $f2, 0x0010($sp) /* 00AB4 80B25114 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 00AB8 80B25118 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00AB8 80B25118 0C01E0C4 */ jal Math_SmoothStepToF /* 00ABC 80B2511C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00AC0 80B25120 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 @@ -499,7 +499,7 @@ glabel EnTrap_Update /* 00ACC 80B2512C 8E070194 */ lw $a3, 0x0194($s0) ## 00000194 /* 00AD0 80B25130 8FA40048 */ lw $a0, 0x0048($sp) /* 00AD4 80B25134 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00AD8 80B25138 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00AD8 80B25138 0C01E0C4 */ jal Math_SmoothStepToF /* 00ADC 80B2513C E7A20010 */ swc1 $f2, 0x0010($sp) /* 00AE0 80B25140 C6060154 */ lwc1 $f6, 0x0154($s0) ## 00000154 @@ -564,7 +564,7 @@ glabel EnTrap_Update /* 00BAC 80B2520C 8E070188 */ lw $a3, 0x0188($s0) ## 00000188 /* 00BB0 80B25210 E7A20010 */ swc1 $f2, 0x0010($sp) /* 00BB4 80B25214 8FA40048 */ lw $a0, 0x0048($sp) -/* 00BB8 80B25218 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00BB8 80B25218 0C01E0C4 */ jal Math_SmoothStepToF /* 00BBC 80B2521C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00BC0 80B25220 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 @@ -573,7 +573,7 @@ glabel EnTrap_Update /* 00BCC 80B2522C 8E070190 */ lw $a3, 0x0190($s0) ## 00000190 /* 00BD0 80B25230 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 00BD4 80B25234 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00BD8 80B25238 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00BD8 80B25238 0C01E0C4 */ jal Math_SmoothStepToF /* 00BDC 80B2523C E7A20010 */ swc1 $f2, 0x0010($sp) /* 00BE0 80B25240 C6100154 */ lwc1 $f16, 0x0154($s0) ## 00000154 @@ -644,7 +644,7 @@ glabel EnTrap_Update /* 00CC0 80B25320 8E07019C */ lw $a3, 0x019C($s0) ## 0000019C /* 00CC4 80B25324 E7A20010 */ swc1 $f2, 0x0010($sp) /* 00CC8 80B25328 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 00CCC 80B2532C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00CCC 80B2532C 0C01E0C4 */ jal Math_SmoothStepToF /* 00CD0 80B25330 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00CD4 80B25334 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 @@ -653,7 +653,7 @@ glabel EnTrap_Update /* 00CE0 80B25340 8E070194 */ lw $a3, 0x0194($s0) ## 00000194 /* 00CE4 80B25344 8FA40048 */ lw $a0, 0x0048($sp) /* 00CE8 80B25348 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00CEC 80B2534C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00CEC 80B2534C 0C01E0C4 */ jal Math_SmoothStepToF /* 00CF0 80B25350 E7A20010 */ swc1 $f2, 0x0010($sp) /* 00CF4 80B25354 C6060154 */ lwc1 $f6, 0x0154($s0) ## 00000154 @@ -718,7 +718,7 @@ glabel EnTrap_Update /* 00DC0 80B25420 8E070188 */ lw $a3, 0x0188($s0) ## 00000188 /* 00DC4 80B25424 E7A20010 */ swc1 $f2, 0x0010($sp) /* 00DC8 80B25428 8FA40048 */ lw $a0, 0x0048($sp) -/* 00DCC 80B2542C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00DCC 80B2542C 0C01E0C4 */ jal Math_SmoothStepToF /* 00DD0 80B25430 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00DD4 80B25434 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 @@ -727,7 +727,7 @@ glabel EnTrap_Update /* 00DE0 80B25440 8E070190 */ lw $a3, 0x0190($s0) ## 00000190 /* 00DE4 80B25444 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 00DE8 80B25448 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00DEC 80B2544C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00DEC 80B2544C 0C01E0C4 */ jal Math_SmoothStepToF /* 00DF0 80B25450 E7A20010 */ swc1 $f2, 0x0010($sp) /* 00DF4 80B25454 C6100154 */ lwc1 $f16, 0x0154($s0) ## 00000154 @@ -909,7 +909,7 @@ glabel EnTrap_Update /* 0106C 80B256CC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01070 80B256D0 8E050008 */ lw $a1, 0x0008($s0) ## 00000008 /* 01074 80B256D4 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 01078 80B256D8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01078 80B256D8 0C01E0C4 */ jal Math_SmoothStepToF /* 0107C 80B256DC 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 01080 80B256E0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 @@ -917,7 +917,7 @@ glabel EnTrap_Update /* 01088 80B256E8 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 0108C 80B256EC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01090 80B256F0 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 01094 80B256F4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01094 80B256F4 0C01E0C4 */ jal Math_SmoothStepToF /* 01098 80B256F8 E7A20010 */ swc1 $f2, 0x0010($sp) .L80B256FC: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26C50.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26C50.s index c9310f6d4d..4f9e6079a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26C50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26C50.s @@ -40,7 +40,7 @@ glabel func_80B26C50 /* 00630 80B26CE0 24070050 */ addiu $a3, $zero, 0x0050 ## $a3 = 00000050 /* 00634 80B26CE4 2404000A */ addiu $a0, $zero, 0x000A ## $a0 = 0000000A -/* 00638 80B26CE8 0C01DF64 */ jal Math_Rand_S16Offset +/* 00638 80B26CE8 0C01DF64 */ jal Rand_S16Offset /* 0063C 80B26CEC 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A /* 00640 80B26CF0 9219040D */ lbu $t9, 0x040D($s0) ## 0000040D diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E9C.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E9C.s index e654500609..0a1941e5b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E9C.s @@ -37,7 +37,7 @@ glabel func_80B26E9C /* 00874 80B26F24 0C016A7D */ jal Camera_GetCamDirYaw /* 00878 80B26F28 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 /* 0087C 80B26F2C 00022400 */ sll $a0, $v0, 16 -/* 00880 80B26F30 0C01DE0D */ jal Math_Coss +/* 00880 80B26F30 0C01DE0D */ jal Math_CosS ## coss? /* 00884 80B26F34 00042403 */ sra $a0, $a0, 16 /* 00888 80B26F38 865907A0 */ lh $t9, 0x07A0($s2) ## 000007A0 @@ -47,7 +47,7 @@ glabel func_80B26E9C /* 00898 80B26F48 0C016A7D */ jal Camera_GetCamDirYaw /* 0089C 80B26F4C 8D240790 */ lw $a0, 0x0790($t1) ## 00000790 /* 008A0 80B26F50 00022400 */ sll $a0, $v0, 16 -/* 008A4 80B26F54 0C01DE1C */ jal Math_Sins +/* 008A4 80B26F54 0C01DE1C */ jal Math_SinS ## sins? /* 008A8 80B26F58 00042403 */ sra $a0, $a0, 16 /* 008AC 80B26F5C 928A0194 */ lbu $t2, 0x0194($s4) ## 00000194 @@ -62,7 +62,7 @@ glabel func_80B26E9C .L80B26F80: /* 008D0 80B26F80 15A0002E */ bne $t5, $zero, .L80B2703C /* 008D4 80B26F84 00119B80 */ sll $s3, $s1, 14 -/* 008D8 80B26F88 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 008D8 80B26F88 0C00CFC8 */ jal Rand_CenteredFloat /* 008DC 80B26F8C 4600D306 */ mov.s $f12, $f26 /* 008E0 80B26F90 4600010D */ trunc.w.s $f4, $f0 @@ -73,7 +73,7 @@ glabel func_80B26E9C /* 008F4 80B26FA4 00028400 */ sll $s0, $v0, 16 /* 008F8 80B26FA8 00022400 */ sll $a0, $v0, 16 /* 008FC 80B26FAC 00108403 */ sra $s0, $s0, 16 -/* 00900 80B26FB0 0C01DE1C */ jal Math_Sins +/* 00900 80B26FB0 0C01DE1C */ jal Math_SinS ## sins? /* 00904 80B26FB4 00042403 */ sra $a0, $a0, 16 /* 00908 80B26FB8 46140182 */ mul.s $f6, $f0, $f20 @@ -82,7 +82,7 @@ glabel func_80B26E9C /* 00914 80B26FC4 00042403 */ sra $a0, $a0, 16 /* 00918 80B26FC8 46163202 */ mul.s $f8, $f6, $f22 /* 0091C 80B26FCC 460A4400 */ add.s $f16, $f8, $f10 -/* 00920 80B26FD0 0C01DE0D */ jal Math_Coss +/* 00920 80B26FD0 0C01DE0D */ jal Math_CosS ## coss? /* 00924 80B26FD4 E7B0008C */ swc1 $f16, 0x008C($sp) /* 00928 80B26FD8 46140102 */ mul.s $f4, $f0, $f20 @@ -91,7 +91,7 @@ glabel func_80B26E9C /* 00934 80B26FE4 00042403 */ sra $a0, $a0, 16 /* 00938 80B26FE8 46049181 */ sub.s $f6, $f18, $f4 /* 0093C 80B26FEC 461C3200 */ add.s $f8, $f6, $f28 -/* 00940 80B26FF0 0C01DE1C */ jal Math_Sins +/* 00940 80B26FF0 0C01DE1C */ jal Math_SinS ## sins? /* 00944 80B26FF4 E7A80090 */ swc1 $f8, 0x0090($sp) /* 00948 80B26FF8 46140282 */ mul.s $f10, $f0, $f20 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B270D8.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B270D8.s index dd60e644da..daf820c17c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B270D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B270D8.s @@ -25,7 +25,7 @@ glabel func_80B270D8 /* 00A80 80B27130 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 .L80B27134: /* 00A84 80B27134 8E050080 */ lw $a1, 0x0080($s0) ## 00000080 -/* 00A88 80B27138 0C01DE80 */ jal Math_ApproxF +/* 00A88 80B27138 0C01DE80 */ jal Math_StepToF /* 00A8C 80B2713C 8E060060 */ lw $a2, 0x0060($s0) ## 00000060 /* 00A90 80B27140 10400005 */ beq $v0, $zero, .L80B27158 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B2716C.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B2716C.s index 4b4bd9e159..e98ac1c15c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B2716C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B2716C.s @@ -36,7 +36,7 @@ glabel func_80B2716C /* 00B08 80B271B8 44033000 */ mfc1 $v1, $f6 /* 00B0C 80B271BC 260402F8 */ addiu $a0, $s0, 0x02F8 ## $a0 = 000002F8 /* 00B10 80B271C0 44058000 */ mfc1 $a1, $f16 -/* 00B14 80B271C4 0C01DE80 */ jal Math_ApproxF +/* 00B14 80B271C4 0C01DE80 */ jal Math_StepToF /* 00B18 80B271C8 AFA30024 */ sw $v1, 0x0024($sp) /* 00B1C 80B271CC 8FA30024 */ lw $v1, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B274A0.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B274A0.s index a5577e3dcf..1b2c489584 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B274A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B274A0.s @@ -41,35 +41,35 @@ glabel func_80B274A0 /* 00E74 80B27524 24170002 */ addiu $s7, $zero, 0x0002 ## $s7 = 00000002 /* 00E78 80B27528 27B30070 */ addiu $s3, $sp, 0x0070 ## $s3 = FFFFFFF0 .L80B2752C: -/* 00E7C 80B2752C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00E7C 80B2752C 0C00CFC8 */ jal Rand_CenteredFloat /* 00E80 80B27530 4600A306 */ mov.s $f12, $f20 /* 00E84 80B27534 C6440024 */ lwc1 $f4, 0x0024($s2) ## 00000024 /* 00E88 80B27538 4600B306 */ mov.s $f12, $f22 /* 00E8C 80B2753C 46040180 */ add.s $f6, $f0, $f4 -/* 00E90 80B27540 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00E90 80B27540 0C00CFC8 */ jal Rand_CenteredFloat /* 00E94 80B27544 E7A60070 */ swc1 $f6, 0x0070($sp) /* 00E98 80B27548 C6480028 */ lwc1 $f8, 0x0028($s2) ## 00000028 /* 00E9C 80B2754C 4600A306 */ mov.s $f12, $f20 /* 00EA0 80B27550 46080280 */ add.s $f10, $f0, $f8 -/* 00EA4 80B27554 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00EA4 80B27554 0C00CFC8 */ jal Rand_CenteredFloat /* 00EA8 80B27558 E7AA0074 */ swc1 $f10, 0x0074($sp) /* 00EAC 80B2755C C650002C */ lwc1 $f16, 0x002C($s2) ## 0000002C /* 00EB0 80B27560 46100480 */ add.s $f18, $f0, $f16 -/* 00EB4 80B27564 0C03F66B */ jal Math_Rand_ZeroOne +/* 00EB4 80B27564 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00EB8 80B27568 E7B20078 */ swc1 $f18, 0x0078($sp) /* 00EBC 80B2756C 46180100 */ add.s $f4, $f0, $f24 /* 00EC0 80B27570 3C0180B3 */ lui $at, %hi(D_80B2895C) ## $at = 80B30000 /* 00EC4 80B27574 24040028 */ addiu $a0, $zero, 0x0028 ## $a0 = 00000028 /* 00EC8 80B27578 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 -/* 00ECC 80B2757C 0C01DF64 */ jal Math_Rand_S16Offset +/* 00ECC 80B2757C 0C01DF64 */ jal Rand_S16Offset /* 00ED0 80B27580 E424895C */ swc1 $f4, %lo(D_80B2895C)($at) /* 00ED4 80B27584 00028400 */ sll $s0, $v0, 16 -/* 00ED8 80B27588 0C03F66B */ jal Math_Rand_ZeroOne +/* 00ED8 80B27588 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00EDC 80B2758C 00108403 */ sra $s0, $s0, 16 /* 00EE0 80B27590 461A003C */ c.lt.s $f0, $f26 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27654.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27654.s index e56489c752..ac3876c991 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27654.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27654.s @@ -20,7 +20,7 @@ glabel func_80B27654 /* 00FE4 80B27694 45030013 */ bc1tl .L80B276E4 /* 00FE8 80B27698 860F0196 */ lh $t7, 0x0196($s0) ## 00000196 /* 00FEC 80B2769C 44060000 */ mfc1 $a2, $f0 -/* 00FF0 80B276A0 0C01DE80 */ jal Math_ApproxF +/* 00FF0 80B276A0 0C01DE80 */ jal Math_StepToF /* 00FF4 80B276A4 8E050080 */ lw $a1, 0x0080($s0) ## 00000080 /* 00FF8 80B276A8 10400008 */ beq $v0, $zero, .L80B276CC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27710.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27710.s index 13f8b24cf2..77bf79878f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27710.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27710.s @@ -64,7 +64,7 @@ glabel func_80B27710 /* 01128 80B277D8 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C .L80B277DC: /* 0112C 80B277DC 460A0200 */ add.s $f8, $f0, $f10 -/* 01130 80B277E0 0C03F66B */ jal Math_Rand_ZeroOne +/* 01130 80B277E0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01134 80B277E4 E7A8005C */ swc1 $f8, 0x005C($sp) /* 01138 80B277E8 3C0180B3 */ lui $at, %hi(D_80B28A64) ## $at = 80B30000 @@ -102,7 +102,7 @@ glabel func_80B27710 /* 011B4 80B27864 8E050080 */ lw $a1, 0x0080($s0) ## 00000080 /* 011B8 80B27868 46085400 */ add.s $f16, $f10, $f8 /* 011BC 80B2786C E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 -/* 011C0 80B27870 0C01DE80 */ jal Math_ApproxF +/* 011C0 80B27870 0C01DE80 */ jal Math_StepToF /* 011C4 80B27874 8E060060 */ lw $a2, 0x0060($s0) ## 00000060 /* 011C8 80B27878 10400004 */ beq $v0, $zero, .L80B2788C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B278A0.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B278A0.s index 103a7bf748..29df662cf7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B278A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B278A0.s @@ -21,7 +21,7 @@ glabel func_80B278A0 /* 01218 80B278C8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 0121C 80B278CC 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 /* 01220 80B278D0 24440028 */ addiu $a0, $v0, 0x0028 ## $a0 = 00000028 -/* 01224 80B278D4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01224 80B278D4 0C01E0C4 */ jal Math_SmoothStepToF /* 01228 80B278D8 E7A40010 */ swc1 $f4, 0x0010($sp) /* 0122C 80B278DC 3C0180B3 */ lui $at, %hi(D_80B28A70) ## $at = 80B30000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28054.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28054.s index 70b2292dd5..116a0607f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28054.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28054.s @@ -114,7 +114,7 @@ glabel func_80B28054 /* 01AF4 80B281A4 44051000 */ mfc1 $a1, $f2 /* 01AF8 80B281A8 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01AFC 80B281AC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01B00 80B281B0 0C01DE80 */ jal Math_ApproxF +/* 01B00 80B281B0 0C01DE80 */ jal Math_StepToF /* 01B04 80B281B4 248402F4 */ addiu $a0, $a0, 0x02F4 ## $a0 = 000002F4 /* 01B08 80B281B8 8FAB0018 */ lw $t3, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28344.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28344.s index c80f0f608c..1036db73ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28344.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28344.s @@ -109,12 +109,12 @@ glabel func_80B28344 /* 01DAC 80B2845C 0C034348 */ jal Matrix_RotateY /* 01DB0 80B28460 00000000 */ nop /* 01DB4 80B28464 8FA800C0 */ lw $t0, 0x00C0($sp) -/* 01DB8 80B28468 0C01DE0D */ jal Math_Coss +/* 01DB8 80B28468 0C01DE0D */ jal Math_CosS ## coss? /* 01DBC 80B2846C 850400B6 */ lh $a0, 0x00B6($t0) ## 000000B6 /* 01DC0 80B28470 8FA900C0 */ lw $t1, 0x00C0($sp) /* 01DC4 80B28474 E7A0007C */ swc1 $f0, 0x007C($sp) -/* 01DC8 80B28478 0C01DE1C */ jal Math_Sins +/* 01DC8 80B28478 0C01DE1C */ jal Math_SinS ## sins? /* 01DCC 80B2847C 852400B6 */ lh $a0, 0x00B6($t1) ## 000000B6 /* 01DD0 80B28480 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Init.s index 534ff63a8b..4385aa14ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Init.s @@ -28,21 +28,21 @@ glabel EnVbBall_Init /* 00024 80B28FC4 8FA4003C */ lw $a0, 0x003C($sp) /* 00028 80B28FC8 3C014440 */ lui $at, 0x4440 ## $at = 44400000 /* 0002C 80B28FCC 44816000 */ mtc1 $at, $f12 ## $f12 = 768.00 -/* 00030 80B28FD0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00030 80B28FD0 0C00CFC8 */ jal Rand_CenteredFloat /* 00034 80B28FD4 00000000 */ nop /* 00038 80B28FD8 3C014440 */ lui $at, 0x4440 ## $at = 44400000 /* 0003C 80B28FDC 44816000 */ mtc1 $at, $f12 ## $f12 = 768.00 -/* 00040 80B28FE0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00040 80B28FE0 0C00CFC8 */ jal Rand_CenteredFloat /* 00044 80B28FE4 E600015C */ swc1 $f0, 0x015C($s0) ## 0000015C /* 00048 80B28FE8 E6000158 */ swc1 $f0, 0x0158($s0) ## 00000158 /* 0004C 80B28FEC C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 -/* 00050 80B28FF0 0C03F494 */ jal Math_atan2f +/* 00050 80B28FF0 0C03F494 */ jal Math_FAtan2F /* 00054 80B28FF4 C60E002C */ lwc1 $f14, 0x002C($s0) ## 0000002C /* 00058 80B28FF8 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 0005C 80B28FFC 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 -/* 00060 80B29000 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00060 80B29000 0C00CFBE */ jal Rand_ZeroFloat /* 00064 80B29004 E7A00028 */ swc1 $f0, 0x0028($sp) /* 00068 80B29008 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 @@ -104,12 +104,12 @@ glabel EnVbBall_Init /* 00130 80B290D0 46060202 */ mul.s $f8, $f0, $f6 /* 00134 80B290D4 4600428D */ trunc.w.s $f10, $f8 /* 00138 80B290D8 440B5000 */ mfc1 $t3, $f10 -/* 0013C 80B290DC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0013C 80B290DC 0C00CFC8 */ jal Rand_CenteredFloat /* 00140 80B290E0 A60B01AC */ sh $t3, 0x01AC($s0) ## 000001AC /* 00144 80B290E4 3C014600 */ lui $at, 0x4600 ## $at = 46000000 /* 00148 80B290E8 44816000 */ mtc1 $at, $f12 ## $f12 = 8192.00 -/* 0014C 80B290EC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0014C 80B290EC 0C00CFC8 */ jal Rand_CenteredFloat /* 00150 80B290F0 E6000158 */ swc1 $f0, 0x0158($s0) ## 00000158 /* 00154 80B290F4 3C014288 */ lui $at, 0x4288 ## $at = 42880000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s index ef04f8361b..384f0a6156 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s @@ -63,7 +63,7 @@ glabel EnVbBall_Update /* 006E0 80B29680 100001B4 */ beq $zero, $zero, .L80B29D54 /* 006E4 80B29684 8FBF0064 */ lw $ra, 0x0064($sp) .L80B29688: -/* 006E8 80B29688 0C01E107 */ jal Math_SmoothScaleMaxF +/* 006E8 80B29688 0C01E107 */ jal Math_ApproachF /* 006EC 80B2968C 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 /* 006F0 80B29690 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -142,11 +142,11 @@ glabel EnVbBall_Update /* 007FC 80B2979C 16AE0010 */ bne $s5, $t6, .L80B297E0 /* 00800 80B297A0 00000000 */ nop /* 00804 80B297A4 44816000 */ mtc1 $at, $f12 ## $f12 = 13.00 -/* 00808 80B297A8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00808 80B297A8 0C00CFC8 */ jal Rand_CenteredFloat /* 0080C 80B297AC 00000000 */ nop /* 00810 80B297B0 E7A000EC */ swc1 $f0, 0x00EC($sp) -/* 00814 80B297B4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00814 80B297B4 0C00CFBE */ jal Rand_ZeroFloat /* 00818 80B297B8 4600C306 */ mov.s $f12, $f24 /* 0081C 80B297BC 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 @@ -154,24 +154,24 @@ glabel EnVbBall_Update /* 00824 80B297C4 3C014150 */ lui $at, 0x4150 ## $at = 41500000 /* 00828 80B297C8 44816000 */ mtc1 $at, $f12 ## $f12 = 13.00 /* 0082C 80B297CC 460A0400 */ add.s $f16, $f0, $f10 -/* 00830 80B297D0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00830 80B297D0 0C00CFC8 */ jal Rand_CenteredFloat /* 00834 80B297D4 E7B000F0 */ swc1 $f16, 0x00F0($sp) /* 00838 80B297D8 1000000D */ beq $zero, $zero, .L80B29810 /* 0083C 80B297DC E7A000F4 */ swc1 $f0, 0x00F4($sp) .L80B297E0: -/* 00840 80B297E0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00840 80B297E0 0C00CFC8 */ jal Rand_CenteredFloat /* 00844 80B297E4 4600B306 */ mov.s $f12, $f22 /* 00848 80B297E8 E7A000EC */ swc1 $f0, 0x00EC($sp) -/* 0084C 80B297EC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0084C 80B297EC 0C00CFBE */ jal Rand_ZeroFloat /* 00850 80B297F0 4600A306 */ mov.s $f12, $f20 /* 00854 80B297F4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 00858 80B297F8 44819000 */ mtc1 $at, $f18 ## $f18 = 4.00 /* 0085C 80B297FC 4600B306 */ mov.s $f12, $f22 /* 00860 80B29800 46120100 */ add.s $f4, $f0, $f18 -/* 00864 80B29804 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00864 80B29804 0C00CFC8 */ jal Rand_CenteredFloat /* 00868 80B29808 E7A400F0 */ swc1 $f4, 0x00F0($sp) /* 0086C 80B2980C E7A000F4 */ swc1 $f0, 0x00F4($sp) @@ -251,7 +251,7 @@ glabel EnVbBall_Update /* 00980 80B29920 46004282 */ mul.s $f10, $f8, $f0 /* 00984 80B29924 E60A0158 */ swc1 $f10, 0x0158($s0) ## 00000158 /* 00988 80B29928 C7AE00F4 */ lwc1 $f14, 0x00F4($sp) -/* 0098C 80B2992C 0C03F494 */ jal Math_atan2f +/* 0098C 80B2992C 0C03F494 */ jal Math_FAtan2F /* 00990 80B29930 C7AC00EC */ lwc1 $f12, 0x00EC($sp) /* 00994 80B29934 3C0180B3 */ lui $at, %hi(D_80B2A100) ## $at = 80B30000 /* 00998 80B29938 C430A100 */ lwc1 $f16, %lo(D_80B2A100)($at) @@ -299,41 +299,41 @@ glabel EnVbBall_Update /* 00A38 80B299D8 AF090000 */ sw $t1, 0x0000($t8) ## FFFFFFBC /* 00A3C 80B299DC 8F290008 */ lw $t1, 0x0008($t9) ## 80B2A058 /* 00A40 80B299E0 AF0E0004 */ sw $t6, 0x0004($t8) ## FFFFFFC0 -/* 00A44 80B299E4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00A44 80B299E4 0C00CFC8 */ jal Rand_CenteredFloat /* 00A48 80B299E8 AF090008 */ sw $t1, 0x0008($t8) ## FFFFFFC4 /* 00A4C 80B299EC E7A000D8 */ swc1 $f0, 0x00D8($sp) -/* 00A50 80B299F0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00A50 80B299F0 0C00CFBE */ jal Rand_ZeroFloat /* 00A54 80B299F4 4600C306 */ mov.s $f12, $f24 /* 00A58 80B299F8 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 00A5C 80B299FC 44814000 */ mtc1 $at, $f8 ## $f8 = 8.00 /* 00A60 80B29A00 4600A306 */ mov.s $f12, $f20 /* 00A64 80B29A04 46080280 */ add.s $f10, $f0, $f8 -/* 00A68 80B29A08 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00A68 80B29A08 0C00CFC8 */ jal Rand_CenteredFloat /* 00A6C 80B29A0C E7AA00DC */ swc1 $f10, 0x00DC($sp) /* 00A70 80B29A10 E7A000E0 */ swc1 $f0, 0x00E0($sp) -/* 00A74 80B29A14 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00A74 80B29A14 0C00CFC8 */ jal Rand_CenteredFloat /* 00A78 80B29A18 4600B306 */ mov.s $f12, $f22 /* 00A7C 80B29A1C C6300024 */ lwc1 $f16, 0x0024($s1) ## 00000024 /* 00A80 80B29A20 4600B306 */ mov.s $f12, $f22 /* 00A84 80B29A24 46100100 */ add.s $f4, $f0, $f16 -/* 00A88 80B29A28 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00A88 80B29A28 0C00CFC8 */ jal Rand_CenteredFloat /* 00A8C 80B29A2C E7A400C0 */ swc1 $f4, 0x00C0($sp) /* 00A90 80B29A30 C6320028 */ lwc1 $f18, 0x0028($s1) ## 00000028 /* 00A94 80B29A34 4600B306 */ mov.s $f12, $f22 /* 00A98 80B29A38 46120180 */ add.s $f6, $f0, $f18 -/* 00A9C 80B29A3C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00A9C 80B29A3C 0C00CFC8 */ jal Rand_CenteredFloat /* 00AA0 80B29A40 E7A600C4 */ swc1 $f6, 0x00C4($sp) /* 00AA4 80B29A44 C628002C */ lwc1 $f8, 0x002C($s1) ## 0000002C /* 00AA8 80B29A48 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 00AAC 80B29A4C 44816000 */ mtc1 $at, $f12 ## $f12 = 12.00 /* 00AB0 80B29A50 46080280 */ add.s $f10, $f0, $f8 -/* 00AB4 80B29A54 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00AB4 80B29A54 0C00CFBE */ jal Rand_ZeroFloat /* 00AB8 80B29A58 E7AA00C8 */ swc1 $f10, 0x00C8($sp) /* 00ABC 80B29A5C 4600040D */ trunc.w.s $f16, $f0 @@ -384,41 +384,41 @@ glabel EnVbBall_Update /* 00B6C 80B29B0C AD280000 */ sw $t0, 0x0000($t1) ## FFFFFF98 /* 00B70 80B29B10 8D480008 */ lw $t0, 0x0008($t2) ## 80B2A070 /* 00B74 80B29B14 AD2B0004 */ sw $t3, 0x0004($t1) ## FFFFFF9C -/* 00B78 80B29B18 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00B78 80B29B18 0C00CFC8 */ jal Rand_CenteredFloat /* 00B7C 80B29B1C AD280008 */ sw $t0, 0x0008($t1) ## FFFFFFA0 /* 00B80 80B29B20 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00B84 80B29B24 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 00B88 80B29B28 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00B88 80B29B28 0C00CFBE */ jal Rand_ZeroFloat /* 00B8C 80B29B2C E7A000B4 */ swc1 $f0, 0x00B4($sp) /* 00B90 80B29B30 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 00B94 80B29B34 44816000 */ mtc1 $at, $f12 ## $f12 = 8.00 -/* 00B98 80B29B38 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00B98 80B29B38 0C00CFC8 */ jal Rand_CenteredFloat /* 00B9C 80B29B3C E7A000B8 */ swc1 $f0, 0x00B8($sp) /* 00BA0 80B29B40 E7A000BC */ swc1 $f0, 0x00BC($sp) /* 00BA4 80B29B44 E7B600AC */ swc1 $f22, 0x00AC($sp) -/* 00BA8 80B29B48 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00BA8 80B29B48 0C00CFC8 */ jal Rand_CenteredFloat /* 00BAC 80B29B4C 4600A306 */ mov.s $f12, $f20 /* 00BB0 80B29B50 C6260024 */ lwc1 $f6, 0x0024($s1) ## 00000024 /* 00BB4 80B29B54 4600A306 */ mov.s $f12, $f20 /* 00BB8 80B29B58 46060200 */ add.s $f8, $f0, $f6 -/* 00BBC 80B29B5C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00BBC 80B29B5C 0C00CFC8 */ jal Rand_CenteredFloat /* 00BC0 80B29B60 E7A8009C */ swc1 $f8, 0x009C($sp) /* 00BC4 80B29B64 C62A0028 */ lwc1 $f10, 0x0028($s1) ## 00000028 /* 00BC8 80B29B68 4600A306 */ mov.s $f12, $f20 /* 00BCC 80B29B6C 460A0400 */ add.s $f16, $f0, $f10 -/* 00BD0 80B29B70 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00BD0 80B29B70 0C00CFC8 */ jal Rand_CenteredFloat /* 00BD4 80B29B74 E7B000A0 */ swc1 $f16, 0x00A0($sp) /* 00BD8 80B29B78 C624002C */ lwc1 $f4, 0x002C($s1) ## 0000002C /* 00BDC 80B29B7C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00BE0 80B29B80 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 00BE4 80B29B84 46040480 */ add.s $f18, $f0, $f4 -/* 00BE8 80B29B88 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00BE8 80B29B88 0C00CFBE */ jal Rand_ZeroFloat /* 00BEC 80B29B8C E7B200A4 */ swc1 $f18, 0x00A4($sp) /* 00BF0 80B29B90 46180180 */ add.s $f6, $f0, $f24 @@ -466,39 +466,39 @@ glabel EnVbBall_Update /* 00C90 80B29C30 AF2A0000 */ sw $t2, 0x0000($t9) ## FFFFFF74 /* 00C94 80B29C34 8DCA0008 */ lw $t2, 0x0008($t6) ## 80B2A088 /* 00C98 80B29C38 AF290004 */ sw $t1, 0x0004($t9) ## FFFFFF78 -/* 00C9C 80B29C3C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00C9C 80B29C3C 0C00CFC8 */ jal Rand_CenteredFloat /* 00CA0 80B29C40 AF2A0008 */ sw $t2, 0x0008($t9) ## FFFFFF7C /* 00CA4 80B29C44 E7A00090 */ swc1 $f0, 0x0090($sp) -/* 00CA8 80B29C48 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00CA8 80B29C48 0C00CFBE */ jal Rand_ZeroFloat /* 00CAC 80B29C4C 4600A306 */ mov.s $f12, $f20 /* 00CB0 80B29C50 46140200 */ add.s $f8, $f0, $f20 /* 00CB4 80B29C54 4600B306 */ mov.s $f12, $f22 -/* 00CB8 80B29C58 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00CB8 80B29C58 0C00CFC8 */ jal Rand_CenteredFloat /* 00CBC 80B29C5C E7A80094 */ swc1 $f8, 0x0094($sp) /* 00CC0 80B29C60 E7A00098 */ swc1 $f0, 0x0098($sp) -/* 00CC4 80B29C64 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00CC4 80B29C64 0C00CFC8 */ jal Rand_CenteredFloat /* 00CC8 80B29C68 4600C306 */ mov.s $f12, $f24 /* 00CCC 80B29C6C C62A0024 */ lwc1 $f10, 0x0024($s1) ## 00000024 /* 00CD0 80B29C70 4600C306 */ mov.s $f12, $f24 /* 00CD4 80B29C74 460A0400 */ add.s $f16, $f0, $f10 -/* 00CD8 80B29C78 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00CD8 80B29C78 0C00CFC8 */ jal Rand_CenteredFloat /* 00CDC 80B29C7C E7B00078 */ swc1 $f16, 0x0078($sp) /* 00CE0 80B29C80 C6240028 */ lwc1 $f4, 0x0028($s1) ## 00000028 /* 00CE4 80B29C84 4600C306 */ mov.s $f12, $f24 /* 00CE8 80B29C88 46040480 */ add.s $f18, $f0, $f4 -/* 00CEC 80B29C8C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00CEC 80B29C8C 0C00CFC8 */ jal Rand_CenteredFloat /* 00CF0 80B29C90 E7B2007C */ swc1 $f18, 0x007C($sp) /* 00CF4 80B29C94 C626002C */ lwc1 $f6, 0x002C($s1) ## 0000002C /* 00CF8 80B29C98 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 00CFC 80B29C9C 44816000 */ mtc1 $at, $f12 ## $f12 = 12.00 /* 00D00 80B29CA0 46060200 */ add.s $f8, $f0, $f6 -/* 00D04 80B29CA4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00D04 80B29CA4 0C00CFBE */ jal Rand_ZeroFloat /* 00D08 80B29CA8 E7A80080 */ swc1 $f8, 0x0080($sp) /* 00D0C 80B29CAC 4600028D */ trunc.w.s $f10, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B29158.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B29158.s index a1a4c12c3b..8162168140 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B29158.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B29158.s @@ -37,13 +37,13 @@ glabel func_80B29158 /* 00240 80B291E0 C7A4002C */ lwc1 $f4, 0x002C($sp) /* 00244 80B291E4 46062203 */ div.s $f8, $f4, $f6 /* 00248 80B291E8 E4A80030 */ swc1 $f8, 0x0030($a1) ## 00000030 -/* 0024C 80B291EC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0024C 80B291EC 0C00CFBE */ jal Rand_ZeroFloat /* 00250 80B291F0 AFA5001C */ sw $a1, 0x001C($sp) /* 00254 80B291F4 8FA5001C */ lw $a1, 0x001C($sp) /* 00258 80B291F8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0025C 80B291FC 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 00260 80B29200 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00260 80B29200 0C00CFBE */ jal Rand_ZeroFloat /* 00264 80B29204 E4A00034 */ swc1 $f0, 0x0034($a1) ## 00000034 /* 00268 80B29208 8FA5001C */ lw $a1, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B292D0.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B292D0.s index 82af1bc528..2e6ccb1a10 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B292D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B292D0.s @@ -48,16 +48,16 @@ glabel func_80B292D0 /* 003D4 80B29374 45020075 */ bc1fl .L80B2954C /* 003D8 80B29378 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 003DC 80B2937C 4481A000 */ mtc1 $at, $f20 ## $f20 = 50.00 -/* 003E0 80B29380 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 003E0 80B29380 0C00CFC8 */ jal Rand_CenteredFloat /* 003E4 80B29384 4600A306 */ mov.s $f12, $f20 /* 003E8 80B29388 E6600158 */ swc1 $f0, 0x0158($s3) ## 00000158 -/* 003EC 80B2938C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 003EC 80B2938C 0C00CFC8 */ jal Rand_CenteredFloat /* 003F0 80B29390 4600A306 */ mov.s $f12, $f20 /* 003F4 80B29394 E660015C */ swc1 $f0, 0x015C($s3) ## 0000015C /* 003F8 80B29398 C66C0024 */ lwc1 $f12, 0x0024($s3) ## 00000024 -/* 003FC 80B2939C 0C03F494 */ jal Math_atan2f +/* 003FC 80B2939C 0C03F494 */ jal Math_FAtan2F /* 00400 80B293A0 C66E002C */ lwc1 $f14, 0x002C($s3) ## 0000002C /* 00404 80B293A4 46000506 */ mov.s $f20, $f0 /* 00408 80B293A8 0C0400A4 */ jal sinf @@ -128,20 +128,20 @@ glabel func_80B292D0 /* 004F8 80B29498 AE2A0004 */ sw $t2, 0x0004($s1) ## FFFFFFE4 /* 004FC 80B2949C AE2B0008 */ sw $t3, 0x0008($s1) ## FFFFFFE8 /* 00500 80B294A0 AE4D0008 */ sw $t5, 0x0008($s2) ## FFFFFFDC -/* 00504 80B294A4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00504 80B294A4 0C00CFC8 */ jal Rand_CenteredFloat /* 00508 80B294A8 AE4C0004 */ sw $t4, 0x0004($s2) ## FFFFFFD8 /* 0050C 80B294AC E7A00098 */ swc1 $f0, 0x0098($sp) -/* 00510 80B294B0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00510 80B294B0 0C00CFBE */ jal Rand_ZeroFloat /* 00514 80B294B4 4600C306 */ mov.s $f12, $f24 /* 00518 80B294B8 E7A0009C */ swc1 $f0, 0x009C($sp) -/* 0051C 80B294BC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0051C 80B294BC 0C00CFC8 */ jal Rand_CenteredFloat /* 00520 80B294C0 4600A306 */ mov.s $f12, $f20 /* 00524 80B294C4 E7A000A0 */ swc1 $f0, 0x00A0($sp) /* 00528 80B294C8 E7BA0090 */ swc1 $f26, 0x0090($sp) -/* 0052C 80B294CC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0052C 80B294CC 0C00CFC8 */ jal Rand_CenteredFloat /* 00530 80B294D0 4600B306 */ mov.s $f12, $f22 /* 00534 80B294D4 C6700024 */ lwc1 $f16, 0x0024($s3) ## 00000024 @@ -152,13 +152,13 @@ glabel func_80B292D0 /* 00548 80B294E8 E7B20080 */ swc1 $f18, 0x0080($sp) /* 0054C 80B294EC C6640080 */ lwc1 $f4, 0x0080($s3) ## 00000080 /* 00550 80B294F0 46062200 */ add.s $f8, $f4, $f6 -/* 00554 80B294F4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00554 80B294F4 0C00CFC8 */ jal Rand_CenteredFloat /* 00558 80B294F8 E7A80084 */ swc1 $f8, 0x0084($sp) /* 0055C 80B294FC C66A002C */ lwc1 $f10, 0x002C($s3) ## 0000002C /* 00560 80B29500 4600E306 */ mov.s $f12, $f28 /* 00564 80B29504 460A0400 */ add.s $f16, $f0, $f10 -/* 00568 80B29508 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00568 80B29508 0C00CFBE */ jal Rand_ZeroFloat /* 0056C 80B2950C E7B00088 */ swc1 $f16, 0x0088($sp) /* 00570 80B29510 461E0480 */ add.s $f18, $f0, $f30 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C398.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C398.s index ac6ef974b9..b86f592e4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C398.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C398.s @@ -197,7 +197,7 @@ glabel func_80B2C398 /* 0248C 80B2C68C 00052C03 */ sra $a1, $a1, 16 /* 02490 80B2C690 26240032 */ addiu $a0, $s1, 0x0032 ## $a0 = 00000032 /* 02494 80B2C694 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 02498 80B2C698 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 02498 80B2C698 0C01E1A7 */ jal Math_SmoothStepToS /* 0249C 80B2C69C 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 024A0 80B2C6A0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 @@ -205,7 +205,7 @@ glabel func_80B2C398 /* 024A8 80B2C6A8 262400B6 */ addiu $a0, $s1, 0x00B6 ## $a0 = 000000B6 /* 024AC 80B2C6AC 87A50030 */ lh $a1, 0x0030($sp) /* 024B0 80B2C6B0 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 024B4 80B2C6B4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 024B4 80B2C6B4 0C01E1A7 */ jal Math_SmoothStepToS /* 024B8 80B2C6B8 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 024BC 80B2C6BC 87A30032 */ lh $v1, 0x0032($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C768.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C768.s index 616bdb1d3b..5c76cc30b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C768.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C768.s @@ -36,7 +36,7 @@ glabel func_80B2C768 /* 025D0 80B2C7D0 E44201F8 */ swc1 $f2, 0x01F8($v0) ## 000001F8 /* 025D4 80B2C7D4 E44401F0 */ swc1 $f4, 0x01F0($v0) ## 000001F0 /* 025D8 80B2C7D8 E44601FC */ swc1 $f6, 0x01FC($v0) ## 000001FC -/* 025DC 80B2C7DC 0C03F66B */ jal Math_Rand_ZeroOne +/* 025DC 80B2C7DC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 025E0 80B2C7E0 AFA20018 */ sw $v0, 0x0018($sp) /* 025E4 80B2C7E4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -73,7 +73,7 @@ glabel func_80B2C768 /* 0265C 80B2C85C E44201F8 */ swc1 $f2, 0x01F8($v0) ## 000001F8 /* 02660 80B2C860 E44801F0 */ swc1 $f8, 0x01F0($v0) ## 000001F0 /* 02664 80B2C864 E44A01FC */ swc1 $f10, 0x01FC($v0) ## 000001FC -/* 02668 80B2C868 0C03F66B */ jal Math_Rand_ZeroOne +/* 02668 80B2C868 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0266C 80B2C86C AFA20018 */ sw $v0, 0x0018($sp) /* 02670 80B2C870 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s index b52bf0d578..fea6175bdb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s @@ -93,7 +93,7 @@ glabel func_80B2C8AC /* 027B8 80B2C9B8 4405A000 */ mfc1 $a1, $f20 /* 027BC 80B2C9BC 4406A000 */ mfc1 $a2, $f20 /* 027C0 80B2C9C0 44070000 */ mfc1 $a3, $f0 -/* 027C4 80B2C9C4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 027C4 80B2C9C4 0C01E0C4 */ jal Math_SmoothStepToF /* 027C8 80B2C9C8 E7A00010 */ swc1 $f0, 0x0010($sp) /* 027CC 80B2C9CC C60001E8 */ lwc1 $f0, 0x01E8($s0) ## 000001E8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2CC1C.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2CC1C.s index 4e286b05f3..b6f414411d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2CC1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2CC1C.s @@ -75,7 +75,7 @@ glabel func_80B2CC1C /* 02B24 80B2CD24 00000000 */ nop /* 02B28 80B2CD28 46805420 */ cvt.s.w $f16, $f10 /* 02B2C 80B2CD2C 46128101 */ sub.s $f4, $f16, $f18 -/* 02B30 80B2CD30 0C01DE1C */ jal Math_Sins +/* 02B30 80B2CD30 0C01DE1C */ jal Math_SinS ## sins? /* 02B34 80B2CD34 E7A40034 */ swc1 $f4, 0x0034($sp) /* 02B38 80B2CD38 8E220000 */ lw $v0, 0x0000($s1) ## 8015FA90 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B328E8.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B328E8.s index 58515fa733..daf4616c28 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B328E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B328E8.s @@ -19,7 +19,7 @@ glabel func_80B328E8 /* 00674 80B32904 AFA40020 */ sw $a0, 0x0020($sp) /* 00678 80B32908 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0067C 80B3290C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00680 80B32910 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00680 80B32910 0C01DE2B */ jal Math_ScaledStepToS /* 00684 80B32914 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 00688 80B32918 8FA40020 */ lw $a0, 0x0020($sp) @@ -30,7 +30,7 @@ glabel func_80B328E8 /* 0069C 80B3292C 2604027C */ addiu $a0, $s0, 0x027C ## $a0 = 0000027C /* 006A0 80B32930 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 006A4 80B32934 E7A40030 */ swc1 $f4, 0x0030($sp) -/* 006A8 80B32938 0C01DE80 */ jal Math_ApproxF +/* 006A8 80B32938 0C01DE80 */ jal Math_StepToF /* 006AC 80B3293C 8E050280 */ lw $a1, 0x0280($s0) ## 00000280 /* 006B0 80B32940 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -63,13 +63,13 @@ glabel func_80B328E8 /* 00718 80B329A8 3C063CF5 */ lui $a2, 0x3CF5 ## $a2 = 3CF50000 /* 0071C 80B329AC 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 3CF5C28F /* 00720 80B329B0 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00724 80B329B4 0C01DE80 */ jal Math_ApproxF +/* 00724 80B329B4 0C01DE80 */ jal Math_StepToF /* 00728 80B329B8 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 0072C 80B329BC 10000004 */ beq $zero, $zero, .L80B329D0 /* 00730 80B329C0 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 .L80B329C4: -/* 00734 80B329C4 0C01DE80 */ jal Math_ApproxF +/* 00734 80B329C4 0C01DE80 */ jal Math_StepToF /* 00738 80B329C8 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 0000C28F /* 0073C 80B329CC 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 @@ -84,7 +84,7 @@ glabel func_80B328E8 /* 0075C 80B329EC A6190194 */ sh $t9, 0x0194($s0) ## 00000194 /* 00760 80B329F0 A6180196 */ sh $t8, 0x0196($s0) ## 00000196 .L80B329F4: -/* 00764 80B329F4 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00764 80B329F4 0C01DE2B */ jal Math_ScaledStepToS /* 00768 80B329F8 86050196 */ lh $a1, 0x0196($s0) ## 00000196 /* 0076C 80B329FC 50400029 */ beql $v0, $zero, .L80B32AA4 @@ -98,10 +98,10 @@ glabel func_80B328E8 .L80B32A1C: /* 0078C 80B32A1C 54400021 */ bnel $v0, $zero, .L80B32AA4 /* 00790 80B32A20 C602000C */ lwc1 $f2, 0x000C($s0) ## 0000000C -/* 00794 80B32A24 0C01DF64 */ jal Math_Rand_S16Offset +/* 00794 80B32A24 0C01DF64 */ jal Rand_S16Offset /* 00798 80B32A28 24052000 */ addiu $a1, $zero, 0x2000 ## $a1 = 00002000 -/* 0079C 80B32A2C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0079C 80B32A2C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 007A0 80B32A30 A7A20026 */ sh $v0, 0x0026($sp) /* 007A4 80B32A34 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -121,7 +121,7 @@ glabel func_80B328E8 /* 007D8 80B32A68 A60D0194 */ sh $t5, 0x0194($s0) ## 00000194 /* 007DC 80B32A6C 00005012 */ mflo $t2 /* 007E0 80B32A70 014B6021 */ addu $t4, $t2, $t3 -/* 007E4 80B32A74 0C03F66B */ jal Math_Rand_ZeroOne +/* 007E4 80B32A74 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 007E8 80B32A78 A60C0196 */ sh $t4, 0x0196($s0) ## 00000196 /* 007EC 80B32A7C 3C0180B3 */ lui $at, %hi(D_80B33B20) ## $at = 80B30000 @@ -152,7 +152,7 @@ glabel func_80B328E8 /* 00848 80B32AD8 10000050 */ beq $zero, $zero, .L80B32C1C /* 0084C 80B32ADC 8FBF001C */ lw $ra, 0x001C($sp) .L80B32AE0: -/* 00850 80B32AE0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00850 80B32AE0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00854 80B32AE4 E6020028 */ swc1 $f2, 0x0028($s0) ## 00000028 /* 00858 80B32AE8 C6020080 */ lwc1 $f2, 0x0080($s0) ## 00000080 @@ -174,7 +174,7 @@ glabel func_80B328E8 /* 00894 80B32B24 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 /* 00898 80B32B28 1320000E */ beq $t9, $zero, .L80B32B64 /* 0089C 80B32B2C 00000000 */ nop -/* 008A0 80B32B30 0C03F66B */ jal Math_Rand_ZeroOne +/* 008A0 80B32B30 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 008A4 80B32B34 00000000 */ nop /* 008A8 80B32B38 C602000C */ lwc1 $f2, 0x000C($s0) ## 0000000C @@ -191,7 +191,7 @@ glabel func_80B328E8 .L80B32B64: /* 008D4 80B32B64 51000012 */ beql $t0, $zero, .L80B32BB0 /* 008D8 80B32B68 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 008DC 80B32B6C 0C03F66B */ jal Math_Rand_ZeroOne +/* 008DC 80B32B6C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 008E0 80B32B70 00000000 */ nop /* 008E4 80B32B74 3C0180B3 */ lui $at, %hi(D_80B33B24) ## $at = 80B30000 @@ -200,7 +200,7 @@ glabel func_80B328E8 /* 008F0 80B32B80 00000000 */ nop /* 008F4 80B32B84 4502000A */ bc1fl .L80B32BB0 /* 008F8 80B32B88 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 008FC 80B32B8C 0C03F66B */ jal Math_Rand_ZeroOne +/* 008FC 80B32B8C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00900 80B32B90 00000000 */ nop /* 00904 80B32B94 C6020080 */ lwc1 $f2, 0x0080($s0) ## 00000080 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32C2C.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32C2C.s index 9675cb717f..6b7426047d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32C2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32C2C.s @@ -13,7 +13,7 @@ glabel func_80B32C2C /* 009C4 80B32C54 15C00011 */ bne $t6, $zero, .L80B32C9C /* 009C8 80B32C58 24051800 */ addiu $a1, $zero, 0x1800 ## $a1 = 00001800 /* 009CC 80B32C5C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 009D0 80B32C60 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 009D0 80B32C60 0C01DE2B */ jal Math_ScaledStepToS /* 009D4 80B32C64 2405C000 */ addiu $a1, $zero, 0xC000 ## $a1 = FFFFC000 /* 009D8 80B32C68 10400008 */ beq $v0, $zero, .L80B32C8C @@ -31,7 +31,7 @@ glabel func_80B32C2C /* 00A04 80B32C94 10000021 */ beq $zero, $zero, .L80B32D1C /* 00A08 80B32C98 A60900B8 */ sh $t1, 0x00B8($s0) ## 000000B8 .L80B32C9C: -/* 00A0C 80B32C9C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00A0C 80B32C9C 0C01DE2B */ jal Math_ScaledStepToS /* 00A10 80B32CA0 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 00A14 80B32CA4 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32D30.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32D30.s index 78a22799b0..9e604afc31 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32D30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32D30.s @@ -19,12 +19,12 @@ glabel func_80B32D30 .L80B32D6C: /* 00ADC 80B32D6C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00AE0 80B32D70 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00AE4 80B32D74 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00AE4 80B32D74 0C01DE2B */ jal Math_ScaledStepToS /* 00AE8 80B32D78 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 00AEC 80B32D7C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 00AF0 80B32D80 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00AF4 80B32D84 0C01DE80 */ jal Math_ApproxF +/* 00AF4 80B32D84 0C01DE80 */ jal Math_StepToF /* 00AF8 80B32D88 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00AFC 80B32D8C 86030194 */ lh $v1, 0x0194($s0) ## 00000194 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32E34.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32E34.s index b005c9851b..620cf5f736 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32E34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32E34.s @@ -45,7 +45,7 @@ glabel func_80B32E34 /* 00C40 80B32ED0 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 00C44 80B32ED4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 00C48 80B32ED8 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00C4C 80B32EDC 0C01DE80 */ jal Math_ApproxF +/* 00C4C 80B32EDC 0C01DE80 */ jal Math_StepToF /* 00C50 80B32EE0 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 /* 00C54 80B32EE4 10000007 */ beq $zero, $zero, .L80B32F04 @@ -54,7 +54,7 @@ glabel func_80B32E34 /* 00C5C 80B32EEC 3C053FA6 */ lui $a1, 0x3FA6 ## $a1 = 3FA60000 /* 00C60 80B32EF0 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 00C64 80B32EF4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 00C68 80B32EF8 0C01DE80 */ jal Math_ApproxF +/* 00C68 80B32EF8 0C01DE80 */ jal Math_StepToF /* 00C6C 80B32EFC 34A56666 */ ori $a1, $a1, 0x6666 ## $a1 = 3FA66666 /* 00C70 80B32F00 C600000C */ lwc1 $f0, 0x000C($s0) ## 0000000C @@ -81,7 +81,7 @@ glabel func_80B32E34 /* 00CC0 80B32F50 8FBF0024 */ lw $ra, 0x0024($sp) /* 00CC4 80B32F54 E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 .L80B32F58: -/* 00CC8 80B32F58 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00CC8 80B32F58 0C01E1A7 */ jal Math_SmoothStepToS /* 00CCC 80B32F5C AFAA0010 */ sw $t2, 0x0010($sp) /* 00CD0 80B32F60 1000000C */ beq $zero, $zero, .L80B32F94 @@ -95,7 +95,7 @@ glabel func_80B32E34 /* 00CEC 80B32F7C 00052C03 */ sra $a1, $a1, 16 /* 00CF0 80B32F80 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00CF4 80B32F84 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00CF8 80B32F88 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00CF8 80B32F88 0C01E1A7 */ jal Math_SmoothStepToS /* 00CFC 80B32F8C 24070100 */ addiu $a3, $zero, 0x0100 ## $a3 = 00000100 /* 00D00 80B32F90 8605008A */ lh $a1, 0x008A($s0) ## 0000008A @@ -104,7 +104,7 @@ glabel func_80B32E34 /* 00D08 80B32F98 AFAC0010 */ sw $t4, 0x0010($sp) /* 00D0C 80B32F9C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 00D10 80B32FA0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00D14 80B32FA4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00D14 80B32FA4 0C01E1A7 */ jal Math_SmoothStepToS /* 00D18 80B32FA8 24070200 */ addiu $a3, $zero, 0x0200 ## $a3 = 00000200 /* 00D1C 80B32FAC 8FAD002C */ lw $t5, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B33018.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B33018.s index ca777847d3..a2fda89cb6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B33018.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B33018.s @@ -14,7 +14,7 @@ glabel func_80B33018 /* 00DA0 80B33030 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00DA4 80B33034 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00DA8 80B33038 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00DAC 80B3303C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00DAC 80B3303C 0C01DE2B */ jal Math_ScaledStepToS /* 00DB0 80B33040 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 00DB4 80B33044 C6040164 */ lwc1 $f4, 0x0164($s0) ## 00000164 @@ -29,7 +29,7 @@ glabel func_80B33018 /* 00DD8 80B33068 460A4402 */ mul.s $f16, $f8, $f10 /* 00DDC 80B3306C 46008480 */ add.s $f18, $f16, $f0 /* 00DE0 80B33070 44059000 */ mfc1 $a1, $f18 -/* 00DE4 80B33074 0C01DE80 */ jal Math_ApproxF +/* 00DE4 80B33074 0C01DE80 */ jal Math_StepToF /* 00DE8 80B33078 00000000 */ nop /* 00DEC 80B3307C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -62,13 +62,13 @@ glabel func_80B33018 /* 00E54 80B330E4 3C063CF5 */ lui $a2, 0x3CF5 ## $a2 = 3CF50000 /* 00E58 80B330E8 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 3CF5C28F /* 00E5C 80B330EC 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00E60 80B330F0 0C01DE80 */ jal Math_ApproxF +/* 00E60 80B330F0 0C01DE80 */ jal Math_StepToF /* 00E64 80B330F4 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 00E68 80B330F8 10000004 */ beq $zero, $zero, .L80B3310C /* 00E6C 80B330FC 86020194 */ lh $v0, 0x0194($s0) ## 00000194 .L80B33100: -/* 00E70 80B33100 0C01DE80 */ jal Math_ApproxF +/* 00E70 80B33100 0C01DE80 */ jal Math_StepToF /* 00E74 80B33104 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 0000C28F /* 00E78 80B33108 86020194 */ lh $v0, 0x0194($s0) ## 00000194 @@ -89,7 +89,7 @@ glabel func_80B33018 /* 00EAC 80B3313C A6190196 */ sh $t9, 0x0196($s0) ## 00000196 /* 00EB0 80B33140 86050196 */ lh $a1, 0x0196($s0) ## 00000196 .L80B33144: -/* 00EB4 80B33144 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00EB4 80B33144 0C01E1A7 */ jal Math_SmoothStepToS /* 00EB8 80B33148 AFA80010 */ sw $t0, 0x0010($sp) /* 00EBC 80B3314C 54400006 */ bnel $v0, $zero, .L80B33168 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B331CC.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B331CC.s index b1c20a397c..6bd78fbfd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B331CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B331CC.s @@ -32,12 +32,12 @@ glabel func_80B331CC /* 00F94 80B33224 01014821 */ addu $t1, $t0, $at /* 00F98 80B33228 A6090196 */ sh $t1, 0x0196($s0) ## 00000196 .L80B3322C: -/* 00F9C 80B3322C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00F9C 80B3322C 0C01DE2B */ jal Math_ScaledStepToS /* 00FA0 80B33230 86050196 */ lh $a1, 0x0196($s0) ## 00000196 /* 00FA4 80B33234 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00FA8 80B33238 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00FAC 80B3323C 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00FAC 80B3323C 0C01DE2B */ jal Math_ScaledStepToS /* 00FB0 80B33240 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 /* 00FB4 80B33244 860A0194 */ lh $t2, 0x0194($s0) ## 00000194 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B332B4.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B332B4.s index fc3671b89d..1082faa701 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B332B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B332B4.s @@ -10,7 +10,7 @@ glabel func_80B332B4 /* 01040 80B332D0 8FA70018 */ lw $a3, 0x0018($sp) /* 01044 80B332D4 2405C000 */ addiu $a1, $zero, 0xC000 ## $a1 = FFFFC000 /* 01048 80B332D8 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 -/* 0104C 80B332DC 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 0104C 80B332DC 0C01DE2B */ jal Math_ScaledStepToS /* 01050 80B332E0 24E400B4 */ addiu $a0, $a3, 0x00B4 ## $a0 = 000000B4 /* 01054 80B332E4 8FA70018 */ lw $a3, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B333B8.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B333B8.s index c856502901..056b9d0267 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B333B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B333B8.s @@ -11,12 +11,12 @@ glabel func_80B333B8 /* 0114C 80B333DC 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF /* 01150 80B333E0 A48E0194 */ sh $t6, 0x0194($a0) ## 00000194 .L80B333E4: -/* 01154 80B333E4 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01154 80B333E4 0C01DE2B */ jal Math_ScaledStepToS /* 01158 80B333E8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0115C 80B333EC 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 /* 01160 80B333F0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01164 80B333F4 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01164 80B333F4 0C01DE2B */ jal Math_ScaledStepToS /* 01168 80B333F8 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 /* 0116C 80B333FC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B3349C.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B3349C.s index 57e069d988..720ec976a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B3349C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B3349C.s @@ -93,7 +93,7 @@ glabel func_80B3349C /* 0134C 80B335DC 01E5082A */ slt $at, $t7, $a1 /* 01350 80B335E0 50200004 */ beql $at, $zero, .L80B335F4 /* 01354 80B335E4 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -/* 01358 80B335E8 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 01358 80B335E8 0C01DE2B */ jal Math_ScaledStepToS /* 0135C 80B335EC 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 /* 01360 80B335F0 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 @@ -132,7 +132,7 @@ glabel func_80B3349C /* 013D4 80B33664 240B0080 */ addiu $t3, $zero, 0x0080 ## $t3 = 00000080 /* 013D8 80B33668 AFAB0010 */ sw $t3, 0x0010($sp) /* 013DC 80B3366C 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 013E0 80B33670 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 013E0 80B33670 0C01E1A7 */ jal Math_SmoothStepToS /* 013E4 80B33674 24070100 */ addiu $a3, $zero, 0x0100 ## $a3 = 00000100 .L80B33678: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Update.s index d984c899c9..ee5e2330d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Update.s @@ -51,14 +51,14 @@ glabel EnWf_Update /* 03600 80B372B0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 .L80B372B4: /* 03604 80B372B4 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 03608 80B372B8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 03608 80B372B8 0C01E1A7 */ jal Math_SmoothStepToS /* 0360C 80B372BC AFA00010 */ sw $zero, 0x0010($sp) /* 03610 80B372C0 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 /* 03614 80B372C4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03618 80B372C8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0361C 80B372CC 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 03620 80B372D0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 03620 80B372D0 0C01E1A7 */ jal Math_SmoothStepToS /* 03624 80B372D4 AFA00010 */ sw $zero, 0x0010($sp) /* 03628 80B372D8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -141,7 +141,7 @@ glabel EnWf_Update /* 0372C 80B373DC E60A003C */ swc1 $f10, 0x003C($s0) ## 0000003C /* 03730 80B373E0 14400016 */ bne $v0, $zero, .L80B3743C /* 03734 80B373E4 AE190040 */ sw $t9, 0x0040($s0) ## 00000040 -/* 03738 80B373E8 0C03F66B */ jal Math_Rand_ZeroOne +/* 03738 80B373E8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0373C 80B373EC 00000000 */ nop /* 03740 80B373F0 3C0180B3 */ lui $at, %hi(D_80B37BD0) ## $at = 80B30000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34428.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34428.s index 1336ded383..8fc69184a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34428.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34428.s @@ -56,7 +56,7 @@ glabel func_80B34428 /* 00838 80B344E8 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 0083C 80B344EC E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 /* 00840 80B344F0 E60A0054 */ swc1 $f10, 0x0054($s0) ## 00000054 -/* 00844 80B344F4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00844 80B344F4 0C01E0C4 */ jal Math_SmoothStepToF /* 00848 80B344F8 E7A80010 */ swc1 $f8, 0x0010($sp) /* 0084C 80B344FC 8E0902E8 */ lw $t1, 0x02E8($s0) ## 000002E8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s index 3319e286ef..e4b6818d48 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s @@ -10,7 +10,7 @@ glabel func_80B3455C /* 008CC 80B3457C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 008D0 80B34580 8FA70018 */ lw $a3, 0x0018($sp) /* 008D4 80B34584 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 008D8 80B34588 0C03F66B */ jal Math_Rand_ZeroOne +/* 008D8 80B34588 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 008DC 80B3458C ACEE02D4 */ sw $t6, 0x02D4($a3) ## 000002D4 /* 008E0 80B34590 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B345E4.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B345E4.s index 14ac432b25..a57f1868f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B345E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B345E4.s @@ -113,7 +113,7 @@ glabel func_80B345E4 /* 00AB8 80B34768 24051555 */ addiu $a1, $zero, 0x1555 ## $a1 = 00001555 /* 00ABC 80B3476C 10400012 */ beq $v0, $zero, .L80B347B8 /* 00AC0 80B34770 00000000 */ nop -/* 00AC4 80B34774 0C03F66B */ jal Math_Rand_ZeroOne +/* 00AC4 80B34774 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00AC8 80B34778 00000000 */ nop /* 00ACC 80B3477C 3C0180B3 */ lui $at, %hi(D_80B37B78) ## $at = 80B30000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3487C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3487C.s index 903e05c285..6dbb6ec29f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3487C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3487C.s @@ -27,7 +27,7 @@ glabel func_80B3487C /* 00C08 80B348B8 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 00C0C 80B348BC AFA00010 */ sw $zero, 0x0010($sp) /* 00C10 80B348C0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00C14 80B348C4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 00C14 80B348C4 0C01E1A7 */ jal Math_SmoothStepToS /* 00C18 80B348C8 240702EE */ addiu $a3, $zero, 0x02EE ## $a3 = 000002EE /* 00C1C 80B348CC 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 @@ -56,7 +56,7 @@ glabel func_80B3487C /* 00C74 80B34924 C7A40050 */ lwc1 $f4, 0x0050($sp) /* 00C78 80B34928 45020006 */ bc1fl .L80B34944 /* 00C7C 80B3492C 44819000 */ mtc1 $at, $f18 ## $f18 = 65.00 -/* 00C80 80B34930 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00C80 80B34930 0C01E0C4 */ jal Math_SmoothStepToF /* 00C84 80B34934 E7A20010 */ swc1 $f2, 0x0010($sp) /* 00C88 80B34938 10000016 */ beq $zero, $zero, .L80B34994 @@ -76,14 +76,14 @@ glabel func_80B3487C /* 00CBC 80B3496C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 00CC0 80B34970 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00CC4 80B34974 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 00CC8 80B34978 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00CC8 80B34978 0C01E0C4 */ jal Math_SmoothStepToF /* 00CCC 80B3497C E7A20010 */ swc1 $f2, 0x0010($sp) /* 00CD0 80B34980 10000004 */ beq $zero, $zero, .L80B34994 /* 00CD4 80B34984 00000000 */ nop /* 00CD8 80B34988 44051000 */ mfc1 $a1, $f2 .L80B3498C: -/* 00CDC 80B3498C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00CDC 80B3498C 0C01E0C4 */ jal Math_SmoothStepToF /* 00CE0 80B34990 E7A20010 */ swc1 $f2, 0x0010($sp) .L80B34994: @@ -122,7 +122,7 @@ glabel func_80B3487C /* 00D60 80B34A10 C61001A0 */ lwc1 $f16, 0x01A0($s0) ## 000001A0 /* 00D64 80B34A14 8602008A */ lh $v0, 0x008A($s0) ## 0000008A /* 00D68 80B34A18 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 00D6C 80B34A1C 0C03F66B */ jal Math_Rand_ZeroOne +/* 00D6C 80B34A1C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00D70 80B34A20 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 /* 00D74 80B34A24 3C0180B3 */ lui $at, %hi(D_80B37B80) ## $at = 80B30000 @@ -174,7 +174,7 @@ glabel func_80B3487C /* 00E14 80B34AC4 240511C7 */ addiu $a1, $zero, 0x11C7 ## $a1 = 000011C7 /* 00E18 80B34AC8 14400012 */ bne $v0, $zero, .L80B34B14 /* 00E1C 80B34ACC 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 -/* 00E20 80B34AD0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00E20 80B34AD0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00E24 80B34AD4 00000000 */ nop /* 00E28 80B34AD8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -214,7 +214,7 @@ glabel func_80B3487C /* 00EA8 80B34B58 A7A30042 */ sh $v1, 0x0042($sp) /* 00EAC 80B34B5C 1440001C */ bne $v0, $zero, .L80B34BD0 /* 00EB0 80B34B60 87A30042 */ lh $v1, 0x0042($sp) -/* 00EB4 80B34B64 0C03F66B */ jal Math_Rand_ZeroOne +/* 00EB4 80B34B64 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00EB8 80B34B68 A7A30042 */ sh $v1, 0x0042($sp) /* 00EBC 80B34B6C 3C0180B3 */ lui $at, %hi(D_80B37B84) ## $at = 80B30000 @@ -251,7 +251,7 @@ glabel func_80B3487C /* 00F28 80B34BD8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00F2C 80B34BDC 1040000E */ beq $v0, $zero, .L80B34C18 /* 00F30 80B34BE0 00000000 */ nop -/* 00F34 80B34BE4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00F34 80B34BE4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00F38 80B34BE8 00000000 */ nop /* 00F3C 80B34BEC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34D48.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34D48.s index b7d29ca445..40a87c3ce2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34D48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34D48.s @@ -100,7 +100,7 @@ glabel func_80B34D48 /* 011F4 80B34EA4 24051555 */ addiu $a1, $zero, 0x1555 ## $a1 = 00001555 /* 011F8 80B34EA8 50400011 */ beql $v0, $zero, .L80B34EF0 /* 011FC 80B34EAC 8FA90024 */ lw $t1, 0x0024($sp) -/* 01200 80B34EB0 0C03F66B */ jal Math_Rand_ZeroOne +/* 01200 80B34EB0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01204 80B34EB4 00000000 */ nop /* 01208 80B34EB8 3C0180B3 */ lui $at, %hi(D_80B37B88) ## $at = 80B30000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34F28.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34F28.s index 688ebf7abd..0bf2b3a255 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34F28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34F28.s @@ -27,7 +27,7 @@ glabel func_80B34F28 /* 012C4 80B34F74 0C029468 */ jal SkelAnime_ChangeAnim /* 012C8 80B34F78 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 012CC 80B34F7C 0C03F66B */ jal Math_Rand_ZeroOne +/* 012CC 80B34F7C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 012D0 80B34F80 00000000 */ nop /* 012D4 80B34F84 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -49,7 +49,7 @@ glabel func_80B34F28 /* 01310 80B34FC0 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 /* 01314 80B34FC4 46100482 */ mul.s $f18, $f0, $f16 /* 01318 80B34FC8 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -/* 0131C 80B34FCC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0131C 80B34FCC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01320 80B34FD0 E61201A4 */ swc1 $f18, 0x01A4($s0) ## 000001A4 /* 01324 80B34FD4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35024.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35024.s index 3b69b16aeb..8150122016 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35024.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35024.s @@ -26,7 +26,7 @@ glabel func_80B35024 /* 013B0 80B35060 00052C00 */ sll $a1, $a1, 16 /* 013B4 80B35064 00052C03 */ sra $a1, $a1, 16 /* 013B8 80B35068 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 013BC 80B3506C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 013BC 80B3506C 0C01E1A7 */ jal Math_SmoothStepToS /* 013C0 80B35070 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 013C4 80B35074 8FA4005C */ lw $a0, 0x005C($sp) @@ -107,7 +107,7 @@ glabel func_80B35024 /* 014DC 80B3518C 3C05C080 */ lui $a1, 0xC080 ## $a1 = C0800000 /* 014E0 80B35190 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 014E4 80B35194 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 014E8 80B35198 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 014E8 80B35198 0C01E0C4 */ jal Math_SmoothStepToF /* 014EC 80B3519C E7AA0010 */ swc1 $f10, 0x0010($sp) /* 014F0 80B351A0 1000001A */ beq $zero, $zero, .L80B3520C @@ -129,7 +129,7 @@ glabel func_80B35024 /* 0152C 80B351DC 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 /* 01530 80B351E0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01534 80B351E4 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 01538 80B351E8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01538 80B351E8 0C01E0C4 */ jal Math_SmoothStepToF /* 0153C 80B351EC E7A60010 */ swc1 $f6, 0x0010($sp) /* 01540 80B351F0 10000006 */ beq $zero, $zero, .L80B3520C @@ -137,7 +137,7 @@ glabel func_80B35024 /* 01548 80B351F8 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 .L80B351FC: /* 0154C 80B351FC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 0000CCCD -/* 01550 80B35200 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01550 80B35200 0C01E0C4 */ jal Math_SmoothStepToF /* 01554 80B35204 E7A80010 */ swc1 $f8, 0x0010($sp) /* 01558 80B35208 C60C02EC */ lwc1 $f12, 0x02EC($s0) ## 000002EC @@ -148,7 +148,7 @@ glabel func_80B35024 /* 01568 80B35218 00000000 */ nop /* 0156C 80B3521C 45030010 */ bc1tl .L80B35260 /* 01570 80B35220 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 01574 80B35224 0C01DE1C */ jal Math_Sins +/* 01574 80B35224 0C01DE1C */ jal Math_SinS ## sins? /* 01578 80B35228 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 0157C 80B3522C C60402EC */ lwc1 $f4, 0x02EC($s0) ## 000002EC @@ -156,7 +156,7 @@ glabel func_80B35024 /* 01584 80B35234 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 01588 80B35238 46040182 */ mul.s $f6, $f0, $f4 /* 0158C 80B3523C 46069200 */ add.s $f8, $f18, $f6 -/* 01590 80B35240 0C01DE0D */ jal Math_Coss +/* 01590 80B35240 0C01DE0D */ jal Math_CosS ## coss? /* 01594 80B35244 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 /* 01598 80B35248 C60C02EC */ lwc1 $f12, 0x02EC($s0) ## 000002EC @@ -300,7 +300,7 @@ glabel func_80B35024 /* 01784 80B35434 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 /* 01788 80B35438 01CF2023 */ subu $a0, $t6, $t7 /* 0178C 80B3543C 00042400 */ sll $a0, $a0, 16 -/* 01790 80B35440 0C01DE0D */ jal Math_Coss +/* 01790 80B35440 0C01DE0D */ jal Math_CosS ## coss? /* 01794 80B35444 00042403 */ sra $a0, $a0, 16 /* 01798 80B35448 3C0180B3 */ lui $at, %hi(D_80B37B98) ## $at = 80B30000 @@ -335,7 +335,7 @@ glabel func_80B35024 /* 01804 80B354B4 8FA4005C */ lw $a0, 0x005C($sp) /* 01808 80B354B8 1040000E */ beq $v0, $zero, .L80B354F4 /* 0180C 80B354BC 00000000 */ nop -/* 01810 80B354C0 0C03F66B */ jal Math_Rand_ZeroOne +/* 01810 80B354C0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01814 80B354C4 00000000 */ nop /* 01818 80B354C8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -352,7 +352,7 @@ glabel func_80B35024 .L80B354F4: /* 01844 80B354F4 0C2CD157 */ jal func_80B3455C /* 01848 80B354F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0184C 80B354FC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0184C 80B354FC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01850 80B35500 00000000 */ nop /* 01854 80B35504 3C014040 */ lui $at, 0x4040 ## $at = 40400000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B355BC.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B355BC.s index 15ca3cb832..c58174b8af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B355BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B355BC.s @@ -152,7 +152,7 @@ glabel func_80B355BC /* 01B00 80B357B0 00000000 */ nop /* 01B04 80B357B4 0C2CD157 */ jal func_80B3455C /* 01B08 80B357B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B0C 80B357BC 0C03F66B */ jal Math_Rand_ZeroOne +/* 01B0C 80B357BC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01B10 80B357C0 00000000 */ nop /* 01B14 80B357C4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -171,7 +171,7 @@ glabel func_80B355BC /* 01B48 80B357F8 1000003F */ beq $zero, $zero, .L80B358F8 /* 01B4C 80B357FC A60E02E2 */ sh $t6, 0x02E2($s0) ## 000002E2 .L80B35800: -/* 01B50 80B35800 0C03F66B */ jal Math_Rand_ZeroOne +/* 01B50 80B35800 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01B54 80B35804 00000000 */ nop /* 01B58 80B35808 3C0180B3 */ lui $at, %hi(D_80B37BA4) ## $at = 80B30000 @@ -191,7 +191,7 @@ glabel func_80B355BC .L80B35840: /* 01B90 80B35840 0C2CD157 */ jal func_80B3455C /* 01B94 80B35844 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B98 80B35848 0C03F66B */ jal Math_Rand_ZeroOne +/* 01B98 80B35848 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01B9C 80B3584C 00000000 */ nop /* 01BA0 80B35850 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -205,7 +205,7 @@ glabel func_80B355BC /* 01BC0 80B35870 AE1802E8 */ sw $t8, 0x02E8($s0) ## 000002E8 /* 01BC4 80B35874 8619008A */ lh $t9, 0x008A($s0) ## 0000008A .L80B35878: -/* 01BC8 80B35878 0C03F66B */ jal Math_Rand_ZeroOne +/* 01BC8 80B35878 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01BCC 80B3587C A6190032 */ sh $t9, 0x0032($s0) ## 00000032 /* 01BD0 80B35880 3C0180B3 */ lui $at, %hi(D_80B37BA8) ## $at = 80B30000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B359A8.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B359A8.s index 2d797ed190..c7f39ade8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B359A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B359A8.s @@ -47,7 +47,7 @@ glabel func_80B359A8 /* 01D80 80B35A30 87A60022 */ lh $a2, 0x0022($sp) /* 01D84 80B35A34 0C2CD157 */ jal func_80B3455C /* 01D88 80B35A38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D8C 80B35A3C 0C03F66B */ jal Math_Rand_ZeroOne +/* 01D8C 80B35A3C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01D90 80B35A40 00000000 */ nop /* 01D94 80B35A44 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -66,7 +66,7 @@ glabel func_80B359A8 /* 01DC8 80B35A78 10000041 */ beq $zero, $zero, .L80B35B80 /* 01DCC 80B35A7C A60A02E2 */ sh $t2, 0x02E2($s0) ## 000002E2 .L80B35A80: -/* 01DD0 80B35A80 0C03F66B */ jal Math_Rand_ZeroOne +/* 01DD0 80B35A80 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01DD4 80B35A84 A7A60022 */ sh $a2, 0x0022($sp) /* 01DD8 80B35A88 3C0180B3 */ lui $at, %hi(D_80B37BAC) ## $at = 80B30000 @@ -87,7 +87,7 @@ glabel func_80B359A8 .L80B35AC4: /* 01E14 80B35AC4 0C2CD157 */ jal func_80B3455C /* 01E18 80B35AC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E1C 80B35ACC 0C03F66B */ jal Math_Rand_ZeroOne +/* 01E1C 80B35ACC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01E20 80B35AD0 00000000 */ nop /* 01E24 80B35AD4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -102,7 +102,7 @@ glabel func_80B359A8 /* 01E48 80B35AF8 860D008A */ lh $t5, 0x008A($s0) ## 0000008A .L80B35AFC: /* 01E4C 80B35AFC A60D0032 */ sh $t5, 0x0032($s0) ## 00000032 -/* 01E50 80B35B00 0C03F66B */ jal Math_Rand_ZeroOne +/* 01E50 80B35B00 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01E54 80B35B04 A7A60022 */ sh $a2, 0x0022($sp) /* 01E58 80B35B08 3C0180B3 */ lui $at, %hi(D_80B37BB0) ## $at = 80B30000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35C10.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35C10.s index 161ad108a4..1764f604ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35C10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35C10.s @@ -31,7 +31,7 @@ glabel func_80B35C10 /* 01FBC 80B35C6C 00000000 */ nop /* 01FC0 80B35C70 4502000F */ bc1fl .L80B35CB0 /* 01FC4 80B35C74 8FAE0024 */ lw $t6, 0x0024($sp) -/* 01FC8 80B35C78 0C03F66B */ jal Math_Rand_ZeroOne +/* 01FC8 80B35C78 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01FCC 80B35C7C 00000000 */ nop /* 01FD0 80B35C80 3C0180B3 */ lui $at, %hi(D_80B37BB4) ## $at = 80B30000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35EE4.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35EE4.s index 2b7a0f7f2d..6b0c9c5d04 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35EE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35EE4.s @@ -34,7 +34,7 @@ glabel func_80B35EE4 /* 0229C 80B35F4C A6000300 */ sh $zero, 0x0300($s0) ## 00000300 .L80B35F50: /* 022A0 80B35F50 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 022A4 80B35F54 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 022A4 80B35F54 0C01E1A7 */ jal Math_SmoothStepToS /* 022A8 80B35F58 AFA00010 */ sw $zero, 0x0010($sp) /* 022AC 80B35F5C 8FA4002C */ lw $a0, 0x002C($sp) @@ -111,7 +111,7 @@ glabel func_80B35EE4 /* 023B8 80B36068 1000001B */ beq $zero, $zero, .L80B360D8 /* 023BC 80B3606C 8FBF0024 */ lw $ra, 0x0024($sp) .L80B36070: -/* 023C0 80B36070 0C03F66B */ jal Math_Rand_ZeroOne +/* 023C0 80B36070 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 023C4 80B36074 00000000 */ nop /* 023C8 80B36078 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -123,7 +123,7 @@ glabel func_80B35EE4 /* 023E0 80B36090 00000000 */ nop /* 023E4 80B36094 0C2CD157 */ jal func_80B3455C /* 023E8 80B36098 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023EC 80B3609C 0C03F66B */ jal Math_Rand_ZeroOne +/* 023EC 80B3609C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 023F0 80B360A0 00000000 */ nop /* 023F4 80B360A4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B361A0.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B361A0.s index 4a71d2bb67..0048f54d11 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B361A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B361A0.s @@ -9,7 +9,7 @@ glabel func_80B361A0 /* 0250C 80B361BC AFAE0010 */ sw $t6, 0x0010($sp) /* 02510 80B361C0 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 /* 02514 80B361C4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02518 80B361C8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 02518 80B361C8 0C01E1A7 */ jal Math_SmoothStepToS /* 0251C 80B361CC 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 02520 80B361D0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B365A8.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B365A8.s index 197c1d6b5b..be06ae45f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B365A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B365A8.s @@ -39,7 +39,7 @@ glabel func_80B365A8 /* 02970 80B36620 00682023 */ subu $a0, $v1, $t0 /* 02974 80B36624 00042400 */ sll $a0, $a0, 16 /* 02978 80B36628 00042403 */ sra $a0, $a0, 16 -/* 0297C 80B3662C 0C01DE1C */ jal Math_Sins +/* 0297C 80B3662C 0C01DE1C */ jal Math_SinS ## sins? /* 02980 80B36630 A7A30036 */ sh $v1, 0x0036($sp) /* 02984 80B36634 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 @@ -55,7 +55,7 @@ glabel func_80B365A8 .L80B3665C: /* 029AC 80B3665C 006A2023 */ subu $a0, $v1, $t2 /* 029B0 80B36660 00042400 */ sll $a0, $a0, 16 -/* 029B4 80B36664 0C01DE1C */ jal Math_Sins +/* 029B4 80B36664 0C01DE1C */ jal Math_SinS ## sins? /* 029B8 80B36668 00042403 */ sra $a0, $a0, 16 /* 029BC 80B3666C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 @@ -67,7 +67,7 @@ glabel func_80B365A8 /* 029D4 80B36684 1000000E */ beq $zero, $zero, .L80B366C0 /* 029D8 80B36688 A60B02FE */ sh $t3, 0x02FE($s0) ## 000002FE .L80B3668C: -/* 029DC 80B3668C 0C03F66B */ jal Math_Rand_ZeroOne +/* 029DC 80B3668C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 029E0 80B36690 00000000 */ nop /* 029E4 80B36694 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -92,7 +92,7 @@ glabel func_80B365A8 /* 02A2C 80B366DC A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 /* 02A30 80B366E0 46040182 */ mul.s $f6, $f0, $f4 /* 02A34 80B366E4 E60802EC */ swc1 $f8, 0x02EC($s0) ## 000002EC -/* 02A38 80B366E8 0C03F66B */ jal Math_Rand_ZeroOne +/* 02A38 80B366E8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02A3C 80B366EC E60601A4 */ swc1 $f6, 0x01A4($s0) ## 000001A4 /* 02A40 80B366F0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36740.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36740.s index 8be2957035..6b243f6e49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36740.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36740.s @@ -24,7 +24,7 @@ glabel func_80B36740 /* 02ACC 80B3677C 00052C03 */ sra $a1, $a1, 16 /* 02AD0 80B36780 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 /* 02AD4 80B36784 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02AD8 80B36788 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 02AD8 80B36788 0C01E1A7 */ jal Math_SmoothStepToS /* 02ADC 80B3678C 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 02AE0 80B36790 96030088 */ lhu $v1, 0x0088($s0) ## 00000088 @@ -88,7 +88,7 @@ glabel func_80B36740 /* 02BB4 80B36864 3C05C080 */ lui $a1, 0xC080 ## $a1 = C0800000 /* 02BB8 80B36868 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02BBC 80B3686C 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 02BC0 80B36870 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02BC0 80B36870 0C01E0C4 */ jal Math_SmoothStepToF /* 02BC4 80B36874 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 02BC8 80B36878 1000001A */ beq $zero, $zero, .L80B368E4 @@ -110,7 +110,7 @@ glabel func_80B36740 /* 02C04 80B368B4 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 /* 02C08 80B368B8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02C0C 80B368BC 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 02C10 80B368C0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02C10 80B368C0 0C01E0C4 */ jal Math_SmoothStepToF /* 02C14 80B368C4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 02C18 80B368C8 10000006 */ beq $zero, $zero, .L80B368E4 @@ -118,7 +118,7 @@ glabel func_80B36740 /* 02C20 80B368D0 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 .L80B368D4: /* 02C24 80B368D4 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 0000CCCD -/* 02C28 80B368D8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02C28 80B368D8 0C01E0C4 */ jal Math_SmoothStepToF /* 02C2C 80B368DC E7A80010 */ swc1 $f8, 0x0010($sp) /* 02C30 80B368E0 C60202EC */ lwc1 $f2, 0x02EC($s0) ## 000002EC @@ -129,7 +129,7 @@ glabel func_80B36740 /* 02C40 80B368F0 00000000 */ nop /* 02C44 80B368F4 45030010 */ bc1tl .L80B36938 /* 02C48 80B368F8 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 02C4C 80B368FC 0C01DE1C */ jal Math_Sins +/* 02C4C 80B368FC 0C01DE1C */ jal Math_SinS ## sins? /* 02C50 80B36900 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 02C54 80B36904 C60402EC */ lwc1 $f4, 0x02EC($s0) ## 000002EC @@ -137,7 +137,7 @@ glabel func_80B36740 /* 02C5C 80B3690C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 02C60 80B36910 46040182 */ mul.s $f6, $f0, $f4 /* 02C64 80B36914 46069200 */ add.s $f8, $f18, $f6 -/* 02C68 80B36918 0C01DE0D */ jal Math_Coss +/* 02C68 80B36918 0C01DE0D */ jal Math_CosS ## coss? /* 02C6C 80B3691C E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 /* 02C70 80B36920 C60202EC */ lwc1 $f2, 0x02EC($s0) ## 000002EC @@ -263,7 +263,7 @@ glabel func_80B36740 /* 02E1C 80B36ACC 8F221C44 */ lw $v0, 0x1C44($t9) ## 00001C44 /* 02E20 80B36AD0 0C2CD157 */ jal func_80B3455C /* 02E24 80B36AD4 E7AC0044 */ swc1 $f12, 0x0044($sp) -/* 02E28 80B36AD8 0C03F66B */ jal Math_Rand_ZeroOne +/* 02E28 80B36AD8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02E2C 80B36ADC 00000000 */ nop /* 02E30 80B36AE0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36D3C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36D3C.s index 9c7104f247..192a1cb0f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36D3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36D3C.s @@ -25,7 +25,7 @@ glabel func_80B36D3C /* 030E4 80B36D94 26240068 */ addiu $a0, $s1, 0x0068 ## $a0 = 00000068 /* 030E8 80B36D98 44050000 */ mfc1 $a1, $f0 /* 030EC 80B36D9C 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 030F0 80B36DA0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 030F0 80B36DA0 0C01E0C4 */ jal Math_SmoothStepToF /* 030F4 80B36DA4 E7A00010 */ swc1 $f0, 0x0010($sp) /* 030F8 80B36DA8 A6200300 */ sh $zero, 0x0300($s1) ## 00000300 @@ -82,19 +82,19 @@ glabel func_80B36D3C /* 031A8 80B36E58 4481A000 */ mtc1 $at, $f20 ## $f20 = 60.00 /* 031AC 80B36E5C 27B30088 */ addiu $s3, $sp, 0x0088 ## $s3 = FFFFFFF0 .L80B36E60: -/* 031B0 80B36E60 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 031B0 80B36E60 0C00CFC8 */ jal Rand_CenteredFloat /* 031B4 80B36E64 4600A306 */ mov.s $f12, $f20 /* 031B8 80B36E68 C6280024 */ lwc1 $f8, 0x0024($s1) ## 00000024 /* 031BC 80B36E6C 4600A306 */ mov.s $f12, $f20 /* 031C0 80B36E70 46080280 */ add.s $f10, $f0, $f8 -/* 031C4 80B36E74 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 031C4 80B36E74 0C00CFC8 */ jal Rand_CenteredFloat /* 031C8 80B36E78 E7AA0088 */ swc1 $f10, 0x0088($sp) /* 031CC 80B36E7C C630002C */ lwc1 $f16, 0x002C($s1) ## 0000002C /* 031D0 80B36E80 4600B306 */ mov.s $f12, $f22 /* 031D4 80B36E84 46100480 */ add.s $f18, $f0, $f16 -/* 031D8 80B36E88 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 031D8 80B36E88 0C00CFC8 */ jal Rand_CenteredFloat /* 031DC 80B36E8C E7B20090 */ swc1 $f18, 0x0090($sp) /* 031E0 80B36E90 C6240028 */ lwc1 $f4, 0x0028($s1) ## 00000028 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36F40.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36F40.s index ca75c43ac1..5037ed2119 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36F40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36F40.s @@ -23,7 +23,7 @@ glabel func_80B36F40 /* 032D0 80B36F80 00832021 */ addu $a0, $a0, $v1 /* 032D4 80B36F84 000420C0 */ sll $a0, $a0, 3 /* 032D8 80B36F88 00042400 */ sll $a0, $a0, 16 -/* 032DC 80B36F8C 0C01DE1C */ jal Math_Sins +/* 032DC 80B36F8C 0C01DE1C */ jal Math_SinS ## sins? /* 032E0 80B36F90 00042403 */ sra $a0, $a0, 16 /* 032E4 80B36F94 3C0180B3 */ lui $at, %hi(D_80B37BCC) ## $at = 80B30000 @@ -47,7 +47,7 @@ glabel func_80B36F40 /* 03324 80B36FD4 03192823 */ subu $a1, $t8, $t9 /* 03328 80B36FD8 00052C00 */ sll $a1, $a1, 16 /* 0332C 80B36FDC 00052C03 */ sra $a1, $a1, 16 -/* 03330 80B36FE0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 03330 80B36FE0 0C01E1A7 */ jal Math_SmoothStepToS /* 03334 80B36FE4 240705DC */ addiu $a3, $zero, 0x05DC ## $a3 = 000005DC /* 03338 80B36FE8 860204D6 */ lh $v0, 0x04D6($s0) ## 000004D6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Init.s index 11ae891b87..2c30d2cfa5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Init.s @@ -171,15 +171,15 @@ glabel L80B3B470 /* 00510 80B3B480 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 00514 80B3B484 44816000 */ mtc1 $at, $f12 ## $f12 = 6.00 /* 00518 80B3B488 A7A8004E */ sh $t0, 0x004E($sp) -/* 0051C 80B3B48C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0051C 80B3B48C 0C00CFC8 */ jal Rand_CenteredFloat /* 00520 80B3B490 E7A40048 */ swc1 $f4, 0x0048($sp) /* 00524 80B3B494 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 00528 80B3B498 44816000 */ mtc1 $at, $f12 ## $f12 = 6.00 -/* 0052C 80B3B49C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0052C 80B3B49C 0C00CFC8 */ jal Rand_CenteredFloat /* 00530 80B3B4A0 E600005C */ swc1 $f0, 0x005C($s0) ## 0000005C -/* 00534 80B3B4A4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00534 80B3B4A4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00538 80B3B4A8 E6000064 */ swc1 $f0, 0x0064($s0) ## 00000064 /* 0053C 80B3B4AC 3C013FA0 */ lui $at, 0x3FA0 ## $at = 3FA00000 @@ -258,7 +258,7 @@ glabel L80B3B470 /* 0063C 80B3B5AC 014B6021 */ addu $t4, $t2, $t3 /* 00640 80B3B5B0 01822021 */ addu $a0, $t4, $v0 /* 00644 80B3B5B4 00042400 */ sll $a0, $a0, 16 -/* 00648 80B3B5B8 0C01DE0D */ jal Math_Coss +/* 00648 80B3B5B8 0C01DE0D */ jal Math_CosS ## coss? /* 0064C 80B3B5BC 00042403 */ sra $a0, $a0, 16 /* 00650 80B3B5C0 3C0180B4 */ lui $at, %hi(D_80B3C1D0) ## $at = 80B40000 @@ -270,7 +270,7 @@ glabel L80B3B470 /* 00668 80B3B5D8 01AEC021 */ addu $t8, $t5, $t6 /* 0066C 80B3B5DC 03022021 */ addu $a0, $t8, $v0 /* 00670 80B3B5E0 00042400 */ sll $a0, $a0, 16 -/* 00674 80B3B5E4 0C01DE1C */ jal Math_Sins +/* 00674 80B3B5E4 0C01DE1C */ jal Math_SinS ## sins? /* 00678 80B3B5E8 00042403 */ sra $a0, $a0, 16 /* 0067C 80B3B5EC 3C0280B4 */ lui $v0, %hi(D_80B3C1D4) ## $v0 = 80B40000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Update.s index ed351ff7a8..33666199cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Update.s @@ -138,7 +138,7 @@ glabel EnWood02_Update /* 00980 80B3B8F0 AFAA0044 */ sw $t2, 0x0044($sp) .L80B3B8F4: /* 00984 80B3B8F4 3C0180B4 */ lui $at, %hi(D_80B3C060) ## $at = 80B40000 -/* 00988 80B3B8F8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00988 80B3B8F8 0C00CFC8 */ jal Rand_CenteredFloat /* 0098C 80B3B8FC C42CC060 */ lwc1 $f12, %lo(D_80B3C060)($at) /* 00990 80B3B900 4600018D */ trunc.w.s $f6, $f0 @@ -269,14 +269,14 @@ glabel EnWood02_Update /* 00B50 80B3BAC0 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 /* 00B54 80B3BAC4 A639014C */ sh $t9, 0x014C($s1) ## 0000014C /* 00B58 80B3BAC8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00B5C 80B3BACC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00B5C 80B3BACC 0C01E107 */ jal Math_ApproachF /* 00B60 80B3BAD0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00B64 80B3BAD4 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 00B68 80B3BAD8 34E7CCCC */ ori $a3, $a3, 0xCCCC ## $a3 = 3D4CCCCC /* 00B6C 80B3BADC 26240064 */ addiu $a0, $s1, 0x0064 ## $a0 = 00000064 /* 00B70 80B3BAE0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00B74 80B3BAE4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00B74 80B3BAE4 0C01E107 */ jal Math_ApproachF /* 00B78 80B3BAE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00B7C 80B3BAEC 0C00B5FB */ jal func_8002D7EC @@ -291,7 +291,7 @@ glabel EnWood02_Update /* 00BA0 80B3BB10 00812023 */ subu $a0, $a0, $at /* 00BA4 80B3BB14 000420C0 */ sll $a0, $a0, 3 /* 00BA8 80B3BB18 00042400 */ sll $a0, $a0, 16 -/* 00BAC 80B3BB1C 0C01DE1C */ jal Math_Sins +/* 00BAC 80B3BB1C 0C01DE1C */ jal Math_SinS ## sins? /* 00BB0 80B3BB20 00042403 */ sra $a0, $a0, 16 /* 00BB4 80B3BB24 3C014680 */ lui $at, 0x4680 ## $at = 46800000 @@ -321,7 +321,7 @@ glabel EnWood02_Update /* 00C08 80B3BB78 00810019 */ multu $a0, $at /* 00C0C 80B3BB7C 00002012 */ mflo $a0 /* 00C10 80B3BB80 00042400 */ sll $a0, $a0, 16 -/* 00C14 80B3BB84 0C01DE1C */ jal Math_Sins +/* 00C14 80B3BB84 0C01DE1C */ jal Math_SinS ## sins? /* 00C18 80B3BB88 00042403 */ sra $a0, $a0, 16 /* 00C1C 80B3BB8C 3C01437A */ lui $at, 0x437A ## $at = 437A0000 @@ -333,7 +333,7 @@ glabel EnWood02_Update /* 00C34 80B3BBA4 862E008A */ lh $t6, 0x008A($s1) ## 0000008A /* 00C38 80B3BBA8 01CF2023 */ subu $a0, $t6, $t7 /* 00C3C 80B3BBAC 00042400 */ sll $a0, $a0, 16 -/* 00C40 80B3BBB0 0C01DE0D */ jal Math_Coss +/* 00C40 80B3BBB0 0C01DE0D */ jal Math_CosS ## coss? /* 00C44 80B3BBB4 00042403 */ sra $a0, $a0, 16 /* 00C48 80B3BBB8 C7B2006C */ lwc1 $f18, 0x006C($sp) @@ -345,7 +345,7 @@ glabel EnWood02_Update /* 00C60 80B3BBD0 00042403 */ sra $a0, $a0, 16 /* 00C64 80B3BBD4 4600218D */ trunc.w.s $f6, $f4 /* 00C68 80B3BBD8 44193000 */ mfc1 $t9, $f6 -/* 00C6C 80B3BBDC 0C01DE1C */ jal Math_Sins +/* 00C6C 80B3BBDC 0C01DE1C */ jal Math_SinS ## sins? /* 00C70 80B3BBE0 A63900B4 */ sh $t9, 0x00B4($s1) ## 000000B4 /* 00C74 80B3BBE4 C7A8006C */ lwc1 $f8, 0x006C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wood02/func_80B3B094.s b/asm/non_matchings/overlays/actors/ovl_En_Wood02/func_80B3B094.s index a3c0cd6a20..0fb77a76b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wood02/func_80B3B094.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wood02/func_80B3B094.s @@ -41,7 +41,7 @@ glabel func_80B3B094 /* 001B8 80B3B128 016C6821 */ addu $t5, $t3, $t4 /* 001BC 80B3B12C 01B12021 */ addu $a0, $t5, $s1 /* 001C0 80B3B130 00042400 */ sll $a0, $a0, 16 -/* 001C4 80B3B134 0C01DE0D */ jal Math_Coss +/* 001C4 80B3B134 0C01DE0D */ jal Math_CosS ## coss? /* 001C8 80B3B138 00042403 */ sra $a0, $a0, 16 /* 001CC 80B3B13C E6E00000 */ swc1 $f0, 0x0000($s7) ## 80B3C1D0 @@ -50,7 +50,7 @@ glabel func_80B3B094 /* 001D8 80B3B148 01CFC021 */ addu $t8, $t6, $t7 /* 001DC 80B3B14C 03112021 */ addu $a0, $t8, $s1 /* 001E0 80B3B150 00042400 */ sll $a0, $a0, 16 -/* 001E4 80B3B154 0C01DE1C */ jal Math_Sins +/* 001E4 80B3B154 0C01DE1C */ jal Math_SinS ## sins? /* 001E8 80B3B158 00042403 */ sra $a0, $a0, 16 /* 001EC 80B3B15C E7C00000 */ swc1 $f0, 0x0000($s8) ## 80B3C1D4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C31C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C31C.s index e578438d8e..c7a0bce935 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C31C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C31C.s @@ -18,7 +18,7 @@ glabel func_80B3C31C /* 00174 80B3C354 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C /* 00178 80B3C358 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C /* 0017C 80B3C35C AFA3001C */ sw $v1, 0x001C($sp) -/* 00180 80B3C360 0C01DF64 */ jal Math_Rand_S16Offset +/* 00180 80B3C360 0C01DF64 */ jal Rand_S16Offset /* 00184 80B3C364 AFA60038 */ sw $a2, 0x0038($sp) /* 00188 80B3C368 8FA3001C */ lw $v1, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C3A4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C3A4.s index 37865b15e9..7c59578b4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C3A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C3A4.s @@ -4,7 +4,7 @@ glabel func_80B3C3A4 /* 001CC 80B3C3AC AFA40050 */ sw $a0, 0x0050($sp) /* 001D0 80B3C3B0 AFA50054 */ sw $a1, 0x0054($sp) /* 001D4 80B3C3B4 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 001D8 80B3C3B8 0C01DE1C */ jal Math_Sins +/* 001D8 80B3C3B8 0C01DE1C */ jal Math_SinS ## sins? /* 001DC 80B3C3BC A7A40046 */ sh $a0, 0x0046($sp) /* 001E0 80B3C3C0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -21,7 +21,7 @@ glabel func_80B3C3A4 /* 0020C 80B3C3EC C4500004 */ lwc1 $f16, 0x0004($v0) ## 00000028 /* 00210 80B3C3F0 AFA20034 */ sw $v0, 0x0034($sp) /* 00214 80B3C3F4 46128100 */ add.s $f4, $f16, $f18 -/* 00218 80B3C3F8 0C01DE0D */ jal Math_Coss +/* 00218 80B3C3F8 0C01DE0D */ jal Math_CosS ## coss? /* 0021C 80B3C3FC E7A4003C */ swc1 $f4, 0x003C($sp) /* 00220 80B3C400 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Update.s index 150d31116f..447ca7f85a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Update.s @@ -121,7 +121,7 @@ glabel EnZf_Update /* 053B0 80B49400 1420001E */ bne $at, $zero, .L80B4947C /* 053B4 80B49404 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 053B8 80B49408 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 053BC 80B4940C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 053BC 80B4940C 0C01E1A7 */ jal Math_SmoothStepToS /* 053C0 80B49410 AFA00010 */ sw $zero, 0x0010($sp) /* 053C4 80B49414 8E1903DC */ lw $t9, 0x03DC($s0) ## 000003DC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44058.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44058.s index 60a0cb3699..5e3fcb87f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44058.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B44058.s @@ -51,13 +51,13 @@ glabel func_80B44058 /* 000B8 80B44108 A7A80044 */ sh $t0, 0x0044($sp) /* 000BC 80B4410C 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 000C0 80B44110 E7AC0050 */ swc1 $f12, 0x0050($sp) -/* 000C4 80B44114 0C01DE1C */ jal Math_Sins +/* 000C4 80B44114 0C01DE1C */ jal Math_SinS ## sins? /* 000C8 80B44118 AFA20028 */ sw $v0, 0x0028($sp) /* 000CC 80B4411C C7AC0050 */ lwc1 $f12, 0x0050($sp) /* 000D0 80B44120 460C0282 */ mul.s $f10, $f0, $f12 /* 000D4 80B44124 E7AA0040 */ swc1 $f10, 0x0040($sp) -/* 000D8 80B44128 0C01DE0D */ jal Math_Coss +/* 000D8 80B44128 0C01DE0D */ jal Math_CosS ## coss? /* 000DC 80B4412C 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 000E0 80B44130 C7AC0050 */ lwc1 $f12, 0x0050($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B441C4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B441C4.s index 81a0d11e46..e43b76a271 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B441C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B441C4.s @@ -30,13 +30,13 @@ glabel func_80B441C4 /* 001E0 80B44230 96190088 */ lhu $t9, 0x0088($s0) ## 00000088 /* 001E4 80B44234 A7B90044 */ sh $t9, 0x0044($sp) /* 001E8 80B44238 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 001EC 80B4423C 0C01DE1C */ jal Math_Sins +/* 001EC 80B4423C 0C01DE1C */ jal Math_SinS ## sins? /* 001F0 80B44240 AFA20028 */ sw $v0, 0x0028($sp) /* 001F4 80B44244 C7A60050 */ lwc1 $f6, 0x0050($sp) /* 001F8 80B44248 46060202 */ mul.s $f8, $f0, $f6 /* 001FC 80B4424C E7A80040 */ swc1 $f8, 0x0040($sp) -/* 00200 80B44250 0C01DE0D */ jal Math_Coss +/* 00200 80B44250 0C01DE0D */ jal Math_CosS ## coss? /* 00204 80B44254 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00208 80B44258 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45384.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45384.s index f96d0265e1..160e2778fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45384.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45384.s @@ -23,7 +23,7 @@ glabel func_80B45384 /* 01384 80B453D4 E7A80018 */ swc1 $f8, 0x0018($sp) /* 01388 80B453D8 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 0138C 80B453DC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0138C 80B453DC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01390 80B453E0 AE0F03DC */ sw $t7, 0x03DC($s0) ## 000003DC /* 01394 80B453E4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4543C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4543C.s index 11744af310..00cfa770a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4543C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4543C.s @@ -114,7 +114,7 @@ glabel func_80B4543C /* 0156C 80B455BC 00000000 */ nop /* 01570 80B455C0 45000019 */ bc1f .L80B45628 /* 01574 80B455C4 00000000 */ nop -/* 01578 80B455C8 0C03F66B */ jal Math_Rand_ZeroOne +/* 01578 80B455C8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0157C 80B455CC 00000000 */ nop /* 01580 80B455D0 3C0180B5 */ lui $at, %hi(D_80B4A348) ## $at = 80B50000 @@ -141,7 +141,7 @@ glabel func_80B4543C /* 015D0 80B45620 10000016 */ beq $zero, $zero, .L80B4567C /* 015D4 80B45624 8FB90034 */ lw $t9, 0x0034($sp) .L80B45628: -/* 015D8 80B45628 0C03F66B */ jal Math_Rand_ZeroOne +/* 015D8 80B45628 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 015DC 80B4562C 00000000 */ nop /* 015E0 80B45630 3C0180B5 */ lui $at, %hi(D_80B4A34C) ## $at = 80B50000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45748.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45748.s index 627048b8bc..35f42ba919 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45748.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45748.s @@ -172,7 +172,7 @@ glabel func_80B45748 /* 0193C 80B4598C A6020032 */ sh $v0, 0x0032($s0) ## 00000032 /* 01940 80B45990 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 /* 01944 80B45994 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 01948 80B45998 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 01948 80B45998 0C01E0C4 */ jal Math_SmoothStepToF /* 0194C 80B4599C E7AA0010 */ swc1 $f10, 0x0010($sp) .L80B459A0: @@ -204,7 +204,7 @@ glabel func_80B45748 /* 019AC 80B459FC 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 019B0 80B45A00 3C05C100 */ lui $a1, 0xC100 ## $a1 = C1000000 /* 019B4 80B45A04 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 019B8 80B45A08 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 019B8 80B45A08 0C01E0C4 */ jal Math_SmoothStepToF /* 019BC 80B45A0C E7AA0010 */ swc1 $f10, 0x0010($sp) /* 019C0 80B45A10 10000005 */ beq $zero, $zero, .L80B45A28 @@ -212,7 +212,7 @@ glabel func_80B45748 /* 019C8 80B45A18 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 .L80B45A1C: /* 019CC 80B45A1C 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 019D0 80B45A20 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 019D0 80B45A20 0C01E0C4 */ jal Math_SmoothStepToF /* 019D4 80B45A24 E7B00010 */ swc1 $f16, 0x0010($sp) .L80B45A28: @@ -253,7 +253,7 @@ glabel func_80B45748 /* 01A5C 80B45AAC C6120164 */ lwc1 $f18, 0x0164($s0) ## 00000164 /* 01A60 80B45AB0 8602008A */ lh $v0, 0x008A($s0) ## 0000008A /* 01A64 80B45AB4 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 01A68 80B45AB8 0C03F66B */ jal Math_Rand_ZeroOne +/* 01A68 80B45AB8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01A6C 80B45ABC A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 /* 01A70 80B45AC0 3C0180B5 */ lui $at, %hi(D_80B4A354) ## $at = 80B50000 @@ -310,7 +310,7 @@ glabel func_80B45748 /* 01B24 80B45B74 240511C7 */ addiu $a1, $zero, 0x11C7 ## $a1 = 000011C7 /* 01B28 80B45B78 14400012 */ bne $v0, $zero, .L80B45BC4 /* 01B2C 80B45B7C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 01B30 80B45B80 0C03F66B */ jal Math_Rand_ZeroOne +/* 01B30 80B45B80 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01B34 80B45B84 00000000 */ nop /* 01B38 80B45B88 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -337,7 +337,7 @@ glabel func_80B45748 /* 01B84 80B45BD4 00000000 */ nop /* 01B88 80B45BD8 45020024 */ bc1fl .L80B45C6C /* 01B8C 80B45BDC 860B03F8 */ lh $t3, 0x03F8($s0) ## 000003F8 -/* 01B90 80B45BE0 0C03F66B */ jal Math_Rand_ZeroOne +/* 01B90 80B45BE0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01B94 80B45BE4 00000000 */ nop /* 01B98 80B45BE8 3C0180B5 */ lui $at, %hi(D_80B4A358) ## $at = 80B50000 @@ -356,7 +356,7 @@ glabel func_80B45748 /* 01BCC 80B45C1C 10000025 */ beq $zero, $zero, .L80B45CB4 /* 01BD0 80B45C20 860C001C */ lh $t4, 0x001C($s0) ## 0000001C .L80B45C24: -/* 01BD4 80B45C24 0C03F66B */ jal Math_Rand_ZeroOne +/* 01BD4 80B45C24 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01BD8 80B45C28 00000000 */ nop /* 01BDC 80B45C2C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -385,7 +385,7 @@ glabel func_80B45748 /* 01C30 80B45C80 1000000C */ beq $zero, $zero, .L80B45CB4 /* 01C34 80B45C84 860C001C */ lh $t4, 0x001C($s0) ## 0000001C .L80B45C88: -/* 01C38 80B45C88 0C03F66B */ jal Math_Rand_ZeroOne +/* 01C38 80B45C88 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01C3C 80B45C8C 00000000 */ nop /* 01C40 80B45C90 3C0180B5 */ lui $at, %hi(D_80B4A35C) ## $at = 80B50000 @@ -427,7 +427,7 @@ glabel func_80B45748 /* 01CCC 80B45D1C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01CD0 80B45D20 10400010 */ beq $v0, $zero, .L80B45D64 /* 01CD4 80B45D24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CD8 80B45D28 0C03F66B */ jal Math_Rand_ZeroOne +/* 01CD8 80B45D28 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01CDC 80B45D2C 00000000 */ nop /* 01CE0 80B45D30 3C0180B5 */ lui $at, %hi(D_80B4A360) ## $at = 80B50000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46098.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46098.s index 37db61553c..b0d94f543e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46098.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46098.s @@ -128,7 +128,7 @@ glabel func_80B46098 /* 0220C 80B4625C 24051555 */ addiu $a1, $zero, 0x1555 ## $a1 = 00001555 /* 02210 80B46260 50400012 */ beql $v0, $zero, .L80B462AC /* 02214 80B46264 8FAD0034 */ lw $t5, 0x0034($sp) -/* 02218 80B46268 0C03F66B */ jal Math_Rand_ZeroOne +/* 02218 80B46268 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0221C 80B4626C 00000000 */ nop /* 02220 80B46270 3C0180B5 */ lui $at, %hi(D_80B4A364) ## $at = 80B50000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s index 22fa89f9a2..1c5660fd69 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s @@ -31,12 +31,12 @@ glabel func_80B462E4 /* 02304 80B46354 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02308 80B46358 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 0230C 80B4635C 44816000 */ mtc1 $at, $f12 ## $f12 = 12.00 -/* 02310 80B46360 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 02310 80B46360 0C00CFC8 */ jal Rand_CenteredFloat /* 02314 80B46364 00000000 */ nop /* 02318 80B46368 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 /* 0231C 80B4636C E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 02320 80B46370 0C03F66B */ jal Math_Rand_ZeroOne +/* 02320 80B46370 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02324 80B46374 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 02328 80B46378 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B463E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B463E4.s index 5c9c865ab2..5334c27c78 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B463E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B463E4.s @@ -24,7 +24,7 @@ glabel func_80B463E4 /* 023C0 80B46410 AFB80010 */ sw $t8, 0x0010($sp) /* 023C4 80B46414 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 /* 023C8 80B46418 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 023CC 80B4641C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 023CC 80B4641C 0C01E1A7 */ jal Math_SmoothStepToS /* 023D0 80B46420 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 023D4 80B46424 8FA4005C */ lw $a0, 0x005C($sp) @@ -54,7 +54,7 @@ glabel func_80B463E4 /* 02430 80B46480 00622023 */ subu $a0, $v1, $v0 /* 02434 80B46484 00042400 */ sll $a0, $a0, 16 /* 02438 80B46488 00042403 */ sra $a0, $a0, 16 -/* 0243C 80B4648C 0C01DE1C */ jal Math_Sins +/* 0243C 80B4648C 0C01DE1C */ jal Math_SinS ## sins? /* 02440 80B46490 A7A30056 */ sh $v1, 0x0056($sp) /* 02444 80B46494 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 @@ -81,7 +81,7 @@ glabel func_80B463E4 /* 02494 80B464E4 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 /* 02498 80B464E8 014B2023 */ subu $a0, $t2, $t3 /* 0249C 80B464EC 00042400 */ sll $a0, $a0, 16 -/* 024A0 80B464F0 0C01DE1C */ jal Math_Sins +/* 024A0 80B464F0 0C01DE1C */ jal Math_SinS ## sins? /* 024A4 80B464F4 00042403 */ sra $a0, $a0, 16 /* 024A8 80B464F8 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 @@ -219,7 +219,7 @@ glabel func_80B463E4 /* 02684 80B466D4 3C05C080 */ lui $a1, 0xC080 ## $a1 = C0800000 /* 02688 80B466D8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0268C 80B466DC 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 02690 80B466E0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 02690 80B466E0 0C01E0C4 */ jal Math_SmoothStepToF /* 02694 80B466E4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 02698 80B466E8 1000001A */ beq $zero, $zero, .L80B46754 @@ -241,7 +241,7 @@ glabel func_80B463E4 /* 026D4 80B46724 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 /* 026D8 80B46728 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 026DC 80B4672C 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 026E0 80B46730 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 026E0 80B46730 0C01E0C4 */ jal Math_SmoothStepToF /* 026E4 80B46734 E7B20010 */ swc1 $f18, 0x0010($sp) /* 026E8 80B46738 10000006 */ beq $zero, $zero, .L80B46754 @@ -249,7 +249,7 @@ glabel func_80B463E4 /* 026F0 80B46740 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L80B46744: /* 026F4 80B46744 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 0000CCCD -/* 026F8 80B46748 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 026F8 80B46748 0C01E0C4 */ jal Math_SmoothStepToF /* 026FC 80B4674C E7A40010 */ swc1 $f4, 0x0010($sp) /* 02700 80B46750 C6020408 */ lwc1 $f2, 0x0408($s0) ## 00000408 @@ -265,7 +265,7 @@ glabel func_80B463E4 /* 02724 80B46774 8FA5005C */ lw $a1, 0x005C($sp) /* 02728 80B46778 54400010 */ bnel $v0, $zero, .L80B467BC /* 0272C 80B4677C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 02730 80B46780 0C01DE1C */ jal Math_Sins +/* 02730 80B46780 0C01DE1C */ jal Math_SinS ## sins? /* 02734 80B46784 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 02738 80B46788 C60A0408 */ lwc1 $f10, 0x0408($s0) ## 00000408 @@ -273,7 +273,7 @@ glabel func_80B463E4 /* 02740 80B46790 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 02744 80B46794 460A0482 */ mul.s $f18, $f0, $f10 /* 02748 80B46798 46124100 */ add.s $f4, $f8, $f18 -/* 0274C 80B4679C 0C01DE0D */ jal Math_Coss +/* 0274C 80B4679C 0C01DE0D */ jal Math_CosS ## coss? /* 02750 80B467A0 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 /* 02754 80B467A4 C60A0408 */ lwc1 $f10, 0x0408($s0) ## 00000408 @@ -407,7 +407,7 @@ glabel func_80B463E4 /* 02914 80B46964 AFA30028 */ sw $v1, 0x0028($sp) /* 02918 80B46968 03282023 */ subu $a0, $t9, $t0 /* 0291C 80B4696C 00042400 */ sll $a0, $a0, 16 -/* 02920 80B46970 0C01DE0D */ jal Math_Coss +/* 02920 80B46970 0C01DE0D */ jal Math_CosS ## coss? /* 02924 80B46974 00042403 */ sra $a0, $a0, 16 /* 02928 80B46978 3C0180B5 */ lui $at, %hi(D_80B4A370) ## $at = 80B50000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46AE0.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46AE0.s index b881c6b300..f193e795a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46AE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46AE0.s @@ -47,7 +47,7 @@ glabel func_80B46AE0 /* 02B18 80B46B68 00000000 */ nop /* 02B1C 80B46B6C 0C2D14E1 */ jal func_80B45384 /* 02B20 80B46B70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02B24 80B46B74 0C03F66B */ jal Math_Rand_ZeroOne +/* 02B24 80B46B74 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02B28 80B46B78 00000000 */ nop /* 02B2C 80B46B7C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -57,7 +57,7 @@ glabel func_80B46AE0 /* 02B3C 80B46B8C 46025400 */ add.s $f16, $f10, $f2 /* 02B40 80B46B90 4600848D */ trunc.w.s $f18, $f16 /* 02B44 80B46B94 440A9000 */ mfc1 $t2, $f18 -/* 02B48 80B46B98 0C03F66B */ jal Math_Rand_ZeroOne +/* 02B48 80B46B98 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02B4C 80B46B9C AE0A03F0 */ sw $t2, 0x03F0($s0) ## 000003F0 /* 02B50 80B46BA0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -71,7 +71,7 @@ glabel func_80B46AE0 /* 02B70 80B46BC0 10000063 */ beq $zero, $zero, .L80B46D50 /* 02B74 80B46BC4 A60C03F4 */ sh $t4, 0x03F4($s0) ## 000003F4 .L80B46BC8: -/* 02B78 80B46BC8 0C03F66B */ jal Math_Rand_ZeroOne +/* 02B78 80B46BC8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02B7C 80B46BCC 00000000 */ nop /* 02B80 80B46BD0 3C0180B5 */ lui $at, %hi(D_80B4A374) ## $at = 80B50000 @@ -91,7 +91,7 @@ glabel func_80B46AE0 .L80B46C08: /* 02BB8 80B46C08 0C2D14E1 */ jal func_80B45384 /* 02BBC 80B46C0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02BC0 80B46C10 0C03F66B */ jal Math_Rand_ZeroOne +/* 02BC0 80B46C10 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02BC4 80B46C14 00000000 */ nop /* 02BC8 80B46C18 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -105,7 +105,7 @@ glabel func_80B46AE0 /* 02BE8 80B46C38 AE0E03F0 */ sw $t6, 0x03F0($s0) ## 000003F0 /* 02BEC 80B46C3C 860F008A */ lh $t7, 0x008A($s0) ## 0000008A .L80B46C40: -/* 02BF0 80B46C40 0C03F66B */ jal Math_Rand_ZeroOne +/* 02BF0 80B46C40 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02BF4 80B46C44 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 02BF8 80B46C48 3C0180B5 */ lui $at, %hi(D_80B4A378) ## $at = 80B50000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46DD4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46DD4.s index f7927be9e0..17c4767e3c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46DD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46DD4.s @@ -17,7 +17,7 @@ glabel func_80B46DD4 /* 02D9C 80B46DEC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 02DA0 80B46DF0 50400022 */ beql $v0, $zero, .L80B46E7C /* 02DA4 80B46DF4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02DA8 80B46DF8 0C03F66B */ jal Math_Rand_ZeroOne +/* 02DA8 80B46DF8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02DAC 80B46DFC 00000000 */ nop /* 02DB0 80B46E00 3C0180B5 */ lui $at, %hi(D_80B4A37C) ## $at = 80B50000 @@ -31,7 +31,7 @@ glabel func_80B46DD4 /* 02DD0 80B46E20 10000016 */ beq $zero, $zero, .L80B46E7C /* 02DD4 80B46E24 8FBF001C */ lw $ra, 0x001C($sp) .L80B46E28: -/* 02DD8 80B46E28 0C03F66B */ jal Math_Rand_ZeroOne +/* 02DD8 80B46E28 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02DDC 80B46E2C 00000000 */ nop /* 02DE0 80B46E30 3C0180B5 */ lui $at, %hi(D_80B4A380) ## $at = 80B50000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4743C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4743C.s index 496697dd56..3596f93575 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4743C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4743C.s @@ -20,7 +20,7 @@ glabel func_80B4743C /* 03434 80B47484 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 03438 80B47488 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0343C 80B4748C 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 03440 80B47490 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 03440 80B47490 0C01E1A7 */ jal Math_SmoothStepToS /* 03444 80B47494 AFA00010 */ sw $zero, 0x0010($sp) /* 03448 80B47498 86190032 */ lh $t9, 0x0032($s0) ## 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47544.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47544.s index c506e9f777..19e829e0e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47544.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47544.s @@ -12,7 +12,7 @@ glabel func_80B47544 /* 0351C 80B4756C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03520 80B47570 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 03524 80B47574 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 03528 80B47578 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 03528 80B47578 0C01E0C4 */ jal Math_SmoothStepToF /* 0352C 80B4757C E7A40040 */ swc1 $f4, 0x0040($sp) /* 03530 80B47580 8605008A */ lh $a1, 0x008A($s0) ## 0000008A @@ -23,7 +23,7 @@ glabel func_80B47544 /* 03544 80B47594 00052C03 */ sra $a1, $a1, 16 /* 03548 80B47598 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 0354C 80B4759C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 03550 80B475A0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 03550 80B475A0 0C01E1A7 */ jal Math_SmoothStepToS /* 03554 80B475A4 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 03558 80B475A8 3C0143D2 */ lui $at, 0x43D2 ## $at = 43D20000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4781C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4781C.s index d3a3627d79..c81759c45e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4781C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4781C.s @@ -263,7 +263,7 @@ glabel func_80B4781C /* 03B70 80B47BC0 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 03B74 80B47BC4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 03B78 80B47BC8 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 03B7C 80B47BCC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 03B7C 80B47BCC 0C01E1A7 */ jal Math_SmoothStepToS /* 03B80 80B47BD0 AFA00010 */ sw $zero, 0x0010($sp) /* 03B84 80B47BD4 86190032 */ lh $t9, 0x0032($s0) ## 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47CF8.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47CF8.s index 75650fcb68..840ed47f34 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47CF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47CF8.s @@ -16,7 +16,7 @@ glabel func_80B47CF8 /* 03CE0 80B47D30 24071770 */ addiu $a3, $zero, 0x1770 ## $a3 = 00001770 /* 03CE4 80B47D34 45000003 */ bc1f .L80B47D44 /* 03CE8 80B47D38 00000000 */ nop -/* 03CEC 80B47D3C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 03CEC 80B47D3C 0C01E1A7 */ jal Math_SmoothStepToS /* 03CF0 80B47D40 AFA00010 */ sw $zero, 0x0010($sp) .L80B47D44: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47EB4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47EB4.s index 6a2fd9a869..64fb4479ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47EB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47EB4.s @@ -34,7 +34,7 @@ glabel func_80B47EB4 /* 03ECC 80B47F1C AE0003E4 */ sw $zero, 0x03E4($s0) ## 000003E4 .L80B47F20: /* 03ED0 80B47F20 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 03ED4 80B47F24 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 03ED4 80B47F24 0C01E1A7 */ jal Math_SmoothStepToS /* 03ED8 80B47F28 AFA00010 */ sw $zero, 0x0010($sp) /* 03EDC 80B47F2C 8618001C */ lh $t8, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B482B8.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B482B8.s index c6cdbd2164..efc1e2981b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B482B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B482B8.s @@ -9,7 +9,7 @@ glabel func_80B482B8 /* 04284 80B482D4 AFAE0010 */ sw $t6, 0x0010($sp) /* 04288 80B482D8 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 /* 0428C 80B482DC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 04290 80B482E0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 04290 80B482E0 0C01E1A7 */ jal Math_SmoothStepToS /* 04294 80B482E4 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 04298 80B482E8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s index aa88566c09..bb402e1f09 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s @@ -37,7 +37,7 @@ glabel func_80B483E4 /* 0441C 80B4846C 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 04420 80B48470 AFB80028 */ sw $t8, 0x0028($sp) /* 04424 80B48474 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 04428 80B48478 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 04428 80B48478 0C01E1A7 */ jal Math_SmoothStepToS /* 0442C 80B4847C AFB90010 */ sw $t9, 0x0010($sp) /* 04430 80B48480 8FA80028 */ lw $t0, 0x0028($sp) @@ -46,7 +46,7 @@ glabel func_80B483E4 /* 0443C 80B4848C 00692023 */ subu $a0, $v1, $t1 /* 04440 80B48490 00042400 */ sll $a0, $a0, 16 /* 04444 80B48494 00042403 */ sra $a0, $a0, 16 -/* 04448 80B48498 0C01DE1C */ jal Math_Sins +/* 04448 80B48498 0C01DE1C */ jal Math_SinS ## sins? /* 0444C 80B4849C A7A3002E */ sh $v1, 0x002E($sp) /* 04450 80B484A0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 @@ -63,7 +63,7 @@ glabel func_80B483E4 .L80B484CC: /* 0447C 80B484CC 006A2023 */ subu $a0, $v1, $t2 /* 04480 80B484D0 00042400 */ sll $a0, $a0, 16 -/* 04484 80B484D4 0C01DE1C */ jal Math_Sins +/* 04484 80B484D4 0C01DE1C */ jal Math_SinS ## sins? /* 04488 80B484D8 00042403 */ sra $a0, $a0, 16 /* 0448C 80B484DC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 @@ -81,7 +81,7 @@ glabel func_80B483E4 /* 044B4 80B48504 E6020408 */ swc1 $f2, 0x0408($s0) ## 00000408 /* 044B8 80B48508 AE0003E4 */ sw $zero, 0x03E4($s0) ## 000003E4 /* 044BC 80B4850C 256C3FFF */ addiu $t4, $t3, 0x3FFF ## $t4 = 00003FFF -/* 044C0 80B48510 0C03F66B */ jal Math_Rand_ZeroOne +/* 044C0 80B48510 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 044C4 80B48514 A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 /* 044C8 80B48518 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48578.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48578.s index 68e2569f5d..008bca0be7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48578.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48578.s @@ -21,7 +21,7 @@ glabel func_80B48578 /* 04554 80B485A4 AFB80010 */ sw $t8, 0x0010($sp) /* 04558 80B485A8 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 /* 0455C 80B485AC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 04560 80B485B0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS +/* 04560 80B485B0 0C01E1A7 */ jal Math_SmoothStepToS /* 04564 80B485B4 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 04568 80B485B8 8609001C */ lh $t1, 0x001C($s0) ## 0000001C @@ -121,7 +121,7 @@ glabel func_80B48578 .L80B4870C: /* 046BC 80B4870C 010C2023 */ subu $a0, $t0, $t4 /* 046C0 80B48710 00042400 */ sll $a0, $a0, 16 -/* 046C4 80B48714 0C01DE1C */ jal Math_Sins +/* 046C4 80B48714 0C01DE1C */ jal Math_SinS ## sins? /* 046C8 80B48718 00042403 */ sra $a0, $a0, 16 /* 046CC 80B4871C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 @@ -168,7 +168,7 @@ glabel func_80B48578 /* 04764 80B487B4 3C05C080 */ lui $a1, 0xC080 ## $a1 = C0800000 /* 04768 80B487B8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0476C 80B487BC 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 04770 80B487C0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04770 80B487C0 0C01E0C4 */ jal Math_SmoothStepToF /* 04774 80B487C4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 04778 80B487C8 1000001A */ beq $zero, $zero, .L80B48834 @@ -190,7 +190,7 @@ glabel func_80B48578 /* 047B4 80B48804 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 /* 047B8 80B48808 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 047BC 80B4880C 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 047C0 80B48810 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 047C0 80B48810 0C01E0C4 */ jal Math_SmoothStepToF /* 047C4 80B48814 E7B00010 */ swc1 $f16, 0x0010($sp) /* 047C8 80B48818 10000006 */ beq $zero, $zero, .L80B48834 @@ -198,7 +198,7 @@ glabel func_80B48578 /* 047D0 80B48820 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 .L80B48824: /* 047D4 80B48824 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 0000CCCD -/* 047D8 80B48828 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 047D8 80B48828 0C01E0C4 */ jal Math_SmoothStepToF /* 047DC 80B4882C E7B20010 */ swc1 $f18, 0x0010($sp) /* 047E0 80B48830 C6020408 */ lwc1 $f2, 0x0408($s0) ## 00000408 @@ -214,7 +214,7 @@ glabel func_80B48578 /* 04804 80B48854 8FA5005C */ lw $a1, 0x005C($sp) /* 04808 80B48858 54400010 */ bnel $v0, $zero, .L80B4889C /* 0480C 80B4885C 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 04810 80B48860 0C01DE1C */ jal Math_Sins +/* 04810 80B48860 0C01DE1C */ jal Math_SinS ## sins? /* 04814 80B48864 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 04818 80B48868 C6080408 */ lwc1 $f8, 0x0408($s0) ## 00000408 @@ -222,7 +222,7 @@ glabel func_80B48578 /* 04820 80B48870 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 04824 80B48874 46080282 */ mul.s $f10, $f0, $f8 /* 04828 80B48878 460A3400 */ add.s $f16, $f6, $f10 -/* 0482C 80B4887C 0C01DE0D */ jal Math_Coss +/* 0482C 80B4887C 0C01DE0D */ jal Math_CosS ## coss? /* 04830 80B48880 E6100024 */ swc1 $f16, 0x0024($s0) ## 00000024 /* 04834 80B48884 C6040408 */ lwc1 $f4, 0x0408($s0) ## 00000408 @@ -388,7 +388,7 @@ glabel func_80B48578 .L80B48AC0: /* 04A70 80B48AC0 0C2D14E1 */ jal func_80B45384 /* 04A74 80B48AC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04A78 80B48AC8 0C03F66B */ jal Math_Rand_ZeroOne +/* 04A78 80B48AC8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 04A7C 80B48ACC 00000000 */ nop /* 04A80 80B48AD0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48E50.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48E50.s index 0253a73692..fa67013c11 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48E50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48E50.s @@ -19,7 +19,7 @@ glabel func_80B48E50 /* 04E40 80B48E90 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 04E44 80B48E94 44050000 */ mfc1 $a1, $f0 /* 04E48 80B48E98 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E19999A -/* 04E4C 80B48E9C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 04E4C 80B48E9C 0C01E0C4 */ jal Math_SmoothStepToF /* 04E50 80B48EA0 E7A00010 */ swc1 $f0, 0x0010($sp) /* 04E54 80B48EA4 AE0003E4 */ sw $zero, 0x03E4($s0) ## 000003E4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48F90.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48F90.s index e4c9021305..e431cec6cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48F90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48F90.s @@ -28,7 +28,7 @@ glabel func_80B48F90 /* 04F94 80B48FE4 000420C0 */ sll $a0, $a0, 3 /* 04F98 80B48FE8 00042400 */ sll $a0, $a0, 16 /* 04F9C 80B48FEC 00042403 */ sra $a0, $a0, 16 -/* 04FA0 80B48FF0 0C01DE1C */ jal Math_Sins +/* 04FA0 80B48FF0 0C01DE1C */ jal Math_SinS ## sins? /* 04FA4 80B48FF4 AFA50018 */ sw $a1, 0x0018($sp) /* 04FA8 80B48FF8 3C0180B5 */ lui $at, %hi(D_80B4A3A0) ## $at = 80B50000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s index 4bd0a3afed..6cfe44939c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s @@ -9,7 +9,7 @@ glabel func_80B49B60 /* 05B2C 80B49B7C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 05B30 80B49B80 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 05B34 80B49B84 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 05B38 80B49B88 0C03F66B */ jal Math_Rand_ZeroOne +/* 05B38 80B49B88 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 05B3C 80B49B8C 00000000 */ nop /* 05B40 80B49B90 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B9E8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B9E8.s index 92c83b5167..e45ecd4123 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B9E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B9E8.s @@ -41,7 +41,7 @@ glabel L80B5BA48 /* 00298 80B5BA48 14400026 */ bne $v0, $zero, .L80B5BAE4 /* 0029C 80B5BA4C 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E /* 002A0 80B5BA50 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 002A4 80B5BA54 0C01DF64 */ jal Math_Rand_S16Offset +/* 002A4 80B5BA54 0C01DF64 */ jal Rand_S16Offset /* 002A8 80B5BA58 AFA60018 */ sw $a2, 0x0018($sp) /* 002AC 80B5BA5C 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BC00.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BC00.s index 937d5d232d..8f4947e0bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BC00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BC00.s @@ -19,7 +19,7 @@ glabel func_80B5BC00 /* 00494 80B5BC44 8C4F002C */ lw $t7, 0x002C($v0) ## 0000002C /* 00498 80B5BC48 AE0F002C */ sw $t7, 0x002C($s0) ## 0000002C /* 0049C 80B5BC4C 844400B6 */ lh $a0, 0x00B6($v0) ## 000000B6 -/* 004A0 80B5BC50 0C01DE1C */ jal Math_Sins +/* 004A0 80B5BC50 0C01DE1C */ jal Math_SinS ## sins? /* 004A4 80B5BC54 A7A40026 */ sh $a0, 0x0026($sp) /* 004A8 80B5BC58 3C014260 */ lui $at, 0x4260 ## $at = 42600000 @@ -28,7 +28,7 @@ glabel func_80B5BC00 /* 004B4 80B5BC64 87A40026 */ lh $a0, 0x0026($sp) /* 004B8 80B5BC68 46003202 */ mul.s $f8, $f6, $f0 /* 004BC 80B5BC6C 46082280 */ add.s $f10, $f4, $f8 -/* 004C0 80B5BC70 0C01DE0D */ jal Math_Coss +/* 004C0 80B5BC70 0C01DE0D */ jal Math_CosS ## coss? /* 004C4 80B5BC74 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 /* 004C8 80B5BC78 3C014260 */ lui $at, 0x4260 ## $at = 42600000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C008.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C008.s index 4564c05b19..269cd70889 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C008.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5C008.s @@ -64,7 +64,7 @@ glabel func_80B5C008 /* 0093C 80B5C0EC 8CE9002C */ lw $t1, 0x002C($a3) ## 0000002C /* 00940 80B5C0F0 AE09002C */ sw $t1, 0x002C($s0) ## 0000002C /* 00944 80B5C0F4 84E400B6 */ lh $a0, 0x00B6($a3) ## 000000B6 -/* 00948 80B5C0F8 0C01DE1C */ jal Math_Sins +/* 00948 80B5C0F8 0C01DE1C */ jal Math_SinS ## sins? /* 0094C 80B5C0FC A7A40026 */ sh $a0, 0x0026($sp) /* 00950 80B5C100 3C014260 */ lui $at, 0x4260 ## $at = 42600000 @@ -73,7 +73,7 @@ glabel func_80B5C008 /* 0095C 80B5C10C 87A40026 */ lh $a0, 0x0026($sp) /* 00960 80B5C110 46004182 */ mul.s $f6, $f8, $f0 /* 00964 80B5C114 46062280 */ add.s $f10, $f4, $f6 -/* 00968 80B5C118 0C01DE0D */ jal Math_Coss +/* 00968 80B5C118 0C01DE0D */ jal Math_CosS ## coss? /* 0096C 80B5C11C E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 /* 00970 80B5C120 3C014260 */ lui $at, 0x4260 ## $at = 42600000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5D610.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5D610.s index 791f57cebc..679ffbb6f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5D610.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5D610.s @@ -44,7 +44,7 @@ glabel L80B5D650 /* 01EC0 80B5D670 2484C004 */ addiu $a0, $a0, 0xC004 ## $a0 = FFFFC004 /* 01EC4 80B5D674 00042400 */ sll $a0, $a0, 16 /* 01EC8 80B5D678 00042403 */ sra $a0, $a0, 16 -/* 01ECC 80B5D67C 0C01DE1C */ jal Math_Sins +/* 01ECC 80B5D67C 0C01DE1C */ jal Math_SinS ## sins? /* 01ED0 80B5D680 A7A40022 */ sh $a0, 0x0022($sp) /* 01ED4 80B5D684 3C014208 */ lui $at, 0x4208 ## $at = 42080000 @@ -54,7 +54,7 @@ glabel L80B5D650 /* 01EE4 80B5D694 46003202 */ mul.s $f8, $f6, $f0 /* 01EE8 80B5D698 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 /* 01EEC 80B5D69C 46082280 */ add.s $f10, $f4, $f8 -/* 01EF0 80B5D6A0 0C01DE0D */ jal Math_Coss +/* 01EF0 80B5D6A0 0C01DE0D */ jal Math_CosS ## coss? /* 01EF4 80B5D6A4 E44A0024 */ swc1 $f10, 0x0024($v0) ## 00000024 /* 01EF8 80B5D6A8 3C014208 */ lui $at, 0x4208 ## $at = 42080000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Update.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Update.s index 829ae30e4c..222b7b8c37 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Update.s @@ -64,7 +64,7 @@ glabel EnfHG_Update /* 02410 80B64DD0 E608003C */ swc1 $f8, 0x003C($s0) ## 0000003C /* 02414 80B64DD4 00042403 */ sra $a0, $a0, 16 /* 02418 80B64DD8 AE0C0040 */ sw $t4, 0x0040($s0) ## 00000040 -/* 0241C 80B64DDC 0C01DE1C */ jal Math_Sins +/* 0241C 80B64DDC 0C01DE1C */ jal Math_SinS ## sins? /* 02420 80B64DE0 A60D00B6 */ sh $t5, 0x00B6($s0) ## 000000B6 /* 02424 80B64DE4 860201DE */ lh $v0, 0x01DE($s0) ## 000001DE @@ -82,7 +82,7 @@ glabel EnfHG_Update /* 02454 80B64E14 00042403 */ sra $a0, $a0, 16 /* 02458 80B64E18 46128103 */ div.s $f4, $f16, $f18 /* 0245C 80B64E1C 46044282 */ mul.s $f10, $f8, $f4 -/* 02460 80B64E20 0C01DE1C */ jal Math_Sins +/* 02460 80B64E20 0C01DE1C */ jal Math_SinS ## sins? /* 02464 80B64E24 E60A00BC */ swc1 $f10, 0x00BC($s0) ## 000000BC /* 02468 80B64E28 860E01DE */ lh $t6, 0x01DE($s0) ## 000001DE diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s index cf31e6d243..d6efd8c507 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s @@ -189,7 +189,7 @@ glabel L80B62CA4 .L80B62D38: /* 00378 80B62D38 54600407 */ bnel $v1, $zero, .L80B63D58 /* 0037C 80B62D3C 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC -/* 00380 80B62D40 0C03F66B */ jal Math_Rand_ZeroOne +/* 00380 80B62D40 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00384 80B62D44 00000000 */ nop /* 00388 80B62D48 3C0180B6 */ lui $at, %hi(D_80B653E8) ## $at = 80B60000 @@ -344,7 +344,7 @@ glabel L80B62EFC /* 005A4 80B62F64 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 005A8 80B62F68 3C054258 */ lui $a1, 0x4258 ## $a1 = 42580000 /* 005AC 80B62F6C 44074000 */ mfc1 $a3, $f8 -/* 005B0 80B62F70 0C01E107 */ jal Math_SmoothScaleMaxF +/* 005B0 80B62F70 0C01E107 */ jal Math_ApproachF /* 005B4 80B62F74 00000000 */ nop /* 005B8 80B62F78 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -356,7 +356,7 @@ glabel L80B62EFC /* 005D0 80B62F90 26040154 */ addiu $a0, $s0, 0x0154 ## $a0 = 00000154 /* 005D4 80B62F94 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 /* 005D8 80B62F98 44072000 */ mfc1 $a3, $f4 -/* 005DC 80B62F9C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 005DC 80B62F9C 0C01E107 */ jal Math_ApproachF /* 005E0 80B62FA0 00000000 */ nop /* 005E4 80B62FA4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -369,7 +369,7 @@ glabel L80B62EFC /* 00600 80B62FC0 34A53000 */ ori $a1, $a1, 0x3000 ## $a1 = C54A3000 /* 00604 80B62FC4 26040158 */ addiu $a0, $s0, 0x0158 ## $a0 = 00000158 /* 00608 80B62FC8 44075000 */ mfc1 $a3, $f10 -/* 0060C 80B62FCC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0060C 80B62FCC 0C01E107 */ jal Math_ApproachF /* 00610 80B62FD0 00000000 */ nop /* 00614 80B62FD4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -381,7 +381,7 @@ glabel L80B62EFC /* 0062C 80B62FEC 2604015C */ addiu $a0, $s0, 0x015C ## $a0 = 0000015C /* 00630 80B62FF0 3C05C2AC */ lui $a1, 0xC2AC ## $a1 = C2AC0000 /* 00634 80B62FF4 44073000 */ mfc1 $a3, $f6 -/* 00638 80B62FF8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00638 80B62FF8 0C01E107 */ jal Math_ApproachF /* 0063C 80B62FFC 00000000 */ nop /* 00640 80B63000 3C014160 */ lui $at, 0x4160 ## $at = 41600000 @@ -395,7 +395,7 @@ glabel L80B62EFC /* 00660 80B63020 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 00664 80B63024 26040160 */ addiu $a0, $s0, 0x0160 ## $a0 = 00000160 /* 00668 80B63028 44079000 */ mfc1 $a3, $f18 -/* 0066C 80B6302C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0066C 80B6302C 0C01E107 */ jal Math_ApproachF /* 00670 80B63030 00000000 */ nop /* 00674 80B63034 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -408,14 +408,14 @@ glabel L80B62EFC /* 00690 80B63050 34A54000 */ ori $a1, $a1, 0x4000 ## $a1 = C53A4000 /* 00694 80B63054 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 00698 80B63058 44074000 */ mfc1 $a3, $f8 -/* 0069C 80B6305C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0069C 80B6305C 0C01E107 */ jal Math_ApproachF /* 006A0 80B63060 00000000 */ nop /* 006A4 80B63064 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 /* 006A8 80B63068 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A /* 006AC 80B6306C 260401A8 */ addiu $a0, $s0, 0x01A8 ## $a0 = 000001A8 /* 006B0 80B63070 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 006B4 80B63074 0C01E107 */ jal Math_SmoothScaleMaxF +/* 006B4 80B63074 0C01E107 */ jal Math_ApproachF /* 006B8 80B63078 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 006BC 80B6307C 860801D4 */ lh $t0, 0x01D4($s0) ## 000001D4 @@ -438,7 +438,7 @@ glabel L80B630A4 /* 006FC 80B630BC 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00700 80B630C0 3C0542A8 */ lui $a1, 0x42A8 ## $a1 = 42A80000 /* 00704 80B630C4 44073000 */ mfc1 $a3, $f6 -/* 00708 80B630C8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00708 80B630C8 0C01E107 */ jal Math_ApproachF /* 0070C 80B630CC 00000000 */ nop /* 00710 80B630D0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -450,7 +450,7 @@ glabel L80B630A4 /* 00728 80B630E8 26040154 */ addiu $a0, $s0, 0x0154 ## $a0 = 00000154 /* 0072C 80B630EC 3C05C1D0 */ lui $a1, 0xC1D0 ## $a1 = C1D00000 /* 00730 80B630F0 44079000 */ mfc1 $a3, $f18 -/* 00734 80B630F4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00734 80B630F4 0C01E107 */ jal Math_ApproachF /* 00738 80B630F8 00000000 */ nop /* 0073C 80B630FC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -463,7 +463,7 @@ glabel L80B630A4 /* 00758 80B63118 34A5B000 */ ori $a1, $a1, 0xB000 ## $a1 = C542B000 /* 0075C 80B6311C 26040158 */ addiu $a0, $s0, 0x0158 ## $a0 = 00000158 /* 00760 80B63120 44074000 */ mfc1 $a3, $f8 -/* 00764 80B63124 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00764 80B63124 0C01E107 */ jal Math_ApproachF /* 00768 80B63128 00000000 */ nop /* 0076C 80B6312C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -475,7 +475,7 @@ glabel L80B630A4 /* 00784 80B63144 2604015C */ addiu $a0, $s0, 0x015C ## $a0 = 0000015C /* 00788 80B63148 3C05C308 */ lui $a1, 0xC308 ## $a1 = C3080000 /* 0078C 80B6314C 44072000 */ mfc1 $a3, $f4 -/* 00790 80B63150 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00790 80B63150 0C01E107 */ jal Math_ApproachF /* 00794 80B63154 00000000 */ nop /* 00798 80B63158 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -487,7 +487,7 @@ glabel L80B630A4 /* 007B0 80B63170 26040160 */ addiu $a0, $s0, 0x0160 ## $a0 = 00000160 /* 007B4 80B63174 3C054294 */ lui $a1, 0x4294 ## $a1 = 42940000 /* 007B8 80B63178 44075000 */ mfc1 $a3, $f10 -/* 007BC 80B6317C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 007BC 80B6317C 0C01E107 */ jal Math_ApproachF /* 007C0 80B63180 00000000 */ nop /* 007C4 80B63184 3C014220 */ lui $at, 0x4220 ## $at = 42200000 @@ -500,14 +500,14 @@ glabel L80B630A4 /* 007E0 80B631A0 34A54000 */ ori $a1, $a1, 0x4000 ## $a1 = C5534000 /* 007E4 80B631A4 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 007E8 80B631A8 44073000 */ mfc1 $a3, $f6 -/* 007EC 80B631AC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 007EC 80B631AC 0C01E107 */ jal Math_ApproachF /* 007F0 80B631B0 00000000 */ nop /* 007F4 80B631B4 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 007F8 80B631B8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 007FC 80B631BC 260401A8 */ addiu $a0, $s0, 0x01A8 ## $a0 = 000001A8 /* 00800 80B631C0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00804 80B631C4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00804 80B631C4 0C01E107 */ jal Math_ApproachF /* 00808 80B631C8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0080C 80B631CC 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 @@ -590,7 +590,7 @@ glabel L80B632DC /* 00930 80B632F0 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00934 80B632F4 3C054208 */ lui $a1, 0x4208 ## $a1 = 42080000 /* 00938 80B632F8 44075000 */ mfc1 $a3, $f10 -/* 0093C 80B632FC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0093C 80B632FC 0C01E107 */ jal Math_ApproachF /* 00940 80B63300 00000000 */ nop /* 00944 80B63304 C61201A8 */ lwc1 $f18, 0x01A8($s0) ## 000001A8 @@ -601,7 +601,7 @@ glabel L80B632DC /* 00958 80B63318 26040154 */ addiu $a0, $s0, 0x0154 ## $a0 = 00000154 /* 0095C 80B6331C 3C05428A */ lui $a1, 0x428A ## $a1 = 428A0000 /* 00960 80B63320 44073000 */ mfc1 $a3, $f6 -/* 00964 80B63324 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00964 80B63324 0C01E107 */ jal Math_ApproachF /* 00968 80B63328 00000000 */ nop /* 0096C 80B6332C C60801A8 */ lwc1 $f8, 0x01A8($s0) ## 000001A8 @@ -613,7 +613,7 @@ glabel L80B632DC /* 00984 80B63344 34A5A000 */ ori $a1, $a1, 0xA000 ## $a1 = C54DA000 /* 00988 80B63348 26040158 */ addiu $a0, $s0, 0x0158 ## $a0 = 00000158 /* 0098C 80B6334C 44079000 */ mfc1 $a3, $f18 -/* 00990 80B63350 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00990 80B63350 0C01E107 */ jal Math_ApproachF /* 00994 80B63354 00000000 */ nop /* 00998 80B63358 C60401A8 */ lwc1 $f4, 0x01A8($s0) ## 000001A8 @@ -624,7 +624,7 @@ glabel L80B632DC /* 009AC 80B6336C 2604015C */ addiu $a0, $s0, 0x015C ## $a0 = 0000015C /* 009B0 80B63370 3C05C308 */ lui $a1, 0xC308 ## $a1 = C3080000 /* 009B4 80B63374 44074000 */ mfc1 $a3, $f8 -/* 009B8 80B63378 0C01E107 */ jal Math_SmoothScaleMaxF +/* 009B8 80B63378 0C01E107 */ jal Math_ApproachF /* 009BC 80B6337C 00000000 */ nop /* 009C0 80B63380 C60A01A8 */ lwc1 $f10, 0x01A8($s0) ## 000001A8 @@ -635,7 +635,7 @@ glabel L80B632DC /* 009D4 80B63394 26040160 */ addiu $a0, $s0, 0x0160 ## $a0 = 00000160 /* 009D8 80B63398 3C054324 */ lui $a1, 0x4324 ## $a1 = 43240000 /* 009DC 80B6339C 44072000 */ mfc1 $a3, $f4 -/* 009E0 80B633A0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 009E0 80B633A0 0C01E107 */ jal Math_ApproachF /* 009E4 80B633A4 00000000 */ nop /* 009E8 80B633A8 C60601A8 */ lwc1 $f6, 0x01A8($s0) ## 000001A8 @@ -647,7 +647,7 @@ glabel L80B632DC /* 00A00 80B633C0 34A54000 */ ori $a1, $a1, 0x4000 ## $a1 = C5534000 /* 00A04 80B633C4 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 00A08 80B633C8 44075000 */ mfc1 $a3, $f10 -/* 00A0C 80B633CC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00A0C 80B633CC 0C01E107 */ jal Math_ApproachF /* 00A10 80B633D0 00000000 */ nop /* 00A14 80B633D4 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 @@ -655,7 +655,7 @@ glabel L80B632DC /* 00A1C 80B633DC 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A83126F /* 00A20 80B633E0 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00A24 80B633E4 260401A8 */ addiu $a0, $s0, 0x01A8 ## $a0 = 000001A8 -/* 00A28 80B633E8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00A28 80B633E8 0C01E107 */ jal Math_ApproachF /* 00A2C 80B633EC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00A30 80B633F0 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 @@ -872,7 +872,7 @@ glabel L80B63670 /* 00D1C 80B636DC 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00D20 80B636E0 3C054342 */ lui $a1, 0x4342 ## $a1 = 43420000 /* 00D24 80B636E4 44075000 */ mfc1 $a3, $f10 -/* 00D28 80B636E8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00D28 80B636E8 0C01E107 */ jal Math_ApproachF /* 00D2C 80B636EC 00000000 */ nop /* 00D30 80B636F0 C60401A8 */ lwc1 $f4, 0x01A8($s0) ## 000001A8 @@ -883,7 +883,7 @@ glabel L80B63670 /* 00D44 80B63704 26040154 */ addiu $a0, $s0, 0x0154 ## $a0 = 00000154 /* 00D48 80B63708 3C05C1D0 */ lui $a1, 0xC1D0 ## $a1 = C1D00000 /* 00D4C 80B6370C 44073000 */ mfc1 $a3, $f6 -/* 00D50 80B63710 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00D50 80B63710 0C01E107 */ jal Math_ApproachF /* 00D54 80B63714 00000000 */ nop /* 00D58 80B63718 3C0180B6 */ lui $at, %hi(D_80B65410) ## $at = 80B60000 @@ -898,14 +898,14 @@ glabel L80B63670 /* 00D7C 80B6373C 44052000 */ mfc1 $a1, $f4 /* 00D80 80B63740 26040158 */ addiu $a0, $s0, 0x0158 ## $a0 = 00000158 /* 00D84 80B63744 44074000 */ mfc1 $a3, $f8 -/* 00D88 80B63748 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00D88 80B63748 0C01E107 */ jal Math_ApproachF /* 00D8C 80B6374C 00000000 */ nop /* 00D90 80B63750 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00D94 80B63754 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 00D98 80B63758 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 00D9C 80B6375C 3C05C2C8 */ lui $a1, 0xC2C8 ## $a1 = C2C80000 -/* 00DA0 80B63760 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00DA0 80B63760 0C01E107 */ jal Math_ApproachF /* 00DA4 80B63764 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 00DA8 80B63768 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -917,7 +917,7 @@ glabel L80B63670 /* 00DC0 80B63780 2604015C */ addiu $a0, $s0, 0x015C ## $a0 = 0000015C /* 00DC4 80B63784 8E050024 */ lw $a1, 0x0024($s0) ## 00000024 /* 00DC8 80B63788 44079000 */ mfc1 $a3, $f18 -/* 00DCC 80B6378C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00DCC 80B6378C 0C01E107 */ jal Math_ApproachF /* 00DD0 80B63790 00000000 */ nop /* 00DD4 80B63794 3C01428C */ lui $at, 0x428C ## $at = 428C0000 @@ -936,7 +936,7 @@ glabel L80B63670 /* 00E08 80B637C8 44059000 */ mfc1 $a1, $f18 /* 00E0C 80B637CC 26040160 */ addiu $a0, $s0, 0x0160 ## $a0 = 00000160 /* 00E10 80B637D0 44075000 */ mfc1 $a3, $f10 -/* 00E14 80B637D4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00E14 80B637D4 0C01E107 */ jal Math_ApproachF /* 00E18 80B637D8 00000000 */ nop /* 00E1C 80B637DC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -948,14 +948,14 @@ glabel L80B63670 /* 00E34 80B637F4 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 00E38 80B637F8 8E05002C */ lw $a1, 0x002C($s0) ## 0000002C /* 00E3C 80B637FC 44073000 */ mfc1 $a3, $f6 -/* 00E40 80B63800 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00E40 80B63800 0C01E107 */ jal Math_ApproachF /* 00E44 80B63804 00000000 */ nop /* 00E48 80B63808 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00E4C 80B6380C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 00E50 80B63810 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 00E54 80B63814 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 -/* 00E58 80B63818 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00E58 80B63818 0C01E107 */ jal Math_ApproachF /* 00E5C 80B6381C 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 00E60 80B63820 860401C0 */ lh $a0, 0x01C0($s0) ## 000001C0 @@ -968,7 +968,7 @@ glabel L80B63670 /* 00E7C 80B6383C 00812023 */ subu $a0, $a0, $at /* 00E80 80B63840 00042080 */ sll $a0, $a0, 2 /* 00E84 80B63844 00042400 */ sll $a0, $a0, 16 -/* 00E88 80B63848 0C01DE1C */ jal Math_Sins +/* 00E88 80B63848 0C01DE1C */ jal Math_SinS ## sins? /* 00E8C 80B6384C 00042403 */ sra $a0, $a0, 16 /* 00E90 80B63850 46000280 */ add.s $f10, $f0, $f0 @@ -981,7 +981,7 @@ glabel L80B63670 /* 00EAC 80B6386C 44061000 */ mfc1 $a2, $f2 /* 00EB0 80B63870 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 /* 00EB4 80B63874 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD -/* 00EB8 80B63878 0C01E107 */ jal Math_SmoothScaleMaxF +/* 00EB8 80B63878 0C01E107 */ jal Math_ApproachF /* 00EBC 80B6387C 260401A8 */ addiu $a0, $s0, 0x01A8 ## $a0 = 000001A8 /* 00EC0 80B63880 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 @@ -1109,14 +1109,14 @@ glabel L80B63988 /* 01078 80B63A38 44052000 */ mfc1 $a1, $f4 /* 0107C 80B63A3C 26040158 */ addiu $a0, $s0, 0x0158 ## $a0 = 00000158 /* 01080 80B63A40 44074000 */ mfc1 $a3, $f8 -/* 01084 80B63A44 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01084 80B63A44 0C01E107 */ jal Math_ApproachF /* 01088 80B63A48 00000000 */ nop /* 0108C 80B63A4C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01090 80B63A50 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01094 80B63A54 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 01098 80B63A58 3C05C2C8 */ lui $a1, 0xC2C8 ## $a1 = C2C80000 -/* 0109C 80B63A5C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0109C 80B63A5C 0C01E107 */ jal Math_ApproachF /* 010A0 80B63A60 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 010A4 80B63A64 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -1128,7 +1128,7 @@ glabel L80B63988 /* 010BC 80B63A7C 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 010C0 80B63A80 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 010C4 80B63A84 44079000 */ mfc1 $a3, $f18 -/* 010C8 80B63A88 0C01E107 */ jal Math_SmoothScaleMaxF +/* 010C8 80B63A88 0C01E107 */ jal Math_ApproachF /* 010CC 80B63A8C 00000000 */ nop /* 010D0 80B63A90 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -1137,7 +1137,7 @@ glabel L80B63988 /* 010DC 80B63A9C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 010E0 80B63AA0 44050000 */ mfc1 $a1, $f0 /* 010E4 80B63AA4 44060000 */ mfc1 $a2, $f0 -/* 010E8 80B63AA8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 010E8 80B63AA8 0C01E107 */ jal Math_ApproachF /* 010EC 80B63AAC 260401A8 */ addiu $a0, $s0, 0x01A8 ## $a0 = 000001A8 /* 010F0 80B63AB0 3C0180B6 */ lui $at, %hi(D_80B65418) ## $at = 80B60000 @@ -1186,14 +1186,14 @@ glabel L80B63988 /* 01190 80B63B50 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 01194 80B63B54 2604015C */ addiu $a0, $s0, 0x015C ## $a0 = 0000015C /* 01198 80B63B58 8E050024 */ lw $a1, 0x0024($s0) ## 00000024 -/* 0119C 80B63B5C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0119C 80B63B5C 0C01E107 */ jal Math_ApproachF /* 011A0 80B63B60 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 011A4 80B63B64 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 011A8 80B63B68 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 011AC 80B63B6C 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 011B0 80B63B70 8E05002C */ lw $a1, 0x002C($s0) ## 0000002C -/* 011B4 80B63B74 0C01E107 */ jal Math_SmoothScaleMaxF +/* 011B4 80B63B74 0C01E107 */ jal Math_ApproachF /* 011B8 80B63B78 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 011BC 80B63B7C 3C0480B6 */ lui $a0, %hi(D_80B65220) ## $a0 = 80B60000 @@ -1250,14 +1250,14 @@ glabel L80B63C0C /* 01280 80B63C40 44055000 */ mfc1 $a1, $f10 /* 01284 80B63C44 26040158 */ addiu $a0, $s0, 0x0158 ## $a0 = 00000158 /* 01288 80B63C48 44073000 */ mfc1 $a3, $f6 -/* 0128C 80B63C4C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0128C 80B63C4C 0C01E107 */ jal Math_ApproachF /* 01290 80B63C50 00000000 */ nop /* 01294 80B63C54 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01298 80B63C58 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0129C 80B63C5C 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 012A0 80B63C60 3C05C2C8 */ lui $a1, 0xC2C8 ## $a1 = C2C80000 -/* 012A4 80B63C64 0C01E107 */ jal Math_SmoothScaleMaxF +/* 012A4 80B63C64 0C01E107 */ jal Math_ApproachF /* 012A8 80B63C68 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 012AC 80B63C6C 3C01428C */ lui $at, 0x428C ## $at = 428C0000 @@ -1276,7 +1276,7 @@ glabel L80B63C0C /* 012E0 80B63CA0 44053000 */ mfc1 $a1, $f6 /* 012E4 80B63CA4 26040160 */ addiu $a0, $s0, 0x0160 ## $a0 = 00000160 /* 012E8 80B63CA8 44072000 */ mfc1 $a3, $f4 -/* 012EC 80B63CAC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 012EC 80B63CAC 0C01E107 */ jal Math_ApproachF /* 012F0 80B63CB0 00000000 */ nop /* 012F4 80B63CB4 861901D6 */ lh $t9, 0x01D6($s0) ## 000001D6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s index fcf9701b22..048c512d4b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s @@ -75,7 +75,7 @@ glabel func_80B6404C /* 01754 80B64114 34A56A7E */ ori $a1, $a1, 0x6A7E ## $a1 = 3C3C6A7E /* 01758 80B64118 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 /* 0175C 80B6411C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01760 80B64120 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01760 80B64120 0C01E107 */ jal Math_ApproachF /* 01764 80B64124 8E0701A4 */ lw $a3, 0x01A4($s0) ## 000001A4 /* 01768 80B64128 3C053951 */ lui $a1, 0x3951 ## $a1 = 39510000 @@ -83,14 +83,14 @@ glabel func_80B6404C /* 01770 80B64130 34E7539C */ ori $a3, $a3, 0x539C ## $a3 = 35C9539C /* 01774 80B64134 34A5B717 */ ori $a1, $a1, 0xB717 ## $a1 = 3951B717 /* 01778 80B64138 260401A4 */ addiu $a0, $s0, 0x01A4 ## $a0 = 000001A4 -/* 0177C 80B6413C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0177C 80B6413C 0C01E107 */ jal Math_ApproachF /* 01780 80B64140 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01784 80B64144 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01788 80B64148 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0178C 80B6414C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 01790 80B64150 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 -/* 01794 80B64154 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01794 80B64154 0C01E107 */ jal Math_ApproachF /* 01798 80B64158 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 0179C 80B6415C 861901D4 */ lh $t9, 0x01D4($s0) ## 000001D4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s index 149542fe34..9c1d70020b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s @@ -44,7 +44,7 @@ glabel func_80B6424C /* 018D4 80B64294 34E7B717 */ ori $a3, $a3, 0xB717 ## $a3 = 3951B717 /* 018D8 80B64298 34A56A7E */ ori $a1, $a1, 0x6A7E ## $a1 = 3C3C6A7E /* 018DC 80B6429C 26040058 */ addiu $a0, $s0, 0x0058 ## $a0 = 00000058 -/* 018E0 80B642A0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 018E0 80B642A0 0C01E107 */ jal Math_ApproachF /* 018E4 80B642A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 018E8 80B642A8 860F01D4 */ lh $t7, 0x01D4($s0) ## 000001D4 @@ -63,25 +63,25 @@ glabel func_80B6424C /* 01918 80B642D8 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 /* 0191C 80B642DC 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 01920 80B642E0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01924 80B642E4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01924 80B642E4 0C01E107 */ jal Math_ApproachF /* 01928 80B642E8 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 0192C 80B642EC 260401EC */ addiu $a0, $s0, 0x01EC ## $a0 = 000001EC /* 01930 80B642F0 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 01934 80B642F4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01938 80B642F8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01938 80B642F8 0C01E107 */ jal Math_ApproachF /* 0193C 80B642FC 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01940 80B64300 260401F0 */ addiu $a0, $s0, 0x01F0 ## $a0 = 000001F0 /* 01944 80B64304 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 01948 80B64308 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0194C 80B6430C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0194C 80B6430C 0C01E107 */ jal Math_ApproachF /* 01950 80B64310 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01954 80B64314 260401F4 */ addiu $a0, $s0, 0x01F4 ## $a0 = 000001F4 /* 01958 80B64318 3C05C270 */ lui $a1, 0xC270 ## $a1 = C2700000 /* 0195C 80B6431C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01960 80B64320 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01960 80B64320 0C01E107 */ jal Math_ApproachF /* 01964 80B64324 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 01968 80B64328 10000084 */ beq $zero, $zero, .L80B6453C @@ -98,7 +98,7 @@ glabel func_80B6424C /* 01990 80B64350 46062100 */ add.s $f4, $f4, $f6 .L80B64354: /* 01994 80B64354 44052000 */ mfc1 $a1, $f4 -/* 01998 80B64358 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01998 80B64358 0C01E107 */ jal Math_ApproachF /* 0199C 80B6435C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 019A0 80B64360 8FAA005C */ lw $t2, 0x005C($sp) @@ -114,7 +114,7 @@ glabel func_80B6424C /* 019C8 80B64388 460A4200 */ add.s $f8, $f8, $f10 .L80B6438C: /* 019CC 80B6438C 44054000 */ mfc1 $a1, $f8 -/* 019D0 80B64390 0C01E107 */ jal Math_SmoothScaleMaxF +/* 019D0 80B64390 0C01E107 */ jal Math_ApproachF /* 019D4 80B64394 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 019D8 80B64398 8FAC005C */ lw $t4, 0x005C($sp) @@ -130,13 +130,13 @@ glabel func_80B6424C /* 01A00 80B643C0 46128400 */ add.s $f16, $f16, $f18 .L80B643C4: /* 01A04 80B643C4 44058000 */ mfc1 $a1, $f16 -/* 01A08 80B643C8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01A08 80B643C8 0C01E107 */ jal Math_ApproachF /* 01A0C 80B643CC 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01A10 80B643D0 260401F4 */ addiu $a0, $s0, 0x01F4 ## $a0 = 000001F4 /* 01A14 80B643D4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 01A18 80B643D8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01A1C 80B643DC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01A1C 80B643DC 0C01E107 */ jal Math_ApproachF /* 01A20 80B643E0 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 01A24 80B643E4 860E01D6 */ lh $t6, 0x01D6($s0) ## 000001D6 @@ -215,26 +215,26 @@ glabel func_80B6424C /* 01B24 80B644E4 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3B03126F /* 01B28 80B644E8 34A56A7E */ ori $a1, $a1, 0x6A7E ## $a1 = 3C3C6A7E /* 01B2C 80B644EC 26040058 */ addiu $a0, $s0, 0x0058 ## $a0 = 00000058 -/* 01B30 80B644F0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01B30 80B644F0 0C01E107 */ jal Math_ApproachF /* 01B34 80B644F4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01B38 80B644F8 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 01B3C 80B644FC 8E05018C */ lw $a1, 0x018C($s0) ## 0000018C /* 01B40 80B64500 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01B44 80B64504 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01B44 80B64504 0C01E107 */ jal Math_ApproachF /* 01B48 80B64508 8E070198 */ lw $a3, 0x0198($s0) ## 00000198 /* 01B4C 80B6450C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01B50 80B64510 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01B54 80B64514 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 01B58 80B64518 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 -/* 01B5C 80B6451C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01B5C 80B6451C 0C01E107 */ jal Math_ApproachF /* 01B60 80B64520 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 01B64 80B64524 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 01B68 80B64528 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 /* 01B6C 80B6452C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01B70 80B64530 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01B70 80B64530 0C01E107 */ jal Math_ApproachF /* 01B74 80B64534 8E07019C */ lw $a3, 0x019C($s0) ## 0000019C /* 01B78 80B64538 860A01DE */ lh $t2, 0x01DE($s0) ## 000001DE diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s index df591b0a53..57e439e80f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s @@ -41,7 +41,7 @@ glabel func_80B6476C /* 01E0C 80B647CC 46062100 */ add.s $f4, $f4, $f6 .L80B647D0: /* 01E10 80B647D0 44052000 */ mfc1 $a1, $f4 -/* 01E14 80B647D4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01E14 80B647D4 0C01E107 */ jal Math_ApproachF /* 01E18 80B647D8 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01E1C 80B647DC 8FB80064 */ lw $t8, 0x0064($sp) @@ -57,7 +57,7 @@ glabel func_80B6476C /* 01E44 80B64804 460A4200 */ add.s $f8, $f8, $f10 .L80B64808: /* 01E48 80B64808 44054000 */ mfc1 $a1, $f8 -/* 01E4C 80B6480C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01E4C 80B6480C 0C01E107 */ jal Math_ApproachF /* 01E50 80B64810 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01E54 80B64814 8FA80064 */ lw $t0, 0x0064($sp) @@ -73,13 +73,13 @@ glabel func_80B6476C /* 01E7C 80B6483C 46049480 */ add.s $f18, $f18, $f4 .L80B64840: /* 01E80 80B64840 44059000 */ mfc1 $a1, $f18 -/* 01E84 80B64844 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01E84 80B64844 0C01E107 */ jal Math_ApproachF /* 01E88 80B64848 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01E8C 80B6484C 4406A000 */ mfc1 $a2, $f20 /* 01E90 80B64850 260401F4 */ addiu $a0, $s0, 0x01F4 ## $a0 = 000001F4 /* 01E94 80B64854 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01E98 80B64858 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01E98 80B64858 0C01E107 */ jal Math_ApproachF /* 01E9C 80B6485C 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 01EA0 80B64860 3C053C3C */ lui $a1, 0x3C3C ## $a1 = 3C3C0000 @@ -87,7 +87,7 @@ glabel func_80B6476C /* 01EA8 80B64868 3C073B03 */ lui $a3, 0x3B03 ## $a3 = 3B030000 /* 01EAC 80B6486C 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3B03126F /* 01EB0 80B64870 34A56A7E */ ori $a1, $a1, 0x6A7E ## $a1 = 3C3C6A7E -/* 01EB4 80B64874 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01EB4 80B64874 0C01E107 */ jal Math_ApproachF /* 01EB8 80B64878 26040058 */ addiu $a0, $s0, 0x0058 ## $a0 = 00000058 /* 01EBC 80B6487C 860A01D4 */ lh $t2, 0x01D4($s0) ## 000001D4 @@ -97,7 +97,7 @@ glabel func_80B6476C /* 01ECC 80B6488C 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 01ED0 80B64890 4405A000 */ mfc1 $a1, $f20 /* 01ED4 80B64894 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 01ED8 80B64898 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 01ED8 80B64898 0C01E123 */ jal Math_ApproachZeroF /* 01EDC 80B6489C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01EE0 80B648A0 860B01D4 */ lh $t3, 0x01D4($s0) ## 000001D4 @@ -131,7 +131,7 @@ glabel func_80B6476C .L80B64910: /* 01F50 80B64910 4405A000 */ mfc1 $a1, $f20 /* 01F54 80B64914 4406A000 */ mfc1 $a2, $f20 -/* 01F58 80B64918 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01F58 80B64918 0C01E107 */ jal Math_ApproachF /* 01F5C 80B6491C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 0000CCCD .L80B64920: @@ -143,14 +143,14 @@ glabel func_80B6476C /* 01F70 80B64930 46062202 */ mul.s $f8, $f4, $f6 /* 01F74 80B64934 8E05018C */ lw $a1, 0x018C($s0) ## 0000018C /* 01F78 80B64938 44074000 */ mfc1 $a3, $f8 -/* 01F7C 80B6493C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01F7C 80B6493C 0C01E107 */ jal Math_ApproachF /* 01F80 80B64940 00000000 */ nop /* 01F84 80B64944 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01F88 80B64948 4407A000 */ mfc1 $a3, $f20 /* 01F8C 80B6494C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01F90 80B64950 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 01F94 80B64954 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01F94 80B64954 0C01E107 */ jal Math_ApproachF /* 01F98 80B64958 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 /* 01F9C 80B6495C C60A01A0 */ lwc1 $f10, 0x01A0($s0) ## 000001A0 @@ -160,7 +160,7 @@ glabel func_80B6476C /* 01FAC 80B6496C 46125102 */ mul.s $f4, $f10, $f18 /* 01FB0 80B64970 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 /* 01FB4 80B64974 44072000 */ mfc1 $a3, $f4 -/* 01FB8 80B64978 0C01E107 */ jal Math_SmoothScaleMaxF +/* 01FB8 80B64978 0C01E107 */ jal Math_ApproachF /* 01FBC 80B6497C 00000000 */ nop /* 01FC0 80B64980 C60E018C */ lwc1 $f14, 0x018C($s0) ## 0000018C diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B64AA8.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B64AA8.s index 20870f038c..0f22990b89 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B64AA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B64AA8.s @@ -32,7 +32,7 @@ glabel func_80B64AA8 /* 02118 80B64AD8 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 0211C 80B64ADC 50A00004 */ beql $a1, $zero, .L80B64AF0 /* 02120 80B64AE0 862E001C */ lh $t6, 0x001C($s1) ## 0000001C -/* 02124 80B64AE4 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 02124 80B64AE4 0C01E1EF */ jal Math_ApproachS /* 02128 80B64AE8 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 0212C 80B64AEC 862E001C */ lh $t6, 0x001C($s1) ## 0000001C @@ -70,7 +70,7 @@ glabel func_80B64AA8 /* 021A0 80B64B60 44050000 */ mfc1 $a1, $f0 /* 021A4 80B64B64 44070000 */ mfc1 $a3, $f0 /* 021A8 80B64B68 4406A000 */ mfc1 $a2, $f20 -/* 021AC 80B64B6C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 021AC 80B64B6C 0C01E107 */ jal Math_ApproachF /* 021B0 80B64B70 26240058 */ addiu $a0, $s1, 0x0058 ## $a0 = 00000058 /* 021B4 80B64B74 3C053B03 */ lui $a1, 0x3B03 ## $a1 = 3B030000 @@ -79,14 +79,14 @@ glabel func_80B64AA8 /* 021C0 80B64B80 34E7B717 */ ori $a3, $a3, 0xB717 ## $a3 = 38D1B717 /* 021C4 80B64B84 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 021C8 80B64B88 34A5126F */ ori $a1, $a1, 0x126F ## $a1 = 3B03126F -/* 021CC 80B64B8C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 021CC 80B64B8C 0C01E107 */ jal Math_ApproachF /* 021D0 80B64B90 26240050 */ addiu $a0, $s1, 0x0050 ## $a0 = 00000050 /* 021D4 80B64B94 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 021D8 80B64B98 4407A000 */ mfc1 $a3, $f20 /* 021DC 80B64B9C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 021E0 80B64BA0 26240028 */ addiu $a0, $s1, 0x0028 ## $a0 = 00000028 -/* 021E4 80B64BA4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 021E4 80B64BA4 0C01E107 */ jal Math_ApproachF /* 021E8 80B64BA8 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 021EC 80B64BAC 862201D4 */ lh $v0, 0x01D4($s1) ## 000001D4 @@ -123,7 +123,7 @@ glabel func_80B64AA8 /* 0225C 80B64C1C 1000002F */ beq $zero, $zero, .L80B64CDC /* 02260 80B64C20 AE200134 */ sw $zero, 0x0134($s1) ## 00000134 .L80B64C24: -/* 02264 80B64C24 0C03F66B */ jal Math_Rand_ZeroOne +/* 02264 80B64C24 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02268 80B64C28 00000000 */ nop /* 0226C 80B64C2C 3C0180B6 */ lui $at, %hi(D_80B65450) ## $at = 80B60000 @@ -140,7 +140,7 @@ glabel func_80B64AA8 /* 02298 80B64C58 0C2D8F61 */ jal func_80B63D84 /* 0229C 80B64C5C 00063403 */ sra $a2, $a2, 16 .L80B64C60: -/* 022A0 80B64C60 0C03F66B */ jal Math_Rand_ZeroOne +/* 022A0 80B64C60 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 022A4 80B64C64 00000000 */ nop /* 022A8 80B64C68 46140482 */ mul.s $f18, $f0, $f20 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s index 8833adc0a4..f9b790d979 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s @@ -384,7 +384,7 @@ glabel Fishing_Init /* 010B8 80B6AA58 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 010BC 80B6AA5C 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 010C0 80B6AA60 E6000008 */ swc1 $f0, 0x0008($s0) ## 80B830C0 -/* 010C4 80B6AA64 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 010C4 80B6AA64 0C00CFBE */ jal Rand_ZeroFloat /* 010C8 80B6AA68 E6000014 */ swc1 $f0, 0x0014($s0) ## 80B830CC /* 010CC 80B6AA6C 4600028D */ trunc.w.s $f10, $f0 @@ -493,7 +493,7 @@ glabel Fishing_Init /* 01240 80B6ABE0 4481A000 */ mtc1 $at, $f20 ## $f20 = 65536.00 /* 01244 80B6ABE4 00000000 */ nop .L80B6ABE8: -/* 01248 80B6ABE8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01248 80B6ABE8 0C00CFBE */ jal Rand_ZeroFloat /* 0124C 80B6ABEC 4600A306 */ mov.s $f12, $f20 /* 01250 80B6ABF0 3C0980B8 */ lui $t1, %hi(D_80B7AD40) ## $t1 = 80B80000 @@ -630,7 +630,7 @@ glabel Fishing_Init .L80B6ADD8: /* 01438 80B6ADD8 E64A01AC */ swc1 $f10, 0x01AC($s2) ## 000001AC /* 0143C 80B6ADDC 3C0180B8 */ lui $at, %hi(D_80B7B384) ## $at = 80B80000 -/* 01440 80B6ADE0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01440 80B6ADE0 0C00CFBE */ jal Rand_ZeroFloat /* 01444 80B6ADE4 C42CB384 */ lwc1 $f12, %lo(D_80B7B384)($at) /* 01448 80B6ADE8 C65201AC */ lwc1 $f18, 0x01AC($s2) ## 000001AC @@ -643,7 +643,7 @@ glabel Fishing_Init /* 01464 80B6AE04 00000000 */ nop /* 01468 80B6AE08 4500000F */ bc1f .L80B6AE48 /* 0146C 80B6AE0C 00000000 */ nop -/* 01470 80B6AE10 0C03F66B */ jal Math_Rand_ZeroOne +/* 01470 80B6AE10 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01474 80B6AE14 00000000 */ nop /* 01478 80B6AE18 3C0180B8 */ lui $at, %hi(D_80B7B388) ## $at = 80B80000 @@ -653,7 +653,7 @@ glabel Fishing_Init /* 01488 80B6AE28 00000000 */ nop /* 0148C 80B6AE2C 45000006 */ bc1f .L80B6AE48 /* 01490 80B6AE30 00000000 */ nop -/* 01494 80B6AE34 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 01494 80B6AE34 0C00CFBE */ jal Rand_ZeroFloat /* 01498 80B6AE38 C42CB38C */ lwc1 $f12, %lo(D_80B7B38C)($at) /* 0149C 80B6AE3C C64A01AC */ lwc1 $f10, 0x01AC($s2) ## 000001AC diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s index 120581151c..cd33178bcd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s @@ -520,7 +520,7 @@ glabel Fishing_Update /* 07E58 80B717F8 4406A000 */ mfc1 $a2, $f20 /* 07E5C 80B717FC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD /* 07E60 80B71800 AFA800E0 */ sw $t0, 0x00E0($sp) -/* 07E64 80B71804 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07E64 80B71804 0C01E107 */ jal Math_ApproachF /* 07E68 80B71808 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 07E6C 80B7180C 860C0158 */ lh $t4, 0x0158($s0) ## 00000158 @@ -530,7 +530,7 @@ glabel Fishing_Update /* 07E7C 80B7181C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 07E80 80B71820 2604019C */ addiu $a0, $s0, 0x019C ## $a0 = 0000019C /* 07E84 80B71824 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 07E88 80B71828 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07E88 80B71828 0C01E107 */ jal Math_ApproachF /* 07E8C 80B7182C 3C074348 */ lui $a3, 0x4348 ## $a3 = 43480000 /* 07E90 80B71830 10000027 */ beq $zero, $zero, .L80B718D0 @@ -572,7 +572,7 @@ glabel Fishing_Update /* 07F18 80B718B8 46023202 */ mul.s $f8, $f6, $f2 /* 07F1C 80B718BC 44052000 */ mfc1 $a1, $f4 /* 07F20 80B718C0 44074000 */ mfc1 $a3, $f8 -/* 07F24 80B718C4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07F24 80B718C4 0C01E107 */ jal Math_ApproachF /* 07F28 80B718C8 00000000 */ nop /* 07F2C 80B718CC 26040170 */ addiu $a0, $s0, 0x0170 ## $a0 = 00000170 @@ -580,7 +580,7 @@ glabel Fishing_Update /* 07F30 80B718D0 AFA40040 */ sw $a0, 0x0040($sp) /* 07F34 80B718D4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 07F38 80B718D8 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 07F3C 80B718DC 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 07F3C 80B718DC 0C01E1EF */ jal Math_ApproachS /* 07F40 80B718E0 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 /* 07F44 80B718E4 92090150 */ lbu $t1, 0x0150($s0) ## 00000150 @@ -713,7 +713,7 @@ glabel Fishing_Update /* 0811C 80B71ABC C60401BC */ lwc1 $f4, 0x01BC($s0) ## 000001BC /* 08120 80B71AC0 E7AE0130 */ swc1 $f14, 0x0130($sp) /* 08124 80B71AC4 460A2301 */ sub.s $f12, $f4, $f10 -/* 08128 80B71AC8 0C034199 */ jal atan2s +/* 08128 80B71AC8 0C034199 */ jal Math_Atan2S /* 0812C 80B71ACC E7AC0128 */ swc1 $f12, 0x0128($sp) /* 08130 80B71AD0 C7B00130 */ lwc1 $f16, 0x0130($sp) @@ -724,7 +724,7 @@ glabel Fishing_Update /* 08144 80B71AE4 46129182 */ mul.s $f6, $f18, $f18 /* 08148 80B71AE8 46064080 */ add.s $f2, $f8, $f6 /* 0814C 80B71AEC 46001304 */ sqrt.s $f12, $f2 -/* 08150 80B71AF0 0C034199 */ jal atan2s +/* 08150 80B71AF0 0C034199 */ jal Math_Atan2S /* 08154 80B71AF4 E7A2004C */ swc1 $f2, 0x004C($sp) /* 08158 80B71AF8 C7AC012C */ lwc1 $f12, 0x012C($sp) @@ -858,7 +858,7 @@ glabel Fishing_Update /* 08338 80B71CD8 00812023 */ subu $a0, $a0, $at /* 0833C 80B71CDC 00042080 */ sll $a0, $a0, 2 /* 08340 80B71CE0 00042400 */ sll $a0, $a0, 16 -/* 08344 80B71CE4 0C01DE1C */ jal Math_Sins +/* 08344 80B71CE4 0C01DE1C */ jal Math_SinS ## sins? /* 08348 80B71CE8 00042403 */ sra $a0, $a0, 16 /* 0834C 80B71CEC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -876,7 +876,7 @@ glabel Fishing_Update /* 0837C 80B71D1C 00812023 */ subu $a0, $a0, $at /* 08380 80B71D20 00042040 */ sll $a0, $a0, 1 /* 08384 80B71D24 00042400 */ sll $a0, $a0, 16 -/* 08388 80B71D28 0C01DE1C */ jal Math_Sins +/* 08388 80B71D28 0C01DE1C */ jal Math_SinS ## sins? /* 0838C 80B71D2C 00042403 */ sra $a0, $a0, 16 /* 08390 80B71D30 3C014000 */ lui $at, 0x4000 ## $at = 40000000 @@ -910,7 +910,7 @@ glabel Fishing_Update /* 08400 80B71DA0 45000020 */ bc1f .L80B71E24 /* 08404 80B71DA4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 08408 80B71DA8 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 0840C 80B71DAC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0840C 80B71DAC 0C00CFC8 */ jal Rand_CenteredFloat /* 08410 80B71DB0 00000000 */ nop /* 08414 80B71DB4 3C014302 */ lui $at, 0x4302 ## $at = 43020000 @@ -921,7 +921,7 @@ glabel Fishing_Update /* 08428 80B71DC8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0842C 80B71DCC 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 08430 80B71DD0 E7A600C8 */ swc1 $f6, 0x00C8($sp) -/* 08434 80B71DD4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 08434 80B71DD4 0C00CFC8 */ jal Rand_CenteredFloat /* 08438 80B71DD8 E7A800C4 */ swc1 $f8, 0x00C4($sp) /* 0843C 80B71DDC 3C0144A0 */ lui $at, 0x44A0 ## $at = 44A00000 @@ -929,7 +929,7 @@ glabel Fishing_Update /* 08444 80B71DE4 3C0180B8 */ lui $at, %hi(D_80B7B630) ## $at = 80B80000 /* 08448 80B71DE8 C42CB630 */ lwc1 $f12, %lo(D_80B7B630)($at) /* 0844C 80B71DEC 46040280 */ add.s $f10, $f0, $f4 -/* 08450 80B71DF0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 08450 80B71DF0 0C00CFBE */ jal Rand_ZeroFloat /* 08454 80B71DF4 E7AA00CC */ swc1 $f10, 0x00CC($sp) /* 08458 80B71DF8 3C0180B8 */ lui $at, %hi(D_80B7B634) ## $at = 80B80000 @@ -947,7 +947,7 @@ glabel Fishing_Update /* 08484 80B71E24 8604015C */ lh $a0, 0x015C($s0) ## 0000015C /* 08488 80B71E28 000422C0 */ sll $a0, $a0, 11 /* 0848C 80B71E2C 00042400 */ sll $a0, $a0, 16 -/* 08490 80B71E30 0C01DE1C */ jal Math_Sins +/* 08490 80B71E30 0C01DE1C */ jal Math_SinS ## sins? /* 08494 80B71E34 00042403 */ sra $a0, $a0, 16 /* 08498 80B71E38 3C0180B8 */ lui $at, %hi(D_80B7B638) ## $at = 80B80000 @@ -961,7 +961,7 @@ glabel Fishing_Update /* 084B8 80B71E58 44054000 */ mfc1 $a1, $f8 /* 084BC 80B71E5C 00000000 */ nop /* 084C0 80B71E60 00052C00 */ sll $a1, $a1, 16 -/* 084C4 80B71E64 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 084C4 80B71E64 0C01E1EF */ jal Math_ApproachS /* 084C8 80B71E68 00052C03 */ sra $a1, $a1, 16 /* 084CC 80B71E6C 8604015C */ lh $a0, 0x015C($s0) ## 0000015C @@ -970,7 +970,7 @@ glabel Fishing_Update /* 084D8 80B71E78 00812021 */ addu $a0, $a0, $at /* 084DC 80B71E7C 00042240 */ sll $a0, $a0, 9 /* 084E0 80B71E80 00042400 */ sll $a0, $a0, 16 -/* 084E4 80B71E84 0C01DE1C */ jal Math_Sins +/* 084E4 80B71E84 0C01DE1C */ jal Math_SinS ## sins? /* 084E8 80B71E88 00042403 */ sra $a0, $a0, 16 /* 084EC 80B71E8C 3C0180B8 */ lui $at, %hi(D_80B7B63C) ## $at = 80B80000 @@ -983,7 +983,7 @@ glabel Fishing_Update /* 08508 80B71EA8 44055000 */ mfc1 $a1, $f10 /* 0850C 80B71EAC 00000000 */ nop /* 08510 80B71EB0 00052C00 */ sll $a1, $a1, 16 -/* 08514 80B71EB4 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 08514 80B71EB4 0C01E1EF */ jal Math_ApproachS /* 08518 80B71EB8 00052C03 */ sra $a1, $a1, 16 /* 0851C 80B71EBC 3C0180B8 */ lui $at, %hi(D_80B7B640) ## $at = 80B80000 @@ -1003,13 +1003,13 @@ glabel L80B71ED8 /* 08550 80B71EF0 3C054000 */ lui $a1, 0x4000 ## $a1 = 40000000 /* 08554 80B71EF4 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 08558 80B71EF8 AE0D01B8 */ sw $t5, 0x01B8($s0) ## 000001B8 -/* 0855C 80B71EFC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0855C 80B71EFC 0C01E107 */ jal Math_ApproachF /* 08560 80B71F00 AE0E01BC */ sw $t6, 0x01BC($s0) ## 000001BC /* 08564 80B71F04 4406A000 */ mfc1 $a2, $f20 /* 08568 80B71F08 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 0856C 80B71F0C 3C054580 */ lui $a1, 0x4580 ## $a1 = 45800000 -/* 08570 80B71F10 0C01E107 */ jal Math_SmoothScaleMaxF +/* 08570 80B71F10 0C01E107 */ jal Math_ApproachF /* 08574 80B71F14 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 /* 08578 80B71F18 3C014220 */ lui $at, 0x4220 ## $at = 42200000 @@ -1060,13 +1060,13 @@ glabel L80B71FA8 /* 08624 80B71FC4 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 08628 80B71FC8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0862C 80B71FCC AE0C01B8 */ sw $t4, 0x01B8($s0) ## 000001B8 -/* 08630 80B71FD0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 08630 80B71FD0 0C01E107 */ jal Math_ApproachF /* 08634 80B71FD4 AE0901BC */ sw $t1, 0x01BC($s0) ## 000001BC /* 08638 80B71FD8 4406A000 */ mfc1 $a2, $f20 /* 0863C 80B71FDC 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 08640 80B71FE0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 08644 80B71FE4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 08644 80B71FE4 0C01E107 */ jal Math_ApproachF /* 08648 80B71FE8 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 /* 0864C 80B71FEC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 @@ -1118,7 +1118,7 @@ glabel L80B71FA8 /* 086FC 80B7209C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 08700 80B720A0 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 /* 08704 80B720A4 44816000 */ mtc1 $at, $f12 ## $f12 = 150.00 -/* 08708 80B720A8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 08708 80B720A8 0C00CFBE */ jal Rand_ZeroFloat /* 0870C 80B720AC A60F0158 */ sh $t7, 0x0158($s0) ## 00000158 /* 08710 80B720B0 4600028D */ trunc.w.s $f10, $f0 @@ -1136,7 +1136,7 @@ glabel L80B71FA8 /* 0873C 80B720DC 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 08740 80B720E0 240B0007 */ addiu $t3, $zero, 0x0007 ## $t3 = 00000007 /* 08744 80B720E4 44816000 */ mtc1 $at, $f12 ## $f12 = 150.00 -/* 08748 80B720E8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 08748 80B720E8 0C00CFBE */ jal Rand_ZeroFloat /* 0874C 80B720EC A60B0158 */ sh $t3, 0x0158($s0) ## 00000158 /* 08750 80B720F0 4600020D */ trunc.w.s $f8, $f0 @@ -1153,7 +1153,7 @@ glabel L80B71FA8 /* 08778 80B72118 A46009F2 */ sh $zero, 0x09F2($v1) ## 801609F2 /* 0877C 80B7211C 240C0007 */ addiu $t4, $zero, 0x0007 ## $t4 = 00000007 /* 08780 80B72120 44816000 */ mtc1 $at, $f12 ## $f12 = 150.00 -/* 08784 80B72124 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 08784 80B72124 0C00CFBE */ jal Rand_ZeroFloat /* 08788 80B72128 A60C0158 */ sh $t4, 0x0158($s0) ## 00000158 /* 0878C 80B7212C 4600018D */ trunc.w.s $f6, $f0 @@ -1167,13 +1167,13 @@ glabel L80B72144 /* 087A8 80B72148 4406A000 */ mfc1 $a2, $f20 /* 087AC 80B7214C 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 087B0 80B72150 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD -/* 087B4 80B72154 0C01E107 */ jal Math_SmoothScaleMaxF +/* 087B4 80B72154 0C01E107 */ jal Math_ApproachF /* 087B8 80B72158 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 087BC 80B7215C 4406A000 */ mfc1 $a2, $f20 /* 087C0 80B72160 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 087C4 80B72164 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 087C8 80B72168 0C01E107 */ jal Math_SmoothScaleMaxF +/* 087C8 80B72168 0C01E107 */ jal Math_ApproachF /* 087CC 80B7216C 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 /* 087D0 80B72170 8618017A */ lh $t8, 0x017A($s0) ## 0000017A @@ -1190,7 +1190,7 @@ glabel L80B72144 /* 087F8 80B72198 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 087FC 80B7219C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 08800 80B721A0 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 08804 80B721A4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 08804 80B721A4 0C00CFBE */ jal Rand_ZeroFloat /* 08808 80B721A8 A60C0158 */ sh $t4, 0x0158($s0) ## 00000158 /* 0880C 80B721AC 4600010D */ trunc.w.s $f4, $f0 @@ -1199,12 +1199,12 @@ glabel L80B72144 /* 08818 80B721B8 440E2000 */ mfc1 $t6, $f4 /* 0881C 80B721BC 00000000 */ nop /* 08820 80B721C0 25CF000A */ addiu $t7, $t6, 0x000A ## $t7 = 0000000A -/* 08824 80B721C4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 08824 80B721C4 0C00CFC8 */ jal Rand_CenteredFloat /* 08828 80B721C8 A60F017A */ sh $t7, 0x017A($s0) ## 0000017A /* 0882C 80B721CC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 08830 80B721D0 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 08834 80B721D4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 08834 80B721D4 0C00CFBE */ jal Rand_ZeroFloat /* 08838 80B721D8 E60001B4 */ swc1 $f0, 0x01B4($s0) ## 000001B4 /* 0883C 80B721DC 8E3807C0 */ lw $t8, 0x07C0($s1) ## 000007C0 @@ -1219,7 +1219,7 @@ glabel L80B72144 /* 08860 80B72200 46805220 */ cvt.s.w $f8, $f10 /* 08864 80B72204 46064101 */ sub.s $f4, $f8, $f6 /* 08868 80B72208 46002281 */ sub.s $f10, $f4, $f0 -/* 0886C 80B7220C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0886C 80B7220C 0C00CFC8 */ jal Rand_CenteredFloat /* 08870 80B72210 E60A01B8 */ swc1 $f10, 0x01B8($s0) ## 000001B8 /* 08874 80B72214 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 @@ -1265,7 +1265,7 @@ glabel L80B72260 /* 08904 80B722A4 4406A000 */ mfc1 $a2, $f20 /* 08908 80B722A8 AFA4004C */ sw $a0, 0x004C($sp) /* 0890C 80B722AC 3C054580 */ lui $a1, 0x4580 ## $a1 = 45800000 -/* 08910 80B722B0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 08910 80B722B0 0C01E107 */ jal Math_ApproachF /* 08914 80B722B4 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 /* 08918 80B722B8 3C01437A */ lui $at, 0x437A ## $at = 437A0000 @@ -1284,14 +1284,14 @@ glabel L80B72260 /* 0894C 80B722EC 4406A000 */ mfc1 $a2, $f20 .L80B722F0: /* 08950 80B722F0 3C054600 */ lui $a1, 0x4600 ## $a1 = 46000000 -/* 08954 80B722F4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 08954 80B722F4 0C01E107 */ jal Math_ApproachF /* 08958 80B722F8 3C074440 */ lui $a3, 0x4440 ## $a3 = 44400000 /* 0895C 80B722FC 3C054086 */ lui $a1, 0x4086 ## $a1 = 40860000 /* 08960 80B72300 4406A000 */ mfc1 $a2, $f20 /* 08964 80B72304 34A56666 */ ori $a1, $a1, 0x6666 ## $a1 = 40866666 /* 08968 80B72308 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 0896C 80B7230C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0896C 80B7230C 0C01E107 */ jal Math_ApproachF /* 08970 80B72310 3C073F40 */ lui $a3, 0x3F40 ## $a3 = 3F400000 /* 08974 80B72314 3C0180B8 */ lui $at, %hi(D_80B7B64C) ## $at = 80B80000 @@ -1312,7 +1312,7 @@ glabel L80B72260 /* 089AC 80B7234C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 089B0 80B72350 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 089B4 80B72354 3C053FC0 */ lui $a1, 0x3FC0 ## $a1 = 3FC00000 -/* 089B8 80B72358 0C01E107 */ jal Math_SmoothScaleMaxF +/* 089B8 80B72358 0C01E107 */ jal Math_ApproachF /* 089BC 80B7235C E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 .L80B72360: @@ -1327,7 +1327,7 @@ glabel L80B72260 .L80B72380: /* 089E0 80B72380 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 089E4 80B72384 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 089E8 80B72388 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 089E8 80B72388 0C00CFBE */ jal Rand_ZeroFloat /* 089EC 80B7238C A6000158 */ sh $zero, 0x0158($s0) ## 00000158 /* 089F0 80B72390 4600010D */ trunc.w.s $f4, $f0 @@ -1358,7 +1358,7 @@ glabel L80B723E8 /* 08A48 80B723E8 26040166 */ addiu $a0, $s0, 0x0166 ## $a0 = 00000166 /* 08A4C 80B723EC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 08A50 80B723F0 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 08A54 80B723F4 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 08A54 80B723F4 0C01E1EF */ jal Math_ApproachS /* 08A58 80B723F8 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 /* 08A5C 80B723FC 3C01437A */ lui $at, 0x437A ## $at = 437A0000 @@ -1377,7 +1377,7 @@ glabel L80B723E8 .L80B72430: /* 08A90 80B72430 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 08A94 80B72434 3C054040 */ lui $a1, 0x4040 ## $a1 = 40400000 -/* 08A98 80B72438 0C01E107 */ jal Math_SmoothScaleMaxF +/* 08A98 80B72438 0C01E107 */ jal Math_ApproachF /* 08A9C 80B7243C 3C073F40 */ lui $a3, 0x3F40 ## $a3 = 3F400000 /* 08AA0 80B72440 3C01457A */ lui $at, 0x457A ## $at = 457A0000 @@ -1389,7 +1389,7 @@ glabel L80B723E8 /* 08AB8 80B72458 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 08ABC 80B7245C 3C054580 */ lui $a1, 0x4580 ## $a1 = 45800000 /* 08AC0 80B72460 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 -/* 08AC4 80B72464 0C01E107 */ jal Math_SmoothScaleMaxF +/* 08AC4 80B72464 0C01E107 */ jal Math_ApproachF /* 08AC8 80B72468 E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 /* 08ACC 80B7246C 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 @@ -1399,12 +1399,12 @@ glabel L80B723E8 /* 08ADC 80B7247C 15200036 */ bne $t1, $zero, .L80B72558 /* 08AE0 80B72480 3C014416 */ lui $at, 0x4416 ## $at = 44160000 /* 08AE4 80B72484 44816000 */ mtc1 $at, $f12 ## $f12 = 600.00 -/* 08AE8 80B72488 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 08AE8 80B72488 0C00CFC8 */ jal Rand_CenteredFloat /* 08AEC 80B7248C 00000000 */ nop /* 08AF0 80B72490 3C014416 */ lui $at, 0x4416 ## $at = 44160000 /* 08AF4 80B72494 44816000 */ mtc1 $at, $f12 ## $f12 = 600.00 -/* 08AF8 80B72498 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 08AF8 80B72498 0C00CFC8 */ jal Rand_CenteredFloat /* 08AFC 80B7249C E60001B4 */ swc1 $f0, 0x01B4($s0) ## 000001B4 /* 08B00 80B724A0 3C01C2F0 */ lui $at, 0xC2F0 ## $at = C2F00000 @@ -1429,13 +1429,13 @@ glabel L80B723E8 /* 08B48 80B724E8 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 08B4C 80B724EC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 08B50 80B724F0 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 08B54 80B724F4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 08B54 80B724F4 0C01E107 */ jal Math_ApproachF /* 08B58 80B724F8 E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 /* 08B5C 80B724FC 4406A000 */ mfc1 $a2, $f20 /* 08B60 80B72500 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 08B64 80B72504 3C054500 */ lui $a1, 0x4500 ## $a1 = 45000000 -/* 08B68 80B72508 0C01E107 */ jal Math_SmoothScaleMaxF +/* 08B68 80B72508 0C01E107 */ jal Math_ApproachF /* 08B6C 80B7250C 3C074300 */ lui $a3, 0x4300 ## $a3 = 43000000 /* 08B70 80B72510 10000012 */ beq $zero, $zero, .L80B7255C @@ -1450,13 +1450,13 @@ glabel L80B723E8 /* 08B90 80B72530 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3CA3D70A /* 08B94 80B72534 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 08B98 80B72538 E60A0190 */ swc1 $f10, 0x0190($s0) ## 00000190 -/* 08B9C 80B7253C 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 08B9C 80B7253C 0C01E123 */ jal Math_ApproachZeroF /* 08BA0 80B72540 E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 /* 08BA4 80B72544 4406A000 */ mfc1 $a2, $f20 /* 08BA8 80B72548 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 08BAC 80B7254C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 08BB0 80B72550 0C01E107 */ jal Math_SmoothScaleMaxF +/* 08BB0 80B72550 0C01E107 */ jal Math_ApproachF /* 08BB4 80B72554 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 .L80B72558: @@ -1496,12 +1496,12 @@ glabel L80B723E8 /* 08C30 80B725D0 00000000 */ nop /* 08C34 80B725D4 46803120 */ cvt.s.w $f4, $f6 /* 08C38 80B725D8 460A2200 */ add.s $f8, $f4, $f10 -/* 08C3C 80B725DC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 08C3C 80B725DC 0C00CFBE */ jal Rand_ZeroFloat /* 08C40 80B725E0 E60801B8 */ swc1 $f8, 0x01B8($s0) ## 000001B8 /* 08C44 80B725E4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 08C48 80B725E8 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 08C4C 80B725EC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 08C4C 80B725EC 0C00CFBE */ jal Rand_ZeroFloat /* 08C50 80B725F0 E60001B4 */ swc1 $f0, 0x01B4($s0) ## 000001B4 /* 08C54 80B725F4 E60001BC */ swc1 $f0, 0x01BC($s0) ## 000001BC @@ -1541,7 +1541,7 @@ glabel L80B7260C /* 08CC8 80B72668 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 /* 08CCC 80B7266C 24070100 */ addiu $a3, $zero, 0x0100 ## $a3 = 00000100 /* 08CD0 80B72670 E60A0190 */ swc1 $f10, 0x0190($s0) ## 00000190 -/* 08CD4 80B72674 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 08CD4 80B72674 0C01E1EF */ jal Math_ApproachS /* 08CD8 80B72678 E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 /* 08CDC 80B7267C 8E2E07C0 */ lw $t6, 0x07C0($s1) ## 000007C0 @@ -1562,7 +1562,7 @@ glabel L80B7260C /* 08D18 80B726B8 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 08D1C 80B726BC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 08D20 80B726C0 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 08D24 80B726C4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 08D24 80B726C4 0C01E107 */ jal Math_ApproachF /* 08D28 80B726C8 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 /* 08D2C 80B726CC 1000005B */ beq $zero, $zero, .L80B7283C @@ -1571,7 +1571,7 @@ glabel L80B7260C .L80B726D8: /* 08D38 80B726D8 3C063C23 */ lui $a2, 0x3C23 ## $a2 = 3C230000 /* 08D3C 80B726DC 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3C23D70A -/* 08D40 80B726E0 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 08D40 80B726E0 0C01E123 */ jal Math_ApproachZeroF /* 08D44 80B726E4 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 08D48 80B726E8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 @@ -1596,12 +1596,12 @@ glabel L80B7260C /* 08D94 80B72734 3C014396 */ lui $at, 0x4396 ## $at = 43960000 .L80B72738: /* 08D98 80B72738 44816000 */ mtc1 $at, $f12 ## $f12 = 300.00 -/* 08D9C 80B7273C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 08D9C 80B7273C 0C00CFBE */ jal Rand_ZeroFloat /* 08DA0 80B72740 00000000 */ nop /* 08DA4 80B72744 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 08DA8 80B72748 44816000 */ mtc1 $at, $f12 ## $f12 = 300.00 -/* 08DAC 80B7274C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 08DAC 80B7274C 0C00CFBE */ jal Rand_ZeroFloat /* 08DB0 80B72750 E60001B4 */ swc1 $f0, 0x01B4($s0) ## 000001B4 /* 08DB4 80B72754 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -1667,7 +1667,7 @@ glabel L80B7260C .L80B7283C: /* 08E9C 80B7283C 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 08EA0 80B72840 3C054500 */ lui $a1, 0x4500 ## $a1 = 45000000 -/* 08EA4 80B72844 0C01E107 */ jal Math_SmoothScaleMaxF +/* 08EA4 80B72844 0C01E107 */ jal Math_ApproachF /* 08EA8 80B72848 3C074300 */ lui $a3, 0x4300 ## $a3 = 43000000 /* 08EAC 80B7284C 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 @@ -1698,7 +1698,7 @@ glabel L80B72860 /* 08F04 80B728A4 26040166 */ addiu $a0, $s0, 0x0166 ## $a0 = 00000166 /* 08F08 80B728A8 24051000 */ addiu $a1, $zero, 0x1000 ## $a1 = 00001000 /* 08F0C 80B728AC 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 08F10 80B728B0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 08F10 80B728B0 0C01E1EF */ jal Math_ApproachS /* 08F14 80B728B4 2407006A */ addiu $a3, $zero, 0x006A ## $a3 = 0000006A /* 08F18 80B728B8 3C014220 */ lui $at, 0x4220 ## $at = 42200000 @@ -1717,13 +1717,13 @@ glabel L80B72860 /* 08F4C 80B728EC 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 08F50 80B728F0 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 /* 08F54 80B728F4 E6080190 */ swc1 $f8, 0x0190($s0) ## 00000190 -/* 08F58 80B728F8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 08F58 80B728F8 0C01E107 */ jal Math_ApproachF /* 08F5C 80B728FC E60A0194 */ swc1 $f10, 0x0194($s0) ## 00000194 /* 08F60 80B72900 4406A000 */ mfc1 $a2, $f20 /* 08F64 80B72904 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 08F68 80B72908 3C054500 */ lui $a1, 0x4500 ## $a1 = 45000000 -/* 08F6C 80B7290C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 08F6C 80B7290C 0C01E107 */ jal Math_ApproachF /* 08F70 80B72910 3C074300 */ lui $a3, 0x4300 ## $a3 = 43000000 /* 08F74 80B72914 10000A59 */ beq $zero, $zero, .L80B7527C @@ -1825,7 +1825,7 @@ glabel L80B72928 /* 090D4 80B72A74 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 090D8 80B72A78 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 090DC 80B72A7C 44074000 */ mfc1 $a3, $f8 -/* 090E0 80B72A80 0C01E107 */ jal Math_SmoothScaleMaxF +/* 090E0 80B72A80 0C01E107 */ jal Math_ApproachF /* 090E4 80B72A84 00000000 */ nop .L80B72A88: @@ -1842,7 +1842,7 @@ glabel L80B72928 /* 09110 80B72AB0 468051A0 */ cvt.s.w $f6, $f10 /* 09114 80B72AB4 46043200 */ add.s $f8, $f6, $f4 /* 09118 80B72AB8 44074000 */ mfc1 $a3, $f8 -/* 0911C 80B72ABC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0911C 80B72ABC 0C01E107 */ jal Math_ApproachF /* 09120 80B72AC0 00000000 */ nop /* 09124 80B72AC4 262D0014 */ addiu $t5, $s1, 0x0014 ## $t5 = 00000014 @@ -1910,7 +1910,7 @@ glabel L80B72928 /* 09208 80B72BA8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0920C 80B72BAC 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 09210 80B72BB0 E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 -/* 09214 80B72BB4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 09214 80B72BB4 0C00CFBE */ jal Rand_ZeroFloat /* 09218 80B72BB8 E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 /* 0921C 80B72BBC 4600018D */ trunc.w.s $f6, $f0 @@ -1924,7 +1924,7 @@ glabel L80B72928 /* 09238 80B72BD8 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 0923C 80B72BDC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 09240 80B72BE0 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = BE4CCCCD -/* 09244 80B72BE4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 09244 80B72BE4 0C01E107 */ jal Math_ApproachF /* 09248 80B72BE8 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0924C 80B72BEC 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 @@ -1945,7 +1945,7 @@ glabel L80B72928 /* 09280 80B72C20 3C073E19 */ lui $a3, 0x3E19 ## $a3 = 3E190000 /* 09284 80B72C24 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E19999A /* 09288 80B72C28 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 0928C 80B72C2C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0928C 80B72C2C 0C01E107 */ jal Math_ApproachF /* 09290 80B72C30 3C054040 */ lui $a1, 0x4040 ## $a1 = 40400000 /* 09294 80B72C34 A600015E */ sh $zero, 0x015E($s0) ## 0000015E @@ -2071,7 +2071,7 @@ glabel L80B72928 /* 09444 80B72DE4 11E1000A */ beq $t7, $at, .L80B72E10 /* 09448 80B72DE8 00000000 */ nop /* 0944C 80B72DEC E7A20120 */ swc1 $f2, 0x0120($sp) -/* 09450 80B72DF0 0C03F66B */ jal Math_Rand_ZeroOne +/* 09450 80B72DF0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 09454 80B72DF4 E7AC011C */ swc1 $f12, 0x011C($sp) /* 09458 80B72DF8 C7AC011C */ lwc1 $f12, 0x011C($sp) @@ -2081,7 +2081,7 @@ glabel L80B72928 /* 09468 80B72E08 45000040 */ bc1f .L80B72F0C /* 0946C 80B72E0C 00000000 */ nop .L80B72E10: -/* 09470 80B72E10 0C03F66B */ jal Math_Rand_ZeroOne +/* 09470 80B72E10 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 09474 80B72E14 E7A20120 */ swc1 $f2, 0x0120($sp) /* 09478 80B72E18 C7A20120 */ lwc1 $f2, 0x0120($sp) @@ -2109,7 +2109,7 @@ glabel L80B72928 /* 094CC 80B72E6C C426B68C */ lwc1 $f6, %lo(D_80B7B68C)($at) /* 094D0 80B72E70 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 094D4 80B72E74 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 094D8 80B72E78 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 094D8 80B72E78 0C00CFBE */ jal Rand_ZeroFloat /* 094DC 80B72E7C E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 /* 094E0 80B72E80 4600028D */ trunc.w.s $f10, $f0 @@ -2132,7 +2132,7 @@ glabel L80B72928 /* 0951C 80B72EBC 1721000A */ bne $t9, $at, .L80B72EE8 /* 09520 80B72EC0 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 09524 80B72EC4 44816000 */ mtc1 $at, $f12 ## $f12 = 1.50 -/* 09528 80B72EC8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 09528 80B72EC8 0C00CFBE */ jal Rand_ZeroFloat /* 0952C 80B72ECC 00000000 */ nop /* 09530 80B72ED0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -2144,7 +2144,7 @@ glabel L80B72928 .L80B72EE8: /* 09548 80B72EE8 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 0954C 80B72EEC 44816000 */ mtc1 $at, $f12 ## $f12 = 1.50 -/* 09550 80B72EF0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 09550 80B72EF0 0C00CFBE */ jal Rand_ZeroFloat /* 09554 80B72EF4 00000000 */ nop /* 09558 80B72EF8 3C014090 */ lui $at, 0x4090 ## $at = 40900000 @@ -2177,7 +2177,7 @@ glabel L80B72928 .L80B72F60: /* 095C0 80B72F60 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 095C4 80B72F64 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 095C8 80B72F68 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 095C8 80B72F68 0C00CFBE */ jal Rand_ZeroFloat /* 095CC 80B72F6C A6090158 */ sh $t1, 0x0158($s0) ## 00000158 /* 095D0 80B72F70 4600010D */ trunc.w.s $f4, $f0 @@ -2186,7 +2186,7 @@ glabel L80B72928 /* 095DC 80B72F7C 440F2000 */ mfc1 $t7, $f4 /* 095E0 80B72F80 00000000 */ nop /* 095E4 80B72F84 25F80032 */ addiu $t8, $t7, 0x0032 ## $t8 = 00000032 -/* 095E8 80B72F88 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 095E8 80B72F88 0C00CFBE */ jal Rand_ZeroFloat /* 095EC 80B72F8C A618017C */ sh $t8, 0x017C($s0) ## 0000017C /* 095F0 80B72F90 4600020D */ trunc.w.s $f8, $f0 @@ -2282,7 +2282,7 @@ glabel L80B73004 /* 09748 80B730E8 C426B694 */ lwc1 $f6, %lo(D_80B7B694)($at) /* 0974C 80B730EC 46064102 */ mul.s $f4, $f8, $f6 /* 09750 80B730F0 44052000 */ mfc1 $a1, $f4 -/* 09754 80B730F4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 09754 80B730F4 0C01E107 */ jal Math_ApproachF /* 09758 80B730F8 00000000 */ nop /* 0975C 80B730FC 3C1980B8 */ lui $t9, %hi(D_80B7A694) ## $t9 = 80B80000 @@ -2360,13 +2360,13 @@ glabel L80B7320C /* 0986C 80B7320C 4406A000 */ mfc1 $a2, $f20 /* 09870 80B73210 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 09874 80B73214 3C054680 */ lui $a1, 0x4680 ## $a1 = 46800000 -/* 09878 80B73218 0C01E107 */ jal Math_SmoothScaleMaxF +/* 09878 80B73218 0C01E107 */ jal Math_ApproachF /* 0987C 80B7321C 3C074580 */ lui $a3, 0x4580 ## $a3 = 45800000 /* 09880 80B73220 8FA40040 */ lw $a0, 0x0040($sp) /* 09884 80B73224 24054E20 */ addiu $a1, $zero, 0x4E20 ## $a1 = 00004E20 /* 09888 80B73228 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 0988C 80B7322C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0988C 80B7322C 0C01E1EF */ jal Math_ApproachS /* 09890 80B73230 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 /* 09894 80B73234 240A0032 */ addiu $t2, $zero, 0x0032 ## $t2 = 00000032 @@ -2384,7 +2384,7 @@ glabel L80B7320C /* 098C4 80B73264 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 098C8 80B73268 AE0B01B8 */ sw $t3, 0x01B8($s0) ## 000001B8 /* 098CC 80B7326C 8D2D0008 */ lw $t5, 0x0008($t1) ## 80B7E0C0 -/* 098D0 80B73270 0C01E107 */ jal Math_SmoothScaleMaxF +/* 098D0 80B73270 0C01E107 */ jal Math_ApproachF /* 098D4 80B73274 AE0D01BC */ sw $t5, 0x01BC($s0) ## 000001BC /* 098D8 80B73278 3C0E80B8 */ lui $t6, %hi(D_80B7A694) ## $t6 = 80B80000 @@ -2468,7 +2468,7 @@ glabel L80B7320C /* 09A04 80B733A4 AC30E0A8 */ sw $s0, %lo(D_80B7E0A8)($at) /* 09A08 80B733A8 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 09A0C 80B733AC 44816000 */ mtc1 $at, $f12 ## $f12 = 400.00 -/* 09A10 80B733B0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 09A10 80B733B0 0C00CFBE */ jal Rand_ZeroFloat /* 09A14 80B733B4 00000000 */ nop /* 09A18 80B733B8 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 @@ -2488,7 +2488,7 @@ glabel L80B7320C /* 09A50 80B733F0 4500000D */ bc1f .L80B73428 /* 09A54 80B733F4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 09A58 80B733F8 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 09A5C 80B733FC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 09A5C 80B733FC 0C00CFBE */ jal Rand_ZeroFloat /* 09A60 80B73400 00000000 */ nop /* 09A64 80B73404 4600018D */ trunc.w.s $f6, $f0 @@ -2509,7 +2509,7 @@ glabel L80B7320C /* 09A9C 80B7343C 4500000D */ bc1f .L80B73474 /* 09AA0 80B73440 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 09AA4 80B73444 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 09AA8 80B73448 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 09AA8 80B73448 0C00CFBE */ jal Rand_ZeroFloat /* 09AAC 80B7344C 00000000 */ nop /* 09AB0 80B73450 4600028D */ trunc.w.s $f10, $f0 @@ -2530,7 +2530,7 @@ glabel L80B7320C /* 09AE8 80B73488 4500000D */ bc1f .L80B734C0 /* 09AEC 80B7348C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 09AF0 80B73490 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 09AF4 80B73494 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 09AF4 80B73494 0C00CFBE */ jal Rand_ZeroFloat /* 09AF8 80B73498 00000000 */ nop /* 09AFC 80B7349C 4600018D */ trunc.w.s $f6, $f0 @@ -2545,7 +2545,7 @@ glabel L80B7320C .L80B734C0: /* 09B20 80B734C0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 09B24 80B734C4 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 -/* 09B28 80B734C8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 09B28 80B734C8 0C00CFBE */ jal Rand_ZeroFloat /* 09B2C 80B734CC 00000000 */ nop /* 09B30 80B734D0 4600010D */ trunc.w.s $f4, $f0 @@ -2579,7 +2579,7 @@ glabel L80B7320C /* 09B98 80B73538 4500000D */ bc1f .L80B73570 /* 09B9C 80B7353C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 09BA0 80B73540 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 09BA4 80B73544 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 09BA4 80B73544 0C00CFBE */ jal Rand_ZeroFloat /* 09BA8 80B73548 00000000 */ nop /* 09BAC 80B7354C 4600020D */ trunc.w.s $f8, $f0 @@ -2600,7 +2600,7 @@ glabel L80B7320C /* 09BE4 80B73584 4500000D */ bc1f .L80B735BC /* 09BE8 80B73588 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 09BEC 80B7358C 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 09BF0 80B73590 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 09BF0 80B73590 0C00CFBE */ jal Rand_ZeroFloat /* 09BF4 80B73594 00000000 */ nop /* 09BF8 80B73598 4600010D */ trunc.w.s $f4, $f0 @@ -2621,7 +2621,7 @@ glabel L80B7320C /* 09C30 80B735D0 4500000D */ bc1f .L80B73608 /* 09C34 80B735D4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 09C38 80B735D8 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 09C3C 80B735DC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 09C3C 80B735DC 0C00CFBE */ jal Rand_ZeroFloat /* 09C40 80B735E0 00000000 */ nop /* 09C44 80B735E4 4600020D */ trunc.w.s $f8, $f0 @@ -2636,7 +2636,7 @@ glabel L80B7320C .L80B73608: /* 09C68 80B73608 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 09C6C 80B7360C 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 09C70 80B73610 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 09C70 80B73610 0C00CFBE */ jal Rand_ZeroFloat /* 09C74 80B73614 00000000 */ nop /* 09C78 80B73618 4600018D */ trunc.w.s $f6, $f0 @@ -2682,7 +2682,7 @@ glabel L80B73684 /* 09D0C 80B736AC 3C054000 */ lui $a1, 0x4000 ## $a1 = 40000000 /* 09D10 80B736B0 AE0A01B8 */ sw $t2, 0x01B8($s0) ## 000001B8 /* 09D14 80B736B4 8F2C0008 */ lw $t4, 0x0008($t9) ## 80B7E0C0 -/* 09D18 80B736B8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 09D18 80B736B8 0C01E107 */ jal Math_ApproachF /* 09D1C 80B736BC AE0C01BC */ sw $t4, 0x01BC($s0) ## 000001BC /* 09D20 80B736C0 3C0980B8 */ lui $t1, %hi(D_80B7A694) ## $t1 = 80B80000 @@ -2867,7 +2867,7 @@ glabel L80B738A0 /* 09FBC 80B7395C 8FA40040 */ lw $a0, 0x0040($sp) /* 09FC0 80B73960 24052AF8 */ addiu $a1, $zero, 0x2AF8 ## $a1 = 00002AF8 /* 09FC4 80B73964 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 09FC8 80B73968 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 09FC8 80B73968 0C01E1EF */ jal Math_ApproachS /* 09FCC 80B7396C 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 09FD0 80B73970 3C0180B8 */ lui $at, %hi(D_80B7E0A8) ## $at = 80B80000 @@ -2880,7 +2880,7 @@ glabel L80B738A0 /* 09FEC 80B7398C 00052C03 */ sra $a1, $a1, 16 /* 09FF0 80B73990 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 09FF4 80B73994 24070500 */ addiu $a3, $zero, 0x0500 ## $a3 = 00000500 -/* 09FF8 80B73998 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 09FF8 80B73998 0C01E1EF */ jal Math_ApproachS /* 09FFC 80B7399C 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 /* 0A000 80B739A0 3C0380B8 */ lui $v1, %hi(D_80B7E124) ## $v1 = 80B80000 @@ -3094,7 +3094,7 @@ glabel L80B738A0 /* 0A2FC 80B73C9C 03225024 */ and $t2, $t9, $v0 /* 0A300 80B73CA0 5540006E */ bnel $t2, $zero, .L80B73E5C /* 0A304 80B73CA4 8602017C */ lh $v0, 0x017C($s0) ## 0000017C -/* 0A308 80B73CA8 0C03F66B */ jal Math_Rand_ZeroOne +/* 0A308 80B73CA8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0A30C 80B73CAC AFA20048 */ sw $v0, 0x0048($sp) /* 0A310 80B73CB0 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 @@ -3164,7 +3164,7 @@ glabel L80B738A0 .L80B73D9C: /* 0A3FC 80B73D9C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0A400 80B73DA0 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 0A404 80B73DA4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0A404 80B73DA4 0C00CFBE */ jal Rand_ZeroFloat /* 0A408 80B73DA8 E7A200A4 */ swc1 $f2, 0x00A4($sp) /* 0A40C 80B73DAC 4449F800 */ cfc1 $t1, $31 @@ -3232,7 +3232,7 @@ glabel L80B738A0 .L80B73E90: /* 0A4F0 80B73E90 3C0180B8 */ lui $at, %hi(D_80B7B6BC) ## $at = 80B80000 /* 0A4F4 80B73E94 C42CB6BC */ lwc1 $f12, %lo(D_80B7B6BC)($at) -/* 0A4F8 80B73E98 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0A4F8 80B73E98 0C00CFC8 */ jal Rand_CenteredFloat /* 0A4FC 80B73E9C A7A200A2 */ sh $v0, 0x00A2($sp) /* 0A500 80B73EA0 860E008A */ lh $t6, 0x008A($s0) ## 0000008A @@ -3277,7 +3277,7 @@ glabel L80B738A0 /* 0A59C 80B73F3C 1420FFD4 */ bne $at, $zero, .L80B73E90 /* 0A5A0 80B73F40 00000000 */ nop .L80B73F44: -/* 0A5A4 80B73F44 0C03F66B */ jal Math_Rand_ZeroOne +/* 0A5A4 80B73F44 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0A5A8 80B73F48 00000000 */ nop /* 0A5AC 80B73F4C 3C0180B8 */ lui $at, %hi(D_80B7B6C8) ## $at = 80B80000 @@ -3328,7 +3328,7 @@ glabel L80B738A0 /* 0A658 80B73FF8 A42CE0A4 */ sh $t4, %lo(D_80B7E0A4)($at) /* 0A65C 80B73FFC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0A660 80B74000 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 0A664 80B74004 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0A664 80B74004 0C00CFBE */ jal Rand_ZeroFloat /* 0A668 80B74008 00000000 */ nop /* 0A66C 80B7400C 4600018D */ trunc.w.s $f6, $f0 @@ -3342,7 +3342,7 @@ glabel L80B738A0 /* 0A688 80B74028 3C014120 */ lui $at, 0x4120 ## $at = 41200000 .L80B7402C: /* 0A68C 80B7402C 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 0A690 80B74030 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0A690 80B74030 0C00CFBE */ jal Rand_ZeroFloat /* 0A694 80B74034 00000000 */ nop /* 0A698 80B74038 4600028D */ trunc.w.s $f10, $f0 @@ -3352,7 +3352,7 @@ glabel L80B738A0 /* 0A6A8 80B74048 440C5000 */ mfc1 $t4, $f10 /* 0A6AC 80B7404C 00000000 */ nop /* 0A6B0 80B74050 25890003 */ addiu $t1, $t4, 0x0003 ## $t1 = 00000003 -/* 0A6B4 80B74054 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0A6B4 80B74054 0C00CFBE */ jal Rand_ZeroFloat /* 0A6B8 80B74058 A609017A */ sh $t1, 0x017A($s0) ## 0000017A /* 0A6BC 80B7405C 3C01C28C */ lui $at, 0xC28C ## $at = C28C0000 @@ -3377,13 +3377,13 @@ glabel L80B738A0 /* 0A700 80B740A0 C424B6D0 */ lwc1 $f4, %lo(D_80B7B6D0)($at) /* 0A704 80B740A4 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0A708 80B740A8 3C0540F0 */ lui $a1, 0x40F0 ## $a1 = 40F00000 -/* 0A70C 80B740AC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0A70C 80B740AC 0C01E107 */ jal Math_ApproachF /* 0A710 80B740B0 E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 /* 0A714 80B740B4 8FA40040 */ lw $a0, 0x0040($sp) /* 0A718 80B740B8 24054E20 */ addiu $a1, $zero, 0x4E20 ## $a1 = 00004E20 /* 0A71C 80B740BC 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0A720 80B740C0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0A720 80B740C0 0C01E1EF */ jal Math_ApproachS /* 0A724 80B740C4 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 0A728 80B740C8 1000009B */ beq $zero, $zero, .L80B74338 @@ -3404,7 +3404,7 @@ glabel L80B738A0 /* 0A760 80B74100 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD /* 0A764 80B74104 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0A768 80B74108 3C054040 */ lui $a1, 0x4040 ## $a1 = 40400000 -/* 0A76C 80B7410C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0A76C 80B7410C 0C01E107 */ jal Math_ApproachF /* 0A770 80B74110 E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 /* 0A774 80B74114 1000000D */ beq $zero, $zero, .L80B7414C @@ -3419,7 +3419,7 @@ glabel L80B738A0 /* 0A794 80B74134 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0A798 80B74138 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 /* 0A79C 80B7413C 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 0A7A0 80B74140 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0A7A0 80B74140 0C01E107 */ jal Math_ApproachF /* 0A7A4 80B74144 E60A0194 */ swc1 $f10, 0x0194($s0) ## 00000194 /* 0A7A8 80B74148 920F0150 */ lbu $t7, 0x0150($s0) ## 00000150 @@ -3468,7 +3468,7 @@ glabel L80B738A0 .L80B741E8: /* 0A848 80B741E8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0A84C 80B741EC 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 0A850 80B741F0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0A850 80B741F0 0C00CFBE */ jal Rand_ZeroFloat /* 0A854 80B741F4 00000000 */ nop /* 0A858 80B741F8 4600010D */ trunc.w.s $f4, $f0 @@ -3514,7 +3514,7 @@ glabel L80B738A0 /* 0A8E8 80B74288 4406A000 */ mfc1 $a2, $f20 /* 0A8EC 80B7428C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0A8F0 80B74290 3C054000 */ lui $a1, 0x4000 ## $a1 = 40000000 -/* 0A8F4 80B74294 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0A8F4 80B74294 0C01E107 */ jal Math_ApproachF /* 0A8F8 80B74298 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 0A8FC 80B7429C 860B017C */ lh $t3, 0x017C($s0) ## 0000017C @@ -3527,7 +3527,7 @@ glabel L80B738A0 /* 0A918 80B742B8 1020000A */ beq $at, $zero, .L80B742E4 /* 0A91C 80B742BC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 0A920 80B742C0 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 0A924 80B742C4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0A924 80B742C4 0C00CFBE */ jal Rand_ZeroFloat /* 0A928 80B742C8 00000000 */ nop /* 0A92C 80B742CC 4600018D */ trunc.w.s $f6, $f0 @@ -3541,7 +3541,7 @@ glabel L80B738A0 /* 0A948 80B742E8 1020000A */ beq $at, $zero, .L80B74314 /* 0A94C 80B742EC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0A950 80B742F0 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 0A954 80B742F4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0A954 80B742F4 0C00CFBE */ jal Rand_ZeroFloat /* 0A958 80B742F8 00000000 */ nop /* 0A95C 80B742FC 4600020D */ trunc.w.s $f8, $f0 @@ -3553,7 +3553,7 @@ glabel L80B738A0 .L80B74314: /* 0A974 80B74314 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0A978 80B74318 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 0A97C 80B7431C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0A97C 80B7431C 0C00CFBE */ jal Rand_ZeroFloat /* 0A980 80B74320 00000000 */ nop /* 0A984 80B74324 4600028D */ trunc.w.s $f10, $f0 @@ -3614,7 +3614,7 @@ glabel L80B738A0 /* 0AA44 80B743E4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0AA48 80B743E8 2484A6C0 */ addiu $a0, $a0, %lo(D_80B7A6C0) ## $a0 = 80B7A6C0 /* 0AA4C 80B743EC 3C05420C */ lui $a1, 0x420C ## $a1 = 420C0000 -/* 0AA50 80B743F0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0AA50 80B743F0 0C01E107 */ jal Math_ApproachF /* 0AA54 80B743F4 3C074060 */ lui $a3, 0x4060 ## $a3 = 40600000 /* 0AA58 80B743F8 3C0480B8 */ lui $a0, %hi(D_80B7A6BC) ## $a0 = 80B80000 @@ -3623,7 +3623,7 @@ glabel L80B738A0 /* 0AA64 80B74404 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 0AA68 80B74408 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 0AA6C 80B7440C 2484A6BC */ addiu $a0, $a0, %lo(D_80B7A6BC) ## $a0 = 80B7A6BC -/* 0AA70 80B74410 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0AA70 80B74410 0C01E107 */ jal Math_ApproachF /* 0AA74 80B74414 8FA50100 */ lw $a1, 0x0100($sp) .L80B74418: @@ -3672,7 +3672,7 @@ glabel L80B738A0 /* 0AB20 80B744C0 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 0AB24 80B744C4 46000280 */ add.s $f10, $f0, $f0 /* 0AB28 80B744C8 44075000 */ mfc1 $a3, $f10 -/* 0AB2C 80B744CC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0AB2C 80B744CC 0C01E107 */ jal Math_ApproachF /* 0AB30 80B744D0 00000000 */ nop /* 0AB34 80B744D4 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 @@ -3694,7 +3694,7 @@ glabel L80B738A0 /* 0AB74 80B74514 00000000 */ nop /* 0AB78 80B74518 46083102 */ mul.s $f4, $f6, $f8 /* 0AB7C 80B7451C 44072000 */ mfc1 $a3, $f4 -/* 0AB80 80B74520 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0AB80 80B74520 0C01E107 */ jal Math_ApproachF /* 0AB84 80B74524 00000000 */ nop /* 0AB88 80B74528 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 @@ -3709,7 +3709,7 @@ glabel L80B738A0 /* 0ABAC 80B7454C 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 0ABB0 80B74550 46000200 */ add.s $f8, $f0, $f0 /* 0ABB4 80B74554 44074000 */ mfc1 $a3, $f8 -/* 0ABB8 80B74558 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0ABB8 80B74558 0C01E107 */ jal Math_ApproachF /* 0ABBC 80B7455C 00000000 */ nop .L80B74560: @@ -3774,7 +3774,7 @@ glabel L80B738A0 /* 0AC94 80B74634 312B007F */ andi $t3, $t1, 0x007F ## $t3 = 00000000 /* 0AC98 80B74638 15600056 */ bne $t3, $zero, .L80B74794 /* 0AC9C 80B7463C 00000000 */ nop -/* 0ACA0 80B74640 0C03F66B */ jal Math_Rand_ZeroOne +/* 0ACA0 80B74640 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0ACA4 80B74644 00000000 */ nop /* 0ACA8 80B74648 3C0180B8 */ lui $at, %hi(D_80B7B710) ## $at = 80B80000 @@ -3947,7 +3947,7 @@ glabel L80B748A0 /* 0AF18 80B748B8 8FA40040 */ lw $a0, 0x0040($sp) /* 0AF1C 80B748BC 24052AF8 */ addiu $a1, $zero, 0x2AF8 ## $a1 = 00002AF8 /* 0AF20 80B748C0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0AF24 80B748C4 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0AF24 80B748C4 0C01E1EF */ jal Math_ApproachS /* 0AF28 80B748C8 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 0AF2C 80B748CC 3C0480B8 */ lui $a0, %hi(D_80B7FEC8) ## $a0 = 80B80000 @@ -3955,7 +3955,7 @@ glabel L80B748A0 /* 0AF34 80B748D4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 0AF38 80B748D8 2484FEC8 */ addiu $a0, $a0, %lo(D_80B7FEC8) ## $a0 = 80B7FEC8 /* 0AF3C 80B748DC 3C054170 */ lui $a1, 0x4170 ## $a1 = 41700000 -/* 0AF40 80B748E0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0AF40 80B748E0 0C01E107 */ jal Math_ApproachF /* 0AF44 80B748E4 3C073F40 */ lui $a3, 0x3F40 ## $a3 = 3F400000 /* 0AF48 80B748E8 3C0180B8 */ lui $at, %hi(D_80B7FEC8) ## $at = 80B80000 @@ -4187,7 +4187,7 @@ glabel L80B748A0 /* 0B290 80B74C30 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 /* 0B294 80B74C34 46044280 */ add.s $f10, $f8, $f4 /* 0B298 80B74C38 44055000 */ mfc1 $a1, $f10 -/* 0B29C 80B74C3C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0B29C 80B74C3C 0C01E107 */ jal Math_ApproachF /* 0B2A0 80B74C40 00000000 */ nop /* 0B2A4 80B74C44 8FAB00E0 */ lw $t3, 0x00E0($sp) @@ -4198,7 +4198,7 @@ glabel L80B748A0 /* 0B2B8 80B74C58 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 /* 0B2BC 80B74C5C 46083100 */ add.s $f4, $f6, $f8 /* 0B2C0 80B74C60 44052000 */ mfc1 $a1, $f4 -/* 0B2C4 80B74C64 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0B2C4 80B74C64 0C01E107 */ jal Math_ApproachF /* 0B2C8 80B74C68 00000000 */ nop /* 0B2CC 80B74C6C 8FAD00E0 */ lw $t5, 0x00E0($sp) @@ -4209,7 +4209,7 @@ glabel L80B748A0 /* 0B2E0 80B74C80 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 /* 0B2E4 80B74C84 46065200 */ add.s $f8, $f10, $f6 /* 0B2E8 80B74C88 44054000 */ mfc1 $a1, $f8 -/* 0B2EC 80B74C8C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0B2EC 80B74C8C 0C01E107 */ jal Math_ApproachF /* 0B2F0 80B74C90 00000000 */ nop /* 0B2F4 80B74C94 3C01433C */ lui $at, 0x433C ## $at = 433C0000 @@ -4514,7 +4514,7 @@ glabel L80B74FF0 /* 0B754 80B750F4 4406A000 */ mfc1 $a2, $f20 /* 0B758 80B750F8 4407A000 */ mfc1 $a3, $f20 /* 0B75C 80B750FC 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 0B760 80B75100 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0B760 80B75100 0C01E107 */ jal Math_ApproachF /* 0B764 80B75104 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 /* 0B768 80B75108 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -4527,7 +4527,7 @@ glabel L80B74FF0 /* 0B784 80B75124 8FA40040 */ lw $a0, 0x0040($sp) /* 0B788 80B75128 24054E20 */ addiu $a1, $zero, 0x4E20 ## $a1 = 00004E20 /* 0B78C 80B7512C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0B790 80B75130 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0B790 80B75130 0C01E1EF */ jal Math_ApproachS /* 0B794 80B75134 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 0B798 80B75138 860C017E */ lh $t4, 0x017E($s0) ## 0000017E @@ -4538,7 +4538,7 @@ glabel L80B74FF0 /* 0B7AC 80B7514C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0B7B0 80B75150 1040002E */ beq $v0, $zero, .L80B7520C /* 0B7B4 80B75154 3C0180B8 */ lui $at, %hi(D_80B7B720) ## $at = 80B80000 -/* 0B7B8 80B75158 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0B7B8 80B75158 0C00CFBE */ jal Rand_ZeroFloat /* 0B7BC 80B7515C C42CB720 */ lwc1 $f12, %lo(D_80B7B720)($at) /* 0B7C0 80B75160 4459F800 */ cfc1 $t9, $31 @@ -4580,7 +4580,7 @@ glabel L80B74FF0 /* 0B844 80B751E4 30A500FF */ andi $a1, $a1, 0x00FF ## $a1 = 000000FF /* 0B848 80B751E8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0B84C 80B751EC 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 0B850 80B751F0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0B850 80B751F0 0C00CFBE */ jal Rand_ZeroFloat /* 0B854 80B751F4 00000000 */ nop /* 0B858 80B751F8 4600018D */ trunc.w.s $f6, $f0 @@ -4624,7 +4624,7 @@ glabel L80B75278 .L80B7527C: /* 0B8DC 80B7527C 00042300 */ sll $a0, $a0, 12 /* 0B8E0 80B75280 00042400 */ sll $a0, $a0, 16 -/* 0B8E4 80B75284 0C01DE1C */ jal Math_Sins +/* 0B8E4 80B75284 0C01DE1C */ jal Math_SinS ## sins? /* 0B8E8 80B75288 00042403 */ sra $a0, $a0, 16 /* 0B8EC 80B7528C 3C0180B8 */ lui $at, %hi(D_80B7B724) ## $at = 80B80000 @@ -4640,7 +4640,7 @@ glabel L80B75278 /* 0B914 80B752B4 44052000 */ mfc1 $a1, $f4 /* 0B918 80B752B8 00000000 */ nop /* 0B91C 80B752BC 00052C00 */ sll $a1, $a1, 16 -/* 0B920 80B752C0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0B920 80B752C0 0C01E1EF */ jal Math_ApproachS /* 0B924 80B752C4 00052C03 */ sra $a1, $a1, 16 /* 0B928 80B752C8 860B0158 */ lh $t3, 0x0158($s0) ## 00000158 @@ -4666,7 +4666,7 @@ glabel L80B75278 /* 0B978 80B75318 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0B97C 80B7531C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 0B980 80B75320 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 0B984 80B75324 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0B984 80B75324 0C01E1EF */ jal Math_ApproachS /* 0B988 80B75328 E60A0194 */ swc1 $f10, 0x0194($s0) ## 00000194 /* 0B98C 80B7532C 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 @@ -4687,7 +4687,7 @@ glabel L80B75278 .L80B75368: /* 0B9C8 80B75368 4405A000 */ mfc1 $a1, $f20 /* 0B9CC 80B7536C 26040184 */ addiu $a0, $s0, 0x0184 ## $a0 = 00000184 -/* 0B9D0 80B75370 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 0B9D0 80B75370 0C01E123 */ jal Math_ApproachZeroF /* 0B9D4 80B75374 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 0B9D8 80B75378 86030158 */ lh $v1, 0x0158($s0) ## 00000158 @@ -4744,7 +4744,7 @@ glabel L80B75278 /* 0BA9C 80B7543C 44074000 */ mfc1 $a3, $f8 /* 0BAA0 80B75440 00000000 */ nop /* 0BAA4 80B75444 00073C00 */ sll $a3, $a3, 16 -/* 0BAA8 80B75448 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0BAA8 80B75448 0C01E1EF */ jal Math_ApproachS /* 0BAAC 80B7544C 00073C03 */ sra $a3, $a3, 16 /* 0BAB0 80B75450 87A500F6 */ lh $a1, 0x00F6($sp) @@ -4767,7 +4767,7 @@ glabel L80B75278 /* 0BAEC 80B7548C 45000006 */ bc1f .L80B754A8 /* 0BAF0 80B75490 2604016E */ addiu $a0, $s0, 0x016E ## $a0 = 0000016E /* 0BAF4 80B75494 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0BAF8 80B75498 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0BAF8 80B75498 0C01E1EF */ jal Math_ApproachS /* 0BAFC 80B7549C 24074E20 */ addiu $a3, $zero, 0x4E20 ## $a3 = 00004E20 /* 0BB00 80B754A0 10000005 */ beq $zero, $zero, .L80B754B8 @@ -4775,7 +4775,7 @@ glabel L80B75278 .L80B754A8: /* 0BB08 80B754A8 2604016E */ addiu $a0, $s0, 0x016E ## $a0 = 0000016E /* 0BB0C 80B754AC 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 0BB10 80B754B0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0BB10 80B754B0 0C01E1EF */ jal Math_ApproachS /* 0BB14 80B754B4 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 .L80B754B8: @@ -4825,19 +4825,19 @@ glabel L80B75278 /* 0BBB0 80B75550 26040160 */ addiu $a0, $s0, 0x0160 ## $a0 = 00000160 /* 0BBB4 80B75554 86050166 */ lh $a1, 0x0166($s0) ## 00000166 /* 0BBB8 80B75558 87A600F4 */ lh $a2, 0x00F4($sp) -/* 0BBBC 80B7555C 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0BBBC 80B7555C 0C01E1EF */ jal Math_ApproachS /* 0BBC0 80B75560 87A700F2 */ lh $a3, 0x00F2($sp) /* 0BBC4 80B75564 26040162 */ addiu $a0, $s0, 0x0162 ## $a0 = 00000162 /* 0BBC8 80B75568 86050168 */ lh $a1, 0x0168($s0) ## 00000168 /* 0BBCC 80B7556C 87A600F0 */ lh $a2, 0x00F0($sp) -/* 0BBD0 80B75570 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0BBD0 80B75570 0C01E1EF */ jal Math_ApproachS /* 0BBD4 80B75574 87A700EE */ lh $a3, 0x00EE($sp) /* 0BBD8 80B75578 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 0BBDC 80B7557C 8605016A */ lh $a1, 0x016A($s0) ## 0000016A /* 0BBE0 80B75580 87A600FA */ lh $a2, 0x00FA($sp) -/* 0BBE4 80B75584 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0BBE4 80B75584 0C01E1EF */ jal Math_ApproachS /* 0BBE8 80B75588 24072000 */ addiu $a3, $zero, 0x2000 ## $a3 = 00002000 /* 0BBEC 80B7558C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -4849,13 +4849,13 @@ glabel L80B75278 /* 0BC04 80B755A4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0BC08 80B755A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0BC0C 80B755AC 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 0BC10 80B755B0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0BC10 80B755B0 0C01E1EF */ jal Math_ApproachS /* 0BC14 80B755B4 86070178 */ lh $a3, 0x0178($s0) ## 00000178 /* 0BC18 80B755B8 26040178 */ addiu $a0, $s0, 0x0178 ## $a0 = 00000178 /* 0BC1C 80B755BC 24050500 */ addiu $a1, $zero, 0x0500 ## $a1 = 00000500 /* 0BC20 80B755C0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0BC24 80B755C4 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0BC24 80B755C4 0C01E1EF */ jal Math_ApproachS /* 0BC28 80B755C8 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 /* 0BC2C 80B755CC 1000000B */ beq $zero, $zero, .L80B755FC @@ -4867,7 +4867,7 @@ glabel L80B75278 /* 0BC40 80B755E0 00052823 */ subu $a1, $zero, $a1 /* 0BC44 80B755E4 00052C00 */ sll $a1, $a1, 16 /* 0BC48 80B755E8 00052C03 */ sra $a1, $a1, 16 -/* 0BC4C 80B755EC 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0BC4C 80B755EC 0C01E1EF */ jal Math_ApproachS /* 0BC50 80B755F0 24071000 */ addiu $a3, $zero, 0x1000 ## $a3 = 00001000 /* 0BC54 80B755F4 A6000178 */ sh $zero, 0x0178($s0) ## 00000178 @@ -4909,7 +4909,7 @@ glabel L80B75278 /* 0BCE0 80B75680 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0BCE4 80B75684 44816000 */ mtc1 $at, $f12 ## $f12 = 32768.00 /* 0BCE8 80B75688 E6080184 */ swc1 $f8, 0x0184($s0) ## 00000184 -/* 0BCEC 80B7568C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0BCEC 80B7568C 0C00CFC8 */ jal Rand_CenteredFloat /* 0BCF0 80B75690 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 /* 0BCF4 80B75694 4600018D */ trunc.w.s $f6, $f0 @@ -5073,7 +5073,7 @@ glabel L80B75278 /* 0BF48 80B758E8 45000048 */ bc1f .L80B75A0C /* 0BF4C 80B758EC 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 0BF50 80B758F0 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 -/* 0BF54 80B758F4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0BF54 80B758F4 0C00CFBE */ jal Rand_ZeroFloat /* 0BF58 80B758F8 00000000 */ nop /* 0BF5C 80B758FC 3C0180B8 */ lui $at, %hi(D_80B7B738) ## $at = 80B80000 @@ -5095,7 +5095,7 @@ glabel L80B75278 /* 0BF98 80B75938 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0BF9C 80B7593C 0C2DC33C */ jal func_80B70CF0 /* 0BFA0 80B75940 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0BFA4 80B75944 0C03F66B */ jal Math_Rand_ZeroOne +/* 0BFA4 80B75944 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0BFA8 80B75948 00000000 */ nop /* 0BFAC 80B7594C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -5111,7 +5111,7 @@ glabel L80B75278 /* 0BFD0 80B75970 240CC000 */ addiu $t4, $zero, 0xC000 ## $t4 = FFFFC000 /* 0BFD4 80B75974 A60C016A */ sh $t4, 0x016A($s0) ## 0000016A .L80B75978: -/* 0BFD8 80B75978 0C03F66B */ jal Math_Rand_ZeroOne +/* 0BFD8 80B75978 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0BFDC 80B7597C 00000000 */ nop /* 0BFE0 80B75980 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -5126,7 +5126,7 @@ glabel L80B75278 /* 0C004 80B759A4 3C014200 */ lui $at, 0x4200 ## $at = 42000000 .L80B759A8: /* 0C008 80B759A8 44816000 */ mtc1 $at, $f12 ## $f12 = 32.00 -/* 0C00C 80B759AC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C00C 80B759AC 0C00CFC8 */ jal Rand_CenteredFloat /* 0C010 80B759B0 00000000 */ nop /* 0C014 80B759B4 4600020D */ trunc.w.s $f8, $f0 @@ -5138,7 +5138,7 @@ glabel L80B75278 .L80B759CC: /* 0C02C 80B759CC 3C014680 */ lui $at, 0x4680 ## $at = 46800000 /* 0C030 80B759D0 44816000 */ mtc1 $at, $f12 ## $f12 = 16384.00 -/* 0C034 80B759D4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C034 80B759D4 0C00CFC8 */ jal Rand_CenteredFloat /* 0C038 80B759D8 00000000 */ nop /* 0C03C 80B759DC 4600010D */ trunc.w.s $f4, $f0 @@ -5168,14 +5168,14 @@ glabel L80B75278 /* 0C098 80B75A38 02214821 */ addu $t1, $s1, $at /* 0C09C 80B75A3C 260B00E4 */ addiu $t3, $s0, 0x00E4 ## $t3 = 000000E4 /* 0C0A0 80B75A40 AFAB004C */ sw $t3, 0x004C($sp) -/* 0C0A4 80B75A44 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C0A4 80B75A44 0C00CFC8 */ jal Rand_CenteredFloat /* 0C0A8 80B75A48 AFA90048 */ sw $t1, 0x0048($sp) /* 0C0AC 80B75A4C C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 0C0B0 80B75A50 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0C0B4 80B75A54 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 0C0B8 80B75A58 46040180 */ add.s $f6, $f0, $f4 -/* 0C0BC 80B75A5C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C0BC 80B75A5C 0C00CFC8 */ jal Rand_CenteredFloat /* 0C0C0 80B75A60 E7A60074 */ swc1 $f6, 0x0074($sp) /* 0C0C4 80B75A64 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C @@ -5221,26 +5221,26 @@ glabel L80B75278 /* 0C15C 80B75AFC A7A00072 */ sh $zero, 0x0072($sp) /* 0C160 80B75B00 E7AC0060 */ swc1 $f12, 0x0060($sp) .L80B75B04: -/* 0C164 80B75B04 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C164 80B75B04 0C00CFC8 */ jal Rand_CenteredFloat /* 0C168 80B75B08 C7AC0060 */ lwc1 $f12, 0x0060($sp) /* 0C16C 80B75B0C C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 0C170 80B75B10 C7AC0060 */ lwc1 $f12, 0x0060($sp) /* 0C174 80B75B14 46040180 */ add.s $f6, $f0, $f4 -/* 0C178 80B75B18 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C178 80B75B18 0C00CFC8 */ jal Rand_CenteredFloat /* 0C17C 80B75B1C E7A60064 */ swc1 $f6, 0x0064($sp) /* 0C180 80B75B20 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 0C184 80B75B24 C7AC0060 */ lwc1 $f12, 0x0060($sp) /* 0C188 80B75B28 460A0200 */ add.s $f8, $f0, $f10 -/* 0C18C 80B75B2C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0C18C 80B75B2C 0C00CFC8 */ jal Rand_CenteredFloat /* 0C190 80B75B30 E7A80068 */ swc1 $f8, 0x0068($sp) /* 0C194 80B75B34 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C /* 0C198 80B75B38 3C0180B8 */ lui $at, %hi(D_80B7B750) ## $at = 80B80000 /* 0C19C 80B75B3C C42CB750 */ lwc1 $f12, %lo(D_80B7B750)($at) /* 0C1A0 80B75B40 46040180 */ add.s $f6, $f0, $f4 -/* 0C1A4 80B75B44 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0C1A4 80B75B44 0C00CFBE */ jal Rand_ZeroFloat /* 0C1A8 80B75B48 E7A6006C */ swc1 $f6, 0x006C($sp) /* 0C1AC 80B75B4C 3C0180B8 */ lui $at, %hi(D_80B7B754) ## $at = 80B80000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69D88.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69D88.s index d690027cbe..3cd34e2cb1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69D88.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69D88.s @@ -68,7 +68,7 @@ glabel func_80B69D88 /* 004E0 80B69E80 ACAF001C */ sw $t7, 0x001C($a1) ## 0000001C /* 004E4 80B69E84 8D180008 */ lw $t8, 0x0008($t0) ## FFFFFFF8 /* 004E8 80B69E88 ACB80020 */ sw $t8, 0x0020($a1) ## 00000020 -/* 004EC 80B69E8C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 004EC 80B69E8C 0C00CFBE */ jal Rand_ZeroFloat /* 004F0 80B69E90 AFA50034 */ sw $a1, 0x0034($sp) /* 004F4 80B69E94 4600020D */ trunc.w.s $f8, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69ED0.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69ED0.s index 3da35aa78a..7829948cf2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69ED0.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B69ED0.s @@ -60,7 +60,7 @@ glabel func_80B69ED0 /* 00614 80B69FB4 A4B8002A */ sh $t8, 0x002A($a1) ## 0000002A /* 00618 80B69FB8 ACAF0020 */ sw $t7, 0x0020($a1) ## 00000020 /* 0061C 80B69FBC E7AE003C */ swc1 $f14, 0x003C($sp) -/* 00620 80B69FC0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00620 80B69FC0 0C00CFBE */ jal Rand_ZeroFloat /* 00624 80B69FC4 AFA50034 */ sw $a1, 0x0034($sp) /* 00628 80B69FC8 4600020D */ trunc.w.s $f8, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6A008.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6A008.s index d08f716eae..8c83bce0d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6A008.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6A008.s @@ -57,7 +57,7 @@ glabel func_80B6A008 /* 00740 80B6A0E0 ACAE001C */ sw $t6, 0x001C($a1) ## 0000001C /* 00744 80B6A0E4 8DAF0008 */ lw $t7, 0x0008($t5) ## 80B7A8A4 /* 00748 80B6A0E8 ACAF0020 */ sw $t7, 0x0020($a1) ## 00000020 -/* 0074C 80B6A0EC 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0074C 80B6A0EC 0C00CFBE */ jal Rand_ZeroFloat /* 00750 80B6A0F0 AFA50034 */ sw $a1, 0x0034($sp) /* 00754 80B6A0F4 4600020D */ trunc.w.s $f8, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6A22C.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6A22C.s index ec00c989a6..03b0ed1bd9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6A22C.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6A22C.s @@ -87,7 +87,7 @@ glabel func_80B6A22C /* 00998 80B6A338 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 /* 0099C 80B6A33C 00000000 */ nop /* 009A0 80B6A340 468084A0 */ cvt.s.w $f18, $f16 -/* 009A4 80B6A344 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 009A4 80B6A344 0C00CFBE */ jal Rand_ZeroFloat /* 009A8 80B6A348 E6120008 */ swc1 $f18, 0x0008($s0) ## 80B7FF00 /* 009AC 80B6A34C 4600010D */ trunc.w.s $f4, $f0 @@ -107,7 +107,7 @@ glabel func_80B6A22C /* 009E4 80B6A384 46080282 */ mul.s $f10, $f0, $f8 /* 009E8 80B6A388 4600A306 */ mov.s $f12, $f20 /* 009EC 80B6A38C 46105480 */ add.s $f18, $f10, $f16 -/* 009F0 80B6A390 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 009F0 80B6A390 0C00CFBE */ jal Rand_ZeroFloat /* 009F4 80B6A394 E6120024 */ swc1 $f18, 0x0024($s0) ## 80B7FF1C /* 009F8 80B6A398 E6000014 */ swc1 $f0, 0x0014($s0) ## 80B7FF0C @@ -161,7 +161,7 @@ glabel func_80B6A22C /* 00AAC 80B6A44C 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 /* 00AB0 80B6A450 4600A306 */ mov.s $f12, $f20 /* 00AB4 80B6A454 46105480 */ add.s $f18, $f10, $f16 -/* 00AB8 80B6A458 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00AB8 80B6A458 0C00CFBE */ jal Rand_ZeroFloat /* 00ABC 80B6A45C E6120024 */ swc1 $f18, 0x0024($s0) ## 80B7FF1C /* 00AC0 80B6A460 E6000010 */ swc1 $f0, 0x0010($s0) ## 80B7FF08 @@ -186,7 +186,7 @@ glabel func_80B6A22C /* 00B04 80B6A4A4 4600A306 */ mov.s $f12, $f20 /* 00B08 80B6A4A8 46080282 */ mul.s $f10, $f0, $f8 /* 00B0C 80B6A4AC 461C5400 */ add.s $f16, $f10, $f28 -/* 00B10 80B6A4B0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 00B10 80B6A4B0 0C00CFBE */ jal Rand_ZeroFloat /* 00B14 80B6A4B4 E6100024 */ swc1 $f16, 0x0024($s0) ## 80B7FF1C /* 00B18 80B6A4B8 3C01447A */ lui $at, 0x447A ## $at = 447A0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6AF28.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6AF28.s index c2f4a877f1..66bc42a27b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6AF28.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6AF28.s @@ -84,7 +84,7 @@ glabel func_80B6AF28 /* 01670 80B6B010 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 01674 80B6B014 26040030 */ addiu $a0, $s0, 0x0030 ## $a0 = 00000030 /* 01678 80B6B018 8E050034 */ lw $a1, 0x0034($s0) ## 00000034 -/* 0167C 80B6B01C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0167C 80B6B01C 0C01E107 */ jal Math_ApproachF /* 01680 80B6B020 8E070038 */ lw $a3, 0x0038($s0) ## 00000038 /* 01684 80B6B024 8618002C */ lh $t8, 0x002C($s0) ## 0000002C @@ -118,7 +118,7 @@ glabel func_80B6AF28 /* 016EC 80B6B08C 26040030 */ addiu $a0, $s0, 0x0030 ## $a0 = 00000030 /* 016F0 80B6B090 4406A000 */ mfc1 $a2, $f20 /* 016F4 80B6B094 4407A000 */ mfc1 $a3, $f20 -/* 016F8 80B6B098 0C01E107 */ jal Math_SmoothScaleMaxF +/* 016F8 80B6B098 0C01E107 */ jal Math_ApproachF /* 016FC 80B6B09C 8E050034 */ lw $a1, 0x0034($s0) ## 00000034 /* 01700 80B6B0A0 860F002A */ lh $t7, 0x002A($s0) ## 0000002A @@ -173,7 +173,7 @@ glabel func_80B6AF28 /* 017B4 80B6B154 45020132 */ bc1fl .L80B6B620 /* 017B8 80B6B158 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000005 /* 017BC 80B6B15C A2000024 */ sb $zero, 0x0024($s0) ## 00000024 -/* 017C0 80B6B160 0C03F66B */ jal Math_Rand_ZeroOne +/* 017C0 80B6B160 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 017C4 80B6B164 E7A200B4 */ swc1 $f2, 0x00B4($sp) /* 017C8 80B6B168 3C0180B8 */ lui $at, %hi(D_80B7B39C) ## $at = 80B80000 @@ -227,7 +227,7 @@ glabel func_80B6AF28 /* 01880 80B6B220 00000000 */ nop /* 01884 80B6B224 450200FE */ bc1fl .L80B6B620 /* 01888 80B6B228 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000008 -/* 0188C 80B6B22C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0188C 80B6B22C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01890 80B6B230 A2000024 */ sb $zero, 0x0024($s0) ## 00000024 /* 01894 80B6B234 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -318,7 +318,7 @@ glabel func_80B6AF28 .L80B6B384: /* 019E4 80B6B384 A2000025 */ sb $zero, 0x0025($s0) ## 00000025 /* 019E8 80B6B388 460A7100 */ add.s $f4, $f14, $f10 -/* 019EC 80B6B38C 0C03F66B */ jal Math_Rand_ZeroOne +/* 019EC 80B6B38C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 019F0 80B6B390 E6040004 */ swc1 $f4, 0x0004($s0) ## 00000004 /* 019F4 80B6B394 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 @@ -383,21 +383,21 @@ glabel func_80B6AF28 /* 01AD4 80B6B474 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01AD8 80B6B478 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 /* 01ADC 80B6B47C 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 01AE0 80B6B480 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01AE0 80B6B480 0C01E1EF */ jal Math_ApproachS /* 01AE4 80B6B484 E60A0030 */ swc1 $f10, 0x0030($s0) ## 00000030 /* 01AE8 80B6B488 3C0480B8 */ lui $a0, %hi(D_80B7E09C) ## $a0 = 80B80000 /* 01AEC 80B6B48C 2484E09C */ addiu $a0, $a0, %lo(D_80B7E09C) ## $a0 = 80B7E09C /* 01AF0 80B6B490 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01AF4 80B6B494 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 01AF8 80B6B498 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01AF8 80B6B498 0C01E1EF */ jal Math_ApproachS /* 01AFC 80B6B49C 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 01B00 80B6B4A0 3C0480B8 */ lui $a0, %hi(D_80B7E0A0) ## $a0 = 80B80000 /* 01B04 80B6B4A4 2484E0A0 */ addiu $a0, $a0, %lo(D_80B7E0A0) ## $a0 = 80B7E0A0 /* 01B08 80B6B4A8 2405C000 */ addiu $a1, $zero, 0xC000 ## $a1 = FFFFC000 /* 01B0C 80B6B4AC 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 01B10 80B6B4B0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 01B10 80B6B4B0 0C01E1EF */ jal Math_ApproachS /* 01B14 80B6B4B4 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 01B18 80B6B4B8 C6020000 */ lwc1 $f2, 0x0000($s0) ## 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s index da8caf9335..00f49d42db 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s @@ -622,7 +622,7 @@ glabel func_80B6B674 /* 02538 80B6BED8 01215025 */ or $t2, $t1, $at ## $t2 = FFFFFF50 /* 0253C 80B6BEDC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 .L80B6BEE0: -/* 02540 80B6BEE0 0C03F66B */ jal Math_Rand_ZeroOne +/* 02540 80B6BEE0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 02544 80B6BEE4 00000000 */ nop /* 02548 80B6BEE8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C3E0.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C3E0.s index 0ec7bed73a..36a429b7ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C3E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C3E0.s @@ -165,7 +165,7 @@ glabel func_80B6C3E0 /* 02C48 80B6C5E8 4614D202 */ mul.s $f8, $f26, $f20 /* 02C4C 80B6C5EC 46044280 */ add.s $f10, $f8, $f4 /* 02C50 80B6C5F0 44055000 */ mfc1 $a1, $f10 -/* 02C54 80B6C5F4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02C54 80B6C5F4 0C01E107 */ jal Math_ApproachF /* 02C58 80B6C5F8 00000000 */ nop /* 02C5C 80B6C5FC C7A60090 */ lwc1 $f6, 0x0090($sp) @@ -176,7 +176,7 @@ glabel func_80B6C3E0 /* 02C70 80B6C610 26040004 */ addiu $a0, $s0, 0x0004 ## $a0 = 00000004 /* 02C74 80B6C614 46044280 */ add.s $f10, $f8, $f4 /* 02C78 80B6C618 44055000 */ mfc1 $a1, $f10 -/* 02C7C 80B6C61C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02C7C 80B6C61C 0C01E107 */ jal Math_ApproachF /* 02C80 80B6C620 00000000 */ nop /* 02C84 80B6C624 C7A6008C */ lwc1 $f6, 0x008C($sp) @@ -187,7 +187,7 @@ glabel func_80B6C3E0 /* 02C98 80B6C638 26040008 */ addiu $a0, $s0, 0x0008 ## $a0 = 00000008 /* 02C9C 80B6C63C 46044280 */ add.s $f10, $f8, $f4 /* 02CA0 80B6C640 44055000 */ mfc1 $a1, $f10 -/* 02CA4 80B6C644 0C01E107 */ jal Math_SmoothScaleMaxF +/* 02CA4 80B6C644 0C01E107 */ jal Math_ApproachF /* 02CA8 80B6C648 00000000 */ nop .L80B6C64C: @@ -339,7 +339,7 @@ glabel func_80B6C3E0 /* 02EC8 80B6C868 4600D386 */ mov.s $f14, $f26 /* 02ECC 80B6C86C 46044501 */ sub.s $f20, $f8, $f4 /* 02ED0 80B6C870 46068601 */ sub.s $f24, $f16, $f6 -/* 02ED4 80B6C874 0C0341F5 */ jal atan2f +/* 02ED4 80B6C874 0C0341F5 */ jal Math_Atan2F /* 02ED8 80B6C878 4600A306 */ mov.s $f12, $f20 /* 02EDC 80B6C87C 461AD282 */ mul.s $f10, $f26, $f26 @@ -347,7 +347,7 @@ glabel func_80B6C3E0 /* 02EE4 80B6C884 4600C386 */ mov.s $f14, $f24 /* 02EE8 80B6C888 4614A182 */ mul.s $f6, $f20, $f20 /* 02EEC 80B6C88C 46065000 */ add.s $f0, $f10, $f6 -/* 02EF0 80B6C890 0C0341F5 */ jal atan2f +/* 02EF0 80B6C890 0C0341F5 */ jal Math_Atan2F /* 02EF4 80B6C894 46000304 */ sqrt.s $f12, $f0 /* 02EF8 80B6C898 8FB90104 */ lw $t9, 0x0104($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C960.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C960.s index a4a91e3d13..243607965a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C960.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C960.s @@ -52,7 +52,7 @@ glabel func_80B6C960 /* 03084 80B6CA24 46083581 */ sub.s $f22, $f6, $f8 /* 03088 80B6CA28 4600A386 */ mov.s $f14, $f20 /* 0308C 80B6CA2C 46049601 */ sub.s $f24, $f18, $f4 -/* 03090 80B6CA30 0C0341F5 */ jal atan2f +/* 03090 80B6CA30 0C0341F5 */ jal Math_Atan2F /* 03094 80B6CA34 4600B306 */ mov.s $f12, $f22 /* 03098 80B6CA38 4614A282 */ mul.s $f10, $f20, $f20 @@ -60,7 +60,7 @@ glabel func_80B6C960 /* 030A0 80B6CA40 4600C386 */ mov.s $f14, $f24 /* 030A4 80B6CA44 4616B402 */ mul.s $f16, $f22, $f22 /* 030A8 80B6CA48 46105000 */ add.s $f0, $f10, $f16 -/* 030AC 80B6CA4C 0C0341F5 */ jal atan2f +/* 030AC 80B6CA4C 0C0341F5 */ jal Math_Atan2F /* 030B0 80B6CA50 46000304 */ sqrt.s $f12, $f0 /* 030B4 80B6CA54 46000507 */ neg.s $f20, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6CAF8.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6CAF8.s index de4b83f4bb..7d677b2844 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6CAF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6CAF8.s @@ -127,7 +127,7 @@ glabel func_80B6CAF8 /* 032A0 80B6CC40 C4720008 */ lwc1 $f18, 0x0008($v1) ## 00000008 /* 032A4 80B6CC44 E7AE00C4 */ swc1 $f14, 0x00C4($sp) /* 032A8 80B6CC48 46049301 */ sub.s $f12, $f18, $f4 -/* 032AC 80B6CC4C 0C0341F5 */ jal atan2f +/* 032AC 80B6CC4C 0C0341F5 */ jal Math_Atan2F /* 032B0 80B6CC50 E7AC00BC */ swc1 $f12, 0x00BC($sp) /* 032B4 80B6CC54 C7A200C4 */ lwc1 $f2, 0x00C4($sp) @@ -137,7 +137,7 @@ glabel func_80B6CAF8 /* 032C4 80B6CC64 C7AE00C0 */ lwc1 $f14, 0x00C0($sp) /* 032C8 80B6CC68 46108202 */ mul.s $f8, $f16, $f16 /* 032CC 80B6CC6C 46083000 */ add.s $f0, $f6, $f8 -/* 032D0 80B6CC70 0C0341F5 */ jal atan2f +/* 032D0 80B6CC70 0C0341F5 */ jal Math_Atan2F /* 032D4 80B6CC74 46000304 */ sqrt.s $f12, $f0 /* 032D8 80B6CC78 46000287 */ neg.s $f10, $f0 @@ -191,7 +191,7 @@ glabel func_80B6CAF8 /* 03398 80B6CD38 3C073E99 */ lui $a3, 0x3E99 ## $a3 = 3E990000 /* 0339C 80B6CD3C 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E99999A /* 033A0 80B6CD40 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 033A4 80B6CD44 0C01E107 */ jal Math_SmoothScaleMaxF +/* 033A4 80B6CD44 0C01E107 */ jal Math_ApproachF /* 033A8 80B6CD48 AFA4001C */ sw $a0, 0x001C($sp) /* 033AC 80B6CD4C 10000008 */ beq $zero, $zero, .L80B6CD70 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D054.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D054.s index 92ff21965a..e00ffe4828 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D054.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D054.s @@ -155,7 +155,7 @@ glabel func_80B6D054 /* 038D0 80B6D270 4600A386 */ mov.s $f14, $f20 /* 038D4 80B6D274 46049181 */ sub.s $f6, $f18, $f4 /* 038D8 80B6D278 46103580 */ add.s $f22, $f6, $f16 -/* 038DC 80B6D27C 0C0341F5 */ jal atan2f +/* 038DC 80B6D27C 0C0341F5 */ jal Math_Atan2F /* 038E0 80B6D280 4600B306 */ mov.s $f12, $f22 /* 038E4 80B6D284 4614A282 */ mul.s $f10, $f20, $f20 @@ -163,7 +163,7 @@ glabel func_80B6D054 /* 038EC 80B6D28C 4600C386 */ mov.s $f14, $f24 /* 038F0 80B6D290 4616B202 */ mul.s $f8, $f22, $f22 /* 038F4 80B6D294 46085000 */ add.s $f0, $f10, $f8 -/* 038F8 80B6D298 0C0341F5 */ jal atan2f +/* 038F8 80B6D298 0C0341F5 */ jal Math_Atan2F /* 038FC 80B6D29C 46000304 */ sqrt.s $f12, $f0 /* 03900 80B6D2A0 46000507 */ neg.s $f20, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s index daaf57594d..135c1385b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s @@ -211,7 +211,7 @@ glabel func_80B6D688 /* 03F24 80B6D8C4 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 /* 03F28 80B6D8C8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD /* 03F2C 80B6D8CC 8C45094C */ lw $a1, 0x094C($v0) ## 80B7F414 -/* 03F30 80B6D8D0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 03F30 80B6D8D0 0C01E107 */ jal Math_ApproachF /* 03F34 80B6D8D4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 03F38 80B6D8D8 3C0380B8 */ lui $v1, %hi(D_80B7E0B8) ## $v1 = 80B80000 @@ -380,7 +380,7 @@ glabel func_80B6D688 /* 041B0 80B6DB50 E7AC006C */ swc1 $f12, 0x006C($sp) /* 041B4 80B6DB54 46062381 */ sub.s $f14, $f4, $f6 /* 041B8 80B6DB58 E7AA0068 */ swc1 $f10, 0x0068($sp) -/* 041BC 80B6DB5C 0C03F494 */ jal Math_atan2f +/* 041BC 80B6DB5C 0C03F494 */ jal Math_FAtan2F /* 041C0 80B6DB60 E7AE0064 */ swc1 $f14, 0x0064($sp) /* 041C4 80B6DB64 C7B2006C */ lwc1 $f18, 0x006C($sp) /* 041C8 80B6DB68 C7A80064 */ lwc1 $f8, 0x0064($sp) @@ -391,7 +391,7 @@ glabel func_80B6D688 /* 041DC 80B6DB7C E7A20030 */ swc1 $f2, 0x0030($sp) /* 041E0 80B6DB80 46101000 */ add.s $f0, $f2, $f16 /* 041E4 80B6DB84 E7B0002C */ swc1 $f16, 0x002C($sp) -/* 041E8 80B6DB88 0C03F494 */ jal Math_atan2f +/* 041E8 80B6DB88 0C03F494 */ jal Math_FAtan2F /* 041EC 80B6DB8C 46000384 */ sqrt.s $f14, $f0 /* 041F0 80B6DB90 C7B20068 */ lwc1 $f18, 0x0068($sp) /* 041F4 80B6DB94 C7A20030 */ lwc1 $f2, 0x0030($sp) @@ -487,7 +487,7 @@ glabel func_80B6D688 /* 04354 80B6DCF4 E7AC004C */ swc1 $f12, 0x004C($sp) /* 04358 80B6DCF8 AFA2002C */ sw $v0, 0x002C($sp) /* 0435C 80B6DCFC 46083381 */ sub.s $f14, $f6, $f8 -/* 04360 80B6DD00 0C03F494 */ jal Math_atan2f +/* 04360 80B6DD00 0C03F494 */ jal Math_FAtan2F /* 04364 80B6DD04 E7AE0044 */ swc1 $f14, 0x0044($sp) /* 04368 80B6DD08 C7B2004C */ lwc1 $f18, 0x004C($sp) /* 0436C 80B6DD0C C7AA0044 */ lwc1 $f10, 0x0044($sp) @@ -498,7 +498,7 @@ glabel func_80B6D688 /* 04380 80B6DD20 E7A20028 */ swc1 $f2, 0x0028($sp) /* 04384 80B6DD24 46101000 */ add.s $f0, $f2, $f16 /* 04388 80B6DD28 E7B00024 */ swc1 $f16, 0x0024($sp) -/* 0438C 80B6DD2C 0C03F494 */ jal Math_atan2f +/* 0438C 80B6DD2C 0C03F494 */ jal Math_FAtan2F /* 04390 80B6DD30 46000384 */ sqrt.s $f14, $f0 /* 04394 80B6DD34 C7B20048 */ lwc1 $f18, 0x0048($sp) /* 04398 80B6DD38 C7A20028 */ lwc1 $f2, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6DF30.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6DF30.s index 4c8d58ea9d..58eb2ef0dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6DF30.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6DF30.s @@ -95,7 +95,7 @@ glabel func_80B6DF30 /* 045E8 80B6DF88 2484A6C0 */ addiu $a0, $a0, %lo(D_80B7A6C0) ## $a0 = 80B7A6C0 /* 045EC 80B6DF8C 3C05420C */ lui $a1, 0x420C ## $a1 = 420C0000 /* 045F0 80B6DF90 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 045F4 80B6DF94 0C01E107 */ jal Math_SmoothScaleMaxF +/* 045F4 80B6DF94 0C01E107 */ jal Math_ApproachF /* 045F8 80B6DF98 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 045FC 80B6DF9C 3C0480B8 */ lui $a0, %hi(D_80B7A6BC) ## $a0 = 80B80000 @@ -104,14 +104,14 @@ glabel func_80B6DF30 /* 04608 80B6DFA8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3ECCCCCD /* 0460C 80B6DFAC 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = BF4CCCCD /* 04610 80B6DFB0 2484A6BC */ addiu $a0, $a0, %lo(D_80B7A6BC) ## $a0 = 80B7A6BC -/* 04614 80B6DFB4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04614 80B6DFB4 0C01E107 */ jal Math_ApproachF /* 04618 80B6DFB8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0461C 80B6DFBC 8FA400B8 */ lw $a0, 0x00B8($sp) /* 04620 80B6DFC0 2405F060 */ addiu $a1, $zero, 0xF060 ## $a1 = FFFFF060 /* 04624 80B6DFC4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 04628 80B6DFC8 24073A98 */ addiu $a3, $zero, 0x3A98 ## $a3 = 00003A98 -/* 0462C 80B6DFCC 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0462C 80B6DFCC 0C01E1EF */ jal Math_ApproachS /* 04630 80B6DFD0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 04634 80B6DFD4 10000031 */ beq $zero, $zero, .L80B6E09C @@ -135,7 +135,7 @@ glabel func_80B6DF30 /* 04678 80B6E018 00812021 */ addu $a0, $a0, $at /* 0467C 80B6E01C 00042280 */ sll $a0, $a0, 10 /* 04680 80B6E020 00042400 */ sll $a0, $a0, 16 -/* 04684 80B6E024 0C01DE1C */ jal Math_Sins +/* 04684 80B6E024 0C01DE1C */ jal Math_SinS ## sins? /* 04688 80B6E028 00042403 */ sra $a0, $a0, 16 /* 0468C 80B6E02C 3C0180B8 */ lui $at, %hi(D_80B7B444) ## $at = 80B80000 @@ -152,14 +152,14 @@ glabel func_80B6DF30 /* 046B4 80B6E054 3C053DCC */ lui $a1, 0x3DCC ## $a1 = 3DCC0000 /* 046B8 80B6E058 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD /* 046BC 80B6E05C 2484A6C0 */ addiu $a0, $a0, %lo(D_80B7A6C0) ## $a0 = 80B7A6C0 -/* 046C0 80B6E060 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 046C0 80B6E060 0C01E123 */ jal Math_ApproachZeroF /* 046C4 80B6E064 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 046C8 80B6E068 3C0480B8 */ lui $a0, %hi(D_80B7A6BC) ## $a0 = 80B80000 /* 046CC 80B6E06C 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 046D0 80B6E070 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 046D4 80B6E074 2484A6BC */ addiu $a0, $a0, %lo(D_80B7A6BC) ## $a0 = 80B7A6BC -/* 046D8 80B6E078 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 046D8 80B6E078 0C01E123 */ jal Math_ApproachZeroF /* 046DC 80B6E07C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 .L80B6E080: @@ -168,7 +168,7 @@ glabel func_80B6DF30 /* 046E8 80B6E088 00052C03 */ sra $a1, $a1, 16 /* 046EC 80B6E08C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 046F0 80B6E090 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 046F4 80B6E094 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 046F4 80B6E094 0C01E1EF */ jal Math_ApproachS /* 046F8 80B6E098 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 .L80B6E09C: @@ -219,7 +219,7 @@ glabel func_80B6DF30 /* 04798 80B6E138 2464085C */ addiu $a0, $v1, 0x085C ## $a0 = 0000085C /* 0479C 80B6E13C E7AA00C8 */ swc1 $f10, 0x00C8($sp) /* 047A0 80B6E140 44053000 */ mfc1 $a1, $f6 -/* 047A4 80B6E144 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 047A4 80B6E144 0C01E0C4 */ jal Math_SmoothStepToF /* 047A8 80B6E148 00000000 */ nop /* 047AC 80B6E14C 8FA200B8 */ lw $v0, 0x00B8($sp) @@ -242,7 +242,7 @@ glabel func_80B6DF30 /* 047F0 80B6E190 46809120 */ cvt.s.w $f4, $f18 /* 047F4 80B6E194 46062202 */ mul.s $f8, $f4, $f6 /* 047F8 80B6E198 44054000 */ mfc1 $a1, $f8 -/* 047FC 80B6E19C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 047FC 80B6E19C 0C01E0C4 */ jal Math_SmoothStepToF /* 04800 80B6E1A0 00000000 */ nop /* 04804 80B6E1A4 8FA200B8 */ lw $v0, 0x00B8($sp) @@ -290,7 +290,7 @@ glabel func_80B6DF30 /* 0489C 80B6E23C 8CE7A6B0 */ lw $a3, %lo(D_80B7A6B0)($a3) /* 048A0 80B6E240 2484A6A8 */ addiu $a0, $a0, %lo(D_80B7A6A8) ## $a0 = 80B7A6A8 /* 048A4 80B6E244 44058000 */ mfc1 $a1, $f16 -/* 048A8 80B6E248 0C01E107 */ jal Math_SmoothScaleMaxF +/* 048A8 80B6E248 0C01E107 */ jal Math_ApproachF /* 048AC 80B6E24C 00000000 */ nop /* 048B0 80B6E250 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -300,7 +300,7 @@ glabel func_80B6DF30 /* 048C0 80B6E260 44050000 */ mfc1 $a1, $f0 /* 048C4 80B6E264 44060000 */ mfc1 $a2, $f0 /* 048C8 80B6E268 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 048CC 80B6E26C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 048CC 80B6E26C 0C01E107 */ jal Math_ApproachF /* 048D0 80B6E270 2484A6B0 */ addiu $a0, $a0, %lo(D_80B7A6B0) ## $a0 = 80B7A6B0 /* 048D4 80B6E274 3C01428C */ lui $at, 0x428C ## $at = 428C0000 @@ -316,7 +316,7 @@ glabel func_80B6DF30 /* 048FC 80B6E29C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04900 80B6E2A0 46083282 */ mul.s $f10, $f6, $f8 /* 04904 80B6E2A4 44055000 */ mfc1 $a1, $f10 -/* 04908 80B6E2A8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04908 80B6E2A8 0C01E107 */ jal Math_ApproachF /* 0490C 80B6E2AC 00000000 */ nop /* 04910 80B6E2B0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -326,7 +326,7 @@ glabel func_80B6DF30 /* 04920 80B6E2C0 44050000 */ mfc1 $a1, $f0 /* 04924 80B6E2C4 44060000 */ mfc1 $a2, $f0 /* 04928 80B6E2C8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 0492C 80B6E2CC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0492C 80B6E2CC 0C01E107 */ jal Math_ApproachF /* 04930 80B6E2D0 2484A6B4 */ addiu $a0, $a0, %lo(D_80B7A6B4) ## $a0 = 80B7A6B4 /* 04934 80B6E2D4 3C1180B8 */ lui $s1, %hi(D_80B7A6B8) ## $s1 = 80B80000 @@ -334,7 +334,7 @@ glabel func_80B6DF30 /* 0493C 80B6E2DC 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 04940 80B6E2E0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04944 80B6E2E4 02202025 */ or $a0, $s1, $zero ## $a0 = 80B7A6B8 -/* 04948 80B6E2E8 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 04948 80B6E2E8 0C01E123 */ jal Math_ApproachZeroF /* 0494C 80B6E2EC 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 04950 80B6E2F0 10000047 */ beq $zero, $zero, .L80B6E410 @@ -343,14 +343,14 @@ glabel func_80B6DF30 /* 04958 80B6E2F8 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 0495C 80B6E2FC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 04960 80B6E300 2484085C */ addiu $a0, $a0, 0x085C ## $a0 = 0000085C -/* 04964 80B6E304 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 04964 80B6E304 0C01E123 */ jal Math_ApproachZeroF /* 04968 80B6E308 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 0496C 80B6E30C 8FA400B8 */ lw $a0, 0x00B8($sp) /* 04970 80B6E310 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 04974 80B6E314 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 04978 80B6E318 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 0497C 80B6E31C 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 0497C 80B6E31C 0C01E123 */ jal Math_ApproachZeroF /* 04980 80B6E320 24840858 */ addiu $a0, $a0, 0x0858 ## $a0 = 00000858 /* 04984 80B6E324 3C0480B8 */ lui $a0, %hi(D_80B7E0AE) ## $a0 = 80B80000 @@ -364,7 +364,7 @@ glabel func_80B6DF30 /* 049A4 80B6E344 00812023 */ subu $a0, $a0, $at /* 049A8 80B6E348 000420C0 */ sll $a0, $a0, 3 /* 049AC 80B6E34C 00042400 */ sll $a0, $a0, 16 -/* 049B0 80B6E350 0C01DE1C */ jal Math_Sins +/* 049B0 80B6E350 0C01DE1C */ jal Math_SinS ## sins? /* 049B4 80B6E354 00042403 */ sra $a0, $a0, 16 /* 049B8 80B6E358 3C0180B8 */ lui $at, %hi(D_80B7B458) ## $at = 80B80000 @@ -379,14 +379,14 @@ glabel func_80B6DF30 /* 049DC 80B6E37C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 049E0 80B6E380 46049180 */ add.s $f6, $f18, $f4 /* 049E4 80B6E384 44053000 */ mfc1 $a1, $f6 -/* 049E8 80B6E388 0C01E107 */ jal Math_SmoothScaleMaxF +/* 049E8 80B6E388 0C01E107 */ jal Math_ApproachF /* 049EC 80B6E38C 00000000 */ nop /* 049F0 80B6E390 3C0480B8 */ lui $a0, %hi(D_80B7A6A8) ## $a0 = 80B80000 /* 049F4 80B6E394 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 049F8 80B6E398 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 049FC 80B6E39C 2484A6A8 */ addiu $a0, $a0, %lo(D_80B7A6A8) ## $a0 = 80B7A6A8 -/* 04A00 80B6E3A0 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 04A00 80B6E3A0 0C01E123 */ jal Math_ApproachZeroF /* 04A04 80B6E3A4 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 04A08 80B6E3A8 3C0280B8 */ lui $v0, %hi(D_80B7E0B4) ## $v0 = 80B80000 @@ -405,7 +405,7 @@ glabel func_80B6DF30 /* 04A3C 80B6E3DC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD /* 04A40 80B6E3E0 02202025 */ or $a0, $s1, $zero ## $a0 = 80B7A6B8 /* 04A44 80B6E3E4 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3F4CCCCD -/* 04A48 80B6E3E8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04A48 80B6E3E8 0C01E107 */ jal Math_ApproachF /* 04A4C 80B6E3EC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04A50 80B6E3F0 10000007 */ beq $zero, $zero, .L80B6E410 @@ -414,7 +414,7 @@ glabel func_80B6DF30 /* 04A58 80B6E3F8 3C073ECC */ lui $a3, 0x3ECC ## $a3 = 3ECC0000 /* 04A5C 80B6E3FC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3ECCCCCD /* 04A60 80B6E400 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 04A64 80B6E404 0C01E107 */ jal Math_SmoothScaleMaxF +/* 04A64 80B6E404 0C01E107 */ jal Math_ApproachF /* 04A68 80B6E408 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04A6C 80B6E40C 8FAD00D0 */ lw $t5, 0x00D0($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6E9E0.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6E9E0.s index b6583a2d5c..2b4e87366e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6E9E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6E9E0.s @@ -274,7 +274,7 @@ glabel func_80B6E9E0 /* 051C4 80B6EB64 11C00033 */ beq $t6, $zero, .L80B6EC34 .L80B6EB68: /* 051C8 80B6EB68 3C0180B8 */ lui $at, %hi(D_80B7B47C) ## $at = 80B80000 -/* 051CC 80B6EB6C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 051CC 80B6EB6C 0C00CFBE */ jal Rand_ZeroFloat /* 051D0 80B6EB70 C42CB47C */ lwc1 $f12, %lo(D_80B7B47C)($at) /* 051D4 80B6EB74 444FF800 */ cfc1 $t7, $31 @@ -436,14 +436,14 @@ glabel func_80B6E9E0 /* 0542C 80B6EDCC 02002025 */ or $a0, $s0, $zero ## $a0 = 80B7E108 /* 05430 80B6EDD0 3C05C448 */ lui $a1, 0xC448 ## $a1 = C4480000 /* 05434 80B6EDD4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 05438 80B6EDD8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05438 80B6EDD8 0C01E107 */ jal Math_ApproachF /* 0543C 80B6EDDC 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 05440 80B6EDE0 3C0880B8 */ lui $t0, %hi(D_80B7EAC8) ## $t0 = 80B80000 /* 05444 80B6EDE4 10000005 */ beq $zero, $zero, .L80B6EDFC /* 05448 80B6EDE8 2508EAC8 */ addiu $t0, $t0, %lo(D_80B7EAC8) ## $t0 = 80B7EAC8 .L80B6EDEC: -/* 0544C 80B6EDEC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0544C 80B6EDEC 0C01E107 */ jal Math_ApproachF /* 05450 80B6EDF0 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 05454 80B6EDF4 3C0880B8 */ lui $t0, %hi(D_80B7EAC8) ## $t0 = 80B80000 @@ -486,7 +486,7 @@ glabel L80B6EE24 /* 054D8 80B6EE78 2484E144 */ addiu $a0, $a0, %lo(D_80B7E144) ## $a0 = 80B7E144 /* 054DC 80B6EE7C 44060000 */ mfc1 $a2, $f0 /* 054E0 80B6EE80 44070000 */ mfc1 $a3, $f0 -/* 054E4 80B6EE84 0C01E107 */ jal Math_SmoothScaleMaxF +/* 054E4 80B6EE84 0C01E107 */ jal Math_ApproachF /* 054E8 80B6EE88 3C054343 */ lui $a1, 0x4343 ## $a1 = 43430000 /* 054EC 80B6EE8C 8FA300C0 */ lw $v1, 0x00C0($sp) @@ -587,7 +587,7 @@ glabel L80B6EE24 /* 05660 80B6F000 3C0180B8 */ lui $at, %hi(D_80B7E11C) ## $at = 80B80000 /* 05664 80B6F004 E426E11C */ swc1 $f6, %lo(D_80B7E11C)($at) /* 05668 80B6F008 3C0180B8 */ lui $at, %hi(D_80B7B49C) ## $at = 80B80000 -/* 0566C 80B6F00C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0566C 80B6F00C 0C00CFBE */ jal Rand_ZeroFloat /* 05670 80B6F010 C42CB49C */ lwc1 $f12, %lo(D_80B7B49C)($at) /* 05674 80B6F014 4459F800 */ cfc1 $t9, $31 @@ -731,7 +731,7 @@ glabel L80B6F0C4 /* 05880 80B6F220 E7A200D4 */ swc1 $f2, 0x00D4($sp) /* 05884 80B6F224 E7AC00D0 */ swc1 $f12, 0x00D0($sp) /* 05888 80B6F228 E7AE00D8 */ swc1 $f14, 0x00D8($sp) -/* 0588C 80B6F22C 0C0341F5 */ jal atan2f +/* 0588C 80B6F22C 0C0341F5 */ jal Math_Atan2F /* 05890 80B6F230 E6040000 */ swc1 $f4, 0x0000($s0) ## 80B7E0D8 /* 05894 80B6F234 3C0180B8 */ lui $at, %hi(D_80B7B4A8) ## $at = 80B80000 @@ -965,7 +965,7 @@ glabel L80B6F0C4 /* 05BFC 80B6F59C 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 05C00 80B6F5A0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 05C04 80B6F5A4 2484E148 */ addiu $a0, $a0, %lo(D_80B7E148) ## $a0 = 80B7E148 -/* 05C08 80B6F5A8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 05C08 80B6F5A8 0C01E107 */ jal Math_ApproachF /* 05C0C 80B6F5AC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05C10 80B6F5B0 3C0480B8 */ lui $a0, %hi(D_80B7AF94) ## $a0 = 80B80000 @@ -1066,7 +1066,7 @@ glabel L80B6F0C4 /* 05D7C 80B6F71C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 .L80B6F720: /* 05D80 80B6F720 44816000 */ mtc1 $at, $f12 ## $f12 = 1.50 -/* 05D84 80B6F724 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 05D84 80B6F724 0C00CFBE */ jal Rand_ZeroFloat /* 05D88 80B6F728 00000000 */ nop /* 05D8C 80B6F72C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -1074,7 +1074,7 @@ glabel L80B6F0C4 /* 05D94 80B6F734 3C0180B8 */ lui $at, %hi(D_80B7B4C4) ## $at = 80B80000 /* 05D98 80B6F738 C42CB4C4 */ lwc1 $f12, %lo(D_80B7B4C4)($at) /* 05D9C 80B6F73C 46060100 */ add.s $f4, $f0, $f6 -/* 05DA0 80B6F740 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 05DA0 80B6F740 0C00CFBE */ jal Rand_ZeroFloat /* 05DA4 80B6F744 E7A4007C */ swc1 $f4, 0x007C($sp) /* 05DA8 80B6F748 E7A00078 */ swc1 $f0, 0x0078($sp) @@ -1091,7 +1091,7 @@ glabel L80B6F0C4 /* 05DCC 80B6F76C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 05DD0 80B6F770 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 /* 05DD4 80B6F774 46060102 */ mul.s $f4, $f0, $f6 -/* 05DD8 80B6F778 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 05DD8 80B6F778 0C00CFBE */ jal Rand_ZeroFloat /* 05DDC 80B6F77C E7A400A4 */ swc1 $f4, 0x00A4($sp) /* 05DE0 80B6F780 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -1126,7 +1126,7 @@ glabel L80B6F0C4 /* 05E54 80B6F7F4 46024182 */ mul.s $f6, $f8, $f2 /* 05E58 80B6F7F8 E7AA00AC */ swc1 $f10, 0x00AC($sp) /* 05E5C 80B6F7FC 46062280 */ add.s $f10, $f4, $f6 -/* 05E60 80B6F800 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 05E60 80B6F800 0C00CFBE */ jal Rand_ZeroFloat /* 05E64 80B6F804 E7AA00B0 */ swc1 $f10, 0x00B0($sp) /* 05E68 80B6F808 3C0180B8 */ lui $at, %hi(D_80B7B4CC) ## $at = 80B80000 @@ -1183,7 +1183,7 @@ glabel L80B6F0C4 /* 05F34 80B6F8D4 1000000D */ beq $zero, $zero, .L80B6F90C /* 05F38 80B6F8D8 E7A40034 */ swc1 $f4, 0x0034($sp) .L80B6F8DC: -/* 05F3C 80B6F8DC 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 05F3C 80B6F8DC 0C01E123 */ jal Math_ApproachZeroF /* 05F40 80B6F8E0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 0000CCCD /* 05F44 80B6F8E4 3C0480B8 */ lui $a0, %hi(D_80B7AF94) ## $a0 = 80B80000 @@ -1235,7 +1235,7 @@ glabel L80B6F94C /* 05FF4 80B6F994 46087100 */ add.s $f4, $f14, $f8 /* 05FF8 80B6F998 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 05FFC 80B6F99C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 06000 80B6F9A0 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 06000 80B6F9A0 0C01E123 */ jal Math_ApproachZeroF /* 06004 80B6F9A4 E4440004 */ swc1 $f4, 0x0004($v0) ## 80B7E0BC /* 06008 80B6F9A8 3C1980B8 */ lui $t9, %hi(D_80B7E0B6) ## $t9 = 80B80000 @@ -1255,7 +1255,7 @@ glabel L80B6F94C /* 06040 80B6F9E0 00000000 */ nop /* 06044 80B6F9E4 468031A0 */ cvt.s.w $f6, $f6 /* 06048 80B6F9E8 44053000 */ mfc1 $a1, $f6 -/* 0604C 80B6F9EC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0604C 80B6F9EC 0C01E107 */ jal Math_ApproachF /* 06050 80B6F9F0 00000000 */ nop .L80B6F9F4: @@ -1264,7 +1264,7 @@ glabel L80B6F94C /* 0605C 80B6F9FC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 06060 80B6FA00 2484E148 */ addiu $a0, $a0, %lo(D_80B7E148) ## $a0 = 80B7E148 /* 06064 80B6FA04 3C054000 */ lui $a1, 0x4000 ## $a1 = 40000000 -/* 06068 80B6FA08 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06068 80B6FA08 0C01E107 */ jal Math_ApproachF /* 0606C 80B6FA0C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06070 80B6FA10 3C0480B8 */ lui $a0, %hi(D_80B7E0A2) ## $a0 = 80B80000 @@ -1325,7 +1325,7 @@ glabel L80B6FA3C /* 0613C 80B6FADC 00812023 */ subu $a0, $a0, $at /* 06140 80B6FAE0 00042140 */ sll $a0, $a0, 5 /* 06144 80B6FAE4 00042400 */ sll $a0, $a0, 16 -/* 06148 80B6FAE8 0C01DE1C */ jal Math_Sins +/* 06148 80B6FAE8 0C01DE1C */ jal Math_SinS ## sins? /* 0614C 80B6FAEC 00042403 */ sra $a0, $a0, 16 /* 06150 80B6FAF0 3C0180B8 */ lui $at, %hi(D_80B7E10C) ## $at = 80B80000 @@ -1342,7 +1342,7 @@ glabel L80B6FA3C /* 0617C 80B6FB1C 460C3280 */ add.s $f10, $f6, $f12 /* 06180 80B6FB20 02002025 */ or $a0, $s0, $zero ## $a0 = 80B7E0D8 /* 06184 80B6FB24 44055000 */ mfc1 $a1, $f10 -/* 06188 80B6FB28 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06188 80B6FB28 0C01E107 */ jal Math_ApproachF /* 0618C 80B6FB2C 00000000 */ nop /* 06190 80B6FB30 3C0480B8 */ lui $a0, %hi(D_80B7E110) ## $a0 = 80B80000 @@ -1350,14 +1350,14 @@ glabel L80B6FA3C /* 06198 80B6FB38 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 0619C 80B6FB3C 2484E110 */ addiu $a0, $a0, %lo(D_80B7E110) ## $a0 = 80B7E110 /* 061A0 80B6FB40 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 061A4 80B6FB44 0C01E107 */ jal Math_SmoothScaleMaxF +/* 061A4 80B6FB44 0C01E107 */ jal Math_ApproachF /* 061A8 80B6FB48 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 061AC 80B6FB4C 3C0480B8 */ lui $a0, %hi(D_80B7E10C) ## $a0 = 80B80000 /* 061B0 80B6FB50 3C063CA3 */ lui $a2, 0x3CA3 ## $a2 = 3CA30000 /* 061B4 80B6FB54 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3CA3D70A /* 061B8 80B6FB58 2484E10C */ addiu $a0, $a0, %lo(D_80B7E10C) ## $a0 = 80B7E10C -/* 061BC 80B6FB5C 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 061BC 80B6FB5C 0C01E123 */ jal Math_ApproachZeroF /* 061C0 80B6FB60 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 061C4 80B6FB64 3C0880B8 */ lui $t0, %hi(D_80B7EAC8) ## $t0 = 80B80000 @@ -1523,7 +1523,7 @@ glabel L80B6FA3C /* 0641C 80B6FDBC C5C4002C */ lwc1 $f4, 0x002C($t6) ## 80B8002C /* 06420 80B6FDC0 E7B00070 */ swc1 $f16, 0x0070($sp) /* 06424 80B6FDC4 46082301 */ sub.s $f12, $f4, $f8 -/* 06428 80B6FDC8 0C0341F5 */ jal atan2f +/* 06428 80B6FDC8 0C0341F5 */ jal Math_Atan2F /* 0642C 80B6FDCC E7AC0098 */ swc1 $f12, 0x0098($sp) /* 06430 80B6FDD0 3C0280B8 */ lui $v0, %hi(D_80B7E140) ## $v0 = 80B80000 @@ -1738,7 +1738,7 @@ glabel L80B6FA3C /* 0675C 80B700FC AFAF0040 */ sw $t7, 0x0040($sp) /* 06760 80B70100 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 06764 80B70104 2484E138 */ addiu $a0, $a0, %lo(D_80B7E138) ## $a0 = 80B7E138 -/* 06768 80B70108 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 06768 80B70108 0C01E123 */ jal Math_ApproachZeroF /* 0676C 80B7010C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 06770 80B70110 3C0180B8 */ lui $at, %hi(D_80B7E134) ## $at = 80B80000 @@ -1757,7 +1757,7 @@ glabel L80B6FA3C /* 067A4 80B70144 44052000 */ mfc1 $a1, $f4 /* 067A8 80B70148 00000000 */ nop /* 067AC 80B7014C 00052C00 */ sll $a1, $a1, 16 -/* 067B0 80B70150 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 067B0 80B70150 0C01E1EF */ jal Math_ApproachS /* 067B4 80B70154 00052C03 */ sra $a1, $a1, 16 /* 067B8 80B70158 3C1880B8 */ lui $t8, %hi(D_80B7E13C) ## $t8 = 80B80000 @@ -2034,7 +2034,7 @@ glabel L80B6FA3C /* 06BC4 80B70564 2484E154 */ addiu $a0, $a0, %lo(D_80B7E154) ## $a0 = 80B7E154 /* 06BC8 80B70568 3C05447A */ lui $a1, 0x447A ## $a1 = 447A0000 /* 06BCC 80B7056C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 06BD0 80B70570 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06BD0 80B70570 0C01E107 */ jal Math_ApproachF /* 06BD4 80B70574 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 06BD8 80B70578 10000011 */ beq $zero, $zero, .L80B705C0 @@ -2053,7 +2053,7 @@ glabel L80B6FA3C /* 06C08 80B705A8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD /* 06C0C 80B705AC 2484E154 */ addiu $a0, $a0, %lo(D_80B7E154) ## $a0 = 80B7E154 /* 06C10 80B705B0 3C05447A */ lui $a1, 0x447A ## $a1 = 447A0000 -/* 06C14 80B705B4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06C14 80B705B4 0C01E107 */ jal Math_ApproachF /* 06C18 80B705B8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06C1C 80B705BC 8FAF00EC */ lw $t7, 0x00EC($sp) @@ -2080,7 +2080,7 @@ glabel L80B6FA3C /* 06C6C 80B7060C 45020007 */ bc1fl .L80B7062C /* 06C70 80B70610 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 06C74 80B70614 3C0480B8 */ lui $a0, %hi(D_80B7E148) ## $a0 = 80B80000 -/* 06C78 80B70618 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06C78 80B70618 0C01E107 */ jal Math_ApproachF /* 06C7C 80B7061C 2484E148 */ addiu $a0, $a0, %lo(D_80B7E148) ## $a0 = 80B7E148 /* 06C80 80B70620 10000011 */ beq $zero, $zero, .L80B70668 @@ -2091,7 +2091,7 @@ glabel L80B6FA3C /* 06C90 80B70630 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD /* 06C94 80B70634 44050000 */ mfc1 $a1, $f0 /* 06C98 80B70638 44060000 */ mfc1 $a2, $f0 -/* 06C9C 80B7063C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06C9C 80B7063C 0C01E107 */ jal Math_ApproachF /* 06CA0 80B70640 2484E148 */ addiu $a0, $a0, %lo(D_80B7E148) ## $a0 = FFFFE148 /* 06CA4 80B70644 10000008 */ beq $zero, $zero, .L80B70668 @@ -2102,7 +2102,7 @@ glabel L80B6FA3C /* 06CB4 80B70654 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD /* 06CB8 80B70658 2484E148 */ addiu $a0, $a0, %lo(D_80B7E148) ## $a0 = 80B7E148 /* 06CBC 80B7065C 3C054000 */ lui $a1, 0x4000 ## $a1 = 40000000 -/* 06CC0 80B70660 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06CC0 80B70660 0C01E107 */ jal Math_ApproachF /* 06CC4 80B70664 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 .L80B70668: @@ -2112,7 +2112,7 @@ glabel L80B6FA3C /* 06CD4 80B70674 8CE7E154 */ lw $a3, %lo(D_80B7E154)($a3) /* 06CD8 80B70678 8CA5EABC */ lw $a1, %lo(D_80B7EABC)($a1) /* 06CDC 80B7067C 2484E0B8 */ addiu $a0, $a0, %lo(D_80B7E0B8) ## $a0 = 80B7E0B8 -/* 06CE0 80B70680 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06CE0 80B70680 0C01E107 */ jal Math_ApproachF /* 06CE4 80B70684 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06CE8 80B70688 3C0480B8 */ lui $a0, %hi(D_80B7E0BC) ## $a0 = 80B80000 @@ -2121,7 +2121,7 @@ glabel L80B6FA3C /* 06CF4 80B70694 8CE7E154 */ lw $a3, %lo(D_80B7E154)($a3) /* 06CF8 80B70698 8CA5EAC0 */ lw $a1, %lo(D_80B7EAC0)($a1) /* 06CFC 80B7069C 2484E0BC */ addiu $a0, $a0, %lo(D_80B7E0BC) ## $a0 = 80B7E0BC -/* 06D00 80B706A0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06D00 80B706A0 0C01E107 */ jal Math_ApproachF /* 06D04 80B706A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06D08 80B706A8 3C0480B8 */ lui $a0, %hi(D_80B7E0C0) ## $a0 = 80B80000 @@ -2130,7 +2130,7 @@ glabel L80B6FA3C /* 06D14 80B706B4 8CE7E154 */ lw $a3, %lo(D_80B7E154)($a3) /* 06D18 80B706B8 8CA5EAC4 */ lw $a1, %lo(D_80B7EAC4)($a1) /* 06D1C 80B706BC 2484E0C0 */ addiu $a0, $a0, %lo(D_80B7E0C0) ## $a0 = 80B7E0C0 -/* 06D20 80B706C0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06D20 80B706C0 0C01E107 */ jal Math_ApproachF /* 06D24 80B706C4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06D28 80B706C8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -2144,7 +2144,7 @@ glabel L80B6FA3C /* 06D48 80B706E8 44060000 */ mfc1 $a2, $f0 /* 06D4C 80B706EC 44070000 */ mfc1 $a3, $f0 /* 06D50 80B706F0 2484E154 */ addiu $a0, $a0, %lo(D_80B7E154) ## $a0 = 80B7E154 -/* 06D54 80B706F4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06D54 80B706F4 0C01E107 */ jal Math_ApproachF /* 06D58 80B706F8 3C05447A */ lui $a1, 0x447A ## $a1 = 447A0000 /* 06D5C 80B706FC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -2156,7 +2156,7 @@ glabel L80B6FA3C /* 06D70 80B70710 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 06D74 80B70714 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 06D78 80B70718 2484E154 */ addiu $a0, $a0, %lo(D_80B7E154) ## $a0 = 80B7E154 -/* 06D7C 80B7071C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 06D7C 80B7071C 0C01E107 */ jal Math_ApproachF /* 06D80 80B70720 3C05447A */ lui $a1, 0x447A ## $a1 = 447A0000 /* 06D84 80B70724 3C0280B8 */ lui $v0, %hi(D_80B7E144) ## $v0 = 80B80000 @@ -2336,7 +2336,7 @@ glabel L80B70890 .L80B709B8: /* 07018 80B709B8 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 /* 0701C 80B709BC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD -/* 07020 80B709C0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 07020 80B709C0 0C01E107 */ jal Math_ApproachF /* 07024 80B709C4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 07028 80B709C8 10000014 */ beq $zero, $zero, .L80B70A1C diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70A2C.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70A2C.s index 00d75bcf44..ee90f3d9f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70A2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70A2C.s @@ -82,14 +82,14 @@ glabel func_80B70A2C /* 07188 80B70B28 4481B000 */ mtc1 $at, $f22 ## $f22 = 3.00 /* 0718C 80B70B2C 27B100A4 */ addiu $s1, $sp, 0x00A4 ## $s1 = FFFFFFEC .L80B70B30: -/* 07190 80B70B30 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 07190 80B70B30 0C00CFBE */ jal Rand_ZeroFloat /* 07194 80B70B34 4600E306 */ mov.s $f12, $f28 /* 07198 80B70B38 461E0180 */ add.s $f6, $f0, $f30 /* 0719C 80B70B3C 3C0180B8 */ lui $at, %hi(D_80B7B538) ## $at = 80B80000 /* 071A0 80B70B40 C42CB538 */ lwc1 $f12, %lo(D_80B7B538)($at) /* 071A4 80B70B44 461A3502 */ mul.s $f20, $f6, $f26 -/* 071A8 80B70B48 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 071A8 80B70B48 0C00CFBE */ jal Rand_ZeroFloat /* 071AC 80B70B4C 00000000 */ nop /* 071B0 80B70B50 46000606 */ mov.s $f24, $f0 @@ -103,7 +103,7 @@ glabel func_80B70A2C /* 071C8 80B70B68 E7A80098 */ swc1 $f8, 0x0098($sp) /* 071CC 80B70B6C 46140282 */ mul.s $f10, $f0, $f20 /* 071D0 80B70B70 4600B306 */ mov.s $f12, $f22 -/* 071D4 80B70B74 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 071D4 80B70B74 0C00CFBE */ jal Rand_ZeroFloat /* 071D8 80B70B78 E7AA00A0 */ swc1 $f10, 0x00A0($sp) /* 071DC 80B70B7C 46160100 */ add.s $f4, $f0, $f22 @@ -133,7 +133,7 @@ glabel func_80B70A2C /* 0723C 80B70BDC 00000000 */ nop /* 07240 80B70BE0 46802420 */ cvt.s.w $f16, $f4 /* 07244 80B70BE4 E7AA00AC */ swc1 $f10, 0x00AC($sp) -/* 07248 80B70BE8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 07248 80B70BE8 0C00CFBE */ jal Rand_ZeroFloat /* 0724C 80B70BEC E7B000A8 */ swc1 $f16, 0x00A8($sp) /* 07250 80B70BF0 3C0180B8 */ lui $at, %hi(D_80B7B540) ## $at = 80B80000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70CF0.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70CF0.s index 541a3ebb0f..32366c90b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70CF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70CF0.s @@ -58,7 +58,7 @@ glabel func_80B70CF0 /* 073F0 80B70D90 4481C000 */ mtc1 $at, $f24 ## $f24 = 3.00 /* 073F4 80B70D94 27B10094 */ addiu $s1, $sp, 0x0094 ## $s1 = FFFFFFEC .L80B70D98: -/* 073F8 80B70D98 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 073F8 80B70D98 0C00CFBE */ jal Rand_ZeroFloat /* 073FC 80B70D9C 4600F306 */ mov.s $f12, $f30 /* 07400 80B70DA0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -67,7 +67,7 @@ glabel func_80B70CF0 /* 0740C 80B70DAC C42CB548 */ lwc1 $f12, %lo(D_80B7B548)($at) /* 07410 80B70DB0 46060200 */ add.s $f8, $f0, $f6 /* 07414 80B70DB4 461C4502 */ mul.s $f20, $f8, $f28 -/* 07418 80B70DB8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 07418 80B70DB8 0C00CFBE */ jal Rand_ZeroFloat /* 0741C 80B70DBC 00000000 */ nop /* 07420 80B70DC0 46000586 */ mov.s $f22, $f0 @@ -81,7 +81,7 @@ glabel func_80B70CF0 /* 07438 80B70DD8 E7AA0088 */ swc1 $f10, 0x0088($sp) /* 0743C 80B70DDC 46140402 */ mul.s $f16, $f0, $f20 /* 07440 80B70DE0 4600D306 */ mov.s $f12, $f26 -/* 07444 80B70DE4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 07444 80B70DE4 0C00CFBE */ jal Rand_ZeroFloat /* 07448 80B70DE8 E7B00090 */ swc1 $f16, 0x0090($sp) /* 0744C 80B70DEC 461A0480 */ add.s $f18, $f0, $f26 @@ -108,7 +108,7 @@ glabel func_80B70CF0 /* 074A0 80B70E40 E7A40098 */ swc1 $f4, 0x0098($sp) /* 074A4 80B70E44 46185482 */ mul.s $f18, $f10, $f24 /* 074A8 80B70E48 46124400 */ add.s $f16, $f8, $f18 -/* 074AC 80B70E4C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 074AC 80B70E4C 0C00CFBE */ jal Rand_ZeroFloat /* 074B0 80B70E50 E7B0009C */ swc1 $f16, 0x009C($sp) /* 074B4 80B70E54 3C0180B8 */ lui $at, %hi(D_80B7B550) ## $at = 80B80000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70ED4.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70ED4.s index 840920dd9f..5b13311611 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70ED4.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B70ED4.s @@ -140,7 +140,7 @@ glabel func_80B70ED4 /* 07714 80B710B4 A4C0017A */ sh $zero, 0x017A($a2) ## 0000017A /* 07718 80B710B8 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 0771C 80B710BC E7A20024 */ swc1 $f2, 0x0024($sp) -/* 07720 80B710C0 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 07720 80B710C0 0C00CFBE */ jal Rand_ZeroFloat /* 07724 80B710C4 AFA60040 */ sw $a2, 0x0040($sp) /* 07728 80B710C8 4600020D */ trunc.w.s $f8, $f0 @@ -174,7 +174,7 @@ glabel func_80B70ED4 /* 07790 80B71130 A4C0017A */ sh $zero, 0x017A($a2) ## 0000017A /* 07794 80B71134 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 07798 80B71138 E7A20024 */ swc1 $f2, 0x0024($sp) -/* 0779C 80B7113C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0779C 80B7113C 0C00CFBE */ jal Rand_ZeroFloat /* 077A0 80B71140 AFA60040 */ sw $a2, 0x0040($sp) /* 077A4 80B71144 4600040D */ trunc.w.s $f16, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76028.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76028.s index ba85fef569..4d71d36a2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76028.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76028.s @@ -27,7 +27,7 @@ glabel func_80B76028 /* 0C6CC 80B7606C 45000015 */ bc1f .L80B760C4 /* 0C6D0 80B76070 00000000 */ nop /* 0C6D4 80B76074 AFA40028 */ sw $a0, 0x0028($sp) -/* 0C6D8 80B76078 0C0341F5 */ jal atan2f +/* 0C6D8 80B76078 0C0341F5 */ jal Math_Atan2F /* 0C6DC 80B7607C E7A2001C */ swc1 $f2, 0x001C($sp) /* 0C6E0 80B76080 3C0180B8 */ lui $at, %hi(D_80B7B778) ## $at = 80B80000 @@ -45,7 +45,7 @@ glabel func_80B76028 /* 0C710 80B760B0 460A4402 */ mul.s $f16, $f8, $f10 /* 0C714 80B760B4 2444000C */ addiu $a0, $v0, 0x000C ## $a0 = 0000000C /* 0C718 80B760B8 44058000 */ mfc1 $a1, $f16 -/* 0C71C 80B760BC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0C71C 80B760BC 0C01E107 */ jal Math_ApproachF /* 0C720 80B760C0 00000000 */ nop .L80B760C4: diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B760D4.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B760D4.s index d5dc719ffb..5647756938 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B760D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B760D4.s @@ -20,7 +20,7 @@ glabel func_80B760D4 /* 0C77C 80B7611C E7A0001C */ swc1 $f0, 0x001C($sp) /* 0C780 80B76120 4500000A */ bc1f .L80B7614C /* 0C784 80B76124 00000000 */ nop -/* 0C788 80B76128 0C034199 */ jal atan2s +/* 0C788 80B76128 0C034199 */ jal Math_Atan2S /* 0C78C 80B7612C 00000000 */ nop /* 0C790 80B76130 8FA40028 */ lw $a0, 0x0028($sp) @@ -28,7 +28,7 @@ glabel func_80B760D4 /* 0C798 80B76138 00052C03 */ sra $a1, $a1, 16 /* 0C79C 80B7613C 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A /* 0C7A0 80B76140 24070300 */ addiu $a3, $zero, 0x0300 ## $a3 = 00000300 -/* 0C7A4 80B76144 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0C7A4 80B76144 0C01E1EF */ jal Math_ApproachS /* 0C7A8 80B76148 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 .L80B7614C: @@ -54,7 +54,7 @@ glabel func_80B760D4 /* 0C7F8 80B76198 00000000 */ nop .L80B7619C: /* 0C7FC 80B7619C 44050000 */ mfc1 $a1, $f0 -/* 0C800 80B761A0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0C800 80B761A0 0C01E107 */ jal Math_ApproachF /* 0C804 80B761A4 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD .L80B761A8: diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B761B8.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B761B8.s index 1b8b1f3739..fa1d1d52ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B761B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B761B8.s @@ -101,7 +101,7 @@ glabel func_80B761B8 /* 0C978 80B76318 4405B000 */ mfc1 $a1, $f22 .L80B7631C: /* 0C97C 80B7631C 4406B000 */ mfc1 $a2, $f22 -/* 0C980 80B76320 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 0C980 80B76320 0C01E123 */ jal Math_ApproachZeroF /* 0C984 80B76324 2624000C */ addiu $a0, $s1, 0x000C ## $a0 = 80B7FF04 /* 0C988 80B76328 10000037 */ beq $zero, $zero, .L80B76408 @@ -140,13 +140,13 @@ glabel func_80B761B8 .L80B76398: /* 0C9F8 80B76398 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0C9FC 80B7639C 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 0CA00 80B763A0 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0CA00 80B763A0 0C01E1EF */ jal Math_ApproachS /* 0CA04 80B763A4 24070050 */ addiu $a3, $zero, 0x0050 ## $a3 = 00000050 /* 0CA08 80B763A8 86240032 */ lh $a0, 0x0032($s1) ## 80B7FF2A /* 0CA0C 80B763AC 00042300 */ sll $a0, $a0, 12 /* 0CA10 80B763B0 00042400 */ sll $a0, $a0, 16 -/* 0CA14 80B763B4 0C01DE1C */ jal Math_Sins +/* 0CA14 80B763B4 0C01DE1C */ jal Math_SinS ## sins? /* 0CA18 80B763B8 00042403 */ sra $a0, $a0, 16 /* 0CA1C 80B763BC 8E6C07C0 */ lw $t4, 0x07C0($s3) ## 000007C0 @@ -165,7 +165,7 @@ glabel func_80B761B8 /* 0CA50 80B763F0 2624002C */ addiu $a0, $s1, 0x002C ## $a0 = 80B7FF24 /* 0CA54 80B763F4 46049180 */ add.s $f6, $f18, $f4 /* 0CA58 80B763F8 46065400 */ add.s $f16, $f10, $f6 -/* 0CA5C 80B763FC 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 0CA5C 80B763FC 0C01E123 */ jal Math_ApproachZeroF /* 0CA60 80B76400 E6300004 */ swc1 $f16, 0x0004($s1) ## 80B7FEFC .L80B76404: diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B768FC.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B768FC.s index 58e8f91645..2e5d58e3c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B768FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B768FC.s @@ -161,7 +161,7 @@ glabel func_80B768FC /* 0D108 80B76AA8 3C073A83 */ lui $a3, 0x3A83 ## $a3 = 3A830000 /* 0D10C 80B76AAC 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A83126F /* 0D110 80B76AB0 4406C000 */ mfc1 $a2, $f24 -/* 0D114 80B76AB4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0D114 80B76AB4 0C01E107 */ jal Math_ApproachF /* 0D118 80B76AB8 34A53333 */ ori $a1, $a1, 0x3333 ## $a1 = 3F333333 .L80B76ABC: @@ -230,7 +230,7 @@ glabel func_80B768FC /* 0D208 80B76BA8 E7B200BC */ swc1 $f18, 0x00BC($sp) /* 0D20C 80B76BAC 4406C000 */ mfc1 $a2, $f24 .L80B76BB0: -/* 0D210 80B76BB0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0D210 80B76BB0 0C01E107 */ jal Math_ApproachF /* 0D214 80B76BB4 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A83126F .L80B76BB8: @@ -299,7 +299,7 @@ glabel func_80B768FC /* 0D304 80B76CA4 E7A800C8 */ swc1 $f8, 0x00C8($sp) /* 0D308 80B76CA8 4406C000 */ mfc1 $a2, $f24 .L80B76CAC: -/* 0D30C 80B76CAC 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0D30C 80B76CAC 0C01E107 */ jal Math_ApproachF /* 0D310 80B76CB0 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A83126F .L80B76CB4: @@ -381,7 +381,7 @@ glabel func_80B768FC /* 0D424 80B76DC4 C6120018 */ lwc1 $f18, 0x0018($s0) ## 80B81FE0 /* 0D428 80B76DC8 4600A386 */ mov.s $f14, $f20 /* 0D42C 80B76DCC 46049581 */ sub.s $f22, $f18, $f4 -/* 0D430 80B76DD0 0C034199 */ jal atan2s +/* 0D430 80B76DD0 0C034199 */ jal Math_Atan2S /* 0D434 80B76DD4 4600B306 */ mov.s $f12, $f22 /* 0D438 80B76DD8 4614A182 */ mul.s $f6, $f20, $f20 @@ -390,7 +390,7 @@ glabel func_80B768FC /* 0D444 80B76DE4 4616B202 */ mul.s $f8, $f22, $f22 /* 0D448 80B76DE8 46083000 */ add.s $f0, $f6, $f8 /* 0D44C 80B76DEC 46000304 */ sqrt.s $f12, $f0 -/* 0D450 80B76DF0 0C034199 */ jal atan2s +/* 0D450 80B76DF0 0C034199 */ jal Math_Atan2S /* 0D454 80B76DF4 E7AC00E8 */ swc1 $f12, 0x00E8($sp) /* 0D458 80B76DF8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -405,7 +405,7 @@ glabel func_80B768FC /* 0D47C 80B76E1C 31F8001F */ andi $t8, $t7, 0x001F ## $t8 = 00000000 /* 0D480 80B76E20 5700005A */ bnel $t8, $zero, .L80B76F8C /* 0D484 80B76E24 2604003E */ addiu $a0, $s0, 0x003E ## $a0 = 80B82006 -/* 0D488 80B76E28 0C03F66B */ jal Math_Rand_ZeroOne +/* 0D488 80B76E28 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0D48C 80B76E2C 00000000 */ nop /* 0D490 80B76E30 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -419,7 +419,7 @@ glabel func_80B768FC /* 0D4AC 80B76E4C 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 0D4B0 80B76E50 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0D4B4 80B76E54 02E1C821 */ addu $t9, $s7, $at -/* 0D4B8 80B76E58 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D4B8 80B76E58 0C00CFC8 */ jal Rand_CenteredFloat /* 0D4BC 80B76E5C AFB90080 */ sw $t9, 0x0080($sp) /* 0D4C0 80B76E60 00124080 */ sll $t0, $s2, 2 @@ -437,14 +437,14 @@ glabel func_80B768FC /* 0D4F0 80B76E90 4501000E */ bc1t .L80B76ECC /* 0D4F4 80B76E94 00000000 */ nop /* 0D4F8 80B76E98 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 -/* 0D4FC 80B76E9C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D4FC 80B76E9C 0C00CFC8 */ jal Rand_CenteredFloat /* 0D500 80B76EA0 00000000 */ nop /* 0D504 80B76EA4 C62A0000 */ lwc1 $f10, 0x0000($s1) ## 80B830B0 /* 0D508 80B76EA8 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 0D50C 80B76EAC 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 /* 0D510 80B76EB0 460A0400 */ add.s $f16, $f0, $f10 -/* 0D514 80B76EB4 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D514 80B76EB4 0C00CFC8 */ jal Rand_CenteredFloat /* 0D518 80B76EB8 E6100010 */ swc1 $f16, 0x0010($s0) ## 80B81FD8 /* 0D51C 80B76EBC C6320008 */ lwc1 $f18, 0x0008($s1) ## 80B830B8 @@ -452,13 +452,13 @@ glabel func_80B768FC /* 0D524 80B76EC4 1000000B */ beq $zero, $zero, .L80B76EF4 /* 0D528 80B76EC8 E6040018 */ swc1 $f4, 0x0018($s0) ## 80B81FE0 .L80B76ECC: -/* 0D52C 80B76ECC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D52C 80B76ECC 0C00CFC8 */ jal Rand_CenteredFloat /* 0D530 80B76ED0 4600D306 */ mov.s $f12, $f26 /* 0D534 80B76ED4 C6260000 */ lwc1 $f6, 0x0000($s1) ## 80B830B0 /* 0D538 80B76ED8 4600D306 */ mov.s $f12, $f26 /* 0D53C 80B76EDC 46060200 */ add.s $f8, $f0, $f6 -/* 0D540 80B76EE0 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0D540 80B76EE0 0C00CFC8 */ jal Rand_CenteredFloat /* 0D544 80B76EE4 E6080010 */ swc1 $f8, 0x0010($s0) ## 80B81FD8 /* 0D548 80B76EE8 C62A0008 */ lwc1 $f10, 0x0008($s1) ## 80B830B8 @@ -480,7 +480,7 @@ glabel func_80B768FC /* 0D584 80B76F24 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 /* 0D588 80B76F28 00000000 */ nop /* 0D58C 80B76F2C 46809120 */ cvt.s.w $f4, $f18 -/* 0D590 80B76F30 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0D590 80B76F30 0C00CFBE */ jal Rand_ZeroFloat /* 0D594 80B76F34 E7A400A4 */ swc1 $f4, 0x00A4($sp) /* 0D598 80B76F38 8FB80080 */ lw $t8, 0x0080($sp) @@ -535,7 +535,7 @@ glabel func_80B768FC /* 0D64C 80B76FEC 00000000 */ nop /* 0D650 80B76FF0 2405E0C0 */ addiu $a1, $zero, 0xE0C0 ## $a1 = FFFFE0C0 .L80B76FF4: -/* 0D654 80B76FF4 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0D654 80B76FF4 0C01E1EF */ jal Math_ApproachS /* 0D658 80B76FF8 26040042 */ addiu $a0, $s0, 0x0042 ## $a0 = 80B8200A /* 0D65C 80B76FFC 860A0042 */ lh $t2, 0x0042($s0) ## 80B8200A @@ -548,7 +548,7 @@ glabel func_80B768FC /* 0D678 80B77018 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 0D67C 80B7701C 24074000 */ addiu $a3, $zero, 0x4000 ## $a3 = 00004000 /* 0D680 80B77020 46105482 */ mul.s $f18, $f10, $f16 -/* 0D684 80B77024 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0D684 80B77024 0C01E1EF */ jal Math_ApproachS /* 0D688 80B77028 E7B200E0 */ swc1 $f18, 0x00E0($sp) /* 0D68C 80B7702C 87AB00FE */ lh $t3, 0x00FE($sp) @@ -579,32 +579,32 @@ glabel func_80B768FC /* 0D6EC 80B7708C E60A0028 */ swc1 $f10, 0x0028($s0) ## 80B81FF0 /* 0D6F0 80B77090 E6100034 */ swc1 $f16, 0x0034($s0) ## 80B81FFC .L80B77094: -/* 0D6F4 80B77094 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0D6F4 80B77094 0C01E107 */ jal Math_ApproachF /* 0D6F8 80B77098 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 0D6FC 80B7709C C6120028 */ lwc1 $f18, 0x0028($s0) ## 80B81FF0 /* 0D700 80B770A0 C7A400D8 */ lwc1 $f4, 0x00D8($sp) /* 0D704 80B770A4 8604003C */ lh $a0, 0x003C($s0) ## 80B82004 /* 0D708 80B770A8 46049502 */ mul.s $f20, $f18, $f4 -/* 0D70C 80B770AC 0C01DE0D */ jal Math_Coss +/* 0D70C 80B770AC 0C01DE0D */ jal Math_CosS ## coss? /* 0D710 80B770B0 00000000 */ nop /* 0D714 80B770B4 46140582 */ mul.s $f22, $f0, $f20 -/* 0D718 80B770B8 0C01DE1C */ jal Math_Sins +/* 0D718 80B770B8 0C01DE1C */ jal Math_SinS ## sins? /* 0D71C 80B770BC 8604003E */ lh $a0, 0x003E($s0) ## 80B82006 /* 0D720 80B770C0 4600B202 */ mul.s $f8, $f22, $f0 /* 0D724 80B770C4 C6060004 */ lwc1 $f6, 0x0004($s0) ## 80B81FCC /* 0D728 80B770C8 8604003C */ lh $a0, 0x003C($s0) ## 80B82004 /* 0D72C 80B770CC 46083280 */ add.s $f10, $f6, $f8 -/* 0D730 80B770D0 0C01DE1C */ jal Math_Sins +/* 0D730 80B770D0 0C01DE1C */ jal Math_SinS ## sins? /* 0D734 80B770D4 E60A0004 */ swc1 $f10, 0x0004($s0) ## 80B81FCC /* 0D738 80B770D8 4600A482 */ mul.s $f18, $f20, $f0 /* 0D73C 80B770DC C6100008 */ lwc1 $f16, 0x0008($s0) ## 80B81FD0 /* 0D740 80B770E0 8604003E */ lh $a0, 0x003E($s0) ## 80B82006 /* 0D744 80B770E4 46128100 */ add.s $f4, $f16, $f18 -/* 0D748 80B770E8 0C01DE0D */ jal Math_Coss +/* 0D748 80B770E8 0C01DE0D */ jal Math_CosS ## coss? /* 0D74C 80B770EC E6040008 */ swc1 $f4, 0x0008($s0) ## 80B81FD0 /* 0D750 80B770F0 4600B202 */ mul.s $f8, $f22, $f0 @@ -617,7 +617,7 @@ glabel func_80B768FC /* 0D76C 80B7710C E60A000C */ swc1 $f10, 0x000C($s0) ## 80B81FD4 /* 0D770 80B77110 4405C000 */ mfc1 $a1, $f24 /* 0D774 80B77114 4406C000 */ mfc1 $a2, $f24 -/* 0D778 80B77118 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0D778 80B77118 0C01E107 */ jal Math_ApproachF /* 0D77C 80B7711C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 0D780 80B77120 3C053ECC */ lui $a1, 0x3ECC ## $a1 = 3ECC0000 @@ -625,7 +625,7 @@ glabel func_80B768FC /* 0D788 80B77128 3C073D23 */ lui $a3, 0x3D23 ## $a3 = 3D230000 /* 0D78C 80B7712C 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3D23D70A /* 0D790 80B77130 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3ECCCCCD -/* 0D794 80B77134 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0D794 80B77134 0C01E107 */ jal Math_ApproachF /* 0D798 80B77138 26040038 */ addiu $a0, $s0, 0x0038 ## $a0 = 80B82000 /* 0D79C 80B7713C C6100030 */ lwc1 $f16, 0x0030($s0) ## 80B81FF8 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B77404.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B77404.s index b77e23aa10..d2e38788bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B77404.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B77404.s @@ -782,7 +782,7 @@ glabel L80B77C74 /* 0E518 80B77EB8 346E0400 */ ori $t6, $v1, 0x0400 ## $t6 = 00000400 /* 0E51C 80B77EBC ACCE0EC0 */ sw $t6, 0x0EC0($a2) ## 8015DB80 /* 0E520 80B77EC0 AFAF0034 */ sw $t7, 0x0034($sp) -/* 0E524 80B77EC4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0E524 80B77EC4 0C00CFBE */ jal Rand_ZeroFloat /* 0E528 80B77EC8 C42CB824 */ lwc1 $f12, %lo(D_80B7B824)($at) /* 0E52C 80B77ECC 4458F800 */ cfc1 $t8, $31 @@ -837,7 +837,7 @@ glabel L80B77C74 /* 0E5E0 80B77F80 346C0800 */ ori $t4, $v1, 0x0800 ## $t4 = 00000800 /* 0E5E4 80B77F84 ACCC0EC0 */ sw $t4, 0x0EC0($a2) ## 00000EC0 /* 0E5E8 80B77F88 AFAD0034 */ sw $t5, 0x0034($sp) -/* 0E5EC 80B77F8C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0E5EC 80B77F8C 0C00CFBE */ jal Rand_ZeroFloat /* 0E5F0 80B77F90 C42CB828 */ lwc1 $f12, %lo(D_80B7B828)($at) /* 0E5F4 80B77F94 444EF800 */ cfc1 $t6, $31 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s index 9b60771ec2..d8b2073b53 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s @@ -158,13 +158,13 @@ glabel func_80B7825C /* 0E91C 80B782BC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0E920 80B782C0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0E924 80B782C4 24070028 */ addiu $a3, $zero, 0x0028 ## $a3 = 00000028 -/* 0E928 80B782C8 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0E928 80B782C8 0C01E1EF */ jal Math_ApproachS /* 0E92C 80B782CC AFA200E4 */ sw $v0, 0x00E4($sp) /* 0E930 80B782D0 10000004 */ beq $zero, $zero, .L80B782E4 /* 0E934 80B782D4 87AF00F8 */ lh $t7, 0x00F8($sp) .L80B782D8: -/* 0E938 80B782D8 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0E938 80B782D8 0C01E1EF */ jal Math_ApproachS /* 0E93C 80B782DC AFA200E4 */ sw $v0, 0x00E4($sp) /* 0E940 80B782E0 87AF00F8 */ lh $t7, 0x00F8($sp) @@ -231,7 +231,7 @@ glabel func_80B7825C .L80B783B0: /* 0EA10 80B783B0 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 .L80B783B4: -/* 0EA14 80B783B4 0C01E1EF */ jal Math_SmoothScaleMaxS +/* 0EA14 80B783B4 0C01E1EF */ jal Math_ApproachS /* 0EA18 80B783B8 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 /* 0EA1C 80B783BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -241,7 +241,7 @@ glabel func_80B7825C /* 0EA2C 80B783CC 312A001F */ andi $t2, $t1, 0x001F ## $t2 = 00000000 /* 0EA30 80B783D0 5540000C */ bnel $t2, $zero, .L80B78404 /* 0EA34 80B783D4 8FAB0128 */ lw $t3, 0x0128($sp) -/* 0EA38 80B783D8 0C03F66B */ jal Math_Rand_ZeroOne +/* 0EA38 80B783D8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0EA3C 80B783DC 00000000 */ nop /* 0EA40 80B783E0 3C0180B8 */ lui $at, %hi(D_80B7B830) ## $at = 80B80000 @@ -625,7 +625,7 @@ glabel L80B78930 /* 0EFD0 80B78970 460C6182 */ mul.s $f6, $f12, $f12 /* 0EFD4 80B78974 46064000 */ add.s $f0, $f8, $f6 /* 0EFD8 80B78978 46000004 */ sqrt.s $f0, $f0 -/* 0EFDC 80B7897C 0C0341F5 */ jal atan2f +/* 0EFDC 80B7897C 0C0341F5 */ jal Math_Atan2F /* 0EFE0 80B78980 E7A000EC */ swc1 $f0, 0x00EC($sp) /* 0EFE4 80B78984 46000306 */ mov.s $f12, $f0 @@ -664,7 +664,7 @@ glabel L80B78930 /* 0F060 80B78A00 2484FEB8 */ addiu $a0, $a0, %lo(D_80B7FEB8) ## $a0 = 80B7FEB8 /* 0F064 80B78A04 E7A200F0 */ swc1 $f2, 0x00F0($sp) /* 0F068 80B78A08 44072000 */ mfc1 $a3, $f4 -/* 0F06C 80B78A0C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0F06C 80B78A0C 0C01E107 */ jal Math_ApproachF /* 0F070 80B78A10 00000000 */ nop /* 0F074 80B78A14 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -679,7 +679,7 @@ glabel L80B78930 /* 0F098 80B78A38 8CA5E0BC */ lw $a1, %lo(D_80B7E0BC)($a1) /* 0F09C 80B78A3C 2484FEBC */ addiu $a0, $a0, %lo(D_80B7FEBC) ## $a0 = 80B7FEBC /* 0F0A0 80B78A40 44075000 */ mfc1 $a3, $f10 -/* 0F0A4 80B78A44 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0F0A4 80B78A44 0C01E107 */ jal Math_ApproachF /* 0F0A8 80B78A48 00000000 */ nop /* 0F0AC 80B78A4C C7B00104 */ lwc1 $f16, 0x0104($sp) @@ -694,7 +694,7 @@ glabel L80B78930 /* 0F0D0 80B78A70 8CA5E0C0 */ lw $a1, %lo(D_80B7E0C0)($a1) /* 0F0D4 80B78A74 2484FEC0 */ addiu $a0, $a0, %lo(D_80B7FEC0) ## $a0 = 80B7FEC0 /* 0F0D8 80B78A78 44074000 */ mfc1 $a3, $f8 -/* 0F0DC 80B78A7C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0F0DC 80B78A7C 0C01E107 */ jal Math_ApproachF /* 0F0E0 80B78A80 00000000 */ nop /* 0F0E4 80B78A84 3C0180B8 */ lui $at, %hi(D_80B7FED0) ## $at = 80B80000 @@ -741,7 +741,7 @@ glabel L80B78930 /* 0F180 80B78B20 E7AA010C */ swc1 $f10, 0x010C($sp) /* 0F184 80B78B24 C5E8002C */ lwc1 $f8, 0x002C($t7) ## 0000002C /* 0F188 80B78B28 46082180 */ add.s $f6, $f4, $f8 -/* 0F18C 80B78B2C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0F18C 80B78B2C 0C01E107 */ jal Math_ApproachF /* 0F190 80B78B30 E7A60110 */ swc1 $f6, 0x0110($sp) /* 0F194 80B78B34 960B0020 */ lhu $t3, 0x0020($s0) ## 00000020 @@ -896,7 +896,7 @@ glabel L80B78930 /* 0F3BC 80B78D5C 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 0F3C0 80B78D60 2484FEA8 */ addiu $a0, $a0, %lo(D_80B7FEA8) ## $a0 = 80B7FEA8 /* 0F3C4 80B78D64 44072000 */ mfc1 $a3, $f4 -/* 0F3C8 80B78D68 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0F3C8 80B78D68 0C01E107 */ jal Math_ApproachF /* 0F3CC 80B78D6C 00000000 */ nop /* 0F3D0 80B78D70 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -911,7 +911,7 @@ glabel L80B78930 /* 0F3F4 80B78D94 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 0F3F8 80B78D98 2484FEAC */ addiu $a0, $a0, %lo(D_80B7FEAC) ## $a0 = 80B7FEAC /* 0F3FC 80B78D9C 44073000 */ mfc1 $a3, $f6 -/* 0F400 80B78DA0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0F400 80B78DA0 0C01E107 */ jal Math_ApproachF /* 0F404 80B78DA4 00000000 */ nop /* 0F408 80B78DA8 C7B00104 */ lwc1 $f16, 0x0104($sp) @@ -926,7 +926,7 @@ glabel L80B78930 /* 0F42C 80B78DCC 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 0F430 80B78DD0 2484FEB0 */ addiu $a0, $a0, %lo(D_80B7FEB0) ## $a0 = 80B7FEB0 /* 0F434 80B78DD4 44074000 */ mfc1 $a3, $f8 -/* 0F438 80B78DD8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0F438 80B78DD8 0C01E107 */ jal Math_ApproachF /* 0F43C 80B78DDC 00000000 */ nop /* 0F440 80B78DE0 100001DE */ beq $zero, $zero, .L80B7955C @@ -1197,7 +1197,7 @@ glabel L80B791B0 /* 0F83C 80B791DC 2484FEE4 */ addiu $a0, $a0, %lo(D_80B7FEE4) ## $a0 = 80B7FEE4 /* 0F840 80B791E0 3C05428E */ lui $a1, 0x428E ## $a1 = 428E0000 /* 0F844 80B791E4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 0F848 80B791E8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0F848 80B791E8 0C01E107 */ jal Math_ApproachF /* 0F84C 80B791EC 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 0F850 80B791F0 8FAB00E4 */ lw $t3, 0x00E4($sp) @@ -1218,7 +1218,7 @@ glabel L80B791B0 /* 0F88C 80B7922C 8F241DE4 */ lw $a0, 0x1DE4($t9) ## 00001DE4 /* 0F890 80B79230 00042300 */ sll $a0, $a0, 12 /* 0F894 80B79234 00042400 */ sll $a0, $a0, 16 -/* 0F898 80B79238 0C01DE1C */ jal Math_Sins +/* 0F898 80B79238 0C01DE1C */ jal Math_SinS ## sins? /* 0F89C 80B7923C 00042403 */ sra $a0, $a0, 16 /* 0F8A0 80B79240 3C0180B8 */ lui $at, %hi(D_80B7FEE4) ## $at = 80B80000 @@ -1263,7 +1263,7 @@ glabel L80B791B0 /* 0F938 80B792D8 C5A6002C */ lwc1 $f6, 0x002C($t5) ## 0000002C /* 0F93C 80B792DC 3C073F40 */ lui $a3, 0x3F40 ## $a3 = 3F400000 /* 0F940 80B792E0 46043200 */ add.s $f8, $f6, $f4 -/* 0F944 80B792E4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0F944 80B792E4 0C01E107 */ jal Math_ApproachF /* 0F948 80B792E8 E4480008 */ swc1 $f8, 0x0008($v0) ## 80B7FEE0 /* 0F94C 80B792EC 3C0180B8 */ lui $at, %hi(D_80B7FEC8) ## $at = 80B80000 @@ -1447,7 +1447,7 @@ glabel L80B7955C /* 0FBF0 80B79590 44050000 */ mfc1 $a1, $f0 /* 0FBF4 80B79594 44060000 */ mfc1 $a2, $f0 /* 0FBF8 80B79598 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A -/* 0FBFC 80B7959C 0C01E107 */ jal Math_SmoothScaleMaxF +/* 0FBFC 80B7959C 0C01E107 */ jal Math_ApproachF /* 0FC00 80B795A0 2484FECC */ addiu $a0, $a0, %lo(D_80B7FECC) ## $a0 = 80B7FECC /* 0FC04 80B795A4 8E0907C0 */ lw $t1, 0x07C0($s0) ## 000007C0 @@ -1528,7 +1528,7 @@ glabel L80B7955C /* 0FD20 80B796C0 55800023 */ bnel $t4, $zero, .L80B79750 /* 0FD24 80B796C4 4602003C */ c.lt.s $f0, $f2 /* 0FD28 80B796C8 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 0FD2C 80B796CC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0FD2C 80B796CC 0C00CFC8 */ jal Rand_CenteredFloat /* 0FD30 80B796D0 00000000 */ nop /* 0FD34 80B796D4 8FAD00E4 */ lw $t5, 0x00E4($sp) @@ -1536,7 +1536,7 @@ glabel L80B7955C /* 0FD3C 80B796DC 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 0FD40 80B796E0 C5AA0024 */ lwc1 $f10, 0x0024($t5) ## 00000024 /* 0FD44 80B796E4 460A0100 */ add.s $f4, $f0, $f10 -/* 0FD48 80B796E8 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 0FD48 80B796E8 0C00CFC8 */ jal Rand_CenteredFloat /* 0FD4C 80B796EC E7A400A4 */ swc1 $f4, 0x00A4($sp) /* 0FD50 80B796F0 8FA200E4 */ lw $v0, 0x00E4($sp) @@ -1592,7 +1592,7 @@ glabel L80B7955C .L80B797B0: /* 0FE10 80B797B0 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 0FE14 80B797B4 44816000 */ mtc1 $at, $f12 ## $f12 = 1.50 -/* 0FE18 80B797B8 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0FE18 80B797B8 0C00CFBE */ jal Rand_ZeroFloat /* 0FE1C 80B797BC 00000000 */ nop /* 0FE20 80B797C0 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 @@ -1600,7 +1600,7 @@ glabel L80B7955C /* 0FE28 80B797C8 3C0180B8 */ lui $at, %hi(D_80B7B8B8) ## $at = 80B80000 /* 0FE2C 80B797CC C42CB8B8 */ lwc1 $f12, %lo(D_80B7B8B8)($at) /* 0FE30 80B797D0 460A0100 */ add.s $f4, $f0, $f10 -/* 0FE34 80B797D4 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0FE34 80B797D4 0C00CFBE */ jal Rand_ZeroFloat /* 0FE38 80B797D8 E7A40084 */ swc1 $f4, 0x0084($sp) /* 0FE3C 80B797DC E7A00080 */ swc1 $f0, 0x0080($sp) @@ -1617,7 +1617,7 @@ glabel L80B7955C /* 0FE60 80B79800 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 0FE64 80B79804 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 /* 0FE68 80B79808 460A0102 */ mul.s $f4, $f0, $f10 -/* 0FE6C 80B7980C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0FE6C 80B7980C 0C00CFBE */ jal Rand_ZeroFloat /* 0FE70 80B79810 E7A40090 */ swc1 $f4, 0x0090($sp) /* 0FE74 80B79814 3C014000 */ lui $at, 0x4000 ## $at = 40000000 @@ -1650,7 +1650,7 @@ glabel L80B7955C /* 0FEE0 80B79880 C7AA009C */ lwc1 $f10, 0x009C($sp) /* 0FEE4 80B79884 E7A80098 */ swc1 $f8, 0x0098($sp) /* 0FEE8 80B79888 46065200 */ add.s $f8, $f10, $f6 -/* 0FEEC 80B7988C 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 0FEEC 80B7988C 0C00CFBE */ jal Rand_ZeroFloat /* 0FEF0 80B79890 E7A8009C */ swc1 $f8, 0x009C($sp) /* 0FEF4 80B79894 3C0180B8 */ lui $at, %hi(D_80B7B8C0) ## $at = 80B80000 @@ -1763,7 +1763,7 @@ glabel L80B7955C /* 10078 80B79A18 31E90FFF */ andi $t1, $t7, 0x0FFF ## $t1 = 00000000 /* 1007C 80B79A1C 1521003B */ bne $t1, $at, .L80B79B0C /* 10080 80B79A20 00000000 */ nop -/* 10084 80B79A24 0C03F66B */ jal Math_Rand_ZeroOne +/* 10084 80B79A24 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 10088 80B79A28 A0AA0000 */ sb $t2, 0x0000($a1) ## 80B7E077 /* 1008C 80B79A2C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -1776,7 +1776,7 @@ glabel L80B7955C /* 100A8 80B79A48 00000000 */ nop /* 100AC 80B79A4C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 100B0 80B79A50 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 100B4 80B79A54 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 100B4 80B79A54 0C00CFBE */ jal Rand_ZeroFloat /* 100B8 80B79A58 00000000 */ nop /* 100BC 80B79A5C 444CF800 */ cfc1 $t4, $31 @@ -1843,7 +1843,7 @@ glabel L80B7955C .L80B79B3C: /* 1019C 80B79B3C 44052000 */ mfc1 $a1, $f4 /* 101A0 80B79B40 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 -/* 101A4 80B79B44 0C01E107 */ jal Math_SmoothScaleMaxF +/* 101A4 80B79B44 0C01E107 */ jal Math_ApproachF /* 101A8 80B79B48 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 101AC 80B79B4C 3C0180B8 */ lui $at, %hi(D_80B7A650) ## $at = 80B80000 @@ -1872,7 +1872,7 @@ glabel L80B7955C /* 10208 80B79BA8 46006086 */ mov.s $f2, $f12 /* 1020C 80B79BAC 44051000 */ mfc1 $a1, $f2 .L80B79BB0: -/* 10210 80B79BB0 0C01E107 */ jal Math_SmoothScaleMaxF +/* 10210 80B79BB0 0C01E107 */ jal Math_ApproachF /* 10214 80B79BB4 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A /* 10218 80B79BB8 3C0180B8 */ lui $at, %hi(D_80B7A650) ## $at = 80B80000 @@ -1896,7 +1896,7 @@ glabel L80B7955C /* 1025C 80B79BFC 00000000 */ nop /* 10260 80B79C00 44051000 */ mfc1 $a1, $f2 .L80B79C04: -/* 10264 80B79C04 0C01E107 */ jal Math_SmoothScaleMaxF +/* 10264 80B79C04 0C01E107 */ jal Math_ApproachF /* 10268 80B79C08 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 1026C 80B79C0C 3C0480B8 */ lui $a0, %hi(D_80B7A65C) ## $a0 = 80B80000 @@ -1923,13 +1923,13 @@ glabel L80B7955C /* 102BC 80B79C5C 2484A658 */ addiu $a0, $a0, %lo(D_80B7A658) ## $a0 = 80B7A658 /* 102C0 80B79C60 3C05C348 */ lui $a1, 0xC348 ## $a1 = C3480000 /* 102C4 80B79C64 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 102C8 80B79C68 0C01E107 */ jal Math_SmoothScaleMaxF +/* 102C8 80B79C68 0C01E107 */ jal Math_ApproachF /* 102CC 80B79C6C 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 102D0 80B79C70 10000003 */ beq $zero, $zero, .L80B79C80 /* 102D4 80B79C74 00000000 */ nop .L80B79C78: -/* 102D8 80B79C78 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 102D8 80B79C78 0C01E123 */ jal Math_ApproachZeroF /* 102DC 80B79C7C 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 .L80B79C80: @@ -2047,14 +2047,14 @@ glabel L80B7955C /* 10484 80B79E24 3C01442F */ lui $at, 0x442F ## $at = 442F0000 .L80B79E28: /* 10488 80B79E28 44816000 */ mtc1 $at, $f12 ## $f12 = 700.00 -/* 1048C 80B79E2C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 1048C 80B79E2C 0C00CFC8 */ jal Rand_CenteredFloat /* 10490 80B79E30 A7A30076 */ sh $v1, 0x0076($sp) /* 10494 80B79E34 C60600E0 */ lwc1 $f6, 0x00E0($s0) ## 000000E0 /* 10498 80B79E38 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 1049C 80B79E3C 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 104A0 80B79E40 46060200 */ add.s $f8, $f0, $f6 -/* 104A4 80B79E44 0C00CFBE */ jal Math_Rand_ZeroFloat +/* 104A4 80B79E44 0C00CFBE */ jal Rand_ZeroFloat /* 104A8 80B79E48 E7A80064 */ swc1 $f8, 0x0064($sp) /* 104AC 80B79E4C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 @@ -2065,7 +2065,7 @@ glabel L80B7955C /* 104C0 80B79E60 3C01442F */ lui $at, 0x442F ## $at = 442F0000 /* 104C4 80B79E64 44816000 */ mtc1 $at, $f12 ## $f12 = 700.00 /* 104C8 80B79E68 46065201 */ sub.s $f8, $f10, $f6 -/* 104CC 80B79E6C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 104CC 80B79E6C 0C00CFC8 */ jal Rand_CenteredFloat /* 104D0 80B79E70 E7A80068 */ swc1 $f8, 0x0068($sp) /* 104D4 80B79E74 C60400E8 */ lwc1 $f4, 0x00E8($s0) ## 000000E8 diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Init.s b/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Init.s index 7a0169bdf4..98b35f9483 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Init.s @@ -64,15 +64,15 @@ glabel ItemShield_Init /* 000D8 80B869F8 24140011 */ addiu $s4, $zero, 0x0011 ## $s4 = 00000011 .L80B869FC: /* 000DC 80B869FC A251019E */ sb $s1, 0x019E($s2) ## 0000019E -/* 000E0 80B86A00 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 000E0 80B86A00 0C00CFC8 */ jal Rand_CenteredFloat /* 000E4 80B86A04 4600A306 */ mov.s $f12, $f20 /* 000E8 80B86A08 E60001A8 */ swc1 $f0, 0x01A8($s0) ## 000001A8 -/* 000EC 80B86A0C 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 000EC 80B86A0C 0C00CFC8 */ jal Rand_CenteredFloat /* 000F0 80B86A10 4600A306 */ mov.s $f12, $f20 /* 000F4 80B86A14 E60001AC */ swc1 $f0, 0x01AC($s0) ## 000001AC -/* 000F8 80B86A18 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 000F8 80B86A18 0C00CFC8 */ jal Rand_CenteredFloat /* 000FC 80B86A1C 4600A306 */ mov.s $f12, $f20 /* 00100 80B86A20 26310002 */ addiu $s1, $s1, 0x0002 ## $s1 = 00000003 diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86CA8.s b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86CA8.s index 95169f2820..e2522c0fa4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86CA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86CA8.s @@ -44,7 +44,7 @@ glabel func_80B86CA8 /* 003F4 80B86D14 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 003F8 80B86D18 0C00B92D */ jal func_8002E4B4 /* 003FC 80B86D1C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00400 80B86D20 0C01DE1C */ jal Math_Sins +/* 00400 80B86D20 0C01DE1C */ jal Math_SinS ## sins? /* 00404 80B86D24 866400B4 */ lh $a0, 0x00B4($s3) ## 000000B4 /* 00408 80B86D28 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 @@ -53,13 +53,13 @@ glabel func_80B86CA8 /* 00414 80B86D34 00000000 */ nop /* 00418 80B86D38 45000005 */ bc1f .L80B86D50 /* 0041C 80B86D3C 00000000 */ nop -/* 00420 80B86D40 0C01DE1C */ jal Math_Sins +/* 00420 80B86D40 0C01DE1C */ jal Math_SinS ## sins? /* 00424 80B86D44 866400B4 */ lh $a0, 0x00B4($s3) ## 000000B4 /* 00428 80B86D48 10000004 */ beq $zero, $zero, .L80B86D5C /* 0042C 80B86D4C 46000086 */ mov.s $f2, $f0 .L80B86D50: -/* 00430 80B86D50 0C01DE1C */ jal Math_Sins +/* 00430 80B86D50 0C01DE1C */ jal Math_SinS ## sins? /* 00434 80B86D54 866400B4 */ lh $a0, 0x00B4($s3) ## 000000B4 /* 00438 80B86D58 46000087 */ neg.s $f2, $f0 @@ -129,15 +129,15 @@ glabel func_80B86CA8 /* 0052C 80B86E4C 5420000C */ bnel $at, $zero, .L80B86E80 /* 00530 80B86E50 2652000C */ addiu $s2, $s2, 0x000C ## $s2 = 0000000C /* 00534 80B86E54 A22B019E */ sb $t3, 0x019E($s1) ## 0000019E -/* 00538 80B86E58 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00538 80B86E58 0C00CFC8 */ jal Rand_CenteredFloat /* 0053C 80B86E5C 4600B306 */ mov.s $f12, $f22 /* 00540 80B86E60 E60001A8 */ swc1 $f0, 0x01A8($s0) ## 000001A8 -/* 00544 80B86E64 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00544 80B86E64 0C00CFC8 */ jal Rand_CenteredFloat /* 00548 80B86E68 4600E306 */ mov.s $f12, $f28 /* 0054C 80B86E6C E60001AC */ swc1 $f0, 0x01AC($s0) ## 000001AC -/* 00550 80B86E70 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 00550 80B86E70 0C00CFC8 */ jal Rand_CenteredFloat /* 00554 80B86E74 4600B306 */ mov.s $f12, $f22 /* 00558 80B86E78 E60001B0 */ swc1 $f0, 0x01B0($s0) ## 000001B0 diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86F68.s b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86F68.s index fdca04bc82..56c17f2735 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86F68.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86F68.s @@ -22,7 +22,7 @@ glabel func_80B86F68 /* 00684 80B86FA4 C4CC0A48 */ lwc1 $f12, 0x0A48($a2) ## 00000A48 /* 00688 80B86FA8 AFA60020 */ sw $a2, 0x0020($sp) /* 0068C 80B86FAC 46007387 */ neg.s $f14, $f14 -/* 00690 80B86FB0 0C034199 */ jal atan2s +/* 00690 80B86FB0 0C034199 */ jal Math_Atan2S /* 00694 80B86FB4 46006307 */ neg.s $f12, $f12 /* 00698 80B86FB8 8FA60020 */ lw $a2, 0x0020($sp) @@ -35,7 +35,7 @@ glabel func_80B86F68 /* 006B4 80B86FD4 46006307 */ neg.s $f12, $f12 /* 006B8 80B86FD8 46108482 */ mul.s $f18, $f16, $f16 /* 006BC 80B86FDC 46125000 */ add.s $f0, $f10, $f18 -/* 006C0 80B86FE0 0C034199 */ jal atan2s +/* 006C0 80B86FE0 0C034199 */ jal Math_Atan2S /* 006C4 80B86FE4 46000384 */ sqrt.s $f14, $f0 /* 006C8 80B86FE8 A60200B4 */ sh $v0, 0x00B4($s0) ## 000000B4 diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Update.s b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Update.s index dcf6202f8a..9b88d9de8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Update.s @@ -128,7 +128,7 @@ glabel MagicFire_Update .L80B89074: /* 00304 80B89074 3C063D08 */ lui $a2, 0x3D08 ## $a2 = 3D080000 /* 00308 80B89078 34C68889 */ ori $a2, $a2, 0x8889 ## $a2 = 3D088889 -/* 0030C 80B8907C 0C01DE80 */ jal Math_ApproxF +/* 0030C 80B8907C 0C01DE80 */ jal Math_StepToF /* 00310 80B89080 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 00314 80B89084 861901A8 */ lh $t9, 0x01A8($s0) ## 000001A8 @@ -141,7 +141,7 @@ glabel MagicFire_Update /* 00330 80B890A0 8E0601A0 */ lw $a2, 0x01A0($s0) ## 000001A0 /* 00334 80B890A4 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 00338 80B890A8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 0033C 80B890AC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 0033C 80B890AC 0C01E0C4 */ jal Math_SmoothStepToF /* 00340 80B890B0 E7B20010 */ swc1 $f18, 0x0010($sp) /* 00344 80B890B4 C6000050 */ lwc1 $f0, 0x0050($s0) ## 00000050 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EBE4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EBE4.s index 04753a267b..1bdddccb00 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EBE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EBE4.s @@ -39,7 +39,7 @@ glabel func_80B8EBE4 /* 0019C 80B8EC1C A48901BA */ sh $t1, 0x01BA($a0) ## 000001BA /* 001A0 80B8EC20 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 001A4 80B8EC24 248401E4 */ addiu $a0, $a0, 0x01E4 ## $a0 = 000001E4 -/* 001A8 80B8EC28 0C01DE80 */ jal Math_ApproxF +/* 001A8 80B8EC28 0C01DE80 */ jal Math_StepToF /* 001AC 80B8EC2C 3C054000 */ lui $a1, 0x4000 ## $a1 = 40000000 /* 001B0 80B8EC30 860401B6 */ lh $a0, 0x01B6($s0) ## 000001B6 @@ -47,7 +47,7 @@ glabel func_80B8EBE4 /* 001B8 80B8EC38 00042080 */ sll $a0, $a0, 2 /* 001BC 80B8EC3C 00812023 */ subu $a0, $a0, $at /* 001C0 80B8EC40 00042400 */ sll $a0, $a0, 16 -/* 001C4 80B8EC44 0C01DE1C */ jal Math_Sins +/* 001C4 80B8EC44 0C01DE1C */ jal Math_SinS ## sins? /* 001C8 80B8EC48 00042403 */ sra $a0, $a0, 16 /* 001CC 80B8EC4C 860401B8 */ lh $a0, 0x01B8($s0) ## 000001B8 @@ -56,7 +56,7 @@ glabel func_80B8EBE4 /* 001D8 80B8EC58 00042080 */ sll $a0, $a0, 2 /* 001DC 80B8EC5C 00812023 */ subu $a0, $a0, $at /* 001E0 80B8EC60 00042400 */ sll $a0, $a0, 16 -/* 001E4 80B8EC64 0C01DE1C */ jal Math_Sins +/* 001E4 80B8EC64 0C01DE1C */ jal Math_SinS ## sins? /* 001E8 80B8EC68 00042403 */ sra $a0, $a0, 16 /* 001EC 80B8EC6C 46140100 */ add.s $f4, $f0, $f20 @@ -66,14 +66,14 @@ glabel func_80B8EBE4 /* 001FC 80B8EC7C 00042080 */ sll $a0, $a0, 2 /* 00200 80B8EC80 00042400 */ sll $a0, $a0, 16 /* 00204 80B8EC84 00042403 */ sra $a0, $a0, 16 -/* 00208 80B8EC88 0C01DE0D */ jal Math_Coss +/* 00208 80B8EC88 0C01DE0D */ jal Math_CosS ## coss? /* 0020C 80B8EC8C E60801E8 */ swc1 $f8, 0x01E8($s0) ## 000001E8 /* 00210 80B8EC90 860401B8 */ lh $a0, 0x01B8($s0) ## 000001B8 /* 00214 80B8EC94 46000506 */ mov.s $f20, $f0 /* 00218 80B8EC98 00042080 */ sll $a0, $a0, 2 /* 0021C 80B8EC9C 00042400 */ sll $a0, $a0, 16 -/* 00220 80B8ECA0 0C01DE0D */ jal Math_Coss +/* 00220 80B8ECA0 0C01DE0D */ jal Math_CosS ## coss? /* 00224 80B8ECA4 00042403 */ sra $a0, $a0, 16 /* 00228 80B8ECA8 46140280 */ add.s $f10, $f0, $f20 @@ -85,14 +85,14 @@ glabel func_80B8EBE4 /* 00240 80B8ECC0 00812021 */ addu $a0, $a0, $at /* 00244 80B8ECC4 00042400 */ sll $a0, $a0, 16 /* 00248 80B8ECC8 00042403 */ sra $a0, $a0, 16 -/* 0024C 80B8ECCC 0C01DE1C */ jal Math_Sins +/* 0024C 80B8ECCC 0C01DE1C */ jal Math_SinS ## sins? /* 00250 80B8ECD0 E61201EC */ swc1 $f18, 0x01EC($s0) ## 000001EC /* 00254 80B8ECD4 860401B8 */ lh $a0, 0x01B8($s0) ## 000001B8 /* 00258 80B8ECD8 46000506 */ mov.s $f20, $f0 /* 0025C 80B8ECDC 000420C0 */ sll $a0, $a0, 3 /* 00260 80B8ECE0 00042400 */ sll $a0, $a0, 16 -/* 00264 80B8ECE4 0C01DE1C */ jal Math_Sins +/* 00264 80B8ECE4 0C01DE1C */ jal Math_SinS ## sins? /* 00268 80B8ECE8 00042403 */ sra $a0, $a0, 16 /* 0026C 80B8ECEC 3C0180B9 */ lui $at, %hi(D_80B90FFC) ## $at = 80B90000 @@ -116,7 +116,7 @@ glabel func_80B8EBE4 /* 002B4 80B8ED34 00042403 */ sra $a0, $a0, 16 /* 002B8 80B8ED38 46082082 */ mul.s $f2, $f4, $f8 /* 002BC 80B8ED3C E6020058 */ swc1 $f2, 0x0058($s0) ## 00000058 -/* 002C0 80B8ED40 0C01DE0D */ jal Math_Coss +/* 002C0 80B8ED40 0C01DE0D */ jal Math_CosS ## coss? /* 002C4 80B8ED44 E6020050 */ swc1 $f2, 0x0050($s0) ## 00000050 /* 002C8 80B8ED48 3C0180B9 */ lui $at, %hi(D_80B9100C) ## $at = 80B90000 @@ -134,14 +134,14 @@ glabel func_80B8EBE4 /* 002F8 80B8ED78 00042400 */ sll $a0, $a0, 16 /* 002FC 80B8ED7C 46049202 */ mul.s $f8, $f18, $f4 /* 00300 80B8ED80 00042403 */ sra $a0, $a0, 16 -/* 00304 80B8ED84 0C01DE1C */ jal Math_Sins +/* 00304 80B8ED84 0C01DE1C */ jal Math_SinS ## sins? /* 00308 80B8ED88 E6080054 */ swc1 $f8, 0x0054($s0) ## 00000054 /* 0030C 80B8ED8C 860401BA */ lh $a0, 0x01BA($s0) ## 000001BA /* 00310 80B8ED90 46000506 */ mov.s $f20, $f0 /* 00314 80B8ED94 00042040 */ sll $a0, $a0, 1 /* 00318 80B8ED98 00042400 */ sll $a0, $a0, 16 -/* 0031C 80B8ED9C 0C01DE1C */ jal Math_Sins +/* 0031C 80B8ED9C 0C01DE1C */ jal Math_SinS ## sins? /* 00320 80B8EDA0 00042403 */ sra $a0, $a0, 16 /* 00324 80B8EDA4 860A0016 */ lh $t2, 0x0016($s0) ## 00000016 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EE24.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EE24.s index 2a8d14b9a8..d8c7192f09 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EE24.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EE24.s @@ -30,14 +30,14 @@ glabel func_80B8EE24 /* 003F4 80B8EE74 00000000 */ nop /* 003F8 80B8EE78 A60B01B8 */ sh $t3, 0x01B8($s0) ## 000001B8 .L80B8EE7C: -/* 003FC 80B8EE7C 0C01DE1C */ jal Math_Sins +/* 003FC 80B8EE7C 0C01DE1C */ jal Math_SinS ## sins? /* 00400 80B8EE80 860401B6 */ lh $a0, 0x01B6($s0) ## 000001B6 /* 00404 80B8EE84 3C0180B9 */ lui $at, %hi(D_80B91018) ## $at = 80B90000 /* 00408 80B8EE88 C4241018 */ lwc1 $f4, %lo(D_80B91018)($at) /* 0040C 80B8EE8C 860401B8 */ lh $a0, 0x01B8($s0) ## 000001B8 /* 00410 80B8EE90 46040182 */ mul.s $f6, $f0, $f4 -/* 00414 80B8EE94 0C01DE1C */ jal Math_Sins +/* 00414 80B8EE94 0C01DE1C */ jal Math_SinS ## sins? /* 00418 80B8EE98 E6060054 */ swc1 $f6, 0x0054($s0) ## 00000054 /* 0041C 80B8EE9C 3C0180B9 */ lui $at, %hi(D_80B9101C) ## $at = 80B90000 @@ -48,18 +48,18 @@ glabel func_80B8EE24 /* 00430 80B8EEB0 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 /* 00434 80B8EEB4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00438 80B8EEB8 E6020058 */ swc1 $f2, 0x0058($s0) ## 00000058 -/* 0043C 80B8EEBC 0C01DE80 */ jal Math_ApproxF +/* 0043C 80B8EEBC 0C01DE80 */ jal Math_StepToF /* 00440 80B8EEC0 E6020050 */ swc1 $f2, 0x0050($s0) ## 00000050 /* 00444 80B8EEC4 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00448 80B8EEC8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0044C 80B8EECC 260401EC */ addiu $a0, $s0, 0x01EC ## $a0 = 000001EC -/* 00450 80B8EED0 0C01DE80 */ jal Math_ApproxF +/* 00450 80B8EED0 0C01DE80 */ jal Math_StepToF /* 00454 80B8EED4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00458 80B8EED8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 0045C 80B8EEDC 86050016 */ lh $a1, 0x0016($s0) ## 00000016 -/* 00460 80B8EEE0 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 00460 80B8EEE0 0C01DE2B */ jal Math_ScaledStepToS /* 00464 80B8EEE4 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 /* 00468 80B8EEE8 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EFF4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EFF4.s index 3c50fea997..edad5d3891 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EFF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EFF4.s @@ -11,7 +11,7 @@ glabel func_80B8EFF4 /* 00598 80B8F018 01F81021 */ addu $v0, $t7, $t8 /* 0059C 80B8F01C 8C450000 */ lw $a1, 0x0000($v0) ## 00000000 /* 005A0 80B8F020 8C460004 */ lw $a2, 0x0004($v0) ## 00000004 -/* 005A4 80B8F024 0C01DE80 */ jal Math_ApproxF +/* 005A4 80B8F024 0C01DE80 */ jal Math_StepToF /* 005A8 80B8F028 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 /* 005AC 80B8F02C 8FB9007C */ lw $t9, 0x007C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F324.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F324.s index c0be0091df..75a0740929 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F324.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F324.s @@ -42,12 +42,12 @@ glabel func_80B8F324 /* 00930 80B8F3B0 26314E20 */ addiu $s1, $s1, 0x4E20 ## $s1 = 00004E20 .L80B8F3B4: /* 00934 80B8F3B4 00118C00 */ sll $s1, $s1, 16 -/* 00938 80B8F3B8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00938 80B8F3B8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0093C 80B8F3BC 00118C03 */ sra $s1, $s1, 16 /* 00940 80B8F3C0 46180502 */ mul.s $f20, $f0, $f24 /* 00944 80B8F3C4 00112400 */ sll $a0, $s1, 16 -/* 00948 80B8F3C8 0C01DE1C */ jal Math_Sins +/* 00948 80B8F3C8 0C01DE1C */ jal Math_SinS ## sins? /* 0094C 80B8F3CC 00042403 */ sra $a0, $a0, 16 /* 00950 80B8F3D0 46140102 */ mul.s $f4, $f0, $f20 @@ -57,7 +57,7 @@ glabel func_80B8F324 /* 00960 80B8F3E0 46062200 */ add.s $f8, $f4, $f6 /* 00964 80B8F3E4 E7A800C4 */ swc1 $f8, 0x00C4($sp) /* 00968 80B8F3E8 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 0096C 80B8F3EC 0C01DE0D */ jal Math_Coss +/* 0096C 80B8F3EC 0C01DE0D */ jal Math_CosS ## coss? /* 00970 80B8F3F0 E7AA00C8 */ swc1 $f10, 0x00C8($sp) /* 00974 80B8F3F4 46140402 */ mul.s $f16, $f0, $f20 @@ -65,17 +65,17 @@ glabel func_80B8F324 /* 0097C 80B8F3FC 00112400 */ sll $a0, $s1, 16 /* 00980 80B8F400 00042403 */ sra $a0, $a0, 16 /* 00984 80B8F404 46128100 */ add.s $f4, $f16, $f18 -/* 00988 80B8F408 0C01DE1C */ jal Math_Sins +/* 00988 80B8F408 0C01DE1C */ jal Math_SinS ## sins? /* 0098C 80B8F40C E7A400CC */ swc1 $f4, 0x00CC($sp) /* 00990 80B8F410 46160182 */ mul.s $f6, $f0, $f22 -/* 00994 80B8F414 0C03F66B */ jal Math_Rand_ZeroOne +/* 00994 80B8F414 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00998 80B8F418 E7A600B8 */ swc1 $f6, 0x00B8($sp) /* 0099C 80B8F41C 461A0202 */ mul.s $f8, $f0, $f26 /* 009A0 80B8F420 00112400 */ sll $a0, $s1, 16 /* 009A4 80B8F424 00042403 */ sra $a0, $a0, 16 -/* 009A8 80B8F428 0C01DE0D */ jal Math_Coss +/* 009A8 80B8F428 0C01DE0D */ jal Math_CosS ## coss? /* 009AC 80B8F42C E7A800BC */ swc1 $f8, 0x00BC($sp) /* 009B0 80B8F430 46160282 */ mul.s $f10, $f0, $f22 @@ -97,7 +97,7 @@ glabel func_80B8F324 /* 009F0 80B8F470 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C /* 009F4 80B8F474 460A4401 */ sub.s $f16, $f8, $f10 /* 009F8 80B8F478 46103480 */ add.s $f18, $f6, $f16 -/* 009FC 80B8F47C 0C03F66B */ jal Math_Rand_ZeroOne +/* 009FC 80B8F47C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A00 80B8F480 E7B200C0 */ swc1 $f18, 0x00C0($sp) /* 00A04 80B8F484 461C0102 */ mul.s $f4, $f0, $f28 @@ -109,7 +109,7 @@ glabel func_80B8F324 /* 00A1C 80B8F49C 2A41005A */ slti $at, $s2, 0x005A /* 00A20 80B8F4A0 1020000B */ beq $at, $zero, .L80B8F4D0 /* 00A24 80B8F4A4 24020040 */ addiu $v0, $zero, 0x0040 ## $v0 = 00000040 -/* 00A28 80B8F4A8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00A28 80B8F4A8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00A2C 80B8F4AC 2413FFB0 */ addiu $s3, $zero, 0xFFB0 ## $s3 = FFFFFFB0 /* 00A30 80B8F4B0 461E003C */ c.lt.s $f0, $f30 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F59C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F59C.s index cb245d34d0..84a0803b56 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F59C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F59C.s @@ -14,19 +14,19 @@ glabel func_80B8F59C /* 00B28 80B8F5A8 AFBF001C */ sw $ra, 0x001C($sp) /* 00B2C 80B8F5AC 860601C6 */ lh $a2, 0x01C6($s0) ## 000001C6 /* 00B30 80B8F5B0 860501C4 */ lh $a1, 0x01C4($s0) ## 000001C4 -/* 00B34 80B8F5B4 0C01DE5F */ jal Math_ApproxS +/* 00B34 80B8F5B4 0C01DE5F */ jal Math_StepToS /* 00B38 80B8F5B8 248401C2 */ addiu $a0, $a0, 0x01C2 ## $a0 = 000001C2 /* 00B3C 80B8F5BC 260401C8 */ addiu $a0, $s0, 0x01C8 ## $a0 = 000001C8 /* 00B40 80B8F5C0 860501CA */ lh $a1, 0x01CA($s0) ## 000001CA -/* 00B44 80B8F5C4 0C01DE5F */ jal Math_ApproxS +/* 00B44 80B8F5C4 0C01DE5F */ jal Math_StepToS /* 00B48 80B8F5C8 860601CC */ lh $a2, 0x01CC($s0) ## 000001CC /* 00B4C 80B8F5CC 860E01CE */ lh $t6, 0x01CE($s0) ## 000001CE /* 00B50 80B8F5D0 860F01C8 */ lh $t7, 0x01C8($s0) ## 000001C8 /* 00B54 80B8F5D4 01CFC021 */ addu $t8, $t6, $t7 /* 00B58 80B8F5D8 A61801CE */ sh $t8, 0x01CE($s0) ## 000001CE -/* 00B5C 80B8F5DC 0C01DE1C */ jal Math_Sins +/* 00B5C 80B8F5DC 0C01DE1C */ jal Math_SinS ## sins? /* 00B60 80B8F5E0 860401CE */ lh $a0, 0x01CE($s0) ## 000001CE /* 00B64 80B8F5E4 861901C2 */ lh $t9, 0x01C2($s0) ## 000001C2 @@ -41,14 +41,14 @@ glabel func_80B8F59C /* 00B88 80B8F608 44099000 */ mfc1 $t1, $f18 /* 00B8C 80B8F60C 00000000 */ nop /* 00B90 80B8F610 A60901D0 */ sh $t1, 0x01D0($s0) ## 000001D0 -/* 00B94 80B8F614 0C01DE1C */ jal Math_Sins +/* 00B94 80B8F614 0C01DE1C */ jal Math_SinS ## sins? /* 00B98 80B8F618 860401D0 */ lh $a0, 0x01D0($s0) ## 000001D0 /* 00B9C 80B8F61C 3C0180B9 */ lui $at, %hi(D_80B9102C) ## $at = 80B90000 /* 00BA0 80B8F620 C426102C */ lwc1 $f6, %lo(D_80B9102C)($at) /* 00BA4 80B8F624 860401D0 */ lh $a0, 0x01D0($s0) ## 000001D0 /* 00BA8 80B8F628 46060202 */ mul.s $f8, $f0, $f6 -/* 00BAC 80B8F62C 0C01DE0D */ jal Math_Coss +/* 00BAC 80B8F62C 0C01DE0D */ jal Math_CosS ## coss? /* 00BB0 80B8F630 E6080054 */ swc1 $f8, 0x0054($s0) ## 00000054 /* 00BB4 80B8F634 3C0180B9 */ lui $at, %hi(D_80B91030) ## $at = 80B90000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F65C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F65C.s index fcd8df1b40..b16a1b96a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F65C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F65C.s @@ -7,19 +7,19 @@ glabel func_80B8F65C /* 00BF0 80B8F670 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00BF4 80B8F674 AC8E01BC */ sw $t6, 0x01BC($a0) ## 000001BC /* 00BF8 80B8F678 2404000C */ addiu $a0, $zero, 0x000C ## $a0 = 0000000C -/* 00BFC 80B8F67C 0C01DF64 */ jal Math_Rand_S16Offset +/* 00BFC 80B8F67C 0C01DF64 */ jal Rand_S16Offset /* 00C00 80B8F680 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 /* 00C04 80B8F684 A60201C0 */ sh $v0, 0x01C0($s0) ## 000001C0 /* 00C08 80B8F688 240400C8 */ addiu $a0, $zero, 0x00C8 ## $a0 = 000000C8 -/* 00C0C 80B8F68C 0C01DF64 */ jal Math_Rand_S16Offset +/* 00C0C 80B8F68C 0C01DF64 */ jal Rand_S16Offset /* 00C10 80B8F690 24050190 */ addiu $a1, $zero, 0x0190 ## $a1 = 00000190 /* 00C14 80B8F694 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 /* 00C18 80B8F698 A60201C4 */ sh $v0, 0x01C4($s0) ## 000001C4 /* 00C1C 80B8F69C A60F01C6 */ sh $t7, 0x01C6($s0) ## 000001C6 /* 00C20 80B8F6A0 24040064 */ addiu $a0, $zero, 0x0064 ## $a0 = 00000064 -/* 00C24 80B8F6A4 0C01DF64 */ jal Math_Rand_S16Offset +/* 00C24 80B8F6A4 0C01DF64 */ jal Rand_S16Offset /* 00C28 80B8F6A8 24050320 */ addiu $a1, $zero, 0x0320 ## $a1 = 00000320 /* 00C2C 80B8F6AC 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F710.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F710.s index 70f185906b..1cc0e13c77 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F710.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F710.s @@ -7,19 +7,19 @@ glabel func_80B8F710 /* 00CA4 80B8F724 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00CA8 80B8F728 AC8E01BC */ sw $t6, 0x01BC($a0) ## 000001BC /* 00CAC 80B8F72C 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E -/* 00CB0 80B8F730 0C01DF64 */ jal Math_Rand_S16Offset +/* 00CB0 80B8F730 0C01DF64 */ jal Rand_S16Offset /* 00CB4 80B8F734 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 /* 00CB8 80B8F738 A60201C0 */ sh $v0, 0x01C0($s0) ## 000001C0 /* 00CBC 80B8F73C 240407D0 */ addiu $a0, $zero, 0x07D0 ## $a0 = 000007D0 -/* 00CC0 80B8F740 0C01DF64 */ jal Math_Rand_S16Offset +/* 00CC0 80B8F740 0C01DF64 */ jal Rand_S16Offset /* 00CC4 80B8F744 240503E8 */ addiu $a1, $zero, 0x03E8 ## $a1 = 000003E8 /* 00CC8 80B8F748 240F00C8 */ addiu $t7, $zero, 0x00C8 ## $t7 = 000000C8 /* 00CCC 80B8F74C A60201C4 */ sh $v0, 0x01C4($s0) ## 000001C4 /* 00CD0 80B8F750 A60F01C6 */ sh $t7, 0x01C6($s0) ## 000001C6 /* 00CD4 80B8F754 240436B0 */ addiu $a0, $zero, 0x36B0 ## $a0 = 000036B0 -/* 00CD8 80B8F758 0C01DF64 */ jal Math_Rand_S16Offset +/* 00CD8 80B8F758 0C01DF64 */ jal Rand_S16Offset /* 00CDC 80B8F75C 24051770 */ addiu $a1, $zero, 0x1770 ## $a1 = 00001770 /* 00CE0 80B8F760 24180FA0 */ addiu $t8, $zero, 0x0FA0 ## $t8 = 00000FA0 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F788.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F788.s index befd544866..f85e2a5a95 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F788.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F788.s @@ -11,12 +11,12 @@ glabel func_80B8F788 /* 00D2C 80B8F7AC 240400C8 */ addiu $a0, $zero, 0x00C8 ## $a0 = 000000C8 /* 00D30 80B8F7B0 1701000A */ bne $t8, $at, .L80B8F7DC /* 00D34 80B8F7B4 00000000 */ nop -/* 00D38 80B8F7B8 0C01DF64 */ jal Math_Rand_S16Offset +/* 00D38 80B8F7B8 0C01DF64 */ jal Rand_S16Offset /* 00D3C 80B8F7BC 24050190 */ addiu $a1, $zero, 0x0190 ## $a1 = 00000190 /* 00D40 80B8F7C0 A60201C4 */ sh $v0, 0x01C4($s0) ## 000001C4 /* 00D44 80B8F7C4 24040064 */ addiu $a0, $zero, 0x0064 ## $a0 = 00000064 -/* 00D48 80B8F7C8 0C01DF64 */ jal Math_Rand_S16Offset +/* 00D48 80B8F7C8 0C01DF64 */ jal Rand_S16Offset /* 00D4C 80B8F7CC 240501F4 */ addiu $a1, $zero, 0x01F4 ## $a1 = 000001F4 /* 00D50 80B8F7D0 241907D0 */ addiu $t9, $zero, 0x07D0 ## $t9 = 000007D0 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F84C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F84C.s index 7e193a94cc..80e6a4a545 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F84C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F84C.s @@ -10,7 +10,7 @@ glabel func_80B8F84C /* 00DD8 80B8F858 848E01C0 */ lh $t6, 0x01C0($a0) ## 000001C0 /* 00DDC 80B8F85C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00DE0 80B8F860 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 00DE4 80B8F864 0C03F66B */ jal Math_Rand_ZeroOne +/* 00DE4 80B8F864 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00DE8 80B8F868 A48F01C0 */ sh $t7, 0x01C0($a0) ## 000001C0 /* 00DEC 80B8F86C 3C0180B9 */ lui $at, %hi(D_80B91034) ## $at = 80B90000 @@ -20,12 +20,12 @@ glabel func_80B8F84C /* 00DFC 80B8F87C 00000000 */ nop /* 00E00 80B8F880 45000008 */ bc1f .L80B8F8A4 /* 00E04 80B8F884 00000000 */ nop -/* 00E08 80B8F888 0C01DF64 */ jal Math_Rand_S16Offset +/* 00E08 80B8F888 0C01DF64 */ jal Rand_S16Offset /* 00E0C 80B8F88C 240503E8 */ addiu $a1, $zero, 0x03E8 ## $a1 = 000003E8 /* 00E10 80B8F890 A60201C4 */ sh $v0, 0x01C4($s0) ## 000001C4 /* 00E14 80B8F894 24042EE0 */ addiu $a0, $zero, 0x2EE0 ## $a0 = 00002EE0 -/* 00E18 80B8F898 0C01DF64 */ jal Math_Rand_S16Offset +/* 00E18 80B8F898 0C01DF64 */ jal Rand_S16Offset /* 00E1C 80B8F89C 24051F40 */ addiu $a1, $zero, 0x1F40 ## $a1 = 00001F40 /* 00E20 80B8F8A0 A60201CA */ sh $v0, 0x01CA($s0) ## 000001CA diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F8E4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F8E4.s index b789d2ee23..0eb1d580fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F8E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F8E4.s @@ -12,17 +12,17 @@ glabel func_80B8F8E4 /* 00E70 80B8F8F0 AFBF001C */ sw $ra, 0x001C($sp) /* 00E74 80B8F8F4 248401D0 */ addiu $a0, $a0, 0x01D0 ## $a0 = 000001D0 /* 00E78 80B8F8F8 240533E9 */ addiu $a1, $zero, 0x33E9 ## $a1 = 000033E9 -/* 00E7C 80B8F8FC 0C01DE5F */ jal Math_ApproxS +/* 00E7C 80B8F8FC 0C01DE5F */ jal Math_StepToS /* 00E80 80B8F900 24060168 */ addiu $a2, $zero, 0x0168 ## $a2 = 00000168 -/* 00E84 80B8F904 0C01DE1C */ jal Math_Sins +/* 00E84 80B8F904 0C01DE1C */ jal Math_SinS ## sins? /* 00E88 80B8F908 860401D0 */ lh $a0, 0x01D0($s0) ## 000001D0 /* 00E8C 80B8F90C 3C0180B9 */ lui $at, %hi(D_80B91038) ## $at = 80B90000 /* 00E90 80B8F910 C4241038 */ lwc1 $f4, %lo(D_80B91038)($at) /* 00E94 80B8F914 860401D0 */ lh $a0, 0x01D0($s0) ## 000001D0 /* 00E98 80B8F918 46040182 */ mul.s $f6, $f0, $f4 -/* 00E9C 80B8F91C 0C01DE0D */ jal Math_Coss +/* 00E9C 80B8F91C 0C01DE0D */ jal Math_CosS ## coss? /* 00EA0 80B8F920 E6060054 */ swc1 $f6, 0x0054($s0) ## 00000054 /* 00EA4 80B8F924 3C0180B9 */ lui $at, %hi(D_80B9103C) ## $at = 80B90000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F964.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F964.s index 66d4e32aaa..393eb98953 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F964.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F964.s @@ -13,7 +13,7 @@ glabel func_80B8F964 /* 00EF4 80B8F974 25CFF6A0 */ addiu $t7, $t6, 0xF6A0 ## $t7 = FFFFF6A0 /* 00EF8 80B8F978 A48F01D0 */ sh $t7, 0x01D0($a0) ## 000001D0 /* 00EFC 80B8F97C 848401D0 */ lh $a0, 0x01D0($a0) ## 000001D0 -/* 00F00 80B8F980 0C01DE1C */ jal Math_Sins +/* 00F00 80B8F980 0C01DE1C */ jal Math_SinS ## sins? /* 00F04 80B8F984 AFA50018 */ sw $a1, 0x0018($sp) /* 00F08 80B8F988 3C0180B9 */ lui $at, %hi(D_80B91040) ## $at = 80B90000 @@ -21,7 +21,7 @@ glabel func_80B8F964 /* 00F10 80B8F990 8FA50018 */ lw $a1, 0x0018($sp) /* 00F14 80B8F994 46040182 */ mul.s $f6, $f0, $f4 /* 00F18 80B8F998 84A401D0 */ lh $a0, 0x01D0($a1) ## 000001D0 -/* 00F1C 80B8F99C 0C01DE0D */ jal Math_Coss +/* 00F1C 80B8F99C 0C01DE0D */ jal Math_CosS ## coss? /* 00F20 80B8F9A0 E4A60054 */ swc1 $f6, 0x0054($a1) ## 00000054 /* 00F24 80B8F9A4 3C0180B9 */ lui $at, %hi(D_80B91044) ## $at = 80B90000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FEAC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FEAC.s index 6dd7de7812..70b50dd0b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FEAC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FEAC.s @@ -8,7 +8,7 @@ glabel func_80B8FEAC /* 01444 80B8FEC4 3C063C23 */ lui $a2, 0x3C23 ## $a2 = 3C230000 /* 01448 80B8FEC8 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3C23D70A /* 0144C 80B8FECC 34A5BA63 */ ori $a1, $a1, 0xBA63 ## $a1 = 3E2ABA63 -/* 01450 80B8FED0 0C01DE80 */ jal Math_ApproxF +/* 01450 80B8FED0 0C01DE80 */ jal Math_StepToF /* 01454 80B8FED4 24840054 */ addiu $a0, $a0, 0x0054 ## $a0 = 00000054 /* 01458 80B8FED8 30430001 */ andi $v1, $v0, 0x0001 ## $v1 = 00000000 @@ -17,7 +17,7 @@ glabel func_80B8FEAC /* 01464 80B8FEE4 34C61C82 */ ori $a2, $a2, 0x1C82 ## $a2 = 3A941C82 /* 01468 80B8FEE8 34A531C4 */ ori $a1, $a1, 0x31C4 ## $a1 = 3D1231C4 /* 0146C 80B8FEEC AFA30024 */ sw $v1, 0x0024($sp) -/* 01470 80B8FEF0 0C01DE80 */ jal Math_ApproxF +/* 01470 80B8FEF0 0C01DE80 */ jal Math_StepToF /* 01474 80B8FEF4 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 /* 01478 80B8FEF8 8FA30024 */ lw $v1, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FF8C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FF8C.s index 419cc7ed79..70842ab3f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FF8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8FF8C.s @@ -15,7 +15,7 @@ glabel func_80B8FF8C /* 01524 80B8FFA4 25CFF6A0 */ addiu $t7, $t6, 0xF6A0 ## $t7 = FFFFF6A0 /* 01528 80B8FFA8 A48F01B6 */ sh $t7, 0x01B6($a0) ## 000001B6 /* 0152C 80B8FFAC 848401B6 */ lh $a0, 0x01B6($a0) ## 000001B6 -/* 01530 80B8FFB0 0C01DE1C */ jal Math_Sins +/* 01530 80B8FFB0 0C01DE1C */ jal Math_SinS ## sins? /* 01534 80B8FFB4 AFA50018 */ sw $a1, 0x0018($sp) /* 01538 80B8FFB8 3C0180B9 */ lui $at, %hi(D_80B91048) ## $at = 80B90000 @@ -23,7 +23,7 @@ glabel func_80B8FF8C /* 01540 80B8FFC0 8FA50018 */ lw $a1, 0x0018($sp) /* 01544 80B8FFC4 46040182 */ mul.s $f6, $f0, $f4 /* 01548 80B8FFC8 84A401B6 */ lh $a0, 0x01B6($a1) ## 000001B6 -/* 0154C 80B8FFCC 0C01DE0D */ jal Math_Coss +/* 0154C 80B8FFCC 0C01DE0D */ jal Math_CosS ## coss? /* 01550 80B8FFD0 E4A60054 */ swc1 $f6, 0x0054($a1) ## 00000054 /* 01554 80B8FFD4 3C0180B9 */ lui $at, %hi(D_80B9104C) ## $at = 80B90000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90050.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90050.s index 26d0364358..c942ec6801 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90050.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90050.s @@ -19,7 +19,7 @@ glabel func_80B90050 /* 015F0 80B90070 2719FF38 */ addiu $t9, $t8, 0xFF38 ## $t9 = FFFFFF38 /* 015F4 80B90074 A48F01B6 */ sh $t7, 0x01B6($a0) ## 000001B6 /* 015F8 80B90078 A49901B8 */ sh $t9, 0x01B8($a0) ## 000001B8 -/* 015FC 80B9007C 0C01DE1C */ jal Math_Sins +/* 015FC 80B9007C 0C01DE1C */ jal Math_SinS ## sins? /* 01600 80B90080 848401B6 */ lh $a0, 0x01B6($a0) ## 000001B6 /* 01604 80B90084 860801B8 */ lh $t0, 0x01B8($s0) ## 000001B8 @@ -35,14 +35,14 @@ glabel func_80B90050 /* 0162C 80B900AC 00000000 */ nop /* 01630 80B900B0 00042400 */ sll $a0, $a0, 16 /* 01634 80B900B4 00042403 */ sra $a0, $a0, 16 -/* 01638 80B900B8 0C01DE1C */ jal Math_Sins +/* 01638 80B900B8 0C01DE1C */ jal Math_SinS ## sins? /* 0163C 80B900BC A7A40026 */ sh $a0, 0x0026($sp) /* 01640 80B900C0 3C0180B9 */ lui $at, %hi(D_80B91054) ## $at = 80B90000 /* 01644 80B900C4 C4261054 */ lwc1 $f6, %lo(D_80B91054)($at) /* 01648 80B900C8 87A40026 */ lh $a0, 0x0026($sp) /* 0164C 80B900CC 46060202 */ mul.s $f8, $f0, $f6 -/* 01650 80B900D0 0C01DE0D */ jal Math_Coss +/* 01650 80B900D0 0C01DE0D */ jal Math_CosS ## coss? /* 01654 80B900D4 E6080054 */ swc1 $f8, 0x0054($s0) ## 00000054 /* 01658 80B900D8 3C0180B9 */ lui $at, %hi(D_80B91058) ## $at = 80B90000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95A28.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95A28.s index 6d8c42fb8f..73e1b0fdce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95A28.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95A28.s @@ -46,21 +46,21 @@ glabel func_80B95A28 /* 000D4 80B95AA4 241E0010 */ addiu $s8, $zero, 0x0010 ## $s8 = 00000010 .L80B95AA8: /* 000D8 80B95AA8 00112400 */ sll $a0, $s1, 16 -/* 000DC 80B95AAC 0C01DE1C */ jal Math_Sins +/* 000DC 80B95AAC 0C01DE1C */ jal Math_SinS ## sins? /* 000E0 80B95AB0 00042403 */ sra $a0, $a0, 16 /* 000E4 80B95AB4 00112400 */ sll $a0, $s1, 16 /* 000E8 80B95AB8 46000506 */ mov.s $f20, $f0 -/* 000EC 80B95ABC 0C01DE0D */ jal Math_Coss +/* 000EC 80B95ABC 0C01DE0D */ jal Math_CosS ## coss? /* 000F0 80B95AC0 00042403 */ sra $a0, $a0, 16 -/* 000F4 80B95AC4 0C03F66B */ jal Math_Rand_ZeroOne +/* 000F4 80B95AC4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 000F8 80B95AC8 46000586 */ mov.s $f22, $f0 /* 000FC 80B95ACC 461A0602 */ mul.s $f24, $f0, $f26 /* 00100 80B95AD0 00000000 */ nop /* 00104 80B95AD4 4618A102 */ mul.s $f4, $f20, $f24 -/* 00108 80B95AD8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00108 80B95AD8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0010C 80B95ADC E7A400D0 */ swc1 $f4, 0x00D0($sp) /* 00110 80B95AE0 461C0182 */ mul.s $f6, $f0, $f28 @@ -72,7 +72,7 @@ glabel func_80B95A28 /* 00128 80B95AF8 461E3200 */ add.s $f8, $f6, $f30 /* 0012C 80B95AFC E7AA00D8 */ swc1 $f10, 0x00D8($sp) /* 00130 80B95B00 E7A800D4 */ swc1 $f8, 0x00D4($sp) -/* 00134 80B95B04 0C03F66B */ jal Math_Rand_ZeroOne +/* 00134 80B95B04 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00138 80B95B08 E7A400C4 */ swc1 $f4, 0x00C4($sp) /* 0013C 80B95B0C 461C0182 */ mul.s $f6, $f0, $f28 @@ -93,7 +93,7 @@ glabel func_80B95A28 /* 00178 80B95B48 E7A400D4 */ swc1 $f4, 0x00D4($sp) /* 0017C 80B95B4C C6460008 */ lwc1 $f6, 0x0008($s2) ## 0000002C /* 00180 80B95B50 46065200 */ add.s $f8, $f10, $f6 -/* 00184 80B95B54 0C03F66B */ jal Math_Rand_ZeroOne +/* 00184 80B95B54 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00188 80B95B58 E7A800D8 */ swc1 $f8, 0x00D8($sp) /* 0018C 80B95B5C 3C0180B9 */ lui $at, %hi(D_80B96040) ## $at = 80B90000 @@ -115,7 +115,7 @@ glabel func_80B95A28 /* 001C8 80B95B98 10000001 */ beq $zero, $zero, .L80B95BA0 /* 001CC 80B95B9C 24100040 */ addiu $s0, $zero, 0x0040 ## $s0 = 00000040 .L80B95BA0: -/* 001D0 80B95BA0 0C03F66B */ jal Math_Rand_ZeroOne +/* 001D0 80B95BA0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 001D4 80B95BA4 00000000 */ nop /* 001D8 80B95BA8 461A0102 */ mul.s $f4, $f0, $f26 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Init.s index 5a985ee21b..d0108fa654 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Init.s @@ -51,7 +51,7 @@ glabel ObjLift_Init /* 00390 80B96460 0C01E037 */ jal Actor_ProcessInitChain /* 00394 80B96464 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00398 80B96468 0C03F66B */ jal Math_Rand_ZeroOne +/* 00398 80B96468 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0039C 80B9646C 00000000 */ nop /* 003A0 80B96470 3C0180B9 */ lui $at, %hi(D_80B96A98) ## $at = 80B90000 @@ -59,7 +59,7 @@ glabel ObjLift_Init /* 003A8 80B96478 46040182 */ mul.s $f6, $f0, $f4 /* 003AC 80B9647C 4600320D */ trunc.w.s $f8, $f6 /* 003B0 80B96480 44094000 */ mfc1 $t1, $f8 -/* 003B4 80B96484 0C03F66B */ jal Math_Rand_ZeroOne +/* 003B4 80B96484 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 003B8 80B96488 A6090168 */ sh $t1, 0x0168($s0) ## 00000168 /* 003BC 80B9648C 3C0180B9 */ lui $at, %hi(D_80B96A9C) ## $at = 80B90000 @@ -67,7 +67,7 @@ glabel ObjLift_Init /* 003C4 80B96494 460A0402 */ mul.s $f16, $f0, $f10 /* 003C8 80B96498 4600848D */ trunc.w.s $f18, $f16 /* 003CC 80B9649C 440B9000 */ mfc1 $t3, $f18 -/* 003D0 80B964A0 0C03F66B */ jal Math_Rand_ZeroOne +/* 003D0 80B964A0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 003D4 80B964A4 A60B016A */ sh $t3, 0x016A($s0) ## 0000016A /* 003D8 80B964A8 3C0180B9 */ lui $at, %hi(D_80B96AA0) ## $at = 80B90000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96160.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96160.s index 4bf0a99d4f..548765128f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96160.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96160.s @@ -64,7 +64,7 @@ glabel func_80B96160 /* 00170 80B96240 46040182 */ mul.s $f6, $f0, $f4 /* 00174 80B96244 00000000 */ nop /* 00178 80B96248 46143202 */ mul.s $f8, $f6, $f20 -/* 0017C 80B9624C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0017C 80B9624C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00180 80B96250 E7A800B8 */ swc1 $f8, 0x00B8($sp) /* 00184 80B96254 46180282 */ mul.s $f10, $f0, $f24 @@ -77,7 +77,7 @@ glabel func_80B96160 /* 001A0 80B96270 46062202 */ mul.s $f8, $f4, $f6 /* 001A4 80B96274 00000000 */ nop /* 001A8 80B96278 46144282 */ mul.s $f10, $f8, $f20 -/* 001AC 80B9627C 0C03F66B */ jal Math_Rand_ZeroOne +/* 001AC 80B9627C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 001B0 80B96280 E7AA00C0 */ swc1 $f10, 0x00C0($sp) /* 001B4 80B96284 461C003C */ c.lt.s $f0, $f28 @@ -87,7 +87,7 @@ glabel func_80B96160 /* 001C4 80B96294 10000001 */ beq $zero, $zero, .L80B9629C /* 001C8 80B96298 24110040 */ addiu $s1, $zero, 0x0040 ## $s1 = 00000040 .L80B9629C: -/* 001CC 80B9629C 0C03F66B */ jal Math_Rand_ZeroOne +/* 001CC 80B9629C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 001D0 80B962A0 00000000 */ nop /* 001D4 80B962A4 46160402 */ mul.s $f16, $f0, $f22 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96678.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96678.s index 23910cecf1..c7d1d0f552 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96678.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96678.s @@ -15,7 +15,7 @@ glabel func_80B96678 .L80B966AC: /* 005DC 80B966AC 25F82710 */ addiu $t8, $t7, 0x2710 ## $t8 = 00002710 /* 005E0 80B966B0 A6180168 */ sh $t8, 0x0168($s0) ## 00000168 -/* 005E4 80B966B4 0C01DE1C */ jal Math_Sins +/* 005E4 80B966B4 0C01DE1C */ jal Math_SinS ## sins? /* 005E8 80B966B8 86040168 */ lh $a0, 0x0168($s0) ## 00000168 /* 005EC 80B966BC 3C014396 */ lui $at, 0x4396 ## $at = 43960000 @@ -27,7 +27,7 @@ glabel func_80B96678 /* 00604 80B966D4 440A4000 */ mfc1 $t2, $f8 /* 00608 80B966D8 00000000 */ nop /* 0060C 80B966DC 014B6021 */ addu $t4, $t2, $t3 -/* 00610 80B966E0 0C01DE0D */ jal Math_Coss +/* 00610 80B966E0 0C01DE0D */ jal Math_CosS ## coss? /* 00614 80B966E4 A60C0030 */ sh $t4, 0x0030($s0) ## 00000030 /* 00618 80B966E8 3C014396 */ lui $at, 0x4396 ## $at = 43960000 @@ -46,7 +46,7 @@ glabel func_80B96678 /* 0064C 80B9671C 03194021 */ addu $t0, $t8, $t9 /* 00650 80B96720 A6080034 */ sh $t0, 0x0034($s0) ## 00000034 /* 00654 80B96724 860A0034 */ lh $t2, 0x0034($s0) ## 00000034 -/* 00658 80B96728 0C01DE1C */ jal Math_Sins +/* 00658 80B96728 0C01DE1C */ jal Math_SinS ## sins? /* 0065C 80B9672C A60A00B8 */ sh $t2, 0x00B8($s0) ## 000000B8 /* 00660 80B96730 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C @@ -55,7 +55,7 @@ glabel func_80B96678 /* 0066C 80B9673C 25AE4650 */ addiu $t6, $t5, 0x4650 ## $t6 = 00004650 /* 00670 80B96740 A60E016C */ sh $t6, 0x016C($s0) ## 0000016C /* 00674 80B96744 8604016C */ lh $a0, 0x016C($s0) ## 0000016C -/* 00678 80B96748 0C01DE1C */ jal Math_Sins +/* 00678 80B96748 0C01DE1C */ jal Math_SinS ## sins? /* 0067C 80B9674C E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 /* 00680 80B96750 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -64,7 +64,7 @@ glabel func_80B96678 /* 0068C 80B9675C 8604016C */ lh $a0, 0x016C($s0) ## 0000016C /* 00690 80B96760 46080282 */ mul.s $f10, $f0, $f8 /* 00694 80B96764 46105480 */ add.s $f18, $f10, $f16 -/* 00698 80B96768 0C01DE0D */ jal Math_Coss +/* 00698 80B96768 0C01DE0D */ jal Math_CosS ## coss? /* 0069C 80B9676C E6120024 */ swc1 $f18, 0x0024($s0) ## 00000024 /* 006A0 80B96770 3C014040 */ lui $at, 0x4040 ## $at = 40400000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B99358.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B99358.s index 2a34e33bdc..eacf48f86d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B99358.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B99358.s @@ -18,7 +18,7 @@ glabel func_80B99358 /* 008F4 80B99394 8E220158 */ lw $v0, 0x0158($s1) ## 00000158 /* 008F8 80B99398 50400018 */ beql $v0, $zero, .L80B993FC /* 008FC 80B9939C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 00900 80B993A0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00900 80B993A0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00904 80B993A4 AC40011C */ sw $zero, 0x011C($v0) ## 0000011C /* 00908 80B993A8 4616003E */ c.le.s $f0, $f22 @@ -29,7 +29,7 @@ glabel func_80B99358 /* 0091C 80B993BC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 00920 80B993C0 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 /* 00924 80B993C4 468021A0 */ cvt.s.w $f6, $f4 -/* 00928 80B993C8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00928 80B993C8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0092C 80B993CC 46083501 */ sub.s $f20, $f6, $f8 /* 00930 80B993D0 46140282 */ mul.s $f10, $f0, $f20 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B995A4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B995A4.s index 4fa3267395..41d1a06d90 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B995A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B995A4.s @@ -28,7 +28,7 @@ glabel func_80B995A4 /* 00B28 80B995C8 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 00B2C 80B995CC 51E0002D */ beql $t7, $zero, .L80B99684 /* 00B30 80B995D0 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 00B34 80B995D4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00B34 80B995D4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00B38 80B995D8 A48001A6 */ sh $zero, 0x01A6($a0) ## 000001A6 /* 00B3C 80B995DC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -48,7 +48,7 @@ glabel func_80B995A4 /* 00B74 80B99614 00000000 */ nop /* 00B78 80B99618 4500000D */ bc1f .L80B99650 /* 00B7C 80B9961C 00000000 */ nop -/* 00B80 80B99620 0C03F66B */ jal Math_Rand_ZeroOne +/* 00B80 80B99620 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00B84 80B99624 00000000 */ nop /* 00B88 80B99628 3C0140B0 */ lui $at, 0x40B0 ## $at = 40B00000 @@ -62,7 +62,7 @@ glabel func_80B995A4 /* 00BA8 80B99648 10000043 */ beq $zero, $zero, .L80B99758 /* 00BAC 80B9964C A60A01A4 */ sh $t2, 0x01A4($s0) ## 000001A4 .L80B99650: -/* 00BB0 80B99650 0C03F66B */ jal Math_Rand_ZeroOne +/* 00BB0 80B99650 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00BB4 80B99654 00000000 */ nop /* 00BB8 80B99658 3C014222 */ lui $at, 0x4222 ## $at = 42220000 @@ -84,7 +84,7 @@ glabel func_80B995A4 /* 00BF4 80B99694 00000000 */ nop /* 00BF8 80B99698 45000019 */ bc1f .L80B99700 /* 00BFC 80B9969C 00000000 */ nop -/* 00C00 80B996A0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00C00 80B996A0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00C04 80B996A4 00000000 */ nop /* 00C08 80B996A8 3C014128 */ lui $at, 0x4128 ## $at = 41280000 @@ -95,7 +95,7 @@ glabel func_80B995A4 /* 00C1C 80B996BC 440A8000 */ mfc1 $t2, $f16 /* 00C20 80B996C0 00000000 */ nop /* 00C24 80B996C4 254B0004 */ addiu $t3, $t2, 0x0004 ## $t3 = 00000004 -/* 00C28 80B996C8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00C28 80B996C8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00C2C 80B996CC A60B01A4 */ sh $t3, 0x01A4($s0) ## 000001A4 /* 00C30 80B996D0 3C0180BA */ lui $at, %hi(D_80B99D3C) ## $at = 80BA0000 @@ -111,7 +111,7 @@ glabel func_80B995A4 /* 00C58 80B996F8 10000018 */ beq $zero, $zero, .L80B9975C /* 00C5C 80B996FC 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 .L80B99700: -/* 00C60 80B99700 0C03F66B */ jal Math_Rand_ZeroOne +/* 00C60 80B99700 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00C64 80B99704 00000000 */ nop /* 00C68 80B99708 3C014128 */ lui $at, 0x4128 ## $at = 41280000 @@ -122,7 +122,7 @@ glabel func_80B995A4 /* 00C7C 80B9971C 440F9000 */ mfc1 $t7, $f18 /* 00C80 80B99720 00000000 */ nop /* 00C84 80B99724 25F80004 */ addiu $t8, $t7, 0x0004 ## $t8 = 00000004 -/* 00C88 80B99728 0C03F66B */ jal Math_Rand_ZeroOne +/* 00C88 80B99728 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00C8C 80B9972C A61801A4 */ sh $t8, 0x01A4($s0) ## 000001A4 /* 00C90 80B99730 3C0180BA */ lui $at, %hi(D_80B99D44) ## $at = 80BA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B997CC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B997CC.s index 2eb444737a..78b3a86e30 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B997CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B997CC.s @@ -19,7 +19,7 @@ glabel func_80B997CC /* 00D50 80B997F0 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00D54 80B997F4 11E00029 */ beq $t7, $zero, .L80B9989C /* 00D58 80B997F8 00000000 */ nop -/* 00D5C 80B997FC 0C03F66B */ jal Math_Rand_ZeroOne +/* 00D5C 80B997FC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00D60 80B99800 A48001A6 */ sh $zero, 0x01A6($a0) ## 000001A6 /* 00D64 80B99804 3C0180BA */ lui $at, %hi(D_80B99D4C) ## $at = 80BA0000 @@ -36,7 +36,7 @@ glabel func_80B997CC /* 00D90 80B99830 00000000 */ nop /* 00D94 80B99834 4500000D */ bc1f .L80B9986C /* 00D98 80B99838 00000000 */ nop -/* 00D9C 80B9983C 0C03F66B */ jal Math_Rand_ZeroOne +/* 00D9C 80B9983C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00DA0 80B99840 00000000 */ nop /* 00DA4 80B99844 3C0140B0 */ lui $at, 0x40B0 ## $at = 40B00000 @@ -50,7 +50,7 @@ glabel func_80B997CC /* 00DC4 80B99864 10000021 */ beq $zero, $zero, .L80B998EC /* 00DC8 80B99868 A60A01A4 */ sh $t2, 0x01A4($s0) ## 000001A4 .L80B9986C: -/* 00DCC 80B9986C 0C03F66B */ jal Math_Rand_ZeroOne +/* 00DCC 80B9986C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00DD0 80B99870 00000000 */ nop /* 00DD4 80B99874 3C014222 */ lui $at, 0x4222 ## $at = 42220000 @@ -64,7 +64,7 @@ glabel func_80B997CC /* 00DF4 80B99894 10000015 */ beq $zero, $zero, .L80B998EC /* 00DF8 80B99898 A60F01A4 */ sh $t7, 0x01A4($s0) ## 000001A4 .L80B9989C: -/* 00DFC 80B9989C 0C03F66B */ jal Math_Rand_ZeroOne +/* 00DFC 80B9989C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00E00 80B998A0 A61801A6 */ sh $t8, 0x01A6($s0) ## 000001A6 /* 00E04 80B998A4 3C0180BA */ lui $at, %hi(D_80B99D50) ## $at = 80BA0000 @@ -74,7 +74,7 @@ glabel func_80B997CC /* 00E14 80B998B4 44059000 */ mfc1 $a1, $f18 /* 00E18 80B998B8 0C2E64D6 */ jal func_80B99358 /* 00E1C 80B998BC 00000000 */ nop -/* 00E20 80B998C0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00E20 80B998C0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00E24 80B998C4 00000000 */ nop /* 00E28 80B998C8 3C014128 */ lui $at, 0x4128 ## $at = 41280000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B99F40.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B99F40.s index efd41b686a..bc4852abda 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B99F40.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B99F40.s @@ -37,7 +37,7 @@ glabel func_80B99F40 /* 00080 80B99FC0 00119400 */ sll $s2, $s1, 16 /* 00084 80B99FC4 00129403 */ sra $s2, $s2, 16 /* 00088 80B99FC8 00122400 */ sll $a0, $s2, 16 -/* 0008C 80B99FCC 0C01DE1C */ jal Math_Sins +/* 0008C 80B99FCC 0C01DE1C */ jal Math_SinS ## sins? /* 00090 80B99FD0 00042403 */ sra $a0, $a0, 16 /* 00094 80B99FD4 4600A182 */ mul.s $f6, $f20, $f0 @@ -45,7 +45,7 @@ glabel func_80B99F40 /* 0009C 80B99FDC 00122400 */ sll $a0, $s2, 16 /* 000A0 80B99FE0 00042403 */ sra $a0, $a0, 16 /* 000A4 80B99FE4 46062200 */ add.s $f8, $f4, $f6 -/* 000A8 80B99FE8 0C01DE0D */ jal Math_Coss +/* 000A8 80B99FE8 0C01DE0D */ jal Math_CosS ## coss? /* 000AC 80B99FEC E6080000 */ swc1 $f8, 0x0000($s0) ## 0000000C /* 000B0 80B99FF0 4600A402 */ mul.s $f16, $f20, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A058.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A058.s index 8ee78b83ae..af77b100b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A058.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A058.s @@ -26,7 +26,7 @@ glabel func_80B9A058 /* 00174 80B9A0B4 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy /* 00178 80B9A0B8 02602825 */ or $a1, $s3, $zero ## $a1 = 00000024 -/* 0017C 80B9A0BC 0C01DE0D */ jal Math_Coss +/* 0017C 80B9A0BC 0C01DE0D */ jal Math_CosS ## coss? /* 00180 80B9A0C0 86240002 */ lh $a0, 0x0002($s1) ## 80B9A82A /* 00184 80B9A0C4 86290000 */ lh $t1, 0x0000($s1) ## 80B9A828 @@ -37,7 +37,7 @@ glabel func_80B9A058 /* 00198 80B9A0D8 46004282 */ mul.s $f10, $f8, $f0 /* 0019C 80B9A0DC 460A2400 */ add.s $f16, $f4, $f10 /* 001A0 80B9A0E0 E6100000 */ swc1 $f16, 0x0000($s0) ## 00000000 -/* 001A4 80B9A0E4 0C01DE1C */ jal Math_Sins +/* 001A4 80B9A0E4 0C01DE1C */ jal Math_SinS ## sins? /* 001A8 80B9A0E8 86240002 */ lh $a0, 0x0002($s1) ## 80B9A82A /* 001AC 80B9A0EC 862A0000 */ lh $t2, 0x0000($s1) ## 80B9A828 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A158.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A158.s index d3f4bc2e79..de164be919 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A158.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A158.s @@ -32,7 +32,7 @@ glabel func_80B9A158 /* 00288 80B9A1C8 00119400 */ sll $s2, $s1, 16 /* 0028C 80B9A1CC 00129403 */ sra $s2, $s2, 16 /* 00290 80B9A1D0 00122400 */ sll $a0, $s2, 16 -/* 00294 80B9A1D4 0C01DE1C */ jal Math_Sins +/* 00294 80B9A1D4 0C01DE1C */ jal Math_SinS ## sins? /* 00298 80B9A1D8 00042403 */ sra $a0, $a0, 16 /* 0029C 80B9A1DC 4600A182 */ mul.s $f6, $f20, $f0 @@ -40,7 +40,7 @@ glabel func_80B9A158 /* 002A4 80B9A1E4 00122400 */ sll $a0, $s2, 16 /* 002A8 80B9A1E8 00042403 */ sra $a0, $a0, 16 /* 002AC 80B9A1EC 46062200 */ add.s $f8, $f4, $f6 -/* 002B0 80B9A1F0 0C01DE0D */ jal Math_Coss +/* 002B0 80B9A1F0 0C01DE0D */ jal Math_CosS ## coss? /* 002B4 80B9A1F4 E6080000 */ swc1 $f8, 0x0000($s0) ## 00000000 /* 002B8 80B9A1F8 4600A402 */ mul.s $f16, $f20, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AA90.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AA90.s index e9f9506e27..ffe80ce6c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AA90.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9AA90.s @@ -13,11 +13,11 @@ glabel func_80B9AA90 /* 000EC 80B9AABC F7B60018 */ sdc1 $f22, 0x0018($sp) /* 000F0 80B9AAC0 F7B40010 */ sdc1 $f20, 0x0010($sp) /* 000F4 80B9AAC4 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000 -/* 000F8 80B9AAC8 0C01DE1C */ jal Math_Sins +/* 000F8 80B9AAC8 0C01DE1C */ jal Math_SinS ## sins? /* 000FC 80B9AACC 84840032 */ lh $a0, 0x0032($a0) ## 00000032 /* 00100 80B9AAD0 46000606 */ mov.s $f24, $f0 -/* 00104 80B9AAD4 0C01DE0D */ jal Math_Coss +/* 00104 80B9AAD4 0C01DE0D */ jal Math_CosS ## coss? /* 00108 80B9AAD8 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 0010C 80B9AADC 3C01C220 */ lui $at, 0xC220 ## $at = C2200000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ABA0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ABA0.s index 21a11d82b9..e772bb7244 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ABA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ABA0.s @@ -27,7 +27,7 @@ glabel func_80B9ABA0 /* 00230 80B9AC00 00132400 */ sll $a0, $s3, 16 /* 00234 80B9AC04 0010C080 */ sll $t8, $s0, 2 /* 00238 80B9AC08 02588821 */ addu $s1, $s2, $t8 -/* 0023C 80B9AC0C 0C01DE1C */ jal Math_Sins +/* 0023C 80B9AC0C 0C01DE1C */ jal Math_SinS ## sins? /* 00240 80B9AC10 00042403 */ sra $a0, $a0, 16 /* 00244 80B9AC14 46140182 */ mul.s $f6, $f0, $f20 @@ -35,7 +35,7 @@ glabel func_80B9ABA0 /* 0024C 80B9AC1C 00132400 */ sll $a0, $s3, 16 /* 00250 80B9AC20 00042403 */ sra $a0, $a0, 16 /* 00254 80B9AC24 46083280 */ add.s $f10, $f6, $f8 -/* 00258 80B9AC28 0C01DE0D */ jal Math_Coss +/* 00258 80B9AC28 0C01DE0D */ jal Math_CosS ## coss? /* 0025C 80B9AC2C E7AA0048 */ swc1 $f10, 0x0048($sp) /* 00260 80B9AC30 46140402 */ mul.s $f16, $f0, $f20 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA100C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA100C.s index 0f66e6fc03..105e147399 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA100C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA100C.s @@ -45,17 +45,17 @@ glabel func_80BA100C /* 00330 80BA1090 27B700BC */ addiu $s7, $sp, 0x00BC ## $s7 = FFFFFFDC .L80BA1094: /* 00334 80BA1094 00112400 */ sll $a0, $s1, 16 -/* 00338 80BA1098 0C01DE1C */ jal Math_Sins +/* 00338 80BA1098 0C01DE1C */ jal Math_SinS ## sins? /* 0033C 80BA109C 00042403 */ sra $a0, $a0, 16 /* 00340 80BA10A0 00112400 */ sll $a0, $s1, 16 /* 00344 80BA10A4 46000506 */ mov.s $f20, $f0 -/* 00348 80BA10A8 0C01DE0D */ jal Math_Coss +/* 00348 80BA10A8 0C01DE0D */ jal Math_CosS ## coss? /* 0034C 80BA10AC 00042403 */ sra $a0, $a0, 16 /* 00350 80BA10B0 4618A102 */ mul.s $f4, $f20, $f24 /* 00354 80BA10B4 46000586 */ mov.s $f22, $f0 -/* 00358 80BA10B8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00358 80BA10B8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0035C 80BA10BC E7A400C8 */ swc1 $f4, 0x00C8($sp) /* 00360 80BA10C0 461A0182 */ mul.s $f6, $f0, $f26 @@ -66,7 +66,7 @@ glabel func_80BA100C /* 00374 80BA10D4 461C3200 */ add.s $f8, $f6, $f28 /* 00378 80BA10D8 E7AA00D0 */ swc1 $f10, 0x00D0($sp) /* 0037C 80BA10DC E7A800CC */ swc1 $f8, 0x00CC($sp) -/* 00380 80BA10E0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00380 80BA10E0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00384 80BA10E4 E7B200BC */ swc1 $f18, 0x00BC($sp) /* 00388 80BA10E8 461A0102 */ mul.s $f4, $f0, $f26 @@ -80,7 +80,7 @@ glabel func_80BA100C /* 003A8 80BA1108 0C01DFA7 */ jal Math_Vec3f_Sum ## Vec3f_Add /* 003AC 80BA110C E7A600C0 */ swc1 $f6, 0x00C0($sp) -/* 003B0 80BA1110 0C03F66B */ jal Math_Rand_ZeroOne +/* 003B0 80BA1110 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 003B4 80BA1114 00000000 */ nop /* 003B8 80BA1118 3C0180BA */ lui $at, %hi(D_80BA1C5C) ## $at = 80BA0000 @@ -102,7 +102,7 @@ glabel func_80BA100C /* 003F4 80BA1154 10000001 */ beq $zero, $zero, .L80BA115C /* 003F8 80BA1158 24100040 */ addiu $s0, $zero, 0x0040 ## $s0 = 00000040 .L80BA115C: -/* 003FC 80BA115C 0C03F66B */ jal Math_Rand_ZeroOne +/* 003FC 80BA115C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00400 80BA1160 00000000 */ nop /* 00404 80BA1164 3C0142BE */ lui $at, 0x42BE ## $at = 42BE0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1294.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1294.s index 18c7a0c6cc..984adb545c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1294.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1294.s @@ -65,17 +65,17 @@ glabel func_80BA1294 /* 00610 80BA1370 27B500BC */ addiu $s5, $sp, 0x00BC ## $s5 = FFFFFFDC .L80BA1374: /* 00614 80BA1374 00112400 */ sll $a0, $s1, 16 -/* 00618 80BA1378 0C01DE1C */ jal Math_Sins +/* 00618 80BA1378 0C01DE1C */ jal Math_SinS ## sins? /* 0061C 80BA137C 00042403 */ sra $a0, $a0, 16 /* 00620 80BA1380 00112400 */ sll $a0, $s1, 16 /* 00624 80BA1384 46000506 */ mov.s $f20, $f0 -/* 00628 80BA1388 0C01DE0D */ jal Math_Coss +/* 00628 80BA1388 0C01DE0D */ jal Math_CosS ## coss? /* 0062C 80BA138C 00042403 */ sra $a0, $a0, 16 /* 00630 80BA1390 4618A282 */ mul.s $f10, $f20, $f24 /* 00634 80BA1394 46000586 */ mov.s $f22, $f0 -/* 00638 80BA1398 0C03F66B */ jal Math_Rand_ZeroOne +/* 00638 80BA1398 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0063C 80BA139C E7AA00C8 */ swc1 $f10, 0x00C8($sp) /* 00640 80BA13A0 461E0402 */ mul.s $f16, $f0, $f30 @@ -86,7 +86,7 @@ glabel func_80BA1294 /* 00654 80BA13B4 461A8480 */ add.s $f18, $f16, $f26 /* 00658 80BA13B8 E7A400D0 */ swc1 $f4, 0x00D0($sp) /* 0065C 80BA13BC E7B200CC */ swc1 $f18, 0x00CC($sp) -/* 00660 80BA13C0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00660 80BA13C0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00664 80BA13C4 E7A800BC */ swc1 $f8, 0x00BC($sp) /* 00668 80BA13C8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 @@ -102,7 +102,7 @@ glabel func_80BA1294 /* 00690 80BA13F0 0C01DFA7 */ jal Math_Vec3f_Sum ## Vec3f_Add /* 00694 80BA13F4 E7B200C0 */ swc1 $f18, 0x00C0($sp) -/* 00698 80BA13F8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00698 80BA13F8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0069C 80BA13FC 00000000 */ nop /* 006A0 80BA1400 3C0180BA */ lui $at, %hi(D_80BA1C68) ## $at = 80BA0000 @@ -115,7 +115,7 @@ glabel func_80BA1294 /* 006BC 80BA141C 10000001 */ beq $zero, $zero, .L80BA1424 /* 006C0 80BA1420 24100040 */ addiu $s0, $zero, 0x0040 ## $s0 = 00000040 .L80BA1424: -/* 006C4 80BA1424 0C03F66B */ jal Math_Rand_ZeroOne +/* 006C4 80BA1424 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 006C8 80BA1428 00000000 */ nop /* 006CC 80BA142C 3C0142BE */ lui $at, 0x42BE ## $at = 42BE0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA188C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA188C.s index 72432848fc..053b9350ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA188C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA188C.s @@ -8,20 +8,20 @@ glabel func_80BA188C /* 00B30 80BA1890 AFB00018 */ sw $s0, 0x0018($sp) /* 00B34 80BA1894 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00B38 80BA1898 AFBF001C */ sw $ra, 0x001C($sp) -/* 00B3C 80BA189C 0C01DE1C */ jal Math_Sins +/* 00B3C 80BA189C 0C01DE1C */ jal Math_SinS ## sins? /* 00B40 80BA18A0 84840032 */ lh $a0, 0x0032($a0) ## 00000032 /* 00B44 80BA18A4 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 /* 00B48 80BA18A8 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 00B4C 80BA18AC 46040182 */ mul.s $f6, $f0, $f4 -/* 00B50 80BA18B0 0C01DE0D */ jal Math_Coss +/* 00B50 80BA18B0 0C01DE0D */ jal Math_CosS ## coss? /* 00B54 80BA18B4 E606005C */ swc1 $f6, 0x005C($s0) ## 0000005C /* 00B58 80BA18B8 C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 /* 00B5C 80BA18BC 240E00F0 */ addiu $t6, $zero, 0x00F0 ## $t6 = 000000F0 /* 00B60 80BA18C0 A20E00AE */ sb $t6, 0x00AE($s0) ## 000000AE /* 00B64 80BA18C4 46080282 */ mul.s $f10, $f0, $f8 -/* 00B68 80BA18C8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00B68 80BA18C8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00B6C 80BA18CC E60A0064 */ swc1 $f10, 0x0064($s0) ## 00000064 /* 00B70 80BA18D0 3C0180BA */ lui $at, %hi(D_80BA1C6C) ## $at = 80BA0000 @@ -33,7 +33,7 @@ glabel func_80BA188C /* 00B88 80BA18E8 46049182 */ mul.s $f6, $f18, $f4 /* 00B8C 80BA18EC 4600320D */ trunc.w.s $f8, $f6 /* 00B90 80BA18F0 44184000 */ mfc1 $t8, $f8 -/* 00B94 80BA18F4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00B94 80BA18F4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00B98 80BA18F8 A4381B50 */ sh $t8, %lo(D_80BA1B50)($at) /* 00B9C 80BA18FC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1958.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1958.s index 40a21726ae..ce14fe0335 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1958.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1958.s @@ -59,14 +59,14 @@ glabel func_80BA1958 /* 00CC0 80BA1A20 3C0580BA */ lui $a1, %hi(D_80BA1B50) ## $a1 = 80BA0000 /* 00CC4 80BA1A24 84A51B50 */ lh $a1, %lo(D_80BA1B50)($a1) /* 00CC8 80BA1A28 24841B54 */ addiu $a0, $a0, %lo(D_80BA1B54) ## $a0 = 80BA1B54 -/* 00CCC 80BA1A2C 0C01DE5F */ jal Math_ApproxS +/* 00CCC 80BA1A2C 0C01DE5F */ jal Math_StepToS /* 00CD0 80BA1A30 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 /* 00CD4 80BA1A34 3C0480BA */ lui $a0, %hi(D_80BA1B5C) ## $a0 = 80BA0000 /* 00CD8 80BA1A38 3C0580BA */ lui $a1, %hi(D_80BA1B58) ## $a1 = 80BA0000 /* 00CDC 80BA1A3C 84A51B58 */ lh $a1, %lo(D_80BA1B58)($a1) /* 00CE0 80BA1A40 24841B5C */ addiu $a0, $a0, %lo(D_80BA1B5C) ## $a0 = 80BA1B5C -/* 00CE4 80BA1A44 0C01DE5F */ jal Math_ApproxS +/* 00CE4 80BA1A44 0C01DE5F */ jal Math_StepToS /* 00CE8 80BA1A48 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 /* 00CEC 80BA1A4C 3C0980BA */ lui $t1, %hi(D_80BA1B54) ## $t1 = 80BA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA2DD4.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA2DD4.s index d529f29bb8..e95043bfe2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA2DD4.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA2DD4.s @@ -299,7 +299,7 @@ glabel func_80BA2DD4 /* 00660 80BA3100 C62800E8 */ lwc1 $f8, 0x00E8($s1) ## 000000E8 /* 00664 80BA3104 461C3282 */ mul.s $f10, $f6, $f28 /* 00668 80BA3108 460A4100 */ add.s $f4, $f8, $f10 -/* 0066C 80BA310C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0066C 80BA310C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00670 80BA3110 E6040170 */ swc1 $f4, 0x0170($s0) ## 8015E7D0 /* 00674 80BA3114 46140181 */ sub.s $f6, $f0, $f20 @@ -309,7 +309,7 @@ glabel func_80BA2DD4 /* 00684 80BA3124 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 /* 00688 80BA3128 46083282 */ mul.s $f10, $f6, $f8 /* 0068C 80BA312C E6040154 */ swc1 $f4, 0x0154($s0) ## 8015E7B4 -/* 00690 80BA3130 0C03F66B */ jal Math_Rand_ZeroOne +/* 00690 80BA3130 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00694 80BA3134 E60A0150 */ swc1 $f10, 0x0150($s0) ## 8015E7B0 /* 00698 80BA3138 46140181 */ sub.s $f6, $f0, $f20 @@ -317,7 +317,7 @@ glabel func_80BA2DD4 /* 006A0 80BA3140 44814000 */ mtc1 $at, $f8 ## $f8 = 160.00 /* 006A4 80BA3144 00000000 */ nop /* 006A8 80BA3148 46083282 */ mul.s $f10, $f6, $f8 -/* 006AC 80BA314C 0C03F66B */ jal Math_Rand_ZeroOne +/* 006AC 80BA314C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 006B0 80BA3150 E60A0158 */ swc1 $f10, 0x0158($s0) ## 8015E7B8 /* 006B4 80BA3154 3C0180BA */ lui $at, %hi(D_80BA5C20) ## $at = 80BA0000 @@ -325,7 +325,7 @@ glabel func_80BA2DD4 /* 006BC 80BA315C A200018C */ sb $zero, 0x018C($s0) ## 8015E7EC /* 006C0 80BA3160 46040182 */ mul.s $f6, $f0, $f4 /* 006C4 80BA3164 46143200 */ add.s $f8, $f6, $f20 -/* 006C8 80BA3168 0C03F66B */ jal Math_Rand_ZeroOne +/* 006C8 80BA3168 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 006CC 80BA316C E6080184 */ swc1 $f8, 0x0184($s0) ## 8015E7E4 /* 006D0 80BA3170 3C0180BA */ lui $at, %hi(D_80BA5C24) ## $at = 80BA0000 @@ -370,21 +370,21 @@ glabel func_80BA2DD4 /* 00760 80BA3200 3C0180BA */ lui $at, %hi(D_80BA5C28) ## $at = 80BA0000 /* 00764 80BA3204 C4285C28 */ lwc1 $f8, %lo(D_80BA5C28)($at) /* 00768 80BA3208 44D8F800 */ ctc1 $t8, $31 -/* 0076C 80BA320C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0076C 80BA320C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00770 80BA3210 E6080190 */ swc1 $f8, 0x0190($s0) ## 8015E7F0 /* 00774 80BA3214 3C0143B4 */ lui $at, 0x43B4 ## $at = 43B40000 /* 00778 80BA3218 44815000 */ mtc1 $at, $f10 ## $f10 = 360.00 /* 0077C 80BA321C 00000000 */ nop /* 00780 80BA3220 460A0102 */ mul.s $f4, $f0, $f10 -/* 00784 80BA3224 0C03F66B */ jal Math_Rand_ZeroOne +/* 00784 80BA3224 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00788 80BA3228 E6040174 */ swc1 $f4, 0x0174($s0) ## 8015E7D4 /* 0078C 80BA322C 3C0143B4 */ lui $at, 0x43B4 ## $at = 43B40000 /* 00790 80BA3230 44813000 */ mtc1 $at, $f6 ## $f6 = 360.00 /* 00794 80BA3234 00000000 */ nop /* 00798 80BA3238 46060202 */ mul.s $f8, $f0, $f6 -/* 0079C 80BA323C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0079C 80BA323C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 007A0 80BA3240 E6080178 */ swc1 $f8, 0x0178($s0) ## 8015E7D8 /* 007A4 80BA3244 3C0143B4 */ lui $at, 0x43B4 ## $at = 43B40000 @@ -453,14 +453,14 @@ glabel func_80BA2DD4 /* 00894 80BA3334 29E10101 */ slti $at, $t7, 0x0101 /* 00898 80BA3338 14200051 */ bne $at, $zero, .L80BA3480 /* 0089C 80BA333C 00000000 */ nop -/* 008A0 80BA3340 0C03F66B */ jal Math_Rand_ZeroOne +/* 008A0 80BA3340 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 008A4 80BA3344 A600019C */ sh $zero, 0x019C($s0) ## 8015E7FC /* 008A8 80BA3348 4614003C */ c.lt.s $f0, $f20 /* 008AC 80BA334C 00000000 */ nop /* 008B0 80BA3350 4500000D */ bc1f .L80BA3388 /* 008B4 80BA3354 00000000 */ nop -/* 008B8 80BA3358 0C03F66B */ jal Math_Rand_ZeroOne +/* 008B8 80BA3358 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 008BC 80BA335C 00000000 */ nop /* 008C0 80BA3360 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -474,7 +474,7 @@ glabel func_80BA2DD4 /* 008E0 80BA3380 1000000C */ beq $zero, $zero, .L80BA33B4 /* 008E4 80BA3384 A60A0194 */ sh $t2, 0x0194($s0) ## 8015E7F4 .L80BA3388: -/* 008E8 80BA3388 0C03F66B */ jal Math_Rand_ZeroOne +/* 008E8 80BA3388 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 008EC 80BA338C 00000000 */ nop /* 008F0 80BA3390 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -487,7 +487,7 @@ glabel func_80BA2DD4 /* 0090C 80BA33AC 01EEC023 */ subu $t8, $t7, $t6 /* 00910 80BA33B0 A6180194 */ sh $t8, 0x0194($s0) ## 8015E7F4 .L80BA33B4: -/* 00914 80BA33B4 0C03F66B */ jal Math_Rand_ZeroOne +/* 00914 80BA33B4 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00918 80BA33B8 00000000 */ nop /* 0091C 80BA33BC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -498,7 +498,7 @@ glabel func_80BA2DD4 /* 00930 80BA33D0 440A5000 */ mfc1 $t2, $f10 /* 00934 80BA33D4 00000000 */ nop /* 00938 80BA33D8 254B000F */ addiu $t3, $t2, 0x000F ## $t3 = 0000000F -/* 0093C 80BA33DC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0093C 80BA33DC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00940 80BA33E0 A60B0196 */ sh $t3, 0x0196($s0) ## 8015E7F6 /* 00944 80BA33E4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -508,7 +508,7 @@ glabel func_80BA2DD4 /* 00954 80BA33F4 46020202 */ mul.s $f8, $f0, $f2 /* 00958 80BA33F8 46024100 */ add.s $f4, $f8, $f2 /* 0095C 80BA33FC 46062282 */ mul.s $f10, $f4, $f6 -/* 00960 80BA3400 0C03F66B */ jal Math_Rand_ZeroOne +/* 00960 80BA3400 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00964 80BA3404 E60A0198 */ swc1 $f10, 0x0198($s0) ## 8015E7F8 /* 00968 80BA3408 4616003C */ c.lt.s $f0, $f22 @@ -554,7 +554,7 @@ glabel func_80BA2DD4 /* 009F4 80BA3494 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A83126F /* 009F8 80BA3498 00A03021 */ addu $a2, $a1, $zero /* 009FC 80BA349C 26040190 */ addiu $a0, $s0, 0x0190 ## $a0 = 8015E7F0 -/* 00A00 80BA34A0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00A00 80BA34A0 0C01E0C4 */ jal Math_SmoothStepToF /* 00A04 80BA34A4 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00A08 80BA34A8 3C0180BA */ lui $at, %hi(D_80BA5C38) ## $at = 80BA0000 @@ -563,7 +563,7 @@ glabel func_80BA2DD4 /* 00A14 80BA34B4 4406A000 */ mfc1 $a2, $f20 /* 00A18 80BA34B8 4407B000 */ mfc1 $a3, $f22 /* 00A1C 80BA34BC 26040180 */ addiu $a0, $s0, 0x0180 ## $a0 = 8015E7E0 -/* 00A20 80BA34C0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00A20 80BA34C0 0C01E0C4 */ jal Math_SmoothStepToF /* 00A24 80BA34C4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00A28 80BA34C8 0C0400A4 */ jal sinf @@ -606,7 +606,7 @@ glabel func_80BA2DD4 /* 00AAC 80BA354C C6080174 */ lwc1 $f8, 0x0174($s0) ## 8015E7D4 /* 00AB0 80BA3550 C42A5C3C */ lwc1 $f10, %lo(D_80BA5C3C)($at) /* 00AB4 80BA3554 460A4100 */ add.s $f4, $f8, $f10 -/* 00AB8 80BA3558 0C03F66B */ jal Math_Rand_ZeroOne +/* 00AB8 80BA3558 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00ABC 80BA355C E6040174 */ swc1 $f4, 0x0174($s0) ## 8015E7D4 /* 00AC0 80BA3560 3C0180BA */ lui $at, %hi(D_80BA5C40) ## $at = 80BA0000 @@ -622,7 +622,7 @@ glabel func_80BA2DD4 /* 00AE8 80BA3588 10000048 */ beq $zero, $zero, .L80BA36AC /* 00AEC 80BA358C E60A017C */ swc1 $f10, 0x017C($s0) ## 8015E7DC .L80BA3590: -/* 00AF0 80BA3590 0C03F66B */ jal Math_Rand_ZeroOne +/* 00AF0 80BA3590 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00AF4 80BA3594 00000000 */ nop /* 00AF8 80BA3598 3C0180BA */ lui $at, %hi(D_80BA5C48) ## $at = 80BA0000 @@ -630,7 +630,7 @@ glabel func_80BA2DD4 /* 00B00 80BA35A0 C6040174 */ lwc1 $f4, 0x0174($s0) ## 8015E7D4 /* 00B04 80BA35A4 46004182 */ mul.s $f6, $f8, $f0 /* 00B08 80BA35A8 46062280 */ add.s $f10, $f4, $f6 -/* 00B0C 80BA35AC 0C03F66B */ jal Math_Rand_ZeroOne +/* 00B0C 80BA35AC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00B10 80BA35B0 E60A0174 */ swc1 $f10, 0x0174($s0) ## 8015E7D4 /* 00B14 80BA35B4 3C0180BA */ lui $at, %hi(D_80BA5C4C) ## $at = 80BA0000 @@ -638,7 +638,7 @@ glabel func_80BA2DD4 /* 00B1C 80BA35BC C6080178 */ lwc1 $f8, 0x0178($s0) ## 8015E7D8 /* 00B20 80BA35C0 46002182 */ mul.s $f6, $f4, $f0 /* 00B24 80BA35C4 46064280 */ add.s $f10, $f8, $f6 -/* 00B28 80BA35C8 0C03F66B */ jal Math_Rand_ZeroOne +/* 00B28 80BA35C8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00B2C 80BA35CC E60A0178 */ swc1 $f10, 0x0178($s0) ## 8015E7D8 /* 00B30 80BA35D0 3C0180BA */ lui $at, %hi(D_80BA5C50) ## $at = 80BA0000 @@ -649,7 +649,7 @@ glabel func_80BA2DD4 /* 00B44 80BA35E4 10000031 */ beq $zero, $zero, .L80BA36AC /* 00B48 80BA35E8 E60A017C */ swc1 $f10, 0x017C($s0) ## 8015E7DC .L80BA35EC: -/* 00B4C 80BA35EC 0C03F66B */ jal Math_Rand_ZeroOne +/* 00B4C 80BA35EC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00B50 80BA35F0 00000000 */ nop /* 00B54 80BA35F4 3C0180BA */ lui $at, %hi(D_80BA5C54) ## $at = 80BA0000 @@ -657,7 +657,7 @@ glabel func_80BA2DD4 /* 00B5C 80BA35FC C6080174 */ lwc1 $f8, 0x0174($s0) ## 8015E7D4 /* 00B60 80BA3600 46002182 */ mul.s $f6, $f4, $f0 /* 00B64 80BA3604 46064280 */ add.s $f10, $f8, $f6 -/* 00B68 80BA3608 0C03F66B */ jal Math_Rand_ZeroOne +/* 00B68 80BA3608 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00B6C 80BA360C E60A0174 */ swc1 $f10, 0x0174($s0) ## 8015E7D4 /* 00B70 80BA3610 3C0180BA */ lui $at, %hi(D_80BA5C58) ## $at = 80BA0000 @@ -665,7 +665,7 @@ glabel func_80BA2DD4 /* 00B78 80BA3618 C6040178 */ lwc1 $f4, 0x0178($s0) ## 8015E7D8 /* 00B7C 80BA361C 46004182 */ mul.s $f6, $f8, $f0 /* 00B80 80BA3620 46062280 */ add.s $f10, $f4, $f6 -/* 00B84 80BA3624 0C03F66B */ jal Math_Rand_ZeroOne +/* 00B84 80BA3624 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00B88 80BA3628 E60A0178 */ swc1 $f10, 0x0178($s0) ## 8015E7D8 /* 00B8C 80BA362C 3C0180BA */ lui $at, %hi(D_80BA5C5C) ## $at = 80BA0000 @@ -676,7 +676,7 @@ glabel func_80BA2DD4 /* 00BA0 80BA3640 1000001A */ beq $zero, $zero, .L80BA36AC /* 00BA4 80BA3644 E60A017C */ swc1 $f10, 0x017C($s0) ## 8015E7DC .L80BA3648: -/* 00BA8 80BA3648 0C03F66B */ jal Math_Rand_ZeroOne +/* 00BA8 80BA3648 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00BAC 80BA364C 00000000 */ nop /* 00BB0 80BA3650 3C0180BA */ lui $at, %hi(D_80BA5C60) ## $at = 80BA0000 @@ -687,7 +687,7 @@ glabel func_80BA2DD4 /* 00BC4 80BA3664 46005121 */ cvt.d.s $f4, $f10 /* 00BC8 80BA3668 46262200 */ add.d $f8, $f4, $f6 /* 00BCC 80BA366C 462042A0 */ cvt.s.d $f10, $f8 -/* 00BD0 80BA3670 0C03F66B */ jal Math_Rand_ZeroOne +/* 00BD0 80BA3670 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00BD4 80BA3674 E60A0174 */ swc1 $f10, 0x0174($s0) ## 8015E7D4 /* 00BD8 80BA3678 3C0180BA */ lui $at, %hi(D_80BA5C68) ## $at = 80BA0000 @@ -695,7 +695,7 @@ glabel func_80BA2DD4 /* 00BE0 80BA3680 C6040178 */ lwc1 $f4, 0x0178($s0) ## 8015E7D8 /* 00BE4 80BA3684 46003202 */ mul.s $f8, $f6, $f0 /* 00BE8 80BA3688 46082280 */ add.s $f10, $f4, $f8 -/* 00BEC 80BA368C 0C03F66B */ jal Math_Rand_ZeroOne +/* 00BEC 80BA368C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00BF0 80BA3690 E60A0178 */ swc1 $f10, 0x0178($s0) ## 8015E7D8 /* 00BF4 80BA3694 3C0180BA */ lui $at, %hi(D_80BA5C6C) ## $at = 80BA0000 @@ -720,7 +720,7 @@ glabel func_80BA2DD4 /* 00C34 80BA36D4 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 /* 00C38 80BA36D8 A600019C */ sh $zero, 0x019C($s0) ## 8015E7FC /* 00C3C 80BA36DC A209014C */ sb $t1, 0x014C($s0) ## 8015E7AC -/* 00C40 80BA36E0 0C03F66B */ jal Math_Rand_ZeroOne +/* 00C40 80BA36E0 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00C44 80BA36E4 E6040180 */ swc1 $f4, 0x0180($s0) ## 8015E7E0 /* 00C48 80BA36E8 3C0180BA */ lui $at, %hi(D_80BA5C70) ## $at = 80BA0000 @@ -743,14 +743,14 @@ glabel func_80BA2DD4 /* 00C88 80BA3728 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 00C8C 80BA372C 26040190 */ addiu $a0, $s0, 0x0190 ## $a0 = 8015E7F0 /* 00C90 80BA3730 3C053E80 */ lui $a1, 0x3E80 ## $a1 = 3E800000 -/* 00C94 80BA3734 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00C94 80BA3734 0C01E0C4 */ jal Math_SmoothStepToF /* 00C98 80BA3738 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00C9C 80BA373C 8E850024 */ lw $a1, 0x0024($s4) ## 00000024 /* 00CA0 80BA3740 4406A000 */ mfc1 $a2, $f20 /* 00CA4 80BA3744 E7B60010 */ swc1 $f22, 0x0010($sp) /* 00CA8 80BA3748 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 8015E7C8 -/* 00CAC 80BA374C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00CAC 80BA374C 0C01E0C4 */ jal Math_SmoothStepToF /* 00CB0 80BA3750 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 00CB4 80BA3754 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -762,21 +762,21 @@ glabel func_80BA2DD4 /* 00CCC 80BA376C 2604016C */ addiu $a0, $s0, 0x016C ## $a0 = 8015E7CC /* 00CD0 80BA3770 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 00CD4 80BA3774 44055000 */ mfc1 $a1, $f10 -/* 00CD8 80BA3778 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00CD8 80BA3778 0C01E0C4 */ jal Math_SmoothStepToF /* 00CDC 80BA377C 00000000 */ nop /* 00CE0 80BA3780 8E85002C */ lw $a1, 0x002C($s4) ## 0000002C /* 00CE4 80BA3784 4406A000 */ mfc1 $a2, $f20 /* 00CE8 80BA3788 E7B60010 */ swc1 $f22, 0x0010($sp) /* 00CEC 80BA378C 26040170 */ addiu $a0, $s0, 0x0170 ## $a0 = 8015E7D0 -/* 00CF0 80BA3790 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00CF0 80BA3790 0C01E0C4 */ jal Math_SmoothStepToF /* 00CF4 80BA3794 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 00CF8 80BA3798 9604018A */ lhu $a0, 0x018A($s0) ## 8015E7EA /* 00CFC 80BA379C 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 00D00 80BA37A0 00812021 */ addu $a0, $a0, $at /* 00D04 80BA37A4 00042400 */ sll $a0, $a0, 16 -/* 00D08 80BA37A8 0C01DE1C */ jal Math_Sins +/* 00D08 80BA37A8 0C01DE1C */ jal Math_SinS ## sins? /* 00D0C 80BA37AC 00042403 */ sra $a0, $a0, 16 /* 00D10 80BA37B0 960C0196 */ lhu $t4, 0x0196($s0) ## 8015E7F6 @@ -794,14 +794,14 @@ glabel func_80BA2DD4 /* 00D3C 80BA37DC 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 00D40 80BA37E0 E7B60010 */ swc1 $f22, 0x0010($sp) /* 00D44 80BA37E4 44055000 */ mfc1 $a1, $f10 -/* 00D48 80BA37E8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00D48 80BA37E8 0C01E0C4 */ jal Math_SmoothStepToF /* 00D4C 80BA37EC 00000000 */ nop /* 00D50 80BA37F0 9604018A */ lhu $a0, 0x018A($s0) ## 8015E7EA /* 00D54 80BA37F4 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 00D58 80BA37F8 00812021 */ addu $a0, $a0, $at /* 00D5C 80BA37FC 00042400 */ sll $a0, $a0, 16 -/* 00D60 80BA3800 0C01DE0D */ jal Math_Coss +/* 00D60 80BA3800 0C01DE0D */ jal Math_CosS ## coss? /* 00D64 80BA3804 00042403 */ sra $a0, $a0, 16 /* 00D68 80BA3808 960D0196 */ lhu $t5, 0x0196($s0) ## 8015E7F6 @@ -819,7 +819,7 @@ glabel func_80BA2DD4 /* 00D94 80BA3834 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 00D98 80BA3838 E7B60010 */ swc1 $f22, 0x0010($sp) /* 00D9C 80BA383C 44055000 */ mfc1 $a1, $f10 -/* 00DA0 80BA3840 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00DA0 80BA3840 0C01E0C4 */ jal Math_SmoothStepToF /* 00DA4 80BA3844 00000000 */ nop /* 00DA8 80BA3848 960F018A */ lhu $t7, 0x018A($s0) ## 8015E7EA @@ -831,7 +831,7 @@ glabel func_80BA2DD4 /* 00DBC 80BA385C A618018A */ sh $t8, 0x018A($s0) ## 8015E7EA /* 00DC0 80BA3860 C6040154 */ lwc1 $f4, 0x0154($s0) ## 8015E7B4 /* 00DC4 80BA3864 46002180 */ add.s $f6, $f4, $f0 -/* 00DC8 80BA3868 0C03F66B */ jal Math_Rand_ZeroOne +/* 00DC8 80BA3868 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00DCC 80BA386C E6060154 */ swc1 $f6, 0x0154($s0) ## 8015E7B4 /* 00DD0 80BA3870 4600B282 */ mul.s $f10, $f22, $f0 @@ -841,7 +841,7 @@ glabel func_80BA2DD4 /* 00DE0 80BA3880 C6080198 */ lwc1 $f8, 0x0198($s0) ## 8015E7F8 /* 00DE4 80BA3884 46083280 */ add.s $f10, $f6, $f8 /* 00DE8 80BA3888 E6040174 */ swc1 $f4, 0x0174($s0) ## 8015E7D4 -/* 00DEC 80BA388C 0C03F66B */ jal Math_Rand_ZeroOne +/* 00DEC 80BA388C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 00DF0 80BA3890 E60A0178 */ swc1 $f10, 0x0178($s0) ## 8015E7D8 /* 00DF4 80BA3894 3C0180BA */ lui $at, %hi(D_80BA5C78) ## $at = 80BA0000 @@ -854,7 +854,7 @@ glabel func_80BA2DD4 /* 00E10 80BA38B0 00042400 */ sll $a0, $a0, 16 /* 00E14 80BA38B4 00042403 */ sra $a0, $a0, 16 /* 00E18 80BA38B8 46082280 */ add.s $f10, $f4, $f8 -/* 00E1C 80BA38BC 0C01DE1C */ jal Math_Sins +/* 00E1C 80BA38BC 0C01DE1C */ jal Math_SinS ## sins? /* 00E20 80BA38C0 E60A017C */ swc1 $f10, 0x017C($s0) ## 8015E7DC /* 00E24 80BA38C4 96190196 */ lhu $t9, 0x0196($s0) ## 8015E7F6 @@ -872,7 +872,7 @@ glabel func_80BA2DD4 /* 00E50 80BA38F0 00812021 */ addu $a0, $a0, $at /* 00E54 80BA38F4 00042400 */ sll $a0, $a0, 16 /* 00E58 80BA38F8 00042403 */ sra $a0, $a0, 16 -/* 00E5C 80BA38FC 0C01DE0D */ jal Math_Coss +/* 00E5C 80BA38FC 0C01DE0D */ jal Math_CosS ## coss? /* 00E60 80BA3900 E60A0150 */ swc1 $f10, 0x0150($s0) ## 8015E7B0 /* 00E64 80BA3904 96080196 */ lhu $t0, 0x0196($s0) ## 8015E7F6 @@ -894,7 +894,7 @@ glabel func_80BA2DD4 /* 00E9C 80BA393C 3C073A83 */ lui $a3, 0x3A83 ## $a3 = 3A830000 /* 00EA0 80BA3940 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A83126F /* 00EA4 80BA3944 00A03021 */ addu $a2, $a1, $zero -/* 00EA8 80BA3948 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00EA8 80BA3948 0C01E0C4 */ jal Math_SmoothStepToF /* 00EAC 80BA394C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00EB0 80BA3950 3C0180BA */ lui $at, %hi(D_80BA5C80) ## $at = 80BA0000 @@ -904,7 +904,7 @@ glabel func_80BA2DD4 /* 00EC0 80BA3960 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 00EC4 80BA3964 26040180 */ addiu $a0, $s0, 0x0180 ## $a0 = 8015E7E0 /* 00EC8 80BA3968 3C053FC0 */ lui $a1, 0x3FC0 ## $a1 = 3FC00000 -/* 00ECC 80BA396C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 00ECC 80BA396C 0C01E0C4 */ jal Math_SmoothStepToF /* 00ED0 80BA3970 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00ED4 80BA3974 C6080114 */ lwc1 $f8, 0x0114($s0) ## 8015E774 diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA414C.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA414C.s index 12a2515fa6..4dbffea3fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA414C.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA414C.s @@ -181,7 +181,7 @@ glabel func_80BA414C /* 018FC 80BA439C E606016C */ swc1 $f6, 0x016C($s0) ## 0000016C /* 01900 80BA43A0 C66A00E8 */ lwc1 $f10, 0x00E8($s3) ## 000000E8 /* 01904 80BA43A4 46085100 */ add.s $f4, $f10, $f8 -/* 01908 80BA43A8 0C03F66B */ jal Math_Rand_ZeroOne +/* 01908 80BA43A8 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0190C 80BA43AC E6040170 */ swc1 $f4, 0x0170($s0) ## 00000170 /* 01910 80BA43B0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -191,7 +191,7 @@ glabel func_80BA414C /* 01920 80BA43C0 46140181 */ sub.s $f6, $f0, $f20 /* 01924 80BA43C4 E61E0154 */ swc1 $f30, 0x0154($s0) ## 00000154 /* 01928 80BA43C8 46183282 */ mul.s $f10, $f6, $f24 -/* 0192C 80BA43CC 0C03F66B */ jal Math_Rand_ZeroOne +/* 0192C 80BA43CC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01930 80BA43D0 E60A0150 */ swc1 $f10, 0x0150($s0) ## 00000150 /* 01934 80BA43D4 46140201 */ sub.s $f8, $f0, $f20 @@ -208,7 +208,7 @@ glabel func_80BA414C /* 01960 80BA4400 00000000 */ nop /* 01964 80BA4404 E616016C */ swc1 $f22, 0x016C($s0) ## 0000016C .L80BA4408: -/* 01968 80BA4408 0C03F66B */ jal Math_Rand_ZeroOne +/* 01968 80BA4408 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 0196C 80BA440C 00000000 */ nop /* 01970 80BA4410 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -216,14 +216,14 @@ glabel func_80BA414C /* 01978 80BA4418 00000000 */ nop /* 0197C 80BA441C 46040182 */ mul.s $f6, $f0, $f4 /* 01980 80BA4420 46143280 */ add.s $f10, $f6, $f20 -/* 01984 80BA4424 0C03F66B */ jal Math_Rand_ZeroOne +/* 01984 80BA4424 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01988 80BA4428 E60A0180 */ swc1 $f10, 0x0180($s0) ## 00000180 /* 0198C 80BA442C 3C0143B4 */ lui $at, 0x43B4 ## $at = 43B40000 /* 01990 80BA4430 44814000 */ mtc1 $at, $f8 ## $f8 = 360.00 /* 01994 80BA4434 00000000 */ nop /* 01998 80BA4438 46080102 */ mul.s $f4, $f0, $f8 -/* 0199C 80BA443C 0C03F66B */ jal Math_Rand_ZeroOne +/* 0199C 80BA443C 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 019A0 80BA4440 E6040174 */ swc1 $f4, 0x0174($s0) ## 00000174 /* 019A4 80BA4444 3C0143B4 */ lui $at, 0x43B4 ## $at = 43B40000 @@ -269,7 +269,7 @@ glabel func_80BA414C /* 01A40 80BA44E0 4608A100 */ add.s $f4, $f20, $f8 /* 01A44 80BA44E4 E7A400F0 */ swc1 $f4, 0x00F0($sp) /* 01A48 80BA44E8 461E3282 */ mul.s $f10, $f6, $f30 -/* 01A4C 80BA44EC 0C03F66B */ jal Math_Rand_ZeroOne +/* 01A4C 80BA44EC 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01A50 80BA44F0 460A8580 */ add.s $f22, $f16, $f10 /* 01A54 80BA44F4 3C0180BA */ lui $at, %hi(D_80BA5CA4) ## $at = 80BA0000 @@ -277,7 +277,7 @@ glabel func_80BA414C /* 01A5C 80BA44FC C6080174 */ lwc1 $f8, 0x0174($s0) ## 00000174 /* 01A60 80BA4500 4600A102 */ mul.s $f4, $f20, $f0 /* 01A64 80BA4504 46044180 */ add.s $f6, $f8, $f4 -/* 01A68 80BA4508 0C03F66B */ jal Math_Rand_ZeroOne +/* 01A68 80BA4508 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float /* 01A6C 80BA450C E6060174 */ swc1 $f6, 0x0174($s0) ## 00000174 /* 01A70 80BA4510 4600A202 */ mul.s $f8, $f20, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4CD4.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4CD4.s index c16c866f7c..14ed66c8bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4CD4.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4CD4.s @@ -42,7 +42,7 @@ glabel func_80BA4CD4 /* 022B4 80BA4D54 3C073E8F */ lui $a3, 0x3E8F ## $a3 = 3E8F0000 /* 022B8 80BA4D58 34E75C29 */ ori $a3, $a3, 0x5C29 ## $a3 = 3E8F5C29 /* 022BC 80BA4D5C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 022C0 80BA4D60 0C01E0C4 */ jal Math_SmoothScaleMaxMinF +/* 022C0 80BA4D60 0C01E0C4 */ jal Math_SmoothStepToF /* 022C4 80BA4D64 E7A40010 */ swc1 $f4, 0x0010($sp) /* 022C8 80BA4D68 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA53CC.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA53CC.s index 13e83c5c74..082aa60a73 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA53CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA53CC.s @@ -45,7 +45,7 @@ glabel func_80BA53CC /* 029C0 80BA5460 4405A000 */ mfc1 $a1, $f20 .L80BA5464: /* 029C4 80BA5464 4406A000 */ mfc1 $a2, $f20 -/* 029C8 80BA5468 0C01E123 */ jal Math_SmoothDownscaleMaxF +/* 029C8 80BA5468 0C01E123 */ jal Math_ApproachZeroF /* 029CC 80BA546C 26040190 */ addiu $a0, $s0, 0x0190 ## $a0 = 00000190 /* 029D0 80BA5470 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000003 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s index c8f60ac25e..6ba3340d5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s @@ -110,7 +110,7 @@ glabel func_808299A0 /* 16278 80829A98 3C073D27 */ lui $a3, 0x3D27 ## $a3 = 3D270000 /* 1627C 80829A9C 34E7EF9E */ ori $a3, $a3, 0xEF9E ## $a3 = 3D27EF9E /* 16280 80829AA0 24841398 */ addiu $a0, %lo(D_80161398) -/* 16284 80829AA4 0C01E107 */ jal Math_SmoothScaleMaxF +/* 16284 80829AA4 0C01E107 */ jal Math_ApproachF /* 16288 80829AA8 3C053FC0 */ lui $a1, 0x3FC0 ## $a1 = 3FC00000 /* 1628C 80829AAC 3C018016 */ lui $at, %hi(D_80161398) @@ -129,7 +129,7 @@ glabel func_808299A0 .L80829AE0: /* 162C0 80829AE0 4405C000 */ mfc1 $a1, $f24 /* 162C4 80829AE4 4406C000 */ mfc1 $a2, $f24 -/* 162C8 80829AE8 0C01E107 */ jal Math_SmoothScaleMaxF +/* 162C8 80829AE8 0C01E107 */ jal Math_ApproachF /* 162CC 80829AEC 34E7EF9E */ ori $a3, $a3, 0xEF9E ## $a3 = 0000EF9E /* 162D0 80829AF0 3C018016 */ lui $at, %hi(D_80161398) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/Player_UpdateCommon.s b/asm/non_matchings/overlays/actors/ovl_player_actor/Player_UpdateCommon.s index 6a52060f8f..a0e1a9b891 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/Player_UpdateCommon.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/Player_UpdateCommon.s @@ -247,7 +247,7 @@ glabel Player_UpdateCommon .L808492D0: /* 170C0 808492D0 A2080844 */ sb $t0, 0x0844($s0) ## 00000844 .L808492D4: -/* 170C4 808492D4 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 170C4 808492D4 0C01DE2B */ jal Math_ScaledStepToS /* 170C8 808492D8 24060190 */ addiu $a2, $zero, 0x0190 ## $a2 = 00000190 /* 170CC 808492DC 260403A8 */ addiu $a0, $s0, 0x03A8 ## $a0 = 000003A8 @@ -344,7 +344,7 @@ glabel Player_UpdateCommon .L8084942C: /* 1721C 8084942C 34C63333 */ ori $a2, $a2, 0x3333 ## $a2 = 3EB33333 /* 17220 80849430 A7A7006E */ sh $a3, 0x006E($sp) -/* 17224 80849434 0C01DE80 */ jal Math_ApproxF +/* 17224 80849434 0C01DE80 */ jal Math_StepToF /* 17228 80849438 E7A00070 */ swc1 $f0, 0x0070($sp) /* 1722C 8084943C 87A7006E */ lh $a3, 0x006E($sp) @@ -394,7 +394,7 @@ glabel Player_UpdateCommon /* 172CC 808494DC 00C01025 */ or $v0, $a2, $zero ## $v0 = 00000546 .L808494E0: /* 172D0 808494E0 00023400 */ sll $a2, $v0, 16 -/* 172D4 808494E4 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 172D4 808494E4 0C01DE2B */ jal Math_ScaledStepToS /* 172D8 808494E8 00063403 */ sra $a2, $a2, 16 /* 172DC 808494EC C60C0838 */ lwc1 $f12, 0x0838($s0) ## 00000838 @@ -449,7 +449,7 @@ glabel Player_UpdateCommon /* 17394 808495A4 258C07F4 */ addiu $t4, $t4, %lo(func_808507F4) ## $t4 = 808507F4 /* 17398 808495A8 104C000F */ beq $v0, $t4, .L808495E8 /* 1739C 808495AC 00000000 */ nop -/* 173A0 808495B0 0C01DE1C */ jal Math_Sins +/* 173A0 808495B0 0C01DE1C */ jal Math_SinS ## sins? /* 173A4 808495B4 860408B0 */ lh $a0, 0x08B0($s0) ## 000008B0 /* 173A8 808495B8 C60408AC */ lwc1 $f4, 0x08AC($s0) ## 000008AC @@ -457,7 +457,7 @@ glabel Player_UpdateCommon /* 173B0 808495C0 860408B0 */ lh $a0, 0x08B0($s0) ## 000008B0 /* 173B4 808495C4 46002202 */ mul.s $f8, $f4, $f0 /* 173B8 808495C8 46089180 */ add.s $f6, $f18, $f8 -/* 173BC 808495CC 0C01DE0D */ jal Math_Coss +/* 173BC 808495CC 0C01DE0D */ jal Math_CosS ## coss? /* 173C0 808495D0 E606005C */ swc1 $f6, 0x005C($s0) ## 0000005C /* 173C4 808495D4 C61008AC */ lwc1 $f16, 0x08AC($s0) ## 000008AC @@ -570,7 +570,7 @@ glabel Player_UpdateCommon /* 1754C 8084975C 46100282 */ mul.s $f10, $f0, $f16 /* 17550 80849760 E7A00048 */ swc1 $f0, 0x0048($sp) /* 17554 80849764 44065000 */ mfc1 $a2, $f10 -/* 17558 80849768 0C01DE80 */ jal Math_ApproxF +/* 17558 80849768 0C01DE80 */ jal Math_StepToF /* 1755C 8084976C 00000000 */ nop /* 17560 80849770 8E0C067C */ lw $t4, 0x067C($s0) ## 0000067C @@ -595,7 +595,7 @@ glabel Player_UpdateCommon /* 175A4 808497B4 44069000 */ mfc1 $a2, $f18 /* 175A8 808497B8 00000000 */ nop /* 175AC 808497BC 00063400 */ sll $a2, $a2, 16 -/* 175B0 808497C0 0C01DE2B */ jal Math_ApproxUpdateScaledS +/* 175B0 808497C0 0C01DE2B */ jal Math_ScaledStepToS /* 175B4 808497C4 00063403 */ sra $a2, $a2, 16 /* 175B8 808497C8 10000017 */ beq $zero, $zero, .L80849828 @@ -623,7 +623,7 @@ glabel Player_UpdateCommon /* 17604 80849814 00000000 */ nop /* 17608 80849818 44061000 */ mfc1 $a2, $f2 .L8084981C: -/* 1760C 8084981C 0C01DE80 */ jal Math_ApproxF +/* 1760C 8084981C 0C01DE80 */ jal Math_StepToF /* 17610 80849820 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 17614 80849824 8FA40084 */ lw $a0, 0x0084($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847BA0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847BA0.s index 9da691d679..5fdc3de667 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847BA0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847BA0.s @@ -321,7 +321,7 @@ glabel func_80847BA0 /* 15DC8 80847FD8 44889000 */ mtc1 $t0, $f18 ## $f18 = 0.00 /* 15DCC 80847FDC 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 /* 15DD0 80847FE0 46809320 */ cvt.s.w $f12, $f18 -/* 15DD4 80847FE4 0C034199 */ jal atan2s +/* 15DD4 80847FE4 0C034199 */ jal Math_Atan2S /* 15DD8 80847FE8 468023A0 */ cvt.s.w $f14, $f4 /* 15DDC 80847FEC A602007E */ sh $v0, 0x007E($s0) ## 0000007E @@ -543,7 +543,7 @@ glabel func_80847BA0 /* 16108 80848318 448B9000 */ mtc1 $t3, $f18 ## $f18 = 0.00 /* 1610C 8084831C 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 /* 16110 80848320 46809320 */ cvt.s.w $f12, $f18 -/* 16114 80848324 0C034199 */ jal atan2s +/* 16114 80848324 0C034199 */ jal Math_Atan2S /* 16118 80848328 468023A0 */ cvt.s.w $f14, $f4 /* 1611C 8084832C 860E007E */ lh $t6, 0x007E($s0) ## 0000007E @@ -704,11 +704,11 @@ glabel func_80847BA0 /* 16350 80848560 468042A0 */ cvt.s.w $f10, $f8 /* 16354 80848564 46045482 */ mul.s $f18, $f10, $f4 /* 16358 80848568 E7B20050 */ swc1 $f18, 0x0050($sp) -/* 1635C 8084856C 0C01DE1C */ jal Math_Sins +/* 1635C 8084856C 0C01DE1C */ jal Math_SinS ## sins? /* 16360 80848570 8604083C */ lh $a0, 0x083C($s0) ## 0000083C /* 16364 80848574 E7A0004C */ swc1 $f0, 0x004C($sp) -/* 16368 80848578 0C01DE0D */ jal Math_Coss +/* 16368 80848578 0C01DE0D */ jal Math_CosS ## coss? /* 1636C 8084857C 8604083C */ lh $a0, 0x083C($s0) ## 0000083C /* 16370 80848580 C7A60058 */ lwc1 $f6, 0x0058($sp) @@ -723,7 +723,7 @@ glabel func_80847BA0 /* 16394 808485A4 C7AA0054 */ lwc1 $f10, 0x0054($sp) /* 16398 808485A8 46062201 */ sub.s $f8, $f4, $f6 /* 1639C 808485AC 460A4382 */ mul.s $f14, $f8, $f10 -/* 163A0 808485B0 0C034199 */ jal atan2s +/* 163A0 808485B0 0C034199 */ jal Math_Atan2S /* 163A4 808485B4 00000000 */ nop /* 163A8 808485B8 A6020898 */ sh $v0, 0x0898($s0) ## 00000898 @@ -739,15 +739,15 @@ glabel func_80847BA0 /* 163D0 808485E0 46003207 */ neg.s $f8, $f6 /* 163D4 808485E4 46044181 */ sub.s $f6, $f8, $f4 /* 163D8 808485E8 460A3382 */ mul.s $f14, $f6, $f10 -/* 163DC 808485EC 0C034199 */ jal atan2s +/* 163DC 808485EC 0C034199 */ jal Math_Atan2S /* 163E0 808485F0 00000000 */ nop /* 163E4 808485F4 A602089A */ sh $v0, 0x089A($s0) ## 0000089A -/* 163E8 808485F8 0C01DE1C */ jal Math_Sins +/* 163E8 808485F8 0C01DE1C */ jal Math_SinS ## sins? /* 163EC 808485FC 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 163F0 80848600 E7A0004C */ swc1 $f0, 0x004C($sp) -/* 163F4 80848604 0C01DE0D */ jal Math_Coss +/* 163F4 80848604 0C01DE0D */ jal Math_CosS ## coss? /* 163F8 80848608 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 163FC 8084860C C7B20058 */ lwc1 $f18, 0x0058($sp) @@ -761,7 +761,7 @@ glabel func_80847BA0 /* 1641C 8084862C C7A40054 */ lwc1 $f4, 0x0054($sp) /* 16420 80848630 46123201 */ sub.s $f8, $f6, $f18 /* 16424 80848634 46044382 */ mul.s $f14, $f8, $f4 -/* 16428 80848638 0C034199 */ jal atan2s +/* 16428 80848638 0C034199 */ jal Math_Atan2S /* 1642C 8084863C 00000000 */ nop /* 16430 80848640 3C018085 */ lui $at, %hi(D_80853610) ## $at = 80850000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085002C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085002C.s index 8638a89911..1b33d7ca0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085002C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085002C.s @@ -31,12 +31,12 @@ glabel func_8085002C /* 1DE90 808500A0 012A2023 */ subu $a0, $t1, $t2 /* 1DE94 808500A4 00042400 */ sll $a0, $a0, 16 /* 1DE98 808500A8 00042403 */ sra $a0, $a0, 16 -/* 1DE9C 808500AC 0C01DE0D */ jal Math_Coss +/* 1DE9C 808500AC 0C01DE0D */ jal Math_CosS ## coss? /* 1DEA0 808500B0 A7A40026 */ sh $a0, 0x0026($sp) /* 1DEA4 808500B4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 1DEA8 808500B8 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 1DEAC 808500BC 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 1DEAC 808500BC 0C00CFC8 */ jal Rand_CenteredFloat /* 1DEB0 808500C0 E7A00020 */ swc1 $f0, 0x0020($sp) /* 1DEB4 808500C4 8FA80030 */ lw $t0, 0x0030($sp) @@ -54,12 +54,12 @@ glabel func_8085002C /* 1DEE4 808500F4 46102182 */ mul.s $f6, $f4, $f16 /* 1DEE8 808500F8 4600320D */ trunc.w.s $f8, $f6 /* 1DEEC 808500FC 440E4000 */ mfc1 $t6, $f8 -/* 1DEF0 80850100 0C01DE1C */ jal Math_Sins +/* 1DEF0 80850100 0C01DE1C */ jal Math_SinS ## sins? /* 1DEF4 80850104 A7AE0028 */ sh $t6, 0x0028($sp) /* 1DEF8 80850108 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 1DEFC 8085010C 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 1DF00 80850110 0C00CFC8 */ jal Math_Rand_CenteredFloat +/* 1DF00 80850110 0C00CFC8 */ jal Rand_CenteredFloat /* 1DF04 80850114 E7A00020 */ swc1 $f0, 0x0020($sp) /* 1DF08 80850118 8FAF0030 */ lw $t7, 0x0030($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080F560.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080F560.s index b5e0e2da90..efcd77f2c1 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080F560.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080F560.s @@ -19,13 +19,13 @@ glabel func_8080F560 /* 0B864 8080F5A4 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 0B868 8080F5A8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 0B86C 8080F5AC 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) -/* 0B870 8080F5B0 0C01DE0D */ jal Math_Coss +/* 0B870 8080F5B0 0C01DE0D */ jal Math_CosS ## coss? /* 0B874 8080F5B4 870407AA */ lh $a0, 0x07AA($t8) ## 801607AA /* 0B878 8080F5B8 3C198016 */ lui $t9, %hi(gGameInfo) /* 0B87C 8080F5BC 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 0B880 8080F5C0 E7A00048 */ swc1 $f0, 0x0048($sp) -/* 0B884 8080F5C4 0C01DE1C */ jal Math_Sins +/* 0B884 8080F5C4 0C01DE1C */ jal Math_SinS ## sins? /* 0B888 8080F5C8 872407AA */ lh $a0, 0x07AA($t9) ## 801607AA /* 0B88C 8080F5CC 3C01447A */ lui $at, 0x447A ## $at = 447A0000 @@ -43,13 +43,13 @@ glabel func_8080F560 /* 0B8BC 8080F5FC 00000000 */ nop /* 0B8C0 8080F600 468084A0 */ cvt.s.w $f18, $f16 /* 0B8C4 8080F604 E7B20104 */ swc1 $f18, 0x0104($sp) -/* 0B8C8 8080F608 0C01DE1C */ jal Math_Sins +/* 0B8C8 8080F608 0C01DE1C */ jal Math_SinS ## sins? /* 0B8CC 8080F60C 844407AA */ lh $a0, 0x07AA($v0) ## 801607AA /* 0B8D0 8080F610 3C098016 */ lui $t1, %hi(gGameInfo) /* 0B8D4 8080F614 8D29FA90 */ lw $t1, %lo(gGameInfo)($t1) /* 0B8D8 8080F618 E7A00048 */ swc1 $f0, 0x0048($sp) -/* 0B8DC 8080F61C 0C01DE0D */ jal Math_Coss +/* 0B8DC 8080F61C 0C01DE0D */ jal Math_CosS ## coss? /* 0B8E0 8080F620 852407AA */ lh $a0, 0x07AA($t1) ## 801607AA /* 0B8E4 8080F624 3C01447A */ lui $at, 0x447A ## $at = 447A0000 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808109B8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808109B8.s index 885155fb47..a4ff6135bc 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808109B8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808109B8.s @@ -19,13 +19,13 @@ glabel func_808109B8 /* 0CCBC 808109FC AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 0CCC0 80810A00 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 0CCC4 80810A04 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) -/* 0CCC8 80810A08 0C01DE0D */ jal Math_Coss +/* 0CCC8 80810A08 0C01DE0D */ jal Math_CosS ## coss? /* 0CCCC 80810A0C 870407AA */ lh $a0, 0x07AA($t8) ## 801607AA /* 0CCD0 80810A10 3C198016 */ lui $t9, %hi(gGameInfo) /* 0CCD4 80810A14 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* 0CCD8 80810A18 E7A00040 */ swc1 $f0, 0x0040($sp) -/* 0CCDC 80810A1C 0C01DE1C */ jal Math_Sins +/* 0CCDC 80810A1C 0C01DE1C */ jal Math_SinS ## sins? /* 0CCE0 80810A20 872407AA */ lh $a0, 0x07AA($t9) ## 801607AA /* 0CCE4 80810A24 3C01447A */ lui $at, 0x447A ## $at = 447A0000 @@ -43,13 +43,13 @@ glabel func_808109B8 /* 0CD14 80810A54 00000000 */ nop /* 0CD18 80810A58 468084A0 */ cvt.s.w $f18, $f16 /* 0CD1C 80810A5C E7B20094 */ swc1 $f18, 0x0094($sp) -/* 0CD20 80810A60 0C01DE1C */ jal Math_Sins +/* 0CD20 80810A60 0C01DE1C */ jal Math_SinS ## sins? /* 0CD24 80810A64 844407AA */ lh $a0, 0x07AA($v0) ## 801607AA /* 0CD28 80810A68 3C098016 */ lui $t1, %hi(gGameInfo) /* 0CD2C 80810A6C 8D29FA90 */ lw $t1, %lo(gGameInfo)($t1) /* 0CD30 80810A70 E7A00040 */ swc1 $f0, 0x0040($sp) -/* 0CD34 80810A74 0C01DE0D */ jal Math_Coss +/* 0CD34 80810A74 0C01DE0D */ jal Math_CosS ## coss? /* 0CD38 80810A78 852407AA */ lh $a0, 0x07AA($t1) ## 801607AA /* 0CD3C 80810A7C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 diff --git a/include/functions.h b/include/functions.h index dffd30c864..f115065e57 100644 --- a/include/functions.h +++ b/include/functions.h @@ -490,8 +490,8 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx) void func_80033DB8(GlobalContext* globalCtx, s16 arg1, s16 arg2); void func_80033E1C(GlobalContext* globalCtx, s16 arg1, s16 arg2, s16 arg3); void func_80033E88(Actor* actor, GlobalContext* globalCtx, s16 arg2, s16 arg3); -f32 Math_Rand_ZeroFloat(f32 f); -f32 Math_Rand_CenteredFloat(f32 f); +f32 Rand_ZeroFloat(f32 f); +f32 Rand_CenteredFloat(f32 f); void Actor_DrawDoorLock(GlobalContext* globalCtx, s32 arg1, s32 arg2); void func_8003424C(GlobalContext* globalCtx, Vec3f* arg1); void func_8003426C(Actor* actor, s16 arg1, s16 arg2, s16 arg3, s16 arg4); @@ -963,16 +963,18 @@ void func_800775F0(u16); // ? func_80077600(?); void func_800776E4(GlobalContext* globalCtx); void Lib_MemSet(u8* dest, size_t size, u8 val); -f32 Math_Coss(s16 angle); -f32 Math_Sins(s16 angle); -s32 Math_ApproxUpdateScaledS(s16* pValue, s16 target, s16 step); -s32 Math_ApproxS(s16* pValue, s16 target, s16 step); -s32 Math_ApproxF(f32* pValue, f32 target, f32 step); -s32 func_80077AF8(s16* pValue, s16 target, s16 step); -s32 func_80077B58(s16* pValue, s16 target, s16 step); -s32 func_80077C6C(f32* pValue, f32 target, f32 incrStep, f32 decrStep); +f32 Math_CosS(s16 angle); +f32 Math_SinS(s16 angle); +s32 Math_ScaledStepToS(s16* pValue, s16 target, s16 step); +s32 Math_StepToS(s16* pValue, s16 target, s16 step); +s32 Math_StepToF(f32* pValue, f32 target, f32 step); +s32 Math_StepUntilAngleS(s16* pValue, s16 limit, s16 step); +s32 Math_StepUntilS(s16* pValue, s16 limit, s16 step); +s32 Math_StepToAngleS(s16* pValue, s16 target, s16 step); +s32 Math_StepUntilF(f32* pValue, f32 limit, f32 step); +s32 Math_AymStepToF(f32* pValue, f32 target, f32 incrStep, f32 decrStep); void func_80077D10(f32* arg0, s16* arg1, Input* input); -s16 Math_Rand_S16Offset(s16 base, s16 range); +s16 Rand_S16Offset(s16 base, s16 range); void Math_Vec3f_Copy(Vec3f* dest, Vec3f* src); void Math_Vec3s_ToVec3f(Vec3f* dest, Vec3s* src); void Math_Vec3f_Sum(Vec3f* a, Vec3f* b, Vec3f* dest); @@ -985,11 +987,12 @@ f32 Math_Vec3f_DistXZ(Vec3f* a, Vec3f* b); s16 Math_Vec3f_Yaw(Vec3f* a, Vec3f* b); s16 Math_Vec3f_Pitch(Vec3f* a, Vec3f* b); void Actor_ProcessInitChain(Actor* actor, InitChainEntry* initChain); -f32 Math_SmoothScaleMaxMinF(f32* pValue, f32 target, f32 scale, f32 maxStep, f32 minStep); -void Math_SmoothScaleMaxF(f32* pValue, f32 target, f32 scale, f32 maxStep); -void Math_SmoothDownscaleMaxF(f32* pValue, f32 scale, f32 maxStep); -s16 Math_SmoothScaleMaxMinS(s16* pValue, s16 target, s16 invScale, s16 maxStep, s16 minStep); -void Math_SmoothScaleMaxS(s16* pValue, s16 target, s16 invScale, s16 maxStep); +f32 Math_SmoothStepToF(f32* pValue, f32 target, f32 fraction, f32 step, f32 minStep); +void Math_ApproachF(f32* pValue, f32 target, f32 fraction, f32 step); +void Math_ApproachZeroF(f32* pValue, f32 fraction, f32 step); +f32 Math_SmoothStepToDegF(f32* pValue, f32 target, f32 fraction, f32 step, f32 minStep); +s16 Math_SmoothStepToS(s16* pValue, s16 target, s16 scale, s16 step, s16 minStep); +void Math_ApproachS(s16* pValue, s16 target, s16 scale, s16 step); void Color_RGBA8_Copy(Color_RGBA8* dst, Color_RGBA8* src); void func_80078884(u16 sfxId); void func_800788CC(u16 sfxId); @@ -1715,8 +1718,11 @@ void SpeedMeter_DrawAllocEntries(SpeedMeter* meter, GraphicsContext* gfxCtx, Gam void SysCfb_Init(s32 n64dd); u32 SysCfb_GetFbPtr(s32 idx); u32 SysCfb_GetFbEnd(); -f32 func_800CA720(f32); -f32 func_800CA774(f32); +f32 Math_FactorialF(f32 n); +f32 Math_Factorial(s32 n); +f32 Math_PowF(f32 base, s32 exp); +f32 Math_SinF(f32 angle); +f32 Math_CosF(f32 angle); s32 Math3D_PlaneVsLineSegClosestPoint(f32 planeAA, f32 planeAB, f32 planeAC, f32 planeADist, f32 planeBA, f32 planeBB, f32 planeBC, f32 planeBDist, Vec3f* linePointA, Vec3f* linePointB, Vec3f* closestPoint); @@ -1784,8 +1790,8 @@ s32 Math3D_XYInSphere(Sphere16* sphere, f32 x, f32 y); s32 Math3D_YZInSphere(Sphere16* sphere, f32 y, f32 z); void Math3D_DrawSphere(GlobalContext* globalCtx, Sphere16* sph); void Math3D_DrawCylinder(GlobalContext* globalCtx, Cylinder16* cyl); -s16 atan2s(f32 x, f32 y); -f32 atan2f(f32 x, f32 y); +s16 Math_Atan2S(f32 x, f32 y); +f32 Math_Atan2F(f32 x, f32 y); void Matrix_Init(GameState* gameState); void Matrix_Push(void); void Matrix_Pull(void); @@ -2350,15 +2356,16 @@ s8 PadUtils_GetRelX(Input* input); s8 PadUtils_GetRelY(Input* input); void PadUtils_UpdateRelXY(Input* input); s32 PadSetup_Init(OSMesgQueue* mq, u8* outMask, OSContStatus* status); -f32 Math_tanf(f32 x); -f32 Math_nearbyintf(f32 x); -f32 Math_atanf_taylor_q(f32 x); -f32 Math_atanf_taylor(f32 x); -f32 Math_atanf_cfrac(f32 x); -f32 Math_atanf(f32 x); -f32 Math_atan2f(f32 y, f32 x); -f32 Math_asinf(f32 x); -f32 Math_acosf(f32 x); +f32 Math_FTanF(f32 x); +f32 Math_FFloorF(f32 x); +f32 Math_FCeilF(f32 x); +f32 Math_FRoundF(f32 x); +f32 Math_FNearbyIntF(f32 x); +f32 Math_FTruncF(f32 x); +f32 Math_FAtanF(f32 x); +f32 Math_FAtan2F(f32 y, f32 x); +f32 Math_FAsinF(f32 x); +f32 Math_FAcosF(f32 x); f32 ceilf(f32 x); f32 truncf(f32 x); f32 roundf(f32 x); @@ -2379,14 +2386,14 @@ void SystemArena_Check(); void SystemArena_Init(void* start, u32 size); void SystemArena_Cleanup(); u8 SystemArena_IsInitalized(); -u32 Math_Rand_Next(void); -void Math_Rand_Seed(u32 seed); -f32 Math_Rand_ZeroOne(void); -f32 Math_Rand_Centered(void); -void Math_Rand_Seed_Variable(u32* rndNum, u32 seed); -u32 Math_Rand_Next_Variable(u32* rndNum); -f32 Math_Rand_ZeroOne_Variable(u32* rndNum); -f32 Math_Rand_Centered_Variable(u32* rndNum); +u32 Rand_Next(void); +void Rand_Seed(u32 seed); +f32 Rand_ZeroOne(void); +f32 Rand_Centered(void); +void Rand_Seed_Variable(u32* rndNum, u32 seed); +u32 Rand_Next_Variable(u32* rndNum); +f32 Rand_ZeroOne_Variable(u32* rndNum); +f32 Rand_Centered_Variable(u32* rndNum); bool ArenaImpl_GetFillAllocBlock(Arena* arena); bool ArenaImpl_GetFillFreeBlock(Arena* arena); bool ArenaImpl_GetCheckFreeBlock(Arena* arena); diff --git a/src/code/code_800FCE80.c b/src/code/code_800FCE80.c index 2acf1ed022..d81d4f91b9 100644 --- a/src/code/code_800FCE80.c +++ b/src/code/code_800FCE80.c @@ -1,38 +1,38 @@ #include "global.h" #include "fp.h" -s32 use_cfrac; +s32 gUseAtanContFrac; -f32 Math_tanf(f32 x) { +f32 Math_FTanF(f32 x) { f32 sin = sinf(x); f32 cos = cosf(x); return sin / cos; } -f32 Math_floorf(f32 x) { +f32 Math_FFloorF(f32 x) { return floorf(x); } -f32 Math_ceilf(f32 x) { +f32 Math_FCeilF(f32 x) { return ceilf(x); } -f32 Math_roundf(f32 x) { +f32 Math_FRoundF(f32 x) { return roundf(x); } -f32 Math_truncf(f32 x) { +f32 Math_FTruncF(f32 x) { return truncf(x); } -f32 Math_nearbyintf(f32 x) { +f32 Math_FNearbyIntF(f32 x) { return nearbyintf(x); } /* Arctangent approximation using a Taylor series (one quadrant) */ -f32 Math_atanf_taylor_q(f32 x) { +f32 Math_FAtanTaylorQF(f32 x) { static const f32 coeffs[] = { - -1.f / 3, +1.f / 5, -1.f / 7, +1.f / 9, -1.f / 11, +1.f / 13, -1.f / 15, +1.f / 17, 0.f, + -1.0f / 3, +1.0f / 5, -1.0f / 7, +1.0f / 9, -1.0f / 11, +1.0f / 13, -1.0f / 15, +1.0f / 17, 0.0f, }; f32 poly = x; @@ -54,31 +54,31 @@ f32 Math_atanf_taylor_q(f32 x) { } /* Ditto for two quadrants */ -f32 Math_atanf_taylor(f32 x) { +f32 Math_FAtanTaylorF(f32 x) { f32 t; f32 q; - if (x > 0.f) { + if (x > 0.0f) { t = x; - } else if (x < 0.f) { + } else if (x < 0.0f) { t = -x; - } else if (x == 0.f) { - return 0.f; + } else if (x == 0.0f) { + return 0.0f; } else { return qNaN0x10000; } - if (t <= M_SQRT2 - 1.f) { - return Math_atanf_taylor_q(x); + if (t <= M_SQRT2 - 1.0f) { + return Math_FAtanTaylorQF(x); } - if (t >= M_SQRT2 + 1.f) { - q = M_PI / 2 - Math_atanf_taylor_q(1.f / t); + if (t >= M_SQRT2 + 1.0f) { + q = M_PI / 2 - Math_FAtanTaylorQF(1.0f / t); } else { - q = M_PI / 4 - Math_atanf_taylor_q((1.f - t) / (1.f + t)); + q = M_PI / 4 - Math_FAtanTaylorQF((1.0f - t) / (1.0f + t)); } - if (x > 0.f) { + if (x > 0.0f) { return q; } else { return -q; @@ -86,33 +86,33 @@ f32 Math_atanf_taylor(f32 x) { } /* Arctangent approximation using a continued fraction */ -f32 Math_atanf_cfrac(f32 x) { +f32 Math_FAtanContFracF(f32 x) { s32 sector; f32 z; f32 conv; f32 sq; s32 i; - if (x >= -1.f && x <= 1.f) { + if (x >= -1.0f && x <= 1.0f) { sector = 0; - } else if (x > 1.f) { + } else if (x > 1.0f) { sector = 1; - x = 1.f / x; - } else if (x < -1.f) { + x = 1.0f / x; + } else if (x < -1.0f) { sector = -1; - x = 1.f / x; + x = 1.0f / x; } else { return qNaN0x10000; } sq = SQ(x); - conv = 0.f; - z = 8.f; + conv = 0.0f; + z = 8.0f; for (i = 8; i != 0; i--) { - conv = SQ(z) * sq / (2.f * z + 1.f + conv); - z -= 1.f; + conv = SQ(z) * sq / (2.0f * z + 1.0f + conv); + z -= 1.0f; } - conv = x / (1.f + conv); + conv = x / (1.0f + conv); if (sector == 0) { return conv; @@ -123,38 +123,38 @@ f32 Math_atanf_cfrac(f32 x) { } } -f32 Math_atanf(f32 x) { - if (use_cfrac == 0) { - return Math_atanf_taylor(x); +f32 Math_FAtanF(f32 x) { + if (!gUseAtanContFrac) { + return Math_FAtanTaylorF(x); } else { - return Math_atanf_cfrac(x); + return Math_FAtanContFracF(x); } } -f32 Math_atan2f(f32 y, f32 x) { - if (x == 0.f) { - if (y == 0.f) { - return 0.f; - } else if (y > 0.f) { +f32 Math_FAtan2F(f32 y, f32 x) { + if (x == 0.0f) { + if (y == 0.0f) { + return 0.0f; + } else if (y > 0.0f) { return M_PI / 2; - } else if (y < 0.f) { + } else if (y < 0.0f) { return -M_PI / 2; } else { return qNaN0x10000; } - } else if (x >= 0.f) { - return Math_atanf(y / x); - } else if (y < 0.f) { - return Math_atanf(y / x) - M_PI; + } else if (x >= 0.0f) { + return Math_FAtanF(y / x); + } else if (y < 0.0f) { + return Math_FAtanF(y / x) - M_PI; } else { - return M_PI - Math_atanf(-(y / x)); + return M_PI - Math_FAtanF(-(y / x)); } } -f32 Math_asinf(f32 x) { - return Math_atan2f(x, sqrtf(1.f - SQ(x))); +f32 Math_FAsinF(f32 x) { + return Math_FAtan2F(x, sqrtf(1.0f - SQ(x))); } -f32 Math_acosf(f32 x) { - return M_PI / 2 - Math_asinf(x); +f32 Math_FAcosF(f32 x) { + return M_PI / 2 - Math_FAsinF(x); } diff --git a/src/code/code_800FD970.c b/src/code/code_800FD970.c index 04d5f81188..7478bfe0bb 100644 --- a/src/code/code_800FD970.c +++ b/src/code/code_800FD970.c @@ -9,14 +9,14 @@ static u32 sRandFloat; /** * Gets the next integer in the sequence of pseudo-random numbers. */ -u32 Math_Rand_Next(void) { +u32 Rand_Next(void) { return sRandInt = (sRandInt * 1664525) + 1013904223; } /** * Seeds the pseudo-random number generator by providing a starting value. */ -void Math_Rand_Seed(u32 seed) { +void Rand_Seed(u32 seed) { sRandInt = seed; } @@ -25,7 +25,7 @@ void Math_Rand_Seed(u32 seed) { * the next integer and masking it to an IEEE-754 compliant floating-point number * between 1.0f and 2.0f, returning the result subtract 1.0f. */ -f32 Math_Rand_ZeroOne(void) { +f32 Rand_ZeroOne(void) { sRandInt = (sRandInt * 1664525) + 1013904223; sRandFloat = ((sRandInt >> 9) | 0x3F800000); return *((f32*)&sRandFloat) - 1.0f; @@ -33,9 +33,9 @@ f32 Math_Rand_ZeroOne(void) { /** * Returns a pseudo-random floating-point number between -0.5f and 0.5f by the same - * manner in which Math_Rand_ZeroOne generates its result. + * manner in which Rand_ZeroOne generates its result. */ -f32 Math_Rand_Centered(void) { +f32 Rand_Centered(void) { sRandInt = (sRandInt * 1664525) + 1013904223; sRandFloat = ((sRandInt >> 9) | 0x3F800000); return *((f32*)&sRandFloat) - 1.5f; @@ -44,14 +44,14 @@ f32 Math_Rand_Centered(void) { /** * Seeds a pseudo-random number at rndNum with a provided seed. */ -void Math_Rand_Seed_Variable(u32* rndNum, u32 seed) { +void Rand_Seed_Variable(u32* rndNum, u32 seed) { *rndNum = seed; } /** * Generates the next pseudo-random integer from the provided rndNum. */ -u32 Math_Rand_Next_Variable(u32* rndNum) { +u32 Rand_Next_Variable(u32* rndNum) { return *rndNum = (*rndNum * 1664525) + 1013904223; } @@ -59,7 +59,7 @@ u32 Math_Rand_Next_Variable(u32* rndNum) { * Generates the next pseudo-random floating-point number between 0.0f and * 1.0f from the provided rndNum. */ -f32 Math_Rand_ZeroOne_Variable(u32* rndNum) { +f32 Rand_ZeroOne_Variable(u32* rndNum) { u32 next; next = (*rndNum * 1664525) + 1013904223; @@ -73,7 +73,7 @@ f32 Math_Rand_ZeroOne_Variable(u32* rndNum) { * Generates the next pseudo-random floating-point number between -0.5f and * 0.5f from the provided rndNum. */ -f32 Math_Rand_Centered_Variable(u32* rndNum) { +f32 Rand_Centered_Variable(u32* rndNum) { u32 next; next = (*rndNum * 1664525) + 1013904223; diff --git a/src/code/sys_math.c b/src/code/sys_math.c index 87a1eacd8c..c72d8cbee6 100644 --- a/src/code/sys_math.c +++ b/src/code/sys_math.c @@ -3,42 +3,45 @@ f32 sFactorialTbl[] = { 1.0f, 1.0f, 2.0f, 6.0f, 24.0f, 120.0f, 720.0f, 5040.0f, 40320.0f, 362880.0f, 3628800.0f, 39916800.0f, 479001600.0f }; -f32 func_800CA540(f32 arg0) { +f32 Math_FactorialF(f32 n) { f32 ret = 1.0f; s32 i; - for (i = arg0; i > 1; i--) { + + for (i = n; i > 1; i--) { ret *= i; } return ret; } -f32 func_800CA63C(u32 arg0) { +f32 Math_Factorial(s32 n) { f32 ret; s32 i; - if (arg0 > 12) { + + if (n > 12U) { ret = sFactorialTbl[12]; - for (i = 13; i <= (s32)arg0; i++) { + for (i = 13; i <= n; i++) { ret *= i; } } else { - ret = sFactorialTbl[arg0]; + ret = sFactorialTbl[n]; } return ret; } -f32 func_800CA6FC(f32 arg0, s32 arg1) { +f32 Math_PowF(f32 base, s32 exp) { f32 ret = 1.0f; - while (arg1 > 0) { - arg1--; - ret *= arg0; + + while (exp > 0) { + exp--; + ret *= base; } return ret; } -f32 func_800CA720(f32 arg0) { - return sins((s16)(arg0 * (32767.0f / M_PI))) * SHT_MINV; +f32 Math_SinF(f32 angle) { + return sins((s16)(angle * (32767.0f / M_PI))) * SHT_MINV; } -f32 func_800CA774(f32 arg0) { - return coss((s16)(arg0 * (32767.0f / M_PI))) * SHT_MINV; +f32 Math_CosF(f32 angle) { + return coss((s16)(angle * (32767.0f / M_PI))) * SHT_MINV; } diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index 4a0006c327..04a7fa8643 100644 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -870,8 +870,8 @@ s32 Math3D_LineVsCubeShort(Vec3s* min, Vec3s* max, Vec3s* a, Vec3s* b) { * outputs the plane equation `a``pointOnPlane->x` + 0y + `c``pointOnPlane->z`+`d` = 0 */ void Math3D_RotateXZPlane(Vec3f* pointOnPlane, s16 angle, f32* a, f32* c, f32* d) { - *a = Math_Sins(angle) * 32767.0f; - *c = Math_Coss(angle) * 32767.0f; + *a = Math_SinS(angle) * 32767.0f; + *c = Math_CosS(angle) * 32767.0f; *d = -((*a * pointOnPlane->x) + (*c * pointOnPlane->z)); } diff --git a/src/code/sys_math_atan.c b/src/code/sys_math_atan.c index b468818c81..d2f1b34670 100644 --- a/src/code/sys_math_atan.c +++ b/src/code/sys_math_atan.c @@ -1,6 +1,6 @@ #include "global.h" -u16 sATan2Tbl[] = { +static u16 sATan2Tbl[] = { 0x0000, 0x000A, 0x0014, 0x001F, 0x0029, 0x0033, 0x003D, 0x0047, 0x0051, 0x005C, 0x0066, 0x0070, 0x007A, 0x0084, 0x008F, 0x0099, 0x00A3, 0x00AD, 0x00B7, 0x00C2, 0x00CC, 0x00D6, 0x00E0, 0x00EA, 0x00F4, 0x00FF, 0x0109, 0x0113, 0x011D, 0x0127, 0x0131, 0x013C, 0x0146, 0x0150, 0x015A, 0x0164, 0x016F, 0x0179, 0x0183, 0x018D, 0x0197, 0x01A1, @@ -77,7 +77,7 @@ u16 sATan2Tbl[] = { 0x1FF6, 0x1FFB, 0x2000, }; -u16 GetAtan2Tbl(f32 x, f32 y) { +u16 Math_GetAtan2Tbl(f32 x, f32 y) { s32 tblIdx; u16 ret; @@ -93,41 +93,41 @@ u16 GetAtan2Tbl(f32 x, f32 y) { return ret; } -s16 atan2s(f32 x, f32 y) { +s16 Math_Atan2S(f32 x, f32 y) { s32 ret; if (y >= 0.0f) { if (x >= 0.0f) { if (y <= x) { - ret = GetAtan2Tbl(y, x); + ret = Math_GetAtan2Tbl(y, x); } else { - ret = 0x4000 - GetAtan2Tbl(x, y); + ret = 0x4000 - Math_GetAtan2Tbl(x, y); } } else { if (-x < y) { - ret = GetAtan2Tbl(-x, y) + 0x4000; + ret = Math_GetAtan2Tbl(-x, y) + 0x4000; } else { - ret = 0x8000 - GetAtan2Tbl(y, -x); + ret = 0x8000 - Math_GetAtan2Tbl(y, -x); } } } else { if (x < 0.0f) { if (-y <= -x) { - ret = GetAtan2Tbl(-y, -x) + 0x8000; + ret = Math_GetAtan2Tbl(-y, -x) + 0x8000; } else { - ret = 0xC000 - GetAtan2Tbl(-x, -y); + ret = 0xC000 - Math_GetAtan2Tbl(-x, -y); } } else { if (x < -y) { - ret = GetAtan2Tbl(x, -y) + 0xC000; + ret = Math_GetAtan2Tbl(x, -y) + 0xC000; } else { - ret = -GetAtan2Tbl(-y, x); + ret = -Math_GetAtan2Tbl(-y, x); } } } return ret; } -f32 atan2f(f32 x, f32 y) { - return atan2s(x, y) * (M_PI / 32768.0f); +f32 Math_Atan2F(f32 x, f32 y) { + return Math_Atan2S(x, y) * (M_PI / 32768.0f); } diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index ab800b5bf0..0ce2e74c28 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -308,8 +308,8 @@ void Matrix_RotateRPY(s16 x, s16 y, s16 z, u8 mode) { f32 cos; if (mode == MTXMODE_APPLY) { - sin = Math_Sins(z); - cos = Math_Coss(z); + sin = Math_SinS(z); + cos = Math_CosS(z); temp1 = cmf->xx; temp2 = cmf->yx; @@ -332,8 +332,8 @@ void Matrix_RotateRPY(s16 x, s16 y, s16 z, u8 mode) { cmf->yw = temp2 * cos - temp1 * sin; if (y != 0) { - sin = Math_Sins(y); - cos = Math_Coss(y); + sin = Math_SinS(y); + cos = Math_CosS(y); temp1 = cmf->xx; temp2 = cmf->zx; @@ -357,8 +357,8 @@ void Matrix_RotateRPY(s16 x, s16 y, s16 z, u8 mode) { } if (x != 0) { - sin = Math_Sins(x); - cos = Math_Coss(x); + sin = Math_SinS(x); + cos = Math_CosS(x); temp1 = cmf->yx; temp2 = cmf->zx; @@ -395,8 +395,8 @@ void Matrix_JointPosition(Vec3f* position, Vec3s* rotation) { f32 temp1; f32 temp2; - sin = Math_Sins(rotation->z); - cos = Math_Coss(rotation->z); + sin = Math_SinS(rotation->z); + cos = Math_CosS(rotation->z); temp1 = cmf->xx; temp2 = cmf->yx; @@ -423,8 +423,8 @@ void Matrix_JointPosition(Vec3f* position, Vec3s* rotation) { cmf->yw = temp2 * cos - temp1 * sin; if (rotation->y != 0) { - sin = Math_Sins(rotation->y); - cos = Math_Coss(rotation->y); + sin = Math_SinS(rotation->y); + cos = Math_CosS(rotation->y); temp1 = cmf->xx; temp2 = cmf->zx; @@ -448,8 +448,8 @@ void Matrix_JointPosition(Vec3f* position, Vec3s* rotation) { } if (rotation->x != 0) { - sin = Math_Sins(rotation->x); - cos = Math_Coss(rotation->x); + sin = Math_SinS(rotation->x); + cos = Math_CosS(rotation->x); temp1 = cmf->yx; temp2 = cmf->zx; @@ -480,8 +480,8 @@ void func_800D1694(f32 x, f32 y, f32 z, Vec3s* vec) { f32 sp28; f32 sp24; - sp30 = Math_Sins(vec->y); - sp2C = Math_Coss(vec->y); + sp30 = Math_SinS(vec->y); + sp2C = Math_CosS(vec->y); cmf->xx = sp2C; cmf->xz = -sp30; @@ -494,8 +494,8 @@ void func_800D1694(f32 x, f32 y, f32 z, Vec3s* vec) { cmf->ww = 1.0f; if (vec->x != 0) { - sp24 = Math_Sins(vec->x); - sp28 = Math_Coss(vec->x); + sp24 = Math_SinS(vec->x); + sp28 = Math_CosS(vec->x); cmf->zz = sp2C * sp28; cmf->yz = sp2C * sp24; @@ -513,8 +513,8 @@ void func_800D1694(f32 x, f32 y, f32 z, Vec3s* vec) { } if (vec->z != 0) { - sp24 = Math_Sins(vec->z); - sp28 = Math_Coss(vec->z); + sp24 = Math_SinS(vec->z); + sp28 = Math_CosS(vec->z); sp30 = cmf->xx; sp2C = cmf->yx; @@ -752,17 +752,17 @@ void func_800D20CC(MtxF* mf, Vec3s* vec, s32 flag) { temp = mf->zx; temp *= temp; temp += SQ(mf->zz); - vec->x = Math_atan2f(-mf->zy, sqrtf(temp)) * (32768 / M_PI); + vec->x = Math_FAtan2F(-mf->zy, sqrtf(temp)) * (32768 / M_PI); if ((vec->x == 0x4000) || (vec->x == -0x4000)) { vec->z = 0; - vec->y = Math_atan2f(-mf->xz, mf->xx) * (32768 / M_PI); + vec->y = Math_FAtan2F(-mf->xz, mf->xx) * (32768 / M_PI); } else { - vec->y = Math_atan2f(mf->zx, mf->zz) * (32768 / M_PI); + vec->y = Math_FAtan2F(mf->zx, mf->zz) * (32768 / M_PI); if (!flag) { - vec->z = Math_atan2f(mf->xy, mf->yy) * (32768 / M_PI); + vec->z = Math_FAtan2F(mf->xy, mf->yy) * (32768 / M_PI); } else { temp = mf->xx; temp4 = mf->xz; @@ -783,7 +783,7 @@ void func_800D20CC(MtxF* mf, Vec3s* vec, s32 flag) { temp2 = sqrtf(temp2); temp2 = temp3 / temp2; - vec->z = Math_atan2f(temp, temp2) * (32768 / M_PI); + vec->z = Math_FAtan2F(temp, temp2) * (32768 / M_PI); } } } @@ -800,18 +800,18 @@ void func_800D2264(MtxF* mf, Vec3s* vec, s32 flag) { temp = mf->xx; temp *= temp; temp += SQ(mf->xy); - vec->y = Math_atan2f(-mf->xz, sqrtf(temp)) * (32768 / M_PI); + vec->y = Math_FAtan2F(-mf->xz, sqrtf(temp)) * (32768 / M_PI); if ((vec->y == 0x4000) || (vec->y == -0x4000)) { vec->x = 0; - vec->z = Math_atan2f(-mf->yx, mf->yy) * (32768 / M_PI); + vec->z = Math_FAtan2F(-mf->yx, mf->yy) * (32768 / M_PI); return; } - vec->z = Math_atan2f(mf->xy, mf->xx) * (32768 / M_PI); + vec->z = Math_FAtan2F(mf->xy, mf->xx) * (32768 / M_PI); if (!flag) { - vec->x = Math_atan2f(mf->yz, mf->zz) * (32768 / M_PI); + vec->x = Math_FAtan2F(mf->yz, mf->zz) * (32768 / M_PI); } else { temp = mf->yx; temp *= temp; @@ -827,7 +827,7 @@ void func_800D2264(MtxF* mf, Vec3s* vec, s32 flag) { temp2 = sqrtf(temp2); temp2 = mf->zz / temp2; - vec->x = Math_atan2f(temp, temp2) * (32768 / M_PI); + vec->x = Math_FAtan2F(temp, temp2) * (32768 / M_PI); } } #else diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 42c96d473e..331837e714 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -28,7 +28,7 @@ void func_8002B200(Actor* actor, Lights* lights, GlobalContext* globalCtx, Gfx* COMBINED); temp1 = (temp1 < 0.0f) ? 0.0f : ((temp1 > 150.0f) ? 150.0f : temp1); - temp2 = 1.0f - (temp1 * (1.f / 350)); + temp2 = 1.0f - (temp1 * (1.0f / 350)); if (color != NULL) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, color->r, color->g, color->b, @@ -44,7 +44,7 @@ void func_8002B200(Actor* actor, Lights* lights, GlobalContext* globalCtx, Gfx* Matrix_RotateY(actor->shape.rot.y * (M_PI / 32768), MTXMODE_APPLY); } - temp2 = (1.0f - (temp1 * (1.f / 350))) * actor->shape.unk_10; + temp2 = (1.0f - (temp1 * (1.0f / 350))) * actor->shape.unk_10; Matrix_Scale(actor->scale.x * temp2, 1.0f, actor->scale.z * temp2, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 1588), @@ -80,7 +80,7 @@ void func_8002B66C(GlobalContext* globalCtx, Light* light, MtxF* arg2, s32 arg3, gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0, 0, 0, (u32)(((arg3 * 0.00005f) > 1.0f ? 1.0f : (arg3 * 0.00005f)) * arg4) & 0xFF); - sp58 = Math_atan2f(light->l.dir[0], light->l.dir[2]); + sp58 = Math_FAtan2F(light->l.dir[0], light->l.dir[2]); arg6 *= (4.5f - (light->l.dir[1] * 0.035f)); arg6 = (arg6 < 1.0f) ? 1.0f : arg6; Matrix_Put(arg2); @@ -463,7 +463,7 @@ void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, Gl unkActor = &player->actor; } - if (Math_ApproxF(&targetCtx->unk_40, 0.0f, 0.25f) == 0) { + if (Math_StepToF(&targetCtx->unk_40, 0.0f, 0.25f) == 0) { temp1 = 0.25f / targetCtx->unk_40; temp2 = unkActor->posRot.pos.x - targetCtx->naviRefPos.x; temp3 = (unkActor->posRot.pos.y + (unkActor->unk_4C * unkActor->scale.y)) - targetCtx->naviRefPos.y; @@ -502,7 +502,7 @@ void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, Gl if (targetCtx->unk_4B == 0) { temp5 = (500.0f - targetCtx->unk_44) * 3.0f; temp6 = (temp5 < 30.0f) ? 30.0f : ((100.0f < temp5) ? 100.0f : temp5); - if (Math_ApproxF(&targetCtx->unk_44, 80.0f, temp6) != 0) { + if (Math_StepToF(&targetCtx->unk_44, 80.0f, temp6) != 0) { targetCtx->unk_4B++; } } else { @@ -511,7 +511,7 @@ void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, Gl } } else { targetCtx->targetedActor = NULL; - Math_ApproxF(&targetCtx->unk_44, 500.0f, 80.0f); + Math_StepToF(&targetCtx->unk_44, 500.0f, 80.0f); } } @@ -697,11 +697,11 @@ void TitleCard_InitPlaceName(GlobalContext* globalCtx, TitleCardContext* titleCt void TitleCard_Update(GlobalContext* globalCtx, TitleCardContext* titleCtx) { if (DECR(titleCtx->delayB) == 0) { if (DECR(titleCtx->delayA) == 0) { - Math_ApproxS(&titleCtx->unk_C, 0, 30); - Math_ApproxS(&titleCtx->unk_E, 0, 70); + Math_StepToS(&titleCtx->unk_C, 0, 30); + Math_StepToS(&titleCtx->unk_E, 0, 70); } else { - Math_ApproxS(&titleCtx->unk_C, 255, 10); - Math_ApproxS(&titleCtx->unk_E, 255, 20); + Math_StepToS(&titleCtx->unk_C, 255, 10); + Math_StepToS(&titleCtx->unk_E, 255, 20); } } } @@ -853,8 +853,8 @@ void func_8002D7EC(Actor* actor) { } void func_8002D868(Actor* actor) { - actor->velocity.x = Math_Sins(actor->posRot.rot.y) * actor->speedXZ; - actor->velocity.z = Math_Coss(actor->posRot.rot.y) * actor->speedXZ; + actor->velocity.x = Math_SinS(actor->posRot.rot.y) * actor->speedXZ; + actor->velocity.z = Math_CosS(actor->posRot.rot.y) * actor->speedXZ; actor->velocity.y += actor->gravity; if (actor->velocity.y < actor->minVelocityY) { @@ -868,10 +868,10 @@ void Actor_MoveForward(Actor* actor) { } void func_8002D908(Actor* actor) { - f32 sp24 = Math_Coss(actor->posRot.rot.x) * actor->speedXZ; - actor->velocity.x = Math_Sins(actor->posRot.rot.y) * sp24; - actor->velocity.y = Math_Sins(actor->posRot.rot.x) * actor->speedXZ; - actor->velocity.z = Math_Coss(actor->posRot.rot.y) * sp24; + f32 sp24 = Math_CosS(actor->posRot.rot.x) * actor->speedXZ; + actor->velocity.x = Math_SinS(actor->posRot.rot.y) * sp24; + actor->velocity.y = Math_SinS(actor->posRot.rot.x) * actor->speedXZ; + actor->velocity.z = Math_CosS(actor->posRot.rot.y) * sp24; } void func_8002D97C(Actor* actor) { @@ -880,8 +880,8 @@ void func_8002D97C(Actor* actor) { } void func_8002D9A4(Actor* actor, f32 arg1) { - actor->speedXZ = Math_Coss(actor->posRot.rot.x) * arg1; - actor->velocity.y = -Math_Sins(actor->posRot.rot.x) * arg1; + actor->speedXZ = Math_CosS(actor->posRot.rot.x) * arg1; + actor->velocity.y = -Math_SinS(actor->posRot.rot.x) * arg1; } void func_8002D9F8(Actor* actor, SkelAnime* skelAnime) { @@ -938,8 +938,8 @@ void func_8002DBD0(Actor* actor, Vec3f* result, Vec3f* arg2) { f32 deltaX; f32 deltaZ; - cosRot2Y = Math_Coss(actor->shape.rot.y); - sinRot2Y = Math_Sins(actor->shape.rot.y); + cosRot2Y = Math_CosS(actor->shape.rot.y); + sinRot2Y = Math_SinS(actor->shape.rot.y); deltaX = arg2->x - actor->posRot.pos.x; deltaZ = arg2->z - actor->posRot.pos.z; @@ -1223,7 +1223,7 @@ void func_8002E4B4(GlobalContext* globalCtx, Actor* actor, f32 arg2, f32 arg3, f &actor->wallPoly, &sp60, actor, arg2))) { sp5C = actor->wallPoly; Math_Vec3f_Copy(&actor->posRot.pos, &sp64); - actor->wallPolyRot = atan2s(sp5C->norm.z, sp5C->norm.x); + actor->wallPolyRot = Math_Atan2S(sp5C->norm.z, sp5C->norm.x); actor->bgCheckFlags |= 8; actor->wallPolySource = sp60; } else { @@ -1829,7 +1829,7 @@ void func_8002FBAC(GlobalContext* globalCtx) { sp9C = (1.0f / D_8015BC18) * temp_ret; phi_f14 = 20.0f / sp9C; phi_f14 = (phi_f14 < 0.05f) ? 0.05f : phi_f14; - Math_ApproxF(&D_8015BC18, 0.0f, phi_f14); + Math_StepToF(&D_8015BC18, 0.0f, phi_f14); temp_f2 = ((D_8015BC18 / spC0) * temp_ret) / temp_ret; gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x = gSaveContext.respawn[RESPAWN_MODE_DOWN].pos.x + (spB4.x * temp_f2); @@ -1843,9 +1843,9 @@ void func_8002FBAC(GlobalContext* globalCtx) { osSyncPrintf("-------- DISPLAY Y=%f\n", spD8); } - spA4.x = Math_Rand_CenteredFloat(6.0f) + gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x; - spA4.y = Math_Rand_ZeroOne() * 6.0f + gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y + 80.0f; - spA4.z = Math_Rand_CenteredFloat(6.0f) + gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z; + spA4.x = Rand_CenteredFloat(6.0f) + gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x; + spA4.y = Rand_ZeroOne() * 6.0f + gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y + 80.0f; + spA4.z = Rand_CenteredFloat(6.0f) + gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z; EffectSsKiraKira_SpawnDispersed(globalCtx, &spA4, &D_80116048, &D_80116054, &D_80116060, &D_80116064, 1000, 16); @@ -3011,7 +3011,7 @@ void func_80032C7C(GlobalContext* globalCtx, Actor* actor) { s16 func_80032CB4(s16* arg0, s16 arg1, s16 arg2, s16 arg3) { if (DECR(arg0[1]) == 0) { - arg0[1] = Math_Rand_S16Offset(arg1, arg2); + arg0[1] = Rand_S16Offset(arg1, arg2); } if ((arg0[1] - arg3) > 0) { @@ -3027,11 +3027,11 @@ s16 func_80032CB4(s16* arg0, s16 arg1, s16 arg2, s16 arg3) { s16 func_80032D60(s16* arg0, s16 arg1, s16 arg2, s16 arg3) { if (DECR(arg0[1]) == 0) { - arg0[1] = Math_Rand_S16Offset(arg1, arg2); + arg0[1] = Rand_S16Offset(arg1, arg2); arg0[0]++; if ((arg0[0] % 3) == 0) { - arg0[0] = (s32)(Math_Rand_ZeroOne() * arg3) * 3; + arg0[0] = (s32)(Rand_ZeroOne() * arg3) * 3; } } @@ -3148,15 +3148,15 @@ void func_80033260(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, f32 arg3 f32 var; s32 i; - var = (Math_Rand_ZeroOne() - 0.5f) * 6.28f; + var = (Rand_ZeroOne() - 0.5f) * 6.28f; pos.y = actor->groundY; - accel.y += (Math_Rand_ZeroOne() - 0.5f) * 0.2f; + accel.y += (Rand_ZeroOne() - 0.5f) * 0.2f; for (i = arg4; i >= 0; i--) { - pos.x = (func_800CA720(var) * arg3) + arg2->x; - pos.z = (func_800CA774(var) * arg3) + arg2->z; - accel.x = (Math_Rand_ZeroOne() - 0.5f) * arg5; - accel.z = (Math_Rand_ZeroOne() - 0.5f) * arg5; + pos.x = (Math_SinF(var) * arg3) + arg2->x; + pos.z = (Math_CosF(var) * arg3) + arg2->z; + accel.x = (Rand_ZeroOne() - 0.5f) * arg5; + accel.z = (Rand_ZeroOne() - 0.5f) * arg5; if (scale == 0) { func_8002857C(globalCtx, &pos, &velocity, &accel); @@ -3179,11 +3179,11 @@ void func_80033480(GlobalContext* globalCtx, Vec3f* arg1, f32 arg2, s32 arg3, s1 s32 i; for (i = arg3; i >= 0; i--) { - pos.x = arg1->x + ((Math_Rand_ZeroOne() - 0.5f) * arg2); - pos.y = arg1->y + ((Math_Rand_ZeroOne() - 0.5f) * arg2); - pos.z = arg1->z + ((Math_Rand_ZeroOne() - 0.5f) * arg2); + pos.x = arg1->x + ((Rand_ZeroOne() - 0.5f) * arg2); + pos.y = arg1->y + ((Rand_ZeroOne() - 0.5f) * arg2); + pos.z = arg1->z + ((Rand_ZeroOne() - 0.5f) * arg2); - scale = (s16)((Math_Rand_ZeroOne() * arg4) * 0.2f) + arg4; + scale = (s16)((Rand_ZeroOne() * arg4) * 0.2f) + arg4; var2 = arg6; if (var2 != 0) { @@ -3256,9 +3256,9 @@ Actor* func_80033780(GlobalContext* globalCtx, Actor* refActor, f32 arg2) { (itemActor->unk_210 == 0)) { actor = actor->next; } else { - deltaX = Math_Sins(itemActor->actor.posRot.rot.y) * (itemActor->actor.speedXZ * 10.0f); + deltaX = Math_SinS(itemActor->actor.posRot.rot.y) * (itemActor->actor.speedXZ * 10.0f); deltaY = itemActor->actor.velocity.y + (itemActor->actor.gravity * 10.0f); - deltaZ = Math_Coss(itemActor->actor.posRot.rot.y) * (itemActor->actor.speedXZ * 10.0f); + deltaZ = Math_CosS(itemActor->actor.posRot.rot.y) * (itemActor->actor.speedXZ * 10.0f); spA8.x = itemActor->actor.posRot.pos.x + deltaX; spA8.y = itemActor->actor.posRot.pos.y + deltaY; @@ -3366,8 +3366,8 @@ s16 func_800339B8(Actor* actor, GlobalContext* globalCtx, f32 arg2, s16 arg3) { Math_Vec3f_Copy(&sp30, &actor->posRot.pos); sp44 = actor->bgCheckFlags; - sp40 = Math_Sins(arg3) * arg2; - sp3C = Math_Coss(arg3) * arg2; + sp40 = Math_SinS(arg3) * arg2; + sp3C = Math_CosS(arg3) * arg2; actor->posRot.pos.x += sp40; actor->posRot.pos.z += sp3C; func_8002E4B4(globalCtx, actor, 0.0f, 0.0f, 0.0f, 4); @@ -3403,13 +3403,13 @@ f32 func_80033AEC(Vec3f* arg0, Vec3f* arg1, f32 arg2, f32 arg3, f32 arg4, f32 ar f32 ret = 0.0f; if (arg4 <= Math_Vec3f_DistXYZ(arg0, arg1)) { - ret = Math_SmoothScaleMaxMinF(&arg1->x, arg0->x, arg2, arg3, 0.0f); - ret += Math_SmoothScaleMaxMinF(&arg1->y, arg0->y, arg2, arg3, 0.0f); - ret += Math_SmoothScaleMaxMinF(&arg1->z, arg0->z, arg2, arg3, 0.0f); + ret = Math_SmoothStepToF(&arg1->x, arg0->x, arg2, arg3, 0.0f); + ret += Math_SmoothStepToF(&arg1->y, arg0->y, arg2, arg3, 0.0f); + ret += Math_SmoothStepToF(&arg1->z, arg0->z, arg2, arg3, 0.0f); } else if (arg5 < Math_Vec3f_DistXYZ(arg0, arg1)) { - ret = Math_SmoothScaleMaxMinF(&arg1->x, arg0->x, arg2, arg3, 0.0f); - ret += Math_SmoothScaleMaxMinF(&arg1->y, arg0->y, arg2, arg3, 0.0f); - ret += Math_SmoothScaleMaxMinF(&arg1->z, arg0->z, arg2, arg3, 0.0f); + ret = Math_SmoothStepToF(&arg1->x, arg0->x, arg2, arg3, 0.0f); + ret += Math_SmoothStepToF(&arg1->y, arg0->y, arg2, arg3, 0.0f); + ret += Math_SmoothStepToF(&arg1->z, arg0->z, arg2, arg3, 0.0f); } return ret; @@ -3475,12 +3475,12 @@ void func_80033E88(Actor* actor, GlobalContext* globalCtx, s16 arg2, s16 arg3) { func_80033DB8(globalCtx, arg2, arg3); } -f32 Math_Rand_ZeroFloat(f32 f) { - return Math_Rand_ZeroOne() * f; +f32 Rand_ZeroFloat(f32 f) { + return Rand_ZeroOne() * f; } -f32 Math_Rand_CenteredFloat(f32 f) { - return (Math_Rand_ZeroOne() - 0.5f) * f; +f32 Rand_CenteredFloat(f32 f) { + return (Rand_ZeroOne() - 0.5f) * f; } typedef struct { @@ -3666,7 +3666,7 @@ void func_800344BC(Actor* actor, struct_80034A14_arg1* arg1, s16 arg2, s16 arg3, sp40 = Math_Vec3f_Yaw(&actor->posRot.pos, &arg1->unk_18) - actor->shape.rot.y; temp1 = CLAMP(sp40, -arg2, arg2); - Math_SmoothScaleMaxMinS(&arg1->unk_08.y, temp1, 6, 2000, 1); + Math_SmoothStepToS(&arg1->unk_08.y, temp1, 6, 2000, 1); sp40 = (ABS(sp40) >= 0x8000) ? 0 : ABS(sp40); arg1->unk_08.y = CLAMP(arg1->unk_08.y, -sp40, sp40); @@ -3674,23 +3674,23 @@ void func_800344BC(Actor* actor, struct_80034A14_arg1* arg1, s16 arg2, s16 arg3, sp40 = sp40 - arg1->unk_08.y; temp1 = CLAMP(sp40, -arg5, arg5); - Math_SmoothScaleMaxMinS(&arg1->unk_0E.y, temp1, 6, 2000, 1); + Math_SmoothStepToS(&arg1->unk_0E.y, temp1, 6, 2000, 1); sp40 = (ABS(sp40) >= 0x8000) ? 0 : ABS(sp40); arg1->unk_0E.y = CLAMP(arg1->unk_0E.y, -sp40, sp40); if (arg8 != 0) { if (arg3) {} // Seems necessary to match - Math_SmoothScaleMaxMinS(&actor->shape.rot.y, sp44, 6, 2000, 1); + Math_SmoothStepToS(&actor->shape.rot.y, sp44, 6, 2000, 1); } temp1 = CLAMP(sp46, arg4, arg3); - Math_SmoothScaleMaxMinS(&arg1->unk_08.x, temp1, 6, 2000, 1); + Math_SmoothStepToS(&arg1->unk_08.x, temp1, 6, 2000, 1); temp2 = sp46 - arg1->unk_08.x; temp1 = CLAMP(temp2, arg7, arg6); - Math_SmoothScaleMaxMinS(&arg1->unk_0E.x, temp1, 6, 2000, 1); + Math_SmoothStepToS(&arg1->unk_0E.x, temp1, 6, 2000, 1); } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800344BC.s") @@ -3734,11 +3734,11 @@ s16 func_80034810(Actor* actor, struct_80034A14_arg1* arg1, f32 arg2, s16 arg3, switch (arg1->unk_06) { case 0: case 2: - arg1->unk_04 = Math_Rand_S16Offset(30, 30); + arg1->unk_04 = Rand_S16Offset(30, 30); arg1->unk_06++; return 1; case 1: - arg1->unk_04 = Math_Rand_S16Offset(10, 10); + arg1->unk_04 = Rand_S16Offset(10, 10); arg1->unk_06++; return 3; } @@ -3839,10 +3839,10 @@ s16 func_80034DD4(Actor* actor, GlobalContext* globalCtx, s16 arg2, f32 arg3) { if (arg3 < var) { actor->flags &= ~1; - Math_SmoothScaleMaxMinS(&arg2, 0, 6, 0x14, 1); + Math_SmoothStepToS(&arg2, 0, 6, 0x14, 1); } else { actor->flags |= 1; - Math_SmoothScaleMaxMinS(&arg2, 0xFF, 6, 0x14, 1); + Math_SmoothStepToS(&arg2, 0xFF, 6, 0x14, 1); } return arg2; @@ -3885,7 +3885,7 @@ s32 func_80035124(Actor* actor, GlobalContext* globalCtx) { actor->params = 1; } else if (!(actor->bgCheckFlags & 1)) { Actor_MoveForward(actor); - Math_SmoothScaleMaxMinF(&actor->speedXZ, 0.0f, 1.0f, 0.1f, 0.0f); + Math_SmoothStepToF(&actor->speedXZ, 0.0f, 1.0f, 0.1f, 0.0f); } else if ((actor->bgCheckFlags & 2) && (actor->velocity.y < -4.0f)) { ret = 1; } else { @@ -4070,8 +4070,8 @@ void func_80035844(Vec3f* arg0, Vec3f* arg1, s16* arg2, s32 arg3) { f32 dz = arg1->z - arg0->z; f32 dy = arg3 ? (arg1->y - arg0->y) : (arg0->y - arg1->y); - arg2[1] = atan2s(dz, dx); - arg2[0] = atan2s(sqrtf(SQ(dx) + SQ(dz)), dy); + arg2[1] = Math_Atan2S(dz, dx); + arg2[0] = Math_Atan2S(sqrtf(SQ(dx) + SQ(dz)), dy); } /** @@ -4117,15 +4117,15 @@ void func_800359B8(Actor* actor, s16 arg1, Vec3s* arg2) { sp40 = floorPoly->norm.y * (1.0f / 32767); sp3C = floorPoly->norm.z * (1.0f / 32767); - sp38 = Math_Sins(arg1); - sp34 = Math_Coss(arg1); + sp38 = Math_SinS(arg1); + sp34 = Math_CosS(arg1); sp28 = (-(sp44 * sp38) - (sp3C * sp34)); - arg2->x = -(s16)(Math_atan2f(sp28 * sp40, 1.0f) * (32768 / M_PI)); + arg2->x = -(s16)(Math_FAtan2F(sp28 * sp40, 1.0f) * (32768 / M_PI)); - sp2C = Math_Sins(arg1 - 16375); - sp30 = Math_Coss(arg1 - 16375); + sp2C = Math_SinS(arg1 - 16375); + sp30 = Math_CosS(arg1 - 16375); sp24 = (-(sp44 * sp2C) - (sp3C * sp30)); - arg2->z = -(s16)(Math_atan2f(sp24 * sp40, 1.0f) * (32768 / M_PI)); + arg2->z = -(s16)(Math_FAtan2F(sp24 * sp40, 1.0f) * (32768 / M_PI)); } } @@ -5433,10 +5433,10 @@ s32 func_80037D98(GlobalContext* globalCtx, Actor* actor, s16 arg2, s32* arg3) { } s32 func_80037F30(Vec3s* arg0, Vec3s* arg1) { - Math_SmoothScaleMaxMinS(&arg0->y, 0, 6, 6200, 100); - Math_SmoothScaleMaxMinS(&arg0->x, 0, 6, 6200, 100); - Math_SmoothScaleMaxMinS(&arg1->y, 0, 6, 6200, 100); - Math_SmoothScaleMaxMinS(&arg1->x, 0, 6, 6200, 100); + Math_SmoothStepToS(&arg0->y, 0, 6, 6200, 100); + Math_SmoothStepToS(&arg0->x, 0, 6, 6200, 100); + Math_SmoothStepToS(&arg1->y, 0, 6, 6200, 100); + Math_SmoothStepToS(&arg1->x, 0, 6, 6200, 100); return 1; } @@ -5448,17 +5448,17 @@ s32 func_80037FC8(Actor* actor, Vec3f* arg1, Vec3s* arg2, Vec3s* arg3) { sp36 = Math_Vec3f_Pitch(&actor->posRot2.pos, arg1); sp34 = Math_Vec3f_Yaw(&actor->posRot2.pos, arg1) - actor->posRot.rot.y; - Math_SmoothScaleMaxMinS(&arg2->x, sp36, 6, 2000, 1); + Math_SmoothStepToS(&arg2->x, sp36, 6, 2000, 1); arg2->x = (arg2->x < -6000) ? -6000 : ((arg2->x > 6000) ? 6000 : arg2->x); - var = Math_SmoothScaleMaxMinS(&arg2->y, sp34, 6, 2000, 1); + var = Math_SmoothStepToS(&arg2->y, sp34, 6, 2000, 1); arg2->y = (arg2->y < -8000) ? -8000 : ((arg2->y > 8000) ? 8000 : arg2->y); if (var && (ABS(arg2->y) < 8000)) { return 0; } - Math_SmoothScaleMaxMinS(&arg3->y, sp34 - arg2->y, 4, 2000, 1); + Math_SmoothStepToS(&arg3->y, sp34 - arg2->y, 4, 2000, 1); arg3->y = (arg3->y < -12000) ? -12000 : ((arg3->y > 12000) ? 12000 : arg3->y); return 1; diff --git a/src/code/z_camera.c b/src/code/z_camera.c index b0db5de019..87c3cf85a1 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -558,7 +558,7 @@ f32 Camera_GetWaterSurface(Camera* camera, Vec3f* chkPos, s32* envProp) { * Calculates the angle between points `from` and `to` */ s16 Camera_XZAngle(Vec3f* to, Vec3f* from) { - return DEGF_TO_BINANG(RADF_TO_DEGF(Math_atan2f(from->x - to->x, from->z - to->z))); + return DEGF_TO_BINANG(RADF_TO_DEGF(Math_FAtan2F(from->x - to->x, from->z - to->z))); } s16 func_80044ADC(Camera* camera, s16 yaw, s16 arg2) { @@ -580,8 +580,8 @@ s16 func_80044ADC(Camera* camera, s16 yaw, s16 arg2) { f32 phi_f16; f32 playerHeight; - sinYaw = Math_Sins(yaw); - cosYaw = Math_Coss(yaw); + sinYaw = Math_SinS(yaw); + cosYaw = Math_CosS(yaw); playerHeight = Player_GetHeight(camera->player); temp_f2 = PCT(OREG(19)) * playerHeight; sp30 = PCT(OREG(17)) * playerHeight; @@ -623,8 +623,8 @@ s16 func_80044ADC(Camera* camera, s16 yaw, s16 arg2) { } phi_f16 = PCT(OREG(20)) * (D_8015CE50 - camera->playerGroundY); phi_f18 = (1.0f - PCT(OREG(20))) * (D_8015CE54 - camera->playerGroundY); - temp_s0 = DEGF_TO_BINANG(RADF_TO_DEGF(Math_atan2f(phi_f16, sp30))); - temp_s1 = DEGF_TO_BINANG(RADF_TO_DEGF(Math_atan2f(phi_f18, sp2C))); + temp_s0 = DEGF_TO_BINANG(RADF_TO_DEGF(Math_FAtan2F(phi_f16, sp30))); + temp_s1 = DEGF_TO_BINANG(RADF_TO_DEGF(Math_FAtan2F(phi_f18, sp2C))); return temp_s0 + temp_s1; } @@ -653,13 +653,13 @@ Vec3f* Camera_CalcUpFromPitchYawRoll(Vec3f* dest, s16 pitch, s16 yaw, s16 roll) f32 temp_f8_2; f32 temp_f8_3; - sinPitch = Math_Sins(pitch); - cosPitch = Math_Coss(pitch); - sinYaw = Math_Sins(yaw); - cosYaw = Math_Coss(yaw); + sinPitch = Math_SinS(pitch); + cosPitch = Math_CosS(pitch); + sinYaw = Math_SinS(yaw); + cosYaw = Math_CosS(yaw); negSinPitch = -sinPitch; - sinNegRoll = Math_Sins(-roll); - cosNegRoll = Math_Coss(-roll); + sinNegRoll = Math_SinS(-roll); + cosNegRoll = Math_CosS(-roll); negSinPitchSinYaw = negSinPitch * sinYaw; temp_f14 = 1.0f - cosNegRoll; cosPitchSinYaw = cosPitch * sinYaw; @@ -884,8 +884,8 @@ f32 Camera_CalcSlopeYAdj(Vec3f* floorNorm, s16 playerYRot, s16 eyeAtYaw, f32 adj OLib_Vec3fToVecSphGeo(&floorNormSph, floorNorm); - tmp = Math_Coss(floorNormSph.pitch) * Math_Coss(playerYRot - floorNormSph.yaw); - return (fabsf(tmp) * adjAmt) * Math_Coss(playerYRot - eyeAtYaw); + tmp = Math_CosS(floorNormSph.pitch) * Math_CosS(playerYRot - floorNormSph.yaw); + return (fabsf(tmp) * adjAmt) * Math_CosS(playerYRot - eyeAtYaw); } /** @@ -940,7 +940,7 @@ s32 func_800458D4(Camera* camera, VecSph* eyeAtDir, f32 arg2, f32* arg3, s16 arg } deltaY = playerPosRot->pos.y - *arg3; - eyeAtAngle = Math_atan2f(deltaY, OLib_Vec3fDistXZ(&camera->at, &camera->eye)); + eyeAtAngle = Math_FAtan2F(deltaY, OLib_Vec3fDistXZ(&camera->at, &camera->eye)); if (eyeAtAngle > DEGF_TO_RADF(OREG(32))) { if (1) {} @@ -975,12 +975,12 @@ s32 func_80045B08(Camera* camera, VecSph* eyeAtDir, f32 yExtra, s16 arg3) { posOffsetTarget.x = 0.0f; posOffsetTarget.z = 0.0f; - temp_ret = Math_Sins(arg3); + temp_ret = Math_SinS(arg3); if (temp_ret < 0.0f) { - phi_f2 = Math_Coss(playerPosRot->rot.y - eyeAtDir->yaw); + phi_f2 = Math_CosS(playerPosRot->rot.y - eyeAtDir->yaw); } else { - phi_f2 = -Math_Coss(playerPosRot->rot.y - eyeAtDir->yaw); + phi_f2 = -Math_CosS(playerPosRot->rot.y - eyeAtDir->yaw); } posOffsetTarget.y -= temp_ret * phi_f2 * OREG(9); @@ -1031,8 +1031,8 @@ s32 Camera_CalcAtForParallel(Camera* camera, VecSph* arg1, f32 arg2, f32* arg3, phi_f20 = playerPosRot->pos.y - *arg3; sp54 = OLib_Vec3fDistXZ(at, &camera->eye); phi_f16 = sp54; - Math_atan2f(phi_f20, sp54); - temp_f2 = Math_tanf(DEG_TO_RAD(camera->fov * 0.4f)) * phi_f16; + Math_FAtan2F(phi_f20, sp54); + temp_f2 = Math_FTanF(DEG_TO_RAD(camera->fov * 0.4f)) * phi_f16; if (temp_f2 < phi_f20) { *arg3 += phi_f20 - temp_f2; phi_f20 = temp_f2; @@ -1043,7 +1043,7 @@ s32 Camera_CalcAtForParallel(Camera* camera, VecSph* arg1, f32 arg2, f32* arg3, posOffsetTarget.y -= phi_f20; } else { phi_f20 = playerPosRot->pos.y - *arg3; - temp_f2 = Math_atan2f(phi_f20, OLib_Vec3fDistXZ(at, eye)); + temp_f2 = Math_FAtan2F(phi_f20, OLib_Vec3fDistXZ(at, eye)); if (DEG_TO_RAD(OREG(32)) < temp_f2) { phi_f16 = 1 - sinf(temp_f2 - DEG_TO_RAD(OREG(32))); } else if (temp_f2 < DEG_TO_RAD(OREG(33))) { @@ -1133,8 +1133,8 @@ s32 Camera_CalcAtForLockOn(Camera* camera, VecSph* eyeAtDir, Vec3f* targetPos, f yPosDelta = playerPosRot->pos.y - *yPosOffset; eyeAtDist = OLib_Vec3fDistXZ(at, &camera->eye); phi_f16 = eyeAtDist; - Math_atan2f(yPosDelta, eyeAtDist); - temp_f0_2 = Math_tanf(DEG_TO_RAD(camera->fov * 0.4f)) * phi_f16; + Math_FAtan2F(yPosDelta, eyeAtDist); + temp_f0_2 = Math_FTanF(DEG_TO_RAD(camera->fov * 0.4f)) * phi_f16; if (temp_f0_2 < yPosDelta) { *yPosOffset = *yPosOffset + (yPosDelta - temp_f0_2); yPosDelta = temp_f0_2; @@ -1145,7 +1145,7 @@ s32 Camera_CalcAtForLockOn(Camera* camera, VecSph* eyeAtDir, Vec3f* targetPos, f tmpPos0.y = tmpPos0.y - yPosDelta; } else { yPosDelta = playerPosRot->pos.y - *yPosOffset; - temp_f0_2 = Math_atan2f(yPosDelta, OLib_Vec3fDistXZ(at, &camera->eye)); + temp_f0_2 = Math_FAtan2F(yPosDelta, OLib_Vec3fDistXZ(at, &camera->eye)); if (temp_f0_2 > DEG_TO_RAD(OREG(32))) { phi_f16 = 1.0f - sinf(temp_f0_2 - DEG_TO_RAD(OREG(32))); @@ -1227,7 +1227,7 @@ f32 Camera_LERPClampDist(Camera* camera, f32 dist, f32 min, f32 max) { } camera->rUpdateRateInv = Camera_LERPCeilF(rUpdateRateInvTarget, camera->rUpdateRateInv, PCT(OREG(25)), 0.1f); - return Camera_LERPCeilF(distTarget, camera->dist, 1.f / camera->rUpdateRateInv, 0.2f); + return Camera_LERPCeilF(distTarget, camera->dist, 1.0f / camera->rUpdateRateInv, 0.2f); } f32 Camera_ClampDist(Camera* camera, f32 dist, f32 minDist, f32 maxDist, s16 timer) { @@ -1261,7 +1261,7 @@ s16 Camera_CalcDefaultPitch(Camera* camera, s16 arg1, s16 arg2, s16 arg3) { s16 sp1C; phi_v1 = ABS(arg1); - phi_v0 = arg3 > 0 ? (s16)(Math_Coss(arg3) * arg3) : arg3; + phi_v0 = arg3 > 0 ? (s16)(Math_CosS(arg3) * arg3) : arg3; sp1C = arg2 - phi_v0; if (ABS(sp1C) < phi_v1) { @@ -1380,7 +1380,7 @@ void func_80046E20(Camera* camera, VecSph* eyeAdjustment, f32 minDist, f32 arg3, anim->atEyePoly = NULL; if (temp_f0 < OREG(21)) { sp40.yaw = eyeAdjustment->yaw; - sp40.pitch = Math_Sins(atEyeColChk.sphNorm.pitch + 0x3FFF) * 16380.0f; + sp40.pitch = Math_SinS(atEyeColChk.sphNorm.pitch + 0x3FFF) * 16380.0f; sp40.r = (OREG(21) - temp_f0) * PCT(OREG(22)); Camera_Vec3fVecSphGeoAdd(eye, eye, &sp40); } @@ -1537,7 +1537,7 @@ s32 Camera_Normal1(Camera* camera) { } spA0 = ((anim->swing.unk_18 != 0) && (norm1->yOffset > -40.0f)) - ? (sp9C = Math_Sins(anim->swing.unk_14), ((-40.0f * sp9C) + (norm1->yOffset * (1.0f - sp9C)))) + ? (sp9C = Math_SinS(anim->swing.unk_14), ((-40.0f * sp9C) + (norm1->yOffset * (1.0f - sp9C)))) : norm1->yOffset; if (norm1->interfaceFlags & 0x80) { @@ -1614,7 +1614,7 @@ s32 Camera_Normal1(Camera* camera) { // crit wiggle if (gSaveContext.health <= 16 && ((camera->globalCtx->state.frames % 256) == 0)) { - wiggleAdj = Math_Rand_ZeroOne() * 10000.0f; + wiggleAdj = Rand_ZeroOne() * 10000.0f; camera->inputDir.y = wiggleAdj + camera->inputDir.y; } } else { @@ -2420,9 +2420,9 @@ s32 Camera_Jump2(Camera* camera) { } // Check the floor at the top of the climb - bgChkPos.x = playerPosRot->pos.x + (Math_Sins(playerPosRot->rot.y) * 25.0f); + bgChkPos.x = playerPosRot->pos.x + (Math_SinS(playerPosRot->rot.y) * 25.0f); bgChkPos.y = playerPosRot->pos.y + (playerHeight * 2.2f); - bgChkPos.z = playerPosRot->pos.z + (Math_Coss(playerPosRot->rot.y) * 25.0f); + bgChkPos.z = playerPosRot->pos.z + (Math_CosS(playerPosRot->rot.y) * 25.0f); sp90 = Camera_GetFloorYNorm(camera, &floorNorm, &bgChkPos, &bgId); if ((sp90 != BGCHECK_Y_MIN) && (playerPosRot->pos.y < sp90)) { @@ -4211,13 +4211,13 @@ s32 Camera_Subj3(Camera* camera) { func_80044340(camera, at, eye); } } else { - sp58 = Math_Sins(-sp60.rot.x); - temp_f0_3 = Math_Coss(-sp60.rot.x); + sp58 = Math_SinS(-sp60.rot.x); + temp_f0_3 = Math_CosS(-sp60.rot.x); sp98.x = subj3->atOffset.x; sp98.y = (subj3->atOffset.y * temp_f0_3) - (subj3->atOffset.z * sp58); sp98.z = (subj3->atOffset.y * sp58) + (subj3->atOffset.z * temp_f0_3); - sp58 = Math_Sins(BINANG_ROT180(sp60.rot.y)); - temp_f0_3 = Math_Coss(BINANG_ROT180(sp60.rot.y)); + sp58 = Math_SinS(BINANG_ROT180(sp60.rot.y)); + temp_f0_3 = Math_CosS(BINANG_ROT180(sp60.rot.y)); subj3->atOffset.x = (sp98.z * sp58) + (sp98.x * temp_f0_3); subj3->atOffset.y = sp98.y; subj3->atOffset.z = (sp98.z * temp_f0_3) - (sp98.x * sp58); @@ -4341,7 +4341,7 @@ s32 Camera_Subj4(Camera* camera) { sp64.pitch = 0x238C; Camera_Vec3fVecSphGeoAdd(&sp98, eyeNext, &sp64); anim->unk_2C += 0xBB8; - temp_f16 = Math_Coss(anim->unk_2C); + temp_f16 = Math_CosS(anim->unk_2C); eye->x += (sp98.x - eye->x) * fabsf(temp_f16); eye->y += (sp98.y - eye->y) * fabsf(temp_f16); eye->z += (sp98.z - eye->z) * fabsf(temp_f16); @@ -4360,9 +4360,9 @@ s32 Camera_Subj4(Camera* camera) { camera->player->actor.shape.rot.y = sp64.yaw; temp_f16 = ((240.0f * temp_f16) * (anim->unk_24 * 0.416667f)); temp_a0 = temp_f16 + anim->unk_30; - at->x = eye->x + (Math_Sins(temp_a0) * 10.0f); + at->x = eye->x + (Math_SinS(temp_a0) * 10.0f); at->y = eye->y; - at->z = eye->z + (Math_Coss(temp_a0) * 10.0f); + at->z = eye->z + (Math_CosS(temp_a0) * 10.0f); camera->roll = Camera_LERPCeilS(0, camera->roll, 0.5f, 0xA); return 1; } @@ -4975,7 +4975,7 @@ s32 Camera_Unique7(Camera* camera) { // 0x7D0 ~ 10.98 degres. unk08->unk_00.x = Camera_LERPFloorS(playerPosEyeOffset.yaw, unk08->unk_00.x, 0.4f, 0x7D0); playerPosEyeOffset.pitch = - -BGCAM_ROT(sceneCamData).x * Math_Coss(playerPosEyeOffset.yaw - BGCAM_ROT(sceneCamData).y); + -BGCAM_ROT(sceneCamData).x * Math_CosS(playerPosEyeOffset.yaw - BGCAM_ROT(sceneCamData).y); Camera_Vec3fVecSphGeoAdd(at, eye, &playerPosEyeOffset); camera->unk_14C |= 0x400; return true; @@ -5630,9 +5630,9 @@ s32 Camera_Demo3(Camera* camera) { anim->initialAt.y = camera->playerGroundY; } angle = camPlayerPosRot->rot.y; - sp68.x = anim->initialAt.x + (Math_Sins(angle) * 40.0f); + sp68.x = anim->initialAt.x + (Math_SinS(angle) * 40.0f); sp68.y = anim->initialAt.y + 40.0f; - sp68.z = anim->initialAt.z + (Math_Coss(angle) * 40.0f); + sp68.z = anim->initialAt.z + (Math_CosS(angle) * 40.0f); if (camera->globalCtx->state.frames & 1) { angle -= 0x3FFF; anim->yawDir = 1; @@ -5640,9 +5640,9 @@ s32 Camera_Demo3(Camera* camera) { angle += 0x3FFF; anim->yawDir = -1; } - sp74.x = sp68.x + (D_8011D658[1].r * Math_Sins(angle)); + sp74.x = sp68.x + (D_8011D658[1].r * Math_SinS(angle)); sp74.y = anim->initialAt.y + 5.0f; - sp74.z = sp68.z + (D_8011D658[1].r * Math_Coss(angle)); + sp74.z = sp68.z + (D_8011D658[1].r * Math_CosS(angle)); if (Camera_BGCheck(camera, &sp68, &sp74)) { anim->yawDir = -anim->yawDir; } @@ -5838,8 +5838,8 @@ s32 Camera_Demo5(Camera* camera) { // camera is targeting a(the) player actor if (eyePlayerGeo.r > 30.0f) { D_8011D6AC[1].timerInit = camera->timer - 1; - D_8011D6AC[1].atTargetInit.z = Math_Rand_ZeroOne() * 10.0f; - D_8011D6AC[1].eyeTargetInit.x = Math_Rand_ZeroOne() * 10.0f; + D_8011D6AC[1].atTargetInit.z = Rand_ZeroOne() * 10.0f; + D_8011D6AC[1].eyeTargetInit.x = Rand_ZeroOne() * 10.0f; ONEPOINTDEMO->keyFrames = D_8011D6AC; ONEPOINTDEMO->keyFrameCnt = ARRAY_COUNT(D_8011D6AC); if (camera->parentCamIdx != 0) { @@ -5848,7 +5848,7 @@ s32 Camera_Demo5(Camera* camera) { camera->timer += D_8011D6AC[2].timerInit; } } else { - D_8011D724[1].eyeTargetInit.x = Math_Rand_ZeroOne() * 10.0f; + D_8011D724[1].eyeTargetInit.x = Rand_ZeroOne() * 10.0f; D_8011D724[1].timerInit = camera->timer - 1; ONEPOINTDEMO->keyFrames = D_8011D724; ONEPOINTDEMO->keyFrameCnt = ARRAY_COUNT(D_8011D724); @@ -5906,7 +5906,7 @@ s32 Camera_Demo5(Camera* camera) { } else { D_8011D8DC[0].atTargetInit.z = eyeTargetDist * 0.6f; D_8011D8DC[0].eyeTargetInit.z = eyeTargetDist + 50.0f; - D_8011D8DC[0].eyeTargetInit.x = Math_Rand_ZeroOne() * 10.0f; + D_8011D8DC[0].eyeTargetInit.x = Rand_ZeroOne() * 10.0f; if (BINANG_SUB(eyePlayerGeo.yaw, playerTargetGeo.yaw) > 0) { D_8011D8DC[0].atTargetInit.x = -D_8011D8DC[0].atTargetInit.x; D_8011D8DC[0].eyeTargetInit.x = -D_8011D8DC[0].eyeTargetInit.x; @@ -5937,14 +5937,14 @@ s32 Camera_Demo5(Camera* camera) { D_8011D954[0].atTargetInit.y = D_8011D954[0].eyeTargetInit.y = D_8011D954[1].atTargetInit.y = camera->target->shape.rot.y == sp4A ? 180.0f : 0.0f; - sp90 = (BINANG_SUB(playerTargetGeo.yaw, sp4A) < 0 ? 20.0f : -20.0f) * Math_Rand_ZeroOne(); + sp90 = (BINANG_SUB(playerTargetGeo.yaw, sp4A) < 0 ? 20.0f : -20.0f) * Rand_ZeroOne(); D_8011D954[0].eyeTargetInit.y = D_8011D954->eyeTargetInit.y + sp90; - temp_v0 = Math_Rand_ZeroOne() * (sp90 * -0.2f); + temp_v0 = Rand_ZeroOne() * (sp90 * -0.2f); D_8011D954[1].rollTargetInit = temp_v0; D_8011D954[0].rollTargetInit = temp_v0; func_8002EEE4(&targetPosRot2, camera->target); - targetPosRot2.pos.x += 50.0f * Math_Sins(BINANG_ROT180(sp4A)); - targetPosRot2.pos.z += 50.0f * Math_Coss(BINANG_ROT180(sp4A)); + targetPosRot2.pos.x += 50.0f * Math_SinS(BINANG_ROT180(sp4A)); + targetPosRot2.pos.z += 50.0f * Math_CosS(BINANG_ROT180(sp4A)); if (Camera_BGCheck(camera, &playerPosRot2.pos, &targetPosRot2.pos)) { D_8011D954[1].actionFlags = 0xC1; D_8011D954[2].actionFlags = 0x8F; @@ -5964,7 +5964,7 @@ s32 Camera_Demo5(Camera* camera) { D_8011D9F4[0].atTargetInit.z = playerTargetGeo.r * 0.25f; } if (playerTargetGeo.r < 400.0f) { - D_8011D9F4[0].eyeTargetInit.x = Math_Rand_ZeroOne() * 25.0f; + D_8011D9F4[0].eyeTargetInit.x = Rand_ZeroOne() * 25.0f; } Player_GetHeight(camera->player); D_8011D9F4[0].timerInit = camera->timer; @@ -6347,9 +6347,9 @@ s32 Camera_Special4(Camera* camera) { // 0x3E8 ~ 5.49 degrees sp3A = BINANG_ROT180(curTargetPosRot.rot.y) + 0x3E8; - camera->eye.x = camera->eyeNext.x = (Math_Sins(sp3A) * 780.0f) + camera->at.x; + camera->eye.x = camera->eyeNext.x = (Math_SinS(sp3A) * 780.0f) + camera->at.x; camera->eyeNext.y = camera->at.y; - camera->eye.z = camera->eyeNext.z = (Math_Coss(sp3A) * 780.0f) + camera->at.z; + camera->eye.z = camera->eyeNext.z = (Math_CosS(sp3A) * 780.0f) + camera->at.z; camera->eye.y = curTargetPosRot.pos.y; camera->eye.y = Camera_GetFloorY(camera, &camera->eye) + 20.0f; (*timer)--; @@ -6425,7 +6425,7 @@ s32 Camera_Special5(Camera* camera) { OLib_Vec3fToVecSphGeo(&sp6C, &sp7C.norm); spA4 = BINANG_SUB(playerPosRot->rot.y, sp6C.yaw); sp74.r = spec5->eyeDist; - temp_f0_2 = Math_Rand_ZeroOne(); + temp_f0_2 = Rand_ZeroOne(); sp74.yaw = BINANG_ROT180(playerPosRot->rot.y) + (s16)(spA4 < 0 ? -(s16)(0x1553 + (s16)(temp_f0_2 * 2730.0f)) : (s16)(0x1553 + (s16)(temp_f0_2 * 2730.0f))); @@ -7285,12 +7285,12 @@ void func_80058E8C(Camera* camera) { } D_8011DB08 += DEGF_TO_BINANG(phi_f0); D_8011DB0C += DEGF_TO_BINANG(phi_f2); - Math_Coss(D_8011DB08); - Math_Sins(D_8011DB08); - Math_Sins(D_8011DB0C); + Math_CosS(D_8011DB08); + Math_SinS(D_8011DB08); + Math_SinS(D_8011DB0C); func_800AA76C(&camera->globalCtx->view, 0.0f, 0.0f, 0.0f); - func_800AA78C(&camera->globalCtx->view, Math_Sins(D_8011DB0C) * (sp40 * phi_f20) + 1.0f, - Math_Coss(D_8011DB0C) * (sp3C * phi_f20) + 1.0f, Math_Coss(D_8011DB08) * (sp38 * phi_f20) + 1.0f); + func_800AA78C(&camera->globalCtx->view, Math_SinS(D_8011DB0C) * (sp40 * phi_f20) + 1.0f, + Math_CosS(D_8011DB0C) * (sp3C * phi_f20) + 1.0f, Math_CosS(D_8011DB08) * (sp38 * phi_f20) + 1.0f); func_800AA7AC(&camera->globalCtx->view, sp34 * sp60); camera->unk_14C |= 0x40; } else if (camera->unk_14C & 0x40) { diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 93b2bf85b7..2ef4cbe52f 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -132,7 +132,7 @@ void func_80064720(GlobalContext* globalCtx, CutsceneContext* csCtx) { } u32 func_8006472C(GlobalContext* globalCtx, CutsceneContext* csCtx, f32 target) { - return Math_ApproxF(&csCtx->unk_0C, target, 0.1f); + return Math_StepToF(&csCtx->unk_0C, target, 0.1f); } void func_80064760(GlobalContext* globalCtx, CutsceneContext* csCtx) { diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index d376bbf98b..bc3d3465b3 100644 --- a/src/code/z_eff_blure.c +++ b/src/code/z_eff_blure.c @@ -602,16 +602,16 @@ void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElem vtx[0].v = baseVtx; vtx[1].v = baseVtx; - vtx[0].v.ob[0] = Math_nearbyintf(sp158.x); - vtx[0].v.ob[1] = Math_nearbyintf(sp158.y); - vtx[0].v.ob[2] = Math_nearbyintf(sp158.z); + vtx[0].v.ob[0] = Math_FNearbyIntF(sp158.x); + vtx[0].v.ob[1] = Math_FNearbyIntF(sp158.y); + vtx[0].v.ob[2] = Math_FNearbyIntF(sp158.z); vtx[0].v.cn[0] = sp148.r; vtx[0].v.cn[1] = sp148.g; vtx[0].v.cn[2] = sp148.b; vtx[0].v.cn[3] = sp148.a; - vtx[1].v.ob[0] = Math_nearbyintf(sp14C.x); - vtx[1].v.ob[1] = Math_nearbyintf(sp14C.y); - vtx[1].v.ob[2] = Math_nearbyintf(sp14C.z); + vtx[1].v.ob[0] = Math_FNearbyIntF(sp14C.x); + vtx[1].v.ob[1] = Math_FNearbyIntF(sp14C.y); + vtx[1].v.ob[2] = Math_FNearbyIntF(sp14C.z); vtx[1].v.cn[0] = sp144.r; vtx[1].v.cn[1] = sp144.g; vtx[1].v.cn[2] = sp144.b; @@ -644,17 +644,17 @@ void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElem vtx[j1].v = baseVtx; vtx[j2].v = baseVtx; - vtx[j1].v.ob[0] = Math_nearbyintf(sp158.x); - vtx[j1].v.ob[1] = Math_nearbyintf(sp158.y); - vtx[j1].v.ob[2] = Math_nearbyintf(sp158.z); + vtx[j1].v.ob[0] = Math_FNearbyIntF(sp158.x); + vtx[j1].v.ob[1] = Math_FNearbyIntF(sp158.y); + vtx[j1].v.ob[2] = Math_FNearbyIntF(sp158.z); vtx[j1].v.cn[0] = func_80027E84(sp1A4.r, sp19C.r, temp_f28); vtx[j1].v.cn[1] = func_80027E84(sp1A4.g, sp19C.g, temp_f28); vtx[j1].v.cn[2] = func_80027E84(sp1A4.b, sp19C.b, temp_f28); vtx[j1].v.cn[3] = func_80027E84(sp1A4.a, sp19C.a, temp_f28); - vtx[j2].v.ob[0] = Math_nearbyintf(sp14C.x); - vtx[j2].v.ob[1] = Math_nearbyintf(sp14C.y); - vtx[j2].v.ob[2] = Math_nearbyintf(sp14C.z); + vtx[j2].v.ob[0] = Math_FNearbyIntF(sp14C.x); + vtx[j2].v.ob[1] = Math_FNearbyIntF(sp14C.y); + vtx[j2].v.ob[2] = Math_FNearbyIntF(sp14C.z); vtx[j2].v.cn[0] = func_80027E84(sp1A0.r, sp198.r, temp_f28); vtx[j2].v.cn[1] = func_80027E84(sp1A0.g, sp198.g, temp_f28); vtx[j2].v.cn[2] = func_80027E84(sp1A0.b, sp198.b, temp_f28); diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c index 6005c3faf0..852eaeefec 100644 --- a/src/code/z_eff_shield_particle.c +++ b/src/code/z_eff_shield_particle.c @@ -37,14 +37,13 @@ void EffectShieldParticle_Init(void* thisx, void* initParamsx) { this->timer = 0; for (elem = &this->elements[0]; elem < &this->elements[this->numElements]; elem++) { - elem->initialSpeed = - (Math_Rand_ZeroOne() * (this->maxInitialSpeed * 0.5f)) + (this->maxInitialSpeed * 0.5f); + elem->initialSpeed = (Rand_ZeroOne() * (this->maxInitialSpeed * 0.5f)) + (this->maxInitialSpeed * 0.5f); elem->endX = 0.0f; elem->startXChange = 0.0f; elem->startX = 0.0f; elem->endXChange = elem->initialSpeed; - elem->yaw = Math_Rand_ZeroOne() * 65534.0f; - elem->pitch = Math_Rand_ZeroOne() * 65534.0f; + elem->yaw = Rand_ZeroOne() * 65534.0f; + elem->pitch = Rand_ZeroOne() * 65534.0f; } this->lightDecay = initParams->lightDecay; diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c index c17633053f..c310d4a3bd 100644 --- a/src/code/z_eff_spark.c +++ b/src/code/z_eff_spark.c @@ -66,9 +66,9 @@ void EffectSpark_Init(void* thisx, void* initParamsx) { elem->position.x = this->position.x; elem->position.y = this->position.y; elem->position.z = this->position.z; - elem->velocity.x = Math_Rand_ZeroOne() - 0.5f; - elem->velocity.y = Math_Rand_ZeroOne() - 0.5f; - elem->velocity.z = Math_Rand_ZeroOne() - 0.5f; + elem->velocity.x = Rand_ZeroOne() - 0.5f; + elem->velocity.y = Rand_ZeroOne() - 0.5f; + elem->velocity.z = Rand_ZeroOne() - 0.5f; velocityNorm = sqrtf(SQ(elem->velocity.x) + SQ(elem->velocity.y) + SQ(elem->velocity.z)); @@ -81,12 +81,12 @@ void EffectSpark_Init(void* thisx, void* initParamsx) { elem->velocity.y = this->speed; } - elem->unkVelocity.x = 30000.0f - Math_Rand_ZeroOne() * 15000.0f; - elem->unkVelocity.y = 30000.0f - Math_Rand_ZeroOne() * 15000.0f; - elem->unkVelocity.z = 30000.0f - Math_Rand_ZeroOne() * 15000.0f; - elem->unkPosition.x = Math_Rand_ZeroOne() * 65534.0f; - elem->unkPosition.y = Math_Rand_ZeroOne() * 65534.0f; - elem->unkPosition.z = Math_Rand_ZeroOne() * 65534.0f; + elem->unkVelocity.x = 30000.0f - Rand_ZeroOne() * 15000.0f; + elem->unkVelocity.y = 30000.0f - Rand_ZeroOne() * 15000.0f; + elem->unkVelocity.z = 30000.0f - Rand_ZeroOne() * 15000.0f; + elem->unkPosition.x = Rand_ZeroOne() * 65534.0f; + elem->unkPosition.y = Rand_ZeroOne() * 65534.0f; + elem->unkPosition.z = Rand_ZeroOne() * 65534.0f; } this->timer = 0; @@ -214,7 +214,7 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) { elem = &this->elements[i]; SkinMatrix_SetTranslate(&spEC, elem->position.x, elem->position.y, elem->position.z); - temp = ((Math_Rand_ZeroOne() * 2.5f) + 1.5f) * 0.015625f; + temp = ((Rand_ZeroOne() * 2.5f) + 1.5f) * 0.015625f; SkinMatrix_SetScale(&spAC, temp, temp, 1.0f); SkinMatrix_MtxFMtxFMult(&spEC, &globalCtx->mf_11DA0, &sp6C); SkinMatrix_MtxFMtxFMult(&sp6C, &spAC, &sp12C); diff --git a/src/code/z_eff_ss_dead.c b/src/code/z_eff_ss_dead.c index 9b5a552cb3..aebee67b38 100644 --- a/src/code/z_eff_ss_dead.c +++ b/src/code/z_eff_ss_dead.c @@ -8,7 +8,7 @@ void func_80026230(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 113); displayListHead = POLY_OPA_DISP; - cos = Math_Coss((0x8000 / arg3) * arg2); + cos = Math_CosS((0x8000 / arg3) * arg2); absCos = ABS(cos); gDPPipeSync(displayListHead++); @@ -35,7 +35,7 @@ void func_80026400(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a if (arg3 != 0) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 141); - cos = Math_Coss((0x4000 / arg3) * arg2); + cos = Math_CosS((0x4000 / arg3) * arg2); displayListHead = POLY_OPA_DISP; gDPPipeSync(displayListHead++); @@ -69,7 +69,7 @@ void func_80026690(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 178); displayListHead = POLY_XLU_DISP; - cos = Math_Coss((0x8000 / arg3) * arg2); + cos = Math_CosS((0x8000 / arg3) * arg2); absCos = ABS(cos); gDPPipeSync(displayListHead++); @@ -96,7 +96,7 @@ void func_80026860(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 201); displayListHead = POLY_XLU_DISP; - cos = Math_Coss((0x4000 / arg3) * arg2); + cos = Math_CosS((0x4000 / arg3) * arg2); gDPPipeSync(displayListHead++); gDPSetFogColor(displayListHead++, color->r, color->g, color->b, color->a); diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index c990f02f07..991d280ec9 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -182,17 +182,17 @@ void func_80028894(Vec3f* srcPos, f32 randScale, Vec3f* newPos, Vec3f* velocity, s16 randAngle; f32 rand; - rand = Math_Rand_ZeroOne() * randScale; - randAngle = (Math_Rand_ZeroOne() * 65536.0f); + rand = Rand_ZeroOne() * randScale; + randAngle = (Rand_ZeroOne() * 65536.0f); *newPos = *srcPos; - newPos->x += Math_Sins(randAngle) * rand; - newPos->z += Math_Coss(randAngle) * rand; + newPos->x += Math_SinS(randAngle) * rand; + newPos->z += Math_CosS(randAngle) * rand; velocity->y = 1.0f; - velocity->x = Math_Sins(randAngle); - velocity->z = Math_Coss(randAngle); + velocity->x = Math_SinS(randAngle); + velocity->z = Math_CosS(randAngle); accel->x = 0.0f; accel->y = 0.0f; @@ -243,13 +243,13 @@ void EffectSsKiraKira_SpawnDispersed(GlobalContext* globalCtx, Vec3f* pos, Vec3f Math_Vec3f_Copy(&initParams.pos, pos); Math_Vec3f_Copy(&initParams.velocity, velocity); - initParams.velocity.y = ((Math_Rand_ZeroOne() * initParams.velocity.y) + initParams.velocity.y) * 0.5f; + initParams.velocity.y = ((Rand_ZeroOne() * initParams.velocity.y) + initParams.velocity.y) * 0.5f; Math_Vec3f_Copy(&initParams.accel, accel); - initParams.accel.y = ((Math_Rand_ZeroOne() * initParams.accel.y) + initParams.accel.y) * 0.5f; + initParams.accel.y = ((Rand_ZeroOne() * initParams.accel.y) + initParams.accel.y) * 0.5f; initParams.life = life; initParams.updateMode = 0; initParams.rotSpeed = 0x1518; - initParams.yaw = Math_Rand_ZeroOne() * 16384.0f; + initParams.yaw = Rand_ZeroOne() * 16384.0f; initParams.scale = scale; initParams.primColor = *primColor; initParams.envColor = *envColor; @@ -268,7 +268,7 @@ void EffectSsKiraKira_SpawnFocused(GlobalContext* globalCtx, Vec3f* pos, Vec3f* initParams.life = life; initParams.updateMode = 1; initParams.rotSpeed = 0x1518; - initParams.yaw = Math_Rand_ZeroOne() * 16384.0f; + initParams.yaw = Rand_ZeroOne() * 16384.0f; initParams.scale = scale; Color_RGBA8_Copy(&initParams.primColor, primColor); Color_RGBA8_Copy(&initParams.envColor, envColor); @@ -410,7 +410,7 @@ void EffectSsGSpk_SpawnRandColor(GlobalContext* globalCtx, Actor* actor, Vec3f* Color_RGBA8 envColor = { 255, 0, 0, 0 }; s32 randOffset; - randOffset = (Math_Rand_ZeroOne() * 20.0f) - 10.0f; + randOffset = (Rand_ZeroOne() * 20.0f) - 10.0f; primColor.r += randOffset; primColor.g += randOffset; @@ -619,12 +619,12 @@ void EffectSsHahen_SpawnBurst(GlobalContext* globalCtx, Vec3f* pos, f32 burstSca accel.x = accel.z = 0.0f; for (i = 0; i < count; i++) { - velocity.x = (Math_Rand_ZeroOne() - 0.5f) * burstScale; - velocity.z = (Math_Rand_ZeroOne() - 0.5f) * burstScale; - velocity.y = ((Math_Rand_ZeroOne() * 0.5f) + 0.5f) * burstScale; + velocity.x = (Rand_ZeroOne() - 0.5f) * burstScale; + velocity.z = (Rand_ZeroOne() - 0.5f) * burstScale; + velocity.y = ((Rand_ZeroOne() * 0.5f) + 0.5f) * burstScale; - EffectSsHahen_Spawn(globalCtx, pos, &velocity, &accel, unused, Math_Rand_S16Offset(scale, randScaleRange), - objId, life, dList); + EffectSsHahen_Spawn(globalCtx, pos, &velocity, &accel, unused, Rand_S16Offset(scale, randScaleRange), objId, + life, dList); } } @@ -664,7 +664,7 @@ void EffectSsSibuki_SpawnBurst(GlobalContext* globalCtx, Vec3f* pos) { Vec3f unusedZeroVec1 = { 0.0f, 0.0f, 0.0f }; Vec3f unusedZeroVec2 = { 0.0f, 0.0f, 0.0f }; Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; - s16 randDirection = Math_Rand_ZeroOne() * 1.99f; + s16 randDirection = Rand_ZeroOne() * 1.99f; for (i = 0; i < KREG(19) + 30; i++) { EffectSsSibuki_Spawn(globalCtx, pos, &zeroVec, &zeroVec, i / (KREG(27) + 6), randDirection, KREG(18) + 40); @@ -864,7 +864,7 @@ void EffectSsIcePiece_SpawnBurst(GlobalContext* globalCtx, Vec3f* refPos, f32 sc for (i = 0; i < ARRAY_COUNT(vecScales); i++) { pos = *refPos; - velocityScale = Math_Rand_ZeroFloat(1.0f) + 0.5f; + velocityScale = Rand_ZeroFloat(1.0f) + 0.5f; velocity.x = (vecScales[i].x * 0.18f) * velocityScale; velocity.y = (vecScales[i].y * 0.18f) * velocityScale; velocity.z = (vecScales[i].z * 0.18f) * velocityScale; @@ -872,8 +872,8 @@ void EffectSsIcePiece_SpawnBurst(GlobalContext* globalCtx, Vec3f* refPos, f32 sc pos.y += vecScales[i].y; pos.z += vecScales[i].z; - EffectSsIcePiece_Spawn(globalCtx, &pos, (Math_Rand_ZeroFloat(1.0f) + 0.5f) * ((scale * 1.3f) * 100.0f), - &velocity, &accel, 25); + EffectSsIcePiece_Spawn(globalCtx, &pos, (Rand_ZeroFloat(1.0f) + 0.5f) * ((scale * 1.3f) * 100.0f), &velocity, + &accel, 25); } } diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c index 1f5c522cf8..babfd19f82 100644 --- a/src/code/z_elf_message.c +++ b/src/code/z_elf_message.c @@ -90,7 +90,7 @@ u32 func_8006BF1C(ElfMessage** msgp) { return false; } - temp3 = Math_Rand_ZeroFloat(temp1); + temp3 = Rand_ZeroFloat(temp1); for (temp1 = 0; temp1 < temp2; temp1++) { if (sp44[temp1]) { if (temp3 > 0) { diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index c23701d19c..81c1b93952 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -244,7 +244,7 @@ void func_8001D480(EnAObj* this, s16 params) { } void func_8001D4A8(EnAObj* this, GlobalContext* globalCtx) { - Math_SmoothScaleMaxMinF(&this->dyna.actor.speedXZ, 1.0f, 1.0f, 0.5f, 0.0f); + Math_SmoothStepToF(&this->dyna.actor.speedXZ, 1.0f, 1.0f, 0.5f, 0.0f); this->dyna.actor.shape.rot.x = this->dyna.actor.shape.rot.x + (this->dyna.actor.posRot.rot.x >> 1); this->dyna.actor.shape.rot.z = this->dyna.actor.shape.rot.z + (this->dyna.actor.posRot.rot.z >> 1); @@ -282,7 +282,7 @@ void func_8001D608(EnAObj* this, GlobalContext* globalCtx) { ? -2.5f : ((this->dyna.actor.speedXZ > 2.5f) ? 2.5f : this->dyna.actor.speedXZ); - Math_SmoothScaleMaxMinF(&this->dyna.actor.speedXZ, 0.0f, 1.0f, 1.0f, 0.0f); + Math_SmoothStepToF(&this->dyna.actor.speedXZ, 0.0f, 1.0f, 1.0f, 0.0f); if (this->dyna.actor.speedXZ != 0.0f) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 1ae9c71c43..0a79d0dc40 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -96,7 +96,7 @@ void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) { this->unk_15C = 0.02f; break; case ITEM00_HEART: - this->actor.initPosRot.rot.z = Math_Rand_CenteredFloat(65535.0f); + this->actor.initPosRot.rot.z = Rand_CenteredFloat(65535.0f); sp34 = 430.0f; Actor_SetScale(&this->actor, 0.02f); this->unk_15C = 0.02f; @@ -286,25 +286,25 @@ void func_8001DFC8(EnItem00* this, GlobalContext* globalCtx) { } else { if ((this->actor.params >= ITEM00_SHIELD_DEKU) && (this->actor.params != ITEM00_BOMBS_SPECIAL)) { if (this->unk_15A == -1) { - if (!Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, this->actor.posRot.rot.x - 0x4000, 2, 3000, + if (!Math_SmoothStepToS(&this->actor.shape.rot.x, this->actor.posRot.rot.x - 0x4000, 2, 3000, 1500)) { this->unk_15A = -2; } } else { - if (!Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, -this->actor.posRot.rot.x - 0x4000, 2, 3000, + if (!Math_SmoothStepToS(&this->actor.shape.rot.x, -this->actor.posRot.rot.x - 0x4000, 2, 3000, 1500)) { this->unk_15A = -1; } } - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.x, 0, 2, 2500, 500); + Math_SmoothStepToS(&this->actor.posRot.rot.x, 0, 2, 2500, 500); } } if (this->actor.params == ITEM00_HEART_PIECE) { - this->actor.shape.unk_08 = Math_Sins(this->actor.shape.rot.y) * 150.0f + 850.0f; + this->actor.shape.unk_08 = Math_SinS(this->actor.shape.rot.y) * 150.0f + 850.0f; } - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f); if (this->unk_154 == 0) { if ((this->actor.params != ITEM00_SMALL_KEY) && (this->actor.params != ITEM00_HEART_PIECE) && @@ -334,9 +334,9 @@ void func_8001E1C8(EnItem00* this, GlobalContext* globalCtx) { } if (globalCtx->gameplayFrames & 1) { - pos.x = this->actor.posRot.pos.x + Math_Rand_CenteredFloat(10.0f); - pos.y = this->actor.posRot.pos.y + Math_Rand_CenteredFloat(10.0f); - pos.z = this->actor.posRot.pos.z + Math_Rand_CenteredFloat(10.0f); + pos.x = this->actor.posRot.pos.x + Rand_CenteredFloat(10.0f); + pos.y = this->actor.posRot.pos.y + Rand_CenteredFloat(10.0f); + pos.z = this->actor.posRot.pos.z + Rand_CenteredFloat(10.0f); EffectSsKiraKira_SpawnSmall(globalCtx, &pos, &D_80115518, &D_80115524, &D_80115510, &D_80115514); } @@ -368,9 +368,9 @@ void func_8001E304(EnItem00* this, GlobalContext* globalCtx) { } this->actor.initPosRot.rot.z += (s16)((this->actor.velocity.y + 3.0f) * 1000.0f); this->actor.posRot.pos.x += - Math_Coss(this->actor.yawTowardsLink) * (-3.0f * Math_Coss(this->actor.initPosRot.rot.z)); + Math_CosS(this->actor.yawTowardsLink) * (-3.0f * Math_CosS(this->actor.initPosRot.rot.z)); this->actor.posRot.pos.z += - Math_Sins(this->actor.yawTowardsLink) * (-3.0f * Math_Coss(this->actor.initPosRot.rot.z)); + Math_SinS(this->actor.yawTowardsLink) * (-3.0f * Math_CosS(this->actor.initPosRot.rot.z)); } } @@ -392,9 +392,9 @@ void func_8001E304(EnItem00* this, GlobalContext* globalCtx) { } if (!(globalCtx->gameplayFrames & 1)) { - pos.x = this->actor.posRot.pos.x + (Math_Rand_ZeroOne() - 0.5f) * 10.0f; - pos.y = this->actor.posRot.pos.y + (Math_Rand_ZeroOne() - 0.5f) * 10.0f; - pos.z = this->actor.posRot.pos.z + (Math_Rand_ZeroOne() - 0.5f) * 10.0f; + pos.x = this->actor.posRot.pos.x + (Rand_ZeroOne() - 0.5f) * 10.0f; + pos.y = this->actor.posRot.pos.y + (Rand_ZeroOne() - 0.5f) * 10.0f; + pos.z = this->actor.posRot.pos.z + (Rand_ZeroOne() - 0.5f) * 10.0f; EffectSsKiraKira_SpawnSmall(globalCtx, &pos, &D_80115518, &D_80115524, &D_80115510, &D_80115514); } @@ -431,7 +431,7 @@ void func_8001E5C8(EnItem00* this, GlobalContext* globalCtx) { this->actor.shape.rot.y = 0; } - this->actor.posRot.pos.y += 40.0f + Math_Sins(this->unk_15A * 15000) * (this->unk_15A * 0.3f); + this->actor.posRot.pos.y += 40.0f + Math_SinS(this->unk_15A * 15000) * (this->unk_15A * 0.3f); if (LINK_IS_ADULT) { this->actor.posRot.pos.y += 20.0f; @@ -463,7 +463,7 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); - Math_SmoothScaleMaxMinF(&this->actor.scale.x, this->unk_15C, 0.1f, this->unk_15C * 0.1f, 0.0f); + Math_SmoothStepToF(&this->actor.scale.x, this->unk_15C, 0.1f, this->unk_15C * 0.1f, 0.0f); this->actor.scale.z = this->actor.scale.x; this->actor.scale.y = this->actor.scale.x; @@ -506,7 +506,7 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) { if ((this->actor.params == ITEM00_SHIELD_DEKU) || (this->actor.params == ITEM00_SHIELD_HYLIAN) || (this->actor.params == ITEM00_TUNIC_ZORA) || (this->actor.params == ITEM00_TUNIC_GORON)) { - f32 newUnkBC = Math_Coss(this->actor.shape.rot.x) * 37.0f; + f32 newUnkBC = Math_CosS(this->actor.shape.rot.x) * 37.0f; this->actor.shape.unk_08 = newUnkBC; if (newUnkBC >= 0.0f) { this->actor.shape.unk_08 = this->actor.shape.unk_08; @@ -892,7 +892,7 @@ EnItem00* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, s16 pa spawnedActor->actor.velocity.y = !param4000 ? 8.0f : -2.0f; spawnedActor->actor.speedXZ = 2.0f; spawnedActor->actor.gravity = -0.9f; - spawnedActor->actor.posRot.rot.y = Math_Rand_CenteredFloat(65536.0f); + spawnedActor->actor.posRot.rot.y = Rand_CenteredFloat(65536.0f); Actor_SetScale(&spawnedActor->actor, 0.0f); EnItem00_SetupAction(spawnedActor, func_8001E304); spawnedActor->unk_15A = 220; @@ -933,7 +933,7 @@ EnItem00* Item_DropCollectible2(GlobalContext* globalCtx, Vec3f* spawnPos, s16 p spawnedActor->actor.velocity.y = 0.0f; spawnedActor->actor.speedXZ = 0.0f; spawnedActor->actor.gravity = param4000 ? 0.0f : -0.9f; - spawnedActor->actor.posRot.rot.y = Math_Rand_CenteredFloat(65536.0f); + spawnedActor->actor.posRot.rot.y = Rand_CenteredFloat(65536.0f); spawnedActor->actor.flags |= 0x0010; } } @@ -950,7 +950,7 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3 s16 dropTableIndex; u8 dropId; - dropTableIndex = Math_Rand_ZeroOne() * 16.0f; + dropTableIndex = Rand_ZeroOne() * 16.0f; param8000 = params & 0x8000; params = params & 0x7FFF; @@ -1045,7 +1045,7 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3 spawnedActor->actor.velocity.y = 8.0f; spawnedActor->actor.speedXZ = 2.0f; spawnedActor->actor.gravity = -0.9f; - spawnedActor->actor.posRot.rot.y = Math_Rand_ZeroOne() * 40000.0f; + spawnedActor->actor.posRot.rot.y = Rand_ZeroOne() * 40000.0f; Actor_SetScale(&spawnedActor->actor, 0.0f); EnItem00_SetupAction(spawnedActor, func_8001E304); spawnedActor->actor.flags |= 0x0010; diff --git a/src/code/z_fbdemo_fade.c b/src/code/z_fbdemo_fade.c index 57c58f2748..e70c1a81d2 100644 --- a/src/code/z_fbdemo_fade.c +++ b/src/code/z_fbdemo_fade.c @@ -60,12 +60,12 @@ void TransitionFade_Update(TransitionFade* this, s32 updateRate) { newAlpha = this->fadeColor.a; if (iREG(50) != 0) { if (iREG(50) < 0) { - if (Math_ApproxS(&newAlpha, 255, 255)) { + if (Math_StepToS(&newAlpha, 255, 255)) { iREG(50) = 150; } } else { - Math_ApproxS(&iREG(50), 20, 60); - if (Math_ApproxS(&newAlpha, 0, iREG(50))) { + Math_StepToS(&iREG(50), 20, 60); + if (Math_StepToS(&newAlpha, 0, iREG(50))) { iREG(50) = 0; this->isDone = 1; } diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index 016743503d..eccb1a7998 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -31,7 +31,7 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_80073A5C.s") f32 func_800746DC() { - return Math_Rand_ZeroOne() - 0.5f; + return Rand_ZeroOne() - 0.5f; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_80074704.s") diff --git a/src/code/z_lib.c b/src/code/z_lib.c index 5c6336890f..177217f3c1 100644 --- a/src/code/z_lib.c +++ b/src/code/z_lib.c @@ -8,19 +8,21 @@ void Lib_MemSet(u8* dest, size_t size, u8 val) { // clang-format on } -f32 Math_Coss(s16 angle) { - return coss(angle) * (1.0f / 32767); +f32 Math_CosS(s16 angle) { + return coss(angle) * SHT_MINV; } -f32 Math_Sins(s16 angle) { - return sins(angle) * (1.0f / 32767); +f32 Math_SinS(s16 angle) { + return sins(angle) * SHT_MINV; } -s32 Math_ApproxUpdateScaledS(s16* pValue, s16 target, s16 step) { - f32 updateScale; - +/** + * Changes pValue by step (scaled by the update rate) towards target, setting it equal when the target is reached. + * Returns true when target is reached, false otherwise. + */ +s32 Math_ScaledStepToS(s16* pValue, s16 target, s16 step) { if (step != 0) { - updateScale = R_UPDATE_RATE * 0.5f; + f32 updateScale = R_UPDATE_RATE * 0.5f; if ((s16)(*pValue - target) > 0) { step = -step; @@ -30,16 +32,20 @@ s32 Math_ApproxUpdateScaledS(s16* pValue, s16 target, s16 step) { if (((s16)(*pValue - target) * step) >= 0) { *pValue = target; - return 1; + return true; } } else if (target == *pValue) { - return 1; + return true; } - return 0; + return false; } -s32 Math_ApproxS(s16* pValue, s16 target, s16 step) { +/** + * Changes pValue by step towards target, setting it equal when the target is reached. + * Returns true when target is reached, false otherwise. + */ +s32 Math_StepToS(s16* pValue, s16 target, s16 step) { if (step != 0) { if (target < *pValue) { step = -step; @@ -49,16 +55,20 @@ s32 Math_ApproxS(s16* pValue, s16 target, s16 step) { if (((*pValue - target) * step) >= 0) { *pValue = target; - return 1; + return true; } } else if (target == *pValue) { - return 1; + return true; } - return 0; + return false; } -s32 Math_ApproxF(f32* pValue, f32 target, f32 step) { +/** + * Changes pValue by step towards target, setting it equal when the target is reached. + * Returns true when target is reached, false otherwise. + */ +s32 Math_StepToF(f32* pValue, f32 target, f32 step) { if (step != 0.0f) { if (target < *pValue) { step = -step; @@ -68,84 +78,104 @@ s32 Math_ApproxF(f32* pValue, f32 target, f32 step) { if (((*pValue - target) * step) >= 0) { *pValue = target; - return 1; + return true; } } else if (target == *pValue) { - return 1; + return true; } - return 0; + return false; } -s32 func_80077A90(s16* pValue, s16 target, s16 step) { +/** + * Changes pValue by step. If pvalue reaches limit angle or its opposite, sets it equal to limit angle. + * Returns true when limit angle or its opposite is reached, false otherwise. + */ +s32 Math_StepUntilAngleS(s16* pValue, s16 limit, s16 step) { s16 orig = *pValue; *pValue += step; - if (((s16)(*pValue - target) * (s16)(orig - target)) <= 0) { - *pValue = target; - return 1; + if (((s16)(*pValue - limit) * (s16)(orig - limit)) <= 0) { + *pValue = limit; + return true; } - return 0; + return false; } -s32 func_80077AF8(s16* pValue, s16 target, s16 step) { +/** + * Changes pValue by step. If pvalue reaches limit, sets it equal to limit. + * Returns true when limit is reached, false otherwise. + */ +s32 Math_StepUntilS(s16* pValue, s16 limit, s16 step) { s16 orig = *pValue; *pValue += step; - if (((*pValue - target) * ((s16)orig - target)) <= 0) { - *pValue = target; - return 1; + if (((*pValue - limit) * (orig - limit)) <= 0) { + *pValue = limit; + return true; } - return 0; + return false; } -s32 func_80077B58(s16* pValue, s16 target, s16 step) { - s32 phi_v0 = target - *pValue; +/** + * Changes pValue by step towards target angle, setting it equal when the target is reached. + * Returns true when target is reached, false otherwise. + */ +s32 Math_StepToAngleS(s16* pValue, s16 target, s16 step) { + s32 diff = target - *pValue; - if (phi_v0 < 0) { + if (diff < 0) { step = -step; } - if (phi_v0 >= 0x8000) { + if (diff >= 0x8000) { step = -step; - phi_v0 = 0xFFFF0001 - -phi_v0; - } else if (phi_v0 <= -0x8000) { - phi_v0 += 0xFFFF; + diff = -0xFFFF - -diff; + } else if (diff <= -0x8000) { + diff += 0xFFFF; step = -step; } if (step != 0) { *pValue += step; - if ((phi_v0 * step) <= 0) { + if ((diff * step) <= 0) { *pValue = target; - return 1; + return true; } } else if (target == *pValue) { - return 1; + return true; } - return 0; + return false; } -s32 func_80077C1C(f32* pValue, f32 target, f32 step) { +/** + * Changes pValue by step. If pvalue reaches limit, sets it equal to limit. + * Returns true when limit is reached, false otherwise. + */ +s32 Math_StepUntilF(f32* pValue, f32 limit, f32 step) { f32 orig = *pValue; *pValue += step; - if (((*pValue - target) * (orig - target)) <= 0) { - *pValue = target; - return 1; + if (((*pValue - limit) * (orig - limit)) <= 0) { + *pValue = limit; + return true; } - return 0; + return false; } -s32 func_80077C6C(f32* pValue, f32 target, f32 incrStep, f32 decrStep) { +/** + * Changes pValue toward target by incrStep if pValue is smaller and by decrStep if it is greater, setting it equal when + * target is reached. Returns true when target is reached, false otherwise. + */ +s32 Math_AymStepToF(f32* pValue, f32 target, f32 incrStep, f32 decrStep) { f32 step = (target >= *pValue) ? incrStep : decrStep; if (step != 0.0f) { @@ -173,15 +203,15 @@ void func_80077D10(f32* arg0, s16* arg1, Input* input) { *arg0 = sqrtf(SQ(relX) + SQ(relY)); *arg0 = (60.0f < *arg0) ? 60.0f : *arg0; - *arg1 = atan2s(relY, -relX); + *arg1 = Math_Atan2S(relY, -relX); } -s16 Math_Rand_S16Offset(s16 base, s16 range) { - return (s16)(Math_Rand_ZeroOne() * range) + base; +s16 Rand_S16Offset(s16 base, s16 range) { + return (s16)(Rand_ZeroOne() * range) + base; } -s16 Math_Rand_S16OffsetStride(s16 base, s16 stride, s16 range) { - return (s16)(Math_Rand_ZeroOne() * range) * stride + base; +s16 Rand_S16OffsetStride(s16 base, s16 stride, s16 range) { + return (s16)(Rand_ZeroOne() * range) * stride + base; } void Math_Vec3f_Copy(Vec3f* dest, Vec3f* src) { @@ -251,11 +281,11 @@ s16 Math_Vec3f_Yaw(Vec3f* a, Vec3f* b) { f32 dx = b->x - a->x; f32 dz = b->z - a->z; - return atan2s(dz, dx); + return Math_Atan2S(dz, dx); } s16 Math_Vec3f_Pitch(Vec3f* a, Vec3f* b) { - return atan2s(Math_Vec3f_DistXZ(a, b), a->y - b->y); + return Math_Atan2S(Math_Vec3f_DistXZ(a, b), a->y - b->y); } void IChain_Apply_u8(u8* ptr, InitChainEntry* ichain); @@ -351,32 +381,34 @@ void IChain_Apply_Vec3s(u8* ptr, InitChainEntry* ichain) { vec->x = val; } -f32 Math_SmoothScaleMaxMinF(f32* pValue, f32 target, f32 scale, f32 maxStep, f32 minStep) { - f32 var; - +/** + * Changes pValue by step towards target. If this step is more than fraction of the remaining distance, step by that + * instead, with a minimum step of minStep. Returns remaining distance to target. + */ +f32 Math_SmoothStepToF(f32* pValue, f32 target, f32 fraction, f32 step, f32 minStep) { if (*pValue != target) { - var = (target - *pValue) * scale; + f32 stepSize = (target - *pValue) * fraction; - if ((var >= minStep) || (var <= -minStep)) { - if (var > maxStep) { - var = maxStep; + if ((stepSize >= minStep) || (stepSize <= -minStep)) { + if (stepSize > step) { + stepSize = step; } - if (var < -maxStep) { - var = -maxStep; + if (stepSize < -step) { + stepSize = -step; } - *pValue += var; + *pValue += stepSize; } else { - if (var < minStep) { + if (stepSize < minStep) { *pValue += minStep; - var = minStep; + stepSize = minStep; if (target < *pValue) { *pValue = target; } } - if (var > -minStep) { + if (stepSize > -minStep) { *pValue += -minStep; if (*pValue < target) { @@ -389,73 +421,76 @@ f32 Math_SmoothScaleMaxMinF(f32* pValue, f32 target, f32 scale, f32 maxStep, f32 return fabsf(target - *pValue); } -void Math_SmoothScaleMaxF(f32* pValue, f32 target, f32 scale, f32 maxStep) { - f32 step; - +/** + * Changes pValue by step towards target. If step is more than fraction of the remaining distance, step by that instead. + */ +void Math_ApproachF(f32* pValue, f32 target, f32 fraction, f32 step) { if (*pValue != target) { - step = (target - *pValue) * scale; + f32 stepSize = (target - *pValue) * fraction; - if (step > maxStep) { - step = maxStep; - } else if (step < -maxStep) { - step = -maxStep; + if (stepSize > step) { + stepSize = step; + } else if (stepSize < -step) { + stepSize = -step; } - *pValue += step; + *pValue += stepSize; } } -void Math_SmoothDownscaleMaxF(f32* pValue, f32 scale, f32 maxStep) { - f32 step; +/** + * Changes pValue by step towards zero. If step is more than fraction of the remaining distance, step by that instead. + */ +void Math_ApproachZeroF(f32* pValue, f32 fraction, f32 step) { + f32 stepSize = *pValue * fraction; - step = *pValue * scale; - - if (step > maxStep) { - step = maxStep; - } else if (step < -maxStep) { - step = -maxStep; + if (stepSize > step) { + stepSize = step; + } else if (stepSize < -step) { + stepSize = -step; } - *pValue -= step; + *pValue -= stepSize; } -f32 func_800784D8(f32* pValue, f32 target, f32 scale, f32 maxStep, f32 minStep) { - f32 step; - f32 baseStep; - - step = 0.0f; - baseStep = target - *pValue; +/** + * Changes pValue by step towards target angle in degrees. If this step is more than fraction of the remaining distance, + * step by that instead, with a minimum step of minStep. Returns the value of the step taken. + */ +f32 Math_SmoothStepToDegF(f32* pValue, f32 target, f32 fraction, f32 step, f32 minStep) { + f32 stepSize = 0.0f; + f32 diff = target - *pValue; if (*pValue != target) { - if (baseStep > 180.0f) { - baseStep = -(360.0f - baseStep); - } else if (baseStep < -180.0f) { - baseStep = 360.0f + baseStep; + if (diff > 180.0f) { + diff = -(360.0f - diff); + } else if (diff < -180.0f) { + diff = 360.0f + diff; } - step = baseStep * scale; + stepSize = diff * fraction; - if ((step >= minStep) || (step <= -minStep)) { - if (step > maxStep) { - step = maxStep; + if ((stepSize >= minStep) || (stepSize <= -minStep)) { + if (stepSize > step) { + stepSize = step; } - if (step < -maxStep) { - step = -maxStep; + if (stepSize < -step) { + stepSize = -step; } - *pValue += step; + *pValue += stepSize; } else { - if (step < minStep) { - step = minStep; - *pValue += step; + if (stepSize < minStep) { + stepSize = minStep; + *pValue += stepSize; if (*pValue > target) { *pValue = target; } } - if (step > -minStep) { - step = -minStep; - *pValue += step; + if (stepSize > -minStep) { + stepSize = -minStep; + *pValue += stepSize; if (*pValue < target) { *pValue = target; } @@ -471,28 +506,30 @@ f32 func_800784D8(f32* pValue, f32 target, f32 scale, f32 maxStep, f32 minStep) *pValue += 360.0f; } - return step; + return stepSize; } -s16 Math_SmoothScaleMaxMinS(s16* pValue, s16 target, s16 invScale, s16 maxStep, s16 minStep) { - s16 step = 0; - s16 diff = (target - *pValue); - - s32 baseStep = diff / invScale; +/** + * Changes pValue by step towards target. If this step is more than 1/scale of the remaining distance, step by that + * instead, with a minimum step of minStep. Returns remaining distance to target. + */ +s16 Math_SmoothStepToS(s16* pValue, s16 target, s16 scale, s16 step, s16 minStep) { + s16 stepSize = 0; + s16 diff = target - *pValue; if (*pValue != target) { - step = baseStep; + stepSize = diff / scale; - if ((step > minStep) || (step < -minStep)) { - if (step > maxStep) { - step = maxStep; + if ((stepSize > minStep) || (stepSize < -minStep)) { + if (stepSize > step) { + stepSize = step; } - if (step < -maxStep) { - step = -maxStep; + if (stepSize < -step) { + stepSize = -step; } - *pValue += step; + *pValue += stepSize; } else { if (diff >= 0) { *pValue += minStep; @@ -513,17 +550,20 @@ s16 Math_SmoothScaleMaxMinS(s16* pValue, s16 target, s16 invScale, s16 maxStep, return diff; } -void Math_SmoothScaleMaxS(s16* pValue, s16 target, s16 invScale, s16 maxStep) { - s16 step = target - *pValue; +/** + * Changes pValue by step towards target. If step is more than 1/scale of the remaining distance, step by that instead. + */ +void Math_ApproachS(s16* pValue, s16 target, s16 scale, s16 maxStep) { + s16 diff = target - *pValue; - step /= invScale; + diff /= scale; - if (step > maxStep) { + if (diff > maxStep) { *pValue += maxStep; - } else if (step < -maxStep) { + } else if (diff < -maxStep) { *pValue -= maxStep; } else { - *pValue += step; + *pValue += diff; } } diff --git a/src/code/z_olib.c b/src/code/z_olib.c index 92d66a2d3d..9c1ca88615 100644 --- a/src/code/z_olib.c +++ b/src/code/z_olib.c @@ -80,10 +80,10 @@ Vec3f* OLib_VecSphToVec3f(Vec3f* dest, VecSph* sph) { f32 sinYaw; f32 cosYaw; - cosPitch = Math_Coss(sph->pitch); - cosYaw = Math_Coss(sph->yaw); - sinPitch = Math_Sins(sph->pitch); - sinYaw = Math_Sins(sph->yaw); + cosPitch = Math_CosS(sph->pitch); + cosYaw = Math_CosS(sph->yaw); + sinPitch = Math_SinS(sph->pitch); + sinYaw = Math_SinS(sph->yaw); v.x = sph->r * sinPitch * sinYaw; v.y = sph->r * cosPitch; @@ -122,14 +122,14 @@ VecSph* OLib_Vec3fToVecSph(VecSph* dest, Vec3f* vec) { if ((dist == 0.0f) && (vec->y == 0.0f)) { sph.pitch = 0; } else { - sph.pitch = DEGF_TO_BINANG(RADF_TO_DEGF(Math_atan2f(dist, vec->y))); + sph.pitch = DEGF_TO_BINANG(RADF_TO_DEGF(Math_FAtan2F(dist, vec->y))); } sph.r = sqrtf(SQ(vec->y) + distSquared); if ((vec->x == 0.0f) && (vec->z == 0.0f)) { sph.yaw = 0; } else { - sph.yaw = DEGF_TO_BINANG(RADF_TO_DEGF(Math_atan2f(vec->x, vec->z))); + sph.yaw = DEGF_TO_BINANG(RADF_TO_DEGF(Math_FAtan2F(vec->x, vec->z))); } *dest = sph; @@ -183,8 +183,8 @@ VecSph* OLib_Vec3fDiffToVecSphGeo(VecSph* dest, Vec3f* a, Vec3f* b) { Vec3f* OLib_Vec3fDiffRad(Vec3f* dest, Vec3f* a, Vec3f* b) { Vec3f anglesRad; - anglesRad.x = Math_atan2f(b->z - a->z, b->y - a->y); - anglesRad.y = Math_atan2f(b->x - a->x, b->z - a->z); + anglesRad.x = Math_FAtan2F(b->z - a->z, b->y - a->y); + anglesRad.y = Math_FAtan2F(b->x - a->x, b->z - a->z); anglesRad.z = 0; *dest = anglesRad; diff --git a/src/code/z_path.c b/src/code/z_path.c index f9bcac0848..0f50fe02a6 100644 --- a/src/code/z_path.c +++ b/src/code/z_path.c @@ -27,7 +27,7 @@ f32 Path_OrientAndGetDistSq(Actor* actor, Path* path, s16 waypoint, s16* yaw) { dx = pointPos->x - actor->posRot.pos.x; dz = pointPos->z - actor->posRot.pos.z; - *yaw = Math_atan2f(dx, dz) * (32768 / M_PI); + *yaw = Math_FAtan2F(dx, dz) * (32768 / M_PI); return SQ(dx) + SQ(dz); } diff --git a/src/code/z_play.c b/src/code/z_play.c index 95d973dff2..4d27f4d139 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -339,7 +339,7 @@ void Gameplay_Init(GameState* thisx) { gTrnsnUnkState = 0; globalCtx->transitionMode = 0; func_8008E6A0(&globalCtx->sub_7B8); - Math_Rand_Seed((u32)osGetTime()); + Rand_Seed((u32)osGetTime()); Matrix_Init(&globalCtx->state); globalCtx->state.main = Gameplay_Main; globalCtx->state.destroy = Gameplay_Destroy; diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 0e32913729..6d1d6204a2 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -754,7 +754,7 @@ void func_8008F87C(GlobalContext* globalCtx, Player* this, SkelAnime* skelAnime, sp58 = sp7C - SQ(sp60); sp58 = (sp7C < SQ(sp60)) ? 0.0f : sqrtf(sp58); - sp54 = Math_atan2f(sp58, sp60); + sp54 = Math_FAtan2F(sp58, sp60); sp6C = sp80 - spA4.y; @@ -765,9 +765,9 @@ void func_8008F87C(GlobalContext* globalCtx, Player* this, SkelAnime* skelAnime, sp58 = sp7C - SQ(sp60); sp58 = (sp7C < SQ(sp60)) ? 0.0f : sqrtf(sp58); - sp50 = Math_atan2f(sp58, sp60); + sp50 = Math_FAtan2F(sp58, sp60); - temp1 = (M_PI - (Math_atan2f(sp5C, sp58) + ((M_PI / 2) - sp50))) * 10430.378f; + temp1 = (M_PI - (Math_FAtan2F(sp5C, sp58) + ((M_PI / 2) - sp50))) * 10430.378f; temp1 = temp1 - skelAnime->limbDrawTbl[shinLimbIndex].z; if ((s16)(ABS(skelAnime->limbDrawTbl[shinLimbIndex].x) + ABS(skelAnime->limbDrawTbl[shinLimbIndex].y)) < @@ -814,7 +814,7 @@ s32 func_8008FCC8(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p pos->y -= this->unk_6C4; if (this->unk_6C2 != 0) { - Matrix_Translate(pos->x, ((Math_Coss(this->unk_6C2) - 1.0f) * 200.0f) + pos->y, pos->z, MTXMODE_APPLY); + Matrix_Translate(pos->x, ((Math_CosS(this->unk_6C2) - 1.0f) * 200.0f) + pos->y, pos->z, MTXMODE_APPLY); Matrix_RotateX(this->unk_6C2 * (M_PI / 32768), MTXMODE_APPLY); Matrix_RotateRPY(rot->x, rot->y, rot->z, MTXMODE_APPLY); pos->x = pos->y = pos->z = 0.0f; @@ -1034,8 +1034,8 @@ void Player_DrawGetItemImpl(GlobalContext* globalCtx, Player* this, Vec3f* refPo gSPSegment(POLY_OPA_DISP++, 0x06, this->giObjectSegment); gSPSegment(POLY_XLU_DISP++, 0x06, this->giObjectSegment); - Matrix_Translate(refPos->x + (3.3f * Math_Sins(this->actor.shape.rot.y)), refPos->y + height, - refPos->z + ((3.3f + (IREG(90) / 10.0f)) * Math_Coss(this->actor.shape.rot.y)), MTXMODE_NEW); + Matrix_Translate(refPos->x + (3.3f * Math_SinS(this->actor.shape.rot.y)), refPos->y + height, + refPos->z + ((3.3f + (IREG(90) / 10.0f)) * Math_CosS(this->actor.shape.rot.y)), MTXMODE_NEW); Matrix_RotateRPY(0, globalCtx->gameplayFrames * 1000, 0, MTXMODE_APPLY); Matrix_Scale(0.2f, 0.2f, 0.2f, MTXMODE_APPLY); diff --git a/src/code/z_quake.c b/src/code/z_quake.c index 3638e3a76b..8bf332420c 100644 --- a/src/code/z_quake.c +++ b/src/code/z_quake.c @@ -64,8 +64,8 @@ void Quake_UpdateShakeInfo(QuakeRequest* req, ShakeInfo* shake, f32 y, f32 x) { s16 Quake_Callback1(QuakeRequest* req, ShakeInfo* shake) { s32 pad; if (req->countdown > 0) { - f32 a = Math_Sins(req->speed * req->countdown); - Quake_UpdateShakeInfo(req, shake, a, Math_Rand_ZeroOne() * a); + f32 a = Math_SinS(req->speed * req->countdown); + Quake_UpdateShakeInfo(req, shake, a, Rand_ZeroOne() * a); req->countdown--; } return req->countdown; @@ -73,7 +73,7 @@ s16 Quake_Callback1(QuakeRequest* req, ShakeInfo* shake) { s16 Quake_Callback5(QuakeRequest* req, ShakeInfo* shake) { if (req->countdown > 0) { - f32 a = Math_Sins(req->speed * req->countdown); + f32 a = Math_SinS(req->speed * req->countdown); Quake_UpdateShakeInfo(req, shake, a, a); req->countdown--; } @@ -85,14 +85,14 @@ s16 Quake_Callback6(QuakeRequest* req, ShakeInfo* shake) { f32 a; req->countdown--; - a = Math_Sins(req->speed * ((req->countdown & 0xF) + 500)); - Quake_UpdateShakeInfo(req, shake, a, Math_Rand_ZeroOne() * a); + a = Math_SinS(req->speed * ((req->countdown & 0xF) + 500)); + Quake_UpdateShakeInfo(req, shake, a, Rand_ZeroOne() * a); return 1; } s16 Quake_Callback3(QuakeRequest* req, ShakeInfo* shake) { if (req->countdown > 0) { - f32 a = Math_Sins(req->speed * req->countdown) * ((f32)req->countdown / (f32)req->countdownMax); + f32 a = Math_SinS(req->speed * req->countdown) * ((f32)req->countdown / (f32)req->countdownMax); Quake_UpdateShakeInfo(req, shake, a, a); req->countdown--; } @@ -101,8 +101,8 @@ s16 Quake_Callback3(QuakeRequest* req, ShakeInfo* shake) { s16 Quake_Callback2(QuakeRequest* req, ShakeInfo* shake) { if (req->countdown > 0) { - f32 a = Math_Rand_ZeroOne(); - Quake_UpdateShakeInfo(req, shake, a, Math_Rand_ZeroOne() * a); + f32 a = Rand_ZeroOne(); + Quake_UpdateShakeInfo(req, shake, a, Rand_ZeroOne() * a); req->countdown--; } return req->countdown; @@ -110,8 +110,8 @@ s16 Quake_Callback2(QuakeRequest* req, ShakeInfo* shake) { s16 Quake_Callback4(QuakeRequest* req, ShakeInfo* shake) { if (req->countdown > 0) { - f32 a = Math_Rand_ZeroOne() * ((f32)req->countdown / (f32)req->countdownMax); - Quake_UpdateShakeInfo(req, shake, a, Math_Rand_ZeroOne() * a); + f32 a = Rand_ZeroOne() * ((f32)req->countdown / (f32)req->countdownMax); + Quake_UpdateShakeInfo(req, shake, a, Rand_ZeroOne() * a); req->countdown--; } return req->countdown; @@ -151,7 +151,7 @@ QuakeRequest* Quake_AddImpl(Camera* cam, u32 callbackIdx) { req->camPtrIdx = cam->thisIdx; req->callbackIdx = callbackIdx; req->unk_1C = 1; - req->randIdx = ((s16)(Math_Rand_ZeroOne() * (f32)0x10000) & ~3) + idx; + req->randIdx = ((s16)(Rand_ZeroOne() * (f32)0x10000) & ~3) + idx; sQuakeRequestCount++; return req; diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 58069b1cae..7a1af1ee68 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -384,11 +384,11 @@ void func_80098D80(GlobalContext* globalCtx, SceneCmd* cmd) { } dayTime = gSaveContext.dayTime; - globalCtx->envCtx.unk_04.x = -(Math_Sins(dayTime - 0x8000) * 120.0f) * 25.0f; + globalCtx->envCtx.unk_04.x = -(Math_SinS(dayTime - 0x8000) * 120.0f) * 25.0f; dayTime = gSaveContext.dayTime; - globalCtx->envCtx.unk_04.y = (Math_Coss(dayTime - 0x8000) * 120.0f) * 25.0f; + globalCtx->envCtx.unk_04.y = (Math_CosS(dayTime - 0x8000) * 120.0f) * 25.0f; dayTime = gSaveContext.dayTime; - globalCtx->envCtx.unk_04.z = (Math_Coss(dayTime - 0x8000) * 20.0f) * 25.0f; + globalCtx->envCtx.unk_04.z = (Math_CosS(dayTime - 0x8000) * 20.0f) * 25.0f; if (((globalCtx->envCtx.unk_02 == 0) && (gSaveContext.cutsceneIndex < 0xFFF0)) || (gSaveContext.entranceIndex == 0x0604)) { diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index 8de6d86ada..5d10ded730 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -1449,11 +1449,11 @@ void func_8009BEEC(GlobalContext* globalCtx) { Quake_SetCountdown(var, 127); } - if ((globalCtx->gameplayFrames % 64 == 0) && (Math_Rand_ZeroOne() > 0.6f)) { + if ((globalCtx->gameplayFrames % 64 == 0) && (Rand_ZeroOne() > 0.6f)) { var = Quake_Add(ACTIVE_CAM, 3); - Quake_SetSpeed(var, 32000.0f + (Math_Rand_ZeroOne() * 3000.0f)); - Quake_SetQuakeValues(var, 10.0f - (Math_Rand_ZeroOne() * 9.0f), 0, 0, 0); - Quake_SetCountdown(var, 48.0f - (Math_Rand_ZeroOne() * 15.0f)); + Quake_SetSpeed(var, 32000.0f + (Rand_ZeroOne() * 3000.0f)); + Quake_SetQuakeValues(var, 10.0f - (Rand_ZeroOne() * 9.0f), 0, 0, 0); + Quake_SetCountdown(var, 48.0f - (Rand_ZeroOne() * 15.0f)); } } @@ -1836,11 +1836,11 @@ void func_8009DA30(GlobalContext* globalCtx) { } else { if (gSaveContext.dayTime > 0xC555) { if (globalCtx->unk_11D30[0] != 255) { - Math_ApproxS(&globalCtx->unk_11D30[0], 255, 5); + Math_StepToS(&globalCtx->unk_11D30[0], 255, 5); } } else if (gSaveContext.dayTime >= 0x4000) { if (globalCtx->unk_11D30[0] != 0) { - Math_ApproxS(&globalCtx->unk_11D30[0], 0, 10); + Math_StepToS(&globalCtx->unk_11D30[0], 0, 10); } } @@ -2189,11 +2189,11 @@ void func_8009F5D4(GlobalContext* globalCtx) { } else { if (gSaveContext.dayTime > 0xC000) { if (globalCtx->unk_11D30[0] != 255) { - Math_ApproxS(&globalCtx->unk_11D30[0], 255, 5); + Math_StepToS(&globalCtx->unk_11D30[0], 255, 5); } } else if (gSaveContext.dayTime >= 0x4000) { if (globalCtx->unk_11D30[0] != 0) { - Math_ApproxS(&globalCtx->unk_11D30[0], 0, 10); + Math_StepToS(&globalCtx->unk_11D30[0], 0, 10); } } @@ -2343,10 +2343,10 @@ void func_8009FE58(GlobalContext* globalCtx) { D_8012A3A0 += 1820; temp = 0.020000001f; - func_800AA76C(&globalCtx->view, 0.00009587531f * temp * Math_Coss(D_8012A39C), - 0.00009587531f * temp * Math_Sins(D_8012A39C), 0.00009587531f * temp * Math_Sins(D_8012A3A0)); - func_800AA78C(&globalCtx->view, 1.f + (0.79999995f * temp * Math_Sins(D_8012A3A0)), - 1.f + (0.39999998f * temp * Math_Coss(D_8012A3A0)), 1.f + (1 * temp * Math_Coss(D_8012A39C))); + func_800AA76C(&globalCtx->view, 0.00009587531f * temp * Math_CosS(D_8012A39C), + 0.00009587531f * temp * Math_SinS(D_8012A39C), 0.00009587531f * temp * Math_SinS(D_8012A3A0)); + func_800AA78C(&globalCtx->view, 1.f + (0.79999995f * temp * Math_SinS(D_8012A3A0)), + 1.f + (0.39999998f * temp * Math_CosS(D_8012A3A0)), 1.f + (1 * temp * Math_CosS(D_8012A39C))); func_800AA7AC(&globalCtx->view, 0.95f); switch (globalCtx->unk_11D30[0]) { diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index e57b770ddd..2ab52c9e24 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -1397,11 +1397,11 @@ s32 func_800A4AD8(SkelAnime* skelAnime) { } temp_a1 = skelAnime->transCurrentFrame * 0x4000; if (skelAnime->unk_03 < 0) { - sp28 = 1.0f - Math_Coss(temp_a2); - phi_f2 = 1.0f - Math_Coss(temp_a1); + sp28 = 1.0f - Math_CosS(temp_a2); + phi_f2 = 1.0f - Math_CosS(temp_a1); } else { - sp28 = Math_Sins(temp_a2); - phi_f2 = Math_Sins(temp_a1); + sp28 = Math_SinS(temp_a2); + phi_f2 = Math_SinS(temp_a1); } if (phi_f2 != 0.0f) { phi_f2 /= sp28; @@ -1614,15 +1614,15 @@ void func_800A54FC(SkelAnime* skelAnime, Vec3f* pos, s16 angle) { // `angle` rotation around y axis. x = skelAnime->limbDrawTbl[0].x; z = skelAnime->limbDrawTbl[0].z; - sin = Math_Sins(angle); - cos = Math_Coss(angle); + sin = Math_SinS(angle); + cos = Math_CosS(angle); pos->x = x * cos + z * sin; pos->z = z * cos - x * sin; x = skelAnime->prevFramePos.x; z = skelAnime->prevFramePos.z; // `prevFrameRot` rotation around y axis. - sin = Math_Sins(skelAnime->prevFrameRot); - cos = Math_Coss(skelAnime->prevFrameRot); + sin = Math_SinS(skelAnime->prevFrameRot); + cos = Math_CosS(skelAnime->prevFrameRot); pos->x -= x * cos + z * sin; pos->z -= z * cos - x * sin; } diff --git a/src/code/z_skin_matrix.c b/src/code/z_skin_matrix.c index f299f76c92..1392b1fb06 100644 --- a/src/code/z_skin_matrix.c +++ b/src/code/z_skin_matrix.c @@ -330,8 +330,8 @@ void SkinMatrix_SetRotateRPY(MtxF* mf, s16 roll, s16 pitch, s16 yaw) { f32 yy; f32 zy; - sin = Math_Sins(yaw); - cos = Math_Coss(yaw); + sin = Math_SinS(yaw); + cos = Math_CosS(yaw); mf->yy = cos; mf->yx = -sin; mf->xw = mf->yw = mf->zw = 0; @@ -339,8 +339,8 @@ void SkinMatrix_SetRotateRPY(MtxF* mf, s16 roll, s16 pitch, s16 yaw) { mf->ww = 1; if (pitch != 0) { - sin2 = Math_Sins(pitch); - cos2 = Math_Coss(pitch); + sin2 = Math_SinS(pitch); + cos2 = Math_CosS(pitch); mf->xx = cos * cos2; mf->zx = cos * sin2; @@ -361,8 +361,8 @@ void SkinMatrix_SetRotateRPY(MtxF* mf, s16 roll, s16 pitch, s16 yaw) { } if (roll != 0) { - sin2 = Math_Sins(roll); - cos2 = Math_Coss(roll); + sin2 = Math_SinS(roll); + cos2 = Math_CosS(roll); yx = mf->yx; zx = mf->zx; @@ -395,8 +395,8 @@ void SkinMatrix_SetRotateYRP(MtxF* mf, s16 yaw, s16 roll, s16 pitch) { f32 yz; f32 xx; f32 yx; - sin = Math_Sins(roll); - cos = Math_Coss(roll); + sin = Math_SinS(roll); + cos = Math_CosS(roll); mf->xx = cos; mf->xz = -sin; mf->zw = 0; @@ -408,8 +408,8 @@ void SkinMatrix_SetRotateYRP(MtxF* mf, s16 yaw, s16 roll, s16 pitch) { mf->ww = 1; if (yaw != 0) { - sin2 = Math_Sins(yaw); - cos2 = Math_Coss(yaw); + sin2 = Math_SinS(yaw); + cos2 = Math_CosS(yaw); mf->zz = cos * cos2; mf->yz = cos * sin2; @@ -430,8 +430,8 @@ void SkinMatrix_SetRotateYRP(MtxF* mf, s16 yaw, s16 roll, s16 pitch) { } if (pitch != 0) { - sin2 = Math_Sins(pitch); - cos2 = Math_Coss(pitch); + sin2 = Math_SinS(pitch); + cos2 = Math_CosS(pitch); xx = mf->xx; yx = mf->yx; mf->xx = (xx * cos2) + (yx * sin2); @@ -620,8 +620,8 @@ void func_800A7EC0(MtxF* mf, s16 a, f32 x, f32 y, f32 z) { f32 xz; f32 pad; - sinA = Math_Sins(a); - cosA = Math_Coss(a); + sinA = Math_SinS(a); + cosA = Math_CosS(a); xx = x * x; yy = y * y; diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index 78f922eafc..0ad7602037 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -236,7 +236,7 @@ void ArmsHook_Shoot(ArmsHook* this, GlobalContext* globalCtx) { } else { Math_Vec3f_Diff(&bodyDistDiffVec, &newPos, &player->actor.velocity); player->actor.posRot.rot.x = - atan2s(sqrtf(SQ(bodyDistDiffVec.x) + SQ(bodyDistDiffVec.z)), -bodyDistDiffVec.y); + Math_Atan2S(sqrtf(SQ(bodyDistDiffVec.x) + SQ(bodyDistDiffVec.z)), -bodyDistDiffVec.y); } if (phi_f16 < 50.0f) { @@ -254,7 +254,7 @@ void ArmsHook_Shoot(ArmsHook* this, GlobalContext* globalCtx) { Actor_MoveForward(&this->actor); Math_Vec3f_Diff(&this->actor.posRot.pos, &this->actor.pos4, &prevFrameDiff); Math_Vec3f_Sum(&this->unk_1E8, &prevFrameDiff, &this->unk_1E8); - this->actor.shape.rot.x = atan2s(this->actor.speedXZ, -this->actor.velocity.y); + this->actor.shape.rot.x = Math_Atan2S(this->actor.speedXZ, -this->actor.velocity.y); sp60.x = this->unk_1F4.x - (this->unk_1E8.x - this->unk_1F4.x); sp60.y = this->unk_1F4.y - (this->unk_1E8.y - this->unk_1F4.y); sp60.z = this->unk_1F4.z - (this->unk_1E8.z - this->unk_1F4.z); @@ -332,8 +332,8 @@ void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx) { Math_Vec3f_Diff(&player->unk_3C8, &this->actor.posRot.pos, &sp78); sp58 = SQ(sp78.x) + SQ(sp78.z); sp5C = sqrtf(sp58); - Matrix_RotateY(Math_atan2f(sp78.x, sp78.z), MTXMODE_APPLY); - Matrix_RotateX(Math_atan2f(-sp78.y, sp5C), MTXMODE_APPLY); + Matrix_RotateY(Math_FAtan2F(sp78.x, sp78.z), MTXMODE_APPLY); + Matrix_RotateX(Math_FAtan2F(-sp78.y, sp5C), MTXMODE_APPLY); Matrix_Scale(0.015f, 0.015f, sqrtf(SQ(sp78.y) + sp58) * 0.01f, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arms_hook.c", 910), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index 8060ca5ecd..6256967242 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -195,7 +195,7 @@ void func_8086C054(BgBdanObjects* this, GlobalContext* globalCtx) { } void func_8086C1A0(BgBdanObjects* this, GlobalContext* globalCtx) { - if (Math_SmoothScaleMaxMinF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 500.0f, 0.5f, 7.5f, + if (Math_SmoothStepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 500.0f, 0.5f, 7.5f, 1.0f) < 0.1f) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BUYOSTAND_STOP_A); this->actionFunc = func_8086C29C; @@ -242,7 +242,7 @@ void func_8086C3D8(BgBdanObjects* this, GlobalContext* globalCtx) { Player* player = PLAYER; this->dyna.actor.velocity.y += 0.5f; - if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + -70.0f, + if (Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + -70.0f, this->dyna.actor.velocity.y)) { this->dyna.actor.posRot.rot.y = 0; this->unk_16A = 0x3C; @@ -311,9 +311,9 @@ void func_8086C618(BgBdanObjects* this, GlobalContext* globalCtx) { } void func_8086C6EC(BgBdanObjects* this, GlobalContext* globalCtx) { - s32 cond = Math_ApproxUpdateScaledS(&this->dyna.actor.shape.rot.y, this->dyna.actor.initPosRot.rot.y, 0x200); + s32 cond = Math_ScaledStepToS(&this->dyna.actor.shape.rot.y, this->dyna.actor.initPosRot.rot.y, 0x200); - if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + -125.0f, 3.0f)) { + if (Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + -125.0f, 3.0f)) { if (cond) { this->actionFunc = func_8086C76C; } @@ -330,7 +330,7 @@ void func_8086C76C(BgBdanObjects* this, GlobalContext* globalCtx) { } void func_8086C7D0(BgBdanObjects* this, GlobalContext* globalCtx) { - if (Math_SmoothScaleMaxMinF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 965.0f, 0.5f, 15.0f, + if (Math_SmoothStepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 965.0f, 0.5f, 15.0f, 0.2f) < 0.01f) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BUYOSTAND_STOP_A); this->actionFunc = BgBdanObjects_DoNothing; @@ -383,13 +383,13 @@ void func_8086C9A8(BgBdanObjects* this, GlobalContext* globalCtx) { void func_8086C9F0(BgBdanObjects* this, GlobalContext* globalCtx) { if (this->unk_16A == 0) { - if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, 0.5f)) { + if (Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, 0.5f)) { Flags_UnsetSwitch(globalCtx, this->unk_168); this->actionFunc = func_8086C9A8; } func_8002F948(this, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); } else { - if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 75.0f, 0.5f)) { + if (Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 75.0f, 0.5f)) { this->actionFunc = func_8086CABC; } func_8002F948(this, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c index 6ecacbe58e..467cf557a5 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c @@ -112,14 +112,14 @@ void func_8086D0EC(BgBdanSwitch* this) { case BLUE: case YELLOW_HEAVY: case YELLOW: - this->unk_1D4 = ((Math_Coss(this->unk_1CC) * 0.5f) + 8.833334f) * 0.012f; - this->unk_1D0 = ((Math_Coss(this->unk_1CC) * 0.5f) + 20.5f) * (this->unk_1C8 * 0.0050000004f); + this->unk_1D4 = ((Math_CosS(this->unk_1CC) * 0.5f) + 8.833334f) * 0.012f; + this->unk_1D0 = ((Math_CosS(this->unk_1CC) * 0.5f) + 20.5f) * (this->unk_1C8 * 0.0050000004f); this->dyna.actor.scale.y = this->unk_1C8 * 0.1f; break; case YELLOW_TALL_1: case YELLOW_TALL_2: - this->unk_1D4 = ((Math_Coss(this->unk_1CC) * 0.5f) + (43.0f / 6.0f)) * 0.0075000003f; - this->unk_1D0 = ((Math_Coss(this->unk_1CC) * 0.5f) + 20.5f) * (this->unk_1C8 * 0.0050000004f); + this->unk_1D4 = ((Math_CosS(this->unk_1CC) * 0.5f) + (43.0f / 6.0f)) * 0.0075000003f; + this->unk_1D0 = ((Math_CosS(this->unk_1CC) * 0.5f) + 20.5f) * (this->unk_1C8 * 0.0050000004f); this->dyna.actor.scale.y = this->unk_1C8 * 0.1f; } this->dyna.actor.shape.unk_08 = 1.2f / this->unk_1D0; diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c index 84bf54f07f..986360bf22 100644 --- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c +++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c @@ -87,7 +87,7 @@ void BgBowlWall_SpawnBullseyes(BgBowlWall* this, GlobalContext* globalCtx) { type = this->dyna.actor.params; if (type != 0) { - type += (s16)Math_Rand_ZeroFloat(2.99f); + type += (s16)Rand_ZeroFloat(2.99f); this->dyna.actor.shape.rot.z = this->dyna.actor.posRot.rot.z = sTargetRot[type]; osSyncPrintf("\n\n"); } @@ -136,13 +136,13 @@ void BgBowlWall_FallDoEffects(BgBowlWall* this, GlobalContext* globalCtx) { wallFallen = false; if (this->dyna.actor.params == 0) { // wall collapses backwards - Math_SmoothScaleMaxMinS(&this->dyna.actor.shape.rot.x, -0x3E80, 3, 500, 0); + Math_SmoothStepToS(&this->dyna.actor.shape.rot.x, -0x3E80, 3, 500, 0); this->dyna.actor.posRot.rot.x = this->dyna.actor.shape.rot.x; if (this->dyna.actor.shape.rot.x < -0x3C1E) { wallFallen = true; } } else { // wall slides downwards - Math_SmoothScaleMaxF(&this->dyna.actor.posRot.pos.y, this->initPos.y - 450.0f, 0.3f, 10.0f); + Math_ApproachF(&this->dyna.actor.posRot.pos.y, this->initPos.y - 450.0f, 0.3f, 10.0f); if (this->dyna.actor.posRot.pos.y < (this->initPos.y - 400.0f)) { wallFallen = true; } @@ -150,9 +150,9 @@ void BgBowlWall_FallDoEffects(BgBowlWall* this, GlobalContext* globalCtx) { if (wallFallen) { for (i = 0; i < 15; i++) { - effectPos.x = Math_Rand_CenteredFloat(300.0f) + this->bullseyeCenter.x; + effectPos.x = Rand_CenteredFloat(300.0f) + this->bullseyeCenter.x; effectPos.y = -100.0f; - effectPos.z = Math_Rand_CenteredFloat(400.0f) + this->bullseyeCenter.z; + effectPos.z = Rand_CenteredFloat(400.0f) + this->bullseyeCenter.z; EffectSsBomb2_SpawnLayered(globalCtx, &effectPos, &effectVelocity, &effectAccel, 100, 30); effectPos.y = -50.0f; EffectSsHahen_SpawnBurst(globalCtx, &effectPos, 10.0f, 0, 50, 15, 3, HAHEN_OBJECT_DEFAULT, 10, NULL); @@ -170,9 +170,9 @@ void BgBowlWall_FallDoEffects(BgBowlWall* this, GlobalContext* globalCtx) { void BgBowlWall_FinishFall(BgBowlWall* this, GlobalContext* globalCtx) { if (this->timer >= 2) { if (this->dyna.actor.params == 0) { - Math_SmoothScaleMaxMinS(&this->dyna.actor.shape.rot.x, -0x3E80, 1, 200, 0); + Math_SmoothStepToS(&this->dyna.actor.shape.rot.x, -0x3E80, 1, 200, 0); } else { - Math_SmoothScaleMaxF(&this->dyna.actor.posRot.pos.y, this->initPos.y - 450.0f, 0.3f, 10.0f); + Math_ApproachF(&this->dyna.actor.posRot.pos.y, this->initPos.y - 450.0f, 0.3f, 10.0f); } } else if (this->timer == 1) { this->dyna.actor.posRot.rot.x = this->dyna.actor.shape.rot.x = 0; @@ -184,7 +184,7 @@ void BgBowlWall_FinishFall(BgBowlWall* this, GlobalContext* globalCtx) { void BgBowlWall_Reset(BgBowlWall* this, GlobalContext* globalCtx) { if (this->chuGirl->wallStatus[this->dyna.actor.params] != 2) { - Math_SmoothScaleMaxF(&this->dyna.actor.posRot.pos.y, this->initPos.y, 0.3f, 50.0f); + Math_ApproachF(&this->dyna.actor.posRot.pos.y, this->initPos.y, 0.3f, 50.0f); if (fabsf(this->dyna.actor.posRot.pos.y - this->initPos.y) <= 10.0f) { this->dyna.actor.posRot.pos.y = this->initPos.y; this->isHit = false; diff --git a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c index c62f0b6a3f..064ffc1323 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c @@ -136,16 +136,16 @@ void BgDdanJd_MoveEffects(BgDdanJd* this, GlobalContext* globalCtx) { dustPos.y = this->dyna.actor.initPosRot.pos.y; if (globalCtx->gameplayFrames & 1) { dustPos.x = this->dyna.actor.posRot.pos.x + 65.0f; - dustPos.z = Math_Rand_CenteredFloat(110.0f) + this->dyna.actor.posRot.pos.z; + dustPos.z = Rand_CenteredFloat(110.0f) + this->dyna.actor.posRot.pos.z; func_80033480(globalCtx, &dustPos, 5.0f, 1, 20, 60, 1); dustPos.x = this->dyna.actor.posRot.pos.x - 65.0f; - dustPos.z = Math_Rand_CenteredFloat(110.0f) + this->dyna.actor.posRot.pos.z; + dustPos.z = Rand_CenteredFloat(110.0f) + this->dyna.actor.posRot.pos.z; func_80033480(globalCtx, &dustPos, 5.0f, 1, 20, 60, 1); } else { - dustPos.x = Math_Rand_CenteredFloat(110.0f) + this->dyna.actor.posRot.pos.x; + dustPos.x = Rand_CenteredFloat(110.0f) + this->dyna.actor.posRot.pos.x; dustPos.z = this->dyna.actor.posRot.pos.z + 65.0f; func_80033480(globalCtx, &dustPos, 5.0f, 1, 20, 60, 1); - dustPos.x = Math_Rand_CenteredFloat(110.0f) + this->dyna.actor.posRot.pos.x; + dustPos.x = Rand_CenteredFloat(110.0f) + this->dyna.actor.posRot.pos.x; dustPos.z = this->dyna.actor.posRot.pos.z - 65.0f; func_80033480(globalCtx, &dustPos, 5.0f, 1, 20, 60, 1); } @@ -165,7 +165,7 @@ void BgDdanJd_Move(BgDdanJd* this, GlobalContext* globalCtx) { this->idleTimer = 0; this->actionFunc = BgDdanJd_Idle; func_800800F8(globalCtx, 0xBF4, -0x63, &this->dyna.actor, 0); - } else if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->targetY, this->ySpeed)) { + } else if (Math_StepToF(&this->dyna.actor.posRot.pos.y, this->targetY, this->ySpeed)) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_PILLAR_MOVE_STOP); this->actionFunc = BgDdanJd_Idle; } diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c index 2b091f5462..31ff220763 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c @@ -117,10 +117,10 @@ void BgDdanKd_LowerStairs(BgDdanKd* this, GlobalContext* globalCtx) { Vec3f sp50; f32 sp4C; - Math_SmoothScaleMaxMinF(&this->dyna.actor.speedXZ, 4.0f, 0.5f, 0.025f, 0.0f); + Math_SmoothStepToF(&this->dyna.actor.speedXZ, 4.0f, 0.5f, 0.025f, 0.0f); func_800AA000(500.0f, 0x78, 0x14, 0xA); - if (Math_SmoothScaleMaxMinF(&this->dyna.actor.posRot.pos.y, (this->dyna.actor.initPosRot.pos.y - 200.0f) - 20.0f, + if (Math_SmoothStepToF(&this->dyna.actor.posRot.pos.y, (this->dyna.actor.initPosRot.pos.y - 200.0f) - 20.0f, 0.075f, this->dyna.actor.speedXZ, 0.0075f) == 0.0f) { Flags_SetSwitch(globalCtx, this->dyna.actor.params); BgDdanKd_SetupAction(this, func_80871838); @@ -131,30 +131,30 @@ void BgDdanKd_LowerStairs(BgDdanKd* this, GlobalContext* globalCtx) { sp5C = sp50 = this->dyna.actor.posRot.pos; if (globalCtx->state.frames & 2) { - sp5C.z += 210.0f + Math_Rand_ZeroOne() * 230.0f; - sp50.z += 210.0f + Math_Rand_ZeroOne() * 230.0f; + sp5C.z += 210.0f + Rand_ZeroOne() * 230.0f; + sp50.z += 210.0f + Rand_ZeroOne() * 230.0f; } else { - sp5C.z += 330.0f + Math_Rand_ZeroOne() * 240.0f; - sp50.z += 330.0f + Math_Rand_ZeroOne() * 240.0f; + sp5C.z += 330.0f + Rand_ZeroOne() * 240.0f; + sp50.z += 330.0f + Rand_ZeroOne() * 240.0f; } - sp5C.x += 80.0f + Math_Rand_ZeroOne() * 10.0f; - sp50.x -= 80.0f + Math_Rand_ZeroOne() * 10.0f; - sp5C.y = this->dyna.actor.groundY + 20.0f + Math_Rand_ZeroOne(); - sp50.y = this->dyna.actor.groundY + 20.0f + Math_Rand_ZeroOne(); + sp5C.x += 80.0f + Rand_ZeroOne() * 10.0f; + sp50.x -= 80.0f + Rand_ZeroOne() * 10.0f; + sp5C.y = this->dyna.actor.groundY + 20.0f + Rand_ZeroOne(); + sp50.y = this->dyna.actor.groundY + 20.0f + Rand_ZeroOne(); func_80033480(globalCtx, &sp5C, 20.0f, 1, sp4C * 135.0f, 60, 1); func_80033480(globalCtx, &sp50, 20.0f, 1, sp4C * 135.0f, 60, 1); - D_808718FC[0] = Math_Rand_CenteredFloat(3.0f); - D_80871904[0] = Math_Rand_CenteredFloat(3.0f); + D_808718FC[0] = Rand_CenteredFloat(3.0f); + D_80871904[0] = Rand_CenteredFloat(3.0f); func_8003555C(globalCtx, &sp5C, &D_808718FC, &D_80871908); func_8003555C(globalCtx, &sp50, &D_808718FC, &D_80871908); sp5C = this->dyna.actor.posRot.pos; - sp5C.z += 560.0f + Math_Rand_ZeroOne() * 5.0f; - sp5C.x += (Math_Rand_ZeroOne() - 0.5f) * 160.0f; - sp5C.y = Math_Rand_ZeroOne() * 3.0f + (this->dyna.actor.groundY + 20.0f); + sp5C.z += 560.0f + Rand_ZeroOne() * 5.0f; + sp5C.x += (Rand_ZeroOne() - 0.5f) * 160.0f; + sp5C.y = Rand_ZeroOne() * 3.0f + (this->dyna.actor.groundY + 20.0f); func_80033480(globalCtx, &sp5C, 20.0f, 1, sp4C * 135.0f, 60, 1); func_8003555C(globalCtx, &sp5C, &D_808718FC, &D_80871908); diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index 6f7c1c3430..b483a9dd86 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -63,9 +63,9 @@ void BgDodoago_SpawnSparkles(Vec3f* vec, GlobalContext* globalCtx) { s32 i; for (i = 4; i > 0; i--) { - pos.x = Math_Rand_CenteredFloat(20.0f) + vec->x; - pos.y = Math_Rand_CenteredFloat(10.0f) + vec->y; - pos.z = Math_Rand_CenteredFloat(20.0f) + vec->z; + pos.x = Rand_CenteredFloat(20.0f) + vec->x; + pos.y = Rand_CenteredFloat(10.0f) + vec->y; + pos.z = Rand_CenteredFloat(20.0f) + vec->z; EffectSsKiraKira_SpawnSmall(globalCtx, &pos, &velocity, &acceleration, &primColor, &envColor); } } @@ -210,10 +210,10 @@ void func_80871FB8(BgDodoago* this, GlobalContext* globalCtx) { currentPos.z = this->dyna.actor.posRot.pos.z + 100.0f; BgDodoago_SpawnSparkles(¤tPos, globalCtx); - Math_ApproxS(&this->unk_164, 0x64, 3); + Math_StepToS(&this->unk_164, 0x64, 3); func_800AA000(500.0f, 0x78, 0x14, 0xA); - if (Math_SmoothScaleMaxMinS(&this->dyna.actor.shape.rot.x, 0x1333, 0x6E - this->unk_164, 0x3E8, 0x32) == 0) { + if (Math_SmoothStepToS(&this->dyna.actor.shape.rot.x, 0x1333, 0x6E - this->unk_164, 0x3E8, 0x32) == 0) { BgDodoago_SetupAction(this, func_8087227C); Audio_PlaySoundGeneral(NA_SE_EV_STONE_BOUND, &this->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c index 0a4c528b4d..8b5993f2a5 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c @@ -199,25 +199,25 @@ void BgGanonOtyuka_Fall(BgGanonOtyuka* this, GlobalContext* globalCtx) { osSyncPrintf("MODE DOWN\n"); if (this->flashState == FLASH_GROW) { - Math_SmoothScaleMaxF(&this->flashPrimColorB, 170.0f, 1.0f, 8.5f); - Math_SmoothScaleMaxF(&this->flashEnvColorR, 120.0f, 1.0f, 13.5f); - Math_SmoothScaleMaxF(&this->flashYScale, 2.5f, 1.0f, 0.25f); + Math_ApproachF(&this->flashPrimColorB, 170.0f, 1.0f, 8.5f); + Math_ApproachF(&this->flashEnvColorR, 120.0f, 1.0f, 13.5f); + Math_ApproachF(&this->flashYScale, 2.5f, 1.0f, 0.25f); if (this->flashYScale == 2.5f) { this->flashState = FLASH_SHRINK; } } else if (this->flashState == FLASH_SHRINK) { - Math_SmoothScaleMaxF(&this->flashPrimColorG, 0.0f, 1.0f, 25.5f); - Math_SmoothScaleMaxF(&this->flashEnvColorR, 0.0f, 1.0f, 12.0f); - Math_SmoothScaleMaxF(&this->flashEnvColorG, 0.0f, 1.0f, 25.5f); - Math_SmoothDownscaleMaxF(&this->flashYScale, 1.0f, 0.25f); + Math_ApproachF(&this->flashPrimColorG, 0.0f, 1.0f, 25.5f); + Math_ApproachF(&this->flashEnvColorR, 0.0f, 1.0f, 12.0f); + Math_ApproachF(&this->flashEnvColorG, 0.0f, 1.0f, 25.5f); + Math_ApproachZeroF(&this->flashYScale, 1.0f, 0.25f); if (this->flashYScale == 0.0f) { this->flashState = FLASH_NONE; } } if (this->dropTimer == 0) { this->flashYScale = 0.0f; - Math_SmoothScaleMaxF(&this->dyna.actor.posRot.pos.y, -1000.0f, 1.0f, this->dyna.actor.speedXZ); - Math_SmoothScaleMaxF(&this->dyna.actor.speedXZ, 100.0f, 1.0f, 2.0f); + Math_ApproachF(&this->dyna.actor.posRot.pos.y, -1000.0f, 1.0f, this->dyna.actor.speedXZ); + Math_ApproachF(&this->dyna.actor.speedXZ, 100.0f, 1.0f, 2.0f); if (!(this->unwalledSides & OTYUKA_SIDE_EAST)) { this->dyna.actor.shape.rot.z -= (s16)(this->dyna.actor.speedXZ * 30.0f); } @@ -237,11 +237,11 @@ void BgGanonOtyuka_Fall(BgGanonOtyuka* this, GlobalContext* globalCtx) { velocity.x = velocity.y = velocity.z = 0.0f; for (i = 0; i < 30; i++) { - pos.x = Math_Rand_CenteredFloat(150.0f) + this->dyna.actor.posRot.pos.x; - pos.y = Math_Rand_ZeroFloat(60.0f) + -750.0f; - pos.z = Math_Rand_CenteredFloat(150.0f) + this->dyna.actor.posRot.pos.z; + pos.x = Rand_CenteredFloat(150.0f) + this->dyna.actor.posRot.pos.x; + pos.y = Rand_ZeroFloat(60.0f) + -750.0f; + pos.z = Rand_CenteredFloat(150.0f) + this->dyna.actor.posRot.pos.z; func_8002836C(globalCtx, &pos, &velocity, &accel, &sDustPrimColor, &sDustEnvColor, - (s16)Math_Rand_ZeroFloat(100.0f) + 250, 5, (s16)Math_Rand_ZeroFloat(5.0f) + 15); + (s16)Rand_ZeroFloat(100.0f) + 250, 5, (s16)Rand_ZeroFloat(5.0f) + 15); } func_80033DB8(globalCtx, 10, 15); @@ -257,8 +257,8 @@ void BgGanonOtyuka_Fall(BgGanonOtyuka* this, GlobalContext* globalCtx) { Audio_PlaySoundGeneral(NA_SE_EV_BLOCKSINK - SFX_FLAG, &this->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); } - Math_SmoothScaleMaxF(&this->dyna.actor.posRot.pos.y, -1000.0f, 1.0f, this->dyna.actor.speedXZ); - Math_SmoothScaleMaxF(&this->dyna.actor.speedXZ, 100.0f, 1.0f, 0.1f); + Math_ApproachF(&this->dyna.actor.posRot.pos.y, -1000.0f, 1.0f, this->dyna.actor.speedXZ); + Math_ApproachF(&this->dyna.actor.speedXZ, 100.0f, 1.0f, 0.1f); } osSyncPrintf("MODE DOWN END\n"); } diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c index f6aa35d6f9..67372de594 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c +++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c @@ -85,7 +85,7 @@ void func_80878300(BgGateShutter* this, GlobalContext* globalCtx) { if (this->unk_178 == 0) { Audio_PlayActorSound2(thisx, NA_SE_EV_METALGATE_OPEN - SFX_FLAG); thisx->posRot.pos.x -= 2.0f; - Math_SmoothScaleMaxF(&thisx->posRot.pos.z, -1375.0f, 0.8f, 0.3f); + Math_ApproachF(&thisx->posRot.pos.z, -1375.0f, 0.8f, 0.3f); if (thisx->posRot.pos.x < -89.0f) { Audio_PlayActorSound2(thisx, NA_SE_EV_BRIDGE_OPEN_STOP); this->unk_178 = 0x1E; @@ -107,7 +107,7 @@ void func_808783D4(BgGateShutter* this, GlobalContext* globalCtx) { if (this->unk_178 == 0) { Audio_PlayActorSound2(thisx, NA_SE_EV_METALGATE_OPEN - SFX_FLAG); thisx->posRot.pos.x += 2.0f; - Math_SmoothScaleMaxF(&thisx->posRot.pos.z, -1350.0f, 0.8f, 0.3f); + Math_ApproachF(&thisx->posRot.pos.z, -1350.0f, 0.8f, 0.3f); if (thisx->posRot.pos.x > 90.0f) { thisx->posRot.pos.x = 91.0f; Audio_PlayActorSound2(thisx, NA_SE_EV_BRIDGE_OPEN_STOP); diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c index e7bc8124fe..6826c37105 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c @@ -194,7 +194,7 @@ void BgGndDarkmeiro_DrawSwitchBlock(Actor* thisx, GlobalContext* globalCtx) { if (vanishTimer > 64) { this->timer2 = (this->timer2 < 120) ? this->timer2 + 8 : 127; } else if (vanishTimer > 16) { - this->timer2 = (Math_Coss((u16)this->timer1 * 0x1000) * 64.0f) + 127.0f; + this->timer2 = (Math_CosS((u16)this->timer1 * 0x1000) * 64.0f) + 127.0f; if (this->timer2 > 127) { this->timer2 = 127; } diff --git a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c index 94608120df..b82e3d7493 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c @@ -124,24 +124,24 @@ void func_8087AF38(BgGndSoulmeiro* this, GlobalContext* globalCtx) { if (1) {} if ((this->unk_198 % 6) == 0) { - temp_2 = Math_Rand_ZeroOne() * (10922.0f); // This should be: 0x10000 / 6.0f + temp_2 = Rand_ZeroOne() * (10922.0f); // This should be: 0x10000 / 6.0f vecA.y = 0.0f; vecB.y = this->actor.posRot.pos.y; this2 = this; for (i = 0; i < 6; i++) { - temp_1 = Math_Rand_CenteredFloat(0x2800) + temp_2; - temp_3 = Math_Sins(temp_1); - temp_4 = Math_Coss(temp_1); + temp_1 = Rand_CenteredFloat(0x2800) + temp_2; + temp_3 = Math_SinS(temp_1); + temp_4 = Math_CosS(temp_1); vecB.x = this2->actor.posRot.pos.x + (120.0f * temp_3); vecB.z = this2->actor.posRot.pos.z + (120.0f * temp_4); - distXZ = Math_Vec3f_DistXZ(&this2->actor.initPosRot.pos, &vecB) * (1.0f / 120.f); + distXZ = Math_Vec3f_DistXZ(&this2->actor.initPosRot.pos, &vecB) * (1.0f / 120.0f); if (distXZ < 0.7f) { - temp_3 = Math_Sins(temp_1 + 0x8000); - temp_4 = Math_Coss(temp_1 + 0x8000); + temp_3 = Math_SinS(temp_1 + 0x8000); + temp_4 = Math_CosS(temp_1 + 0x8000); vecB.x = this->actor.posRot.pos.x + (120.0f * temp_3); vecB.z = this->actor.posRot.pos.z + (120.0f * temp_4); - distXZ = Math_Vec3f_DistXZ(&this->actor.initPosRot.pos, &vecB) * (1.0f / 120.f); + distXZ = Math_Vec3f_DistXZ(&this->actor.initPosRot.pos, &vecB) * (1.0f / 120.0f); } vecA.x = 4.0f * temp_3 * distXZ; diff --git a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c index 53854ef5a2..7488871034 100644 --- a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c +++ b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c @@ -99,11 +99,11 @@ void func_8087B938(BgHaka* this, GlobalContext* globalCtx) { this->dyna.actor.speedXZ += 0.05f; this->dyna.actor.speedXZ = CLAMP_MAX(this->dyna.actor.speedXZ, 1.5f); - sp38 = Math_ApproxF(&this->dyna.actor.minVelocityY, 60.0f, this->dyna.actor.speedXZ); + sp38 = Math_StepToF(&this->dyna.actor.minVelocityY, 60.0f, this->dyna.actor.speedXZ); this->dyna.actor.posRot.pos.x = - Math_Sins(this->dyna.actor.posRot.rot.y) * this->dyna.actor.minVelocityY + this->dyna.actor.initPosRot.pos.x; + Math_SinS(this->dyna.actor.posRot.rot.y) * this->dyna.actor.minVelocityY + this->dyna.actor.initPosRot.pos.x; this->dyna.actor.posRot.pos.z = - Math_Coss(this->dyna.actor.posRot.rot.y) * this->dyna.actor.minVelocityY + this->dyna.actor.initPosRot.pos.z; + Math_CosS(this->dyna.actor.posRot.rot.y) * this->dyna.actor.minVelocityY + this->dyna.actor.initPosRot.pos.z; if (sp38 != 0) { this->dyna.unk_150 = 0.0f; player->stateFlags2 &= ~0x10; diff --git a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c index 087d2f899d..ad787a70f5 100644 --- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c +++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c @@ -157,7 +157,7 @@ void func_8087E10C(BgHakaMeganeBG* this, GlobalContext* globalCtx) { this->unk_16A--; } - if (!Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y - 640.0f, + if (!Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y - 640.0f, this->dyna.actor.velocity.y)) { func_8002F974(&this->dyna.actor, NA_SE_EV_CHINETRAP_DOWN - SFX_FLAG); } @@ -170,7 +170,7 @@ void func_8087E10C(BgHakaMeganeBG* this, GlobalContext* globalCtx) { } void func_8087E1E0(BgHakaMeganeBG* this, GlobalContext* globalCtx) { - Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, 16.0f / 3.0f); + Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, 16.0f / 3.0f); func_8002F974(&this->dyna.actor, NA_SE_EV_BRIDGE_CLOSE - SFX_FLAG); if (this->unk_16A != 0) { @@ -196,9 +196,9 @@ void func_8087E288(BgHakaMeganeBG* this, GlobalContext* globalCtx) { } void func_8087E2D8(BgHakaMeganeBG* this, GlobalContext* globalCtx) { - Math_ApproxF(&this->dyna.actor.speedXZ, 30.0f, 2.0f); + Math_StepToF(&this->dyna.actor.speedXZ, 30.0f, 2.0f); - if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, this->dyna.actor.speedXZ)) { + if (Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, this->dyna.actor.speedXZ)) { Actor_SetHeight(&this->dyna.actor, 50.0f); this->actionFunc = func_8087E34C; } else { diff --git a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c index 26c5ae2d9a..0f77b4f89d 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c +++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c @@ -186,8 +186,8 @@ void BgHakaSgami_Spin(BgHakaSgami* this, GlobalContext* globalCtx) { this->timer = SCYTHE_SPIN_TIME; } - actorRotYSin = Math_Sins(this->actor.shape.rot.y); - actorRotYCos = Math_Coss(this->actor.shape.rot.y); + actorRotYSin = Math_SinS(this->actor.shape.rot.y); + actorRotYCos = Math_CosS(this->actor.shape.rot.y); iterateCount = (this->actor.params != 0) ? 4 : 2; diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index 98fe199e7b..eb691a158d 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -180,8 +180,8 @@ void func_8087FFC0(BgHakaTrap* this, GlobalContext* globalCtx) { func_8002DBD0(&this->dyna.actor, &sp28, &player->actor.posRot.pos); - sine = Math_Sins(this->dyna.actor.shape.rot.y); - cosine = Math_Coss(this->dyna.actor.shape.rot.y); + sine = Math_SinS(this->dyna.actor.shape.rot.y); + cosine = Math_CosS(this->dyna.actor.shape.rot.y); if (this->dyna.actor.params == HAKA_TRAP_GUILLOTINE_SLOW) { sp28.x = CLAMP(sp28.x, -50.0f, 50.0f); zNonNegative = (sp28.z >= 0.0f) ? 1.0f : -1.0f; @@ -201,7 +201,7 @@ void func_808801B8(BgHakaTrap* this, GlobalContext* globalCtx) { Player* player = PLAYER; if ((D_80880F30 == 0) && (!Player_InCsMode(globalCtx))) { - if (!Math_ApproxF(&this->dyna.actor.posRot.pos.x, this->dyna.actor.initPosRot.pos.x, 0.5f)) { + if (!Math_StepToF(&this->dyna.actor.posRot.pos.x, this->dyna.actor.initPosRot.pos.x, 0.5f)) { func_8002F974(&this->dyna.actor, NA_SE_EV_TRAP_OBJ_SLIDE - SFX_FLAG); } else if (this->dyna.actor.params == HAKA_TRAP_SPIKED_WALL) { D_80881018 |= 1; @@ -235,13 +235,13 @@ void func_808802D8(BgHakaTrap* this, GlobalContext* globalCtx) { func_8002F974(&this->dyna.actor, NA_SE_EV_BURN_OUT - SFX_FLAG); for (i = 0; i < 2; i++) { - f32 rand = Math_Rand_ZeroOne(); + f32 rand = Rand_ZeroOne(); xScale = (this->dyna.actor.params == HAKA_TRAP_SPIKED_WALL) ? -30.0f : 30.0f; vector.x = xScale * rand + this->dyna.actor.posRot.pos.x; - vector.y = Math_Rand_ZeroOne() * 10.0f + this->dyna.actor.posRot.pos.y + 30.0f; - vector.z = Math_Rand_CenteredFloat(320.0f) + this->dyna.actor.posRot.pos.z; + vector.y = Rand_ZeroOne() * 10.0f + this->dyna.actor.posRot.pos.y + 30.0f; + vector.z = Rand_CenteredFloat(320.0f) + this->dyna.actor.posRot.pos.z; EffectSsDeadDb_Spawn(globalCtx, &vector, &zeroVec, &zeroVec, 130, 20, 255, 255, 150, 170, 255, 0, 0, 1, 9, false); @@ -267,7 +267,7 @@ void func_80880484(BgHakaTrap* this, GlobalContext* globalCtx) { this->timer -= 1; } - sp24 = Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y - 185.0f, + sp24 = Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y - 185.0f, this->dyna.actor.velocity.y); timer = this->timer; @@ -295,12 +295,12 @@ void func_808805C0(BgHakaTrap* this, GlobalContext* globalCtx) { } if (this->unk_16A) { - Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, 27.0f); + Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, 27.0f); } else { if (this->timer > 20) { - Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y - 90.0f, 9.0f); + Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y - 90.0f, 9.0f); } else { - Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, 4.5f); + Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, 4.5f); } if (this->timer == 20) { @@ -347,7 +347,7 @@ void func_808806BC(BgHakaTrap* this, GlobalContext* globalCtx) { vector.x -= 90.0f; } - if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, tempf20, this->dyna.actor.velocity.y)) { + if (Math_StepToF(&this->dyna.actor.posRot.pos.y, tempf20, this->dyna.actor.velocity.y)) { if (this->dyna.actor.velocity.y > 0.01f) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_TRAP_BOUND); } @@ -374,9 +374,9 @@ void func_808808F4(BgHakaTrap* this, GlobalContext* globalCtx) { } if (this->timer > 20) { - this->unk_169 = Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->unk_16A, 15.0f); + this->unk_169 = Math_StepToF(&this->dyna.actor.posRot.pos.y, this->unk_16A, 15.0f); } else { - this->unk_169 = Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, 20.0f); + this->unk_169 = Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, 20.0f); } if (this->timer == 0) { @@ -412,12 +412,12 @@ void func_808809E4(BgHakaTrap* this, GlobalContext* globalCtx, s16 arg2) { void func_80880AE8(BgHakaTrap* this, GlobalContext* globalCtx) { if (this->timer != 0) { - if (Math_ApproxUpdateScaledS(&this->dyna.actor.posRot.rot.z, 0, this->dyna.actor.posRot.rot.z * 0.03f + 5.0f)) { + if (Math_ScaledStepToS(&this->dyna.actor.posRot.rot.z, 0, this->dyna.actor.posRot.rot.z * 0.03f + 5.0f)) { this->timer = 40; this->actionFunc = func_808809B0; } } else { - if (Math_ApproxUpdateScaledS(&this->dyna.actor.posRot.rot.z, 0x3A00, + if (Math_ScaledStepToS(&this->dyna.actor.posRot.rot.z, 0x3A00, this->dyna.actor.posRot.rot.z * 0.03f + 5.0f)) { this->timer = 100; this->actionFunc = func_80880C0C; diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index 7599e1764a..60e0996641 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -66,7 +66,7 @@ void BgHakaTubo_Init(Actor* thisx, GlobalContext* globalCtx) { Collider_SetCylinder(globalCtx, &this->potCollider, &this->dyna.actor, &sPotColliderInit); Collider_InitCylinder(globalCtx, &this->flamesCollider); Collider_SetCylinder(globalCtx, &this->flamesCollider, &this->dyna.actor, &sFlamesColliderInit); - this->fireScroll = Math_Rand_ZeroOne() * 15.0f; + this->fireScroll = Rand_ZeroOne() * 15.0f; sPotsDestroyed = 0; this->actionFunc = BgHakaTubo_Idle; } @@ -85,8 +85,8 @@ void BgHakaTubo_Idle(BgHakaTubo* this, GlobalContext* globalCtx) { if (this->dyna.actor.room == 12) { // 3 spinning pots room in Shadow Temple this->dyna.actor.shape.rot.y += 0x180; - this->dyna.actor.posRot.pos.x = Math_Sins(this->dyna.actor.shape.rot.y - 0x4000) * 145.0f + -5559.0f; - this->dyna.actor.posRot.pos.z = Math_Coss(this->dyna.actor.shape.rot.y - 0x4000) * 145.0f + -1587.0f; + this->dyna.actor.posRot.pos.x = Math_SinS(this->dyna.actor.shape.rot.y - 0x4000) * 145.0f + -5559.0f; + this->dyna.actor.posRot.pos.z = Math_CosS(this->dyna.actor.shape.rot.y - 0x4000) * 145.0f + -1587.0f; } // Colliding with flame circle if (this->flamesCollider.base.atFlags & 2) { @@ -133,7 +133,7 @@ void BgHakaTubo_DropCollectible(BgHakaTubo* this, GlobalContext* globalCtx) { spawnPos.y = this->dyna.actor.posRot.pos.y + 200.0f; spawnPos.z = this->dyna.actor.posRot.pos.z; if (this->dyna.actor.room == 12) { // 3 spinning pots room in Shadow Temple - rnd = Math_Rand_ZeroOne(); + rnd = Rand_ZeroOne(); sPotsDestroyed++; if (sPotsDestroyed == 3) { // All 3 pots destroyed diff --git a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c index 69de0d024a..e7d239eb04 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c +++ b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c @@ -94,7 +94,7 @@ void BgHakaWater_ChangeWaterLevel(BgHakaWater* this, GlobalContext* globalCtx) { func_8002F948(&this->actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); } - if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 0.5f) != 0) { + if (Math_StepToF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 0.5f) != 0) { this->actionFunc = BgHakaWater_Wait; if (this->isLowered) { this->actor.draw = NULL; diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c index 98e09a5091..eb14fc5136 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c @@ -52,9 +52,9 @@ extern Gfx D_06001A30[]; extern Gfx D_060018A0[]; void BgHeavyBlock_SetPieceRandRot(BgHeavyBlock* this, f32 scale) { - this->dyna.actor.posRot.rot.x = Math_Rand_CenteredFloat(1024.0f) * scale; - this->dyna.actor.posRot.rot.y = Math_Rand_CenteredFloat(1024.0f) * scale; - this->dyna.actor.posRot.rot.z = Math_Rand_CenteredFloat(1024.0f) * scale; + this->dyna.actor.posRot.rot.x = Rand_CenteredFloat(1024.0f) * scale; + this->dyna.actor.posRot.rot.y = Rand_CenteredFloat(1024.0f) * scale; + this->dyna.actor.posRot.rot.z = Rand_CenteredFloat(1024.0f) * scale; } void BgHeavyBlock_InitPiece(BgHeavyBlock* this, f32 scale) { @@ -64,18 +64,18 @@ void BgHeavyBlock_InitPiece(BgHeavyBlock* this, f32 scale) { this->dyna.actor.gravity = -0.6f; this->dyna.actor.minVelocityY = -12.0f; - randChoice = Math_Rand_CenteredFloat(12.0f * scale); + randChoice = Rand_CenteredFloat(12.0f * scale); rand = (randChoice < 0.0f) ? randChoice - 2.0f : randChoice + 2.0f; - this->dyna.actor.velocity.y = (Math_Rand_ZeroFloat(8.0f) + 4.0f) * scale; - this->dyna.actor.velocity.z = Math_Rand_ZeroFloat(-8.0f * scale); - yawSinCos = Math_Coss(this->dyna.actor.posRot.rot.y); + this->dyna.actor.velocity.y = (Rand_ZeroFloat(8.0f) + 4.0f) * scale; + this->dyna.actor.velocity.z = Rand_ZeroFloat(-8.0f * scale); + yawSinCos = Math_CosS(this->dyna.actor.posRot.rot.y); this->dyna.actor.velocity.x = - (Math_Sins(this->dyna.actor.posRot.rot.y) * this->dyna.actor.velocity.z + (yawSinCos * rand)); - yawSinCos = Math_Sins(this->dyna.actor.posRot.rot.y); + (Math_SinS(this->dyna.actor.posRot.rot.y) * this->dyna.actor.velocity.z + (yawSinCos * rand)); + yawSinCos = Math_SinS(this->dyna.actor.posRot.rot.y); this->dyna.actor.velocity.z = - (Math_Coss(this->dyna.actor.posRot.rot.y) * this->dyna.actor.velocity.z) + (-yawSinCos * rand); + (Math_CosS(this->dyna.actor.posRot.rot.y) * this->dyna.actor.velocity.z) + (-yawSinCos * rand); BgHeavyBlock_SetPieceRandRot(this, scale); - Actor_SetScale(&this->dyna.actor, Math_Rand_CenteredFloat(0.2f) + 1.0f); + Actor_SetScale(&this->dyna.actor, Rand_CenteredFloat(0.2f) + 1.0f); } void BgHeavyBlock_SetupDynapoly(BgHeavyBlock* this, GlobalContext* globalCtx) { @@ -192,9 +192,9 @@ void BgHeavyBlock_MovePiece(BgHeavyBlock* this, GlobalContext* globalCtx) { thisx->pos4.y -= this->unk_164.y; if (thisx->bgCheckFlags & 1) { this->pieceFlags |= PIECE_FLAG_HIT_FLOOR; - thisx->velocity.y = Math_Rand_ZeroFloat(4.0f) + 2.0f; - thisx->velocity.x = Math_Rand_CenteredFloat(8.0f); - thisx->velocity.z = Math_Rand_CenteredFloat(8.0f); + thisx->velocity.y = Rand_ZeroFloat(4.0f) + 2.0f; + thisx->velocity.x = Rand_CenteredFloat(8.0f); + thisx->velocity.z = Rand_CenteredFloat(8.0f); BgHeavyBlock_SetPieceRandRot(this, 1.0f); Audio_PlayActorSound2(thisx, NA_SE_EV_ROCK_BROKEN); func_800AA000(thisx->xzDistFromLink, 0x96, 0xA, 8); @@ -261,20 +261,20 @@ void BgHeavyBlock_SpawnDust(GlobalContext* globalCtx, f32 posX, f32 posY, f32 po scaleStep = 50; break; case 2: - sp44 = Math_Rand_ZeroFloat(5.0f) + 5.0f; - sp6E = Math_Rand_CenteredFloat(65280.0f); + sp44 = Rand_ZeroFloat(5.0f) + 5.0f; + sp6E = Rand_CenteredFloat(65280.0f); - velocity.x = (Math_Sins(sp6E) * sp44) + velX; + velocity.x = (Math_SinS(sp6E) * sp44) + velX; velocity.y = velY; - velocity.z = (Math_Coss(sp6E) * sp44) + velZ; + velocity.z = (Math_CosS(sp6E) * sp44) + velZ; break; case 0: sp6E = Math_Vec3f_Yaw(&eye, &at); sp6C = -Math_Vec3f_Pitch(&eye, &at); - velocity.x = ((5.0f * Math_Sins(sp6E)) * Math_Coss(sp6C)) + velX; - velocity.y = (Math_Sins(sp6C) * 5.0f) + velY; - velocity.z = ((5.0f * Math_Coss(sp6E)) * Math_Coss(sp6C)) + velZ; + velocity.x = ((5.0f * Math_SinS(sp6E)) * Math_CosS(sp6C)) + velX; + velocity.y = (Math_SinS(sp6C) * 5.0f) + velY; + velocity.z = ((5.0f * Math_CosS(sp6E)) * Math_CosS(sp6C)) + velZ; pos.x -= (velocity.x * 20.0f); pos.y -= (velocity.y * 20.0f); @@ -283,7 +283,7 @@ void BgHeavyBlock_SpawnDust(GlobalContext* globalCtx, f32 posX, f32 posY, f32 po } func_8002843C(globalCtx, &pos, &velocity, &accel, &primColor, &envColor, scale, scaleStep, - (s32)Math_Rand_ZeroFloat(10.0f) + 20); + (s32)Rand_ZeroFloat(10.0f) + 20); } void BgHeavyBlock_SpawnPieces(BgHeavyBlock* this, GlobalContext* globalCtx) { @@ -299,10 +299,10 @@ void BgHeavyBlock_SpawnPieces(BgHeavyBlock* this, GlobalContext* globalCtx) { f32 sinYaw; f32 cosYaw; - sinPitch = Math_Sins(this->dyna.actor.posRot.rot.x); - cosPitch = Math_Coss(this->dyna.actor.posRot.rot.x); - sinYaw = Math_Sins(this->dyna.actor.posRot.rot.y); - cosYaw = Math_Coss(this->dyna.actor.posRot.rot.y); + sinPitch = Math_SinS(this->dyna.actor.posRot.rot.x); + cosPitch = Math_CosS(this->dyna.actor.posRot.rot.x); + sinYaw = Math_SinS(this->dyna.actor.posRot.rot.y); + cosYaw = Math_CosS(this->dyna.actor.posRot.rot.y); for (i = 0; i < ARRAY_COUNT(spA4); i++) { pos.z = (spA4[i].y * sinPitch) + (spA4[i].z * cosPitch); @@ -362,10 +362,10 @@ void BgHeavyBlock_LiftedUp(BgHeavyBlock* this, GlobalContext* globalCtx) { } if (this->timer < 40) { - xOffset = Math_Rand_CenteredFloat(110.0f); - sinYaw = Math_Sins(this->dyna.actor.shape.rot.y); - zOffset = Math_Rand_CenteredFloat(110.0f); - cosYaw = Math_Coss(this->dyna.actor.shape.rot.y); + xOffset = Rand_CenteredFloat(110.0f); + sinYaw = Math_SinS(this->dyna.actor.shape.rot.y); + zOffset = Rand_CenteredFloat(110.0f); + cosYaw = Math_CosS(this->dyna.actor.shape.rot.y); BgHeavyBlock_SpawnDust(globalCtx, (sinYaw * -70.0f) + (this->dyna.actor.posRot.pos.x + xOffset), this->dyna.actor.posRot.pos.y + 10.0f, @@ -447,7 +447,7 @@ void BgHeavyBlock_Fly(BgHeavyBlock* this, GlobalContext* globalCtx) { this->actionFunc = BgHeavyBlock_Land; } } - this->dyna.actor.shape.rot.x = atan2s(this->dyna.actor.velocity.y, this->dyna.actor.speedXZ); + this->dyna.actor.shape.rot.x = Math_Atan2S(this->dyna.actor.velocity.y, this->dyna.actor.speedXZ); } void BgHeavyBlock_DoNothing(BgHeavyBlock* this, GlobalContext* globalCtx) { @@ -456,25 +456,23 @@ void BgHeavyBlock_DoNothing(BgHeavyBlock* this, GlobalContext* globalCtx) { void BgHeavyBlock_Land(BgHeavyBlock* this, GlobalContext* globalCtx) { s32 pad; - if (Math_SmoothScaleMaxMinS(&this->dyna.actor.shape.rot.x, 0x8AD0, 6, 2000, 100) != 0) { - Math_ApproxF(&this->dyna.actor.speedXZ, 0.0f, 20.0f); - Math_ApproxF(&this->dyna.actor.velocity.y, 0.0f, 3.0f); + if (Math_SmoothStepToS(&this->dyna.actor.shape.rot.x, 0x8AD0, 6, 2000, 100) != 0) { + Math_StepToF(&this->dyna.actor.speedXZ, 0.0f, 20.0f); + Math_StepToF(&this->dyna.actor.velocity.y, 0.0f, 3.0f); this->dyna.actor.gravity = 0.0f; this->dyna.actor.posRot.pos = this->dyna.actor.initPosRot.pos; Actor_MoveForward(&this->dyna.actor); this->dyna.actor.initPosRot.pos = this->dyna.actor.posRot.pos; switch (this->dyna.actor.params & 0xFF) { case HEAVYBLOCK_UNBREAKABLE_OUTSIDE_CASTLE: - BgHeavyBlock_SpawnDust(globalCtx, Math_Rand_CenteredFloat(30.0f) + 1678.0f, - Math_Rand_ZeroFloat(100.0f) + 1286.0f, Math_Rand_CenteredFloat(30.0f) + 552.0f, - 0.0f, 0.0f, 0.0f, 0); - BgHeavyBlock_SpawnDust(globalCtx, Math_Rand_CenteredFloat(30.0f) + 1729.0f, - Math_Rand_ZeroFloat(80.0f) + 1269.0f, Math_Rand_CenteredFloat(30.0f) + 600.0f, - 0.0f, 0.0f, 0.0f, 0); + BgHeavyBlock_SpawnDust(globalCtx, Rand_CenteredFloat(30.0f) + 1678.0f, Rand_ZeroFloat(100.0f) + 1286.0f, + Rand_CenteredFloat(30.0f) + 552.0f, 0.0f, 0.0f, 0.0f, 0); + BgHeavyBlock_SpawnDust(globalCtx, Rand_CenteredFloat(30.0f) + 1729.0f, Rand_ZeroFloat(80.0f) + 1269.0f, + Rand_CenteredFloat(30.0f) + 600.0f, 0.0f, 0.0f, 0.0f, 0); break; case HEAVYBLOCK_UNBREAKABLE: - BgHeavyBlock_SpawnDust(globalCtx, Math_Rand_CenteredFloat(100.0f) + -735.0f, 29.0f, - Math_Rand_CenteredFloat(100.0f) + -3418.0f, 0.0f, 0.0f, 0.0f, 3); + BgHeavyBlock_SpawnDust(globalCtx, Rand_CenteredFloat(100.0f) + -735.0f, 29.0f, + Rand_CenteredFloat(100.0f) + -3418.0f, 0.0f, 0.0f, 0.0f, 3); break; } } else { diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c index ee52113355..6bbad8798c 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c @@ -102,7 +102,7 @@ void BgHidanCurtain_Init(Actor* thisx, GlobalContext* globalCtx) { (((this->type == 0) || (this->type == 6)) && Flags_GetClear(globalCtx, this->actor.room))) { Actor_Kill(&this->actor); } - this->texScroll = Math_Rand_ZeroOne() * 15.0f; + this->texScroll = Rand_ZeroOne() * 15.0f; } void BgHidanCurtain_Destroy(Actor* thisx, GlobalContext* globalCtx) { @@ -149,7 +149,7 @@ void BgHidanCurtain_WaitForSwitchOff(BgHidanCurtain* this, GlobalContext* global void BgHidanCurtain_TurnOn(BgHidanCurtain* this, GlobalContext* globalCtx) { f32 riseSpeed = sHCParams[this->size].riseSpeed; - if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, riseSpeed)) { + if (Math_StepToF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, riseSpeed)) { Flags_UnsetSwitch(globalCtx, this->actor.params); this->actionFunc = BgHidanCurtain_WaitForSwitchOn; } @@ -158,7 +158,7 @@ void BgHidanCurtain_TurnOn(BgHidanCurtain* this, GlobalContext* globalCtx) { void BgHidanCurtain_TurnOff(BgHidanCurtain* this, GlobalContext* globalCtx) { BgHidanCurtainParams* hcParams = &sHCParams[this->size]; - if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y - hcParams->riseDist, + if (Math_StepToF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y - hcParams->riseDist, hcParams->riseSpeed)) { if ((this->type == 0) || (this->type == 6)) { Actor_Kill(&this->actor); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c index c95d51bd3c..b42c593745 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c @@ -104,8 +104,8 @@ void BgHidanDalm_Wait(BgHidanDalm* this, GlobalContext* globalCtx) { } else { this->dyna.actor.posRot.rot.y += 0x4000; } - this->dyna.actor.posRot.pos.x += 32.5f * Math_Sins(this->dyna.actor.posRot.rot.y); - this->dyna.actor.posRot.pos.z += 32.5f * Math_Coss(this->dyna.actor.posRot.rot.y); + this->dyna.actor.posRot.pos.x += 32.5f * Math_SinS(this->dyna.actor.posRot.rot.y); + this->dyna.actor.posRot.pos.z += 32.5f * Math_CosS(this->dyna.actor.posRot.rot.y); func_8002DF54(globalCtx, &this->dyna.actor, 8); this->dyna.actor.flags |= 0x10; @@ -127,7 +127,7 @@ void BgHidanDalm_Shrink(BgHidanDalm* this, GlobalContext* globalCtx) { Vec3f velocity; Vec3f pos; - if (Math_ApproxF(&this->dyna.actor.scale.x, 0.0f, 0.004f)) { + if (Math_StepToF(&this->dyna.actor.scale.x, 0.0f, 0.004f)) { func_8002DF54(globalCtx, &this->dyna.actor, 7); Actor_Kill(&this->dyna.actor); } @@ -139,9 +139,9 @@ void BgHidanDalm_Shrink(BgHidanDalm* this, GlobalContext* globalCtx) { pos.z = this->dyna.actor.posRot.pos.z; for (i = 0; i < 4; i++) { - velocity.x = 5.0f * Math_Sins(this->dyna.actor.posRot.rot.y + 0x8000) + (Math_Rand_ZeroOne() - 0.5f) * 5.0f; - velocity.z = 5.0f * Math_Coss(this->dyna.actor.posRot.rot.y + 0x8000) + (Math_Rand_ZeroOne() - 0.5f) * 5.0f; - velocity.y = (Math_Rand_ZeroOne() - 0.5f) * 1.5f; + velocity.x = 5.0f * Math_SinS(this->dyna.actor.posRot.rot.y + 0x8000) + (Rand_ZeroOne() - 0.5f) * 5.0f; + velocity.z = 5.0f * Math_CosS(this->dyna.actor.posRot.rot.y + 0x8000) + (Rand_ZeroOne() - 0.5f) * 5.0f; + velocity.y = (Rand_ZeroOne() - 0.5f) * 1.5f; EffectSsKiraKira_SpawnSmallYellow(globalCtx, &pos, &velocity, &accel); } } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c index eafb406081..3840b409de 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c @@ -111,9 +111,9 @@ void BgHidanFirewall_Countdown(BgHidanFirewall* this, GlobalContext* globalCtx) void BgHidanFirewall_Erupt(BgHidanFirewall* this, GlobalContext* globalCtx) { if (BgHidanFirewall_CheckProximity(this, globalCtx) != 0) { - Math_ApproxF(&this->actor.scale.y, 0.1f, 0.01f / 0.4f); + Math_StepToF(&this->actor.scale.y, 0.1f, 0.01f / 0.4f); } else { - if (Math_ApproxF(&this->actor.scale.y, 0.01f, 0.01f) != 0) { + if (Math_StepToF(&this->actor.scale.y, 0.01f, 0.01f) != 0) { this->actor.draw = NULL; this->actionFunc = BgHidanFirewall_Wait; } else { @@ -164,8 +164,8 @@ void BgHidanFirewall_ColliderFollowPlayer(BgHidanFirewall* this, GlobalContext* } else { sp30.z = this->actor.params * 25.0f; } - sp28 = Math_Sins(this->actor.shape.rot.y); - temp_ret = Math_Coss(this->actor.shape.rot.y); + sp28 = Math_SinS(this->actor.shape.rot.y); + temp_ret = Math_CosS(this->actor.shape.rot.y); this->collider.dim.pos.x = this->actor.posRot.pos.x + sp30.x * temp_ret + sp30.z * sp28; this->collider.dim.pos.z = this->actor.posRot.pos.z - sp30.x * sp28 + sp30.z * temp_ret; } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c index a01dbebc20..84883aef6a 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c @@ -108,7 +108,7 @@ void func_80886FCC(BgHidanFslift* this, GlobalContext* globalCtx) { void func_8088706C(BgHidanFslift* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; - if (Math_ApproxF(&thisx->posRot.pos.y, thisx->initPosRot.pos.y, 4.0f)) { + if (Math_StepToF(&thisx->posRot.pos.y, thisx->initPosRot.pos.y, 4.0f)) { Audio_PlayActorSound2(thisx, NA_SE_EV_BLOCK_BOUND); func_80886FB4(this); } else { @@ -121,7 +121,7 @@ void func_808870D8(BgHidanFslift* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if (func_80043590(thisx)) { - if (Math_ApproxF(&thisx->posRot.pos.y, thisx->initPosRot.pos.y + 790.0f, 4.0f)) { + if (Math_StepToF(&thisx->posRot.pos.y, thisx->initPosRot.pos.y + 790.0f, 4.0f)) { Audio_PlayActorSound2(thisx, NA_SE_EV_BLOCK_BOUND); func_80886FB4(this); } else { diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c index 91ba4f00bc..7d0f33a765 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c @@ -97,8 +97,8 @@ void BgHidanFwbig_Destroy(Actor* thisx, GlobalContext* globalCtx) { void BgHidanFwbig_UpdatePosition(BgHidanFwbig* this) { s16 startAngle = this->actor.shape.rot.y + this->direction * -0x4000; - this->actor.posRot.pos.x = (Math_Sins(startAngle) * 885.4f) + this->actor.initPosRot.pos.x; - this->actor.posRot.pos.z = (Math_Coss(startAngle) * 885.4f) + this->actor.initPosRot.pos.z; + this->actor.posRot.pos.x = (Math_SinS(startAngle) * 885.4f) + this->actor.initPosRot.pos.x; + this->actor.posRot.pos.z = (Math_CosS(startAngle) * 885.4f) + this->actor.initPosRot.pos.z; } void BgHidanFwbig_WaitForSwitch(BgHidanFwbig* this, GlobalContext* globalCtx) { @@ -116,7 +116,7 @@ void BgHidanFwbig_WaitForCs(BgHidanFwbig* this, GlobalContext* globalCtx) { } void BgHidanFwbig_Rise(BgHidanFwbig* this, GlobalContext* globalCtx) { - if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 10.0f)) { + if (Math_StepToF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 10.0f)) { if (this->direction == 0) { Flags_UnsetSwitch(globalCtx, this->actor.params); this->actionFunc = BgHidanFwbig_WaitForSwitch; @@ -127,7 +127,7 @@ void BgHidanFwbig_Rise(BgHidanFwbig* this, GlobalContext* globalCtx) { } void BgHidanFwbig_Lower(BgHidanFwbig* this, GlobalContext* globalCtx) { - if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y - (2400.0f * this->actor.scale.y), + if (Math_StepToF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y - (2400.0f * this->actor.scale.y), 10.0f)) { if (this->direction == 0) { this->actionFunc = BgHidanFwbig_WaitForTimer; @@ -168,7 +168,7 @@ void BgHidanFwbig_WaitForPlayer(BgHidanFwbig* this, GlobalContext* globalCtx) { void BgHidanFwbig_Move(BgHidanFwbig* this, GlobalContext* globalCtx) { if (!Player_InCsMode(globalCtx)) { - if (Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, + if (Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.initPosRot.rot.y + (this->direction * 0x6390), 0x20)) { this->moveState = FWBIG_RESET; this->actionFunc = BgHidanFwbig_Lower; @@ -192,8 +192,8 @@ void BgHidanFwbig_MoveCollider(BgHidanFwbig* this, GlobalContext* globalCtx) { projPos.x = CLAMP(projPos.x, -500.0f, 500.0f); } - sn = Math_Sins(this->actor.shape.rot.y); - cs = Math_Coss(this->actor.shape.rot.y); + sn = Math_SinS(this->actor.shape.rot.y); + cs = Math_CosS(this->actor.shape.rot.y); this->collider.dim.pos.x = this->actor.posRot.pos.x + (projPos.x * cs) + (projPos.z * sn); this->collider.dim.pos.z = this->actor.posRot.pos.z - (projPos.x * sn) + (projPos.z * cs); this->collider.dim.pos.y = this->actor.posRot.pos.y; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c index 6a8ad92278..c9fb8dce99 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c @@ -97,8 +97,8 @@ void BgHidanKousi_Destroy(Actor* thisx, GlobalContext* globalCtx) { void func_80889ACC(BgHidanKousi* this) { s32 pad[2]; Vec3s* rot = &this->dyna.actor.posRot.rot; - f32 temp1 = D_80889E40[this->dyna.actor.params & 0xFF] * Math_Sins(rot->y); - f32 temp2 = D_80889E40[this->dyna.actor.params & 0xFF] * Math_Coss(rot->y); + f32 temp1 = D_80889E40[this->dyna.actor.params & 0xFF] * Math_SinS(rot->y); + f32 temp2 = D_80889E40[this->dyna.actor.params & 0xFF] * Math_CosS(rot->y); Vec3f* initPos = &this->dyna.actor.initPosRot.pos; this->dyna.actor.posRot.pos.x = initPos->x + temp1; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c index ef3152f007..7d99a576ad 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c @@ -113,8 +113,8 @@ void BgHidanRsekizou_Update(Actor* thisx, GlobalContext* globalCtx) { } this->dyna.actor.shape.rot.y += 0x180; // Approximately 2 Degrees per Frame - yawSine = Math_Sins(this->dyna.actor.shape.rot.y); - yawCosine = Math_Coss(this->dyna.actor.shape.rot.y); + yawSine = Math_SinS(this->dyna.actor.shape.rot.y); + yawCosine = Math_CosS(this->dyna.actor.shape.rot.y); for (i = 0; i < ARRAY_COUNT(this->colliderItems); i++) { sphere = &this->collider.list[i]; @@ -149,11 +149,11 @@ Gfx* BgHidanRsekizou_DrawFireball(GlobalContext* globalCtx, BgHidanRsekizou* thi gDPSetEnvColor(displayList++, 255, 0, 0, 255); if (a == 0) { - sins = -Math_Sins(this->dyna.actor.shape.rot.y - (frame * 1500)); - coss = -Math_Coss(this->dyna.actor.shape.rot.y - (frame * 1500)); + sins = -Math_SinS(this->dyna.actor.shape.rot.y - (frame * 1500)); + coss = -Math_CosS(this->dyna.actor.shape.rot.y - (frame * 1500)); } else { - sins = Math_Sins(this->dyna.actor.shape.rot.y - (frame * 1500)); - coss = Math_Coss(this->dyna.actor.shape.rot.y - (frame * 1500)); + sins = Math_SinS(this->dyna.actor.shape.rot.y - (frame * 1500)); + coss = Math_CosS(this->dyna.actor.shape.rot.y - (frame * 1500)); } mf->xx = mf->yy = mf->zz = (0.7f * fVar6) + 0.5f; diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c index 7d0a609214..b58b26d756 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c @@ -41,13 +41,13 @@ static InitChainEntry sInitChain[] = { void func_80891AC0(BgIceShutter* this) { f32 sp24; - sp24 = Math_Sins(this->dyna.actor.shape.rot.x) * this->dyna.actor.velocity.y; + sp24 = Math_SinS(this->dyna.actor.shape.rot.x) * this->dyna.actor.velocity.y; this->dyna.actor.posRot.pos.y = - (Math_Coss(this->dyna.actor.shape.rot.x) * this->dyna.actor.velocity.y) + this->dyna.actor.initPosRot.pos.y; + (Math_CosS(this->dyna.actor.shape.rot.x) * this->dyna.actor.velocity.y) + this->dyna.actor.initPosRot.pos.y; this->dyna.actor.posRot.pos.x = - (Math_Sins(this->dyna.actor.shape.rot.y) * sp24) + this->dyna.actor.initPosRot.pos.x; + (Math_SinS(this->dyna.actor.shape.rot.y) * sp24) + this->dyna.actor.initPosRot.pos.x; this->dyna.actor.posRot.pos.z = - (Math_Coss(this->dyna.actor.shape.rot.y) * sp24) + this->dyna.actor.initPosRot.pos.z; + (Math_CosS(this->dyna.actor.shape.rot.y) * sp24) + this->dyna.actor.initPosRot.pos.z; } void BgIceShutter_Init(Actor* thisx, GlobalContext* globalCtx) { @@ -84,12 +84,12 @@ void BgIceShutter_Init(Actor* thisx, GlobalContext* globalCtx) { } if (sp28 == 2) { - temp_f6 = Math_Sins(this->dyna.actor.shape.rot.x) * 50.0f; + temp_f6 = Math_SinS(this->dyna.actor.shape.rot.x) * 50.0f; this->dyna.actor.posRot2.pos.x = - (Math_Sins(this->dyna.actor.shape.rot.y) * temp_f6) + this->dyna.actor.initPosRot.pos.x; + (Math_SinS(this->dyna.actor.shape.rot.y) * temp_f6) + this->dyna.actor.initPosRot.pos.x; this->dyna.actor.posRot2.pos.y = this->dyna.actor.initPosRot.pos.y; this->dyna.actor.posRot2.pos.z = - this->dyna.actor.initPosRot.pos.z + (Math_Coss(this->dyna.actor.shape.rot.y) * temp_f6); + this->dyna.actor.initPosRot.pos.z + (Math_CosS(this->dyna.actor.shape.rot.y) * temp_f6); } else { Actor_SetHeight(&this->dyna.actor, 50.0f); } @@ -120,8 +120,8 @@ void func_80891D6C(BgIceShutter* this, GlobalContext* globalCtx) { } void func_80891DD4(BgIceShutter* this, GlobalContext* globalCtx) { - Math_ApproxF(&this->dyna.actor.speedXZ, 30.0f, 2.0f); - if (Math_ApproxF(&this->dyna.actor.velocity.y, 210.0f, this->dyna.actor.speedXZ)) { + Math_StepToF(&this->dyna.actor.speedXZ, 30.0f, 2.0f); + if (Math_StepToF(&this->dyna.actor.velocity.y, 210.0f, this->dyna.actor.speedXZ)) { Actor_Kill(&this->dyna.actor); return; } diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c index 78324fe197..8ad90eaeb6 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c @@ -90,16 +90,16 @@ void BgIceTurara_Break(BgIceTurara* this, GlobalContext* globalCtx, f32 arg2) { Audio_PlaySoundAtPosition(globalCtx, &this->dyna.actor.posRot.pos, 30, NA_SE_EV_ICE_BROKEN); for (i = 0; i < 2; i++) { for (j = 0; j < 10; j++) { - pos.x = this->dyna.actor.posRot.pos.x + Math_Rand_CenteredFloat(8.0f); - pos.y = this->dyna.actor.posRot.pos.y + (Math_Rand_ZeroOne() * arg2) + (i * arg2); - pos.z = this->dyna.actor.posRot.pos.z + Math_Rand_CenteredFloat(8.0f); + pos.x = this->dyna.actor.posRot.pos.x + Rand_CenteredFloat(8.0f); + pos.y = this->dyna.actor.posRot.pos.y + (Rand_ZeroOne() * arg2) + (i * arg2); + pos.z = this->dyna.actor.posRot.pos.z + Rand_CenteredFloat(8.0f); - vel.x = Math_Rand_CenteredFloat(7.0f); - vel.z = Math_Rand_CenteredFloat(7.0f); - vel.y = (Math_Rand_ZeroOne() * 4.0f) + 8.0f; + vel.x = Rand_CenteredFloat(7.0f); + vel.z = Rand_CenteredFloat(7.0f); + vel.y = (Rand_ZeroOne() * 4.0f) + 8.0f; - EffectSsEnIce_Spawn(globalCtx, &pos, (Math_Rand_ZeroOne() * 0.2f) + 0.1f, &vel, &accel, &primColor, - &envColor, 30); + EffectSsEnIce_Spawn(globalCtx, &pos, (Rand_ZeroOne() * 0.2f) + 0.1f, &vel, &accel, &primColor, &envColor, + 30); } } } @@ -139,11 +139,11 @@ void BgIceTurara_Shiver(BgIceTurara* this, GlobalContext* globalCtx) { func_8003EBF8(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); this->actionFunc = BgIceTurara_Fall; } else { - sp28 = Math_Rand_ZeroOne(); - phi_v0_2 = (Math_Rand_ZeroOne() < 0.5f ? -1 : 1); + sp28 = Rand_ZeroOne(); + phi_v0_2 = (Rand_ZeroOne() < 0.5f ? -1 : 1); this->dyna.actor.posRot.pos.x = (phi_v0_2 * ((0.5f * sp28) + 0.5f)) + this->dyna.actor.initPosRot.pos.x; - sp28 = Math_Rand_ZeroOne(); - phi_v0_3 = (Math_Rand_ZeroOne() < 0.5f ? -1 : 1); + sp28 = Rand_ZeroOne(); + phi_v0_3 = (Rand_ZeroOne() < 0.5f ? -1 : 1); this->dyna.actor.posRot.pos.z = (phi_v0_3 * ((0.5f * sp28) + 0.5f)) + this->dyna.actor.initPosRot.pos.z; } } @@ -175,7 +175,7 @@ void BgIceTurara_Fall(BgIceTurara* this, GlobalContext* globalCtx) { } void BgIceTurara_Regrow(BgIceTurara* this, GlobalContext* globalCtx) { - if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, 1.0f)) { + if (Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, 1.0f)) { this->actionFunc = BgIceTurara_Wait; this->dyna.actor.velocity.y = 0.0f; } diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c index e79dc0218f..280bd85165 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -88,7 +88,7 @@ void func_80892890(BgIngate* this, GlobalContext* globalCtx) { if (csFrames > 0x4000) { csFrames = 0x4000; } - csFrames = (Math_Sins(csFrames) * 16384.0f); + csFrames = (Math_SinS(csFrames) * 16384.0f); phi1 = csFrames; if ((this->dyna.actor.params & 2) == 0) { phi1 = -phi1; diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c index 5a02a3da02..31139595b1 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c @@ -142,13 +142,13 @@ void BgJya1flift_ChangeDirection(BgJya1flift* this) { void BgJya1flift_Move(BgJya1flift* this, GlobalContext* globalCtx) { f32 tempVelocity; - Math_ApproxF(&this->dyna.actor.velocity.y, 6.0f, 0.4f); + Math_StepToF(&this->dyna.actor.velocity.y, 6.0f, 0.4f); if (this->dyna.actor.velocity.y < 1.0f) { tempVelocity = 1.0f; } else { tempVelocity = this->dyna.actor.velocity.y; } - if (fabsf(Math_SmoothScaleMaxMinF(&this->dyna.actor.posRot.pos.y, (sFinalPositions[this->isMovingDown]), 0.5f, + if (fabsf(Math_SmoothStepToF(&this->dyna.actor.posRot.pos.y, (sFinalPositions[this->isMovingDown]), 0.5f, tempVelocity, 1.0f)) < 0.001f) { this->dyna.actor.posRot.pos.y = sFinalPositions[this->isMovingDown]; BgJya1flift_ResetMoveDelay(this); diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c index 236daba768..bd9e3fe56d 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c +++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c @@ -91,7 +91,7 @@ void func_80893428(BgJyaAmishutter* this) { } void func_80893438(BgJyaAmishutter* this) { - if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y + 100.0f, 3.0f)) { + if (Math_StepToF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y + 100.0f, 3.0f)) { func_808934B0(this); Audio_PlayActorSound2(&this->actor, NA_SE_EV_METALDOOR_STOP); } else { @@ -114,7 +114,7 @@ void func_808934FC(BgJyaAmishutter* this) { } void func_8089350C(BgJyaAmishutter* this) { - if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 3.0f)) { + if (Math_StepToF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 3.0f)) { func_808933BC(this); Audio_PlayActorSound2(&this->actor, NA_SE_EV_METALDOOR_STOP); } else { diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c index c78b39031e..e6fb1b04db 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c @@ -97,19 +97,19 @@ void BgJyaBombchuiwa_Break(BgJyaBombchuiwa* this, GlobalContext* globalCtx) { s32 i; for (i = 0; i < 20; i++) { - pos.x = Math_Rand_ZeroOne() * 10.0f + this->actor.posRot.pos.x - 10.0f; - pos.y = Math_Rand_ZeroOne() * 40.0f + this->actor.posRot.pos.y - 20.0f; - pos.z = Math_Rand_ZeroOne() * 50.0f + this->actor.posRot.pos.z - 25.0f; - velocity.x = Math_Rand_ZeroOne() * 3.0f - 0.3f; - velocity.y = Math_Rand_ZeroOne() * 18.0f; - velocity.z = (Math_Rand_ZeroOne() - 0.5f) * 15.0f; - scale = (s32)(Math_Rand_ZeroOne() * 20.0f) + 1; + pos.x = Rand_ZeroOne() * 10.0f + this->actor.posRot.pos.x - 10.0f; + pos.y = Rand_ZeroOne() * 40.0f + this->actor.posRot.pos.y - 20.0f; + pos.z = Rand_ZeroOne() * 50.0f + this->actor.posRot.pos.z - 25.0f; + velocity.x = Rand_ZeroOne() * 3.0f - 0.3f; + velocity.y = Rand_ZeroOne() * 18.0f; + velocity.z = (Rand_ZeroOne() - 0.5f) * 15.0f; + scale = (s32)(Rand_ZeroOne() * 20.0f) + 1; if (scale > 10) { arg5 = 5; } else { arg5 = 1; } - if (Math_Rand_ZeroOne() < 0.4f) { + if (Rand_ZeroOne() < 0.4f) { arg5 |= 0x40; arg6 = 0xC; arg7 = 8; @@ -164,7 +164,7 @@ void func_808949B8(BgJyaBombchuiwa* this, GlobalContext* globalCtx) { if (this->timer & 4) { func_80033480(globalCtx, &this->actor.posRot.pos, 60.0f, 3, 100, 100, 0); } - if (Math_ApproxF(&this->lightRayIntensity, 1.0f, 0.028)) { + if (Math_StepToF(&this->lightRayIntensity, 1.0f, 0.028)) { BgJyaBombchuiwa_SpawnLightRay(this, globalCtx); } } diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c index c6c2c796bc..10b096ac60 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c @@ -107,19 +107,19 @@ void BgJyaBombiwa_Break(BgJyaBombiwa* this, GlobalContext* globalCtx) { s16 scale; for (i = 0; i < 16; i++) { - pos.x = ((Math_Rand_ZeroOne() * 80.0f) + this->dyna.actor.posRot.pos.x) - 40.0f; - pos.y = (Math_Rand_ZeroOne() * 140.0f) + this->dyna.actor.posRot.pos.y; - pos.z = ((Math_Rand_ZeroOne() * 80.0f) + this->dyna.actor.posRot.pos.z) - 40.0f; - velocity.x = (Math_Rand_ZeroOne() - 0.5f) * 10.0f; - velocity.y = Math_Rand_ZeroOne() * 12.0f; - velocity.z = (Math_Rand_ZeroOne() - 0.5f) * 10.0f; + pos.x = ((Rand_ZeroOne() * 80.0f) + this->dyna.actor.posRot.pos.x) - 40.0f; + pos.y = (Rand_ZeroOne() * 140.0f) + this->dyna.actor.posRot.pos.y; + pos.z = ((Rand_ZeroOne() * 80.0f) + this->dyna.actor.posRot.pos.z) - 40.0f; + velocity.x = (Rand_ZeroOne() - 0.5f) * 10.0f; + velocity.y = Rand_ZeroOne() * 12.0f; + velocity.z = (Rand_ZeroOne() - 0.5f) * 10.0f; scale = (s32)(i * 1.8f) + 3; if (scale > 15) { arg5 = 5; } else { arg5 = 1; } - if (Math_Rand_ZeroOne() < 0.4f) { + if (Rand_ZeroOne() < 0.4f) { arg5 |= 0x40; arg6 = 0xC; arg7 = 8; diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c index 6b1585545a..5f3a7e25ef 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c @@ -122,9 +122,9 @@ void func_80897B48(BgJyaGoroiwa* this, GlobalContext* globalCtx) { } thisx->speedXZ = (sqrtf(tmpf1) * this->unk_1B0); - thisx->velocity.x = (Math_Sins(thisx->posRot.rot.y) * thisx->speedXZ); + thisx->velocity.x = (Math_SinS(thisx->posRot.rot.y) * thisx->speedXZ); - tmpf2 = Math_Coss(thisx->posRot.rot.y) * thisx->speedXZ; + tmpf2 = Math_CosS(thisx->posRot.rot.y) * thisx->speedXZ; thisx->velocity.z = tmpf2; thisx->posRot.pos.x = thisx->posRot.pos.x + thisx->velocity.x; thisx->posRot.pos.z = thisx->posRot.pos.z + tmpf2; @@ -161,7 +161,7 @@ void func_80897B48(BgJyaGoroiwa* this, GlobalContext* globalCtx) { func_80897DDC(this); } } else { - Math_ApproxF(&this->unk_1B0, 1.0f, 0.04f); + Math_StepToF(&this->unk_1B0, 1.0f, 0.04f); } if (thisx->posRot.pos.x > 1745.0f) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c index f20dd23926..06a7117841 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c @@ -79,12 +79,12 @@ void BgJyaHaheniron_SpawnFragments(GlobalContext* globalCtx, Vec3f* vec1, Vec3f* f32 rand1; for (angle = 0, i = 0; i < ARRAY_COUNT(sKakeraScales); i++) { - rand1 = Math_Rand_ZeroOne() * 10.0f; - vel.x = (Math_Sins(angle) * rand1) + vec2->x; - vel.y = (Math_Rand_ZeroOne() * 10.0f) + vec2->y; - vel.z = (Math_Coss(angle) * rand1) + vec2->z; + rand1 = Rand_ZeroOne() * 10.0f; + vel.x = (Math_SinS(angle) * rand1) + vec2->x; + vel.y = (Rand_ZeroOne() * 10.0f) + vec2->y; + vel.z = (Math_CosS(angle) * rand1) + vec2->z; - rand1 = Math_Rand_ZeroOne(); + rand1 = Rand_ZeroOne(); if (rand1 < 0.2f) { arg5 = 96; } else if (rand1 < 0.8f) { @@ -109,7 +109,7 @@ void BgJyaHaheniron_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_SetScale(&this->actor, D_80898794[this->actor.params]); if (thisx->params == 0) { BgJyaHaheniron_ColliderInit(this, globalCtx); - thisx->shape.rot.z = (Math_Rand_ZeroOne() * 65535.0f); + thisx->shape.rot.z = (Rand_ZeroOne() * 65535.0f); BgJyaHaheniron_SetupChairCrumble(this); } else if (thisx->params == 1) { BgJyaHaheniron_SetupPillarCrumble(this); @@ -135,9 +135,9 @@ void BgJyaHaheniron_ChairCrumble(BgJyaHaheniron* this, GlobalContext* globalCtx) func_8002E4B4(globalCtx, &this->actor, 5.0f, 8.0f, 0.0f, 0x85); if ((this->actor.bgCheckFlags & 9) || ((this->collider.base.atFlags & 2) && (this->collider.base.at) && (this->collider.base.at->type == 2))) { - vec.x = -Math_Rand_ZeroOne() * this->actor.velocity.x; - vec.y = -Math_Rand_ZeroOne() * this->actor.velocity.y; - vec.z = -Math_Rand_ZeroOne() * this->actor.velocity.z; + vec.x = -Rand_ZeroOne() * this->actor.velocity.x; + vec.y = -Rand_ZeroOne() * this->actor.velocity.y; + vec.z = -Rand_ZeroOne() * this->actor.velocity.z; BgJyaHaheniron_SpawnFragments(globalCtx, &this->actor.posRot, &vec); Actor_Kill(&this->actor); } else if (this->timer >= 61) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c index d940e0effa..4137195596 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c @@ -102,7 +102,7 @@ void func_80899950(BgJyaKanaami* this, GlobalContext* globalCtx) { s32 pad[2]; s32 var; this->unk_168 += 0x20; - if (Math_ApproxUpdateScaledS(&this->actor.posRot.rot.x, 0x4000, this->unk_168)) { + if (Math_ScaledStepToS(&this->actor.posRot.rot.x, 0x4000, this->unk_168)) { func_80899A08(this); Audio_PlayActorSound2(&this->actor, NA_SE_EV_TRAP_BOUND); var = Quake_Add(ACTIVE_CAM, 3); diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c index 8e355b101f..3f422b3d42 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c @@ -114,9 +114,9 @@ void BgJyaLift_Move(BgJyaLift* this, GlobalContext* globalCtx) { f32 distFromBottom; f32 tempVelocity; - Math_SmoothScaleMaxMinF(&this->dyna.actor.velocity.y, 4.0f, 0.1f, 1.0f, 0.0f); + Math_SmoothStepToF(&this->dyna.actor.velocity.y, 4.0f, 0.1f, 1.0f, 0.0f); tempVelocity = (this->dyna.actor.velocity.y < 0.2f) ? 0.2f : this->dyna.actor.velocity.y; - distFromBottom = Math_SmoothScaleMaxMinF(&this->dyna.actor.posRot.pos.y, 973.0f, 0.1f, tempVelocity, 0.2f); + distFromBottom = Math_SmoothStepToF(&this->dyna.actor.posRot.pos.y, 973.0f, 0.1f, tempVelocity, 0.2f); if ((this->dyna.actor.posRot.pos.y < 1440.0f) && (1440.0f <= this->dyna.actor.pos4.y)) { func_8005B1A4(ACTIVE_CAM); } diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c index b1d1757676..017f206e13 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c @@ -132,11 +132,11 @@ void func_8089A1DC(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, s32 nu s32 i; for (i = 0; i < num; i++) { - s32 idx = ((s16)(Math_Rand_ZeroOne() * 8.0f)) & D_8089B17C[arg4]; - s16 arg5 = ((idx < 5) && (Math_Rand_ZeroOne() < 0.7f)) ? 0x40 : 0x20; + s32 idx = ((s16)(Rand_ZeroOne() * 8.0f)) & D_8089B17C[arg4]; + s16 arg5 = ((idx < 5) && (Rand_ZeroOne() < 0.7f)) ? 0x40 : 0x20; EffectSsKakera_Spawn(globalCtx, pos, velocity, pos, -90, arg5, D_8089B16C[idx], 4, 0, D_8089B14C[idx], 0, 5, D_8089B15C[idx], KAKERA_COLOR_NONE, OBJECT_JYA_OBJ, D_0600B9F8); - if (Math_Rand_ZeroOne() < 0.45f) { + if (Rand_ZeroOne() < 0.45f) { Math_Vec3f_Copy(&spB4, pos); spB4.z += 25.0f; func_80033480(globalCtx, &spB4, 60.0f, 0, D_8089B14C[idx] * 4 + 50, D_8089B14C[idx] * 4 + 70, 1); @@ -149,7 +149,7 @@ void func_8089A41C(BgJyaMegami* this, GlobalContext* globalCtx, f32 arg2) { Vec3f sp50; for (i = 0; i < ARRAY_COUNT(this->pieces); i++) { - if (Math_Rand_ZeroOne() < arg2) { + if (Rand_ZeroOne() < arg2) { Math_Vec3f_Sum(&this->dyna.actor.posRot.pos, &sPiecesInit[i].unk_00, &sp50); sp50.z += 15.0f; func_8089A1DC(globalCtx, &sp50, &D_8089B184, 1, 0); @@ -252,7 +252,7 @@ void BgJyaMegami_Explode(BgJyaMegami* this, GlobalContext* globalCtx) { temp->pos.y += temp->vel.y; temp->rotVelX += temp2->rotVelX; temp->rotVelY += temp2->rotVelY; - if (Math_Rand_ZeroOne() < 0.067f) { + if (Rand_ZeroOne() < 0.067f) { Math_Vec3f_Sum(&temp->pos, &temp2->unk_00, &sp8C); sp8C.z += 10.0f; func_8089A1DC(globalCtx, &sp8C, &temp->vel, 3, 2); @@ -266,9 +266,9 @@ void BgJyaMegami_Explode(BgJyaMegami* this, GlobalContext* globalCtx) { if ((this->explosionTimer % 4 == 0) && (this->explosionTimer > 30) && (this->explosionTimer < 80) && (this->explosionTimer > 40)) { - sp8C.x = ((Math_Rand_ZeroOne() - 0.5f) * 90.0f) + this->dyna.actor.posRot.pos.x; - sp8C.y = (this->dyna.actor.posRot.pos.y - (Math_Rand_ZeroOne() * 80.0f)) - 20.0f; - sp8C.z = this->dyna.actor.posRot.pos.z - ((Math_Rand_ZeroOne() - 0.5f) * 50.0f); + sp8C.x = ((Rand_ZeroOne() - 0.5f) * 90.0f) + this->dyna.actor.posRot.pos.x; + sp8C.y = (this->dyna.actor.posRot.pos.y - (Rand_ZeroOne() * 80.0f)) - 20.0f; + sp8C.z = this->dyna.actor.posRot.pos.z - ((Rand_ZeroOne() - 0.5f) * 50.0f); func_8089A1DC(globalCtx, &sp8C, &sVec, 1, 0); } if (this->explosionTimer < ARRAY_COUNT(this->pieces)) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c index 477ce72967..53a8859a5c 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c @@ -166,7 +166,7 @@ void func_8089B80C(BgJyaZurerukabe* this) { } void func_8089B870(BgJyaZurerukabe* this, GlobalContext* globalCtx) { - if (Math_ApproxF(&this->dyna.actor.posRot.pos.x, this->dyna.actor.initPosRot.pos.x + (this->unk_16C * 75), + if (Math_StepToF(&this->dyna.actor.posRot.pos.x, this->dyna.actor.initPosRot.pos.x + (this->unk_16C * 75), D_8089BA08[this->unk_168])) { func_8089B7B4(this); } diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c index 0958d99443..f57891eb33 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c @@ -106,19 +106,19 @@ void BgMizuShutter_WaitForCutscene(BgMizuShutter* this, GlobalContext* globalCtx void BgMizuShutter_Move(BgMizuShutter* this, GlobalContext* globalCtx) { if (Flags_GetSwitch(globalCtx, (u16)this->dyna.actor.params & 0x3F)) { - Math_SmoothScaleMaxMinF(&this->dyna.actor.posRot.pos.x, this->openPos.x, 1.0f, 4.0f, 0.1f); - Math_SmoothScaleMaxMinF(&this->dyna.actor.posRot.pos.y, this->openPos.y, 1.0f, 4.0f, 0.1f); - Math_SmoothScaleMaxMinF(&this->dyna.actor.posRot.pos.z, this->openPos.z, 1.0f, 4.0f, 0.1f); + Math_SmoothStepToF(&this->dyna.actor.posRot.pos.x, this->openPos.x, 1.0f, 4.0f, 0.1f); + Math_SmoothStepToF(&this->dyna.actor.posRot.pos.y, this->openPos.y, 1.0f, 4.0f, 0.1f); + Math_SmoothStepToF(&this->dyna.actor.posRot.pos.z, this->openPos.z, 1.0f, 4.0f, 0.1f); if ((this->dyna.actor.posRot.pos.x == this->openPos.x) && (this->dyna.actor.posRot.pos.y == this->openPos.y) && (this->dyna.actor.posRot.pos.z == this->openPos.z)) { this->timer = this->timerMax; this->actionFunc = BgMizuShutter_WaitForTimer; } } else { - Math_SmoothScaleMaxMinF(&this->maxSpeed, 20.0f, 1.0f, 3.0f, 0.1f); - Math_SmoothScaleMaxMinF(&this->dyna.actor.posRot.pos.x, this->closedPos.x, 1.0f, this->maxSpeed, 0.1f); - Math_SmoothScaleMaxMinF(&this->dyna.actor.posRot.pos.y, this->closedPos.y, 1.0f, this->maxSpeed, 0.1f); - Math_SmoothScaleMaxMinF(&this->dyna.actor.posRot.pos.z, this->closedPos.z, 1.0f, this->maxSpeed, 0.1f); + Math_SmoothStepToF(&this->maxSpeed, 20.0f, 1.0f, 3.0f, 0.1f); + Math_SmoothStepToF(&this->dyna.actor.posRot.pos.x, this->closedPos.x, 1.0f, this->maxSpeed, 0.1f); + Math_SmoothStepToF(&this->dyna.actor.posRot.pos.y, this->closedPos.y, 1.0f, this->maxSpeed, 0.1f); + Math_SmoothStepToF(&this->dyna.actor.posRot.pos.z, this->closedPos.z, 1.0f, this->maxSpeed, 0.1f); if ((this->dyna.actor.posRot.pos.x == this->closedPos.x) && (this->dyna.actor.posRot.pos.y == this->closedPos.y) && (this->dyna.actor.posRot.pos.z == this->closedPos.z)) { diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index d626c9264c..b5629ab65c 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -236,7 +236,7 @@ void BgMizuWater_ChangeWaterLevel(BgMizuWater* this, GlobalContext* globalCtx) { Flags_UnsetSwitch(globalCtx, prevSwitchFlag); } - if (Math_ApproxF(&this->actor.posRot.pos.y, this->targetY, 5.0f)) { + if (Math_StepToF(&this->actor.posRot.pos.y, this->targetY, 5.0f)) { globalCtx->unk_11D30[0] = 0; this->actionFunc = BgMizuWater_WaitForAction; func_80106CCC(globalCtx); @@ -251,7 +251,7 @@ void BgMizuWater_ChangeWaterLevel(BgMizuWater* this, GlobalContext* globalCtx) { } else { this->targetY = this->baseY; } - if (Math_ApproxF(&this->actor.posRot.pos.y, this->targetY, 1.0f)) { + if (Math_StepToF(&this->actor.posRot.pos.y, this->targetY, 1.0f)) { globalCtx->unk_11D30[0] = 0; this->actionFunc = BgMizuWater_WaitForAction; } @@ -263,7 +263,7 @@ void BgMizuWater_ChangeWaterLevel(BgMizuWater* this, GlobalContext* globalCtx) { } else { this->targetY = this->baseY; } - if (Math_ApproxF(&this->actor.posRot.pos.y, this->targetY, 1.0f)) { + if (Math_StepToF(&this->actor.posRot.pos.y, this->targetY, 1.0f)) { globalCtx->unk_11D30[0] = 0; this->actionFunc = BgMizuWater_WaitForAction; } @@ -275,7 +275,7 @@ void BgMizuWater_ChangeWaterLevel(BgMizuWater* this, GlobalContext* globalCtx) { } else { this->targetY = this->baseY; } - if (Math_ApproxF(&this->actor.posRot.pos.y, this->targetY, 1.0f)) { + if (Math_StepToF(&this->actor.posRot.pos.y, this->targetY, 1.0f)) { globalCtx->unk_11D30[0] = 0; this->actionFunc = BgMizuWater_WaitForAction; } diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c index 5561c50767..e063c4f5bc 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c @@ -106,8 +106,8 @@ s32 BgMoriHashigo_SpawnLadder(BgMoriHashigo* this, GlobalContext* globalCtx) { Vec3f pos; Actor* ladder; - cs = Math_Coss(this->dyna.actor.shape.rot.y); - sn = Math_Sins(this->dyna.actor.shape.rot.y); + cs = Math_CosS(this->dyna.actor.shape.rot.y); + sn = Math_SinS(this->dyna.actor.shape.rot.y); pos.x = 6.0f * sn + this->dyna.actor.posRot.pos.x; pos.y = -210.0f + this->dyna.actor.posRot.pos.y; diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c index d7d7bf83f2..50029c2ecf 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c @@ -147,7 +147,7 @@ void BgMoriHashira4_GateWait(BgMoriHashira4* this, GlobalContext* globalCtx) { } void BgMoriHashira4_GateOpen(BgMoriHashira4* this, GlobalContext* globalCtx) { - if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 120.0f, 10.0f)) { + if (Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 120.0f, 10.0f)) { Actor_Kill(&this->dyna.actor); } } diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c index 2e6fdded9c..8a5cf93b8b 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c @@ -132,7 +132,7 @@ void BgMoriIdomizu_Main(BgMoriIdomizu* this, GlobalContext* globalCtx) { this->drainTimer--; if ((roomNum == 7) || (roomNum == 8) || (roomNum == 9)) { if (this->drainTimer < 70) { - Math_ApproxF(&thisx->posRot.pos.y, this->targetWaterLevel, 3.5f); + Math_StepToF(&thisx->posRot.pos.y, this->targetWaterLevel, 3.5f); BgMoriIdomizu_SetWaterLevel(globalCtx, thisx->posRot.pos.y); if (this->drainTimer > 0) { if (switchFlagSet) { diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c index 5b676eb098..78a2502a0b 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c +++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c @@ -102,9 +102,9 @@ void BgMoriKaitenkabe_Wait(BgMoriKaitenkabe* this, GlobalContext* globalCtx) { BgMoriKaitenkabe_SetupRotate(this); func_8002DF54(globalCtx, &this->dyna.actor, 8); Math_Vec3f_Copy(&this->lockedPlayerPos, &player->actor.posRot.pos); - push.x = Math_Sins(this->dyna.unk_158); + push.x = Math_SinS(this->dyna.unk_158); push.y = 0.0f; - push.z = Math_Coss(this->dyna.unk_158); + push.z = Math_CosS(this->dyna.unk_158); leverArm.x = this->dyna.actor.posRot.pos.x - player->actor.posRot.pos.x; leverArm.y = 0.0f; leverArm.z = this->dyna.actor.posRot.pos.z - player->actor.posRot.pos.z; @@ -131,8 +131,8 @@ void BgMoriKaitenkabe_Rotate(BgMoriKaitenkabe* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; s16 rotY; - Math_ApproxF(&this->rotSpeed, 0.6f, 0.02f); - if (Math_ApproxF(&this->rotYdeg, this->rotDirection * 45.0f, this->rotSpeed)) { + Math_StepToF(&this->rotSpeed, 0.6f, 0.02f); + if (Math_StepToF(&this->rotYdeg, this->rotDirection * 45.0f, this->rotSpeed)) { BgMoriKaitenkabe_SetupWait(this); func_8002DF54(globalCtx, thisx, 7); if (this->rotDirection > 0.0f) { diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c index 956e3ce1cf..aaccdc6519 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c @@ -193,7 +193,7 @@ void BgMoriRakkatenjo_SetupRise(BgMoriRakkatenjo* this) { } void BgMoriRakkatenjo_Rise(BgMoriRakkatenjo* this, GlobalContext* globalCtx) { - Math_SmoothScaleMaxMinF(&this->dyna.actor.velocity.y, 5.0f, 0.06f, 0.1f, 0.0f); + Math_SmoothStepToF(&this->dyna.actor.velocity.y, 5.0f, 0.06f, 0.1f, 0.0f); this->dyna.actor.posRot.pos.y += this->dyna.actor.velocity.y; if (this->dyna.actor.posRot.pos.y >= 683.0f) { BgMoriRakkatenjo_SetupWait(this); diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c index 08c5aaa041..507a9a1b4d 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c @@ -86,8 +86,8 @@ void BgPoEvent_InitPaintings(BgPoEvent* this, GlobalContext* globalCtx) { s32 phi_t2; Actor* newPainting; - sins = Math_Sins(this->dyna.actor.shape.rot.y); - coss = Math_Coss(this->dyna.actor.shape.rot.y); + sins = Math_SinS(this->dyna.actor.shape.rot.y); + coss = Math_CosS(this->dyna.actor.shape.rot.y); if (this->type == 4) { sins *= 2.4f; scaleY = 1.818f; @@ -130,7 +130,7 @@ void BgPoEvent_InitPaintings(BgPoEvent* this, GlobalContext* globalCtx) { sPuzzleState = 0; this->actionFunc = BgPoEvent_AmyWait; } else { - sPuzzleState = (s32)(Math_Rand_ZeroOne() * 3.0f) % 3; + sPuzzleState = (s32)(Rand_ZeroOne() * 3.0f) % 3; this->actionFunc = BgPoEvent_PaintingEmpty; } } @@ -295,7 +295,7 @@ void BgPoEvent_BlockFall(BgPoEvent* this, GlobalContext* globalCtx) { static s32 firstFall = 0; this->dyna.actor.velocity.y++; - if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, 433.0f, this->dyna.actor.velocity.y)) { + if (Math_StepToF(&this->dyna.actor.posRot.pos.y, 433.0f, this->dyna.actor.velocity.y)) { this->dyna.actor.flags &= ~0x20; this->dyna.actor.velocity.y = 0.0f; sBlocksAtRest++; @@ -376,10 +376,10 @@ void BgPoEvent_BlockPush(BgPoEvent* this, GlobalContext* globalCtx) { this->dyna.actor.speedXZ += 0.1f; this->dyna.actor.speedXZ = CLAMP_MAX(this->dyna.actor.speedXZ, 2.0f); - blockStop = Math_ApproxF(&blockPushDist, 20.0f, this->dyna.actor.speedXZ); + blockStop = Math_StepToF(&blockPushDist, 20.0f, this->dyna.actor.speedXZ); displacement = this->direction * blockPushDist; - this->dyna.actor.posRot.pos.x = (Math_Sins(this->dyna.unk_158) * displacement) + this->dyna.actor.initPosRot.pos.x; - this->dyna.actor.posRot.pos.z = (Math_Coss(this->dyna.unk_158) * displacement) + this->dyna.actor.initPosRot.pos.z; + this->dyna.actor.posRot.pos.x = (Math_SinS(this->dyna.unk_158) * displacement) + this->dyna.actor.initPosRot.pos.x; + this->dyna.actor.posRot.pos.z = (Math_CosS(this->dyna.unk_158) * displacement) + this->dyna.actor.initPosRot.pos.z; if (blockStop) { player->stateFlags2 &= ~0x10; if ((this->dyna.unk_150 > 0.0f) && (func_800435D8(globalCtx, &this->dyna, 0x1E, 0x32, -0x14) == 0)) { @@ -409,8 +409,8 @@ void BgPoEvent_BlockReset(BgPoEvent* this, GlobalContext* globalCtx) { player->stateFlags2 &= ~0x10; this->dyna.unk_150 = 0.0f; } - if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, 493.0f, 1.0f) && - Math_ApproxUpdateScaledS(&this->dyna.actor.shape.rot.z, this->dyna.actor.posRot.rot.z - 0x4000, 0x400)) { + if (Math_StepToF(&this->dyna.actor.posRot.pos.y, 493.0f, 1.0f) && + Math_ScaledStepToS(&this->dyna.actor.shape.rot.z, this->dyna.actor.posRot.rot.z - 0x4000, 0x400)) { this->index = (this->index + 1) % 4; this->actionFunc = BgPoEvent_BlockFall; @@ -428,7 +428,7 @@ void BgPoEvent_BlockSolved(BgPoEvent* this, GlobalContext* globalCtx) { if (this->dyna.unk_150 != 0.0f) { player->stateFlags2 &= ~0x10; } - if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, 369.0f, 2.0f)) { + if (Math_StepToF(&this->dyna.actor.posRot.pos.y, 369.0f, 2.0f)) { sPuzzleState = 0x20; Actor_Kill(&this->dyna.actor); } @@ -449,8 +449,8 @@ void BgPoEvent_AmyPuzzle(BgPoEvent* this, GlobalContext* globalCtx) { if (sPuzzleState == 0xF) { pos.x = this->dyna.actor.posRot.pos.x - 5.0f; - pos.y = Math_Rand_CenteredFloat(120.0f) + this->dyna.actor.posRot.pos.y; - pos.z = Math_Rand_CenteredFloat(120.0f) + this->dyna.actor.posRot.pos.z; + pos.y = Rand_CenteredFloat(120.0f) + this->dyna.actor.posRot.pos.y; + pos.z = Rand_CenteredFloat(120.0f) + this->dyna.actor.posRot.pos.z; EffectSsDeadDb_Spawn(globalCtx, &pos, &sZeroVec, &sZeroVec, 170, 0, 200, 255, 100, 170, 0, 255, 0, 1, 9, true); } else if (sPuzzleState == 0x20) { Actor_Kill(&this->dyna.actor); @@ -461,7 +461,7 @@ void BgPoEvent_AmyPuzzle(BgPoEvent* this, GlobalContext* globalCtx) { s32 BgPoEvent_NextPainting(BgPoEvent* this) { if ((this->dyna.actor.parent != NULL) && (this->dyna.actor.child != NULL)) { - if (Math_Rand_ZeroOne() < 0.5f) { + if (Rand_ZeroOne() < 0.5f) { sPuzzleState = ((BgPoEvent*)this->dyna.actor.parent)->index; } else { sPuzzleState = ((BgPoEvent*)this->dyna.actor.child)->index; @@ -548,9 +548,9 @@ void BgPoEvent_PaintingBurn(BgPoEvent* this, GlobalContext* globalCtx) { Vec3f sp54; this->timer--; - sp54.x = (Math_Sins(this->dyna.actor.shape.rot.y) * 5.0f) + this->dyna.actor.posRot.pos.x; - sp54.y = Math_Rand_CenteredFloat(66.0f) + this->dyna.actor.posRot.pos.y; - sp54.z = Math_Rand_CenteredFloat(50.0f) + this->dyna.actor.posRot.pos.z; + sp54.x = (Math_SinS(this->dyna.actor.shape.rot.y) * 5.0f) + this->dyna.actor.posRot.pos.x; + sp54.y = Rand_CenteredFloat(66.0f) + this->dyna.actor.posRot.pos.y; + sp54.z = Rand_CenteredFloat(50.0f) + this->dyna.actor.posRot.pos.z; if (this->timer >= 0) { if (this->type == 2) { EffectSsDeadDb_Spawn(globalCtx, &sp54, &sZeroVec, &sZeroVec, 100, 0, 255, 255, 150, 170, 255, 0, 0, 1, 9, diff --git a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c index 840514df57..fd90ab6168 100644 --- a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c +++ b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c @@ -105,7 +105,7 @@ void BgPoSyokudai_Init(Actor* thisx, GlobalContext* globalCtx) { } } - this->flameTextureScroll = (s16)(Math_Rand_ZeroOne() * 20.0f); + this->flameTextureScroll = (s16)(Rand_ZeroOne() * 20.0f); } void BgPoSyokudai_Destroy(Actor* thisx, GlobalContext* globalCtx) { @@ -149,7 +149,7 @@ void BgPoSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) { Color_RGBA8* primColor = &sPrimColors[this->flameColor]; Color_RGBA8* envColor = &sEnvColors[this->flameColor]; - lightBrightness = (0.3f * Math_Rand_ZeroOne()) + 0.7f; + lightBrightness = (0.3f * Rand_ZeroOne()) + 0.7f; red = (u8)(primColor->r * lightBrightness); green = (u8)(primColor->g * lightBrightness); diff --git a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c index 07cdf29c27..a8f2dafd0a 100644 --- a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c +++ b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c @@ -65,7 +65,7 @@ void func_808A8BAC(BgPushbox* this, GlobalContext* globalCtx) { thisx->speedXZ += this->dyna.unk_150 * 0.2f; thisx->speedXZ = (thisx->speedXZ < -1.0f) ? -1.0f : ((thisx->speedXZ > 1.0f) ? 1.0f : thisx->speedXZ); - Math_ApproxF(&thisx->speedXZ, 0.0f, 0.2f); + Math_StepToF(&thisx->speedXZ, 0.0f, 0.2f); thisx->posRot.rot.y = this->dyna.unk_158; Actor_MoveForward(thisx); func_8002E4B4(globalCtx, thisx, 20.0f, 40.0f, 40.0f, 0x1D); diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c index bb4dd6d9bc..f9a4866cb7 100644 --- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c +++ b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c @@ -129,7 +129,7 @@ void func_808A90F4(BgRelayObjects* this, GlobalContext* globalCtx) { this->timer = 160; } } - if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 120.0f, 12.0f)) { + if (Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 120.0f, 12.0f)) { this->actionFunc = func_808A91AC; } } @@ -150,7 +150,7 @@ void func_808A91AC(BgRelayObjects* this, GlobalContext* globalCtx) { void func_808A9234(BgRelayObjects* this, GlobalContext* globalCtx) { this->dyna.actor.velocity.y += this->dyna.actor.gravity; - if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, this->dyna.actor.velocity.y)) { + if (Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, this->dyna.actor.velocity.y)) { func_800AA000(this->dyna.actor.xyzDistFromLinkSq, 180, 20, 100); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_STONE_BOUND); if (this->unk_169 != globalCtx->roomCtx.curRoom.num) { @@ -189,9 +189,9 @@ void func_808A939C(BgRelayObjects* this, GlobalContext* globalCtx) { gSaveContext.eventChkInf[6] |= 0x20; } if (gSaveContext.eventChkInf[6] & 0x20) { - Math_ApproxUpdateScaledS(&this->dyna.actor.posRot.rot.y, 0x400, 8); + Math_ScaledStepToS(&this->dyna.actor.posRot.rot.y, 0x400, 8); } else { - Math_ApproxUpdateScaledS(&this->dyna.actor.posRot.rot.y, 0x80, 8); + Math_ScaledStepToS(&this->dyna.actor.posRot.rot.y, 0x80, 8); } this->dyna.actor.shape.rot.y += this->dyna.actor.posRot.rot.y; func_800F436C(&this->dyna.actor.projectedPos, NA_SE_EV_WOOD_GEAR - SFX_FLAG, diff --git a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c index fad63612c9..e2fdbc4fc4 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c @@ -68,7 +68,7 @@ void func_808AAA50(BgSpot01Fusya* this, GlobalContext* globalCtx) { thisx->shape.rot.z += this->unk_154; temp = ((this->unk_154 - 100.0f) / 1700.0f) + 1.0f; func_800F436C(&thisx->projectedPos, 0x2085, temp); - Math_SmoothScaleMaxF(&this->unk_154, this->unk_158, this->unk_15C, 100.0f); + Math_ApproachF(&this->unk_154, this->unk_158, this->unk_15C, 100.0f); } void BgSpot01Fusya_Update(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c index 22fa4dc354..10b5e7d789 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c @@ -60,7 +60,7 @@ void func_808ABB84(BgSpot01Idomizu* this, GlobalContext* globalCtx) { Audio_PlaySoundGeneral(NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } - Math_SmoothScaleMaxF(&this->actor.posRot.pos.y, this->waterHeight, 1.0f, 2.0f); + Math_ApproachF(&this->actor.posRot.pos.y, this->waterHeight, 1.0f, 2.0f); } void BgSpot01Idomizu_Update(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c index 160f79a1c2..d987bfaeb6 100644 --- a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c +++ b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c @@ -97,7 +97,7 @@ void func_808AE630(BgSpot05Soko* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; thisx->speedXZ *= 1.5f; - if (Math_ApproxF(&thisx->posRot.pos.y, thisx->initPosRot.pos.y - 120.0f, thisx->speedXZ) != 0) { + if (Math_StepToF(&thisx->posRot.pos.y, thisx->initPosRot.pos.y - 120.0f, thisx->speedXZ) != 0) { Actor_Kill(thisx); } } diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c index 1c624ff255..0f1c03f500 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c @@ -84,8 +84,8 @@ void func_808B0324(BgSpot08Bakudankabe* this, GlobalContext* globalCtx) { f32 sinY; f32 cosY; - sinY = Math_Sins(this->dyna.actor.shape.rot.y); - cosY = Math_Coss(this->dyna.actor.shape.rot.y); + sinY = Math_SinS(this->dyna.actor.shape.rot.y); + cosY = Math_CosS(this->dyna.actor.shape.rot.y); burstDepthX.z = 0.0f; burstDepthX.x = 0.0f; @@ -97,14 +97,14 @@ void func_808B0324(BgSpot08Bakudankabe* this, GlobalContext* globalCtx) { f32 temp2; s32 rotationSpeed; - temp1 = (Math_Rand_ZeroOne() - 0.5f) * 440.0f; - temp2 = (Math_Rand_ZeroOne() - 0.5f) * 20.0f; + temp1 = (Rand_ZeroOne() - 0.5f) * 440.0f; + temp2 = (Rand_ZeroOne() - 0.5f) * 20.0f; burstDepthY.x = this->dyna.actor.posRot.pos.x + temp2 * sinY + (temp1 * cosY); burstDepthY.y = (this->dyna.actor.posRot.pos.y + 20.0f) + (i * 5.4166665f); burstDepthY.z = this->dyna.actor.posRot.pos.z + temp2 * cosY - (temp1 * sinY); - burstDepthX.y = (Math_Rand_ZeroOne() - 0.2f) * 12.0f; - scale = Math_Rand_ZeroOne() * 75.0f + 10.0f; + burstDepthX.y = (Rand_ZeroOne() - 0.2f) * 12.0f; + scale = Rand_ZeroOne() * 75.0f + 10.0f; if (scale < 25) { gravityInfluence = -300; @@ -114,7 +114,7 @@ void func_808B0324(BgSpot08Bakudankabe* this, GlobalContext* globalCtx) { gravityInfluence = -420; } - if (Math_Rand_ZeroOne() < 0.4f) { + if (Rand_ZeroOne() < 0.4f) { rotationSpeed = 65; } else { rotationSpeed = 33; diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c index 6505ece45f..7e7e5387f5 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c @@ -67,12 +67,12 @@ void func_808B2218(BgSpot11Bakudankabe* this, GlobalContext* globalCtx) { Math_Vec3f_Sum(&thisx->posRot.pos, &D_808B272C, &burstDepthY); - burstDepthY.x += (Math_Rand_ZeroOne() - 0.5f) * 120.0f; + burstDepthY.x += (Rand_ZeroOne() - 0.5f) * 120.0f; burstDepthY.y += (30.0f + (i * 6.5f)); - burstDepthY.z += (Math_Rand_ZeroOne() - 0.5f) * 20.0f; + burstDepthY.z += (Rand_ZeroOne() - 0.5f) * 20.0f; - burstDepthX.y = (Math_Rand_ZeroOne() - 0.2f) * 12.0f; - scale = (Math_Rand_ZeroOne() * 55.0f) + 8.0f; + burstDepthX.y = (Rand_ZeroOne() - 0.2f) * 12.0f; + scale = (Rand_ZeroOne() * 55.0f) + 8.0f; if (scale < 20) { gravityInfluence = -300; @@ -81,7 +81,7 @@ void func_808B2218(BgSpot11Bakudankabe* this, GlobalContext* globalCtx) { } else { gravityInfluence = -420; } - if (Math_Rand_ZeroOne() < 0.4f) { + if (Rand_ZeroOne() < 0.4f) { rotationSpeed = 65; } else { rotationSpeed = 33; diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c index fd9c5ff689..da2c21baea 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c @@ -103,7 +103,7 @@ void func_808B29E0(BgSpot11Oasis* this) { } void func_808B29F0(BgSpot11Oasis* this, GlobalContext* globalCtx) { - if (Math_ApproxF(&this->actor.posRot.pos.y, 0.0f, 0.7f)) { + if (Math_StepToF(&this->actor.posRot.pos.y, 0.0f, 0.7f)) { func_808B2AA8(this); Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, this->actor.posRot.pos.x, this->actor.posRot.pos.y + 40.0f, this->actor.posRot.pos.z, 0, 0, 0, FAIRY_SPAWNER); @@ -135,9 +135,9 @@ void BgSpot11Oasis_Update(Actor* thisx, GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; if (gameplayFrames & 4) { Math_Vec3f_Sum(&this->actor.posRot.pos, &D_808B2E34[this->unk_151], &sp30); - EffectSsBubble_Spawn(globalCtx, &sp30, 0.0f, 15.0f, 50.0f, (Math_Rand_ZeroOne() * 0.12f) + 0.02f); - if (Math_Rand_ZeroOne() < 0.3f) { - this->unk_151 = Math_Rand_ZeroOne() * 4.9f; + EffectSsBubble_Spawn(globalCtx, &sp30, 0.0f, 15.0f, 50.0f, (Rand_ZeroOne() * 0.12f) + 0.02f); + if (Rand_ZeroOne() < 0.3f) { + this->unk_151 = Rand_ZeroOne() * 4.9f; } } } else { diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c index 3c61ec3dc2..bc4a4925c6 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c @@ -114,8 +114,8 @@ void func_808B318C(BgSpot12Gate* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; s32 var; - Math_ApproxF(&thisx->velocity.y, 1.6f, 0.03f); - if (Math_ApproxF(&thisx->posRot.pos.y, thisx->initPosRot.pos.y + 200.0f, thisx->velocity.y)) { + Math_StepToF(&thisx->velocity.y, 1.6f, 0.03f); + if (Math_StepToF(&thisx->posRot.pos.y, thisx->initPosRot.pos.y + 200.0f, thisx->velocity.y)) { func_808B3274(this); var = Quake_Add(ACTIVE_CAM, 3); Quake_SetSpeed(var, -0x3CB0); diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c index 3e49a633f4..ca7bd4267a 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c @@ -102,13 +102,13 @@ void func_808B35E4(BgSpot12Saku* this) { } void func_808B3604(BgSpot12Saku* this, GlobalContext* globalCtx) { - f32 temp_ret = Math_SmoothScaleMaxMinF(&this->dyna.actor.scale.x, 0.001f / 0.14f, 0.16f, 0.0022f, 0.001f); + f32 temp_ret = Math_SmoothStepToF(&this->dyna.actor.scale.x, 0.001f / 0.14f, 0.16f, 0.0022f, 0.001f); f32 temp_f18 = ((0.1f - this->dyna.actor.scale.x) * 840.0f); this->dyna.actor.posRot.pos.x = - this->dyna.actor.initPosRot.pos.x - (Math_Sins(this->dyna.actor.shape.rot.y + 0x4000) * temp_f18); + this->dyna.actor.initPosRot.pos.x - (Math_SinS(this->dyna.actor.shape.rot.y + 0x4000) * temp_f18); this->dyna.actor.posRot.pos.z = - this->dyna.actor.initPosRot.pos.z - (Math_Coss(this->dyna.actor.shape.rot.y + 0x4000) * temp_f18); + this->dyna.actor.initPosRot.pos.z - (Math_CosS(this->dyna.actor.shape.rot.y + 0x4000) * temp_f18); if (fabsf(temp_ret) < 0.0001f) { func_808B3714(this); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BRIDGE_OPEN_STOP); @@ -122,8 +122,8 @@ void func_808B3714(BgSpot12Saku* this) { this->actionFunc = func_808B37AC; thisx->scale.x = 0.001f / 0.14f; - thisx->posRot.pos.x = thisx->initPosRot.pos.x - (Math_Sins(thisx->shape.rot.y + 0x4000) * 78.0f); - thisx->posRot.pos.z = thisx->initPosRot.pos.z - (Math_Coss(thisx->shape.rot.y + 0x4000) * 78.0f); + thisx->posRot.pos.x = thisx->initPosRot.pos.x - (Math_SinS(thisx->shape.rot.y + 0x4000) * 78.0f); + thisx->posRot.pos.z = thisx->initPosRot.pos.z - (Math_CosS(thisx->shape.rot.y + 0x4000) * 78.0f); } void func_808B37AC(BgSpot12Saku* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c index d58e48b75c..06a005284c 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c @@ -261,7 +261,7 @@ void func_808B4194(BgSpot15Rrbox* this, GlobalContext* globalCtx) { this->unk_174 = CLAMP_MAX(this->unk_174, 2.0f); - approxFResult = Math_ApproxF(&this->unk_178, 20.0f, this->unk_174); + approxFResult = Math_StepToF(&this->unk_178, 20.0f, this->unk_174); sign = this->unk_17C >= 0.0f ? 1.0f : -1.0f; @@ -354,8 +354,8 @@ void BgSpot15Rrbox_Update(Actor* thisx, GlobalContext* globalCtx) { this->unk_168--; } this->dyna.actor.posRot.rot.y = this->dyna.unk_158; - this->unk_16C = Math_Sins(this->dyna.actor.posRot.rot.y); - this->unk_170 = Math_Coss(this->dyna.actor.posRot.rot.y); + this->unk_16C = Math_SinS(this->dyna.actor.posRot.rot.y); + this->unk_170 = Math_CosS(this->dyna.actor.posRot.rot.y); this->actionFunc(this, globalCtx); } diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index 25d539b4ad..fcce47452b 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -154,8 +154,8 @@ s32 func_808B4D9C(BgSpot16Bombstone* this, GlobalContext* globalCtx) { this->actor.colChkInfo.mass = 0xFF; func_808B4C4C(this, globalCtx); func_808B4D04(this, globalCtx); - this->sinRotation = Math_Sins(this->actor.shape.rot.y); - this->cosRotation = Math_Coss(this->actor.shape.rot.y); + this->sinRotation = Math_SinS(this->actor.shape.rot.y); + this->cosRotation = Math_CosS(this->actor.shape.rot.y); this->unk_150 = D_06000C20; func_808B5934(this); @@ -181,8 +181,8 @@ s32 func_808B4E58(BgSpot16Bombstone* this, GlobalContext* globalctx) { actor->posRot.rot.y = D_808B5DD8[actor->params][5]; - sinValue = Math_Sins(this->actor.posRot.rot.y); - cosValue = Math_Coss(this->actor.posRot.rot.y); + sinValue = Math_SinS(this->actor.posRot.rot.y); + cosValue = Math_CosS(this->actor.posRot.rot.y); actor->posRot.pos.x = (sinValue * sinCosPosFactor) + actor->initPosRot.pos.x; actor->posRot.pos.y = D_808B5DD8[actor->params][6] + actor->initPosRot.pos.y; @@ -308,13 +308,13 @@ void BgSpot16Bombstone_SpawnFragments(BgSpot16Bombstone* this, GlobalContext* gl if (index < ARRAY_COUNT(D_808B6074)) { do { - pos.x = ((Math_Rand_ZeroOne() - 0.5f) * 8.0f) + this->actor.posRot.pos.x; - pos.y = ((Math_Rand_ZeroOne() * 5.0f) + this->actor.posRot.pos.y) + 8.0f; - pos.z = ((Math_Rand_ZeroOne() - 0.5f) * 8.0f) + this->actor.posRot.pos.z; + pos.x = ((Rand_ZeroOne() - 0.5f) * 8.0f) + this->actor.posRot.pos.x; + pos.y = ((Rand_ZeroOne() * 5.0f) + this->actor.posRot.pos.y) + 8.0f; + pos.z = ((Rand_ZeroOne() - 0.5f) * 8.0f) + this->actor.posRot.pos.z; - velocity.x = (Math_Rand_ZeroOne() - 0.5f) * 16.0f; - velocity.y = (Math_Rand_ZeroOne() * 14.0) + (fabsf(this->actor.velocity.y) * velocityYMultiplier); - velocity.z = (Math_Rand_ZeroOne() - 0.5f) * 16.0f; + velocity.x = (Rand_ZeroOne() - 0.5f) * 16.0f; + velocity.y = (Rand_ZeroOne() * 14.0) + (fabsf(this->actor.velocity.y) * velocityYMultiplier); + velocity.z = (Rand_ZeroOne() - 0.5f) * 16.0f; scale = D_808B6074[index] * this->actor.scale.x * 3; @@ -353,7 +353,7 @@ void func_808B56BC(BgSpot16Bombstone* this, GlobalContext* globalCtx) { adjustedYawDiff = absYawDiff - 0x3FFF; if (adjustedYawDiff > 0) { - sinValue = Math_Sins(adjustedYawDiff) * this->actor.xzDistFromLink; + sinValue = Math_SinS(adjustedYawDiff) * this->actor.xzDistFromLink; if (sinValue >= 0.0f) { player->actor.posRot.pos.x += sinValue * this->sinRotation; diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c index ce61789534..e380dce1e3 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c @@ -48,8 +48,8 @@ void func_808B6BC0(BgSpot17Bakudankabe* this, GlobalContext* globalCtx) { f32 sinY; f32 cosY; - sinY = Math_Sins(this->dyna.actor.shape.rot.y); - cosY = Math_Coss(this->dyna.actor.shape.rot.y); + sinY = Math_SinS(this->dyna.actor.shape.rot.y); + cosY = Math_CosS(this->dyna.actor.shape.rot.y); burstDepthX.z = 0.0f; burstDepthX.x = 0.0f; @@ -61,15 +61,15 @@ void func_808B6BC0(BgSpot17Bakudankabe* this, GlobalContext* globalCtx) { f32 temp2; s32 rotationSpeed; - temp1 = (Math_Rand_ZeroOne() - 0.5f) * 140.0f; - temp2 = (Math_Rand_ZeroOne() - 0.5f) * 20.0f; + temp1 = (Rand_ZeroOne() - 0.5f) * 140.0f; + temp2 = (Rand_ZeroOne() - 0.5f) * 20.0f; burstDepthY.x = this->dyna.actor.posRot.pos.x + temp2 * sinY + (temp1 * cosY); burstDepthY.y = this->dyna.actor.posRot.pos.y + 30.0f + (i * 6.5f); burstDepthY.z = this->dyna.actor.posRot.pos.z + temp2 * cosY - (temp1 * sinY); - burstDepthX.y = (Math_Rand_ZeroOne() - 0.2f) * 12.0f; - scale = Math_Rand_ZeroOne() * 55.0f + 8.0f; + burstDepthX.y = (Rand_ZeroOne() - 0.2f) * 12.0f; + scale = Rand_ZeroOne() * 55.0f + 8.0f; if (scale < 20) { gravityInfluence = -300; @@ -79,7 +79,7 @@ void func_808B6BC0(BgSpot17Bakudankabe* this, GlobalContext* globalCtx) { gravityInfluence = -420; } - if (Math_Rand_ZeroOne() < 0.4f) { + if (Rand_ZeroOne() < 0.4f) { rotationSpeed = 65; } else { rotationSpeed = 33; diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c index df45180488..8a57173a50 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c @@ -78,13 +78,13 @@ void func_808B7770(BgSpot18Basket* this, GlobalContext* globalCtx, f32 arg2) { for (i = 0, count = 2; i != count; i++) { if (globalCtx) {} - if (!(arg2 < Math_Rand_ZeroOne())) { + if (!(arg2 < Rand_ZeroOne())) { D_808B85D0 += 0x7530; - sinValue = Math_Sins(D_808B85D0); - cosValue = Math_Coss(D_808B85D0); + sinValue = Math_SinS(D_808B85D0); + cosValue = Math_CosS(D_808B85D0); - randomValue = (Math_Rand_ZeroOne() * 35.0f) + 35.0f; + randomValue = (Rand_ZeroOne() * 35.0f) + 35.0f; position.x = (randomValue * sinValue) + this->dyna.actor.posRot.pos.x; position.y = this->dyna.actor.posRot.pos.y + 10.0f; @@ -98,8 +98,8 @@ void func_808B7770(BgSpot18Basket* this, GlobalContext* globalCtx, f32 arg2) { acceleration.y = 0.5f; acceleration.z = 0.0f; - func_800286CC(globalCtx, &position, &velocity, &acceleration, ((Math_Rand_ZeroOne() * 16) + 80), - ((Math_Rand_ZeroOne() * 30) + 80)); + func_800286CC(globalCtx, &position, &velocity, &acceleration, ((Rand_ZeroOne() * 16) + 80), + ((Rand_ZeroOne() * 30) + 80)); } } } @@ -185,17 +185,17 @@ void func_808B7BCC(BgSpot18Basket* this, GlobalContext* globalCtx) { f32 positionDiff; Actor* colliderBaseAc; - Math_ApproxS(&this->unk_210, 0x1F4, 0x1E); + Math_StepToS(&this->unk_210, 0x1F4, 0x1E); this->dyna.actor.shape.rot.y += this->unk_210; - Math_ApproxF(&this->unk_208, 50.0f, 1.5f); - Math_ApproxS(&this->unk_20C, 400, 15); + Math_StepToF(&this->unk_208, 50.0f, 1.5f); + Math_StepToS(&this->unk_20C, 400, 15); this->unk_20E += this->unk_20C; - this->dyna.actor.posRot.pos.x = (Math_Sins(this->unk_20E) * this->unk_208) + this->dyna.actor.initPosRot.pos.x; - this->dyna.actor.posRot.pos.z = (Math_Coss(this->unk_20E) * this->unk_208) + this->dyna.actor.initPosRot.pos.z; + this->dyna.actor.posRot.pos.x = (Math_SinS(this->unk_20E) * this->unk_208) + this->dyna.actor.initPosRot.pos.x; + this->dyna.actor.posRot.pos.z = (Math_CosS(this->unk_20E) * this->unk_208) + this->dyna.actor.initPosRot.pos.z; if (this->colliderJntSph.base.acFlags & 2) { colliderBaseAc = this->colliderJntSph.base.ac; @@ -227,32 +227,32 @@ void func_808B7D50(BgSpot18Basket* this, GlobalContext* globalCtx) { f32 tempValue; if (this->unk_216 > 120) { - Math_ApproxS(&this->unk_210, 0x3E8, 0x32); + Math_StepToS(&this->unk_210, 0x3E8, 0x32); } else { - Math_ApproxS(&this->unk_210, 0xBB8, 0x64); + Math_StepToS(&this->unk_210, 0xBB8, 0x64); } this->dyna.actor.shape.rot.y = this->dyna.actor.shape.rot.y + this->unk_210; if (this->unk_216 < 70) { - Math_ApproxF(&this->unk_208, 100.0f, 2.0f); + Math_StepToF(&this->unk_208, 100.0f, 2.0f); } else { - Math_ApproxF(&this->unk_208, 0.0f, 2.0f); + Math_StepToF(&this->unk_208, 0.0f, 2.0f); } - Math_ApproxS(&this->unk_20C, 1000, 20); + Math_StepToS(&this->unk_20C, 1000, 20); this->unk_20E += this->unk_20C; - this->dyna.actor.posRot.pos.x = (Math_Sins(this->unk_20E) * this->unk_208) + this->dyna.actor.initPosRot.pos.x; - this->dyna.actor.posRot.pos.z = (Math_Coss(this->unk_20E) * this->unk_208) + this->dyna.actor.initPosRot.pos.z; + this->dyna.actor.posRot.pos.x = (Math_SinS(this->unk_20E) * this->unk_208) + this->dyna.actor.initPosRot.pos.x; + this->dyna.actor.posRot.pos.z = (Math_CosS(this->unk_20E) * this->unk_208) + this->dyna.actor.initPosRot.pos.z; this->unk_212 += 0xBB8; - Math_ApproxS(&this->unk_214, 0x5DC, 0x1E); + Math_StepToS(&this->unk_214, 0x5DC, 0x1E); - this->dyna.actor.shape.rot.x = Math_Coss(this->unk_212) * this->unk_214; - this->dyna.actor.shape.rot.z = -Math_Sins(this->unk_212) * this->unk_214; + this->dyna.actor.shape.rot.x = Math_CosS(this->unk_212) * this->unk_214; + this->dyna.actor.shape.rot.z = -Math_SinS(this->unk_212) * this->unk_214; if (this->unk_216 > 140) { func_808B7F74(this); @@ -298,15 +298,15 @@ void func_808B7FC0(BgSpot18Basket* this, GlobalContext* globalCtx) { this->unk_212 += 0xBB8; if (this->unk_216 >= 13) { - tempUnk214 = Math_ApproxS(&this->unk_214, 0, 55); + tempUnk214 = Math_StepToS(&this->unk_214, 0, 55); } else { tempUnk214 = 0; } - this->dyna.actor.shape.rot.x = Math_Coss(this->unk_212) * this->unk_214; - this->dyna.actor.shape.rot.z = -Math_Sins(this->unk_212) * this->unk_214; + this->dyna.actor.shape.rot.x = Math_CosS(this->unk_212) * this->unk_214; + this->dyna.actor.shape.rot.z = -Math_SinS(this->unk_212) * this->unk_214; - Math_ApproxS(&this->unk_210, 0x1F4, 0xA); + Math_StepToS(&this->unk_210, 0x1F4, 0xA); this->dyna.actor.shape.rot.y += this->unk_210; if (tempUnk214 != 0) { diff --git a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c index 0150303393..d5659449ca 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c @@ -59,7 +59,7 @@ void BgSpot18Futa_Update(Actor* thisx, GlobalContext* globalCtx) { s32 iVar1; if (this->actor.parent == NULL) { - iVar1 = Math_ApproxF(&this->actor.scale.x, 0, 0.005); + iVar1 = Math_StepToF(&this->actor.scale.x, 0, 0.005); if (iVar1 != 0) { Actor_Kill(&this->actor); diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c index f35f77ba3e..6af2973fae 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c @@ -158,9 +158,9 @@ s32 func_808B8BB4(BgSpot18Obj* this, GlobalContext* globalCtx) { } else if (Flags_GetSwitch(globalCtx, (this->dyna.actor.params >> 8) & 0x3F)) { func_808B9030(this); this->dyna.actor.posRot.pos.x = - (Math_Sins(this->dyna.actor.posRot.rot.y) * 80.0f) + this->dyna.actor.initPosRot.pos.x; + (Math_SinS(this->dyna.actor.posRot.rot.y) * 80.0f) + this->dyna.actor.initPosRot.pos.x; this->dyna.actor.posRot.pos.z = - (Math_Coss(this->dyna.actor.posRot.rot.y) * 80.0f) + this->dyna.actor.initPosRot.pos.z; + (Math_CosS(this->dyna.actor.posRot.rot.y) * 80.0f) + this->dyna.actor.initPosRot.pos.z; } else { func_808B8E64(this); } @@ -247,7 +247,7 @@ void func_808B8F08(BgSpot18Obj* this, GlobalContext* globalCtx) { s32 pad; Player* player = PLAYER; - Math_ApproxF(&this->dyna.actor.speedXZ, 1.2f, 0.1f); + Math_StepToF(&this->dyna.actor.speedXZ, 1.2f, 0.1f); Actor_MoveForward(&this->dyna.actor); func_808B8DDC(this, globalCtx); @@ -255,9 +255,9 @@ void func_808B8F08(BgSpot18Obj* this, GlobalContext* globalCtx) { this->dyna.actor.initPosRot.pos.z) >= 6400.0f) { func_808B9030(this); this->dyna.actor.posRot.pos.x = - (Math_Sins(this->dyna.actor.posRot.rot.y) * 80.0f) + this->dyna.actor.initPosRot.pos.x; + (Math_SinS(this->dyna.actor.posRot.rot.y) * 80.0f) + this->dyna.actor.initPosRot.pos.x; this->dyna.actor.posRot.pos.z = - (Math_Coss(this->dyna.actor.posRot.rot.y) * 80.0f) + this->dyna.actor.initPosRot.pos.z; + (Math_CosS(this->dyna.actor.posRot.rot.y) * 80.0f) + this->dyna.actor.initPosRot.pos.z; this->dyna.unk_150 = 0.0f; player->stateFlags2 &= ~0x10; Flags_SetSwitch(globalCtx, (this->dyna.actor.params >> 8) & 0x3F); diff --git a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c index 8a266d7577..32a6a64dca 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c @@ -67,8 +67,8 @@ void BgSpot18Shutter_Init(Actor* thisx, GlobalContext* globalCtx) { } } else { if (gSaveContext.infTable[16] & 0x200) { - this->dyna.actor.posRot.pos.x += 125.0f * Math_Coss(this->dyna.actor.posRot.rot.y); - this->dyna.actor.posRot.pos.z -= 125.0f * Math_Sins(this->dyna.actor.posRot.rot.y); + this->dyna.actor.posRot.pos.x += 125.0f * Math_CosS(this->dyna.actor.posRot.rot.y); + this->dyna.actor.posRot.pos.z -= 125.0f * Math_SinS(this->dyna.actor.posRot.rot.y); this->actionFunc = func_808B95AC; } else { this->actionFunc = func_808B9618; @@ -109,7 +109,7 @@ void func_808B9618(BgSpot18Shutter* this, GlobalContext* globalCtx) { } void func_808B9698(BgSpot18Shutter* this, GlobalContext* globalCtx) { - if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 180.0f, 1.44f)) { + if (Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 180.0f, 1.44f)) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP); this->actionFunc = func_808B95AC; } else { @@ -118,13 +118,13 @@ void func_808B9698(BgSpot18Shutter* this, GlobalContext* globalCtx) { } void func_808B971C(BgSpot18Shutter* this, GlobalContext* globalCtx) { - f32 sin = Math_Sins(this->dyna.actor.posRot.rot.y); - f32 cos = Math_Coss(this->dyna.actor.posRot.rot.y); + f32 sin = Math_SinS(this->dyna.actor.posRot.rot.y); + f32 cos = Math_CosS(this->dyna.actor.posRot.rot.y); s32 flag = - Math_ApproxF(&this->dyna.actor.posRot.pos.x, this->dyna.actor.initPosRot.pos.x + (125.0f * cos), fabsf(cos)) & + Math_StepToF(&this->dyna.actor.posRot.pos.x, this->dyna.actor.initPosRot.pos.x + (125.0f * cos), fabsf(cos)) & 1; flag &= - Math_ApproxF(&this->dyna.actor.posRot.pos.z, this->dyna.actor.initPosRot.pos.z - (125.0f * sin), fabsf(sin)); + Math_StepToF(&this->dyna.actor.posRot.pos.z, this->dyna.actor.initPosRot.pos.z - (125.0f * sin), fabsf(sin)); if (flag) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP); diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c index daec715096..6cec7559c5 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c @@ -117,9 +117,9 @@ void func_808BC6F8(BgTreemouth* this, GlobalContext* globalCtx) { if ((gSaveContext.sceneSetupIndex == 6) && (globalCtx->csCtx.frames >= 0x2BD) && (globalCtx->state.frames % 8 == 0)) { - sp34.x = (Math_Rand_ZeroOne() * 1158.0f) + 3407.0f; + sp34.x = (Rand_ZeroOne() * 1158.0f) + 3407.0f; sp34.y = 970.0f; - sp34.z = (Math_Rand_ZeroOne() * 2026.0f) + -2163.0f; + sp34.z = (Rand_ZeroOne() * 2026.0f) + -2163.0f; EffectSsHahen_SpawnBurst(globalCtx, &sp34, 0.8f, 0, 50, 30, 1, HAHEN_OBJECT_DEFAULT, 10, NULL); } } diff --git a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c index 1f5c1c9cdf..a7237b8bda 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c @@ -96,9 +96,9 @@ void BgYdanHasi_UpdateFloatingBlock(BgYdanHasi* this, GlobalContext* globalCtx) framesAfterMath = sinf((globalCtx->gameplayFrames & 0xFF) * 0.024543693f) * 165.0f; this->dyna.actor.posRot.pos.x = - ((Math_Sins(this->dyna.actor.posRot.rot.y) * framesAfterMath) + this->dyna.actor.initPosRot.pos.x); + ((Math_SinS(this->dyna.actor.posRot.rot.y) * framesAfterMath) + this->dyna.actor.initPosRot.pos.x); this->dyna.actor.posRot.pos.z = - ((Math_Coss(this->dyna.actor.posRot.rot.y) * framesAfterMath) + this->dyna.actor.initPosRot.pos.z); + ((Math_CosS(this->dyna.actor.posRot.rot.y) * framesAfterMath) + this->dyna.actor.initPosRot.pos.z); waterBox = &globalCtx->colCtx.stat.colHeader->waterBoxes[1]; this->dyna.actor.posRot.pos.y = waterBox->unk_02 + 20.0f; if (this->timer != 0) { @@ -122,13 +122,13 @@ WaterBox* BgYdanHasi_MoveWater(BgYdanHasi* this, GlobalContext* globalCtx) { WaterBox* waterBox; if (this->timer == 0) { - if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, 1.0f) != 0) { + if (Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, 1.0f) != 0) { Flags_UnsetSwitch(globalCtx, this->unk_168); this->actionFunc = BgYdanHasi_InitWater; } func_8002F948(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); } else { - if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y - 47.0f, 0.5f)) { + if (Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y - 47.0f, 0.5f)) { this->actionFunc = BgYdanHasi_DecWaterTimer; } func_8002F948(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); @@ -165,7 +165,7 @@ void BgYdanHasi_UpdateThreeBlocks(BgYdanHasi* this, GlobalContext* globalCtx) { this->timer--; } if (this->timer == 0) { - if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, 3.0f) != 0) { + if (Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, 3.0f) != 0) { Flags_UnsetSwitch(globalCtx, this->unk_168); this->dyna.actor.draw = NULL; this->actionFunc = BgYdanHasi_SetupThreeBlocks; @@ -174,7 +174,7 @@ void BgYdanHasi_UpdateThreeBlocks(BgYdanHasi* this, GlobalContext* globalCtx) { func_8002F948(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); return; } - if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 120.0f, 3.0f) == 0) { + if (Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 120.0f, 3.0f) == 0) { func_8002F948(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); return; } diff --git a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c index d7d55f88f3..5e013b7123 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c @@ -92,8 +92,8 @@ void BgYdanMaruta_Init(Actor* thisx, GlobalContext* globalCtx) { } } - sinRotY = Math_Sins(thisx->shape.rot.y); - cosRotY = Math_Coss(thisx->shape.rot.y); + sinRotY = Math_SinS(thisx->shape.rot.y); + cosRotY = Math_CosS(thisx->shape.rot.y); for (i = 0; i < 3; i++) { sp4C[i].x = (items->dim.vtx[i].x * cosRotY) + thisx->posRot.pos.x; @@ -160,16 +160,16 @@ void func_808BF108(BgYdanMaruta* this, GlobalContext* globalCtx) { } this->dyna.actor.posRot.pos.x = - (Math_Coss(this->dyna.actor.shape.rot.y) * temp) + this->dyna.actor.initPosRot.pos.x; + (Math_CosS(this->dyna.actor.shape.rot.y) * temp) + this->dyna.actor.initPosRot.pos.x; this->dyna.actor.posRot.pos.z = - (Math_Sins(this->dyna.actor.shape.rot.y) * temp) + this->dyna.actor.initPosRot.pos.z; + (Math_SinS(this->dyna.actor.shape.rot.y) * temp) + this->dyna.actor.initPosRot.pos.z; func_8002F974(&this->dyna.actor, NA_SE_EV_TRAP_OBJ_SLIDE - SFX_FLAG); } void func_808BF1EC(BgYdanMaruta* this, GlobalContext* globalCtx) { this->dyna.actor.velocity.y += 1.0f; - if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, this->dyna.actor.velocity.y)) { + if (Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, this->dyna.actor.velocity.y)) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_LADDER_DOUND); this->actionFunc = BgYdanMaruta_DoNothing; } diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index 26ab98fd00..870c6327ca 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -203,7 +203,7 @@ void DemoEc_UpdateEyes(DemoEc* this) { s16* eyeTexIndex = &this->eyeTexIndex; if (DECR(*blinkTimer) == 0) { - *blinkTimer = Math_Rand_S16Offset(60, 60); + *blinkTimer = Rand_S16Offset(60, 60); } *eyeTexIndex = *blinkTimer; diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index a5f8e88aa0..70ab7f634a 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -605,16 +605,16 @@ void DemoEffect_MedalSparkle(DemoEffect* this, GlobalContext* globalCtx, s32 isS accel.z = 0.0f; if (isSmallSpawner) { - velocity.x = Math_Rand_ZeroOne() - 0.5f; - velocity.z = Math_Rand_ZeroOne() - 0.5f; + velocity.x = Rand_ZeroOne() - 0.5f; + velocity.z = Rand_ZeroOne() - 0.5f; } else { - velocity.x = (Math_Rand_ZeroOne() - 0.5f) * 2.0f; - velocity.z = (Math_Rand_ZeroOne() - 0.5f) * 2.0f; + velocity.x = (Rand_ZeroOne() - 0.5f) * 2.0f; + velocity.z = (Rand_ZeroOne() - 0.5f) * 2.0f; } - pos.x = Math_Rand_CenteredFloat(10.0f) + this->actor.posRot.pos.x; - pos.y = Math_Rand_CenteredFloat(10.0f) + this->actor.posRot.pos.y; - pos.z = Math_Rand_CenteredFloat(10.0f) + this->actor.posRot.pos.z; + pos.x = Rand_CenteredFloat(10.0f) + this->actor.posRot.pos.x; + pos.y = Rand_CenteredFloat(10.0f) + this->actor.posRot.pos.y; + pos.z = Rand_CenteredFloat(10.0f) + this->actor.posRot.pos.z; EffectSsKiraKira_SpawnDispersed(globalCtx, &pos, &velocity, &accel, &primColor, &envColor, 1000, 16); } @@ -1075,7 +1075,7 @@ void DemoEffect_UpdateLightEffect(DemoEffect* this, GlobalContext* globalCtx) { break; case 3: - Math_SmoothScaleMaxMinF(&this->actor.scale.x, 0.0f, 0.1f, 0.1f, 0.005f); + Math_SmoothStepToF(&this->actor.scale.x, 0.0f, 0.1f, 0.1f, 0.005f); Actor_SetScale(&this->actor, this->actor.scale.x); break; @@ -1487,7 +1487,7 @@ void DemoEffect_MoveJewelActivateDoorOfTime(DemoEffect* this, GlobalContext* glo } if (startPos.x != endPos.x || startPos.y != endPos.y || startPos.z != endPos.z) { - this->jewelCsRotation.x = atan2f(endPos.z - startPos.z, -(endPos.x - startPos.x)) * (0x8000 / M_PI); + this->jewelCsRotation.x = Math_Atan2F(endPos.z - startPos.z, -(endPos.x - startPos.x)) * (0x8000 / M_PI); this->jewelCsRotation.y = Math_Vec3f_Yaw(&startPos, &endPos); } @@ -1525,8 +1525,8 @@ void DemoEffect_JewelSparkle(DemoEffect* this, GlobalContext* globalCtx, s32 spa primColor.a = 0; for (i = 0; i < spawnerCount; i++) { - velocity.x = (Math_Rand_ZeroOne() - 0.5f) * 1.5f; - velocity.z = (Math_Rand_ZeroOne() - 0.5f) * 1.5f; + velocity.x = (Rand_ZeroOne() - 0.5f) * 1.5f; + velocity.z = (Rand_ZeroOne() - 0.5f) * 1.5f; EffectSsKiraKira_SpawnDispersed(globalCtx, &this->actor.posRot.pos, &velocity, &accel, &primColor, &envColor, 3000, 16); @@ -1639,8 +1639,8 @@ void DemoEffect_UpdateDust(DemoEffect* this, GlobalContext* globalCtx) { pos = this->actor.posRot.pos; pos.y += 600.0f; - pos.x += Math_Rand_CenteredFloat(300.0f); - pos.z += 200.0f + Math_Rand_CenteredFloat(300.0f); + pos.x += Rand_CenteredFloat(300.0f); + pos.z += 200.0f + Rand_CenteredFloat(300.0f); velocity.z = 0.0f; velocity.x = 0.0f; @@ -2109,8 +2109,8 @@ void DemoEffect_FaceToCsEndpoint(DemoEffect* this, Vec3f startPos, Vec3f endPos) f32 z = endPos.z - startPos.z; f32 xzDistance = sqrtf(SQ(x) + SQ(z)); - this->actor.shape.rot.y = Math_atan2f(x, z) * (32768.0f / M_PI); - this->actor.shape.rot.x = Math_atan2f(-(endPos.y - startPos.y), xzDistance) * (32768.0f / M_PI); + this->actor.shape.rot.y = Math_FAtan2F(x, z) * (32768.0f / M_PI); + this->actor.shape.rot.x = Math_FAtan2F(-(endPos.y - startPos.y), xzDistance) * (32768.0f / M_PI); } /** diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c index 643ebfa64d..cfec64f4f4 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -98,7 +98,7 @@ void func_8097C930(DemoGo* this) { s32 pad[3]; if (DECR(*something) == 0) { - *something = Math_Rand_S16Offset(0x3C, 0x3C); + *something = Rand_S16Offset(0x3C, 0x3C); } *other = *something; if (*other >= 3) { diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index 96f8d2485e..73fad91941 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -52,8 +52,8 @@ void DemoGt_SpawnDust(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec static Color_RGBA8 brownPrim = { 100, 80, 100, 0 }; static Color_RGBA8 redEnv = { 255, 110, 96, 0 }; - func_8002843C(globalCtx, pos, velocity, accel, &brownPrim, &redEnv, - ((Math_Rand_ZeroOne() * (scale * 0.2f)) + scale), scaleStep, life); + func_8002843C(globalCtx, pos, velocity, accel, &brownPrim, &redEnv, ((Rand_ZeroOne() * (scale * 0.2f)) + scale), + scaleStep, life); } void func_8097D7D8(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velOffset, f32 scale, s32 arg4, s32 arg5, s16 life) { @@ -116,19 +116,19 @@ void func_8097DAC8(DemoGt* this, GlobalContext* globalCtx, Vec3f* spawnerPos) { for (i = 0; i < 12; i++) { - pos.x = Math_Sins(angle) * 46.0f; - pos.y = (Math_Rand_ZeroOne() * 75.0f) + 2.0f; - pos.z = Math_Coss(angle) * 46.0f; + pos.x = Math_SinS(angle) * 46.0f; + pos.y = (Rand_ZeroOne() * 75.0f) + 2.0f; + pos.z = Math_CosS(angle) * 46.0f; velocity.x = (pos.x * 0.1f) + 20.0f; - velocity.y = Math_Rand_ZeroOne() * 16.0f; + velocity.y = Rand_ZeroOne() * 16.0f; velocity.z = pos.z * 0.1f; pos.x += spawnerPos->x; pos.y += spawnerPos->y; pos.z += spawnerPos->z; - temp_f0 = Math_Rand_ZeroOne(); + temp_f0 = Rand_ZeroOne(); if (temp_f0 < 0.1f) { phi_s0 = 96; @@ -139,7 +139,7 @@ void func_8097DAC8(DemoGt* this, GlobalContext* globalCtx, Vec3f* spawnerPos) { } EffectSsKakera_Spawn(globalCtx, &pos, &velocity, spawnerPos, -247, phi_s0, 3, 0, 0, - (s32)(Math_Rand_ZeroOne() * 10.0f + 30.0f), 2, 300, (s32)(Math_Rand_ZeroOne() * 0.0f) + 30, + (s32)(Rand_ZeroOne() * 10.0f + 30.0f), 2, 300, (s32)(Rand_ZeroOne() * 0.0f) + 30, KAKERA_COLOR_NONE, OBJECT_GEFF, D_06000EA0); angle += 0x1555; } @@ -157,19 +157,19 @@ void func_8097DD28(DemoGt* this, GlobalContext* globalCtx, Vec3f* spawnerPos) { for (i = 0; i < 8; i++) { - pos.x = Math_Sins(angle) * 30.0f; - pos.y = (Math_Rand_ZeroOne() * 75.0f) + 2.0f; - pos.z = Math_Coss(angle) * 30.0f; + pos.x = Math_SinS(angle) * 30.0f; + pos.y = (Rand_ZeroOne() * 75.0f) + 2.0f; + pos.z = Math_CosS(angle) * 30.0f; velocity.x = 0.0f; - velocity.y = Math_Rand_ZeroOne() * -4.0f; + velocity.y = Rand_ZeroOne() * -4.0f; velocity.z = pos.z * 0.1f; pos.x += spawnerPos->x; pos.y += spawnerPos->y; pos.z += spawnerPos->z; - temp_f0 = Math_Rand_ZeroOne(); + temp_f0 = Rand_ZeroOne(); if (temp_f0 < 0.1f) { phi_s0 = 96; @@ -180,8 +180,8 @@ void func_8097DD28(DemoGt* this, GlobalContext* globalCtx, Vec3f* spawnerPos) { } EffectSsKakera_Spawn(globalCtx, &pos, &velocity, spawnerPos, -247, phi_s0, 3, 0, 0, - (s32)((Math_Rand_ZeroOne() * 10.0f) + 30.0f), 2, 300, - (s32)(Math_Rand_ZeroOne() * 0.0f) + 0x1E, KAKERA_COLOR_NONE, OBJECT_GEFF, D_06000EA0); + (s32)((Rand_ZeroOne() * 10.0f) + 30.0f), 2, 300, (s32)(Rand_ZeroOne() * 0.0f) + 0x1E, + KAKERA_COLOR_NONE, OBJECT_GEFF, D_06000EA0); angle += 0x2000; } @@ -199,19 +199,19 @@ void func_8097DF70(DemoGt* this, GlobalContext* globalCtx, Vec3f* spawnerPos) { for (i = 0; i < 12; i++) { - pos.x = Math_Sins(angle) * 16.0f; - pos.y = (Math_Rand_ZeroOne() * 5.0f) + 2.0f; - pos.z = Math_Coss(angle) * 16.0f; + pos.x = Math_SinS(angle) * 16.0f; + pos.y = (Rand_ZeroOne() * 5.0f) + 2.0f; + pos.z = Math_CosS(angle) * 16.0f; velocity.x = pos.x * 0.6f; - velocity.y = (Math_Rand_ZeroOne() * 36.0f) + 6.0f; + velocity.y = (Rand_ZeroOne() * 36.0f) + 6.0f; velocity.z = pos.z * 0.6f; pos.x += spawnerPos->x; pos.y += spawnerPos->y; pos.z += spawnerPos->z; - temp_f0 = Math_Rand_ZeroOne(); + temp_f0 = Rand_ZeroOne(); if (temp_f0 < 0.1f) { phi_s0 = 97; @@ -222,7 +222,7 @@ void func_8097DF70(DemoGt* this, GlobalContext* globalCtx, Vec3f* spawnerPos) { } EffectSsKakera_Spawn(globalCtx, &pos, &velocity, spawnerPos, -200, phi_s0, 10, 10, 0, - Math_Rand_ZeroOne() * 30.0f + 30.0f, 2, 300, (s32)(Math_Rand_ZeroOne() * 30.0f) + 30, + Rand_ZeroOne() * 30.0f + 30.0f, 2, 300, (s32)(Rand_ZeroOne() * 30.0f) + 30, KAKERA_COLOR_NONE, OBJECT_GEFF, D_06000EA0); angle += 0x1555; } @@ -240,19 +240,19 @@ void func_8097E1D4(GlobalContext* globalCtx, Vec3f* arg1, s16 arg2) { for (i = 0; i < 1; i++) { - pos.x = Math_Sins(angle) * 46.0f; - pos.y = (Math_Rand_ZeroOne() * 75.0f) - 28.0f; - pos.z = Math_Coss(angle) * 46.0f; + pos.x = Math_SinS(angle) * 46.0f; + pos.y = (Rand_ZeroOne() * 75.0f) - 28.0f; + pos.z = Math_CosS(angle) * 46.0f; - velocity.x = Math_Sins(arg2) * 3.0f; - velocity.y = (Math_Rand_ZeroOne() * -4.0f) + 10.0f; - velocity.z = Math_Coss(arg2) * 3.0f; + velocity.x = Math_SinS(arg2) * 3.0f; + velocity.y = (Rand_ZeroOne() * -4.0f) + 10.0f; + velocity.z = Math_CosS(arg2) * 3.0f; pos.x += arg1->x; pos.y += arg1->y; pos.z += arg1->z; - temp_f0 = Math_Rand_ZeroOne(); + temp_f0 = Rand_ZeroOne(); if (temp_f0 < 0.1f) { phi_s0 = 97; @@ -263,8 +263,8 @@ void func_8097E1D4(GlobalContext* globalCtx, Vec3f* arg1, s16 arg2) { } EffectSsKakera_Spawn(globalCtx, &pos, &velocity, arg1, -247, phi_s0, 3, 0, 0, - (s32)((Math_Rand_ZeroOne() * 10.0f) + 30.0f), 2, 300, - (s32)(Math_Rand_ZeroOne() * 0.0f) + 30, KAKERA_COLOR_NONE, OBJECT_GEFF, D_06000EA0); + (s32)((Rand_ZeroOne() * 10.0f) + 30.0f), 2, 300, (s32)(Rand_ZeroOne() * 0.0f) + 30, + KAKERA_COLOR_NONE, OBJECT_GEFF, D_06000EA0); angle += 0x10000; } @@ -288,13 +288,13 @@ void func_8097E454(GlobalContext* globalCtx, Vec3f* spawnerPos, Vec3f* velocity, for (i = frames; i < arg6; i += arg7) { - pos.x = (Math_Sins(phi_s0) * arg4) + spawnerPos->x; + pos.x = (Math_SinS(phi_s0) * arg4) + spawnerPos->x; pos.y = spawnerPos->y; - pos.z = (Math_Coss(phi_s0) * arg4) + spawnerPos->z; + pos.z = (Math_CosS(phi_s0) * arg4) + spawnerPos->z; DemoGt_SpawnDust(globalCtx, &pos, velocity, accel, dustScale, dustScaleStep, life); - if (Math_Rand_ZeroOne() <= 0.05f) { + if (Rand_ZeroOne() <= 0.05f) { func_8097E1D4(globalCtx, &pos, phi_s0); } @@ -434,9 +434,9 @@ void func_8097E824(DemoGt* this, s32 arg1) { unk16C->y += phi_a2; unk16C->z += phi_a3; - tempf1 = Math_Coss(unk16C->x) * phi_f14; - tempf2 = Math_Coss(unk16C->y) * phi_f12; - tempf3 = Math_Coss(unk16C->z) * phi_f2; + tempf1 = Math_CosS(unk16C->x) * phi_f14; + tempf2 = Math_CosS(unk16C->y) * phi_f12; + tempf3 = Math_CosS(unk16C->z) * phi_f2; pos->x += tempf1; pos->y += tempf2; @@ -660,16 +660,16 @@ void DemoGt_Draw1(DemoGt* this, GlobalContext* globalCtx) { spB8 = (s16)((s32)kREG(70)) + 0x4000; spBA = kREG(70); spB4 = Graph_Alloc(gfxCtx, sizeof(Mtx)); - sp98 = 1.0f - Math_Coss(spC6); + sp98 = 1.0f - Math_CosS(spC6); OPEN_DISPS(gfxCtx, "../z_demo_gt_part1.c", 458); - spA8.x = Math_Coss(spB8); + spA8.x = Math_CosS(spB8); spA8.y = 0.0f; - spA8.z = Math_Sins(spB8); - sp9C.x = Math_Coss(spBA) * spBC * sp98; - sp9C.y = Math_Sins(spC6) * spBC; - sp9C.z = Math_Sins(spBA) * spBC * sp98; + spA8.z = Math_SinS(spB8); + sp9C.x = Math_CosS(spBA) * spBC * sp98; + sp9C.y = Math_SinS(spC6) * spBC; + sp9C.z = Math_SinS(spBA) * spBC * sp98; Matrix_Push(); @@ -1281,17 +1281,17 @@ void DemoGt_Draw4(DemoGt* this, GlobalContext* globalCtx) { sp6A = kREG(58); gfxCtx = globalCtx2->state.gfxCtx; sp60 = Graph_Alloc(gfxCtx, sizeof(Mtx)); - sp44 = 1.0f - Math_Coss(sp76); + sp44 = 1.0f - Math_CosS(sp76); OPEN_DISPS(gfxCtx, "../z_demo_gt_part4_1.c", 217); - sp54.x = Math_Coss(sp68); + sp54.x = Math_CosS(sp68); sp54.y = 0.0f; - sp54.z = Math_Sins(sp68); + sp54.z = Math_SinS(sp68); - sp48.x = (Math_Coss(sp6A) * sp6C) * sp44; - sp48.y = Math_Sins(sp76) * sp6C; - sp48.z = (Math_Sins(sp6A) * sp6C) * sp44; + sp48.x = (Math_CosS(sp6A) * sp6C) * sp44; + sp48.y = Math_SinS(sp76) * sp6C; + sp48.z = (Math_SinS(sp6A) * sp6C) * sp44; Matrix_Push(); @@ -1400,17 +1400,17 @@ void DemoGt_Draw5(DemoGt* this, GlobalContext* globalCtx) { sp68 = (s16)(kREG(59) - 0x4000) + 0x4000; gfxCtx = globalCtx->state.gfxCtx; sp60 = Graph_Alloc(gfxCtx, sizeof(Mtx)); - sp44 = 1 - Math_Coss(sp76); + sp44 = 1 - Math_CosS(sp76); OPEN_DISPS(gfxCtx, "../z_demo_gt_part4_2.c", 212); - sp54.x = Math_Coss(sp68); + sp54.x = Math_CosS(sp68); sp54.y = 0.0f; - sp54.z = Math_Sins(sp68); + sp54.z = Math_SinS(sp68); - sp48.x = Math_Coss(sp6A) * sp6C * sp44; - sp48.y = Math_Sins(sp76) * sp6C; - sp48.z = Math_Sins(sp6A) * sp6C * sp44; + sp48.x = Math_CosS(sp6A) * sp6C * sp44; + sp48.y = Math_SinS(sp76) * sp6C; + sp48.z = Math_SinS(sp6A) * sp6C * sp44; Matrix_Push(); @@ -1496,17 +1496,17 @@ void DemoGt_Draw6(DemoGt* this, GlobalContext* globalCtx) { sp6C += 0x4000; gfxCtx = globalCtx->state.gfxCtx; sp64 = Graph_Alloc(gfxCtx, sizeof(Mtx)); - sp48 = 1.0f - Math_Coss(sp78); + sp48 = 1.0f - Math_CosS(sp78); OPEN_DISPS(gfxCtx, "../z_demo_gt_part4_3.c", 276); - sp58.x = Math_Coss(sp6C); + sp58.x = Math_CosS(sp6C); sp58.y = 0.0f; - sp58.z = Math_Sins(sp6C); + sp58.z = Math_SinS(sp6C); - sp4C.x = Math_Coss(sp6E) * sp70 * sp48; - sp4C.y = Math_Sins(sp78) * sp70; - sp4C.z = Math_Sins(sp6E) * sp70 * sp48; + sp4C.x = Math_CosS(sp6E) * sp70 * sp48; + sp4C.y = Math_SinS(sp78) * sp70; + sp4C.z = Math_SinS(sp6E) * sp70 * sp48; Matrix_Push(); @@ -1588,17 +1588,17 @@ void DemoGt_Draw7(DemoGt* this, GlobalContext* globalCtx) { sp60 = kREG(74) + 0x7FEC; sp60 = sp60 + 0x4000; sp5C = Graph_Alloc(gfxCtx, sizeof(Mtx)); - sp40 = 1.0f - Math_Coss(sp6E); + sp40 = 1.0f - Math_CosS(sp6E); OPEN_DISPS(gfxCtx, "../z_demo_gt_part5.c", 136); - sp50.x = Math_Coss(sp60); + sp50.x = Math_CosS(sp60); sp50.y = 0.0f; - sp50.z = Math_Sins(sp60); + sp50.z = Math_SinS(sp60); - sp44.x = (Math_Coss(sp62) * sp64) * sp40; - sp44.y = Math_Sins(sp6E) * sp64; - sp44.z = (Math_Sins(sp62) * sp64) * sp40; + sp44.x = (Math_CosS(sp62) * sp64) * sp40; + sp44.y = Math_SinS(sp6E) * sp64; + sp44.z = (Math_SinS(sp62) * sp64) * sp40; Matrix_Push(); @@ -1679,17 +1679,17 @@ void DemoGt_Draw8(DemoGt* this, GlobalContext* globalCtx) { sp60 = kREG(77) + 0xBE80; sp60 += 0x4000; sp5C = Graph_Alloc(gfxCtx, sizeof(Mtx)); - sp40 = 1.0f - Math_Coss(sp6E); + sp40 = 1.0f - Math_CosS(sp6E); OPEN_DISPS(gfxCtx, "../z_demo_gt_part6.c", 137); - sp50.x = Math_Coss(sp60); + sp50.x = Math_CosS(sp60); sp50.y = 0.0f; - sp50.z = Math_Sins(sp60); + sp50.z = Math_SinS(sp60); - sp44.x = Math_Coss(sp62) * sp64 * sp40; - sp44.y = Math_Sins(sp6E) * sp64; - sp44.z = Math_Sins(sp62) * sp64 * sp40; + sp44.x = Math_CosS(sp62) * sp64 * sp40; + sp44.y = Math_SinS(sp6E) * sp64; + sp44.z = Math_SinS(sp62) * sp64 * sp40; Matrix_Push(); diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index 2c8b19167c..13e6c729de 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -115,7 +115,7 @@ void func_80984BE0(DemoIm* this) { s16* unk_25C = &this->unk_25C; if (DECR(*unk_25E) == 0) { - *unk_25E = Math_Rand_S16Offset(0x3C, 0x3C); + *unk_25E = Rand_S16Offset(0x3C, 0x3C); } *unk_25C = *unk_25E; @@ -175,11 +175,11 @@ void func_80984DB8(DemoIm* this) { Vec3s* vec1 = &this->unk_2D4.unk_08; Vec3s* vec2 = &this->unk_2D4.unk_0E; - Math_SmoothScaleMaxMinS(&vec1->x, 0, 20, 6200, 100); - Math_SmoothScaleMaxMinS(&vec1->y, 0, 20, 6200, 100); + Math_SmoothStepToS(&vec1->x, 0, 20, 6200, 100); + Math_SmoothStepToS(&vec1->y, 0, 20, 6200, 100); - Math_SmoothScaleMaxMinS(&vec2->x, 0, 20, 6200, 100); - Math_SmoothScaleMaxMinS(&vec2->y, 0, 20, 6200, 100); + Math_SmoothStepToS(&vec2->x, 0, 20, 6200, 100); + Math_SmoothStepToS(&vec2->y, 0, 20, 6200, 100); } void func_80984E58(DemoIm* this, GlobalContext* globalCtx) { @@ -730,9 +730,9 @@ void func_809865F8(DemoIm* this, GlobalContext* globalCtx, s32 arg2) { if (this->unk_27C == 0) { Vec3f* thisPos = &this->actor.posRot.pos; s16 shapeRotY = this->actor.shape.rot.y; - f32 spawnPosX = thisPos->x + (Math_Sins(shapeRotY) * 30.0f); + f32 spawnPosX = thisPos->x + (Math_SinS(shapeRotY) * 30.0f); f32 spawnPosY = thisPos->y; - f32 spawnPosZ = thisPos->z + (Math_Coss(shapeRotY) * 30.0f); + f32 spawnPosZ = thisPos->z + (Math_CosS(shapeRotY) * 30.0f); Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ARROW, spawnPosX, spawnPosY, spawnPosZ, 0xFA0, this->actor.shape.rot.y, 0, 0xFFF6); diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index 58dd98f5a9..000b76b7e8 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -106,7 +106,7 @@ void func_8098E480(DemoSa* this) { s16* unk_192 = &this->unk_192; if (DECR(*unk_192) == 0) { - *unk_192 = Math_Rand_S16Offset(0x3C, 0x3C); + *unk_192 = Rand_S16Offset(0x3C, 0x3C); } *unk_190 = *unk_192; diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index a34196c95e..abd901e11e 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -114,7 +114,7 @@ void DoorAna_WaitOpen(DoorAna* this, GlobalContext* globalCtx) { s32 destinationIdx; player = PLAYER; - if (Math_ApproxF(&this->actor.scale.x, 0.01f, 0.001f) != 0) { + if (Math_StepToF(&this->actor.scale.x, 0.01f, 0.001f) != 0) { if ((this->actor.unk_1F != 0) && (globalCtx->sceneLoadFlag == 0) && (player->stateFlags1 & 0x80000000) && (player->unk_84F == 0)) { destinationIdx = ((this->actor.params >> 0xC) & 7) - 1; @@ -147,8 +147,8 @@ void DoorAna_GrabLink(DoorAna* this, GlobalContext* globalCtx) { if (this->actor.yDistFromLink <= 0.0f && 15.0f < this->actor.xzDistFromLink) { player = PLAYER; - player->actor.posRot.pos.x = Math_Sins(this->actor.yawTowardsLink) * 15.0f + this->actor.posRot.pos.x; - player->actor.posRot.pos.z = Math_Coss(this->actor.yawTowardsLink) * 15.0f + this->actor.posRot.pos.z; + player->actor.posRot.pos.x = Math_SinS(this->actor.yawTowardsLink) * 15.0f + this->actor.posRot.pos.x; + player->actor.posRot.pos.z = Math_CosS(this->actor.yawTowardsLink) * 15.0f + this->actor.posRot.pos.z; } } diff --git a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c index 633aa7da68..67d34421f1 100644 --- a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c +++ b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c @@ -135,8 +135,8 @@ void func_8099496C(DoorGerudo* this, GlobalContext* globalCtx) { } void func_809949C8(DoorGerudo* this, GlobalContext* globalCtx) { - Math_ApproxF(&this->dyna.actor.velocity.y, 15.0f, 3.0f); - Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 200.0f, + Math_StepToF(&this->dyna.actor.velocity.y, 15.0f, 3.0f); + Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 200.0f, this->dyna.actor.velocity.y); } diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index fdf0872cee..47311a3a14 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -403,8 +403,8 @@ s32 func_80996D14(DoorShutter* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_SLIDE_DOOR_OPEN); func_80996C60(this, globalCtx); } - Math_ApproxF(&this->dyna.actor.velocity.y, 15.0f, 3.0f); - if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 200.0f, + Math_StepToF(&this->dyna.actor.velocity.y, 15.0f, 3.0f); + if (Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 200.0f, this->dyna.actor.velocity.y)) { return true; } @@ -413,7 +413,7 @@ s32 func_80996D14(DoorShutter* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BUYODOOR_OPEN); func_80996C60(this, globalCtx); } - if (Math_ApproxS(&this->unk_166, 0, 10)) { + if (Math_StepToS(&this->unk_166, 0, 10)) { return true; } } @@ -436,7 +436,7 @@ s32 func_80996E08(DoorShutter* this, GlobalContext* globalCtx, f32 arg2) { } } } - if (Math_ApproxF(&this->unk_170, arg2, 0.2f)) { + if (Math_StepToF(&this->unk_170, arg2, 0.2f)) { return true; } return false; @@ -539,9 +539,9 @@ void func_809973E8(DoorShutter* this, GlobalContext* globalCtx) { s32 quakeId; if (this->dyna.actor.velocity.y < 20.0f) { - Math_ApproxF(&this->dyna.actor.velocity.y, 20.0f, 8.0f); + Math_StepToF(&this->dyna.actor.velocity.y, 20.0f, 8.0f); } - if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, this->dyna.actor.velocity.y)) { + if (Math_StepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, this->dyna.actor.velocity.y)) { if (this->dyna.actor.velocity.y > 20.0f) { this->dyna.actor.groundY = this->dyna.actor.initPosRot.pos.y; func_80033260(globalCtx, &this->dyna.actor, &this->dyna.actor.posRot.pos, 45.0f, 0xA, 8.0f, 0x1F4, 0xA, 0); @@ -557,7 +557,7 @@ void func_809973E8(DoorShutter* this, GlobalContext* globalCtx) { } void func_80997528(DoorShutter* this, GlobalContext* globalCtx) { - if (Math_ApproxS(&this->unk_166, 0x64, 0xA)) { + if (Math_StepToS(&this->unk_166, 0x64, 0xA)) { func_80997220(this, globalCtx); } } @@ -603,7 +603,7 @@ void func_80997744(DoorShutter* this, GlobalContext* globalCtx) { this->unk_164--; } phi_f0 = (this->unk_164 % 2 != 0) ? -3.0f : 0.0f; - Math_SmoothScaleMaxMinF(&this->dyna.actor.posRot.pos.y, -34.0f + phi_f0, 1.0f, 20.0f, 0.0f); + Math_SmoothStepToF(&this->dyna.actor.posRot.pos.y, -34.0f + phi_f0, 1.0f, 20.0f, 0.0f); osSyncPrintf("FHG SAKU END !!\n"); } diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index c6965350ee..73f982f7ac 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -275,14 +275,14 @@ void EnAni_Update(Actor* thisx, GlobalContext* globalCtx) { this->unk_2A2.y = this->unk_2A2.z; this->unk_2A2.x = this->unk_2A2.z; } else { - Math_SmoothScaleMaxMinS(&this->unk_29C.x, 0, 6, 6200, 100); - Math_SmoothScaleMaxMinS(&this->unk_29C.y, 0, 6, 6200, 100); - Math_SmoothScaleMaxMinS(&this->unk_2A2.x, 0, 6, 6200, 100); - Math_SmoothScaleMaxMinS(&this->unk_2A2.y, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->unk_29C.x, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->unk_29C.y, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->unk_2A2.x, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->unk_2A2.y, 0, 6, 6200, 100); } if (DECR(this->unk_2AE) == 0) { - this->unk_2AE = Math_Rand_S16Offset(60, 60); + this->unk_2AE = Rand_S16Offset(60, 60); } this->unk_2AC = this->unk_2AE; if (this->unk_2AC >= 3) { diff --git a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c index 749651b72b..27a8d64163 100644 --- a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c +++ b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c @@ -83,10 +83,10 @@ void EnAnubiceTag_ManageAnubis(EnAnubiceTag* this, GlobalContext* globalCtx) { if (anubis->unk_260 == 0) { if (anubis->unk_262 == 0) { anubis->unk_25E = 1; - offset.x = -Math_Sins(this->actor.yawTowardsLink) * this->actor.xzDistFromLink; - offset.z = -Math_Coss(this->actor.yawTowardsLink) * this->actor.xzDistFromLink; - Math_SmoothScaleMaxF(&anubis->actor.posRot.pos.x, (this->actor.posRot.pos.x + offset.x), 0.3f, 10.0f); - Math_SmoothScaleMaxF(&anubis->actor.posRot.pos.z, (this->actor.posRot.pos.z + offset.z), 0.3f, 10.0f); + offset.x = -Math_SinS(this->actor.yawTowardsLink) * this->actor.xzDistFromLink; + offset.z = -Math_CosS(this->actor.yawTowardsLink) * this->actor.xzDistFromLink; + Math_ApproachF(&anubis->actor.posRot.pos.x, (this->actor.posRot.pos.x + offset.x), 0.3f, 10.0f); + Math_ApproachF(&anubis->actor.posRot.pos.z, (this->actor.posRot.pos.z + offset.z), 0.3f, 10.0f); return; } } diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c index 1904ed5af3..f816091a6e 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -54,12 +54,12 @@ void EnAttackNiw_Init(Actor* thisx, GlobalContext* globalCtx) { } Actor_SetScale(&this->actor, 0.01f); this->actor.gravity = 0.0f; - this->unk_298.x = Math_Rand_CenteredFloat(100.0f); - this->unk_298.y = Math_Rand_CenteredFloat(10.0f); - this->unk_298.z = Math_Rand_CenteredFloat(100.0f); + this->unk_298.x = Rand_CenteredFloat(100.0f); + this->unk_298.y = Rand_CenteredFloat(10.0f); + this->unk_298.z = Rand_CenteredFloat(100.0f); Actor_SetScale(&this->actor, 0.01f); this->actor.flags &= ~1; - this->actor.shape.rot.y = this->actor.posRot.rot.y = (Math_Rand_ZeroOne() - 0.5f) * 60000.0f; + this->actor.shape.rot.y = this->actor.posRot.rot.y = (Rand_ZeroOne() - 0.5f) * 60000.0f; this->actionFunc = func_809B5670; } @@ -86,7 +86,7 @@ void func_809B5268(EnAttackNiw* this, GlobalContext* globalCtx, s16 arg2) { if ((this->unk_28E & 1) == 0) { this->unk_264 = 0.0f; if (arg2 == 0) { - this->unk_254 = Math_Rand_ZeroFloat(30.0f); + this->unk_254 = Rand_ZeroFloat(30.0f); } } } @@ -143,28 +143,28 @@ void func_809B5268(EnAttackNiw* this, GlobalContext* globalCtx, s16 arg2) { } if (this->unk_288 != this->unk_2C0) { - Math_SmoothScaleMaxF(&this->unk_2C0, this->unk_288, 0.5f, 4000.0f); + Math_ApproachF(&this->unk_2C0, this->unk_288, 0.5f, 4000.0f); } if (this->unk_264 != this->unk_2BC) { - Math_SmoothScaleMaxF(&this->unk_2BC, this->unk_264, 0.5f, 4000.0f); + Math_ApproachF(&this->unk_2BC, this->unk_264, 0.5f, 4000.0f); } if (this->unk_26C != this->unk_2A4.x) { - Math_SmoothScaleMaxF(&this->unk_2A4.x, this->unk_26C, 0.8f, 7000.0f); + Math_ApproachF(&this->unk_2A4.x, this->unk_26C, 0.8f, 7000.0f); } if (this->unk_280 != this->unk_2A4.y) { - Math_SmoothScaleMaxF(&this->unk_2A4.y, this->unk_280, 0.8f, 7000.0f); + Math_ApproachF(&this->unk_2A4.y, this->unk_280, 0.8f, 7000.0f); } if (this->unk_284 != this->unk_2A4.z) { - Math_SmoothScaleMaxF(&this->unk_2A4.z, this->unk_284, 0.8f, 7000.0f); + Math_ApproachF(&this->unk_2A4.z, this->unk_284, 0.8f, 7000.0f); } if (this->unk_268 != this->unk_2B0.x) { - Math_SmoothScaleMaxF(&this->unk_2B0.x, this->unk_268, 0.8f, 7000.0f); + Math_ApproachF(&this->unk_2B0.x, this->unk_268, 0.8f, 7000.0f); } if (this->unk_278 != this->unk_2B0.y) { - Math_SmoothScaleMaxF(&this->unk_2B0.y, this->unk_278, 0.8f, 7000.0f); + Math_ApproachF(&this->unk_2B0.y, this->unk_278, 0.8f, 7000.0f); } if (this->unk_27C != this->unk_2B0.z) { - Math_SmoothScaleMaxF(&this->unk_2B0.z, this->unk_27C, 0.8f, 7000.0f); + Math_ApproachF(&this->unk_2B0.z, this->unk_27C, 0.8f, 7000.0f); } } @@ -203,9 +203,9 @@ void func_809B5670(EnAttackNiw* this, GlobalContext* globalCtx) { this->unk_2D4 = Math_Vec3f_Yaw(&this->actor.posRot.pos, &sp34); this->unk_2D0 = Math_Vec3f_Pitch(&this->actor.posRot.pos, &sp34) * -1.0f; - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->unk_2D4, 5, this->unk_2DC, 0); - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.x, this->unk_2D0, 5, this->unk_2DC, 0); - Math_SmoothScaleMaxF(&this->unk_2DC, 5000.0f, 1.0f, 100.0f); + Math_SmoothStepToS(&this->actor.posRot.rot.y, this->unk_2D4, 5, this->unk_2DC, 0); + Math_SmoothStepToS(&this->actor.posRot.rot.x, this->unk_2D0, 5, this->unk_2DC, 0); + Math_ApproachF(&this->unk_2DC, 5000.0f, 1.0f, 100.0f); Actor_SetHeight(&this->actor, this->unk_2E4); func_8002F374(globalCtx, &this->actor, &sp4E, &sp4C); @@ -266,12 +266,12 @@ void func_809B59B0(EnAttackNiw* this, GlobalContext* globalCtx) { } } if (this->unk_25C == 0x32) { - this->unk_2D4 = Math_Rand_CenteredFloat(200.0f) + this->actor.yawTowardsLink; + this->unk_2D4 = Rand_CenteredFloat(200.0f) + this->actor.yawTowardsLink; } - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->unk_2D4, 2, this->unk_2DC, 0); - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.x, this->unk_2D0, 2, this->unk_2DC, 0); - Math_SmoothScaleMaxF(&this->unk_2DC, 10000.0f, 1.0f, 1000.0f); - Math_SmoothScaleMaxF(&this->actor.speedXZ, this->unk_2E0, 0.9f, 1.0f); + Math_SmoothStepToS(&this->actor.posRot.rot.y, this->unk_2D4, 2, this->unk_2DC, 0); + Math_SmoothStepToS(&this->actor.posRot.rot.x, this->unk_2D0, 2, this->unk_2DC, 0); + Math_ApproachF(&this->unk_2DC, 10000.0f, 1.0f, 1000.0f); + Math_ApproachF(&this->actor.speedXZ, this->unk_2E0, 0.9f, 1.0f); if ((this->actor.gravity == -2.0f) && (this->unk_262 == 0) && ((this->actor.bgCheckFlags & 8) || (this->unk_25C == 0))) { this->unk_2E0 = 0.0f; @@ -291,9 +291,9 @@ void func_809B5C18(EnAttackNiw* this, GlobalContext* globalCtx) { Actor_Kill(&this->actor); return; } - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.x, this->unk_2D0, 5, this->unk_2DC, 0); - Math_SmoothScaleMaxF(&this->unk_2DC, 5000.0f, 1.0f, 100.0f); - Math_SmoothScaleMaxF(&this->actor.velocity.y, 5.0f, 0.3f, 1.0f); + Math_SmoothStepToS(&this->actor.posRot.rot.x, this->unk_2D0, 5, this->unk_2DC, 0); + Math_ApproachF(&this->unk_2DC, 5000.0f, 1.0f, 100.0f); + Math_ApproachF(&this->actor.velocity.y, 5.0f, 0.3f, 1.0f); func_809B5268(this, globalCtx, 2); } diff --git a/src/overlays/actors/ovl_En_Bird/z_en_bird.c b/src/overlays/actors/ovl_En_Bird/z_en_bird.c index d621bddcbe..05f375ecd8 100644 --- a/src/overlays/actors/ovl_En_Bird/z_en_bird.c +++ b/src/overlays/actors/ovl_En_Bird/z_en_bird.c @@ -72,7 +72,7 @@ void func_809C1CAC(EnBird* this, s16 params) { f32 playbackSpeed = this->unk_19C ? 0.0f : 1.0f; AnimationHeader* anim = &D_0600006C; - this->unk_198 = Math_Rand_S16Offset(5, 0x23); + this->unk_198 = Rand_S16Offset(5, 0x23); SkelAnime_ChangeAnim(&this->skelAnime, anim, playbackSpeed, 0.0f, frameCount, 0, 0.0f); EnBird_SetupAction(this, func_809C1D60); } @@ -81,7 +81,7 @@ void func_809C1D60(EnBird* this, GlobalContext* globalCtx) { f32 fVar2 = sinf(this->unk_1B4); this->actor.shape.unk_08 = this->actor.shape.unk_08 + fVar2 * this->unk_1A0; - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 0.1f, 0.5f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 0.1f, 0.5f, 0.0f); if (this->unk_19C != 0) { this->skelAnime.animPlaybackSpeed = this->actor.speedXZ + this->actor.speedXZ; @@ -96,17 +96,17 @@ void func_809C1D60(EnBird* this, GlobalContext* globalCtx) { } void func_809C1E00(EnBird* this, s16 params) { - this->unk_198 = Math_Rand_S16Offset(0x14, 0x2D); + this->unk_198 = Rand_S16Offset(0x14, 0x2D); EnBird_SetupAction(this, func_809C1E40); } void func_809C1E40(EnBird* this, GlobalContext* globalCtx) { f32 fVar4 = sinf(this->unk_1B4); this->actor.shape.unk_08 += fVar4 * this->unk_1A0; - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, this->unk_1A8, 0.1f, this->unk_1AC, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, this->unk_1A8, 0.1f, this->unk_1AC, 0.0f); if (this->unk_1B0 < Math_Vec3f_DistXZ(&this->actor.posRot.pos, &this->actor.initPosRot.pos) || this->unk_198 < 4) { - func_80077B58(&this->actor.posRot.rot.y, Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->actor.initPosRot.pos), + Math_StepToAngleS(&this->actor.posRot.rot.y, Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->actor.initPosRot.pos), this->unk_1C0); } else { fVar4 = sinf(this->unk_1B4); diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index c95f52358f..5c67dfdcd3 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -119,9 +119,9 @@ void EnBom_Move(EnBom* this, GlobalContext* globalCtx) { } if (!(this->actor.bgCheckFlags & 1)) { - Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.08f); + Math_StepToF(&this->actor.speedXZ, 0.0f, 0.08f); } else { - Math_ApproxF(&this->actor.speedXZ, 0.0f, 1.0f); + Math_StepToF(&this->actor.speedXZ, 0.0f, 1.0f); if ((this->actor.bgCheckFlags & 2) && (this->actor.velocity.y < -3.0f)) { func_8002F850(globalCtx, &this->actor); this->actor.velocity.y *= -0.3f; @@ -263,9 +263,9 @@ void EnBom_Update(Actor* thisx, GlobalContext* globalCtx) { } if ((this->timer < 100) && ((this->timer & (this->flashSpeedScale + 1)) != 0)) { - Math_SmoothScaleMaxMinF(&this->flashIntensity, 140.0f, 1.0f, 140.0f / this->flashSpeedScale, 0.0f); + Math_SmoothStepToF(&this->flashIntensity, 140.0f, 1.0f, 140.0f / this->flashSpeedScale, 0.0f); } else { - Math_SmoothScaleMaxMinF(&this->flashIntensity, 0.0f, 1.0f, 140.0f / this->flashSpeedScale, 0.0f); + Math_SmoothStepToF(&this->flashIntensity, 0.0f, 1.0f, 140.0f / this->flashSpeedScale, 0.0f); } if (this->timer < 3) { diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index 3d4812623c..40e9a60c51 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -82,7 +82,7 @@ void EnBomBowlMan_Init(Actor* thisx, GlobalContext* globalCtx) { } } - this->prizeSelect = (s16)Math_Rand_ZeroFloat(4.99f); + this->prizeSelect = (s16)Rand_ZeroFloat(4.99f); this->actor.unk_1F = 1; this->actionFunc = EnBomBowMan_SetupWaitAsleep; } @@ -163,7 +163,7 @@ void EnBomBowMan_CheckBeatenDC(EnBomBowlMan* this, GlobalContext* globalCtx) { this->frameCount = (f32)SkelAnime_GetFrameCount(&D_060072AC); SkelAnime_ChangeAnim(&this->skelAnime, &D_060072AC, 1.0f, 0.0f, this->frameCount, 0, -10.0f); this->eyeMode = CHU_GIRL_EYES_AWAKE; - this->blinkTimer = (s16)Math_Rand_ZeroFloat(60.0f) + 20; + this->blinkTimer = (s16)Rand_ZeroFloat(60.0f) + 20; // Check for beaten Dodongo's Cavern if (!((gSaveContext.eventChkInf[2] & 0x20) || BREG(2))) { this->actionFunc = EnBomBowMan_WaitNotBeatenDC; @@ -478,7 +478,7 @@ void EnBomBowlMan_Update(Actor* thisx, GlobalContext* globalCtx) { this->eyeTextureIndex++; if (this->eyeTextureIndex >= 3) { this->eyeTextureIndex = 0; - this->blinkTimer = (s16)Math_Rand_ZeroFloat(60.0f) + 20; + this->blinkTimer = (s16)Rand_ZeroFloat(60.0f) + 20; } } diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c index a7e92507d9..2817224a42 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c @@ -120,12 +120,12 @@ void EnBomBowlPit_DetectHit(EnBomBowlPit* this, GlobalContext* globalCtx) { void EnBomBowlPit_CameraDollyIn(EnBomBowlPit* this, GlobalContext* globalCtx) { if (this->camId != 0) { - Math_SmoothScaleMaxF(&this->unk_180.x, this->unk_1BC.x, this->unk_1C8.x, this->unk_1D4.x); - Math_SmoothScaleMaxF(&this->unk_180.y, this->unk_1BC.y, this->unk_1C8.y, this->unk_1D4.y); - Math_SmoothScaleMaxF(&this->unk_180.z, this->unk_1BC.z, this->unk_1C8.z, this->unk_1D4.z); - Math_SmoothScaleMaxF(&this->unk_18C.x, this->unk_198.x, this->unk_1A4.x, this->unk_1B0.x); - Math_SmoothScaleMaxF(&this->unk_18C.y, this->unk_198.y, this->unk_1A4.y, this->unk_1B0.y); - Math_SmoothScaleMaxF(&this->unk_18C.z, this->unk_198.z, this->unk_1A4.z, this->unk_1B0.z); + Math_ApproachF(&this->unk_180.x, this->unk_1BC.x, this->unk_1C8.x, this->unk_1D4.x); + Math_ApproachF(&this->unk_180.y, this->unk_1BC.y, this->unk_1C8.y, this->unk_1D4.y); + Math_ApproachF(&this->unk_180.z, this->unk_1BC.z, this->unk_1C8.z, this->unk_1D4.z); + Math_ApproachF(&this->unk_18C.x, this->unk_198.x, this->unk_1A4.x, this->unk_1B0.x); + Math_ApproachF(&this->unk_18C.y, this->unk_198.y, this->unk_1A4.y, this->unk_1B0.y); + Math_ApproachF(&this->unk_18C.z, this->unk_198.z, this->unk_1A4.z, this->unk_1B0.z); } Gameplay_CameraSetAtEye(globalCtx, this->camId, &this->unk_180, &this->unk_18C); diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index 205067139c..9c2956712c 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -214,9 +214,9 @@ void EnBombf_Move(EnBombf* this, GlobalContext* globalCtx) { this->flowerBombScale = 1.0f; if (!(this->actor.bgCheckFlags & 1)) { - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 1.0f, 0.025f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 0.025f, 0.0f); } else { - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 1.0f, 1.5f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 1.5f, 0.0f); if ((this->actor.bgCheckFlags & 2) && (this->actor.velocity.y < -6.0f)) { func_8002F850(globalCtx, &this->actor); this->actor.velocity.y *= -0.5f; @@ -374,9 +374,9 @@ void EnBombf_Update(Actor* thisx, GlobalContext* globalCtx) { } if ((this->timer < 100) && ((this->timer & (this->flashSpeedScale + 1)) != 0)) { - Math_SmoothScaleMaxMinF(&this->flashIntensity, 150.0f, 1.0f, 150.0f / this->flashSpeedScale, 0.0f); + Math_SmoothStepToF(&this->flashIntensity, 150.0f, 1.0f, 150.0f / this->flashSpeedScale, 0.0f); } else { - Math_SmoothScaleMaxMinF(&this->flashIntensity, 0.0f, 1.0f, 150.0f / this->flashSpeedScale, 0.0f); + Math_SmoothStepToF(&this->flashIntensity, 0.0f, 1.0f, 150.0f / this->flashSpeedScale, 0.0f); } if (this->timer < 3) { diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index 711a7c56b1..9fd969ca71 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -131,8 +131,8 @@ void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx) { // the moveTo pointer is nulled and it flies off in a seemingly random direction. this->moveTo = NULL; } else { - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, yawTarget, (s16)(ABS(yawDiff) * distXYZScale)); - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.x, pitchTarget, (s16)(ABS(pitchDiff) * distXYZScale)); + Math_ScaledStepToS(&this->actor.posRot.rot.y, yawTarget, (s16)(ABS(yawDiff) * distXYZScale)); + Math_ScaledStepToS(&this->actor.posRot.rot.x, pitchTarget, (s16)(ABS(pitchDiff) * distXYZScale)); } } diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c index 62e6750a34..5df7de0cce 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -137,7 +137,7 @@ void EnBox_Init(Actor* thisx, GlobalContext* globalCtx) { } else if ((this->type == ENBOX_TYPE_SWITCH_FLAG_FALL_BIG || this->type == ENBOX_TYPE_SWITCH_FLAG_FALL_SMALL) && !Flags_GetSwitch(globalCtx2, this->switchFlag)) { func_8003EBF8(globalCtx2, &globalCtx2->colCtx.dyna, this->dyna.dynaPolyId); - if (Math_Rand_ZeroOne() < 0.5f) { + if (Rand_ZeroOne() < 0.5f) { this->movementFlags |= ENBOX_MOVE_FALL_ANGLE_SIDE; } this->unk_1A8 = -12; @@ -204,16 +204,16 @@ void EnBox_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void EnBox_RandomDustKinematic(EnBox* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel) { - f32 randomRadius = Math_Rand_ZeroOne() * 25.0f; - s16 randomAngle = Math_Rand_ZeroOne() * 0x10000; + f32 randomRadius = Rand_ZeroOne() * 25.0f; + s16 randomAngle = Rand_ZeroOne() * 0x10000; *pos = this->dyna.actor.posRot.pos; - pos->x += Math_Sins(randomAngle) * randomRadius; - pos->z += Math_Coss(randomAngle) * randomRadius; + pos->x += Math_SinS(randomAngle) * randomRadius; + pos->z += Math_CosS(randomAngle) * randomRadius; velocity->y = 1.0f; - velocity->x = Math_Sins(randomAngle); - velocity->z = Math_Coss(randomAngle); + velocity->x = Math_SinS(randomAngle); + velocity->z = Math_CosS(randomAngle); accel->x = 0.0f; accel->y = 0.0f; @@ -455,13 +455,13 @@ void EnBox_Open(EnBox* this, GlobalContext* globalCtx) { if (this->unk_1F4 < 120) { this->unk_1F4++; } else { - Math_ApproxF(&this->unk_1B0, 0.0f, 0.05f); + Math_StepToF(&this->unk_1B0, 0.0f, 0.05f); } } else { if (this->unk_1F4 > -120) { this->unk_1F4--; } else { - Math_ApproxF(&this->unk_1B0, 0.0f, 0.05f); + Math_StepToF(&this->unk_1B0, 0.0f, 0.05f); } } } else { @@ -496,24 +496,24 @@ void EnBox_SpawnIceSmoke(EnBox* this, GlobalContext* globalCtx) { this->iceSmokeTimer++; func_8002F974(&this->dyna.actor, NA_SE_EN_MIMICK_BREATH - SFX_FLAG); - if (Math_Rand_ZeroOne() < 0.3f) { - f0 = 2.0f * Math_Rand_ZeroOne() - 1.0f; + if (Rand_ZeroOne() < 0.3f) { + f0 = 2.0f * Rand_ZeroOne() - 1.0f; pos = this->dyna.actor.posRot.pos; if (this->type == ENBOX_TYPE_SMALL || this->type == ENBOX_TYPE_6 || this->type == ENBOX_TYPE_ROOM_CLEAR_SMALL || this->type == ENBOX_TYPE_SWITCH_FLAG_FALL_SMALL) { - pos.x += f0 * 10.0f * Math_Sins(this->dyna.actor.posRot.rot.y + 0x4000); - pos.z += f0 * 10.0f * Math_Coss(this->dyna.actor.posRot.rot.y + 0x4000); - f0 = 2.0f * Math_Rand_ZeroOne() - 1.0f; - vel.x = f0 * 0.8f * Math_Sins(this->dyna.actor.posRot.rot.y); + pos.x += f0 * 10.0f * Math_SinS(this->dyna.actor.posRot.rot.y + 0x4000); + pos.z += f0 * 10.0f * Math_CosS(this->dyna.actor.posRot.rot.y + 0x4000); + f0 = 2.0f * Rand_ZeroOne() - 1.0f; + vel.x = f0 * 0.8f * Math_SinS(this->dyna.actor.posRot.rot.y); vel.y = 1.8f; - vel.z = f0 * 0.8f * Math_Coss(this->dyna.actor.posRot.rot.y); + vel.z = f0 * 0.8f * Math_CosS(this->dyna.actor.posRot.rot.y); } else { - pos.x += f0 * 20.0f * Math_Sins(this->dyna.actor.posRot.rot.y + 0x4000); - pos.z += f0 * 20.0f * Math_Coss(this->dyna.actor.posRot.rot.y + 0x4000); - f0 = 2.0f * Math_Rand_ZeroOne() - 1.0f; - vel.x = f0 * 1.6f * Math_Sins(this->dyna.actor.posRot.rot.y); + pos.x += f0 * 20.0f * Math_SinS(this->dyna.actor.posRot.rot.y + 0x4000); + pos.z += f0 * 20.0f * Math_CosS(this->dyna.actor.posRot.rot.y + 0x4000); + f0 = 2.0f * Rand_ZeroOne() - 1.0f; + vel.x = f0 * 1.6f * Math_SinS(this->dyna.actor.posRot.rot.y); vel.y = 1.8f; - vel.z = f0 * 1.6f * Math_Coss(this->dyna.actor.posRot.rot.y); + vel.z = f0 * 1.6f * Math_CosS(this->dyna.actor.posRot.rot.y); } EffectSsIceSmoke_Spawn(globalCtx, &pos, &vel, &accel, 150); } diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c index 3408e39eb8..2f76151a1f 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -72,7 +72,7 @@ extern SkeletonHeader D_050036F0; void EnButte_SelectFlightParams(EnButte* this, EnButteFlightParams* flightParams) { if (this->flightParamsIdx == 0) { - if (Math_Rand_ZeroOne() < 0.6f) { + if (Rand_ZeroOne() < 0.6f) { this->flightParamsIdx = 1; } else { this->flightParamsIdx = 2; @@ -81,7 +81,7 @@ void EnButte_SelectFlightParams(EnButte* this, EnButteFlightParams* flightParams this->flightParamsIdx = 0; } - this->timer = Math_Rand_S16Offset(flightParams->minTime, flightParams->maxTime); + this->timer = Rand_S16Offset(flightParams->minTime, flightParams->maxTime); } static f32 sTransformationEffectScale = 0.0f; @@ -107,7 +107,7 @@ void EnButte_DrawTransformationEffect(EnButte* this, GlobalContext* globalCtx) { func_80093C14(globalCtx->state.gfxCtx); - alpha = Math_Sins(sTransformationEffectAlpha) * 250; + alpha = Math_SinS(sTransformationEffectAlpha) * 250; alpha = CLAMP(alpha, 0, 255); Camera_GetCamDir(&camDir, ACTIVE_CAM); @@ -152,9 +152,9 @@ void EnButte_Init(Actor* thisx, GlobalContext* globalCtx) { Collider_InitJntSph(globalCtx, &this->collider); Collider_SetJntSph(globalCtx, &this->collider, &this->actor, &sColliderInit, this->colliderItems); this->actor.colChkInfo.mass = 0; - this->unk_25C = Math_Rand_ZeroOne() * 0xFFFF; - this->unk_25E = Math_Rand_ZeroOne() * 0xFFFF; - this->unk_260 = Math_Rand_ZeroOne() * 0xFFFF; + this->unk_25C = Rand_ZeroOne() * 0xFFFF; + this->unk_25E = Rand_ZeroOne() * 0xFFFF; + this->unk_260 = Rand_ZeroOne() * 0xFFFF; SkelAnime_ChangeAnim(&this->skelAnime, &D_05002470, 1.0f, 0.0f, 0.0f, 1, 0.0f); EnButte_SetupFlyAround(this); this->actor.shape.rot.x -= 0x2320; @@ -174,8 +174,8 @@ void func_809CD56C(EnButte* this) { static f32 D_809CE3E0[] = { 50.0f, 80.0f, 100.0f }; static f32 D_809CE3EC[] = { 30.0f, 40.0f, 50.0f }; - this->actor.shape.unk_08 += Math_Sins(this->unk_25C) * D_809CE3E0[this->flightParamsIdx] + - Math_Sins(this->unk_25E) * D_809CE3EC[this->flightParamsIdx]; + this->actor.shape.unk_08 += Math_SinS(this->unk_25C) * D_809CE3E0[this->flightParamsIdx] + + Math_SinS(this->unk_25E) * D_809CE3EC[this->flightParamsIdx]; this->actor.shape.unk_08 = CLAMP(this->actor.shape.unk_08, -2000.0f, 2000.0f); } @@ -183,8 +183,8 @@ void func_809CD634(EnButte* this) { static f32 D_809CE3F8[] = { 15.0f, 20.0f, 25.0f }; static f32 D_809CE404[] = { 7.5f, 10.0f, 12.5f }; - this->actor.shape.unk_08 += Math_Sins(this->unk_25C) * D_809CE3F8[this->flightParamsIdx] + - Math_Sins(this->unk_25E) * D_809CE404[this->flightParamsIdx]; + this->actor.shape.unk_08 += Math_SinS(this->unk_25C) * D_809CE3F8[this->flightParamsIdx] + + Math_SinS(this->unk_25E) * D_809CE404[this->flightParamsIdx]; this->actor.shape.unk_08 = CLAMP(this->actor.shape.unk_08, -500.0f, 500.0f); } @@ -192,7 +192,7 @@ void EnButte_Turn(EnButte* this) { s16 target = this->actor.posRot.rot.y + 0x8000; s16 diff = target - this->actor.shape.rot.y; - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, target, ABS(diff) >> 3); + Math_ScaledStepToS(&this->actor.shape.rot.y, target, ABS(diff) >> 3); this->actor.shape.rot.x = (s16)(sinf(this->unk_260) * 600.0f) - 0x2320; } @@ -214,7 +214,7 @@ void EnButte_FlyAround(EnButte* this, GlobalContext* globalCtx) { distSqFromHome = Math3D_Dist2DSq(this->actor.posRot.pos.x, this->actor.posRot.pos.z, this->actor.initPosRot.pos.x, this->actor.initPosRot.pos.z); func_809CD56C(this); - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, flightParams->speedXZTarget, flightParams->speedXZScale, + Math_SmoothStepToF(&this->actor.speedXZ, flightParams->speedXZTarget, flightParams->speedXZScale, flightParams->speedXZStep, 0.0f); if (this->unk_257 == 1) { @@ -230,17 +230,17 @@ void EnButte_FlyAround(EnButte* this, GlobalContext* globalCtx) { if ((this->flightParamsIdx != 0) && ((distSqFromHome > maxDistSqFromHome) || (this->timer < 4))) { yaw = Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->actor.initPosRot.pos); - if (Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, yaw, flightParams->rotYStep) == 0) { + if (Math_ScaledStepToS(&this->actor.posRot.rot.y, yaw, flightParams->rotYStep) == 0) { minAnimSpeed = 0.5f; } } else if ((this->unk_257 == 0) && (this->actor.child != NULL) && (this->actor.child != &this->actor)) { yaw = Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->actor.child->posRot.pos); - if (Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, yaw, rotStep) == 0) { + if (Math_ScaledStepToS(&this->actor.posRot.rot.y, yaw, rotStep) == 0) { minAnimSpeed = 0.3f; } } else if (this->unk_257 == 1) { - yaw = this->actor.yawTowardsLink + 0x8000 + (s16)((Math_Rand_ZeroOne() - 0.5f) * 0x6000); - if (Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, yaw, rotStep) == 0) { + yaw = this->actor.yawTowardsLink + 0x8000 + (s16)((Rand_ZeroOne() - 0.5f) * 0x6000); + if (Math_ScaledStepToS(&this->actor.posRot.rot.y, yaw, rotStep) == 0) { minAnimSpeed = 0.4f; } } else { @@ -249,8 +249,8 @@ void EnButte_FlyAround(EnButte* this, GlobalContext* globalCtx) { EnButte_Turn(this); - animSpeed = this->actor.speedXZ / 2.0f + Math_Rand_ZeroOne() * 0.2f + (1.0f - Math_Sins(this->unk_260)) * 0.15f + - (1.0f - Math_Sins(this->unk_25E)) * 0.3f + minAnimSpeed; + animSpeed = this->actor.speedXZ / 2.0f + Rand_ZeroOne() * 0.2f + (1.0f - Math_SinS(this->unk_260)) * 0.15f + + (1.0f - Math_SinS(this->unk_25E)) * 0.3f + minAnimSpeed; this->skelAnime.animPlaybackSpeed = CLAMP(animSpeed, 0.2f, 1.5f); SkelAnime_FrameUpdateMatrix(&this->skelAnime); @@ -288,17 +288,17 @@ void EnButte_FollowLink(EnButte* this, GlobalContext* globalCtx) { s16 yaw; func_809CD634(this); - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, flightParams->speedXZTarget, flightParams->speedXZScale, + Math_SmoothStepToF(&this->actor.speedXZ, flightParams->speedXZTarget, flightParams->speedXZScale, flightParams->speedXZStep, 0.0f); minAnimSpeed = 0.0f; if ((this->flightParamsIdx != 0) && (this->timer < 12)) { - swordTip.x = player->swordInfo[0].tip.x + Math_Sins(player->actor.shape.rot.y) * 10.0f; + swordTip.x = player->swordInfo[0].tip.x + Math_SinS(player->actor.shape.rot.y) * 10.0f; swordTip.y = player->swordInfo[0].tip.y; - swordTip.z = player->swordInfo[0].tip.z + Math_Coss(player->actor.shape.rot.y) * 10.0f; + swordTip.z = player->swordInfo[0].tip.z + Math_CosS(player->actor.shape.rot.y) * 10.0f; - yaw = Math_Vec3f_Yaw(&this->actor.posRot.pos, &swordTip) + (s16)(Math_Rand_ZeroOne() * D_809CE410); - if (Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, yaw, 2000) != 0) { + yaw = Math_Vec3f_Yaw(&this->actor.posRot.pos, &swordTip) + (s16)(Rand_ZeroOne() * D_809CE410); + if (Math_ScaledStepToS(&this->actor.posRot.rot.y, yaw, 2000) != 0) { if (globalCtx->gameplayFrames % 2) { this->actor.posRot.rot.y += (s16)(sinf(this->unk_25C) * 60.0f); } @@ -311,8 +311,8 @@ void EnButte_FollowLink(EnButte* this, GlobalContext* globalCtx) { EnButte_Turn(this); - animSpeed = this->actor.speedXZ / 2.0f + Math_Rand_ZeroOne() * 0.2f + (1.0f - Math_Sins(this->unk_260)) * 0.15f + - (1.0f - Math_Sins(this->unk_25E)) * 0.3f + minAnimSpeed; + animSpeed = this->actor.speedXZ / 2.0f + Rand_ZeroOne() * 0.2f + (1.0f - Math_SinS(this->unk_260)) * 0.15f + + (1.0f - Math_SinS(this->unk_25E)) * 0.3f + minAnimSpeed; this->skelAnime.animPlaybackSpeed = CLAMP(animSpeed, 0.2f, 1.5f); SkelAnime_FrameUpdateMatrix(&this->skelAnime); @@ -399,7 +399,7 @@ void EnButte_Update(Actor* thisx, GlobalContext* globalCtx) { if (this->actor.update != NULL) { Actor_MoveForward(&this->actor); - Math_ApproxF(&this->actor.posRot.pos.y, this->posYTarget, 0.6f); + Math_StepToF(&this->actor.posRot.pos.y, this->posYTarget, 0.6f); if (this->actor.xyzDistFromLinkSq < 5000.0f) { CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); } diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/src/overlays/actors/ovl_En_Bx/z_en_bx.c index be6f53b71f..0c188f4ab6 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -148,11 +148,11 @@ void EnBx_Update(Actor* thisx, GlobalContext* globalCtx) { Vec3f pos; s16 yaw; - yaw = (s32)Math_Rand_CenteredFloat(12288.0f); + yaw = (s32)Rand_CenteredFloat(12288.0f); yaw = (yaw + (i * 0x4000)) + 0x2000; - pos.x = Math_Rand_CenteredFloat(5.0f) + thisx->posRot.pos.x; - pos.y = Math_Rand_CenteredFloat(30.0f) + thisx->posRot.pos.y + 170.0f; - pos.z = Math_Rand_CenteredFloat(5.0f) + thisx->posRot.pos.z; + pos.x = Rand_CenteredFloat(5.0f) + thisx->posRot.pos.x; + pos.y = Rand_CenteredFloat(30.0f) + thisx->posRot.pos.y + 170.0f; + pos.z = Rand_CenteredFloat(5.0f) + thisx->posRot.pos.z; EffectSsLightning_Spawn(globalCtx, &pos, &primColor, &envColor, 230, yaw, 6, 0); } } @@ -192,11 +192,11 @@ void EnBx_Draw(Actor* thisx, GlobalContext* globalCtx) { } this->unk_14E -= 0xBB8; - thisx->scale.z = thisx->scale.x = (Math_Coss(this->unk_14E) * 0.0075f) + 0.015f; + thisx->scale.z = thisx->scale.x = (Math_CosS(this->unk_14E) * 0.0075f) + 0.015f; for (i = 3; i >= 0; i--) { s16 off = (0x2000 * i); - this->unk_184[i].z = this->unk_184[i].x = (Math_Coss(this->unk_14E + off) * 0.0075f) + 0.015f; + this->unk_184[i].z = this->unk_184[i].x = (Math_CosS(this->unk_14E + off) * 0.0075f) + 0.015f; this->unk_1B4[i].x = thisx->shape.rot.x; this->unk_1B4[i].y = thisx->shape.rot.y; this->unk_1B4[i].z = thisx->shape.rot.z; diff --git a/src/overlays/actors/ovl_En_Changer/z_en_changer.c b/src/overlays/actors/ovl_En_Changer/z_en_changer.c index 884dd02f75..93c07b0262 100644 --- a/src/overlays/actors/ovl_En_Changer/z_en_changer.c +++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.c @@ -138,7 +138,7 @@ void EnChanger_Init(Actor* thisx, GlobalContext* globalCtx2) { this->rightChestGetItemId = GI_DOOR_KEY; rightChestItem = ITEM_ETC_KEY_SMALL_CHEST_GAME; - if (Math_Rand_ZeroFloat(1.99f) < 1.0f) { + if (Rand_ZeroFloat(1.99f) < 1.0f) { rightChestParams = (sLoserGetItemIds[globalCtx->roomCtx.curRoom.num] << 5) | 0x4000; this->rightChestNum = new_var; this->rightChestGetItemId = sLoserGetItemIds[globalCtx->roomCtx.curRoom.num]; diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index 0734985b42..5e295b866d 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -57,10 +57,10 @@ void func_809DEE00(Vec3f* vec, s16 rotY) { f32 xCalc; f32 rotCalcTemp; - rotCalcTemp = Math_Coss(rotY); - xCalc = (Math_Sins(rotY) * vec->z) + (rotCalcTemp * vec->x); - rotCalcTemp = Math_Sins(rotY); - vec->z = (Math_Coss(rotY) * vec->z) + (-rotCalcTemp * vec->x); + rotCalcTemp = Math_CosS(rotY); + xCalc = (Math_SinS(rotY) * vec->z) + (rotCalcTemp * vec->x); + rotCalcTemp = Math_SinS(rotY); + vec->z = (Math_CosS(rotY) * vec->z) + (-rotCalcTemp * vec->x); vec->x = xCalc; } @@ -123,7 +123,7 @@ void EnCow_Init(Actor* thisx, GlobalContext* globalCtx) { } Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_COW, this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, this->actor.shape.rot.y, 0, 1); - this->unk_278 = Math_Rand_ZeroFloat(1000.0f) + 40.0f; + this->unk_278 = Rand_ZeroFloat(1000.0f) + 40.0f; this->unk_27A = 0; this->actor.unk_1F = 6; DREG(53) = 0; @@ -137,7 +137,7 @@ void EnCow_Init(Actor* thisx, GlobalContext* globalCtx) { this->actionFunc = func_809DFA84; func_809DEF94(this); this->actor.flags &= ~0x1; - this->unk_278 = ((u32)(Math_Rand_ZeroFloat(1000.0f)) & 0xFFFF) + 40.0f; + this->unk_278 = ((u32)(Rand_ZeroFloat(1000.0f)) & 0xFFFF) + 40.0f; break; } this->actor.colChkInfo.mass = 0xFF; @@ -158,7 +158,7 @@ void func_809DF494(EnCow* this, GlobalContext* globalCtx) { if (this->unk_278 > 0) { this->unk_278 -= 1; } else { - this->unk_278 = Math_Rand_ZeroFloat(500.0f) + 40.0f; + this->unk_278 = Rand_ZeroFloat(500.0f) + 40.0f; SkelAnime_ChangeAnim(&this->skelAnime, &D_060001CC, 1.0f, this->skelAnime.animCurrentFrame, SkelAnime_GetFrameCount(&D_060001CC), 2, 1.0f); } @@ -177,13 +177,13 @@ void func_809DF494(EnCow* this, GlobalContext* globalCtx) { // (1.0f / 100.0f) instead of 0.01f below is necessary so 0.01f doesn't get reused mistakenly if (this->unk_27A < 0x20) { - this->actor.scale.x = ((Math_Sins(this->unk_27A << 0xA) * (1.0f / 100.0f)) + 1.0f) * 0.01f; + this->actor.scale.x = ((Math_SinS(this->unk_27A << 0xA) * (1.0f / 100.0f)) + 1.0f) * 0.01f; } else { this->actor.scale.x = 0.01f; } if (this->unk_27A >= 0x11) { - this->actor.scale.y = ((Math_Sins((this->unk_27A << 0xA) - 0x4000) * (1.0f / 100.0f)) + 1.0f) * 0.01f; + this->actor.scale.y = ((Math_SinS((this->unk_27A << 0xA) - 0x4000) * (1.0f / 100.0f)) + 1.0f) * 0.01f; } else { this->actor.scale.y = 0.01f; } @@ -274,7 +274,7 @@ void func_809DFA84(EnCow* this, GlobalContext* globalCtx) { if (this->unk_278 > 0) { this->unk_278--; } else { - this->unk_278 = Math_Rand_ZeroFloat(200.0f) + 40.0f; + this->unk_278 = Rand_ZeroFloat(200.0f) + 40.0f; SkelAnime_ChangeAnim(&this->skelAnime, &D_06004348, 1.0f, this->skelAnime.animCurrentFrame, SkelAnime_GetFrameCount(&D_06004348), 2, 1.0f); } @@ -332,8 +332,8 @@ void EnCow_Update(Actor* thisx, GlobalContext* globalCtx) { targetY = 0; targetX = 0; } - Math_SmoothScaleMaxMinS(&this->someRot.x, targetX, 0xA, 0xC8, 0xA); - Math_SmoothScaleMaxMinS(&this->someRot.y, targetY, 0xA, 0xC8, 0xA); + Math_SmoothStepToS(&this->someRot.x, targetX, 0xA, 0xC8, 0xA); + Math_SmoothStepToS(&this->someRot.y, targetY, 0xA, 0xC8, 0xA); } void func_809DFE98(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index 6540b34c9d..ca9c8b0b38 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -103,7 +103,7 @@ void func_809E03B4(EnCrow* this, GlobalContext* globalCtx) { f32 scale; Vec3f iceParticlePos; - this->actor.speedXZ *= Math_Coss(this->actor.posRot.rot.x); + this->actor.speedXZ *= Math_CosS(this->actor.posRot.rot.x); this->actor.velocity.y = 0.0f; SkelAnime_ChangeAnim(&this->skelAnime, &D_060000F0, 0.4f, 0.0f, 0.0f, 1, -3.0f); scale = this->actor.scale.x * 100.0f; @@ -120,7 +120,7 @@ void func_809E03B4(EnCrow* this, GlobalContext* globalCtx) { iceParticlePos.y = ((i & 2 ? 7.0f : -7.0f) * scale) + this->actor.posRot.pos.y; iceParticlePos.z = ((i & 4 ? 7.0f : -7.0f) * scale) + this->actor.posRot.pos.z; EffectSsEnIce_SpawnFlyingVec3f(globalCtx, &this->actor, &iceParticlePos, 150, 150, 150, 250, 235, 245, 255, - ((Math_Rand_ZeroOne() * 0.15f) + 0.85f) * scale); + ((Rand_ZeroOne() * 0.15f) + 0.85f) * scale); } } else if (this->actor.colChkInfo.damageEffect == 2) { func_8003426C(&this->actor, 0x4000, 255, 0, 40); @@ -186,7 +186,7 @@ void EnCrow_Wait(EnCrow* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); skelanimeUpdated = func_800A56C8(&this->skelAnime, 0.0f); - this->actor.speedXZ = (Math_Rand_ZeroOne() * 1.5f) + 3.0f; + this->actor.speedXZ = (Rand_ZeroOne() * 1.5f) + 3.0f; if (this->actor.bgCheckFlags & 8) { this->aimRotY = this->actor.wallPolyRot; @@ -194,13 +194,13 @@ void EnCrow_Wait(EnCrow* this, GlobalContext* globalCtx) { this->aimRotY = func_8002DAC0(&this->actor, &this->actor.initPosRot); } - if ((Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->aimRotY, 5, 0x300, 0x10) == 0) && (skelanimeUpdated) && - (Math_Rand_ZeroOne() < 0.1f)) { + if ((Math_SmoothStepToS(&this->actor.shape.rot.y, this->aimRotY, 5, 0x300, 0x10) == 0) && (skelanimeUpdated) && + (Rand_ZeroOne() < 0.1f)) { var = func_8002DAC0(&this->actor, &this->actor.initPosRot) - this->actor.shape.rot.y; if (var > 0) { - this->aimRotY += 0x1000 + (0x1000 * Math_Rand_ZeroOne()); + this->aimRotY += 0x1000 + (0x1000 * Rand_ZeroOne()); } else { - this->aimRotY -= 0x1000 + (0x1000 * Math_Rand_ZeroOne()); + this->aimRotY -= 0x1000 + (0x1000 * Rand_ZeroOne()); } Audio_PlayActorSound2(&this->actor, NA_SE_EN_KAICHO_CRY); } @@ -208,23 +208,23 @@ void EnCrow_Wait(EnCrow* this, GlobalContext* globalCtx) { if (this->actor.waterY > -40.0f) { this->aimRotX = -0x1000; } else if (this->actor.posRot.pos.y < (this->actor.initPosRot.pos.y - 50.0f)) { - this->aimRotX = -0x800 - (Math_Rand_ZeroOne() * 0x800); + this->aimRotX = -0x800 - (Rand_ZeroOne() * 0x800); } else if (this->actor.posRot.pos.y > (this->actor.initPosRot.pos.y + 50.0f)) { - this->aimRotX = 0x800 + (Math_Rand_ZeroOne() * 0x800); + this->aimRotX = 0x800 + (Rand_ZeroOne() * 0x800); } - if ((Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, this->aimRotX, 10, 0x100, 8) == 0) && (skelanimeUpdated) && - (Math_Rand_ZeroOne() < 0.1f)) { + if ((Math_SmoothStepToS(&this->actor.shape.rot.x, this->aimRotX, 10, 0x100, 8) == 0) && (skelanimeUpdated) && + (Rand_ZeroOne() < 0.1f)) { if (this->actor.initPosRot.pos.y < this->actor.posRot.pos.y) { - this->aimRotX -= (0x400 * Math_Rand_ZeroOne()) + 0x400; + this->aimRotX -= (0x400 * Rand_ZeroOne()) + 0x400; } else { - this->aimRotX += (0x400 * Math_Rand_ZeroOne()) + 0x400; + this->aimRotX += (0x400 * Rand_ZeroOne()) + 0x400; } this->aimRotX = CLAMP(this->aimRotX, -0x1000, 0x1000); } if (this->actor.bgCheckFlags & 1) { - Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, -0x100, 0x400); + Math_ScaledStepToS(&this->actor.shape.rot.x, -0x100, 0x400); } if (this->timer != 0) { @@ -257,13 +257,13 @@ void func_809E0C8C(EnCrow* this, GlobalContext* globalCtx) { if (target > 0x3000) { target = 0x3000; } - Math_SmoothScaleMaxS(&this->actor.shape.rot.x, target, 2, 0x400); + Math_ApproachS(&this->actor.shape.rot.x, target, 2, 0x400); } else { - Math_SmoothScaleMaxS(&this->actor.shape.rot.x, -0x1000, 2, 0x100); + Math_ApproachS(&this->actor.shape.rot.x, -0x1000, 2, 0x100); } if ((yaw != 0) || (this->actor.xzDistFromLink > 80.0f)) { - Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 4, 0xC00); + Math_ApproachS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 4, 0xC00); } if ((this->timer == 0) || (Player_GetMask(globalCtx) == PLAYER_MASK_SKULL) || (this->collider.base.atFlags & 2) || @@ -278,12 +278,12 @@ void func_809E0C8C(EnCrow* this, GlobalContext* globalCtx) { } void func_809E0E2C(EnCrow* this, GlobalContext* globalCtx) { - Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.5f); + Math_StepToF(&this->actor.speedXZ, 0.0f, 0.5f); this->actor.dmgEffectTimer = 40; if (!(this->actor.flags & 0x8000)) { if (this->actor.dmgEffectParams & 0x4000) { - Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, 0x4000, 0x200); + Math_ScaledStepToS(&this->actor.shape.rot.x, 0x4000, 0x200); this->actor.shape.rot.z += 0x1780; } if ((this->actor.bgCheckFlags & 1) || (this->actor.groundY == -32000.0f)) { @@ -303,7 +303,7 @@ void EnCrow_Die(EnCrow* this, GlobalContext* globalCtx) { step = 0.002f; } - if (Math_ApproxF(&this->actor.scale, 0.0f, step)) { + if (Math_StepToF(&this->actor.scale, 0.0f, step)) { if (this->actor.params == 0) { sDeathCount++; Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.posRot, 0); @@ -325,8 +325,8 @@ void func_809E1004(EnCrow* this, GlobalContext* globalCtx) { this->aimRotY = this->actor.yawTowardsLink + 0x8000; } - Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->aimRotY, 3, 0xC00); - Math_SmoothScaleMaxS(&this->actor.shape.rot.x, this->aimRotX, 5, 0x100); + Math_ApproachS(&this->actor.shape.rot.y, this->aimRotY, 3, 0xC00); + Math_ApproachS(&this->actor.shape.rot.x, this->aimRotX, 5, 0x100); if (this->timer != 0) { this->timer--; @@ -351,7 +351,7 @@ void func_809E10A8(EnCrow* this, GlobalContext* globalCtx) { } else { target = 0.01f; } - if (Math_ApproxF(&this->actor.scale, target, target * 0.1f)) { + if (Math_StepToF(&this->actor.scale, target, target * 0.1f)) { this->actor.flags |= 1; this->actor.flags &= ~0x10; this->actor.colChkInfo.health = 1; diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index ad2f58fa55..9a402f1ac5 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -172,7 +172,7 @@ void EnDaiku_Init(Actor* thisx, GlobalContext* globalCtx) { this->stateFlags |= ENDAIKU_STATEFLAG_1 | ENDAIKU_STATEFLAG_2; } - this->skelAnime.animCurrentFrame = (s32)(Math_Rand_ZeroOne() * this->skelAnime.animFrameCount); + this->skelAnime.animCurrentFrame = (s32)(Rand_ZeroOne() * this->skelAnime.animFrameCount); this->actionFunc = EnDaiku_TentIdle; } } @@ -391,7 +391,7 @@ void EnDaiku_InitEscape(EnDaiku* this, GlobalContext* globalCtx) { pointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->waypoint; dx = pointPos->x - this->actor.posRot.pos.x; dz = pointPos->z - this->actor.posRot.pos.z; - this->rotYtowardsPath = Math_atan2f(dx, dz) * (0x8000 / M_PI); + this->rotYtowardsPath = Math_FAtan2F(dx, dz) * (0x8000 / M_PI); dxz = sqrtf(SQ(dx) + SQ(dz)); if (dxz > 10.0f) { exitLoop = true; @@ -409,7 +409,7 @@ void EnDaiku_InitEscape(EnDaiku* this, GlobalContext* globalCtx) { void EnDaiku_EscapeRotate(EnDaiku* this, GlobalContext* globalCtx) { s16 diff; - diff = Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->rotYtowardsPath, 1, 0x1388, 0); + diff = Math_SmoothStepToS(&this->actor.shape.rot.y, this->rotYtowardsPath, 1, 0x1388, 0); SkelAnime_FrameUpdateMatrix(&this->skelAnime); if (diff == 0) { this->actionFunc = EnDaiku_EscapeRun; @@ -458,9 +458,9 @@ void EnDaiku_UpdateSubCamera(EnDaiku* this, GlobalContext* globalCtx) { this->subCamAtTarget.y = this->actor.posRot.pos.y + 60.0f; this->subCamAtTarget.z = this->actor.posRot.pos.z; - Math_SmoothScaleMaxMinF(&this->subCamAt.x, this->subCamAtTarget.x, 1.0f, 1000.0f, 0.0f); - Math_SmoothScaleMaxMinF(&this->subCamAt.y, this->subCamAtTarget.y, 1.0f, 1000.0f, 0.0f); - Math_SmoothScaleMaxMinF(&this->subCamAt.z, this->subCamAtTarget.z, 1.0f, 1000.0f, 0.0f); + Math_SmoothStepToF(&this->subCamAt.x, this->subCamAtTarget.x, 1.0f, 1000.0f, 0.0f); + Math_SmoothStepToF(&this->subCamAt.y, this->subCamAtTarget.y, 1.0f, 1000.0f, 0.0f); + Math_SmoothStepToF(&this->subCamAt.z, this->subCamAtTarget.z, 1.0f, 1000.0f, 0.0f); Gameplay_CameraSetAtEye(globalCtx, this->subCamId, &this->subCamAt, &this->subCamEye); } @@ -479,7 +479,7 @@ void EnDaiku_EscapeSuccess(EnDaiku* this, GlobalContext* globalCtx) { Matrix_MultVec3f(&D_809E4148, &vec); gerudoGuard = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_GE3, this->initPos.x + vec.x, this->initPos.y + vec.y, - this->initPos.z + vec.z, 0, Math_atan2f(-vec.x, -vec.z) * (0x8000 / M_PI), 0, 2); + this->initPos.z + vec.z, 0, Math_FAtan2F(-vec.x, -vec.z) * (0x8000 / M_PI), 0, 2); if (gerudoGuard == NULL) { Actor_Kill(&this->actor); @@ -506,7 +506,7 @@ void EnDaiku_EscapeRun(EnDaiku* this, GlobalContext* globalCtx) { pointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->waypoint; dx = pointPos->x - this->actor.posRot.pos.x; dz = pointPos->z - this->actor.posRot.pos.z; - ry = Math_atan2f(dx, dz) * (0x8000 / M_PI); + ry = Math_FAtan2F(dx, dz) * (0x8000 / M_PI); dxz = sqrtf(SQ(dx) + SQ(dz)); if (dxz <= 20.88f) { this->waypoint++; @@ -519,9 +519,9 @@ void EnDaiku_EscapeRun(EnDaiku* this, GlobalContext* globalCtx) { } } - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, ry, 1, 0xFA0, 0); + Math_SmoothStepToS(&this->actor.shape.rot.y, ry, 1, 0xFA0, 0); this->actor.posRot.rot.y = this->actor.shape.rot.y; - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, this->runSpeed, 0.6f, dxz, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, this->runSpeed, 0.6f, dxz, 0.0f); Actor_MoveForward(&this->actor); func_8002E4B4(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4); diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index 477ecb5d03..b7b3bc0d43 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -127,22 +127,22 @@ void EnDh_SpawnDebris(GlobalContext* globalCtx, EnDh* this, Vec3f* spawnPos, f32 f32 spreadAngle; f32 scaleMod; - spreadAngle = (Math_Rand_ZeroOne() - 0.5f) * 6.28f; + spreadAngle = (Rand_ZeroOne() - 0.5f) * 6.28f; pos.y = this->actor.groundY; - pos.x = (func_800CA720(spreadAngle) * spread) + spawnPos->x; - pos.z = (func_800CA774(spreadAngle) * spread) + spawnPos->z; - accel.x = (Math_Rand_ZeroOne() - 0.5f) * accelXZ; - accel.z = (Math_Rand_ZeroOne() - 0.5f) * accelXZ; - vel.y += (Math_Rand_ZeroOne() - 0.5f) * 4.0f; - scaleMod = (Math_Rand_ZeroOne() * 5.0f) + 12.0f; + pos.x = (Math_SinF(spreadAngle) * spread) + spawnPos->x; + pos.z = (Math_CosF(spreadAngle) * spread) + spawnPos->z; + accel.x = (Rand_ZeroOne() - 0.5f) * accelXZ; + accel.z = (Rand_ZeroOne() - 0.5f) * accelXZ; + vel.y += (Rand_ZeroOne() - 0.5f) * 4.0f; + scaleMod = (Rand_ZeroOne() * 5.0f) + 12.0f; EffectSsHahen_Spawn(globalCtx, &pos, &vel, &accel, arg4, scaleMod * scale, -1, 10, NULL); } void EnDh_SetupWait(EnDh* this) { SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_06003A8C); this->curAction = DH_WAIT; - this->actor.posRot.pos.x = Math_Rand_CenteredFloat(600.0f) + this->actor.initPosRot.pos.x; - this->actor.posRot.pos.z = Math_Rand_CenteredFloat(600.0f) + this->actor.initPosRot.pos.z; + this->actor.posRot.pos.x = Rand_CenteredFloat(600.0f) + this->actor.initPosRot.pos.x; + this->actor.posRot.pos.z = Rand_CenteredFloat(600.0f) + this->actor.initPosRot.pos.z; this->actor.shape.unk_08 = -15000.0f; this->dirtWaveSpread = this->actor.speedXZ = 0.0f; this->actor.posRot.rot.y = this->actor.shape.rot.y; @@ -169,9 +169,9 @@ void EnDh_Wait(EnDh* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_DEADHAND_HIDE); case 1: this->dirtWavePhase += 0x3A7; - Math_SmoothScaleMaxMinF(&this->dirtWaveSpread, 300.0f, 1.0f, 5.0f, 0.0f); - this->dirtWaveHeight = Math_Sins(this->dirtWavePhase) * 55.0f; - this->dirtWaveAlpha = (s16)(Math_Sins(this->dirtWavePhase) * 255.0f); + Math_SmoothStepToF(&this->dirtWaveSpread, 300.0f, 1.0f, 5.0f, 0.0f); + this->dirtWaveHeight = Math_SinS(this->dirtWavePhase) * 55.0f; + this->dirtWaveAlpha = (s16)(Math_SinS(this->dirtWavePhase) * 255.0f); EnDh_SpawnDebris(globalCtx, this, &this->actor.posRot.pos, this->dirtWaveSpread, 4, 2.05f, 1.2f); if (this->actor.shape.unk_08 == 0.0f) { this->drawDirtWave = false; @@ -184,7 +184,7 @@ void EnDh_Wait(EnDh* this, GlobalContext* globalCtx) { EnDh_SetupWalk(this); break; } - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 1, 0x7D0, 0); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 1, 0x7D0, 0); SkelAnime_FrameUpdateMatrix(&this->skelAnime); if (this->actor.params != ENDH_START_ATTACK_BOMB) { func_8008EEAC(globalCtx, &this->actor); @@ -202,7 +202,7 @@ void EnDh_SetupWalk(EnDh* this) { } void EnDh_Walk(EnDh* this, GlobalContext* globalCtx) { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 1, 0xFA, 0); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 1, 0xFA, 0); this->actor.posRot.rot.y = this->actor.shape.rot.y; SkelAnime_FrameUpdateMatrix(&this->skelAnime); if (((s32)this->skelAnime.animCurrentFrame % 8) == 0) { @@ -235,7 +235,7 @@ void EnDh_Retreat(EnDh* this, GlobalContext* globalCtx) { this->retreat = false; EnDh_SetupBurrow(this); } else { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, (s16)(this->actor.yawTowardsLink + 0x8000), 1, 0xBB8, 0); + Math_SmoothStepToS(&this->actor.shape.rot.y, (s16)(this->actor.yawTowardsLink + 0x8000), 1, 0xBB8, 0); } this->actor.posRot.rot.y = this->actor.shape.rot.y; SkelAnime_FrameUpdateMatrix(&this->skelAnime); @@ -266,7 +266,7 @@ void EnDh_Attack(EnDh* this, GlobalContext* globalCtx) { this->actionState++; Audio_PlayActorSound2(&this->actor, NA_SE_EN_DEADHAND_BITE); case 0: - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 1, 0x5DC, 0); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 1, 0x5DC, 0); break; case 2: if (this->skelAnime.animCurrentFrame >= 4.0f) { @@ -328,9 +328,9 @@ void EnDh_Burrow(EnDh* this, GlobalContext* globalCtx) { this->collider1.body.toucher.damage = 4; case 1: this->dirtWavePhase += 0x47E; - Math_SmoothScaleMaxMinF(&this->dirtWaveSpread, 300.0f, 1.0f, 8.0f, 0.0f); - this->dirtWaveHeight = Math_Sins(this->dirtWavePhase) * 55.0f; - this->dirtWaveAlpha = (s16)(Math_Sins(this->dirtWavePhase) * 255.0f); + Math_SmoothStepToF(&this->dirtWaveSpread, 300.0f, 1.0f, 8.0f, 0.0f); + this->dirtWaveHeight = Math_SinS(this->dirtWavePhase) * 55.0f; + this->dirtWaveAlpha = (s16)(Math_SinS(this->dirtWavePhase) * 255.0f); EnDh_SpawnDebris(globalCtx, this, &this->actor.posRot.pos, this->dirtWaveSpread, 4, 2.05f, 1.2f); this->collider1.dim.radius = this->dirtWaveSpread * 0.6f; if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c index 09d8dd8456..bddfde8946 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -112,7 +112,7 @@ void EnDha_Destroy(Actor* thisx, GlobalContext* globalCtx) { void func_809EC9C8(EnDha* this) { SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_060015B0); this->unk_1C0 = 0; - this->unk_1C8 = ((Math_Rand_ZeroOne() * 10.0f) + 5.0f); + this->unk_1C8 = ((Rand_ZeroOne() * 10.0f) + 5.0f); this->actor.speedXZ = 0.0f; this->actor.posRot.rot.y = this->actor.shape.rot.y; this->actor.initPosRot.rot.z = 1; @@ -131,8 +131,8 @@ void func_809ECA50(EnDha* this, GlobalContext* globalCtx) { s16 result; s32 resultAbs; - playerPos.x += Math_Sins(player->actor.shape.rot.y) * -5.0f; - playerPos.z += Math_Coss(player->actor.shape.rot.y) * -5.0f; + playerPos.x += Math_SinS(player->actor.shape.rot.y) * -5.0f; + playerPos.z += Math_CosS(player->actor.shape.rot.y) * -5.0f; if (LINK_IS_CHILD) { playerPos.y += 38.0f; } else { @@ -152,7 +152,7 @@ void func_809ECA50(EnDha* this, GlobalContext* globalCtx) { } } else { this->unk_1CA += 0x1194; - this->unk_1D0.y = Math_Sins(this->unk_1CA) * 1820.0f; + this->unk_1D0.y = Math_SinS(this->unk_1CA) * 1820.0f; if (!(player->stateFlags2 & 0x80)) { this->unk_1CC = 0; func_809ECF60(this); @@ -177,9 +177,9 @@ void func_809ECA50(EnDha* this, GlobalContext* globalCtx) { } } this->actor.shape.rot.y = Math_Vec3f_Yaw(&this->actor.posRot.pos, &playerPos); - Math_SmoothScaleMaxMinF(&this->unk_1DC.x, playerPos.x, 1.0f, 16.0f, 0.0f); - Math_SmoothScaleMaxMinF(&this->unk_1DC.y, playerPos.y, 1.0f, 16.0f, 0.0f); - Math_SmoothScaleMaxMinF(&this->unk_1DC.z, playerPos.z, 1.0f, 16.0f, 0.0f); + Math_SmoothStepToF(&this->unk_1DC.x, playerPos.x, 1.0f, 16.0f, 0.0f); + Math_SmoothStepToF(&this->unk_1DC.y, playerPos.y, 1.0f, 16.0f, 0.0f); + Math_SmoothStepToF(&this->unk_1DC.z, playerPos.z, 1.0f, 16.0f, 0.0f); func_80035844(&this->unk_1F4, &this->unk_1DC, &test, 0); Matrix_Translate(this->unk_1DC.x, this->unk_1DC.y, this->unk_1DC.z, MTXMODE_NEW); Matrix_RotateRPY(test.x, test.y, 0, MTXMODE_APPLY); @@ -206,8 +206,8 @@ void func_809ECA50(EnDha* this, GlobalContext* globalCtx) { player->unk_850 = 200; } this->actor.initPosRot.rot.z = 1; - Math_SmoothScaleMaxMinS(&this->unk_1D0.x, 0, 1, 0x3E8, 0); - Math_SmoothScaleMaxMinS(&this->unk_1CE, -0x4000, 1, 0x3E8, 0); + Math_SmoothStepToS(&this->unk_1D0.x, 0, 1, 0x3E8, 0); + Math_SmoothStepToS(&this->unk_1CE, -0x4000, 1, 0x3E8, 0); SkelAnime_FrameUpdateMatrix(&this->skelAnime); } } @@ -225,9 +225,9 @@ void func_809ECF8C(EnDha* this, GlobalContext* globalCtx) { player->actor.parent = NULL; player->unk_850 = 200; } - Math_SmoothScaleMaxMinS(&this->unk_1D0.x, 0, 1, 2000, 0); - Math_SmoothScaleMaxMinS(&this->unk_1D0.y, 0, 1, 600, 0); - Math_SmoothScaleMaxMinS(&this->unk_1CE, -0x4000, 1, 2000, 0); + Math_SmoothStepToS(&this->unk_1D0.x, 0, 1, 2000, 0); + Math_SmoothStepToS(&this->unk_1D0.y, 0, 1, 600, 0); + Math_SmoothStepToS(&this->unk_1CE, -0x4000, 1, 2000, 0); SkelAnime_FrameUpdateMatrix(&this->skelAnime); this->unk_1C8--; if (this->unk_1C8 == 0) { @@ -260,8 +260,8 @@ void EnDha_Die(EnDha* this, GlobalContext* globalCtx) { player->actor.parent = NULL; player->unk_850 = 200; } - Math_SmoothScaleMaxMinS(&this->unk_1D0.x, 0, 1, 0x7D0, 0); - result = Math_SmoothScaleMaxMinS(&this->unk_1CE, -0x4000, 1, 0x7D0, 0); + Math_SmoothStepToS(&this->unk_1D0.x, 0, 1, 0x7D0, 0); + result = Math_SmoothStepToS(&this->unk_1CE, -0x4000, 1, 0x7D0, 0); SkelAnime_FrameUpdateMatrix(&this->skelAnime); if (result == 0) { vector = this->actor.posRot.pos; diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index f24daf1946..c7152ebdd4 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -312,7 +312,7 @@ void EnDns_SetupWait(EnDns* this, GlobalContext* globalCtx) { } void EnDns_Wait(EnDns* this, GlobalContext* globalCtx) { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 3, 2000, 0); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 3, 2000, 0); this->actor.posRot.rot.y = this->actor.shape.rot.y; if (func_8002F194(&this->actor, globalCtx)) { this->actionFunc = EnDns_Talk; diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index 8ce12b131e..a14d240423 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -133,12 +133,12 @@ void EnDodongo_SpawnBombSmoke(EnDodongo* this, GlobalContext* globalCtx) { Vec3f velocity = { 0.0f, 0.0f, 0.0f }; Vec3f accel = { 0.0f, 0.3f, 0.0f }; Vec3f pos = this->headPos; - s16 randAngle = Math_Rand_CenteredFloat(0x4000); + s16 randAngle = Rand_CenteredFloat(0x4000); f32 randCos; f32 randSin; - randCos = Math_Coss(this->actor.shape.rot.y + randAngle); - randSin = Math_Sins(this->actor.shape.rot.y + randAngle); + randCos = Math_CosS(this->actor.shape.rot.y + randAngle); + randSin = Math_SinS(this->actor.shape.rot.y + randAngle); if (this->bombSmokePrimColor.r > 30) { this->bombSmokePrimColor.r -= 16; this->bombSmokePrimColor.g -= 16; @@ -158,33 +158,33 @@ void EnDodongo_SpawnBombSmoke(EnDodongo* this, GlobalContext* globalCtx) { velocity.x = randSin * 3.5f; velocity.y = this->bombSmokeEnvColor.r * 0.02f; velocity.z = randCos * 3.5f; - accel.x = ((Math_Rand_ZeroOne() * 0.1f) + 0.15f) * -randSin; - accel.z = ((Math_Rand_ZeroOne() * 0.1f) + 0.15f) * -randCos; + accel.x = ((Rand_ZeroOne() * 0.1f) + 0.15f) * -randSin; + accel.z = ((Rand_ZeroOne() * 0.1f) + 0.15f) * -randCos; func_8002836C(globalCtx, &pos, &velocity, &accel, &this->bombSmokePrimColor, &this->bombSmokeEnvColor, 100, 25, 20); - randAngle = Math_Rand_ZeroOne() * 0x2000; - randCos = Math_Coss(this->actor.shape.rot.y + randAngle); - randSin = Math_Sins(this->actor.shape.rot.y + randAngle); + randAngle = Rand_ZeroOne() * 0x2000; + randCos = Math_CosS(this->actor.shape.rot.y + randAngle); + randSin = Math_SinS(this->actor.shape.rot.y + randAngle); pos.x -= randCos * 6.0f; pos.z += randSin * 6.0f; velocity.x = -randCos * 3.5f; velocity.y = this->bombSmokeEnvColor.r * 0.02f; velocity.z = randSin * 3.5f; - accel.x = ((Math_Rand_ZeroOne() * 0.1f) + 0.15f) * randCos; - accel.z = ((Math_Rand_ZeroOne() * 0.1f) + 0.15f) * -randSin; + accel.x = ((Rand_ZeroOne() * 0.1f) + 0.15f) * randCos; + accel.z = ((Rand_ZeroOne() * 0.1f) + 0.15f) * -randSin; func_8002836C(globalCtx, &pos, &velocity, &accel, &this->bombSmokePrimColor, &this->bombSmokeEnvColor, 100, 25, 20); - randAngle = Math_Rand_ZeroOne() * 0x2000; - randCos = Math_Coss(this->actor.shape.rot.y + randAngle); - randSin = Math_Sins(this->actor.shape.rot.y + randAngle); + randAngle = Rand_ZeroOne() * 0x2000; + randCos = Math_CosS(this->actor.shape.rot.y + randAngle); + randSin = Math_SinS(this->actor.shape.rot.y + randAngle); pos.x = this->headPos.x + (randCos * 6.0f); pos.z = this->headPos.z - (randSin * 6.0f); velocity.x = randCos * 3.5f; velocity.y = this->bombSmokeEnvColor.r * 0.02f; velocity.z = -randSin * 3.5f; - accel.x = ((Math_Rand_ZeroOne() * 0.1f) + 0.15f) * -randCos; - accel.z = ((Math_Rand_ZeroOne() * 0.1f) + 0.15f) * randSin; + accel.x = ((Rand_ZeroOne() * 0.1f) + 0.15f) * -randCos; + accel.z = ((Rand_ZeroOne() * 0.1f) + 0.15f) * randSin; func_8002836C(globalCtx, &pos, &velocity, &accel, &this->bombSmokePrimColor, &this->bombSmokeEnvColor, 100, 25, 20); } @@ -247,7 +247,7 @@ void EnDodongo_Destroy(Actor* thisx, GlobalContext* globalCtx) { void EnDodongo_SetupIdle(EnDodongo* this) { SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_06004C20, -4.0f); this->actor.speedXZ = 0.0f; - this->timer = Math_Rand_S16Offset(30, 50); + this->timer = Rand_S16Offset(30, 50); this->actionState = DODONGO_IDLE; EnDodongo_SetupAction(this, EnDodongo_Idle); } @@ -257,7 +257,7 @@ void EnDodongo_SetupWalk(EnDodongo* this) { SkelAnime_ChangeAnim(&this->skelAnime, &D_06008B1C, 0.0f, 0.0f, frames, 0, -4.0f); this->actor.speedXZ = 1.5f; - this->timer = Math_Rand_S16Offset(50, 70); + this->timer = Rand_S16Offset(50, 70); this->rightFootStep = true; this->actionState = DODONGO_WALK; EnDodongo_SetupAction(this, EnDodongo_Walk); @@ -306,7 +306,7 @@ void EnDodongo_Idle(EnDodongo* this, GlobalContext* globalCtx) { void EnDodongo_EndBreatheFire(EnDodongo* this, GlobalContext* globalCtx) { if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { EnDodongo_SetupIdle(this); - this->timer = Math_Rand_S16Offset(10, 20); + this->timer = Rand_S16Offset(10, 20); } } @@ -373,9 +373,9 @@ void EnDodongo_SwallowBomb(EnDodongo* this, GlobalContext* globalCtx) { this->skelAnime.animCurrentFrame++; if (this->timer == 10) { for (i = 10; i >= 0; i--) { - deathFireVel.x = Math_Rand_CenteredFloat(10.0f); - deathFireVel.y = Math_Rand_CenteredFloat(10.0f); - deathFireVel.z = Math_Rand_CenteredFloat(10.0f); + deathFireVel.x = Rand_CenteredFloat(10.0f); + deathFireVel.y = Rand_CenteredFloat(10.0f); + deathFireVel.z = Rand_CenteredFloat(10.0f); deathFireAccel.x = deathFireVel.x * -0.1f; deathFireAccel.y = deathFireVel.y * -0.1f; deathFireAccel.z = deathFireVel.z * -0.1f; @@ -396,16 +396,16 @@ void EnDodongo_SwallowBomb(EnDodongo* this, GlobalContext* globalCtx) { } else { pos = this->headPos; func_8002829C(globalCtx, &pos, &smokeVel, &smokeAccel, &white, &white, 50, 5); - pos.x -= (Math_Coss(this->actor.shape.rot.y) * 6.0f); - pos.z += (Math_Sins(this->actor.shape.rot.y) * 6.0f); + pos.x -= (Math_CosS(this->actor.shape.rot.y) * 6.0f); + pos.z += (Math_SinS(this->actor.shape.rot.y) * 6.0f); func_8002829C(globalCtx, &pos, &smokeVel, &smokeAccel, &white, &white, 50, 5); - pos.x = this->headPos.x + (Math_Coss(this->actor.shape.rot.y) * 6.0f); - pos.z = this->headPos.z - (Math_Sins(this->actor.shape.rot.y) * 6.0f); + pos.x = this->headPos.x + (Math_CosS(this->actor.shape.rot.y) * 6.0f); + pos.z = this->headPos.z - (Math_SinS(this->actor.shape.rot.y) * 6.0f); func_8002829C(globalCtx, &pos, &smokeVel, &smokeAccel, &white, &white, 50, 5); } } - this->bodyScale.y = this->bodyScale.z = (Math_Sins(this->actor.dmgEffectTimer * 0x1000) * 0.5f) + 1.0f; - this->bodyScale.x = Math_Sins(this->actor.dmgEffectTimer * 0x1000) + 1.0f; + this->bodyScale.y = this->bodyScale.z = (Math_SinS(this->actor.dmgEffectTimer * 0x1000) * 0.5f) + 1.0f; + this->bodyScale.x = Math_SinS(this->actor.dmgEffectTimer * 0x1000) + 1.0f; SkelAnime_FrameUpdateMatrix(&this->skelAnime); if (this->timer == 0) { @@ -421,7 +421,7 @@ void EnDodongo_Walk(EnDodongo* this, GlobalContext* globalCtx) { yawDiff = ABS(yawDiff); - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 1.5f, 0.1f, 1.0f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 1.5f, 0.1f, 1.0f, 0.0f); playbackSpeed = this->actor.speedXZ * 0.75f; if (this->actor.speedXZ >= 0.0f) { @@ -451,7 +451,7 @@ void EnDodongo_Walk(EnDodongo* this, GlobalContext* globalCtx) { } if (Math_Vec3f_DistXZ(&this->actor.initPosRot.pos, &player->actor.posRot.pos) < 400.0f) { - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 1, 0x1F4, 0); + Math_SmoothStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 1, 0x1F4, 0); this->actor.flags |= 1; if ((this->actor.xzDistFromLink < 100.0f) && (yawDiff < 0x1388) && (this->actor.yDistFromLink < 60.0f)) { EnDodongo_SetupBreatheFire(this); @@ -462,16 +462,16 @@ void EnDodongo_Walk(EnDodongo* this, GlobalContext* globalCtx) { (this->retreatTimer != 0)) { s16 yawToHome = Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->actor.initPosRot.pos); - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, yawToHome, 1, 0x1F4, 0); + Math_SmoothStepToS(&this->actor.posRot.rot.y, yawToHome, 1, 0x1F4, 0); } if (this->retreatTimer != 0) { this->retreatTimer--; } this->timer--; if (this->timer == 0) { - if (Math_Rand_ZeroOne() > 0.7f) { - this->timer = Math_Rand_S16Offset(50, 70); - this->retreatTimer = Math_Rand_S16Offset(15, 40); + if (Rand_ZeroOne() > 0.7f) { + this->timer = Rand_S16Offset(50, 70); + this->retreatTimer = Rand_S16Offset(15, 40); } else { EnDodongo_SetupIdle(this); } @@ -503,7 +503,7 @@ void EnDodongo_SweepTail(EnDodongo* this, GlobalContext* globalCtx) { this->sphElements[2].body.toucher.damage = 0; this->sphElements[1].body.toucher.damage = 0; EnDodongo_SetupBreatheFire(this); - this->timer = Math_Rand_S16Offset(5, 10); + this->timer = Rand_S16Offset(5, 10); } else { s16 yawDiff2 = this->actor.yawTowardsLink - this->actor.shape.rot.y; AnimationHeader* animation; @@ -637,7 +637,7 @@ void EnDodongo_UpdateQuad(EnDodongo* this, GlobalContext* globalCtx) { s32 b = 1; // These indices are needed to match. s32 c = 2; // Might be a way to quickly test vertex arrangements s32 d = 3; - f32 xMod = func_800CA720((this->skelAnime.animCurrentFrame - 28.0f) * 0.08f) * 5500.0f; + f32 xMod = Math_SinF((this->skelAnime.animCurrentFrame - 28.0f) * 0.08f) * 5500.0f; sp7C.x -= xMod; sp94.x -= xMod; @@ -680,9 +680,9 @@ void EnDodongo_Update(Actor* thisx, GlobalContext* globalCtx) { CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->colliderAT.base); } } - this->actor.posRot2.pos.x = this->actor.posRot.pos.x + Math_Sins(this->actor.shape.rot.y) * -30.0f; + this->actor.posRot2.pos.x = this->actor.posRot.pos.x + Math_SinS(this->actor.shape.rot.y) * -30.0f; this->actor.posRot2.pos.y = this->actor.posRot.pos.y + 20.0f; - this->actor.posRot2.pos.z = this->actor.posRot.pos.z + Math_Coss(this->actor.shape.rot.y) * -30.0f; + this->actor.posRot2.pos.z = this->actor.posRot.pos.z + Math_CosS(this->actor.shape.rot.y) * -30.0f; } s32 EnDodongo_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, @@ -825,8 +825,8 @@ void EnDodongo_Draw(Actor* thisx, GlobalContext* globalCtx2) { } void EnDodongo_ShiftVecRadial(s16 yaw, f32 radius, Vec3f* vec) { - vec->x += Math_Sins(yaw) * radius; - vec->z += Math_Coss(yaw) * radius; + vec->x += Math_SinS(yaw) * radius; + vec->z += Math_CosS(yaw) * radius; } s32 EnDodongo_AteBomb(EnDodongo* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index 4479c420c7..84b21f5aa3 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -211,7 +211,7 @@ s32 EnDog_Orient(EnDog* this, GlobalContext* globalCtx) { f32 waypointDistSq; waypointDistSq = Path_OrientAndGetDistSq(&this->actor, this->path, this->waypoint, &targetYaw); - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, targetYaw, 10, 1000, 1); + Math_SmoothStepToS(&this->actor.posRot.rot.y, targetYaw, 10, 1000, 1); if ((waypointDistSq > 0.0f) && (waypointDistSq < 1000.0f)) { return EnDog_UpdateWaypoint(this, globalCtx); @@ -298,7 +298,7 @@ void EnDog_FollowPath(EnDog* this, GlobalContext* globalCtx) { } else { speed = 4.0f; } - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, speed, 0.4f, 1.0f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, speed, 0.4f, 1.0f, 0.0f); EnDog_Orient(this, globalCtx); this->actor.shape.rot = this->actor.posRot.rot; @@ -315,7 +315,7 @@ void EnDog_FollowPath(EnDog* this, GlobalContext* globalCtx) { frame = globalCtx->state.frames % 3; this->nextBehavior = behaviors[frame]; // no clue why they're using the behavior id to calculate timer. possibly meant to use the unused array? - this->behaviorTimer = Math_Rand_S16Offset(60, behaviors[frame]); + this->behaviorTimer = Rand_S16Offset(60, behaviors[frame]); this->actionFunc = EnDog_ChooseMovement; } } @@ -326,7 +326,7 @@ void EnDog_ChooseMovement(EnDog* this, GlobalContext* globalCtx) { } if (DECR(this->behaviorTimer) == 0) { - this->behaviorTimer = Math_Rand_S16Offset(200, 100); + this->behaviorTimer = Rand_S16Offset(200, 100); if (globalCtx->state.frames % 2) { this->nextBehavior = DOG_WALK; } else { @@ -338,7 +338,7 @@ void EnDog_ChooseMovement(EnDog* this, GlobalContext* globalCtx) { } this->actionFunc = EnDog_FollowPath; } - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 0.4f, 1.0f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 0.4f, 1.0f, 0.0f); } void EnDog_FollowLink(EnDog* this, GlobalContext* globalCtx) { @@ -370,18 +370,18 @@ void EnDog_FollowLink(EnDog* this, GlobalContext* globalCtx) { speed = 1.0f; } - Math_SmoothScaleMaxF(&this->actor.speedXZ, speed, 0.6f, 1.0f); + Math_ApproachF(&this->actor.speedXZ, speed, 0.6f, 1.0f); if (!(this->actor.xzDistFromLink > 400.0f)) { - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 10, 1000, 1); + Math_SmoothStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 10, 1000, 1); this->actor.shape.rot = this->actor.posRot.rot; } } void EnDog_RunAway(EnDog* this, GlobalContext* globalCtx) { if (this->actor.xzDistFromLink < 200.0f) { - Math_SmoothScaleMaxF(&this->actor.speedXZ, 4.0f, 0.6f, 1.0f); - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, (this->actor.yawTowardsLink ^ 0x8000), 10, 1000, 1); + Math_ApproachF(&this->actor.speedXZ, 4.0f, 0.6f, 1.0f); + Math_SmoothStepToS(&this->actor.posRot.rot.y, (this->actor.yawTowardsLink ^ 0x8000), 10, 1000, 1); } else { this->actionFunc = EnDog_FaceLink; } @@ -397,11 +397,11 @@ void EnDog_FaceLink(EnDog* this, GlobalContext* globalCtx) { if (200.0f <= this->actor.xzDistFromLink) { this->nextBehavior = DOG_WALK; - Math_SmoothScaleMaxF(&this->actor.speedXZ, 1.0f, 0.6f, 1.0f); + Math_ApproachF(&this->actor.speedXZ, 1.0f, 0.6f, 1.0f); rotTowardLink = this->actor.yawTowardsLink; prevRotY = this->actor.posRot.rot.y; - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, rotTowardLink, 10, 1000, 1); + Math_SmoothStepToS(&this->actor.posRot.rot.y, rotTowardLink, 10, 1000, 1); absAngleDiff = this->actor.posRot.rot.y; absAngleDiff -= prevRotY; diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c index 6aaa0f425e..d350c10940 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -117,8 +117,8 @@ void EnDoor_Init(Actor* thisx, GlobalContext* globalCtx2) { if (this->actor.params & 0x40) { EnDoor* other; - xOffset = Math_Coss(this->actor.shape.rot.y) * 30.0f; - zOffset = Math_Sins(this->actor.shape.rot.y) * 30.0f; + xOffset = Math_CosS(this->actor.shape.rot.y) * 30.0f; + zOffset = Math_SinS(this->actor.shape.rot.y) * 30.0f; other = (EnDoor*)Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_DOOR, this->actor.posRot.pos.x + xOffset, this->actor.posRot.pos.y, this->actor.posRot.pos.z - zOffset, 0, this->actor.shape.rot.y + 0x8000, 0, @@ -249,13 +249,13 @@ void EnDoor_AjarWait(EnDoor* this, GlobalContext* globalCtx) { void EnDoor_AjarOpen(EnDoor* this, GlobalContext* globalCtx) { if (this->actor.xzDistFromLink < DOOR_AJAR_SLAM_RANGE) { this->actionFunc = EnDoor_AjarClose; - } else if (Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, -0x1800, 0x100)) { + } else if (Math_ScaledStepToS(&this->actor.posRot.rot.y, -0x1800, 0x100)) { this->actionFunc = EnDoor_AjarWait; } } void EnDoor_AjarClose(EnDoor* this, GlobalContext* globalCtx) { - if (Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, 0, 0x700)) { + if (Math_ScaledStepToS(&this->actor.posRot.rot.y, 0, 0x700)) { this->actionFunc = EnDoor_Idle; } } @@ -275,7 +275,7 @@ void EnDoor_Open(EnDoor* this, GlobalContext* globalCtx) { ? NA_SE_EV_IRON_DOOR_OPEN : NA_SE_OC_DOOR_OPEN); if (this->skelAnime.animPlaybackSpeed < 1.5f) { - numEffects = (s32)(Math_Rand_ZeroOne() * 30.0f) + 50; + numEffects = (s32)(Rand_ZeroOne() * 30.0f) + 50; for (i = 0; i < numEffects; i++) { EffectSsBubble_Spawn(globalCtx, &this->actor.posRot.pos, 60.0f, 100.0f, 50.0f, 0.15f); } diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/src/overlays/actors/ovl_En_Ds/z_en_ds.c index 20839299d9..659449d493 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.c +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.c @@ -113,7 +113,7 @@ void EnDs_BrewOddPotion3(EnDs* this, GlobalContext* globalCtx) { func_8010B720(globalCtx, 0x504D); } - Math_ApproxF(&this->unk_1E4, 0, 0.03f); + Math_StepToF(&this->unk_1E4, 0, 0.03f); func_800773A8(globalCtx, this->unk_1E4 * (2.0f - this->unk_1E4), 0.0f, 0.1f, 1.0f); } @@ -135,7 +135,7 @@ void EnDs_BrewOddPotion1(EnDs* this, GlobalContext* globalCtx) { this->brewTimer = 20; } - Math_ApproxF(&this->unk_1E4, 1.0f, 0.01f); + Math_StepToF(&this->unk_1E4, 1.0f, 0.01f); func_800773A8(globalCtx, this->unk_1E4 * (2.0f - this->unk_1E4), 0.0f, 0.1f, 1.0f); } @@ -247,10 +247,10 @@ void EnDs_Update(Actor* thisx, GlobalContext* globalCtx) { if (this->unk_1E8 & 1) { func_80038290(globalCtx, this, &this->unk_1D8, &this->unk_1DE, this->actor.posRot2.pos); } else { - Math_SmoothScaleMaxMinS(&this->unk_1D8.x, 0, 6, 0x1838, 100); - Math_SmoothScaleMaxMinS(&this->unk_1D8.y, 0, 6, 0x1838, 100); - Math_SmoothScaleMaxMinS(&this->unk_1DE.x, 0, 6, 0x1838, 100); - Math_SmoothScaleMaxMinS(&this->unk_1DE.y, 0, 6, 0x1838, 100); + Math_SmoothStepToS(&this->unk_1D8.x, 0, 6, 0x1838, 100); + Math_SmoothStepToS(&this->unk_1D8.y, 0, 6, 0x1838, 100); + Math_SmoothStepToS(&this->unk_1DE.x, 0, 6, 0x1838, 100); + Math_SmoothStepToS(&this->unk_1DE.y, 0, 6, 0x1838, 100); } } diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c index bee8d6bc9c..df5ddb68a6 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c @@ -55,7 +55,7 @@ void EnDyExtra_Init(Actor* thisx, GlobalContext* globalCtx) { } void func_809FF7AC(EnDyExtra* this, GlobalContext* globalCtx) { - Math_SmoothScaleMaxF(&this->actor.gravity, 0.0f, 0.1f, 0.005f); + Math_ApproachF(&this->actor.gravity, 0.0f, 0.1f, 0.005f); if (this->actor.posRot.pos.y < -55.0f) { this->actor.velocity.y = 0.0f; } @@ -66,12 +66,12 @@ void func_809FF7AC(EnDyExtra* this, GlobalContext* globalCtx) { } void func_809FF840(EnDyExtra* this, GlobalContext* globalCtx) { - Math_SmoothScaleMaxF(&this->actor.gravity, 0.0f, 0.1f, 0.005f); + Math_ApproachF(&this->actor.gravity, 0.0f, 0.1f, 0.005f); if (this->unk_154 == 0 || this->unk_158 < 0.02f) { Actor_Kill(&this->actor); return; } - Math_SmoothDownscaleMaxF(&this->unk_158, 0.03f, 0.05f); + Math_ApproachZeroF(&this->unk_158, 0.03f, 0.05f); if (this->actor.posRot.pos.y < -55.0f) { this->actor.velocity.y = 0.0f; } diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c index 240c1695d2..3a9c2810f5 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -226,8 +226,8 @@ void func_80A01FE0(EnElf* this, GlobalContext* globalCtx) { } else { this->unk_2A8 = 1; this->unk_2AC = 0x80; - this->unk_2B8 = Math_Rand_ZeroFloat(1.0f) + 0.5f; - this->unk_2B0 = Math_Rand_CenteredFloat(32767.0f); + this->unk_2B8 = Rand_ZeroFloat(1.0f) + 0.5f; + this->unk_2B0 = Rand_CenteredFloat(32767.0f); this->func_2C8 = func_80A0214C; } } @@ -241,8 +241,8 @@ void func_80A020A4(EnElf* this, GlobalContext* globalCtx) { } else { this->unk_2A8 = 1; this->unk_2AC = 0x80; - this->unk_2B8 = Math_Rand_ZeroFloat(1.0f) + 0.5f; - this->unk_2B0 = Math_Rand_CenteredFloat(32767.0f); + this->unk_2B8 = Rand_ZeroFloat(1.0f) + 0.5f; + this->unk_2B0 = Rand_CenteredFloat(32767.0f); this->func_2C8 = func_80A0214C; } } @@ -256,13 +256,13 @@ void func_80A0214C(EnElf* this, GlobalContext* globalCtx) { } else { xzDistFromLink = this->actor.xzDistFromLink; if (xzDistFromLink < 50.0f) { - if (Math_Rand_ZeroOne() < 0.2f) { + if (Rand_ZeroOne() < 0.2f) { this->unk_2A8 = 2; this->unk_2AC = 0x400; this->unk_2B8 = 2.0f; this->func_2C8 = func_80A020A4; this->actor.speedXZ = 1.5f; - this->unk_2C0 = (s16)Math_Rand_ZeroFloat(8.0f) + 4; + this->unk_2C0 = (s16)Rand_ZeroFloat(8.0f) + 4; } else { this->unk_2C0 = 10; } @@ -273,23 +273,23 @@ void func_80A0214C(EnElf* this, GlobalContext* globalCtx) { xzDistFromLink = ((xzDistFromLink - 50.0f) * 0.95f) + 0.05f; - if (Math_Rand_ZeroOne() < xzDistFromLink) { + if (Rand_ZeroOne() < xzDistFromLink) { this->unk_2A8 = 3; this->unk_2AC = 0x200; this->unk_2B8 = (xzDistFromLink * 2.0f) + 1.0f; this->func_2C8 = func_80A01FE0; - this->unk_2C0 = (s16)Math_Rand_ZeroFloat(16.0f) + 0x10; + this->unk_2C0 = (s16)Rand_ZeroFloat(16.0f) + 0x10; } else { this->unk_2C0 = 10; } } } - if (Math_Rand_ZeroOne() < 0.1f) { + if (Rand_ZeroOne() < 0.1f) { this->unk_2A8 = 1; this->unk_2AC = 0x80; - this->unk_2B8 = Math_Rand_ZeroFloat(0.5f) + 0.5f; - this->unk_2B0 = Math_Rand_CenteredFloat(32767.0f); + this->unk_2B8 = Rand_ZeroFloat(0.5f) + 0.5f; + this->unk_2B0 = Rand_CenteredFloat(32767.0f); } } @@ -307,9 +307,9 @@ void func_80A0232C(EnElf* this, GlobalContext* globalCtx) { f32 EnElf_GetColorValue(s32 colorFlag) { switch (colorFlag) { case 1: - return Math_Rand_ZeroFloat(55.0f) + 200.0f; + return Rand_ZeroFloat(55.0f) + 200.0f; case 2: - return Math_Rand_ZeroFloat(255.0f); + return Rand_ZeroFloat(255.0f); default: return 0.0f; } @@ -383,18 +383,18 @@ void EnElf_Init(Actor* thisx, GlobalContext* globalCtx) { case FAIRY_HEAL: colorConfig = -1; EnElf_SetupAction(this, func_80A0329C); - this->unk_2B4 = Math_Rand_ZeroFloat(10.0f) + 10.0f; + this->unk_2B4 = Rand_ZeroFloat(10.0f) + 10.0f; this->unk_2AA = 0; - this->unk_2AE = (s16)(Math_Rand_ZeroFloat(1048.0f)) + 0x200; + this->unk_2AE = (s16)(Rand_ZeroFloat(1048.0f)) + 0x200; this->unk_28C = thisx->posRot.pos; - this->unk_2BC = Math_Rand_CenteredFloat(32767.0f); + this->unk_2BC = Rand_CenteredFloat(32767.0f); this->func_2C8 = func_80A0214C; func_80A0232C(this, globalCtx); this->unk_2C0 = 0; this->disappearTimer = 240; break; case FAIRY_KOKIRI: - colorConfig = Math_Rand_ZeroFloat(11.99f) + 1.0f; + colorConfig = Rand_ZeroFloat(11.99f) + 1.0f; EnElf_SetupAction(this, func_80A0353C); func_80A01C38(this, 0); break; @@ -444,9 +444,9 @@ void EnElf_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void func_80A02A20(EnElf* this, GlobalContext* globalCtx) { - this->unk_28C.x = Math_Sins(this->unk_2AC) * this->unk_2B8; - this->unk_28C.y = Math_Sins(this->unk_2AA) * this->unk_2B4; - this->unk_28C.z = Math_Coss(this->unk_2AC) * this->unk_2B8; + this->unk_28C.x = Math_SinS(this->unk_2AC) * this->unk_2B8; + this->unk_28C.y = Math_SinS(this->unk_2AA) * this->unk_2B4; + this->unk_28C.z = Math_CosS(this->unk_2AC) * this->unk_2B8; this->unk_2AC += this->unk_2B0; this->unk_2AA += this->unk_2AE; } @@ -454,11 +454,11 @@ void func_80A02A20(EnElf* this, GlobalContext* globalCtx) { void func_80A02AA4(EnElf* this, GlobalContext* globalCtx) { f32 xzScale; - xzScale = (Math_Coss(this->unk_2AA) * this->unk_2B4) + this->unk_2B8; + xzScale = (Math_CosS(this->unk_2AA) * this->unk_2B4) + this->unk_2B8; - this->unk_28C.x = Math_Sins(this->unk_2AC) * xzScale; + this->unk_28C.x = Math_SinS(this->unk_2AC) * xzScale; this->unk_28C.y = 0.0f; - this->unk_28C.z = Math_Coss(this->unk_2AC) * xzScale; + this->unk_28C.z = Math_CosS(this->unk_2AC) * xzScale; this->unk_2AC += this->unk_2B0; this->unk_2AA += this->unk_2AE; @@ -468,10 +468,10 @@ void func_80A02B38(EnElf* this, GlobalContext* globalCtx) { Player* player = PLAYER; this->unk_2AA = (this->unk_2AC * 2) & 0xFFFF; - this->unk_28C.x = Math_Sins(this->unk_2AC) * this->unk_2B8; - this->unk_28C.y = Math_Sins(this->unk_2AA) * this->unk_2B4; - this->unk_28C.z = -Math_Sins(player->actor.shape.rot.y) * this->unk_28C.x; - this->unk_28C.x = Math_Coss(player->actor.shape.rot.y) * this->unk_28C.x; + this->unk_28C.x = Math_SinS(this->unk_2AC) * this->unk_2B8; + this->unk_28C.y = Math_SinS(this->unk_2AA) * this->unk_2B4; + this->unk_28C.z = -Math_SinS(player->actor.shape.rot.y) * this->unk_28C.x; + this->unk_28C.x = Math_CosS(player->actor.shape.rot.y) * this->unk_28C.x; this->unk_2AC += this->unk_2B0; } @@ -483,7 +483,7 @@ void func_80A02BD8(EnElf* this, Vec3f* targetPos, f32 arg2) { yVelDirection = (yVelTarget >= 0.0f) ? 1.0f : -1.0f; yVelTarget = fabsf(yVelTarget); yVelTarget = CLAMP(yVelTarget, 0.0f, 20.0f) * yVelDirection; - Math_ApproxF(&this->actor.velocity.y, yVelTarget, 32.0f); + Math_StepToF(&this->actor.velocity.y, yVelTarget, 32.0f); } void func_80A02C98(EnElf* this, Vec3f* targetPos, f32 arg2) { @@ -505,8 +505,8 @@ void func_80A02C98(EnElf* this, Vec3f* targetPos, f32 arg2) { zVelTarget = CLAMP(zVelTarget, 0.0f, 20.0f) * zVelDirection; func_80A02BD8(this, targetPos, arg2); - Math_ApproxF(&this->actor.velocity.x, xVelTarget, 1.5f); - Math_ApproxF(&this->actor.velocity.z, zVelTarget, 1.5f); + Math_StepToF(&this->actor.velocity.x, xVelTarget, 1.5f); + Math_StepToF(&this->actor.velocity.z, zVelTarget, 1.5f); func_8002D7EC(&this->actor); } @@ -531,12 +531,12 @@ void func_80A02F2C(EnElf* this, Vec3f* targetPos) { f32 yVelTarget; f32 yVelDirection; - yVelTarget = (((Math_Sins(this->unk_2AA) * this->unk_2B4) + targetPos->y) - this->actor.posRot.pos.y) * 0.2f; + yVelTarget = (((Math_SinS(this->unk_2AA) * this->unk_2B4) + targetPos->y) - this->actor.posRot.pos.y) * 0.2f; yVelDirection = (yVelTarget >= 0.0f) ? 1.0f : -1.0f; this->unk_2AA += this->unk_2AE; yVelTarget = fabsf(yVelTarget); yVelTarget = CLAMP(yVelTarget, 0.0f, 20.0f) * yVelDirection; - Math_ApproxF(&this->actor.velocity.y, yVelTarget, 1.5f); + Math_StepToF(&this->actor.velocity.y, yVelTarget, 1.5f); } void func_80A03018(EnElf* this, GlobalContext* globalCtx) { @@ -545,21 +545,21 @@ void func_80A03018(EnElf* this, GlobalContext* globalCtx) { s16 targetYaw; Vec3f* unk_28C = &this->unk_28C; - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, this->unk_2B8, 0.2f, 0.5f, 0.01f); + Math_SmoothStepToF(&this->actor.speedXZ, this->unk_2B8, 0.2f, 0.5f, 0.01f); switch (this->unk_2A8) { case 0: - targetYaw = atan2s(-(this->actor.posRot.pos.z - unk_28C->z), -(this->actor.posRot.pos.x - unk_28C->x)); + targetYaw = Math_Atan2S(-(this->actor.posRot.pos.z - unk_28C->z), -(this->actor.posRot.pos.x - unk_28C->x)); break; case 3: - targetYaw = atan2s(-(this->actor.posRot.pos.z - player->actor.posRot.pos.z), - -(this->actor.posRot.pos.x - player->actor.posRot.pos.x)); + targetYaw = Math_Atan2S(-(this->actor.posRot.pos.z - player->actor.posRot.pos.z), + -(this->actor.posRot.pos.x - player->actor.posRot.pos.x)); break; case 2: - targetYaw = atan2s(this->actor.posRot.pos.z - player->actor.posRot.pos.z, - this->actor.posRot.pos.x - player->actor.posRot.pos.x); + targetYaw = Math_Atan2S(this->actor.posRot.pos.z - player->actor.posRot.pos.z, + this->actor.posRot.pos.x - player->actor.posRot.pos.x); break; default: @@ -567,7 +567,7 @@ void func_80A03018(EnElf* this, GlobalContext* globalCtx) { break; } - Math_SmoothScaleMaxMinS(&this->unk_2BC, targetYaw, 10, this->unk_2AC, 0x20); + Math_SmoothStepToS(&this->unk_2BC, targetYaw, 10, this->unk_2AC, 0x20); this->actor.posRot.rot.y = this->unk_2BC; Actor_MoveForward(&this->actor); } @@ -595,8 +595,8 @@ void func_80A03148(EnElf* this, Vec3f* arg1, f32 arg2, f32 arg3, f32 arg4) { zVelTarget *= xzVelocity; } - Math_ApproxF(&this->actor.velocity.x, xVelTarget, 5.0f); - Math_ApproxF(&this->actor.velocity.z, zVelTarget, 5.0f); + Math_StepToF(&this->actor.velocity.x, xVelTarget, 5.0f); + Math_StepToF(&this->actor.velocity.z, zVelTarget, 5.0f); func_8002D7EC(&this->actor); } @@ -608,9 +608,9 @@ void func_80A0329C(EnElf* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); - if (Math_Rand_ZeroOne() < 0.05f) { - this->unk_2B4 = Math_Rand_ZeroFloat(10.0f) + 10.0f; - this->unk_2AE = (s16)(Math_Rand_ZeroFloat(1024.0f)) + 0x200; + if (Rand_ZeroOne() < 0.05f) { + this->unk_2B4 = Rand_ZeroFloat(10.0f) + 10.0f; + this->unk_2AE = (s16)(Rand_ZeroFloat(1024.0f)) + 0x200; } func_80A0232C(this, globalCtx); @@ -684,7 +684,7 @@ void func_80A0353C(EnElf* this, GlobalContext* globalCtx) { Actor_Kill(&this->actor); } - this->unk_2BC = atan2s(this->actor.velocity.z, this->actor.velocity.x); + this->unk_2BC = Math_Atan2S(this->actor.velocity.z, this->actor.velocity.x); } void func_80A03604(EnElf* this, GlobalContext* globalCtx) { @@ -694,9 +694,9 @@ void func_80A03610(EnElf* this, GlobalContext* globalCtx) { Player* player = PLAYER; SkelAnime_FrameUpdateMatrix(&this->skelAnime); - Math_SmoothScaleMaxMinF(&this->unk_2B8, 30.0f, 0.1f, 4.0f, 1.0f); + Math_SmoothStepToF(&this->unk_2B8, 30.0f, 0.1f, 4.0f, 1.0f); - this->unk_28C.x = Math_Coss(this->unk_2AC) * this->unk_2B8; + this->unk_28C.x = Math_CosS(this->unk_2AC) * this->unk_2B8; this->unk_28C.y = this->unk_28C.y + this->unk_2B4; switch (this->unk_2AA) { @@ -713,7 +713,7 @@ void func_80A03610(EnElf* this, GlobalContext* globalCtx) { } } - this->unk_28C.z = Math_Sins(this->unk_2AC) * -this->unk_2B8; + this->unk_28C.z = Math_SinS(this->unk_2AC) * -this->unk_2B8; this->unk_2AC += this->unk_2B0; func_80A02C98(this, &player->actor.posRot.pos, 0.2f); @@ -728,7 +728,7 @@ void func_80A03610(EnElf* this, GlobalContext* globalCtx) { return; } - this->unk_2BC = atan2s(this->actor.velocity.z, this->actor.velocity.x); + this->unk_2BC = Math_Atan2S(this->actor.velocity.z, this->actor.velocity.x); EnElf_SpawnSparkles(this, globalCtx, 32); Audio_PlayActorSound2(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG); } @@ -759,11 +759,11 @@ void func_80A03814(EnElf* this, GlobalContext* globalCtx) { } } - this->unk_28C.x = Math_Coss(this->unk_2AC) * this->unk_2B8; - this->unk_28C.z = Math_Sins(this->unk_2AC) * -this->unk_2B8; + this->unk_28C.x = Math_CosS(this->unk_2AC) * this->unk_2B8; + this->unk_28C.z = Math_SinS(this->unk_2AC) * -this->unk_2B8; this->unk_2AC += this->unk_2B0; func_80A02E30(this, &player->bodyPartsPos[0]); - this->unk_2BC = atan2s(this->actor.velocity.z, this->actor.velocity.x); + this->unk_2BC = Math_Atan2S(this->actor.velocity.z, this->actor.velocity.x); EnElf_SpawnSparkles(this, globalCtx, 32); Audio_PlayActorSound2(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG); } @@ -788,7 +788,7 @@ void func_80A03990(EnElf* this, GlobalContext* globalCtx) { func_80A02E30(this, &player->bodyPartsPos[0]); Actor_SetScale(&this->actor, (1.0f - (SQ(this->unk_2B4) * 0.012345679f)) * 0.008f); - this->unk_2BC = atan2s(this->actor.velocity.z, this->actor.velocity.x); + this->unk_2BC = Math_Atan2S(this->actor.velocity.z, this->actor.velocity.x); EnElf_SpawnSparkles(this, globalCtx, 32); Audio_PlayActorSound2(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG); } @@ -830,7 +830,7 @@ void EnElf_UpdateLights(EnElf* this, GlobalContext* globalCtx) { Lights_PointGlowSetInfo(&this->lightInfoGlow, this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 255, 255, 255, glowLightRadius); - this->unk_2BC = atan2s(this->actor.velocity.z, this->actor.velocity.x); + this->unk_2BC = Math_Atan2S(this->actor.velocity.z, this->actor.velocity.x); Actor_SetScale(&this->actor, this->actor.scale.x); } @@ -948,7 +948,7 @@ void func_80A03CF8(EnElf* this, GlobalContext* globalCtx) { } } else { if ((this->timer % 32) == 0) { - this->unk_2A0 = Math_Rand_ZeroFloat(7.0f) + 3.0f; + this->unk_2A0 = Rand_ZeroFloat(7.0f) + 3.0f; } if (this->fairyFlags & 2) { @@ -980,7 +980,7 @@ void func_80A03CF8(EnElf* this, GlobalContext* globalCtx) { } else if (this->unk_2A8 == 8) { this->actor.scale.x = 0.0f; } else { - Math_SmoothScaleMaxMinF(&this->actor.scale.x, 0.008f, 0.3f, 0.00080000004f, 0.000080000005f); + Math_SmoothStepToF(&this->actor.scale.x, 0.008f, 0.3f, 0.00080000004f, 0.000080000005f); } EnElf_UpdateLights(this, globalCtx); @@ -1021,7 +1021,7 @@ void func_80A04414(EnElf* this, GlobalContext* globalCtx) { this->unk_2C6 = 1; } } else if (this->unk_29C != 0.0f) { - if (Math_ApproxF(&this->unk_29C, 0.0f, 0.25f) != 0) { + if (Math_StepToF(&this->unk_29C, 0.0f, 0.25f) != 0) { this->innerColor = globalCtx->actorCtx.targetCtx.naviInner; this->outerColor = globalCtx->actorCtx.targetCtx.naviOuter; } else { @@ -1188,9 +1188,9 @@ void EnElf_SpawnSparkles(EnElf* this, GlobalContext* globalCtx, s32 sparkleLife) Color_RGBA8 primColor; Color_RGBA8 envColor; - sparklePos.x = Math_Rand_CenteredFloat(6.0f) + this->actor.posRot.pos.x; - sparklePos.y = (Math_Rand_ZeroOne() * 6.0f) + this->actor.posRot.pos.y; - sparklePos.z = Math_Rand_CenteredFloat(6.0f) + this->actor.posRot.pos.z; + sparklePos.x = Rand_CenteredFloat(6.0f) + this->actor.posRot.pos.x; + sparklePos.y = (Rand_ZeroOne() * 6.0f) + this->actor.posRot.pos.y; + sparklePos.z = Rand_CenteredFloat(6.0f) + this->actor.posRot.pos.z; primColor.r = this->innerColor.r; primColor.g = this->innerColor.g; @@ -1223,9 +1223,9 @@ void func_80A04DE4(EnElf* this, GlobalContext* globalCtx) { naviRefPos = globalCtx->actorCtx.targetCtx.naviRefPos; if ((player->unk_664 == NULL) || (&player->actor == player->unk_664) || (&this->actor == player->unk_664)) { - naviRefPos.x = player->bodyPartsPos[7].x + (Math_Sins(player->actor.shape.rot.y) * 20.0f); + naviRefPos.x = player->bodyPartsPos[7].x + (Math_SinS(player->actor.shape.rot.y) * 20.0f); naviRefPos.y = player->bodyPartsPos[7].y + 5.0f; - naviRefPos.z = player->bodyPartsPos[7].z + (Math_Coss(player->actor.shape.rot.y) * 20.0f); + naviRefPos.z = player->bodyPartsPos[7].z + (Math_CosS(player->actor.shape.rot.y) * 20.0f); } this->actor.posRot2.pos = naviRefPos; @@ -1241,7 +1241,7 @@ void func_80A04DE4(EnElf* this, GlobalContext* globalCtx) { EnElf_SpawnSparkles(this, globalCtx, 16); } - Math_SmoothScaleMaxMinF(&this->actor.scale.x, 0.008f, 0.3f, 0.00080000004f, 0.000080000005f); + Math_SmoothStepToF(&this->actor.scale.x, 0.008f, 0.3f, 0.00080000004f, 0.000080000005f); EnElf_UpdateLights(this, globalCtx); } @@ -1249,9 +1249,9 @@ void func_80A04DE4(EnElf* this, GlobalContext* globalCtx) { void func_80A04F94(EnElf* this, GlobalContext* globalCtx) { Player* player = PLAYER; - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->unk_2BC, 5, 0x1000, 0x400); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->unk_2BC, 5, 0x1000, 0x400); this->timer++; - Math_ApproxF(&this->unk_2A4, 1.0f, 0.05f); + Math_StepToF(&this->unk_2A4, 1.0f, 0.05f); func_800773A8(globalCtx, SQ(this->unk_2A4), player->actor.projectedPos.z + 780.0f, 0.2f, 0.5f); } @@ -1432,7 +1432,7 @@ void func_80A053F0(Actor* thisx, GlobalContext* globalCtx) { this->timer++; if (this->unk_2A4 > 0.0f) { - Math_ApproxF(&this->unk_2A4, 0.0f, 0.05f); + Math_StepToF(&this->unk_2A4, 0.0f, 0.05f); func_800773A8(globalCtx, SQ(this->unk_2A4) * this->unk_2A4, player->actor.projectedPos.z + 780.0f, 0.2f, 0.5f); } @@ -1471,7 +1471,7 @@ s32 EnElf_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, EnElf* this = THIS; if (limbIndex == 8) { - scale = ((Math_Sins(this->timer * 4096) * 0.1f) + 1.0f) * 0.012f; + scale = ((Math_SinS(this->timer * 4096) * 0.1f) + 1.0f) * 0.012f; if (this->fairyFlags & FAIRY_FLAG_BIG) { scale *= 2.0f; diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c index e1d73cb01f..81ea3b6712 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -128,9 +128,9 @@ void EnEncount1_SpawnLeevers(EnEncount1* this, GlobalContext* globalCtx) { spawnParams = LEEVER_BIG; } - spawnPos.x = player->actor.posRot.pos.x + Math_Sins(spawnAngle) * spawnDist; + spawnPos.x = player->actor.posRot.pos.x + Math_SinS(spawnAngle) * spawnDist; spawnPos.y = player->actor.groundY + 120.0f; - spawnPos.z = player->actor.posRot.pos.z + Math_Coss(spawnAngle) * spawnDist; + spawnPos.z = player->actor.posRot.pos.z + Math_CosS(spawnAngle) * spawnDist; floorY = func_8003C9A4(&globalCtx->colCtx, &floorPoly, &bgId, &this->actor, &spawnPos); if (floorY <= -32000.0f) { @@ -159,9 +159,9 @@ void EnEncount1_SpawnLeevers(EnEncount1* this, GlobalContext* globalCtx) { this->bigLeever = leever; } if (!this->reduceLeevers) { - this->maxCurSpawns = (s16)Math_Rand_ZeroFloat(3.99f) + 2; + this->maxCurSpawns = (s16)Rand_ZeroFloat(3.99f) + 2; } else { - this->maxCurSpawns = (s16)Math_Rand_ZeroFloat(2.99f) + 1; + this->maxCurSpawns = (s16)Rand_ZeroFloat(2.99f) + 1; } } else { // Cannot spawn! @@ -190,9 +190,9 @@ void EnEncount1_SpawnTektites(EnEncount1* this, GlobalContext* globalCtx) { } else { this->outOfRangeTimer = 0; if ((this->curNumSpawn < this->maxCurSpawns) && (this->totalNumSpawn < this->maxTotalSpawns)) { - spawnPos.x = this->actor.posRot.pos.x + Math_Rand_CenteredFloat(50.0f); + spawnPos.x = this->actor.posRot.pos.x + Rand_CenteredFloat(50.0f); spawnPos.y = this->actor.posRot.pos.y + 120.0f; - spawnPos.z = this->actor.posRot.pos.z + Math_Rand_CenteredFloat(50.0f); + spawnPos.z = this->actor.posRot.pos.z + Rand_CenteredFloat(50.0f); floorY = func_8003C9A4(&globalCtx->colCtx, &floorPoly, &bgId, &this->actor, &spawnPos); if (floorY <= -32000.0f) { return; @@ -256,17 +256,17 @@ void EnEncount1_SpawnStalchildOrWolfos(EnEncount1* this, GlobalContext* globalCt break; } - spawnDist = Math_Rand_CenteredFloat(40.0f) + 200.0f; + spawnDist = Rand_CenteredFloat(40.0f) + 200.0f; spawnAngle = player->actor.shape.rot.y; if (this->curNumSpawn != 0) { spawnAngle = -spawnAngle; - spawnDist = Math_Rand_CenteredFloat(40.0f) + 100.0f; + spawnDist = Rand_CenteredFloat(40.0f) + 100.0f; } spawnPos.x = - player->actor.posRot.pos.x + (Math_Sins(spawnAngle) * spawnDist) + Math_Rand_CenteredFloat(40.0f); + player->actor.posRot.pos.x + (Math_SinS(spawnAngle) * spawnDist) + Rand_CenteredFloat(40.0f); spawnPos.y = player->actor.groundY + 120.0f; spawnPos.z = - player->actor.posRot.pos.z + (Math_Coss(spawnAngle) * spawnDist) + Math_Rand_CenteredFloat(40.0f); + player->actor.posRot.pos.z + (Math_CosS(spawnAngle) * spawnDist) + Rand_CenteredFloat(40.0f); floorY = func_8003C9A4(&globalCtx->colCtx, &floorPoly, &bgId, &this->actor, &spawnPos); if (floorY <= -32000.0f) { break; diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index 07cacf94fb..1fb66929e9 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -74,7 +74,7 @@ void EnExRuppy_Init(Actor* thisx, GlobalContext* globalCtx) { } } - temp3 = Math_Rand_ZeroFloat(temp1); + temp3 = Rand_ZeroFloat(temp1); if ((temp3 >= 0) && (temp3 < 40)) { this->rupeeValue = 1; this->colorIdx = 0; @@ -117,7 +117,7 @@ void EnExRuppy_Init(Actor* thisx, GlobalContext* globalCtx) { this->colorIdx = 4; } else { Actor_SetScale(thisx, 0.02f); - this->colorIdx = (s16)Math_Rand_ZeroFloat(3.99f) + 1; + this->colorIdx = (s16)Rand_ZeroFloat(3.99f) + 1; } this->actor.gravity = -3.0f; // "Wow Coin" @@ -131,7 +131,7 @@ void EnExRuppy_Init(Actor* thisx, GlobalContext* globalCtx) { case 3: // Spawned by the guard in Hyrule courtyard Actor_SetScale(&this->actor, 0.02f); this->colorIdx = 0; - switch ((s16)Math_Rand_ZeroFloat(30.99f)) { + switch ((s16)Rand_ZeroFloat(30.99f)) { case 0: this->colorIdx = 2; break; @@ -193,14 +193,14 @@ void EnExRuppy_SpawnSparkles(EnExRuppy* this, GlobalContext* globalCtx, s16 numS for (i = 0; i < numSparkles; i++) { if (movementType == 1) { - accel.x = Math_Rand_CenteredFloat(20.0f); - accel.z = Math_Rand_CenteredFloat(20.0f); + accel.x = Rand_CenteredFloat(20.0f); + accel.z = Rand_CenteredFloat(20.0f); scale = 5000; life = 20; } - pos.x = (Math_Rand_ZeroOne() - 0.5f) * 10.0f + this->actor.posRot.pos.x; - pos.y = (Math_Rand_ZeroOne() - 0.5f) * 10.0f + (this->actor.posRot.pos.y + this->unk_160 * 600.0f); - pos.z = (Math_Rand_ZeroOne() - 0.5f) * 10.0f + this->actor.posRot.pos.z; + pos.x = (Rand_ZeroOne() - 0.5f) * 10.0f + this->actor.posRot.pos.x; + pos.y = (Rand_ZeroOne() - 0.5f) * 10.0f + (this->actor.posRot.pos.y + this->unk_160 * 600.0f); + pos.z = (Rand_ZeroOne() - 0.5f) * 10.0f + this->actor.posRot.pos.z; EffectSsKiraKira_SpawnDispersed(globalCtx, &pos, &velocity, &accel, &primColor, &envColor, scale, life); } } @@ -209,7 +209,7 @@ void EnExRuppy_DropIntoWater(EnExRuppy* this, GlobalContext* globalCtx) { EnDivingGame* divingGame; this->actor.shape.rot.y += 0x7A8; - Math_SmoothScaleMaxF(&this->actor.gravity, -2.0f, 0.3f, 1.0f); + Math_ApproachF(&this->actor.gravity, -2.0f, 0.3f, 1.0f); EnExRuppy_SpawnSparkles(this, globalCtx, 2, 0); func_80078884(NA_SE_EV_RAINBOW_SHOWER - SFX_FLAG); divingGame = (EnDivingGame*)this->actor.parent; @@ -230,15 +230,15 @@ void EnExRuppy_EnterWater(EnExRuppy* this, GlobalContext* globalCtx) { if ((divingGame != NULL) && (divingGame->actor.update != NULL) && (divingGame->unk_2A2 == 2)) { this->invisible = false; - this->actor.posRot.pos.x = ((Math_Rand_ZeroOne() - 0.5f) * 300.0f) + -260.0f; - this->actor.posRot.pos.y = ((Math_Rand_ZeroOne() - 0.5f) * 200.0f) + 370.0f; + this->actor.posRot.pos.x = ((Rand_ZeroOne() - 0.5f) * 300.0f) + -260.0f; + this->actor.posRot.pos.y = ((Rand_ZeroOne() - 0.5f) * 200.0f) + 370.0f; temp_f2 = this->unk_15A * -50.0f; if (!(gSaveContext.eventChkInf[3] & 0x100)) { temp_f2 += -500.0f; - this->actor.posRot.pos.z = ((Math_Rand_ZeroOne() - 0.5f) * 80.0f) + temp_f2; + this->actor.posRot.pos.z = ((Rand_ZeroOne() - 0.5f) * 80.0f) + temp_f2; } else { temp_f2 += -300.0f; - this->actor.posRot.pos.z = ((Math_Rand_ZeroOne() - 0.5f) * 60.0f) + temp_f2; + this->actor.posRot.pos.z = ((Rand_ZeroOne() - 0.5f) * 60.0f) + temp_f2; } this->actionFunc = EnExRuppy_Sink; this->actor.gravity = -1.0f; @@ -274,7 +274,7 @@ void EnExRuppy_WaitInGame(EnExRuppy* this, GlobalContext* globalCtx) { if (this->timer == 0) { this->timer = 10; - EffectSsBubble_Spawn(globalCtx, &this->actor.posRot.pos, 0.0f, 5.0f, 5.0f, Math_Rand_ZeroFloat(0.03f) + 0.07f); + EffectSsBubble_Spawn(globalCtx, &this->actor.posRot.pos, 0.0f, 5.0f, 5.0f, Rand_ZeroFloat(0.03f) + 0.07f); } if (this->actor.parent != NULL) { divingGame = (EnDivingGame*)this->actor.parent; @@ -358,9 +358,9 @@ void EnExRuppy_WaitAsCollectible(EnExRuppy* this, GlobalContext* globalCtx) { void EnExRuppy_GalleryTarget(EnExRuppy* this, GlobalContext* globalCtx) { if (this->galleryFlag) { - Math_SmoothScaleMaxF(&this->actor.shape.unk_08, 700.0f, 0.5f, 200.0f); + Math_ApproachF(&this->actor.shape.unk_08, 700.0f, 0.5f, 200.0f); } else { - Math_SmoothScaleMaxF(&this->actor.shape.unk_08, -700.0f, 0.5f, 200.0f); + Math_ApproachF(&this->actor.shape.unk_08, -700.0f, 0.5f, 200.0f); } } diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/src/overlays/actors/ovl_En_Fd/z_en_fd.c index 2d4ea5ec18..e45bd38c58 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -151,9 +151,9 @@ void EnFd_SpawnDot(EnFd* this, GlobalContext* globalCtx) { pos.x = this->actor.posRot.pos.x; pos.y = this->actor.groundY + 4.0f; pos.z = this->actor.posRot.pos.z; - accel.x = (Math_Rand_ZeroOne() - 0.5f) * 2.0f; - accel.y = ((Math_Rand_ZeroOne() - 0.5f) * 0.2f) + 0.3f; - accel.z = (Math_Rand_ZeroOne() - 0.5f) * 2.0f; + accel.x = (Rand_ZeroOne() - 0.5f) * 2.0f; + accel.y = ((Rand_ZeroOne() - 0.5f) * 0.2f) + 0.3f; + accel.z = (Rand_ZeroOne() - 0.5f) * 2.0f; EnFd_AddEffect(this, FD_EFFECT_FLAME, &pos, &velocity, &accel, 8, 0.6f, 0.2f); } } @@ -296,8 +296,8 @@ Vec3f* EnFd_GetPosAdjAroundCircle(Vec3f* dst, EnFd* this, f32 radius, s16 dir) { Vec3f newPos; angle = Math_Vec3f_Yaw(&this->actor.initPosRot.pos, &this->actor.posRot.pos) + (dir * 0x1554); // ~30 degrees - newPos.x = (Math_Sins(angle) * radius) + this->actor.initPosRot.pos.x; - newPos.z = (Math_Coss(angle) * radius) + this->actor.initPosRot.pos.z; + newPos.x = (Math_SinS(angle) * radius) + this->actor.initPosRot.pos.x; + newPos.z = (Math_CosS(angle) * radius) + this->actor.initPosRot.pos.z; newPos.x -= this->actor.posRot.pos.x; newPos.z -= this->actor.posRot.pos.z; *dst = newPos; @@ -327,7 +327,7 @@ s32 EnFd_ShouldStopRunning(EnFd* this, GlobalContext* globalCtx, f32 radius, s16 return false; } - if (Math_Rand_ZeroOne() > 0.5f) { + if (Rand_ZeroOne() > 0.5f) { *runDir = -*runDir; } return true; @@ -335,7 +335,7 @@ s32 EnFd_ShouldStopRunning(EnFd* this, GlobalContext* globalCtx, f32 radius, s16 void EnFd_Fade(EnFd* this, GlobalContext* globalCtx) { if (this->invincibilityTimer != 0) { - Math_SmoothScaleMaxMinF(&this->fadeAlpha, 0.0f, 0.3f, 10.0f, 0.0f); + Math_SmoothStepToF(&this->fadeAlpha, 0.0f, 0.3f, 10.0f, 0.0f); this->actor.shape.unk_14 = this->fadeAlpha; if (!(this->fadeAlpha >= 0.9f)) { this->invincibilityTimer = 0; @@ -360,7 +360,7 @@ void EnFd_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_SetScale(&this->actor, 0.01f); this->firstUpdateFlag = true; this->actor.gravity = -1.0f; - this->runDir = Math_Rand_ZeroOne() < 0.5f ? -1 : 1; + this->runDir = Rand_ZeroOne() < 0.5f ? -1 : 1; this->actor.naviEnemyId = 0x22; this->actionFunc = EnFd_Reappear; } @@ -412,12 +412,12 @@ void EnFd_JumpToGround(EnFd* this, GlobalContext* globalCtx) { void EnFd_Land(EnFd* this, GlobalContext* globalCtx) { Vec3f adjPos; - Math_SmoothScaleMaxMinF(&this->skelAnime.animPlaybackSpeed, 1.0f, 0.1f, 1.0f, 0.0f); + Math_SmoothStepToF(&this->skelAnime.animPlaybackSpeed, 1.0f, 0.1f, 1.0f, 0.0f); if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) { - this->spinTimer = Math_Rand_S16Offset(60, 90); + this->spinTimer = Rand_S16Offset(60, 90); this->runRadius = Math_Vec3f_DistXYZ(&this->actor.posRot.pos, &this->actor.initPosRot.pos); EnFd_GetPosAdjAroundCircle(&adjPos, this, this->runRadius, this->runDir); - this->actor.posRot.rot.y = Math_atan2f(adjPos.x, adjPos.z) * (0x8000 / M_PI); + this->actor.posRot.rot.y = Math_FAtan2F(adjPos.x, adjPos.z) * (0x8000 / M_PI); func_80034EC0(&this->skelAnime, sAnimations, 4); this->actionFunc = EnFd_SpinAndSpawnFire; } @@ -452,7 +452,7 @@ void EnFd_SpinAndSpawnFire(EnFd* this, GlobalContext* globalCtx) { rotSpeed = 0.0f; tgtSpeed = fabsf(deceleration); deceleration /= tgtSpeed; - Math_SmoothScaleMaxF(&rotSpeed, tgtSpeed, 0.6f, 0x2000); + Math_ApproachF(&rotSpeed, tgtSpeed, 0.6f, 0x2000); rotSpeed *= deceleration; this->actor.shape.rot.y += (s16)rotSpeed; rotSpeed = fabsf(rotSpeed); @@ -465,7 +465,7 @@ void EnFd_SpinAndSpawnFire(EnFd* this, GlobalContext* globalCtx) { this->initYawToInitPos = Math_Vec3f_Yaw(&this->actor.initPosRot.pos, &this->actor.posRot.pos); this->curYawToInitPos = this->runDir < 0 ? 0xFFFF : 0; this->circlesToComplete = (globalCtx->state.frames & 7) + 2; - this->spinTimer = Math_Rand_S16Offset(30, 120); + this->spinTimer = Rand_S16Offset(30, 120); func_80034EC0(&this->skelAnime, sAnimations, 3); this->actionFunc = EnFd_Run; } @@ -516,16 +516,16 @@ void EnFd_Run(EnFd* this, GlobalContext* globalCtx) { } else { runRadiusTarget = 200.0f; } - Math_SmoothScaleMaxMinF(&this->runRadius, runRadiusTarget, 0.3f, 100.0f, 0.0f); + Math_SmoothStepToF(&this->runRadius, runRadiusTarget, 0.3f, 100.0f, 0.0f); EnFd_GetPosAdjAroundCircle(&adjPos, this, this->runRadius, this->runDir); - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, Math_atan2f(adjPos.x, adjPos.z) * (0x8000 / M_PI), 4, 0xFA0, 1); + Math_SmoothStepToS(&this->actor.shape.rot.y, Math_FAtan2F(adjPos.x, adjPos.z) * (0x8000 / M_PI), 4, 0xFA0, 1); this->actor.posRot.rot = this->actor.shape.rot; func_8002F974(&this->actor, NA_SE_EN_FLAME_RUN - SFX_FLAG); if (this->skelAnime.animCurrentFrame == 6.0f || this->skelAnime.animCurrentFrame == 13.0f || this->skelAnime.animCurrentFrame == 28.0f) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_FLAME_KICK); } - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 8.0f, 0.1f, 1.0f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 8.0f, 0.1f, 1.0f, 0.0f); } /** @@ -633,12 +633,12 @@ void EnFd_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec if ((globalCtx->state.frames % 2) != 0) { for (i = 0; i < 1; i++) { Matrix_MultVec3f(&initialPos, &pos); - pos.x += (Math_Rand_ZeroOne() - 0.5f) * 20.0f; - pos.y += (Math_Rand_ZeroOne() - 0.5f) * 40.0f; - pos.z += (Math_Rand_ZeroOne() - 0.5f) * 20.0f; - accel.x = (Math_Rand_ZeroOne() - 0.5f) * 0.4f; - accel.y = ((Math_Rand_ZeroOne() - 0.5f) * 0.2f) + 0.6f; - accel.z = (Math_Rand_ZeroOne() - 0.5f) * 0.4f; + pos.x += (Rand_ZeroOne() - 0.5f) * 20.0f; + pos.y += (Rand_ZeroOne() - 0.5f) * 40.0f; + pos.z += (Rand_ZeroOne() - 0.5f) * 20.0f; + accel.x = (Rand_ZeroOne() - 0.5f) * 0.4f; + accel.y = ((Rand_ZeroOne() - 0.5f) * 0.2f) + 0.6f; + accel.z = (Rand_ZeroOne() - 0.5f) * 0.4f; EnFd_AddEffect(this, FD_EFFECT_DOT, &pos, &velocity, &accel, 0, 0.006f, 0.0f); } } @@ -710,7 +710,7 @@ void EnFd_AddEffect(EnFd* this, u8 type, Vec3f* pos, Vec3f* velocity, Vec3f* acc eff->velocity = *velocity; if (eff->type == FD_EFFECT_DOT) { eff->color.a = 255; - eff->timer = (s16)(Math_Rand_ZeroOne() * 10.0f); + eff->timer = (s16)(Rand_ZeroOne() * 10.0f); } return; } @@ -726,8 +726,8 @@ void EnFd_UpdateFlames(EnFd* this) { if (eff->timer == 0) { eff->type = FD_EFFECT_NONE; } - eff->accel.x = (Math_Rand_ZeroOne() * 0.4f) - 0.2f; - eff->accel.z = (Math_Rand_ZeroOne() * 0.4f) - 0.2f; + eff->accel.x = (Rand_ZeroOne() * 0.4f) - 0.2f; + eff->accel.z = (Rand_ZeroOne() * 0.4f) - 0.2f; eff->pos.x += eff->velocity.x; eff->pos.y += eff->velocity.y; eff->pos.z += eff->velocity.z; diff --git a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c index f8be2cae99..8561ae6823 100644 --- a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c +++ b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c @@ -93,7 +93,7 @@ void EnFdFire_Init(Actor* thisx, GlobalContext* globalCtx) { this->actor.velocity.y = 12.0f; this->spawnRadius = Math_Vec3f_DistXYZ(&this->actor.posRot.pos, &player->actor.posRot.pos); this->scale = 3.0f; - this->tile2Y = (s16)Math_Rand_ZeroFloat(5.0f) - 25; + this->tile2Y = (s16)Rand_ZeroFloat(5.0f) - 25; this->actionFunc = func_80A0E70C; } @@ -107,8 +107,8 @@ void func_80A0E70C(EnFdFire* this, GlobalContext* globalCtx) { Vec3f velocity = { 0.0f, 0.0f, 0.0f }; Vec3f targetPos = this->actor.parent->posRot.pos; - targetPos.x += this->spawnRadius * Math_Sins(this->actor.posRot.rot.y); - targetPos.z += this->spawnRadius * Math_Coss(this->actor.posRot.rot.y); + targetPos.x += this->spawnRadius * Math_SinS(this->actor.posRot.rot.y); + targetPos.z += this->spawnRadius * Math_CosS(this->actor.posRot.rot.y); EnFdFire_UpdatePos(this, &targetPos); if (this->actor.bgCheckFlags & 1 && (!(this->actor.velocity.y > 0.0f))) { this->actor.velocity = velocity; @@ -146,8 +146,8 @@ void EnFdFire_DanceTowardsPlayer(EnFdFire* this, GlobalContext* globalCtx) { if (DECR(this->deathTimer) == 0) { this->actionFunc = EnFdFire_Disappear; } else { - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, Math_Vec3f_Yaw(&this->actor.posRot.pos, &pos), 8, 0xFA0, 1); - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 0.4f, 1.0f, 0.0f); + Math_SmoothStepToS(&this->actor.posRot.rot.y, Math_Vec3f_Yaw(&this->actor.posRot.pos, &pos), 8, 0xFA0, 1); + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 0.4f, 1.0f, 0.0f); if (this->actor.speedXZ < 0.1f) { this->actor.speedXZ = 5.0f; } @@ -156,9 +156,9 @@ void EnFdFire_DanceTowardsPlayer(EnFdFire* this, GlobalContext* globalCtx) { } void EnFdFire_Disappear(EnFdFire* this, GlobalContext* globalCtx) { - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 0.6f, 9.0f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 0.6f, 9.0f, 0.0f); func_8002D868(&this->actor); - Math_SmoothScaleMaxMinF(&this->scale, 0.0f, 0.3f, 0.1f, 0.0f); + Math_SmoothStepToF(&this->scale, 0.0f, 0.3f, 0.1f, 0.0f); this->actor.shape.unk_10 = 20.0f; this->actor.shape.unk_10 *= (this->scale / 3.0f); if (!(this->scale > 0.01f)) { @@ -209,8 +209,8 @@ void EnFdFire_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Translate(this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, MTXMODE_NEW); sp8E = Math_Vec3f_Yaw(&scale, &this->actor.velocity) - Camera_GetCamDirYaw(ACTIVE_CAM); - sp84 = fabsf(Math_Coss(sp8E)); - sp88 = Math_Sins(sp8E); + sp84 = fabsf(Math_CosS(sp8E)); + sp88 = Math_SinS(sp8E); sp80 = Math_Vec3f_DistXZ(&scale, &this->actor.velocity) / 1.5f; if (1) {} if (1) {} diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c index 65eed47198..e809813ab1 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c @@ -137,9 +137,9 @@ void EnFhgFire_Init(Actor* thisx, GlobalContext* globalCtx) { tempf1 = player->actor.posRot.pos.x - thisx->posRot.pos.x; tempf2 = player->actor.posRot.pos.y + 30.0f - thisx->posRot.pos.y; tempf3 = player->actor.posRot.pos.z - thisx->posRot.pos.z; - thisx->posRot.rot.y = Math_atan2f(tempf1, tempf3) * 10430.378f; // 65536/(2*M_PI) + thisx->posRot.rot.y = Math_FAtan2F(tempf1, tempf3) * 10430.378f; // 65536/(2*M_PI) tempf0 = sqrtf(SQ(tempf1) + SQ(tempf3)); - thisx->posRot.rot.x = Math_atan2f(tempf2, tempf0) * 10430.378f; // 65536/(2*M_PI) + thisx->posRot.rot.x = Math_FAtan2F(tempf2, tempf0) * 10430.378f; // 65536/(2*M_PI) this->collider.dim.radius = 40; this->collider.dim.height = 50; this->collider.dim.yShift = -25; @@ -181,7 +181,7 @@ void func_80A0F6F8(EnFhgFire* this, GlobalContext* globalCtx) { case 0x0A: this->actor.shape.rot.y = Camera_GetInputDirYaw(camera) + ((*tmp & 0xFF) << 0x0F); - Math_SmoothScaleMaxF(&this->scale, 1.0f, 1.0f, 0.2f); + Math_ApproachF(&this->scale, 1.0f, 1.0f, 0.2f); if (this->unk_150.x == 0) { this->fireMode = 0x0B; @@ -196,13 +196,12 @@ void func_80A0F6F8(EnFhgFire* this, GlobalContext* globalCtx) { ballAccel = D_80A117BC; for (i = 0; i < 35; i++) { - ballVelocity.x = Math_Rand_CenteredFloat(30.f); - ballVelocity.y = Math_Rand_ZeroFloat(5.0f) + 3.0f; - ballVelocity.z = Math_Rand_CenteredFloat(30.f); + ballVelocity.x = Rand_CenteredFloat(30.f); + ballVelocity.y = Rand_ZeroFloat(5.0f) + 3.0f; + ballVelocity.z = Rand_CenteredFloat(30.f); ballAccel.y = -0.2f; EffectSsFhgFlash_SpawnLightBall(globalCtx, &this->actor.posRot.pos, &ballVelocity, &ballAccel, - (s16)(Math_Rand_ZeroOne() * 100.0f) + 240, - FHGFLASH_LIGHTBALL_GREEN); + (s16)(Rand_ZeroOne() * 100.0f) + 240, FHGFLASH_LIGHTBALL_GREEN); } func_80033E88(&this->actor, globalCtx, 4, 10); @@ -213,9 +212,9 @@ void func_80A0F6F8(EnFhgFire* this, GlobalContext* globalCtx) { case 0x0B: this->actor.shape.rot.y = Camera_GetInputDirYaw(camera) + ((*tmp & 0xFF) << 0x0F); - Math_SmoothScaleMaxF(&this->scale, 0.0f, 1.0f, 0.2f); + Math_ApproachF(&this->scale, 0.0f, 1.0f, 0.2f); if (this->unk_150.x == 0x1E) { - randY = (Math_Rand_ZeroOne() < 0.5f) ? 0x1000 : 0; + randY = (Rand_ZeroOne() < 0.5f) ? 0x1000 : 0; for (i = 0; i < 8; i++) { Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_FHG_FIRE, @@ -240,25 +239,25 @@ void func_80A0F6F8(EnFhgFire* this, GlobalContext* globalCtx) { void func_80A0FA90(EnFhgFire* this, GlobalContext* globalCtx) { osSyncPrintf("FF MOVE 1\n"); - this->actor.shape.rot.x += (s16)(Math_Rand_ZeroOne() * 4000.0f) + 0x4000; + this->actor.shape.rot.x += (s16)(Rand_ZeroOne() * 4000.0f) + 0x4000; switch (this->fireMode) { case 0: this->fireMode = 1; - this->unk_150.x = (s16)(Math_Rand_ZeroOne() * 7.0f) + 0x07; + this->unk_150.x = (s16)(Rand_ZeroOne() * 7.0f) + 0x07; case 1: - Math_SmoothScaleMaxF(&this->scale, 1.7f, 1.0f, 0.34f); + Math_ApproachF(&this->scale, 1.7f, 1.0f, 0.34f); if (this->unk_150.x == 0) { this->fireMode = 0x02; this->unk_150.x = 0x0A; - this->actor.posRot.pos.z += Math_Sins(this->actor.shape.rot.y) * -200.0f * this->scale; - this->actor.posRot.pos.x += Math_Coss(this->actor.shape.rot.y) * 200.0f * this->scale; + this->actor.posRot.pos.z += Math_SinS(this->actor.shape.rot.y) * -200.0f * this->scale; + this->actor.posRot.pos.x += Math_CosS(this->actor.shape.rot.y) * 200.0f * this->scale; this->actor.shape.rot.y += 0x8000; } break; case 2: - Math_SmoothDownscaleMaxF(&this->scale, 1.0f, 0.34f); + Math_ApproachZeroF(&this->scale, 1.0f, 0.34f); if (this->unk_150.x == 0) { Actor_Kill(&this->actor); } @@ -282,7 +281,7 @@ void func_80A0FC48(EnFhgFire* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_FANTOM_HIT_THUNDER); } - if (Math_Rand_ZeroOne() < 0.5f) { + if (Rand_ZeroOne() < 0.5f) { pos = this->actor.posRot.pos; pos.y -= 20.0f; EffectSsFhgFlash_SpawnShock(globalCtx, &this->actor, &pos, 200, FHGFLASH_SHOCK_NO_ACTOR); @@ -330,10 +329,10 @@ void func_80A0FD8C(EnFhgFire* this, GlobalContext* globalCtx) { } if (this->unk_150.x < 0x15) { - Math_SmoothDownscaleMaxF(&this->unk_160, 1.0f, 45.0f); - Math_SmoothDownscaleMaxF(&this->scale, 1.0f, 0.5f); + Math_ApproachZeroF(&this->unk_160, 1.0f, 45.0f); + Math_ApproachZeroF(&this->scale, 1.0f, 0.5f); } else { - Math_SmoothScaleMaxF(&this->scale, this->unk_18C, 0.5f, 3.0f); + Math_ApproachF(&this->scale, this->unk_18C, 0.5f, 3.0f); } Actor_SetScale(&this->actor, this->scale); @@ -351,9 +350,9 @@ void func_80A0FD8C(EnFhgFire* this, GlobalContext* globalCtx) { if (this->unk_1FE != 0) { this->unk_1FE--; this->unk_1FC = 1; - Math_SmoothScaleMaxF(&this->unk_200, 40.0f, 0.3f, 10.0f); + Math_ApproachF(&this->unk_200, 40.0f, 0.3f, 10.0f); } else { - Math_SmoothDownscaleMaxF(&this->unk_200, 1.0f, 5.0f); + Math_ApproachZeroF(&this->unk_200, 1.0f, 5.0f); if (this->unk_200 == 0.0f) { this->unk_1FC = 0; } @@ -381,7 +380,7 @@ void func_80A10008(EnFhgFire* this, GlobalContext* globalCtx) { } this->actor.posRot.pos = horse->unk_200; - this->actor.shape.rot.z += (s16)(Math_Rand_ZeroOne() * 20000.0f) + 0x4000; + this->actor.shape.rot.z += (s16)(Rand_ZeroOne() * 20000.0f) + 0x4000; osSyncPrintf("yari hikari 2\n"); if (this->fireMode == 0) { @@ -392,13 +391,13 @@ void func_80A10008(EnFhgFire* this, GlobalContext* globalCtx) { osSyncPrintf("FLASH !!\n"); for (i = 0; i < 2; i++) { - ballPos.x = Math_Rand_CenteredFloat(20.0f) + this->actor.posRot.pos.x; - ballPos.y = Math_Rand_CenteredFloat(20.0f) + this->actor.posRot.pos.y; - ballPos.z = Math_Rand_CenteredFloat(20.0f) + this->actor.posRot.pos.z; + ballPos.x = Rand_CenteredFloat(20.0f) + this->actor.posRot.pos.x; + ballPos.y = Rand_CenteredFloat(20.0f) + this->actor.posRot.pos.y; + ballPos.z = Rand_CenteredFloat(20.0f) + this->actor.posRot.pos.z; ballAccel.y = -0.08f; EffectSsFhgFlash_SpawnLightBall(globalCtx, &ballPos, &ballVelocity, &ballAccel, - (s16)(Math_Rand_ZeroOne() * 80.0f) + 150, FHGFLASH_LIGHTBALL_GREEN); + (s16)(Rand_ZeroOne() * 80.0f) + 150, FHGFLASH_LIGHTBALL_GREEN); } } @@ -437,12 +436,12 @@ void func_80A10F18(EnFhgFire* this, GlobalContext* globalCtx) { phi_f0 = -1.0f; } - Math_SmoothScaleMaxF(&this->unk_184, phi_f0, 1.0f, 0.04f); - Math_SmoothScaleMaxF(&this->unk_188, 255.0f, 1.0f, 10.2f); + Math_ApproachF(&this->unk_184, phi_f0, 1.0f, 0.04f); + Math_ApproachF(&this->unk_188, 255.0f, 1.0f, 10.2f); } else { if (this->unk_150.x < 0x1A) { - Math_SmoothDownscaleMaxF(&this->unk_184, 1.0f, 0.04f); - Math_SmoothDownscaleMaxF(&this->unk_188, 1.0f, 10.2f); + Math_ApproachZeroF(&this->unk_184, 1.0f, 0.04f); + Math_ApproachZeroF(&this->unk_188, 1.0f, 10.2f); } } diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index 354a54190c..629d698a85 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -115,7 +115,7 @@ void EnFirefly_Init(Actor* thisx, GlobalContext* globalCtx) { if (this->onFire) { this->actionFunc = EnFirefly_FlyIdle; - this->timer = Math_Rand_S16Offset(20, 60); + this->timer = Rand_S16Offset(20, 60); this->actor.shape.rot.x = 0x1554; this->auraType = KEESE_AURA_FIRE; this->actor.naviEnemyId = 0x11; // Fire Keese @@ -154,9 +154,9 @@ void EnFirefly_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void EnFirefly_SetupWait(EnFirefly* this) { - this->timer = Math_Rand_S16Offset(70, 100); - this->actor.speedXZ = (Math_Rand_ZeroOne() * 1.5f) + 1.5f; - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, func_8002DAC0(&this->actor, &this->actor.initPosRot.pos), 0x300); + this->timer = Rand_S16Offset(70, 100); + this->actor.speedXZ = (Rand_ZeroOne() * 1.5f) + 1.5f; + Math_ScaledStepToS(&this->actor.shape.rot.y, func_8002DAC0(&this->actor, &this->actor.initPosRot.pos), 0x300); this->targetPitch = ((this->maxAltitude < this->actor.posRot.pos.y) ? 0xC00 : -0xC00) + 0x1554; this->skelAnime.animPlaybackSpeed = 1.0f; this->actionFunc = EnFirefly_FlyIdle; @@ -187,7 +187,7 @@ void EnFirefly_SetupRebound(EnFirefly* this) { } void EnFirefly_SetupDiveAttack(EnFirefly* this) { - this->timer = Math_Rand_S16Offset(70, 100); + this->timer = Rand_S16Offset(70, 100); this->skelAnime.animPlaybackSpeed = 1.0f; this->targetPitch = ((this->actor.yDistFromLink > 0.0f) ? -0xC00 : 0xC00) + 0x1554; this->actionFunc = EnFirefly_DiveAttack; @@ -225,7 +225,7 @@ void EnFirefly_SetupFrozenFall(EnFirefly* this, GlobalContext* globalCtx) { iceParticlePos.y = (i & 2 ? 7.0f : -7.0f) + this->actor.posRot.pos.y; iceParticlePos.z = (i & 4 ? 7.0f : -7.0f) + this->actor.posRot.pos.z; EffectSsEnIce_SpawnFlyingVec3f(globalCtx, &this->actor, &iceParticlePos, 150, 150, 150, 250, 235, 245, 255, - (Math_Rand_ZeroOne() * 0.15f) + 0.85f); + (Rand_ZeroOne() * 0.15f) + 0.85f); } this->actionFunc = EnFirefly_FrozenFall; @@ -268,9 +268,9 @@ s32 EnFirefly_ReturnToPerch(EnFirefly* this, GlobalContext* globalCtx) { this->actor.speedXZ *= distFromHome; } - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, func_8002DAC0(&this->actor, &this->actor.initPosRot.pos), + Math_ScaledStepToS(&this->actor.shape.rot.y, func_8002DAC0(&this->actor, &this->actor.initPosRot.pos), 0x300); - Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, + Math_ScaledStepToS(&this->actor.shape.rot.x, func_8002DB28(&this->actor, &this->actor.initPosRot.pos) + 0x1554, 0x100); return 1; } @@ -308,9 +308,9 @@ s32 EnFirefly_SeekTorch(EnFirefly* this, GlobalContext* globalCtx) { EnFirefly_Ignite(this); return 1; } else { - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, func_8002DA78(&this->actor, &closestTorch->actor), + Math_ScaledStepToS(&this->actor.shape.rot.y, func_8002DA78(&this->actor, &closestTorch->actor), 0x300); - Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, func_8002DB28(&this->actor, &flamePos) + 0x1554, 0x100); + Math_ScaledStepToS(&this->actor.shape.rot.x, func_8002DB28(&this->actor, &flamePos) + 0x1554, 0x100); return 1; } } @@ -326,16 +326,16 @@ void EnFirefly_FlyIdle(EnFirefly* this, GlobalContext* globalCtx) { this->timer--; } skelanimeUpdated = func_800A56C8(&this->skelAnime, 0.0f); - this->actor.speedXZ = (Math_Rand_ZeroOne() * 1.5f) + 1.5f; + this->actor.speedXZ = (Rand_ZeroOne() * 1.5f) + 1.5f; if (this->onFire || (this->actor.params == KEESE_ICE_FLY) || ((EnFirefly_ReturnToPerch(this, globalCtx) == 0) && (EnFirefly_SeekTorch(this, globalCtx) == 0))) { if (skelanimeUpdated) { - rand = Math_Rand_ZeroOne(); + rand = Rand_ZeroOne(); if (rand < 0.5f) { - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, + Math_ScaledStepToS(&this->actor.shape.rot.y, func_8002DAC0(&this->actor, &this->actor.initPosRot.pos), 0x300); } else if (rand < 0.8f) { - this->actor.shape.rot.y += Math_Rand_CenteredFloat(1536.0f); + this->actor.shape.rot.y += Rand_CenteredFloat(1536.0f); } // Climb if too close to ground if (this->actor.posRot.pos.y < (this->actor.groundY + 20.0f)) { @@ -344,7 +344,7 @@ void EnFirefly_FlyIdle(EnFirefly* this, GlobalContext* globalCtx) { } else if (this->maxAltitude < this->actor.posRot.pos.y) { this->targetPitch = 0x2154; // Otherwise ascend or descend at random, biased towards ascending - } else if (0.35f < Math_Rand_ZeroOne()) { + } else if (0.35f < Rand_ZeroOne()) { this->targetPitch = 0x954; } else { this->targetPitch = 0x2154; @@ -356,10 +356,10 @@ void EnFirefly_FlyIdle(EnFirefly* this, GlobalContext* globalCtx) { this->targetPitch = 0x2154; } } - Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, this->targetPitch, 0x100); + Math_ScaledStepToS(&this->actor.shape.rot.x, this->targetPitch, 0x100); } if (this->actor.bgCheckFlags & 8) { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.wallPolyRot, 2, 0xC00, 0x300); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.wallPolyRot, 2, 0xC00, 0x300); } if ((this->timer == 0) && (this->actor.xzDistFromLink < 200.0f) && (Player_GetMask(globalCtx) != PLAYER_MASK_SKULL)) { @@ -374,11 +374,11 @@ void EnFirefly_Fall(EnFirefly* this, GlobalContext* globalCtx) { } this->actor.dmgEffectTimer = 40; SkelAnime_FrameUpdateMatrix(&this->skelAnime); - Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.5f); + Math_StepToF(&this->actor.speedXZ, 0.0f, 0.5f); if (this->actor.flags & 0x8000) { this->actor.dmgEffectTimer = 40; } else { - Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, 0x6800, 0x200); + Math_ScaledStepToS(&this->actor.shape.rot.x, 0x6800, 0x200); this->actor.shape.rot.y = this->actor.shape.rot.y - 0x300; if (this->timer != 0) { this->timer--; @@ -394,7 +394,7 @@ void EnFirefly_Die(EnFirefly* this, GlobalContext* globalCtx) { if (this->timer != 0) { this->timer--; } - Math_ApproxF(&this->actor.scale.x, 0.0f, 0.00034f); + Math_StepToF(&this->actor.scale.x, 0.0f, 0.00034f); this->actor.scale.y = this->actor.scale.z = this->actor.scale.x; if (this->timer == 0) { Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.posRot.pos, 0xE0); @@ -411,25 +411,25 @@ void EnFirefly_DiveAttack(EnFirefly* this, GlobalContext* globalCtx) { if (this->timer != 0) { this->timer--; } - Math_ApproxF(&this->actor.speedXZ, 4.0f, 0.5f); + Math_StepToF(&this->actor.speedXZ, 4.0f, 0.5f); if (this->actor.bgCheckFlags & 8) { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.wallPolyRot, 2, 0xC00, 0x300); - Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, this->targetPitch, 0x100); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.wallPolyRot, 2, 0xC00, 0x300); + Math_ScaledStepToS(&this->actor.shape.rot.x, this->targetPitch, 0x100); } else if (func_8002E084(&this->actor, 0x2800)) { if (func_800A56C8(&this->skelAnime, 4.0f)) { this->skelAnime.animPlaybackSpeed = 0.0f; this->skelAnime.animCurrentFrame = 4.0f; } - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 2, 0xC00, 0x300); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 2, 0xC00, 0x300); preyPos.x = player->actor.posRot.pos.x; preyPos.y = player->actor.posRot.pos.y + 20.0f; preyPos.z = player->actor.posRot.pos.z; - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, func_8002DB28(&this->actor, &preyPos) + 0x1554, 2, 0x400, + Math_SmoothStepToS(&this->actor.shape.rot.x, func_8002DB28(&this->actor, &preyPos) + 0x1554, 2, 0x400, 0x100); } else { this->skelAnime.animPlaybackSpeed = 1.5f; if (this->actor.xzDistFromLink > 80.0f) { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 2, 0xC00, 0x300); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 2, 0xC00, 0x300); } if (this->actor.bgCheckFlags & 1) { this->targetPitch = 0x954; @@ -439,7 +439,7 @@ void EnFirefly_DiveAttack(EnFirefly* this, GlobalContext* globalCtx) { } else { this->targetPitch = 0x954; } - Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, this->targetPitch, 0x100); + Math_ScaledStepToS(&this->actor.shape.rot.x, this->targetPitch, 0x100); } if ((this->timer == 0) || (Player_GetMask(globalCtx) == PLAYER_MASK_SKULL)) { EnFirefly_SetupFlyAway(this); @@ -449,9 +449,9 @@ void EnFirefly_DiveAttack(EnFirefly* this, GlobalContext* globalCtx) { // Knockback after hitting player void EnFirefly_Rebound(EnFirefly* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); - Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, 0, 0x100); - Math_ApproxF(&this->actor.velocity.y, 0.0f, 0.4f); - if (Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.15f)) { + Math_ScaledStepToS(&this->actor.shape.rot.x, 0, 0x100); + Math_StepToF(&this->actor.velocity.y, 0.0f, 0.4f); + if (Math_StepToF(&this->actor.speedXZ, 0.0f, 0.15f)) { if (this->timer != 0) { this->timer--; } @@ -472,7 +472,7 @@ void EnFirefly_FlyAway(EnFirefly* this, GlobalContext* globalCtx) { EnFirefly_SetupWait(this); return; } - Math_ApproxF(&this->actor.speedXZ, 3.0f, 0.3f); + Math_StepToF(&this->actor.speedXZ, 3.0f, 0.3f); if (this->actor.bgCheckFlags & 1) { this->targetPitch = 0x954; } else if ((this->actor.bgCheckFlags & 0x10) || (this->maxAltitude < this->actor.posRot.pos.y)) { @@ -481,18 +481,18 @@ void EnFirefly_FlyAway(EnFirefly* this, GlobalContext* globalCtx) { this->targetPitch = 0x954; } if (this->actor.bgCheckFlags & 8) { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.wallPolyRot, 2, 0xC00, 0x300); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.wallPolyRot, 2, 0xC00, 0x300); } else { - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, func_8002DAC0(&this->actor, &this->actor.initPosRot.pos), + Math_ScaledStepToS(&this->actor.shape.rot.y, func_8002DAC0(&this->actor, &this->actor.initPosRot.pos), 0x300); } - Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, this->targetPitch, 0x100); + Math_ScaledStepToS(&this->actor.shape.rot.x, this->targetPitch, 0x100); } void EnFirefly_Stunned(EnFirefly* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); - Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.5f); - Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, 0x1554, 0x100); + Math_StepToF(&this->actor.speedXZ, 0.0f, 0.5f); + Math_ScaledStepToS(&this->actor.shape.rot.x, 0x1554, 0x100); if (this->timer != 0) { this->timer--; } @@ -517,14 +517,14 @@ void EnFirefly_FrozenFall(EnFirefly* this, GlobalContext* globalCtx) { // When perching, sit on collision and flap at random intervals void EnFirefly_Perch(EnFirefly* this, GlobalContext* globalCtx) { - Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, 0, 0x100); + Math_ScaledStepToS(&this->actor.shape.rot.x, 0, 0x100); if (this->timer != 0) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); if (func_800A56C8(&this->skelAnime, 6.0f)) { this->timer--; } - } else if (Math_Rand_ZeroOne() < 0.02f) { + } else if (Rand_ZeroOne() < 0.02f) { this->timer = 1; } @@ -543,13 +543,13 @@ void EnFirefly_DisturbDiveAttack(EnFirefly* this, GlobalContext* globalCtx) { } if (this->timer < 40) { - Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, -0xAAC, 0x100); + Math_ScaledStepToS(&this->actor.shape.rot.x, -0xAAC, 0x100); } else { preyPos.x = player->actor.posRot.pos.x; preyPos.y = player->actor.posRot.pos.y + 20.0f; preyPos.z = player->actor.posRot.pos.z; - Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, func_8002DB28(&this->actor, &preyPos) + 0x1554, 0x100); - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0x300); + Math_ScaledStepToS(&this->actor.shape.rot.x, func_8002DB28(&this->actor, &preyPos) + 0x1554, 0x100); + Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0x300); } if (this->timer == 0) { @@ -663,10 +663,10 @@ void EnFirefly_Update(Actor* thisx, GlobalContext* globalCtx2) { CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); this->actor.posRot2.pos.x = - (10.0f * Math_Sins(this->actor.shape.rot.x) * Math_Sins(this->actor.shape.rot.y)) + this->actor.posRot.pos.x; - this->actor.posRot2.pos.y = (10.0f * Math_Coss(this->actor.shape.rot.x)) + this->actor.posRot.pos.y; + (10.0f * Math_SinS(this->actor.shape.rot.x) * Math_SinS(this->actor.shape.rot.y)) + this->actor.posRot.pos.x; + this->actor.posRot2.pos.y = (10.0f * Math_CosS(this->actor.shape.rot.x)) + this->actor.posRot.pos.y; this->actor.posRot2.pos.z = - (10.0f * Math_Sins(this->actor.shape.rot.x) * Math_Coss(this->actor.shape.rot.y)) + this->actor.posRot.pos.z; + (10.0f * Math_SinS(this->actor.shape.rot.x) * Math_CosS(this->actor.shape.rot.y)) + this->actor.posRot.pos.z; } s32 EnFirefly_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, @@ -705,18 +705,18 @@ void EnFirefly_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList if ((limbIndex == 15) || (limbIndex == 21)) { if (this->actionFunc != EnFirefly_Die) { Matrix_Get(&mtx); - effPos.x = (Math_Rand_ZeroOne() * 5.0f) + mtx.wx; - effPos.y = (Math_Rand_ZeroOne() * 5.0f) + mtx.wy; - effPos.z = (Math_Rand_ZeroOne() * 5.0f) + mtx.wz; + effPos.x = (Rand_ZeroOne() * 5.0f) + mtx.wx; + effPos.y = (Rand_ZeroOne() * 5.0f) + mtx.wy; + effPos.z = (Rand_ZeroOne() * 5.0f) + mtx.wz; effScaleStep = -40; effLife = 3; } else { if (limbIndex == 15) { - effPos.x = (Math_Sins(9100 * this->timer) * this->timer) + this->actor.posRot.pos.x; - effPos.z = (Math_Coss(9100 * this->timer) * this->timer) + this->actor.posRot.pos.z; + effPos.x = (Math_SinS(9100 * this->timer) * this->timer) + this->actor.posRot.pos.x; + effPos.z = (Math_CosS(9100 * this->timer) * this->timer) + this->actor.posRot.pos.z; } else { - effPos.x = this->actor.posRot.pos.x - (Math_Sins(9100 * this->timer) * this->timer); - effPos.z = this->actor.posRot.pos.z - (Math_Coss(9100 * this->timer) * this->timer); + effPos.x = this->actor.posRot.pos.x - (Math_SinS(9100 * this->timer) * this->timer); + effPos.z = this->actor.posRot.pos.z - (Math_CosS(9100 * this->timer) * this->timer); } effPos.y = this->actor.posRot.pos.y + ((15 - this->timer) * 1.5f); diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index a567371c5e..cd3b847c31 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -182,7 +182,7 @@ void EnFloormas_SetupBigWalk(EnFloormas* this) { this->skelAnime.animPlaybackSpeed = 1.5f; } - this->actionTimer = Math_Rand_S16Offset(2, 4); + this->actionTimer = Rand_S16Offset(2, 4); this->actionFunc = EnFloormas_BigWalk; this->actor.speedXZ = 1.5f; } @@ -327,8 +327,8 @@ void EnFloormas_SetupGrabLink(EnFloormas* this, Player* player) { xzDelta = -70.0f; } this->actor.posRot.pos.y = player->actor.posRot.pos.y + yDelta; - this->actor.posRot.pos.x = Math_Sins(this->actor.shape.rot.y) * (xzDelta * 0.1f) + player->actor.posRot.pos.x; - this->actor.posRot.pos.z = Math_Coss(this->actor.shape.rot.y) * (xzDelta * 0.1f) + player->actor.posRot.pos.z; + this->actor.posRot.pos.x = Math_SinS(this->actor.shape.rot.y) * (xzDelta * 0.1f) + player->actor.posRot.pos.x; + this->actor.posRot.pos.z = Math_CosS(this->actor.shape.rot.y) * (xzDelta * 0.1f) + player->actor.posRot.pos.z; this->actor.shape.rot.x = -0x4CE0; this->actionFunc = EnFloormas_GrabLink; } @@ -480,7 +480,7 @@ void EnFloormas_Run(EnFloormas* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_FALL_WALK); } - Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 3, 0x71C); + Math_ApproachS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 3, 0x71C); if ((this->actor.xzDistFromLink < 280.0f) && func_8002E084(&this->actor, 0x2000) && !(this->actor.bgCheckFlags & 8)) { @@ -510,13 +510,13 @@ void EnFloormas_Turn(EnFloormas* this, GlobalContext* globalCtx) { // Needed to match if (!this->skelAnime.animCurrentFrame) {} if (this->skelAnime.animCurrentFrame >= 7.0f && this->skelAnime.animCurrentFrame < 22.0f) { - sp30 = Math_Sins(this->actor.shape.rot.y + 0x4268); - sp2C = Math_Coss(this->actor.shape.rot.y + 0x4268); + sp30 = Math_SinS(this->actor.shape.rot.y + 0x4268); + sp2C = Math_CosS(this->actor.shape.rot.y + 0x4268); this->actor.shape.rot.y += this->actionTarget; this->actor.posRot.pos.x -= - (this->actor.scale.x * 2700.0f) * (Math_Sins(this->actor.shape.rot.y + 0x4268) - sp30); + (this->actor.scale.x * 2700.0f) * (Math_SinS(this->actor.shape.rot.y + 0x4268) - sp30); this->actor.posRot.pos.z -= - (this->actor.scale.x * 2700.0f) * (Math_Coss(this->actor.shape.rot.y + 0x4268) - sp2C); + (this->actor.scale.x * 2700.0f) * (Math_CosS(this->actor.shape.rot.y + 0x4268) - sp2C); } } @@ -526,8 +526,8 @@ void EnFloormas_Hover(EnFloormas* this, GlobalContext* globalCtx) { } this->actor.shape.rot.x += 0x140; this->actor.posRot.pos.y += 10.0f; - Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 3, 2730); - Math_ApproxS(&this->zOffset, 1200, 100); + Math_ApproachS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 3, 2730); + Math_StepToS(&this->zOffset, 1200, 100); } void EnFloormas_Slide(EnFloormas* this, GlobalContext* globalCtx) { @@ -540,13 +540,13 @@ void EnFloormas_Slide(EnFloormas* this, GlobalContext* globalCtx) { pos.y = this->actor.groundY; velocity.y = 2.0f; - velocity.x = Math_Sins(this->actor.shape.rot.y + 0x6000) * 7.0f; - velocity.z = Math_Coss(this->actor.shape.rot.y + 0x6000) * 7.0f; + velocity.x = Math_SinS(this->actor.shape.rot.y + 0x6000) * 7.0f; + velocity.z = Math_CosS(this->actor.shape.rot.y + 0x6000) * 7.0f; func_800286CC(globalCtx, &pos, &velocity, &accel, 450, 100); - velocity.x = Math_Sins(this->actor.shape.rot.y - 0x6000) * 7.0f; - velocity.z = Math_Coss(this->actor.shape.rot.y - 0x6000) * 7.0f; + velocity.x = Math_SinS(this->actor.shape.rot.y - 0x6000) * 7.0f; + velocity.z = Math_CosS(this->actor.shape.rot.y - 0x6000) * 7.0f; func_800286CC(globalCtx, &pos, &velocity, &accel, 450, 100); @@ -560,8 +560,8 @@ void EnFloormas_Charge(EnFloormas* this, GlobalContext* globalCtx) { this->actionTimer--; } - Math_ApproxF(&this->actor.speedXZ, 15.0f, SQ(this->actor.speedXZ) * (1.0f / 3.0f)); - Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, -0x1680, 0x140); + Math_StepToF(&this->actor.speedXZ, 15.0f, SQ(this->actor.speedXZ) * (1.0f / 3.0f)); + Math_ScaledStepToS(&this->actor.shape.rot.x, -0x1680, 0x140); distFromGround = this->actor.posRot.pos.y - this->actor.groundY; if (distFromGround < 10.0f) { @@ -601,7 +601,7 @@ void EnFloormas_Land(EnFloormas* this, GlobalContext* globalCtx) { } if (isOnGround) { - Math_ApproxF(&this->actor.speedXZ, 0.0f, 2.0f); + Math_StepToF(&this->actor.speedXZ, 0.0f, 2.0f); } if ((this->actor.speedXZ > 0.0f) && ((this->actor.posRot.pos.y - this->actor.groundY) < 12.0f)) { @@ -625,8 +625,8 @@ void EnFloormas_Land(EnFloormas* this, GlobalContext* globalCtx) { } } - Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, 0, 0x140); - Math_ApproxS(&this->zOffset, -1600, 100); + Math_ScaledStepToS(&this->actor.shape.rot.x, 0, 0x140); + Math_StepToS(&this->zOffset, -1600, 100); } void EnFloormas_Split(EnFloormas* this, GlobalContext* globalCtx) { @@ -636,7 +636,7 @@ void EnFloormas_Split(EnFloormas* this, GlobalContext* globalCtx) { this->smActionTimer = 50; EnFloormas_SetupStand(this); } - Math_ApproxF(&this->actor.speedXZ, 0.0f, 1.0f); + Math_StepToF(&this->actor.speedXZ, 0.0f, 1.0f); } if (this->actor.bgCheckFlags & 2) { @@ -658,7 +658,7 @@ void EnFloormas_SmWalk(EnFloormas* this, GlobalContext* globalCtx) { this->actionTarget = this->actor.wallPolyRot; EnFloormas_SetupTurn(this); } else if (this->actor.xzDistFromLink < 120.0f) { - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, this->actor.yawTowardsLink + 0x8000, 0x38E); + Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink + 0x8000, 0x38E); } } @@ -687,12 +687,12 @@ void EnFloormas_SmDecideAction(EnFloormas* this, GlobalContext* globalCtx) { return; } - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, func_8002DA78(&this->actor, primaryFloormas), 0x38E); + Math_ScaledStepToS(&this->actor.shape.rot.y, func_8002DA78(&this->actor, primaryFloormas), 0x38E); if (func_8002DB8C(&this->actor, primaryFloormas) < 80.0f) { EnFloormas_SetupSlaveJumpAtMaster(this); } } else { - Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 3, 0x71C); + Math_ApproachS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 3, 0x71C); if (this->actor.xzDistFromLink < 80.0f) { EnFloormas_SetupJumpAtLink(this); } @@ -700,7 +700,7 @@ void EnFloormas_SmDecideAction(EnFloormas* this, GlobalContext* globalCtx) { } void EnFloormas_SmShrink(EnFloormas* this, GlobalContext* globalCtx) { - if (Math_ApproxF(&this->actor.scale.x, 0.0f, 0.0015f)) { + if (Math_StepToF(&this->actor.scale.x, 0.0f, 0.0015f)) { EnFloormas_SetupSmWait(this); } this->actor.scale.z = this->actor.scale.x; @@ -712,7 +712,7 @@ void EnFloormas_JumpAtLink(EnFloormas* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); if (this->skelAnime.animCurrentFrame < 20.0f) { - Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 2, 0xE38); + Math_ApproachS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 2, 0xE38); } else if (func_800A56C8(&this->skelAnime, 20.0f)) { this->actor.speedXZ = 5.0f; this->actor.velocity.y = 7.0f; @@ -756,8 +756,8 @@ void EnFloormas_GrabLink(EnFloormas* this, GlobalContext* globalCtx) { } this->actor.posRot.pos.y = player->actor.posRot.pos.y + yDelta; - this->actor.posRot.pos.x = Math_Sins(this->actor.shape.rot.y) * (xzDelta * 0.1f) + player->actor.posRot.pos.x; - this->actor.posRot.pos.z = Math_Coss(this->actor.shape.rot.y) * (xzDelta * 0.1f) + player->actor.posRot.pos.z; + this->actor.posRot.pos.x = Math_SinS(this->actor.shape.rot.y) * (xzDelta * 0.1f) + player->actor.posRot.pos.x; + this->actor.posRot.pos.z = Math_CosS(this->actor.shape.rot.y) * (xzDelta * 0.1f) + player->actor.posRot.pos.z; // let go if (!(player->stateFlags2 & 0x80) || (player->invincibilityTimer < 0)) { @@ -811,7 +811,7 @@ void EnFloormas_SmSlaveJumpAtMaster(EnFloormas* this, GlobalContext* globalCtx) this->actor.speedXZ = 5.0f; this->actor.velocity.y = 7.0f; } else if (this->skelAnime.animCurrentFrame < 20.0f) { - Math_SmoothScaleMaxS(&this->actor.shape.rot.y, func_8002DA78(&this->actor, primFloormas), 2, 0xE38); + Math_ApproachS(&this->actor.shape.rot.y, func_8002DA78(&this->actor, primFloormas), 2, 0xE38); } else if ((((primFloormas->posRot.pos.y - this->actor.posRot.pos.y) < -10.0f) && (fabsf(this->actor.posRot.pos.x - primFloormas->posRot.pos.x) < 10.0f)) && (fabsf(this->actor.posRot.pos.z - primFloormas->posRot.pos.z) < 10.0f)) { @@ -825,7 +825,7 @@ void EnFloormas_SmSlaveJumpAtMaster(EnFloormas* this, GlobalContext* globalCtx) if (fabsf(this->actor.posRot.pos.x - primFloormas->posRot.pos.x) < 5.0f && fabsf(this->actor.posRot.pos.z - primFloormas->posRot.pos.z) < 5.0f) { - Math_ApproxF(&this->actor.speedXZ, 0, 2.0f); + Math_StepToF(&this->actor.speedXZ, 0, 2.0f); } } @@ -864,9 +864,9 @@ void EnFloormas_Merge(EnFloormas* this, GlobalContext* globalCtx) { prevScale = this->actor.scale.x; if (mergeCnt == 1) { - Math_ApproxF(&this->actor.scale.x, 0.007f, 0.0005f); + Math_StepToF(&this->actor.scale.x, 0.007f, 0.0005f); } else if (mergeCnt == 0) { - Math_ApproxF(&this->actor.scale.x, 0.01f, 0.0005f); + Math_StepToF(&this->actor.scale.x, 0.01f, 0.0005f); } curScale = this->actor.scale.x; @@ -919,7 +919,7 @@ void EnFloormas_TakeDamage(EnFloormas* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_GND); } } - Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.2f); + Math_StepToF(&this->actor.speedXZ, 0.0f, 0.2f); } void EnFloormas_Recover(EnFloormas* this, GlobalContext* globalCtx) { @@ -978,7 +978,7 @@ void EnFloormas_ColliderCheck(EnFloormas* this, GlobalContext* globalCtx) { } else { if (this->actor.colChkInfo.damageEffect == 2) { EffectSsFCircle_Spawn(globalCtx, &this->actor, &this->actor.posRot.pos, - this->actor.scale.x * 4000.f, this->actor.scale.x * 4000.f); + this->actor.scale.x * 4000.0f, this->actor.scale.x * 4000.0f); } EnFloormas_SetupTakeDamage(this); } diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index 44501b3204..117f8970b2 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -250,10 +250,10 @@ void EnFu_Update(Actor* thisx, GlobalContext* globalCtx) { } this->actionFunc(this, globalCtx); if ((this->behaviorFlags & FU_RESET_LOOK_ANGLE)) { - Math_SmoothScaleMaxMinS(&this->lookAngleOffset.x, 0, 6, 6200, 100); - Math_SmoothScaleMaxMinS(&this->lookAngleOffset.y, 0, 6, 6200, 100); - Math_SmoothScaleMaxMinS(&this->unk_2A2.x, 0, 6, 6200, 100); - Math_SmoothScaleMaxMinS(&this->unk_2A2.y, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->lookAngleOffset.x, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->lookAngleOffset.y, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->unk_2A2.x, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->unk_2A2.y, 0, 6, 6200, 100); this->behaviorFlags &= ~FU_RESET_LOOK_ANGLE; } else { func_80038290(globalCtx, &this->actor, &this->lookAngleOffset, &this->unk_2A2, this->actor.posRot2.pos); @@ -281,8 +281,8 @@ s32 EnFu_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, } if (limbIndex == 8) { - rot->y += (Math_Sins((globalCtx->state.frames * (limbIndex * 50 + 0x814))) * 200.0f); - rot->z += (Math_Coss((globalCtx->state.frames * (limbIndex * 50 + 0x940))) * 200.0f); + rot->y += (Math_SinS((globalCtx->state.frames * (limbIndex * 50 + 0x814))) * 200.0f); + rot->z += (Math_CosS((globalCtx->state.frames * (limbIndex * 50 + 0x940))) * 200.0f); } return 0; } diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.c b/src/overlays/actors/ovl_En_Fw/z_en_fw.c index 5abe5a4be7..f18be869f6 100644 --- a/src/overlays/actors/ovl_En_Fw/z_en_fw.c +++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.c @@ -107,8 +107,8 @@ Vec3f* EnFw_GetPosAdjAroundCircle(Vec3f* dst, EnFw* this, f32 radius, s16 dir) { // increase rotation around circle ~30 degrees. angle = Math_Vec3f_Yaw(&this->actor.parent->initPosRot.pos, &this->actor.posRot.pos) + (dir * 0x1554); - posAdj.x = (Math_Sins(angle) * radius) + this->actor.parent->initPosRot.pos.x; - posAdj.z = (Math_Coss(angle) * radius) + this->actor.parent->initPosRot.pos.z; + posAdj.x = (Math_SinS(angle) * radius) + this->actor.parent->initPosRot.pos.x; + posAdj.z = (Math_CosS(angle) * radius) + this->actor.parent->initPosRot.pos.z; posAdj.x -= this->actor.posRot.pos.x; posAdj.z -= this->actor.posRot.pos.z; *dst = posAdj; @@ -151,14 +151,14 @@ s32 EnFw_SpawnDust(EnFw* this, u8 timer, f32 scale, f32 scaleStep, s32 dustCnt, pos = this->actor.posRot.pos; pos.y = this->actor.groundY + 2.0f; - angle = ((Math_Rand_ZeroOne() - 0.5f) * 0x10000); + angle = ((Rand_ZeroOne() - 0.5f) * 0x10000); i = dustCnt; while (i >= 0) { - accel.x = (Math_Rand_ZeroOne() - 0.5f) * xzAccel; + accel.x = (Rand_ZeroOne() - 0.5f) * xzAccel; accel.y = yAccel; - accel.z = (Math_Rand_ZeroOne() - 0.5f) * xzAccel; - pos.x = (Math_Sins(angle) * radius) + this->actor.posRot.pos.x; - pos.z = (Math_Coss(angle) * radius) + this->actor.posRot.pos.z; + accel.z = (Rand_ZeroOne() - 0.5f) * xzAccel; + pos.x = (Math_SinS(angle) * radius) + this->actor.posRot.pos.x; + pos.z = (Math_CosS(angle) * radius) + this->actor.posRot.pos.z; EnFw_AddDust(this, &pos, &velocity, &accel, timer, scale, scaleStep); angle += (s16)(0x10000 / dustCnt); i--; @@ -189,7 +189,7 @@ void EnFw_Destroy(Actor* thisx, GlobalContext* globalCtx) { void EnFw_Bounce(EnFw* this, GlobalContext* globalCtx) { if (EnFw_DoBounce(this, 3, 8.0f) && this->bounceCnt == 0) { - this->returnToParentTimer = Math_Rand_S16Offset(300, 150); + this->returnToParentTimer = Rand_S16Offset(300, 150); this->actionFunc = EnFw_Run; } } @@ -201,7 +201,7 @@ void EnFw_Run(EnFw* this, GlobalContext* globalCtx) { EnBom* bomb; Actor* flareDancer; - Math_SmoothScaleMaxMinF(&this->skelAnime.animPlaybackSpeed, 1.0f, 0.1f, 1.0f, 0.0f); + Math_SmoothStepToF(&this->skelAnime.animPlaybackSpeed, 1.0f, 0.1f, 1.0f, 0.0f); if (this->skelAnime.animation == &D_06006CF8) { if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount) == 0) { this->runRadius = Math_Vec3f_DistXYZ(&this->actor.posRot.pos, &this->actor.parent->posRot.pos); @@ -226,7 +226,7 @@ void EnFw_Run(EnFw* this, GlobalContext* globalCtx) { if (this->explosionTimer != 0) { this->skelAnime.animPlaybackSpeed = 0.0f; - Math_SmoothScaleMaxMinF(&this->actor.scale.x, 0.024999999f, 0.08f, 0.6f, 0.0f); + Math_SmoothStepToF(&this->actor.scale.x, 0.024999999f, 0.08f, 0.6f, 0.0f); Actor_SetScale(&this->actor, this->actor.scale.x); if (this->actor.dmgEffectTimer == 0) { func_8003426C(&this->actor, 0x4000, 0xC8, 0, this->explosionTimer); @@ -260,13 +260,13 @@ void EnFw_Run(EnFw* this, GlobalContext* globalCtx) { } // Run outwards until the radius of the run circle is 200 - Math_SmoothScaleMaxMinF(&this->runRadius, 200.0f, 0.3f, 100.0f, 0.0f); + Math_SmoothStepToF(&this->runRadius, 200.0f, 0.3f, 100.0f, 0.0f); if (this->turnAround) { - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 0.1f, 1.0f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 0.1f, 1.0f, 0.0f); tmpAngle = (s16)(this->actor.posRot.rot.y ^ 0x8000); facingDir = this->actor.shape.rot.y; - tmpAngle = Math_SmoothScaleMaxMinF(&facingDir, tmpAngle, 0.1f, 10000.0f, 0.0f); + tmpAngle = Math_SmoothStepToF(&facingDir, tmpAngle, 0.1f, 10000.0f, 0.0f); this->actor.shape.rot.y = facingDir; if (tmpAngle > 0x1554) { return; @@ -275,7 +275,7 @@ void EnFw_Run(EnFw* this, GlobalContext* globalCtx) { } else { Vec3f sp48; EnFw_GetPosAdjAroundCircle(&sp48, this, this->runRadius, this->runDirection); - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, (Math_atan2f(sp48.x, sp48.z) * (0x8000 / M_PI)), 4, 0xFA0, + Math_SmoothStepToS(&this->actor.shape.rot.y, (Math_FAtan2F(sp48.x, sp48.z) * (0x8000 / M_PI)), 4, 0xFA0, 1); } @@ -292,16 +292,16 @@ void EnFw_Run(EnFw* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_FLAME_MAN_SLIDE); this->slideSfxTimer = 4; } - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 0.1f, 1.0f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 0.1f, 1.0f, 0.0f); this->skelAnime.animPlaybackSpeed = 0.0f; - EnFw_SpawnDust(this, 8, 0.16f, 0.2f, 3, 8.0f, 20.0f, ((Math_Rand_ZeroOne() - 0.5f) * 0.2f) + 0.3f); + EnFw_SpawnDust(this, 8, 0.16f, 0.2f, 3, 8.0f, 20.0f, ((Rand_ZeroOne() - 0.5f) * 0.2f) + 0.3f); this->slideTimer--; if (this->slideTimer == 0) { this->turnAround = true; this->runDirection = -this->runDirection; } } else { - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 6.0f, 0.1f, 1.0f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 6.0f, 0.1f, 1.0f, 0.0f); phi_v0 = this->skelAnime.animCurrentFrame; if (phi_v0 == 1 || phi_v0 == 4) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_FLAME_MAN_RUN); @@ -315,7 +315,7 @@ void EnFw_TurnToParentInitPos(EnFw* this, GlobalContext* globalCtx) { s16 angleToParentInit; angleToParentInit = Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->actor.parent->initPosRot.pos); - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, angleToParentInit, 4, 0xFA0, 1); + Math_SmoothStepToS(&this->actor.shape.rot.y, angleToParentInit, 4, 0xFA0, 1); if (ABS(angleToParentInit - this->actor.shape.rot.y) < 0x65) { // angle to parent init pos is ~0.5 degrees this->actor.posRot.rot = this->actor.shape.rot; @@ -332,8 +332,8 @@ void EnFw_JumpToParentInitPos(EnFw* this, GlobalContext* globalCtx) { this->actor.parent->params |= 0x8000; Actor_Kill(&this->actor); } else { - Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.x, this->actor.parent->initPosRot.pos.x, 0.6f, 8.0f, 0.0f); - Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.z, this->actor.parent->initPosRot.pos.z, 0.6f, 8.0f, 0.0f); + Math_SmoothStepToF(&this->actor.posRot.pos.x, this->actor.parent->initPosRot.pos.x, 0.6f, 8.0f, 0.0f); + Math_SmoothStepToF(&this->actor.posRot.pos.z, this->actor.parent->initPosRot.pos.z, 0.6f, 8.0f, 0.0f); } } @@ -414,8 +414,8 @@ void EnFw_UpdateDust(EnFw* this) { if ((--eff->timer) == 0) { eff->type = 0; } - eff->accel.x = (Math_Rand_ZeroOne() * 0.4f) - 0.2f; - eff->accel.z = (Math_Rand_ZeroOne() * 0.4f) - 0.2f; + eff->accel.x = (Rand_ZeroOne() * 0.4f) - 0.2f; + eff->accel.z = (Rand_ZeroOne() * 0.4f) - 0.2f; eff->pos.x += eff->velocity.x; eff->pos.y += eff->velocity.y; eff->pos.z += eff->velocity.z; diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c index 9109256a0f..96cbcf38e4 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c @@ -111,7 +111,7 @@ void EnGSwitch_Init(Actor* thisx, GlobalContext* globalCtx) { // Horseback archery destructible pot osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ やぶさめぶち抜き壷 ☆☆☆☆☆ \n" VT_RST); this->actor.gravity = -3.0f; - this->colorIdx = Math_Rand_ZeroFloat(2.99f); + this->colorIdx = Rand_ZeroFloat(2.99f); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); this->actor.scale.x = 0.25f; @@ -160,9 +160,9 @@ void EnGSwitch_Break(EnGSwitch* this, GlobalContext* globalCtx) { Vec3f velocity = { 0.0f, 0.0f, 0.0f }; s32 i; - randPos.x = this->actor.posRot.pos.x + Math_Rand_CenteredFloat(40.0f); - randPos.y = this->actor.posRot.pos.y + 30.0f + Math_Rand_CenteredFloat(35.0f); - randPos.z = this->actor.posRot.pos.z + Math_Rand_CenteredFloat(40.0f); + randPos.x = this->actor.posRot.pos.x + Rand_CenteredFloat(40.0f); + randPos.y = this->actor.posRot.pos.y + 30.0f + Rand_CenteredFloat(35.0f); + randPos.z = this->actor.posRot.pos.z + Rand_CenteredFloat(40.0f); hitPos.x = this->collider.body.bumper.unk_06.x; hitPos.y = this->collider.body.bumper.unk_06.y; hitPos.z = this->collider.body.bumper.unk_06.z; @@ -244,7 +244,7 @@ void EnGSwitch_SilverRupeeCollected(EnGSwitch* this, GlobalContext* globalCtx) { } this->actor.posRot.pos = player->actor.posRot.pos; this->actor.posRot.pos.y = - player->actor.posRot.pos.y + 40.0f + (this->killTimer * 0.3f) * Math_Sins(this->killTimer * 0x3A98); + player->actor.posRot.pos.y + 40.0f + (this->killTimer * 0.3f) * Math_SinS(this->killTimer * 0x3A98); if (LINK_IS_ADULT) { this->actor.posRot.pos.y += 20.0f; } @@ -294,8 +294,8 @@ void EnGSwitch_GalleryRupee(EnGSwitch* this, GlobalContext* globalCtx) { case MOVE_TARGET: if ((fabsf(this->actor.posRot.pos.x - this->targetPos.x) > 5.0f) || (fabsf(this->actor.posRot.pos.y - this->targetPos.y) > 5.0f)) { - Math_SmoothScaleMaxF(&this->actor.posRot.pos.x, this->targetPos.x, 0.3f, 30.0f); - Math_SmoothScaleMaxF(&this->actor.posRot.pos.y, this->targetPos.y, 0.3f, 30.0f); + Math_ApproachF(&this->actor.posRot.pos.x, this->targetPos.x, 0.3f, 30.0f); + Math_ApproachF(&this->actor.posRot.pos.y, this->targetPos.y, 0.3f, 30.0f); } else { this->moveState = MOVE_HOME; this->waitTimer = 60; @@ -305,9 +305,9 @@ void EnGSwitch_GalleryRupee(EnGSwitch* this, GlobalContext* globalCtx) { if (this->waitTimer == 0) { if ((fabsf(this->actor.posRot.pos.x - this->actor.initPosRot.pos.x) > 5.0f) || (fabsf(this->actor.posRot.pos.y - this->actor.initPosRot.pos.y) > 5.0f)) { - Math_SmoothScaleMaxF(&this->actor.posRot.pos.x, this->actor.initPosRot.pos.x, 0.3f, + Math_ApproachF(&this->actor.posRot.pos.x, this->actor.initPosRot.pos.x, 0.3f, 30.0f); - Math_SmoothScaleMaxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 0.3f, + Math_ApproachF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 0.3f, 30.0f); } else { gallery = ((EnSyatekiItm*)this->actor.parent); @@ -351,26 +351,26 @@ void EnGSwitch_ArcheryPot(EnGSwitch* this, GlobalContext* globalCtx) { for (i = 0, angle = 0; i < 30; i++, angle += 0x4E20) { Vec3f pos; Vec3f vel; - f32 sn = Math_Sins(angle); - f32 cs = Math_Coss(angle); + f32 sn = Math_SinS(angle); + f32 cs = Math_CosS(angle); f32 rand; s32 phi_s0; s32 scale; s32 pad; pos.x = sn * 8.0f; - pos.y = 10.0f + Math_Rand_CenteredFloat(5.0f); + pos.y = 10.0f + Rand_CenteredFloat(5.0f); pos.z = cs * 8.0f; vel.x = pos.x / 2.0f; - vel.y = 10.0f + Math_Rand_ZeroOne() * 15.0f; + vel.y = 10.0f + Rand_ZeroOne() * 15.0f; vel.z = pos.z / 2.0f; pos.x += thisPos->x; pos.y += thisPos->y; pos.z += thisPos->z; - rand = Math_Rand_ZeroOne(); + rand = Rand_ZeroOne(); if (rand < 0.2f) { phi_s0 = 0x60; } else if (rand < 0.6f) { @@ -379,7 +379,7 @@ void EnGSwitch_ArcheryPot(EnGSwitch* this, GlobalContext* globalCtx) { phi_s0 = 0x20; } - scale = 30.0f + Math_Rand_ZeroOne() * 130.0f; + scale = 30.0f + Rand_ZeroOne() * 130.0f; EffectSsKakera_Spawn(globalCtx, &pos, &vel, thisPos, -240, phi_s0, 10, 10, 0, scale, 0, 0x20, 60, KAKERA_COLOR_NONE, OBJECT_TSUBO, D_06001960); @@ -485,8 +485,8 @@ void EnGSwitch_SpawnEffects(EnGSwitch* this, Vec3f* pos, s16 scale, s16 colorIdx effect->colorIdx = colorIdx; effect->timer = 30; effect->rot.x = effect->rot.y = effect->rot.z = 0.0f; - pitch = Math_Rand_CenteredFloat(1000.0f) - 13000.0f; - yaw = Math_Rand_CenteredFloat(65535.0f); + pitch = Rand_CenteredFloat(1000.0f) - 13000.0f; + yaw = Rand_CenteredFloat(65535.0f); Matrix_RotateY(yaw, MTXMODE_NEW); Matrix_RotateX(pitch, MTXMODE_APPLY); baseVel.x = baseVel.y = 0.0f; @@ -505,16 +505,16 @@ void EnGSwitch_UpdateEffects(EnGSwitch* this, GlobalContext* globalCtx) { for (i = 0; i < this->numEffects; i++, effect++) { if (effect->flag) { - effect->rot.x += Math_Rand_ZeroOne() * 10.0f + 15.0f; - effect->rot.y += Math_Rand_ZeroOne() * 10.0f + 15.0f; - effect->rot.z += Math_Rand_ZeroOne() * 10.0f + 15.0f; + effect->rot.x += Rand_ZeroOne() * 10.0f + 15.0f; + effect->rot.y += Rand_ZeroOne() * 10.0f + 15.0f; + effect->rot.z += Rand_ZeroOne() * 10.0f + 15.0f; temp.x = effect->pos.x + effect->velocity.x; temp.y = effect->pos.y + effect->velocity.y; temp.z = effect->pos.z + effect->velocity.z; - Math_SmoothScaleMaxF(&effect->pos.x, temp.x, 0.3f, 30.0f); - Math_SmoothScaleMaxF(&effect->pos.y, temp.y, 0.8f, 250.0f); - Math_SmoothScaleMaxF(&effect->pos.z, temp.z, 0.3f, 30.0f); - Math_SmoothScaleMaxF(&effect->velocity.y, -20.0f, 0.9f, 1.0f); + Math_ApproachF(&effect->pos.x, temp.x, 0.3f, 30.0f); + Math_ApproachF(&effect->pos.y, temp.y, 0.8f, 250.0f); + Math_ApproachF(&effect->pos.z, temp.z, 0.3f, 30.0f); + Math_ApproachF(&effect->velocity.y, -20.0f, 0.9f, 1.0f); if (effect->timer != 0) { effect->timer--; } else if (effect->scale < 10) { diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index 25e0f95277..8bba858e97 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -326,7 +326,7 @@ void EnGeldB_Flee(EnGeldB* this, GlobalContext* globalCtx) { func_80033260(globalCtx, &this->actor, &this->leftFootPos, 3.0f, 2, 2.0f, 0, 0, 0); } if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { - Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.y, this->actor.groundY + 300.0f, 1.0f, 20.5f, 0.0f); + Math_SmoothStepToF(&this->actor.posRot.pos.y, this->actor.groundY + 300.0f, 1.0f, 20.5f, 0.0f); this->timer--; if (this->timer == 0) { Actor_Kill(&this->actor); @@ -337,7 +337,7 @@ void EnGeldB_Flee(EnGeldB* this, GlobalContext* globalCtx) { void EnGeldB_SetupReady(EnGeldB* this) { SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_0600B6D4, -4.0f); this->actionState = GELDB_READY; - this->timer = Math_Rand_ZeroOne() * 10.0f + 5.0f; + this->timer = Rand_ZeroOne() * 10.0f + 5.0f; this->actor.speedXZ = 0.0f; this->actor.posRot.rot.y = this->actor.shape.rot.y; EnGeldB_SetupAction(this, EnGeldB_Ready); @@ -376,14 +376,14 @@ void EnGeldB_Ready(EnGeldB* this, GlobalContext* globalCtx) { } else if (--this->timer == 0) { if (func_8002E084(&this->actor, 30 * 0x10000 / 360)) { if ((210.0f > this->actor.xzDistFromLink) && (this->actor.xzDistFromLink > 150.0f) && - (Math_Rand_ZeroOne() < 0.3f)) { - if (func_80033AB8(globalCtx, &this->actor) || (Math_Rand_ZeroOne() > 0.5f) || + (Rand_ZeroOne() < 0.3f)) { + if (func_80033AB8(globalCtx, &this->actor) || (Rand_ZeroOne() > 0.5f) || (ABS(angleToLink) < 0x38E0)) { EnGeldB_SetupRollForward(this); } else { EnGeldB_SetupSpinAttack(this); } - } else if (Math_Rand_ZeroOne() > 0.3f) { + } else if (Rand_ZeroOne() > 0.3f) { EnGeldB_SetupAdvance(this, globalCtx); } else { EnGeldB_SetupCircle(this); @@ -415,21 +415,21 @@ void EnGeldB_Advance(EnGeldB* this, GlobalContext* globalCtx) { f32 playSpeed; if (!EnGeldB_DodgeRanged(globalCtx, this)) { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 1, 0x2EE, 0); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 1, 0x2EE, 0); this->actor.posRot.rot.y = this->actor.shape.rot.y; if (this->actor.xzDistFromLink <= 40.0f) { - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, -8.0f, 1.0f, 1.5f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, -8.0f, 1.0f, 1.5f, 0.0f); } else if (this->actor.xzDistFromLink > 55.0f) { - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 8.0f, 1.0f, 1.5f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 8.0f, 1.0f, 1.5f, 0.0f); } else { - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 1.0f, 6.65f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 6.65f, 0.0f); } this->skelAnime.animPlaybackSpeed = this->actor.speedXZ * 0.125f; facingAngletoLink = player->actor.shape.rot.y - this->actor.shape.rot.y; facingAngletoLink = ABS(facingAngletoLink); if ((this->actor.xzDistFromLink < 150.0f) && (player->swordState != 0) && (facingAngletoLink >= 0x1F40)) { this->actor.shape.rot.y = this->actor.posRot.rot.y = this->actor.yawTowardsLink; - if (Math_Rand_ZeroOne() > 0.7f) { + if (Rand_ZeroOne() > 0.7f) { EnGeldB_SetupCircle(this); return; } @@ -440,16 +440,16 @@ void EnGeldB_Advance(EnGeldB* this, GlobalContext* globalCtx) { prevKeyFrame = (s32)(this->skelAnime.animCurrentFrame - playSpeed); playSpeed = ABS(this->skelAnime.animPlaybackSpeed); // yes it does this twice. if (!func_8002E084(&this->actor, 0x11C7)) { - if (Math_Rand_ZeroOne() > 0.5f) { + if (Rand_ZeroOne() > 0.5f) { EnGeldB_SetupCircle(this); } else { EnGeldB_SetupReady(this); } } else if (this->actor.xzDistFromLink < 90.0f) { if (!func_80033AB8(globalCtx, &this->actor) && - (Math_Rand_ZeroOne() > 0.03f || (this->actor.xzDistFromLink <= 45.0f && facingAngletoLink < 0x38E0))) { + (Rand_ZeroOne() > 0.03f || (this->actor.xzDistFromLink <= 45.0f && facingAngletoLink < 0x38E0))) { EnGeldB_SetupSlash(this); - } else if (func_80033AB8(globalCtx, &this->actor) && (Math_Rand_ZeroOne() > 0.5f)) { + } else if (func_80033AB8(globalCtx, &this->actor) && (Rand_ZeroOne() > 0.5f)) { EnGeldB_SetupRollBack(this); } else { EnGeldB_SetupCircle(this); @@ -459,7 +459,7 @@ void EnGeldB_Advance(EnGeldB* this, GlobalContext* globalCtx) { if ((210.0f > this->actor.xzDistFromLink) && (this->actor.xzDistFromLink > 150.0f) && func_8002E084(&this->actor, 0x71C)) { if (func_80033A84(globalCtx, &this->actor)) { - if (Math_Rand_ZeroOne() > 0.5f) { + if (Rand_ZeroOne() > 0.5f) { EnGeldB_SetupRollForward(this); } else { EnGeldB_SetupSpinAttack(this); @@ -501,12 +501,12 @@ void EnGeldB_RollForward(EnGeldB* this, GlobalContext* globalCtx) { this->actor.speedXZ = 0.0f; if (!func_8002E084(&this->actor, 0x1554)) { EnGeldB_SetupReady(this); - this->timer = (Math_Rand_ZeroOne() * 5.0f) + 5.0f; + this->timer = (Rand_ZeroOne() * 5.0f) + 5.0f; if (ABS(facingAngleToLink) < 0x38E0) { this->lookTimer = 20; } } else if (!func_80033AB8(globalCtx, &this->actor) && - (Math_Rand_ZeroOne() > 0.5f || (ABS(facingAngleToLink) < 0x3FFC))) { + (Rand_ZeroOne() > 0.5f || (ABS(facingAngleToLink) < 0x3FFC))) { EnGeldB_SetupSlash(this); } else { EnGeldB_SetupAdvance(this, globalCtx); @@ -542,7 +542,7 @@ void EnGeldB_Pivot(EnGeldB* this, GlobalContext* globalCtx) { this->skelAnime.animPlaybackSpeed = -playSpeed; SkelAnime_FrameUpdateMatrix(&this->skelAnime); if (func_8002E084(&this->actor, 30 * 0x10000 / 360)) { - if (Math_Rand_ZeroOne() > 0.8f) { + if (Rand_ZeroOne() > 0.8f) { EnGeldB_SetupCircle(this); } else { EnGeldB_SetupAdvance(this, globalCtx); @@ -556,10 +556,10 @@ void EnGeldB_Pivot(EnGeldB* this, GlobalContext* globalCtx) { void EnGeldB_SetupCircle(EnGeldB* this) { SkelAnime_ChangeAnim(&this->skelAnime, &D_0600A814, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_0600A814), 1, 0.0f); - this->actor.speedXZ = Math_Rand_CenteredFloat(12.0f); + this->actor.speedXZ = Rand_CenteredFloat(12.0f); this->actor.posRot.rot.y = this->actor.shape.rot.y; this->skelAnime.animPlaybackSpeed = -this->actor.speedXZ * 0.5f; - this->timer = Math_Rand_ZeroOne() * 30.0f + 30.0f; + this->timer = Rand_ZeroOne() * 30.0f + 30.0f; this->actionState = GELDB_CIRCLE; this->approachRate = 0.0f; EnGeldB_SetupAction(this, EnGeldB_Circle); @@ -574,16 +574,16 @@ void EnGeldB_Circle(EnGeldB* this, GlobalContext* globalCtx) { s32 prevKeyFrame; Player* player = PLAYER; - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 1, 0xFA0, 1); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 1, 0xFA0, 1); if (!EnGeldB_DodgeRanged(globalCtx, this) && !EnGeldB_ReactToPlayer(globalCtx, this, 0)) { this->actor.posRot.rot.y = this->actor.shape.rot.y + 0x3A98; angleBehindLink = player->actor.shape.rot.y + 0x8000; - if (Math_Sins(angleBehindLink - this->actor.shape.rot.y) >= 0.0f) { + if (Math_SinS(angleBehindLink - this->actor.shape.rot.y) >= 0.0f) { this->actor.speedXZ -= 0.25f; if (this->actor.speedXZ < -8.0f) { this->actor.speedXZ = -8.0f; } - } else if (Math_Sins(angleBehindLink - this->actor.shape.rot.y) < 0.0f) { + } else if (Math_SinS(angleBehindLink - this->actor.shape.rot.y) < 0.0f) { this->actor.speedXZ += 0.25f; if (this->actor.speedXZ > 8.0f) { this->actor.speedXZ = 8.0f; @@ -612,15 +612,15 @@ void EnGeldB_Circle(EnGeldB* this, GlobalContext* globalCtx) { } } if (this->actor.xzDistFromLink <= 45.0f) { - Math_SmoothScaleMaxMinF(&this->approachRate, -4.0f, 1.0f, 1.5f, 0.0f); + Math_SmoothStepToF(&this->approachRate, -4.0f, 1.0f, 1.5f, 0.0f); } else if (this->actor.xzDistFromLink > 40.0f) { - Math_SmoothScaleMaxMinF(&this->approachRate, 4.0f, 1.0f, 1.5f, 0.0f); + Math_SmoothStepToF(&this->approachRate, 4.0f, 1.0f, 1.5f, 0.0f); } else { - Math_SmoothScaleMaxMinF(&this->approachRate, 0.0f, 1.0f, 6.65f, 0.0f); + Math_SmoothStepToF(&this->approachRate, 0.0f, 1.0f, 6.65f, 0.0f); } if (this->approachRate != 0.0f) { - this->actor.posRot.pos.x += Math_Sins(this->actor.shape.rot.y) * this->approachRate; - this->actor.posRot.pos.z += Math_Coss(this->actor.shape.rot.y) * this->approachRate; + this->actor.posRot.pos.x += Math_SinS(this->actor.shape.rot.y) * this->approachRate; + this->actor.posRot.pos.z += Math_CosS(this->actor.shape.rot.y) * this->approachRate; } if (ABS(this->approachRate) < ABS(this->actor.speedXZ)) { this->skelAnime.animPlaybackSpeed = -this->actor.speedXZ * 0.5f; @@ -641,11 +641,11 @@ void EnGeldB_Circle(EnGeldB* this, GlobalContext* globalCtx) { if ((globalCtx->gameplayFrames & 0x5F) == 0) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_GERUDOFT_BREATH); } - if ((Math_Coss(angleBehindLink - this->actor.shape.rot.y) < -0.85f) && + if ((Math_CosS(angleBehindLink - this->actor.shape.rot.y) < -0.85f) && !func_80033AB8(globalCtx, &this->actor) && (this->actor.xzDistFromLink <= 45.0f)) { EnGeldB_SetupSlash(this); } else if (--this->timer == 0) { - if (func_80033AB8(globalCtx, &this->actor) && (Math_Rand_ZeroOne() > 0.5f)) { + if (func_80033AB8(globalCtx, &this->actor) && (Rand_ZeroOne() > 0.5f)) { EnGeldB_SetupRollBack(this); } else { EnGeldB_SetupReady(this); @@ -660,11 +660,11 @@ void EnGeldB_SetupSpinDodge(EnGeldB* this, GlobalContext* globalCtx) { SkelAnime_ChangeAnim(&this->skelAnime, &D_0600A814, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_0600A814), 1, 0.0f); sp3E = player->actor.shape.rot.y; - if (Math_Sins(sp3E - this->actor.shape.rot.y) > 0.0f) { + if (Math_SinS(sp3E - this->actor.shape.rot.y) > 0.0f) { this->actor.speedXZ = -10.0f; - } else if (Math_Sins(sp3E - this->actor.shape.rot.y) < 0.0f) { + } else if (Math_SinS(sp3E - this->actor.shape.rot.y) < 0.0f) { this->actor.speedXZ = 10.0f; - } else if (Math_Rand_ZeroOne() > 0.5f) { + } else if (Rand_ZeroOne() > 0.5f) { this->actor.speedXZ = 10.0f; } else { this->actor.speedXZ = -10.0f; @@ -706,15 +706,15 @@ void EnGeldB_SpinDodge(EnGeldB* this, GlobalContext* globalCtx) { } } if (this->actor.xzDistFromLink <= 45.0f) { - Math_SmoothScaleMaxMinF(&this->approachRate, -4.0f, 1.0f, 1.5f, 0.0f); + Math_SmoothStepToF(&this->approachRate, -4.0f, 1.0f, 1.5f, 0.0f); } else if (this->actor.xzDistFromLink > 40.0f) { - Math_SmoothScaleMaxMinF(&this->approachRate, 4.0f, 1.0f, 1.5f, 0.0f); + Math_SmoothStepToF(&this->approachRate, 4.0f, 1.0f, 1.5f, 0.0f); } else { - Math_SmoothScaleMaxMinF(&this->approachRate, 0.0f, 1.0f, 6.65f, 0.0f); + Math_SmoothStepToF(&this->approachRate, 0.0f, 1.0f, 6.65f, 0.0f); } if (this->approachRate != 0.0f) { - this->actor.posRot.pos.x += Math_Sins(this->actor.yawTowardsLink) * this->approachRate; - this->actor.posRot.pos.z += Math_Coss(this->actor.yawTowardsLink) * this->approachRate; + this->actor.posRot.pos.x += Math_SinS(this->actor.yawTowardsLink) * this->approachRate; + this->actor.posRot.pos.z += Math_CosS(this->actor.yawTowardsLink) * this->approachRate; } if (ABS(this->approachRate) < ABS(this->actor.speedXZ)) { this->skelAnime.animPlaybackSpeed = -this->actor.speedXZ * 0.5f; @@ -784,16 +784,16 @@ void EnGeldB_Slash(EnGeldB* this, GlobalContext* globalCtx) { } else if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { if (!func_8002E084(&this->actor, 0x1554)) { EnGeldB_SetupReady(this); - this->timer = (Math_Rand_ZeroOne() * 5.0f) + 5.0f; + this->timer = (Rand_ZeroOne() * 5.0f) + 5.0f; if (angleToLink > 0x4000) { this->lookTimer = 20; } - } else if (Math_Rand_ZeroOne() > 0.7f || (this->actor.xzDistFromLink >= 120.0f)) { + } else if (Rand_ZeroOne() > 0.7f || (this->actor.xzDistFromLink >= 120.0f)) { EnGeldB_SetupReady(this); - this->timer = (Math_Rand_ZeroOne() * 5.0f) + 5.0f; + this->timer = (Rand_ZeroOne() * 5.0f) + 5.0f; } else { this->actor.posRot.rot.y = this->actor.yawTowardsLink; - if (Math_Rand_ZeroOne() > 0.7f) { + if (Rand_ZeroOne() > 0.7f) { EnGeldB_SetupSidestep(this, globalCtx); } else if (angleFacingLink <= 0x2710) { if (angleToLink > 0x3E80) { @@ -858,16 +858,16 @@ void EnGeldB_SpinAttack(EnGeldB* this, GlobalContext* globalCtx) { if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) && (this->spinAttackState < 2)) { if (!func_8002E084(&this->actor, 0x1554)) { EnGeldB_SetupReady(this); - this->timer = (Math_Rand_ZeroOne() * 5.0f) + 5.0f; + this->timer = (Rand_ZeroOne() * 5.0f) + 5.0f; this->lookTimer = 46; } else if (this->spinAttackState != 0) { EnGeldB_SetupRollBack(this); - } else if (Math_Rand_ZeroOne() > 0.7f || (this->actor.xzDistFromLink >= 120.0f)) { + } else if (Rand_ZeroOne() > 0.7f || (this->actor.xzDistFromLink >= 120.0f)) { EnGeldB_SetupReady(this); - this->timer = (Math_Rand_ZeroOne() * 5.0f) + 5.0f; + this->timer = (Rand_ZeroOne() * 5.0f) + 5.0f; } else { this->actor.posRot.rot.y = this->actor.yawTowardsLink; - if (Math_Rand_ZeroOne() > 0.7f) { + if (Rand_ZeroOne() > 0.7f) { EnGeldB_SetupSidestep(this, globalCtx); } else { angleFacingLink = player->actor.shape.rot.y - this->actor.shape.rot.y; @@ -903,7 +903,7 @@ void EnGeldB_SetupRollBack(EnGeldB* this) { void EnGeldB_RollBack(EnGeldB* this, GlobalContext* globalCtx) { if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { if (!func_80033AB8(globalCtx, &this->actor) && (this->actor.xzDistFromLink < 170.0f) && - (this->actor.xzDistFromLink > 140.0f) && (Math_Rand_ZeroOne() < 0.2f)) { + (this->actor.xzDistFromLink > 140.0f) && (Rand_ZeroOne() < 0.2f)) { EnGeldB_SetupSpinAttack(this); } else if (globalCtx->gameplayFrames & 1) { EnGeldB_SetupSidestep(this, globalCtx); @@ -977,7 +977,7 @@ void EnGeldB_Damaged(EnGeldB* this, GlobalContext* globalCtx) { } this->invisible = false; } - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 1, 0x1194, 0); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 1, 0x1194, 0); if (!EnGeldB_DodgeRanged(globalCtx, this) && !EnGeldB_ReactToPlayer(globalCtx, this, 0) && SkelAnime_FrameUpdateMatrix(&this->skelAnime) && (this->actor.bgCheckFlags & 1)) { angleToWall = this->actor.wallPolyRot - this->actor.shape.rot.y; @@ -1007,7 +1007,7 @@ void EnGeldB_SetupJump(EnGeldB* this) { } void EnGeldB_Jump(EnGeldB* this, GlobalContext* globalCtx) { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 1, 0xFA0, 1); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 1, 0xFA0, 1); if (this->actor.velocity.y >= 5.0f) { func_800355B8(globalCtx, &this->rightFootPos); func_800355B8(globalCtx, &this->leftFootPos); @@ -1035,7 +1035,7 @@ void EnGeldB_SetupBlock(EnGeldB* this) { } this->actor.speedXZ = 0.0f; this->actionState = GELDB_BLOCK; - this->timer = (s32)Math_Rand_CenteredFloat(10.0f) + 10; + this->timer = (s32)Rand_CenteredFloat(10.0f) + 10; SkelAnime_ChangeAnim(&this->skelAnime, &D_06001578, 0.0f, 0.0f, lastFrame, 2, 0.0f); EnGeldB_SetupAction(this, EnGeldB_Block); } @@ -1081,7 +1081,7 @@ void EnGeldB_Block(EnGeldB* this, GlobalContext* globalCtx) { EnGeldB_SetupSpinDodge(this, globalCtx); } else if (!EnGeldB_DodgeRanged(globalCtx, this)) { if ((globalCtx->gameplayFrames & 1)) { - if ((this->actor.xzDistFromLink < 100.0f) && (Math_Rand_ZeroOne() > 0.7f)) { + if ((this->actor.xzDistFromLink < 100.0f) && (Rand_ZeroOne() > 0.7f)) { EnGeldB_SetupJump(this); } else { EnGeldB_SetupRollBack(this); @@ -1099,19 +1099,19 @@ void EnGeldB_SetupSidestep(EnGeldB* this, GlobalContext* globalCtx) { SkelAnime_ChangeAnim(&this->skelAnime, &D_0600A814, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_0600A814), 1, 0.0f); player = PLAYER; - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 1, 0xFA0, 1); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 1, 0xFA0, 1); linkAngle = player->actor.shape.rot.y; - if (Math_Sins(linkAngle - this->actor.shape.rot.y) > 0.0f) { + if (Math_SinS(linkAngle - this->actor.shape.rot.y) > 0.0f) { this->actor.speedXZ = -6.0f; - } else if (Math_Sins(linkAngle - this->actor.shape.rot.y) < 0.0f) { + } else if (Math_SinS(linkAngle - this->actor.shape.rot.y) < 0.0f) { this->actor.speedXZ = 6.0f; } else { - this->actor.speedXZ = Math_Rand_CenteredFloat(12.0f); + this->actor.speedXZ = Rand_CenteredFloat(12.0f); } this->skelAnime.animPlaybackSpeed = -this->actor.speedXZ * 0.5f; this->approachRate = 0.0f; this->actor.posRot.rot.y = this->actor.shape.rot.y + 0x3FFF; - this->timer = Math_Rand_ZeroOne() * 10.0f + 5.0f; + this->timer = Rand_ZeroOne() * 10.0f + 5.0f; this->actionState = GELDB_SIDESTEP; EnGeldB_SetupAction(this, EnGeldB_Sidestep); } @@ -1124,11 +1124,11 @@ void EnGeldB_Sidestep(EnGeldB* this, GlobalContext* globalCtx) { s32 prevKeyFrame; f32 playSpeed; - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 1, 0xBB8, 1); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 1, 0xBB8, 1); behindLinkAngle = player->actor.shape.rot.y + 0x8000; - if (Math_Sins(behindLinkAngle - this->actor.shape.rot.y) > 0.0f) { + if (Math_SinS(behindLinkAngle - this->actor.shape.rot.y) > 0.0f) { this->actor.speedXZ += 0.125f; - } else if (Math_Sins(behindLinkAngle - this->actor.shape.rot.y) <= 0.0f) { + } else if (Math_SinS(behindLinkAngle - this->actor.shape.rot.y) <= 0.0f) { this->actor.speedXZ -= 0.125f; } @@ -1160,15 +1160,15 @@ void EnGeldB_Sidestep(EnGeldB* this, GlobalContext* globalCtx) { this->actor.posRot.rot.y = this->actor.shape.rot.y - 0x3E80; } if (this->actor.xzDistFromLink <= 45.0f) { - Math_SmoothScaleMaxMinF(&this->approachRate, -4.0f, 1.0f, 1.5f, 0.0f); + Math_SmoothStepToF(&this->approachRate, -4.0f, 1.0f, 1.5f, 0.0f); } else if (this->actor.xzDistFromLink > 40.0f) { - Math_SmoothScaleMaxMinF(&this->approachRate, 4.0f, 1.0f, 1.5f, 0.0f); + Math_SmoothStepToF(&this->approachRate, 4.0f, 1.0f, 1.5f, 0.0f); } else { - Math_SmoothScaleMaxMinF(&this->approachRate, 0.0f, 1.0f, 6.65f, 0.0f); + Math_SmoothStepToF(&this->approachRate, 0.0f, 1.0f, 6.65f, 0.0f); } if (this->approachRate != 0.0f) { - this->actor.posRot.pos.x += Math_Sins(this->actor.shape.rot.y) * this->approachRate; - this->actor.posRot.pos.z += Math_Coss(this->actor.shape.rot.y) * this->approachRate; + this->actor.posRot.pos.x += Math_SinS(this->actor.shape.rot.y) * this->approachRate; + this->actor.posRot.pos.z += Math_CosS(this->actor.shape.rot.y) * this->approachRate; } if (ABS(this->approachRate) < ABS(this->actor.speedXZ)) { this->skelAnime.animPlaybackSpeed = -this->actor.speedXZ * 0.5f; @@ -1189,7 +1189,7 @@ void EnGeldB_Sidestep(EnGeldB* this, GlobalContext* globalCtx) { angleFacingPlayer = ABS(angleFacingPlayer); if (angleFacingPlayer >= 0x3A98) { EnGeldB_SetupReady(this); - this->timer = (Math_Rand_ZeroOne() * 5.0f) + 1.0f; + this->timer = (Rand_ZeroOne() * 5.0f) + 1.0f; } else { Player* player2 = PLAYER; s16 angleFacingPlayer2 = player2->actor.shape.rot.y - this->actor.shape.rot.y; @@ -1200,7 +1200,7 @@ void EnGeldB_Sidestep(EnGeldB* this, GlobalContext* globalCtx) { EnGeldB_SetupSlash(this); } else if ((210.0f > this->actor.xzDistFromLink) && (this->actor.xzDistFromLink > 150.0f) && !(globalCtx->gameplayFrames & 1)) { - if (func_80033AB8(globalCtx, &this->actor) || (Math_Rand_ZeroOne() > 0.5f) || + if (func_80033AB8(globalCtx, &this->actor) || (Rand_ZeroOne() > 0.5f) || (ABS(angleFacingPlayer2) < 0x38E0)) { EnGeldB_SetupRollForward(this); } else { @@ -1242,7 +1242,7 @@ void EnGeldB_Defeated(EnGeldB* this, GlobalContext* globalCtx) { this->actor.speedXZ = 0.0f; } if (this->actor.bgCheckFlags & 1) { - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f); this->invisible = false; } if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { @@ -1255,10 +1255,10 @@ void EnGeldB_Defeated(EnGeldB* this, GlobalContext* globalCtx) { void func_80A391D8(EnGeldB* this, GlobalContext* globalCtx) { if ((this->actionState == GELDB_READY) && (this->lookTimer != 0)) { - this->headRot.y = Math_Sins(this->lookTimer * 0x1068) * 8920.0f; + this->headRot.y = Math_SinS(this->lookTimer * 0x1068) * 8920.0f; } else if (this->actionState != GELDB_STUNNED) { if ((this->actionState != GELDB_SLASH) && (this->actionState != GELDB_SPIN_ATTACK)) { - Math_SmoothScaleMaxMinS(&this->headRot.y, this->actor.yawTowardsLink - this->actor.shape.rot.y, 1, 0x1F4, + Math_SmoothStepToS(&this->headRot.y, this->actor.yawTowardsLink - this->actor.shape.rot.y, 1, 0x1F4, 0); this->headRot.y = CLAMP(this->headRot.y, -0x256F, 0x256F); } else { @@ -1338,7 +1338,7 @@ void EnGeldB_Update(Actor* thisx, GlobalContext* globalCtx) { CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->swordCollider.base); } if (this->blinkState == 0) { - if ((Math_Rand_ZeroOne() < 0.1f) && ((globalCtx->gameplayFrames % 4) == 0)) { + if ((Rand_ZeroOne() < 0.1f) && ((globalCtx->gameplayFrames % 4) == 0)) { this->blinkState++; } } else { diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c index 8041405188..ff7a930002 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -746,7 +746,7 @@ void func_80A3BA40(GlobalContext* globalCtx, EnGirlA* this) { void func_80A3BB6C(GlobalContext* globalCtx, EnGirlA* this) { if (this->actor.params == 12) { if (gSaveContext.infTable[7] & 0x40) { - Rupees_ChangeBy(-(this->unk_1C8 - D_80A3CCB4[(s32)Math_Rand_ZeroFloat(7.9f)])); + Rupees_ChangeBy(-(this->unk_1C8 - D_80A3CCB4[(s32)Rand_ZeroFloat(7.9f)])); return; } } @@ -988,7 +988,7 @@ void func_80A3C3BC(EnGirlA* this, GlobalContext* globalCtx) { if (this->unk_1B4 != 0) { this->unk_1B8 += 0x1F4; } else { - Math_SmoothScaleMaxMinS(&this->unk_1B8, 0, 10, 0x7D0, 0); + Math_SmoothStepToS(&this->unk_1B8, 0, 10, 0x7D0, 0); } } } diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c index 3b1d3c8452..43946aab05 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -124,7 +124,7 @@ void EnGm_UpdateEye(EnGm* this) { if (this->eyeTexIndex >= 3) { this->eyeTexIndex = 0; - this->blinkTimer = Math_Rand_ZeroFloat(60.0f) + 20.0f; + this->blinkTimer = Rand_ZeroFloat(60.0f) + 20.0f; } } } diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index 6c0854920e..f81c5e4f42 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -246,11 +246,11 @@ void EnGoroiwa_SpawnDust(GlobalContext* globalCtx, Vec3f* pos) { for (i = 0; i < 8; i++) { angle += 0x4E20; - randPos.x = pos->x + ((47.0f * ((Math_Rand_ZeroOne() * 0.5f) + 0.5f)) * Math_Sins(angle)); - randPos.y = pos->y + ((Math_Rand_ZeroOne() - 0.5f) * 40.0f); - randPos.z = pos->z + ((47.0f * ((Math_Rand_ZeroOne() * 0.5f) + 0.5f))) * Math_Coss(angle); - func_800286CC(globalCtx, &randPos, &velocity, &accel, (s16)(Math_Rand_ZeroOne() * 30.0f) + 100, 80); - func_800286CC(globalCtx, &randPos, &velocity, &accel, (s16)(Math_Rand_ZeroOne() * 20.0f) + 80, 80); + randPos.x = pos->x + ((47.0f * ((Rand_ZeroOne() * 0.5f) + 0.5f)) * Math_SinS(angle)); + randPos.y = pos->y + ((Rand_ZeroOne() - 0.5f) * 40.0f); + randPos.z = pos->z + ((47.0f * ((Rand_ZeroOne() * 0.5f) + 0.5f))) * Math_CosS(angle); + func_800286CC(globalCtx, &randPos, &velocity, &accel, (s16)(Rand_ZeroOne() * 30.0f) + 100, 80); + func_800286CC(globalCtx, &randPos, &velocity, &accel, (s16)(Rand_ZeroOne() * 20.0f) + 80, 80); } } @@ -261,9 +261,9 @@ void EnGoroiwa_SpawnWaterEffects(GlobalContext* globalCtx, Vec3f* contactPos) { for (i = 0; i < 11; i++) { angle += 0x1746; - splashPos.x = contactPos->x + (Math_Sins(angle) * 55.0f); + splashPos.x = contactPos->x + (Math_SinS(angle) * 55.0f); splashPos.y = contactPos->y; - splashPos.z = contactPos->z + (Math_Coss(angle) * 55.0f); + splashPos.z = contactPos->z + (Math_CosS(angle) * 55.0f); EffectSsGSplash_Spawn(globalCtx, &splashPos, 0, 0, 0, 350); } @@ -278,12 +278,12 @@ s32 func_80A4C6C8(EnGoroiwa* this, GlobalContext* globalCtx) { s32 pad; Vec3s* nextPointPos; - Math_ApproxF(&this->actor.speedXZ, mREG(12) * 0.01f, 0.3f); + Math_StepToF(&this->actor.speedXZ, mREG(12) * 0.01f, 0.3f); func_8002D868(&this->actor); path = &globalCtx->setupPathList[this->actor.params & 0xFF]; nextPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->nextWaypoint; - result = Math_ApproxF(&this->actor.posRot.pos.x, nextPointPos->x, fabsf(this->actor.velocity.x)) & 1; - result &= Math_ApproxF(&this->actor.posRot.pos.z, nextPointPos->z, fabsf(this->actor.velocity.z)); + result = Math_StepToF(&this->actor.posRot.pos.x, nextPointPos->x, fabsf(this->actor.velocity.x)) & 1; + result &= Math_StepToF(&this->actor.posRot.pos.z, nextPointPos->z, fabsf(this->actor.velocity.z)); this->actor.posRot.pos.y += this->actor.velocity.y; return result; } @@ -300,7 +300,7 @@ s32 func_80A4C814(EnGoroiwa* this, GlobalContext* globalCtx) { nextPointPosF.x = nextPointPos->x; nextPointPosF.y = nextPointPos->y; nextPointPosF.z = nextPointPos->z; - Math_ApproxF(&this->actor.speedXZ, mREG(12) * 0.01f, 0.3f); + Math_StepToF(&this->actor.speedXZ, mREG(12) * 0.01f, 0.3f); if (Math3D_Vec3fDistSq(&nextPointPosF, &this->actor.posRot.pos) < 25.0f) { Math_Vec3f_Diff(&nextPointPosF, &this->actor.posRot.pos, &posDiff); } else { @@ -312,9 +312,9 @@ s32 func_80A4C814(EnGoroiwa* this, GlobalContext* globalCtx) { this->actor.velocity.x *= this->actor.speedXZ; this->actor.velocity.y *= this->actor.speedXZ; this->actor.velocity.z *= this->actor.speedXZ; - result = Math_ApproxF(&this->actor.posRot.pos.x, nextPointPosF.x, fabsf(this->actor.velocity.x)) & 1; - result &= Math_ApproxF(&this->actor.posRot.pos.y, nextPointPosF.y, fabsf(this->actor.velocity.y)); - result &= Math_ApproxF(&this->actor.posRot.pos.z, nextPointPosF.z, fabsf(this->actor.velocity.z)); + result = Math_StepToF(&this->actor.posRot.pos.x, nextPointPosF.x, fabsf(this->actor.velocity.x)) & 1; + result &= Math_StepToF(&this->actor.posRot.pos.y, nextPointPosF.y, fabsf(this->actor.velocity.y)); + result &= Math_StepToF(&this->actor.posRot.pos.z, nextPointPosF.z, fabsf(this->actor.velocity.z)); return result; } @@ -323,10 +323,10 @@ s32 func_80A4CA50(EnGoroiwa* this, GlobalContext* globalCtx) { Path* path = &globalCtx->setupPathList[this->actor.params & 0xFF]; Vec3s* nextPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->nextWaypoint; - Math_ApproxF(&this->actor.velocity.y, (mREG(12) * 0.01f) * 0.5f, 0.18f); + Math_StepToF(&this->actor.velocity.y, (mREG(12) * 0.01f) * 0.5f, 0.18f); this->actor.posRot.pos.x = nextPointPos->x; this->actor.posRot.pos.z = nextPointPos->z; - return Math_ApproxF(&this->actor.posRot.pos.y, nextPointPos->y, fabsf(this->actor.velocity.y)); + return Math_StepToF(&this->actor.posRot.pos.y, nextPointPos->y, fabsf(this->actor.velocity.y)); } s32 func_80A4CB78(EnGoroiwa* this, GlobalContext* globalCtx) { @@ -348,7 +348,7 @@ s32 func_80A4CB78(EnGoroiwa* this, GlobalContext* globalCtx) { Vec3f sp30; nextPointY = nextPointPos->y; - Math_ApproxF(&this->actor.velocity.y, -14.0f, 1.0f); + Math_StepToF(&this->actor.velocity.y, -14.0f, 1.0f); this->actor.posRot.pos.x = nextPointPos->x; this->actor.posRot.pos.z = nextPointPos->z; thisY = this->actor.posRot.pos.y; @@ -474,19 +474,19 @@ void func_80A4D0FC(EnGoroiwa* this, GlobalContext* globalCtx) { s32 i; for (i = 0, angle1 = 0; i < 16; i++, angle1 += 0x4E20) { - temp_f22 = Math_Sins(angle1); - temp_f24 = Math_Coss(angle1); - angle2 = Math_Rand_ZeroOne() * 0xFFFF; - effectPos.x = ((Math_Rand_ZeroOne() * 50.0f) * temp_f22) * Math_Sins(angle2); - temp_f20_2 = Math_Sins(angle2); - effectPos.y = (((Math_Rand_ZeroOne() - 0.5f) * 100.0f) * temp_f20_2) + colliderHeightOffset[temp_v0]; - effectPos.z = ((Math_Rand_ZeroOne() * 50.0f) * temp_f24) * Math_Sins(angle2); + temp_f22 = Math_SinS(angle1); + temp_f24 = Math_CosS(angle1); + angle2 = Rand_ZeroOne() * 0xFFFF; + effectPos.x = ((Rand_ZeroOne() * 50.0f) * temp_f22) * Math_SinS(angle2); + temp_f20_2 = Math_SinS(angle2); + effectPos.y = (((Rand_ZeroOne() - 0.5f) * 100.0f) * temp_f20_2) + colliderHeightOffset[temp_v0]; + effectPos.z = ((Rand_ZeroOne() * 50.0f) * temp_f24) * Math_SinS(angle2); fragmentVelocity.x = effectPos.x * 0.2f; - fragmentVelocity.y = (Math_Rand_ZeroOne() * 15.0f) + 2.0f; + fragmentVelocity.y = (Rand_ZeroOne() * 15.0f) + 2.0f; fragmentVelocity.z = effectPos.z * 0.2f; Math_Vec3f_Sum(&effectPos, thisPos, &effectPos); EffectSsKakera_Spawn(globalCtx, &effectPos, &fragmentVelocity, &effectPos, -340, 33, 28, 2, 0, - (Math_Rand_ZeroOne() * 7.0f) + 1.0f, 1, 0, 70, KAKERA_COLOR_NONE, 1, D_0400D340); + (Rand_ZeroOne() * 7.0f) + 1.0f, 1, 0, 70, KAKERA_COLOR_NONE, 1, D_0400D340); } effectPos.x = thisPos->x; diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index a3d6232a11..bb28ca2542 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -158,10 +158,10 @@ void func_80A4E648(EnGs* this, GlobalContext* globalCtx) { f32 func_80A4E754(EnGs* this, GlobalContext* globalCtx, f32* arg2, f32* arg3, u16* arg4, f32 arg5, f32 arg6, f32 arg7, s32 arg8, s32 arg9) { - f32 sp2C = Math_SmoothScaleMaxMinF(arg2, *arg3, arg5, arg6, arg7); + f32 sp2C = Math_SmoothStepToF(arg2, *arg3, arg5, arg6, arg7); if (arg9 == 0) { - sp2C = Math_SmoothScaleMaxMinF(arg2, *arg3, arg5, arg6, arg7); + sp2C = Math_SmoothStepToF(arg2, *arg3, arg5, arg6, arg7); this->unk_1B4[0].x = 1.0f + (sinf((((*arg4 % arg8) * (1.0f / arg8)) * 360.0f) * 0.017453292f) * *arg2); this->unk_1B4[0].y = 1.0f - (sinf((((*arg4 % arg8) * (1.0f / arg8)) * 360.0f) * 0.017453292f) * *arg2); *arg4 += 1; @@ -214,7 +214,7 @@ void func_80A4EB3C(EnGs* this, GlobalContext* globalCtx) { this->unk_1EC = -0.8f; this->unk_19F++; } else if (this->unk_19F == 1) { - ret = Math_SmoothScaleMaxMinF(&this->unk_1E8, this->unk_1EC, 1.0f, 0.4f, 0.001f); + ret = Math_SmoothStepToF(&this->unk_1E8, this->unk_1EC, 1.0f, 0.4f, 0.001f); this->unk_1B4[0].y = this->unk_1E8 + 1.0f; if (ret == 0.0f) { this->unk_200 = 0; @@ -228,7 +228,7 @@ void func_80A4EB3C(EnGs* this, GlobalContext* globalCtx) { this->unk_1EC = 0.0f; } } else if (this->unk_19F == 3) { - ret = Math_SmoothScaleMaxMinF(&this->unk_1E8, this->unk_1EC, 1.0f, 0.5f, 0.001f); + ret = Math_SmoothStepToF(&this->unk_1E8, this->unk_1EC, 1.0f, 0.5f, 0.001f); this->unk_1B4[0].y = this->unk_1E8 + 1.0f; if (ret == 0.0f) { this->unk_1E8 = 0.5f; @@ -300,14 +300,14 @@ void func_80A4ED34(EnGs* this, GlobalContext* globalCtx) { if (this->unk_19F == 3) { for (i = 0; i < 3; i++) { - dustVelocity.x = Math_Rand_CenteredFloat(15.0f); - dustVelocity.y = Math_Rand_ZeroFloat(-1.0f); - dustVelocity.z = Math_Rand_CenteredFloat(15.0f); + dustVelocity.x = Rand_CenteredFloat(15.0f); + dustVelocity.y = Rand_ZeroFloat(-1.0f); + dustVelocity.z = Rand_CenteredFloat(15.0f); dustPos.x = this->actor.posRot.pos.x + (dustVelocity.x + dustVelocity.x); dustPos.y = this->actor.posRot.pos.y + 7.0f; dustPos.z = this->actor.posRot.pos.z + (dustVelocity.z + dustVelocity.z); func_8002836C(globalCtx, &dustPos, &dustVelocity, &dustAccel, &dustPrim, &dustEnv, - (s16)Math_Rand_ZeroFloat(50.0f) + 200, 40, 15); + (s16)Rand_ZeroFloat(50.0f) + 200, 40, 15); } func_8002F974(&this->actor, NA_SE_EV_FIRE_PILLAR - SFX_FLAG); @@ -359,8 +359,8 @@ void func_80A4F13C(EnGs* this, GlobalContext* globalCtx) { this->unk_19F = 1; } if (this->unk_19F == 1) { - Math_SmoothScaleMaxMinF(&this->unk_1F0, this->unk_1F4, 1.0f, 0.1f, 0.001f); - tmpf1 = Math_SmoothScaleMaxMinF(&this->unk_1E8, this->unk_1EC, 1.0f, this->unk_1F0, 0.001f); + Math_SmoothStepToF(&this->unk_1F0, this->unk_1F4, 1.0f, 0.1f, 0.001f); + tmpf1 = Math_SmoothStepToF(&this->unk_1E8, this->unk_1EC, 1.0f, this->unk_1F0, 0.001f); this->unk_1A0[0].y += (s32)(this->unk_1E8 * 182.04445f); if (tmpf1 == 0.0f) { this->unk_200 = 0; @@ -380,8 +380,8 @@ void func_80A4F13C(EnGs* this, GlobalContext* globalCtx) { } if (this->unk_19F == 3) { this->unk_1A0[0].y += 0x4000; - tmpf1 = Math_SmoothScaleMaxMinF(&this->unk_1E8, this->unk_1EC, 0.8f, 0.2f, 0.001f); - Math_SmoothScaleMaxMinF(&this->unk_1F0, this->unk_1F4, 0.8f, 0.2f, 0.001f); + tmpf1 = Math_SmoothStepToF(&this->unk_1E8, this->unk_1EC, 0.8f, 0.2f, 0.001f); + Math_SmoothStepToF(&this->unk_1F0, this->unk_1F4, 0.8f, 0.2f, 0.001f); this->unk_1B4[0].x = this->unk_1F0 + 1.0f; this->unk_1B4[0].y = this->unk_1E8 + 1.0f; if (tmpf1 == 0.0f) { @@ -391,7 +391,7 @@ void func_80A4F13C(EnGs* this, GlobalContext* globalCtx) { } } if (this->unk_19F == 4) { - tmpf1 = Math_SmoothScaleMaxMinF(&this->unk_1E8, this->unk_1EC, 0.8f, 16384.0f, 3640.0f); + tmpf1 = Math_SmoothStepToF(&this->unk_1E8, this->unk_1EC, 0.8f, 16384.0f, 3640.0f); this->unk_1A0[0].y += (s16)this->unk_1E8; if (tmpf1 == 0.0f) { @@ -411,7 +411,7 @@ void func_80A4F13C(EnGs* this, GlobalContext* globalCtx) { tmp += 0xFFFF0001; } this->unk_1E8 = tmp; - tmpf1 = Math_SmoothScaleMaxMinF(&this->unk_1E8, this->unk_1EC, 0.8f, 3640.0f, 0.001f); + tmpf1 = Math_SmoothStepToF(&this->unk_1E8, this->unk_1EC, 0.8f, 3640.0f, 0.001f); this->unk_1A0[0].y = this->unk_1E8; if (tmpf1 == 0.0f) { this->unk_1E8 = this->unk_1B4[0].y - 1.0f; @@ -427,9 +427,9 @@ void func_80A4F13C(EnGs* this, GlobalContext* globalCtx) { } } if (this->unk_19F == 6) { - tmpf1 = Math_SmoothScaleMaxMinF(&this->unk_1E8, this->unk_1EC, 0.8f, 0.1f, 0.001f); - tmpf2 = Math_SmoothScaleMaxMinF(&this->unk_1F0, this->unk_1F4, 0.8f, 0.1f, 0.001f); - tmpf3 = Math_SmoothScaleMaxMinF(&this->unk_1F8, this->unk_1FC, 0.8f, 0.02f, 0.001f); + tmpf1 = Math_SmoothStepToF(&this->unk_1E8, this->unk_1EC, 0.8f, 0.1f, 0.001f); + tmpf2 = Math_SmoothStepToF(&this->unk_1F0, this->unk_1F4, 0.8f, 0.1f, 0.001f); + tmpf3 = Math_SmoothStepToF(&this->unk_1F8, this->unk_1FC, 0.8f, 0.02f, 0.001f); this->unk_1B4[0].x = this->unk_1F0 + 1.0f; this->unk_1B4[0].y = this->unk_1E8 + 1.0f; this->unk_1B4[0].x += sinf((((this->unk_200 % 0xA) * 0.1f) * 360.0f) * 0.017453292f) * this->unk_1F8; diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/src/overlays/actors/ovl_En_Guest/z_en_guest.c index 4c90a85cd0..e1e6b238f4 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -120,7 +120,7 @@ void func_80A5046C(EnGuest* this) { if (this->unk_30E >= 3) { this->unk_30E = 0; this->unk_30D = 0; - this->unk_2CA = (s32)Math_Rand_ZeroFloat(60.0f) + 20; + this->unk_2CA = (s32)Rand_ZeroFloat(60.0f) + 20; } else { this->unk_2CA = 1; } @@ -207,8 +207,8 @@ s32 EnGuest_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis } if (limbIndex == 8 || limbIndex == 9 || limbIndex == 12) { - rot->y += Math_Sins(this->unk_2CC[limbIndex]) * 200.0f; - rot->z += Math_Coss(this->unk_2EC[limbIndex]) * 200.0f; + rot->y += Math_SinS(this->unk_2CC[limbIndex]) * 200.0f; + rot->z += Math_CosS(this->unk_2EC[limbIndex]) * 200.0f; } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_guest.c", 388); diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/src/overlays/actors/ovl_En_Hata/z_en_hata.c index c0a2be3ffe..e1e85c6e6d 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -58,7 +58,7 @@ void EnHata_Init(Actor* thisx, GlobalContext* globalCtx) { this->invScale = 6; this->maxStep = 1000; this->minStep = 1; - this->unk_278 = Math_Rand_ZeroOne() * 65535.0f; + this->unk_278 = Rand_ZeroOne() * 65535.0f; } void EnHata_Destroy(Actor* thisx, GlobalContext* globalCtx) { @@ -86,19 +86,19 @@ void EnHata_Update(Actor* thisx, GlobalContext* globalCtx2) { if (globalCtx->envCtx.unk_B0 < 0.0f) { globalCtx->envCtx.unk_B0 = 0.0f; } - if (Math_Rand_ZeroOne() > 0.5f) { + if (Rand_ZeroOne() > 0.5f) { this->unk_278 += 6000; } else { this->unk_278 += 3000; } - sin = Math_Sins(this->unk_278) * 80.0f; + sin = Math_SinS(this->unk_278) * 80.0f; pitch = -Math_Vec3f_Pitch(&sp48, &sp3C); pitch = ((s32)((0x3A98 - pitch) * (1.0f - (globalCtx->envCtx.unk_B0 / (255.0f - sin))))) + pitch; - Math_SmoothScaleMaxMinS(&this->limbs[4].y, pitch, this->invScale, this->maxStep, this->minStep); + Math_SmoothStepToS(&this->limbs[4].y, pitch, this->invScale, this->maxStep, this->minStep); this->limbs[13].y = this->limbs[4].y; this->limbs[4].z = -Math_Vec3f_Yaw(&sp48, &sp3C); this->limbs[13].z = this->limbs[4].z; - this->skelAnime.animPlaybackSpeed = (Math_Rand_ZeroFloat(1.25f) + 2.75f) * (globalCtx->envCtx.unk_B0 / 255.0f); + this->skelAnime.animPlaybackSpeed = (Rand_ZeroFloat(1.25f) + 2.75f) * (globalCtx->envCtx.unk_B0 / 255.0f); } s32 EnHata_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index 09224bea9b..33c46aaa7e 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -146,7 +146,7 @@ void EnHeishi1_SetupWalk(EnHeishi1* this, GlobalContext* globalCtx) { this->transitionRate); this->bodyTurnSpeed = 0.0f; this->moveSpeed = 0.0f; - this->headDirection = Math_Rand_ZeroFloat(1.99f); + this->headDirection = Rand_ZeroFloat(1.99f); this->actionFunc = EnHeishi1_Walk; } @@ -168,17 +168,17 @@ void EnHeishi1_Walk(EnHeishi1* this, GlobalContext* globalCtx) { pointPos = SEGMENTED_TO_VIRTUAL(path->points); pointPos += this->waypoint; - Math_SmoothScaleMaxF(&this->actor.posRot.pos.x, pointPos->x, 1.0f, this->moveSpeed); - Math_SmoothScaleMaxF(&this->actor.posRot.pos.z, pointPos->z, 1.0f, this->moveSpeed); + Math_ApproachF(&this->actor.posRot.pos.x, pointPos->x, 1.0f, this->moveSpeed); + Math_ApproachF(&this->actor.posRot.pos.z, pointPos->z, 1.0f, this->moveSpeed); - Math_SmoothScaleMaxF(&this->moveSpeed, this->moveSpeedTarget, 1.0f, this->moveSpeedMax); + Math_ApproachF(&this->moveSpeed, this->moveSpeedTarget, 1.0f, this->moveSpeedMax); pathDiffX = pointPos->x - this->actor.posRot.pos.x; pathDiffZ = pointPos->z - this->actor.posRot.pos.z; - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, (Math_atan2f(pathDiffX, pathDiffZ) * 10430.378f), 3, + Math_SmoothStepToS(&this->actor.shape.rot.y, (Math_FAtan2F(pathDiffX, pathDiffZ) * 10430.378f), 3, this->bodyTurnSpeed, 0); - Math_SmoothScaleMaxF(&this->bodyTurnSpeed, this->bodyTurnSpeedTarget, 1.0f, this->bodyTurnSpeedMax); + Math_ApproachF(&this->bodyTurnSpeed, this->bodyTurnSpeedTarget, 1.0f, this->bodyTurnSpeedMax); if (this->headTimer == 0) { this->headDirection++; @@ -187,11 +187,11 @@ void EnHeishi1_Walk(EnHeishi1* this, GlobalContext* globalCtx) { if ((this->headDirection & 1) != 0) { this->headAngleTarget *= -1; } - randOffset = Math_Rand_ZeroFloat(30.0f); + randOffset = Rand_ZeroFloat(30.0f); this->headTimer = sBaseHeadTimers[this->type] + randOffset; } - Math_SmoothScaleMaxF(&this->headAngle, this->headAngleTarget, this->headTurnSpeedScale, this->headTurnSpeedMax); + Math_ApproachF(&this->headAngle, this->headAngleTarget, this->headTurnSpeedScale, this->headTurnSpeedMax); if ((this->path == BREG(1)) && (BREG(0) != 0)) { osSyncPrintf(VT_FGCOL(RED) " 種類 %d\n" VT_RST, this->path); @@ -206,7 +206,7 @@ void EnHeishi1_Walk(EnHeishi1* this, GlobalContext* globalCtx) { if ((fabsf(pathDiffX) < 20.0f) && (fabsf(pathDiffZ) < 20.0f)) { if (this->waypointTimer == 0) { if (this->type >= 2) { - if ((this->waypoint >= 4) && (Math_Rand_ZeroFloat(1.99f) > 1.0f)) { + if ((this->waypoint >= 4) && (Rand_ZeroFloat(1.99f) > 1.0f)) { if (this->waypoint == 7) { this->waypoint = 0; } @@ -238,12 +238,12 @@ void EnHeishi1_MoveToLink(EnHeishi1* this, GlobalContext* globalCtx) { Player* player = PLAYER; SkelAnime_FrameUpdateMatrix(&this->skelAnime); - Math_SmoothScaleMaxF(&this->actor.posRot.pos.x, player->actor.posRot.pos.x, 1.0f, this->moveSpeed); - Math_SmoothScaleMaxF(&this->actor.posRot.pos.z, player->actor.posRot.pos.z, 1.0f, this->moveSpeed); - Math_SmoothScaleMaxF(&this->moveSpeed, 6.0f, 1.0f, 0.4f); - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 3, this->bodyTurnSpeed, 0); - Math_SmoothScaleMaxF(&this->bodyTurnSpeed, 3000.0f, 1.0f, 300.0f); - Math_SmoothDownscaleMaxF(&this->headAngle, 0.5f, 2000.0f); + Math_ApproachF(&this->actor.posRot.pos.x, player->actor.posRot.pos.x, 1.0f, this->moveSpeed); + Math_ApproachF(&this->actor.posRot.pos.z, player->actor.posRot.pos.z, 1.0f, this->moveSpeed); + Math_ApproachF(&this->moveSpeed, 6.0f, 1.0f, 0.4f); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 3, this->bodyTurnSpeed, 0); + Math_ApproachF(&this->bodyTurnSpeed, 3000.0f, 1.0f, 300.0f); + Math_ApproachZeroF(&this->headAngle, 0.5f, 2000.0f); if (this->actor.xzDistFromLink < 70.0f) { this->actionFunc = EnHeishi1_SetupTurnTowardLink; @@ -257,8 +257,8 @@ void EnHeishi1_SetupWait(EnHeishi1* this, GlobalContext* globalCtx) { SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, this->animSpeed, 0.0f, (s16)frameCount, 0, this->transitionRate); this->headBehaviorDecided = false; - this->headDirection = Math_Rand_ZeroFloat(1.99f); - rand = Math_Rand_ZeroFloat(50.0f); + this->headDirection = Rand_ZeroFloat(1.99f); + rand = Rand_ZeroFloat(50.0f); this->waitTimer = rand + 50; this->actionFunc = EnHeishi1_Wait; } @@ -274,7 +274,7 @@ void EnHeishi1_Wait(EnHeishi1* this, GlobalContext* globalCtx) { this->headDirection++; // if headDirection is odd, face 52 degrees left this->headAngleTarget = (this->headDirection & 1) ? 0x2500 : -0x2500; - randOffset = Math_Rand_ZeroFloat(30.0f); + randOffset = Rand_ZeroFloat(30.0f); this->headTimer = sBaseHeadTimers[this->type] + randOffset; this->headBehaviorDecided = true; break; @@ -308,7 +308,7 @@ void EnHeishi1_Wait(EnHeishi1* this, GlobalContext* globalCtx) { } break; } - Math_SmoothScaleMaxF(&this->headAngle, this->headAngleTarget, this->headTurnSpeedScale, + Math_ApproachF(&this->headAngle, this->headAngleTarget, this->headTurnSpeedScale, this->headTurnSpeedMax + this->headTurnSpeedMax); if ((this->path == BREG(1)) && (BREG(0) != 0)) { @@ -333,9 +333,9 @@ void EnHeishi1_TurnTowardLink(EnHeishi1* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); if (this->type != 5) { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 3, this->bodyTurnSpeed, 0); - Math_SmoothScaleMaxF(&this->bodyTurnSpeed, 3000.0f, 1.0f, 300.0f); - Math_SmoothDownscaleMaxF(&this->headAngle, 0.5f, 2000.0f); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 3, this->bodyTurnSpeed, 0); + Math_ApproachF(&this->bodyTurnSpeed, 3000.0f, 1.0f, 300.0f); + Math_ApproachZeroF(&this->headAngle, 0.5f, 2000.0f); } if (this->kickTimer == 0) { diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index 3e44abc399..8894560524 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -636,8 +636,8 @@ void func_80A543A0(EnHeishi2* this, GlobalContext* globalCtx) { } } void func_80A544AC(EnHeishi2* this, GlobalContext* globalCtx) { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.z, -6100, 5, this->unk_2E4, 0); - Math_SmoothScaleMaxF(&this->unk_2E4, 3000.0f, 1.0f, 500.0f); + Math_SmoothStepToS(&this->actor.shape.rot.z, -6100, 5, this->unk_2E4, 0); + Math_ApproachF(&this->unk_2E4, 3000.0f, 1.0f, 500.0f); this->actor.posRot.rot.z = this->actor.shape.rot.z; if (this->actor.shape.rot.z < -6000) { func_8010B680(globalCtx, 0x708F, NULL); @@ -657,14 +657,14 @@ void func_80A5455C(EnHeishi2* this, GlobalContext* globalCtx) { func_8002DF54(globalCtx, NULL, 7); func_80106CCC(globalCtx); - pos.x = Math_Rand_CenteredFloat(20.0f) + this->unk_274.x; - pos.y = Math_Rand_CenteredFloat(20.0f) + (this->unk_274.y - 40.0f); - pos.z = Math_Rand_CenteredFloat(20.0f) + (this->unk_274.z - 20.0f); - rotY = Math_Rand_CenteredFloat(7000.0f) + thisx->yawTowardsLink; + pos.x = Rand_CenteredFloat(20.0f) + this->unk_274.x; + pos.y = Rand_CenteredFloat(20.0f) + (this->unk_274.y - 40.0f); + pos.z = Rand_CenteredFloat(20.0f) + (this->unk_274.z - 20.0f); + rotY = Rand_CenteredFloat(7000.0f) + thisx->yawTowardsLink; bomb = (EnBom*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_BOM, pos.x, pos.y, pos.z, 0, rotY, 0, 0); if (bomb != NULL) { - bomb->actor.speedXZ = Math_Rand_CenteredFloat(5.0f) + 10.0f; - bomb->actor.velocity.y = Math_Rand_CenteredFloat(5.0f) + 10.0f; + bomb->actor.speedXZ = Rand_CenteredFloat(5.0f) + 10.0f; + bomb->actor.velocity.y = Rand_CenteredFloat(5.0f) + 10.0f; } // This is down! @@ -674,8 +674,8 @@ void func_80A5455C(EnHeishi2* this, GlobalContext* globalCtx) { } void func_80A546DC(EnHeishi2* this, GlobalContext* globalCtx) { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.z, 200, 5, this->unk_2E4, 0); - Math_SmoothScaleMaxF(&this->unk_2E4, 3000.0f, 1.0f, 500.0f); + Math_SmoothStepToS(&this->actor.shape.rot.z, 200, 5, this->unk_2E4, 0); + Math_ApproachF(&this->unk_2E4, 3000.0f, 1.0f, 500.0f); this->actor.posRot.rot.z = this->actor.shape.rot.z; if (this->actor.shape.rot.z > 0) { Actor_Kill(&this->actor); diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c index e9a66717ba..2c92680668 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -177,7 +177,7 @@ void func_80A55BD4(EnHeishi3* this, GlobalContext* globalCtx) { this->actionFunc = EnHeishi3_ResetAnimationToIdle; this->actor.speedXZ = 0.0f; } else { - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 5, 3000, 0); + Math_SmoothStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 5, 3000, 0); } } diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c index f1ea9c2608..fe33fd47e5 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c @@ -121,7 +121,7 @@ void EnHintnuts_HitByScrubProjectile1(EnHintnuts* this, GlobalContext* globalCtx void EnHintnuts_SetupWait(EnHintnuts* this) { SkelAnime_ChangeAnimPlaybackStop(&this->skelAnime, &D_06002B90, 0.0f); - this->animFlagAndTimer = Math_Rand_S16Offset(100, 50); + this->animFlagAndTimer = Rand_S16Offset(100, 50); this->collider.dim.height = 5; this->actor.posRot.pos = this->actor.initPosRot.pos; this->collider.base.acFlags &= ~1; @@ -280,7 +280,7 @@ void EnHintnuts_Stand(EnHintnuts* this, GlobalContext* globalCtx) { this->animFlagAndTimer--; } if (!(this->animFlagAndTimer & 0x1000)) { - Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 2, 0xE38); + Math_ApproachS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 2, 0xE38); } if (this->actor.xzDistFromLink < 120.0f || this->animFlagAndTimer == 0x1000) { EnHintnuts_SetupBurrow(this); @@ -292,15 +292,15 @@ void EnHintnuts_Stand(EnHintnuts* this, GlobalContext* globalCtx) { void EnHintnuts_ThrowNut(EnHintnuts* this, GlobalContext* globalCtx) { Vec3f nutPos; - Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 2, 0xE38); + Math_ApproachS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 2, 0xE38); if (this->actor.xzDistFromLink < 120.0f) { EnHintnuts_SetupBurrow(this); } else if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { EnHintnuts_SetupStand(this); } else if (func_800A56C8(&this->skelAnime, 6.0f) != 0) { - nutPos.x = (Math_Sins(this->actor.shape.rot.y) * 23.0f) + this->actor.posRot.pos.x; + nutPos.x = (Math_SinS(this->actor.shape.rot.y) * 23.0f) + this->actor.posRot.pos.x; nutPos.y = this->actor.posRot.pos.y + 12.0f; - nutPos.z = (Math_Coss(this->actor.shape.rot.y) * 23.0f) + this->actor.posRot.pos.z; + nutPos.z = (Math_CosS(this->actor.shape.rot.y) * 23.0f) + this->actor.posRot.pos.z; if (Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_NUTSBALL, nutPos.x, nutPos.y, nutPos.z, this->actor.shape.rot.x, this->actor.shape.rot.y, this->actor.shape.rot.z, 1) != NULL) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_THROW); @@ -323,8 +323,8 @@ void EnHintnuts_Burrow(EnHintnuts* this, GlobalContext* globalCtx) { this->collider.base.acFlags &= ~1; } - Math_SmoothScaleMaxF(&this->actor.posRot.pos.x, this->actor.initPosRot.pos.x, 0.5f, 3.0f); - Math_SmoothScaleMaxF(&this->actor.posRot.pos.z, this->actor.initPosRot.pos.z, 0.5f, 3.0f); + Math_ApproachF(&this->actor.posRot.pos.x, this->actor.initPosRot.pos.x, 0.5f, 3.0f); + Math_ApproachF(&this->actor.posRot.pos.z, this->actor.initPosRot.pos.z, 0.5f, 3.0f); } void EnHintnuts_BeginRun(EnHintnuts* this, GlobalContext* globalCtx) { @@ -332,7 +332,7 @@ void EnHintnuts_BeginRun(EnHintnuts* this, GlobalContext* globalCtx) { this->unk_196 = this->actor.yawTowardsLink + 0x8000; EnHintnuts_SetupRun(this); } - Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 2, 0xE38); + Math_ApproachS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 2, 0xE38); } void EnHintnuts_BeginFreeze(EnHintnuts* this, GlobalContext* globalCtx) { @@ -370,8 +370,8 @@ void EnHintnuts_Run(EnHintnuts* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_WALK); } - Math_ApproxF(&this->actor.speedXZ, 7.5f, 1.0f); - if (Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->unk_196, 1, 0xE38, 0xB6) == 0) { + Math_StepToF(&this->actor.speedXZ, 7.5f, 1.0f); + if (Math_SmoothStepToS(&this->actor.posRot.rot.y, this->unk_196, 1, 0xE38, 0xB6) == 0) { if (this->actor.bgCheckFlags & 0x20) { this->unk_196 = func_8002DAC0(&this->actor, &this->actor.initPosRot.pos); } else if (this->actor.bgCheckFlags & 8) { @@ -409,7 +409,7 @@ void EnHintnuts_Run(EnHintnuts* this, GlobalContext* globalCtx) { void EnHintnuts_Talk(EnHintnuts* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0x3, 0x400, 0x100); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0x3, 0x400, 0x100); if (func_8010BDBC(&globalCtx->msgCtx) == 5) { EnHintnuts_SetupLeave(this, globalCtx); } @@ -436,7 +436,7 @@ void EnHintnuts_Leave(EnHintnuts* this, GlobalContext* globalCtx) { temp_a1 = Camera_GetCamDirYaw(globalCtx->cameraPtrs[globalCtx->activeCamera]) - (temp_a1 >> 1) + 0x8000; } } - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, temp_a1, 0x800); + Math_ScaledStepToS(&this->actor.shape.rot.y, temp_a1, 0x800); this->actor.posRot.rot.y = this->actor.shape.rot.y; if ((this->animFlagAndTimer == 0) || (this->actor.projectedPos.z < 0.0f)) { func_80106CCC(globalCtx); @@ -466,7 +466,7 @@ void EnHintnuts_Freeze(EnHintnuts* this, GlobalContext* globalCtx) { } else if (sPuzzleCounter == -4) { this->animFlagAndTimer = 2; } - } else if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y - 35.0f, 7.0f) != 0) { + } else if (Math_StepToF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y - 35.0f, 7.0f) != 0) { if (this->animFlagAndTimer == 1) { Actor_Kill(&this->actor); } else { diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c index 55ec5da305..eb0ad415d5 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -220,8 +220,8 @@ void func_80A591C0(EnHoll* this, GlobalContext* globalCtx) { } if (absY < 95.0f) { this->actor.room = globalCtx->transitionActorList[transitionActorIdx].sides[1].room; - Math_SmoothScaleMaxMinF(&player->actor.posRot.pos.x, this->actor.posRot.pos.x, 1.0f, 50.0f, 10.0f); - Math_SmoothScaleMaxMinF(&player->actor.posRot.pos.z, this->actor.posRot.pos.z, 1.0f, 50.0f, 10.0f); + Math_SmoothStepToF(&player->actor.posRot.pos.x, this->actor.posRot.pos.x, 1.0f, 50.0f, 10.0f); + Math_SmoothStepToF(&player->actor.posRot.pos.z, this->actor.posRot.pos.z, 1.0f, 50.0f, 10.0f); if (this->actor.room != globalCtx->roomCtx.curRoom.num && func_8009728C(globalCtx, &globalCtx->roomCtx, this->actor.room) != 0) { EnHoll_SetupAction(this, EnHoll_NextAction); diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c index 2391bab079..818a442e44 100644 --- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c +++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c @@ -251,14 +251,14 @@ void func_80A68E14(EnHorseGanon* this, GlobalContext* globalCtx) { Vec3f v; s32 temp1; - v.x = Math_Sins(this->actor.shape.rot.y) * 30.0f + this->actor.posRot.pos.x; + v.x = Math_SinS(this->actor.shape.rot.y) * 30.0f + this->actor.posRot.pos.x; v.y = this->actor.posRot.pos.y + 60.0f; - v.z = Math_Coss(this->actor.shape.rot.y) * 30.0f + this->actor.posRot.pos.z; + v.z = Math_CosS(this->actor.shape.rot.y) * 30.0f + this->actor.posRot.pos.z; temp_ret = func_8003C940(&globalCtx->colCtx, &col, &temp1, &v); this->unk_1F4 = temp_ret; - this->actor.shape.rot.x = 10430.3779f * Math_atan2f(this->actor.posRot.pos.y - temp_ret, 30.0f); + this->actor.shape.rot.x = 10430.3779f * Math_FAtan2F(this->actor.posRot.pos.y - temp_ret, 30.0f); } void EnHorseGanon_Update(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index 95502694b0..c670a7fcdf 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -72,7 +72,7 @@ void func_80A6948C(EnHorseLinkChild* this) { Audio_PlaySoundGeneral(NA_SE_EV_KID_HORSE_RUN, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); } else if (this->animationIdx == 1) { - if (Math_Rand_ZeroOne() > 0.5f) { + if (Rand_ZeroOne() > 0.5f) { Audio_PlaySoundGeneral(NA_SE_EV_KID_HORSE_GROAN, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); } else { @@ -399,7 +399,7 @@ void func_80A6A068(EnHorseLinkChild* this, GlobalContext* globalCtx) { void func_80A6A4DC(EnHorseLinkChild* this) { this->action = 5; - this->animationIdx = Math_Rand_ZeroOne() > 0.5f ? 0 : 1; + this->animationIdx = Rand_ZeroOne() > 0.5f ? 0 : 1; DREG(53) = 0; SkelAnime_ChangeAnim(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A695A4(this), 0.0f, SkelAnime_GetFrameCount(sAnimations[this->animationIdx]), 2, 0.0f); @@ -417,12 +417,12 @@ void func_80A6A5A4(EnHorseLinkChild* this, GlobalContext* globalCtx) { this->actor.speedXZ = 0.0f; yawDiff = func_8002DA78(&this->actor, &PLAYER->actor) - this->actor.posRot.rot.y; // 0.7071 = cos(pi/4) - if ((Math_Coss(yawDiff) < 0.7071f) && (this->animationIdx == 2)) { + if ((Math_CosS(yawDiff) < 0.7071f) && (this->animationIdx == 2)) { func_8006DD9C(&this->actor, &PLAYER->actor.posRot.pos, 300); } if (SkelAnime_FrameUpdateMatrix(&this->skin.skelAnime)) { - if (Math_Coss(yawDiff) < 0.0f) { + if (Math_CosS(yawDiff) < 0.0f) { this->animationIdx = 2; SkelAnime_ChangeAnim(&this->skin.skelAnime, sAnimations[this->animationIdx], D_80A6AF64[this->animationIdx], 0.0f, @@ -530,7 +530,7 @@ void EnHorseLinkChild_Update(Actor* thisx, GlobalContext* globalCtx) { this->actor.posRot2.pos = this->actor.posRot.pos; this->actor.posRot2.pos.y += 70.0f; - if ((Math_Rand_ZeroOne() < 0.025f) && (this->unk_1EC == 0)) { + if ((Rand_ZeroOne() < 0.025f) && (this->unk_1EC == 0)) { this->unk_1EC++; } else if (this->unk_1EC > 0) { this->unk_1EC++; diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c index 42399a6ded..73d10054c5 100644 --- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c +++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c @@ -263,7 +263,7 @@ void EnHorseNormal_FollowPath(EnHorseNormal* this, GlobalContext* globalCtx) { pointPos += this->waypoint; dx = pointPos->x - this->actor.posRot.pos.x; dz = pointPos->z - this->actor.posRot.pos.z; - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, Math_atan2f(dx, dz) * (0x8000 / M_PI), 0xA, 0x7D0, 1); + Math_SmoothStepToS(&this->actor.posRot.rot.y, Math_FAtan2F(dx, dz) * (0x8000 / M_PI), 0xA, 0x7D0, 1); this->actor.shape.rot.y = this->actor.posRot.rot.y; if (SQ(dx) + SQ(dz) < 600.0f) { this->waypoint++; @@ -344,8 +344,8 @@ void EnHorseNormal_Wander(EnHorseNormal* this, GlobalContext* globalCtx) { this->unk_218 = 0.0f; break; case 1: - if (Math_Rand_ZeroOne() < 0.1f) { - this->unk_218 = 2.0f * Math_Rand_ZeroOne() - 1.0f; + if (Rand_ZeroOne() < 0.1f) { + this->unk_218 = 2.0f * Rand_ZeroOne() - 1.0f; } this->actor.speedXZ += this->unk_218; if (this->actor.speedXZ <= 0.0f) { @@ -363,10 +363,10 @@ void EnHorseNormal_Wander(EnHorseNormal* this, GlobalContext* globalCtx) { this->actor.speedXZ = 8.0f; phi_t0 = 6; } - if (Math_Rand_ZeroOne() < 0.1f || + if (Rand_ZeroOne() < 0.1f || (this->unk_21E == 0 && (this->actor.bgCheckFlags & 8 || this->bodyCollider.base.maskA & 2 || this->headCollider.base.maskA & 2))) { - this->unk_21E += (Math_Rand_ZeroOne() * 30.0f) - 15.0f; + this->unk_21E += (Rand_ZeroOne() * 30.0f) - 15.0f; if (this->unk_21E > 50) { this->unk_21E = 50; } else if (this->unk_21E < -50) { @@ -378,7 +378,7 @@ void EnHorseNormal_Wander(EnHorseNormal* this, GlobalContext* globalCtx) { this->unk_21C = -300; } else if (this->unk_21C > 300) { this->unk_21C = 300; - } else if (Math_Rand_ZeroOne() < 0.25f && fabsf(this->unk_21C) < 100.0f) { + } else if (Rand_ZeroOne() < 0.25f && fabsf(this->unk_21C) < 100.0f) { this->unk_21C = 0; this->unk_21E = 0; } @@ -407,11 +407,11 @@ void EnHorseNormal_Wander(EnHorseNormal* this, GlobalContext* globalCtx) { } else { switch (D_80A6D510[this->animationIdx]) { case 0: - if (Math_Rand_ZeroOne() < 0.25f) { + if (Rand_ZeroOne() < 0.25f) { this->unk_218 = 1.0f; phi_t0 = 4; } else { - phi_t0 = D_80A6D4F4[(s32)(Math_Rand_ZeroOne() * 2)]; + phi_t0 = D_80A6D4F4[(s32)(Rand_ZeroOne() * 2)]; this->actor.speedXZ = 0.0f; this->unk_218 = 0.0f; } @@ -456,7 +456,7 @@ void func_80A6C4CC(EnHorseNormal* this) { void EnHorseNormal_Wait(EnHorseNormal* this, GlobalContext* globalCtx) { if (SkelAnime_FrameUpdateMatrix(&this->skin.skelAnime)) { - f32 rand = Math_Rand_ZeroOne(); + f32 rand = Rand_ZeroOne(); if (rand < 0.4f) { this->animationIdx = 0; @@ -489,7 +489,7 @@ void EnHorseNormal_WaitClone(EnHorseNormal* this, GlobalContext* globalCtx) { func_80A6BD7C(this); if (SkelAnime_FrameUpdateMatrix(&this->skin.skelAnime)) { - f32 rand = Math_Rand_ZeroOne(); + f32 rand = Rand_ZeroOne(); if (rand < 0.4f) { this->animationIdx = 0; @@ -520,11 +520,11 @@ void func_80A6C8E0(EnHorseNormal* this, GlobalContext* globalCtx) { Vec3f sp28; s32 sp24; - sp28.x = (Math_Sins(this->actor.shape.rot.y) * 30.0f) + this->actor.posRot.pos.x; + sp28.x = (Math_SinS(this->actor.shape.rot.y) * 30.0f) + this->actor.posRot.pos.x; sp28.y = this->actor.posRot.pos.y + 60.0f; - sp28.z = (Math_Coss(this->actor.shape.rot.y) * 30.0f) + this->actor.posRot.pos.z; + sp28.z = (Math_CosS(this->actor.shape.rot.y) * 30.0f) + this->actor.posRot.pos.z; this->unk_220 = func_8003C940(&globalCtx->colCtx, &sp38, &sp24, &sp28); - this->actor.shape.rot.x = Math_atan2f(this->actor.posRot.pos.y - this->unk_220, 30.0f) * (0x8000 / M_PI); + this->actor.shape.rot.x = Math_FAtan2F(this->actor.posRot.pos.y - this->unk_220, 30.0f) * (0x8000 / M_PI); } static EnHorseNormalActionFunc sActionFuncs[] = { diff --git a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c index 269a3548bb..3a1f7f8293 100644 --- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c +++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c @@ -196,11 +196,11 @@ void func_80A6DE38(EnHorseZelda* this, GlobalContext* globalCtx) { Vec3f sp28; f32 sp24; - sp28.x = (Math_Sins(this->actor.shape.rot.y) * 30.0f) + this->actor.posRot.pos.x; + sp28.x = (Math_SinS(this->actor.shape.rot.y) * 30.0f) + this->actor.posRot.pos.x; sp28.y = this->actor.posRot.pos.y + 60.0f; - sp28.z = (Math_Coss(this->actor.shape.rot.y) * 30.0f) + this->actor.posRot.pos.z; + sp28.z = (Math_CosS(this->actor.shape.rot.y) * 30.0f) + this->actor.posRot.pos.z; this->unk_1F4 = func_8003C940(&globalCtx->colCtx, &sp38, &sp24, &sp28); - this->actor.shape.rot.x = Math_atan2f(this->actor.posRot.pos.y - this->unk_1F4, 30.0f) * (0x8000 / M_PI); + this->actor.shape.rot.x = Math_FAtan2F(this->actor.posRot.pos.y - this->unk_1F4, 30.0f) * (0x8000 / M_PI); } void EnHorseZelda_Update(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c index 018f75786c..d862cecfd1 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -234,10 +234,10 @@ void EnHs_Update(Actor* thisx, GlobalContext* globalCtx) { func_80038290(globalCtx, &this->actor, &this->unk_29C, &this->unk_2A2, this->actor.posRot2.pos); this->unk_2A8 &= ~1; } else { - Math_SmoothScaleMaxMinS(&this->unk_29C.x, 12800, 6, 6200, 100); - Math_SmoothScaleMaxMinS(&this->unk_29C.y, 0, 6, 6200, 100); - Math_SmoothScaleMaxMinS(&this->unk_2A2.x, 0, 6, 6200, 100); - Math_SmoothScaleMaxMinS(&this->unk_2A2.y, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->unk_29C.x, 12800, 6, 6200, 100); + Math_SmoothStepToS(&this->unk_29C.y, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->unk_2A2.x, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->unk_2A2.y, 0, 6, 6200, 100); } } diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c index f0eaf669ba..d5c2bd623b 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -111,10 +111,10 @@ void EnHs2_Update(Actor* thisx, GlobalContext* globalCtx) { func_80038290(globalCtx, &this->actor, &this->unk_29C, &this->unk_2A2, this->actor.posRot2.pos); this->unk_2A8 &= ~1; } else { - Math_SmoothScaleMaxMinS(&this->unk_29C.x, 12800, 6, 6200, 100); - Math_SmoothScaleMaxMinS(&this->unk_29C.y, 0, 6, 6200, 100); - Math_SmoothScaleMaxMinS(&this->unk_2A2.x, 0, 6, 6200, 100); - Math_SmoothScaleMaxMinS(&this->unk_2A2.y, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->unk_29C.x, 12800, 6, 6200, 100); + Math_SmoothStepToS(&this->unk_29C.y, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->unk_2A2.x, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->unk_2A2.y, 0, 6, 6200, 100); } } diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c index 20e0c468d0..0cd1b818a6 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c @@ -142,8 +142,8 @@ void EnIceHono_Init(Actor* thisx, GlobalContext* globalCtx) { Lights_PointNoGlowSetInfo(&this->lightInfo, this->actor.posRot.pos.x, (s16)this->actor.posRot.pos.y + 10, this->actor.posRot.pos.z, 155, 210, 255, 0); this->lightNode = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfo); - this->unk_154 = Math_Rand_ZeroOne() * (0x1FFFF / 2.0f); - this->unk_156 = Math_Rand_ZeroOne() * (0x1FFFF / 2.0f); + this->unk_154 = Rand_ZeroOne() * (0x1FFFF / 2.0f); + this->unk_156 = Rand_ZeroOne() * (0x1FFFF / 2.0f); // Translates to: "(ice flame)" osSyncPrintf("(ice 炎)(arg_data 0x%04x)\n", this->actor.params); } @@ -163,9 +163,9 @@ u32 EnIceHono_LinkCloseAndFacing(EnIceHono* this, GlobalContext* globalCtx) { if (this->actor.xzDistFromLink < 60.0f) { Vec3f tempPos; - tempPos.x = Math_Sins(this->actor.yawTowardsLink + 0x8000) * 40.0f + player->actor.posRot.pos.x; + tempPos.x = Math_SinS(this->actor.yawTowardsLink + 0x8000) * 40.0f + player->actor.posRot.pos.x; tempPos.y = player->actor.posRot.pos.y; - tempPos.z = Math_Coss(this->actor.yawTowardsLink + 0x8000) * 40.0f + player->actor.posRot.pos.z; + tempPos.z = Math_CosS(this->actor.yawTowardsLink + 0x8000) * 40.0f + player->actor.posRot.pos.z; if (EnIceHono_SquareDist(&tempPos, &this->actor.posRot.pos) <= SQ(40.0f)) { return 1; } @@ -201,16 +201,16 @@ void EnIceHono_SetupActionDroppedFlame(EnIceHono* this) { void EnIceHono_DropFlame(EnIceHono* this, GlobalContext* globalCtx) { u32 bgFlag = this->actor.bgCheckFlags & 1; - Math_ApproxF(&this->actor.scale.x, 0.0017f, 0.00008f); + Math_StepToF(&this->actor.scale.x, 0.0017f, 0.00008f); this->actor.scale.z = this->actor.scale.x; - Math_ApproxF(&this->actor.scale.y, 0.0017f, 0.00008f); + Math_StepToF(&this->actor.scale.y, 0.0017f, 0.00008f); if (bgFlag != 0) { s32 i; for (i = 0; i < 8; i++) { Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ICE_HONO, this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, - ((s32)(Math_Rand_ZeroOne() * 1000.0f) + i * 0x2000) - 0x1F4, 0, 1); + ((s32)(Rand_ZeroOne() * 1000.0f) + i * 0x2000) - 0x1F4, 0, 1); } EnIceHono_SetupActionSpreadFlames(this); } @@ -235,11 +235,11 @@ void EnIceHono_SetupActionSpreadFlames(EnIceHono* this) { void EnIceHono_SpreadFlames(EnIceHono* this, GlobalContext* globalCtx) { if (this->timer > 20) { - Math_ApproxF(&this->actor.scale.x, 0.011f, 0.00014f); - Math_ApproxF(&this->actor.scale.y, 0.006f, 0.00012f); + Math_StepToF(&this->actor.scale.x, 0.011f, 0.00014f); + Math_StepToF(&this->actor.scale.y, 0.006f, 0.00012f); } else { - Math_ApproxF(&this->actor.scale.x, 0.0001f, 0.00015f); - Math_ApproxF(&this->actor.scale.y, 0.0001f, 0.00015f); + Math_StepToF(&this->actor.scale.x, 0.0001f, 0.00015f); + Math_StepToF(&this->actor.scale.y, 0.0001f, 0.00015f); } this->actor.scale.z = this->actor.scale.x; Actor_MoveForward(&this->actor); @@ -261,7 +261,7 @@ void EnIceHono_SpreadFlames(EnIceHono* this, GlobalContext* globalCtx) { s32 rot = i * 0x1999; Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ICE_HONO, this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, - ((s32)(Math_Rand_ZeroOne() * 1000.0f) + rot) - 0x1F4, 0, 2); + ((s32)(Rand_ZeroOne() * 1000.0f) + rot) - 0x1F4, 0, 2); } } @@ -275,24 +275,24 @@ void EnIceHono_SetupActionSmallFlame(EnIceHono* this) { this->timer = 44; this->alpha = 255; if (this->actor.params == 1) { - this->smallFlameTargetYScale = (Math_Rand_ZeroOne() * 0.005f) + 0.004f; - this->actor.speedXZ = (Math_Rand_ZeroOne() * 1.6f) + 0.5f; + this->smallFlameTargetYScale = (Rand_ZeroOne() * 0.005f) + 0.004f; + this->actor.speedXZ = (Rand_ZeroOne() * 1.6f) + 0.5f; } else { - this->smallFlameTargetYScale = (Math_Rand_ZeroOne() * 0.005f) + 0.003f; - this->actor.speedXZ = (Math_Rand_ZeroOne() * 2.0f) + 0.5f; + this->smallFlameTargetYScale = (Rand_ZeroOne() * 0.005f) + 0.003f; + this->actor.speedXZ = (Rand_ZeroOne() * 2.0f) + 0.5f; } } void EnIceHono_SmallFlameMove(EnIceHono* this, GlobalContext* globalCtx) { if (this->timer > 20) { - Math_ApproxF(&this->actor.scale.x, 0.006f, 0.00016f); - Math_ApproxF(&this->actor.scale.y, this->smallFlameTargetYScale * 0.667f, 0.00014f); + Math_StepToF(&this->actor.scale.x, 0.006f, 0.00016f); + Math_StepToF(&this->actor.scale.y, this->smallFlameTargetYScale * 0.667f, 0.00014f); } else { - Math_ApproxF(&this->actor.scale.x, 0.0001f, 0.00015f); - Math_ApproxF(&this->actor.scale.y, 0.0001f, 0.00015f); + Math_StepToF(&this->actor.scale.x, 0.0001f, 0.00015f); + Math_StepToF(&this->actor.scale.y, 0.0001f, 0.00015f); } this->actor.scale.z = this->actor.scale.x; - Math_ApproxF(&this->actor.speedXZ, 0, 0.06f); + Math_StepToF(&this->actor.speedXZ, 0, 0.06f); Actor_MoveForward(&this->actor); func_8002E4B4(globalCtx, &this->actor, 10.0f, 10.0f, 0.0f, 5); @@ -322,9 +322,9 @@ void EnIceHono_Update(Actor* thisx, GlobalContext* globalCtx) { if ((this->actor.params == -1) || (this->actor.params == 0)) { this->unk_154 += 0x1111; this->unk_156 += 0x4000; - sin156 = Math_Sins(this->unk_156); - sin154 = Math_Sins(this->unk_154); - intensity = (Math_Rand_ZeroOne() * 0.05f) + ((sin154 * 0.125f) + (sin156 * 0.1f)) + 0.425f; + sin156 = Math_SinS(this->unk_156); + sin154 = Math_SinS(this->unk_154); + intensity = (Rand_ZeroOne() * 0.05f) + ((sin154 * 0.125f) + (sin156 * 0.1f)) + 0.425f; if ((intensity > 0.7f) || (intensity < 0.2f)) { // Translates to: "impossible value(ratio = %f)" osSyncPrintf("ありえない値(ratio = %f)\n", intensity); diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 6c9407a40e..8c8177ab04 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -319,9 +319,9 @@ void func_80A74BA4(EnIk* this, GlobalContext* globalCtx) { if ((this->actor.bgCheckFlags & 8) && (ABS(temp_a1) >= 0x4000)) { temp_a1 = (this->actor.yawTowardsLink > 0) ? this->actor.wallPolyRot - 0x4000 : this->actor.wallPolyRot + 0x4000; - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, temp_a1, 1, phi_a3, 0); + Math_SmoothStepToS(&this->actor.posRot.rot.y, temp_a1, 1, phi_a3, 0); } else { - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 1, phi_a3, 0); + Math_SmoothStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 1, phi_a3, 0); } this->actor.shape.rot.y = this->actor.posRot.rot.y; yawDiff = this->actor.yawTowardsLink - this->actor.shape.rot.y; @@ -371,8 +371,8 @@ void func_80A74EBC(EnIk* this, GlobalContext* globalCtx) { if (this->skelAnime.animCurrentFrame == 15.0f) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_IRONNACK_SWING_AXE); } else if (this->skelAnime.animCurrentFrame == 21.0f) { - sp2C.x = this->actor.posRot.pos.x + Math_Sins(this->actor.shape.rot.y + 0x6A4) * 70.0f; - sp2C.z = this->actor.posRot.pos.z + Math_Coss(this->actor.shape.rot.y + 0x6A4) * 70.0f; + sp2C.x = this->actor.posRot.pos.x + Math_SinS(this->actor.shape.rot.y + 0x6A4) * 70.0f; + sp2C.z = this->actor.posRot.pos.z + Math_CosS(this->actor.shape.rot.y + 0x6A4) * 70.0f; sp2C.y = this->actor.posRot.pos.y; Audio_PlayActorSound2(&this->actor, NA_SE_EN_IRONNACK_HIT_GND); Camera_AddQuake(&globalCtx->mainCamera, 2, 0x19, 5); @@ -384,7 +384,7 @@ void func_80A74EBC(EnIk* this, GlobalContext* globalCtx) { this->unk_2FE = 1; } else { if ((this->unk_2FB != 0) && (this->skelAnime.animCurrentFrame < 10.0f)) { - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 1, 0x5DC, 0); + Math_SmoothStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 1, 0x5DC, 0); this->actor.shape.rot.y = this->actor.posRot.rot.y; } this->unk_2FE = 0; @@ -437,7 +437,7 @@ void func_80A75260(EnIk* this, GlobalContext* globalCtx) { f32 temp_f0; this->unk_300 += 0x1C2; - temp_f0 = Math_Sins(this->unk_300); + temp_f0 = Math_SinS(this->unk_300); this->skelAnime.animPlaybackSpeed = ABS(temp_f0); if (this->skelAnime.animCurrentFrame > 11.0f) { @@ -446,7 +446,7 @@ void func_80A75260(EnIk* this, GlobalContext* globalCtx) { if (((this->skelAnime.animCurrentFrame > 1.0f) && (this->skelAnime.animCurrentFrame < 9.0f)) || ((this->skelAnime.animCurrentFrame > 13.0f) && (this->skelAnime.animCurrentFrame < 18.0f))) { if ((this->unk_2FC == 0) && (this->unk_2FB != 0) && (this->skelAnime.animCurrentFrame < 10.0f)) { - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 1, 0x5DC, 0); + Math_SmoothStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 1, 0x5DC, 0); this->actor.shape.rot.y = this->actor.posRot.rot.y; } if (this->unk_2FE < 0) { @@ -488,7 +488,7 @@ void func_80A754A0(EnIk* this) { } void func_80A75530(EnIk* this, GlobalContext* globalCtx) { - func_80077AF8(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 0x7D0); + Math_StepUntilS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 0x7D0); this->actor.shape.rot.y = this->actor.posRot.rot.y; if ((this->skelAnime.animCurrentFrame > 13.0f) && (this->skelAnime.animCurrentFrame < 18.0f)) { if (this->unk_2FE < 0) { @@ -549,7 +549,7 @@ void func_80A75790(EnIk* this) { } void func_80A758B0(EnIk* this, GlobalContext* globalCtx) { - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 1.0f, 1.0f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 1.0f, 0.0f); if (func_8003305C(&this->actor, &this->unk_308, globalCtx, this->actor.params + 4)) { this->unk_308.unk_10 = 0; } @@ -586,9 +586,9 @@ void func_80A75A38(EnIk* this, GlobalContext* globalCtx) { this->unk_2F9--; for (i = 0xC - (this->unk_2F9 >> 1); i >= 0; i--) { - pos.x = this->actor.posRot.pos.x + Math_Rand_CenteredFloat(120.0f); - pos.z = this->actor.posRot.pos.z + Math_Rand_CenteredFloat(120.0f); - pos.y = this->actor.posRot.pos.y + 20.0f + Math_Rand_CenteredFloat(50.0f); + pos.x = this->actor.posRot.pos.x + Rand_CenteredFloat(120.0f); + pos.z = this->actor.posRot.pos.z + Rand_CenteredFloat(120.0f); + pos.y = this->actor.posRot.pos.y + 20.0f + Rand_CenteredFloat(50.0f); EffectSsDeadDb_Spawn(globalCtx, &pos, &sp7C, &sp7C, 100, 0, 255, 255, 255, 255, 0, 0, 255, 1, 9, true); } if (this->unk_2F9 == 0) { @@ -666,8 +666,8 @@ void func_80A75C38(EnIk* this, GlobalContext* globalCtx) { func_80032C7C(globalCtx, &this->actor); return; } - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 1, 0x7D0, 0); - if ((this->actor.params == 0) && (Math_Rand_ZeroOne() < 0.5f)) { + Math_SmoothStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 1, 0x7D0, 0); + if ((this->actor.params == 0) && (Rand_ZeroOne() < 0.5f)) { if (ABS((s16)(this->actor.yawTowardsLink - this->actor.shape.rot.y)) > 0x4000) { func_80A754A0(this); } @@ -958,7 +958,7 @@ void func_80A76E2C(EnIk* this, GlobalContext* globalCtx, Vec3f* pos) { Vec3f effectPos; Matrix_MultVec3f(&D_80A78514[i], &effectPos); - temp_v0 = (Math_Rand_ZeroOne() * 20.0f) - 10.0f; + temp_v0 = (Rand_ZeroOne() * 20.0f) - 10.0f; primColor.r += temp_v0; primColor.g += temp_v0; primColor.b += temp_v0; @@ -966,7 +966,7 @@ void func_80A76E2C(EnIk* this, GlobalContext* globalCtx, Vec3f* pos) { envColor.g += temp_v0; envColor.b += temp_v0; func_8002829C(globalCtx, &effectPos, &effectVelocity, &effectAccel, &primColor, &envColor, - (Math_Rand_ZeroOne() * 60.0f) + 300.0f, 0); + (Rand_ZeroOne() * 60.0f) + 300.0f, 0); } this->unk_4D4 = 1; diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index 6dfa611811..d3c9633a99 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -81,9 +81,9 @@ s32 func_80A7BE6C(EnInsect* this, GlobalContext* globalCtx) { Vec3f pos; if (this->actor.xzDistFromLink < 32.0f) { - pos.x = Math_Sins(this->actor.yawTowardsLink + 0x8000) * 16.0f + player->actor.posRot.pos.x; + pos.x = Math_SinS(this->actor.yawTowardsLink + 0x8000) * 16.0f + player->actor.posRot.pos.x; pos.y = player->actor.posRot.pos.y; - pos.z = Math_Coss(this->actor.yawTowardsLink + 0x8000) * 16.0f + player->actor.posRot.pos.z; + pos.z = Math_CosS(this->actor.yawTowardsLink + 0x8000) * 16.0f + player->actor.posRot.pos.z; if (EnInsect_XZDistanceSquared(&pos, &this->actor.posRot.pos) <= 400.0f) { return 1; @@ -167,7 +167,7 @@ void EnInsect_Init(Actor* thisx, GlobalContext* globalCtx) { } if (this->unk_314 & 4) { - this->unk_31C = Math_Rand_S16Offset(200, 40); + this->unk_31C = Rand_S16Offset(200, 40); this->actor.flags |= 0x10; } @@ -196,7 +196,7 @@ void EnInsect_Init(Actor* thisx, GlobalContext* globalCtx) { D_80A7DEB8++; } else { - rand = Math_Rand_ZeroOne(); + rand = Rand_ZeroOne(); if (rand < 0.3f) { func_80A7C3A0(this); @@ -220,7 +220,7 @@ void EnInsect_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void func_80A7C3A0(EnInsect* this) { - this->unk_31A = Math_Rand_S16Offset(5, 35); + this->unk_31A = Rand_S16Offset(5, 35); func_80A7BF58(this); this->actionFunc = func_80A7C3F4; this->unk_314 |= 0x100; @@ -233,9 +233,9 @@ void func_80A7C3F4(EnInsect* this, GlobalContext* globalCtx) { sp2E = this->actor.params & 3; - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 0.1f, 0.5f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 0.1f, 0.5f, 0.0f); - animPlaybackSpeed = (Math_Rand_ZeroOne() * 0.8f) + (this->actor.speedXZ * 1.2f); + animPlaybackSpeed = (Rand_ZeroOne() * 0.8f) + (this->actor.speedXZ * 1.2f); this->skelAnime.animPlaybackSpeed = CLAMP(animPlaybackSpeed, 0.0f, 1.9f); SkelAnime_FrameUpdateMatrix(&this->skelAnime); @@ -255,7 +255,7 @@ void func_80A7C3F4(EnInsect* this, GlobalContext* globalCtx) { } void func_80A7C598(EnInsect* this) { - this->unk_31A = Math_Rand_S16Offset(10, 45); + this->unk_31A = Rand_S16Offset(10, 45); func_80A7BF58(this); this->actionFunc = func_80A7C5EC; this->unk_314 |= 0x100; @@ -267,15 +267,15 @@ void func_80A7C5EC(EnInsect* this, GlobalContext* globalCtx) { s16 yaw; s16 sp34 = this->actor.params & 3; - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 1.5f, 0.1f, 0.5f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 1.5f, 0.1f, 0.5f, 0.0f); if (EnInsect_XZDistanceSquared(&this->actor.posRot.pos, &this->actor.initPosRot.pos) > 1600.0f || (this->unk_31A < 4)) { yaw = Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->actor.initPosRot.pos); - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, yaw, 2000); + Math_ScaledStepToS(&this->actor.posRot.rot.y, yaw, 2000); } else if (this->actor.child != NULL && &this->actor != this->actor.child) { yaw = Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->actor.child->posRot.pos); - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, yaw, 2000); + Math_ScaledStepToS(&this->actor.posRot.rot.y, yaw, 2000); } this->actor.shape.rot.y = this->actor.posRot.rot.y; @@ -298,7 +298,7 @@ void func_80A7C5EC(EnInsect* this, GlobalContext* globalCtx) { } void func_80A7C818(EnInsect* this) { - this->unk_31A = Math_Rand_S16Offset(10, 40); + this->unk_31A = Rand_S16Offset(10, 40); func_80A7BF58(this); this->actionFunc = func_80A7C86C; this->unk_314 |= 0x100; @@ -312,12 +312,12 @@ void func_80A7C86C(EnInsect* this, GlobalContext* globalCtx) { s16 yaw; s16 sp38 = this->actor.xzDistFromLink < 40.0f; - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 1.8f, 0.1f, 0.5f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 1.8f, 0.1f, 0.5f, 0.0f); if (EnInsect_XZDistanceSquared(&this->actor.posRot.pos, &this->actor.initPosRot.pos) > 25600.0f || this->unk_31A < 4) { yaw = Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->actor.initPosRot.pos); - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, yaw, 2000); + Math_ScaledStepToS(&this->actor.posRot.rot.y, yaw, 2000); } else if (sp38 != 0) { frames = globalCtx->state.frames; yaw = this->actor.yawTowardsLink + 0x8000; @@ -332,7 +332,7 @@ void func_80A7C86C(EnInsect* this, GlobalContext* globalCtx) { } } if (globalCtx) {} - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, yaw, 2000); + Math_ScaledStepToS(&this->actor.posRot.rot.y, yaw, 2000); } this->actor.shape.rot.y = this->actor.posRot.rot.y; this->skelAnime.animPlaybackSpeed = CLAMP(this->actor.speedXZ * 1.6f, 0.8f, 1.9f); @@ -393,23 +393,23 @@ void func_80A7CC3C(EnInsect* this, GlobalContext* globalCtx) { s32 pad[2]; Vec3f velocity; - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 0.1f, 0.5f, 0.0f); - Math_ApproxS(&this->actor.shape.rot.x, 10922, 352); + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 0.1f, 0.5f, 0.0f); + Math_StepToS(&this->actor.shape.rot.x, 10922, 352); Actor_SetScale(&this->actor, CLAMP_MIN(this->actor.scale.x - 0.0002f, 0.001f)); this->actor.shape.unk_08 -= 0.8f; - this->actor.posRot.pos.x = Math_Rand_ZeroOne() + this->actor.initPosRot.pos.x - 0.5f; - this->actor.posRot.pos.z = Math_Rand_ZeroOne() + this->actor.initPosRot.pos.z - 0.5f; + this->actor.posRot.pos.x = Rand_ZeroOne() + this->actor.initPosRot.pos.x - 0.5f; + this->actor.posRot.pos.z = Rand_ZeroOne() + this->actor.initPosRot.pos.z - 0.5f; SkelAnime_FrameUpdateMatrix(&this->skelAnime); - if (this->unk_31A > 20 && Math_Rand_ZeroOne() < 0.1f) { - velocity.x = Math_Sins(this->actor.shape.rot.y) * -0.6f; - velocity.y = Math_Sins(this->actor.shape.rot.x) * 0.6f; - velocity.z = Math_Coss(this->actor.shape.rot.y) * -0.6f; - func_800286CC(globalCtx, &this->actor.posRot.pos, &velocity, &accel, Math_Rand_ZeroOne() * 5.0f + 8.0f, - Math_Rand_ZeroOne() * 5.0f + 8.0f); + if (this->unk_31A > 20 && Rand_ZeroOne() < 0.1f) { + velocity.x = Math_SinS(this->actor.shape.rot.y) * -0.6f; + velocity.y = Math_SinS(this->actor.shape.rot.x) * 0.6f; + velocity.z = Math_CosS(this->actor.shape.rot.y) * -0.6f; + func_800286CC(globalCtx, &this->actor.posRot.pos, &velocity, &accel, Rand_ZeroOne() * 5.0f + 8.0f, + Rand_ZeroOne() * 5.0f + 8.0f); } if (this->unk_31A <= 0) { @@ -422,7 +422,7 @@ void func_80A7CC3C(EnInsect* this, GlobalContext* globalCtx) { } void func_80A7CE60(EnInsect* this) { - this->unk_31A = Math_Rand_S16Offset(120, 50); + this->unk_31A = Rand_S16Offset(120, 50); func_80A7BF58(this); this->unk_316 = this->unk_318 = 0; this->actionFunc = func_80A7CEC0; @@ -441,9 +441,9 @@ void func_80A7CEC0(EnInsect* this, GlobalContext* globalCtx) { sp4E = this->actor.params & 3; if (this->unk_31A >= 81) { - Math_ApproxF(&this->actor.speedXZ, 0.6f, 0.08f); + Math_StepToF(&this->actor.speedXZ, 0.6f, 0.08f); } else { - Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.02f); + Math_StepToF(&this->actor.speedXZ, 0.0f, 0.02f); } this->actor.velocity.y = 0.0f; this->actor.posRot.pos.y += this->actor.waterY; @@ -452,8 +452,8 @@ void func_80A7CEC0(EnInsect* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); if (this->unk_31A >= 81) { - this->unk_316 += Math_Rand_S16Offset(-50, 100); - this->unk_318 += Math_Rand_S16Offset(-300, 600); + this->unk_316 += Rand_S16Offset(-50, 100); + this->unk_318 += Rand_S16Offset(-300, 600); } temp_v1 = this->skelAnime.animPlaybackSpeed * 200.0f; @@ -483,10 +483,10 @@ void func_80A7CEC0(EnInsect* this, GlobalContext* globalCtx) { } this->actor.shape.rot.y += this->unk_318; - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.x, 0, 3000); + Math_ScaledStepToS(&this->actor.posRot.rot.x, 0, 3000); this->actor.shape.rot.x = this->actor.posRot.rot.x; - if (Math_Rand_ZeroOne() < 0.03f) { + if (Rand_ZeroOne() < 0.03f) { sp40.x = this->actor.posRot.pos.x; sp40.y = this->actor.posRot.pos.y + this->actor.waterY; sp40.z = this->actor.posRot.pos.z; @@ -524,9 +524,8 @@ void func_80A7D26C(EnInsect* this, GlobalContext* globalCtx) { this->actor.shape.rot.y += 200; Actor_SetScale(&this->actor, CLAMP_MIN(this->actor.scale.x - 0.00005f, 0.001f)); - if (this->actor.waterY > 5.0f && this->actor.waterY < 30.0f && Math_Rand_ZeroOne() < 0.3f) { - EffectSsBubble_Spawn(globalCtx, &this->actor.posRot.pos, -5.0f, 5.0f, 5.0f, - (Math_Rand_ZeroOne() * 0.04f) + 0.02f); + if (this->actor.waterY > 5.0f && this->actor.waterY < 30.0f && Rand_ZeroOne() < 0.3f) { + EffectSsBubble_Spawn(globalCtx, &this->actor.posRot.pos, -5.0f, 5.0f, 5.0f, (Rand_ZeroOne() * 0.04f) + 0.02f); } if (this->unk_31A <= 0) { @@ -538,9 +537,9 @@ void func_80A7D39C(EnInsect* this) { func_80A7BF58(this); this->unk_31A = 100; this->unk_324 = 1.5f; - this->unk_328 = Math_Rand_ZeroOne() * 65535.5f; - this->unk_316 = (Math_Rand_ZeroOne() - 0.5f) * 1500.0f; - this->actor.posRot.rot.y = Math_Rand_ZeroOne() * 65535.5f; + this->unk_328 = Rand_ZeroOne() * 65535.5f; + this->unk_316 = (Rand_ZeroOne() - 0.5f) * 1500.0f; + this->actor.posRot.rot.y = Rand_ZeroOne() * 65535.5f; Actor_SetScale(&this->actor, 0.003f); this->actionFunc = func_80A7D460; this->unk_314 |= 0x100; @@ -590,20 +589,20 @@ void func_80A7D460(EnInsect* this, GlobalContext* globalCtx) { } } - if (this->soilActor != NULL && Math_Rand_ZeroOne() < 0.07f) { - this->actor.initPosRot.pos.x = (Math_Rand_ZeroOne() - 0.5f) * phi_f2 + thisTemp->soilActor->actor.posRot.pos.x; + if (this->soilActor != NULL && Rand_ZeroOne() < 0.07f) { + this->actor.initPosRot.pos.x = (Rand_ZeroOne() - 0.5f) * phi_f2 + thisTemp->soilActor->actor.posRot.pos.x; this->actor.initPosRot.pos.y = thisTemp->soilActor->actor.posRot.pos.y; - this->actor.initPosRot.pos.z = (Math_Rand_ZeroOne() - 0.5f) * phi_f2 + thisTemp->soilActor->actor.posRot.pos.z; + this->actor.initPosRot.pos.z = (Rand_ZeroOne() - 0.5f) * phi_f2 + thisTemp->soilActor->actor.posRot.pos.z; } if (D_80A7DEB0 > 0.999f) { this->unk_328 = Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->actor.initPosRot.pos); - this->unk_324 = Math_Rand_ZeroOne() * 0.6f + 0.6f; - } else if (Math_Rand_ZeroOne() < 0.07f) { + this->unk_324 = Rand_ZeroOne() * 0.6f + 0.6f; + } else if (Rand_ZeroOne() < 0.07f) { if (this->unk_324 > 1.0f) { this->unk_324 = 0.1f; } else { - this->unk_324 = Math_Rand_ZeroOne() * 0.8f + 1.0f; + this->unk_324 = Rand_ZeroOne() * 0.8f + 1.0f; } sp34 = 1.3f - D_80A7DEB0; @@ -618,28 +617,28 @@ void func_80A7D460(EnInsect* this, GlobalContext* globalCtx) { sp34 = phi_f0; } - sp38 = (Math_Rand_ZeroOne() - 0.5f) * 65535.0f * sp34; + sp38 = (Rand_ZeroOne() - 0.5f) * 65535.0f * sp34; this->unk_328 = Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->actor.initPosRot.pos) + sp38; } Actor_SetScale(&this->actor, CLAMP_MAX(thisTemp->actor.scale.x + 0.0008f, 0.01f)); if (this->actor.bgCheckFlags & 1) { - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, this->unk_324, 0.1f, 0.5f, 0.0f); - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->unk_328, 2000); - sp50 = Math_ApproxUpdateScaledS(&this->actor.posRot.rot.x, 0, 2000); + Math_SmoothStepToF(&this->actor.speedXZ, this->unk_324, 0.1f, 0.5f, 0.0f); + Math_ScaledStepToS(&this->actor.posRot.rot.y, this->unk_328, 2000); + sp50 = Math_ScaledStepToS(&this->actor.posRot.rot.x, 0, 2000); this->actor.shape.rot.y = this->actor.posRot.rot.y; this->actor.shape.rot.x = this->actor.posRot.rot.x; } else { - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 0.1f, 0.5f, 0.0f); - this->actor.speedXZ += (Math_Rand_ZeroOne() - 0.5f) * 0.14f; - this->actor.velocity.y += Math_Rand_ZeroOne() * 0.12f; + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 0.1f, 0.5f, 0.0f); + this->actor.speedXZ += (Rand_ZeroOne() - 0.5f) * 0.14f; + this->actor.velocity.y += Rand_ZeroOne() * 0.12f; this->actor.posRot.rot.y += this->unk_316; this->actor.shape.rot.y = this->actor.posRot.rot.y; this->actor.shape.rot.x -= 2000; } - phi_f2 = Math_Rand_ZeroOne() * 0.5f + this->actor.speedXZ * 1.3f; + phi_f2 = Rand_ZeroOne() * 0.5f + this->actor.speedXZ * 1.3f; if (phi_f2 < 0.0f) { this->skelAnime.animPlaybackSpeed = 0.0f; } else { diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index 9523b8462f..9c44b67481 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -121,9 +121,9 @@ void EnIshi_SpawnFragmentsSmall(EnIshi* this, GlobalContext* globalCtx) { s32 i; for (i = 0; i < ARRAY_COUNT(scales); i++) { - pos.x = this->actor.posRot.pos.x + (Math_Rand_ZeroOne() - 0.5f) * 8.0f; - pos.y = this->actor.posRot.pos.y + (Math_Rand_ZeroOne() * 5.0f) + 5.0f; - pos.z = this->actor.posRot.pos.z + (Math_Rand_ZeroOne() - 0.5f) * 8.0f; + pos.x = this->actor.posRot.pos.x + (Rand_ZeroOne() - 0.5f) * 8.0f; + pos.y = this->actor.posRot.pos.y + (Rand_ZeroOne() * 5.0f) + 5.0f; + pos.z = this->actor.posRot.pos.z + (Rand_ZeroOne() - 0.5f) * 8.0f; Math_Vec3f_Copy(&velocity, &this->actor.velocity); if (this->actor.bgCheckFlags & 1) { velocity.x *= 0.8f; @@ -134,10 +134,10 @@ void EnIshi_SpawnFragmentsSmall(EnIshi* this, GlobalContext* globalCtx) { velocity.y *= 0.8f; velocity.z *= -0.8f; } - velocity.x += (Math_Rand_ZeroOne() - 0.5f) * 11.0f; - velocity.y += Math_Rand_ZeroOne() * 6.0f; - velocity.z += (Math_Rand_ZeroOne() - 0.5f) * 11.0f; - if (Math_Rand_ZeroOne() < 0.5f) { + velocity.x += (Rand_ZeroOne() - 0.5f) * 11.0f; + velocity.y += Rand_ZeroOne() * 6.0f; + velocity.z += (Rand_ZeroOne() - 0.5f) * 11.0f; + if (Rand_ZeroOne() < 0.5f) { phi_v0 = 65; } else { phi_v0 = 33; @@ -160,10 +160,10 @@ void EnIshi_SpawnFragmentsLarge(EnIshi* this, GlobalContext* globalCtx) { for (i = 0; i < ARRAY_COUNT(scales); i++) { angle += 0x4E20; - rand = Math_Rand_ZeroOne() * 10.0f; - pos.x = this->actor.posRot.pos.x + (Math_Sins(angle) * rand); - pos.y = this->actor.posRot.pos.y + (Math_Rand_ZeroOne() * 40.0f) + 5.0f; - pos.z = this->actor.posRot.pos.z + (Math_Coss(angle) * rand); + rand = Rand_ZeroOne() * 10.0f; + pos.x = this->actor.posRot.pos.x + (Math_SinS(angle) * rand); + pos.y = this->actor.posRot.pos.y + (Rand_ZeroOne() * 40.0f) + 5.0f; + pos.z = this->actor.posRot.pos.z + (Math_CosS(angle) * rand); Math_Vec3f_Copy(&velocity, &thisx->velocity); if (thisx->bgCheckFlags & 1) { velocity.x *= 0.9f; @@ -174,10 +174,10 @@ void EnIshi_SpawnFragmentsLarge(EnIshi* this, GlobalContext* globalCtx) { velocity.y *= 0.8f; velocity.z *= -0.9f; } - rand = Math_Rand_ZeroOne() * 10.0f; - velocity.x += rand * Math_Sins(angle); - velocity.y += (Math_Rand_ZeroOne() * 4.0f) + ((Math_Rand_ZeroOne() * i) * 0.7f); - velocity.z += rand * Math_Coss(angle); + rand = Rand_ZeroOne() * 10.0f; + velocity.x += rand * Math_SinS(angle); + velocity.y += (Rand_ZeroOne() * 4.0f) + ((Rand_ZeroOne() * i) * 0.7f); + velocity.z += rand * Math_CosS(angle); if (i == 0) { phi_v0 = 41; phi_v1 = -450; @@ -248,7 +248,7 @@ void EnIshi_Fall(EnIshi* this) { } void func_80A7ED94(Vec3f* arg0, f32 arg1) { - arg1 += ((Math_Rand_ZeroOne() * 0.2f) - 0.1f) * arg1; + arg1 += ((Rand_ZeroOne() * 0.2f) - 0.1f) * arg1; arg0->x -= arg0->x * arg1; arg0->y -= arg0->y * arg1; arg0->z -= arg0->z * arg1; @@ -258,9 +258,8 @@ void EnIshi_SpawnBugs(EnIshi* this, GlobalContext* globalCtx) { s32 i; for (i = 0; i < 3; i++) { - Actor* bug = - Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_INSECT, this->actor.posRot.pos.x, - this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, Math_Rand_ZeroOne() * 0xFFFF, 0, 1); + Actor* bug = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_INSECT, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, Rand_ZeroOne() * 0xFFFF, 0, 1); if (bug == NULL) { break; @@ -294,7 +293,7 @@ void EnIshi_Init(Actor* thisx, GlobalContext* globalCtx) { this->actor.uncullZoneForward += 1000.0f; } if (this->actor.shape.rot.y == 0) { - this->actor.shape.rot.y = this->actor.posRot.rot.y = Math_Rand_ZeroFloat(0x10000); + this->actor.shape.rot.y = this->actor.posRot.rot.y = Rand_ZeroFloat(0x10000); } Actor_SetScale(&this->actor, sRockScales[type]); EnIshi_InitCollider(&this->actor, globalCtx); @@ -379,14 +378,14 @@ void EnIshi_LiftedUp(EnIshi* this, GlobalContext* globalCtx) { } void EnIshi_SetupFly(EnIshi* this) { - this->actor.velocity.x = Math_Sins(this->actor.posRot.rot.y) * this->actor.speedXZ; - this->actor.velocity.z = Math_Coss(this->actor.posRot.rot.y) * this->actor.speedXZ; + this->actor.velocity.x = Math_SinS(this->actor.posRot.rot.y) * this->actor.speedXZ; + this->actor.velocity.z = Math_CosS(this->actor.posRot.rot.y) * this->actor.speedXZ; if ((this->actor.params & 1) == ROCK_SMALL) { - sRotSpeedX = (Math_Rand_ZeroOne() - 0.5f) * 16000.0f; - sRotSpeedY = (Math_Rand_ZeroOne() - 0.5f) * 2400.0f; + sRotSpeedX = (Rand_ZeroOne() - 0.5f) * 16000.0f; + sRotSpeedY = (Rand_ZeroOne() - 0.5f) * 2400.0f; } else { - sRotSpeedX = (Math_Rand_ZeroOne() - 0.5f) * 8000.0f; - sRotSpeedY = (Math_Rand_ZeroOne() - 0.5f) * 1600.0f; + sRotSpeedX = (Rand_ZeroOne() - 0.5f) * 8000.0f; + sRotSpeedY = (Rand_ZeroOne() - 0.5f) * 1600.0f; } this->actor.colChkInfo.mass = 240; this->actionFunc = EnIshi_Fly; @@ -437,7 +436,7 @@ void EnIshi_Fly(EnIshi* this, GlobalContext* globalCtx) { Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_DIVE_INTO_WATER_L); this->actor.bgCheckFlags &= ~0x40; } - Math_ApproxF(&this->actor.shape.unk_08, 0.0f, 2.0f); + Math_StepToF(&this->actor.shape.unk_08, 0.0f, 2.0f); EnIshi_Fall(this); func_80A7ED94(&this->actor.velocity, D_80A7FA28[type]); func_8002D7EC(&this->actor); diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c index d97d69ec5b..dcd6a3b194 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -164,10 +164,10 @@ void EnJs_Update(Actor* thisx, GlobalContext* globalCtx) { if (this->actor.bgCheckFlags & 1) { if (func_80041F34(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorPolySource) == 1) { - Math_SmoothScaleMaxF(&this->actor.shape.unk_08, sREG(80) + -2000.0f, 1.0f, (sREG(81) / 10.0f) + 50.0f); + Math_ApproachF(&this->actor.shape.unk_08, sREG(80) + -2000.0f, 1.0f, (sREG(81) / 10.0f) + 50.0f); } } else { - Math_SmoothDownscaleMaxF(&this->actor.shape.unk_08, 1.0f, (sREG(81) / 10.0f) + 50.0f); + Math_ApproachZeroF(&this->actor.shape.unk_08, 1.0f, (sREG(81) / 10.0f) + 50.0f); } if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { this->skelAnime.animCurrentFrame = 0.0f; @@ -176,15 +176,15 @@ void EnJs_Update(Actor* thisx, GlobalContext* globalCtx) { if (this->unk_284 & 1) { func_80038290(globalCtx, &this->actor, &this->unk_278, &this->unk_27E, this->actor.posRot2.pos); } else { - Math_SmoothScaleMaxMinS(&this->unk_278.x, 0, 6, 0x1838, 0x64); - Math_SmoothScaleMaxMinS(&this->unk_278.y, 0, 6, 0x1838, 0x64); - Math_SmoothScaleMaxMinS(&this->unk_27E.x, 0, 6, 0x1838, 0x64); - Math_SmoothScaleMaxMinS(&this->unk_27E.y, 0, 6, 0x1838, 0x64); + Math_SmoothStepToS(&this->unk_278.x, 0, 6, 0x1838, 0x64); + Math_SmoothStepToS(&this->unk_278.y, 0, 6, 0x1838, 0x64); + Math_SmoothStepToS(&this->unk_27E.x, 0, 6, 0x1838, 0x64); + Math_SmoothStepToS(&this->unk_27E.y, 0, 6, 0x1838, 0x64); } this->unk_284 &= ~0x1; if (DECR(this->unk_288) == 0) { - this->unk_288 = Math_Rand_S16Offset(0x3C, 0x3C); + this->unk_288 = Rand_S16Offset(0x3C, 0x3C); } this->unk_286 = this->unk_288; diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index 627e27c3c1..bbff6a4e08 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -75,10 +75,10 @@ void func_80A8F28C(EnKakasi* this) { this->skelanime.animPlaybackSpeed = 0.0f; this->unk_1A8 = this->unk_1AC = 0; - Math_SmoothDownscaleMaxF(&this->skelanime.animCurrentFrame, 0.5f, 1.0f); - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, this->rot.x, 5, 0x2710, 0); - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->rot.y, 5, 0x2710, 0); - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.z, this->rot.z, 5, 0x2710, 0); + Math_ApproachZeroF(&this->skelanime.animCurrentFrame, 0.5f, 1.0f); + Math_SmoothStepToS(&this->actor.shape.rot.x, this->rot.x, 5, 0x2710, 0); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->rot.y, 5, 0x2710, 0); + Math_SmoothStepToS(&this->actor.shape.rot.z, this->rot.z, 5, 0x2710, 0); } void func_80A8F320(EnKakasi* this, GlobalContext* globalCtx, s16 arg) { @@ -88,11 +88,11 @@ void func_80A8F320(EnKakasi* this, GlobalContext* globalCtx, s16 arg) { phi_v0 = globalCtx->msgCtx.unk_E410[0]; if (arg != 0) { if (this->unk_19C[3] == 0) { - this->unk_19C[3] = (s16)Math_Rand_ZeroFloat(10.99f) + 30; - this->unk_1A6 = (s16)Math_Rand_ZeroFloat(4.99f); + this->unk_19C[3] = (s16)Rand_ZeroFloat(10.99f) + 30; + this->unk_1A6 = (s16)Rand_ZeroFloat(4.99f); } - this->unk_19A = (s16)Math_Rand_ZeroFloat(2.99f) + 5; + this->unk_19A = (s16)Rand_ZeroFloat(2.99f) + 5; phi_v0 = this->unk_1A6; } switch (phi_v0) { @@ -135,9 +135,9 @@ void func_80A8F320(EnKakasi* this, GlobalContext* globalCtx, s16 arg) { this->actor.velocity.y = 3.0f; Audio_PlayActorSound2(&this->actor, NA_SE_IT_KAKASHI_JUMP); } - Math_SmoothScaleMaxF(&this->skelanime.animPlaybackSpeed, this->unk_1B8, 0.1f, 0.2f); - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, this->unk_1A8, 5, 0x3E8, 0); - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.z, this->unk_1AC, 5, 0x3E8, 0); + Math_ApproachF(&this->skelanime.animPlaybackSpeed, this->unk_1B8, 0.1f, 0.2f); + Math_SmoothStepToS(&this->actor.shape.rot.x, this->unk_1A8, 5, 0x3E8, 0); + Math_SmoothStepToS(&this->actor.shape.rot.z, this->unk_1AC, 5, 0x3E8, 0); if (this->unk_1A8 != 0 && fabsf(this->actor.shape.rot.x - this->unk_1A8) < 50.0f) { this->unk_1A8 *= -1.0f; diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c index 89abbc220b..c1be73b424 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -166,7 +166,7 @@ void func_80A90578(EnKakasi2* this, GlobalContext* globalCtx) { } this->actor.shape.rot.y += 0x800; - Math_SmoothDownscaleMaxF(&this->actor.shape.unk_08, 0.5f, 500.0f); + Math_ApproachZeroF(&this->actor.shape.unk_08, 0.5f, 500.0f); if (this->actor.shape.unk_08 > -100.0f) { this->actionFunc = func_80A9062C; @@ -183,9 +183,9 @@ void func_80A9062C(EnKakasi2* this, GlobalContext* globalCtx) { void func_80A906C4(EnKakasi2* this, GlobalContext* globalCtx) { if (this->skelAnime.animCurrentFrame != 0) { - Math_SmoothDownscaleMaxF(&this->skelAnime.animCurrentFrame, 0.5f, 1.0f); + Math_ApproachZeroF(&this->skelAnime.animCurrentFrame, 0.5f, 1.0f); } - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->unk_198, 5, 0xBB8, 0); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->unk_198, 5, 0xBB8, 0); SkelAnime_FrameUpdateMatrix(&this->skelAnime); } diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c index ec20d9f0a0..f15645034b 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c @@ -78,10 +78,10 @@ void func_80A90E28(EnKakasi3* this) { this->skelAnime.animPlaybackSpeed = 0.0f; this->unk_1AA = this->unk_1AE = 0x0; - Math_SmoothDownscaleMaxF(&this->skelAnime.animCurrentFrame, 0.5f, 1.0f); - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, this->rot.x, 5, 0x2710, 0); - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->rot.y, 5, 0x2710, 0); - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.z, this->rot.z, 5, 0x2710, 0); + Math_ApproachZeroF(&this->skelAnime.animCurrentFrame, 0.5f, 1.0f); + Math_SmoothStepToS(&this->actor.shape.rot.x, this->rot.x, 5, 0x2710, 0); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->rot.y, 5, 0x2710, 0); + Math_SmoothStepToS(&this->actor.shape.rot.z, this->rot.z, 5, 0x2710, 0); } void func_80A90EBC(EnKakasi3* this, GlobalContext* globalCtx, s32 arg) { @@ -91,11 +91,11 @@ void func_80A90EBC(EnKakasi3* this, GlobalContext* globalCtx, s32 arg) { phi_v0 = globalCtx->msgCtx.unk_E410[0]; if (arg != 0) { if (this->unk_19C[3] == 0) { - this->unk_19C[3] = (s16)Math_Rand_ZeroFloat(10.99f) + 30; - this->unk_1A6 = (s16)Math_Rand_ZeroFloat(4.99f); + this->unk_19C[3] = (s16)Rand_ZeroFloat(10.99f) + 30; + this->unk_1A6 = (s16)Rand_ZeroFloat(4.99f); } - this->unk_19A = (s16)Math_Rand_ZeroFloat(2.99f) + 5; + this->unk_19A = (s16)Rand_ZeroFloat(2.99f) + 5; phi_v0 = this->unk_1A6; } switch (phi_v0) { @@ -138,9 +138,9 @@ void func_80A90EBC(EnKakasi3* this, GlobalContext* globalCtx, s32 arg) { this->actor.velocity.y = 3.0f; Audio_PlayActorSound2(&this->actor, NA_SE_IT_KAKASHI_JUMP); } - Math_SmoothScaleMaxF(&this->skelAnime.animPlaybackSpeed, this->unk_1B8, 0.1f, 0.2f); - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, this->unk_1AA, 0x5, 0x3E8, 0); - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.z, this->unk_1AE, 0x5, 0x3E8, 0); + Math_ApproachF(&this->skelAnime.animPlaybackSpeed, this->unk_1B8, 0.1f, 0.2f); + Math_SmoothStepToS(&this->actor.shape.rot.x, this->unk_1AA, 0x5, 0x3E8, 0); + Math_SmoothStepToS(&this->actor.shape.rot.z, this->unk_1AE, 0x5, 0x3E8, 0); if (this->unk_1AA != 0x0 && fabsf(this->actor.shape.rot.x - this->unk_1AA) < 50.0f) { this->unk_1AA *= -1.0f; diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c index 0b39b18552..58a1ff9f45 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -218,9 +218,9 @@ void EnKarebaba_Idle(EnKarebaba* this, GlobalContext* globalCtx) { void EnKarebaba_Awaken(EnKarebaba* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); - Math_ApproxF(&this->actor.scale.x, 0.01f, 0.0005f); + Math_StepToF(&this->actor.scale.x, 0.01f, 0.0005f); this->actor.scale.y = this->actor.scale.z = this->actor.scale.x; - if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y + 60.0f, 5.0f)) { + if (Math_StepToF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y + 60.0f, 5.0f)) { EnKarebaba_SetupUpright(this); } this->actor.shape.rot.y += 0x1999; @@ -276,12 +276,12 @@ void EnKarebaba_Spin(EnKarebaba* this, GlobalContext* globalCtx) { this->headCollider.dim.radius = sHeadColliderInit.dim.radius + (value * 2); this->actor.shape.rot.x = 0xC000 - (value * 0x100); this->actor.shape.rot.y += value * 0x2C0; - this->actor.posRot.pos.y = (Math_Sins(this->actor.shape.rot.x) * -60.0f) + this->actor.initPosRot.pos.y; + this->actor.posRot.pos.y = (Math_SinS(this->actor.shape.rot.x) * -60.0f) + this->actor.initPosRot.pos.y; - cos60 = Math_Coss(this->actor.shape.rot.x) * 60.0f; + cos60 = Math_CosS(this->actor.shape.rot.x) * 60.0f; - this->actor.posRot.pos.x = (Math_Sins(this->actor.shape.rot.y) * cos60) + this->actor.initPosRot.pos.x; - this->actor.posRot.pos.z = (Math_Coss(this->actor.shape.rot.y) * cos60) + this->actor.initPosRot.pos.z; + this->actor.posRot.pos.x = (Math_SinS(this->actor.shape.rot.y) * cos60) + this->actor.initPosRot.pos.x; + this->actor.posRot.pos.z = (Math_CosS(this->actor.shape.rot.y) * cos60) + this->actor.initPosRot.pos.z; if (this->bodyCollider.base.acFlags & 2) { EnKarebaba_SetupDying(this); @@ -297,10 +297,10 @@ void EnKarebaba_Dying(EnKarebaba* this, GlobalContext* globalCtx) { Vec3f position; Vec3f rotation; - Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.1f); + Math_StepToF(&this->actor.speedXZ, 0.0f, 0.1f); if (this->actor.params == 0) { - Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, 0x4800, 0x71C); + Math_ScaledStepToS(&this->actor.shape.rot.x, 0x4800, 0x71C); EffectSsHahen_SpawnBurst(globalCtx, &this->actor.posRot.pos, 3.0f, 0, 12, 5, 1, HAHEN_OBJECT_DEFAULT, 10, NULL); if (this->actor.scale.x > 0.005f && ((this->actor.bgCheckFlags & 2) || (this->actor.bgCheckFlags & 8))) { @@ -317,9 +317,9 @@ void EnKarebaba_Dying(EnKarebaba* this, GlobalContext* globalCtx) { } } else if (this->actor.params == 1) { Math_Vec3f_Copy(&position, &this->actor.posRot.pos); - rotation.z = Math_Sins(this->actor.shape.rot.x) * 20.0f; - rotation.x = -20.0f * Math_Coss(this->actor.shape.rot.x) * Math_Sins(this->actor.shape.rot.y); - rotation.y = -20.0f * Math_Coss(this->actor.shape.rot.x) * Math_Coss(this->actor.shape.rot.y); + rotation.z = Math_SinS(this->actor.shape.rot.x) * 20.0f; + rotation.x = -20.0f * Math_CosS(this->actor.shape.rot.x) * Math_SinS(this->actor.shape.rot.y); + rotation.y = -20.0f * Math_CosS(this->actor.shape.rot.x) * Math_CosS(this->actor.shape.rot.y); for (i = 0; i < 4; i++) { func_800286CC(globalCtx, &position, &zeroVec, &zeroVec, 500, 50); @@ -347,10 +347,10 @@ void EnKarebaba_DeadItemDrop(EnKarebaba* this, GlobalContext* globalCtx) { void EnKarebaba_Retract(EnKarebaba* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); - Math_ApproxF(&this->actor.scale.x, 0.005f, 0.0005f); + Math_StepToF(&this->actor.scale.x, 0.005f, 0.0005f); this->actor.scale.y = this->actor.scale.z = this->actor.scale.x; - if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y + 14.0f, 5.0f)) { + if (Math_StepToF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y + 14.0f, 5.0f)) { EnKarebaba_SetupIdle(this); } diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c index 1e0acc01ba..23f7a692b9 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -125,7 +125,7 @@ void EnKusa_DropCollectible(EnKusa* this, GlobalContext* globalCtx) { Item_DropCollectibleRandom(globalCtx, NULL, &this->actor.posRot.pos, dropParams << 4); break; case 1: - if (Math_Rand_ZeroOne() < 0.5f) { + if (Rand_ZeroOne() < 0.5f) { Item_DropCollectible(globalCtx, &this->actor.posRot.pos, ITEM00_SEEDS); } else { Item_DropCollectible(globalCtx, &this->actor.posRot.pos, ITEM00_HEART); @@ -143,7 +143,7 @@ void EnKusa_Fall(EnKusa* this) { } void func_80A9B174(Vec3f* vec, f32 arg1) { - arg1 += ((Math_Rand_ZeroOne() * 0.2f) - 0.1f) * arg1; + arg1 += ((Rand_ZeroOne() * 0.2f) - 0.1f) * arg1; vec->x -= vec->x * arg1; vec->y -= vec->y * arg1; vec->z -= vec->z * arg1; @@ -170,11 +170,11 @@ void EnKusa_SpawnFragments(EnKusa* this, GlobalContext* globalCtx) { pos.y = this->actor.posRot.pos.y + (scale->y * this->actor.scale.y * 20.0f) + 10.0f; pos.z = this->actor.posRot.pos.z + (scale->z * this->actor.scale.z * 20.0f); - velocity.x = (Math_Rand_ZeroOne() - 0.5f) * 8.0f; - velocity.y = Math_Rand_ZeroOne() * 10.0f; - velocity.z = (Math_Rand_ZeroOne() - 0.5f) * 8.0f; + velocity.x = (Rand_ZeroOne() - 0.5f) * 8.0f; + velocity.y = Rand_ZeroOne() * 10.0f; + velocity.z = (Rand_ZeroOne() - 0.5f) * 8.0f; - index = (s32)(Math_Rand_ZeroOne() * 111.1f) & 7; + index = (s32)(Rand_ZeroOne() * 111.1f) & 7; EffectSsKakera_Spawn(globalCtx, &pos, &velocity, &pos, -100, 64, 40, 3, 0, D_80A9C26C[index], 0, 0, 80, KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_KEEP, D_040355E0); @@ -183,11 +183,11 @@ void EnKusa_SpawnFragments(EnKusa* this, GlobalContext* globalCtx) { pos.y = this->actor.posRot.pos.y + (scale->y * this->actor.scale.y * 40.0f) + 10.0f; pos.z = this->actor.posRot.pos.z + (scale->z * this->actor.scale.z * 40.0f); - velocity.x = (Math_Rand_ZeroOne() - 0.5f) * 6.0f; - velocity.y = Math_Rand_ZeroOne() * 10.0f; - velocity.z = (Math_Rand_ZeroOne() - 0.5f) * 6.0f; + velocity.x = (Rand_ZeroOne() - 0.5f) * 6.0f; + velocity.y = Rand_ZeroOne() * 10.0f; + velocity.z = (Rand_ZeroOne() - 0.5f) * 6.0f; - index = (s32)(Math_Rand_ZeroOne() * 111.1f) % 7; + index = (s32)(Rand_ZeroOne() * 111.1f) % 7; EffectSsKakera_Spawn(globalCtx, &pos, &velocity, &pos, -100, 64, 40, 3, 0, D_80A9C26C[index], 0, 0, 80, KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_KEEP, D_040356A0); @@ -198,9 +198,8 @@ void EnKusa_SpawnBugs(EnKusa* this, GlobalContext* globalCtx) { s32 i; for (i = 0; i < 3; i++) { - Actor* bug = - Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_INSECT, this->actor.posRot.pos.x, - this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, Math_Rand_ZeroOne() * 0xFFFF, 0, 1); + Actor* bug = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_INSECT, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, Rand_ZeroOne() * 0xFFFF, 0, 1); if (bug == NULL) { break; @@ -229,7 +228,7 @@ void EnKusa_Init(Actor* thisx, GlobalContext* globalCtx) { func_80061ED4(&this->actor.colChkInfo, NULL, &sColChkInfoInit); if (this->actor.shape.rot.y == 0) { - s16 rand = Math_Rand_ZeroFloat(0x10000); + s16 rand = Rand_ZeroFloat(0x10000); this->actor.posRot.rot.y = rand; this->actor.initPosRot.rot.y = rand; @@ -335,8 +334,8 @@ void EnKusa_LiftedUp(EnKusa* this, GlobalContext* globalCtx) { if (Actor_HasNoParent(&this->actor, globalCtx)) { this->actor.room = globalCtx->roomCtx.curRoom.num; func_80A9BBB0(this); - this->actor.velocity.x = this->actor.speedXZ * Math_Sins(this->actor.posRot.rot.y); - this->actor.velocity.z = this->actor.speedXZ * Math_Coss(this->actor.posRot.rot.y); + this->actor.velocity.x = this->actor.speedXZ * Math_SinS(this->actor.posRot.rot.y); + this->actor.velocity.z = this->actor.speedXZ * Math_CosS(this->actor.posRot.rot.y); this->actor.colChkInfo.mass = 240; this->actor.gravity = -0.1f; EnKusa_Fall(this); @@ -350,7 +349,7 @@ void EnKusa_LiftedUp(EnKusa* this, GlobalContext* globalCtx) { void func_80A9BBB0(EnKusa* this) { EnKusa_SetupAction(this, func_80A9BC1C); D_80A9C1D0 = -0xBB8; - D_80A9C1D8 = ((Math_Rand_ZeroOne() - 0.5f) * 1600.0f); + D_80A9C1D8 = ((Rand_ZeroOne() - 0.5f) * 1600.0f); D_80A9C1D4 = 0; D_80A9C1DC = 0; } @@ -393,8 +392,8 @@ void func_80A9BC1C(EnKusa* this, GlobalContext* globalCtx) { Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_DIVE_INTO_WATER_L); } EnKusa_Fall(this); - Math_ApproxS(&D_80A9C1D4, D_80A9C1D0, 0x1F4); - Math_ApproxS(&D_80A9C1DC, D_80A9C1D8, 0xAA); + Math_StepToS(&D_80A9C1D4, D_80A9C1D0, 0x1F4); + Math_StepToS(&D_80A9C1DC, D_80A9C1D8, 0xAA); this->actor.shape.rot.x += D_80A9C1D4; this->actor.shape.rot.y += D_80A9C1DC; func_80A9B174(&this->actor.velocity, 0.05f); @@ -436,7 +435,7 @@ void func_80A9BF3C(EnKusa* this) { void func_80A9BFA8(EnKusa* this, GlobalContext* globalCtx) { if (this->timer > 120) { - if ((Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 0.6f)) && (this->timer >= 170)) { + if ((Math_StepToF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 0.6f)) && (this->timer >= 170)) { func_80A9C00C(this); } } @@ -452,8 +451,8 @@ void func_80A9C00C(EnKusa* this) { void func_80A9C068(EnKusa* this, GlobalContext* globalCtx) { s32 sp24; - sp24 = Math_ApproxF(&this->actor.scale.y, 0.4f, 0.014f) & 1; - sp24 &= Math_ApproxF(&this->actor.scale.x, 0.4f, 0.011f); + sp24 = Math_StepToF(&this->actor.scale.y, 0.4f, 0.014f) & 1; + sp24 &= Math_StepToF(&this->actor.scale.x, 0.4f, 0.011f); this->actor.scale.z = this->actor.scale.x; if (sp24) { diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/src/overlays/actors/ovl_En_Kz/z_en_kz.c index 5ae557a681..c1340fa041 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -165,7 +165,7 @@ void EnKz_UpdateEyes(EnKz* this) { if (DECR(this->blinkTimer) == 0) { this->eyeIdx += 1; if (this->eyeIdx >= 3) { - this->blinkTimer = Math_Rand_S16Offset(30, 30); + this->blinkTimer = Rand_S16Offset(30, 30); this->eyeIdx = 0; } } @@ -268,7 +268,7 @@ s32 EnKz_FollowPath(EnKz* this, GlobalContext* globalCtx) { pathDiffX = pointPos->x - this->actor.posRot.pos.x; pathDiffZ = pointPos->z - this->actor.posRot.pos.z; - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, (Math_atan2f(pathDiffX, pathDiffZ) * 10430.3779296875f), 0xA, + Math_SmoothStepToS(&this->actor.posRot.rot.y, (Math_FAtan2F(pathDiffX, pathDiffZ) * 10430.3779296875f), 0xA, 0x3E8, 1); if ((SQ(pathDiffX) + SQ(pathDiffZ)) < 10.0f) { @@ -457,8 +457,8 @@ s32 EnKz_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, EnKz* this = THIS; if (limbIndex == 8 || limbIndex == 9 || limbIndex == 10) { - rot->y += Math_Sins(this->unk_2A6[limbIndex]) * 200.0f; - rot->z += Math_Coss(this->unk_2BE[limbIndex]) * 200.0f; + rot->y += Math_SinS(this->unk_2A6[limbIndex]) * 200.0f; + rot->z += Math_CosS(this->unk_2BE[limbIndex]) * 200.0f; } if (limbIndex) {} return 0; diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c index 64e4f74cb3..59f13d4404 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -65,7 +65,7 @@ void EnLight_Init(Actor* thisx, GlobalContext* globalCtx) { this->lightNode = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfo); Actor_SetScale(&this->actor, D_80A9E840[this->actor.params & 0xF].scale * 0.0001f); - this->timer = (s32)(Math_Rand_ZeroOne() * 255.0f); + this->timer = (s32)(Rand_ZeroOne() * 255.0f); if ((this->actor.params & 0x400) != 0) { this->actor.update = EnLight_UpdateSwitch; @@ -97,7 +97,7 @@ void EnLight_Update(Actor* thisx, GlobalContext* globalCtx) { EnLight* this = THIS; flameParams = &D_80A9E840[this->actor.params & 0xF]; - intensity = (Math_Rand_ZeroOne() * 0.5f) + 0.5f; + intensity = (Rand_ZeroOne() * 0.5f) + 0.5f; radius = (this->actor.params < 0) ? 100 : 300; Lights_PointSetColorAndRadius(&this->lightInfo, (flameParams->primColor.r * intensity), (flameParams->primColor.g * intensity), (flameParams->primColor.b * intensity), @@ -120,13 +120,13 @@ void EnLight_UpdateSwitch(Actor* thisx, GlobalContext* globalCtx) { if ((this->actor.params & 0x800) != 0) { if (Flags_GetSwitch(globalCtx, (this->actor.params & 0x3F0) >> 4)) { - Math_ApproxF(&scale, 1.0f, 0.05f); + Math_StepToF(&scale, 1.0f, 0.05f); } else { if (scale < 0.1f) { Actor_SetScale(&this->actor, 0.0f); return; } - Math_ApproxF(&scale, 0.0f, 0.05f); + Math_StepToF(&scale, 0.0f, 0.05f); } } else { if (Flags_GetSwitch(globalCtx, (this->actor.params & 0x3F0) >> 4)) { @@ -134,14 +134,14 @@ void EnLight_UpdateSwitch(Actor* thisx, GlobalContext* globalCtx) { Actor_SetScale(&this->actor, 0.0f); return; } - Math_ApproxF(&scale, 0.0f, 0.05f); + Math_StepToF(&scale, 0.0f, 0.05f); } else { - Math_ApproxF(&scale, 1.0f, 0.05f); + Math_StepToF(&scale, 1.0f, 0.05f); } } Actor_SetScale(&this->actor, ((f32)flameParams->scale * 0.0001) * scale); - intensity = (Math_Rand_ZeroOne() * 0.5f) + 0.5f; + intensity = (Rand_ZeroOne() * 0.5f) + 0.5f; Lights_PointSetColorAndRadius(&this->lightInfo, (flameParams->primColor.r * intensity), (flameParams->primColor.g * intensity), (flameParams->primColor.b * intensity), 300.0f * scale); diff --git a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c index ed170c4180..57255ab256 100644 --- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c +++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c @@ -91,9 +91,9 @@ void EnLightbox_Update(Actor* thisx, GlobalContext* globalCtx) { } if ((thisx->bgCheckFlags & 1) == 0) { - Math_ApproxF(&thisx->speedXZ, 0, IREG(57) / 100.0f); + Math_StepToF(&thisx->speedXZ, 0, IREG(57) / 100.0f); } else { - Math_ApproxF(&thisx->speedXZ, 0, IREG(58) / 100.0f); + Math_StepToF(&thisx->speedXZ, 0, IREG(58) / 100.0f); if ((thisx->bgCheckFlags & 2) && (thisx->velocity.y < IREG(59) / 100.0f)) { Audio_PlaySoundGeneral(NA_SE_EV_BOMB_BOUND, &thisx->projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c index ecc73cb063..f2b8de8b3a 100644 --- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c @@ -54,7 +54,7 @@ void EnMFire1_Update(Actor* thisx, GlobalContext* globalCtx) { EnMFire1* this = THIS; s32 pad; - if (Math_ApproxF(&this->unk_198, 1.0f, 0.2f)) { + if (Math_StepToF(&this->unk_198, 1.0f, 0.2f)) { Actor_Kill(&this->actor); } else { Collider_CylinderUpdate(&this->actor, &this->collider); diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index b56c98f7ac..53785b4ac0 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -199,7 +199,7 @@ void func_80AA0A0C(EnMa1* this) { if (DECR(this->unk_1E2) == 0) { this->unk_1E4 += 1; if (this->unk_1E4 >= 3) { - this->unk_1E2 = Math_Rand_S16Offset(0x1E, 0x1E); + this->unk_1E2 = Rand_S16Offset(0x1E, 0x1E); this->unk_1E4 = 0; } } diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c index 954061b022..1fc4ba59a9 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -178,7 +178,7 @@ void func_80AA1CC0(EnMa2* this) { if ((!func_80AA1C68(this)) && (DECR(this->unk_20C) == 0)) { this->unk_20E += 1; if (this->unk_20E >= 3) { - this->unk_20C = Math_Rand_S16Offset(0x1E, 0x1E); + this->unk_20C = Rand_S16Offset(0x1E, 0x1E); this->unk_20E = 0; } } @@ -342,8 +342,8 @@ s32 EnMa2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Matrix_RotateX((-vec.x / 32768.0f) * M_PI, MTXMODE_APPLY); } if ((limbIndex == 11) || (limbIndex == 12) || (limbIndex == 15)) { - rot->y += Math_Sins(this->unk_212[limbIndex].y) * 200.0f; - rot->z += Math_Coss(this->unk_212[limbIndex].z) * 200.0f; + rot->y += Math_SinS(this->unk_212[limbIndex].y) * 200.0f; + rot->z += Math_CosS(this->unk_212[limbIndex].z) * 200.0f; } return 0; } diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index 52c38290f2..ab25ac402f 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -223,7 +223,7 @@ void func_80AA2F80(EnMa3* this) { if ((!func_80AA2F28(this)) && (DECR(this->unk_20C) == 0)) { this->unk_20E += 1; if (this->unk_20E >= 3) { - this->unk_20C = Math_Rand_S16Offset(0x1E, 0x1E); + this->unk_20C = Rand_S16Offset(0x1E, 0x1E); this->unk_20E = 0; } } @@ -322,8 +322,8 @@ s32 EnMa3_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Matrix_RotateX((-vec.x / 32768.0f) * M_PI, MTXMODE_APPLY); } if ((limbIndex == 11) || (limbIndex == 12) || (limbIndex == 15)) { - rot->y += Math_Sins(this->unk_212[limbIndex].y) * 200.0f; - rot->z += Math_Coss(this->unk_212[limbIndex].z) * 200.0f; + rot->y += Math_SinS(this->unk_212[limbIndex].y) * 200.0f; + rot->z += Math_CosS(this->unk_212[limbIndex].z) * 200.0f; } return 0; } diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/src/overlays/actors/ovl_En_Mb/z_en_mb.c index f925d7003f..b2f56ba9a5 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -239,8 +239,8 @@ s32 func_80AA652C(EnMb* this, GlobalContext* globalCtx) { phi_a2 = 0x4000; } } - cosAngle = Math_Coss(phi_a2); - sinAngle = Math_Sins(phi_a2); + cosAngle = Math_CosS(phi_a2); + sinAngle = Math_SinS(phi_a2); cosAngle = ABS(cosAngle); sinAngle = ABS(sinAngle); xDist = this->actor.posRot.pos.x - player->actor.posRot.pos.x; @@ -293,7 +293,7 @@ void func_80AA66A0(EnMb* this, GlobalContext* globalCtx) { void func_80AA6830(EnMb* this) { SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_060041A8, -4.0f); this->actor.speedXZ = 0.0f; - this->unk_32A = Math_Rand_S16Offset(30, 50); + this->unk_32A = Rand_S16Offset(30, 50); this->unk_320 = 6; EnMb_SetupAction(this, func_80AA7134); } @@ -301,7 +301,7 @@ void func_80AA6830(EnMb* this) { void func_80AA6898(EnMb* this) { SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_0600EBE4); this->actor.speedXZ = 0.0f; - this->unk_32A = Math_Rand_S16Offset(30, 50); + this->unk_32A = Rand_S16Offset(30, 50); this->unk_320 = 6; EnMb_SetupAction(this, func_80AA8DD8); } @@ -309,7 +309,7 @@ void func_80AA6898(EnMb* this) { void func_80AA68FC(EnMb* this, GlobalContext* globalCtx) { SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_060041A8, -4.0f); this->actor.speedXZ = 0.0f; - this->unk_32A = Math_Rand_S16Offset(40, 80); + this->unk_32A = Rand_S16Offset(40, 80); this->unk_320 = 6; func_80AA6444(this, globalCtx); EnMb_SetupAction(this, func_80AA71AC); @@ -318,7 +318,7 @@ void func_80AA68FC(EnMb* this, GlobalContext* globalCtx) { void func_80AA6974(EnMb* this) { SkelAnime_ChangeAnim(&this->skelAnime, &D_06009FC0, 0.0f, 0.0f, SkelAnime_GetFrameCount(&D_06009FC0), 0, -4.0f); this->actor.speedXZ = 0.59999996f; - this->unk_32A = Math_Rand_S16Offset(50, 70); + this->unk_32A = Rand_S16Offset(50, 70); this->unk_332 = 1; this->unk_320 = 9; EnMb_SetupAction(this, func_80AA87D8); @@ -329,7 +329,7 @@ void func_80AA6A18(EnMb* this) { frameCount = SkelAnime_GetFrameCount(&D_06009FC0); this->actor.speedXZ = 0.59999996f; - this->unk_32A = Math_Rand_S16Offset(50, 70); + this->unk_32A = Rand_S16Offset(50, 70); this->unk_332 = 1; this->unk_320 = 9; SkelAnime_ChangeAnim(&this->skelAnime, &D_06009FC0, 0.0f, 0.0f, frameCount, 1, -4.0f); @@ -520,13 +520,13 @@ void func_80AA71AC(EnMb* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); if (this->unk_32A == 0) { this->unk_330 = Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->waypointPos); - if (Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->unk_330, 1, 0x3E8, 0) == 0) { + if (Math_SmoothStepToS(&this->actor.shape.rot.y, this->unk_330, 1, 0x3E8, 0) == 0) { this->actor.posRot.rot.y = this->actor.shape.rot.y; func_80AA6A18(this); } } else { this->unk_32A--; - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.initPosRot.rot.y, 1, 0x3E8, 0); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.initPosRot.rot.y, 1, 0x3E8, 0); } yDist = this->actor.yDistFromLink; yDistAbs = ABS(yDist); @@ -544,7 +544,7 @@ void func_80AA71AC(EnMb* this, GlobalContext* globalCtx) { void func_80AA7310(EnMb* this, GlobalContext* globalCtx) { s32 pad; - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 0.5f, 1.0f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 0.5f, 1.0f, 0.0f); if (this->actor.speedXZ > 1.0f) { func_80033260(globalCtx, &this->actor, &this->actor.posRot.pos, 5.0f, 3, 4.0f, 0x64, 0xF, 0); } @@ -588,7 +588,7 @@ void func_80AA74BC(EnMb* this, GlobalContext* globalCtx) { func_8002F71C(globalCtx, &this->actor, 4.0f, this->actor.posRot.rot.y, 4.0f); } if (this->actor.bgCheckFlags & 1) { - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 1.0f, 1.5f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 1.5f, 0.0f); if (1.0f < this->actor.speedXZ) { func_80033260(globalCtx, &this->actor, &this->actor.posRot.pos, 5.0f, 3, 4.0f, 0x64, 0xF, 0); } @@ -650,7 +650,7 @@ void func_80AA77D0(EnMb* this, GlobalContext* globalCtx) { if (this->unk_32E != 0) { this->unk_32E--; - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 1, 3000, 0); + Math_SmoothStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 1, 3000, 0); } else { this->actor.speedXZ = 10.0f; this->attackParams = 1; @@ -676,7 +676,7 @@ void func_80AA7938(EnMb* this, GlobalContext* globalCtx) { s16 sp54[] = { 20, 40, 0 }; s16 sp4C[] = { -2500, 0, 3500 }; - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, sp4C[this->attackParams - 1] + this->actor.posRot.rot.y, 1, 0x2EE, + Math_SmoothStepToS(&this->actor.shape.rot.y, sp4C[this->attackParams - 1] + this->actor.posRot.rot.y, 1, 0x2EE, 0); if (this->collider2.base.atFlags & 2) { @@ -743,7 +743,7 @@ void func_80AA7CAC(EnMb* this, GlobalContext* globalCtx) { } if (this->unk_32E != 0) { this->unk_32E--; - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.posRot.rot.y, 1, 0x1F40, 0); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.posRot.rot.y, 1, 0x1F40, 0); sp48 = 0; } else { this->actor.speedXZ = 10.0f; @@ -779,11 +779,11 @@ void func_80AA7CAC(EnMb* this, GlobalContext* globalCtx) { } } if ((player->stateFlags2 & 0x80) && (&this->actor == player->actor.parent)) { - player->actor.posRot.pos.x = this->actor.posRot.pos.x + (Math_Coss(this->actor.shape.rot.y) * 10.0f) + - (Math_Sins(this->actor.shape.rot.y) * 89.0f); + player->actor.posRot.pos.x = this->actor.posRot.pos.x + (Math_CosS(this->actor.shape.rot.y) * 10.0f) + + (Math_SinS(this->actor.shape.rot.y) * 89.0f); sp4C = 1; - player->actor.posRot.pos.z = this->actor.posRot.pos.z + (Math_Sins(this->actor.shape.rot.y) * 10.0f) + - (Math_Coss(this->actor.shape.rot.y) * 89.0f); + player->actor.posRot.pos.z = this->actor.posRot.pos.z + (Math_SinS(this->actor.shape.rot.y) * 10.0f) + + (Math_CosS(this->actor.shape.rot.y) * 89.0f); player->unk_850 = 0; player->actor.speedXZ = 0.0f; player->actor.velocity.y = 0.0f; @@ -845,11 +845,11 @@ void func_80AA800C(EnMb* this, GlobalContext* globalCtx) { } } if ((player->stateFlags2 & 0x80) && (&this->actor == player->actor.parent)) { - player->actor.posRot.pos.x = this->actor.posRot.pos.x + (Math_Coss(this->actor.shape.rot.y) * 10.0f) + - (Math_Sins(this->actor.shape.rot.y) * 89.0f); + player->actor.posRot.pos.x = this->actor.posRot.pos.x + (Math_CosS(this->actor.shape.rot.y) * 10.0f) + + (Math_SinS(this->actor.shape.rot.y) * 89.0f); sp54 = 1; - player->actor.posRot.pos.z = this->actor.posRot.pos.z + (Math_Sins(this->actor.shape.rot.y) * 10.0f) + - (Math_Coss(this->actor.shape.rot.y) * 89.0f); + player->actor.posRot.pos.z = this->actor.posRot.pos.z + (Math_SinS(this->actor.shape.rot.y) * 10.0f) + + (Math_CosS(this->actor.shape.rot.y) * 89.0f); player->unk_850 = 0; player->actor.speedXZ = 0.0f; player->actor.velocity.y = 0.0f; @@ -924,18 +924,18 @@ void func_80AA8514(EnMb* this, GlobalContext* globalCtx) { s32 effectsPerFrame; effPosition = this->actor.posRot.pos; - effPosition.x += Math_Sins(this->actor.shape.rot.y) * -70.0f; - effPosition.z += Math_Coss(this->actor.shape.rot.y) * -70.0f; - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f); + effPosition.x += Math_SinS(this->actor.shape.rot.y) * -70.0f; + effPosition.z += Math_CosS(this->actor.shape.rot.y) * -70.0f; + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f); temp = effPosition; if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { if (this->unk_32A > 0) { effZeroVector = D_80AA9D78; this->unk_32A--; for (effectsPerFrame = 4; effectsPerFrame >= 0; effectsPerFrame--) { - effPosition.x = Math_Rand_CenteredFloat(240.0f) + temp.x; - effPosition.y = Math_Rand_CenteredFloat(15.0f) + (temp.y + 20.0f); - effPosition.z = Math_Rand_CenteredFloat(240.0f) + temp.z; + effPosition.x = Rand_CenteredFloat(240.0f) + temp.x; + effPosition.y = Rand_CenteredFloat(15.0f) + (temp.y + 20.0f); + effPosition.z = Rand_CenteredFloat(240.0f) + temp.z; EffectSsDeadDb_Spawn(globalCtx, &effPosition, &effZeroVector, &effZeroVector, 0xE6, 7, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0xFF, 0, 1, 9, 1); } @@ -963,7 +963,7 @@ void func_80AA87D8(EnMb* this, GlobalContext* globalCtx) { yawDiff = (this->actor.yawTowardsLink - this->actor.shape.rot.y); yawDiff = ABS(yawDiff); - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.59999996f, 0.1f, 1.0f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 0.59999996f, 0.1f, 1.0f, 0.0f); this->skelAnime.animPlaybackSpeed = this->actor.speedXZ; currentFrame = this->skelAnime.animCurrentFrame; SkelAnime_FrameUpdateMatrix(&this->skelAnime); @@ -973,7 +973,7 @@ void func_80AA87D8(EnMb* this, GlobalContext* globalCtx) { playbackSpeedABS = ABS(this->skelAnime.animPlaybackSpeed); if ((this->unk_32E == 0) && (Math_Vec3f_DistXZ(&this->actor.initPosRot.pos, &player->actor.posRot.pos) < this->unk_364)) { - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 1, 750, 0); + Math_SmoothStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 1, 750, 0); this->actor.flags |= 1; if (this->actor.xzDistFromLink < 500.0f) { if (yawDiff < 0x1388) { @@ -985,7 +985,7 @@ void func_80AA87D8(EnMb* this, GlobalContext* globalCtx) { if ((this->unk_360 < Math_Vec3f_DistXZ(&this->actor.posRot.pos, &this->actor.initPosRot.pos)) || (this->soundTimer != 0)) { yaw = Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->actor.initPosRot); - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, yaw, 1, 750, 0); + Math_SmoothStepToS(&this->actor.posRot.rot.y, yaw, 1, 750, 0); } else { } if (this->soundTimer != 0) { @@ -999,9 +999,9 @@ void func_80AA87D8(EnMb* this, GlobalContext* globalCtx) { } this->unk_32A--; if (this->unk_32A == 0) { - if (Math_Rand_ZeroOne() > 0.7f) { - this->unk_32A = Math_Rand_S16Offset(50, 70); - this->soundTimer = Math_Rand_S16Offset(15, 40); + if (Rand_ZeroOne() > 0.7f) { + this->unk_32A = Rand_S16Offset(50, 70); + this->soundTimer = Rand_S16Offset(15, 40); } else { func_80AA6830(this); } @@ -1025,14 +1025,14 @@ void func_80AA8AEC(EnMb* this, GlobalContext* globalCtx) { f32 playbackSpeedABS; if (Math_Vec3f_DistXZ(&this->waypointPos, &this->actor.posRot.pos) <= 8.0f || - Math_Rand_ZeroOne() < 0.1f && Math_Vec3f_DistXZ(&this->actor.initPosRot.pos, &this->actor.posRot.pos) <= 4.0f) { + Rand_ZeroOne() < 0.1f && Math_Vec3f_DistXZ(&this->actor.initPosRot.pos, &this->actor.posRot.pos) <= 4.0f) { func_80AA68FC(this, globalCtx); } else { - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.59999996f, 0.1f, 1.0f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 0.59999996f, 0.1f, 1.0f, 0.0f); this->skelAnime.animPlaybackSpeed = (this->actor.speedXZ + this->actor.speedXZ); } this->unk_330 = Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->waypointPos); - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->unk_330, 1, 0x5DC, 0); + Math_SmoothStepToS(&this->actor.posRot.rot.y, this->unk_330, 1, 0x5DC, 0); yDistAbs = (this->actor.yDistFromLink >= 0.0f) ? this->actor.yDistFromLink : -this->actor.yDistFromLink; if (yDistAbs <= 20.0f && func_80AA652C(this, globalCtx) != 0) { yawDiff = (this->actor.shape.rot.y - this->actor.yawTowardsLink); @@ -1052,7 +1052,7 @@ void func_80AA8AEC(EnMb* this, GlobalContext* globalCtx) { } if (this->soundTimer == 0) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_MORIBLIN_VOICE); - this->soundTimer = Math_Rand_S16Offset(30, 70); + this->soundTimer = Rand_S16Offset(30, 70); } currentFrame = this->skelAnime.animCurrentFrame; SkelAnime_FrameUpdateMatrix(&this->skelAnime); @@ -1109,7 +1109,7 @@ void func_80AA8E88(EnMb* this) { } void func_80AA8F50(EnMb* this, GlobalContext* globalCtx) { - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f); if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { if (this->actor.params < 0) { func_80AA6830(this); @@ -1143,7 +1143,7 @@ void func_80AA8FC8(EnMb* this) { void func_80AA90A0(EnMb* this, GlobalContext* globalCtx) { Player* player = PLAYER; - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f); if (player->stateFlags2 & 0x80) { if (&this->actor == player->actor.parent) { player->stateFlags2 &= ~0x80; @@ -1162,9 +1162,9 @@ void func_80AA90A0(EnMb* this, GlobalContext* globalCtx) { this->actor.shape.unk_10 = 0.0f; this->unk_32A--; for (i = 4; i >= 0; i--) { - effPos.x = Math_Rand_CenteredFloat(110.0f) + this->actor.posRot.pos.x; - effPos.y = Math_Rand_CenteredFloat(15.0f) + (this->actor.posRot.pos.y + 20.0f); - effPos.z = Math_Rand_CenteredFloat(110.0f) + this->actor.posRot.pos.z; + effPos.x = Rand_CenteredFloat(110.0f) + this->actor.posRot.pos.x; + effPos.y = Rand_CenteredFloat(15.0f) + (this->actor.posRot.pos.y + 20.0f); + effPos.z = Rand_CenteredFloat(110.0f) + this->actor.posRot.pos.z; EffectSsDeadDb_Spawn(globalCtx, &effPos, &zeroVec, &zeroVec, 0x64, 7, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0xFF, 0, 1, 9, 1); @@ -1273,8 +1273,8 @@ void EnMb_Update(Actor* thisx, GlobalContext* globalCtx) { Actor_SetHeight(thisx, thisx->scale.x * 4500.0f); Collider_CylinderUpdate(thisx, &this->collider1); if (thisx->colChkInfo.health <= 0) { - this->collider1.dim.pos.x += (Math_Sins(thisx->shape.rot.y) * (-4400.0f * thisx->scale.y)); - this->collider1.dim.pos.z += (Math_Coss(thisx->shape.rot.y) * (-4400.0f * thisx->scale.y)); + this->collider1.dim.pos.x += (Math_SinS(thisx->shape.rot.y) * (-4400.0f * thisx->scale.y)); + this->collider1.dim.pos.z += (Math_CosS(thisx->shape.rot.y) * (-4400.0f * thisx->scale.y)); } CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider1.base); if (this->unk_320 >= 5) { diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c index 2f8066b0bb..a66362adce 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -469,7 +469,7 @@ void EnMd_UpdateEyes(EnMd* this) { if (DECR(this->blinkTimer) == 0) { this->eyeIdx++; if (this->eyeIdx > 2) { - this->blinkTimer = Math_Rand_S16Offset(30, 30); + this->blinkTimer = Rand_S16Offset(30, 30); this->eyeIdx = 0; } } @@ -540,7 +540,7 @@ u8 EnMd_FollowPath(EnMd* this, GlobalContext* globalCtx) { pathDiffX = pointPos->x - this->actor.posRot.pos.x; pathDiffZ = pointPos->z - this->actor.posRot.pos.z; - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, Math_atan2f(pathDiffX, pathDiffZ) * (65536.0f / (2 * M_PI)), 4, + Math_SmoothStepToS(&this->actor.posRot.rot.y, Math_FAtan2F(pathDiffX, pathDiffZ) * (65536.0f / (2 * M_PI)), 4, 4000, 1); if ((SQ(pathDiffX) + SQ(pathDiffZ)) < 100.0f) { @@ -664,10 +664,10 @@ void func_80AAB948(EnMd* this, GlobalContext* globalCtx) { yaw = Math_Vec3f_Yaw(&this->actor.initPosRot.pos, &actorToBlock->posRot.pos); this->actor.posRot.pos.x = this->actor.initPosRot.pos.x; - this->actor.posRot.pos.x += 60.0f * Math_Sins(yaw); + this->actor.posRot.pos.x += 60.0f * Math_SinS(yaw); this->actor.posRot.pos.z = this->actor.initPosRot.pos.z; - this->actor.posRot.pos.z += 60.0f * Math_Coss(yaw); + this->actor.posRot.pos.z += 60.0f * Math_CosS(yaw); temp = fabsf((f32)this->actor.yawTowardsLink - yaw) * 0.001f * 3.0f; this->skelAnime.animPlaybackSpeed = CLAMP(temp, 1.0f, 3.0f); @@ -791,8 +791,8 @@ s32 EnMd_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, } if (((limbIndex == 9) || (limbIndex == 10)) || (limbIndex == 13)) { - rot->y += Math_Sins(this->unk_214[limbIndex]) * 200.0f; - rot->z += Math_Coss(this->unk_236[limbIndex]) * 200.0f; + rot->y += Math_SinS(this->unk_214[limbIndex]) * 200.0f; + rot->z += Math_CosS(this->unk_236[limbIndex]) * 200.0f; } return 0; diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index d93446a98c..f4ab02ae26 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -125,7 +125,7 @@ void EnNb_UpdatePath(EnNb* this, GlobalContext* globalCtx) { this->finalPos.y = pointPos[1].y; this->finalPos.z = pointPos[1].z; this->pathYaw = - (Math_atan2f(this->finalPos.x - this->initialPos.x, this->finalPos.z - this->initialPos.z) * 10430.378f); + (Math_FAtan2F(this->finalPos.x - this->initialPos.x, this->finalPos.z - this->initialPos.z) * 10430.378f); // "En_Nb_Get_path_info Rail Data Get! = %d!!!!!!!!!!!!!!" osSyncPrintf("En_Nb_Get_path_info レールデータをゲットだぜ = %d!!!!!!!!!!!!!!\n", path); } else { @@ -177,11 +177,11 @@ void func_80AB10C4(EnNb* this) { Vec3s* tempPtr2; tempPtr = &this->unk_300.unk_08; - Math_SmoothScaleMaxMinS(&tempPtr->x, 0, 20, 6200, 100); - Math_SmoothScaleMaxMinS(&tempPtr->y, 0, 20, 6200, 100); + Math_SmoothStepToS(&tempPtr->x, 0, 20, 6200, 100); + Math_SmoothStepToS(&tempPtr->y, 0, 20, 6200, 100); tempPtr2 = &this->unk_300.unk_0E; - Math_SmoothScaleMaxMinS(&tempPtr2->x, 0, 20, 6200, 100); - Math_SmoothScaleMaxMinS(&tempPtr2->y, 0, 20, 6200, 100); + Math_SmoothStepToS(&tempPtr2->x, 0, 20, 6200, 100); + Math_SmoothStepToS(&tempPtr2->y, 0, 20, 6200, 100); } void EnNb_UpdateEyes(EnNb* this) { @@ -190,7 +190,7 @@ void EnNb_UpdateEyes(EnNb* this) { s16* eyeIdx = &this->eyeIdx; if (DECR(*blinkTimer) == 0) { - *blinkTimer = Math_Rand_S16Offset(60, 60); + *blinkTimer = Rand_S16Offset(60, 60); } *eyeIdx = *blinkTimer; @@ -1164,12 +1164,12 @@ void func_80AB36DC(EnNb* this, GlobalContext* globalCtx) { if ((((u16)((u16)(kREG(17) + 25) - 4))) > moveTime) { s16 invScale = 4 - moveTime; if (invScale > 0) { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->pathYaw, invScale, 6200, 100); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->pathYaw, invScale, 6200, 100); } } else { s16 invScale = (u16)(kREG(17) + 25) - moveTime; if (invScale > 0) { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.initPosRot.rot.y, invScale, 6200, 100); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.initPosRot.rot.y, invScale, 6200, 100); } } } diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c index 9be773eaa3..daa2a959ee 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -153,7 +153,7 @@ void EnNiw_Init(Actor* thisx, GlobalContext* globalCtx) { Math_Vec3f_Copy(&this->unk_2B8, &this->actor.posRot.pos); this->unk_304 = 10.0f; Actor_SetScale(&this->actor, 0.01f); - this->unk_2A4 = (s16)Math_Rand_ZeroFloat(3.99f) + 5; + this->unk_2A4 = (s16)Rand_ZeroFloat(3.99f) + 5; if (this->unk_2A4 < 0) { this->unk_2A4 = 1; @@ -242,7 +242,7 @@ void func_80AB5BF8(EnNiw* this, GlobalContext* globalCtx, s16 arg2) { this->unk_26C[0] = 0.0f; if (arg2 == 0) { - this->timer1 = Math_Rand_ZeroFloat(30.0f); + this->timer1 = Rand_ZeroFloat(30.0f); } } } @@ -293,28 +293,28 @@ void func_80AB5BF8(EnNiw* this, GlobalContext* globalCtx, s16 arg2) { } } if (this->unk_2E0 != this->unk_26C[9]) { - Math_SmoothScaleMaxF(&this->unk_2E0, this->unk_26C[9], 0.5f, 4000.0f); + Math_ApproachF(&this->unk_2E0, this->unk_26C[9], 0.5f, 4000.0f); } if (this->unk_2DC != this->unk_26C[0]) { - Math_SmoothScaleMaxF(&this->unk_2DC, this->unk_26C[0], 0.5f, 4000.0f); + Math_ApproachF(&this->unk_2DC, this->unk_26C[0], 0.5f, 4000.0f); } if (this->unk_2C4 != this->unk_26C[2]) { - Math_SmoothScaleMaxF(&this->unk_2C4, this->unk_26C[2], 0.8f, 7000.0f); + Math_ApproachF(&this->unk_2C4, this->unk_26C[2], 0.8f, 7000.0f); } if (this->unk_2C8 != this->unk_26C[7]) { - Math_SmoothScaleMaxF(&this->unk_2C8, this->unk_26C[7], 0.8f, 7000.0f); + Math_ApproachF(&this->unk_2C8, this->unk_26C[7], 0.8f, 7000.0f); } if (this->unk_2CC != this->unk_26C[8]) { - Math_SmoothScaleMaxF(&this->unk_2CC, this->unk_26C[8], 0.8f, 7000.0f); + Math_ApproachF(&this->unk_2CC, this->unk_26C[8], 0.8f, 7000.0f); } if (this->unk_2D0 != this->unk_26C[1]) { - Math_SmoothScaleMaxF(&this->unk_2D0, this->unk_26C[1], 0.8f, 7000.0f); + Math_ApproachF(&this->unk_2D0, this->unk_26C[1], 0.8f, 7000.0f); } if (this->unk_2D4 != this->unk_26C[5]) { - Math_SmoothScaleMaxF(&this->unk_2D4, this->unk_26C[5], 0.8f, 7000.0f); + Math_ApproachF(&this->unk_2D4, this->unk_26C[5], 0.8f, 7000.0f); } if (this->unk_2D8 != this->unk_26C[6]) { - Math_SmoothScaleMaxF(&this->unk_2D8, this->unk_26C[6], 0.8f, 7000.0f); + Math_ApproachF(&this->unk_2D8, this->unk_26C[6], 0.8f, 7000.0f); } } @@ -330,9 +330,9 @@ void EnNiw_SpawnAttackCucco(EnNiw* this, GlobalContext* globalCtx) { viewX = globalCtx->view.lookAt.x - globalCtx->view.eye.x; viewY = globalCtx->view.lookAt.y - globalCtx->view.eye.y; viewZ = globalCtx->view.lookAt.z - globalCtx->view.eye.z; - attackCuccoPos.x = ((Math_Rand_ZeroOne() - 0.5f) * viewX) + globalCtx->view.eye.x; - attackCuccoPos.y = Math_Rand_CenteredFloat(0.3f) + ((globalCtx->view.eye.y + 50.0f) + (viewY * 0.5f)); - attackCuccoPos.z = ((Math_Rand_ZeroOne() - 0.5f) * viewZ) + globalCtx->view.eye.z; + attackCuccoPos.x = ((Rand_ZeroOne() - 0.5f) * viewX) + globalCtx->view.eye.x; + attackCuccoPos.y = Rand_CenteredFloat(0.3f) + ((globalCtx->view.eye.y + 50.0f) + (viewY * 0.5f)); + attackCuccoPos.z = ((Rand_ZeroOne() - 0.5f) * viewZ) + globalCtx->view.eye.z; attackCucco = Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ATTACK_NIW, attackCuccoPos.x, attackCuccoPos.y, attackCuccoPos.z, 0, 0, 0, 0); @@ -378,8 +378,8 @@ void func_80AB6100(EnNiw* this, GlobalContext* globalCtx, s32 arg2) { } } targetRotY = this->unk_2E4 + factor; - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, targetRotY, 3, this->unk_2FC, 0); - Math_SmoothScaleMaxF(&this->unk_2FC, 3000.0f, 1.0f, 500.0f); + Math_SmoothStepToS(&this->actor.posRot.rot.y, targetRotY, 3, this->unk_2FC, 0); + Math_ApproachF(&this->unk_2FC, 3000.0f, 1.0f, 500.0f); func_80AB5BF8(this, globalCtx, 5); } @@ -401,8 +401,8 @@ void EnNiw_ResetAction(EnNiw* this, GlobalContext* globalCtx) { void func_80AB6324(EnNiw* this, GlobalContext* globalCtx) { if (this->unk_308 != 0) { - this->actor.velocity.y = Math_Rand_ZeroFloat(2.0f) + 4.0f; - this->actor.speedXZ = Math_Rand_ZeroFloat(2.0f) + 3.0f; + this->actor.velocity.y = Rand_ZeroFloat(2.0f) + 4.0f; + this->actor.speedXZ = Rand_ZeroFloat(2.0f) + 3.0f; this->actionFunc = func_80AB63A8; } func_80AB5BF8(this, globalCtx, 1); @@ -448,8 +448,8 @@ void func_80AB6450(EnNiw* this, GlobalContext* globalCtx) { void func_80AB6570(EnNiw* this, GlobalContext* globalCtx) { s32 pad[2]; - f32 posY = Math_Rand_CenteredFloat(100.0f); - f32 posZ = Math_Rand_CenteredFloat(100.0f); + f32 posY = Rand_CenteredFloat(100.0f); + f32 posZ = Rand_CenteredFloat(100.0f); s16 tmp; if (this->actor.params != 0xA) { @@ -471,7 +471,7 @@ void func_80AB6570(EnNiw* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(&this->actor, NA_SE_EV_CHICKEN_CRY_M); this->sfxTimer3 = 100; } - this->unk_2A0 = Math_Rand_ZeroFloat(1.99f); + this->unk_2A0 = Rand_ZeroFloat(1.99f); this->actor.speedXZ = 4.0f; this->unk_300 = 0.0f; this->unk_2FC = 0.0f; @@ -483,19 +483,19 @@ void func_80AB6570(EnNiw* this, GlobalContext* globalCtx) { tmp = 0; if (this->timer5 != 0) { - if (Math_Rand_ZeroFloat(3.99f) < 1.0f) { + if (Rand_ZeroFloat(3.99f) < 1.0f) { this->unk_2E6++; this->unk_2E6 &= 1; } - Math_SmoothScaleMaxF(&this->unk_26C[9], D_80AB8604[this->unk_2E6], 0.5f, 4000.0f); + Math_ApproachF(&this->unk_26C[9], D_80AB8604[this->unk_2E6], 0.5f, 4000.0f); } if (this->timer5 == 0 && this->timer4 == 0) { this->unk_29E++; if (this->unk_29E >= 8) { - this->timer5 = Math_Rand_ZeroFloat(30.0f); - this->unk_29E = Math_Rand_ZeroFloat(3.99f); + this->timer5 = Rand_ZeroFloat(30.0f); + this->unk_29E = Rand_ZeroFloat(3.99f); if (this->actor.params != 0xA && this->actor.params != 8) { if (posY < 0.0f) { posY -= 100.0f; @@ -508,8 +508,8 @@ void func_80AB6570(EnNiw* this, GlobalContext* globalCtx) { posZ += 100.0f; } } else { - posY = Math_Rand_CenteredFloat(30.0f); - posZ = Math_Rand_CenteredFloat(30.0f); + posY = Rand_CenteredFloat(30.0f); + posZ = Rand_CenteredFloat(30.0f); if (posY < 0.0f) { posY -= 20.0f; } else { @@ -537,11 +537,11 @@ void func_80AB6570(EnNiw* this, GlobalContext* globalCtx) { } if (this->timer4 != 0) { - Math_SmoothDownscaleMaxF(&this->unk_26C[9], 0.5f, 4000.0f); + Math_ApproachZeroF(&this->unk_26C[9], 0.5f, 4000.0f); tmp = 1; - Math_SmoothScaleMaxF(&this->actor.posRot.pos.x, this->unk_2B8, 1.0f, this->unk_2FC); - Math_SmoothScaleMaxF(&this->actor.posRot.pos.z, this->unk_2C0, 1.0f, this->unk_2FC); - Math_SmoothScaleMaxF(&this->unk_2FC, 3.0f, 1.0f, 0.3f); + Math_ApproachF(&this->actor.posRot.pos.x, this->unk_2B8, 1.0f, this->unk_2FC); + Math_ApproachF(&this->actor.posRot.pos.z, this->unk_2C0, 1.0f, this->unk_2FC); + Math_ApproachF(&this->unk_2FC, 3.0f, 1.0f, 0.3f); posY = this->unk_2B8 - this->actor.posRot.pos.x; posZ = this->unk_2C0 - this->actor.posRot.pos.z; @@ -556,9 +556,9 @@ void func_80AB6570(EnNiw* this, GlobalContext* globalCtx) { this->unk_29E = 7; } - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, Math_atan2f(posY, posZ) * (0x8000 / M_PI), 3, this->unk_300, + Math_SmoothStepToS(&this->actor.posRot.rot.y, Math_FAtan2F(posY, posZ) * (0x8000 / M_PI), 3, this->unk_300, 0); - Math_SmoothScaleMaxF(&this->unk_300, 10000.0f, 1.0f, 1000.0f); + Math_ApproachF(&this->unk_300, 10000.0f, 1.0f, 1000.0f); } func_80AB5BF8(this, globalCtx, tmp); @@ -585,7 +585,7 @@ void func_80AB6A38(EnNiw* this, GlobalContext* globalCtx) { pointPos += this->waypoint; pathDiffX = pointPos->x - this->actor.posRot.pos.x; pathDiffZ = pointPos->z - this->actor.posRot.pos.z; - this->unk_2E4 = Math_atan2f(pathDiffX, pathDiffZ) * (0x8000 / M_PI); + this->unk_2E4 = Math_FAtan2F(pathDiffX, pathDiffZ) * (0x8000 / M_PI); func_80AB6100(this, globalCtx, 2); if (fabsf(pathDiffX) < 30.0f && fabsf(pathDiffZ) < 30.0f) { @@ -605,9 +605,9 @@ void func_80AB6BF8(EnNiw* this, GlobalContext* globalCtx) { this->timer4 = 10; } - this->actor.shape.rot.x = Math_Rand_CenteredFloat(5000.0f); - this->actor.shape.rot.y = Math_Rand_CenteredFloat(5000.0f); - this->actor.shape.rot.z = Math_Rand_CenteredFloat(5000.0f); + this->actor.shape.rot.x = Rand_CenteredFloat(5000.0f); + this->actor.shape.rot.y = Rand_CenteredFloat(5000.0f); + this->actor.shape.rot.z = Rand_CenteredFloat(5000.0f); if (Actor_HasNoParent(&this->actor, globalCtx)) { if (this->actor.params == 0xD) { @@ -788,7 +788,7 @@ void func_80AB7204(EnNiw* this, GlobalContext* globalCtx) { if (this->timer7 < 2) { if (this->timer7 == 1) { this->actor.speedXZ = 3.0f; - this->unk_2A0 = Math_Rand_ZeroFloat(1.99f); + this->unk_2A0 = Rand_ZeroFloat(1.99f); this->timer1 = this->timer2 = this->timer3 = this->timer4 = 0; } else { func_80AB6100(this, globalCtx, 1); @@ -798,7 +798,7 @@ void func_80AB7204(EnNiw* this, GlobalContext* globalCtx) { void func_80AB7290(EnNiw* this, GlobalContext* globalCtx) { SkelAnime_ChangeAnim(&this->skelAnime, &D_060000E8, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_060000E8), 0, -10.0f); - this->unk_2A0 = Math_Rand_ZeroFloat(1.99f); + this->unk_2A0 = Rand_ZeroFloat(1.99f); this->actor.speedXZ = 4.0f; this->actionFunc = func_80AB7328; } @@ -818,7 +818,7 @@ void func_80AB7328(EnNiw* this, GlobalContext* globalCtx) { } this->actionFunc = EnNiw_ResetAction; } else { - this->unk_2E4 = Math_atan2f(this->actor.posRot.pos.x - player->actor.posRot.pos.x, + this->unk_2E4 = Math_FAtan2F(this->actor.posRot.pos.x - player->actor.posRot.pos.x, this->actor.posRot.pos.z - player->actor.posRot.pos.z) * (0x8000 / M_PI); func_80AB6100(this, globalCtx, 0); @@ -828,7 +828,7 @@ void func_80AB7328(EnNiw* this, GlobalContext* globalCtx) { void func_80AB7420(EnNiw* this, GlobalContext* globalCtx) { if (this->actor.bgCheckFlags & 1) { - this->unk_2A4 = (s16)Math_Rand_ZeroFloat(3.99f) + 5; + this->unk_2A4 = (s16)Rand_ZeroFloat(3.99f) + 5; this->actionFunc = EnNiw_ResetAction; } } @@ -884,21 +884,21 @@ void EnNiw_Update(Actor* thisx, GlobalContext* globalCtx) { } for (i = 0; i < featherCount; i++) { - pos.x = Math_Rand_CenteredFloat(10.0f) + thisx->posRot.pos.x; - pos.y = Math_Rand_CenteredFloat(10.0f) + (thisx->posRot.pos.y + this->unk_304); - pos.z = Math_Rand_CenteredFloat(10.0f) + thisx->posRot.pos.z; - scale = Math_Rand_ZeroFloat(6.0f) + 6.0f; + pos.x = Rand_CenteredFloat(10.0f) + thisx->posRot.pos.x; + pos.y = Rand_CenteredFloat(10.0f) + (thisx->posRot.pos.y + this->unk_304); + pos.z = Rand_CenteredFloat(10.0f) + thisx->posRot.pos.z; + scale = Rand_ZeroFloat(6.0f) + 6.0f; if (this->unk_2A6 == 2 && this->unk_304 != 0) { pos.y += 10; } if (this->unk_304 == 0) { - scale = Math_Rand_ZeroFloat(2.0f) + 2; + scale = Rand_ZeroFloat(2.0f) + 2; } - vel.x = Math_Rand_CenteredFloat(3.0f); - vel.y = (Math_Rand_ZeroFloat(2.0f) * 0.5f) + 2.0f; - vel.z = Math_Rand_CenteredFloat(3.0f); + vel.x = Rand_CenteredFloat(3.0f); + vel.y = (Rand_ZeroFloat(2.0f) * 0.5f) + 2.0f; + vel.z = Rand_CenteredFloat(3.0f); accel.x = 0.0f; accel.y = -0.15f; accel.z = 0.0f; @@ -1136,8 +1136,8 @@ void EnNiw_FeatherSpawn(EnNiw* this, Vec3f* pos, Vec3f* vel, Vec3f* accel, f32 s feather->accel = *accel; feather->timer = 0; feather->scale = scale / 1000.0f; - feather->life = (s16)Math_Rand_ZeroFloat(20.0f) + 40; - feather->unk_2A = Math_Rand_ZeroFloat(1000.0f); + feather->life = (s16)Rand_ZeroFloat(20.0f) + 40; + feather->unk_2A = Rand_ZeroFloat(1000.0f); break; } } @@ -1158,13 +1158,13 @@ void EnNiw_FeatherUpdate(EnNiw* this, GlobalContext* globalCtx) { feather->vel.z += feather->accel.z; if (feather->type == 1) { feather->unk_2A++; - Math_SmoothScaleMaxF(&feather->vel.x, 0.0f, 1.0f, 0.05f); - Math_SmoothScaleMaxF(&feather->vel.z, 0.0f, 1.0f, 0.05f); + Math_ApproachF(&feather->vel.x, 0.0f, 1.0f, 0.05f); + Math_ApproachF(&feather->vel.z, 0.0f, 1.0f, 0.05f); if (feather->vel.y < -0.5f) { feather->vel.y = -0.5f; } - feather->unk_30 = Math_Sins(feather->unk_2A * 0xBB8) * M_PI * 0.2f; + feather->unk_30 = Math_SinS(feather->unk_2A * 0xBB8) * M_PI * 0.2f; if (feather->life < feather->timer) { feather->type = 0; diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index 55e756985e..932bea4ddd 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -102,7 +102,7 @@ void func_80AB9210(EnNiwGirl* this, GlobalContext* globalCtx) { f32 zDistBetween; SkelAnime_FrameUpdateMatrix(&this->skelAnime); - Math_SmoothScaleMaxF(&this->actor.speedXZ, 3.0f, 0.2f, 0.4f); + Math_ApproachF(&this->actor.speedXZ, 3.0f, 0.2f, 0.4f); // Find the X and Z distance between the girl and the cuckoo she is chasing xDistBetween = this->chasedEnNiw->actor.posRot.pos.x - this->actor.posRot.pos.x; @@ -118,9 +118,9 @@ void func_80AB9210(EnNiwGirl* this, GlobalContext* globalCtx) { } // Change her angle so that she is always facing the cuckoo - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, Math_atan2f(xDistBetween, zDistBetween) * 10430.378f, 3, + Math_SmoothStepToS(&this->actor.shape.rot.y, Math_FAtan2F(xDistBetween, zDistBetween) * 10430.378f, 3, this->unk_27C, 0); - Math_SmoothScaleMaxF(&this->unk_27C, 5000.0f, 30.0f, 150.0f); + Math_ApproachF(&this->unk_27C, 5000.0f, 30.0f, 150.0f); this->actor.posRot.rot.y = this->actor.shape.rot.y; // Only allow Link to talk to her when she is playing the jumping animation @@ -164,14 +164,14 @@ void func_80AB94D0(EnNiwGirl* this, GlobalContext* globalCtx) { if (func_8010BDBC(&globalCtx->msgCtx)) { this->chasedEnNiw->path = 0; } - Math_SmoothDownscaleMaxF(&this->actor.speedXZ, 0.8f, 0.2f); + Math_ApproachZeroF(&this->actor.speedXZ, 0.8f, 0.2f); if (func_8002F194(&this->actor, globalCtx)) { if (this->actor.textId == 0x70EA) { this->unk_27A = 1; } } else { if ((this->jumpTimer == 0) && !func_8010BDBC(&globalCtx->msgCtx)) { - this->jumpTimer = Math_Rand_ZeroFloat(100.0f) + 250.0f; + this->jumpTimer = Rand_ZeroFloat(100.0f) + 250.0f; this->actionFunc = EnNiwGirl_Jump; } else { func_8002F2CC(&this->actor, globalCtx, 100.0f); @@ -191,7 +191,7 @@ void EnNiwGirl_Update(Actor* thisx, GlobalContext* globalCtx) { this->unk_272++; if (this->unk_272 >= 3) { this->unk_272 = 0; - this->unk_274 = (s16)Math_Rand_ZeroFloat(60.0f) + 20; + this->unk_274 = (s16)Rand_ZeroFloat(60.0f) + 20; } } this->unk_280 = 30.0f; @@ -205,9 +205,9 @@ void EnNiwGirl_Update(Actor* thisx, GlobalContext* globalCtx) { this->unk_260 = this->unk_2D4.unk_08; this->unk_266 = this->unk_2D4.unk_0E; } else { - Math_SmoothScaleMaxMinS(&this->unk_266.y, 0, 5, 3000, 0); - Math_SmoothScaleMaxMinS(&this->unk_260.y, 0, 5, 3000, 0); - Math_SmoothScaleMaxMinS(&this->unk_260.z, 0, 5, 3000, 0); + Math_SmoothStepToS(&this->unk_266.y, 0, 5, 3000, 0); + Math_SmoothStepToS(&this->unk_260.y, 0, 5, 3000, 0); + Math_SmoothStepToS(&this->unk_260.z, 0, 5, 3000, 0); } if (this->unk_274 != 0) { this->unk_274--; diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index 2d72b4b313..251a43b3a0 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -490,7 +490,7 @@ void EnNiwLady_Update(Actor* thisx, GlobalContext* globalCtx) { this->unk_254 = this->unk_288.unk_08; this->unk_25A = this->unk_288.unk_0E; if (this->unk_276 == 0) { - Math_SmoothScaleMaxMinS(&this->unk_254.y, 0, 5, 3000, 0); + Math_SmoothStepToS(&this->unk_254.y, 0, 5, 3000, 0); } gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[this->objectOsAnimeIndex].segment); if (this->objectOsAnimeIndex >= 0) { @@ -516,7 +516,7 @@ void EnNiwLady_Update(Actor* thisx, GlobalContext* globalCtx) { this->faceState++; if (this->faceState >= 3) { this->faceState = 0; - this->unusedRandomTimer = ((s16)Math_Rand_ZeroFloat(60.0f) + 0x14); + this->unusedRandomTimer = ((s16)Rand_ZeroFloat(60.0f) + 0x14); } } func_8002E4B4(globalCtx, thisx, 20.0f, 20.0f, 60.0f, 0x1D); @@ -549,8 +549,8 @@ s32 EnNiwLady_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dL } if (this->unk_275 != 0) { if ((limbIndex == 8) || (limbIndex == 10) || (limbIndex == 13)) { - rot->y += (Math_Sins((globalCtx->state.frames * ((limbIndex * 0x32) + 0x814))) * 200.0f); - rot->z += (Math_Coss((globalCtx->state.frames * ((limbIndex * 0x32) + 0x940))) * 200.0f); + rot->y += (Math_SinS((globalCtx->state.frames * ((limbIndex * 0x32) + 0x814))) * 200.0f); + rot->z += (Math_CosS((globalCtx->state.frames * ((limbIndex * 0x32) + 0x940))) * 200.0f); } } return 0; diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c index 392dd4bee2..dd4a1c2fe5 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -213,9 +213,9 @@ void EnNwc_Init(Actor* thisx, GlobalContext* globalCtx) { chick = this->chicks; for (i = 0; i < this->count; i++, chick++) { chick->type = CHICK_NORMAL; - chick->pos.x = thisx->posRot.pos.x + ((Math_Rand_ZeroOne() * 100.0f) - 50.0f); + chick->pos.x = thisx->posRot.pos.x + ((Rand_ZeroOne() * 100.0f) - 50.0f); chick->pos.y = thisx->posRot.pos.y + 20.0f; - chick->pos.z = thisx->posRot.pos.z + ((Math_Rand_ZeroOne() * 100.0f) - 50.0f); + chick->pos.z = thisx->posRot.pos.z + ((Rand_ZeroOne() * 100.0f) - 50.0f); chick->height = 5; } EnNwc_SetUpdate(this, EnNwc_Idle); diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index af19e294e8..a7561f4daa 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -212,8 +212,8 @@ void EnOkuta_SetupFreeze(EnOkuta* this) { void EnOkuta_SpawnProjectile(EnOkuta* this, GlobalContext* globalCtx) { Vec3f pos; Vec3f velocity; - f32 sin = Math_Sins(this->actor.shape.rot.y); - f32 cos = Math_Coss(this->actor.shape.rot.y); + f32 sin = Math_SinS(this->actor.shape.rot.y); + f32 cos = Math_CosS(this->actor.shape.rot.y); pos.x = this->actor.posRot.pos.x + (25.0f * sin); pos.y = this->actor.posRot.pos.y - 6.0f; @@ -266,7 +266,7 @@ void EnOkuta_Appear(EnOkuta* this, GlobalContext* globalCtx) { void EnOkuta_Hide(EnOkuta* this, GlobalContext* globalCtx) { s32 pad; - Math_SmoothScaleMaxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 0.5f, 30.0f); + Math_ApproachF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 0.5f, 30.0f); if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_OCTAROCK_BUBLE); EnOkuta_SpawnBubbles(this, globalCtx); @@ -299,7 +299,7 @@ void EnOkuta_WaitToShoot(EnOkuta* this, GlobalContext* globalCtx) { if (this->actor.xzDistFromLink < 160.0f || this->actor.xzDistFromLink > 560.0f) { EnOkuta_SetupHide(this); } else { - temp_v0_2 = Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 3, 0x71C, 0x38E); + temp_v0_2 = Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 3, 0x71C, 0x38E); phi_v1 = ABS(temp_v0_2); if ((phi_v1 < 0x38E) && (this->timer == 0) && (this->actor.yDistFromLink < 200.0f)) { EnOkuta_SetupShoot(this, globalCtx); @@ -308,7 +308,7 @@ void EnOkuta_WaitToShoot(EnOkuta* this, GlobalContext* globalCtx) { } void EnOkuta_Shoot(EnOkuta* this, GlobalContext* globalCtx) { - Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 3, 0x71C); + Math_ApproachS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 3, 0x71C); if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { if (this->timer != 0) { this->timer--; @@ -344,7 +344,7 @@ void EnOkuta_WaitToDie(EnOkuta* this, GlobalContext* globalCtx) { if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { EnOkuta_SetupDie(this); } - Math_SmoothScaleMaxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 0.5f, 5.0f); + Math_ApproachF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 0.5f, 5.0f); } void EnOkuta_Die(EnOkuta* this, GlobalContext* globalCtx) { @@ -358,7 +358,7 @@ void EnOkuta_Die(EnOkuta* this, GlobalContext* globalCtx) { if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { this->timer++; } - Math_SmoothScaleMaxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 0.5f, 5.0f); + Math_ApproachF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 0.5f, 5.0f); if (this->timer == 5) { pos.x = this->actor.posRot.pos.x; pos.y = this->actor.posRot.pos.y + 40.0f; @@ -380,15 +380,15 @@ void EnOkuta_Die(EnOkuta* this, GlobalContext* globalCtx) { } else if (this->timer < 11) { Actor_SetScale(&this->actor, (((this->timer - 5) * 0.04f) + 0.8f) * 0.01f); } else { - if (Math_ApproxF(&this->actor.scale.x, 0.0f, 0.0005f)) { + if (Math_StepToF(&this->actor.scale.x, 0.0f, 0.0005f)) { Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 30, NA_SE_EN_OCTAROCK_BUBLE); Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.posRot.pos, 0x70); for (i = 0; i < 20; i++) { - velocity.x = (Math_Rand_ZeroOne() - 0.5f) * 7.0f; - velocity.y = Math_Rand_ZeroOne() * 7.0f; - velocity.z = (Math_Rand_ZeroOne() - 0.5f) * 7.0f; + velocity.x = (Rand_ZeroOne() - 0.5f) * 7.0f; + velocity.y = Rand_ZeroOne() * 7.0f; + velocity.z = (Rand_ZeroOne() - 0.5f) * 7.0f; EffectSsDtBubble_SpawnCustomColor(globalCtx, &this->actor.posRot.pos, &velocity, &accel, &primColor, - &envColor, Math_Rand_S16Offset(100, 50), 25, 0); + &envColor, Rand_S16Offset(100, 50), 25, 0); } Actor_Kill(&this->actor); } @@ -412,9 +412,9 @@ void EnOkuta_Freeze(EnOkuta* this, GlobalContext* globalCtx) { pos.x = this->actor.posRot.pos.x + ((temp_v1 & 2) ? 10.0f : -10.0f); pos.z = this->actor.posRot.pos.z + ((temp_v1 & 1) ? 10.0f : -10.0f); EffectSsEnIce_SpawnFlyingVec3f(globalCtx, &this->actor, &pos, 150, 150, 150, 250, 235, 245, 255, - (Math_Rand_ZeroOne() * 0.2f) + 1.9f); + (Rand_ZeroOne() * 0.2f) + 1.9f); } - Math_SmoothScaleMaxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 0.5f, 5.0f); + Math_ApproachF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 0.5f, 5.0f); } void EnOkuta_ProjectileFly(EnOkuta* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.c b/src/overlays/actors/ovl_En_Part/z_en_part.c index 5783d63e13..71d4ec5f3f 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -46,24 +46,24 @@ void func_80ACDDE8(EnPart* this, GlobalContext* globalCtx) { f32 sign = 1.0f; this->action = 1; - this->actor.posRot.rot.y = Math_Rand_ZeroOne() * 20000.0f; + this->actor.posRot.rot.y = Rand_ZeroOne() * 20000.0f; switch (this->actor.params) { case 0: this->actor.velocity.y = 0.0f; - this->actor.gravity = -0.3f - Math_Rand_ZeroOne() * 0.5f; + this->actor.gravity = -0.3f - Rand_ZeroOne() * 0.5f; this->rotZSpeed = 0.3f; this->timer = 25; - this->actor.speedXZ = (Math_Rand_ZeroOne() - 0.5f) * 2.0f; + this->actor.speedXZ = (Rand_ZeroOne() - 0.5f) * 2.0f; break; case 13: this->timer = 400; case 12: - this->actor.speedXZ = Math_Rand_CenteredFloat(6.0f); + this->actor.speedXZ = Rand_CenteredFloat(6.0f); this->actor.initPosRot.pos = this->actor.posRot.pos; this->timer += 60; - this->actor.velocity.y = Math_Rand_ZeroOne() * 5.0f + 4.0f; - this->actor.gravity = -0.6f - Math_Rand_ZeroOne() * 0.5f; + this->actor.velocity.y = Rand_ZeroOne() * 5.0f + 4.0f; + this->actor.gravity = -0.6f - Rand_ZeroOne() * 0.5f; this->rotZSpeed = 0.15f; break; case 14: @@ -72,19 +72,19 @@ void func_80ACDDE8(EnPart* this, GlobalContext* globalCtx) { case 4: case 9: case 10: - this->timer += (s16)(Math_Rand_ZeroOne() * 17.0f) + 5; + this->timer += (s16)(Rand_ZeroOne() * 17.0f) + 5; case 2: - this->actor.velocity.y = Math_Rand_ZeroOne() * 5.0f + 4.0f; - this->actor.gravity = -0.6f - Math_Rand_ZeroOne() * 0.5f; + this->actor.velocity.y = Rand_ZeroOne() * 5.0f + 4.0f; + this->actor.gravity = -0.6f - Rand_ZeroOne() * 0.5f; this->rotZSpeed = 0.15f; break; case 11: EffectSsEnFire_SpawnVec3f(globalCtx, &this->actor, &this->actor.posRot.pos, 40, 0x8001, 0, -1); case 3: - this->actor.speedXZ = (Math_Rand_ZeroOne() - 0.5f) * 3.0f; - this->timer = (s16)(Math_Rand_ZeroOne() * 17.0f) + 10; - this->actor.velocity.y = Math_Rand_ZeroOne() * 3.0f + 8.0f; - this->actor.gravity = -0.6f - Math_Rand_ZeroOne() * 0.3f; + this->actor.speedXZ = (Rand_ZeroOne() - 0.5f) * 3.0f; + this->timer = (s16)(Rand_ZeroOne() * 17.0f) + 10; + this->actor.velocity.y = Rand_ZeroOne() * 3.0f + 8.0f; + this->actor.gravity = -0.6f - Rand_ZeroOne() * 0.3f; this->rotZSpeed = 0.15f; break; case 5: @@ -143,13 +143,13 @@ void func_80ACE13C(EnPart* this, GlobalContext* globalCtx) { break; case 4: for (i = 7; i >= 0; i--) { - pos.x = this->actor.posRot.pos.x + Math_Rand_CenteredFloat(60.0f); + pos.x = this->actor.posRot.pos.x + Rand_CenteredFloat(60.0f); pos.y = this->actor.posRot.pos.y + this->actor.shape.unk_08 * this->actor.scale.y + - Math_Rand_CenteredFloat(50.0f); - pos.z = this->actor.posRot.pos.z + Math_Rand_CenteredFloat(60.0f); - velocity.y = Math_Rand_ZeroOne() + 1.0f; - EffectSsDtBubble_SpawnColorProfile(globalCtx, &pos, &velocity, &accel, Math_Rand_S16Offset(80, 100), - 25, 0, true); + Rand_CenteredFloat(50.0f); + pos.z = this->actor.posRot.pos.z + Rand_CenteredFloat(60.0f); + velocity.y = Rand_ZeroOne() + 1.0f; + EffectSsDtBubble_SpawnColorProfile(globalCtx, &pos, &velocity, &accel, Rand_S16Offset(80, 100), 25, + 0, true); } break; case 5: @@ -157,9 +157,9 @@ void func_80ACE13C(EnPart* this, GlobalContext* globalCtx) { case 7: case 8: for (i = 4; i >= 0; i--) { - pos.x = this->actor.posRot.pos.x + Math_Rand_CenteredFloat(25.0f); - pos.y = this->actor.posRot.pos.y + Math_Rand_CenteredFloat(40.0f); - pos.z = this->actor.posRot.pos.z + Math_Rand_CenteredFloat(25.0f); + pos.x = this->actor.posRot.pos.x + Rand_CenteredFloat(25.0f); + pos.y = this->actor.posRot.pos.y + Rand_CenteredFloat(40.0f); + pos.z = this->actor.posRot.pos.z + Rand_CenteredFloat(25.0f); EffectSsDeadDb_Spawn(globalCtx, &pos, &zeroVec, &zeroVec, 40, 7, 255, 255, 255, 255, 0, 0, 255, 1, 9, true); } @@ -205,9 +205,9 @@ void func_80ACE5C8(EnPart* this, GlobalContext* globalCtx) { } func_80033480(globalCtx, &this->actor.posRot.pos, 0.0f, 1, 300, 150, 1); - velocity.x = Math_Rand_CenteredFloat(16.0f); + velocity.x = Rand_CenteredFloat(16.0f); EffectSsHahen_Spawn(globalCtx, &this->actor.posRot.pos, &velocity, &accel, 20, - (s32)((Math_Rand_ZeroOne() * 5.0f + 12.0f) * 2), -1, 10, NULL); + (s32)((Rand_ZeroOne() * 5.0f + 12.0f) * 2), -1, 10, NULL); Audio_PlayActorSound2(&this->actor, NA_SE_EN_MONBLIN_GNDWAVE - SFX_FLAG); } } @@ -224,10 +224,10 @@ void func_80ACE7E8(EnPart* this, GlobalContext* globalCtx) { if (this->timer == 0) { f32 diffsSum = - Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.x, this->actor.initPosRot.pos.x, 1.0f, 5.0f, 0.0f); - diffsSum += Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 1.0f, 5.0f, 0.0f); - diffsSum += Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.z, this->actor.initPosRot.pos.z, 1.0f, 5.0f, 0.0f); - diffsSum += Math_SmoothScaleMaxMinF(&this->rotZ, 0.0f, 1.0f, 0.25f, 0.0f); + Math_SmoothStepToF(&this->actor.posRot.pos.x, this->actor.initPosRot.pos.x, 1.0f, 5.0f, 0.0f); + diffsSum += Math_SmoothStepToF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 1.0f, 5.0f, 0.0f); + diffsSum += Math_SmoothStepToF(&this->actor.posRot.pos.z, this->actor.initPosRot.pos.z, 1.0f, 5.0f, 0.0f); + diffsSum += Math_SmoothStepToF(&this->rotZ, 0.0f, 1.0f, 0.25f, 0.0f); if (diffsSum == 0.0f) { this->actor.parent->initPosRot.rot.x--; this->timer--; @@ -254,7 +254,7 @@ void EnPart_Update(Actor* thisx, GlobalContext* globalCtx) { if ((this->actor.params > 4 && this->actor.params < 9) || this->actor.params < 0) { func_8002E4B4(globalCtx, &this->actor, 5.0f, 15.0f, 0.0f, 5); if (this->actor.params >= 0) { - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f); if (thisx->bgCheckFlags & 1) { thisx->bgCheckFlags &= ~1; thisx->velocity.y = 6.0f; diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c index e5b9213df3..61082edc18 100644 --- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c +++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c @@ -121,7 +121,7 @@ void EnPoDesert_UpdateSpeedModifier(EnPoDesert* this) { if (this->speedModifier != 0) { this->speedModifier--; } - this->actor.posRot.pos.y = Math_Sins(this->speedModifier * 0x800) * 13.0f + this->targetY; + this->actor.posRot.pos.y = Math_SinS(this->speedModifier * 0x800) * 13.0f + this->targetY; } void EnPoDesert_WaitForPlayer(EnPoDesert* this, GlobalContext* globalCtx) { @@ -147,14 +147,14 @@ void EnPoDesert_MoveToNextPoint(EnPoDesert* this, GlobalContext* globalCtx) { this->actionTimer--; } temp_f20 = sinf(this->actionTimer * (M_PI / 20.0f)) * 5.0f; - this->actor.posRot.pos.x += temp_f20 * Math_Coss(this->actor.shape.rot.y); - this->actor.posRot.pos.z += temp_f20 * Math_Sins(this->actor.shape.rot.y); + this->actor.posRot.pos.x += temp_f20 * Math_CosS(this->actor.shape.rot.y); + this->actor.posRot.pos.z += temp_f20 * Math_SinS(this->actor.shape.rot.y); if (this->actionTimer == 0) { this->actionTimer = 40; } temp_f20 = func_8002DBB0(&this->actor, &this->actor.initPosRot.pos); this->actor.posRot.rot.y = func_8002DAC0(&this->actor, &this->actor.initPosRot.pos); - Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.posRot.rot.y + 0x8000, 5, 0x400); + Math_ApproachS(&this->actor.shape.rot.y, this->actor.posRot.rot.y + 0x8000, 5, 0x400); this->actor.speedXZ = sinf(this->speedModifier * (M_PI / 32.0f)) * 2.5f + 5.5f; func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); this->targetY = this->actor.initPosRot.pos.y - ((temp_f20 * this->yDiff) / this->initDistToNextPoint); @@ -226,7 +226,7 @@ void EnPoDesert_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis if (limbIndex == 7) { Matrix_MultVec3f(&baseLightPos, &lightPos); - rand = Math_Rand_ZeroOne(); + rand = Rand_ZeroOne(); color.r = (s16)(rand * 30.0f) + 225; color.g = (s16)(rand * 100.0f) + 155; color.b = (s16)(rand * 160.0f) + 95; diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c index ff31f1b21f..6657cebc49 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c @@ -326,11 +326,11 @@ void EnPoField_CorrectYPos(EnPoField* this, GlobalContext* globalCtx) { EnPoField_SetupDisappear(this); return; } - Math_SmoothScaleMaxF( + Math_ApproachF( &this->actor.initPosRot.pos.y, ((player->actor.posRot.pos.y > this->actor.groundY) ? player->actor.posRot.pos.y : this->actor.groundY) + 13.0f, 0.2f, 5.0f); - this->actor.posRot.pos.y = Math_Sins(this->unk_194 * 0x800) * 13.0f + this->actor.initPosRot.pos.y; + this->actor.posRot.pos.y = Math_SinS(this->unk_194 * 0x800) * 13.0f + this->actor.initPosRot.pos.y; } f32 EnPoField_SetFleeSpeed(EnPoField* this, GlobalContext* globalCtx) { @@ -369,7 +369,7 @@ void EnPoField_WaitForSpawn(EnPoField* this, GlobalContext* globalCtx) { this->actor.params = EN_PO_FIELD_SMALL; spawnDist = 300.0f; } - } else if (player->stateFlags1 & 0x800000 || Math_Rand_ZeroOne() < 0.4f) { + } else if (player->stateFlags1 & 0x800000 || Rand_ZeroOne() < 0.4f) { this->actor.params = EN_PO_FIELD_BIG; this->spawnFlagIndex = i; spawnDist = 480.0f; @@ -378,9 +378,9 @@ void EnPoField_WaitForSpawn(EnPoField* this, GlobalContext* globalCtx) { spawnDist = 300.0f; } this->actor.posRot.pos.x = - Math_Sins(player->actor.shape.rot.y) * spawnDist + player->actor.posRot.pos.x; + Math_SinS(player->actor.shape.rot.y) * spawnDist + player->actor.posRot.pos.x; this->actor.posRot.pos.z = - Math_Coss(player->actor.shape.rot.y) * spawnDist + player->actor.posRot.pos.z; + Math_CosS(player->actor.shape.rot.y) * spawnDist + player->actor.posRot.pos.z; this->actor.posRot.pos.y = player->actor.posRot.pos.y + 1000.0f; this->actor.posRot.pos.y = func_8003C9A4(&globalCtx->colCtx, &this->actor.floorPoly, &sp88, &this->actor, &this->actor.posRot.pos); @@ -428,12 +428,12 @@ void EnPoField_CirclePlayer(EnPoField* this, GlobalContext* globalCtx) { this->actionTimer--; } if (ABS(temp_v1) < 16) { - this->actor.posRot.rot.y += 512.0f * fabsf(Math_Sins(this->unk_194 * 0x800)); + this->actor.posRot.rot.y += 512.0f * fabsf(Math_SinS(this->unk_194 * 0x800)); } - Math_SmoothScaleMaxF(&this->scaleModifier, 180.0f, 0.5f, 10.0f); - Math_SmoothScaleMaxF(&this->actor.initPosRot.pos.x, player->actor.posRot.pos.x, 0.2f, 6.0f); - Math_SmoothScaleMaxF(&this->actor.initPosRot.pos.z, player->actor.posRot.pos.z, 0.2f, 6.0f); - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.posRot.rot.y, 1, 0x800, 0x200); + Math_ApproachF(&this->scaleModifier, 180.0f, 0.5f, 10.0f); + Math_ApproachF(&this->actor.initPosRot.pos.x, player->actor.posRot.pos.x, 0.2f, 6.0f); + Math_ApproachF(&this->actor.initPosRot.pos.z, player->actor.posRot.pos.z, 0.2f, 6.0f); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.posRot.rot.y, 1, 0x800, 0x200); if (this->actor.initPosRot.pos.x - player->actor.posRot.pos.x > 100.0f) { this->actor.initPosRot.pos.x = player->actor.posRot.pos.x + 100.0f; } else if (this->actor.initPosRot.pos.x - player->actor.posRot.pos.x < -100.0f) { @@ -445,9 +445,9 @@ void EnPoField_CirclePlayer(EnPoField* this, GlobalContext* globalCtx) { this->actor.initPosRot.pos.z = player->actor.posRot.pos.z + -100.0f; } this->actor.posRot.pos.x = - this->actor.initPosRot.pos.x - (Math_Sins(this->actor.posRot.rot.y) * this->scaleModifier); + this->actor.initPosRot.pos.x - (Math_SinS(this->actor.posRot.rot.y) * this->scaleModifier); this->actor.posRot.pos.z = - this->actor.initPosRot.pos.z - (Math_Coss(this->actor.posRot.rot.y) * this->scaleModifier); + this->actor.initPosRot.pos.z - (Math_CosS(this->actor.posRot.rot.y) * this->scaleModifier); if (this->actionTimer == 0) { EnPoField_SetupDisappear(this); } else { @@ -470,12 +470,12 @@ void EnPoField_Flee(EnPoField* this, GlobalContext* globalCtx) { } else { phi_t0 = 0; } - Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.yawTowardsLink - phi_t0, 6, 0x400); + Math_ApproachS(&this->actor.shape.rot.y, this->actor.yawTowardsLink - phi_t0, 6, 0x400); EnPoField_SetFleeSpeed(this, globalCtx); this->actor.posRot.rot.y = this->actor.shape.rot.y + 0x8000; - temp_f6 = Math_Sins(this->actionTimer * 0x800) * 3.0f; - this->actor.posRot.pos.x -= temp_f6 * Math_Coss(this->actor.shape.rot.y); - this->actor.posRot.pos.z += temp_f6 * Math_Sins(this->actor.shape.rot.y); + temp_f6 = Math_SinS(this->actionTimer * 0x800) * 3.0f; + this->actor.posRot.pos.x -= temp_f6 * Math_CosS(this->actor.shape.rot.y); + this->actor.posRot.pos.z += temp_f6 * Math_SinS(this->actor.shape.rot.y); if (this->actionTimer == 0 || this->actor.xzDistFromLink > 1500.0f) { EnPoField_SetupDisappear(this); } else { @@ -485,7 +485,7 @@ void EnPoField_Flee(EnPoField* this, GlobalContext* globalCtx) { } void EnPoField_Damage(EnPoField* this, GlobalContext* globalCtx) { - Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.5f); + Math_StepToF(&this->actor.speedXZ, 0.0f, 0.5f); if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { if (this->actor.colChkInfo.health == 0) { EnPoField_SetupDeath(this); @@ -507,14 +507,14 @@ void EnPoField_Death(EnPoField* this, GlobalContext* globalCtx) { this->actionTimer++; if (this->actionTimer < 8) { if (this->actionTimer < 5) { - sp6C.y = Math_Sins(this->actionTimer * 0x1000 - 0x4000) * 23.0f + (this->actor.posRot.pos.y + 40.0f); - sp68 = Math_Coss(this->actionTimer * 0x1000 - 0x4000) * 23.0f; - sp6C.x = Math_Sins(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * sp68 + this->actor.posRot.pos.x; - sp6C.z = Math_Coss(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * sp68 + this->actor.posRot.pos.z; + sp6C.y = Math_SinS(this->actionTimer * 0x1000 - 0x4000) * 23.0f + (this->actor.posRot.pos.y + 40.0f); + sp68 = Math_CosS(this->actionTimer * 0x1000 - 0x4000) * 23.0f; + sp6C.x = Math_SinS(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * sp68 + this->actor.posRot.pos.x; + sp6C.z = Math_CosS(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * sp68 + this->actor.posRot.pos.z; } else { sp6C.y = this->actor.posRot.pos.y + 40.0f + 15.0f * (this->actionTimer - 5); - sp6C.x = Math_Sins(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * 23.0f + this->actor.posRot.pos.x; - sp6C.z = Math_Coss(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * 23.0f + this->actor.posRot.pos.z; + sp6C.x = Math_SinS(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * 23.0f + this->actor.posRot.pos.x; + sp6C.z = Math_CosS(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * 23.0f + this->actor.posRot.pos.z; } EffectSsDeadDb_Spawn(globalCtx, &sp6C, &D_80AD7114, &D_80AD7120, this->actionTimer * 10 + 80, 0, 255, 255, 255, 255, 0, 0, 255, 1, 9, 1); @@ -625,7 +625,7 @@ void func_80AD58D4(EnPoField* this, GlobalContext* globalCtx) { this->actor.flags &= ~0x10000; CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); } - this->actor.posRot.pos.y = Math_Sins(this->unk_194 * 0x800) * 5.0f + this->actor.initPosRot.pos.y; + this->actor.posRot.pos.y = Math_SinS(this->unk_194 * 0x800) * 5.0f + this->actor.initPosRot.pos.y; if (this->unk_194 != 0) { this->unk_194 -= 1; } @@ -718,12 +718,12 @@ void EnPoField_UpdateFlame(EnPoField* this, GlobalContext* globalCtx) { this->flameTimer = 19; } if (this->flameTimer < 20) { - Math_ApproxF(&this->flameScale, 0.0f, 0.00015f); + Math_StepToF(&this->flameScale, 0.0f, 0.00015f); return; } - if (Math_ApproxF(&this->flameScale, 0.003f, 0.0006f) != 0) { - this->flamePosition.x += 2.5f * Math_Sins(this->flameRotation); - this->flamePosition.z += 2.5f * Math_Coss(this->flameRotation); + if (Math_StepToF(&this->flameScale, 0.003f, 0.0006f) != 0) { + this->flamePosition.x += 2.5f * Math_SinS(this->flameRotation); + this->flamePosition.z += 2.5f * Math_CosS(this->flameRotation); } this->flameCollider.dim.pos.x = this->flamePosition.x; this->flameCollider.dim.pos.y = this->flamePosition.y; @@ -800,7 +800,7 @@ void func_80AD6330(EnPoField* this) { (s16)(this->skelAnime.animCurrentFrame * 16.66f) + 55; this->soulColor.a = this->skelAnime.animCurrentFrame * 16.666666f; } else { - rand = Math_Rand_ZeroOne(); + rand = Rand_ZeroOne(); this->soulColor.r = (s16)(rand * 30.0f) + 225; this->soulColor.g = (s16)(rand * 100.0f) + 155; this->soulColor.b = (s16)(rand * 160.0f) + 95; diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index 324fd52764..44fdcb6c52 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -145,13 +145,13 @@ void EnPoRelay_SetupEndRace(EnPoRelay* this) { } void EnPoRelay_CorrectY(EnPoRelay* this) { - Math_ApproxF(&this->actor.initPosRot.pos.y, D_80AD8C30[(this->pathIndex >= 28) ? 27 : this->pathIndex].y + 45.0f, + Math_StepToF(&this->actor.initPosRot.pos.y, D_80AD8C30[(this->pathIndex >= 28) ? 27 : this->pathIndex].y + 45.0f, 2.0f); - this->actor.posRot.pos.y = Math_Sins(this->unk_195 * 0x800) * 8.0f + this->actor.initPosRot.pos.y; + this->actor.posRot.pos.y = Math_SinS(this->unk_195 * 0x800) * 8.0f + this->actor.initPosRot.pos.y; } void EnPoRelay_Idle(EnPoRelay* this, GlobalContext* globalCtx) { - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0x100); + Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0x100); if (func_8002F194(&this->actor, globalCtx) != 0) { this->actor.flags &= ~0x10000; this->actionFunc = EnPoRelay_Talk; @@ -164,7 +164,7 @@ void EnPoRelay_Idle(EnPoRelay* this, GlobalContext* globalCtx) { } void EnPoRelay_Talk(EnPoRelay* this, GlobalContext* globalCtx) { - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0x100); + Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0x100); if (func_8002F334(&this->actor, globalCtx) != 0) { Actor_SetTextWithPrefix(globalCtx, &this->actor, 0x2F); this->textId = this->actor.textId; @@ -182,10 +182,10 @@ void EnPoRelay_Race(EnPoRelay* this, GlobalContext* globalCtx) { if (this->actionTimer != 0) { this->actionTimer--; } - if (this->actionTimer == 0 && Math_Rand_ZeroOne() < 0.03f) { + if (this->actionTimer == 0 && Rand_ZeroOne() < 0.03f) { this->actionTimer = 32; if (this->pathIndex < 23) { - speed = Math_Rand_ZeroOne() * 3.0f; + speed = Rand_ZeroOne() * 3.0f; if (speed < 1.0f) { multiplier = 1.0f; } else if (speed < 2.0f) { @@ -195,12 +195,12 @@ void EnPoRelay_Race(EnPoRelay* this, GlobalContext* globalCtx) { } speed = 30.0f * multiplier; Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HONOTRAP, - Math_Coss(this->unk_19A) * speed + this->actor.posRot.pos.x, this->actor.posRot.pos.y, - Math_Sins(this->unk_19A) * speed + this->actor.posRot.pos.z, 0, + Math_CosS(this->unk_19A) * speed + this->actor.posRot.pos.x, this->actor.posRot.pos.y, + Math_SinS(this->unk_19A) * speed + this->actor.posRot.pos.z, 0, (this->unk_19A + 0x8000) - (0x2000 * multiplier), 0, 2); } } - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->unk_19A, 2, 0x1000, 0x100); + Math_SmoothStepToS(&this->actor.posRot.rot.y, this->unk_19A, 2, 0x1000, 0x100); this->actor.shape.rot.y = this->actor.posRot.rot.y + (this->actionTimer * 0x800) + 0x8000; if (this->pathIndex < 23) { // If the player travels along a different path to Dampé that converges later @@ -223,9 +223,9 @@ void EnPoRelay_Race(EnPoRelay* this, GlobalContext* globalCtx) { multiplier = 250.0f - this->actor.xzDistFromLink; multiplier = CLAMP_MIN(multiplier, 0.0f); speed += multiplier * 0.02f + 1.0f; - Math_SmoothScaleMaxF(&this->actor.speedXZ, speed, 0.5f, 1.5f); + Math_ApproachF(&this->actor.speedXZ, speed, 0.5f, 1.5f); } else { - Math_SmoothScaleMaxF(&this->actor.speedXZ, 3.5f, 0.5f, 1.5f); + Math_ApproachF(&this->actor.speedXZ, 3.5f, 0.5f, 1.5f); } EnPoRelay_Vec3sToVec3f(&vec, &D_80AD8C30[this->pathIndex]); if (func_8002DBB0(&this->actor, &vec) < 40.0f) { @@ -246,7 +246,7 @@ void EnPoRelay_Race(EnPoRelay* this, GlobalContext* globalCtx) { } void EnPoRelay_EndRace(EnPoRelay* this, GlobalContext* globalCtx) { - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, -0x4000, 0x800); + Math_ScaledStepToS(&this->actor.shape.rot.y, -0x4000, 0x800); if (func_8002F194(&this->actor, globalCtx) != 0) { this->actionFunc = EnPoRelay_Talk2; } else if (globalCtx->roomCtx.curRoom.num == 5) { @@ -260,7 +260,7 @@ void EnPoRelay_EndRace(EnPoRelay* this, GlobalContext* globalCtx) { } void EnPoRelay_Talk2(EnPoRelay* this, GlobalContext* globalCtx) { - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0x100); + Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0x100); if (func_8010BDBC(&globalCtx->msgCtx) == 5) { if (func_80106BC8(globalCtx) != 0) { if (this->hookshotSlotFull != 0) { @@ -289,14 +289,14 @@ void EnPoRelay_DisappearAndReward(EnPoRelay* this, GlobalContext* globalCtx) { this->actionTimer++; if (this->actionTimer < 8) { if (this->actionTimer < 5) { - vec.y = Math_Sins((this->actionTimer * 0x1000) - 0x4000) * 23.0f + (this->actor.posRot.pos.y + 40.0f); - multiplier = Math_Coss((this->actionTimer * 0x1000) - 0x4000) * 23.0f; - vec.x = (Math_Sins(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * multiplier) + this->actor.posRot.pos.x; - vec.z = (Math_Coss(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * multiplier) + this->actor.posRot.pos.z; + vec.y = Math_SinS((this->actionTimer * 0x1000) - 0x4000) * 23.0f + (this->actor.posRot.pos.y + 40.0f); + multiplier = Math_CosS((this->actionTimer * 0x1000) - 0x4000) * 23.0f; + vec.x = (Math_SinS(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * multiplier) + this->actor.posRot.pos.x; + vec.z = (Math_CosS(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * multiplier) + this->actor.posRot.pos.z; } else { vec.y = this->actor.posRot.pos.y + 40.0f + 15.0f * (this->actionTimer - 5); - vec.x = (Math_Sins(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * 23.0f) + this->actor.posRot.pos.x; - vec.z = (Math_Coss(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * 23.0f) + this->actor.posRot.pos.z; + vec.x = (Math_SinS(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * 23.0f) + this->actor.posRot.pos.x; + vec.z = (Math_CosS(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * 23.0f) + this->actor.posRot.pos.z; } EffectSsDeadDb_Spawn(globalCtx, &vec, &D_80AD8D30, &D_80AD8D3C, this->actionTimer * 10 + 80, 0, 255, 255, 255, 255, 0, 0, 255, 1, 9, true); @@ -312,7 +312,7 @@ void EnPoRelay_DisappearAndReward(EnPoRelay* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_EXTINCT); } } - if (Math_ApproxF(&this->actor.scale.x, 0.0f, 0.001f) != 0) { + if (Math_StepToF(&this->actor.scale.x, 0.0f, 0.001f) != 0) { if (this->hookshotSlotFull != 0) { sp60.x = this->actor.posRot.pos.x; sp60.y = this->actor.groundY; @@ -368,7 +368,7 @@ void EnPoRelay_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList Vec3f vec; OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_po_relay.c", 885); - rand = Math_Rand_ZeroOne(); + rand = Rand_ZeroOne(); this->lightColor.r = (s16)(rand * 30.0f) + 225; this->lightColor.g = (s16)(rand * 100.0f) + 155; this->lightColor.b = (s16)(rand * 160.0f) + 95; diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index 57d60d2ded..1a12d38acf 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -197,15 +197,15 @@ void func_80AD9240(EnPoSisters* this, s32 arg1, Vec3f* arg2) { for (i = 0; i < this->unk_198; i++) { vec = &this->unk_234[i]; - vec->x = arg2->x + Math_Sins((s16)(this->actor.shape.rot.y + (this->unk_19A * 0x800) + i * 0x2000)) * temp_f20; - vec->z = arg2->z + Math_Coss((s16)(this->actor.shape.rot.y + (this->unk_19A * 0x800) + i * 0x2000)) * temp_f20; + vec->x = arg2->x + Math_SinS((s16)(this->actor.shape.rot.y + (this->unk_19A * 0x800) + i * 0x2000)) * temp_f20; + vec->z = arg2->z + Math_CosS((s16)(this->actor.shape.rot.y + (this->unk_19A * 0x800) + i * 0x2000)) * temp_f20; vec->y = arg2->y + arg1; } } void func_80AD9368(EnPoSisters* this) { SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_060014CC, -3.0f); - this->unk_19A = Math_Rand_S16Offset(2, 3); + this->unk_19A = Rand_S16Offset(2, 3); this->actionFunc = func_80ADA4A8; this->actor.speedXZ = 0.0f; } @@ -214,7 +214,7 @@ void func_80AD93C4(EnPoSisters* this) { if (this->actionFunc != func_80ADA6A0) { SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_06000D40, -3.0f); } - this->unk_19A = Math_Rand_S16Offset(0xF, 3); + this->unk_19A = Rand_S16Offset(0xF, 3); this->unk_199 |= 7; this->actionFunc = func_80ADA530; } @@ -300,16 +300,16 @@ void func_80AD97C8(EnPoSisters* this, GlobalContext* globalCtx) { if (this->unk_195 == 0 || this->actionFunc != func_80ADAAA4) { if ((player->swordState == 0 || player->swordAnimation >= 24) && player->actor.posRot.pos.y - player->actor.groundY < 1.0f) { - Math_ApproxF(&this->unk_294, 110.0f, 3.0f); + Math_StepToF(&this->unk_294, 110.0f, 3.0f); } else { - Math_ApproxF(&this->unk_294, 170.0f, 10.0f); + Math_StepToF(&this->unk_294, 170.0f, 10.0f); } sp20 = this->unk_294; } else if (this->unk_195 != 0) { sp20 = this->actor.parent->xzDistFromLink; } - this->actor.posRot.pos.x = (Math_Sins(this->actor.shape.rot.y + 0x8000) * sp20) + player->actor.posRot.pos.x; - this->actor.posRot.pos.z = (Math_Coss(this->actor.shape.rot.y + 0x8000) * sp20) + player->actor.posRot.pos.z; + this->actor.posRot.pos.x = (Math_SinS(this->actor.shape.rot.y + 0x8000) * sp20) + player->actor.posRot.pos.x; + this->actor.posRot.pos.z = (Math_CosS(this->actor.shape.rot.y + 0x8000) * sp20) + player->actor.posRot.pos.z; } void func_80AD98F4(EnPoSisters* this, GlobalContext* globalCtx) { @@ -535,15 +535,14 @@ void func_80ADA35C(EnPoSisters* this, GlobalContext* globalCtx) { } else { targetY = 832.0f; } - Math_SmoothScaleMaxF(&this->actor.posRot.pos.y, targetY, 0.5f, 3.0f); + Math_ApproachF(&this->actor.posRot.pos.y, targetY, 0.5f, 3.0f); if (!this->unk_196) { this->unk_196 = 32; } if (this->unk_196 != 0) { this->unk_196--; } - - this->actor.posRot.pos.y += (2.0f + 0.5f * Math_Rand_ZeroOne()) * Math_Sins(this->unk_196 * 0x800); + this->actor.posRot.pos.y += (2.0f + 0.5f * Rand_ZeroOne()) * Math_SinS(this->unk_196 * 0x800); if (this->unk_22E.a == 255 && this->actionFunc != func_80ADA8C0 && this->actionFunc != func_80ADA7F0) { if (this->actionFunc == func_80ADAC70) { func_8002F974(&this->actor, NA_SE_EN_PO_AWAY - SFX_FLAG); @@ -565,20 +564,20 @@ void func_80ADA4A8(EnPoSisters* this, GlobalContext* globalCtx) { void func_80ADA530(EnPoSisters* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); - Math_ApproxF(&this->actor.speedXZ, 1.0f, 0.2f); + Math_StepToF(&this->actor.speedXZ, 1.0f, 0.2f); if (func_800A56C8(&this->skelAnime, 0.0f) && this->unk_19A != 0) { this->unk_19A--; } if (this->actor.xzDistFromLink < 200.0f && fabsf(this->actor.yDistFromLink + 5.0f) < 30.0f) { func_80AD943C(this); - } else if (this->unk_19A == 0 && Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.2f) != 0) { + } else if (this->unk_19A == 0 && Math_StepToF(&this->actor.speedXZ, 0.0f, 0.2f) != 0) { func_80AD9368(this); } if (this->actor.bgCheckFlags & 8) { - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, func_8002DAC0(&this->actor, &this->actor.initPosRot.pos), + Math_ScaledStepToS(&this->actor.posRot.rot.y, func_8002DAC0(&this->actor, &this->actor.initPosRot.pos), 0x71C); } else if (func_8002DBB0(&this->actor, &this->actor.initPosRot.pos) > 300.0f) { - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, func_8002DAC0(&this->actor, &this->actor.initPosRot.pos), + Math_ScaledStepToS(&this->actor.posRot.rot.y, func_8002DAC0(&this->actor, &this->actor.initPosRot.pos), 0x71C); } } @@ -589,13 +588,13 @@ void func_80ADA6A0(EnPoSisters* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); temp_v0 = this->actor.yawTowardsLink - player->actor.shape.rot.y; - Math_ApproxF(&this->actor.speedXZ, 2.0f, 0.2f); + Math_StepToF(&this->actor.speedXZ, 2.0f, 0.2f); if (temp_v0 > 0x3000) { - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink + 0x3000, 0x71C); + Math_ScaledStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink + 0x3000, 0x71C); } else if (temp_v0 < -0x3000) { - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink - 0x3000, 0x71C); + Math_ScaledStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink - 0x3000, 0x71C); } else { - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 0x71C); + Math_ScaledStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 0x71C); } if (this->actor.xzDistFromLink < 160.0f && fabsf(this->actor.yDistFromLink + 5.0f) < 30.0f) { func_80AD944C(this); @@ -644,7 +643,7 @@ void func_80ADA8C0(EnPoSisters* this, GlobalContext* globalCtx) { void func_80ADA9E8(EnPoSisters* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); this->actor.shape.rot.y -= (this->actor.speedXZ * 10.0f) * 128.0f; - if (Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.1f) != 0) { + if (Math_StepToF(&this->actor.speedXZ, 0.0f, 0.1f) != 0) { this->actor.posRot.rot.y = this->actor.shape.rot.y; if (this->unk_194 != 0) { func_80AD93C4(this); @@ -670,20 +669,20 @@ void func_80ADAAA4(EnPoSisters* this, GlobalContext* globalCtx) { } } if (this->unk_195 != 0) { - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, this->actor.parent->shape.rot.y, + Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.parent->shape.rot.y, (this->unk_195 == 2) ? 0x800 : 0x400); this->unk_22E.a = ((this->skelAnime.animFrameCount - this->skelAnime.animCurrentFrame) * 255.0f) / this->skelAnime.animFrameCount; this->actor.posRot.pos.y = this->actor.parent->posRot.pos.y; func_80AD97C8(this, globalCtx); } else if (this->unk_194 != 0) { - Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.5f); + Math_StepToF(&this->actor.speedXZ, 0.0f, 0.5f); } } void func_80ADAC70(EnPoSisters* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink + 0x8000, 1820); + Math_ScaledStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink + 0x8000, 1820); if (func_800A56C8(&this->skelAnime, 0.0f) && this->unk_19A != 0) { this->unk_19A--; } @@ -743,17 +742,17 @@ void func_80ADAFC0(EnPoSisters* this, GlobalContext* globalCtx) { this->unk_234[i] = this->unk_234[i - 1]; } this->unk_234[0].x = - (Math_Sins((this->actor.shape.rot.y + this->unk_19A * 0x3000) - 0x4000) * (3000.0f * this->actor.scale.x)) + + (Math_SinS((this->actor.shape.rot.y + this->unk_19A * 0x3000) - 0x4000) * (3000.0f * this->actor.scale.x)) + this->actor.posRot.pos.x; this->unk_234[0].z = - (Math_Coss((this->actor.shape.rot.y + this->unk_19A * 0x3000) - 0x4000) * (3000.0f * this->actor.scale.x)) + + (Math_CosS((this->actor.shape.rot.y + this->unk_19A * 0x3000) - 0x4000) * (3000.0f * this->actor.scale.x)) + this->actor.posRot.pos.z; if (this->unk_19A < 8) { this->unk_234[0].y = this->unk_234[1].y - 9.0f; } else { this->unk_234[0].y = this->unk_234[1].y + 2.0f; if (this->unk_19A >= 16) { - if (Math_ApproxF(&this->actor.scale.x, 0.0f, 0.001f) != 0) { + if (Math_StepToF(&this->actor.scale.x, 0.0f, 0.001f) != 0) { func_80AD9A54(this, globalCtx); } this->actor.scale.z = this->actor.scale.x; @@ -812,7 +811,7 @@ void func_80ADB338(EnPoSisters* this, GlobalContext* globalCtx) { this->unk_19C = 100; } if (this->unk_19C == 0) { - this->actor.shape.rot.y = (s32)(4.0f * Math_Rand_ZeroOne()) * 0x4000 + this->actor.yawTowardsLink; + this->actor.shape.rot.y = (s32)(4.0f * Rand_ZeroOne()) * 0x4000 + this->actor.yawTowardsLink; this->actor.posRot.pos.y = player->actor.posRot.pos.y + 5.0f; func_80AD98F4(this, globalCtx); } @@ -852,7 +851,7 @@ void func_80ADB51C(EnPoSisters* this, GlobalContext* globalCtx) { this->unk_19A -= 1; } if (this->unk_19A == 0) { - this->actor.posRot.rot.y = this->actor.shape.rot.y += 0x4000 * (s32)(Math_Rand_ZeroOne() * 4.0f); + this->actor.posRot.rot.y = this->actor.shape.rot.y += 0x4000 * (s32)(Rand_ZeroOne() * 4.0f); if (this->unk_195 == 0) { func_800F5ACC(0x38); } @@ -880,7 +879,7 @@ void func_80ADB51C(EnPoSisters* this, GlobalContext* globalCtx) { if (this->unk_195 == 2) { phi_a2 *= 2; } - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, + Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.parent->shape.rot.y + (this->unk_195 * 0x4000) * phi_v0, phi_a2); } else if (this->unk_19A == 70 || this->unk_19A == 40) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH2); @@ -903,7 +902,7 @@ void func_80ADB770(EnPoSisters* this, GlobalContext* globalCtx) { if (this->unk_195 == 0) { if (ABS((s16)(16 - this->unk_196)) < 14) { this->actor.shape.rot.y += - (0x580 - (this->unk_19C * 0x180)) * fabsf(Math_Sins(this->unk_196 * 0x800)); + (0x580 - (this->unk_19C * 0x180)) * fabsf(Math_SinS(this->unk_196 * 0x800)); } if (this->unk_19A >= 284 || this->unk_19A < 31) { this->unk_199 |= 0x40; @@ -976,14 +975,14 @@ void func_80ADBB6C(EnPoSisters* this, GlobalContext* globalCtx) { if (func_8002DBB0(&this->actor, &this->actor.initPosRot.pos) < 10.0f) { func_80ADA028(this); } else { - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, func_8002DAC0(&this->actor, &this->actor.initPosRot.pos), + Math_ScaledStepToS(&this->actor.posRot.rot.y, func_8002DAC0(&this->actor, &this->actor.initPosRot.pos), 1820); } } void func_80ADBBF4(EnPoSisters* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 1820); + Math_ScaledStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 1820); if (this->actor.xzDistFromLink < 240.0f && fabsf(this->actor.yDistFromLink + 5.0f) < 30.0f) { func_80AD93C4(this); } @@ -1048,12 +1047,12 @@ void func_80ADBEE8(EnPoSisters* this, GlobalContext* globalCtx) { void func_80ADBF58(EnPoSisters* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); this->unk_19A--; - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, this->actor.posRot.rot.y, 0x500); + Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.posRot.rot.y, 0x500); if (this->unk_19A == 0 && this->unk_194 == 0) { globalCtx->envCtx.unk_BF = 4; } if (this->unk_19A < 0) { - Math_ApproxF(&this->actor.speedXZ, 5.0f, 0.2f); + Math_StepToF(&this->actor.speedXZ, 5.0f, 0.2f); } if (this->unk_19A == -70 && this->unk_194 == 1) { Audio_PlaySoundAtPosition(globalCtx, &D_80ADD7BC, 40, NA_SE_EN_PO_LAUGH); @@ -1095,7 +1094,7 @@ void func_80ADC10C(EnPoSisters* this, GlobalContext* globalCtx) { ((EnPoSisters*)this->actor.parent)->unk_19C--; Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH2); func_80AD9C24(this, globalCtx); - if (Math_Rand_ZeroOne() < 0.2f) { + if (Rand_ZeroOne() < 0.2f) { sp24.x = this->actor.posRot.pos.x; sp24.y = this->actor.posRot.pos.y; sp24.z = this->actor.posRot.pos.z; @@ -1272,7 +1271,7 @@ void EnPoSisters_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi } if (this->unk_198 > 0) { Color_RGBA8* color = &D_80ADD6F0[this->unk_194]; - f32 temp_f2 = Math_Rand_ZeroOne() * 0.3f + 0.7f; + f32 temp_f2 = Rand_ZeroOne() * 0.3f + 0.7f; if (this->actionFunc == func_80ADB17C || this->actionFunc == func_80ADBD38 || this->actionFunc == func_80ADBEE8) { diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c index 43abcee02f..5f82214cc7 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -154,7 +154,7 @@ void EnPoh_Init(Actor* thisx, GlobalContext* globalCtx) { func_80061ED4(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit); this->unk_194 = 0; this->unk_195 = 32; - this->visibilityTimer = Math_Rand_S16Offset(700, 300); + this->visibilityTimer = Rand_S16Offset(700, 300); this->lightNode = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfo); Lights_PointGlowSetInfo(&this->lightInfo, this->actor.initPosRot.pos.x, this->actor.initPosRot.pos.y, this->actor.initPosRot.pos.z, 255, 255, 255, 0); @@ -212,14 +212,14 @@ void EnPoh_Destroy(Actor* thisx, GlobalContext* globalCtx) { void func_80ADE114(EnPoh* this) { SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, this->info->unk_C); - this->unk_198 = Math_Rand_S16Offset(2, 3); + this->unk_198 = Rand_S16Offset(2, 3); this->actionFunc = func_80ADEAC4; this->actor.speedXZ = 0.0f; } void EnPoh_SetupIdle(EnPoh* this) { SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, this->info->unk_10); - this->unk_198 = Math_Rand_S16Offset(15, 3); + this->unk_198 = Rand_S16Offset(15, 3); this->actionFunc = EnPoh_Idle; } @@ -414,8 +414,8 @@ void func_80ADE9BC(EnPoh* this) { void EnPoh_MoveTowardsPlayerHeight(EnPoh* this, GlobalContext* globalCtx) { Player* player = PLAYER; - Math_ApproxF(&this->actor.posRot.pos.y, player->actor.posRot.pos.y, 1.0f); - this->actor.posRot.pos.y += 2.5f * Math_Sins(this->unk_195 * 0x800); + Math_StepToF(&this->actor.posRot.pos.y, player->actor.posRot.pos.y, 1.0f); + this->actor.posRot.pos.y += 2.5f * Math_SinS(this->unk_195 * 0x800); if (this->unk_195 != 0) { this->unk_195 -= 1; } @@ -428,7 +428,7 @@ void func_80ADEA5C(EnPoh* this) { if (func_8002DBB0(&this->actor, &this->actor.initPosRot.pos) > 400.0f) { this->unk_19C = func_8002DAC0(&this->actor, &this->actor.initPosRot.pos); } - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->unk_19C, 0x71C); + Math_ScaledStepToS(&this->actor.posRot.rot.y, this->unk_19C, 0x71C); } void func_80ADEAC4(EnPoh* this, GlobalContext* globalCtx) { @@ -449,7 +449,7 @@ void func_80ADEAC4(EnPoh* this, GlobalContext* globalCtx) { void EnPoh_Idle(EnPoh* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); - Math_ApproxF(&this->actor.speedXZ, 1.0f, 0.2f); + Math_StepToF(&this->actor.speedXZ, 1.0f, 0.2f); if (func_800A56C8(&this->skelAnime, 0.0f) && this->unk_198 != 0) { this->unk_198--; } @@ -458,7 +458,7 @@ void EnPoh_Idle(EnPoh* this, GlobalContext* globalCtx) { if (this->actor.xzDistFromLink < 200.0f && this->unk_198 < 19) { func_80ADE1BC(this); } else if (this->unk_198 == 0) { - if (Math_Rand_ZeroOne() < 0.1f) { + if (Rand_ZeroOne() < 0.1f) { func_80ADE514(this); } else { func_80ADE114(this); @@ -480,11 +480,11 @@ void func_80ADEC9C(EnPoh* this, GlobalContext* globalCtx) { } facingDiff = this->actor.yawTowardsLink - player->actor.shape.rot.y; if (facingDiff >= 0x3001) { - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink + 0x3000, 0x71C); + Math_ScaledStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink + 0x3000, 0x71C); } else if (facingDiff < -0x3000) { - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink - 0x3000, 0x71C); + Math_ScaledStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink - 0x3000, 0x71C); } else { - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 0x71C); + Math_ScaledStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 0x71C); } EnPoh_MoveTowardsPlayerHeight(this, globalCtx); if (this->actor.xzDistFromLink > 280.0f) { @@ -508,7 +508,7 @@ void EnPoh_Attack(EnPoh* this, GlobalContext* globalCtx) { } EnPoh_MoveTowardsPlayerHeight(this, globalCtx); if (this->unk_198 >= 10) { - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 0xE38); + Math_ScaledStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 0xE38); } else if (this->unk_198 == 9) { this->actor.speedXZ = 5.0f; this->skelAnime.animPlaybackSpeed = 2.0f; @@ -519,7 +519,7 @@ void EnPoh_Attack(EnPoh* this, GlobalContext* globalCtx) { } void func_80ADEECC(EnPoh* this, GlobalContext* globalCtx) { - Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.5f); + Math_StepToF(&this->actor.speedXZ, 0.0f, 0.5f); if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { if (this->actor.colChkInfo.health != 0) { func_80ADE368(this); @@ -532,7 +532,7 @@ void func_80ADEECC(EnPoh* this, GlobalContext* globalCtx) { void func_80ADEF38(EnPoh* this, GlobalContext* globalCtx) { if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { this->lightColor.a = 255; - this->visibilityTimer = Math_Rand_S16Offset(700, 300); + this->visibilityTimer = Rand_S16Offset(700, 300); this->actor.flags |= 1; EnPoh_SetupIdle(this); } else if (this->skelAnime.animCurrentFrame > 10.0f) { @@ -547,7 +547,7 @@ void func_80ADEF38(EnPoh* this, GlobalContext* globalCtx) { void EnPoh_ComposerAppear(EnPoh* this, GlobalContext* globalCtx) { if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { this->lightColor.a = 255; - this->visibilityTimer = Math_Rand_S16Offset(700, 300); + this->visibilityTimer = Rand_S16Offset(700, 300); this->actor.flags |= 1; EnPoh_SetupIdle(this); } else { @@ -565,14 +565,14 @@ void func_80ADF15C(EnPoh* this, GlobalContext* globalCtx) { this->unk_198++; if (this->unk_198 < 8) { if (this->unk_198 < 5) { - vec.y = Math_Sins((this->unk_198 * 0x1000) - 0x4000) * 23.0f + (this->actor.posRot.pos.y + 40.0f); - multiplier = Math_Coss((this->unk_198 * 0x1000) - 0x4000) * 23.0f; - vec.x = Math_Sins(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * multiplier + this->actor.posRot.pos.x; - vec.z = Math_Coss(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * multiplier + this->actor.posRot.pos.z; + vec.y = Math_SinS((this->unk_198 * 0x1000) - 0x4000) * 23.0f + (this->actor.posRot.pos.y + 40.0f); + multiplier = Math_CosS((this->unk_198 * 0x1000) - 0x4000) * 23.0f; + vec.x = Math_SinS(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * multiplier + this->actor.posRot.pos.x; + vec.z = Math_CosS(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * multiplier + this->actor.posRot.pos.z; } else { vec.y = (this->actor.posRot.pos.y + 40.0f) + (15.0f * (this->unk_198 - 5)); - vec.x = Math_Sins(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * 23.0f + this->actor.posRot.pos.x; - vec.z = Math_Coss(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * 23.0f + this->actor.posRot.pos.z; + vec.x = Math_SinS(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * 23.0f + this->actor.posRot.pos.x; + vec.z = Math_CosS(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x4800) * 23.0f + this->actor.posRot.pos.z; } EffectSsDeadDb_Spawn(globalCtx, &vec, &D_80AE1B60, &D_80AE1B6C, this->unk_198 * 10 + 80, 0, 255, 255, 255, 255, 0, 0, 255, 1, 9, 1); @@ -607,14 +607,14 @@ void func_80ADF574(EnPoh* this, GlobalContext* globalCtx) { EnPoh_SetupIdle(this); this->unk_198 = 23; } else { - Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.5f); + Math_StepToF(&this->actor.speedXZ, 0.0f, 0.5f); this->actor.shape.rot.y += 0x1000; } } void func_80ADF5E0(EnPoh* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); - if (Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->unk_19C, 1820) != 0) { + if (Math_ScaledStepToS(&this->actor.posRot.rot.y, this->unk_19C, 1820) != 0) { EnPoh_SetupIdle(this); } if (this->actor.xzDistFromLink < 200.0f) { @@ -631,7 +631,7 @@ void EnPoh_Disappear(EnPoh* this, GlobalContext* globalCtx) { EnPoh_MoveTowardsPlayerHeight(this, globalCtx); this->lightColor.a = this->unk_194 * 7.96875f; if (this->unk_194 == 0) { - this->visibilityTimer = Math_Rand_S16Offset(100, 50); + this->visibilityTimer = Rand_S16Offset(100, 50); EnPoh_SetupIdle(this); } } @@ -642,7 +642,7 @@ void EnPoh_Appear(EnPoh* this, GlobalContext* globalCtx) { EnPoh_MoveTowardsPlayerHeight(this, globalCtx); this->lightColor.a = this->unk_194 * 7.96875f; if (this->unk_194 == 32) { - this->visibilityTimer = Math_Rand_S16Offset(700, 300); + this->visibilityTimer = Rand_S16Offset(700, 300); this->unk_194 = 0; EnPoh_SetupIdle(this); } @@ -652,10 +652,10 @@ void func_80ADF894(EnPoh* this, GlobalContext* globalCtx) { f32 multiplier; SkelAnime_FrameUpdateMatrix(&this->skelAnime); - multiplier = Math_Sins(this->unk_195 * 0x800) * 3.0f; - this->actor.posRot.pos.x -= multiplier * Math_Coss(this->actor.shape.rot.y); - this->actor.posRot.pos.z += multiplier * Math_Sins(this->actor.shape.rot.y); - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink + 0x8000, 0x71C); + multiplier = Math_SinS(this->unk_195 * 0x800) * 3.0f; + this->actor.posRot.pos.x -= multiplier * Math_CosS(this->actor.shape.rot.y); + this->actor.posRot.pos.z += multiplier * Math_SinS(this->actor.shape.rot.y); + Math_ScaledStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink + 0x8000, 0x71C); EnPoh_MoveTowardsPlayerHeight(this, globalCtx); if (this->unk_198 == 0 || this->actor.xzDistFromLink > 250.0f) { this->actor.posRot.rot.y = this->actor.shape.rot.y; @@ -738,7 +738,7 @@ void func_80ADFE80(EnPoh* this, GlobalContext* globalCtx) { this->actor.flags &= ~0x10000; CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->colliderCyl.base); } - this->actor.posRot.pos.y = Math_Sins(this->unk_195 * 0x800) * 5.0f + this->actor.initPosRot.pos.y; + this->actor.posRot.pos.y = Math_SinS(this->unk_195 * 0x800) * 5.0f + this->actor.initPosRot.pos.y; if (this->unk_195 != 0) { this->unk_195 -= 1; } @@ -929,7 +929,7 @@ void func_80AE089C(EnPoh* this) { this->envColor.r = this->envColor.g = this->envColor.b = (s16)(this->skelAnime.animCurrentFrame * 16.66f) + 55; this->envColor.a = this->skelAnime.animCurrentFrame * 16.666666f; } else { - rand = Math_Rand_ZeroOne(); + rand = Rand_ZeroOne(); this->envColor.r = (s16)(rand * 30.0f) + 225; this->envColor.g = (s16)(rand * 100.0f) + 155; this->envColor.b = (s16)(rand * 160.0f) + 95; diff --git a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c index 26a076b63d..dad81baadd 100644 --- a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c +++ b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c @@ -75,7 +75,7 @@ void EnPubox_Update(Actor* thisx, GlobalContext* globalCtx) { thisx->speedXZ += this->dyna.unk_150; thisx->posRot.rot.y = this->dyna.unk_158; thisx->speedXZ = (thisx->speedXZ < -2.5f) ? -2.5f : ((thisx->speedXZ > 2.5f) ? 2.5f : thisx->speedXZ); - Math_SmoothScaleMaxMinF(&thisx->speedXZ, 0.0f, 1.0f, 1.0f, 0.0f); + Math_SmoothStepToF(&thisx->speedXZ, 0.0f, 1.0f, 1.0f, 0.0f); if (thisx->speedXZ != 0.0f) { Audio_PlaySoundGeneral(NA_SE_EV_ROCK_SLIDE - SFX_FLAG, &thisx->projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index 7595c9327c..3dafc99add 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -173,7 +173,7 @@ void func_80AE269C(EnRd* this) { } this->unk_31B = 0; - this->unk_30C = (Math_Rand_ZeroOne() * 10.0f) + 5.0f; + this->unk_30C = (Rand_ZeroOne() * 10.0f) + 5.0f; this->actor.speedXZ = 0.0f; this->actor.posRot.rot.y = this->actor.shape.rot.y; EnRd_SetupAction(this, func_80AE2744); @@ -181,11 +181,11 @@ void func_80AE269C(EnRd* this) { void func_80AE2744(EnRd* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); - Math_SmoothScaleMaxMinS(&this->unk_30E, 0, 1, 0x64, 0); - Math_SmoothScaleMaxMinS(&this->unk_310, 0, 1, 0x64, 0); + Math_SmoothStepToS(&this->unk_30E, 0, 1, 0x64, 0); + Math_SmoothStepToS(&this->unk_310, 0, 1, 0x64, 0); if ((this->actor.params == 2) && (0.0f == this->skelAnime.animCurrentFrame)) { - if (Math_Rand_ZeroOne() >= 0.5f) { + if (Rand_ZeroOne() >= 0.5f) { SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_06005D98); } else { SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_060057AC); @@ -193,7 +193,7 @@ void func_80AE2744(EnRd* this, GlobalContext* globalCtx) { } else { this->unk_30C--; if (this->unk_30C == 0) { - this->unk_30C = (Math_Rand_ZeroOne() * 10.0f) + 10.0f; + this->unk_30C = (Rand_ZeroOne() * 10.0f) + 10.0f; this->skelAnime.animCurrentFrame = 0.0f; } } @@ -244,8 +244,8 @@ void func_80AE2970(EnRd* this) { // Rising out of coffin void func_80AE2A10(EnRd* this, GlobalContext* globalCtx) { if (this->actor.shape.rot.x != -0x4000) { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, 0, 1, 0x7D0, 0); - if (Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 0.3f, 2.0f, 0.3f) == + Math_SmoothStepToS(&this->actor.shape.rot.x, 0, 1, 0x7D0, 0); + if (Math_SmoothStepToF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 0.3f, 2.0f, 0.3f) == 0.0f) { this->actor.gravity = -3.5f; func_80AE269C(this); @@ -254,13 +254,13 @@ void func_80AE2A10(EnRd* this, GlobalContext* globalCtx) { if (this->actor.posRot.pos.y == this->actor.initPosRot.pos.y) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_REDEAD_CRY); } - if (Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y + 50.0f, 0.3f, 2.0f, + if (Math_SmoothStepToF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y + 50.0f, 0.3f, 2.0f, 0.3f) == 0.0f) { if (this->unk_30C != 0) { this->unk_30C--; - Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 6.0f, 0.3f, 1.0f, 0.3f); - } else if (Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 0.3f, 1.0f, 0.3f) == 0.0f) { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, 0, 1, 0x7D0, 0); + Math_SmoothStepToF(&this->actor.speedXZ, 6.0f, 0.3f, 1.0f, 0.3f); + } else if (Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 0.3f, 1.0f, 0.3f) == 0.0f) { + Math_SmoothStepToS(&this->actor.shape.rot.x, 0, 1, 0x7D0, 0); } } } @@ -282,9 +282,9 @@ void func_80AE2C1C(EnRd* this, GlobalContext* globalCtx) { s16 sp32 = this->actor.yawTowardsLink - this->actor.shape.rot.y - this->unk_30E - this->unk_310; this->skelAnime.animPlaybackSpeed = this->actor.speedXZ; - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 1, 0xFA, 0); - Math_SmoothScaleMaxMinS(&this->unk_30E, 0, 1, 0x64, 0); - Math_SmoothScaleMaxMinS(&this->unk_310, 0, 1, 0x64, 0); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 1, 0xFA, 0); + Math_SmoothStepToS(&this->unk_30E, 0, 1, 0x64, 0); + Math_SmoothStepToS(&this->unk_310, 0, 1, 0x64, 0); this->actor.posRot.rot.y = this->actor.shape.rot.y; SkelAnime_FrameUpdateMatrix(&this->skelAnime); @@ -345,10 +345,10 @@ void func_80AE2FD0(EnRd* this, GlobalContext* globalCtx) { s16 targetY = func_8002DAC0(&this->actor, &this->actor.initPosRot.pos); if (func_8002DB6C(&this->actor, &this->actor.initPosRot.pos) >= 5.0f) { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, targetY, 1, 0x1C2, 0); + Math_SmoothStepToS(&this->actor.shape.rot.y, targetY, 1, 0x1C2, 0); } else { this->actor.speedXZ = 0.0f; - if (Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.initPosRot.rot.y, 1, 0x1C2, 0) == 0) { + if (Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.initPosRot.rot.y, 1, 0x1C2, 0) == 0) { if (this->actor.params != 2) { func_80AE269C(this); } else { @@ -357,8 +357,8 @@ void func_80AE2FD0(EnRd* this, GlobalContext* globalCtx) { } } - Math_SmoothScaleMaxMinS(&this->unk_30E, 0, 1, 0x64, 0); - Math_SmoothScaleMaxMinS(&this->unk_310, 0, 1, 0x64, 0); + Math_SmoothStepToS(&this->unk_30E, 0, 1, 0x64, 0); + Math_SmoothStepToS(&this->unk_310, 0, 1, 0x64, 0); this->actor.posRot.rot.y = this->actor.shape.rot.y; SkelAnime_FrameUpdateMatrix(&this->skelAnime); @@ -396,7 +396,7 @@ void func_80AE3260(EnRd* this, GlobalContext* globalCtx) { targetY = func_8002DAC0(&this->actor, &thisPos); - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, targetY, 1, 0xFA, 0); + Math_SmoothStepToS(&this->actor.shape.rot.y, targetY, 1, 0xFA, 0); if (func_8002DB6C(&this->actor, &thisPos) >= 45.0f) { this->actor.speedXZ = 0.4f; @@ -410,8 +410,8 @@ void func_80AE3260(EnRd* this, GlobalContext* globalCtx) { } } - Math_SmoothScaleMaxMinS(&this->unk_30E, 0, 1, 0x64, 0); - Math_SmoothScaleMaxMinS(&this->unk_310, 0, 1, 0x64, 0); + Math_SmoothStepToS(&this->unk_30E, 0, 1, 0x64, 0); + Math_SmoothStepToS(&this->unk_310, 0, 1, 0x64, 0); } else { func_80AE2B90(this, globalCtx); } @@ -451,8 +451,8 @@ void func_80AE3454(EnRd* this, GlobalContext* globalCtx) { func_800AA000(this->actor.xzDistFromLink, 0xFF, 1, 0xC); this->unk_319 = 0x14; case 0: - Math_SmoothScaleMaxMinS(&this->unk_30E, 0, 1, 0x5DC, 0); - Math_SmoothScaleMaxMinS(&this->unk_310, 0, 1, 0x5DC, 0); + Math_SmoothStepToS(&this->unk_30E, 0, 1, 0x5DC, 0); + Math_SmoothStepToS(&this->unk_310, 0, 1, 0x5DC, 0); case 2: if (!(player->stateFlags2 & 0x80)) { SkelAnime_ChangeAnim(&this->skelAnime, &D_060046F8, 0.5f, 0.0f, SkelAnime_GetFrameCount(&D_060046F8), 3, @@ -463,17 +463,17 @@ void func_80AE3454(EnRd* this, GlobalContext* globalCtx) { } if (LINK_IS_CHILD) { - Math_SmoothScaleMaxMinF(&this->actor.shape.unk_08, -1500.0f, 1.0f, 150.0f, 0.0f); + Math_SmoothStepToF(&this->actor.shape.unk_08, -1500.0f, 1.0f, 150.0f, 0.0f); } - Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.x, - (Math_Sins(player->actor.shape.rot.y) * -25.0f) + player->actor.posRot.pos.x, 1.0f, + Math_SmoothStepToF(&this->actor.posRot.pos.x, + (Math_SinS(player->actor.shape.rot.y) * -25.0f) + player->actor.posRot.pos.x, 1.0f, 10.0f, 0.0f); - Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.y, player->actor.posRot.pos.y, 1.0f, 10.0f, 0.0f); - Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.z, - (Math_Coss(player->actor.shape.rot.y) * -25.0f) + player->actor.posRot.pos.z, 1.0f, + Math_SmoothStepToF(&this->actor.posRot.pos.y, player->actor.posRot.pos.y, 1.0f, 10.0f, 0.0f); + Math_SmoothStepToF(&this->actor.posRot.pos.z, + (Math_CosS(player->actor.shape.rot.y) * -25.0f) + player->actor.posRot.pos.z, 1.0f, 10.0f, 0.0f); - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, player->actor.shape.rot.y, 1, 0x1770, 0); + Math_SmoothStepToS(&this->actor.shape.rot.y, player->actor.shape.rot.y, 1, 0x1770, 0); if (this->skelAnime.animCurrentFrame == 0.0f) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_REDEAD_ATTACK); @@ -489,12 +489,12 @@ void func_80AE3454(EnRd* this, GlobalContext* globalCtx) { break; case 3: if (LINK_IS_CHILD) { - Math_SmoothScaleMaxMinF(&this->actor.shape.unk_08, 0, 1.0f, 400.0f, 0.0f); + Math_SmoothStepToF(&this->actor.shape.unk_08, 0, 1.0f, 400.0f, 0.0f); } break; case 4: if (LINK_IS_CHILD) { - Math_SmoothScaleMaxMinF(&this->actor.shape.unk_08, 0, 1.0f, 400.0f, 0.0f); + Math_SmoothStepToF(&this->actor.shape.unk_08, 0, 1.0f, 400.0f, 0.0f); } this->actor.unk_1F = 0; this->actor.flags |= 1; @@ -578,8 +578,8 @@ void func_80AE3B18(EnRd* this, GlobalContext* globalCtx) { } this->actor.posRot.rot.y = this->actor.yawTowardsLink; - Math_SmoothScaleMaxMinS(&this->unk_30E, 0, 1, 0x12C, 0); - Math_SmoothScaleMaxMinS(&this->unk_310, 0, 1, 0x12C, 0); + Math_SmoothStepToS(&this->unk_30E, 0, 1, 0x12C, 0); + Math_SmoothStepToS(&this->unk_310, 0, 1, 0x12C, 0); if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { this->actor.posRot.rot.y = this->actor.shape.rot.y; @@ -610,8 +610,8 @@ void func_80AE3C98(EnRd* this, GlobalContext* globalCtx) { Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORTYPE_PROP); } - Math_SmoothScaleMaxMinS(&this->unk_30E, 0, 1, 0x7D0, 0); - Math_SmoothScaleMaxMinS(&this->unk_310, 0, 1, 0x7D0, 0); + Math_SmoothStepToS(&this->unk_30E, 0, 1, 0x7D0, 0); + Math_SmoothStepToS(&this->unk_310, 0, 1, 0x7D0, 0); if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { if (this->unk_30C == 0) { diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index 311e245f52..138ff209e9 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -161,10 +161,10 @@ void func_80AE5054(EnReeba* this, GlobalContext* globalCtx) { } if (this->unk_278 == 0) { - Math_SmoothScaleMaxF(&this->actor.shape.unk_10, 12.0f, 1.0f, 1.0f); + Math_ApproachF(&this->actor.shape.unk_10, 12.0f, 1.0f, 1.0f); if (this->actor.shape.unk_08 < 0.0f) { - Math_SmoothDownscaleMaxF(&this->actor.shape.unk_08, 1.0f, this->unk_288); - Math_SmoothScaleMaxF(&this->unk_288, 300.0f, 1.0f, 5.0f); + Math_ApproachZeroF(&this->actor.shape.unk_08, 1.0f, this->unk_288); + Math_ApproachF(&this->unk_288, 300.0f, 1.0f, 5.0f); } else { this->unk_288 = 0.0f; this->actor.shape.unk_08 = 0.0f; @@ -192,7 +192,7 @@ void func_80AE5054(EnReeba* this, GlobalContext* globalCtx) { this->actionfunc = func_80AE538C; } else { this->unk_272 = 130; - this->actor.speedXZ = Math_Rand_ZeroFloat(4.0f) + 6.0f; + this->actor.speedXZ = Rand_ZeroFloat(4.0f) + 6.0f; this->actionfunc = func_80AE5270; } } @@ -205,7 +205,7 @@ void func_80AE5270(EnReeba* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelanime); if (this->actor.shape.unk_10 < 12.0f) { - Math_SmoothScaleMaxF(&this->actor.shape.unk_10, 12.0f, 3.0f, 1.0f); + Math_ApproachF(&this->actor.shape.unk_10, 12.0f, 3.0f, 1.0f); } surfaceType = func_80041D4C(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorPolySource); @@ -236,7 +236,7 @@ void func_80AE53AC(EnReeba* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelanime); if (this->actor.shape.unk_10 < 12.0f) { - Math_SmoothScaleMaxF(&this->actor.shape.unk_10, 12.0f, 3.0f, 1.0f); + Math_ApproachF(&this->actor.shape.unk_10, 12.0f, 3.0f, 1.0f); } surfaceType = func_80041D4C(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorPolySource); @@ -249,7 +249,7 @@ void func_80AE53AC(EnReeba* this, GlobalContext* globalCtx) { this->unk_270 = 30; } - speed = (this->actor.xzDistFromLink - 20.0f) / ((Math_Rand_ZeroOne() * 50.0f) + 150.0f); + speed = (this->actor.xzDistFromLink - 20.0f) / ((Rand_ZeroOne() * 50.0f) + 150.0f); this->actor.speedXZ += speed * 1.8f; if (this->actor.speedXZ >= 3.0f) { this->actor.speedXZ = 3.0f; @@ -271,7 +271,7 @@ void func_80AE53AC(EnReeba* this, GlobalContext* globalCtx) { } void func_80AE561C(EnReeba* this, GlobalContext* globalCtx) { - Math_SmoothDownscaleMaxF(&this->actor.speedXZ, 1.0f, 0.3f); + Math_ApproachZeroF(&this->actor.speedXZ, 1.0f, 0.3f); if (this->unk_272 == 0) { if (this->isBig) { @@ -291,8 +291,8 @@ void func_80AE5688(EnReeba* this, GlobalContext* globalCtx) { } void func_80AE56E0(EnReeba* this, GlobalContext* globalCtx) { - Math_SmoothDownscaleMaxF(&this->actor.shape.unk_10, 1.0f, 0.3f); - Math_SmoothDownscaleMaxF(&this->actor.speedXZ, 0.1f, 0.3f); + Math_ApproachZeroF(&this->actor.shape.unk_10, 1.0f, 0.3f); + Math_ApproachZeroF(&this->actor.speedXZ, 0.1f, 0.3f); SkelAnime_FrameUpdateMatrix(&this->skelanime); if ((this->unk_284 + 10.0f) <= this->actor.shape.unk_08) { @@ -301,8 +301,8 @@ void func_80AE56E0(EnReeba* this, GlobalContext* globalCtx) { 1); } - Math_SmoothScaleMaxF(&this->actor.shape.unk_08, this->unk_284, 1.0f, this->unk_288); - Math_SmoothScaleMaxF(&this->unk_288, 300.0f, 1.0f, 5.0f); + Math_ApproachF(&this->actor.shape.unk_08, this->unk_284, 1.0f, this->unk_288); + Math_ApproachF(&this->unk_288, 300.0f, 1.0f, 5.0f); } else { Actor_Kill(&this->actor); } @@ -355,9 +355,9 @@ void func_80AE5938(EnReeba* this, GlobalContext* globalCtx) { if ((this->unk_27E == 4) || (this->actor.colChkInfo.health != 0)) { if (this->unk_27E == 2) { - pos.x = this->actor.posRot.pos.x + Math_Rand_CenteredFloat(20.0f); - pos.y = this->actor.posRot.pos.y + Math_Rand_CenteredFloat(20.0f); - pos.z = this->actor.posRot.pos.z + Math_Rand_CenteredFloat(20.0f); + pos.x = this->actor.posRot.pos.x + Rand_CenteredFloat(20.0f); + pos.y = this->actor.posRot.pos.y + Rand_CenteredFloat(20.0f); + pos.z = this->actor.posRot.pos.z + Rand_CenteredFloat(20.0f); scale = 3.0f; if (this->isBig) { @@ -382,9 +382,9 @@ void func_80AE5A9C(EnReeba* this, GlobalContext* globalCtx) { if (this->unk_278 != 0) { if ((this->unk_27E == 2) && ((this->unk_278 & 0xF) == 0)) { - pos.x = this->actor.posRot.pos.x + Math_Rand_CenteredFloat(20.0f); - pos.y = this->actor.posRot.pos.y + Math_Rand_CenteredFloat(20.0f); - pos.z = this->actor.posRot.pos.z + Math_Rand_CenteredFloat(20.0f); + pos.x = this->actor.posRot.pos.x + Rand_CenteredFloat(20.0f); + pos.y = this->actor.posRot.pos.y + Rand_CenteredFloat(20.0f); + pos.z = this->actor.posRot.pos.z + Rand_CenteredFloat(20.0f); scale = 3.0f; if (this->isBig) { @@ -420,7 +420,7 @@ void func_80AE5C38(EnReeba* this, GlobalContext* globalCtx) { } } else { this->actor.speedXZ = 0.0f; - Math_SmoothDownscaleMaxF(&this->scale, 0.1f, 0.01f); + Math_ApproachZeroF(&this->scale, 0.1f, 0.01f); if (this->scale < 0.01f) { pos.x = this->actor.posRot.pos.x; @@ -458,8 +458,8 @@ void func_80AE5C38(EnReeba* this, GlobalContext* globalCtx) { void func_80AE5E48(EnReeba* this, GlobalContext* globalCtx) { if (this->unk_278 < 37) { - this->actor.shape.rot.x = Math_Rand_CenteredFloat(3000.0f); - this->actor.shape.rot.z = Math_Rand_CenteredFloat(3000.0f); + this->actor.shape.rot.x = Rand_CenteredFloat(3000.0f); + this->actor.shape.rot.z = Rand_CenteredFloat(3000.0f); if (this->unk_278 == 0) { if (this->isBig) { @@ -627,9 +627,9 @@ void EnReeba_Draw(Actor* thisx, GlobalContext* globalCtx) { if (BREG(0)) { Vec3f debugPos; - debugPos.x = (Math_Sins(this->actor.posRot.rot.y) * 30.0f) + this->actor.posRot.pos.x; + debugPos.x = (Math_SinS(this->actor.posRot.rot.y) * 30.0f) + this->actor.posRot.pos.x; debugPos.y = this->actor.posRot.pos.y + 20.0f; - debugPos.z = (Math_Coss(this->actor.posRot.rot.y) * 30.0f) + this->actor.posRot.pos.z; + debugPos.z = (Math_CosS(this->actor.posRot.rot.y) * 30.0f) + this->actor.posRot.pos.z; DebugDisplay_AddObject(debugPos.x, debugPos.y, debugPos.z, this->actor.posRot.rot.x, this->actor.posRot.rot.y, this->actor.posRot.rot.z, 1.0f, 1.0f, 1.0f, 255, 0, 0, 255, 4, globalCtx->state.gfxCtx); } diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/src/overlays/actors/ovl_En_Rl/z_en_rl.c index ff7f906287..aa4990c5d1 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.c +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.c @@ -47,7 +47,7 @@ void func_80AE72D0(EnRl* this) { s16* eyeTextureIndex = &this->eyeTextureIndex; if (DECR(*timer) == 0) { - *timer = Math_Rand_S16Offset(60, 60); + *timer = Rand_S16Offset(60, 60); } *eyeTextureIndex = *timer; diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c index cee228abe1..96ba5bf171 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -480,11 +480,11 @@ void EnRr_InitBodySegments(EnRr* this, GlobalContext* globalCtx) { } for (i = 0; i < 5; i++) { this->bodySegs[i].scaleMod.x = this->bodySegs[i].scaleMod.z = - Math_Coss(i * (u32)(s16)this->segPulsePhaseDiff * 0x1000) * this->pulseSize; + Math_CosS(i * (u32)(s16)this->segPulsePhaseDiff * 0x1000) * this->pulseSize; } for (i = 1; i < 5; i++) { - this->bodySegs[i].rotTarget.x = Math_Coss(i * (u32)(s16)this->segWobblePhaseDiffX * 0x1000) * this->wobbleSize; - this->bodySegs[i].rotTarget.z = Math_Sins(i * (u32)(s16)this->segWobblePhaseDiffZ * 0x1000) * this->wobbleSize; + this->bodySegs[i].rotTarget.x = Math_CosS(i * (u32)(s16)this->segWobblePhaseDiffX * 0x1000) * this->wobbleSize; + this->bodySegs[i].rotTarget.z = Math_SinS(i * (u32)(s16)this->segWobblePhaseDiffZ * 0x1000) * this->wobbleSize; } } @@ -495,15 +495,15 @@ void EnRr_UpdateBodySegments(EnRr* this, GlobalContext* globalCtx) { if (!this->isDead) { for (i = 0; i < 5; i++) { this->bodySegs[i].scaleMod.x = this->bodySegs[i].scaleMod.z = - Math_Coss(phase + i * (s16)this->segPulsePhaseDiff * 0x1000) * this->pulseSize; + Math_CosS(phase + i * (s16)this->segPulsePhaseDiff * 0x1000) * this->pulseSize; } phase = this->segMovePhase; if (!this->isDead && (this->reachState == 0)) { for (i = 1; i < 5; i++) { this->bodySegs[i].rotTarget.x = - Math_Coss(phase + i * (s16)this->segWobblePhaseDiffX * 0x1000) * this->wobbleSize; + Math_CosS(phase + i * (s16)this->segWobblePhaseDiffX * 0x1000) * this->wobbleSize; this->bodySegs[i].rotTarget.z = - Math_Sins(phase + i * (s16)this->segWobblePhaseDiffZ * 0x1000) * this->wobbleSize; + Math_SinS(phase + i * (s16)this->segWobblePhaseDiffZ * 0x1000) * this->wobbleSize; } } } @@ -513,7 +513,7 @@ void EnRr_UpdateBodySegments(EnRr* this, GlobalContext* globalCtx) { } void EnRr_Approach(EnRr* this, GlobalContext* globalCtx) { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0xA, 0x1F4, 0); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0xA, 0x1F4, 0); this->actor.posRot.rot.y = this->actor.shape.rot.y; if ((this->actionTimer == 0) && (this->actor.xzDistFromLink < 160.0f)) { EnRr_SetupReach(this); @@ -523,7 +523,7 @@ void EnRr_Approach(EnRr* this, GlobalContext* globalCtx) { } void EnRr_Reach(EnRr* this, GlobalContext* globalCtx) { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0xA, 0x1F4, 0); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0xA, 0x1F4, 0); this->actor.posRot.rot.y = this->actor.shape.rot.y; switch (this->reachState) { case REACH_EXTEND: @@ -571,10 +571,10 @@ void EnRr_GrabPlayer(EnRr* this, GlobalContext* globalCtx) { if ((this->grabTimer == 0) || !(player->stateFlags2 & 0x80)) { EnRr_SetupReleasePlayer(this, globalCtx); } else { - Math_SmoothScaleMaxF(&player->actor.posRot.pos.x, this->mouthPos.x, 1.0f, 30.0f); - Math_SmoothScaleMaxF(&player->actor.posRot.pos.y, this->mouthPos.y + this->swallowOffset, 1.0f, 30.0f); - Math_SmoothScaleMaxF(&player->actor.posRot.pos.z, this->mouthPos.z, 1.0f, 30.0f); - Math_SmoothScaleMaxF(&this->swallowOffset, -55.0f, 1.0f, 5.0f); + Math_ApproachF(&player->actor.posRot.pos.x, this->mouthPos.x, 1.0f, 30.0f); + Math_ApproachF(&player->actor.posRot.pos.y, this->mouthPos.y + this->swallowOffset, 1.0f, 30.0f); + Math_ApproachF(&player->actor.posRot.pos.z, this->mouthPos.z, 1.0f, 30.0f); + Math_ApproachF(&this->swallowOffset, -55.0f, 1.0f, 5.0f); } } @@ -600,7 +600,7 @@ void EnRr_Death(EnRr* this, GlobalContext* globalCtx) { if (this->frameCount < 40) { for (i = 0; i < 5; i++) { - Math_SmoothScaleMaxF(&this->bodySegs[i].heightTarget, i + 59 - (this->frameCount * 25.0f), 1.0f, 50.0f); + Math_ApproachF(&this->bodySegs[i].heightTarget, i + 59 - (this->frameCount * 25.0f), 1.0f, 50.0f); this->bodySegs[i].scaleTarget.x = this->bodySegs[i].scaleTarget.z = (SQ(4 - i) * (f32)this->frameCount * 0.003f) + 1.0f; } @@ -667,8 +667,8 @@ void EnRr_Death(EnRr* this, GlobalContext* globalCtx) { EffectSsDeadDb_Spawn(globalCtx, &pos, &vel, &accel, 100, 0, 255, 255, 255, 255, 255, 0, 0, 1, 9, true); } else { - Math_SmoothScaleMaxF(&this->actor.scale.x, 0.0f, 1.0f, this->shrinkRate); - Math_SmoothScaleMaxF(&this->shrinkRate, 0.001f, 1.0f, 0.00001f); + Math_ApproachF(&this->actor.scale.x, 0.0f, 1.0f, this->shrinkRate); + Math_ApproachF(&this->shrinkRate, 0.001f, 1.0f, 0.00001f); this->actor.scale.z = this->actor.scale.x; } } @@ -678,7 +678,7 @@ void EnRr_Retreat(EnRr* this, GlobalContext* globalCtx) { this->retreat = false; this->actionFunc = EnRr_Approach; } else { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink + 0x8000, 0xA, 0x3E8, 0); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink + 0x8000, 0xA, 0x3E8, 0); this->actor.posRot.rot.y = this->actor.shape.rot.y; if (this->actor.speedXZ == 0.0f) { EnRr_SetSpeed(this, 2.0f); @@ -735,7 +735,7 @@ void EnRr_Update(Actor* thisx, GlobalContext* globalCtx) { __assert("0", "../z_en_rr.c", 1355); } - Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.1f); + Math_StepToF(&this->actor.speedXZ, 0.0f, 0.1f); Actor_MoveForward(&this->actor); Collider_CylinderUpdate(&this->actor, &this->collider1); this->collider2.dim.pos.x = this->mouthPos.x; @@ -756,24 +756,24 @@ void EnRr_Update(Actor* thisx, GlobalContext* globalCtx) { } func_8002E4B4(globalCtx, &this->actor, 20.0f, 30.0f, 20.0f, 7); if (!this->stopScroll) { - Math_SmoothScaleMaxF(&this->segPhaseVel, this->segPhaseVelTarget, 1.0f, 50.0f); - Math_SmoothScaleMaxF(&this->segPulsePhaseDiff, 4.0f, 1.0f, 5.0f); - Math_SmoothScaleMaxF(&this->segWobblePhaseDiffX, this->segWobbleXTarget, 1.0f, 0.04f); - Math_SmoothScaleMaxF(&this->segWobblePhaseDiffZ, this->segWobbleZTarget, 1.0f, 0.01f); - Math_SmoothScaleMaxF(&this->pulseSize, this->pulseSizeTarget, 1.0f, 0.0015f); - Math_SmoothScaleMaxF(&this->wobbleSize, this->wobbleSizeTarget, 1.0f, 20.0f); + Math_ApproachF(&this->segPhaseVel, this->segPhaseVelTarget, 1.0f, 50.0f); + Math_ApproachF(&this->segPulsePhaseDiff, 4.0f, 1.0f, 5.0f); + Math_ApproachF(&this->segWobblePhaseDiffX, this->segWobbleXTarget, 1.0f, 0.04f); + Math_ApproachF(&this->segWobblePhaseDiffZ, this->segWobbleZTarget, 1.0f, 0.01f); + Math_ApproachF(&this->pulseSize, this->pulseSizeTarget, 1.0f, 0.0015f); + Math_ApproachF(&this->wobbleSize, this->wobbleSizeTarget, 1.0f, 20.0f); for (i = 0; i < 5; i++) { - Math_SmoothScaleMaxMinS(&this->bodySegs[i].rot.x, this->bodySegs[i].rotTarget.x, 5, + Math_SmoothStepToS(&this->bodySegs[i].rot.x, this->bodySegs[i].rotTarget.x, 5, this->segMoveRate * 1000.0f, 0); - Math_SmoothScaleMaxMinS(&this->bodySegs[i].rot.z, this->bodySegs[i].rotTarget.z, 5, + Math_SmoothStepToS(&this->bodySegs[i].rot.z, this->bodySegs[i].rotTarget.z, 5, this->segMoveRate * 1000.0f, 0); - Math_SmoothScaleMaxF(&this->bodySegs[i].scale.x, this->bodySegs[i].scaleTarget.x, 1.0f, + Math_ApproachF(&this->bodySegs[i].scale.x, this->bodySegs[i].scaleTarget.x, 1.0f, this->segMoveRate * 0.2f); this->bodySegs[i].scale.z = this->bodySegs[i].scale.x; - Math_SmoothScaleMaxF(&this->bodySegs[i].height, this->bodySegs[i].heightTarget, 1.0f, + Math_ApproachF(&this->bodySegs[i].height, this->bodySegs[i].heightTarget, 1.0f, this->segMoveRate * 300.0f); } - Math_SmoothScaleMaxF(&this->segMoveRate, 1.0f, 1.0f, 0.2f); + Math_ApproachF(&this->segMoveRate, 1.0f, 1.0f, 0.2f); } } @@ -837,9 +837,9 @@ void EnRr_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 segIndex = 4 - (effectTimer >> 2); s32 offIndex = (effectTimer >> 1) & 3; - effectPos.x = this->effectPos[segIndex].x + sEffectOffsets[offIndex].x + Math_Rand_CenteredFloat(10.0f); - effectPos.y = this->effectPos[segIndex].y + sEffectOffsets[offIndex].y + Math_Rand_CenteredFloat(10.0f); - effectPos.z = this->effectPos[segIndex].z + sEffectOffsets[offIndex].z + Math_Rand_CenteredFloat(10.0f); + effectPos.x = this->effectPos[segIndex].x + sEffectOffsets[offIndex].x + Rand_CenteredFloat(10.0f); + effectPos.y = this->effectPos[segIndex].y + sEffectOffsets[offIndex].y + Rand_CenteredFloat(10.0f); + effectPos.z = this->effectPos[segIndex].z + sEffectOffsets[offIndex].z + Rand_CenteredFloat(10.0f); if (this->actor.dmgEffectParams & 0x4000) { EffectSsEnFire_SpawnVec3f(globalCtx, &this->actor, &effectPos, 100, 0, 0, -1); } else { diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index 5244c1652d..cc4528f0dc 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -228,7 +228,7 @@ void func_80AEAE1C(EnRu1* this) { s16* unk_25C = &this->unk_25C; if (DECR(*unk_25E) == 0) { - *unk_25E = Math_Rand_S16Offset(0x3C, 0x3C); + *unk_25E = Rand_S16Offset(0x3C, 0x3C); } *unk_25C = *unk_25E; @@ -500,7 +500,7 @@ void func_80AEB7D0(EnRu1* this) { f32 func_80AEB7E0(CsCmdActorAction* csCmdNPCAction, GlobalContext* globalCtx) { s32 csCtxFrames = globalCtx->csCtx.frames; if ((csCtxFrames < csCmdNPCAction->endFrame) && (csCmdNPCAction->endFrame - csCmdNPCAction->startFrame > 0)) { - return (Math_Coss(((csCtxFrames - csCmdNPCAction->startFrame) / + return (Math_CosS(((csCtxFrames - csCmdNPCAction->startFrame) / (f32)(csCmdNPCAction->endFrame - csCmdNPCAction->startFrame)) * 32768.0f) * -0.5f) + @@ -1017,9 +1017,9 @@ void func_80AECCB0(EnRu1* this, GlobalContext* globalCtx) { yawTowardsLink = thisx->yawTowardsLink; pos = &thisx->posRot.pos; - spawnX = ((kREG(1) + 12.0f) * Math_Sins(yawTowardsLink)) + pos->x; + spawnX = ((kREG(1) + 12.0f) * Math_SinS(yawTowardsLink)) + pos->x; spawnY = pos->y; - spawnZ = ((kREG(1) + 12.0f) * Math_Coss(yawTowardsLink)) + pos->z; + spawnZ = ((kREG(1) + 12.0f) * Math_CosS(yawTowardsLink)) + pos->z; this->unk_278 = Actor_SpawnAsChild(&globalCtx->actorCtx, this, globalCtx, ACTOR_DOOR_WARP1, spawnX, spawnY, spawnZ, 0, yawTowardsLink, 0, 5); } @@ -1045,9 +1045,9 @@ void func_80AECE20(EnRu1* this, GlobalContext* globalCtx) { f32 unk_27C = this->unk_27C; Vec3f* pos = &thisx->posRot.pos; - pos->x = (Math_Sins(shapeRotY) * unk_27C) + playerPos->x; + pos->x = (Math_SinS(shapeRotY) * unk_27C) + playerPos->x; pos->y = playerPos->y; - pos->z = (Math_Coss(shapeRotY) * unk_27C) + playerPos->z; + pos->z = (Math_CosS(shapeRotY) * unk_27C) + playerPos->z; } void func_80AECEB4(EnRu1* this, GlobalContext* globalCtx) { @@ -1057,8 +1057,8 @@ void func_80AECEB4(EnRu1* this, GlobalContext* globalCtx) { Vec3f* pos = &thisx->posRot.pos; s16 shapeRotY = thisx->shape.rot.y; - player_unk_450->x = ((kREG(2) + 30.0f) * Math_Sins(shapeRotY)) + pos->x; - player_unk_450->z = ((kREG(2) + 30.0f) * Math_Coss(shapeRotY)) + pos->z; + player_unk_450->x = ((kREG(2) + 30.0f) * Math_SinS(shapeRotY)) + pos->x; + player_unk_450->z = ((kREG(2) + 30.0f) * Math_CosS(shapeRotY)) + pos->z; } s32 func_80AECF6C(EnRu1* this, GlobalContext* globalCtx) { @@ -1079,9 +1079,9 @@ s32 func_80AECF6C(EnRu1* this, GlobalContext* globalCtx) { shapeRotY = &player->actor.shape.rot.y; temp1 = this->actor.posRot.pos.x - player->actor.posRot.pos.x; temp2 = this->actor.posRot.pos.z - player->actor.posRot.pos.z; - temp_f16 = Math_atan2f(temp1, temp2) * 10430.3779296875f; + temp_f16 = Math_FAtan2F(temp1, temp2) * 10430.3779296875f; if (*shapeRotY != temp_f16) { - Math_SmoothScaleMaxMinS(shapeRotY, temp_f16, 0x14, 0x1838, 0x64); + Math_SmoothStepToS(shapeRotY, temp_f16, 0x14, 0x1838, 0x64); player->actor.posRot.rot.y = *shapeRotY; } else { return 1; @@ -1296,11 +1296,11 @@ void func_80AED83C(EnRu1* this) { Vec3s* tempPtr2; tempPtr = &this->unk_374.unk_08; - Math_SmoothScaleMaxMinS(&tempPtr->x, 0, 0x14, 0x1838, 0x64); - Math_SmoothScaleMaxMinS(&tempPtr->y, 0, 0x14, 0x1838, 0x64); + Math_SmoothStepToS(&tempPtr->x, 0, 0x14, 0x1838, 0x64); + Math_SmoothStepToS(&tempPtr->y, 0, 0x14, 0x1838, 0x64); tempPtr2 = &this->unk_374.unk_0E; - Math_SmoothScaleMaxMinS(&tempPtr2->x, 0, 0x14, 0x1838, 0x64); - Math_SmoothScaleMaxMinS(&tempPtr2->y, 0, 0x14, 0x1838, 0x64); + Math_SmoothStepToS(&tempPtr2->x, 0, 0x14, 0x1838, 0x64); + Math_SmoothStepToS(&tempPtr2->y, 0, 0x14, 0x1838, 0x64); } void func_80AED8DC(EnRu1* this) { @@ -1311,7 +1311,7 @@ void func_80AED8DC(EnRu1* this) { s32 pad[2]; if (DECR(*unk_2AC) == 0) { - *unk_2AC = Math_Rand_S16Offset(0xA, 0x19); + *unk_2AC = Rand_S16Offset(0xA, 0x19); temp_hi = *unk_2AC % 5; if (temp_hi == 0) { this->unk_2B0 = 1; @@ -1324,14 +1324,14 @@ void func_80AED8DC(EnRu1* this) { } if (this->unk_2B0 == 0) { - Math_SmoothScaleMaxMinS(unk_29E, 0 - *someY, 1, 0x190, 0x190); - Math_SmoothScaleMaxMinS(someY, 0, 3, ABS(*unk_29E), 0x64); + Math_SmoothStepToS(unk_29E, 0 - *someY, 1, 0x190, 0x190); + Math_SmoothStepToS(someY, 0, 3, ABS(*unk_29E), 0x64); } else if (this->unk_2B0 == 1) { - Math_SmoothScaleMaxMinS(unk_29E, -0x2AAA - *someY, 1, 0x190, 0x190); - Math_SmoothScaleMaxMinS(someY, -0x2AAA, 3, ABS(*unk_29E), 0x64); + Math_SmoothStepToS(unk_29E, -0x2AAA - *someY, 1, 0x190, 0x190); + Math_SmoothStepToS(someY, -0x2AAA, 3, ABS(*unk_29E), 0x64); } else { - Math_SmoothScaleMaxMinS(unk_29E, 0x2AAA - *someY, 1, 0x190, 0x190); - Math_SmoothScaleMaxMinS(someY, 0x2AAA, 3, ABS(*unk_29E), 0x64); + Math_SmoothStepToS(unk_29E, 0x2AAA - *someY, 1, 0x190, 0x190); + Math_SmoothStepToS(someY, 0x2AAA, 3, ABS(*unk_29E), 0x64); } } @@ -1491,8 +1491,8 @@ void func_80AEE050(EnRu1* this) { if (this->actor.speedXZ <= 0.1f) { this->actor.speedXZ = 0.0f; } - this->actor.velocity.x = Math_Sins(this->actor.posRot.rot.y) * this->actor.speedXZ; - this->actor.velocity.z = Math_Coss(this->actor.posRot.rot.y) * this->actor.speedXZ; + this->actor.velocity.x = Math_SinS(this->actor.posRot.rot.y) * this->actor.speedXZ; + this->actor.velocity.z = Math_CosS(this->actor.posRot.rot.y) * this->actor.speedXZ; func_8002D7EC(this); } } else { @@ -1504,7 +1504,7 @@ void func_80AEE050(EnRu1* this) { } else { sp28 = this->unk_358; sp24 = this->unk_354; - temp_f10 = Math_Coss(this->unk_35C) * -sp28; + temp_f10 = Math_CosS(this->unk_35C) * -sp28; this->actor.posRot.pos.y = temp_f10 + sp24; this->unk_35C += 0x3E8; this->unk_358 *= 0.95f; @@ -1676,7 +1676,7 @@ void func_80AEE7C4(EnRu1* this, GlobalContext* globalCtx) { this->unk_370 += 1.0f; if (this->action != 32) { if (*unk_370 > 30.0f) { - if (Math_Rand_S16Offset(0, 3) == 0) { + if (Rand_S16Offset(0, 3) == 0) { frameCount = SkelAnime_GetFrameCount(&D_06004350); SkelAnime_ChangeAnim(&this->skelAnime, &D_06004350, 1.0f, 0, frameCount, 0, -8.0f); func_80AED5DC(this); diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index 5e084acb10..e5c72c5544 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -121,7 +121,7 @@ void func_80AF2608(EnRu2* this) { s16* unk_2A4 = &this->unk_2A4; if (!DECR(*unk_2A6)) { - *unk_2A6 = Math_Rand_S16Offset(0x3C, 0x3C); + *unk_2A6 = Rand_S16Offset(0x3C, 0x3C); } *unk_2A4 = *unk_2A6; diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index 82e9d2e0fd..5b918de2c1 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -175,7 +175,7 @@ void EnSb_SetupCooldown(EnSb* this, s32 changeSpeed) { void EnSb_WaitClosed(EnSb* this, GlobalContext* globalCtx) { // always face toward link - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0xA, 0x7D0, 0x0); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0xA, 0x7D0, 0x0); if ((this->actor.xzDistFromLink <= 160.0f) && (this->actor.xzDistFromLink > 40.0f)) { EnSb_SetupOpen(this); @@ -189,7 +189,7 @@ void EnSb_Open(EnSb* this, GlobalContext* globalCtx) { this->timer = 15; EnSb_SetupWaitOpen(this); } else { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0xA, 0x7D0, 0x0); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0xA, 0x7D0, 0x0); if ((this->actor.xzDistFromLink > 160.0f) || (this->actor.xzDistFromLink <= 40.0f)) { EnSb_SetupWaitClosed(this); } @@ -199,7 +199,7 @@ void EnSb_Open(EnSb* this, GlobalContext* globalCtx) { void EnSb_WaitOpen(EnSb* this, GlobalContext* globalCtx) { s16 timer = this->timer; - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0xA, 0x7D0, 0x0); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0xA, 0x7D0, 0x0); if ((this->actor.xzDistFromLink > 160.0f) || (this->actor.xzDistFromLink <= 40.0f)) { EnSb_SetupWaitClosed(this); @@ -218,7 +218,7 @@ void EnSb_TurnAround(EnSb* this, GlobalContext* globalCtx) { s16 invertedYaw; invertedYaw = this->attackYaw + 0x8000; - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, invertedYaw, 0x1, 0x1F40, 0xA); + Math_SmoothStepToS(&this->actor.shape.rot.y, invertedYaw, 0x1, 0x1F40, 0xA); if (this->actor.shape.rot.y == invertedYaw) { this->actor.posRot.rot.y = this->attackYaw; @@ -240,7 +240,7 @@ void EnSb_TurnAround(EnSb* this, GlobalContext* globalCtx) { } void EnSb_Lunge(EnSb* this, GlobalContext* globalCtx) { - Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.2f); + Math_StepToF(&this->actor.speedXZ, 0.0f, 0.2f); if ((this->actor.velocity.y <= -0.1f) || ((this->actor.bgCheckFlags & 2))) { if (!(this->actor.waterY > 0.0f)) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_GND); @@ -257,7 +257,7 @@ void EnSb_Bounce(EnSb* this, GlobalContext* globalCtx) { currentFrame = this->skelAnime.animCurrentFrame; frameCount = SkelAnime_GetFrameCount(&D_060000B4); - Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.2f); + Math_StepToF(&this->actor.speedXZ, 0.0f, 0.2f); if (currentFrame == frameCount) { if (this->bouncesLeft != 0) { @@ -463,9 +463,9 @@ void EnSb_Draw(Actor* thisx, GlobalContext* globalCtx) { // fire gets set to 4 when burned, decrements to 3 and fails the "& 1" check and never stores the decrement if ((fireDecr & 1) == 0) { offset = &sFlamePosOffsets[(fireDecr & 3)]; - flamePos.x = Math_Rand_CenteredFloat(5.0f) + (this->actor.posRot.pos.x + offset->x); - flamePos.y = Math_Rand_CenteredFloat(5.0f) + (this->actor.posRot.pos.y + offset->y); - flamePos.z = Math_Rand_CenteredFloat(5.0f) + (this->actor.posRot.pos.z + offset->z); + flamePos.x = Rand_CenteredFloat(5.0f) + (this->actor.posRot.pos.x + offset->x); + flamePos.y = Rand_CenteredFloat(5.0f) + (this->actor.posRot.pos.y + offset->y); + flamePos.z = Rand_CenteredFloat(5.0f) + (this->actor.posRot.pos.z + offset->z); EffectSsEnFire_SpawnVec3f(globalCtx, this, &flamePos, 100, 0, 0, -1); } } diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c index 2a30c3b3b6..32a3147c49 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -73,7 +73,7 @@ void func_80AFB768(EnSi* this, GlobalContext* globalCtx) { if ((this->actor.flags & 0x2000) == 0x2000) { this->actionFunc = func_80AFB89C; } else { - Math_SmoothScaleMaxMinF(&this->actor.scale.x, 0.25f, 0.4f, 1.0f, 0.0f); + Math_SmoothStepToF(&this->actor.scale.x, 0.25f, 0.4f, 1.0f, 0.0f); Actor_SetScale(&this->actor, this->actor.scale.x); this->actor.shape.rot.y += 0x400; @@ -99,7 +99,7 @@ void func_80AFB768(EnSi* this, GlobalContext* globalCtx) { void func_80AFB89C(EnSi* this, GlobalContext* globalCtx) { Player* player = PLAYER; - Math_SmoothScaleMaxMinF(&this->actor.scale.x, 0.25f, 0.4f, 1.0f, 0.0f); + Math_SmoothStepToF(&this->actor.scale.x, 0.25f, 0.4f, 1.0f, 0.0f); Actor_SetScale(&this->actor, this->actor.scale.x); this->actor.shape.rot.y += 0x400; diff --git a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c index 9c544a8b55..0e74d14cc6 100644 --- a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c +++ b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c @@ -146,11 +146,11 @@ void func_80AFBE8C(EnSiofuki* this, GlobalContext* globalCtx) { dist2d = sqrtf(SQ(dX) + SQ(dZ)); this->applySpeed = true; this->splashTimer = 0; - angle = Math_atan2f(dX, dZ) * (0x8000 / M_PI); + angle = Math_FAtan2F(dX, dZ) * (0x8000 / M_PI); dAngle = (player->actor.posRot.rot.y ^ 0x8000) - angle; player->actor.gravity = 0.0f; player->actor.velocity.y = 0.0f; - Math_SmoothScaleMaxMinF(&player->actor.posRot.pos.y, this->dyna.actor.posRot.pos.y, 0.5f, 4.0f, 1.0f); + Math_SmoothStepToF(&player->actor.posRot.pos.y, this->dyna.actor.posRot.pos.y, 0.5f, 4.0f, 1.0f); if ((dAngle < 0x4000) && (dAngle > -0x4000)) { this->appliedYaw = player->actor.posRot.rot.y ^ 0x8000; @@ -158,13 +158,13 @@ void func_80AFBE8C(EnSiofuki* this, GlobalContext* globalCtx) { speedScale = CLAMP_MIN(speedScale, 0.0f); speedScale = CLAMP_MAX(speedScale, 1.0f); player->linearVelocity *= speedScale; - Math_SmoothScaleMaxF(&this->targetAppliedSpeed, 3.0f, 1.0f, 1.0f); - Math_SmoothScaleMaxF(&this->appliedSpeed, this->targetAppliedSpeed, 1.0f, 0.3f * speedScale); + Math_ApproachF(&this->targetAppliedSpeed, 3.0f, 1.0f, 1.0f); + Math_ApproachF(&this->appliedSpeed, this->targetAppliedSpeed, 1.0f, 0.3f * speedScale); } else { this->appliedYaw = player->actor.posRot.rot.y; player->linearVelocity /= 2.0f; - Math_SmoothScaleMaxF(&this->targetAppliedSpeed, 3.0f, 1.0f, 1.0f); - Math_SmoothScaleMaxF(&this->appliedSpeed, this->targetAppliedSpeed, 1.0f, 0.1f); + Math_ApproachF(&this->targetAppliedSpeed, 3.0f, 1.0f, 1.0f); + Math_ApproachF(&this->appliedSpeed, this->targetAppliedSpeed, 1.0f, 0.1f); } player->windDirection = this->appliedYaw; @@ -183,7 +183,7 @@ void func_80AFBE8C(EnSiofuki* this, GlobalContext* globalCtx) { } void func_80AFC1D0(EnSiofuki* this, GlobalContext* globalCtx) { - Math_SmoothScaleMaxMinF(&this->currentHeight, this->targetHeight, 0.8f, 3.0f, 0.01f); + Math_SmoothStepToF(&this->currentHeight, this->targetHeight, 0.8f, 3.0f, 0.01f); } void func_80AFC218(EnSiofuki* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index fb6f17c215..1ff08ac16e 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -272,7 +272,7 @@ s32 EnSsh_Damaged(EnSsh* this) { func_8003426C(&this->actor, 0, 0xC8, 0, this->stunTimer); } if (DECR(this->stunTimer) != 0) { - Math_SmoothScaleMaxMinS(&this->maxTurnRate, 0x2710, 0xA, 0x3E8, 1); + Math_SmoothStepToS(&this->maxTurnRate, 0x2710, 0xA, 0x3E8, 1); return false; } else { this->stunTimer = 0; @@ -294,14 +294,14 @@ void EnSsh_Turn(EnSsh* this, GlobalContext* globalCtx) { if (DECR(this->spinTimer) != 0) { this->actor.posRot.rot.y += 10000.0f * (this->spinTimer / 30.0f); } else if ((this->swayTimer == 0) && (this->stunTimer == 0)) { - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 4, 0x2710, 1); + Math_SmoothStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 4, 0x2710, 1); } this->actor.shape.rot.y = this->actor.posRot.rot.y; } void EnSsh_Stunned(EnSsh* this, GlobalContext* globalCtx) { if ((this->swayTimer == 0) && (this->stunTimer == 0)) { - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink ^ 0x8000, 4, this->maxTurnRate, + Math_SmoothStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink ^ 0x8000, 4, this->maxTurnRate, 1); } this->actor.shape.rot.y = this->actor.posRot.rot.y; @@ -328,7 +328,7 @@ void EnSsh_Bob(EnSsh* this, GlobalContext* globalCtx) { if ((globalCtx->state.frames & 8) != 0) { bobVel *= -1.0f; } - Math_SmoothScaleMaxMinF(&this->actor.velocity.y, bobVel, 0.4f, 1000.0f, 0.0f); + Math_SmoothStepToF(&this->actor.velocity.y, bobVel, 0.4f, 1000.0f, 0.0f); } s32 EnSsh_IsCloseToLink(EnSsh* this, GlobalContext* globalCtx) { @@ -396,10 +396,10 @@ void EnSsh_Sway(EnSsh* this) { this->swayAngle = 0; } temp = this->swayTimer * (1.0f / 6); - swayAngle = temp * (0x10000 / 360.0f) * Math_Sins(this->swayAngle); + swayAngle = temp * (0x10000 / 360.0f) * Math_SinS(this->swayAngle); temp = this->actor.posRot.pos.y - this->ceilingPos.y; - swayVecBase.x = Math_Sins(swayAngle) * temp; - swayVecBase.y = Math_Coss(swayAngle) * temp; + swayVecBase.x = Math_SinS(swayAngle) * temp; + swayVecBase.y = Math_CosS(swayAngle) * temp; swayVecBase.z = 0.0f; Matrix_Push(); Matrix_Translate(this->ceilingPos.x, this->ceilingPos.y, this->ceilingPos.z, MTXMODE_NEW); @@ -711,7 +711,7 @@ void EnSsh_Land(EnSsh* this, GlobalContext* globalCtx) { if ((this->actor.groundY + this->groundYoffset) <= this->actor.posRot.pos.y) { EnSsh_SetupAction(this, EnSsh_Idle); } else { - Math_SmoothScaleMaxMinF(&this->actor.velocity.y, 2.0f, 0.6f, 1000.0f, 0.0f); + Math_SmoothStepToF(&this->actor.velocity.y, 2.0f, 0.6f, 1000.0f, 0.0f); } } @@ -801,7 +801,7 @@ void EnSsh_Update(Actor* thisx, GlobalContext* globalCtx) { } EnSsh_UpdateYaw(this, globalCtx); if (DECR(this->blinkTimer) == 0) { - this->blinkTimer = Math_Rand_S16Offset(60, 60); + this->blinkTimer = Rand_S16Offset(60, 60); } this->blinkState = this->blinkTimer; if (this->blinkState >= 3) { diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index fd93a7deba..d11e2c12e0 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -104,13 +104,13 @@ void EnSt_SpawnDust(EnSt* this, GlobalContext* globalCtx, s32 dustCnt) { s16 yAngle; s32 i; - yAngle = (Math_Rand_ZeroOne() - 0.5f) * 65536.0f; + yAngle = (Rand_ZeroOne() - 0.5f) * 65536.0f; dustPos.y = this->actor.groundY; for (i = dustCnt; i >= 0; i--, yAngle += (s16)(0x10000 / dustCnt)) { - dustAccel.x = (Math_Rand_ZeroOne() - 0.5f) * 4.0f; - dustAccel.z = (Math_Rand_ZeroOne() - 0.5f) * 4.0f; - dustPos.x = this->actor.posRot.pos.x + (Math_Sins(yAngle) * 22.0f); - dustPos.z = this->actor.posRot.pos.z + (Math_Coss(yAngle) * 22.0f); + dustAccel.x = (Rand_ZeroOne() - 0.5f) * 4.0f; + dustAccel.z = (Rand_ZeroOne() - 0.5f) * 4.0f; + dustPos.x = this->actor.posRot.pos.x + (Math_SinS(yAngle) * 22.0f); + dustPos.z = this->actor.posRot.pos.z + (Math_CosS(yAngle) * 22.0f); func_8002836C(globalCtx, &dustPos, &dustVel, &dustAccel, &primColor, &envColor, 120, 40, 10); } } @@ -130,9 +130,9 @@ void EnSt_SpawnDeadEffect(EnSt* this, GlobalContext* globalCtx) { Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; Vec3f firePos; - firePos.x = this->actor.posRot.pos.x + ((Math_Rand_ZeroOne() - 0.5f) * 60.0f); - firePos.y = (this->actor.posRot.pos.y + 10.0f) + ((Math_Rand_ZeroOne() - 0.5f) * 45.0f); - firePos.z = this->actor.posRot.pos.z + ((Math_Rand_ZeroOne() - 0.5f) * 60.0f); + firePos.x = this->actor.posRot.pos.x + ((Rand_ZeroOne() - 0.5f) * 60.0f); + firePos.y = (this->actor.posRot.pos.y + 10.0f) + ((Rand_ZeroOne() - 0.5f) * 45.0f); + firePos.z = this->actor.posRot.pos.z + ((Rand_ZeroOne() - 0.5f) * 60.0f); EffectSsDeadDb_Spawn(globalCtx, &firePos, &zeroVec, &zeroVec, 100, 0, 255, 255, 255, 255, 255, 0, 0, 1, 9, true); } @@ -506,9 +506,9 @@ s32 EnSt_SetTeethColor(EnSt* this, s16 redTarget, s16 greenTarget, s16 blueTarge minMaxStep = 1; } - Math_SmoothScaleMaxMinS(&red, redTarget, 1, minMaxStep, minMaxStep); - Math_SmoothScaleMaxMinS(&green, greenTarget, 1, minMaxStep, minMaxStep); - Math_SmoothScaleMaxMinS(&blue, blueTarget, 1, minMaxStep, minMaxStep); + Math_SmoothStepToS(&red, redTarget, 1, minMaxStep, minMaxStep); + Math_SmoothStepToS(&green, greenTarget, 1, minMaxStep, minMaxStep); + Math_SmoothStepToS(&blue, blueTarget, 1, minMaxStep, minMaxStep); this->teethR = red; this->teethG = green; this->teethB = blue; @@ -582,7 +582,7 @@ void EnSt_UpdateYaw(EnSt* this, GlobalContext* globalCtx) { yawTarget = (this->actionFunc == EnSt_WaitOnGround ? this->actor.yawTowardsLink : this->initalYaw); yawDiff = rot.y - (yawTarget ^ yawDir); if (ABS(yawDiff) <= 0x4000) { - Math_SmoothScaleMaxMinS(&rot.y, yawTarget ^ yawDir, 4, 0x2000, 1); + Math_SmoothStepToS(&rot.y, yawTarget ^ yawDir, 4, 0x2000, 1); } else { rot.y += 0x2000; } @@ -641,7 +641,7 @@ void EnSt_Bob(EnSt* this, GlobalContext* globalCtx) { if ((globalCtx->state.frames & 8) != 0) { ySpeedTarget *= -1.0f; } - Math_SmoothScaleMaxMinF(&this->actor.velocity.y, ySpeedTarget, 0.4f, 1000.0f, 0.0f); + Math_SmoothStepToF(&this->actor.velocity.y, ySpeedTarget, 0.4f, 1000.0f, 0.0f); } s32 EnSt_IsCloseToPlayer(EnSt* this, GlobalContext* globalCtx) { @@ -710,7 +710,7 @@ void EnSt_Sway(EnSt* this) { } swayAmt = this->swayTimer * (7.0f / 15.0f); - rotAngle = Math_Sins(this->swayAngle) * (swayAmt * (65536.0f / 360.0f)); + rotAngle = Math_SinS(this->swayAngle) * (swayAmt * (65536.0f / 360.0f)); if (this->absPrevSwayAngle >= ABS(rotAngle) && this->playSwayFlag == 0) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALTU_WAVE); @@ -722,8 +722,8 @@ void EnSt_Sway(EnSt* this) { } this->absPrevSwayAngle = ABS(rotAngle); - amtToTranslate.x = Math_Sins(rotAngle) * -200.0f; - amtToTranslate.y = Math_Coss(rotAngle) * -200.0f; + amtToTranslate.x = Math_SinS(rotAngle) * -200.0f; + amtToTranslate.y = Math_CosS(rotAngle) * -200.0f; amtToTranslate.z = 0.0f; Matrix_Push(); Matrix_Translate(this->ceilingPos.x, this->ceilingPos.y, this->ceilingPos.z, MTXMODE_NEW); @@ -844,7 +844,7 @@ void EnSt_LandOnGround(EnSt* this, GlobalContext* globalCtx) { this->sfxTimer = 0; EnSt_SetupAction(this, EnSt_WaitOnGround); } else { - Math_SmoothScaleMaxMinF(&this->actor.velocity.y, 2.0f, 0.3f, 1.0f, 0.0f); + Math_SmoothStepToF(&this->actor.velocity.y, 2.0f, 0.3f, 1.0f, 0.0f); } } @@ -907,7 +907,7 @@ void EnSt_BounceAround(EnSt* this, GlobalContext* globalCtx) { this->actor.gravity = -2.0f; EnSt_SetupAction(this, EnSt_FinishBouncing); } else { - Math_SmoothScaleMaxMinF(&this->actor.shape.unk_08, 400.0f, 0.4f, 10000.0f, 0.0f); + Math_SmoothStepToF(&this->actor.shape.unk_08, 400.0f, 0.4f, 10000.0f, 0.0f); } } @@ -929,9 +929,9 @@ void EnSt_FinishBouncing(EnSt* this, GlobalContext* globalCtx) { this->setTargetYawTimer = 8; } - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.x, 0x3FFC, 4, 0x2710, 1); - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.z, 0, 4, 0x2710, 1); - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->deathYawTarget, 0xA, 0x2710, 1); + Math_SmoothStepToS(&this->actor.posRot.rot.x, 0x3FFC, 4, 0x2710, 1); + Math_SmoothStepToS(&this->actor.posRot.rot.z, 0, 4, 0x2710, 1); + Math_SmoothStepToS(&this->actor.posRot.rot.y, this->deathYawTarget, 0xA, 0x2710, 1); this->actor.shape.rot = this->actor.posRot.rot; diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.c b/src/overlays/actors/ovl_En_Stream/z_en_stream.c index 01718b319e..52f3af44b5 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -94,16 +94,16 @@ void EnStream_SuckPlayer(EnStream* this, GlobalContext* globalCtx) { if (func_80B0B81C(&this->actor.posRot.pos, &player->actor.posRot.pos, &posDifference, this->actor.scale.y) != 0) { xzDist = sqrtf(SQ(posDifference.x) + SQ(posDifference.z)); yDistWithOffset = player->actor.posRot.pos.y - (this->actor.posRot.pos.y - 90.0f); - player->windDirection = Math_atan2f(-posDifference.x, -posDifference.z) * 10430.378f; + player->windDirection = Math_FAtan2F(-posDifference.x, -posDifference.z) * 10430.378f; if (xzDist > 3.0f) { - Math_SmoothScaleMaxMinF(&player->windSpeed, 3.0f, 0.5f, xzDist, 0.0f); + Math_SmoothStepToF(&player->windSpeed, 3.0f, 0.5f, xzDist, 0.0f); } else { player->windSpeed = 0.0f; - Math_SmoothScaleMaxMinF(&player->actor.posRot.pos.x, this->actor.posRot.pos.x, 0.5f, 3.0f, 0.0f); - Math_SmoothScaleMaxMinF(&player->actor.posRot.pos.z, this->actor.posRot.pos.z, 0.5f, 3.0f, 0.0f); + Math_SmoothStepToF(&player->actor.posRot.pos.x, this->actor.posRot.pos.x, 0.5f, 3.0f, 0.0f); + Math_SmoothStepToF(&player->actor.posRot.pos.z, this->actor.posRot.pos.z, 0.5f, 3.0f, 0.0f); } if (yDistWithOffset > 0.0f) { - Math_SmoothScaleMaxMinF(&player->actor.velocity.y, -3.0f, 0.7f, yDistWithOffset, 0.0f); + Math_SmoothStepToF(&player->actor.velocity.y, -3.0f, 0.7f, yDistWithOffset, 0.0f); if (posDifference.y < -70.0f) { player->stateFlags2 |= 0x80000000; } diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c index 3afff764f9..a4895c1b06 100644 --- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c +++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c @@ -141,9 +141,9 @@ void EnSyatekiItm_StartRound(EnSyatekiItm* this, GlobalContext* globalCtx) { this->actionFunc = EnSyatekiItm_CleanupGame; return; } - i = Math_Rand_ZeroFloat(5.99f); + i = Rand_ZeroFloat(5.99f); while (this->roundFlags[i]) { - i = Math_Rand_ZeroFloat(5.99f); + i = Rand_ZeroFloat(5.99f); if (1) {} } this->roundNum = i + 1; diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index 9485e464e2..f0fbaa69dc 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -371,7 +371,7 @@ void EnSyatekiMan_Blink(EnSyatekiMan* this) { if (nextEyeState >= 3) { this->eyeState = 0; - this->blinkTimer = 20 + (s32)(Math_Rand_ZeroOne() * 60.0f); + this->blinkTimer = 20 + (s32)(Rand_ZeroOne() * 60.0f); this->blinkFunc = EnSyatekiMan_BlinkWait; } else { this->eyeState = nextEyeState; diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index ca62c72e52..6f57d0e8f0 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -109,7 +109,7 @@ void func_80B11A94(EnSyatekiNiw* this, GlobalContext* globalCtx, s16 arg2) { if (!(this->unk_28E & 1)) { this->unk_264 = 0.0f; if (arg2 == 0) { - this->unk_254 = Math_Rand_ZeroFloat(30.0f); + this->unk_254 = Rand_ZeroFloat(30.0f); } } } @@ -171,31 +171,31 @@ void func_80B11A94(EnSyatekiNiw* this, GlobalContext* globalCtx, s16 arg2) { } if (this->unk_264 != this->unk_2BC.x) { - Math_SmoothScaleMaxF(&this->unk_2BC.x, this->unk_264, 0.5f, 4000.0f); + Math_ApproachF(&this->unk_2BC.x, this->unk_264, 0.5f, 4000.0f); } if (this->unk_26C != this->unk_2A4.x) { - Math_SmoothScaleMaxF(&this->unk_2A4.x, this->unk_26C, 0.8f, 7000.0f); + Math_ApproachF(&this->unk_2A4.x, this->unk_26C, 0.8f, 7000.0f); } if (this->unk_280 != this->unk_2A4.y) { - Math_SmoothScaleMaxF(&this->unk_2A4.y, this->unk_280, 0.8f, 7000.0f); + Math_ApproachF(&this->unk_2A4.y, this->unk_280, 0.8f, 7000.0f); } if (this->unk_284 != this->unk_2A4.z) { - Math_SmoothScaleMaxF(&this->unk_2A4.z, this->unk_284, 0.8f, 7000.0f); + Math_ApproachF(&this->unk_2A4.z, this->unk_284, 0.8f, 7000.0f); } if (this->unk_268 != this->unk_2B0.x) { - Math_SmoothScaleMaxF(&this->unk_2B0.x, this->unk_268, 0.8f, 7000.0f); + Math_ApproachF(&this->unk_2B0.x, this->unk_268, 0.8f, 7000.0f); } if (this->unk_278 != this->unk_2B0.y) { - Math_SmoothScaleMaxF(&this->unk_2B0.y, this->unk_278, 0.8f, 7000.0f); + Math_ApproachF(&this->unk_2B0.y, this->unk_278, 0.8f, 7000.0f); } if (this->unk_27C != this->unk_2B0.z) { - Math_SmoothScaleMaxF(&this->unk_2B0.z, this->unk_27C, 0.8f, 7000.0f); + Math_ApproachF(&this->unk_2B0.z, this->unk_27C, 0.8f, 7000.0f); } } @@ -230,19 +230,19 @@ void func_80B11E78(EnSyatekiNiw* this, GlobalContext* globalCtx) { if ((this->unk_25E == 0) && (this->unk_25C == 0)) { this->unk_294++; if (this->unk_294 >= 8) { - this->unk_25E = Math_Rand_ZeroFloat(30.0f); - this->unk_294 = Math_Rand_ZeroFloat(3.99f); + this->unk_25E = Rand_ZeroFloat(30.0f); + this->unk_294 = Rand_ZeroFloat(3.99f); switch (this->unk_29E) { case 0: - sp50 = Math_Rand_CenteredFloat(100.0f); + sp50 = Rand_CenteredFloat(100.0f); if (sp50 < 0.0f) { sp50 -= 100.0f; } else { sp50 += 100.0f; } - sp4C = Math_Rand_CenteredFloat(100.0f); + sp4C = Rand_CenteredFloat(100.0f); if (sp4C < 0.0f) { sp4C -= 100.0f; } else { @@ -270,14 +270,14 @@ void func_80B11E78(EnSyatekiNiw* this, GlobalContext* globalCtx) { break; case 1: - sp50 = Math_Rand_CenteredFloat(50.0f); + sp50 = Rand_CenteredFloat(50.0f); if (sp50 < 0.0f) { sp50 -= 50.0f; } else { sp50 += 50.0f; } - sp4C = Math_Rand_CenteredFloat(30.0f); + sp4C = Rand_CenteredFloat(30.0f); if (sp4C < 0.0f) { sp4C -= 30.0f; } else { @@ -292,7 +292,7 @@ void func_80B11E78(EnSyatekiNiw* this, GlobalContext* globalCtx) { this->unk_25C = 4; if (this->actor.bgCheckFlags & 1) { this->actor.velocity.y = 2.5f; - if ((Math_Rand_ZeroFloat(10.0f) < 1.0f) && (this->unk_29E == 0)) { + if ((Rand_ZeroFloat(10.0f) < 1.0f) && (this->unk_29E == 0)) { this->unk_25C = 0xC; this->actor.velocity.y = 10.0f; } @@ -301,9 +301,9 @@ void func_80B11E78(EnSyatekiNiw* this, GlobalContext* globalCtx) { } if (this->unk_25C != 0) { sp4A = 1; - Math_SmoothScaleMaxF(&this->actor.posRot.pos.x, this->unk_2E8.x, 1.0f, this->unk_2C8.y); - Math_SmoothScaleMaxF(&this->actor.posRot.pos.z, this->unk_2E8.z, 1.0f, this->unk_2C8.y); - Math_SmoothScaleMaxF(&this->unk_2C8.y, 3.0f, 1.0f, 0.3f); + Math_ApproachF(&this->actor.posRot.pos.x, this->unk_2E8.x, 1.0f, this->unk_2C8.y); + Math_ApproachF(&this->actor.posRot.pos.z, this->unk_2E8.z, 1.0f, this->unk_2C8.y); + Math_ApproachF(&this->unk_2C8.y, 3.0f, 1.0f, 0.3f); tmpf1 = this->unk_2E8.x - this->actor.posRot.pos.x; tmpf2 = this->unk_2E8.z - this->actor.posRot.pos.z; @@ -320,9 +320,9 @@ void func_80B11E78(EnSyatekiNiw* this, GlobalContext* globalCtx) { this->unk_294 = 7; } - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, Math_atan2f(tmpf1, tmpf2) * 10430.378f, 3, this->unk_2C8.z, + Math_SmoothStepToS(&this->actor.posRot.rot.y, Math_FAtan2F(tmpf1, tmpf2) * 10430.378f, 3, this->unk_2C8.z, 0); - Math_SmoothScaleMaxF(&this->unk_2C8.z, 10000.0f, 1.0f, 1000.0f); + Math_ApproachF(&this->unk_2C8.z, 10000.0f, 1.0f, 1000.0f); } if (this->unk_260 == 0) { @@ -331,7 +331,7 @@ void func_80B11E78(EnSyatekiNiw* this, GlobalContext* globalCtx) { } if ((globalCtx->gameplayFrames % 4) == 0) { - dustVelocity.y = Math_Rand_CenteredFloat(5.0f); + dustVelocity.y = Rand_CenteredFloat(5.0f); dustAccel.y = 0.2f; dustPos = this->actor.posRot.pos; func_8002836C(globalCtx, &dustPos, &dustVelocity, &dustAccel, &dustPrimColor, &dustEnvColor, 600, 40, 30); @@ -465,13 +465,13 @@ void func_80B12460(EnSyatekiNiw* this, GlobalContext* globalCtx) { break; } - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, - (s16)(Math_atan2f(player->actor.posRot.pos.x - this->actor.posRot.pos.x, + Math_SmoothStepToS(&this->actor.posRot.rot.y, + (s16)(Math_FAtan2F(player->actor.posRot.pos.x - this->actor.posRot.pos.x, player->actor.posRot.pos.z - this->actor.posRot.pos.z) * 10430.378f) + phi_f16, 5, this->unk_2C8.y, 0); - Math_SmoothScaleMaxF(&this->unk_2C8.y, 3000.0f, 1.0f, 500.0f); + Math_ApproachF(&this->unk_2C8.y, 3000.0f, 1.0f, 500.0f); if (this->unk_296 == 2) { this->unk_256 = 10; this->unk_254 = this->unk_256; @@ -495,8 +495,8 @@ void func_80B128F8(EnSyatekiNiw* this, GlobalContext* globalCtx) { if ((this->actor.projectedPos.z > 200.0f) && (this->actor.projectedPos.z < 800.0f) && (sp26 > 0) && (sp26 < SCREEN_WIDTH) && (sp24 > 0) && (sp24 < SCREEN_HEIGHT)) { this->actor.speedXZ = 5.0f; - this->unk_298 = Math_Rand_ZeroFloat(1.99f); - this->unk_2D8 = Math_Rand_CenteredFloat(8000.0f) + -10000.0f; + this->unk_298 = Rand_ZeroFloat(1.99f); + this->unk_2D8 = Rand_CenteredFloat(8000.0f) + -10000.0f; this->unk_262 = 0x1E; this->unk_25E = 0x64; this->actionFunc = func_80B129EC; @@ -522,16 +522,16 @@ void func_80B129EC(EnSyatekiNiw* this, GlobalContext* globalCtx) { if (this->unk_25C == 0) { this->unk_298++; this->unk_298 &= 1; - this->unk_25C = (s16)Math_Rand_CenteredFloat(4.0f) + 5; - if ((Math_Rand_ZeroFloat(5.0f) < 1.0f) && (this->actor.bgCheckFlags & 1)) { + this->unk_25C = (s16)Rand_CenteredFloat(4.0f) + 5; + if ((Rand_ZeroFloat(5.0f) < 1.0f) && (this->actor.bgCheckFlags & 1)) { this->actor.velocity.y = 4.0f; } } phi_f2 = (this->unk_298 == 0) ? 5000.0f : -5000.0f; tmpf2 = this->unk_2D8 + phi_f2; - Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, tmpf2, 3, this->unk_2C8.y, 0); - Math_SmoothScaleMaxF(&this->unk_2C8.y, 3000.0f, 1.0f, 500.0f); + Math_SmoothStepToS(&this->actor.posRot.rot.y, tmpf2, 3, this->unk_2C8.y, 0); + Math_ApproachF(&this->unk_2C8.y, 3000.0f, 1.0f, 500.0f); func_80B11A94(this, globalCtx, 2); } @@ -615,15 +615,15 @@ void EnSyatekiNiw_Update(Actor* thisx, GlobalContext* globalCtx) { if (this->unk_2A0 != 0) { for (i = 0; i < 20; i++) { - sp78.x = Math_Rand_CenteredFloat(10.0f) + this->actor.posRot.pos.x; - sp78.y = Math_Rand_CenteredFloat(10.0f) + (this->actor.posRot.pos.y + 20.0f); - sp78.z = Math_Rand_CenteredFloat(10.0f) + this->actor.posRot.pos.z; - sp6C.x = Math_Rand_CenteredFloat(3.0f); - sp6C.y = (Math_Rand_ZeroFloat(2.0f) * 0.5f) + 2.0f; - sp6C.z = Math_Rand_CenteredFloat(3.0f); + sp78.x = Rand_CenteredFloat(10.0f) + this->actor.posRot.pos.x; + sp78.y = Rand_CenteredFloat(10.0f) + (this->actor.posRot.pos.y + 20.0f); + sp78.z = Rand_CenteredFloat(10.0f) + this->actor.posRot.pos.z; + sp6C.x = Rand_CenteredFloat(3.0f); + sp6C.y = (Rand_ZeroFloat(2.0f) * 0.5f) + 2.0f; + sp6C.z = Rand_CenteredFloat(3.0f); sp60.z = sp60.x = 0.0f; sp60.y = -0.15f; - func_80B131B8(this, &sp78, &sp6C, &sp60, Math_Rand_ZeroFloat(8.0f) + 8.0f); + func_80B131B8(this, &sp78, &sp6C, &sp60, Rand_ZeroFloat(8.0f) + 8.0f); } this->unk_2A0 = 0; @@ -713,8 +713,8 @@ void func_80B131B8(EnSyatekiNiw* this, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3, f3 ptr->unk_1C = *arg3; ptr->unk_34 = 0; ptr->unk_2C = (arg4 / 1000.0f); - ptr->unk_28 = (s16)Math_Rand_ZeroFloat(20.0f) + 0x28; - ptr->unk_2A = Math_Rand_ZeroFloat(1000.0f); + ptr->unk_28 = (s16)Rand_ZeroFloat(20.0f) + 0x28; + ptr->unk_2A = Rand_ZeroFloat(1000.0f); return; } } @@ -735,13 +735,13 @@ void func_80B132A8(EnSyatekiNiw* this, GlobalContext* globalCtx) { ptr->unk_10.z += ptr->unk_1C.z; if (ptr->unk_00 == 1) { ptr->unk_2A++; - Math_SmoothScaleMaxF(&ptr->unk_10.x, 0.0f, 1.0f, 0.05f); - Math_SmoothScaleMaxF(&ptr->unk_10.z, 0.0f, 1.0f, 0.05f); + Math_ApproachF(&ptr->unk_10.x, 0.0f, 1.0f, 0.05f); + Math_ApproachF(&ptr->unk_10.z, 0.0f, 1.0f, 0.05f); if (ptr->unk_10.y < -0.5f) { ptr->unk_10.y = 0.5f; } - ptr->unk_30 = (Math_Sins(ptr->unk_2A * 3000) * M_PI) * 0.2f; + ptr->unk_30 = (Math_SinS(ptr->unk_2A * 3000) * M_PI) * 0.2f; if (ptr->unk_28 < ptr->unk_34) { ptr->unk_00 = 0; } diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index 725a25ca2f..669a807fa0 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -766,13 +766,13 @@ void func_80B1585C(EnTa* this, GlobalContext* globalCtx) { if (this->unk_2CC > 35) { for (i = 1; i < ARRAY_COUNT(this->unk_2B8); i++) { if (this->unk_2B8[i] != NULL) { - Math_SmoothScaleMaxMinS(&this->unk_2B8[i]->actor.posRot.rot.y, i * -10000 - 3000, 2, 0x800, 0x100); + Math_SmoothStepToS(&this->unk_2B8[i]->actor.posRot.rot.y, i * -10000 - 3000, 2, 0x800, 0x100); this->unk_2B8[i]->actor.shape.rot.y = this->unk_2B8[i]->actor.posRot.rot.y; } } } else if (this->unk_2CC == 35) { for (i = 0; i < ARRAY_COUNT(this->unk_2B8); i++) { - this->unk_2C4[i] = (s32)(Math_Rand_CenteredFloat(6.0f) + 10.0f); + this->unk_2C4[i] = (s32)(Rand_CenteredFloat(6.0f) + 10.0f); if (this->unk_2B8[i] != NULL) { EnNiw* niw = this->unk_2B8[i]; @@ -1081,7 +1081,7 @@ void func_80B16700(EnTa* this) { this->unk_2CE--; temp2B6 = 1; } else { - temp2B6 = (s32)(Math_Rand_ZeroOne() * 60.0f) + 20; + temp2B6 = (s32)(Rand_ZeroOne() * 60.0f) + 20; } this->unk_2B6 = temp2B6; this->unk_2B0 = func_80B166CC; @@ -1112,7 +1112,7 @@ void func_80B16854(EnTa* this) { } else { if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, this->unk_2E4); - this->unk_2E2 = Math_Rand_ZeroFloat(100.0f) + 100.0f; + this->unk_2E2 = Rand_ZeroFloat(100.0f) + 100.0f; } if (this->skelAnime.animCurrentFrame < 96.0f && this->skelAnime.animCurrentFrame >= 53.0f) { @@ -1152,10 +1152,10 @@ void EnTa_Update(Actor* thisx, GlobalContext* globalCtx) { if (this->unk_2E0 & 1) { func_80038290(globalCtx, &this->actor, &this->unk_2D4, &this->unk_2DA, this->actor.posRot2.pos); } else { - Math_SmoothScaleMaxMinS(&this->unk_2D4.x, 0, 6, 6200, 100); - Math_SmoothScaleMaxMinS(&this->unk_2D4.y, 0, 6, 6200, 100); - Math_SmoothScaleMaxMinS(&this->unk_2DA.x, 0, 6, 6200, 100); - Math_SmoothScaleMaxMinS(&this->unk_2DA.y, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->unk_2D4.x, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->unk_2D4.y, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->unk_2DA.x, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->unk_2DA.y, 0, 6, 6200, 100); } this->unk_2E0 &= ~0x5; @@ -1183,8 +1183,8 @@ s32 EnTa_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, this->unk_2E0 &= ~0x8; } else if ((limbIndex == 8) || (limbIndex == 10) || (limbIndex == 13)) { s32 limbIdx50 = limbIndex * 50; - rot->y += Math_Sins(globalCtx->state.frames * (limbIdx50 + 0x814)) * 200.0f; - rot->z += Math_Coss(globalCtx->state.frames * (limbIdx50 + 0x940)) * 200.0f; + rot->y += Math_SinS(globalCtx->state.frames * (limbIdx50 + 0x814)) * 200.0f; + rot->z += Math_CosS(globalCtx->state.frames * (limbIdx50 + 0x940)) * 200.0f; } return 0; diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c index 0fdb4434f1..ceb78dda08 100644 --- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c +++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c @@ -194,7 +194,7 @@ void EnTakaraMan_Update(Actor* thisx, GlobalContext* globalCtx) { this->eyeTextureIdx++; if (this->eyeTextureIdx >= 2) { this->eyeTextureIdx = 0; - this->eyeTimer = (s16)Math_Rand_ZeroFloat(60.0f) + 20; + this->eyeTimer = (s16)Rand_ZeroFloat(60.0f) + 20; } } this->unk_212++; diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 7fbe600bee..3bc62f20b3 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -81,8 +81,8 @@ void EnTkEff_Update(EnTk* this) { if (eff->timeLeft == 0) { eff->active = 0; } - eff->accel.x = Math_Rand_ZeroOne() * 0.4f - 0.2f; - eff->accel.z = Math_Rand_ZeroOne() * 0.4f - 0.2f; + eff->accel.x = Rand_ZeroOne() * 0.4f - 0.2f; + eff->accel.z = Rand_ZeroOne() * 0.4f - 0.2f; eff->pos.x += eff->speed.x; eff->pos.y += eff->speed.y; eff->pos.z += eff->speed.z; @@ -123,13 +123,13 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) { gfxSetup = 1; } - alpha = eff->timeLeft * (255.f / eff->timeTotal); + alpha = eff->timeLeft * (255.0f / eff->timeTotal); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 170, 130, 90, alpha); gDPPipeSync(POLY_XLU_DISP++); Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW); func_800D1FD4(&globalCtx->mf_11DA0); - Matrix_Scale(eff->size, eff->size, 1.f, MTXMODE_APPLY); + Matrix_Scale(eff->size, eff->size, 1.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 140), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -145,10 +145,10 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) { } s32 EnTkEff_CreateDflt(EnTk* this, Vec3f* pos, u8 duration, f32 size, f32 growth, f32 yAccelMax) { - Vec3f speed = { 0.f, 0.f, 0.f }; - Vec3f accel = { 0.f, 0.3f, 0.f }; + Vec3f speed = { 0.0f, 0.0f, 0.0f }; + Vec3f accel = { 0.0f, 0.3f, 0.0f }; - accel.y += Math_Rand_ZeroOne() * yAccelMax; + accel.y += Rand_ZeroOne() * yAccelMax; EnTkEff_Create(this, pos, &speed, &accel, duration, size, growth); @@ -170,24 +170,24 @@ static CollisionCheckInfoInit2 sColChkInfoInit = { void EnTk_RestAnim(EnTk* this, GlobalContext* globalCtx) { AnimationHeader* anim = &D_06002F84; - SkelAnime_ChangeAnim(&this->skelAnim, anim, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06002F84), 0, -10.f); + SkelAnime_ChangeAnim(&this->skelAnim, anim, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_06002F84), 0, -10.0f); - this->actionCountdown = Math_Rand_S16Offset(60, 60); - this->actor.speedXZ = 0.f; + this->actionCountdown = Rand_S16Offset(60, 60); + this->actor.speedXZ = 0.0f; } void EnTk_WalkAnim(EnTk* this, GlobalContext* globalCtx) { AnimationHeader* anim = &D_06001FA8; - SkelAnime_ChangeAnim(&this->skelAnim, anim, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06002F84), 0, -10.f); + SkelAnime_ChangeAnim(&this->skelAnim, anim, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_06002F84), 0, -10.0f); - this->actionCountdown = Math_Rand_S16Offset(240, 240); + this->actionCountdown = Rand_S16Offset(240, 240); } void EnTk_DigAnim(EnTk* this, GlobalContext* globalCtx) { AnimationHeader* anim = &D_06001144; - SkelAnime_ChangeAnim(&this->skelAnim, anim, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06001144), 0, -10.f); + SkelAnime_ChangeAnim(&this->skelAnim, anim, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_06001144), 0, -10.0f); if (EnTk_CheckNextSpot(this, globalCtx) >= 0) { this->validDigHere = 1; @@ -200,9 +200,9 @@ void EnTk_UpdateEyes(EnTk* this) { if (this->eyeTextureIdx > 2) { this->blinkCycles--; if (this->blinkCycles < 0) { - this->blinkCountdown = Math_Rand_S16Offset(30, 30); + this->blinkCountdown = Rand_S16Offset(30, 30); this->blinkCycles = 2; - if (Math_Rand_ZeroOne() > 0.5f) { + if (Rand_ZeroOne() > 0.5f) { this->blinkCycles++; } } @@ -215,7 +215,7 @@ s32 EnTk_CheckFacingPlayer(EnTk* this) { s16 v0; s16 v1; - if (this->actor.xyzDistFromLinkSq > 10000.f) { + if (this->actor.xyzDistFromLinkSq > 10000.0f) { return 0; } @@ -251,7 +251,7 @@ s32 EnTk_CheckNextSpot(EnTk* this, GlobalContext* globalCtx) { dy = prop->posRot.pos.y - this->actor.groundY; dxz = func_8002DB8C(&this->actor, prop); - if (dxz > 40.f || dy > 10.f) { + if (dxz > 40.0f || dy > 10.0f) { prop = prop->next; continue; } @@ -270,36 +270,36 @@ void EnTk_CheckCurrentSpot(EnTk* this) { if (this->currentSpot != NULL) { dy = this->currentSpot->posRot.pos.y - this->actor.groundY; dxz = func_8002DB8C(&this->actor, this->currentSpot); - if (dxz > 40.f || dy > 10.f) { + if (dxz > 40.0f || dy > 10.0f) { this->currentSpot = NULL; } } } f32 EnTk_Step(EnTk* this, GlobalContext* globalCtx) { - f32 stepFrames[] = { 36.f, 10.f }; + f32 stepFrames[] = { 36.0f, 10.0f }; f32 a1_; s32 i; - if (this->skelAnim.animCurrentFrame == 0.f || this->skelAnim.animCurrentFrame == 25.f) { + if (this->skelAnim.animCurrentFrame == 0.0f || this->skelAnim.animCurrentFrame == 25.0f) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_MORIBLIN_WALK); } if (this->skelAnim.animation != &D_06001FA8) { - return 0.f; + return 0.0f; } a1_ = this->skelAnim.animCurrentFrame; for (i = 0; i < ARRAY_COUNT(stepFrames); i++) { - if (a1_ < stepFrames[i] + 12.f && a1_ >= stepFrames[i]) { + if (a1_ < stepFrames[i] + 12.0f && a1_ >= stepFrames[i]) { break; } } if (i >= ARRAY_COUNT(stepFrames)) { - return 0.f; + return 0.0f; } else { - a1_ = (0x8000 / 12.f) * (a1_ - stepFrames[i]); - return Math_Sins(a1_) * 2.f; + a1_ = (0x8000 / 12.0f) * (a1_ - stepFrames[i]); + return Math_SinS(a1_) * 2.0f; } } @@ -320,10 +320,10 @@ s32 EnTk_Orient(EnTk* this, GlobalContext* globalCtx) { dx = point->x - this->actor.posRot.pos.x; dz = point->z - this->actor.posRot.pos.z; - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, Math_atan2f(dx, dz) * (0x8000 / M_PI), 10, 1000, 1); + Math_SmoothStepToS(&this->actor.shape.rot.y, Math_FAtan2F(dx, dz) * (0x8000 / M_PI), 10, 1000, 1); this->actor.posRot.rot = this->actor.shape.rot; - if (SQ(dx) + SQ(dz) < 10.f) { + if (SQ(dx) + SQ(dz) < 10.0f) { this->currentWaypoint++; if (this->currentWaypoint >= path->count) { this->currentWaypoint = 0; @@ -406,7 +406,7 @@ s32 EnTk_ChooseReward(EnTk* this) { f32 luck; s32 reward; - luck = Math_Rand_ZeroOne(); + luck = Rand_ZeroOne(); if (luck < 0.4f) { reward = 0; @@ -469,15 +469,15 @@ s32 EnTk_ChooseReward(EnTk* this) { } void EnTk_DigEff(EnTk* this) { - Vec3f pos = { 0.f, 0.f, 0.f }; - Vec3f speed = { 0.f, 0.f, 0.f }; - Vec3f accel = { 0.f, 0.3f, 0.f }; + Vec3f pos = { 0.0f, 0.0f, 0.0f }; + Vec3f speed = { 0.0f, 0.0f, 0.0f }; + Vec3f accel = { 0.0f, 0.3f, 0.0f }; - if (this->skelAnim.animCurrentFrame >= 32.f && this->skelAnim.animCurrentFrame < 40.f) { - pos.x = (Math_Rand_ZeroOne() - 0.5f) * 12.f + this->v3f_304.x; - pos.y = (Math_Rand_ZeroOne() - 0.5f) * 8.f + this->v3f_304.y; - pos.z = (Math_Rand_ZeroOne() - 0.5f) * 12.f + this->v3f_304.z; - EnTkEff_CreateDflt(this, &pos, 12, 0.2f, 0.1f, 0.f); + if (this->skelAnim.animCurrentFrame >= 32.0f && this->skelAnim.animCurrentFrame < 40.0f) { + pos.x = (Rand_ZeroOne() - 0.5f) * 12.0f + this->v3f_304.x; + pos.y = (Rand_ZeroOne() - 0.5f) * 8.0f + this->v3f_304.y; + pos.z = (Rand_ZeroOne() - 0.5f) * 12.0f + this->v3f_304.z; + EnTkEff_CreateDflt(this, &pos, 12, 0.2f, 0.1f, 0.0f); } } @@ -485,10 +485,10 @@ void EnTk_Init(Actor* thisx, GlobalContext* globalCtx) { EnTk* this = THIS; s32 pad; - ActorShape_Init(&this->actor.shape, 0, ActorShadow_DrawFunc_Circle, 24.f); + ActorShape_Init(&this->actor.shape, 0, ActorShadow_DrawFunc_Circle, 24.0f); SkelAnime_InitFlex(globalCtx, &this->skelAnim, &D_0600BE40, NULL, this->hz_22A, this->hz_296, 18); - SkelAnime_ChangeAnim(&this->skelAnim, &D_06002F84, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06002F84), 0, 0.f); + SkelAnime_ChangeAnim(&this->skelAnim, &D_06002F84, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_06002F84), 0, 0.0f); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); @@ -532,7 +532,7 @@ void EnTk_Rest(EnTk* this, GlobalContext* globalCtx) { return; } - func_800343CC(globalCtx, &this->actor, &this->h_1E0, this->collider.dim.radius + 30.f, func_80B1C54C, + func_800343CC(globalCtx, &this->actor, &this->h_1E0, this->collider.dim.radius + 30.0f, func_80B1C54C, func_80B1C5A0); } else if (EnTk_CheckFacingPlayer(this) != 0) { v1 = this->actor.shape.rot.y; @@ -540,7 +540,7 @@ void EnTk_Rest(EnTk* this, GlobalContext* globalCtx) { v1 = this->actor.yawTowardsLink - v1; this->actionCountdown = 0; - func_800343CC(globalCtx, &this->actor, &this->h_1E0, this->collider.dim.radius + 30.f, func_80B1C54C, + func_800343CC(globalCtx, &this->actor, &this->h_1E0, this->collider.dim.radius + 30.0f, func_80B1C54C, func_80B1C5A0); } else if (func_8002F194(&this->actor, globalCtx) != 0) { v1 = this->actor.shape.rot.y; @@ -559,7 +559,7 @@ void EnTk_Rest(EnTk* this, GlobalContext* globalCtx) { } a1_ = CLAMP(-v1, 1270, 10730); - Math_SmoothScaleMaxMinS(&this->headRot, a1_, 6, 1000, 1); + Math_SmoothStepToS(&this->headRot, a1_, 6, 1000, 1); } void EnTk_Walk(EnTk* this, GlobalContext* globalCtx) { @@ -570,7 +570,7 @@ void EnTk_Walk(EnTk* this, GlobalContext* globalCtx) { } else { this->actor.speedXZ = EnTk_Step(this, globalCtx); EnTk_Orient(this, globalCtx); - Math_SmoothScaleMaxMinS(&this->headRot, 0, 6, 1000, 1); + Math_SmoothStepToS(&this->headRot, 0, 6, 1000, 1); EnTk_CheckCurrentSpot(this); DECR(this->actionCountdown); @@ -594,16 +594,16 @@ void EnTk_Dig(EnTk* this, GlobalContext* globalCtx) { EnTk_DigEff(this); - if (this->skelAnim.animCurrentFrame == 32.f) { + if (this->skelAnim.animCurrentFrame == 32.0f) { /* What's gonna come out? */ Audio_PlayActorSound2(&this->actor, NA_SE_EV_DIG_UP); this->rewardTimer = 0; if (this->validDigHere == 1) { - rewardOrigin.x = 0.f; - rewardOrigin.y = 0.f; - rewardOrigin.z = -40.f; + rewardOrigin.x = 0.0f; + rewardOrigin.y = 0.0f; + rewardOrigin.z = -40.0f; Matrix_RotateY(this->actor.shape.rot.y, MTXMODE_NEW); Matrix_MultVec3f(&rewardOrigin, &rewardPos); @@ -628,7 +628,7 @@ void EnTk_Dig(EnTk* this, GlobalContext* globalCtx) { } } - if (this->skelAnim.animCurrentFrame >= 32.f && this->rewardTimer == 10) { + if (this->skelAnim.animCurrentFrame >= 32.0f && this->rewardTimer == 10) { /* Play a reward sound shortly after digging */ if (this->validDigHere == 0) { /* Bad dig spot */ @@ -670,7 +670,7 @@ void EnTk_Update(Actor* thisx, GlobalContext* globalCtx) { Actor_MoveForward(&this->actor); - func_8002E4B4(globalCtx, &this->actor, 40.f, 10.f, 0.f, 5); + func_8002E4B4(globalCtx, &this->actor, 40.0f, 10.0f, 0.0f, 5); this->actionFunc(this, globalCtx); @@ -707,8 +707,8 @@ s32 EnTk_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, void EnTk_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { EnTk* this = THIS; - Vec3f sp28 = { 0.f, 0.f, 4600.f }; - Vec3f sp1C = { 0.f, 0.f, 0.f }; + Vec3f sp28 = { 0.0f, 0.0f, 4600.0f }; + Vec3f sp1C = { 0.0f, 0.0f, 0.0f }; /* Limb 16 - Jaw */ if (limbIndex == 16) { diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index a189c8cec1..db31058340 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -81,21 +81,21 @@ void EnTuboTrap_SpawnEffectsOnLand(EnTuboTrap* this, GlobalContext* globalCtx) { Vec3f* actorPos = &this->actor.posRot.pos; for (i = 0, var = 0; i < 15; i++, var += 20000) { - sin = Math_Sins(var); - cos = Math_Coss(var); + sin = Math_SinS(var); + cos = Math_CosS(var); pos.x = sin * 8.0f; - pos.y = (Math_Rand_ZeroOne() * 5.0f) + 2.0f; + pos.y = (Rand_ZeroOne() * 5.0f) + 2.0f; pos.z = cos * 8.0f; velocity.x = pos.x * 0.23f; - velocity.y = (Math_Rand_ZeroOne() * 5.0f) + 2.0f; + velocity.y = (Rand_ZeroOne() * 5.0f) + 2.0f; velocity.z = pos.z * 0.23f; pos.x += actorPos->x; pos.y += actorPos->y; pos.z += actorPos->z; - rand = Math_Rand_ZeroOne(); + rand = Rand_ZeroOne(); if (rand < 0.2f) { arg5 = 96; } else if (rand < 0.6f) { @@ -105,7 +105,7 @@ void EnTuboTrap_SpawnEffectsOnLand(EnTuboTrap* this, GlobalContext* globalCtx) { } EffectSsKakera_Spawn(globalCtx, &pos, &velocity, actorPos, -240, arg5, 10, 10, 0, - (Math_Rand_ZeroOne() * 65.0f) + 15.0f, 0, 32, 60, KAKERA_COLOR_NONE, + (Rand_ZeroOne() * 65.0f) + 15.0f, 0, 32, 60, KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_DANGEON_KEEP, D_05017A60); } @@ -129,21 +129,21 @@ void EnTuboTrap_SpawnEffectsInWater(EnTuboTrap* this, GlobalContext* globalCtx) EffectSsGSplash_Spawn(globalCtx, &pos, 0, 0, 0, 400); for (i = 0, var = 0; i < 15; i++, var += 20000) { - sin = Math_Sins(var); - cos = Math_Coss(var); + sin = Math_SinS(var); + cos = Math_CosS(var); pos.x = sin * 8.0f; - pos.y = (Math_Rand_ZeroOne() * 5.0f) + 2.0f; + pos.y = (Rand_ZeroOne() * 5.0f) + 2.0f; pos.z = cos * 8.0f; velocity.x = pos.x * 0.20f; - velocity.y = (Math_Rand_ZeroOne() * 4.0f) + 2.0f; + velocity.y = (Rand_ZeroOne() * 4.0f) + 2.0f; velocity.z = pos.z * 0.20f; pos.x += actorPos->x; pos.y += actorPos->y; pos.z += actorPos->z; - rand = Math_Rand_ZeroOne(); + rand = Rand_ZeroOne(); if (rand < 0.2f) { arg5 = 64; } else { @@ -151,7 +151,7 @@ void EnTuboTrap_SpawnEffectsInWater(EnTuboTrap* this, GlobalContext* globalCtx) } EffectSsKakera_Spawn(globalCtx, &pos, &velocity, actorPos, -180, arg5, 30, 30, 0, - (Math_Rand_ZeroOne() * 65.0f) + 15.0f, 0, 32, 70, KAKERA_COLOR_NONE, + (Rand_ZeroOne() * 65.0f) + 15.0f, 0, 32, 70, KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_DANGEON_KEEP, D_05017A60); } } @@ -237,7 +237,7 @@ void EnTuboTrap_WaitForProximity(EnTuboTrap* this, GlobalContext* globalCtx) { void EnTuboTrap_Levitate(EnTuboTrap* this, GlobalContext* globalCtx) { this->actor.shape.rot.y += 5000; - Math_SmoothScaleMaxF(&this->actor.posRot.pos.y, this->targetY, 0.8f, 3.0f); + Math_ApproachF(&this->actor.posRot.pos.y, this->targetY, 0.8f, 3.0f); if (fabsf(this->actor.posRot.pos.y - this->targetY) < 10.0f) { this->actor.speedXZ = 10.0f; @@ -254,7 +254,7 @@ void EnTuboTrap_Fly(EnTuboTrap* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_TUBOOCK_FLY - SFX_FLAG); if (240.0f < sqrtf(SQ(dx) + SQ(dy) + SQ(dz))) { - Math_SmoothScaleMaxF(&this->actor.gravity, -3.0f, 0.2f, 0.5f); + Math_ApproachF(&this->actor.gravity, -3.0f, 0.2f, 0.5f); } this->actor.shape.rot.y += 5000; diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c index 1ebe1c610d..4aaccf7bed 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -143,7 +143,7 @@ void EnVm_Wait(EnVm* this, GlobalContext* globalCtx) { switch (this->unk_25E) { case 0: - Math_SmoothScaleMaxMinS(&this->beamRot.x, 0, 10, 1500, 0); + Math_SmoothStepToS(&this->beamRot.x, 0, 10, 1500, 0); headRot = this->actor.yawTowardsLink - this->headRotY - this->actor.shape.rot.y; pitch = Math_Vec3f_Pitch(&this->beamPos1, &player->actor.posRot.pos); @@ -155,8 +155,8 @@ void EnVm_Wait(EnVm* this, GlobalContext* globalCtx) { if (this->actor.xzDistFromLink <= this->beamSightRange && ABS(headRot) <= 0x2710 && pitch >= 0xE38 && this->actor.yDistFromLink <= 80.0f && this->actor.yDistFromLink >= -160.0f) { - Math_SmoothScaleMaxMinS(&this->beamRot, pitch, 10, 0xFA0, 0); - if (Math_SmoothScaleMaxMinS(&this->headRotY, this->actor.yawTowardsLink - this->actor.shape.rot.y, 1, + Math_SmoothStepToS(&this->beamRot, pitch, 10, 0xFA0, 0); + if (Math_SmoothStepToS(&this->headRotY, this->actor.yawTowardsLink - this->actor.shape.rot.y, 1, (ABS((s16)(dist * 180.0f)) / 3) + 0xFA0, 0) <= 5460) { this->timer--; if (this->timer == 0) { @@ -179,7 +179,7 @@ void EnVm_Wait(EnVm* this, GlobalContext* globalCtx) { return; } - Math_SmoothScaleMaxMinS(&this->headRotY, this->actor.yawTowardsLink - this->actor.shape.rot.y, 1, 0x1F40, 0); + Math_SmoothStepToS(&this->headRotY, this->actor.yawTowardsLink - this->actor.shape.rot.y, 1, 0x1F40, 0); if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { this->unk_260++; @@ -238,7 +238,7 @@ void EnVm_Attack(EnVm* this, GlobalContext* globalCtx) { } if (this->beamRot.x < 0xAAA || this->timer == 0) { - Math_SmoothScaleMaxMinF(&this->beamScale, 0.0f, 1.0f, 0.03f, 0.0f); + Math_SmoothStepToF(&this->beamScale, 0.0f, 1.0f, 0.03f, 0.0f); this->unk_260 = 0; if (this->beamScale.x == 0.0f) { @@ -251,9 +251,9 @@ void EnVm_Attack(EnVm* this, GlobalContext* globalCtx) { return; } - Math_SmoothScaleMaxMinS(&this->headRotY, -this->actor.shape.rot.y + this->actor.yawTowardsLink, 10, 0xDAC, 0); - Math_SmoothScaleMaxMinS(&this->beamRot.y, this->actor.yawTowardsLink, 10, 0xDAC, 0); - Math_SmoothScaleMaxMinS(&this->beamRot, pitch, 10, 0xDAC, 0); + Math_SmoothStepToS(&this->headRotY, -this->actor.shape.rot.y + this->actor.yawTowardsLink, 10, 0xDAC, 0); + Math_SmoothStepToS(&this->beamRot.y, this->actor.yawTowardsLink, 10, 0xDAC, 0); + Math_SmoothStepToS(&this->beamRot, pitch, 10, 0xDAC, 0); playerPos = player->actor.posRot.pos; if (player->actor.groundY > -32000.0f) { @@ -261,8 +261,8 @@ void EnVm_Attack(EnVm* this, GlobalContext* globalCtx) { } dist = Math_Vec3f_DistXYZ(&this->beamPos1, &playerPos); - Math_SmoothScaleMaxMinF(&this->beamScale.z, dist, 1.0f, this->beamSpeed, 0.0f); - Math_SmoothScaleMaxMinF(&this->beamScale.x, 0.1f, 1.0f, 0.12f, 0.0f); + Math_SmoothStepToF(&this->beamScale.z, dist, 1.0f, this->beamSpeed, 0.0f); + Math_SmoothStepToF(&this->beamScale.x, 0.1f, 1.0f, 0.12f, 0.0f); Audio_PlayActorSound2(&this->actor, NA_SE_EN_BIMOS_LAZER - SFX_FLAG); if (this->unk_260 > 2) { @@ -305,7 +305,7 @@ void EnVm_Stun(EnVm* this, GlobalContext* globalCtx) { } } } else { - Math_SmoothScaleMaxMinS(&this->beamRot, 0, 10, 0x5DC, 0); + Math_SmoothStepToS(&this->beamRot, 0, 10, 0x5DC, 0); this->timer--; SkelAnime_FrameUpdateMatrix(&this->skelAnime); } @@ -322,8 +322,8 @@ void EnVm_SetupDie(EnVm* this) { this->actor.posRot.pos.y += 5000.0f * this->actor.scale.y; this->actor.velocity.y = 8.0f; this->actor.gravity = -0.5f; - this->actor.speedXZ = Math_Rand_ZeroOne() + 1.0f; - this->actor.posRot.rot.y = Math_Rand_CenteredFloat(65535.0f); + this->actor.speedXZ = Rand_ZeroOne() + 1.0f; + this->actor.posRot.rot.y = Rand_CenteredFloat(65535.0f); EnVm_SetupAction(this, EnVm_Die); } diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c index 32e1451f95..b8cdb50244 100644 --- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c +++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c @@ -114,8 +114,8 @@ void EnWallTubo_SetWallFall(EnWallTubo* this, GlobalContext* globalCtx) { Vec3f effPos; if ((globalCtx->gameplayFrames & 1) == 0) { - effPos.x = this->explosionCenter.x + Math_Rand_CenteredFloat(300.0f); - effPos.y = this->explosionCenter.y + Math_Rand_CenteredFloat(300.0f); + effPos.x = this->explosionCenter.x + Rand_CenteredFloat(300.0f); + effPos.y = this->explosionCenter.y + Rand_CenteredFloat(300.0f); effPos.z = this->explosionCenter.z; EffectSsBomb2_SpawnLayered(globalCtx, &effPos, &effVelocity, &effAccel, 100, 30); EffectSsHahen_SpawnBurst(globalCtx, &effPos, 10.0f, 0, 50, 15, 3, HAHEN_OBJECT_DEFAULT, 10, NULL); diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index a0d3e2e3d3..b5820d2448 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -312,7 +312,7 @@ void EnWallmas_Stand(EnWallmas* this, GlobalContext* globalCtx) { EnWallmas_SetupWalk(this); } - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink + 0x8000, 0xB6); + Math_ScaledStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink + 0x8000, 0xB6); } void EnWallmas_Walk(EnWallmas* this, GlobalContext* globalCtx) { @@ -320,7 +320,7 @@ void EnWallmas_Walk(EnWallmas* this, GlobalContext* globalCtx) { EnWallmas_SetupJumpToCeiling(this); } - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, (s16)((s32)this->actor.yawTowardsLink + 0x8000), 0xB6); + Math_ScaledStepToS(&this->actor.posRot.rot.y, (s16)((s32)this->actor.yawTowardsLink + 0x8000), 0xB6); if ((func_800A56C8(&this->skelAnime, 0.0f) != 0) || (func_800A56C8(&this->skelAnime, 12.0f) != 0) || (func_800A56C8(&this->skelAnime, 24.0f) != 0) || (func_800A56C8(&this->skelAnime, 36.0f) != 0)) { @@ -374,7 +374,7 @@ void EnWallmas_TakeDamage(EnWallmas* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_GND); } - Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.2f); + Math_StepToF(&this->actor.speedXZ, 0.0f, 0.2f); } void EnWallmas_Cooldown(EnWallmas* this, GlobalContext* globalCtx) { @@ -384,7 +384,7 @@ void EnWallmas_Cooldown(EnWallmas* this, GlobalContext* globalCtx) { } void EnWallmas_Die(EnWallmas* this, GlobalContext* globalCtx) { - if (Math_ApproxF(&this->actor.scale.x, 0.0f, 0.0015) != 0) { + if (Math_StepToF(&this->actor.scale.x, 0.0f, 0.0015) != 0) { Actor_SetScale(&this->actor, 0.01f); Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.posRot.pos, 0xC0); Actor_Kill(&this->actor); @@ -434,11 +434,11 @@ void EnWallmas_TakePlayer(EnWallmas* this, GlobalContext* globalCtx) { this->timer = this->timer + 2; } else { - Math_ApproxF(&this->actor.posRot.pos.y, player->actor.posRot.pos.y + (LINK_IS_CHILD ? 30.0f : 50.0f), 5.0f); + Math_StepToF(&this->actor.posRot.pos.y, player->actor.posRot.pos.y + (LINK_IS_CHILD ? 30.0f : 50.0f), 5.0f); } - Math_ApproxF(&this->actor.posRot.pos.x, player->actor.posRot.pos.x, 3.0f); - Math_ApproxF(&this->actor.posRot.pos.z, player->actor.posRot.pos.z, 3.0f); + Math_StepToF(&this->actor.posRot.pos.x, player->actor.posRot.pos.x, 3.0f); + Math_StepToF(&this->actor.posRot.pos.z, player->actor.posRot.pos.z, 3.0f); if (this->timer == 0x1E) { func_80078884(NA_SE_OC_ABYSS); diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c index ca408f8080..27e02cdee7 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c @@ -294,11 +294,11 @@ void func_80B31B24(EnWeatherTag* this, GlobalContext* globalCtx) { Player* player = PLAYER; if (func_8002DB8C(&player->actor, &this->actor) < ((this->actor.params >> 8) * 100.0f)) { - Math_SmoothScaleMaxMinS(&globalCtx->envCtx.unk_9E, -0x50, 1, 2, 1); - Math_SmoothScaleMaxMinS(&globalCtx->envCtx.unk_A0, -0x7D0, 1, 0x32, 1); + Math_SmoothStepToS(&globalCtx->envCtx.unk_9E, -0x50, 1, 2, 1); + Math_SmoothStepToS(&globalCtx->envCtx.unk_A0, -0x7D0, 1, 0x32, 1); } else { - Math_SmoothScaleMaxMinS(&globalCtx->envCtx.unk_9E, 0, 1, 1, 1); - Math_SmoothScaleMaxMinS(&globalCtx->envCtx.unk_A0, 0, 1, 0x19, 1); + Math_SmoothStepToS(&globalCtx->envCtx.unk_9E, 0, 1, 1, 1); + Math_SmoothStepToS(&globalCtx->envCtx.unk_A0, 0, 1, 0x19, 1); } } diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c index 51efd7d78a..cef368963f 100644 --- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c +++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c @@ -83,7 +83,7 @@ void func_80B43AD4(EnYukabyun* this, GlobalContext* globalCtx) { this->actor.speedXZ = 10.0f; this->actionfunc = func_80B43B6C; } - Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y + 30.0f, 1.0f); + Math_StepToF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y + 30.0f, 1.0f); func_8002F974(&this->actor, NA_SE_EN_YUKABYUN_FLY - SFX_FLAG); } diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index c7b66644c4..11a21dad11 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -119,7 +119,7 @@ void func_80B4AE18(EnZl1* this) { this->unk_1FC = 2; } else { if (DECR(this->unk_1FC) == 0) { - this->unk_1FC = Math_Rand_S16Offset(0x1E, 0xA); + this->unk_1FC = Rand_S16Offset(0x1E, 0xA); } this->unk_1FE = (this->unk_1FC < 4) ? this->unk_1FC : 0; @@ -555,9 +555,9 @@ void EnZl1_Update(Actor* thisx, GlobalContext* globalCtx) { Collider_CylinderUpdate(&this->actor, &this->collider); CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); } - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, this->actor.posRot.rot.x, 0xA, 0x3E8, 1); - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.posRot.rot.y, 0xA, 0x3E8, 1); - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.z, this->actor.posRot.rot.z, 0xA, 0x3E8, 1); + Math_SmoothStepToS(&this->actor.shape.rot.x, this->actor.posRot.rot.x, 0xA, 0x3E8, 1); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.posRot.rot.y, 0xA, 0x3E8, 1); + Math_SmoothStepToS(&this->actor.shape.rot.z, this->actor.posRot.rot.z, 0xA, 0x3E8, 1); func_80B4AE18(this); } diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index c9ede614e5..609348c797 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -143,7 +143,7 @@ void func_80B4E9B0(EnZl2* this) { s16* unk_190 = &this->unk_190; if (DECR(*unk_192) == 0) { - *unk_192 = Math_Rand_S16Offset(0x3C, 0x3C); + *unk_192 = Rand_S16Offset(0x3C, 0x3C); } *unk_190 = *unk_192; if (*unk_190 >= 3) { @@ -784,7 +784,7 @@ void func_80B50304(EnZl2* this, GlobalContext* globalCtx) { this->drawConfig = 1; this->unk_23C = 0.0f; actorShape->unk_14 = 0xFF; - this->actor.posRot.rot.y = actorShape->rot.y = Math_atan2f(actionXDelta, actionZDelta) * 10430.3779296875f; + this->actor.posRot.rot.y = actorShape->rot.y = Math_FAtan2F(actionXDelta, actionZDelta) * 10430.3779296875f; } void func_80B503DC(EnZl2* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index 126384756f..2fc2234254 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -135,7 +135,7 @@ void func_80B534CC(EnZl3* this) { s16* unk_246 = &this->unk_246; if (DECR(*unk_246) == 0) { - *unk_246 = Math_Rand_S16Offset(0x3C, 0x3C); + *unk_246 = Rand_S16Offset(0x3C, 0x3C); } *unk_244 = *unk_246; if (*unk_244 >= 3) { @@ -155,9 +155,9 @@ void func_80B5357C(EnZl3* this, GlobalContext* globalCtx) { Vec3f* thisPos = &this->actor.posRot.pos; Vec3f sp20; - sp20.x = thisPos->x + ((Math_Rand_ZeroOne() - 0.5f) * 10.0f); + sp20.x = thisPos->x + ((Rand_ZeroOne() - 0.5f) * 10.0f); sp20.y = thisPos->y; - sp20.z = thisPos->z + ((Math_Rand_ZeroOne() - 0.5f) * 10.0f); + sp20.z = thisPos->z + ((Rand_ZeroOne() - 0.5f) * 10.0f); Item_DropCollectible(globalCtx, &sp20, 3); } @@ -178,10 +178,10 @@ void func_80B536C4(EnZl3* this) { Vec3s* vec1 = &this->unk_3F8.unk_08; Vec3s* vec2 = &this->unk_3F8.unk_0E; - Math_SmoothScaleMaxMinS(&vec1->x, 0, 20, 6200, 100); - Math_SmoothScaleMaxMinS(&vec1->y, 0, 20, 6200, 100); - Math_SmoothScaleMaxMinS(&vec2->x, 0, 20, 6200, 100); - Math_SmoothScaleMaxMinS(&vec2->y, 0, 20, 6200, 100); + Math_SmoothStepToS(&vec1->x, 0, 20, 6200, 100); + Math_SmoothStepToS(&vec1->y, 0, 20, 6200, 100); + Math_SmoothStepToS(&vec2->x, 0, 20, 6200, 100); + Math_SmoothStepToS(&vec2->y, 0, 20, 6200, 100); } void func_80B53764(EnZl3* this, GlobalContext* globalCtx) { @@ -198,8 +198,8 @@ s32 func_80B537E8(EnZl3* this) { s16* unk_3D0 = &this->unk_3D0; s16 pad[3]; - Math_SmoothScaleMaxMinS(unk_3D0, ABS((s16)(yawTowardsLink - *rotY)), 5, 6200, 100); - Math_SmoothScaleMaxMinS(rotY, yawTowardsLink, 5, *unk_3D0, 100); + Math_SmoothStepToS(unk_3D0, ABS((s16)(yawTowardsLink - *rotY)), 5, 6200, 100); + Math_SmoothStepToS(rotY, yawTowardsLink, 5, *unk_3D0, 100); this->actor.shape.rot.y = *rotY; // no return statement despite being of type s32 // the function directly below needs this to not be void I guess @@ -1062,8 +1062,8 @@ void func_80B558A8(EnZl3* this) { this->unk_32C = thisPos; *unk_338 = thisPos; - unk_338->z += ((-1.6073999404907227f) * Math_Coss(thisRotY)) - (3.1620006561279297f * Math_Sins(thisRotY)); - unk_338->x += ((-1.6073999404907227f) * Math_Sins(thisRotY)) + (3.1620006561279297f * Math_Coss(thisRotY)); + unk_338->z += ((-1.6073999404907227f) * Math_CosS(thisRotY)) - (3.1620006561279297f * Math_SinS(thisRotY)); + unk_338->x += ((-1.6073999404907227f) * Math_SinS(thisRotY)) + (3.1620006561279297f * Math_CosS(thisRotY)); unk_338->y += -0.01219940185546875f; } @@ -1639,7 +1639,7 @@ s32 func_80B57034(EnZl3* this, s32 arg1, s32 arg2) { f32 xDiff = vec2->x - vec1->x; f32 zDiff = vec2->z - vec1->z; - return ((xDiff == 0.0f) && (zDiff == 0.0f)) ? 0 : (s16)(Math_atan2f(xDiff, zDiff) * 10430.3779296875f); + return ((xDiff == 0.0f) && (zDiff == 0.0f)) ? 0 : (s16)(Math_FAtan2F(xDiff, zDiff) * 10430.3779296875f); } return 0; } @@ -1652,7 +1652,7 @@ s16 func_80B57104(EnZl3* this, s32 arg1) { f32 zDiff = point->z - this->actor.posRot.pos.z; if ((xDiff != 0.0f) || (zDiff != 0.0f)) { - return Math_atan2f(xDiff, zDiff) * (0x8000 / M_PI); + return Math_FAtan2F(xDiff, zDiff) * (0x8000 / M_PI); } } return 0; @@ -1685,7 +1685,7 @@ void func_80B57240(EnZl3* this) { s32 temp_a1 = func_80B571FC(this); s16* rotY = &this->actor.posRot.rot.y; - Math_SmoothScaleMaxMinS(rotY, temp_a1, 2, 6400, 1000); + Math_SmoothStepToS(rotY, temp_a1, 2, 6400, 1000); this->actor.shape.rot.y = *rotY; } @@ -1693,7 +1693,7 @@ void func_80B57298(EnZl3* this) { s16* rotY = &this->actor.posRot.rot.y; s16 temp_a1 = func_80B571A8(this); - Math_SmoothScaleMaxMinS(rotY, temp_a1, 2, 6400, 1000); + Math_SmoothStepToS(rotY, temp_a1, 2, 6400, 1000); this->actor.shape.rot.y = *rotY; } @@ -1766,7 +1766,7 @@ s32 func_80B57458(EnZl3* this, GlobalContext* globalCtx) { return 1; } - temp_v0 = (s16)(temp_v1 - (s16)(Math_atan2f(temp_f12, temp_f13) * 10430.3779296875f)); + temp_v0 = (s16)(temp_v1 - (s16)(Math_FAtan2F(temp_f12, temp_f13) * 10430.3779296875f)); if (temp_v0 < 0x1555) { return 1; @@ -1853,7 +1853,7 @@ void func_80B577BC(GlobalContext* globalCtx, Vec3f* vec) { f32 posZ = vec->z; Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_TEST, posX, posY, posZ, 0, - (Math_atan2f(playerPos->x - posX, playerPos->z - posZ) * 10430.3779296875f), 0, 5); + (Math_FAtan2F(playerPos->x - posX, playerPos->z - posZ) * 10430.3779296875f), 0, 5); } void func_80B57858(GlobalContext* globalCtx) { @@ -1952,9 +1952,9 @@ void func_80B57AE0(EnZl3* this, GlobalContext* globalCtx) { unk_354->y = temp_v0->y; unk_354->z = temp_v0->z; } else { - unk_354->x = unk_348->x + (Math_Sins(shapeRotY) * 200.0f); + unk_354->x = unk_348->x + (Math_SinS(shapeRotY) * 200.0f); unk_354->y = unk_348->y; - unk_354->z = unk_348->z + (Math_Coss(shapeRotY) * 200.0f); + unk_354->z = unk_348->z + (Math_CosS(shapeRotY) * 200.0f); } xDiff = unk_354->x - unk_348->x; @@ -2005,8 +2005,8 @@ s32 func_80B57D80(EnZl3* this, GlobalContext* globalCtx) { s16 phi_v1; unk_3F8->unk_18.y = player->actor.posRot.pos.y; - unk_3F8->unk_18.x = (Math_Sins(temp_v0) * this->actor.xzDistFromLink) + this->actor.posRot.pos.x; - unk_3F8->unk_18.z = (Math_Coss(temp_v0) * this->actor.xzDistFromLink) + this->actor.posRot.pos.z; + unk_3F8->unk_18.x = (Math_SinS(temp_v0) * this->actor.xzDistFromLink) + this->actor.posRot.pos.x; + unk_3F8->unk_18.z = (Math_CosS(temp_v0) * this->actor.xzDistFromLink) + this->actor.posRot.pos.z; unk_3F8->unk_14 = kREG(16) - 16.0f; func_80034A14(&this->actor, unk_3F8, kREG(17) + 0xC, 4); diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index 3241f9e8a1..c6345a9b86 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -79,7 +79,7 @@ void EnZo_Bubble(EnZo* this, Vec3f* pos) { effect->pos = *pos; effect->vec = *pos; effect->vel = vel; - effect->scale = ((Math_Rand_ZeroOne() - 0.5f) * 0.02f) + 0.12f; + effect->scale = ((Rand_ZeroOne() - 0.5f) * 0.02f) + 0.12f; break; } } @@ -100,7 +100,7 @@ void EnZo_Splash(EnZo* this, Vec3f* pos, Vec3f* vel, f32 scale) { effect->pos = *pos; effect->vec = accel; effect->vel = *vel; - effect->color.a = (Math_Rand_ZeroOne() * 100.0f) + 100.0f; + effect->color.a = (Rand_ZeroOne() * 100.0f) + 100.0f; effect->scale = scale; break; } @@ -114,7 +114,7 @@ void EnZo_UpdateRipples(EnZo* this) { for (i = 0; i < ARRAY_COUNT(this->effects); i++) { if (effect->type == ENZO_EFFECT_RIPPLE) { - Math_SmoothScaleMaxF(&effect->scale, effect->targetScale, 0.2f, 0.8f); + Math_ApproachF(&effect->scale, effect->targetScale, 0.2f, 0.8f); if (effect->color.a > 20) { effect->color.a -= 20; } else { @@ -137,8 +137,8 @@ void EnZo_UpdateBubbles(EnZo* this) { effect = this->effects; for (i = 0; i < ARRAY_COUNT(this->effects); i++) { if (effect->type == ENZO_EFFECT_BUBBLE) { - effect->pos.x = ((Math_Rand_ZeroOne() * 0.5f) - 0.25f) + effect->vec.x; - effect->pos.z = ((Math_Rand_ZeroOne() * 0.5f) - 0.25f) + effect->vec.z; + effect->pos.x = ((Rand_ZeroOne() * 0.5f) - 0.25f) + effect->vec.x; + effect->pos.z = ((Rand_ZeroOne() * 0.5f) - 0.25f) + effect->vec.z; effect->pos.y += effect->vel.y; // Bubbles turn into ripples when they reach the surface @@ -325,10 +325,10 @@ void EnZo_SpawnSplashes(EnZo* this) { // Convert 20 particles into splashes (all of them since there are only 15) for (i = 0; i < 20; i++) { - f32 speed = Math_Rand_ZeroOne() * 1.5f + 0.5f; - f32 angle = Math_Rand_ZeroOne() * 6.28f; // ~pi * 2 + f32 speed = Rand_ZeroOne() * 1.5f + 0.5f; + f32 angle = Rand_ZeroOne() * 6.28f; // ~pi * 2 - vel.y = Math_Rand_ZeroOne() * 3.0f + 3.0f; + vel.y = Rand_ZeroOne() * 3.0f + 3.0f; vel.x = sinf(angle) * speed; vel.z = cosf(angle) * speed; @@ -482,7 +482,7 @@ void EnZo_Blink(EnZo* this) { if (DECR(this->blinkTimer) == 0) { this->eyeTexture++; if (this->eyeTexture >= 3) { - this->blinkTimer = Math_Rand_S16Offset(30, 30); + this->blinkTimer = Rand_S16Offset(30, 30); this->eyeTexture = 0; } } @@ -631,8 +631,8 @@ void EnZo_Surface(EnZo* this, GlobalContext* globalCtx) { this->actor.velocity.y = 0.0f; this->alpha = 255.0f; } else if (this->actor.waterY < 80.0f) { - Math_SmoothScaleMaxF(&this->actor.velocity.y, 2.0f, 0.4f, 0.6f); - Math_SmoothScaleMaxF(&this->alpha, 255.0f, 0.3f, 10.0f); + Math_ApproachF(&this->actor.velocity.y, 2.0f, 0.4f, 0.6f); + Math_ApproachF(&this->alpha, 255.0f, 0.3f, 10.0f); } } @@ -645,7 +645,7 @@ void EnZo_TreadWater(EnZo* this, GlobalContext* globalCtx) { } EnZo_SetAnimation(this); - Math_SmoothScaleMaxF(&this->actor.velocity.y, this->actor.waterY < 54.0f ? -0.6f : 0.6f, 0.3f, 0.2f); + Math_ApproachF(&this->actor.velocity.y, this->actor.waterY < 54.0f ? -0.6f : 0.6f, 0.3f, 0.2f); if (this->rippleTimer != 0) { this->rippleTimer--; if ((this->rippleTimer == 3) || (this->rippleTimer == 6)) { @@ -657,7 +657,7 @@ void EnZo_TreadWater(EnZo* this, GlobalContext* globalCtx) { } if (EnZo_PlayerInProximity(this, globalCtx) != 0) { - this->timeToDive = Math_Rand_S16Offset(40, 40); + this->timeToDive = Rand_S16Offset(40, 40); } else if (DECR(this->timeToDive) == 0) { f32 initialFrame; func_80034EC0(&this->skelAnime, sAnimations, 4); @@ -686,8 +686,8 @@ void EnZo_Dive(EnZo* this, GlobalContext* globalCtx) { } if (this->actor.waterY > 80.0f || this->actor.bgCheckFlags & 1) { - Math_SmoothScaleMaxF(&this->actor.velocity.y, -1.0f, 0.4f, 0.6f); - Math_SmoothScaleMaxF(&this->alpha, 0.0f, 0.3f, 10.0f); + Math_ApproachF(&this->actor.velocity.y, -1.0f, 0.4f, 0.6f); + Math_ApproachF(&this->alpha, 0.0f, 0.3f, 10.0f); } if ((s16)this->alpha == 0) { @@ -717,9 +717,9 @@ void EnZo_Update(Actor* thisx, GlobalContext* globalCtx) { if (globalCtx->state.frames & 8) { pos = this->actor.posRot.pos; - pos.y += (Math_Rand_ZeroOne() - 0.5f) * 10.0f + 18.0f; - pos.x += (Math_Rand_ZeroOne() - 0.5f) * 28.0f; - pos.z += (Math_Rand_ZeroOne() - 0.5f) * 28.0f; + pos.y += (Rand_ZeroOne() - 0.5f) * 10.0f + 18.0f; + pos.x += (Rand_ZeroOne() - 0.5f) * 28.0f; + pos.z += (Rand_ZeroOne() - 0.5f) * 28.0f; EnZo_Bubble(this, &pos); } @@ -753,8 +753,8 @@ s32 EnZo_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, } if ((limbIndex == 8) || (limbIndex == 9) || (limbIndex == 12)) { - rot->y += (Math_Sins(this->unk_656[limbIndex]) * 200.0f); - rot->z += (Math_Coss(this->unk_67E[limbIndex]) * 200.0f); + rot->y += (Math_SinS(this->unk_656[limbIndex]) * 200.0f); + rot->z += (Math_CosS(this->unk_67E[limbIndex]) * 200.0f); } return 0; diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c index abec30a5ea..60557a6788 100644 --- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c +++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c @@ -70,12 +70,12 @@ void func_80B85264(ItemBHeart* this, GlobalContext* globalCtx) { f32 temp; this->unk_164 += 1; - temp = ((Math_Sins(this->unk_164 * 1548) * 5.0f) + 20.0f); - Math_SmoothScaleMaxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y + temp, 0.1f, this->unk_158); - Math_SmoothScaleMaxF(&this->unk_158, 2.0f, 1.0f, 0.1f); + temp = ((Math_SinS(this->unk_164 * 1548) * 5.0f) + 20.0f); + Math_ApproachF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y + temp, 0.1f, this->unk_158); + Math_ApproachF(&this->unk_158, 2.0f, 1.0f, 0.1f); this->actor.shape.rot.y += 0x400; - Math_SmoothScaleMaxF(&this->actor.scale.x, 0.4f, 0.1f, 0.01f); + Math_ApproachF(&this->actor.scale.x, 0.4f, 0.1f, 0.01f); this->actor.scale.y = this->actor.scale.z = this->actor.scale.x; } diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c index e2d39b63ad..8d66e9596f 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -151,13 +151,13 @@ void ItemEtcetera_SpawnSparkles(ItemEtcetera* this, GlobalContext* globalCtx) { static Color_RGB8 envColor = { 255, 50, 50 }; Vec3f pos; - velocity.x = Math_Rand_CenteredFloat(3.0f); - velocity.z = Math_Rand_CenteredFloat(3.0f); + velocity.x = Rand_CenteredFloat(3.0f); + velocity.z = Rand_CenteredFloat(3.0f); velocity.y = -0.05f; accel.y = -0.025f; - pos.x = Math_Rand_CenteredFloat(12.0f) + this->actor.posRot.pos.x; - pos.y = (Math_Rand_ZeroOne() * 6.0f) + this->actor.posRot.pos.y; - pos.z = Math_Rand_CenteredFloat(12.0f) + this->actor.posRot.pos.z; + pos.x = Rand_CenteredFloat(12.0f) + this->actor.posRot.pos.x; + pos.y = (Rand_ZeroOne() * 6.0f) + this->actor.posRot.pos.y; + pos.z = Rand_CenteredFloat(12.0f) + this->actor.posRot.pos.z; EffectSsKiraKira_SpawnDispersed(globalCtx, &pos, &velocity, &accel, &primColor, &envColor, 5000, 16); } diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c index 62a914877f..937d793cdf 100644 --- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c +++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c @@ -172,11 +172,11 @@ void MagicDark_OrbUpdate(Actor* thisx, GlobalContext* globalCtx) { func_8002F974(&this->actor, NA_SE_PL_MAGIC_SOUL_BALL - SFX_FLAG); if (this->timer < 35) { MagicDark_DimLighting(globalCtx, this->timer * (1 / 45.0f)); - Math_SmoothScaleMaxMinF(&thisx->scale.x, this->scale * (1 / 12.000001f), 0.05f, 0.01f, 0.0001f); + Math_SmoothStepToF(&thisx->scale.x, this->scale * (1 / 12.000001f), 0.05f, 0.01f, 0.0001f); Actor_SetScale(&this->actor, thisx->scale.x); } else if (this->timer < 55) { Actor_SetScale(&this->actor, thisx->scale.x * 0.9f); - Math_SmoothScaleMaxMinF(&this->orbOffset.y, player->bodyPartsPos[0].y, 0.5f, 3.0f, 1.0f); + Math_SmoothStepToF(&this->orbOffset.y, player->bodyPartsPos[0].y, 0.5f, 3.0f, 1.0f); if (this->timer > 48) { MagicDark_DimLighting(globalCtx, (54 - this->timer) * 0.2f); } @@ -251,11 +251,11 @@ void MagicDark_OrbDraw(Actor* thisx, GlobalContext* globalCtx) { return; } - pos.x -= (this->actor.scale.x * 300.0f * Math_Sins(Camera_GetCamDirYaw(ACTIVE_CAM)) * - Math_Coss(Camera_GetCamDirPitch(ACTIVE_CAM))); - pos.y -= (this->actor.scale.x * 300.0f * Math_Sins(Camera_GetCamDirPitch(ACTIVE_CAM))); - pos.z -= (this->actor.scale.x * 300.0f * Math_Coss(Camera_GetCamDirYaw(ACTIVE_CAM)) * - Math_Coss(Camera_GetCamDirPitch(ACTIVE_CAM))); + pos.x -= (this->actor.scale.x * 300.0f * Math_SinS(Camera_GetCamDirYaw(ACTIVE_CAM)) * + Math_CosS(Camera_GetCamDirPitch(ACTIVE_CAM))); + pos.y -= (this->actor.scale.x * 300.0f * Math_SinS(Camera_GetCamDirPitch(ACTIVE_CAM))); + pos.z -= (this->actor.scale.x * 300.0f * Math_CosS(Camera_GetCamDirYaw(ACTIVE_CAM)) * + Math_CosS(Camera_GetCamDirPitch(ACTIVE_CAM))); OPEN_DISPS(globalCtx->state.gfxCtx, "../z_magic_dark.c", 619); diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index 27eb83ff24..ba9e40b4af 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -124,12 +124,12 @@ void MirRay_MakeShieldLight(MirRay* this, GlobalContext* globalCtx) { lightPt.z = (dataEntry->unk_18 * reflectionPt.z) + this->sourcePt.z; // Fade up - Math_ApproxS(&this->lightPointRad, dataEntry->lgtPtMaxRad, 6); + Math_StepToS(&this->lightPointRad, dataEntry->lgtPtMaxRad, 6); Lights_PointNoGlowSetInfo(&this->lightInfo, lightPt.x, lightPt.y, lightPt.z, dataEntry->color.r, dataEntry->color.g, dataEntry->color.b, this->lightPointRad); } else { // Fade down - Math_ApproxS(&this->lightPointRad, 0, 6); + Math_StepToS(&this->lightPointRad, 0, 6); Lights_PointSetColorAndRadius(&this->lightInfo, dataEntry->color.r, dataEntry->color.g, dataEntry->color.b, this->lightPointRad); } diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index 5a4ed2fe5f..a3de4fe198 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -73,7 +73,7 @@ void ObjBombiwa_Init(Actor* thisx, GlobalContext* globalCtx) { } else { func_80061ED4(&thisx->colChkInfo, NULL, &sColChkInfoInit); if (thisx->shape.rot.y == 0) { - s16 rand = (s16)Math_Rand_ZeroFloat(65536.0f); + s16 rand = (s16)Rand_ZeroFloat(65536.0f); thisx->posRot.rot.y = rand; thisx->shape.rot.y = rand; } @@ -99,12 +99,12 @@ void ObjBombiwa_Break(ObjBombiwa* this, GlobalContext* globalCtx) { dlist = D_060009E0; for (i = 0; i < ARRAY_COUNT(sEffectScales); i++) { - pos.x = ((Math_Rand_ZeroOne() - 0.5f) * 10.0f) + this->actor.initPosRot.pos.x; - pos.y = ((Math_Rand_ZeroOne() * 5.0f) + this->actor.initPosRot.pos.y) + 8.0f; - pos.z = ((Math_Rand_ZeroOne() - 0.5f) * 10.0f) + this->actor.initPosRot.pos.z; - velocity.x = (Math_Rand_ZeroOne() - 0.5f) * 15.0f; - velocity.y = (Math_Rand_ZeroOne() * 16.0f) + 5.0f; - velocity.z = (Math_Rand_ZeroOne() - 0.5f) * 15.0f; + pos.x = ((Rand_ZeroOne() - 0.5f) * 10.0f) + this->actor.initPosRot.pos.x; + pos.y = ((Rand_ZeroOne() * 5.0f) + this->actor.initPosRot.pos.y) + 8.0f; + pos.z = ((Rand_ZeroOne() - 0.5f) * 10.0f) + this->actor.initPosRot.pos.z; + velocity.x = (Rand_ZeroOne() - 0.5f) * 15.0f; + velocity.y = (Rand_ZeroOne() * 16.0f) + 5.0f; + velocity.z = (Rand_ZeroOne() - 0.5f) * 15.0f; scale = sEffectScales[i]; arg5 = (scale >= 11) ? 37 : 33; EffectSsKakera_Spawn(globalCtx, &pos, &velocity, &pos, -400, arg5, 10, 2, 0, scale, 1, 0, 80, KAKERA_COLOR_NONE, diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index 3b71d53b52..06964a1c83 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -72,19 +72,19 @@ void ObjComb_Break(ObjComb* this, GlobalContext* globalCtx) { for (i = 0; i < 31; i++) { angle += 20000; - rand1 = Math_Rand_ZeroOne() * 10.0f; + rand1 = Rand_ZeroOne() * 10.0f; - pos1.x = Math_Sins(angle) * rand1; + pos1.x = Math_SinS(angle) * rand1; pos1.y = (i - 15) * 0.7f; - pos1.z = Math_Coss(angle) * rand1; + pos1.z = Math_CosS(angle) * rand1; Math_Vec3f_Sum(&pos1, &this->actor.posRot.pos, &pos); - velocity.x = (Math_Rand_ZeroOne() - 0.5f) + pos1.x * 0.5f; - velocity.y = (Math_Rand_ZeroOne() - 0.5f) + pos1.y * 0.6f; - velocity.z = (Math_Rand_ZeroOne() - 0.5f) + pos1.z * 0.5f; + velocity.x = (Rand_ZeroOne() - 0.5f) + pos1.x * 0.5f; + velocity.y = (Rand_ZeroOne() - 0.5f) + pos1.y * 0.6f; + velocity.z = (Rand_ZeroOne() - 0.5f) + pos1.z * 0.5f; - scale = Math_Rand_ZeroOne() * 72.0f + 25.0f; + scale = Rand_ZeroOne() * 72.0f + 25.0f; if (scale < 40) { gravity = -200; @@ -97,7 +97,7 @@ void ObjComb_Break(ObjComb* this, GlobalContext* globalCtx) { arg6 = 20; } - rand2 = Math_Rand_ZeroOne(); + rand2 = Rand_ZeroOne(); if (rand2 < 0.1f) { arg5 = 96; @@ -127,7 +127,7 @@ void ObjComb_ChooseItemDrop(ObjComb* this, GlobalContext* globalCtx) { } else { params = (params | (((this->actor.params >> 8) & 0x3F) << 8)); } - } else if (Math_Rand_ZeroOne() < 0.5f) { + } else if (Rand_ZeroOne() < 0.5f) { params = -1; } if (params >= 0) { @@ -188,7 +188,7 @@ void ObjComb_Update(Actor* thisx, GlobalContext* globalCtx) { this->unk_1B2 += 12000; this->actionFunc(this, globalCtx); - this->actor.shape.rot.x = Math_Sins(this->unk_1B2) * this->unk_1B0 + this->actor.initPosRot.rot.x; + this->actor.shape.rot.x = Math_SinS(this->unk_1B2) * this->unk_1B0 + this->actor.initPosRot.rot.x; } void ObjComb_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c index 43eeb3bfc9..e4724bd9e8 100644 --- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c +++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c @@ -107,7 +107,7 @@ void func_80B92D20(ObjElevator* this) { void func_80B92D44(ObjElevator* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; - if (fabsf(Math_SmoothScaleMaxMinF(&thisx->posRot.pos.y, this->unk_168, 1.0f, this->unk_16C, 0.0f)) < 0.001f) { + if (fabsf(Math_SmoothStepToF(&thisx->posRot.pos.y, this->unk_168, 1.0f, this->unk_16C, 0.0f)) < 0.001f) { Audio_PlayActorSound2(thisx, NA_SE_EV_FOOT_SWITCH); func_80B92C5C(this); } else { diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c index 56903f4004..9907500c56 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -63,22 +63,22 @@ void ObjHamishi_Shake(ObjHamishi* this) { this->shakePosPhase += 5000; this->shakeRotPhase += 0xE10; - Math_ApproxF(&this->shakePosSize, 0.0f, 0.15f); - Math_ApproxF(&this->shakeRotSize, 0.0f, 40.0f); + Math_StepToF(&this->shakePosSize, 0.0f, 0.15f); + Math_StepToF(&this->shakeRotSize, 0.0f, 40.0f); this->actor.posRot.pos.x = - this->actor.initPosRot.pos.x + (Math_Sins(this->shakePosPhase * 4) * this->shakePosSize); + this->actor.initPosRot.pos.x + (Math_SinS(this->shakePosPhase * 4) * this->shakePosSize); this->actor.posRot.pos.z = - this->actor.initPosRot.pos.z + (Math_Coss(this->shakePosPhase * 7) * this->shakePosSize); + this->actor.initPosRot.pos.z + (Math_CosS(this->shakePosPhase * 7) * this->shakePosSize); this->actor.shape.rot.x = - this->actor.initPosRot.rot.x + (s16)(Math_Sins(this->shakeRotPhase * 4) * this->shakeRotSize); + this->actor.initPosRot.rot.x + (s16)(Math_SinS(this->shakeRotPhase * 4) * this->shakeRotSize); this->actor.shape.rot.z = - this->actor.initPosRot.rot.z + (s16)(Math_Coss(this->shakeRotPhase * 7) * this->shakeRotSize); + this->actor.initPosRot.rot.z + (s16)(Math_CosS(this->shakeRotPhase * 7) * this->shakeRotSize); } else { - Math_ApproxF(&this->actor.posRot.pos.x, this->actor.initPosRot.pos.x, 1.0f); - Math_ApproxF(&this->actor.posRot.pos.z, this->actor.initPosRot.pos.z, 1.0f); - Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, this->actor.initPosRot.rot.x, 0xBB8); - Math_ApproxUpdateScaledS(&this->actor.shape.rot.z, this->actor.initPosRot.rot.z, 0xBB8); + Math_StepToF(&this->actor.posRot.pos.x, this->actor.initPosRot.pos.x, 1.0f); + Math_StepToF(&this->actor.posRot.pos.z, this->actor.initPosRot.pos.z, 1.0f); + Math_ScaledStepToS(&this->actor.shape.rot.x, this->actor.initPosRot.rot.x, 0xBB8); + Math_ScaledStepToS(&this->actor.shape.rot.z, this->actor.initPosRot.rot.z, 0xBB8); } } @@ -96,16 +96,16 @@ void ObjHamishi_Break(ObjHamishi* this, GlobalContext* globalCtx) { for (i = 0; i < ARRAY_COUNT(sEffectScales); i++) { phi_s0 += 20000; - temp_f20 = Math_Rand_ZeroOne() * 10.0f; - pos.x = (Math_Sins(phi_s0) * temp_f20) + this->actor.posRot.pos.x; - pos.y = (Math_Rand_ZeroOne() * 40.0f) + this->actor.posRot.pos.y + 5.0f; - pos.z = (Math_Coss(phi_s0) * temp_f20) + this->actor.posRot.pos.z; + temp_f20 = Rand_ZeroOne() * 10.0f; + pos.x = (Math_SinS(phi_s0) * temp_f20) + this->actor.posRot.pos.x; + pos.y = (Rand_ZeroOne() * 40.0f) + this->actor.posRot.pos.y + 5.0f; + pos.z = (Math_CosS(phi_s0) * temp_f20) + this->actor.posRot.pos.z; - temp_f20 = (Math_Rand_ZeroOne() * 10.0f) + 2.0f; - velocity.x = Math_Sins(phi_s0) * temp_f20; - temp_f22 = Math_Rand_ZeroOne(); - velocity.y = (Math_Rand_ZeroOne() * i * 2.5f) + (temp_f22 * 15.0f); - velocity.z = Math_Coss(phi_s0) * temp_f20; + temp_f20 = (Rand_ZeroOne() * 10.0f) + 2.0f; + velocity.x = Math_SinS(phi_s0) * temp_f20; + temp_f22 = Rand_ZeroOne(); + velocity.y = (Rand_ZeroOne() * i * 2.5f) + (temp_f22 * 15.0f); + velocity.z = Math_CosS(phi_s0) * temp_f20; if (i == 0) { phi_v0 = 41; @@ -135,8 +135,7 @@ void ObjHamishi_Init(Actor* thisx, GlobalContext* globalCtx) { this->actor.uncullZoneForward += 1000.0f; } if (this->actor.shape.rot.y == 0) { - this->actor.shape.rot.y = this->actor.posRot.rot.y = this->actor.initPosRot.rot.y = - Math_Rand_ZeroFloat(65536.0f); + this->actor.shape.rot.y = this->actor.posRot.rot.y = this->actor.initPosRot.rot.y = Rand_ZeroFloat(65536.0f); } ObjHamishi_InitCollision(&this->actor, globalCtx); diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c index 96fca2a352..fcec9d3dbd 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -127,8 +127,8 @@ void func_80B93E38(ObjHsblock* this) { } void func_80B93E5C(ObjHsblock* this, GlobalContext* globalCtx) { - Math_SmoothScaleMaxMinF(&this->dyna.actor.velocity.y, 16.0f, 0.1f, 0.8f, 0.0f); - if (fabsf(Math_SmoothScaleMaxMinF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, 0.3f, + Math_SmoothStepToF(&this->dyna.actor.velocity.y, 16.0f, 0.1f, 0.8f, 0.0f); + if (fabsf(Math_SmoothStepToF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y, 0.3f, this->dyna.actor.velocity.y, 0.3f)) < 0.001f) { this->dyna.actor.posRot.pos.y = this->dyna.actor.initPosRot.pos.y; func_80B93D90(this); diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c index 6448e009fd..3c9ca8ff0b 100644 --- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c @@ -105,11 +105,11 @@ void ObjIcePoly_Idle(ObjIcePoly* this, GlobalContext* globalCtx) { } else { Actor_Kill(&this->actor); } - pos.x = this->actor.posRot.pos.x + - this->actor.scale.x * (Math_Rand_S16Offset(15, 15) * (Math_Rand_ZeroOne() < 0.5f ? -1 : 1)); - pos.y = this->actor.posRot.pos.y + this->actor.scale.y * Math_Rand_S16Offset(10, 90); - pos.z = this->actor.posRot.pos.z + - this->actor.scale.z * (Math_Rand_S16Offset(15, 15) * (Math_Rand_ZeroOne() < 0.5f ? -1 : 1)); + pos.x = + this->actor.posRot.pos.x + this->actor.scale.x * (Rand_S16Offset(15, 15) * (Rand_ZeroOne() < 0.5f ? -1 : 1)); + pos.y = this->actor.posRot.pos.y + this->actor.scale.y * Rand_S16Offset(10, 90); + pos.z = + this->actor.posRot.pos.z + this->actor.scale.z * (Rand_S16Offset(15, 15) * (Rand_ZeroOne() < 0.5f ? -1 : 1)); if ((globalCtx->gameplayFrames % 7) == 0) { EffectSsKiraKira_SpawnDispersed(globalCtx, &pos, &zeroVec, &zeroVec, &sColorWhite, &sColorGray, 2000, 5); } @@ -130,12 +130,12 @@ void ObjIcePoly_Melt(ObjIcePoly* this, GlobalContext* globalCtx) { for (i = 0; i < 2; i++) { pos.x = this->actor.posRot.pos.x + - this->actor.scale.x * (Math_Rand_S16Offset(20, 20) * (Math_Rand_ZeroOne() < 0.5f ? -1 : 1)); - pos.y = this->actor.posRot.pos.y + this->actor.scale.y * Math_Rand_ZeroOne() * 50.0f; + this->actor.scale.x * (Rand_S16Offset(20, 20) * (Rand_ZeroOne() < 0.5f ? -1 : 1)); + pos.y = this->actor.posRot.pos.y + this->actor.scale.y * Rand_ZeroOne() * 50.0f; pos.z = this->actor.posRot.pos.z + - this->actor.scale.x * (Math_Rand_S16Offset(20, 20) * (Math_Rand_ZeroOne() < 0.5f ? -1 : 1)); + this->actor.scale.x * (Rand_S16Offset(20, 20) * (Rand_ZeroOne() < 0.5f ? -1 : 1)); func_8002829C(globalCtx, &pos, &vel, &accel, &sColorWhite, &sColorGray, - Math_Rand_S16Offset(0x15E, 0x64) * this->actor.scale.x, this->actor.scale.x * 20.0f); + Rand_S16Offset(0x15E, 0x64) * this->actor.scale.x, this->actor.scale.x * 20.0f); } if (this->meltTimer < 0) { if (this->actor.parent != NULL) { diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index dd89cdb94b..c8ab0a37e9 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -107,21 +107,21 @@ void ObjKibako_AirBreak(ObjKibako* this, GlobalContext* globalCtx) { Vec3f velocity; for (i = 0, angle = 0; i < 12; i++, angle += 0x4E20) { - f32 sn = Math_Sins(angle); - f32 cs = Math_Coss(angle); + f32 sn = Math_SinS(angle); + f32 cs = Math_CosS(angle); f32 temp_rand; s16 phi_s0; pos.x = sn * 16.0f; - pos.y = (Math_Rand_ZeroOne() * 5.0f) + 2.0f; + pos.y = (Rand_ZeroOne() * 5.0f) + 2.0f; pos.z = cs * 16.0f; velocity.x = pos.x * 0.2f; - velocity.y = (Math_Rand_ZeroOne() * 6.0f) + 2.0f; + velocity.y = (Rand_ZeroOne() * 6.0f) + 2.0f; velocity.z = pos.z * 0.2f; pos.x += breakPos->x; pos.y += breakPos->y; pos.z += breakPos->z; - temp_rand = Math_Rand_ZeroOne(); + temp_rand = Rand_ZeroOne(); if (temp_rand < 0.1f) { phi_s0 = 0x60; } else if (temp_rand < 0.7f) { @@ -130,7 +130,7 @@ void ObjKibako_AirBreak(ObjKibako* this, GlobalContext* globalCtx) { phi_s0 = 0x20; } EffectSsKakera_Spawn(globalCtx, &pos, &velocity, breakPos, -200, phi_s0, 10, 10, 0, - (Math_Rand_ZeroOne() * 30.0f) + 10.0f, 0, 32, 60, KAKERA_COLOR_NONE, + (Rand_ZeroOne() * 30.0f) + 10.0f, 0, 32, 60, KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_DANGEON_KEEP, D_05005380); } func_80033480(globalCtx, &this->actor.posRot.pos, 40.0f, 3, 50, 140, 1); @@ -148,24 +148,24 @@ void ObjKibako_WaterBreak(ObjKibako* this, GlobalContext* globalCtx) { EffectSsGSplash_Spawn(globalCtx, &pos, NULL, NULL, 0, 500); for (i = 0, angle = 0; i < 12; i++, angle += 0x4E20) { - f32 sn = Math_Sins(angle); - f32 cs = Math_Coss(angle); + f32 sn = Math_SinS(angle); + f32 cs = Math_CosS(angle); f32 temp_rand; s16 phi_s0; pos.x = sn * 16.0f; - pos.y = (Math_Rand_ZeroOne() * 5.0f) + 2.0f; + pos.y = (Rand_ZeroOne() * 5.0f) + 2.0f; pos.z = cs * 16.0f; velocity.x = pos.x * 0.18f; - velocity.y = (Math_Rand_ZeroOne() * 4.0f) + 2.0f; + velocity.y = (Rand_ZeroOne() * 4.0f) + 2.0f; velocity.z = pos.z * 0.18f; pos.x += breakPos->x; pos.y += breakPos->y; pos.z += breakPos->z; - temp_rand = Math_Rand_ZeroOne(); + temp_rand = Rand_ZeroOne(); phi_s0 = (temp_rand < 0.2f) ? 0x40 : 0x20; EffectSsKakera_Spawn(globalCtx, &pos, &velocity, breakPos, -180, phi_s0, 30, 30, 0, - (Math_Rand_ZeroOne() * 30.0f) + 10.0f, 0, 32, 70, KAKERA_COLOR_NONE, + (Rand_ZeroOne() * 30.0f) + 10.0f, 0, 32, 70, KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_DANGEON_KEEP, D_05005380); } } @@ -232,8 +232,8 @@ void ObjKibako_Held(ObjKibako* this, GlobalContext* globalCtx) { } void ObjKibako_SetupThrown(ObjKibako* this) { - this->actor.velocity.x = Math_Sins(this->actor.posRot.rot.y) * this->actor.speedXZ; - this->actor.velocity.z = Math_Coss(this->actor.posRot.rot.y) * this->actor.speedXZ; + this->actor.velocity.x = Math_SinS(this->actor.posRot.rot.y) * this->actor.speedXZ; + this->actor.velocity.z = Math_CosS(this->actor.posRot.rot.y) * this->actor.speedXZ; this->actor.colChkInfo.mass = 240; this->actionFunc = ObjKibako_Thrown; } diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index 5d2ad91698..f66055ed5c 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -122,15 +122,15 @@ void ObjLightswitch_ClearSwitchFlag(ObjLightswitch* this, GlobalContext* globalC void ObjLightswitch_SpawnDisappearEffects(ObjLightswitch* this, GlobalContext* globalCtx) { Vec3f pos; - f32 s = Math_Sins(this->actor.shape.rot.y); - f32 c = Math_Coss(this->actor.shape.rot.y); + f32 s = Math_SinS(this->actor.shape.rot.y); + f32 c = Math_CosS(this->actor.shape.rot.y); f32 x; f32 y; f32 z; s32 pad; if (this->alpha >= (100 << 6)) { - x = (CLAMP_MAX((1.0f - 1.0f / (255 << 6) * this->alpha) * 400.0f, 60.0f) - 30.0f + 30.0f) * Math_Rand_ZeroOne(); + x = (CLAMP_MAX((1.0f - 1.0f / (255 << 6) * this->alpha) * 400.0f, 60.0f) - 30.0f + 30.0f) * Rand_ZeroOne(); y = x - 30.0f; if (x > 30.0f) { x = 30.0f; @@ -141,8 +141,8 @@ void ObjLightswitch_SpawnDisappearEffects(ObjLightswitch* this, GlobalContext* g } x = sqrtf(x); } - x = 2.0f * (x * (Math_Rand_ZeroOne() - 0.5f)); - z = (30.0f - fabsf(x)) * 0.5f + 10.0f * Math_Rand_ZeroOne(); + x = 2.0f * (x * (Rand_ZeroOne() - 0.5f)); + z = (30.0f - fabsf(x)) * 0.5f + 10.0f * Rand_ZeroOne(); pos.x = this->actor.posRot.pos.x + ((z * s) + (x * c)); pos.y = this->actor.posRot.pos.y + y + 10.0f; pos.z = this->actor.posRot.pos.z + ((z * c) - (x * s)); @@ -252,7 +252,7 @@ void ObjLightswitch_TurnOn(ObjLightswitch* this, GlobalContext* globalCtx) { this->timer++; - Math_ApproxS(&this->flameRingRotSpeed, -0xAA, 0xA); + Math_StepToS(&this->flameRingRotSpeed, -0xAA, 0xA); this->flameRingRot += this->flameRingRotSpeed; this->color[0] = this->timer * (((255 - 155) << 6) / 20) + (155 << 6); @@ -321,7 +321,7 @@ void ObjLightswitch_TurnOff(ObjLightswitch* this, GlobalContext* globalCtx) { this->toggleDelay <= 0) { this->timer--; - Math_ApproxS(&this->flameRingRotSpeed, 0, 0xA); + Math_StepToS(&this->flameRingRotSpeed, 0, 0xA); this->flameRingRot += this->flameRingRotSpeed; this->color[0] = this->timer * (((255 - 155) << 6) / 20) + (155 << 6); diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index fda4403b71..bfba466368 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -412,8 +412,8 @@ s32 ObjOshihiki_CheckGround(ObjOshihiki* this, GlobalContext* globalCtx) { s32 ObjOshihiki_CheckWall(GlobalContext* globalCtx, s16 angle, f32 direction, ObjOshihiki* this) { f32 maxDist = ((direction >= 0.0f) ? 1.0f : -1.0f) * (300.0f * this->dyna.actor.scale.x + 20.0f - 0.5f); - f32 sn = Math_Sins(angle); - f32 cs = Math_Coss(angle); + f32 sn = Math_SinS(angle); + f32 cs = Math_CosS(angle); s32 i; for (i = 0; i < 4; i++) { @@ -571,7 +571,7 @@ void ObjOshihiki_Push(ObjOshihiki* this, GlobalContext* globalCtx) { this->pushSpeed += 0.5f; this->stateFlags |= PUSHBLOCK_PUSH; this->pushSpeed = CLAMP_MAX(this->pushSpeed, 2.0f); - stopFlag = Math_ApproxF(&this->pushDist, 20.0f, this->pushSpeed); + stopFlag = Math_StepToF(&this->pushDist, 20.0f, this->pushSpeed); pushDistSigned = ((this->direction >= 0.0f) ? 1.0f : -1.0f) * this->pushDist; thisx->posRot.pos.x = thisx->initPosRot.pos.x + (pushDistSigned * this->yawSin); thisx->posRot.pos.z = thisx->initPosRot.pos.z + (pushDistSigned * this->yawCos); @@ -651,8 +651,8 @@ void ObjOshihiki_Update(Actor* thisx, GlobalContext* globalCtx) { this->dyna.actor.posRot.rot.y = this->dyna.unk_158; - this->yawSin = Math_Sins(this->dyna.actor.posRot.rot.y); - this->yawCos = Math_Coss(this->dyna.actor.posRot.rot.y); + this->yawSin = Math_SinS(this->dyna.actor.posRot.rot.y); + this->yawCos = Math_CosS(this->dyna.actor.posRot.rot.y); if (this->actionFunc != NULL) { this->actionFunc(this, globalCtx); diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index cb1682fd7e..217cca6984 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -126,8 +126,8 @@ static InitChainEntry sInitChain[] = { }; void ObjSwitch_RotateY(Vec3f* dest, Vec3f* src, s16 angle) { - f32 s = Math_Sins(angle); - f32 c = Math_Coss(angle); + f32 s = Math_SinS(angle); + f32 c = Math_CosS(angle); dest->x = src->z * s + src->x * c; dest->y = src->y; diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c index cf57de83a7..6c0e9f0ceb 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -77,7 +77,7 @@ void ObjSyokudai_Init(Actor* thisx, GlobalContext* globalCtx) { this->litTimer = -1; } - this->flameTexScroll = (s32)(Math_Rand_ZeroOne() * 20.0f); + this->flameTexScroll = (s32)(Rand_ZeroOne() * 20.0f); sLitTorchCount = 0; Actor_SetHeight(&this->actor, 60.0f); } @@ -224,7 +224,7 @@ void ObjSyokudai_Update(Actor* thisx, GlobalContext* globalCtx2) { } else { lightRadius = (this->litTimer * 200.0f) / 20.0f; } - brightness = (u8)(Math_Rand_ZeroOne() * 127.0f) + 128; + brightness = (u8)(Rand_ZeroOne() * 127.0f) + 128; func_8002F974(&this->actor, NA_SE_EV_TORCH - SFX_FLAG); } Lights_PointSetColorAndRadius(&this->lightInfo, brightness, brightness, 0, lightRadius); diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c index a70a69528c..0b3521a620 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -140,9 +140,9 @@ void OceffSpot_Update(Actor* thisx, GlobalContext* globalCtx) { (s32)(200.0f * temp), (s16)(100.0f * temp)); Lights_PointNoGlowSetInfo(&this->lightInfo2, - (s16)this->actor.posRot.pos.x + Math_Sins(player->actor.shape.rot.y) * 20.0f, + (s16)this->actor.posRot.pos.x + Math_SinS(player->actor.shape.rot.y) * 20.0f, (s16)this->actor.posRot.pos.y + 20.0f, - (s16)this->actor.posRot.pos.z + Math_Coss(player->actor.shape.rot.y) * 20.0f, + (s16)this->actor.posRot.pos.z + Math_CosS(player->actor.shape.rot.y) * 20.0f, (s32)(255.0f * temp), (s32)(255.0f * temp), (s32)(200.0f * temp), (s16)(100.0f * temp)); } diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index 101db5bf4d..f9360755be 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -80,7 +80,7 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_oceff_wipe.c", 346); if (this->counter < 32) { - z = Math_Sins(this->counter << 9) * 1400; + z = Math_SinS(this->counter << 9) * 1400; } else { z = 1400; } diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index fb83157ab5..7e0b81107d 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -71,7 +71,7 @@ void OceffWipe2_Draw(Actor* thisx, GlobalContext* globalCtx) { eye = ACTIVE_CAM->eye; Camera_GetSkyboxOffset(&vec, ACTIVE_CAM); if (this->counter < 32) { - z = Math_Sins(this->counter << 9) * 1330; + z = Math_SinS(this->counter << 9) * 1330; } else { z = 1330; } diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index dc2cda8336..6d33abc9c2 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -72,7 +72,7 @@ void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx) { eye = ACTIVE_CAM->eye; Camera_GetSkyboxOffset(&vec, ACTIVE_CAM); if (this->counter < 32) { - z = Math_Sins(this->counter << 9) * 1330; + z = Math_SinS(this->counter << 9) * 1330; } else { z = 1330; } diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c index ad83326771..9d14346fdb 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -66,7 +66,7 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) { eye = ACTIVE_CAM->eye; Camera_GetSkyboxOffset(&vec, ACTIVE_CAM); if (this->counter < 16) { - z = Math_Sins(this->counter << 10) * 1330; + z = Math_SinS(this->counter << 10) * 1330; } else { z = 1330; } diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index d7e3067897..5bfea1cc29 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -2416,7 +2416,7 @@ s32 func_808351D4(Player* this, GlobalContext* globalCtx) { sp2C = 1; } - Math_ApproxUpdateScaledS(&this->unk_6C0, 1200, 400); + Math_ScaledStepToS(&this->unk_6C0, 1200, 400); this->unk_6AE |= 0x100; if ((this->unk_836 == 0) && (func_80833350(this) == 0) && (this->skelAnime.animation == &D_040026E8)) { @@ -2617,8 +2617,8 @@ s32 func_808359FC(Player* this, GlobalContext* globalCtx) { func_80833638(this, func_80835B60); this->unk_834 = 0; } else if (func_800A4530(&this->skelAnime2, 6.0f)) { - f32 posX = (Math_Sins(this->actor.shape.rot.y) * 10.0f) + this->actor.posRot.pos.x; - f32 posZ = (Math_Coss(this->actor.shape.rot.y) * 10.0f) + this->actor.posRot.pos.z; + f32 posX = (Math_SinS(this->actor.shape.rot.y) * 10.0f) + this->actor.posRot.pos.x; + f32 posZ = (Math_CosS(this->actor.shape.rot.y) * 10.0f) + this->actor.posRot.pos.z; s32 yaw = (this->unk_664 != NULL) ? this->actor.shape.rot.y + 14000 : this->actor.shape.rot.y; EnBoom* boomerang = (EnBoom*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_BOOM, posX, this->actor.posRot.pos.y + 30.0f, @@ -2929,7 +2929,7 @@ s32 func_80836670(Player* this, GlobalContext* globalCtx) { SkelAnime_LoadAnimationType4(globalCtx, this->skelAnime.limbCount, this->skelAnime2.limbDrawTbl, this->skelAnime.limbDrawTbl, D_80853410); } - Math_ApproxF(&this->unk_830, 0.0f, 0.25f); + Math_StepToF(&this->unk_830, 0.0f, 0.25f); SkelAnime_LoadAnimationType2(globalCtx, this->skelAnime.limbCount, this->skelAnime.limbDrawTbl, this->skelAnime2.limbDrawTbl, 1.0f - this->unk_830); } else if ((func_80833350(this) == 0) || (this->linearVelocity != 0.0f)) { @@ -2956,13 +2956,13 @@ void func_808368EC(Player* this, GlobalContext* globalCtx) { if (!(this->stateFlags2 & 0x60)) { if ((this->unk_664 != NULL) && ((globalCtx->actorCtx.targetCtx.unk_4B != 0) || (this->actor.type != ACTORTYPE_PLAYER))) { - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, + Math_ScaledStepToS(&this->actor.shape.rot.y, Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->unk_664->posRot2.pos), 4000); } else if ((this->stateFlags1 & 0x20000) && !(this->stateFlags2 & 0x60)) { - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, this->targetYaw, 4000); + Math_ScaledStepToS(&this->actor.shape.rot.y, this->targetYaw, 4000); } } else if (!(this->stateFlags2 & 0x40)) { - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, this->currentYaw, 2000); + Math_ScaledStepToS(&this->actor.shape.rot.y, this->currentYaw, 2000); } this->unk_87C = this->actor.shape.rot.y - previousYaw; @@ -2977,7 +2977,7 @@ s32 func_808369C8(s16* pValue, s16 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5) temp2 = CLAMP(temp2, -arg5, arg5); *pValue += (s16)(temp1 - temp2); - Math_ApproxUpdateScaledS(pValue, arg1, arg2); + Math_ScaledStepToS(pValue, arg1, arg2); temp3 = *pValue; if (*pValue < -arg3) { @@ -3134,7 +3134,7 @@ s32 func_80836FAC(GlobalContext* globalCtx, Player* this, f32* arg2, s16* arg3, if (*arg2 < 0.0f) { *arg2 = 0.0f; } else { - temp_f2 = 1.0f - Math_Coss(*arg2 * 450.0f); + temp_f2 = 1.0f - Math_CosS(*arg2 * 450.0f); *arg2 = ((temp_f2 * temp_f2) * 30.0f) + 7.0f; } } else { @@ -3142,7 +3142,7 @@ s32 func_80836FAC(GlobalContext* globalCtx, Player* this, f32* arg2, s16* arg3, } if (D_808535D4 != 0.0f) { - temp_f0 = Math_Sins(this->unk_898); + temp_f0 = Math_SinS(this->unk_898); temp_f12 = this->unk_880; temp_f14 = CLAMP(temp_f0, 0.0f, 0.6f); @@ -3164,7 +3164,7 @@ s32 func_80836FAC(GlobalContext* globalCtx, Player* this, f32* arg2, s16* arg3, } s32 func_8083721C(Player* this) { - return Math_ApproxF(&this->linearVelocity, 0.0f, REG(43) / 100.0f); + return Math_StepToF(&this->linearVelocity, 0.0f, REG(43) / 100.0f); } s32 func_80837268(Player* this, f32* arg1, s16* arg2, f32 arg3, GlobalContext* globalCtx) { @@ -3637,7 +3637,7 @@ void func_8083821C(Player* this) { s32 i; // clang-format off - for (i = 0; i < 18; i++) { this->flameTimers[i] = Math_Rand_S16Offset(0, 200); } + for (i = 0; i < 18; i++) { this->flameTimers[i] = Rand_S16Offset(0, 200); } // clang-format on this->isBurning = true; @@ -3937,8 +3937,8 @@ void func_80838E70(GlobalContext* globalCtx, Player* this, f32 arg2, s16 arg3) { this->unk_84F = 1; this->unk_850 = 1; - this->unk_450.x = (Math_Sins(arg3) * arg2) + this->actor.posRot.pos.x; - this->unk_450.z = (Math_Coss(arg3) * arg2) + this->actor.posRot.pos.z; + this->unk_450.x = (Math_SinS(arg3) * arg2) + this->actor.posRot.pos.x; + this->unk_450.z = (Math_CosS(arg3) * arg2) + this->actor.posRot.pos.z; func_80832264(globalCtx, this, func_80833338(this)); } @@ -4102,8 +4102,8 @@ s32 func_80839034(GlobalContext* globalCtx, Player* this, CollisionPoly* arg2, u } void func_808395DC(Player* this, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3) { - f32 cos = Math_Coss(this->actor.shape.rot.y); - f32 sin = Math_Sins(this->actor.shape.rot.y); + f32 cos = Math_CosS(this->actor.shape.rot.y); + f32 sin = Math_SinS(this->actor.shape.rot.y); arg3->x = arg1->x + ((arg2->x * cos) + (arg2->z * sin)); arg3->y = arg1->y + arg2->y; @@ -4171,8 +4171,8 @@ s32 func_80839800(Player* this, GlobalContext* globalCtx) { } sp7C = this->doorDirection; - sp78 = Math_Coss(doorActor->shape.rot.y); - sp74 = Math_Sins(doorActor->shape.rot.y); + sp78 = Math_CosS(doorActor->shape.rot.y); + sp74 = Math_SinS(doorActor->shape.rot.y); if (this->doorType == 2) { doorShutter = (DoorShutter*)doorActor; @@ -4394,9 +4394,9 @@ void func_8083A0F4(GlobalContext* globalCtx, Player* this) { (Player_GetStrength() <= PLAYER_STR_NONE)) { func_80835C58(globalCtx, this, func_80846408, 0); this->actor.posRot.pos.x = - (Math_Sins(interactRangeActor->yawTowardsLink) * 20.0f) + interactRangeActor->posRot.pos.x; + (Math_SinS(interactRangeActor->yawTowardsLink) * 20.0f) + interactRangeActor->posRot.pos.x; this->actor.posRot.pos.z = - (Math_Coss(interactRangeActor->yawTowardsLink) * 20.0f) + interactRangeActor->posRot.pos.z; + (Math_CosS(interactRangeActor->yawTowardsLink) * 20.0f) + interactRangeActor->posRot.pos.z; this->currentYaw = this->actor.shape.rot.y = interactRangeActor->yawTowardsLink + 0x8000; anim = &D_04003060; } else { @@ -4495,7 +4495,7 @@ void func_8083A5C4(GlobalContext* globalCtx, Player* this, CollisionPoly* arg2, this->actor.posRot.pos.x -= (arg3 + 1.0f) * sp24; this->actor.posRot.pos.z -= (arg3 + 1.0f) * sp20; - this->actor.shape.rot.y = this->currentYaw = atan2s(sp20, sp24); + this->actor.shape.rot.y = this->currentYaw = Math_Atan2S(sp20, sp24); func_80832224(this); func_80832CFC(this); @@ -5674,9 +5674,9 @@ void func_8083D6EC(GlobalContext* globalCtx, Player* this) { if (this->unk_854 > 15.0f) { this->unk_854 = 0.0f; - ripplePos.x = (Math_Rand_ZeroOne() * 10.0f) + this->actor.posRot.pos.x; + ripplePos.x = (Rand_ZeroOne() * 10.0f) + this->actor.posRot.pos.x; ripplePos.y = this->actor.posRot.pos.y + this->actor.waterY; - ripplePos.z = (Math_Rand_ZeroOne() * 10.0f) + this->actor.posRot.pos.z; + ripplePos.z = (Rand_ZeroOne() * 10.0f) + this->actor.posRot.pos.z; EffectSsGRipple_Spawn(globalCtx, &ripplePos, 100, 500, 0); if ((this->linearVelocity > 4.0f) && !func_808332B8(this) && @@ -5692,7 +5692,7 @@ void func_8083D6EC(GlobalContext* globalCtx, Player* this) { s32 i; if ((this->actor.velocity.y > -1.0f) || (this->actor.bgCheckFlags & 1)) { - if (Math_Rand_ZeroOne() < 0.2f) { + if (Rand_ZeroOne() < 0.2f) { numBubbles = 1; } } else { @@ -5717,8 +5717,8 @@ s32 func_8083DB98(Player* this, s32 arg1) { sp30.z = this->actor.posRot.pos.z; sp2E = Math_Vec3f_Pitch(&sp30, &unk_664->posRot2.pos); sp2C = Math_Vec3f_Yaw(&sp30, &unk_664->posRot2.pos); - Math_SmoothScaleMaxMinS(&this->actor.posRot2.rot.y, sp2C, 4, 10000, 0); - Math_SmoothScaleMaxMinS(&this->actor.posRot2.rot.x, sp2E, 4, 10000, 0); + Math_SmoothStepToS(&this->actor.posRot2.rot.y, sp2C, 4, 10000, 0); + Math_SmoothStepToS(&this->actor.posRot2.rot.x, sp2E, 4, 10000, 0); this->unk_6AE |= 2; return func_80836AB8(this, arg1); @@ -5742,16 +5742,16 @@ void func_8083DC54(Player* this, GlobalContext* globalCtx) { } if (D_808535E4 == 11) { - Math_SmoothScaleMaxMinS(&this->actor.posRot2.rot.x, -20000, 10, 4000, 800); + Math_SmoothStepToS(&this->actor.posRot2.rot.x, -20000, 10, 4000, 800); } else { sp46 = 0; temp1 = func_8083973C(globalCtx, this, &D_8085456C, &sp34); if (temp1 > -32000.0f) { - temp2 = atan2s(40.0f, this->actor.posRot.pos.y - temp1); + temp2 = Math_Atan2S(40.0f, this->actor.posRot.pos.y - temp1); sp46 = CLAMP(temp2, -4000, 4000); } this->actor.posRot2.rot.y = this->actor.shape.rot.y; - Math_SmoothScaleMaxMinS(&this->actor.posRot2.rot.x, sp46, 14, 4000, 30); + Math_SmoothStepToS(&this->actor.posRot2.rot.x, sp46, 14, 4000, 30); } func_80836AB8(this, func_8002DD78(this) || func_808334B4(this)); @@ -5766,10 +5766,10 @@ void func_8083DDC8(Player* this, GlobalContext* globalCtx) { temp2 = (s16)(this->currentYaw - this->actor.shape.rot.y) * this->linearVelocity * 0.1f; temp1 = CLAMP(temp1, -4000, 4000); temp2 = CLAMP(-temp2, -4000, 4000); - Math_ApproxUpdateScaledS(&this->unk_6BC, temp1, 900); + Math_ScaledStepToS(&this->unk_6BC, temp1, 900); this->unk_6B6 = -(f32)this->unk_6BC * 0.5f; - Math_ApproxUpdateScaledS(&this->unk_6BA, temp2, 300); - Math_ApproxUpdateScaledS(&this->unk_6C0, temp2, 200); + Math_ScaledStepToS(&this->unk_6BA, temp2, 300); + Math_ScaledStepToS(&this->unk_6C0, temp2, 200); this->unk_6AE |= 0x168; } else { func_8083DC54(this, globalCtx); @@ -5777,8 +5777,8 @@ void func_8083DDC8(Player* this, GlobalContext* globalCtx) { } void func_8083DF68(Player* this, f32 arg1, s16 arg2) { - func_80077C6C(&this->linearVelocity, arg1, REG(19) / 100.0f, 1.5f); - Math_ApproxUpdateScaledS(&this->currentYaw, arg2, REG(27)); + Math_AymStepToF(&this->linearVelocity, arg1, REG(19) / 100.0f, 1.5f); + Math_ScaledStepToS(&this->currentYaw, arg2, REG(27)); } void func_8083DFE0(Player* this, f32* arg1, s16* arg2) { @@ -5789,12 +5789,12 @@ void func_8083DFE0(Player* this, f32* arg1, s16* arg2) { } if (ABS(yawDiff) > 0x6000) { - if (Math_ApproxF(&this->linearVelocity, 0.0f, 1.0f)) { + if (Math_StepToF(&this->linearVelocity, 0.0f, 1.0f)) { this->currentYaw = *arg2; } } else { - func_80077C6C(&this->linearVelocity, *arg1, 0.05f, 0.1f); - Math_ApproxUpdateScaledS(&this->currentYaw, *arg2, 200); + Math_AymStepToF(&this->linearVelocity, *arg1, 0.05f, 0.1f); + Math_ScaledStepToS(&this->currentYaw, *arg2, 200); } } @@ -5812,8 +5812,8 @@ s32 func_8083E0FC(Player* this, GlobalContext* globalCtx) { s32 temp; if ((rideActor != NULL) && CHECK_BTN_ALL(sControlInput->press.button, BTN_A)) { - sp38 = Math_Coss(rideActor->actor.shape.rot.y); - sp34 = Math_Sins(rideActor->actor.shape.rot.y); + sp38 = Math_CosS(rideActor->actor.shape.rot.y); + sp34 = Math_SinS(rideActor->actor.shape.rot.y); func_80836898(globalCtx, this, func_8083A360); @@ -5853,7 +5853,7 @@ void func_8083E298(CollisionPoly* arg0, Vec3f* arg1, s16* arg2) { arg1->y = arg0->norm.y * (1.0f / 32767.0f); arg1->z = arg0->norm.z * (1.0f / 32767.0f); - *arg2 = atan2s(arg1->z, arg1->x); + *arg2 = Math_Atan2S(arg1->z, arg1->x); } LinkAnimationHeader* D_80854590[] = { @@ -5872,7 +5872,7 @@ s32 func_8083E318(GlobalContext* globalCtx, Player* this, CollisionPoly* arg2) { if (!Player_InBlockingCsMode(globalCtx, this) && (func_8084F390 != this->func_674) && (func_80041F7C(&globalCtx->colCtx, arg2, this->actor.floorPolySource) == 1)) { - sp4A = atan2s(this->actor.velocity.z, this->actor.velocity.x); + sp4A = Math_Atan2S(this->actor.velocity.z, this->actor.velocity.x); func_8083E298(arg2, &sp3C, &sp3A); temp3 = sp3A - sp4A; @@ -5883,7 +5883,7 @@ s32 func_8083E318(GlobalContext* globalCtx, Player* this, CollisionPoly* arg2) { temp2 = 1.2f; } this->windDirection = sp3A; - Math_ApproxF(&this->windSpeed, temp1, temp2); + Math_StepToF(&this->windSpeed, temp1, temp2); } else { func_80835C58(globalCtx, this, func_8084F390, 0); func_80832564(globalCtx, this); @@ -5976,9 +5976,9 @@ s32 func_8083E5A8(Player* this, GlobalContext* globalCtx) { this->stateFlags1 |= 0x20000C00; func_8083AE40(this, giEntry->objectId); this->actor.posRot.pos.x = - chest->dyna.actor.posRot.pos.x - (Math_Sins(chest->dyna.actor.shape.rot.y) * 29.434299469f); + chest->dyna.actor.posRot.pos.x - (Math_SinS(chest->dyna.actor.shape.rot.y) * 29.434299469f); this->actor.posRot.pos.z = - chest->dyna.actor.posRot.pos.z - (Math_Coss(chest->dyna.actor.shape.rot.y) * 29.434299469f); + chest->dyna.actor.posRot.pos.z - (Math_CosS(chest->dyna.actor.shape.rot.y) * 29.434299469f); this->currentYaw = this->actor.shape.rot.y = chest->dyna.actor.shape.rot.y; func_80832224(this); @@ -6255,8 +6255,8 @@ s32 func_8083F360(GlobalContext* globalCtx, Player* this, f32 arg1, f32 arg2, f3 f32 temp1; f32 temp2; - yawCos = Math_Coss(this->actor.shape.rot.y); - yawSin = Math_Sins(this->actor.shape.rot.y); + yawCos = Math_CosS(this->actor.shape.rot.y); + yawSin = Math_SinS(this->actor.shape.rot.y); sp6C.x = this->actor.posRot.pos.x + (arg4 * yawSin); sp6C.z = this->actor.posRot.pos.z + (arg4 * yawCos); @@ -6274,12 +6274,12 @@ s32 func_8083F360(GlobalContext* globalCtx, Player* this, f32 arg1, f32 arg2, f3 temp1 = wallPoly->norm.x * (1.0f / 32767.0f); temp2 = wallPoly->norm.z * (1.0f / 32767.0f); - temp = atan2s(-temp2, -temp1); - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, temp, 800); + temp = Math_Atan2S(-temp2, -temp1); + Math_ScaledStepToS(&this->actor.shape.rot.y, temp, 800); this->currentYaw = this->actor.shape.rot.y; - this->actor.posRot.pos.x = sp54.x - (Math_Sins(this->actor.shape.rot.y) * arg2); - this->actor.posRot.pos.z = sp54.z - (Math_Coss(this->actor.shape.rot.y) * arg2); + this->actor.posRot.pos.x = sp54.x - (Math_SinS(this->actor.shape.rot.y) * arg2); + this->actor.posRot.pos.z = sp54.z - (Math_CosS(this->actor.shape.rot.y) * arg2); return 1; } @@ -6468,7 +6468,7 @@ s32 func_8083FD78(Player* this, f32* arg1, s16* arg2, GlobalContext* globalCtx) u16 sp2C = ABS(sp2E); if ((func_8002DD78(this) || func_808334B4(this)) && (this->unk_664 == NULL)) { - *arg1 *= Math_Sins(sp2C); + *arg1 *= Math_SinS(sp2C); if (*arg1 != 0.0f) { *arg2 = (((sp2E >= 0) ? 1 : -1) << 0xE) + this->actor.shape.rot.y; @@ -6479,7 +6479,7 @@ s32 func_8083FD78(Player* this, f32* arg1, s16* arg2, GlobalContext* globalCtx) if (this->unk_664 != NULL) { func_8083DB98(this, 1); } else { - Math_SmoothScaleMaxMinS(&this->actor.posRot2.rot.x, sControlInput->rel.stick_y * 240.0f, 14, 4000, 30); + Math_SmoothStepToS(&this->actor.posRot2.rot.x, sControlInput->rel.stick_y * 240.0f, 14, 4000, 30); func_80836AB8(this, 1); } } else { @@ -6489,7 +6489,7 @@ s32 func_8083FD78(Player* this, f32* arg1, s16* arg2, GlobalContext* globalCtx) func_8083DC54(this, globalCtx); if ((*arg1 != 0.0f) && (sp2C < 6000)) { return 1; - } else if (*arg1 > Math_Sins((0x4000 - (sp2C >> 1))) * 200.0f) { + } else if (*arg1 > Math_SinS((0x4000 - (sp2C >> 1))) * 200.0f) { return -1; } } @@ -6501,7 +6501,7 @@ s32 func_8083FD78(Player* this, f32* arg1, s16* arg2, GlobalContext* globalCtx) s32 func_8083FFB8(Player* this, f32* arg1, s16* arg2) { s16 temp1 = *arg2 - this->actor.shape.rot.y; u16 temp2 = ABS(temp1); - f32 temp3 = Math_Coss(temp2); + f32 temp3 = Math_CosS(temp2); *arg1 *= temp3; @@ -6544,7 +6544,7 @@ void func_80840138(Player* this, f32 arg1, s16 arg2) { } } - Math_ApproxF(&this->unk_870, this->unk_874, 0.3f); + Math_StepToF(&this->unk_870, this->unk_874, 0.3f); } void func_808401B0(GlobalContext* globalCtx, Player* this) { @@ -6658,7 +6658,7 @@ void func_80840450(Player* this, GlobalContext* globalCtx) { temp2 = this->unk_868; if ((temp2 < 6) || ((temp2 - 0xE) < 6)) { - Math_ApproxF(&this->linearVelocity, 0.0f, 1.5f); + Math_StepToF(&this->linearVelocity, 0.0f, 1.5f); return; } @@ -6666,16 +6666,16 @@ void func_80840450(Player* this, GlobalContext* globalCtx) { temp4 = ABS(temp3); if (temp4 > 0x4000) { - if (Math_ApproxF(&this->linearVelocity, 0.0f, 1.5f)) { + if (Math_StepToF(&this->linearVelocity, 0.0f, 1.5f)) { this->currentYaw = sp42; } return; } - func_80077C6C(&this->linearVelocity, sp44 * 0.3f, 2.0f, 1.5f); + Math_AymStepToF(&this->linearVelocity, sp44 * 0.3f, 2.0f, 1.5f); if (!(this->stateFlags3 & 8)) { - Math_ApproxUpdateScaledS(&this->currentYaw, sp42, temp4 * 0.1f); + Math_ScaledStepToS(&this->currentYaw, sp42, temp4 * 0.1f); } } } @@ -6769,7 +6769,7 @@ void func_808409CC(GlobalContext* globalCtx, Player* this) { sp38 = 8; } } else { - sp34 = Math_Rand_ZeroOne() * 5.0f; + sp34 = Rand_ZeroOne() * 5.0f; if (sp34 < 4) { if (((sp34 != 0) && (sp34 != 3)) || ((this->rightHandType == 10) && ((sp34 == 3) || Player_GetSwordHeld(this)))) { @@ -6845,7 +6845,7 @@ void func_80840BC8(Player* this, GlobalContext* globalCtx) { return; } - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, sp3A, 1200); + Math_ScaledStepToS(&this->actor.shape.rot.y, sp3A, 1200); this->currentYaw = this->actor.shape.rot.y; if (func_80833338(this) == this->skelAnime.animation) { func_8083DC54(this, globalCtx); @@ -6933,14 +6933,14 @@ void func_80840DE4(Player* this, GlobalContext* globalCtx) { temp3 = ABS(temp2); if (temp3 > 0x4000) { - if (Math_ApproxF(&this->linearVelocity, 0.0f, 1.5f)) { + if (Math_StepToF(&this->linearVelocity, 0.0f, 1.5f)) { this->currentYaw = sp42; } return; } - func_80077C6C(&this->linearVelocity, sp44 * 0.4f, 1.5f, 1.5f); - Math_ApproxUpdateScaledS(&this->currentYaw, sp42, temp3 * 0.1f); + Math_AymStepToF(&this->linearVelocity, sp44 * 0.4f, 1.5f, 1.5f); + Math_ScaledStepToS(&this->currentYaw, sp42, temp3 * 0.1f); } } @@ -7034,8 +7034,8 @@ void func_808414F8(Player* this, GlobalContext* globalCtx) { } else { sp2A = sp32 - this->currentYaw; - func_80077C6C(&this->linearVelocity, sp34 * 1.5f, 1.5f, 2.0f); - Math_ApproxUpdateScaledS(&this->currentYaw, sp32, sp2A * 0.1f); + Math_AymStepToF(&this->linearVelocity, sp34 * 1.5f, 1.5f, 2.0f); + Math_ScaledStepToS(&this->currentYaw, sp32, sp2A * 0.1f); if ((sp34 == 0.0f) && (this->linearVelocity == 0.0f)) { func_80839F30(this, globalCtx); @@ -7152,15 +7152,15 @@ void func_8084193C(Player* this, GlobalContext* globalCtx) { temp3 = ABS(temp2); if (temp3 > 0x4000) { - if (Math_ApproxF(&this->linearVelocity, 0.0f, 3.0f) != 0) { + if (Math_StepToF(&this->linearVelocity, 0.0f, 3.0f) != 0) { this->currentYaw = sp3A; } return; } sp3C *= 0.9f; - func_80077C6C(&this->linearVelocity, sp3C, 2.0f, 3.0f); - Math_ApproxUpdateScaledS(&this->currentYaw, sp3A, temp3 * 0.1f); + Math_AymStepToF(&this->linearVelocity, sp3C, 2.0f, 3.0f); + Math_ScaledStepToS(&this->currentYaw, sp3A, temp3 * 0.1f); } } @@ -7183,7 +7183,7 @@ void func_80841BA8(Player* this, GlobalContext* globalCtx) { if (sp34 != 0.0f) { this->actor.shape.rot.y = sp32; func_8083C858(this, globalCtx); - } else if (Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, sp32, this->unk_87E)) { + } else if (Math_ScaledStepToS(&this->actor.shape.rot.y, sp32, this->unk_87E)) { func_8083C0E8(this, globalCtx); } @@ -7202,7 +7202,7 @@ void func_80841CC4(Player* this, s32 arg1, GlobalContext* globalCtx) { target = CLAMP(D_80853610, -10922, 10922); } - Math_ApproxUpdateScaledS(&this->unk_89C, target, 400); + Math_ScaledStepToS(&this->unk_89C, target, 400); if ((this->modelAnimType == 3) || ((this->unk_89C == 0) && (this->unk_6C4 <= 0.0f))) { if (arg1 == 0) { @@ -7401,9 +7401,9 @@ void func_8084251C(Player* this, GlobalContext* globalCtx) { } void func_8084260C(Vec3f* src, Vec3f* dest, f32 arg2, f32 arg3, f32 arg4) { - dest->x = (Math_Rand_ZeroOne() * arg3) + src->x; - dest->y = (Math_Rand_ZeroOne() * arg4) + (src->y + arg2); - dest->z = (Math_Rand_ZeroOne() * arg3) + src->z; + dest->x = (Rand_ZeroOne() * arg3) + src->x; + dest->y = (Rand_ZeroOne() * arg4) + (src->y + arg2); + dest->z = (Rand_ZeroOne() * arg3) + src->z; } Vec3f D_808545B4 = { 0.0f, 0.0f, 0.0f }; @@ -7667,10 +7667,10 @@ void func_80843188(Player* this, GlobalContext* globalCtx) { sp50 = sControlInput->rel.stick_x * -120; sp4E = this->actor.shape.rot.y - Camera_GetInputDirYaw(ACTIVE_CAM); - sp40 = Math_Coss(sp4E); - sp4C = (Math_Sins(sp4E) * sp50) + (sp54 * sp40); - sp40 = Math_Coss(sp4E); - sp4A = (sp50 * sp40) - (Math_Sins(sp4E) * sp54); + sp40 = Math_CosS(sp4E); + sp4C = (Math_SinS(sp4E) * sp50) + (sp54 * sp40); + sp40 = Math_CosS(sp4E); + sp4A = (sp50 * sp40) - (Math_SinS(sp4E) * sp54); if (sp4C > 3500) { sp4C = 3500; @@ -7686,9 +7686,9 @@ void func_80843188(Player* this, GlobalContext* globalCtx) { sp46 = 50; } - Math_ApproxUpdateScaledS(&this->actor.posRot2.rot.x, sp4C, sp48); + Math_ScaledStepToS(&this->actor.posRot2.rot.x, sp4C, sp48); this->unk_6BC = this->actor.posRot2.rot.x; - Math_ApproxUpdateScaledS(&this->unk_6BE, sp4A, sp46); + Math_ScaledStepToS(&this->unk_6BE, sp4A, sp46); if (this->unk_84F != 0) { if (!func_80842DF4(globalCtx, this)) { @@ -7949,7 +7949,7 @@ s32 func_80843E64(GlobalContext* globalCtx, Player* this) { sp34 = this->fallDistance; } - Math_ApproxF(&this->linearVelocity, 0.0f, 1.0f); + Math_StepToF(&this->linearVelocity, 0.0f, 1.0f); this->stateFlags1 &= ~0xC0000; @@ -8146,7 +8146,7 @@ void func_80844708(Player* this, GlobalContext* globalCtx) { if (func_80842964(this, globalCtx) == 0) { if (this->unk_850 != 0) { - Math_ApproxF(&this->linearVelocity, 0.0f, 2.0f); + Math_StepToF(&this->linearVelocity, 0.0f, 2.0f); temp = func_808374A0(globalCtx, this, &this->skelAnime, 5.0f); if ((temp != 0) && ((temp > 0) || sp44)) { @@ -8212,7 +8212,7 @@ void func_80844A44(Player* this, GlobalContext* globalCtx) { func_80832284(globalCtx, this, &D_04003160); } - Math_ApproxF(&this->linearVelocity, 0.0f, 0.05f); + Math_StepToF(&this->linearVelocity, 0.0f, 0.05f); if (this->actor.bgCheckFlags & 1) { this->actor.colChkInfo.damage = 0x10; @@ -8298,7 +8298,7 @@ void func_80844DC8(Player* this, GlobalContext* globalCtx) { } void func_80844E3C(Player* this) { - Math_ApproxF(&this->unk_858, 1.0f, 0.02f); + Math_StepToF(&this->unk_858, 1.0f, 0.02f); } void func_80844E68(Player* this, GlobalContext* globalCtx) { @@ -8394,14 +8394,14 @@ void func_80845000(Player* this, GlobalContext* globalCtx) { sp44 = ABS(temp5); if (sp44 > 0x4000) { - if (Math_ApproxF(&this->linearVelocity, 0.0f, 1.0f)) { + if (Math_StepToF(&this->linearVelocity, 0.0f, 1.0f)) { this->currentYaw = sp52; } return; } - func_80077C6C(&this->linearVelocity, sp54 * 0.2f, 1.0f, 0.5f); - Math_ApproxUpdateScaledS(&this->currentYaw, sp52, sp44 * 0.1f); + Math_AymStepToF(&this->linearVelocity, sp54 * 0.2f, 1.0f, 0.5f); + Math_ScaledStepToS(&this->currentYaw, sp52, sp44 * 0.1f); if ((sp54 == 0.0f) && (this->linearVelocity == 0.0f)) { func_80844DC8(this, globalCtx); @@ -8462,14 +8462,14 @@ void func_80845308(Player* this, GlobalContext* globalCtx) { sp44 = ABS(temp5); if (sp44 > 0x4000) { - if (Math_ApproxF(&this->linearVelocity, 0.0f, 1.0f)) { + if (Math_StepToF(&this->linearVelocity, 0.0f, 1.0f)) { this->currentYaw = sp52; } return; } - func_80077C6C(&this->linearVelocity, sp54 * 0.2f, 1.0f, 0.5f); - Math_ApproxUpdateScaledS(&this->currentYaw, sp52, sp44 * 0.1f); + Math_AymStepToF(&this->linearVelocity, sp54 * 0.2f, 1.0f, 0.5f); + Math_ScaledStepToS(&this->currentYaw, sp52, sp44 * 0.1f); if ((sp54 == 0.0f) && (this->linearVelocity == 0.0f) && (sp5C == 0.0f)) { func_80844DC8(this, globalCtx); @@ -8547,7 +8547,7 @@ void func_80845668(Player* this, GlobalContext* globalCtx) { func_80832854(this); this->unk_850 = 1; } - Math_ApproxF(&this->actor.shape.unk_08, 0.0f, 150.0f); + Math_StepToF(&this->actor.shape.unk_08, 0.0f, 150.0f); } } } @@ -8574,7 +8574,7 @@ s32 func_80845964(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2 f32 sp28 = sqrtf(SQ(selfDistX) + SQ(selfDistZ)) / sp34; s32 sp24 = (arg2->endFrame - globalCtx->csCtx.frames) + 1; - arg4 = atan2s(selfDistZ, selfDistX); + arg4 = Math_Atan2S(selfDistZ, selfDistX); if (arg5 == 1) { f32 distX = arg2->endPos.x - arg2->startPos.x; @@ -8662,8 +8662,8 @@ void func_80845CA4(Player* this, GlobalContext* globalCtx) { sp34 = gSaveContext.entranceSpeed; if (D_808535F4 != 0) { - this->unk_450.x = (Math_Sins(D_808535FC) * 400.0f) + this->actor.posRot.pos.x; - this->unk_450.z = (Math_Coss(D_808535FC) * 400.0f) + this->actor.posRot.pos.z; + this->unk_450.x = (Math_SinS(D_808535FC) * 400.0f) + this->actor.posRot.pos.x; + this->unk_450.z = (Math_CosS(D_808535FC) * 400.0f) + this->actor.posRot.pos.z; } } else if (this->unk_850 < 0) { this->unk_850++; @@ -8744,7 +8744,7 @@ void func_80846050(Player* this, GlobalContext* globalCtx) { return; } - Math_ApproxUpdateScaledS(&this->unk_3BC.y, 0, 4000); + Math_ScaledStepToS(&this->unk_3BC.y, 0, 4000); } struct_80832924 D_8085461C[] = { @@ -8773,8 +8773,8 @@ void func_80846120(Player* this, GlobalContext* globalCtx) { if (func_800A4530(&this->skelAnime, 229.0f)) { Actor* heldActor = this->heldActor; - heldActor->speedXZ = Math_Sins(heldActor->shape.rot.x) * 40.0f; - heldActor->velocity.y = Math_Coss(heldActor->shape.rot.x) * 40.0f; + heldActor->speedXZ = Math_SinS(heldActor->shape.rot.x) * 40.0f; + heldActor->velocity.y = Math_CosS(heldActor->shape.rot.x) * 40.0f; heldActor->gravity = -2.0f; heldActor->minVelocityY = -30.0f; func_808323B4(globalCtx, this); @@ -9169,7 +9169,7 @@ void func_808471F4(s16* pValue) { step = (ABS(*pValue) * 100.0f) / 1000.0f; step = CLAMP(step, 400, 4000); - Math_ApproxUpdateScaledS(pValue, 0, step); + Math_ScaledStepToS(pValue, 0, step); } void func_80847298(Player* this) { @@ -9486,7 +9486,7 @@ void func_80847BA0(GlobalContext* globalCtx, Player* this) { if (this->actor.wallPoly != spA0) { this->actor.wallPoly = spA0; this->actor.wallPolySource = sp9C; - this->actor.wallPolyRot = atan2s(spA0->norm.z, spA0->norm.x); + this->actor.wallPolyRot = Math_Atan2S(spA0->norm.z, spA0->norm.x); } } @@ -9543,7 +9543,8 @@ void func_80847BA0(GlobalContext* globalCtx, Player* this) { D_80854798.y = (sp64 + 5.0f) - this->actor.posRot.pos.y; if (func_80839768(globalCtx, this, &D_80854798, &sp78, &sp74, &D_80858AA8) && - (temp3 = this->actor.wallPolyRot - atan2s(sp78->norm.z, sp78->norm.x), ABS(temp3) < 0x4000) && + (temp3 = this->actor.wallPolyRot - Math_Atan2S(sp78->norm.z, sp78->norm.x), + ABS(temp3) < 0x4000) && !func_80041E18(&globalCtx->colCtx, sp78, sp74)) { this->wallHeight = 399.96002f; } else if (func_80041DE4(&globalCtx->colCtx, wallPoly, this->actor.wallPolySource) == 0) { @@ -9598,16 +9599,16 @@ void func_80847BA0(GlobalContext* globalCtx, Player* this) { sp54 = 1.0f / (spC0->norm.y * (1.0f / 32767.0f)); sp50 = spC0->norm.z * (1.0f / 32767.0f); - sp4C = Math_Sins(this->currentYaw); - sp44 = Math_Coss(this->currentYaw); + sp4C = Math_SinS(this->currentYaw); + sp44 = Math_CosS(this->currentYaw); - this->unk_898 = atan2s(1.0f, (-(sp58 * sp4C) - (sp50 * sp44)) * sp54); - this->unk_89A = atan2s(1.0f, (-(sp58 * sp44) - (sp50 * sp4C)) * sp54); + this->unk_898 = Math_Atan2S(1.0f, (-(sp58 * sp4C) - (sp50 * sp44)) * sp54); + this->unk_89A = Math_Atan2S(1.0f, (-(sp58 * sp44) - (sp50 * sp4C)) * sp54); - sp4C = Math_Sins(this->actor.shape.rot.y); - sp44 = Math_Coss(this->actor.shape.rot.y); + sp4C = Math_SinS(this->actor.shape.rot.y); + sp44 = Math_CosS(this->actor.shape.rot.y); - D_80853610 = atan2s(1.0f, (-(sp58 * sp4C) - (sp50 * sp44)) * sp54); + D_80853610 = Math_Atan2S(1.0f, (-(sp58 * sp4C) - (sp50 * sp44)) * sp54); func_8083E318(globalCtx, this, spC0); } @@ -9758,10 +9759,10 @@ void func_80848B44(GlobalContext* globalCtx, Player* this) { shockScale = 40; } - randBodyPart = this->bodyPartsPos + (s32)Math_Rand_ZeroFloat(17.9f); - shockPos.x = (Math_Rand_CenteredFloat(5.0f) + randBodyPart->x) - this->actor.posRot.pos.x; - shockPos.y = (Math_Rand_CenteredFloat(5.0f) + randBodyPart->y) - this->actor.posRot.pos.y; - shockPos.z = (Math_Rand_CenteredFloat(5.0f) + randBodyPart->z) - this->actor.posRot.pos.z; + randBodyPart = this->bodyPartsPos + (s32)Rand_ZeroFloat(17.9f); + shockPos.x = (Rand_CenteredFloat(5.0f) + randBodyPart->x) - this->actor.posRot.pos.x; + shockPos.y = (Rand_CenteredFloat(5.0f) + randBodyPart->y) - this->actor.posRot.pos.y; + shockPos.z = (Rand_CenteredFloat(5.0f) + randBodyPart->z) - this->actor.posRot.pos.z; EffectSsFhgFlash_SpawnShock(globalCtx, &this->actor, &shockPos, shockScale, FHGFLASH_SHOCK_PLAYER); func_8002F8F0(&this->actor, NA_SE_PL_SPARK - SFX_FLAG); @@ -9974,7 +9975,7 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { this->unk_844--; } - Math_ApproxUpdateScaledS(&this->unk_6C2, 0, 400); + Math_ScaledStepToS(&this->unk_6C2, 0, 400); func_80032CB4(this->unk_3A8, 20, 80, 6); this->actor.shape.unk_06 = this->unk_3A8[0] + ((globalCtx->gameplayFrames & 32) ? 0 : 3); @@ -10000,7 +10001,7 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { sp6E += 0x8000; } - if (Math_ApproxF(&this->actor.speedXZ, sp70, 0.35f) && (sp70 == 0.0f)) { + if (Math_StepToF(&this->actor.speedXZ, sp70, 0.35f) && (sp70 == 0.0f)) { this->actor.posRot.rot.y = this->currentYaw; } @@ -10010,7 +10011,7 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { phi_v0 = (fabsf(this->linearVelocity) * 700.0f) - (fabsf(this->actor.speedXZ) * 100.0f); phi_v0 = CLAMP(phi_v0, 0, 1350); - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, sp6E, phi_v0); + Math_ScaledStepToS(&this->actor.posRot.rot.y, sp6E, phi_v0); } if ((this->linearVelocity == 0.0f) && (this->actor.speedXZ != 0.0f)) { @@ -10025,8 +10026,8 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { if ((this->windSpeed != 0.0f) && !Player_InCsMode(globalCtx) && !(this->stateFlags1 & 0x206000) && (func_80845668 != this->func_674) && (func_808507F4 != this->func_674)) { - this->actor.velocity.x += this->windSpeed * Math_Sins(this->windDirection); - this->actor.velocity.z += this->windSpeed * Math_Coss(this->windDirection); + this->actor.velocity.x += this->windSpeed * Math_SinS(this->windDirection); + this->actor.velocity.z += this->windSpeed * Math_CosS(this->windDirection); } func_8002D7EC(&this->actor); @@ -10076,12 +10077,12 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { sp48 = D_8085482C[D_808535F4]; } - Math_ApproxF(&this->windSpeed, sp48, sp48 * 0.1f); + Math_StepToF(&this->windSpeed, sp48, sp48 * 0.1f); - Math_ApproxUpdateScaledS(&this->windDirection, D_808535FC, + Math_ScaledStepToS(&this->windDirection, D_808535FC, ((this->stateFlags1 & 0x8000000) ? 400.0f : 800.0f) * sp48); } else if (this->windSpeed != 0.0f) { - Math_ApproxF(&this->windSpeed, 0.0f, (this->stateFlags1 & 0x8000000) ? 0.5f : 1.0f); + Math_StepToF(&this->windSpeed, 0.0f, (this->stateFlags1 & 0x8000000) ? 0.5f : 1.0f); } if (!Player_InBlockingCsMode(globalCtx, this) && !(this->stateFlags2 & 0x40000)) { @@ -10372,7 +10373,7 @@ void func_8084A0E8(GlobalContext* globalCtx, Player* this, s32 lod, Gfx* cullDLi D_8085486C = (-sp5C * 4) + 36; D_8085486C = D_8085486C * D_8085486C; - D_8085486C = (s32)((Math_Coss(D_8085486C) * 100.0f) + 100.0f) + 55.0f; + D_8085486C = (s32)((Math_CosS(D_8085486C) * 100.0f) + 100.0f) + 55.0f; D_8085486C = D_8085486C * (sp5C * 0.11111111f); } @@ -10419,7 +10420,7 @@ void Player_Draw(Actor* thisx, GlobalContext* globalCtx) { if (this->invincibilityTimer > 0) { this->unk_88F += CLAMP(50 - this->invincibilityTimer, 8, 40); POLY_OPA_DISP = - Gfx_SetFog2(POLY_OPA_DISP, 255, 0, 0, 0, 0, 4000 - (s32)(Math_Coss(this->unk_88F * 256) * 2000.0f)); + Gfx_SetFog2(POLY_OPA_DISP, 255, 0, 0, 0, 0, 4000 - (s32)(Math_CosS(this->unk_88F * 256) * 2000.0f)); } func_8002EBCC(&this->actor, globalCtx, 0); @@ -10512,7 +10513,7 @@ s16 func_8084ABD8(GlobalContext* globalCtx, Player* this, s32 arg2, s16 arg3) { if (!func_8002DD78(this) && !func_808334B4(this) && (arg2 == 0)) { temp2 = sControlInput->rel.stick_y * 240.0f; - Math_SmoothScaleMaxMinS(&this->actor.posRot2.rot.x, temp2, 14, 4000, 30); + Math_SmoothStepToS(&this->actor.posRot2.rot.x, temp2, 14, 4000, 30); temp2 = sControlInput->rel.stick_x * -16.0f; temp2 = CLAMP(temp2, -3000, 3000); @@ -10520,14 +10521,14 @@ s16 func_8084ABD8(GlobalContext* globalCtx, Player* this, s32 arg2, s16 arg3) { } else { temp1 = (this->stateFlags1 & 0x800000) ? 3500 : 14000; temp3 = ((sControlInput->rel.stick_y >= 0) ? 1 : -1) * - (s32)((1.0f - Math_Coss(sControlInput->rel.stick_y * 200)) * 1500.0f); + (s32)((1.0f - Math_CosS(sControlInput->rel.stick_y * 200)) * 1500.0f); this->actor.posRot2.rot.x += temp3; this->actor.posRot2.rot.x = CLAMP(this->actor.posRot2.rot.x, -temp1, temp1); temp1 = 19114; temp2 = this->actor.posRot2.rot.y - this->actor.shape.rot.y; temp3 = ((sControlInput->rel.stick_x >= 0) ? 1 : -1) * - (s32)((1.0f - Math_Coss(sControlInput->rel.stick_x * 200)) * -1500.0f); + (s32)((1.0f - Math_CosS(sControlInput->rel.stick_x * 200)) * -1500.0f); temp2 += temp3; this->actor.posRot2.rot.y = CLAMP(temp2, -temp1, temp1) + this->actor.shape.rot.y; } @@ -10555,8 +10556,8 @@ void func_8084AEEC(Player* this, f32* arg1, f32 arg2, s16 arg3) { arg2 = 0.0f; } - func_80077C6C(arg1, arg2 * 0.8f, temp1, (fabsf(*arg1) * 0.02f) + 0.05f); - Math_ApproxUpdateScaledS(&this->currentYaw, arg3, 1600); + Math_AymStepToF(arg1, arg2 * 0.8f, temp1, (fabsf(*arg1) * 0.02f) + 0.05f); + Math_ScaledStepToS(&this->currentYaw, arg3, 1600); } void func_8084B000(Player* this) { @@ -10912,7 +10913,7 @@ void func_8084BBE4(Player* this, GlobalContext* globalCtx) { } } - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, this->currentYaw, 0x800); + Math_ScaledStepToS(&this->actor.shape.rot.y, this->currentYaw, 0x800); if (this->unk_84F != 0) { func_80837268(this, &sp3C, &sp3A, 0.0f, globalCtx); @@ -11347,7 +11348,7 @@ void func_8084CC98(Player* this, GlobalContext* globalCtx) { if ((rideActor->unk_210 != this->unk_850) && ((rideActor->unk_210 >= 2) || (this->unk_850 >= 2))) { if ((this->unk_850 = rideActor->unk_210) < 2) { - f32 rand = Math_Rand_ZeroOne(); + f32 rand = Rand_ZeroOne(); s32 temp = 0; this->unk_850 = 1; @@ -11565,7 +11566,7 @@ void func_8084D610(Player* this, GlobalContext* globalCtx) { if (sp34 != 0.0f) { s16 temp = this->actor.shape.rot.y - sp32; - if ((ABS(temp) > 0x6000) && !Math_ApproxF(&this->linearVelocity, 0.0f, 1.0f)) { + if ((ABS(temp) > 0x6000) && !Math_StepToF(&this->linearVelocity, 0.0f, 1.0f)) { return; } @@ -11628,7 +11629,7 @@ s32 func_8084D980(GlobalContext* globalCtx, Player* this, f32* arg2, s16* arg3) if (ABS(temp1) > 0x6000) { anim = &D_04003328; - if (Math_ApproxF(&this->linearVelocity, 0.0f, 1.0f)) { + if (Math_StepToF(&this->linearVelocity, 0.0f, 1.0f)) { this->currentYaw = *arg3; } else { *arg2 = 0.0f; @@ -11740,7 +11741,7 @@ void func_8084DC48(Player* this, GlobalContext* globalCtx) { } func_8084B158(globalCtx, this, sControlInput, fabsf(this->actor.velocity.y)); - Math_ApproxUpdateScaledS(&this->unk_6C2, -10000, 800); + Math_ScaledStepToS(&this->unk_6C2, -10000, 800); if (sp2C > 8.0f) { sp2C = 8.0f; @@ -11992,7 +11993,7 @@ void func_8084E6D4(Player* this, GlobalContext* globalCtx) { } if (this->skelAnime.animation == &D_04002788) { - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, Camera_GetCamDirYaw(ACTIVE_CAM) + 0x8000, 4000); + Math_ScaledStepToS(&this->actor.shape.rot.y, Camera_GetCamDirYaw(ACTIVE_CAM) + 0x8000, 4000); } if (func_800A4530(&this->skelAnime, 21.0f)) { @@ -12046,7 +12047,7 @@ void func_8084EAC0(Player* this, GlobalContext* globalCtx) { if (func_800A3BC0(globalCtx, &this->skelAnime)) { if (this->unk_850 == 0) { if (this->itemActionParam == PLAYER_AP_BOTTLE_POE) { - s32 rand = Math_Rand_S16Offset(-1, 3); + s32 rand = Rand_S16Offset(-1, 3); if (rand == 0) { rand = 3; @@ -12208,8 +12209,8 @@ void func_8084EFC0(Player* this, GlobalContext* globalCtx) { BottleDropInfo* dropInfo = &D_80854A28[this->itemActionParam - PLAYER_AP_BOTTLE_FISH]; Actor_Spawn(&globalCtx->actorCtx, globalCtx, dropInfo->actorId, - (Math_Sins(this->actor.shape.rot.y) * 5.0f) + this->leftHandPos.x, this->leftHandPos.y, - (Math_Coss(this->actor.shape.rot.y) * 5.0f) + this->leftHandPos.z, 0x4000, this->actor.shape.rot.y, + (Math_SinS(this->actor.shape.rot.y) * 5.0f) + this->leftHandPos.x, this->leftHandPos.y, + (Math_CosS(this->actor.shape.rot.y) * 5.0f) + this->leftHandPos.z, 0x4000, this->actor.shape.rot.y, 0, dropInfo->actorParams); Player_UpdateBottleHeld(globalCtx, this, ITEM_BOTTLE, PLAYER_AP_BOTTLE); @@ -12340,7 +12341,7 @@ void func_8084F390(Player* this, GlobalContext* globalCtx) { sp4C = 1.0f; } - if (func_80077C6C(&this->linearVelocity, sp50, sp4C, sp48) && (sp50 == 0)) { + if (Math_AymStepToF(&this->linearVelocity, sp50, sp4C, sp48) && (sp50 == 0)) { LinkAnimationHeader* anim; if (this->unk_84F == 0) { anim = D_80853D04[this->modelAnimType]; @@ -12350,8 +12351,8 @@ void func_8084F390(Player* this, GlobalContext* globalCtx) { func_8083A098(this, anim, globalCtx); } - Math_SmoothScaleMaxMinS(&this->currentYaw, sp46, 10, 4000, 800); - Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, sp44, 2000); + Math_SmoothStepToS(&this->currentYaw, sp46, 10, 4000, 800); + Math_ScaledStepToS(&this->actor.shape.rot.y, sp44, 2000); } } @@ -12390,7 +12391,7 @@ void func_8084F710(Player* this, GlobalContext* globalCtx) { func_80853080(this, globalCtx); } } - Math_SmoothScaleMaxMinF(&this->actor.velocity.y, 2.0f, 0.3f, 8.0f, 0.5f); + Math_SmoothStepToF(&this->actor.velocity.y, 2.0f, 0.3f, 8.0f, 0.5f); } if ((globalCtx->sceneNum == SCENE_KENJYANOMA) && func_8083ADD4(globalCtx, this)) { @@ -12444,7 +12445,7 @@ void func_8084F9C0(Player* this, GlobalContext* globalCtx) { if (this->actor.velocity.y < 0.0f) { func_80837B9C(this, globalCtx); } else if (this->actor.velocity.y < 6.0f) { - Math_ApproxF(&this->linearVelocity, 3.0f, 0.5f); + Math_StepToF(&this->linearVelocity, 3.0f, 0.5f); } } @@ -12551,8 +12552,8 @@ s32 func_8084FCAC(Player* this, GlobalContext* globalCtx) { angle = temp - 0x4000; } - this->actor.posRot.pos.x += speed * Math_Sins(angle); - this->actor.posRot.pos.z += speed * Math_Coss(angle); + this->actor.posRot.pos.x += speed * Math_SinS(angle); + this->actor.posRot.pos.z += speed * Math_CosS(angle); } } @@ -12603,8 +12604,8 @@ void func_8085002C(Player* this) { sp26 = this->actor.posRot.rot.y - this->actor.shape.rot.y; - sp28 = this->actor.speedXZ * -200.0f * Math_Coss(sp26) * (Math_Rand_CenteredFloat(2.0f) + 10.0f); - sp2A = this->actor.speedXZ * 100.0f * Math_Sins(sp26) * (Math_Rand_CenteredFloat(2.0f) + 10.0f); + sp28 = this->actor.speedXZ * -200.0f * Math_CosS(sp26) * (Rand_CenteredFloat(2.0f) + 10.0f); + sp2A = this->actor.speedXZ * 100.0f * Math_SinS(sp26) * (Rand_CenteredFloat(2.0f) + 10.0f); D_80858AC8.unk_06 += sp28 >> 2; D_80858AC8.unk_08 += sp2A >> 2; @@ -12674,7 +12675,7 @@ void func_808502D0(Player* this, GlobalContext* globalCtx) { func_8084269C(globalCtx, this); } - Math_ApproxF(&this->linearVelocity, 0.0f, 5.0f); + Math_StepToF(&this->linearVelocity, 0.0f, 5.0f); func_8083C50C(this); if (func_800A3BC0(globalCtx, &this->skelAnime)) { @@ -12709,7 +12710,7 @@ void func_808502D0(Player* this, GlobalContext* globalCtx) { shockwavePos.y = func_8083973C(globalCtx, this, &D_80854A40, &shockwavePos); sp2C = this->actor.posRot.pos.y - shockwavePos.y; - Math_ApproxUpdateScaledS(&this->actor.posRot2.rot.x, atan2s(45.0f, sp2C), 800); + Math_ScaledStepToS(&this->actor.posRot2.rot.x, Math_Atan2S(45.0f, sp2C), 800); func_80836AB8(this, 1); if ((((this->swordAnimation == 0x16) && func_800A4530(&this->skelAnime, 7.0f)) || @@ -12924,7 +12925,7 @@ void func_80850AEC(Player* this, GlobalContext* globalCtx) { if ((this->skelAnime.animation != &D_04002C90) || (4.0f <= this->skelAnime.animCurrentFrame)) { this->actor.gravity = 0.0f; - Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, this->actor.posRot.rot.x, 0x800); + Math_ScaledStepToS(&this->actor.shape.rot.x, this->actor.posRot.rot.x, 0x800); func_8083264C(this, 100, 2, 100, 0); } } @@ -13165,7 +13166,7 @@ void func_808513BC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg this->unk_84F = 1; } else { func_8084B158(globalCtx, this, NULL, fabsf(this->actor.velocity.y)); - Math_ApproxUpdateScaledS(&this->unk_6C2, -10000, 800); + Math_ScaledStepToS(&this->unk_6C2, -10000, 800); func_8084AEEC(this, &this->actor.velocity.y, 4.0f, this->currentYaw); } return; @@ -13432,12 +13433,12 @@ void func_80851D80(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg void func_80851DEC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { func_800A3BC0(globalCtx, &this->skelAnime); - Math_ApproxS(&this->actor.shape.unk_06, 0, 1); + Math_StepToS(&this->actor.shape.unk_06, 0, 1); } void func_80851E28(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { func_800A3BC0(globalCtx, &this->skelAnime); - Math_ApproxS(&this->actor.shape.unk_06, 2, 1); + Math_StepToS(&this->actor.shape.unk_06, 2, 1); } void func_80851E64(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { @@ -13705,9 +13706,9 @@ void func_808526EC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg ptr = D_80855210[gSaveContext.linkAge]; - sp34.x = ptr[0].x + Math_Rand_CenteredFloat(ptr[1].x); - sp34.y = ptr[0].y + Math_Rand_CenteredFloat(ptr[1].y); - sp34.z = ptr[0].z + Math_Rand_CenteredFloat(ptr[1].z); + sp34.x = ptr[0].x + Rand_CenteredFloat(ptr[1].x); + sp34.y = ptr[0].y + Rand_CenteredFloat(ptr[1].y); + sp34.z = ptr[0].z + Rand_CenteredFloat(ptr[1].z); SkinMatrix_Vec3fMtxFMultXYZ(&this->shieldMf, &sp34, &sparklePos); diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c index eb0d9829a3..4bf0ee5d08 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c +++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c @@ -80,7 +80,7 @@ void EffectSsBlast_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { } void EffectSsBlast_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { - Math_ApproxS(&this->rPrimColorA, 0, this->rAlphaTarget); + Math_StepToS(&this->rPrimColorA, 0, this->rAlphaTarget); this->rScale += this->rScaleStep; if (this->rScaleStep != 0) { diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c index 03d0707386..4f4f0626de 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c @@ -92,6 +92,6 @@ void EffectSsBomb_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { this->rTexIdx = 3; } - this->accel.x = ((Math_Rand_ZeroOne() * 0.4f) - 0.2f); - this->accel.z = ((Math_Rand_ZeroOne() * 0.4f) - 0.2f); + this->accel.x = ((Rand_ZeroOne() * 0.4f) - 0.2f); + this->accel.z = ((Rand_ZeroOne() * 0.4f) - 0.2f); } diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c index ad56cb8b72..bf3c63f30d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c @@ -24,17 +24,16 @@ extern Gfx D_0401A160[]; u32 EffectSsBubble_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { EffectSsBubbleInitParams* initParams = (EffectSsBubbleInitParams*)initParamsx; - // @bug Math_Rand_ZeroOne in the macro means a random number is generated for both parts of the macro. + // @bug Rand_ZeroOne in the macro means a random number is generated for both parts of the macro. // In the base game this works out because both addresses are segment 4, but it may break if // the addresses were changed to refer to different segments - this->gfx = SEGMENTED_TO_VIRTUAL(Math_Rand_ZeroOne() < 0.5f ? &D_04055DB0 : &D_04055EB0); - this->pos.x = ((Math_Rand_ZeroOne() - 0.5f) * initParams->xzPosRandScale) + initParams->pos.x; - this->pos.y = - (((Math_Rand_ZeroOne() - 0.5f) * initParams->yPosRandScale) + initParams->yPosOffset) + initParams->pos.y; - this->pos.z = ((Math_Rand_ZeroOne() - 0.5f) * initParams->xzPosRandScale) + initParams->pos.z; + this->gfx = SEGMENTED_TO_VIRTUAL(Rand_ZeroOne() < 0.5f ? &D_04055DB0 : &D_04055EB0); + this->pos.x = ((Rand_ZeroOne() - 0.5f) * initParams->xzPosRandScale) + initParams->pos.x; + this->pos.y = (((Rand_ZeroOne() - 0.5f) * initParams->yPosRandScale) + initParams->yPosOffset) + initParams->pos.y; + this->pos.z = ((Rand_ZeroOne() - 0.5f) * initParams->xzPosRandScale) + initParams->pos.z; Math_Vec3f_Copy(&this->vec, &this->pos); this->life = 1; - this->rScale = (((Math_Rand_ZeroOne() * 0.5f) + 1.0f) * initParams->scale) * 100; + this->rScale = (((Rand_ZeroOne() * 0.5f) + 1.0f) * initParams->scale) * 100; this->draw = EffectSsBubble_Draw; this->update = EffectSsBubble_Update; @@ -81,8 +80,8 @@ void EffectSsBubble_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) this->life = -1; } else { this->life++; - this->pos.x = ((Math_Rand_ZeroOne() * 0.5f) - 0.25f) + this->vec.x; - this->accel.y = (Math_Rand_ZeroOne() - 0.3f) * 0.2f; - this->pos.z = ((Math_Rand_ZeroOne() * 0.5f) - 0.25f) + this->vec.z; + this->pos.x = ((Rand_ZeroOne() * 0.5f) - 0.25f) + this->vec.x; + this->accel.y = (Rand_ZeroOne() - 0.3f) * 0.2f; + this->pos.z = ((Rand_ZeroOne() * 0.5f) - 0.25f) + this->vec.z; } } diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c index 42d3a50a3e..a2c365308c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c @@ -75,12 +75,12 @@ u32 EffectSsDeadDd_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, voi this->update = EffectSsDeadDd_Update; for (i = initParams->randIter; i > 0; i--) { - this->pos.x = ((Math_Rand_ZeroOne() - 0.5f) * initParams->randPosScale) + initParams->pos.x; - this->pos.y = ((Math_Rand_ZeroOne() - 0.5f) * initParams->randPosScale) + initParams->pos.y; - this->pos.z = ((Math_Rand_ZeroOne() - 0.5f) * initParams->randPosScale) + initParams->pos.z; - this->accel.x = this->velocity.x = (Math_Rand_ZeroOne() - 0.5f) * 2.0f; - this->accel.y = this->velocity.y = (Math_Rand_ZeroOne() - 0.5f) * 2.0f; - this->accel.z = this->velocity.z = (Math_Rand_ZeroOne() - 0.5f) * 2.0f; + this->pos.x = ((Rand_ZeroOne() - 0.5f) * initParams->randPosScale) + initParams->pos.x; + this->pos.y = ((Rand_ZeroOne() - 0.5f) * initParams->randPosScale) + initParams->pos.y; + this->pos.z = ((Rand_ZeroOne() - 0.5f) * initParams->randPosScale) + initParams->pos.z; + this->accel.x = this->velocity.x = (Rand_ZeroOne() - 0.5f) * 2.0f; + this->accel.y = this->velocity.y = (Rand_ZeroOne() - 0.5f) * 2.0f; + this->accel.z = this->velocity.z = (Rand_ZeroOne() - 0.5f) * 2.0f; } } else { osSyncPrintf("Effect_SS_Dd_disp_mode():mode_swが変です。\n"); diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c index e044635384..8163886a42 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c @@ -37,10 +37,10 @@ extern Gfx D_0401A160[]; u32 EffectSsDtBubble_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { EffectSsDtBubbleInitParams* initParams = (EffectSsDtBubbleInitParams*)initParamsx; - // @bug Math_Rand_ZeroOne in the macro means a random number is generated for both parts of the macro. + // @bug Rand_ZeroOne in the macro means a random number is generated for both parts of the macro. // In the base game this works out because both addresses are segment 4, but it may break if // the addresses were changed to refer to different segments - this->gfx = SEGMENTED_TO_VIRTUAL(Math_Rand_ZeroOne() < 0.5f ? &D_04055DB0 : &D_04055EB0); + this->gfx = SEGMENTED_TO_VIRTUAL(Rand_ZeroOne() < 0.5f ? &D_04055DB0 : &D_04055EB0); this->pos = initParams->pos; this->velocity = initParams->velocity; this->accel = initParams->accel; @@ -101,10 +101,10 @@ void EffectSsDtBubble_Update(GlobalContext* globalCtx, u32 index, EffectSs* this f32 rand; if (this->rRandXZ == 1) { - rand = Math_Rand_ZeroOne(); + rand = Rand_ZeroOne(); this->pos.x += (rand * 2.0f) - 1.0f; - rand = Math_Rand_ZeroOne(); + rand = Rand_ZeroOne(); this->pos.z += (rand * 2.0f) - 1.0f; } } diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c index e8bcc5211b..ee7fc4a229 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c @@ -50,7 +50,7 @@ u32 EffectSsDust_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* this->draw = EffectSsDust_Draw; if (initParams->drawFlags & 4) { - randColorOffset = Math_Rand_ZeroOne() * 20.0f - 10.0f; + randColorOffset = Rand_ZeroOne() * 20.0f - 10.0f; this->rPrimColorR = initParams->primColor.r + randColorOffset; this->rPrimColorG = initParams->primColor.g + randColorOffset; this->rPrimColorB = initParams->primColor.b + randColorOffset; @@ -131,8 +131,8 @@ void EffectSsDust_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { } void EffectSsDust_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { - this->accel.x = (Math_Rand_ZeroOne() * 0.4f) - 0.2f; - this->accel.z = (Math_Rand_ZeroOne() * 0.4f) - 0.2f; + this->accel.x = (Rand_ZeroOne() * 0.4f) - 0.2f; + this->accel.z = (Rand_ZeroOne() * 0.4f) - 0.2f; if ((this->life <= this->rLifespan) && (this->life >= (this->rLifespan - 7))) { if (this->rLifespan >= 5) { @@ -149,8 +149,8 @@ void EffectSsDust_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { // this update mode is unused in the original game void EffectSsBlast_UpdateFire(GlobalContext* globalCtx, u32 index, EffectSs* this) { - this->accel.x = (Math_Rand_ZeroOne() * 0.4f) - 0.2f; - this->accel.z = (Math_Rand_ZeroOne() * 0.4f) - 0.2f; + this->accel.x = (Rand_ZeroOne() * 0.4f) - 0.2f; + this->accel.z = (Rand_ZeroOne() * 0.4f) - 0.2f; switch (this->rTexIdx) { case 0: diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c index e5344412dc..7fac9d0ce2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c @@ -38,7 +38,7 @@ u32 EffectSsEnFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, voi this->life = 20; this->rLifespan = this->life; this->actor = initParams->actor; - this->rScroll = Math_Rand_ZeroOne() * 20.0f; + this->rScroll = Rand_ZeroOne() * 20.0f; this->draw = EffectSsEnFire_Draw; this->update = EffectSsEnFire_Update; this->rUnused = -15; @@ -78,7 +78,7 @@ void EffectSsEnFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { camYaw = (Camera_GetCamDirYaw(ACTIVE_CAM) + 0x8000); Matrix_RotateY(camYaw * 0.0000958738f, MTXMODE_APPLY); - scale = Math_Sins(this->life * 0x333) * (this->rScale * 0.00005f); + scale = Math_SinS(this->life * 0x333) * (this->rScale * 0.00005f); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_en_fire.c", 180), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -124,7 +124,7 @@ void EffectSsEnFire_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) this->life++; } if (this->actor->update != NULL) { - Math_SmoothScaleMaxMinS(&this->rScale, this->rScaleMax, 1, this->rScaleMax >> 3, 0); + Math_SmoothStepToS(&this->rScale, this->rScaleMax, 1, this->rScaleMax >> 3, 0); if (this->rBodyPart < 0) { Matrix_Translate(this->actor->posRot.pos.x, this->actor->posRot.pos.y, this->actor->posRot.pos.z, diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c index 8bc45ff012..0e5caa4840 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c @@ -57,7 +57,7 @@ u32 EffectSsEnIce_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void this->rEnvColorG = initParams->envColor.g; this->rEnvColorB = initParams->envColor.b; this->rAlphaMode = 1; - this->rPitch = Math_Rand_CenteredFloat(65536.0f); + this->rPitch = Rand_CenteredFloat(65536.0f); } else if (initParams->type == 1) { this->pos = initParams->pos; this->vec = initParams->pos; @@ -68,7 +68,7 @@ u32 EffectSsEnIce_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void this->update = EffectSsEnIce_Update; this->rLifespan = initParams->life; this->rScale = initParams->scale * 100.0f; - this->rYaw = atan2s(initParams->velocity.z, initParams->velocity.x); + this->rYaw = Math_Atan2S(initParams->velocity.z, initParams->velocity.x); this->rPitch = 0; this->rPrimColorR = initParams->primColor.r; this->rPrimColorG = initParams->primColor.g; @@ -144,18 +144,16 @@ void EffectSsEnIce_UpdateFlying(GlobalContext* globalCtx, u32 index, EffectSs* t this->pos.z = this->actor->posRot.pos.z + this->vec.z; this->life++; } else if (this->life == 9) { - this->accel.x = - Math_Sins(Math_Vec3f_Yaw(&this->actor->posRot.pos, &this->pos)) * (Math_Rand_ZeroOne() + 1.0f); - this->accel.z = - Math_Coss(Math_Vec3f_Yaw(&this->actor->posRot.pos, &this->pos)) * (Math_Rand_ZeroOne() + 1.0f); + this->accel.x = Math_SinS(Math_Vec3f_Yaw(&this->actor->posRot.pos, &this->pos)) * (Rand_ZeroOne() + 1.0f); + this->accel.z = Math_CosS(Math_Vec3f_Yaw(&this->actor->posRot.pos, &this->pos)) * (Rand_ZeroOne() + 1.0f); this->accel.y = -1.5f; this->velocity.y = 5.0f; } } else { if (this->life >= 9) { - rand = Math_Rand_CenteredFloat(65535.0f); - this->accel.x = Math_Sins(rand) * (Math_Rand_ZeroOne() + 1.0f); - this->accel.z = Math_Coss(rand) * (Math_Rand_ZeroOne() + 1.0f); + rand = Rand_CenteredFloat(65535.0f); + this->accel.x = Math_SinS(rand) * (Rand_ZeroOne() + 1.0f); + this->accel.z = Math_CosS(rand) * (Rand_ZeroOne() + 1.0f); this->life = 8; this->accel.y = -1.5f; this->velocity.y = 5.0f; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c index 59b7f97d3f..ed3fc838ef 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c @@ -88,7 +88,7 @@ void EffectSsFcircle_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) this->life = actor->dmgEffectTimer; } - Math_ApproxS(&this->rScale, 100, 20); + Math_StepToS(&this->rScale, 100, 20); } else { this->actor = NULL; } diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c index 2d0ab28433..dd8b04cf82 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c @@ -61,8 +61,8 @@ u32 EffectSsFhgFlash_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, v } else { this->actor = initParams->actor; this->velocity = this->accel = zeroVec; - this->life = (s16)(Math_Rand_ZeroOne() * 10.0f) + 111; - this->rScale = (s16)Math_Rand_ZeroFloat(initParams->scale) + initParams->scale; + this->life = (s16)(Rand_ZeroOne() * 10.0f) + 111; + this->rScale = (s16)Rand_ZeroFloat(initParams->scale) + initParams->scale; this->rAlpha = 255; this->draw = EffectSsFhgFlash_DrawShock; this->update = EffectSsFhgFlash_UpdateShock; @@ -146,7 +146,7 @@ void EffectSsFhgFlash_DrawShock(GlobalContext* globalCtx, u32 index, EffectSs* t } void EffectSsFhgFlash_UpdateLightBall(GlobalContext* globalCtx, u32 index, EffectSs* this) { - s16 rand = (Math_Rand_ZeroOne() * 20000.0f); + s16 rand = (Rand_ZeroOne() * 20000.0f); this->rXZRot = (this->rXZRot + rand) + 0x4000; @@ -174,21 +174,21 @@ void EffectSsFhgFlash_UpdateShock(GlobalContext* globalCtx, u32 index, EffectSs* BossGanondrof* phantomGanon; s16 rand; - rand = (Math_Rand_ZeroOne() * 20000.0f); + rand = (Rand_ZeroOne() * 20000.0f); this->rXZRot = (this->rXZRot + rand) + 0x4000; if (this->rParam == FHGFLASH_SHOCK_PLAYER) { player = PLAYER; - randBodypart = Math_Rand_ZeroFloat(17.9f); - this->pos.x = player->bodyPartsPos[randBodypart].x + Math_Rand_CenteredFloat(10.0f); - this->pos.y = player->bodyPartsPos[randBodypart].y + Math_Rand_CenteredFloat(15.0f); - this->pos.z = player->bodyPartsPos[randBodypart].z + Math_Rand_CenteredFloat(10.0f); + randBodypart = Rand_ZeroFloat(17.9f); + this->pos.x = player->bodyPartsPos[randBodypart].x + Rand_CenteredFloat(10.0f); + this->pos.y = player->bodyPartsPos[randBodypart].y + Rand_CenteredFloat(15.0f); + this->pos.z = player->bodyPartsPos[randBodypart].z + Rand_CenteredFloat(10.0f); } else if (this->rParam == FHGFLASH_SHOCK_PG) { phantomGanon = (BossGanondrof*)this->actor; - randBodypart = Math_Rand_ZeroFloat(23.9f); - this->pos.x = phantomGanon->bodyPartsPos[randBodypart].x + Math_Rand_CenteredFloat(15.0f); - this->pos.y = phantomGanon->bodyPartsPos[randBodypart].y + Math_Rand_CenteredFloat(20.0f); - this->pos.z = phantomGanon->bodyPartsPos[randBodypart].z + Math_Rand_CenteredFloat(15.0f); + randBodypart = Rand_ZeroFloat(23.9f); + this->pos.x = phantomGanon->bodyPartsPos[randBodypart].x + Rand_CenteredFloat(15.0f); + this->pos.y = phantomGanon->bodyPartsPos[randBodypart].y + Rand_CenteredFloat(20.0f); + this->pos.z = phantomGanon->bodyPartsPos[randBodypart].z + Rand_CenteredFloat(15.0f); } if (this->life < 100) { diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c index c858269a7e..56f29f956c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c @@ -91,9 +91,9 @@ void EffectSsFireTail_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) Player* player = PLAYER; s16 bodyPart = this->rBodyPart; - this->pos.x = player->bodyPartsPos[bodyPart].x - (Math_Sins(Camera_GetCamDirYaw(ACTIVE_CAM)) * 5.0f); + this->pos.x = player->bodyPartsPos[bodyPart].x - (Math_SinS(Camera_GetCamDirYaw(ACTIVE_CAM)) * 5.0f); this->pos.y = player->bodyPartsPos[bodyPart].y; - this->pos.z = player->bodyPartsPos[bodyPart].z - (Math_Coss(Camera_GetCamDirYaw(ACTIVE_CAM)) * 5.0f); + this->pos.z = player->bodyPartsPos[bodyPart].z - (Math_CosS(Camera_GetCamDirYaw(ACTIVE_CAM)) * 5.0f); Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); } @@ -102,8 +102,8 @@ void EffectSsFireTail_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) } yaw = Math_Vec3f_Yaw(&scale, &this->vec) - Camera_GetCamDirYaw(ACTIVE_CAM); - temp1 = fabsf(Math_Coss(yaw)); - temp2 = Math_Sins(yaw); + temp1 = fabsf(Math_CosS(yaw)); + temp2 = Math_SinS(yaw); dist = Math_Vec3f_DistXZ(&scale, &this->vec) / (this->rReg10 * 0.1f); Matrix_RotateY((s16)(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x8000) * 0.0000958738f, MTXMODE_APPLY); Matrix_RotateZ(temp2 * this->rReg2 * dist * 0.017453292f, MTXMODE_APPLY); diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c index b4e2ba1482..381f8c77cf 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c @@ -27,7 +27,7 @@ u32 EffectSsGMagma_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, voi this->update = EffectSsGMagma_Update; this->gfx = SEGMENTED_TO_VIRTUAL(D_04024410); this->life = 16; - this->rgScale = (s16)(Math_Rand_ZeroOne() * 100.0f) + 200; + this->rgScale = (s16)(Rand_ZeroOne() * 100.0f) + 200; this->rgTexIdx = 0; this->rgTexIdxStep = 50; this->rgPrimColorR = 255; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c index 5836daf7c2..55b7ff919a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c @@ -116,14 +116,14 @@ void EffectSsGRipple_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) if (DECR(this->rLifespan) == 0) { radius = this->rRadius; - Math_SmoothScaleMaxMinF(&radius, this->rRadiusMax, 0.2f, 30.0f, 1.0f); + Math_SmoothStepToF(&radius, this->rRadiusMax, 0.2f, 30.0f, 1.0f); this->rRadius = radius; primAlpha = this->rPrimColorA; envAlpha = this->rEnvColorA; - Math_SmoothScaleMaxMinF(&primAlpha, 0.0f, 0.2f, 15.0f, 7.0f); - Math_SmoothScaleMaxMinF(&envAlpha, 0.0f, 0.2f, 15.0f, 7.0f); + Math_SmoothStepToF(&primAlpha, 0.0f, 0.2f, 15.0f, 7.0f); + Math_SmoothStepToF(&envAlpha, 0.0f, 0.2f, 15.0f, 7.0f); this->rPrimColorA = primAlpha; this->rEnvColorA = envAlpha; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c index 5af3a96934..9613bbfdb7 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c @@ -110,8 +110,8 @@ void EffectSsGSpk_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { void EffectSsGSpk_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { - this->accel.x = (Math_Rand_ZeroOne() - 0.5f) * 3.0f; - this->accel.z = (Math_Rand_ZeroOne() - 0.5f) * 3.0f; + this->accel.x = (Rand_ZeroOne() - 0.5f) * 3.0f; + this->accel.z = (Rand_ZeroOne() - 0.5f) * 3.0f; if (this->actor != NULL) { if ((this->actor->type == ACTORTYPE_EXPLOSIVES) && (this->actor->update != NULL)) { @@ -134,8 +134,8 @@ void EffectSsGSpk_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { void EffectSsGSpk_UpdateNoAccel(GlobalContext* globalCtx, u32 index, EffectSs* this) { if (this->actor != NULL) { if ((this->actor->type == ACTORTYPE_EXPLOSIVES) && (this->actor->update != NULL)) { - this->pos.x += (Math_Sins(this->actor->posRot.rot.y) * this->actor->speedXZ); - this->pos.z += (Math_Coss(this->actor->posRot.rot.y) * this->actor->speedXZ); + this->pos.x += (Math_SinS(this->actor->posRot.rot.y) * this->actor->speedXZ); + this->pos.z += (Math_CosS(this->actor->posRot.rot.y) * this->actor->speedXZ); } } diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c index 3b467dda92..a71735a9d2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c +++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c @@ -61,8 +61,8 @@ u32 EffectSsHahen_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void this->update = EffectSsHahen_Update; this->rUnused = initParams->unused; this->rScale = initParams->scale; - this->rPitch = Math_Rand_ZeroOne() * 314.0f; - this->rYaw = Math_Rand_ZeroOne() * 314.0f; + this->rPitch = Rand_ZeroOne() * 314.0f; + this->rYaw = Rand_ZeroOne() * 314.0f; this->rMinLife = 200 - initParams->life; return 1; diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c index c863949a57..61de667e8b 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c @@ -35,10 +35,10 @@ u32 EffectSsIcePiece_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, v this->update = EffectSsIcePiece_Update; this->rLifespan = initParams->life; this->rScale = initParams->scale * 100.0f; - this->rYaw = atan2s(initParams->velocity.z, initParams->velocity.x); + this->rYaw = Math_Atan2S(initParams->velocity.z, initParams->velocity.x); this->rPitch = 0; this->rRotSpeed = - ((fabsf(initParams->velocity.x) + fabsf(initParams->velocity.y)) * 100.0f) * (Math_Rand_ZeroFloat(1.0f) + 0.5f); + ((fabsf(initParams->velocity.x) + fabsf(initParams->velocity.y)) * 100.0f) * (Rand_ZeroFloat(1.0f) + 0.5f); return 1; } diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c index b5fbb7fd05..f87064e47e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c @@ -33,7 +33,7 @@ u32 EffectSsKFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void this->life = 100; this->rScaleMax = initParams->scaleMax; this->rAlpha = 255; - this->rScroll = (s16)Math_Rand_ZeroFloat(5.0f) - 0x19; + this->rScroll = (s16)Rand_ZeroFloat(5.0f) - 0x19; this->rType = initParams->type; this->draw = EffectSsKFire_Draw; this->update = EffectSsKFire_Update; diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c index f4473453f0..4854368615 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c +++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c @@ -62,8 +62,8 @@ u32 EffectSsKakera_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, voi this->vec = initParams->unk_18; this->rReg0 = initParams->unk_2C; this->rGravity = initParams->gravity; - this->rPitch = Math_Rand_ZeroOne() * 32767.0f; - this->rYaw = Math_Rand_ZeroOne() * 32767.0f; + this->rPitch = Rand_ZeroOne() * 32767.0f; + this->rYaw = Rand_ZeroOne() * 32767.0f; this->rReg4 = initParams->unk_26; this->rReg5 = initParams->unk_28; this->rReg6 = initParams->unk_2A; @@ -82,7 +82,7 @@ f32 func_809A9818(f32 arg0, f32 arg1) { osSyncPrintf("範囲がマイナス！！(randomD_sectionUniformity)\n"); } - temp_f2 = Math_Rand_ZeroOne() * arg1; + temp_f2 = Rand_ZeroOne() * arg1; return ((temp_f2 * 2.0f) - arg1) + arg0; } diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c index d0cb0971e2..dbf844065c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c +++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c @@ -115,8 +115,8 @@ void EffectSsKiraKira_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) } void func_809AABF0(GlobalContext* globalCtx, u32 index, EffectSs* this) { - this->accel.x = (Math_Rand_ZeroOne() * 0.4f) - 0.2f; - this->accel.z = (Math_Rand_ZeroOne() * 0.4f) - 0.2f; + this->accel.x = (Rand_ZeroOne() * 0.4f) - 0.2f; + this->accel.z = (Rand_ZeroOne() * 0.4f) - 0.2f; this->rEnvColorA += this->rAlphaStep; if (this->rEnvColorA < 0) { @@ -133,8 +133,8 @@ void func_809AABF0(GlobalContext* globalCtx, u32 index, EffectSs* this) { void func_809AACAC(GlobalContext* globalCtx, u32 index, EffectSs* this) { this->velocity.x *= 0.95f; this->velocity.z *= 0.95f; - this->accel.x = Math_Rand_CenteredFloat(0.2f); - this->accel.z = Math_Rand_CenteredFloat(0.2f); + this->accel.x = Rand_CenteredFloat(0.2f); + this->accel.z = Rand_CenteredFloat(0.2f); this->rEnvColorA += this->rAlphaStep; if (this->rEnvColorA < 0) { @@ -149,5 +149,5 @@ void func_809AACAC(GlobalContext* globalCtx, u32 index, EffectSs* this) { } void func_809AAD6C(GlobalContext* globalCtx, u32 index, EffectSs* this) { - this->rScale = this->rEnvColorA * Math_Sins((32768.0f / this->rLifespan) * this->life); + this->rScale = this->rEnvColorA * Math_SinS((32768.0f / this->rLifespan) * this->life); } diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c index 6e02b8423b..9e1a2b3258 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c +++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c @@ -126,18 +126,18 @@ void EffectSsLightning_Update(GlobalContext* globalCtx, u32 index, EffectSs* thi if ((this->rNumBolts != 0) && ((this->life + 1) == this->rLifespan)) { - yaw = this->rYaw + (((Math_Rand_ZeroOne() < 0.5f) ? -1 : 1) * ((s16)((Math_Rand_ZeroOne() * 3640.0f)) + 0xE38)); + yaw = this->rYaw + (((Rand_ZeroOne() < 0.5f) ? -1 : 1) * ((s16)((Rand_ZeroOne() * 3640.0f)) + 0xE38)); scale = (this->rScale * 0.01f) * 80.0f; - pos.y = this->pos.y + (Math_Sins(this->rYaw - 0x4000) * scale); + pos.y = this->pos.y + (Math_SinS(this->rYaw - 0x4000) * scale); - scale = Math_Coss(this->rYaw - 0x4000) * scale; - pos.x = this->pos.x - (Math_Coss(Camera_GetInputDirYaw(ACTIVE_CAM)) * scale); - pos.z = this->pos.z + (Math_Sins(Camera_GetInputDirYaw(ACTIVE_CAM)) * scale); + scale = Math_CosS(this->rYaw - 0x4000) * scale; + pos.x = this->pos.x - (Math_CosS(Camera_GetInputDirYaw(ACTIVE_CAM)) * scale); + pos.z = this->pos.z + (Math_SinS(Camera_GetInputDirYaw(ACTIVE_CAM)) * scale); EffectSsLightning_NewLightning(globalCtx, &pos, yaw, this); - if (Math_Rand_ZeroOne() < 0.1f) { + if (Rand_ZeroOne() < 0.1f) { EffectSsLightning_NewLightning(globalCtx, &pos, (this->rYaw * 2) - yaw, this); } } diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c index a266eeaa5d..bb79b0a561 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c @@ -44,7 +44,7 @@ u32 EffectSsSibuki_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, voi this->gfx = SEGMENTED_TO_VIRTUAL(&D_04055DB0); } - this->life = ((s16)((Math_Rand_ZeroOne() * (500.0f + KREG(64))) * 0.01f)) + KREG(65) + 10; + this->life = ((s16)((Rand_ZeroOne() * (500.0f + KREG(64))) * 0.01f)) + KREG(65) + 10; this->rMoveDelay = initParams->moveDelay + 1; this->draw = EffectSsSibuki_Draw; this->update = EffectSsSibuki_Update; @@ -96,17 +96,17 @@ void EffectSsSibuki_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) if (this->rMoveDelay == 0) { yaw = Camera_GetInputDirYaw(Gameplay_GetCamera(globalCtx, 0)); - xzVelScale = ((200.0f + KREG(20)) * 0.01f) + ((0.1f * Math_Rand_ZeroOne()) * (KREG(23) + 20.0f)); + xzVelScale = ((200.0f + KREG(20)) * 0.01f) + ((0.1f * Rand_ZeroOne()) * (KREG(23) + 20.0f)); if (this->rDirection != 0) { xzVelScale *= -1.0f; } - this->velocity.x = Math_Coss(yaw) * xzVelScale; - this->velocity.z = -Math_Sins(yaw) * xzVelScale; + this->velocity.x = Math_CosS(yaw) * xzVelScale; + this->velocity.z = -Math_SinS(yaw) * xzVelScale; - this->velocity.y = ((700.0f + KREG(21)) * 0.01f) + ((0.1f * Math_Rand_ZeroOne()) * (KREG(24) + 20.0f)); - this->accel.y = ((-100.0f + KREG(22)) * 0.01f) + ((0.1f * Math_Rand_ZeroOne()) * KREG(25)); + this->velocity.y = ((700.0f + KREG(21)) * 0.01f) + ((0.1f * Rand_ZeroOne()) * (KREG(24) + 20.0f)); + this->accel.y = ((-100.0f + KREG(22)) * 0.01f) + ((0.1f * Rand_ZeroOne()) * KREG(25)); if (KREG(3) != 0) { this->velocity.x *= (KREG(3) * 0.01f); diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c index dc17cdfbef..a8cea99dbf 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c @@ -35,8 +35,8 @@ u32 EffectSsStick_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void this->gfx = ageInfoEntry->displayList; this->vec = this->pos = initParams->pos; this->rYaw = initParams->yaw; - this->velocity.x = Math_Sins(initParams->yaw) * 6.0f; - this->velocity.z = Math_Coss(initParams->yaw) * 6.0f; + this->velocity.x = Math_SinS(initParams->yaw) * 6.0f; + this->velocity.z = Math_CosS(initParams->yaw) * 6.0f; this->life = 20; this->draw = EffectSsStick_Draw; this->update = EffectSsStick_Update; diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c index 1ac0a799d8..733360bdf5 100644 --- a/src/overlays/gamestates/ovl_select/z_select.c +++ b/src/overlays/gamestates/ovl_select/z_select.c @@ -429,7 +429,7 @@ void Select_PrintLoadingMessage(SelectContext* this, GfxPrint* printer) { GfxPrint_SetPos(printer, 0xA, 0xF); GfxPrint_SetColor(printer, 255, 255, 255, 255); - randomMsg = Math_Rand_ZeroOne() * ARRAY_COUNT(sLoadingMessages); + randomMsg = Rand_ZeroOne() * ARRAY_COUNT(sLoadingMessages); GfxPrint_Printf(printer, "%s", sLoadingMessages[randomMsg]); }