summaryrefslogtreecommitdiff
path: root/gflib/string_util.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-10-07 16:10:35 -0400
committerGitHub <noreply@github.com>2021-10-07 16:10:35 -0400
commita2655ba9ab82646a54f60abc6078df372179f8d4 (patch)
tree95b074a1a4d77d6cd77e413e1d6e72eb55b595b0 /gflib/string_util.c
parente86d3410a1719fcbf62754bfda93a295aa7e0d57 (diff)
parent001a25e49cd6acdac89a62f4230aef80422e78f2 (diff)
Merge branch 'master' into doc-union
Diffstat (limited to 'gflib/string_util.c')
-rw-r--r--gflib/string_util.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/gflib/string_util.c b/gflib/string_util.c
index 92f8eea5a..b7485184a 100644
--- a/gflib/string_util.c
+++ b/gflib/string_util.c
@@ -384,18 +384,18 @@ u8 *StringExpandPlaceholders(u8 *dest, const u8 *src)
u8 *StringBraille(u8 *dest, const u8 *src)
{
- const u8 setBrailleFont[] = {
- EXT_CTRL_CODE_BEGIN,
- EXT_CTRL_CODE_SIZE,
- 6,
- EOS
+ const u8 setBrailleFont[] = {
+ EXT_CTRL_CODE_BEGIN,
+ EXT_CTRL_CODE_SIZE,
+ 6,
+ EOS
};
- const u8 gotoLine2[] = {
- CHAR_NEWLINE,
- EXT_CTRL_CODE_BEGIN,
- EXT_CTRL_CODE_SHIFT_DOWN,
- 2,
- EOS
+ const u8 gotoLine2[] = {
+ CHAR_NEWLINE,
+ EXT_CTRL_CODE_BEGIN,
+ EXT_CTRL_CODE_SHIFT_DOWN,
+ 2,
+ EOS
};
dest = StringCopy(dest, setBrailleFont);
@@ -630,7 +630,7 @@ bool32 IsStringJapanese(u8 *str)
{
while (*str != EOS)
{
- if (*str < CHAR_0)
+ if (*str <= JAPANESE_CHAR_END)
if (*str != CHAR_SPACE)
return TRUE;
str++;
@@ -639,13 +639,13 @@ bool32 IsStringJapanese(u8 *str)
return FALSE;
}
-bool32 sub_800924C(u8 *str, s32 n)
+bool32 IsStringNJapanese(u8 *str, s32 n)
{
s32 i;
for (i = 0; *str != EOS && i < n; i++)
{
- if (*str < CHAR_0)
+ if (*str <= JAPANESE_CHAR_END)
if (*str != CHAR_SPACE)
return TRUE;
str++;