diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-15 23:27:27 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-15 23:27:27 +0200 |
commit | 003a8a501b7ee0a4f8bf8bb803cf7e077d52d068 (patch) | |
tree | 2ebb9f702f863ab0cfb78a996aeeac331428ba7b /include/string_util.h | |
parent | 9d4acb9635b3b74d5ae4edee70d673f49c0aab74 (diff) | |
parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) |
fix merge conflict
Diffstat (limited to 'include/string_util.h')
-rw-r--r-- | include/string_util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/string_util.h b/include/string_util.h index 382f52251..f26646082 100644 --- a/include/string_util.h +++ b/include/string_util.h @@ -31,7 +31,7 @@ u8 *StringFillWithTerminator(u8 *dest, u16 n); u8 *StringCopyN_Multibyte(u8 *dest, u8 *src, u32 n); u32 StringLength_Multibyte(u8 *str); u8 *WriteColorChangeControlCode(u8 *dest, u32 colorType, u8 color); -bool32 sub_8009228(u8 *str); +bool32 IsStringJapanese(u8 *str); bool32 sub_800924C(u8 *str, s32 n); u8 GetExtCtrlCodeLength(u8 code); static const u8 *SkipExtCtrlCode(const u8 *s); |