3 files changed, 9 insertions, 10 deletions
diff --git a/gflib/sprite.h b/gflib/sprite.h
index 595ecd7db..e53737981 100644
--- a/gflib/sprite.h
+++ b/gflib/sprite.h
@@ -281,7 +281,6 @@ void FreeSpriteTiles(struct Sprite *sprite);
 void FreeSpritePalette(struct Sprite *sprite);
 void FreeSpriteOamMatrix(struct Sprite *sprite);
 void DestroySpriteAndFreeResources(struct Sprite *sprite);
-void sub_800142C(u32 a1, u32 a2, u16 *a3, u16 a4, u32 a5);
 void AnimateSprite(struct Sprite *sprite);
 void SetSpriteMatrixAnchor(struct Sprite* sprite, s16 x, s16 y);
 void StartSpriteAnim(struct Sprite *sprite, u8 animNum);
diff --git a/gflib/string_util.c b/gflib/string_util.c
index 9463b4a7b..bc6f976c7 100644
--- a/gflib/string_util.c
+++ b/gflib/string_util.c
@@ -25,10 +25,10 @@ static const s32 sPowersOfTen[] =
     1000000000,
 };
 
-u8 *StringCopy10(u8 *dest, const u8 *src)
+u8 *StringCopy_Nickname(u8 *dest, const u8 *src)
 {
     u8 i;
-    u32 limit = 10;
+    u32 limit = POKEMON_NAME_LENGTH;
 
     for (i = 0; i < limit; i++)
     {
@@ -42,10 +42,10 @@ u8 *StringCopy10(u8 *dest, const u8 *src)
     return &dest[i];
 }
 
-u8 *StringGetEnd10(u8 *str)
+u8 *StringGet_Nickname(u8 *str)
 {
     u8 i;
-    u32 limit = 10;
+    u32 limit = POKEMON_NAME_LENGTH;
 
     for (i = 0; i < limit; i++)
         if (str[i] == EOS)
@@ -55,10 +55,10 @@ u8 *StringGetEnd10(u8 *str)
     return &str[i];
 }
 
-u8 *StringCopy7(u8 *dest, const u8 *src)
+u8 *StringCopy_PlayerName(u8 *dest, const u8 *src)
 {
     s32 i;
-    s32 limit = 7;
+    s32 limit = PLAYER_NAME_LENGTH;
 
     for (i = 0; i < limit; i++)
     {
diff --git a/gflib/string_util.h b/gflib/string_util.h
index 7f3b64add..0a8a99fb9 100644
--- a/gflib/string_util.h
+++ b/gflib/string_util.h
@@ -13,9 +13,9 @@ enum StringConvertMode
     STR_CONV_MODE_LEADING_ZEROS
 };
 
-u8 *StringCopy10(u8 *dest, const u8 *src);
-u8 *StringGetEnd10(u8 *str);
-u8 *StringCopy7(u8 *dest, const u8 *src);
+u8 *StringCopy_Nickname(u8 *dest, const u8 *src);
+u8 *StringGet_Nickname(u8 *str);
+u8 *StringCopy_PlayerName(u8 *dest, const u8 *src);
 u8 *StringCopy(u8 *dest, const u8 *src);
 u8 *StringAppend(u8 *dest, const u8 *src);
 u8 *StringCopyN(u8 *dest, const u8 *src, u8 n);