diff options
| author | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-06-23 19:51:13 +0200 |
|---|---|---|
| committer | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-06-23 19:51:13 +0200 |
| commit | c5a2721fff4710a92cd68cb801f593f7e44357f1 (patch) | |
| tree | 49b37975265caa4380b170c59c069ffea1710479 | |
| parent | 4f67da10102f766b53bc209415649c8cd2e61b48 (diff) | |
int -> s32
| -rw-r--r-- | arm9/src/unk_02002F08.c | 4 | ||||
| -rw-r--r-- | arm9/src/unk_02021934.c | 8 | ||||
| -rw-r--r-- | include/string16.h | 4 | ||||
| -rw-r--r-- | include/unk_02002F08.h | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/arm9/src/unk_02002F08.c b/arm9/src/unk_02002F08.c index bb98bfdb..b81da622 100644 --- a/arm9/src/unk_02002F08.c +++ b/arm9/src/unk_02002F08.c @@ -5,7 +5,7 @@ #include "string16.h" #include "unk_0201B8B8.h" -THUMB_FUNC int FUN_02002F08(u32 param0, struct String *str, u32 param2) +THUMB_FUNC s32 FUN_02002F08(u32 param0, struct String *str, u32 param2) { GF_ASSERT(UNK_02106FC8->unk94[param0] != NULL); @@ -52,7 +52,7 @@ THUMB_FUNC u32 FUN_02002F90(struct String *str) return FUN_02002F58(String_c_str(str)); } -THUMB_FUNC int FUN_02002F9C(u32 param0, struct String *str) +THUMB_FUNC s32 FUN_02002F9C(u32 param0, struct String *str) { GF_ASSERT(UNK_02106FC8->unk94[param0] != NULL); diff --git a/arm9/src/unk_02021934.c b/arm9/src/unk_02021934.c index ebc600fa..b12e2d8f 100644 --- a/arm9/src/unk_02021934.c +++ b/arm9/src/unk_02021934.c @@ -10,9 +10,9 @@ void StrAddChar(struct String * str, u16 val); -int StringGetWidth(struct UnkStruct_0202199C * r7, const u16 * arr, u32 r6) +s32 StringGetWidth(struct UnkStruct_0202199C * r7, const u16 * arr, u32 r6) { - int ret = 0; + s32 ret = 0; u32 r4 = 0; while (*arr != 0xFFFF) { @@ -38,9 +38,9 @@ int StringGetWidth(struct UnkStruct_0202199C * r7, const u16 * arr, u32 r6) return ret; } -int StringGetWidth_SingleLine_HandleClearToControlCode(struct UnkStruct_0202199C * r6, const u16 * arr) +s32 StringGetWidth_SingleLine_HandleClearToControlCode(struct UnkStruct_0202199C * r6, const u16 * arr) { - int ret = 0; + s32 ret = 0; while (*arr != 0xFFFF) { if (*arr == 0xFFFE) diff --git a/include/string16.h b/include/string16.h index bc276ea7..69ea4e30 100644 --- a/include/string16.h +++ b/include/string16.h @@ -25,8 +25,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); -int StringGetWidth(struct UnkStruct_0202199C * r7, const u16 * arr, u32 r6); -int StringGetWidth_SingleLine_HandleClearToControlCode(struct UnkStruct_0202199C * r6, const u16 * arr); +s32 StringGetWidth(struct UnkStruct_0202199C * r7, const u16 * arr, u32 r6); +s32 StringGetWidth_SingleLine_HandleClearToControlCode(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); diff --git a/include/unk_02002F08.h b/include/unk_02002F08.h index a304009b..773d9246 100644 --- a/include/unk_02002F08.h +++ b/include/unk_02002F08.h @@ -21,11 +21,11 @@ struct UnkStruct_02002F08 u32 unk11c; }; -int FUN_02002F08(u32 param0, struct String *str, u32 param2); +s32 FUN_02002F08(u32 param0, struct String *str, u32 param2); u32 FUN_02002F40(u32 param0, struct String *str, u32 param2, u32 param3); u32 FUN_02002F58(const u16 *str); u32 FUN_02002F90(struct String *str); -int FUN_02002F9C(u32 param0, struct String *str); +s32 FUN_02002F9C(u32 param0, struct String *str); struct UnkStruct_02002F08 *FUN_02002FD0(u32 heap_id); void FUN_02002FEC(struct UnkStruct_02002F08 *ptr); void FUN_02002FF4(struct UnkStruct_02002F08 *param0, u32 param1, void *param2, void *param3, u32 size); |