diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index bf38ba72a..f978860d1 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -5157,7 +5157,7 @@ glabel func0f16b96c /* f16c868: 44818000 */ mtc1 $at,$f16 /* f16c86c: 3c018008 */ lui $at,0x8008 /* f16c870: 46105483 */ div.s $f18,$f10,$f16 -/* f16c874: 0c002f48 */ jal func0000bd20 +/* f16c874: 0c002f48 */ jal viSetUseZBuf /* f16c878: e432403c */ swc1 $f18,0x403c($at) /* f16c87c: 8e8204b4 */ lw $v0,0x4b4($s4) /* f16c880: 2401004e */ addiu $at,$zero,0x4e @@ -5618,7 +5618,7 @@ glabel func0f16b96c // g_Uptime = g_MpTimeElapsed / 60.0f; // // // 874 -// func0000bd20(true); +// viSetUseZBuf(true); // // if (g_Vars.stagenum == STAGE_TEST_OLD) { // func0f01ae30(); diff --git a/src/game/title.c b/src/game/title.c index e063e2ffe..dd8f1a526 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -425,7 +425,7 @@ void titleTickLegal(void) func0000bd30(60); func0000bd7c(1.33333333f); func0000be84(100, 10000); - func0000bd20(false); + viSetUseZBuf(false); g_TitleTimer += g_Vars.lvupdate240_60; @@ -452,7 +452,7 @@ void titleTickCheckControllers(void) { g_TitleTimer++; func0000be84(100, 10000); - func0000bd20(0); + viSetUseZBuf(false); if (g_TitleTimer > 6) { if ((getConnectedControllers() & 1) == 0) { @@ -1310,7 +1310,7 @@ void titleTickPdLogo(void) func0000bd30(46); func0000bd7c(1.33333333f); func0000be84(100, 10000); - func0000bd20(0); + viSetUseZBuf(false); g_TitleTimer += g_Vars.lvupdate240_60; var8009ccb8 = 1 - var8009ccb8; @@ -3304,7 +3304,7 @@ void titleTickRarePresents(void) func0000bd30(60); func0000bd7c(1.33333333f); func0000be84(100, 10000); - func0000bd20(0); + viSetUseZBuf(false); g_TitleTimer += g_Vars.lvupdate240_60; @@ -3560,7 +3560,7 @@ void titleTickNintendoLogo(void) func0000bd30(60); func0000bd7c(1.33333333f); func0000be84(100, 10000); - func0000bd20(0); + viSetUseZBuf(false); g_TitleTimer += g_Vars.lvupdate240_60; @@ -3954,7 +3954,7 @@ void titleTickRareLogo(void) func0000bd30(60); func0000bd7c(1.33333333f); func0000be84(100, 10000); - func0000bd20(0); + viSetUseZBuf(false); if (g_TitleTimer < 0) { g_TitleTimer++; @@ -4477,7 +4477,7 @@ void titleTickNoController(void) func0000bd30(60); func0000bd7c(1.33333333f); func0000be84(100, 10000); - func0000bd20(0); + viSetUseZBuf(false); g_TitleTimer += g_Vars.lvupdate240_60; } @@ -4858,7 +4858,7 @@ void titleTick(void) titleTickNoController(); break; case TITLEMODE_SKIP: - func0000bd20(0); + viSetUseZBuf(false); titleSetNextMode(TITLEMODE_RARELOGO); break; } diff --git a/src/include/lib/lib_09660.h b/src/include/lib/lib_09660.h index a4195eb8f..6a7306eda 100644 --- a/src/include/lib/lib_09660.h +++ b/src/include/lib/lib_09660.h @@ -47,7 +47,7 @@ s16 viGetViewY(void); void func0000bca8(s16 arg0, s16 arg1); s16 viGetViewLeft(void); s16 viGetViewTop(void); -void func0000bd20(bool arg0); +void viSetUseZBuf(bool use); void func0000bd30(f32 fovy); void func0000bd7c(f32 arg0); u32 func0000bdc8(void); diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index a9e333e33..c3232e3d8 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -2834,13 +2834,10 @@ s16 viGetViewTop(void) return g_ViData->viewtop; } -GLOBAL_ASM( -glabel func0000bd20 -/* bd20: 3c0e8006 */ lui $t6,%hi(g_ViData) -/* bd24: 8dced594 */ lw $t6,%lo(g_ViData)($t6) -/* bd28: 03e00008 */ jr $ra -/* bd2c: adc40024 */ sw $a0,0x24($t6) -); +void viSetUseZBuf(bool use) +{ + g_ViData->usezbuf = use; +} GLOBAL_ASM( glabel func0000bd30