diff --git a/src/game/title.c b/src/game/title.c index 11225aebf..6737e8707 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -423,7 +423,7 @@ void titleExitLegal(void) void titleTickLegal(void) { viSetFovY(60); - func0000bd7c(1.33333333f); + viSetAspect(1.33333333f); func0000be84(100, 10000); viSetUseZBuf(false); @@ -1308,7 +1308,7 @@ void titleExitPdLogo(void) void titleTickPdLogo(void) { viSetFovY(46); - func0000bd7c(1.33333333f); + viSetAspect(1.33333333f); func0000be84(100, 10000); viSetUseZBuf(false); @@ -3302,7 +3302,7 @@ void titleExitRarePresents(void) void titleTickRarePresents(void) { viSetFovY(60); - func0000bd7c(1.33333333f); + viSetAspect(1.33333333f); func0000be84(100, 10000); viSetUseZBuf(false); @@ -3558,7 +3558,7 @@ u32 var800628c4 = 0x00000000; void titleTickNintendoLogo(void) { viSetFovY(60); - func0000bd7c(1.33333333f); + viSetAspect(1.33333333f); func0000be84(100, 10000); viSetUseZBuf(false); @@ -3952,7 +3952,7 @@ u32 var8006293c = 0x00000000; void titleTickRareLogo(void) { viSetFovY(60); - func0000bd7c(1.33333333f); + viSetAspect(1.33333333f); func0000be84(100, 10000); viSetUseZBuf(false); @@ -4445,7 +4445,7 @@ void titleInitSkip(void) if (g_Is4Mb == true) { g_TitleNextStage = STAGE_4MBMENU; - func0000bd7c(1.4545454978943f); + viSetAspect(1.4545454978943f); viSetXY(320, 220); viSetBuf(320, 220); currentPlayerSetViewSize(320, 220); @@ -4475,7 +4475,7 @@ void titleExitNoController(void) void titleTickNoController(void) { viSetFovY(60); - func0000bd7c(1.33333333f); + viSetAspect(1.33333333f); func0000be84(100, 10000); viSetUseZBuf(false); @@ -4746,7 +4746,7 @@ s32 titleGetMode(void) void titleTick(void) { - func0000bd7c(576.0f / var800624a0); + viSetAspect(576.0f / var800624a0); viSetXY(576, var800624a0); viSetBuf(576, var800624a0); currentPlayerSetViewSize(576, var800624a0); diff --git a/src/include/lib/lib_09660.h b/src/include/lib/lib_09660.h index 52696a28c..10080d7f4 100644 --- a/src/include/lib/lib_09660.h +++ b/src/include/lib/lib_09660.h @@ -49,7 +49,7 @@ s16 viGetViewLeft(void); s16 viGetViewTop(void); void viSetUseZBuf(bool use); void viSetFovY(f32 fovy); -void func0000bd7c(f32 arg0); +void viSetAspect(f32 aspect); u32 func0000bdc8(void); void func0000bdd8(f32 arg0, f32 arg1, s16 viewx, s16 viewy); f32 viGetFovY(void); diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index 238091f63..496b48a94 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -2797,28 +2797,13 @@ void viSetFovY(f32 fovy) currentPlayerSetCameraScale(); } -GLOBAL_ASM( -glabel func0000bd7c -/* bd7c: 27bdffe8 */ addiu $sp,$sp,-24 -/* bd80: 3c038006 */ lui $v1,%hi(g_ViData) -/* bd84: 2463d594 */ addiu $v1,$v1,%lo(g_ViData) -/* bd88: e7ac0018 */ swc1 $f12,0x18($sp) -/* bd8c: c7a40018 */ lwc1 $f4,0x18($sp) -/* bd90: 8c6e0000 */ lw $t6,0x0($v1) -/* bd94: afbf0014 */ sw $ra,0x14($sp) -/* bd98: e5c4000c */ swc1 $f4,0xc($t6) -/* bd9c: 8c620000 */ lw $v0,0x0($v1) -/* bda0: c44c0010 */ lwc1 $f12,0x10($v0) -/* bda4: c44e0008 */ lwc1 $f14,0x8($v0) -/* bda8: 0fc2d266 */ jal currentPlayerSetPerspective -/* bdac: 8c46000c */ lw $a2,0xc($v0) -/* bdb0: 0fc2d289 */ jal currentPlayerSetCameraScale -/* bdb4: 00000000 */ sll $zero,$zero,0x0 -/* bdb8: 8fbf0014 */ lw $ra,0x14($sp) -/* bdbc: 27bd0018 */ addiu $sp,$sp,0x18 -/* bdc0: 03e00008 */ jr $ra -/* bdc4: 00000000 */ sll $zero,$zero,0x0 -); +void viSetAspect(f32 aspect) +{ + g_ViData->aspect = aspect; + + currentPlayerSetPerspective(g_ViData->znear, g_ViData->fovy, g_ViData->aspect); + currentPlayerSetCameraScale(); +} GLOBAL_ASM( glabel func0000bdc8