From a4bbbd86289f9487584d1c870e85cb9454839787 Mon Sep 17 00:00:00 2001
From: CreateSource <72283721+abnormalhare@users.noreply.github.com>
Date: Sun, 16 Mar 2025 15:09:37 -0400
Subject: [PATCH] undo git's stupidness

---
 .vscode/settings.json                     | 2 +-
 src/TRK_MINNOW_DOLPHIN/dolphin_trk_glue.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index bd742134..1e7df332 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -142,4 +142,4 @@
   "C_Cpp_Runner.showCompilationTime": false,
   "C_Cpp_Runner.useLinkTimeOptimization": false,
   "C_Cpp_Runner.msvcSecureNoWarnings": false
-}
+}
\ No newline at end of file
diff --git a/src/TRK_MINNOW_DOLPHIN/dolphin_trk_glue.c b/src/TRK_MINNOW_DOLPHIN/dolphin_trk_glue.c
index 6f0ad505..46eb1107 100644
--- a/src/TRK_MINNOW_DOLPHIN/dolphin_trk_glue.c
+++ b/src/TRK_MINNOW_DOLPHIN/dolphin_trk_glue.c
@@ -144,7 +144,6 @@ UARTError TRKReadUARTPoll(u8* arg0)
     UARTError readErr = 4;
     s32 cnt;
 
-    var_r29 = 4;
     if (gReadPos >= gReadCount) {
         gReadPos = 0;
         cnt = gReadCount = TRKPollUART();
@@ -152,17 +151,17 @@ UARTError TRKReadUARTPoll(u8* arg0)
             if (cnt > BUFF_LEN) {
                 gReadCount = BUFF_LEN;
             }
-            var_r29 = TRKReadUARTN(gReadBuf, gReadCount);
-            if (var_r29 != 0) {
+            readErr = TRKReadUARTN(gReadBuf, gReadCount);
+            if (readErr != 0) {
                 gReadCount = 0;
             }
         }
     }
     if (gReadPos < gReadCount) {
         *arg0 = gReadBuf[gReadPos++];
-        var_r29 = 0;
+        readErr = 0;
     }
-    return var_r29;
+    return readErr;
 }
 
 void ReserveEXI2Port(void) { gDBCommTable.open_func(); }