From c6160e1980d9ff5e048eb57ee8e55bd755bcb891 Mon Sep 17 00:00:00 2001
From: cadmic <cadmic24@gmail.com>
Date: Fri, 27 Sep 2024 13:44:35 -0700
Subject: [ntsc-1.0/1.1] Match PAL 1.0 viconfig changes (#2231)

* [ntsc-1.0/1.1] Match viconfig changes

* SREG(48) -> R_VI_MODE_EDIT_STATE
---
 src/code/game.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/code/game.c')

diff --git a/src/code/game.c b/src/code/game.c
index 45362fb58..2b665e0d8 100644
--- a/src/code/game.c
+++ b/src/code/game.c
@@ -2,6 +2,7 @@
 #include "fault.h"
 #include "libc64/os_malloc.h"
 #include "terminal.h"
+#include "versions.h"
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
@@ -281,6 +282,14 @@ void GameState_Update(GameState* gameState) {
 
     func_800C4344(gameState);
 
+#if OOT_VERSION < PAL_1_0
+    if (R_VI_MODE_EDIT_STATE != VI_MODE_EDIT_STATE_INACTIVE) {
+        ViMode_Update(&sViMode, &gameState->input[0]);
+        gfxCtx->viMode = &sViMode.customViMode;
+        gfxCtx->viFeatures = sViMode.viFeatures;
+    }
+#endif
+
 #if OOT_DEBUG
     if (SREG(63) == 1u) {
         if (R_VI_MODE_EDIT_STATE < VI_MODE_EDIT_STATE_INACTIVE) {
-- 
cgit v1.2.3