d_error_msg mostly done, little Z2LinkMgr work (#2248)

3 files changed, 17 insertions, 1 deletions

diff --git a/include/JSystem/J2DGraph/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox.h
index dc8604e26b..2663da7621 100644
--- a/include/JSystem/J2DGraph/J2DTextBox.h
+++ b/include/JSystem/J2DGraph/J2DTextBox.h
@@ -76,7 +76,11 @@ public:
     /* 8021C7F4 */ virtual JUTFont* getFont() const { return mFont; }
     /* 80254408 */ virtual bool setBlack(JUtility::TColor);
     /* 80186C84 */ virtual bool setWhite(JUtility::TColor white) { mWhiteColor = white; return true; }
-    /* 8019230C */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
+    /* 8019230C */ virtual bool setBlackWhite(JUtility::TColor black, JUtility::TColor white) {
+        mBlackColor = black;
+        mWhiteColor = white;
+        return true;
+    }
     /* 801DFA34 */ virtual JUtility::TColor getBlack() const {
         return mBlackColor;
     }
@@ -126,6 +130,14 @@ public:
         mGradientColor = i_GradientColor;
     }
 
+    void setCharColor(JUtility::TColor i_charColor) {
+        mCharColor.set(i_charColor);
+    }
+
+    void setGradColor(JUtility::TColor i_GradientColor) {
+        mGradientColor.set(i_GradientColor);
+    }
+
     void setCharSpace(f32 space) { mCharSpacing = space; }
     f32 getCharSpace() const { return mCharSpacing; }
     void setLineSpace(f32 space) { mLineSpacing = space; }
diff --git a/include/JSystem/JFramework/JFWDisplay.h b/include/JSystem/JFramework/JFWDisplay.h
index 5aa79d3792..69ae5bfc37 100644
--- a/include/JSystem/JFramework/JFWDisplay.h
+++ b/include/JSystem/JFramework/JFWDisplay.h
@@ -98,6 +98,7 @@ public:
 
     void setDrawDoneMethod(EDrawDone drawDone) { mDrawDoneMethod = drawDone; }
     void setFader(JUTFader* fader) { mFader = fader; }
+    void resetFader() { setFader(NULL); }
     JUTFader* getFader() const { return mFader; }
     void setClearColor(JUtility::TColor color) { mClearColor = color; }
 
diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h
index ec7c7a1099..310148f42f 100644
--- a/include/JSystem/JUtility/JUTFont.h
+++ b/include/JSystem/JUtility/JUTFont.h
@@ -100,6 +100,9 @@ public:
     static bool isLeadByte_ShiftJIS(int b) {
         return (b >= 0x81 && b <= 0x9f) || (b >= 0xe0 && b <= 0xfc);
     }
+    static bool isLeadByte_EUC(int b) {
+        return (b >= 0xA1 && b <= 0xFE) || b == 0x8E;
+    }
 
     void initialize_state();
     void setCharColor(JUtility::TColor col1);