From e9d2fbf746dcf467541cb7b2941e69cf7494a79f Mon Sep 17 00:00:00 2001 From: Rachel Date: Sun, 7 Apr 2024 23:41:53 -0700 Subject: [PATCH] Label extern functions in charcode.h --- include/charcode.h | 10 ++++++---- include/strbuf.h | 2 +- src/charcode.c | 15 ++++++--------- src/overlay020/ov20_021D2EA4.c | 2 +- src/string_template.c | 8 ++++---- src/unk_02002328.c | 28 ++++++++++++++-------------- src/unk_02014A84.c | 4 ++-- src/unk_020232E0.c | 12 ++++++------ 8 files changed, 40 insertions(+), 41 deletions(-) diff --git a/include/charcode.h b/include/charcode.h index 4cfa2f85ef..cab53ada68 100644 --- a/include/charcode.h +++ b/include/charcode.h @@ -1,9 +1,11 @@ #ifndef POKEPLATINUM_CHARCODE_H #define POKEPLATINUM_CHARCODE_H -u16 * sub_0201D0C8(const u16 * param0); -u32 sub_0201D0F0(const u16 * param0); -BOOL sub_0201D108(const u16 * param0); -u32 sub_0201D134(const u16 * param0, u32 param1); +typedef u16 charcode_t; + +charcode_t *CharCode_SkipFormatArg(const charcode_t *param0); +u32 CharCode_FormatArgType(const charcode_t *param0); +BOOL CharCode_IsFormatArg(const charcode_t *param0); +u32 CharCode_FormatArgParam(const charcode_t *param0, u32 param1); #endif // POKEPLATINUM_CHARCODE_H diff --git a/include/strbuf.h b/include/strbuf.h index 8a3b43b124..79da67d80b 100644 --- a/include/strbuf.h +++ b/include/strbuf.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRBUF_H #define POKEPLATINUM_STRBUF_H -typedef u16 charcode_t; +#include "charcode.h" /** * Managed string buffer. diff --git a/src/charcode.c b/src/charcode.c index 64bde3624e..0f5e7d52ea 100644 --- a/src/charcode.c +++ b/src/charcode.c @@ -1,10 +1,6 @@ -#include -#include -#include - #include "charcode.h" -u16 * sub_0201D0C8 (const u16 * param0) +u16 * CharCode_SkipFormatArg (const u16 * param0) { GF_ASSERT(*param0 == 0xfffe); @@ -19,15 +15,15 @@ u16 * sub_0201D0C8 (const u16 * param0) return (u16 *)param0; } -u32 sub_0201D0F0 (const u16 * param0) +u32 CharCode_FormatArgType (const u16 * param0) { GF_ASSERT(*param0 == 0xfffe); return *(param0 + 1); } -BOOL sub_0201D108 (const u16 * param0) +BOOL CharCode_IsFormatArg (const u16 * param0) { - u32 v0 = sub_0201D0F0(param0); + u32 v0 = CharCode_FormatArgType(param0); if (((v0 & 0xff00) == 0x100) || ((v0 & 0xff00) == 0x600) || ((v0 & 0xff00) == 0x500)) { return 1; @@ -36,7 +32,7 @@ BOOL sub_0201D108 (const u16 * param0) return 0; } -u32 sub_0201D134 (const u16 * param0, u32 param1) +u32 CharCode_FormatArgParam (const u16 * param0, u32 param1) { GF_ASSERT(*param0 == 0xfffe); @@ -51,3 +47,4 @@ u32 sub_0201D134 (const u16 * param0, u32 param1) return param0[param1]; } } + diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c index 4f43bb6467..b7ff7d7267 100644 --- a/src/overlay020/ov20_021D2EA4.c +++ b/src/overlay020/ov20_021D2EA4.c @@ -356,7 +356,7 @@ static int ov20_021D3400 (UnkStruct_ov20_021D33C8 * param0, Strbuf *param1) Strbuf_CopyNumChars(param1, v0, (param0->unk_04 - v0) + 1); return 0; case 1: - param0->unk_04 = sub_0201D0C8(param0->unk_04); + param0->unk_04 = CharCode_SkipFormatArg(param0->unk_04); v1 = 1; break; case 2: diff --git a/src/string_template.c b/src/string_template.c index c9c4035dec..e26d21e47f 100644 --- a/src/string_template.c +++ b/src/string_template.c @@ -962,18 +962,18 @@ void StringTemplate_Format (const StringTemplate * param0, Strbuf *param1, const while (*v0 != 0xffff) { if (*v0 == 0xfffe) { - if (sub_0201D108(v0)) { + if (CharCode_IsFormatArg(v0)) { u32 v2; - v2 = sub_0201D134(v0, 0); + v2 = CharCode_FormatArgParam(v0, 0); GF_ASSERT(v2 < param0->unk_00); Strbuf_ConcatTrainerName(param1, param0->unk_08[v2].unk_04); - v0 = sub_0201D0C8(v0); + v0 = CharCode_SkipFormatArg(v0); } else { const u16 * v3 = v0; - v0 = sub_0201D0C8(v0); + v0 = CharCode_SkipFormatArg(v0); while (v3 < v0) { Strbuf_AppendChar(param1, *v3++); diff --git a/src/unk_02002328.c b/src/unk_02002328.c index 1879fc3ba0..76ba60b793 100644 --- a/src/unk_02002328.c +++ b/src/unk_02002328.c @@ -68,12 +68,12 @@ int sub_02002328 (UnkStruct_0201D834 * param0) return 2; case 0xfffe: param0->unk_00.unk_00_val1--; - v4 = sub_0201D0F0(param0->unk_00.unk_00_val1); + v4 = CharCode_FormatArgType(param0->unk_00.unk_00_val1); switch (v4) { case 0xff00: { - u16 v5 = sub_0201D134(param0->unk_00.unk_00_val1, 0); + u16 v5 = CharCode_FormatArgParam(param0->unk_00.unk_00_val1, 0); if (v5 == 255) { u8 v6 = param0->unk_00.unk_1B; @@ -98,7 +98,7 @@ int sub_02002328 (UnkStruct_0201D834 * param0) break; case 0x200: { - u16 v7 = sub_0201D134(param0->unk_00.unk_00_val1, 0); + u16 v7 = CharCode_FormatArgParam(param0->unk_00.unk_00_val1, 0); sub_0201DB8C(param0, param0->unk_00.unk_0C, param0->unk_00.unk_0E, v7); } @@ -108,25 +108,25 @@ int sub_02002328 (UnkStruct_0201D834 * param0) break; case 0x201: { - param0->unk_2A = sub_0201D134(param0->unk_00.unk_00_val1, 0); - param0->unk_00.unk_00_val1 = sub_0201D0C8(param0->unk_00.unk_00_val1); + param0->unk_2A = CharCode_FormatArgParam(param0->unk_00.unk_00_val1, 0); + param0->unk_00.unk_00_val1 = CharCode_SkipFormatArg(param0->unk_00.unk_00_val1); param0->unk_28 = 6; return 3; } break; case 0x202: - param0->unk_2E = sub_0201D134(param0->unk_00.unk_00_val1, 0); - param0->unk_00.unk_00_val1 = sub_0201D0C8(param0->unk_00.unk_00_val1); + param0->unk_2E = CharCode_FormatArgParam(param0->unk_00.unk_00_val1, 0); + param0->unk_00.unk_00_val1 = CharCode_SkipFormatArg(param0->unk_00.unk_00_val1); return 3; case 0x203: - param0->unk_00.unk_0C = sub_0201D134(param0->unk_00.unk_00_val1, 0); + param0->unk_00.unk_0C = CharCode_FormatArgParam(param0->unk_00.unk_00_val1, 0); break; case 0x204: - param0->unk_00.unk_0E = sub_0201D134(param0->unk_00.unk_00_val1, 0); + param0->unk_00.unk_0E = CharCode_FormatArgParam(param0->unk_00.unk_00_val1, 0); break; case 0xff01: { - u16 v8 = sub_0201D134(param0->unk_00.unk_00_val1, 0); + u16 v8 = CharCode_FormatArgParam(param0->unk_00.unk_00_val1, 0); switch (v8) { case 0x64: @@ -142,25 +142,25 @@ int sub_02002328 (UnkStruct_0201D834 * param0) break; case 0xfe06: { - u16 v9 = sub_0201D134(param0->unk_00.unk_00_val1, 0); + u16 v9 = CharCode_FormatArgParam(param0->unk_00.unk_00_val1, 0); switch (v9) { case 0xfe01: param0->unk_28 = 2; sub_020027B4(param0); - param0->unk_00.unk_00_val1 = sub_0201D0C8(param0->unk_00.unk_00_val1); + param0->unk_00.unk_00_val1 = CharCode_SkipFormatArg(param0->unk_00.unk_00_val1); return 3; case 0xfe00: param0->unk_28 = 3; sub_020027B4(param0); - param0->unk_00.unk_00_val1 = sub_0201D0C8(param0->unk_00.unk_00_val1); + param0->unk_00.unk_00_val1 = CharCode_SkipFormatArg(param0->unk_00.unk_00_val1); return 3; } } break; } - param0->unk_00.unk_00_val1 = sub_0201D0C8(param0->unk_00.unk_00_val1); + param0->unk_00.unk_00_val1 = CharCode_SkipFormatArg(param0->unk_00.unk_00_val1); return 2; case 0x25bc: param0->unk_28 = 2; diff --git a/src/unk_02014A84.c b/src/unk_02014A84.c index 9702dfdbb2..bf483b1316 100644 --- a/src/unk_02014A84.c +++ b/src/unk_02014A84.c @@ -153,11 +153,11 @@ static u32 sub_02014C00 (u32 param0, u32 param1) while (*v1 != 0xffff) { if (*v1 == 0xfffe) { - if (sub_0201D108(v1)) { + if (CharCode_IsFormatArg(v1)) { v2++; } - v1 = sub_0201D0C8(v1); + v1 = CharCode_SkipFormatArg(v1); } else { v1++; } diff --git a/src/unk_020232E0.c b/src/unk_020232E0.c index 3e1f010d0f..40aa43f4b4 100644 --- a/src/unk_020232E0.c +++ b/src/unk_020232E0.c @@ -250,7 +250,7 @@ u32 sub_02023620 (const UnkStruct_02023350 * param0, const u16 * param1, u32 par while (*param1 != 0xffff) { if (*param1 == 0xfffe) { - param1 = sub_0201D0C8(param1); + param1 = CharCode_SkipFormatArg(param1); if (*param1 == 0xffff) { break; @@ -268,7 +268,7 @@ BOOL sub_0202366C (const UnkStruct_02023350 * param0, const u16 * param1) { while (*param1 != 0xffff) { if (*param1 == 0xfffe) { - param1 = sub_0201D0C8(param1); + param1 = CharCode_SkipFormatArg(param1); if (*param1 == 0xffff) { return 1; @@ -305,7 +305,7 @@ u32 sub_020236D0 (const UnkStruct_02023350 * param0, const u16 * param1, u32 par while (*param1 != 0xffff) { if (*param1 == 0xfffe) { - param1 = sub_0201D0C8(param1); + param1 = CharCode_SkipFormatArg(param1); continue; } else if (*param1 == 0xe000) { v1 -= param2; @@ -339,11 +339,11 @@ u32 sub_02023738 (const UnkStruct_02023350 * param0, const u16 * param1) while (*param1 != 0xffff) { if (*param1 == 0xfffe) { - if (sub_0201D0F0(param1) == 0x203) { - v0 = sub_0201D134(param1, 0) - 12; + if (CharCode_FormatArgType(param1) == 0x203) { + v0 = CharCode_FormatArgParam(param1, 0) - 12; } - param1 = sub_0201D0C8(param1); + param1 = CharCode_SkipFormatArg(param1); continue; }