From fb733364c8a75fea61c7fd54e8a008bc52a32644 Mon Sep 17 00:00:00 2001
From: LagoLunatic <LagoLunatic@users.noreply.github.com>
Date: Thu, 2 Apr 2026 19:33:38 -0400
Subject: [PATCH] JFWSystem OK

---
 configure.py                          | 2 +-
 include/JSystem/JUtility/JUTConsole.h | 3 ++-
 src/JSystem/JFramework/JFWSystem.cpp  | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.py b/configure.py
index 103a44572..baca82bf3 100755
--- a/configure.py
+++ b/configure.py
@@ -708,7 +708,7 @@ config.libs = [
         "JFramework",
         [
             Object(Matching,    "JSystem/JFramework/JFWDisplay.cpp"),
-            Object(NonMatching, "JSystem/JFramework/JFWSystem.cpp"),
+            Object(Matching,    "JSystem/JFramework/JFWSystem.cpp"),
         ],
     ),
     JSystemLib(
diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h
index ded3914af..223950673 100644
--- a/include/JSystem/JUtility/JUTConsole.h
+++ b/include/JSystem/JUtility/JUTConsole.h
@@ -54,7 +54,8 @@ public:
     }
 
     void setFont(JUTFont* p_font) {
-        mFont = p_font;
+        // Fakematch...? Fixes GCN but breaks TP Wii. TODO: Test after TP Wii flags are fixed.
+        p_font = mFont = p_font;
         setFontSize(p_font->getWidth(), p_font->getHeight());
     }
 
diff --git a/src/JSystem/JFramework/JFWSystem.cpp b/src/JSystem/JFramework/JFWSystem.cpp
index 6f215a42d..68fc04316 100644
--- a/src/JSystem/JFramework/JFWSystem.cpp
+++ b/src/JSystem/JFramework/JFWSystem.cpp
@@ -58,7 +58,6 @@ void JFWSystem::firstInit() {
 
 /* 80254E54-802551C0       .text init__9JFWSystemFv */
 void JFWSystem::init() {
-    /* Nonmatching - regalloc */
     JUT_ASSERT(101, sInitCalled == false);
 
     if(rootHeap == 0) {