Reorganize font and string related code

3 files changed, 5 insertions, 4 deletions

diff --git a/include/string16.h b/include/string16.h
index f42ff918..d1e8b250 100644
--- a/include/string16.h
+++ b/include/string16.h
@@ -20,8 +20,6 @@ BOOL StringCompare(struct String *, struct String *);
 void CopyU16ArrayToStringN(struct String *, u16 *, u32); // copy
 void StringSetEmpty(struct String *); // set empty
 struct String * StringDup(struct String *, u32 heap_id);
-s32 StringGetWidth(struct FontData * r7, const u16 * arr, u32 r6);
-s32 StringGetWidth_SingleLine_HandleClearToControlCode(struct FontData * r6, const u16 * arr);
 void String_dtor(struct String * str);
 void StringCopy(struct String * dest, struct String * src);
 void String16_FormatInteger(struct String * str, int num, u32 ndigits, int strConvMode, BOOL whichCharset);
@@ -32,7 +30,10 @@ void StringGetLineN(struct String * dest, volatile struct String * src, u32 n);
 void CopyU16ArrayToString(struct String * str, u16 * buf);
 void CopyStringToU16Array(struct String * str, u16 * buf, u32 length);
 u16 * String_c_str(struct String * str);
+void StrAddChar(struct String * str, u16 val);
 void StringCat(struct String * dest, struct String * src);
 void StrUpperFirstChar(struct String * str);
+BOOL String_IsTrainerName(struct String * string);
+void StringCat_HandleTrainerName(struct String * dest, struct String * src);
 
 #endif //POKEDIAMOND_STRING16_H
diff --git a/include/unk_02021590.h b/include/unk_02021590.h
index 6ed73bb8..8c815992 100644
--- a/include/unk_02021590.h
+++ b/include/unk_02021590.h
@@ -48,5 +48,7 @@ void DecompressGlyphTiles_LazyFromNarc(struct FontData * ptr, u16 param1, struct
 u32 GetStringWidth(struct FontData * ptr, const u16 * str, u32 letterSpacing);

 int GetGlyphWidth_VariableWidth(struct FontData * ptr, int a1);

 int GetGlyphWidth_FixedWidth(struct FontData * ptr, int a1);

+s32 GetStringWidthMultiline(struct FontData * r7, const u16 * arr, u32 r6);

+s32 StringGetWidth_SingleLine_HandleClearToControlCode(struct FontData * r6, const u16 * arr);

 

 #endif //POKEDIAMOND_UNK_02021590_H

diff --git a/include/unk_02021FF8.h b/include/unk_02021FF8.h
index 59120668..48ef4322 100644
--- a/include/unk_02021FF8.h
+++ b/include/unk_02021FF8.h
@@ -17,8 +17,6 @@ struct UnkStruct_020220C4
     struct UnkStruct_020220C4_sub * field_10;
 };
 
-BOOL String_IsTrainerName(struct String * string);
-void StringCat_HandleTrainerName(struct String * dest, struct String * src);
 struct UnkStruct_020220C4 * FUN_020220C4(u8 * a0, u32 a1, void (*a2)(s32, s32, u32), u32 a3, u32 a4);
 void FUN_02022120(struct UnkStruct_020220C4_sub * sub);
 void FUN_0202212C(struct UnkStruct_020220C4 * unk);