diff --git a/src/game/bondmove.c b/src/game/bondmove.c index bf1c0c4fe..14f2fbb3e 100644 --- a/src/game/bondmove.c +++ b/src/game/bondmove.c @@ -267,11 +267,11 @@ void func0f0c8004(void) f32 func0f0c805c(f32 value) { if (value > 0) { - return (func0000be74() * value * -0.7f) / 60.0f; + return (viGetFovY() * value * -0.7f) / 60.0f; } if (value < 0) { - return (func0000be74() * -value * 0.7f) / 60.0f; + return (viGetFovY() * -value * 0.7f) / 60.0f; } return 0; @@ -279,7 +279,7 @@ f32 func0f0c805c(f32 value) void currentPlayerUpdateSpeedVerta(f32 value) { - f32 mult = func0000be74() / 60.0f; + f32 mult = viGetFovY() / 60.0f; f32 limit = func0f0c805c(value); if (value > 0) { @@ -322,11 +322,11 @@ void currentPlayerUpdateSpeedVerta(f32 value) f32 func0f0c82f8(f32 value) { if (value > 0) { - return (func0000be74() * value * -0.7f) / 60.0f; + return (viGetFovY() * value * -0.7f) / 60.0f; } if (value < 0) { - return (func0000be74() * -value * 0.7f) / 60.0f; + return (viGetFovY() * -value * 0.7f) / 60.0f; } return 0; @@ -334,7 +334,7 @@ f32 func0f0c82f8(f32 value) void currentPlayerUpdateSpeedThetaControl(f32 value) { - f32 mult = func0000be74() / 60.0f; + f32 mult = viGetFovY() / 60.0f; f32 limit = func0f0c82f8(value); if (value > 0) { @@ -3496,7 +3496,7 @@ glabel var7f1ad8e4 .L0f0cb190: /* f0cb190: 1120002f */ beqz $t1,.L0f0cb250 /* f0cb194: c7a601ec */ lwc1 $f6,0x1ec($sp) -/* f0cb198: 0c002f9d */ jal func0000be74 +/* f0cb198: 0c002f9d */ jal viGetFovY /* f0cb19c: 00000000 */ sll $zero,$zero,0x0 /* f0cb1a0: 8faa0254 */ lw $t2,0x254($sp) /* f0cb1a4: 3c014270 */ lui $at,0x4270 @@ -3613,7 +3613,7 @@ glabel var7f1ad8e4 /* f0cb32c: c7ac01f4 */ lwc1 $f12,0x1f4($sp) /* f0cb330: 5140002d */ beqzl $t2,.L0f0cb3e8 /* f0cb334: 44804000 */ mtc1 $zero,$f8 -/* f0cb338: 0c002f9d */ jal func0000be74 +/* f0cb338: 0c002f9d */ jal viGetFovY /* f0cb33c: 00000000 */ sll $zero,$zero,0x0 /* f0cb340: 8fab0250 */ lw $t3,0x250($sp) /* f0cb344: 3c01428c */ lui $at,0x428c @@ -4982,7 +4982,7 @@ glabel var7f1ad8e4 // } // } // } else { -// fVar24 = func0000be74(); +// fVar24 = viGetFovY(); // fVar25 = iStack12 / 70.0f; // // if (fVar25 > 1) { @@ -5053,7 +5053,7 @@ glabel var7f1ad8e4 // currentPlayerUpdateSpeedThetaControl(-fStack104); // } // } else { -// fVar24 = func0000be74(); +// fVar24 = viGetFovY(); // fVar25 = iStack16 / 70.0f; // // if (fVar25 > 1) { diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index f1295de12..3e244165b 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -11437,7 +11437,7 @@ glabel func0f0a0cb0 /* f0a0dac: 46081082 */ mul.s $f2,$f2,$f8 /* f0a0db0: 00000000 */ sll $zero,$zero,0x0 .L0f0a0db4: -/* f0a0db4: 0c002f9d */ jal func0000be74 +/* f0a0db4: 0c002f9d */ jal viGetFovY /* f0a0db8: e7a2003c */ swc1 $f2,0x3c($sp) /* f0a0dbc: 3c0142f0 */ lui $at,0x42f0 /* f0a0dc0: 44815000 */ mtc1 $at,$f10 @@ -11633,7 +11633,7 @@ glabel func0f0a0fac /* f0a1074: 46081082 */ mul.s $f2,$f2,$f8 /* f0a1078: 00000000 */ sll $zero,$zero,0x0 .L0f0a107c: -/* f0a107c: 0c002f9d */ jal func0000be74 +/* f0a107c: 0c002f9d */ jal viGetFovY /* f0a1080: e7a200a4 */ swc1 $f2,0xa4($sp) /* f0a1084: 3c0142f0 */ lui $at,0x42f0 /* f0a1088: 44815000 */ mtc1 $at,$f10 diff --git a/src/game/game_11f000.c b/src/game/game_11f000.c index 71f800bdb..449b72c4e 100644 --- a/src/game/game_11f000.c +++ b/src/game/game_11f000.c @@ -7408,7 +7408,7 @@ glabel var7f1b5108 /* f125c84: 00000000 */ sll $zero,$zero,0x0 /* f125c88: 460a4402 */ mul.s $f16,$f8,$f10 /* f125c8c: 46168480 */ add.s $f18,$f16,$f22 -/* f125c90: 0c002f9d */ jal func0000be74 +/* f125c90: 0c002f9d */ jal viGetFovY /* f125c94: e6520000 */ swc1 $f18,0x0($s2) /* f125c98: 3c014270 */ lui $at,0x4270 /* f125c9c: 44812000 */ mtc1 $at,$f4 @@ -8074,7 +8074,7 @@ glabel var7f1b511c /* f126668: 35ef9bff */ ori $t7,$t7,0x9bff /* f12666c: 35ceff7f */ ori $t6,$t6,0xff7f /* f126670: ad4e0004 */ sw $t6,0x4($t2) -/* f126674: 0c002f9d */ jal func0000be74 +/* f126674: 0c002f9d */ jal viGetFovY /* f126678: ad4f0000 */ sw $t7,0x0($t2) /* f12667c: 8fb90190 */ lw $t9,0x190($sp) /* f126680: 3c17fb00 */ lui $s7,0xfb00 diff --git a/src/game/game_12f6c0.c b/src/game/game_12f6c0.c index c4f0d5f90..52f6b014f 100644 --- a/src/game/game_12f6c0.c +++ b/src/game/game_12f6c0.c @@ -1353,7 +1353,7 @@ glabel func0f130044 /* f130a08: 3c017f1b */ lui $at,%hi(var7f1b5610) /* f130a0c: c4325610 */ lwc1 $f18,%lo(var7f1b5610)($at) /* f130a10: 4612b582 */ mul.s $f22,$f22,$f18 -/* f130a14: 0c002f9d */ jal func0000be74 +/* f130a14: 0c002f9d */ jal viGetFovY /* f130a18: 00000000 */ sll $zero,$zero,0x0 /* f130a1c: 3c014270 */ lui $at,0x4270 /* f130a20: 44812000 */ mtc1 $at,$f4 diff --git a/src/game/game_135c70.c b/src/game/game_135c70.c index 7d9650dd1..9b6fceab3 100644 --- a/src/game/game_135c70.c +++ b/src/game/game_135c70.c @@ -1153,7 +1153,7 @@ glabel var7f1b57bc /* f136c40: 5632fffb */ bnel $s1,$s2,.L0f136c30 /* f136c44: 8e240000 */ lw $a0,0x0($s1) .L0f136c48: -/* f136c48: 0c002f9d */ jal func0000be74 +/* f136c48: 0c002f9d */ jal viGetFovY /* f136c4c: 00000000 */ sll $zero,$zero,0x0 /* f136c50: 0c002f72 */ jal func0000bdc8 /* f136c54: e7a00090 */ swc1 $f0,0x90($sp) diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c index be175d606..2588b6d6b 100644 --- a/src/game/game_13c510.c +++ b/src/game/game_13c510.c @@ -1370,7 +1370,7 @@ glabel func0f13d568 /* f13d7e0: 28610002 */ slti $at,$v1,0x2 /* f13d7e4: 54200222 */ bnezl $at,.L0f13e070 /* f13d7e8: a2600001 */ sb $zero,0x1($s3) -/* f13d7ec: 0c002f9d */ jal func0000be74 +/* f13d7ec: 0c002f9d */ jal viGetFovY /* f13d7f0: 00000000 */ sll $zero,$zero,0x0 /* f13d7f4: 3c017f1b */ lui $at,%hi(var7f1b59e0) /* f13d7f8: c42459e0 */ lwc1 $f4,%lo(var7f1b59e0)($at) diff --git a/src/game/game_141820.c b/src/game/game_141820.c index e8081eae0..929c4e5fd 100644 --- a/src/game/game_141820.c +++ b/src/game/game_141820.c @@ -7240,7 +7240,7 @@ glabel hudRenderHorizonScanner /* f1481a8: 460021a1 */ cvt.d.s $f6,$f4 /* f1481ac: 0c004dad */ jal sprintf /* f1481b0: f7a60018 */ sdc1 $f6,0x18($sp) -/* f1481b4: 0c002f9d */ jal func0000be74 +/* f1481b4: 0c002f9d */ jal viGetFovY /* f1481b8: 00000000 */ sll $zero,$zero,0x0 /* f1481bc: 4480b000 */ mtc1 $zero,$f22 /* f1481c0: 3c057f1b */ lui $a1,%hi(var7f1b5ef4) diff --git a/src/game/propobj.c b/src/game/propobj.c index ee9702d5f..d088740fa 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -2535,7 +2535,7 @@ glabel func0f06803c /* f068058: afa60060 */ sw $a2,0x60($sp) /* f06805c: 0c002f72 */ jal func0000bdc8 /* f068060: afa70064 */ sw $a3,0x64($sp) -/* f068064: 0c002f9d */ jal func0000be74 +/* f068064: 0c002f9d */ jal viGetFovY /* f068068: 46000586 */ mov.s $f22,$f0 /* f06806c: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f068070: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) diff --git a/src/include/lib/lib_09660.h b/src/include/lib/lib_09660.h index 6a7306eda..92d496a17 100644 --- a/src/include/lib/lib_09660.h +++ b/src/include/lib/lib_09660.h @@ -52,7 +52,7 @@ void func0000bd30(f32 fovy); void func0000bd7c(f32 arg0); u32 func0000bdc8(void); void func0000bdd8(f32 arg0, f32 arg1, s16 viewx, s16 viewy); -f32 func0000be74(void); +f32 viGetFovY(void); void func0000be84(f32 arg0, f32 arg1); void func0000bee0(f32 *arg0); u32 func0000bf04(void); diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index c3232e3d8..cec58b0af 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -2936,13 +2936,10 @@ glabel func0000bdd8 /* be70: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0000be74 -/* be74: 3c0e8006 */ lui $t6,%hi(g_ViData) -/* be78: 8dced594 */ lw $t6,%lo(g_ViData)($t6) -/* be7c: 03e00008 */ jr $ra -/* be80: c5c00008 */ lwc1 $f0,0x8($t6) -); +f32 viGetFovY(void) +{ + return g_ViData->fovy; +} GLOBAL_ASM( glabel func0000be84