1 files changed, 24 insertions, 11 deletions
diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c
index cd3d5897f..e35aa4640 100644
--- a/src/code/sys_cfb.c
+++ b/src/code/sys_cfb.c
@@ -63,27 +63,40 @@ void SysCfb_SetHiResMode(void) {
     gWorkBuffer = gWorkBufferHiRes;
     gGfxSPTaskOutputBufferPtr = *gGfxSPTaskOutputBufferHiRes;
     gGfxSPTaskOutputBufferEnd = gGfxSPTaskOutputBufferEndHiRes;
-    if (1) {}
-    gCfbWidth = HIRES_BUFFER_WIDTH;
-    gCfbHeight = HIRES_BUFFER_HEIGHT;
-    gCfbLeftAdjust = 30;
-    gCfbUpperAdjust = 10;
+
+    if (0) {
+        // Remnant of debug
+    } else {
+        gCfbWidth = HIRES_BUFFER_WIDTH;
+        gCfbHeight = HIRES_BUFFER_HEIGHT;
+        gCfbLeftAdjust = 30;
+        gCfbUpperAdjust = 10;
+    }
     gScreenWidth = gCfbWidth;
     gScreenHeight = gCfbHeight;
+
     if ((gCfbWidth == SCREEN_WIDTH_HIRES) && (gCfbHeight == SCREEN_HEIGHT_HIRES)) {
         gActiveViMode = &osViModeNtscHpf1;
     } else {
+        s32 leftAdjust;
         s32 rightAdjust;
+        s32 upperAdjust;
         s32 lowerAdjust;
 
-    //! FAKE:
-    l1:
-        rightAdjust = gCfbWidth - 610;
-        lowerAdjust = gCfbHeight - 470;
-        ViMode_Configure(&sNotebookViMode, -1, osTvType, 0, 1, 0, 1, gCfbWidth, gCfbHeight, 30, rightAdjust, 10,
-                         lowerAdjust);
+        if (0) {
+            // Remnant of debug
+        } else {
+            leftAdjust = 30;
+            upperAdjust = 10;
+            rightAdjust = gCfbWidth - (SCREEN_WIDTH_HIRES - leftAdjust);
+            lowerAdjust = gCfbHeight - (SCREEN_HEIGHT_HIRES - upperAdjust);
+        }
+
+        ViMode_Configure(&sNotebookViMode, -1, osTvType, false, true, false, true, gCfbWidth, gCfbHeight, leftAdjust,
+                         rightAdjust, upperAdjust, lowerAdjust);
         gActiveViMode = &sNotebookViMode;
     }
+
     gSysCfbHiResEnabled = true;
 }