some d_message additions

3 files changed, 37 insertions, 3 deletions

diff --git a/include/d/d_message.h b/include/d/d_message.h
index 47b0fe4d..cd075bb0 100644
--- a/include/d/d_message.h
+++ b/include/d/d_message.h
@@ -57,6 +57,14 @@ public:
     static const wchar_t *formatText(const wchar_t *text);
 
 private:
+    static void *sZev0;
+    static void *sZevStage;
+
+    static void *getZev0Internal();
+    static void *getZevStageInternal();
+
+    void executeMinigame();
+
     const wchar_t *formatTextInternal(const wchar_t *text);
     const wchar_t *getTextMessageByLabelInternal(
         const char *label, dTagProcessor_c *pTagProcessor, bool global, wchar_t *dstBuf, u32 maxLen
@@ -68,6 +76,7 @@ private:
     bool checkIsValidTextLabel(const char *name);
 
     static void setZevFromMsbArc();
+    static void setStageZevFromMsbArc();
     static s32 getMsbtNumberByIndex(s32 index);
     static const char *getMsbfFileName(s32 index);
     static s32 getMsbfNumberByIndex(s32 index);
@@ -78,6 +87,11 @@ private:
     static MsbtInfo *getMsbtInfoForIndex(s32 index);
     MsbtInfo *getMsbtInfoForIndexInternal(s32 index);
 
+    static MsbfInfo *getMsbfInfoForIndex(s32 index);
+    MsbfInfo *getMsbfInfoForIndexInternal(s32 index);
+
+    static const char *getArcNameByIndexInternal(s32 idx, bool global);
+
     static dMessage_c *sInstance;
     static dTagProcessor_c *sTagProcessor;
 
@@ -93,8 +107,11 @@ private:
     /* 0x329 */ bool field_0x329;
     /* 0x32A */ bool field_0x32A;
 
+    /* 0x32B */ u8 _0x32B[0x334 - 0x32B];
+
     /* 0x334 */ u32 mMinigameResultPoints;
     /* 0x338 */ u32 mMinigameTime;
+    /* 0x33C */ u8 _0x33C[0x344 - 0x33C];
     /* 0x344 */ s32 field_0x344;
 };
 
diff --git a/include/d/d_textunk.h b/include/d/d_textunk.h
index bc820fd7..90e2a4d4 100644
--- a/include/d/d_textunk.h
+++ b/include/d/d_textunk.h
@@ -133,10 +133,26 @@ public:
         return field_0x7B4;
     }
 
+    void *getField_0x74C() const {
+        return field_0x74C;
+    }
+
+    void *getField_0x750() const {
+        return field_0x750;
+    }
+
+    bool getField_0x7B6() const {
+        return field_0x7B6;
+    }
+
     MsbtInfo *getMsbtInfo(s32 index) const {
         return field_buf2[index];
     }
 
+    MsbfInfo *getMsbfInfo(s32 index) const {
+        return field_buf3[index];
+    }
+
     const char *getStr1() const {
         return field_0x004;
     }
@@ -161,11 +177,12 @@ public:
         field_0x104 = s;
     }
 
+    void *allocUnk(size_t size, int align);
+    void destroyUnk(void *thing);
+
 private:
     static UnkTextThing *sInstance;
 
-    void *allocUnk(size_t size, int align);
-    void destroyUnk(void *thing);
     void destroyFlow(MsbfInfo *flow);
     void destroyMsg(MsbtInfo *msg);
 
diff --git a/include/libms/flowfile.h b/include/libms/flowfile.h
index 9bc47790..edd1710f 100644
--- a/include/libms/flowfile.h
+++ b/include/libms/flowfile.h
@@ -12,7 +12,7 @@ struct MsbfInfo;
 struct MsbFlowInfo {
     /* 0x00 */ char type;
     /* 0x01 */ char subType;
-    /* 0x04 */ short params1n2;
+    /* 0x04 */ int params1n2;
     /* 0x08 */ short next;
     /* 0x0A */ short param3;
     /* 0x0C */ short param4;