summaryrefslogtreecommitdiff
path: root/arm9/src/string_util.c
diff options
context:
space:
mode:
authorRoastVeg <RoastVeg@users.noreply.github.com>2020-06-20 17:57:41 +0100
committerGitHub <noreply@github.com>2020-06-20 17:57:41 +0100
commit6298426d9ad4c59a875b0a90a0facfa1a3a513cc (patch)
tree542386bd071b5b5b5b87ec9ad65668745eabc0c4 /arm9/src/string_util.c
parent53ac396de4098e38a6916e0cc86cbd278a960c4c (diff)
parent16b091058e6135f9b7875fcf074d812d610df380 (diff)
Merge branch 'master' into master
Diffstat (limited to 'arm9/src/string_util.c')
-rw-r--r--arm9/src/string_util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arm9/src/string_util.c b/arm9/src/string_util.c
index 54ad61fc..19ed5fa3 100644
--- a/arm9/src/string_util.c
+++ b/arm9/src/string_util.c
@@ -32,7 +32,7 @@ const s32 gPowersOfTen[] = {
1000000000,
};
-THUMB_FUNC void StringCopy(u16 *dest, const u16 *src)
+THUMB_FUNC void CopyU16StringArray(u16 *dest, const u16 *src)
{
u16 c = *src;
while (c != EOS) {
@@ -44,7 +44,7 @@ THUMB_FUNC void StringCopy(u16 *dest, const u16 *src)
*dest = EOS;
}
-THUMB_FUNC u16 *StringCopyN(u16 *dest, const u16 *src, u32 num)
+THUMB_FUNC u16 *CopyU16StringArrayN(u16 *dest, const u16 *src, u32 num)
{
u32 copied = 0;
if (num > copied) {