diff --git a/src/game/game_135c70.c b/src/game/game_135c70.c index 9b6fceab3..7fc011953 100644 --- a/src/game/game_135c70.c +++ b/src/game/game_135c70.c @@ -1155,7 +1155,7 @@ glabel var7f1b57bc .L0f136c48: /* f136c48: 0c002f9d */ jal viGetFovY /* f136c4c: 00000000 */ sll $zero,$zero,0x0 -/* f136c50: 0c002f72 */ jal func0000bdc8 +/* f136c50: 0c002f72 */ jal viGetAspect /* f136c54: e7a00090 */ swc1 $f0,0x90($sp) /* f136c58: c7b00090 */ lwc1 $f16,0x90($sp) /* f136c5c: 3c013f00 */ lui $at,0x3f00 diff --git a/src/game/propobj.c b/src/game/propobj.c index d088740fa..d6db2e9b9 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -2533,7 +2533,7 @@ glabel func0f06803c /* f068050: f7b40018 */ sdc1 $f20,0x18($sp) /* f068054: afa5005c */ sw $a1,0x5c($sp) /* f068058: afa60060 */ sw $a2,0x60($sp) -/* f06805c: 0c002f72 */ jal func0000bdc8 +/* f06805c: 0c002f72 */ jal viGetAspect /* f068060: afa70064 */ sw $a3,0x64($sp) /* f068064: 0c002f9d */ jal viGetFovY /* f068068: 46000586 */ mov.s $f22,$f0 diff --git a/src/include/lib/lib_09660.h b/src/include/lib/lib_09660.h index 10080d7f4..eec90786b 100644 --- a/src/include/lib/lib_09660.h +++ b/src/include/lib/lib_09660.h @@ -50,7 +50,7 @@ s16 viGetViewTop(void); void viSetUseZBuf(bool use); void viSetFovY(f32 fovy); void viSetAspect(f32 aspect); -u32 func0000bdc8(void); +f32 viGetAspect(void); void func0000bdd8(f32 arg0, f32 arg1, s16 viewx, s16 viewy); f32 viGetFovY(void); void func0000be84(f32 arg0, f32 arg1); diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index 496b48a94..293e56e72 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -2805,13 +2805,10 @@ void viSetAspect(f32 aspect) currentPlayerSetCameraScale(); } -GLOBAL_ASM( -glabel func0000bdc8 -/* bdc8: 3c0e8006 */ lui $t6,%hi(g_ViData) -/* bdcc: 8dced594 */ lw $t6,%lo(g_ViData)($t6) -/* bdd0: 03e00008 */ jr $ra -/* bdd4: c5c0000c */ lwc1 $f0,0xc($t6) -); +f32 viGetAspect(void) +{ + return g_ViData->aspect; +} GLOBAL_ASM( glabel func0000bdd8