summaryrefslogtreecommitdiff
path: root/arm9/src/string_util.c
diff options
context:
space:
mode:
authorLouis Hampton <roastveg@hotmail.co.uk>2020-06-20 19:01:00 +0100
committerLouis Hampton <roastveg@hotmail.co.uk>2020-06-20 19:01:00 +0100
commit3cf5ef0a661c62a94766e2c08025bb7ecb785b2a (patch)
tree7fa9fc230a0517f65876613318f043f3c14b8f63 /arm9/src/string_util.c
parent59f6bdfa9a7645d3e2e9d1ac0bde5af3ad77e8b2 (diff)
parent6298426d9ad4c59a875b0a90a0facfa1a3a513cc (diff)
Merge branch 'master' of https://github.com/roastveg/pokediamond
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) {