From d0a3b2b0a47f08c156a4b1c51a9949b3c9c8969d Mon Sep 17 00:00:00 2001
From: robojumper <robojumper@gmail.com>
Date: Fri, 26 Apr 2024 08:23:43 +0200
Subject: [PATCH] Match DrawStringLineToXfb_ (and add some symbols)

---
 config/SOUE01/symbols.txt      | 16 ++++++++--------
 src/nw4r/db/db_directPrint.cpp | 14 +++++---------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
index 01d5e532..d4d14801 100644
--- a/config/SOUE01/symbols.txt
+++ b/config/SOUE01/symbols.txt
@@ -22151,11 +22151,11 @@ VIWaitForRetrace = .text:0x803B4760; // type:function size:0x54
 fn_803B47C0 = .text:0x803B47C0; // type:function size:0x2A8
 fn_803B4A70 = .text:0x803B4A70; // type:function size:0xE0
 fn_803B4B50 = .text:0x803B4B50; // type:function size:0x194
-fn_803B4CF0 = .text:0x803B4CF0; // type:function size:0x6CC
+VIConfigure = .text:0x803B4CF0; // type:function size:0x6CC
 fn_803B53C0 = .text:0x803B53C0; // type:function size:0x354
-fn_803B5720 = .text:0x803B5720; // type:function size:0x114
-fn_803B5840 = .text:0x803B5840; // type:function size:0x6C
-fn_803B58B0 = .text:0x803B58B0; // type:function size:0x8
+VIFlush = .text:0x803B5720; // type:function size:0x114
+VISetNextFrameBuffer = .text:0x803B5840; // type:function size:0x6C
+VIGetCurrentFrameBuffer = .text:0x803B58B0; // type:function size:0x8
 VISetBlack = .text:0x803B58C0; // type:function size:0x78
 VIGetRetraceCount = .text:0x803B5940; // type:function size:0x8
 fn_803B5950 = .text:0x803B5950; // type:function size:0x9C
@@ -36497,11 +36497,11 @@ jumptable_8055FB08 = .data:0x8055FB08; // type:object size:0x44 scope:local
 lbl_8055FB4C = .data:0x8055FB4C; // type:object size:0x44
 jumptable_8055FB90 = .data:0x8055FB90; // type:object size:0x44 scope:local
 jumptable_8055FBD4 = .data:0x8055FBD4; // type:object size:0x54 scope:local
-lbl_8055FC28 = .data:0x8055FC28; // type:object size:0x3C
+GXNtsc480IntDf = .data:0x8055FC28; // type:object size:0x3C
 lbl_8055FC64 = .data:0x8055FC64; // type:object size:0x3C
-lbl_8055FCA0 = .data:0x8055FCA0; // type:object size:0x3C
-lbl_8055FCDC = .data:0x8055FCDC; // type:object size:0x3C
-lbl_8055FD18 = .data:0x8055FD18; // type:object size:0x40
+GXMpal480IntDf = .data:0x8055FCA0; // type:object size:0x3C
+GXPal528IntDf = .data:0x8055FCDC; // type:object size:0x3C
+GXEurgb60Hz480IntDf = .data:0x8055FD18; // type:object size:0x40
 jumptable_8055FD58 = .data:0x8055FD58; // type:object size:0xF4 scope:local
 jumptable_8055FE4C = .data:0x8055FE4C; // type:object size:0xF4 scope:local
 jumptable_8055FF40 = .data:0x8055FF40; // type:object size:0x3C scope:local
diff --git a/src/nw4r/db/db_directPrint.cpp b/src/nw4r/db/db_directPrint.cpp
index 8a59f655..46c3667f 100644
--- a/src/nw4r/db/db_directPrint.cpp
+++ b/src/nw4r/db/db_directPrint.cpp
@@ -9,9 +9,6 @@
 
 NOTE: This file does not match fully yet, Inlining + function ordering needs to still be addressed
 
-Nonmatching functions:
-DrawStringLineToXfb_ https://decomp.me/scratch/uqeZ6
-
 This worked for SS: as seen in egg stuff ive worked on, not sure if it works for others ¯\_(ツ)_/¯
 - Especially with inlines. DWARF provides info of local vars and maps provide calls to functions,
   but outside of that I made some guesses.
@@ -256,9 +253,7 @@ const char *DrawStringLineToXfb_(int posh, int posv, const char *str, int width)
     char c;
     int code, cnt, tab_size;
 
-    cnt = 0;
-    while (*str != '\0') {
-        c = *str;
+    for (cnt = 0; (c = *str) != '\0'; str++) {
         if (c == '\n' || c == '\0') {
             return str;
         }
@@ -274,11 +269,12 @@ const char *DrawStringLineToXfb_(int posh, int posv, const char *str, int width)
             posh += 6;
             cnt++;
         }
-        if (cnt >= width && str[1] == '\n') {
-            str++;
+        if (cnt >= width) {
+            if (str[1] == '\n') {
+                str++;
+            }
             return str;
         }
-        str++;
     }
     return str;
 }