Merge remote-tracking branch 'upstream' into tustin2121-patch-5

1 files changed, 0 insertions, 784 deletions

diff --git a/src/string_util.c b/src/string_util.c
deleted file mode 100644
index 39d235ab8..000000000
--- a/src/string_util.c
+++ /dev/null
@@ -1,784 +0,0 @@
-#include "global.h"
-#include "string_util.h"
-#include "text.h"
-
-EWRAM_DATA u8 gStringVar1[0x100] = {0};
-EWRAM_DATA u8 gStringVar2[0x100] = {0};
-EWRAM_DATA u8 gStringVar3[0x100] = {0};
-EWRAM_DATA u8 gStringVar4[0x3E8] = {0};
-EWRAM_DATA static u8 sUnknownStringVar[16] = {0};
-
-static const u8 sDigits[] = __("0123456789ABCDEF");
-
-static const s32 sPowersOfTen[] =
-{
-             1,
-            10,
-           100,
-          1000,
-         10000,
-        100000,
-       1000000,
-      10000000,
-     100000000,
-    1000000000,
-};
-
-extern const u8 gExpandedPlaceholder_Empty[];
-extern const u8 gExpandedPlaceholder_Kun[];
-extern const u8 gExpandedPlaceholder_Chan[];
-extern const u8 gExpandedPlaceholder_Sapphire[];
-extern const u8 gExpandedPlaceholder_Ruby[];
-extern const u8 gExpandedPlaceholder_Emerald[];
-extern const u8 gExpandedPlaceholder_Aqua[];
-extern const u8 gExpandedPlaceholder_Magma[];
-extern const u8 gExpandedPlaceholder_Archie[];
-extern const u8 gExpandedPlaceholder_Maxie[];
-extern const u8 gExpandedPlaceholder_Kyogre[];
-extern const u8 gExpandedPlaceholder_Groudon[];
-extern const u8 gExpandedPlaceholder_Brendan[];
-extern const u8 gExpandedPlaceholder_May[];
-
-u8 *StringCopy10(u8 *dest, const u8 *src)
-{
-    u8 i;
-    u32 limit = 10;
-
-    for (i = 0; i < limit; i++)
-    {
-        dest[i] = src[i];
-
-        if (dest[i] == EOS)
-            return &dest[i];
-    }
-
-    dest[i] = EOS;
-    return &dest[i];
-}
-
-u8 *StringGetEnd10(u8 *str)
-{
-    u8 i;
-    u32 limit = 10;
-
-    for (i = 0; i < limit; i++)
-        if (str[i] == EOS)
-            return &str[i];
-
-    str[i] = EOS;
-    return &str[i];
-}
-
-u8 *StringCopy7(u8 *dest, const u8 *src)
-{
-    s32 i;
-    s32 limit = 7;
-
-    for (i = 0; i < limit; i++)
-    {
-        dest[i] = src[i];
-
-        if (dest[i] == EOS)
-            return &dest[i];
-    }
-
-    dest[i] = EOS;
-    return &dest[i];
-}
-
-u8 *StringCopy(u8 *dest, const u8 *src)
-{
-    while (*src != EOS)
-    {
-        *dest = *src;
-        dest++;
-        src++;
-    }
-
-    *dest = EOS;
-    return dest;
-}
-
-u8 *StringAppend(u8 *dest, const u8 *src)
-{
-    while (*dest != EOS)
-        dest++;
-
-    return StringCopy(dest, src);
-}
-
-u8 *StringCopyN(u8 *dest, const u8 *src, u8 n)
-{
-    u16 i;
-
-    for (i = 0; i < n; i++)
-        dest[i] = src[i];
-
-    return &dest[n];
-}
-
-u8 *StringAppendN(u8 *dest, const u8 *src, u8 n)
-{
-    while (*dest != EOS)
-        dest++;
-
-    return StringCopyN(dest, src, n);
-}
-
-u16 StringLength(const u8 *str)
-{
-    u16 length = 0;
-
-    while (str[length] != EOS)
-        length++;
-
-    return length;
-}
-
-s32 StringCompare(const u8 *str1, const u8 *str2)
-{
-    while (*str1 == *str2)
-    {
-        if (*str1 == EOS)
-            return 0;
-        str1++;
-        str2++;
-    }
-
-    return *str1 - *str2;
-}
-
-s32 StringCompareN(const u8 *str1, const u8 *str2, u32 n)
-{
-    while (*str1 == *str2)
-    {
-        if (*str1 == EOS)
-            return 0;
-        str1++;
-        str2++;
-        if (--n == 0)
-            return 0;
-    }
-
-    return *str1 - *str2;
-}
-
-bool8 IsStringLengthAtLeast(const u8 *str, s32 n)
-{
-    u8 i;
-
-    for (i = 0; i < n; i++)
-        if (str[i] && str[i] != EOS)
-            return TRUE;
-
-    return FALSE;
-}
-
-u8 *ConvertIntToDecimalStringN(u8 *dest, s32 value, enum StringConvertMode mode, u8 n)
-{
-    enum { WAITING_FOR_NONZERO_DIGIT, WRITING_DIGITS, WRITING_SPACES } state;
-    s32 powerOfTen;
-    s32 largestPowerOfTen = sPowersOfTen[n - 1];
-
-    state = WAITING_FOR_NONZERO_DIGIT;
-
-    if (mode == STR_CONV_MODE_RIGHT_ALIGN)
-        state = WRITING_SPACES;
-
-    if (mode == STR_CONV_MODE_LEADING_ZEROS)
-        state = WRITING_DIGITS;
-
-    for (powerOfTen = largestPowerOfTen; powerOfTen > 0; powerOfTen /= 10)
-    {
-        u8 c;
-        u16 digit = value / powerOfTen;
-        s32 temp = value - (powerOfTen * digit);
-
-        if (state == WRITING_DIGITS)
-        {
-            u8 *out = dest++;
-
-            if (digit <= 9)
-                c = sDigits[digit];
-            else
-                c = CHAR_QUESTION_MARK;
-
-            *out = c;
-        }
-        else if (digit != 0 || powerOfTen == 1)
-        {
-            u8 *out;
-            state = WRITING_DIGITS;
-            out = dest++;
-
-            if (digit <= 9)
-                c = sDigits[digit];
-            else
-                c = CHAR_QUESTION_MARK;
-
-            *out = c;
-        }
-        else if (state == WRITING_SPACES)
-        {
-            *dest++ = 0x77;
-        }
-
-        value = temp;
-    }
-
-    *dest = EOS;
-    return dest;
-}
-
-u8 *ConvertUIntToDecimalStringN(u8 *dest, u32 value, enum StringConvertMode mode, u8 n)
-{
-    enum { WAITING_FOR_NONZERO_DIGIT, WRITING_DIGITS, WRITING_SPACES } state;
-    s32 powerOfTen;
-    s32 largestPowerOfTen = sPowersOfTen[n - 1];
-
-    state = WAITING_FOR_NONZERO_DIGIT;
-
-    if (mode == STR_CONV_MODE_RIGHT_ALIGN)
-        state = WRITING_SPACES;
-
-    if (mode == STR_CONV_MODE_LEADING_ZEROS)
-        state = WRITING_DIGITS;
-
-    for (powerOfTen = largestPowerOfTen; powerOfTen > 0; powerOfTen /= 10)
-    {
-        u8 c;
-        u16 digit = value / powerOfTen;
-        u32 temp = value - (powerOfTen * digit);
-
-        if (state == WRITING_DIGITS)
-        {
-            u8 *out = dest++;
-
-            if (digit <= 9)
-                c = sDigits[digit];
-            else
-                c = CHAR_QUESTION_MARK;
-
-            *out = c;
-        }
-        else if (digit != 0 || powerOfTen == 1)
-        {
-            u8 *out;
-            state = WRITING_DIGITS;
-            out = dest++;
-
-            if (digit <= 9)
-                c = sDigits[digit];
-            else
-                c = CHAR_QUESTION_MARK;
-
-            *out = c;
-        }
-        else if (state == WRITING_SPACES)
-        {
-            *dest++ = 0x77;
-        }
-
-        value = temp;
-    }
-
-    *dest = EOS;
-    return dest;
-}
-
-u8 *ConvertIntToHexStringN(u8 *dest, s32 value, enum StringConvertMode mode, u8 n)
-{
-    enum { WAITING_FOR_NONZERO_DIGIT, WRITING_DIGITS, WRITING_SPACES } state;
-    u8 i;
-    s32 powerOfSixteen;
-    s32 largestPowerOfSixteen = 1;
-
-    for (i = 1; i < n; i++)
-        largestPowerOfSixteen *= 16;
-
-    state = WAITING_FOR_NONZERO_DIGIT;
-
-    if (mode == STR_CONV_MODE_RIGHT_ALIGN)
-        state = WRITING_SPACES;
-
-    if (mode == STR_CONV_MODE_LEADING_ZEROS)
-        state = WRITING_DIGITS;
-
-    for (powerOfSixteen = largestPowerOfSixteen; powerOfSixteen > 0; powerOfSixteen /= 16)
-    {
-        u8 c;
-        u32 digit = value / powerOfSixteen;
-        s32 temp = value % powerOfSixteen;
-
-        if (state == WRITING_DIGITS)
-        {
-            char *out = dest++;
-
-            if (digit <= 0xF)
-                c = sDigits[digit];
-            else
-                c = CHAR_QUESTION_MARK;
-
-            *out = c;
-        }
-        else if (digit != 0 || powerOfSixteen == 1)
-        {
-            char *out;
-            state = WRITING_DIGITS;
-            out = dest++;
-
-            if (digit <= 0xF)
-                c = sDigits[digit];
-            else
-                c = CHAR_QUESTION_MARK;
-
-            *out = c;
-        }
-        else if (state == WRITING_SPACES)
-        {
-            *dest++ = 0x77;
-        }
-
-        value = temp;
-    }
-
-    *dest = EOS;
-    return dest;
-}
-
-u8 *StringExpandPlaceholders(u8 *dest, const u8 *src)
-{
-    for (;;)
-    {
-        u8 c = *src++;
-        u8 placeholderId;
-        const u8 *expandedString;
-
-        switch (c)
-        {
-            case PLACEHOLDER_BEGIN:
-                placeholderId = *src++;
-                expandedString = GetExpandedPlaceholder(placeholderId);
-                dest = StringExpandPlaceholders(dest, expandedString);
-                break;
-            case EXT_CTRL_CODE_BEGIN:
-                *dest++ = c;
-                c = *src++;
-                *dest++ = c;
-
-                switch (c)
-                {
-                    case 0x07:
-                    case 0x09:
-                    case 0x0F:
-                    case 0x15:
-                    case 0x16:
-                    case 0x17:
-                    case 0x18:
-                        break;
-                    case 0x04:
-                        *dest++ = *src++;
-                    case 0x0B:
-                        *dest++ = *src++;
-                    default:
-                        *dest++ = *src++;
-                }
-                break;
-            case EOS:
-                *dest = EOS;
-                return dest;
-            case CHAR_PROMPT_SCROLL:
-            case CHAR_PROMPT_CLEAR:
-            case CHAR_NEWLINE:
-            default:
-                *dest++ = c;
-        }
-    }
-}
-
-u8 *StringBraille(u8 *dest, const u8 *src)
-{
-    u8 setBrailleFont[] = { EXT_CTRL_CODE_BEGIN, 0x06, 0x06, EOS };
-    u8 gotoLine2[] = { CHAR_NEWLINE, EXT_CTRL_CODE_BEGIN, 0x0E, 0x02, EOS };
-
-    dest = StringCopy(dest, setBrailleFont);
-
-    for (;;)
-    {
-        u8 c = *src++;
-
-        switch (c)
-        {
-            case EOS:
-                *dest = c;
-                return dest;
-            case CHAR_NEWLINE:
-                dest = StringCopy(dest, gotoLine2);
-                break;
-            default:
-                *dest++ = c;
-                *dest++ = c + 0x40;
-                break;
-        }
-    }
-}
-
-static const u8 *ExpandPlaceholder_UnknownStringVar(void)
-{
-    return sUnknownStringVar;
-}
-
-static const u8 *ExpandPlaceholder_PlayerName(void)
-{
-    return gSaveBlock2Ptr->playerName;
-}
-
-static const u8 *ExpandPlaceholder_StringVar1(void)
-{
-    return gStringVar1;
-}
-
-static const u8 *ExpandPlaceholder_StringVar2(void)
-{
-    return gStringVar2;
-}
-
-static const u8 *ExpandPlaceholder_StringVar3(void)
-{
-    return gStringVar3;
-}
-
-static const u8 *ExpandPlaceholder_KunChan(void)
-{
-    if (gSaveBlock2Ptr->playerGender == MALE)
-        return gExpandedPlaceholder_Kun;
-    else
-        return gExpandedPlaceholder_Chan;
-}
-
-static const u8 *ExpandPlaceholder_RivalName(void)
-{
-    if (gSaveBlock2Ptr->playerGender == MALE)
-        return gExpandedPlaceholder_May;
-    else
-        return gExpandedPlaceholder_Brendan;
-}
-
-static const u8 *ExpandPlaceholder_Version(void)
-{
-    return gExpandedPlaceholder_Emerald;
-}
-
-static const u8 *ExpandPlaceholder_Aqua(void)
-{
-    return gExpandedPlaceholder_Aqua;
-}
-
-static const u8 *ExpandPlaceholder_Magma(void)
-{
-    return gExpandedPlaceholder_Magma;
-}
-
-static const u8 *ExpandPlaceholder_Archie(void)
-{
-    return gExpandedPlaceholder_Archie;
-}
-
-static const u8 *ExpandPlaceholder_Maxie(void)
-{
-    return gExpandedPlaceholder_Maxie;
-}
-
-static const u8 *ExpandPlaceholder_Kyogre(void)
-{
-    return gExpandedPlaceholder_Kyogre;
-}
-
-static const u8 *ExpandPlaceholder_Groudon(void)
-{
-    return gExpandedPlaceholder_Groudon;
-}
-
-const u8 *GetExpandedPlaceholder(u32 id)
-{
-    typedef const u8 *(*ExpandPlaceholderFunc)(void);
-
-    static const ExpandPlaceholderFunc funcs[] =
-    {
-        ExpandPlaceholder_UnknownStringVar,
-        ExpandPlaceholder_PlayerName,
-        ExpandPlaceholder_StringVar1,
-        ExpandPlaceholder_StringVar2,
-        ExpandPlaceholder_StringVar3,
-        ExpandPlaceholder_KunChan,
-        ExpandPlaceholder_RivalName,
-        ExpandPlaceholder_Version,
-        ExpandPlaceholder_Aqua,
-        ExpandPlaceholder_Magma,
-        ExpandPlaceholder_Archie,
-        ExpandPlaceholder_Maxie,
-        ExpandPlaceholder_Kyogre,
-        ExpandPlaceholder_Groudon,
-    };
-
-    if (id >= ARRAY_COUNT(funcs))
-        return gExpandedPlaceholder_Empty;
-    else
-        return funcs[id]();
-}
-
-u8 *StringFill(u8 *dest, u8 c, u16 n)
-{
-    u16 i;
-
-    for (i = 0; i < n; i++)
-        *dest++ = c;
-
-    *dest = EOS;
-    return dest;
-}
-
-u8 *StringCopyPadded(u8 *dest, const u8 *src, u8 c, u16 n)
-{
-    while (*src != EOS)
-    {
-        *dest++ = *src++;
-
-        if (n)
-            n--;
-    }
-
-    n--;
-
-    while (n != (u16)-1)
-    {
-        *dest++ = c;
-        n--;
-    }
-
-    *dest = EOS;
-    return dest;
-}
-
-u8 *StringFillWithTerminator(u8 *dest, u16 n)
-{
-    return StringFill(dest, EOS, n);
-}
-
-u8 *StringCopyN_Multibyte(u8 *dest, u8 *src, u32 n)
-{
-    u32 i;
-
-    for (i = n - 1; i != (u32)-1; i--)
-    {
-        if (*src == EOS)
-        {
-            break;
-        }
-        else
-        {
-            *dest++ = *src++;
-            if (*(src - 1) == CHAR_SPECIAL_F9)
-                *dest++ = *src++;
-        }
-    }
-
-    *dest = EOS;
-    return dest;
-}
-
-u32 StringLength_Multibyte(const u8 *str)
-{
-    u32 length = 0;
-
-    while (*str != EOS)
-    {
-        if (*str == CHAR_SPECIAL_F9)
-            str++;
-        str++;
-        length++;
-    }
-
-    return length;
-}
-
-u8 *WriteColorChangeControlCode(u8 *dest, u32 colorType, u8 color)
-{
-    *dest = EXT_CTRL_CODE_BEGIN;
-    dest++;
-
-    switch (colorType)
-    {
-    case 0:
-        *dest = 1;
-        dest++;
-        break;
-    case 1:
-        *dest = 3;
-        dest++;
-        break;
-    case 2:
-        *dest = 2;
-        dest++;
-        break;
-    }
-
-    *dest = color;
-    dest++;
-    *dest = EOS;
-    return dest;
-}
-
-bool32 IsStringJapanese(u8 *str)
-{
-    while (*str != EOS)
-    {
-        if (*str <= 0xA0)
-            if (*str != CHAR_SPACE)
-                return TRUE;
-        str++;
-    }
-
-    return FALSE;
-}
-
-bool32 sub_800924C(u8 *str, s32 n)
-{
-    s32 i;
-
-    for (i = 0; *str != EOS && i < n; i++)
-    {
-        if (*str <= 0xA0)
-            if (*str != CHAR_SPACE)
-                return TRUE;
-        str++;
-    }
-
-    return FALSE;
-}
-
-u8 GetExtCtrlCodeLength(u8 code)
-{
-    static const u8 lengths[] =
-    {
-        1,
-        2,
-        2,
-        2,
-        4,
-        2,
-        2,
-        1,
-        2,
-        1,
-        1,
-        3,
-        2,
-        2,
-        2,
-        1,
-        3,
-        2,
-        2,
-        2,
-        2,
-        1,
-        1,
-        1,
-        1,
-    };
-
-    u8 length = 0;
-    if (code < ARRAY_COUNT(lengths))
-        length = lengths[code];
-    return length;
-}
-
-static const u8 *SkipExtCtrlCode(const u8 *s)
-{
-    while (*s == EXT_CTRL_CODE_BEGIN)
-    {
-        s++;
-        s += GetExtCtrlCodeLength(*s);
-    }
-
-    return s;
-}
-
-s32 StringCompareWithoutExtCtrlCodes(const u8 *str1, const u8 *str2)
-{
-    s32 retVal = 0;
-
-    while (1)
-    {
-        str1 = SkipExtCtrlCode(str1);
-        str2 = SkipExtCtrlCode(str2);
-
-        if (*str1 > *str2)
-            break;
-
-        if (*str1 < *str2)
-        {
-            retVal = -1;
-            if (*str2 == EOS)
-                retVal = 1;
-        }
-
-        if (*str1 == EOS)
-            return retVal;
-
-        str1++;
-        str2++;
-    }
-
-    retVal = 1;
-
-    if (*str1 == EOS)
-        retVal = -1;
-
-    return retVal;
-}
-
-void ConvertInternationalString(u8 *s, u8 language)
-{
-    if (language == LANGUAGE_JAPANESE)
-    {
-        u8 i;
-
-        StripExtCtrlCodes(s);
-        i = StringLength(s);
-        s[i++] = EXT_CTRL_CODE_BEGIN;
-        s[i++] = 22;
-        s[i++] = EOS;
-
-        i--;
-
-        while (i != (u8)-1)
-        {
-            s[i + 2] = s[i];
-            i--;
-        }
-
-        s[0] = EXT_CTRL_CODE_BEGIN;
-        s[1] = 21;
-    }
-}
-
-void StripExtCtrlCodes(u8 *str)
-{
-    u16 srcIndex = 0;
-    u16 destIndex = 0;
-    while (str[srcIndex] != EOS)
-    {
-        if (str[srcIndex] == EXT_CTRL_CODE_BEGIN)
-        {
-            srcIndex++;
-            srcIndex += GetExtCtrlCodeLength(str[srcIndex]);
-        }
-        else
-        {
-            str[destIndex++] = str[srcIndex++];
-        }
-    }
-    str[destIndex] = EOS;
-}