d_tag_processor OK

include/d/d_message.h

@@ -136,6 +136,8 @@ public:
     bool advanceUntilEvent(s32 searchParam3, s32 *pOutParams1n2);
     bool advanceUntil(s32 searchType, s32 searchParam3, s32 *pOutParams1n2);
 
+    static void playSound(u32);
+
     u16 getField_0x44() const;
     u16 getNextFiFlow() const;
 
@@ -176,7 +178,6 @@ protected:
     void setField0x3C();
     bool checkField0x3C() const;
     bool shouldHideKillCountForActor(s32 id) const;
-    static void playSound(u32);
     void createLytMiniGame();
     void clearMinigame();
 

include/d/d_tag_processor.h

@@ -9,7 +9,7 @@ struct dLytMsgWindowCharData;
 
 struct LineData {
     f32 mLineWidths[0x32];
-    u32 mNumLines;
+    s32 mNumLines;
 };
 
 // inofficial name
@@ -28,7 +28,12 @@ public:
 
     nw4r::ut::Operation ProcessTags(nw4r::ut::Rect *rect, u16 ch, nw4r::ut::PrintContext<wchar_t> *ctx);
 
-    f32 fn_800B8560(s32);
+    u8 fn_800B7A90(u8 arg);
+    u8 symbolToFontIdx(s32 s);
+    u8 fn_800B7880(u8);
+
+    u8 fn_800B7B30(u8 arg);
+    f32 getMarginForCenteredLine(s32);
     f32 fn_800B85C0(s32);
     void somethingWithScrapperAndMusic(wchar_t* src);
 
@@ -54,7 +59,10 @@ public:
     void restoreColor(nw4r::ut::PrintContext<wchar_t> *ctx, u8 windowType);
     void setScale(nw4r::ut::Rect *rect, nw4r::ut::PrintContext<wchar_t> *ctx, u8 cmdLen, wchar_t *ptr);
 
-    u8 symbolToFontIdx(s32 s);
+    void SetupGXCommon();
+    void SetupGXWithColorMapping(nw4r::ut::Color min, nw4r::ut::Color max);
+    void SetupVertexFormat();
+
     void setStringArg(const wchar_t *arg, s32 index);
 
     static s32 getMaxNumLines(s32 arg);
@@ -63,17 +71,17 @@ public:
     static void process0xFCommand(wchar_t _0xf, const wchar_t *src, s32 *outCmd);
 
     static f32 fn_800B8040(s8, u32);
-    wchar_t *fn_800B5FD0(u32, wchar_t *, s32 *);
+    wchar_t *writeSingleCharacter(wchar_t, wchar_t *, s32 *);
     wchar_t *writeTextNormal(const wchar_t *src, wchar_t *dest, s32 *, u8 cmdLen, s32);
     wchar_t *writeHeroname(wchar_t *dest, s32 *, s32);
-    wchar_t *fn_800B5DD0(wchar_t *dest, wchar_t *src, s32 *, s32);
+    wchar_t *writeSingularOrPluralWord(wchar_t *dest, wchar_t *src, s32 *, s32);
     void fn_800B5520(wchar_t *src);
     void writeIcon(dTextBox_c *textBox, wchar_t *cmd, f32);
-    char fn_800B7880(u32);
     void fn_800B70D0(nw4r::ut::TextWriterBase<wchar_t> *, nw4r::ut::PrintContext<wchar_t> *ctx, u16 c, s32);
+    void fn_800B6790(nw4r::ut::CharWriter *w, nw4r::ut::PrintContext<wchar_t> *ctx, u16, u8);
 
     void
-    fn_800B4290(dTextBox_c *textBox, const wchar_t *src, wchar_t *dest, s32, u16 *, dLytMsgWindowCharData *charData);
+    computeCharacterPlacement(dTextBox_c *textBox, const wchar_t *src, wchar_t *dest, s32, u16 *, dLytMsgWindowCharData *charData);
 
     void resetSomething();
     void resetLineData();
@@ -82,10 +90,17 @@ public:
     f32 getLineWidth(s32 i);
     s32 tickPauseFrame();
     s32 tick0x830();
+
+    void tick0x8C8();
+    void tick0x8CC();
     void execute();
 
     void setTextbox(dTextBox_c *box) {
-        field_0x004 = box;
+        mpTextBox = box;
+    }
+
+    dTextBox_c *getTextBox() const {
+        return mpTextBox;
     }
 
     s32 getNumLinesMaybe() const {
@@ -188,7 +203,7 @@ private:
         }
     }
 
-    /* 0x004 */ dTextBox_c *field_0x004;
+    /* 0x004 */ dTextBox_c *mpTextBox;
     /* 0x008 */ wchar_t field_0x008[4][256];
     /* 0x808 */ wchar_t field_0x808[4];
     /* 0x810 */ f32 field_0x810;
@@ -196,7 +211,7 @@ private:
     /* 0x818 */ f32 field_0x818;
     /* 0x81C */ s32 field_0x81C;
     /* 0x820 */ s32 field_0x820;
-    /* 0x824 */ s32 field_0x824;
+    /* 0x824 */ u32 field_0x824;
     /* 0x828 */ s32 field_0x828;
     /* 0x82C */ s32 field_0x82C;
     /* 0x830 */ s32 field_0x830;
@@ -227,7 +242,7 @@ private:
     /* 0x894 */ s32 field_0x894;
     /* 0x898 */ s32 field_0x898;
     /* 0x89C */ s32 mNumericArgs[10];
-    /* 0x8C4 */ s32 mNumericArgsCopy[10];
+    /* 0x8C4 */ s32 mNumericArgsCopy[10]; // probably not an array
     /* 0x8EC */ s32 field_0x8EC;
     /* 0x8EC */ s32 field_0x8F0;
     /* 0x8F4 */ s32 field_0x8F4;

include/d/d_textunk.h

@@ -75,6 +75,13 @@ public:
         return 1.0f;
     }
 
+    inline static f32 getFn800B1FC0() {
+        if (sInstance != nullptr) {
+            return sInstance->fn_800B1FC0();
+        }
+        return 1.0f;
+    }
+
     inline static f32 getFn800B1FD0() {
         if (sInstance != nullptr) {
             return sInstance->fn_800B1FD0();
@@ -128,6 +135,20 @@ public:
         return 0.0f;
     }
 
+    inline static s16 getField_0x7AA() {
+        if (sInstance != nullptr) {
+            return sInstance->field_0x7AA;
+        }
+        return 0;
+    }
+
+    inline static s16 getField_0x7AA_plus_0x7AC() {
+        if (sInstance != nullptr) {
+            return sInstance->field_0x7AA + sInstance->field_0x7AC;
+        }
+        return 0;
+    }
+
     static UnkTextThing *getInstance() {
         return sInstance;
     }

include/d/lyt/d_lyt_util_items.h

@@ -16,4 +16,10 @@ DowsingTarget::DowsingSlot dowsingSlotForIndex(s32 index);
 s32 getLytIndexForDowsingIndex(s32 index);
 u16 getDowsingItemIdForIndex(s32 index);
 
+/**
+ * FR: -1, 0, 1 singular, else plural
+ * Otherwise: -1, 1 singular, else plural
+ */
+bool shouldUseSingular(s32 amount);
+
 #endif

include/d/lyt/msg_window/d_lyt_msg_window.h

@@ -93,6 +93,10 @@ public:
         return mpTagProcessor;
     }
 
+    s32 getField_0x784() const {
+        return field_0x784;
+    }
+
     u8 getField_0x80D() const {
         return field_0x80D;
     }
@@ -105,6 +109,10 @@ public:
         return mTextOptionSelection;
     }
 
+    void onFlag0x820(u16 flag) {
+        field_0x820 |= flag;
+    }
+
 private:
     bool setTextToDisplay(const wchar_t *text);
     void createSubMsgManager(u8 type);

include/toBeSorted/music_mgrs.h

@@ -3,12 +3,15 @@
 
 #include "common.h"
 
-extern "C" void *BGM_MGR;
+class BgmMgr;
+
+extern "C" BgmMgr *BGM_MGR;
 extern "C" void fn_8035E000();
-extern "C" void fn_8035E860(void *);
-extern "C" void fn_8035E310(void *);
-extern "C" void fn_8035E820(void *);
-extern "C" void fn_8035E880(void *);
+extern "C" void fn_8035E860(BgmMgr *);
+extern "C" void fn_8035E310(BgmMgr *);
+extern "C" void fn_8035E820(BgmMgr *);
+extern "C" void fn_8035E880(BgmMgr *);
+extern "C" void fn_8035E790(BgmMgr *, UNKWORD, void *);
 
 extern "C" void *ENEMY_SOUND_MGR;
 extern "C" void fn_80362150(void *, u16);