diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index b4d9d8faa..58077c517 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -8168,7 +8168,7 @@ glabel func0f0bd764 /* f0bd8dc: 00054c03 */ sra $t1,$a1,0x10 /* f0bd8e0: 00044403 */ sra $t0,$a0,0x10 /* f0bd8e4: 01002025 */ or $a0,$t0,$zero -/* f0bd8e8: 0c002ee8 */ jal func0000bba0 +/* f0bd8e8: 0c002ee8 */ jal viSetBuf /* f0bd8ec: 01202825 */ or $a1,$t1,$zero /* f0bd8f0: 8fbf001c */ lw $ra,0x1c($sp) /* f0bd8f4: 8fb00018 */ lw $s0,0x18($sp) @@ -8429,7 +8429,7 @@ glabel var7f1ad6ac /* f0bdc14: 00055403 */ sra $t2,$a1,0x10 /* f0bdc18: 00044c03 */ sra $t1,$a0,0x10 /* f0bdc1c: 01202025 */ or $a0,$t1,$zero -/* f0bdc20: 0c002ee8 */ jal func0000bba0 +/* f0bdc20: 0c002ee8 */ jal viSetBuf /* f0bdc24: 01402825 */ or $a1,$t2,$zero /* f0bdc28: 0fc2ed0b */ jal func0f0bb42c /* f0bdc2c: 00000000 */ sll $zero,$zero,0x0 @@ -10645,7 +10645,7 @@ glabel var7f1ad6ac // func0000bdd8(60, aspectratio, func0f0bc554(), func0f0bcaa0()); // func0000bca8(func0f0bc7ac(), func0f0bce24()); // func0000bbe4(func0f0bc44c(), func0f0bc478()); -// func0000bba0(func0f0bc44c(), func0f0bc478()); +// viSetBuf(func0f0bc44c(), func0f0bc478()); // func0f0bb42c(); // func0f0bb5ec(); // currentPlayerSetAutoAimY(optionsGetAutoAim(g_Vars.currentplayerstats->mpindex)); diff --git a/src/game/title.c b/src/game/title.c index dd8f1a526..5c398b110 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -4447,7 +4447,7 @@ void titleInitSkip(void) g_TitleNextStage = STAGE_4MBMENU; func0000bd7c(1.4545454978943f); func0000bbe4(320, 220); - func0000bba0(320, 220); + viSetBuf(320, 220); currentPlayerSetViewSize(320, 220); func0000bc28(320, 220); } @@ -4748,7 +4748,7 @@ void titleTick(void) { func0000bd7c(576.0f / var800624a0); func0000bbe4(576, var800624a0); - func0000bba0(576, var800624a0); + viSetBuf(576, var800624a0); currentPlayerSetViewSize(576, var800624a0); func0000bc28(576, var800624a0); currentPlayerSetViewPosition(0, 0); @@ -4962,7 +4962,7 @@ void func0f01adb8(void) { func0000aab0(2); func0000bbe4(576, var800624a0); - func0000bba0(576, var800624a0); + viSetBuf(576, var800624a0); currentPlayerSetViewSize(576, var800624a0); func0000bc28(576, var800624a0); currentPlayerSetViewPosition(0, 0); diff --git a/src/include/lib/lib_09660.h b/src/include/lib/lib_09660.h index 8b8aaa4aa..f869c6ef7 100644 --- a/src/include/lib/lib_09660.h +++ b/src/include/lib/lib_09660.h @@ -35,7 +35,7 @@ u32 func0000b1d0(void); u32 func0000b280(void); u32 func0000b2c4(void); u32 func0000b330(void); -void func0000bba0(s16 arg0, s16 arg1); +void viSetBuf(s16 x, s16 y); s16 viGetBufX(void); s16 viGetBufY(void); void func0000bbe4(s16 arg0, s16 arg1); diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index 3f9cbd7ba..4f525fe77 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -2709,18 +2709,11 @@ glabel func0000b330 /* bb9c: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0000bba0 -/* bba0: 3c028006 */ lui $v0,%hi(g_ViData) -/* bba4: 2442d594 */ addiu $v0,$v0,%lo(g_ViData) -/* bba8: 8c480000 */ lw $t0,0x0($v0) -/* bbac: afa40000 */ sw $a0,0x0($sp) -/* bbb0: afa50004 */ sw $a1,0x4($sp) -/* bbb4: a5040018 */ sh $a0,0x18($t0) -/* bbb8: 8c490000 */ lw $t1,0x0($v0) -/* bbbc: 03e00008 */ jr $ra -/* bbc0: a525001a */ sh $a1,0x1a($t1) -); +void viSetBuf(s16 x, s16 y) +{ + g_ViData->bufx = x; + g_ViData->bufy = y; +} s16 viGetBufX(void) {