JUTAssert

4 files changed, 15 insertions, 1 deletions

diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h
index 26f1afec9c..c9d9f3c86f 100644
--- a/include/JSystem/JUtility/JUTAssert.h
+++ b/include/JSystem/JUtility/JUTAssert.h
@@ -26,11 +26,13 @@
 // TODO: make it a namespace
 struct JUTAssertion {
     /* 802E495C */ static void create();
-    /* 802E4960 */ static void flush_subroutine();
+    /* 802E4960 */ static u32 flush_subroutine();
     /* 802E499C */ static void flushMessage();
     /* 802E4A54 */ static void flushMessage_dbPrint();
     /* 802E4C34 */ static void setVisible(bool);
     /* 802E4C3C */ static void setMessageCount(int);
 };
 
+extern bool sAssertVisible;
+
 #endif /* JUTASSERT_H */
diff --git a/include/JSystem/JUtility/JUTDbPrint.h b/include/JSystem/JUtility/JUTDbPrint.h
index 18f951784a..30b325183d 100644
--- a/include/JSystem/JUtility/JUTDbPrint.h
+++ b/include/JSystem/JUtility/JUTDbPrint.h
@@ -26,7 +26,9 @@ public:
     /* 802E0440 */ void drawString(int, int, int, u8 const*);
 
     static JUTDbPrint* getManager() { return sDebugPrint; }
+
     void setVisible(bool visible) { mVisible = visible; }
+    JUTFont* getFont() const { return mFont; }
 
     static JUTDbPrint* sDebugPrint;
 
diff --git a/include/JSystem/JUtility/JUTDirectPrint.h b/include/JSystem/JUtility/JUTDirectPrint.h
index 53927bea72..a24dfac706 100644
--- a/include/JSystem/JUtility/JUTDirectPrint.h
+++ b/include/JSystem/JUtility/JUTDirectPrint.h
@@ -23,6 +23,7 @@ public:
     /* 802E4240 */ static JUTDirectPrint* start();
 
     bool isActive() const { return field_0x00 != 0; }
+    JUtility::TColor getCharColor() const { return mCharColor; }
 
     static JUTDirectPrint* getManager() { return sDirectPrint; }
 
diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h
index ab47155562..fcf4901076 100644
--- a/include/JSystem/JUtility/JUTFont.h
+++ b/include/JSystem/JUtility/JUTFont.h
@@ -2,6 +2,7 @@
 #define JUTFONT_H
 
 #include "JSystem/JUtility/TColor.h"
+#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h"
 #include "dolphin/gx/GX.h"
 #include "dolphin/types.h"
 
@@ -88,6 +89,14 @@ public:
     void setGradColor(JUtility::TColor col1, JUtility::TColor col2);
     f32 drawString_size_scale(f32 a1, f32 a2, f32 a3, f32 a4, const char* a5, u32 usz, bool a7);
 
+    void drawString(int param_0, int param_1, const char* str, bool param_3) {
+        drawString_size(param_0, param_1, str, strlen(str), param_3);
+    }
+
+    void drawString_size(int param_0, int param_1, const char* str, u32 len, bool param_4) {
+        drawString_size_scale(param_0, param_1, getWidth(), getHeight(), str, len, param_4);
+    }
+
     /* 0x04 */ bool mValid;
     /* 0x05 */ bool mFixed;
     /* 0x08 */ int mFixedWidth;