diff --git a/src/TRK_MINNOW_DOLPHIN/dolphin_trk_glue.c b/src/TRK_MINNOW_DOLPHIN/dolphin_trk_glue.c
index 0b6947ed..46eb1107 100644
--- a/src/TRK_MINNOW_DOLPHIN/dolphin_trk_glue.c
+++ b/src/TRK_MINNOW_DOLPHIN/dolphin_trk_glue.c
@@ -139,29 +139,29 @@ UARTError WriteUART1(u8 arg0)
     return 0;
 }
 
-s32 TRKReadUARTPoll(u8* arg0) {
-    UARTError var_r29;
+UARTError TRKReadUARTPoll(u8* arg0)
+{
+    UARTError readErr = 4;
     s32 cnt;
 
-    var_r29 = 4;
     if (gReadPos >= gReadCount) {
         gReadPos = 0;
         cnt = gReadCount = TRKPollUART();
         if (cnt > 0) {
-            if (cnt > 0x110A) {
-                gReadCount = 0x110A;
+            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(); }