From aaf9c939a47e6613e3b72bb68d0e39c529649975 Mon Sep 17 00:00:00 2001
From: Tharo <17233964+Thar0@users.noreply.github.com>
Date: Tue, 7 Jan 2025 05:21:25 +0000
Subject: [PATCH] [iQue] Match osViSetMode (#2404)

---
 include/variables.h         | 2 ++
 src/code/main.c             | 2 +-
 src/code/z_camera.c         | 2 +-
 src/libultra/io/visetmode.c | 6 ++++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/include/variables.h b/include/variables.h
index c24ae4f643..d532f4fe95 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -14,6 +14,8 @@ extern s32 osCicId;
 extern u32 osMemSize;
 extern u8 osAppNMIBuffer[0x40];
 
+extern u32 __osBbIsBb;
+
 extern s8 D_80009430;
 extern vu8 gViConfigBlack;
 extern u8 gViConfigAdditionalScanLines;
diff --git a/src/code/main.c b/src/code/main.c
index 637243160f..8ad00b52bd 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -24,7 +24,7 @@ extern struct IrqMgr gIrqMgr;
 #endif
 
 #pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160 gc-us-mq:160" \
-                               "ntsc-1.0:142 ntsc-1.1:142 ntsc-1.2:142 pal-1.0:140 pal-1.1:140"
+                               "ntsc-1.0:141 ntsc-1.1:141 ntsc-1.2:141 pal-1.0:139 pal-1.1:139"
 
 extern u8 _buffersSegmentEnd[];
 
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index b35c18c048..e4090d484e 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -3639,7 +3639,7 @@ s32 Camera_KeepOn3(Camera* camera) {
 }
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
-                               "ntsc-1.0:145 ntsc-1.1:145 ntsc-1.2:145 pal-1.0:143 pal-1.1:143"
+                               "ntsc-1.0:144 ntsc-1.1:144 ntsc-1.2:144 pal-1.0:142 pal-1.1:142"
 
 s32 Camera_KeepOn4(Camera* camera) {
     static Vec3f D_8015BD50;
diff --git a/src/libultra/io/visetmode.c b/src/libultra/io/visetmode.c
index ab5b3b0e18..8c34a4ee31 100644
--- a/src/libultra/io/visetmode.c
+++ b/src/libultra/io/visetmode.c
@@ -4,6 +4,12 @@
 void osViSetMode(OSViMode* mode) {
     register u32 prevInt = __osDisableInt();
 
+#ifdef BBPLAYER
+    if (__osBbIsBb) {
+        mode->comRegs.ctrl &= ~VI_CTRL_PIXEL_ADV(2);
+    }
+#endif
+
     __osViNext->modep = mode;
     __osViNext->state = VI_STATE_MODE_SET;
     __osViNext->features = __osViNext->modep->comRegs.ctrl;