diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-08-16 08:34:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-16 08:34:55 +0100 |
| commit | 168950d7e03129c23ddce331593823d1d48411cf (patch) | |
| tree | eb0753d70cca0a010b552b45ab384b1ccb98a180 /include/string16.h | |
| parent | a6b9c13d97e130e43c774f81c383ad452811ef75 (diff) | |
| parent | e1a3782f3cac045ea8f8a21869f17608479c5bdb (diff) | |
Merge pull request #447 from PikalaxALT/pikalax_work
unk_02021590
Diffstat (limited to 'include/string16.h')
| -rw-r--r-- | include/string16.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/include/string16.h b/include/string16.h index 69ea4e30..f42ff918 100644 --- a/include/string16.h +++ b/include/string16.h @@ -2,6 +2,7 @@ #define POKEDIAMOND_STRING16_H #include "string_util.h" +#include "unk_02021590.h" struct String { @@ -12,12 +13,6 @@ 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); @@ -25,8 +20,8 @@ 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 UnkStruct_0202199C * r7, const u16 * arr, u32 r6); -s32 StringGetWidth_SingleLine_HandleClearToControlCode(struct UnkStruct_0202199C * r6, const u16 * arr); +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); |