Merge pull request #94 from robojumper/more-tag-processor

Continue with d_tag_processor

3 files changed, 30 insertions, 3 deletions

diff --git a/include/d/d_message.h b/include/d/d_message.h
index aa86ffbe..3c232312 100644
--- a/include/d/d_message.h
+++ b/include/d/d_message.h
@@ -73,6 +73,10 @@ public:
 
     static const wchar_t *formatText(const wchar_t *text);
 
+    static MsbtInfo *getMsbtInfoForIndex(s32 index);
+    static MsbfInfo *getMsbfInfoForIndex(s32 index);
+    static const char *getArcNameByIndex(s32 idx, bool);
+
 private:
     static void *sZev0;
     static void *sZevStage;
@@ -88,7 +92,6 @@ private:
     );
 
     static s32 getArcIndexForFile(const char *fileName);
-    static const char *getArcNameByIndex(s32 idx, bool);
 
     bool checkIsValidTextLabel(const char *name);
 
@@ -101,10 +104,8 @@ private:
 
     s32 getTextIndexForLabel(const char *label);
     s32 getMsbtIndexForLabelInternal(const char *label);
-    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);
diff --git a/include/d/d_tag_processor.h b/include/d/d_tag_processor.h
index f4195865..d1b6fa0e 100644
--- a/include/d/d_tag_processor.h
+++ b/include/d/d_tag_processor.h
@@ -28,6 +28,10 @@ public:
 
     nw4r::ut::Operation ProcessTags(nw4r::ut::Rect *rect, u16 ch, nw4r::ut::PrintContext<wchar_t> *ctx);
 
+    f32 fn_800B8560(s32);
+    f32 fn_800B85C0(s32);
+    void somethingWithScrapperAndMusic(wchar_t* src);
+
     void changeScale(nw4r::ut::Rect *rect, nw4r::ut::PrintContext<wchar_t> *ctx, bool);
     wchar_t *writeItem(wchar_t *dest, wchar_t *src, s32 *, s32);
     wchar_t *writeStringArg(wchar_t *dest, wchar_t *src, s32 *, s32);
@@ -161,6 +165,16 @@ public:
     }
 
 private:
+    wchar_t *getTmpBuffer() {
+        return field_0x008[field_0x90E - 1];
+    }
+
+    void onWriteTmpBuffer() {
+        if (field_0x90E - 1 < 4) {
+            field_0x808[field_0x90E - 1]++;
+        }
+    }
+
     /* 0x004 */ dTextBox_c *field_0x004;
     /* 0x008 */ wchar_t field_0x008[4][256];
     /* 0x808 */ wchar_t field_0x808[4];
diff --git a/include/d/d_textunk.h b/include/d/d_textunk.h
index a76d5c99..eea6de23 100644
--- a/include/d/d_textunk.h
+++ b/include/d/d_textunk.h
@@ -38,6 +38,14 @@ public:
     inline static f32 getField0x760() {
         if (sInstance != nullptr) {
             return sInstance->field_0x760;
+        } else {
+            return 0.0f;
+        }
+    }
+
+    inline static f32 getField0x764() {
+        if (sInstance != nullptr) {
+            return sInstance->field_0x764;
         }
         return 0.0f;
     }
@@ -56,6 +64,10 @@ public:
         return 0.0f;
     }
 
+    inline static f32 getField0x788() {
+        return sInstance->field_0x788;
+    }
+
     inline static f32 getFn800B1F70() {
         if (sInstance != nullptr) {
             return sInstance->fn_800B1F70();