d_error_msg mostly done, little Z2LinkMgr work (#2248)

zeldaret · Nov 12, 2024 · ebd7e3f · ebd7e3f
1 parent f2a7b2a
commit ebd7e3f
Show file tree

Hide file tree

Showing 14 changed files with 416 additions and 456 deletions.
diff --git a/config/GZ2E01/splits.txt b/config/GZ2E01/splits.txt
@@ -739,12 +739,13 @@ d/d_model.cpp:
 d/d_eye_hl.cpp:
 	.text       start:0x8009C964 end:0x8009CB88
 	.rodata     start:0x8037B100 end:0x8037B140
-	.sbss       start:0x80450FA8 end:0x80450FC0
+	.sbss       start:0x80450FA8 end:0x80450FB0
 	.sdata2     start:0x80452C10 end:0x80452C18
 
 d/d_error_msg.cpp:
 	.text       start:0x8009CB88 end:0x8009D87C
 	.rodata     start:0x8037B140 end:0x8038D658
+	.sbss       start:0x80450FB0 end:0x80450FB8
 	.sdata2     start:0x80452C18 end:0x80452C50
 	.sbss2      start:0x80456B78 end:0x80456B80
 
@@ -785,7 +786,7 @@ d/actor/d_a_alink.cpp:
 	.data       start:0x803AF990 end:0x803B3610
 	.bss        start:0x80425508 end:0x80425708
 	.sdata      start:0x80450690 end:0x804506A8
-	.sbss       start:0x80450FC0 end:0x80450FD8
+	.sbss       start:0x80450FB8 end:0x80450FD8
 	.sdata2     start:0x80452C50 end:0x804533A8
 
 d/actor/d_a_itembase.cpp:

diff --git a/include/JSystem/J2DGraph/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox.h
@@ -76,7 +76,11 @@ class J2DTextBox : public J2DPane {
     /* 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 @@ class J2DTextBox : public J2DPane {
         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
@@ -98,6 +98,7 @@ class JFWDisplay {
 
     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
@@ -100,6 +100,9 @@ class JUTFont {
     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);

diff --git a/include/Z2AudioLib/Z2AudioMgr.h b/include/Z2AudioLib/Z2AudioMgr.h
@@ -29,8 +29,9 @@ class Z2AudioMgr : public Z2SeMgr, public Z2SeqMgr, public Z2SceneMgr, public Z2
     void resetRecover();
     bool hasReset() const;
 
-    static Z2AudioMgr* getInterface() { return mAudioMgrPtr; }
+    bool isResetting() { return mResettingFlag; }
 
+    static Z2AudioMgr* getInterface() { return mAudioMgrPtr; }
     static Z2AudioMgr* mAudioMgrPtr;
 
     /* 0x0514 */ virtual bool startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*);

diff --git a/include/Z2AudioLib/Z2Creature.h b/include/Z2AudioLib/Z2Creature.h
@@ -64,8 +64,8 @@ class Z2CreatureLink : public Z2Creature, public Z2LinkSoundStarter {
     void setRiding(bool);
     void setMagnetized(bool);
     void setWolfEyeOpen(bool);
-    void startLinkSound(JAISoundID, u32, s8);
-    void startLinkSoundLevel(JAISoundID, u32, s8);
+    Z2SoundHandlePool* startLinkSound(JAISoundID, u32, s8);
+    JAISoundHandle* startLinkSoundLevel(JAISoundID, u32, s8);
     void startLinkVoice(JAISoundID, s8);
     void startLinkVoiceLevel(JAISoundID, s8);
     void startLinkSwordSound(JAISoundID, u32, s8);

diff --git a/include/Z2AudioLib/Z2SoundHandles.h b/include/Z2AudioLib/Z2SoundHandles.h
@@ -30,6 +30,13 @@ class Z2SoundHandles : protected JSUList<Z2SoundHandlePool> {
 
     void stopAllSounds(u32 fadeout);
 
+    void stopSound(JAISoundID soundID, u32 param_1) {
+        JAISoundHandle* phandle = getHandleSoundID(soundID);
+        if (phandle != NULL) {
+            (*phandle)->stop(param_1);
+        }
+    }
+
     void setPos(const JGeometry::TVec3<f32>& pos);
 
     int getNumHandles() const { return getNumLinks(); }

diff --git a/include/d/d_error_msg.h b/include/d/d_error_msg.h
@@ -8,14 +8,8 @@ struct dShutdownErrorMsg_c {
 };
 
 struct dDvdErrorMsg_c {
-    /* 8009D194 */ void draw(s32);
+    /* 8009D194 */ static void draw(s32);
     /* 8009D354 */ static u8 execute();
 };
 
-struct J2DOrthoGraph {
-    /* 802E96D0 */ J2DOrthoGraph(f32, f32, f32, f32, f32, f32);
-    /* 802E97B4 */ void setPort();
-    /* 802E980C */ void setOrtho(JGeometry::TBox2<f32> const&, f32, f32);
-};
-
 #endif /* D_D_ERROR_MSG_H */
diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h
@@ -7,6 +7,7 @@
 class JUTFader;
 
 int mDoGph_Create();
+void mDoGph_drawFilterQuad(s8 param_0, s8 param_1);
 
 extern bool data_80450BE7;  // AutoForcus