clean up

4 files changed, 55 insertions, 23 deletions

diff --git a/asm/rom.s b/asm/rom.s
index 60726576a..a1d9d269f 100644
--- a/asm/rom.s
+++ b/asm/rom.s
@@ -559251,7 +559251,7 @@ _081103C0:
 	ldr r4, _08110438
 	adds r0, r4, 0
 	movs r1, 0x8
-	bl StringFillEOS
+	bl StringFillWithTerminator
 	adds r0, r4, 0
 	adds r1, r7, 0
 	movs r2, 0x7
diff --git a/include/global.h b/include/global.h
index 37473afc8..faed7fbcc 100644
--- a/include/global.h
+++ b/include/global.h
@@ -31,4 +31,22 @@ typedef u32 bool32;
 #include "gba/syscall.h"
 #include "gba/macro.h"
 
+extern u8 gStringVar1[];
+extern u8 gStringVar2[];
+extern u8 gStringVar3[];
+
+enum
+{
+    MALE,
+    FEMALE
+};
+
+struct SaveBlock2
+{
+    u8 playerName[8];
+    u8 playerGender;
+};
+
+extern struct SaveBlock2 gSaveBlock2;
+
 #endif // GUARD_GLOBAL_H
diff --git a/include/string_util.h b/include/string_util.h
new file mode 100644
index 000000000..d1b90aa34
--- /dev/null
+++ b/include/string_util.h
@@ -0,0 +1,31 @@
+#ifndef GUARD_STRING_UTIL_H
+#define GUARD_STRING_UTIL_H
+
+enum StringConvertMode
+{
+    STR_CONV_MODE_LEFT_ALIGN,
+    STR_CONV_MODE_RIGHT_ALIGN,
+    STR_CONV_MODE_LEADING_ZEROS
+};
+
+u8 *StringCopy10(u8 *dest, u8 *src);
+u8 *StringGetEnd10(u8 *str);
+u8 *StringCopy8(u8 *dest, u8 *src);
+u8 *StringCopy(u8 *dest, u8 *src);
+u8 *StringAppend(u8 *dest, u8 *src);
+u8 *StringCopyN(u8 *dest, u8 *src, u8 n);
+u8 *StringAppendN(u8 *dest, u8 *src, u8 n);
+u16 StringGetLength(u8 *str);
+s32 StringCompare(u8 *str1, u8 *str2);
+s32 StringCompareN(u8 *str1, u8 *str2, u32 n);
+u8 *ConvertIntToDecimalStringN(u8 *dest, s32 value, enum StringConvertMode mode, u8 n);
+u8 *ConvertIntToDecimalStringN_UnknownExtCtrlCode(u8 *dest, s32 value, enum StringConvertMode mode, u8 n);
+u8 *ConvertIntToHexStringN(u8 *dest, s32 value, enum StringConvertMode mode, u8 n);
+u8 *ConvertIntToDecimalString(u8 *dest, s32 value);
+u8 *StringExpandPlaceholders(u8 *dest, u8 *src);
+u8 *UnknownStringFunc(u8 *dest, u8 *src);
+u8 *StringFill(u8 *dest, u8 c, u16 n);
+u8 *StringCopyPadded(u8 *dest, u8 *src, u8 c, u16 n);
+u8 *StringFillWithTerminator(u8 *dest, u16 n);
+
+#endif // GUARD_STRING_UTIL_H
diff --git a/src/string_util.c b/src/string_util.c
index a5a9dc19e..221319ae3 100644
--- a/src/string_util.c
+++ b/src/string_util.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "string_util.h"
 
 #define CHAR_SPACE         0x00
 #define CHAR_QUESTION_MARK 0xAC
@@ -9,14 +10,6 @@
 
 #define MAX_PLACEHOLDER_ID 0xD
 
-#define MALE   0
-#define FEMALE 1
-
-struct SaveBlock2 {
-    u8 playerName[8];
-    u8 playerGender;
-};
-
 typedef u8 *(*ExpandPlaceholderFunc)();
 
 extern u8 gDigits[];
@@ -40,16 +33,6 @@ extern u8 gExpandedPlaceholder_Brendan[];
 extern u8 gExpandedPlaceholder_May[];
 
 extern u8 gUnknownStringVar[];
-extern u8 gStringVar1[];
-extern u8 gStringVar2[];
-extern u8 gStringVar3[];
-extern struct SaveBlock2 gSaveBlock2;
-
-enum StringConvertMode {
-    STR_CONV_MODE_LEFT_ALIGN,
-    STR_CONV_MODE_RIGHT_ALIGN,
-    STR_CONV_MODE_LEADING_ZEROS
-};
 
 extern u8 GetExtCtrlCodeLength(u8 code);
 
@@ -492,7 +475,7 @@ u8 *ExpandPlaceholder_RivalName()
         return gExpandedPlaceholder_Brendan;
 }
 
-#define VERSION_DEPENDENT_PH_LIST          \
+#define VERSION_DEPENDENT_PLACEHOLDER_LIST \
     X(Version,          Ruby,    Sapphire) \
     X(EvilTeam,         Magma,   Aqua)     \
     X(GoodTeam,         Aqua,    Magma)    \
@@ -504,11 +487,11 @@ u8 *ExpandPlaceholder_RivalName()
 #ifdef SAPPHIRE
 #define X(ph, r, s) \
 u8 *ExpandPlaceholder_##ph() { return gExpandedPlaceholder_##s; }
-VERSION_DEPENDENT_PH_LIST
+VERSION_DEPENDENT_PLACEHOLDER_LIST
 #else
 #define X(ph, r, s) \
 u8 *ExpandPlaceholder_##ph() { return gExpandedPlaceholder_##r; }
-VERSION_DEPENDENT_PH_LIST
+VERSION_DEPENDENT_PLACEHOLDER_LIST
 #endif
 
 #undef X
@@ -554,7 +537,7 @@ u8 *StringCopyPadded(u8 *dest, u8 *src, u8 c, u16 n)
     return dest;
 }
 
-u8 *StringFillEOS(u8 *dest, u16 n)
+u8 *StringFillWithTerminator(u8 *dest, u16 n)
 {
     return StringFill(dest, EOS, n);
 }