2 files changed, 178 insertions, 2 deletions
diff --git a/arm9/src/script_buffers.c b/arm9/src/script_buffers.c
index 0c1b3996..431f63b4 100644
--- a/arm9/src/script_buffers.c
+++ b/arm9/src/script_buffers.c
@@ -18,7 +18,7 @@ extern void * FUN_02024EC0(struct SaveBlock2 * sav2);
 extern u16 * FUN_02024EE8(void *);
 extern u32 GetCityNamesMsgdataIdByCountry(u32);
 extern void GetECWordIntoStringByIndex(u32 a0, struct String * a1);
-extern void FUN_02022048(struct String * dest, const struct String * src);
+extern void StringCat_HandleTrainerName(struct String * dest, const struct String * src);
 extern void StrAddChar(struct String * str, u16 val);
 extern void * FUN_02006BB0(NarcId, s32, s32, struct UnkStruct_0200B870_sub **, u32);
 extern BOOL UncompressFromNarc(NarcId narcId, s32 memberNo, BOOL a2, u32 heap_id, BOOL a4);
@@ -726,7 +726,7 @@ void StringExpandPlaceholders(struct ScrStrBufs * mgr, struct String * dest, str
             {
                 u32 idx = MsgArray_ControlCodeGetField(cstr, 0);
                 GF_ASSERT(idx < mgr->count);
-                FUN_02022048(dest, mgr->array[idx].msg);
+                StringCat_HandleTrainerName(dest, mgr->array[idx].msg);
                 cstr = MsgArray_SkipControlCode(cstr);
             }
             else
diff --git a/arm9/src/unk_02021FF8.c b/arm9/src/unk_02021FF8.c
new file mode 100644
index 00000000..2fe37556
--- /dev/null
+++ b/arm9/src/unk_02021FF8.c
@@ -0,0 +1,176 @@
+#include "global.h"
+#include "string16.h"
+#include "heap.h"
+#include "unk_02021FF8.h"
+
+#pragma thumb on
+
+BOOL String_IsTrainerName(struct String * string)
+{
+    return string->size != 0 && string->data[0] == 0xF100;
+}
+
+void StringCat_HandleTrainerName(struct String * dest, struct String * src)
+{
+    if (String_IsTrainerName(src))
+    {
+        u16 * dest_p = &dest->data[dest->size];
+        u16 * src_p = &src->data[1];
+        s32 bit = 0;
+        u32 outsize = 0;
+        u16 cur_char = 0;
+
+        while (1)
+        {
+            cur_char = (u16)((*src_p >> bit) & 0x1FF);
+            bit += 9;
+            if (bit >= 15)
+            {
+                src_p++;
+                bit -= 15;
+                if (bit != 0)
+                {
+                    cur_char |= (*src_p << (9 - bit)) & 0x1FF;
+                }
+            }
+            if (cur_char == 0x1FF)
+                break;
+            *dest_p++ = cur_char;
+            outsize++;
+        }
+        *dest_p = EOS;
+        dest->size += outsize;
+    }
+    else
+        StringCat(dest, src);
+}
+
+struct UnkStruct_020220C4 * FUN_020220C4(u8 * a0, u32 a1, void (*a2)(s32, s32, u32), u32 a3, u32 a4)
+{
+    struct UnkStruct_020220C4 * ret;
+    s32 i;
+    GF_ASSERT(a1 != 0);
+    ret = AllocFromHeap(a4, sizeof(struct UnkStruct_020220C4));
+    if (ret != NULL)
+    {
+        ret->field_0 = a0;
+        ret->field_4 = a1;
+        ret->field_8 = a2;
+        ret->field_C = a3;
+        ret->field_10 = AllocFromHeap(a4, a1 * sizeof(struct UnkStruct_020220C4_sub));
+        if (ret->field_10 != NULL)
+        {
+            for (i = 0; i < a1; i++)
+            {
+                FUN_02022120(&ret->field_10[i]);
+            }
+        }
+        else
+        {
+            FreeToHeap(ret);
+            ret = NULL;
+        }
+    }
+    return ret;
+}
+
+void FUN_02022120(struct UnkStruct_020220C4_sub * sub)
+{
+    sub->field_0 = 0;
+    sub->field_1 = 0;
+    sub->field_2 = 0;
+}
+
+void FUN_0202212C(struct UnkStruct_020220C4 * unk)
+{
+    GF_ASSERT(unk != NULL);
+    FreeToHeap(unk->field_10);
+    FreeToHeap(unk);
+}
+
+extern u16 FUN_02020A98(void);
+extern u16 FUN_02020AA4(void);
+extern u8 FUN_02020A40(u8 * a0);
+extern u8 FUN_02020A6C(u8 * a0);
+
+s32 (*const UNK_020EE6CC[])(struct UnkStruct_020220C4_sub * a0, u32 a1, u32 a2) = {
+    FUN_020221EC,
+    FUN_02022208
+};
+
+void FUN_02022144(struct UnkStruct_020220C4 * unk)
+{
+    u32 sp4;
+    u32 sp0 = FUN_02020A98();
+    s32 i;
+    s32 r1;
+    if (sp0 != 0)
+    {
+        sp4 = FUN_02020AA4();
+        for (i = 0; i < unk->field_4; i++)
+        {
+            u8 res;
+            if (unk->field_10[i].field_1 != 0)
+            {
+                res = FUN_02020A40(&unk->field_0[4 * i]);
+            }
+            else
+            {
+                res = FUN_02020A6C(&unk->field_0[4 * i]);
+            }
+            unk->field_10[i].field_1 = res;
+        }
+    }
+    else
+    {
+        sp4 = 0;
+        for (i = 0; i < unk->field_4; i++)
+        {
+            unk->field_10[i].field_1 = 0;
+        }
+    }
+    for (i = 0; i < unk->field_4; i++)
+    {
+        r1 = UNK_020EE6CC[unk->field_10[i].field_0](&unk->field_10[i], sp0, sp4);
+        if (r1 != -1)
+        {
+            unk->field_8(i, r1, unk->field_C);
+        }
+    }
+}
+
+s32 FUN_020221EC(struct UnkStruct_020220C4_sub * a0, u32 a1, u32 a2)
+{
+#pragma unused(a1)
+    if (a0->field_1 && a2)
+    {
+        FUN_0202223C(a0, 1);
+        return 0;
+    }
+    return -1;
+}
+
+s32 FUN_02022208(struct UnkStruct_020220C4_sub * a0, u32 a1, u32 a2)
+{
+#pragma unused(a2)
+    if (a0->field_1)
+    {
+        if (a0->field_2 < 0xFFFF)
+            a0->field_2++;
+        return 2;
+    }
+    else if (a1)
+    {
+        FUN_0202223C(a0, 0);
+        return 3;
+    }
+    FUN_0202223C(a0, 0);
+    return 1;
+}
+
+void FUN_0202223C(struct UnkStruct_020220C4_sub * a0, u8 a1)
+{
+    a0->field_0 = a1;
+    a0->field_2 = 0;
+}
+