Decompile unk_02021934

2 files changed, 25 insertions, 7 deletions

diff --git a/include/proto.h b/include/proto.h
index 849d6956..b45c2b48 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -6,10 +6,7 @@
 #include "pokemon.h" // for struct definitions
 #include "string16.h" // for struct definitions
 
-void StringCopy(u16 * dest, struct String * src);
-void String_dtor(void * ptr);
-void FUN_02021E28(u16 * dest, u16 * src);
-void FUN_02021EF0(const struct String * src, u16 * dest, u32 count);
+int FUN_0206AE00(int x);
 u32 GetItemAttr(u16 item, u32 a1, u32 a2);
 int FUN_02014C3C(u8);
 void FUN_02014C54(int, int, struct UnkStruct_02069038 *, u8);
diff --git a/include/string16.h b/include/string16.h
index 71880020..255b44b8 100644
--- a/include/string16.h
+++ b/include/string16.h
@@ -10,11 +10,32 @@ struct String
     u8 padding[2];
 };
 
+struct UnkStruct_0202199C
+{
+    u8 filler_00[0x70];
+    int (*unk_70)(struct UnkStruct_0202199C *, int);
+};
+
+#define STR16_MAGIC 0xB6F8D2EC
+
 struct String * String_ctor(u32 count, u32 heap_id);
-int FUN_02021CE0(struct String *, struct String *);
-int FUN_0206AE00(int x);
-void FUN_02021E8C(struct String *, u16 *, u32); // copy
+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);
+int StringGetWidth(struct UnkStruct_0202199C * r7, const u16 * arr, u32 r6);
+int StringGetWidthNoSpacing(struct UnkStruct_0202199C * 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);
+s64 String_atoi(struct String * str, BOOL * flag);
+u16 StringGetLength(struct String * str);
+int StringCountLines(volatile struct String * str);
+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 StringCat(struct String * dest, struct String * src);
+void StrUpperFirstChar(struct String * str);
 
 #endif //POKEDIAMOND_STRING16_H