diff --git a/include/item.h b/include/item.h index 862ff93f10..de5ceba52f 100644 --- a/include/item.h +++ b/include/item.h @@ -10,8 +10,8 @@ u16 sub_0207CF10(u16 param0); u16 Item_GetIndexOfIconNCER(void); u16 Item_GetIndexOfIconNANR(void); void * Item_LoadDataOrGFX(u16 param0, u16 param1, u32 param2); -void Item_GetNameIntoString(UnkStruct_02023790 * param0, u16 param1, u32 param2); -void Item_GetDescriptionIntoString(UnkStruct_02023790 * param0, u16 param1, u16 param2); +void Item_GetNameIntoString(Strbuf *dst, u16 param1, u32 param2); +void Item_GetDescriptionIntoString(Strbuf *dst, u16 param1, u16 param2); s32 Item_GetAttribute(u16 param0, u16 param1, u32 param2); s32 Item_GetAttributeFromStruct(UnkStruct_0207D3B0 * param0, u16 param1); const u16 GetMoveFromTMOrHMItemID(u16 param0); diff --git a/include/overlay006/ov6_022489E4.h b/include/overlay006/ov6_022489E4.h index f875e30cf7..3121e75561 100644 --- a/include/overlay006/ov6_022489E4.h +++ b/include/overlay006/ov6_022489E4.h @@ -19,7 +19,7 @@ BOOL ov6_02248BE8(UnkStruct_02095C48 * param0, int param1, const UnkStruct_ov6_0 void ov6_02248C28(int param0, int param1, void * param2, void * param3); BOOL ov6_02248C68(UnkStruct_02095C48 * param0, int param1, const UnkStruct_020954F0 * param2); void ov6_02248CBC(int param0, int param1, void * param2, void * param3); -BOOL ov6_02248CE8(UnkStruct_02095C48 * param0, int param1, const UnkStruct_02023790 * param2); +BOOL ov6_02248CE8(UnkStruct_02095C48 * param0, int param1, const Strbuf *param2); void ov6_02248D38(int param0, int param1, void * param2, void * param3); BOOL ov6_02248D64(UnkStruct_02095C48 * param0, int param1, void * param2); void ov6_02248DA0(int param0, int param1, void * param2, void * param3); diff --git a/include/overlay007/struct_ov7_0224D008.h b/include/overlay007/struct_ov7_0224D008.h index 35fb08e60b..e9e20253c0 100644 --- a/include/overlay007/struct_ov7_0224D008.h +++ b/include/overlay007/struct_ov7_0224D008.h @@ -48,7 +48,7 @@ typedef struct { u8 unk_295; u8 unk_296; u8 unk_297; - UnkStruct_02023790 * unk_298; + Strbuf* unk_298; u8 unk_29C[4]; int unk_2A0; u8 unk_2A4; diff --git a/include/overlay008/ov8_02249960.h b/include/overlay008/ov8_02249960.h index 5118be0a4f..b7ad173bae 100644 --- a/include/overlay008/ov8_02249960.h +++ b/include/overlay008/ov8_02249960.h @@ -21,7 +21,7 @@ void ov8_0224AD34(UnkStruct_0203CDB0 * param0, const u8 param1); void ov8_0224B020(UnkStruct_0203CDB0 * param0); void ov8_0224B0FC(UnkStruct_0203CDB0 * param0); BOOL ov8_0224B110(UnkStruct_0203CDB0 * param0, const int param1, const int param2, const fx32 param3, BOOL * param4); -BOOL ov8_0224B67C(UnkStruct_0203CDB0 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0200B144 * param2, UnkStruct_02023790 * param3); +BOOL ov8_0224B67C(UnkStruct_0203CDB0 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0200B144 * param2, Strbuf *param3); BOOL ov8_0224B714(UnkStruct_0203CDB0 * param0, int param1, int param2, int param3); void ov8_0224B764(UnkStruct_0203CDB0 * param0); void ov8_0224B7C0(UnkStruct_0203CDB0 * param0); diff --git a/include/overlay010/struct_ov10_0221F800.h b/include/overlay010/struct_ov10_0221F800.h index 3a7981ef5c..afe7d79174 100644 --- a/include/overlay010/struct_ov10_0221F800.h +++ b/include/overlay010/struct_ov10_0221F800.h @@ -8,7 +8,7 @@ typedef struct { UnkStruct_ov6_02240D5C * unk_00; Party * unk_04[4]; - UnkStruct_02023790 * unk_14[4]; + Strbuf* unk_14[4]; u32 unk_24; u8 unk_28; u8 unk_29; diff --git a/include/overlay013/struct_ov13_022213F0.h b/include/overlay013/struct_ov13_022213F0.h index ed1f27ef28..7868188d33 100644 --- a/include/overlay013/struct_ov13_022213F0.h +++ b/include/overlay013/struct_ov13_022213F0.h @@ -40,7 +40,7 @@ typedef struct { UnkStruct_0200C440 * unk_1FA0; UnkStruct_0200B144 * unk_1FA4; UnkStruct_0200B358 * unk_1FA8; - UnkStruct_02023790 * unk_1FAC; + Strbuf* unk_1FAC; UnkStruct_0200C704 * unk_1FB0; UnkStruct_0200D0F4 * unk_1FB4[38]; UnkStruct_0205AA50 unk_204C[2]; diff --git a/include/overlay013/struct_ov13_02227244.h b/include/overlay013/struct_ov13_02227244.h index ff1f659699..5e799b5b62 100644 --- a/include/overlay013/struct_ov13_02227244.h +++ b/include/overlay013/struct_ov13_02227244.h @@ -22,7 +22,7 @@ typedef struct { UnkStruct_0200C440 * unk_0C; UnkStruct_0200B144 * unk_10; UnkStruct_0200B358 * unk_14; - UnkStruct_02023790 * unk_18; + Strbuf* unk_18; UnkStruct_0205AA50 unk_1C; UnkStruct_0205AA50 * unk_2C; u8 unk_30; diff --git a/include/overlay016/ov16_0223DF00.h b/include/overlay016/ov16_0223DF00.h index 6379b0eead..3190101fc1 100644 --- a/include/overlay016/ov16_0223DF00.h +++ b/include/overlay016/ov16_0223DF00.h @@ -69,7 +69,7 @@ u16 * ov16_0223E0B0(UnkStruct_0207ADB4 * param0); u16 * ov16_0223E0BC(UnkStruct_0207ADB4 * param0); UnkStruct_ov16_0223E0C8 * ov16_0223E0C8(UnkStruct_0207ADB4 * param0); UnkStruct_0200B358 * ov16_0223E0D0(UnkStruct_0207ADB4 * param0); -UnkStruct_02023790 * ov16_0223E0D4(UnkStruct_0207ADB4 * param0); +Strbuf* ov16_0223E0D4(UnkStruct_0207ADB4 * param0); u16 ov16_0223E0D8(UnkStruct_0207ADB4 * param0, int param1); UnkStruct_0207A9CC * ov16_0223E120(UnkStruct_0207ADB4 * param0, int param1); UnkStruct_02025E6C * ov16_0223E16C(UnkStruct_0207ADB4 * param0, int param1); diff --git a/include/overlay017/ov17_0223F118.h b/include/overlay017/ov17_0223F118.h index 834e71c27b..4b58c70f35 100644 --- a/include/overlay017/ov17_0223F118.h +++ b/include/overlay017/ov17_0223F118.h @@ -15,10 +15,10 @@ UnkStruct_0207C690 * ov17_0223F140(int param0); void ov17_0223F1E0(UnkStruct_0207C690 * param0); -void ov17_0223F1E8(int param0, UnkStruct_02018340 * param1, UnkStruct_0200C704 * param2, UnkStruct_02012744 * param3, UnkStruct_ov17_0223F2E4 * param4, const UnkStruct_02023790 * param5, int param6, u32 param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14); +void ov17_0223F1E8(int param0, UnkStruct_02018340 * param1, UnkStruct_0200C704 * param2, UnkStruct_02012744 * param3, UnkStruct_ov17_0223F2E4 * param4, const Strbuf *param5, int param6, u32 param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14); void ov17_0223F2E4(UnkStruct_ov17_0223F2E4 * param0); void ov17_0223F2F8(UnkStruct_ov17_0223F2E4 * param0, int param1, int param2, int param3); -UnkStruct_02023790 * ov17_0223F310(u32 param0, u32 param1); +Strbuf* ov17_0223F310(u32 param0, u32 param1); void ov17_0223F334(UnkStruct_02095C48 * param0, int param1); void ov17_0223F374(UnkStruct_02095C48 * param0); void ov17_0223F560(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, UnkStruct_02002F38 * param2, int param3, int param4, int param5, int param6); diff --git a/include/overlay017/struct_ov17_0223F88C.h b/include/overlay017/struct_ov17_0223F88C.h index bf200b81ac..d3f7580915 100644 --- a/include/overlay017/struct_ov17_0223F88C.h +++ b/include/overlay017/struct_ov17_0223F88C.h @@ -32,7 +32,7 @@ typedef struct { UnkStruct_0200B144 * unk_40; UnkStruct_0200B144 * unk_44; UnkStruct_0200B358 * unk_48; - UnkStruct_02023790 * unk_4C; + Strbuf* unk_4C; UnkStruct_02002F38 * unk_50; UnkStruct_02012744 * unk_54; UnkStruct_ov16_0223E0C8 unk_58[4]; diff --git a/include/overlay017/struct_ov17_022476F8.h b/include/overlay017/struct_ov17_022476F8.h index 5952cc833c..219dba63e3 100644 --- a/include/overlay017/struct_ov17_022476F8.h +++ b/include/overlay017/struct_ov17_022476F8.h @@ -27,7 +27,7 @@ typedef struct { UnkStruct_0205AA50 unk_28[1]; UnkStruct_0200B144 * unk_38; UnkStruct_0200B358 * unk_3C; - UnkStruct_02023790 * unk_40; + Strbuf* unk_40; UnkStruct_02002F38 * unk_44; UnkStruct_ov16_0223E0C8 unk_48[4]; UnkStruct_0200D0F4 * unk_88[8]; diff --git a/include/overlay017/struct_ov17_0224A1EC.h b/include/overlay017/struct_ov17_0224A1EC.h index 8c15663c76..5897376976 100644 --- a/include/overlay017/struct_ov17_0224A1EC.h +++ b/include/overlay017/struct_ov17_0224A1EC.h @@ -38,7 +38,7 @@ typedef struct { UnkStruct_0205AA50 unk_64[2]; UnkStruct_0200B144 * unk_84; UnkStruct_0200B358 * unk_88; - UnkStruct_02023790 * unk_8C; + Strbuf* unk_8C; UnkStruct_02002F38 * unk_90; UnkStruct_02012744 * unk_94; UnkStruct_ov16_0223E0C8 unk_98[4]; diff --git a/include/overlay017/struct_ov17_022507C4.h b/include/overlay017/struct_ov17_022507C4.h index 67fb3c63af..43cf69baa1 100644 --- a/include/overlay017/struct_ov17_022507C4.h +++ b/include/overlay017/struct_ov17_022507C4.h @@ -28,7 +28,7 @@ typedef struct { UnkStruct_0205AA50 unk_24[9]; UnkStruct_0200B144 * unk_B4; UnkStruct_0200B358 * unk_B8; - UnkStruct_02023790 * unk_BC; + Strbuf* unk_BC; UnkStruct_02002F38 * unk_C0; UnkStruct_02012744 * unk_C4; UnkStruct_ov16_0223E0C8 unk_C8[4]; diff --git a/include/overlay019/struct_ov19_021D4F5C.h b/include/overlay019/struct_ov19_021D4F5C.h index 1d2992997f..c6f67ee078 100644 --- a/include/overlay019/struct_ov19_021D4F5C.h +++ b/include/overlay019/struct_ov19_021D4F5C.h @@ -7,7 +7,7 @@ typedef struct { u8 unk_00; u8 unk_01; u8 padding_02[2]; - UnkStruct_02023790 * unk_04; + Strbuf* unk_04; } UnkStruct_ov19_021D4F5C; #endif // POKEPLATINUM_STRUCT_OV19_021D4F5C_H diff --git a/include/overlay019/struct_ov19_021D5BAC.h b/include/overlay019/struct_ov19_021D5BAC.h index 71c1c6a4da..82e6b411bf 100644 --- a/include/overlay019/struct_ov19_021D5BAC.h +++ b/include/overlay019/struct_ov19_021D5BAC.h @@ -15,11 +15,11 @@ typedef struct { u8 unk_0E; u8 unk_0F; u8 padding_10[4]; - UnkStruct_02023790 * unk_14; - UnkStruct_02023790 * unk_18; - UnkStruct_02023790 * unk_1C; - UnkStruct_02023790 * unk_20; - UnkStruct_02023790 * unk_24; + Strbuf* unk_14; + Strbuf* unk_18; + Strbuf* unk_1C; + Strbuf* unk_20; + Strbuf* unk_24; } UnkStruct_ov19_021D5BAC; #endif // POKEPLATINUM_STRUCT_OV19_021D5BAC_H diff --git a/include/overlay019/struct_ov19_021D5FAC.h b/include/overlay019/struct_ov19_021D5FAC.h index 5077e0c85e..29f8c473a9 100644 --- a/include/overlay019/struct_ov19_021D5FAC.h +++ b/include/overlay019/struct_ov19_021D5FAC.h @@ -21,8 +21,8 @@ typedef struct { u16 unk_1C; u16 unk_1E; u16 unk_20[4]; - UnkStruct_02023790 * unk_28; - UnkStruct_02023790 * unk_2C; + Strbuf* unk_28; + Strbuf* unk_2C; } UnkStruct_ov19_021D5FAC; #endif // POKEPLATINUM_STRUCT_OV19_021D5FAC_H diff --git a/include/overlay019/struct_ov19_021DA9E0.h b/include/overlay019/struct_ov19_021DA9E0.h index e6693ed828..e8037b6122 100644 --- a/include/overlay019/struct_ov19_021DA9E0.h +++ b/include/overlay019/struct_ov19_021DA9E0.h @@ -32,8 +32,8 @@ typedef struct { void * unk_34; NNSG2dCellDataBank * unk_38; UnkStruct_02022550 * unk_3C[2]; - UnkStruct_02023790 * unk_44; - UnkStruct_02023790 * unk_48; + Strbuf* unk_44; + Strbuf* unk_48; UnkStruct_0201CD38 * unk_4C; u8 padding_50[4]; } UnkStruct_ov19_021DA9E0; diff --git a/include/overlay019/struct_ov19_021DB6F0.h b/include/overlay019/struct_ov19_021DB6F0.h index 7b68e48f51..9ea2681fd4 100644 --- a/include/overlay019/struct_ov19_021DB6F0.h +++ b/include/overlay019/struct_ov19_021DB6F0.h @@ -25,8 +25,8 @@ typedef struct { void * unk_24; NNSG2dCharacterData * unk_28; const UnkStruct_0200B358 * unk_2C; - UnkStruct_02023790 * unk_30; - UnkStruct_02023790 * unk_34; + Strbuf* unk_30; + Strbuf* unk_34; } UnkStruct_ov19_021DB6F0; #endif // POKEPLATINUM_STRUCT_OV19_021DB6F0_H diff --git a/include/overlay019/struct_ov19_021DBA9C.h b/include/overlay019/struct_ov19_021DBA9C.h index 7ca4509efb..4ca2a0ec45 100644 --- a/include/overlay019/struct_ov19_021DBA9C.h +++ b/include/overlay019/struct_ov19_021DBA9C.h @@ -42,7 +42,7 @@ typedef struct { u8 unk_4BE4[18]; u8 padding_4BF6[2]; UnkStruct_0200B144 * unk_4BF8; - UnkStruct_02023790 * unk_4BFC; + Strbuf* unk_4BFC; } UnkStruct_ov19_021DBA9C; #endif // POKEPLATINUM_STRUCT_OV19_021DBA9C_H diff --git a/include/overlay020/ov20_021D0D80.h b/include/overlay020/ov20_021D0D80.h index 5f4109bce0..4938426cdf 100644 --- a/include/overlay020/ov20_021D0D80.h +++ b/include/overlay020/ov20_021D0D80.h @@ -13,12 +13,12 @@ u32 ov20_021D1F88(const UnkStruct_ov20_021D16E8 * param0); u32 ov20_021D1F94(const UnkStruct_ov20_021D16E8 * param0); u32 ov20_021D1F9C(const UnkStruct_ov20_021D16E8 * param0); u16 ov20_021D1FA8(const UnkStruct_ov20_021D16E8 * param0, int param1); -UnkStruct_02023790 * ov20_021D1FC0(const UnkStruct_ov20_021D16E8 * param0, u32 param1); +Strbuf* ov20_021D1FC0(const UnkStruct_ov20_021D16E8 * param0, u32 param1); u32 ov20_021D1FCC(const UnkStruct_ov20_021D16E8 * param0); u32 ov20_021D1FD4(const UnkStruct_ov20_021D16E8 * param0); u32 ov20_021D1FDC(const UnkStruct_ov20_021D16E8 * param0); u32 ov20_021D1FE4(const UnkStruct_ov20_021D16E8 * param0); -void ov20_021D2008(const UnkStruct_ov20_021D16E8 * param0, u32 param1, UnkStruct_02023790 * param2); +void ov20_021D2008(const UnkStruct_ov20_021D16E8 * param0, u32 param1, Strbuf *param2); u32 ov20_021D2034(const UnkStruct_ov20_021D16E8 * param0); int ov20_021D2040(const UnkStruct_ov20_021D16E8 * param0); BOOL ov20_021D204C(const UnkStruct_ov20_021D16E8 * param0); diff --git a/include/overlay020/ov20_021D5044.h b/include/overlay020/ov20_021D5044.h index e5e811fc4c..e4a869ac72 100644 --- a/include/overlay020/ov20_021D5044.h +++ b/include/overlay020/ov20_021D5044.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02023790_decl.h" u32 ov20_021D5044(void); -void ov20_021D5048(u32 param0, UnkStruct_02023790 * param1); +void ov20_021D5048(u32 param0, Strbuf *param1); void ov20_021D506C(u32 param0, u32 * param1, u32 * param2); int ov20_021D5098(u32 param0); int ov20_021D50B4(u32 param0); diff --git a/include/overlay021/ov21_021D0D80.h b/include/overlay021/ov21_021D0D80.h index f7fbeafdc7..3b730c2db3 100644 --- a/include/overlay021/ov21_021D0D80.h +++ b/include/overlay021/ov21_021D0D80.h @@ -70,6 +70,6 @@ u32 ov21_021D1B94(UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D332 u32 ov21_021D1BD8(UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6); u32 ov21_021D1C30(UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6); u32 ov21_021D1C88(UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6); -UnkStruct_02023790 * ov21_021D1CE0(int param0, int param1); +Strbuf* ov21_021D1CE0(int param0, int param1); #endif // POKEPLATINUM_OV21_021D0D80_H diff --git a/include/overlay021/ov21_021D3208.h b/include/overlay021/ov21_021D3208.h index 1149db5188..4126b6dd16 100644 --- a/include/overlay021/ov21_021D3208.h +++ b/include/overlay021/ov21_021D3208.h @@ -50,7 +50,7 @@ int ov21_021D38B0(const UnkStruct_ov21_021D3320 * param0, int param1); void ov21_021D38C0(UnkStruct_ov21_021D3320 * param0); int ov21_021D38FC(const UnkStruct_ov21_021D3320 * param0); int ov21_021D3908(const UnkStruct_ov21_021D3320 * param0); -UnkStruct_02023790 * ov21_021D3914(const UnkStruct_ov21_021D3320 * param0); +Strbuf* ov21_021D3914(const UnkStruct_ov21_021D3320 * param0); u32 ov21_021D3920(const UnkStruct_ov21_021D3320 * param0); BOOL ov21_021D392C(const UnkStruct_ov21_021D3320 * param0, int param1); BOOL ov21_021D3954(const UnkStruct_ov21_021D3320 * param0); diff --git a/include/overlay021/ov21_021D4C0C.h b/include/overlay021/ov21_021D4C0C.h index 415ee7c754..520949008c 100644 --- a/include/overlay021/ov21_021D4C0C.h +++ b/include/overlay021/ov21_021D4C0C.h @@ -18,6 +18,6 @@ UnkStruct_0205AA50 * ov21_021D4D6C(UnkStruct_ov21_021D4C0C * param0, int param1, void ov21_021D4DA0(UnkStruct_0205AA50 * param0); u32 ov21_021D4DAC(UnkStruct_ov21_021D4C0C * param0, UnkStruct_0205AA50 * param1, u32 param2, u32 param3, int param4, int param5); void ov21_021D4E10(UnkStruct_ov21_021D4C0C * param0, UnkStruct_0205AA50 * param1, u32 param2, u32 param3); -void ov21_021D4E80(UnkStruct_ov21_021D4C0C * param0, UnkStruct_0205AA50 * param1, UnkStruct_02023790 * param2, int param3, int param4); +void ov21_021D4E80(UnkStruct_ov21_021D4C0C * param0, UnkStruct_0205AA50 * param1, Strbuf *param2, int param3, int param4); #endif // POKEPLATINUM_OV21_021D4C0C_H diff --git a/include/overlay021/ov21_021D5600.h b/include/overlay021/ov21_021D5600.h index 1bca2d119c..fce92ace7e 100644 --- a/include/overlay021/ov21_021D5600.h +++ b/include/overlay021/ov21_021D5600.h @@ -3,10 +3,10 @@ #include "struct_decls/struct_02023790_decl.h" -void ov21_021D5600(UnkStruct_02023790 * param0); +void ov21_021D5600(Strbuf *param0); int ov21_021D5608(int param0); -UnkStruct_02023790 * ov21_021D561C(int param0, int param1, int param2); -UnkStruct_02023790 * ov21_021D566C(int param0, int param1, int param2); -UnkStruct_02023790 * ov21_021D56BC(int param0, int param1, int param2, int param3); +Strbuf* ov21_021D561C(int param0, int param1, int param2); +Strbuf* ov21_021D566C(int param0, int param1, int param2); +Strbuf* ov21_021D56BC(int param0, int param1, int param2, int param3); #endif // POKEPLATINUM_OV21_021D5600_H diff --git a/include/overlay021/struct_ov21_021D3320.h b/include/overlay021/struct_ov21_021D3320.h index 489f9276bc..8bdef2ca71 100644 --- a/include/overlay021/struct_ov21_021D3320.h +++ b/include/overlay021/struct_ov21_021D3320.h @@ -18,7 +18,7 @@ typedef struct { UnkStruct_02098700 * unk_1748; u32 unk_174C; u32 unk_1750; - UnkStruct_02023790 * unk_1754; + Strbuf* unk_1754; int unk_1758; u16 unk_175C; u16 unk_175E; diff --git a/include/overlay022/struct_ov22_0225A428.h b/include/overlay022/struct_ov22_0225A428.h index a6a51a048e..253968c880 100644 --- a/include/overlay022/struct_ov22_0225A428.h +++ b/include/overlay022/struct_ov22_0225A428.h @@ -20,7 +20,7 @@ typedef struct { int unk_138; int unk_13C; u32 unk_140; - UnkStruct_02023790 * unk_144; + Strbuf* unk_144; } UnkStruct_ov22_0225A428; #endif // POKEPLATINUM_STRUCT_OV22_0225A428_H diff --git a/include/overlay023/ov23_0223E140.h b/include/overlay023/ov23_0223E140.h index 84b2dda487..a14c262ce2 100644 --- a/include/overlay023/ov23_0223E140.h +++ b/include/overlay023/ov23_0223E140.h @@ -33,7 +33,7 @@ void ov23_02241364(void); void ov23_022413A0(int param0, int param1, void * param2, void * param3); void ov23_0224142C(int param0, int param1, void * param2, void * param3); int ov23_022414D0(void); -BOOL ov23_022415B8(UnkStruct_02023790 * param0); +BOOL ov23_022415B8(Strbuf *param0); void ov23_0224160C(void); BOOL ov23_0224162C(int param0); void ov23_02241648(int param0); diff --git a/include/overlay023/ov23_022416A8.h b/include/overlay023/ov23_022416A8.h index a8cabe467e..237078de8c 100644 --- a/include/overlay023/ov23_022416A8.h +++ b/include/overlay023/ov23_022416A8.h @@ -22,7 +22,7 @@ BOOL ov23_02241CF4(int param0); BOOL ov23_02241D04(int param0, int param1); int ov23_02241D18(int param0); int ov23_02241D38(int param0); -BOOL ov23_02241D58(UnkStruct_02023790 * param0); +BOOL ov23_02241D58(Strbuf *param0); int ov23_02241DF8(MATHRandContext16 * param0); void ov23_02241E6C(void); void ov23_02241ED0(void); diff --git a/include/overlay023/ov23_02241F74.h b/include/overlay023/ov23_02241F74.h index e4560e4b65..156898f0d2 100644 --- a/include/overlay023/ov23_02241F74.h +++ b/include/overlay023/ov23_02241F74.h @@ -18,8 +18,8 @@ UnkStruct_ov23_02253E2C * ov23_022421BC(void); UnkStruct_ov23_02253E2C * ov23_022421CC(void); UnkStruct_ov23_02253E2C * ov23_022421DC(void); void ov23_022421EC(void); -BOOL ov23_0224223C(UnkStruct_02025E6C * param0, UnkStruct_02025E6C * param1, int param2, UnkStruct_02023790 * param3); -BOOL ov23_022422A8(UnkStruct_02025E6C * param0, int param1, int param2, UnkStruct_02023790 * param3); +BOOL ov23_0224223C(UnkStruct_02025E6C * param0, UnkStruct_02025E6C * param1, int param2, Strbuf *param3); +BOOL ov23_022422A8(UnkStruct_02025E6C * param0, int param1, int param2, Strbuf *param3); BOOL ov23_0224240C(int param0, int param1); BOOL ov23_02242458(void); void ov23_022425F8(int param0, int param1, void * param2, void * param3); @@ -39,7 +39,7 @@ void ov23_02242C78(void); void ov23_02242CB4(void); void ov23_02242D08(void); void ov23_02242D44(UnkStruct_0203CDB0 * param0); -BOOL ov23_02242D60(UnkStruct_02023790 * param0); +BOOL ov23_02242D60(Strbuf *param0); UnkStruct_02029894 * ov23_02242E10(UnkStruct_021C0794 * param0); int ov23_02242E28(void); int ov23_02242E40(void); diff --git a/include/overlay023/ov23_0224340C.h b/include/overlay023/ov23_0224340C.h index bf06dc7c8a..16e29f5888 100644 --- a/include/overlay023/ov23_0224340C.h +++ b/include/overlay023/ov23_0224340C.h @@ -45,8 +45,8 @@ void ov23_022445E8(int param0, int param1, void * param2, void * param3); void ov23_0224461C(int param0, int param1, void * param2, void * param3); void ov23_02244638(void); void ov23_0224467C(int param0, int param1, void * param2, void * param3); -BOOL ov23_022446B0(UnkStruct_02023790 * param0); -BOOL ov23_02244784(UnkStruct_02023790 * param0); +BOOL ov23_022446B0(Strbuf *param0); +BOOL ov23_02244784(Strbuf *param0); void ov23_02244858(int param0, BOOL param1); int ov23_02245408(void); void ov23_0224540C(int param0, int param1, void * param2, void * param3); diff --git a/include/overlay023/ov23_0224B05C.h b/include/overlay023/ov23_0224B05C.h index dd623155cc..7231900cf0 100644 --- a/include/overlay023/ov23_0224B05C.h +++ b/include/overlay023/ov23_0224B05C.h @@ -41,7 +41,7 @@ void ov23_0224CD68(void); int ov23_0224CD7C(void); void ov23_0224CD80(int param0, int param1, void * param2, void * param3); void ov23_0224CF18(int param0, int param1, void * param2, void * param3); -BOOL ov23_0224D020(UnkStruct_02023790 * param0); +BOOL ov23_0224D020(Strbuf *param0); UnkStruct_02029894 * ov23_0224D130(UnkStruct_021C0794 * param0); int ov23_0224D150(void); int ov23_0224D178(void); diff --git a/include/overlay023/struct_ov23_02250CD4.h b/include/overlay023/struct_ov23_02250CD4.h index e57461219e..2074e61100 100644 --- a/include/overlay023/struct_ov23_02250CD4.h +++ b/include/overlay023/struct_ov23_02250CD4.h @@ -37,8 +37,8 @@ typedef struct { UnkStruct_02001AF4 * unk_5C; UnkFuncPtr_ov23_022515D8 unk_60; UnkFuncPtr_ov23_022515D8 unk_64; - UnkStruct_02023790 * unk_68; - UnkStruct_02023790 * unk_6C; + Strbuf* unk_68; + Strbuf* unk_6C; UnkStruct_0200B358 * unk_70; UnkStruct_ov5_021D30A8 unk_74; UnkStruct_0200D0F4 * unk_23C[8]; diff --git a/include/overlay062/funcptr_ov62_022349A8.h b/include/overlay062/funcptr_ov62_022349A8.h index 467c170600..27291a3a6f 100644 --- a/include/overlay062/funcptr_ov62_022349A8.h +++ b/include/overlay062/funcptr_ov62_022349A8.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_02023790_decl.h" -typedef void (* UnkFuncPtr_ov62_022349A8)(void *, UnkStruct_02023790 *); +typedef void (* UnkFuncPtr_ov62_022349A8)(void *, Strbuf *); #endif // POKEPLATINUM_FUNCPTR_OV62_022349A8_H diff --git a/include/overlay062/ov62_02231690.h b/include/overlay062/ov62_02231690.h index b1ec1185c3..ad23e99974 100644 --- a/include/overlay062/ov62_02231690.h +++ b/include/overlay062/ov62_02231690.h @@ -40,10 +40,10 @@ void ov62_02232394(UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C * param1 void ov62_022323B8(UnkStruct_ov62_022323B8 * param0, int param1); void ov62_022324A0(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, const UnkStruct_ov62_02248CDC * param2); void ov62_02232594(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, UnkStruct_0200B144 * param2, const UnkStruct_ov62_02248CDC * param3); -void ov62_02232778(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, UnkStruct_0200B144 * param2, const UnkStruct_ov62_02248CDC * param3, int param4, int param5, UnkStruct_02023790 * param6); -void ov62_02232AAC(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, const UnkStruct_ov62_02248CDC * param2, UnkStruct_02023790 * param3[20][2]); -int ov62_02232BB4(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, UnkStruct_02023790 * param2[20][2]); -int ov62_02232C78(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, int param2, int param3, UnkStruct_02023790 * param4); +void ov62_02232778(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, UnkStruct_0200B144 * param2, const UnkStruct_ov62_02248CDC * param3, int param4, int param5, Strbuf *param6); +void ov62_02232AAC(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, const UnkStruct_ov62_02248CDC * param2, Strbuf *param3[20][2]); +int ov62_02232BB4(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, Strbuf *param2[20][2]); +int ov62_02232C78(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, int param2, int param3, Strbuf *param4); int ov62_02232F68(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1); int ov62_02233064(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1); void ov62_022331C8(UnkStruct_ov62_02233310 * param0, s16 param1); @@ -84,7 +84,7 @@ int ov62_02233FEC(UnkStruct_ov62_02233F74 * param0); void ov62_02234214(UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C * param1); void ov62_02234228(UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C * param1); void ov62_0223427C(UnkStruct_ov62_02233F74 * param0, int param1); -int ov62_0223429C(UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1); +int ov62_0223429C(UnkStruct_0205AA50 * param0, Strbuf *param1); void ov62_022342BC(UnkStruct_0208C06C * param0); BOOL ov62_022342CC(UnkStruct_0208C06C * param0); void ov62_02234314(void); @@ -100,6 +100,6 @@ int ov62_022345B8(UnkStruct_0208C06C * param0, int param1, int param2, int param void ov62_022348B8(UnkStruct_0208C06C * param0, int param1, int param2, int param3); void ov62_022348FC(UnkStruct_0208C06C * param0); BOOL ov62_02234970(UnkStruct_0208C06C * param0, u64 param1); -void ov62_022349A8(UnkStruct_0208C06C * param0, UnkStruct_02023790 * param1); +void ov62_022349A8(UnkStruct_0208C06C * param0, Strbuf *param1); #endif // POKEPLATINUM_OV62_02231690_H diff --git a/include/overlay062/struct_ov62_022349A8.h b/include/overlay062/struct_ov62_022349A8.h index 86dda11ca1..1e1f3f0057 100644 --- a/include/overlay062/struct_ov62_022349A8.h +++ b/include/overlay062/struct_ov62_022349A8.h @@ -41,7 +41,7 @@ typedef struct { int unk_3F0; UnkStruct_0200B144 * unk_3F4; UnkStruct_0200B358 * unk_3F8; - UnkStruct_02023790 * unk_3FC; + Strbuf* unk_3FC; UnkStruct_ov61_0222B920 unk_400; u8 unk_40D; u8 unk_40E; diff --git a/include/overlay062/struct_ov62_02246B00.h b/include/overlay062/struct_ov62_02246B00.h index 5fc6461291..eeab7e70ee 100644 --- a/include/overlay062/struct_ov62_02246B00.h +++ b/include/overlay062/struct_ov62_02246B00.h @@ -8,7 +8,7 @@ typedef struct { int unk_00; int unk_04[4]; u8 padding_14[4]; - UnkStruct_02023790 * unk_18; + Strbuf* unk_18; UnkStruct_020279FC * unk_1C; } UnkStruct_ov62_02246B00; diff --git a/include/overlay065/struct_ov65_0222EBE0_t.h b/include/overlay065/struct_ov65_0222EBE0_t.h index f6ace1b4f5..6badc12e2a 100644 --- a/include/overlay065/struct_ov65_0222EBE0_t.h +++ b/include/overlay065/struct_ov65_0222EBE0_t.h @@ -41,10 +41,10 @@ struct UnkStruct_ov65_0222EBE0_t { UnkStruct_0200B358 * unk_164; UnkStruct_0200B144 * unk_168; UnkStruct_0200B144 * unk_16C; - UnkStruct_02023790 * unk_170; - UnkStruct_02023790 * unk_174; - UnkStruct_02023790 * unk_178; - UnkStruct_02023790 * unk_17C; + Strbuf* unk_170; + Strbuf* unk_174; + Strbuf* unk_178; + Strbuf* unk_17C; int unk_180; UnkStruct_02001AF4 * unk_184; void * unk_188; diff --git a/include/overlay066/ov66_0223177C.h b/include/overlay066/ov66_0223177C.h index 1d2366186b..f0a0df12b4 100644 --- a/include/overlay066/ov66_0223177C.h +++ b/include/overlay066/ov66_0223177C.h @@ -43,7 +43,7 @@ BOOL ov66_02231C48(const UnkStruct_ov66_0223177C * param0, u32 param1); UnkEnum_ov66_02231E6C ov66_02231C54(const UnkStruct_ov66_0223177C * param0); BOOL ov66_02231C60(const UnkStruct_ov66_0223177C * param0); int ov66_02231C78(const UnkStruct_ov66_0223177C * param0); -BOOL ov66_02231C94(const UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02232068 * param1, int param2, UnkStruct_02023790 * param3, u32 param4); +BOOL ov66_02231C94(const UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02232068 * param1, int param2, Strbuf *param3, u32 param4); u32 ov66_02231D00(const UnkStruct_ov66_0223177C * param0, int param1, u32 param2); #endif // POKEPLATINUM_OV66_0223177C_H diff --git a/include/overlay070/ov70_0225D9A4.h b/include/overlay070/ov70_0225D9A4.h index d5eef3a319..a14fbcc91d 100644 --- a/include/overlay070/ov70_0225D9A4.h +++ b/include/overlay070/ov70_0225D9A4.h @@ -38,18 +38,18 @@ void ov70_0225DF4C(UnkStruct_ov70_0225DEE8 * param0, u8 param1, BOOL param2); BOOL ov70_0225DF64(const UnkStruct_ov70_0225DEE8 * param0, u8 param1); void ov70_0225DF6C(UnkStruct_ov70_0225DEE8 * param0, u8 param1, BOOL param2); BOOL ov70_0225DF84(const UnkStruct_ov70_0225DEE8 * param0, u8 param1); -void ov70_0225DF8C(UnkStruct_ov70_0225DEE8 * param0, const UnkStruct_02023790 * param1); -void ov70_0225DF9C(UnkStruct_ov70_0225DEE8 * param0, const UnkStruct_02023790 * param1); +void ov70_0225DF8C(UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1); +void ov70_0225DF9C(UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1); BOOL ov70_0225DFAC(const UnkStruct_ov70_0225DEE8 * param0); void ov70_0225DFBC(UnkStruct_ov70_0225DEE8 * param0); void ov70_0225DFCC(UnkStruct_ov70_0225DEE8 * param0); BOOL ov70_0225DFDC(const UnkStruct_ov70_0225DEE8 * param0); void ov70_0225DFEC(UnkStruct_ov70_0225DEE8 * param0); -void ov70_0225DFFC(UnkStruct_ov70_0225DEE8 * param0, const UnkStruct_02023790 * param1); +void ov70_0225DFFC(UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1); void ov70_0225E00C(UnkStruct_ov70_0225DEE8 * param0, u32 param1); void ov70_0225E020(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2); void ov70_0225E034(UnkStruct_ov70_0225DEE8 * param0); -void ov70_0225E044(UnkStruct_ov70_0225DEE8 * param0, const UnkStruct_02023790 * param1, u32 param2); +void ov70_0225E044(UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1, u32 param2); const UnkStruct_02013A04 * ov70_0225E054(const UnkStruct_ov70_0225DEE8 * param0); BOOL ov70_0225E064(const UnkStruct_ov70_0225DEE8 * param0, u32 param1); void ov70_0225E074(UnkStruct_ov70_0225DEE8 * param0, const UnkStruct_ov84_02240FA8 * param1, u16 param2, u16 param3); @@ -59,13 +59,13 @@ void ov70_0225E0E4(UnkStruct_ov70_0225DEE8 * param0, u16 * param1, u16 * param2) void ov70_0225E0F4(UnkStruct_ov70_0225DEE8 * param0, BOOL param1); void ov70_0225E104(UnkStruct_ov70_0225DEE8 * param0, u8 param1, u8 param2, u8 param3, u8 param4); void ov70_0225E12C(UnkStruct_ov70_0225DEE8 * param0); -void ov70_0225E13C(UnkStruct_ov70_0225DEE8 * param0, const UnkStruct_02023790 * param1, u8 param2, u8 param3); +void ov70_0225E13C(UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1, u8 param2, u8 param3); void ov70_0225E14C(UnkStruct_ov70_0225DEE8 * param0, u16 param1, u16 param2, u16 param3, u16 param4); void ov70_0225E164(UnkStruct_ov70_0225DEE8 * param0); void ov70_0225E194(UnkStruct_ov70_0225DEE8 * param0); int ov70_0225E1C4(UnkStruct_ov70_0225DEE8 * param0); void ov70_0225E1F8(UnkStruct_ov70_0225DEE8 * param0); -UnkStruct_02023790 * ov70_0225E20C(UnkStruct_ov70_0225DEE8 * param0, int param1, u32 param2); +Strbuf* ov70_0225E20C(UnkStruct_ov70_0225DEE8 * param0, int param1, u32 param2); void ov70_0225E21C(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2, u32 param3, int param4); void ov70_0225E234(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2); void ov70_0225E27C(UnkStruct_ov70_0225DEE8 * param0, UnkEnum_ov66_022324D0 param1, u32 param2); diff --git a/include/overlay071/ov71_0223C69C.h b/include/overlay071/ov71_0223C69C.h index 04e31bc69a..a783d0ded0 100644 --- a/include/overlay071/ov71_0223C69C.h +++ b/include/overlay071/ov71_0223C69C.h @@ -11,7 +11,7 @@ void ov71_0223C6D4(UnkStruct_0205AA50 * param0); void ov71_0223C6F0(UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * param1); void ov71_0223CA28(UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * param1); void ov71_0223CD44(UnkStruct_0205AA50 * param0, const u8 param1, const u8 param2); -void ov71_0223CDE8(UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * param1, UnkStruct_02023790 * param2); -void ov71_0223CECC(UnkStruct_0205AA50 * param0, const BOOL param1, UnkStruct_02023790 * param2); +void ov71_0223CDE8(UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * param1, Strbuf *param2); +void ov71_0223CECC(UnkStruct_0205AA50 * param0, const BOOL param1, Strbuf *param2); #endif // POKEPLATINUM_OV71_0223C69C_H diff --git a/include/overlay071/struct_ov71_0223B620.h b/include/overlay071/struct_ov71_0223B620.h index b3b767c65b..b0cfc349ca 100644 --- a/include/overlay071/struct_ov71_0223B620.h +++ b/include/overlay071/struct_ov71_0223B620.h @@ -35,8 +35,8 @@ typedef struct { void * unk_335C; NNSG2dScreenData * unk_3360; UnkStruct_ov71_0223C444 unk_3364; - UnkStruct_02023790 * unk_336C; - UnkStruct_02023790 * unk_3370; + Strbuf* unk_336C; + Strbuf* unk_3370; u8 unk_3374[8]; u8 unk_337C; u8 unk_337D; diff --git a/include/overlay072/struct_ov72_0223DB98_t.h b/include/overlay072/struct_ov72_0223DB98_t.h index ee25f05193..9133023227 100644 --- a/include/overlay072/struct_ov72_0223DB98_t.h +++ b/include/overlay072/struct_ov72_0223DB98_t.h @@ -26,10 +26,10 @@ struct UnkStruct_ov72_0223DB98_t { UnkStruct_020279FC * unk_0C; UnkStruct_0200B358 * unk_10; UnkStruct_0200B144 * unk_14; - UnkStruct_02023790 * unk_18[5]; - UnkStruct_02023790 * unk_2C; - UnkStruct_02023790 * unk_30; - UnkStruct_02023790 * unk_34; + Strbuf* unk_18[5]; + Strbuf* unk_2C; + Strbuf* unk_30; + Strbuf* unk_34; int unk_38; UnkStruct_020218BC * unk_3C; UnkStruct_0200C738 unk_40; diff --git a/include/overlay079/struct_ov79_021D0E1C_sub1.h b/include/overlay079/struct_ov79_021D0E1C_sub1.h index d0989dfb62..07fd06a5fd 100644 --- a/include/overlay079/struct_ov79_021D0E1C_sub1.h +++ b/include/overlay079/struct_ov79_021D0E1C_sub1.h @@ -6,15 +6,15 @@ typedef struct { UnkStruct_0200B358 * unk_00; - UnkStruct_02023790 * unk_04; - UnkStruct_02023790 * unk_08; - UnkStruct_02023790 * unk_0C; - UnkStruct_02023790 * unk_10; - UnkStruct_02023790 * unk_14; - UnkStruct_02023790 * unk_18; - UnkStruct_02023790 * unk_1C; - UnkStruct_02023790 * unk_20[6]; - UnkStruct_02023790 * unk_38[5]; + Strbuf* unk_04; + Strbuf* unk_08; + Strbuf* unk_0C; + Strbuf* unk_10; + Strbuf* unk_14; + Strbuf* unk_18; + Strbuf* unk_1C; + Strbuf* unk_20[6]; + Strbuf* unk_38[5]; u8 unk_4C; u8 unk_4D[3]; } UnkStruct_ov79_021D0E1C_sub1; diff --git a/include/overlay079/struct_ov79_021D38D0.h b/include/overlay079/struct_ov79_021D38D0.h index 0258a826bd..c0e2543797 100644 --- a/include/overlay079/struct_ov79_021D38D0.h +++ b/include/overlay079/struct_ov79_021D38D0.h @@ -11,7 +11,7 @@ typedef struct { u8 unk_07; u8 unk_08; u8 unk_09; - UnkStruct_02023790 * unk_0C; + Strbuf* unk_0C; } UnkStruct_ov79_021D38D0; #endif // POKEPLATINUM_STRUCT_OV79_021D38D0_H diff --git a/include/overlay080/struct_ov80_021D2A08.h b/include/overlay080/struct_ov80_021D2A08.h index c804e4ffed..339a40ffe4 100644 --- a/include/overlay080/struct_ov80_021D2A08.h +++ b/include/overlay080/struct_ov80_021D2A08.h @@ -39,7 +39,7 @@ typedef struct UnkStruct_ov80_021D2A08_t { UnkStruct_ov80_021D259C unk_44[5]; UnkStruct_0200B144 * unk_80; UnkStruct_0200B144 * unk_84; - UnkStruct_02023790 * unk_88; + Strbuf* unk_88; int unk_8C; int unk_90; UnkStruct_ov80_021D2AF4 * unk_94; diff --git a/include/overlay081/struct_ov81_021D1610.h b/include/overlay081/struct_ov81_021D1610.h index 02b9da8bc8..98919c27a9 100644 --- a/include/overlay081/struct_ov81_021D1610.h +++ b/include/overlay081/struct_ov81_021D1610.h @@ -18,7 +18,7 @@ typedef struct { UnkStruct_021C0794 * unk_4C; UnkStruct_0200B144 * unk_50; UnkStruct_0200B358 * unk_54; - UnkStruct_02023790 * unk_58; + Strbuf* unk_58; u16 unk_5C[1024]; u16 unk_85C[1024]; s8 unk_105C; diff --git a/include/overlay083/struct_ov83_0223DEA0.h b/include/overlay083/struct_ov83_0223DEA0.h index 5f0bf4214b..3b2a791d12 100644 --- a/include/overlay083/struct_ov83_0223DEA0.h +++ b/include/overlay083/struct_ov83_0223DEA0.h @@ -8,20 +8,20 @@ typedef struct { UnkStruct_0200B144 * unk_00; UnkStruct_0200B358 * unk_04; - UnkStruct_02023790 * unk_08; - UnkStruct_02023790 * unk_0C; - UnkStruct_02023790 * unk_10; - UnkStruct_02023790 * unk_14; - UnkStruct_02023790 * unk_18; - UnkStruct_02023790 * unk_1C; - UnkStruct_02023790 * unk_20; - UnkStruct_02023790 * unk_24; - UnkStruct_02023790 * unk_28; - UnkStruct_02023790 * unk_2C; - UnkStruct_02023790 * unk_30; - UnkStruct_02023790 * unk_34; - UnkStruct_02023790 * unk_38[5]; - UnkStruct_02023790 * unk_4C[10]; + Strbuf* unk_08; + Strbuf* unk_0C; + Strbuf* unk_10; + Strbuf* unk_14; + Strbuf* unk_18; + Strbuf* unk_1C; + Strbuf* unk_20; + Strbuf* unk_24; + Strbuf* unk_28; + Strbuf* unk_2C; + Strbuf* unk_30; + Strbuf* unk_34; + Strbuf* unk_38[5]; + Strbuf* unk_4C[10]; } UnkStruct_ov83_0223DEA0; #endif // POKEPLATINUM_STRUCT_OV83_0223DEA0_H diff --git a/include/overlay084/struct_ov84_0223B5A0.h b/include/overlay084/struct_ov84_0223B5A0.h index 52bf7a76df..f74d99f457 100644 --- a/include/overlay084/struct_ov84_0223B5A0.h +++ b/include/overlay084/struct_ov84_0223B5A0.h @@ -38,16 +38,16 @@ typedef struct { UnkStruct_0200B358 * unk_118; UnkStruct_0200B144 * unk_11C; UnkStruct_0200B144 * unk_120; - UnkStruct_02023790 * unk_124[12]; + Strbuf* unk_124[12]; UnkStruct_02013A04 * unk_154; UnkStruct_02001AF4 * unk_158; UnkStruct_0200112C * unk_15C; UnkStruct_02013A04 * unk_160; - UnkStruct_02023790 * unk_164[165]; - UnkStruct_02023790 * unk_3F8; - UnkStruct_02023790 * unk_3FC; - UnkStruct_02023790 * unk_400; - UnkStruct_02023790 * unk_404[8]; + Strbuf* unk_164[165]; + Strbuf* unk_3F8; + Strbuf* unk_3FC; + Strbuf* unk_400; + Strbuf* unk_404[8]; u8 unk_424; u8 unk_425; u8 unk_426; diff --git a/include/overlay087/struct_ov87_021D1640.h b/include/overlay087/struct_ov87_021D1640.h index 3a1d7ac678..deaf7a52c0 100644 --- a/include/overlay087/struct_ov87_021D1640.h +++ b/include/overlay087/struct_ov87_021D1640.h @@ -4,8 +4,8 @@ #include "struct_decls/struct_02023790_decl.h" typedef struct { - UnkStruct_02023790 * unk_00; - UnkStruct_02023790 * unk_04; + Strbuf* unk_00; + Strbuf* unk_04; u32 unk_08; u32 unk_0C; u16 unk_10; diff --git a/include/overlay088/ov88_0223E9C4.h b/include/overlay088/ov88_0223E9C4.h index 6931b428f8..fac1b5dc6a 100644 --- a/include/overlay088/ov88_0223E9C4.h +++ b/include/overlay088/ov88_0223E9C4.h @@ -13,7 +13,7 @@ void ov88_0223E9C4(UnkStruct_02018340 * param0, UnkStruct_0205AA50 * param1, UnkStruct_020279FC * param2); void ov88_0223EC04(UnkStruct_0205AA50 * param0); -void ov88_0223EC78(UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, u32 param3, int param4, int param5); +void ov88_0223EC78(UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, u32 param3, int param4, int param5); int ov88_0223ECBC(UnkStruct_0205AA50 * param0, int param1, int param2, UnkStruct_0200B144 * param3, UnkStruct_0200B358 * param4); u32 ov88_0223ED2C(UnkStruct_02018340 * param0, UnkStruct_02001AF4 ** param1, int * param2); void ov88_0223ED80(UnkStruct_0205AA50 * param0); diff --git a/include/overlay092/ov92_021D0D80.h b/include/overlay092/ov92_021D0D80.h index be38bebe82..7c1851eff9 100644 --- a/include/overlay092/ov92_021D0D80.h +++ b/include/overlay092/ov92_021D0D80.h @@ -7,7 +7,7 @@ int ov92_021D0D80(UnkStruct_020067E8 * param0, int * param1); int ov92_021D0EB8(UnkStruct_020067E8 * param0, int * param1); int ov92_021D1478(UnkStruct_020067E8 * param0, int * param1); -BOOL ov92_021D27E8(int param0, int param1, UnkStruct_02023790 * param2, UnkStruct_02023790 * param3, int param4); +BOOL ov92_021D27E8(int param0, int param1, Strbuf *param2, Strbuf *param3, int param4); BOOL ov92_021D2854(int param0); #endif // POKEPLATINUM_OV92_021D0D80_H diff --git a/include/overlay094/ov94_02244950.h b/include/overlay094/ov94_02244950.h index 0527dbccd3..68580a25f1 100644 --- a/include/overlay094/ov94_02244950.h +++ b/include/overlay094/ov94_02244950.h @@ -10,8 +10,8 @@ int ov94_02244950(UnkStruct_ov94_0223FD4C * param0, int param1); int ov94_022449FC(UnkStruct_ov94_0223FD4C * param0, int param1); int ov94_02244A2C(UnkStruct_ov94_0223FD4C * param0, int param1); void ov94_02245824(UnkStruct_ov94_0223FD4C * param0, UnkStruct_0200B144 * param1, int param2, int param3, u16 param4); -void ov94_022458CC(UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, int param4, u32 param5); -void ov94_02245900(UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, int param4, u32 param5); +void ov94_022458CC(UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5); +void ov94_02245900(UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5); void ov94_02245934(UnkStruct_ov94_0223FD4C * param0); #endif // POKEPLATINUM_OV94_02244950_H diff --git a/include/overlay094/struct_ov94_0223FD4C.h b/include/overlay094/struct_ov94_0223FD4C.h index a5dab829ff..48f78b3dcf 100644 --- a/include/overlay094/struct_ov94_0223FD4C.h +++ b/include/overlay094/struct_ov94_0223FD4C.h @@ -94,12 +94,12 @@ typedef struct UnkStruct_ov94_0223FD4C_t { UnkStruct_0200B144 * unk_B98; UnkStruct_0200B144 * unk_B9C; UnkStruct_0200B144 * unk_BA0; - UnkStruct_02023790 * unk_BA4; - UnkStruct_02023790 * unk_BA8; - UnkStruct_02023790 * unk_BAC; - UnkStruct_02023790 * unk_BB0; - UnkStruct_02023790 * unk_BB4[10]; - UnkStruct_02023790 * unk_BDC; + Strbuf* unk_BA4; + Strbuf* unk_BA8; + Strbuf* unk_BAC; + Strbuf* unk_BB0; + Strbuf* unk_BB4[10]; + Strbuf* unk_BDC; int unk_BE0; UnkStruct_020218BC * unk_BE4; UnkStruct_0200C738 unk_BE8; diff --git a/include/overlay094/struct_ov94_0223FD4C_sub3.h b/include/overlay094/struct_ov94_0223FD4C_sub3.h index a73509e65b..ff37b3de6c 100644 --- a/include/overlay094/struct_ov94_0223FD4C_sub3.h +++ b/include/overlay094/struct_ov94_0223FD4C_sub3.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02023790_decl.h" typedef struct { - UnkStruct_02023790 ** unk_00; + Strbuf **unk_00; u16 unk_04; u16 unk_06; u16 unk_08; diff --git a/include/overlay096/ov96_0223BCE0.h b/include/overlay096/ov96_0223BCE0.h index 1b061c20bd..07f4dbd49c 100644 --- a/include/overlay096/ov96_0223BCE0.h +++ b/include/overlay096/ov96_0223BCE0.h @@ -8,8 +8,8 @@ int ov96_0223BCE0(UnkStruct_ov96_0223BF40 * param0, int param1); int ov96_0223BDBC(UnkStruct_ov96_0223BF40 * param0, int param1); int ov96_0223BDEC(UnkStruct_ov96_0223BF40 * param0, int param1); -void ov96_0223D8A4(UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, int param4, u32 param5); -void ov96_0223D8D8(UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, int param4, u32 param5); +void ov96_0223D8A4(UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5); +void ov96_0223D8D8(UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5); void ov96_0223D948(UnkStruct_ov96_0223BF40 * param0); #endif // POKEPLATINUM_OV96_0223BCE0_H diff --git a/include/overlay096/struct_ov96_0223BF40_t.h b/include/overlay096/struct_ov96_0223BF40_t.h index de63a041b2..25b49462f5 100644 --- a/include/overlay096/struct_ov96_0223BF40_t.h +++ b/include/overlay096/struct_ov96_0223BF40_t.h @@ -54,11 +54,11 @@ struct UnkStruct_ov96_0223BF40_t { UnkStruct_0200B144 * unk_BD0; UnkStruct_0200B144 * unk_BD4; UnkStruct_0200B144 * unk_BD8; - UnkStruct_02023790 * unk_BDC; - UnkStruct_02023790 * unk_BE0; - UnkStruct_02023790 * unk_BE4; - UnkStruct_02023790 * unk_BE8; - UnkStruct_02023790 * unk_BEC; + Strbuf* unk_BDC; + Strbuf* unk_BE0; + Strbuf* unk_BE4; + Strbuf* unk_BE8; + Strbuf* unk_BEC; int unk_BF0; UnkStruct_020218BC * unk_BF4; UnkStruct_0200C738 unk_BF8; diff --git a/include/overlay097/struct_ov97_0222D04C.h b/include/overlay097/struct_ov97_0222D04C.h index e071808fdd..451e94d28b 100644 --- a/include/overlay097/struct_ov97_0222D04C.h +++ b/include/overlay097/struct_ov97_0222D04C.h @@ -27,7 +27,7 @@ typedef struct { UnkStruct_020279FC * unk_08; UnkStruct_0200B358 * unk_0C; UnkStruct_0200B144 * unk_10; - UnkStruct_02023790 * unk_14; + Strbuf* unk_14; UnkStruct_0205AA50 unk_18; UnkStruct_0205AA50 unk_28[3]; UnkStruct_0205AA50 unk_58; diff --git a/include/overlay098/ov98_022499C8.h b/include/overlay098/ov98_022499C8.h index c556d4c3ba..afe9aac361 100644 --- a/include/overlay098/ov98_022499C8.h +++ b/include/overlay098/ov98_022499C8.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_02023790_decl.h" -void ov98_022499C8(UnkStruct_02023790 * param0, char * param1, int param2); +void ov98_022499C8(Strbuf *param0, char * param1, int param2); void ov98_02249A80(void); void ov98_02249ACC(void); diff --git a/include/overlay098/struct_ov98_02246E88.h b/include/overlay098/struct_ov98_02246E88.h index 2ff3c75a92..c031659539 100644 --- a/include/overlay098/struct_ov98_02246E88.h +++ b/include/overlay098/struct_ov98_02246E88.h @@ -34,8 +34,8 @@ typedef struct { u32 unk_10C; u8 unk_110; u8 unk_111[3]; - UnkStruct_02023790 * unk_114; - UnkStruct_02023790 * unk_118; + Strbuf* unk_114; + Strbuf* unk_118; BOOL unk_11C; } UnkStruct_ov98_02246E88; diff --git a/include/overlay104/struct_ov104_022320B4_t.h b/include/overlay104/struct_ov104_022320B4_t.h index 24993abcf6..448289c7f3 100644 --- a/include/overlay104/struct_ov104_022320B4_t.h +++ b/include/overlay104/struct_ov104_022320B4_t.h @@ -20,8 +20,8 @@ struct UnkStruct_ov104_022320B4_t { UnkStruct_0200B144 * unk_3C; u8 * unk_40; UnkStruct_0200B358 * unk_44; - UnkStruct_02023790 * unk_48; - UnkStruct_02023790 * unk_4C; + Strbuf* unk_48; + Strbuf* unk_4C; u8 unk_50; s8 unk_51; u16 unk_52; diff --git a/include/overlay109/struct_ov109_021D5140.h b/include/overlay109/struct_ov109_021D5140.h index 9b513de274..80bd382fea 100644 --- a/include/overlay109/struct_ov109_021D5140.h +++ b/include/overlay109/struct_ov109_021D5140.h @@ -35,10 +35,10 @@ typedef struct UnkStruct_ov109_021D5140_t { UnkStruct_0201CD38 * unk_30; UnkStruct_0200B358 * unk_34; UnkStruct_0200B144 * unk_38; - UnkStruct_02023790 * unk_3C[5]; - UnkStruct_02023790 * unk_50; - UnkStruct_02023790 * unk_54; - UnkStruct_02023790 * unk_58; + Strbuf* unk_3C[5]; + Strbuf* unk_50; + Strbuf* unk_54; + Strbuf* unk_58; int unk_5C; UnkStruct_020218BC * unk_60; UnkStruct_0200C738 unk_64; diff --git a/include/overlay117/ov117_02263AF0.h b/include/overlay117/ov117_02263AF0.h index 4ad9011fc2..d29e2cac8e 100644 --- a/include/overlay117/ov117_02263AF0.h +++ b/include/overlay117/ov117_02263AF0.h @@ -46,7 +46,7 @@ void ov117_02265ABC(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C void ov117_02265B3C(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C * param1); void ov117_02265B58(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C * param1, int param2, int param3, int param4); void ov117_02265C1C(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C * param1); -void ov117_02265DB8(UnkStruct_02018340 * param0, UnkStruct_0200C704 * param1, UnkStruct_02012744 * param2, UnkStruct_ov117_02265EB0 * param3, const UnkStruct_02023790 * param4, int param5, u32 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14); +void ov117_02265DB8(UnkStruct_02018340 * param0, UnkStruct_0200C704 * param1, UnkStruct_02012744 * param2, UnkStruct_ov117_02265EB0 * param3, const Strbuf *param4, int param5, u32 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14); void ov117_02265EB0(UnkStruct_ov117_02265EB0 * param0); void ov117_02265EC8(UnkStruct_ov117_02265EC8 * param0); void ov117_02265F34(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265EC8 * param1); diff --git a/include/overlay117/struct_ov117_02261280.h b/include/overlay117/struct_ov117_02261280.h index c9dd4e9303..13910b4254 100644 --- a/include/overlay117/struct_ov117_02261280.h +++ b/include/overlay117/struct_ov117_02261280.h @@ -48,7 +48,7 @@ typedef struct UnkStruct_ov117_02261280_t { UnkStruct_0205AA50 unk_30[5]; UnkStruct_0200B144 * unk_80; UnkStruct_0200B358 * unk_84; - UnkStruct_02023790 * unk_88; + Strbuf* unk_88; UnkStruct_02002F38 * unk_8C; UnkStruct_02012744 * unk_90; UnkStruct_0201CD38 * unk_94; diff --git a/include/struct_decls/struct_02023790_decl.h b/include/struct_decls/struct_02023790_decl.h index 7ef445e1ca..d94fd62075 100644 --- a/include/struct_decls/struct_02023790_decl.h +++ b/include/struct_decls/struct_02023790_decl.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_02023790_DECL_H #define POKEPLATINUM_STRUCT_02023790_DECL_H -typedef struct UnkStruct_02023790_t UnkStruct_02023790; +typedef struct Strbuf_t Strbuf; #endif // POKEPLATINUM_STRUCT_02023790_DECL_H diff --git a/include/struct_defs/struct_020158A8.h b/include/struct_defs/struct_020158A8.h index 54fef07876..fc03cb7e71 100644 --- a/include/struct_defs/struct_020158A8.h +++ b/include/struct_defs/struct_020158A8.h @@ -6,7 +6,7 @@ typedef struct { UnkStruct_0200B144 * unk_00; - UnkStruct_02023790 * unk_04[29]; + Strbuf* unk_04[29]; } UnkStruct_020158A8; #endif // POKEPLATINUM_STRUCT_020158A8_H diff --git a/include/struct_defs/struct_0201D738.h b/include/struct_defs/struct_0201D738.h index be1ba91049..eab8fcebff 100644 --- a/include/struct_defs/struct_0201D738.h +++ b/include/struct_defs/struct_0201D738.h @@ -7,7 +7,7 @@ typedef struct { union { const u16 * unk_00_val1; - const UnkStruct_02023790 * unk_00_val2; + const Strbuf* unk_00_val2; }; UnkStruct_0205AA50 * unk_04; u8 unk_08; diff --git a/include/struct_defs/struct_0202EE10_sub1.h b/include/struct_defs/struct_0202EE10_sub1.h index 7d2c2e7bd4..b3a1351579 100644 --- a/include/struct_defs/struct_0202EE10_sub1.h +++ b/include/struct_defs/struct_0202EE10_sub1.h @@ -6,7 +6,7 @@ typedef struct { u32 unk_00; u32 unk_04; - UnkStruct_02023790 * unk_08; + Strbuf* unk_08; } UnkStruct_0202EE10_sub1; #endif // POKEPLATINUM_STRUCT_0202EE10_SUB1_H diff --git a/include/struct_defs/struct_0205C924.h b/include/struct_defs/struct_0205C924.h index 924a6d15df..9940e82b5e 100644 --- a/include/struct_defs/struct_0205C924.h +++ b/include/struct_defs/struct_0205C924.h @@ -5,9 +5,9 @@ #include "struct_decls/struct_02023790_decl.h" typedef struct { - UnkStruct_02023790 * unk_00; - UnkStruct_02023790 * unk_04; - UnkStruct_02023790 * unk_08; + Strbuf* unk_00; + Strbuf* unk_04; + Strbuf* unk_08; u32 unk_0C; int unk_10; UnkStruct_02014A84 unk_14; diff --git a/include/struct_defs/struct_0207ADB4_t.h b/include/struct_defs/struct_0207ADB4_t.h index c05bceef13..0122c18633 100644 --- a/include/struct_defs/struct_0207ADB4_t.h +++ b/include/struct_defs/struct_0207ADB4_t.h @@ -47,7 +47,7 @@ struct UnkStruct_0207ADB4_t { UnkStruct_0200B144 * unk_0C; UnkStruct_0200B144 * unk_10; UnkStruct_0200B358 * unk_14; - UnkStruct_02023790 * unk_18; + Strbuf* unk_18; UnkStruct_0201CD38 * unk_1C; UnkStruct_0201CD38 * unk_20; UnkStruct_0201CD38 * unk_24; diff --git a/include/struct_defs/struct_0207AE68_t.h b/include/struct_defs/struct_0207AE68_t.h index f342a637c9..e0c49f76eb 100644 --- a/include/struct_defs/struct_0207AE68_t.h +++ b/include/struct_defs/struct_0207AE68_t.h @@ -28,7 +28,7 @@ struct UnkStruct_0207AE68_t { UnkStruct_0205AA50 * unk_04; UnkStruct_0200B144 * unk_08; UnkStruct_0200B358 * unk_0C; - UnkStruct_02023790 * unk_10; + Strbuf* unk_10; UnkStruct_02002F38 * unk_14; UnkStruct_02007768 * unk_18; UnkStruct_02007C7C * unk_1C[2]; diff --git a/include/struct_defs/struct_0207F248.h b/include/struct_defs/struct_0207F248.h index bbf664190f..041e5fa8d1 100644 --- a/include/struct_defs/struct_0207F248.h +++ b/include/struct_defs/struct_0207F248.h @@ -39,9 +39,9 @@ typedef struct { UnkStruct_0200C440 * unk_698; UnkStruct_0200B144 * unk_69C; UnkStruct_0200B358 * unk_6A0; - UnkStruct_02023790 * unk_6A4; - UnkStruct_02023790 * unk_6A8; - UnkStruct_02023790 * unk_6AC[20]; + Strbuf* unk_6A4; + Strbuf* unk_6A8; + Strbuf* unk_6AC[20]; UnkStruct_02013A04 * unk_6FC; UnkStruct_02001AF4 * unk_700; UnkStruct_020831B4 unk_704[6]; diff --git a/include/struct_defs/struct_020831B4.h b/include/struct_defs/struct_020831B4.h index aada60ef5a..b6fbfdb1d8 100644 --- a/include/struct_defs/struct_020831B4.h +++ b/include/struct_defs/struct_020831B4.h @@ -5,7 +5,7 @@ #include "struct_decls/struct_02023790_decl.h" typedef struct { - UnkStruct_02023790 * unk_00; + Strbuf* unk_00; u16 unk_04; u16 unk_06; u16 unk_08; diff --git a/include/struct_defs/struct_0208737C.h b/include/struct_defs/struct_0208737C.h index 14bdc9e7d7..b900378a41 100644 --- a/include/struct_defs/struct_0208737C.h +++ b/include/struct_defs/struct_0208737C.h @@ -12,7 +12,7 @@ typedef struct { int unk_0C; int unk_10; int unk_14; - UnkStruct_02023790 * unk_18; + Strbuf* unk_18; u16 unk_1C[20]; int unk_44; UnkStruct_020797DC * unk_48; diff --git a/include/struct_defs/struct_02089438.h b/include/struct_defs/struct_02089438.h index 7420d9fbd3..057745b8d5 100644 --- a/include/struct_defs/struct_02089438.h +++ b/include/struct_defs/struct_02089438.h @@ -8,7 +8,7 @@ typedef struct { int unk_00; int unk_04[5]; int unk_18; - UnkStruct_02023790 * unk_1C; + Strbuf* unk_1C; UnkStruct_020279FC * unk_20; int unk_24; u32 unk_28; diff --git a/include/struct_defs/struct_0208D1D4.h b/include/struct_defs/struct_0208D1D4.h index 826b67c6fe..b5d3b550bf 100644 --- a/include/struct_defs/struct_0208D1D4.h +++ b/include/struct_defs/struct_0208D1D4.h @@ -4,9 +4,9 @@ #include "struct_decls/struct_02023790_decl.h" typedef struct { - UnkStruct_02023790 * unk_00; - UnkStruct_02023790 * unk_04; - UnkStruct_02023790 * unk_08; + Strbuf* unk_00; + Strbuf* unk_04; + Strbuf* unk_08; u16 unk_0C; u16 unk_0E; u8 unk_10; diff --git a/include/struct_defs/struct_0208D7BC.h b/include/struct_defs/struct_0208D7BC.h index abf0e6fbe2..894be36ca2 100644 --- a/include/struct_defs/struct_0208D7BC.h +++ b/include/struct_defs/struct_0208D7BC.h @@ -37,8 +37,8 @@ typedef struct { UnkStruct_0200B144 * unk_688; UnkStruct_0200B144 * unk_68C; UnkStruct_0200B358 * unk_690; - UnkStruct_02023790 * unk_694; - UnkStruct_02023790 * unk_698; + Strbuf* unk_694; + Strbuf* unk_698; UnkStruct_0200B144 * unk_69C; NARC * unk_6A0; s8 unk_6A4; diff --git a/include/struct_defs/struct_02090800_sub1.h b/include/struct_defs/struct_02090800_sub1.h index ecfc5af0c0..d84a068725 100644 --- a/include/struct_defs/struct_02090800_sub1.h +++ b/include/struct_defs/struct_02090800_sub1.h @@ -5,7 +5,7 @@ typedef struct { int unk_00; - UnkStruct_02023790 * unk_04; + Strbuf* unk_04; } UnkStruct_02090800_sub1; #endif // POKEPLATINUM_STRUCT_02090800_SUB1_H diff --git a/include/struct_defs/struct_02093800.h b/include/struct_defs/struct_02093800.h index a007534492..d30e23510d 100644 --- a/include/struct_defs/struct_02093800.h +++ b/include/struct_defs/struct_02093800.h @@ -17,7 +17,7 @@ typedef struct { u8 unk_05; u8 padding_06[2]; Pokemon * unk_08; - const UnkStruct_02023790 * unk_0C; + const Strbuf* unk_0C; const UnkStruct_02025E6C * unk_10; UnkStruct_0202A750 * unk_14; const UnkStruct_020279FC * unk_18; diff --git a/include/struct_defs/struct_02095C48_sub1.h b/include/struct_defs/struct_02095C48_sub1.h index 1495c8b4d6..34602a8f74 100644 --- a/include/struct_defs/struct_02095C48_sub1.h +++ b/include/struct_defs/struct_02095C48_sub1.h @@ -12,7 +12,7 @@ typedef struct { Pokemon * unk_00[4]; UnkStruct_ov6_02248BE8 unk_10[4]; UnkStruct_020954F0 unk_C0[3]; - UnkStruct_02023790 * unk_D8[4]; + Strbuf* unk_D8[4]; UnkStruct_02029C88 * unk_E8[4]; u8 unk_F8[4]; u8 unk_FC[4]; diff --git a/include/struct_defs/struct_02095E80_t.h b/include/struct_defs/struct_02095E80_t.h index 0d27ff4c60..fd8ac8b491 100644 --- a/include/struct_defs/struct_02095E80_t.h +++ b/include/struct_defs/struct_02095E80_t.h @@ -68,9 +68,9 @@ struct UnkStruct_02095E80_t { UnkStruct_0200B358 * unk_17C; UnkStruct_0200B358 * unk_180; UnkStruct_0200B144 * unk_184; - UnkStruct_02023790 * unk_188; - UnkStruct_02023790 * unk_18C; - UnkStruct_02023790 * unk_190; + Strbuf* unk_188; + Strbuf* unk_18C; + Strbuf* unk_190; UnkStruct_020218BC * unk_194; UnkStruct_0200C738 unk_198; UnkStruct_02009714 * unk_324[4]; diff --git a/include/struct_defs/struct_02095EAC_t.h b/include/struct_defs/struct_02095EAC_t.h index b08add4345..fb55df320d 100644 --- a/include/struct_defs/struct_02095EAC_t.h +++ b/include/struct_defs/struct_02095EAC_t.h @@ -25,9 +25,9 @@ struct UnkStruct_02095EAC_t { UnkStruct_0203DDFC * unk_08; UnkStruct_0200B358 * unk_0C; UnkStruct_0200B144 * unk_10; - UnkStruct_02023790 * unk_14[5]; - UnkStruct_02023790 * unk_28; - UnkStruct_02023790 * unk_2C; + Strbuf* unk_14[5]; + Strbuf* unk_28; + Strbuf* unk_2C; int unk_30; UnkStruct_020218BC * unk_34; UnkStruct_0200C738 unk_38; diff --git a/include/struct_defs/struct_020961E8_t.h b/include/struct_defs/struct_020961E8_t.h index f94d70375c..76896cbda3 100644 --- a/include/struct_defs/struct_020961E8_t.h +++ b/include/struct_defs/struct_020961E8_t.h @@ -31,10 +31,10 @@ struct UnkStruct_020961E8_t { UnkStruct_0201CD38 * unk_20; UnkStruct_0200B358 * unk_24; UnkStruct_0200B144 * unk_28; - UnkStruct_02023790 * unk_2C[5]; - UnkStruct_02023790 * unk_40; - UnkStruct_02023790 * unk_44; - UnkStruct_02023790 * unk_48; + Strbuf* unk_2C[5]; + Strbuf* unk_40; + Strbuf* unk_44; + Strbuf* unk_48; int unk_4C; UnkStruct_020218BC * unk_50; UnkStruct_0200C738 unk_54; diff --git a/include/struct_defs/struct_020978D8.h b/include/struct_defs/struct_020978D8.h index d2075edf83..12db258b81 100644 --- a/include/struct_defs/struct_020978D8.h +++ b/include/struct_defs/struct_020978D8.h @@ -16,7 +16,7 @@ typedef struct { u8 unk_0D; u8 unk_0E; u8 unk_0F; - UnkStruct_02023790 * unk_10; + Strbuf* unk_10; UnkUnion_02028328 unk_14[3]; UnkStruct_02014A84 unk_1A[3]; } UnkStruct_020978D8; diff --git a/include/unk_02002B7C.h b/include/unk_02002B7C.h index 1b2330f14b..782f198d49 100644 --- a/include/unk_02002B7C.h +++ b/include/unk_02002B7C.h @@ -13,13 +13,13 @@ void sub_02002C60(int param0); const UnkStruct_02002328 * sub_02002CFC(int param0, u16 param1); int sub_02002D18(int param0, UnkStruct_0201D834 * param1); u32 sub_02002D48(int param0, const u16 * param1, u32 param2); -u32 sub_02002D7C(int param0, const UnkStruct_02023790 * param1, u32 param2); -u32 sub_02002DB4(int param0, UnkStruct_02023790 * param1, UnkStruct_02023790 * param2); +u32 sub_02002D7C(int param0, const Strbuf *param1, u32 param2); +u32 sub_02002DB4(int param0, Strbuf *param1, Strbuf *param2); u8 sub_02002DF8(u8 param0, u8 param1); void sub_02002E7C(u32 param0, u32 param1, u32 param2); void sub_02002E98(u32 param0, u32 param1, u32 param2); -u32 sub_02002EB4(int param0, const UnkStruct_02023790 * param1, u32 param2); -u32 sub_02002EEC(int param0, const UnkStruct_02023790 * param1, u32 param2, u32 param3); -u32 sub_02002F04(int param0, const UnkStruct_02023790 * param1); +u32 sub_02002EB4(int param0, const Strbuf *param1, u32 param2); +u32 sub_02002EEC(int param0, const Strbuf *param1, u32 param2, u32 param3); +u32 sub_02002F04(int param0, const Strbuf *param1); #endif // POKEPLATINUM_UNK_02002B7C_H diff --git a/include/unk_0200AC5C.h b/include/unk_0200AC5C.h index 153f9ec79c..3022f291cf 100644 --- a/include/unk_0200AC5C.h +++ b/include/unk_0200AC5C.h @@ -10,18 +10,18 @@ UnkStruct_0200AC5C * sub_0200AC5C(u32 param0, u32 param1, u32 param2); void sub_0200AC64(UnkStruct_0200AC5C * param0); void sub_0200AC6C(const UnkStruct_0200AC5C * param0, u32 param1, u16 * param2); void sub_0200ACF0(u32 param0, u32 param1, u32 param2, u32 param3, u16 * param4); -void sub_0200ADAC(const UnkStruct_0200AC5C * param0, u32 param1, UnkStruct_02023790 * param2); -UnkStruct_02023790 * sub_0200AE5C(const UnkStruct_0200AC5C * param0, u32 param1, u32 param2); -void sub_0200AF20(u32 param0, u32 param1, u32 param2, u32 param3, UnkStruct_02023790 * param4); -void sub_0200AF48(NARC * param0, u32 param1, u32 param2, u32 param3, UnkStruct_02023790 * param4); -UnkStruct_02023790 * sub_0200B010(u32 param0, u32 param1, u32 param2, u32 param3); -UnkStruct_02023790 * sub_0200B044(NARC * param0, u32 param1, u32 param2, u32 param3); +void sub_0200ADAC(const UnkStruct_0200AC5C * param0, u32 param1, Strbuf *param2); +Strbuf* sub_0200AE5C(const UnkStruct_0200AC5C * param0, u32 param1, u32 param2); +void sub_0200AF20(u32 param0, u32 param1, u32 param2, u32 param3, Strbuf *param4); +void sub_0200AF48(NARC * param0, u32 param1, u32 param2, u32 param3, Strbuf *param4); +Strbuf* sub_0200B010(u32 param0, u32 param1, u32 param2, u32 param3); +Strbuf* sub_0200B044(NARC * param0, u32 param1, u32 param2, u32 param3); u32 sub_0200B120(const UnkStruct_0200AC5C * param0); u32 sub_0200B124(u32 param0, u32 param1); UnkStruct_0200B144 * sub_0200B144(int param0, u32 param1, u32 param2, u32 param3); void sub_0200B190(UnkStruct_0200B144 * param0); -void sub_0200B1B8(const UnkStruct_0200B144 * param0, u32 param1, UnkStruct_02023790 * param2); -UnkStruct_02023790 * sub_0200B1EC(const UnkStruct_0200B144 * param0, u32 param1); +void sub_0200B1B8(const UnkStruct_0200B144 * param0, u32 param1, Strbuf *param2); +Strbuf* sub_0200B1EC(const UnkStruct_0200B144 * param0, u32 param1); u32 sub_0200B218(const UnkStruct_0200B144 * param0); void sub_0200B240(const UnkStruct_0200B144 * param0, u32 param1, u16 * param2); void sub_0200B274(u32 param0, u32 param1, u16 * param2); diff --git a/include/unk_0200B29C.h b/include/unk_0200B29C.h index d1cad0aade..69587efe31 100644 --- a/include/unk_0200B29C.h +++ b/include/unk_0200B29C.h @@ -5,8 +5,8 @@ #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02023790_decl.h" -UnkStruct_02023790 * sub_0200B29C(UnkStruct_0200B358 * param0, UnkStruct_0200B144 * param1, u32 param2, u32 param3); -UnkStruct_02023790 * sub_0200B2EC(u32 param0, u32 param1); -UnkStruct_02023790 * sub_0200B32C(u32 param0, u32 param1); +Strbuf* sub_0200B29C(UnkStruct_0200B358 * param0, UnkStruct_0200B144 * param1, u32 param2, u32 param3); +Strbuf* sub_0200B2EC(u32 param0, u32 param1); +Strbuf* sub_0200B32C(u32 param0, u32 param1); #endif // POKEPLATINUM_UNK_0200B29C_H diff --git a/include/unk_0200B358.h b/include/unk_0200B358.h index 2ba663bff0..25e46308da 100644 --- a/include/unk_0200B358.h +++ b/include/unk_0200B358.h @@ -14,7 +14,7 @@ UnkStruct_0200B358 * sub_0200B358(u32 param0); UnkStruct_0200B358 * sub_0200B368(u32 param0, u32 param1, u32 param2); void sub_0200B3F0(UnkStruct_0200B358 * param0); -void sub_0200B48C(UnkStruct_0200B358 * param0, u32 param1, const UnkStruct_02023790 * param2, u32 param3, BOOL param4, u32 param5); +void sub_0200B48C(UnkStruct_0200B358 * param0, u32 param1, const Strbuf *param2, u32 param3, BOOL param4, u32 param5); void sub_0200B498(UnkStruct_0200B358 * param0, u32 param1, const UnkStruct_02025E6C * param2); void sub_0200B4BC(UnkStruct_0200B358 * param0, u32 param1, const UnkStruct_021C0794 * param2); void sub_0200B4E4(UnkStruct_0200B358 * param0, u32 param1, const UnkStruct_021C0794 * param2); @@ -83,7 +83,7 @@ void sub_0200C2A8(UnkStruct_0200B358 * param0, u32 param1, u32 param2); void sub_0200C2E0(UnkStruct_0200B358 * param0, u32 param1, u32 param2); void sub_0200C324(UnkStruct_0200B358 * param0, u32 param1); void sub_0200C338(UnkStruct_0200B358 * param0, u32 param1, u32 param2); -void sub_0200C388(const UnkStruct_0200B358 * param0, UnkStruct_02023790 * param1, const UnkStruct_02023790 * param2); +void sub_0200C388(const UnkStruct_0200B358 * param0, Strbuf *param1, const Strbuf *param2); void sub_0200C41C(UnkStruct_0200B358 * param0); #endif // POKEPLATINUM_UNK_0200B358_H diff --git a/include/unk_02013A04.h b/include/unk_02013A04.h index 11220a3b10..3bd23d0090 100644 --- a/include/unk_02013A04.h +++ b/include/unk_02013A04.h @@ -8,7 +8,7 @@ UnkStruct_02013A04 * sub_02013A04(u32 param0, u32 param1); void sub_02013A3C(UnkStruct_02013A04 * param0); void sub_02013A4C(UnkStruct_02013A04 * param0, const UnkStruct_0200B144 * param1, u32 param2, u32 param3); -void sub_02013A6C(UnkStruct_02013A04 * param0, const UnkStruct_02023790 * param1, u32 param2); +void sub_02013A6C(UnkStruct_02013A04 * param0, const Strbuf *param1, u32 param2); void sub_02013A90(UnkStruct_02013A04 * param0, const UnkStruct_02013A04 * param1); void sub_02013AE8(UnkStruct_02013A04 * param0); diff --git a/include/unk_02014A84.h b/include/unk_02014A84.h index eae854513e..e50816e075 100644 --- a/include/unk_02014A84.h +++ b/include/unk_02014A84.h @@ -8,8 +8,8 @@ void sub_02014A84(UnkStruct_02014A84 * param0); void sub_02014A9C(UnkStruct_02014A84 * param0, u32 param1); void sub_02014AB4(UnkStruct_02014A84 * param0); void sub_02014AC4(UnkStruct_02014A84 * param0, int param1); -UnkStruct_02023790 * sub_02014B34(const UnkStruct_02014A84 * param0, u32 param1); -UnkStruct_02023790 * sub_02014BA0(const UnkStruct_02014A84 * param0, u32 param1); +Strbuf* sub_02014B34(const UnkStruct_02014A84 * param0, u32 param1); +Strbuf* sub_02014BA0(const UnkStruct_02014A84 * param0, u32 param1); BOOL sub_02014BBC(const UnkStruct_02014A84 * param0); BOOL sub_02014BD0(const UnkStruct_02014A84 * param0); u16 sub_02014C78(const UnkStruct_02014A84 * param0, int param1); diff --git a/include/unk_02014D38.h b/include/unk_02014D38.h index 4b0babc655..a80775cd36 100644 --- a/include/unk_02014D38.h +++ b/include/unk_02014D38.h @@ -9,8 +9,8 @@ UnkStruct_02014D38 * sub_02014D38(u32 param0); void sub_02014D70(UnkStruct_02014D38 * param0); -void sub_02014D90(UnkStruct_02014D38 * param0, u16 param1, UnkStruct_02023790 * param2); -void sub_02014DB8(u16 param0, UnkStruct_02023790 * param1); +void sub_02014D90(UnkStruct_02014D38 * param0, u16 param1, Strbuf *param2); +void sub_02014DB8(u16 param0, Strbuf *param1); u16 sub_02014DFC(u32 param0, u32 param1); BOOL sub_02014E4C(u16 param0, u32 * param1, u32 * param2); u32 sub_02014E8C(void); diff --git a/include/unk_020158A8.h b/include/unk_020158A8.h index d3e333b075..9d767bd4c7 100644 --- a/include/unk_020158A8.h +++ b/include/unk_020158A8.h @@ -6,6 +6,6 @@ UnkStruct_020158A8 * sub_020158A8(int param0); void sub_020158F4(UnkStruct_020158A8 * param0); -const UnkStruct_02023790 * sub_02015918(UnkStruct_020158A8 * param0, int param1); +const Strbuf* sub_02015918(UnkStruct_020158A8 * param0, int param1); #endif // POKEPLATINUM_UNK_020158A8_H diff --git a/include/unk_0201D670.h b/include/unk_0201D670.h index 01dadf596f..7b468a9fa1 100644 --- a/include/unk_0201D670.h +++ b/include/unk_0201D670.h @@ -12,9 +12,9 @@ void sub_0201D670(const UnkStruct_0201D670 * param0); void sub_0201D710(void); u8 sub_0201D724(u8 param0); void sub_0201D730(u8 param0); -u8 sub_0201D738(UnkStruct_0205AA50 * param0, u32 param1, const UnkStruct_02023790 * param2, u32 param3, u32 param4, u32 param5, UnkFuncPtr_0201D834 param6); -u8 sub_0201D78C(UnkStruct_0205AA50 * param0, u32 param1, const UnkStruct_02023790 * param2, u32 param3, u32 param4, u32 param5, u32 param6, UnkFuncPtr_0201D834 param7); -u8 sub_0201D7E0(UnkStruct_0205AA50 * param0, u32 param1, const UnkStruct_02023790 * param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, UnkFuncPtr_0201D834 param9); +u8 sub_0201D738(UnkStruct_0205AA50 * param0, u32 param1, const Strbuf *param2, u32 param3, u32 param4, u32 param5, UnkFuncPtr_0201D834 param6); +u8 sub_0201D78C(UnkStruct_0205AA50 * param0, u32 param1, const Strbuf *param2, u32 param3, u32 param4, u32 param5, u32 param6, UnkFuncPtr_0201D834 param7); +u8 sub_0201D7E0(UnkStruct_0205AA50 * param0, u32 param1, const Strbuf *param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, UnkFuncPtr_0201D834 param9); u8 sub_0201D834(const UnkStruct_0201D738 * param0, u32 param1, UnkFuncPtr_0201D834 param2); void sub_0201D9FC(u8 param0, u8 param1, u8 param2); void sub_0201DAA0(u32 param0, u32 param1); diff --git a/include/unk_02023790.h b/include/unk_02023790.h index 0be28efa27..91fa7315b2 100644 --- a/include/unk_02023790.h +++ b/include/unk_02023790.h @@ -3,26 +3,26 @@ #include "struct_decls/struct_02023790_decl.h" -UnkStruct_02023790 * sub_02023790(u32 param0, u32 param1); -void sub_020237BC(UnkStruct_02023790 * param0); -void sub_020237E8(UnkStruct_02023790 * param0); -void sub_02023810(UnkStruct_02023790 * param0, const UnkStruct_02023790 * param1); -UnkStruct_02023790 * sub_02023868(const UnkStruct_02023790 * param0, u32 param1); -void sub_020238A0(UnkStruct_02023790 * param0, int param1, u32 param2, int param3, int param4); -void sub_020239D4(UnkStruct_02023790 * param0, u64 param1, u32 param2, int param3, int param4); -u64 sub_02023B38(const UnkStruct_02023790 * param0, BOOL * param1); -int sub_02023BE0(const UnkStruct_02023790 * param0, const UnkStruct_02023790 * param1); -u32 sub_02023C3C(const UnkStruct_02023790 * param0); -u32 sub_02023C5C(const UnkStruct_02023790 * param0); -void sub_02023C9C(UnkStruct_02023790 * param0, const UnkStruct_02023790 * param1, u32 param2); -void sub_02023D28(UnkStruct_02023790 * param0, const u16 * param1); -void sub_02023D8C(UnkStruct_02023790 * param0, const u16 * param1, u32 param2); -void sub_02023DF0(const UnkStruct_02023790 * param0, u16 * param1, u32 param2); -const u16 * sub_02023E2C(const UnkStruct_02023790 * param0); -void sub_02023E4C(UnkStruct_02023790 * param0, const UnkStruct_02023790 * param1); -void sub_02023EB0(UnkStruct_02023790 * param0, u16 param1); -BOOL sub_02023EF8(UnkStruct_02023790 * param0); -void sub_02023F10(UnkStruct_02023790 * param0, UnkStruct_02023790 * param1); -void sub_02023F8C(UnkStruct_02023790 * param0, int param1); +Strbuf* sub_02023790(u32 param0, u32 param1); +void sub_020237BC(Strbuf *param0); +void sub_020237E8(Strbuf *param0); +void sub_02023810(Strbuf *param0, const Strbuf *param1); +Strbuf* sub_02023868(const Strbuf *param0, u32 param1); +void sub_020238A0(Strbuf *param0, int param1, u32 param2, int param3, int param4); +void sub_020239D4(Strbuf *param0, u64 param1, u32 param2, int param3, int param4); +u64 sub_02023B38(const Strbuf *param0, BOOL * param1); +int sub_02023BE0(const Strbuf *param0, const Strbuf *param1); +u32 sub_02023C3C(const Strbuf *param0); +u32 sub_02023C5C(const Strbuf *param0); +void sub_02023C9C(Strbuf *param0, const Strbuf *param1, u32 param2); +void sub_02023D28(Strbuf *param0, const u16 * param1); +void sub_02023D8C(Strbuf *param0, const u16 * param1, u32 param2); +void sub_02023DF0(const Strbuf *param0, u16 * param1, u32 param2); +const u16 * sub_02023E2C(const Strbuf *param0); +void sub_02023E4C(Strbuf *param0, const Strbuf *param1); +void sub_02023EB0(Strbuf *param0, u16 param1); +BOOL sub_02023EF8(Strbuf *param0); +void sub_02023F10(Strbuf *param0, Strbuf *param1); +void sub_02023F8C(Strbuf *param0, int param1); #endif // POKEPLATINUM_UNK_02023790_H diff --git a/include/unk_02025E68.h b/include/unk_02025E68.h index 89de46164d..6115ec424b 100644 --- a/include/unk_02025E68.h +++ b/include/unk_02025E68.h @@ -10,10 +10,10 @@ void sub_02025E80(const UnkStruct_02025E6C * param0, UnkStruct_02025E6C * param1 void sub_02025E8C(UnkStruct_02025E6C * param0); BOOL sub_02025EA8(const UnkStruct_02025E6C * param0); void sub_02025EC0(UnkStruct_02025E6C * param0, const u16 * param1); -void sub_02025EE0(UnkStruct_02025E6C * param0, const UnkStruct_02023790 * param1); +void sub_02025EE0(UnkStruct_02025E6C * param0, const Strbuf *param1); const u16 * sub_02025EF0(const UnkStruct_02025E6C * param0); -void sub_02025EF4(const UnkStruct_02025E6C * param0, UnkStruct_02023790 * param1); -UnkStruct_02023790 * sub_02025F04(const UnkStruct_02025E6C * param0, int param1); +void sub_02025EF4(const UnkStruct_02025E6C * param0, Strbuf *param1); +Strbuf* sub_02025F04(const UnkStruct_02025E6C * param0, int param1); void sub_02025F1C(UnkStruct_02025E6C * param0, u32 param1); u32 sub_02025F20(const UnkStruct_02025E6C * param0); u16 sub_02025F24(const UnkStruct_02025E6C * param0); diff --git a/include/unk_0202602C.h b/include/unk_0202602C.h index 3afe8f3def..22192e57c5 100644 --- a/include/unk_0202602C.h +++ b/include/unk_0202602C.h @@ -10,8 +10,8 @@ int sub_0202602C(void); int sub_02026030(void); void sub_02026034(const UnkStruct_0202610C * param0, UnkStruct_0202610C * param1); void sub_02026040(UnkStruct_02026030 * param0); -void sub_0202604C(const UnkStruct_0202610C * param0, UnkStruct_02023790 * param1); -UnkStruct_02023790 * sub_0202605C(const UnkStruct_0202610C * param0, int param1); +void sub_0202604C(const UnkStruct_0202610C * param0, Strbuf *param1); +Strbuf* sub_0202605C(const UnkStruct_0202610C * param0, int param1); int sub_02026074(const UnkStruct_0202610C * param0, int param1); UnkStruct_0202610C * sub_0202610C(UnkStruct_021C0794 * param0, int param1); void sub_0202613C(UnkStruct_021C0794 * param0, const UnkStruct_0202610C * param1); diff --git a/include/unk_02026150.h b/include/unk_02026150.h index 2904d333d2..e6b1980ae1 100644 --- a/include/unk_02026150.h +++ b/include/unk_02026150.h @@ -6,7 +6,7 @@ #include "struct_decls/struct_021C0794_decl.h" const UnkStruct_0202610C * sub_02026150(UnkStruct_021C0794 * param0, int param1); -void sub_0202616C(UnkStruct_021C0794 * param0, int param1, UnkStruct_02023790 * param2, int param3); +void sub_0202616C(UnkStruct_021C0794 * param0, int param1, Strbuf *param2, int param3); const UnkStruct_0202610C * sub_020261A8(void); int sub_020261B0(const UnkStruct_0202610C * param0); diff --git a/include/unk_020277A4.h b/include/unk_020277A4.h index 75bace7628..b03f9316d7 100644 --- a/include/unk_020277A4.h +++ b/include/unk_020277A4.h @@ -15,9 +15,9 @@ const UnkStruct_0202783C * sub_02027848(const UnkStruct_021C0794 * param0); UnkStruct_02027854 * sub_02027854(UnkStruct_021C0794 * param0); UnkStruct_02027860 * sub_02027860(UnkStruct_021C0794 * param0); const u16 * sub_02027870(const UnkStruct_0202783C * param0); -void sub_0202787C(UnkStruct_0202783C * param0, UnkStruct_02023790 * param1); +void sub_0202787C(UnkStruct_0202783C * param0, Strbuf *param1); const u16 * sub_02027894(const UnkStruct_0202783C * param0); -void sub_020278A0(UnkStruct_0202783C * param0, UnkStruct_02023790 * param1); +void sub_020278A0(UnkStruct_0202783C * param0, Strbuf *param1); void sub_020278B8(UnkStruct_0202783C * param0); u32 sub_020278CC(const UnkStruct_0202783C * param0); void sub_020278DC(UnkStruct_0202783C * param0, int param1, int param2, int param3); diff --git a/include/unk_020298BC.h b/include/unk_020298BC.h index 51c298b147..3368008456 100644 --- a/include/unk_020298BC.h +++ b/include/unk_020298BC.h @@ -42,12 +42,12 @@ void sub_02029FD0(UnkStruct_02029C68 * param0, const UnkStruct_ov22_02255040 * p void sub_0202A084(UnkStruct_02029C68 * param0, u8 param1); void sub_0202A0A0(UnkStruct_02029C68 * param0, u16 param1); void sub_0202A0CC(UnkStruct_02029C68 * param0, const UnkStruct_02029C68 * param1); -void sub_0202A0EC(UnkStruct_02029C68 * param0, const UnkStruct_02023790 * param1, int param2); +void sub_0202A0EC(UnkStruct_02029C68 * param0, const Strbuf *param1, int param2); BOOL sub_0202A110(const UnkStruct_02029C68 * param0, int param1); const UnkStruct_0202A138 * sub_0202A138(const UnkStruct_02029C68 * param0); const UnkStruct_0202A150 * sub_0202A150(const UnkStruct_02029C68 * param0, int param1); u16 sub_0202A184(const UnkStruct_02029C68 * param0); -void sub_0202A1A0(const UnkStruct_02029C68 * param0, UnkStruct_02023790 * param1); +void sub_0202A1A0(const UnkStruct_02029C68 * param0, Strbuf *param1); u32 sub_0202A1C0(const UnkStruct_02029C68 * param0); u8 sub_0202A1DC(const UnkStruct_02029C68 * param0); u16 sub_0202A1F4(const UnkStruct_02029C68 * param0); @@ -63,17 +63,17 @@ void sub_0202A390(UnkStruct_02029C88 * param0, const UnkStruct_02029C88 * param1 void sub_0202A3B0(UnkStruct_02029C88 * param0, Pokemon * param1, s8 param2); void sub_0202A3EC(UnkStruct_02029C88 * param0, u32 param1, u8 param2, u8 param3, u8 param4, s8 param5); BOOL sub_0202A488(const UnkStruct_02029C88 * param0, int param1); -void sub_0202A4B4(UnkStruct_02029C88 * param0, const UnkStruct_02023790 * param1, int param2); +void sub_0202A4B4(UnkStruct_02029C88 * param0, const Strbuf *param1, int param2); const UnkStruct_0202A138 * sub_0202A4D8(const UnkStruct_02029C88 * param0); const UnkStruct_0202A150 * sub_0202A4F0(const UnkStruct_02029C88 * param0, int param1); -void sub_0202A524(const UnkStruct_02029C88 * param0, UnkStruct_02023790 * param1); +void sub_0202A524(const UnkStruct_02029C88 * param0, Strbuf *param1); u32 sub_0202A544(const UnkStruct_02029C88 * param0); void sub_0202A560(const UnkStruct_02029C88 * param0, Pokemon * param1); u8 sub_0202A580(const UnkStruct_02029C88 * param0, int param1); u8 sub_0202A5B8(const UnkStruct_02029C88 * param0); u32 sub_0202A5D0(const UnkStruct_02029C88 * param0); u16 sub_0202A5E8(const UnkStruct_0202A138 * param0); -void sub_0202A5EC(const UnkStruct_0202A138 * param0, UnkStruct_02023790 * param1); +void sub_0202A5EC(const UnkStruct_0202A138 * param0, Strbuf *param1); u32 sub_0202A5FC(const UnkStruct_0202A138 * param0); s8 sub_0202A604(const UnkStruct_0202A138 * param0); u8 sub_0202A60C(const UnkStruct_0202A138 * param0); diff --git a/include/unk_0202ACE0.h b/include/unk_0202ACE0.h index 86a839e3aa..d21b04a24c 100644 --- a/include/unk_0202ACE0.h +++ b/include/unk_0202ACE0.h @@ -14,9 +14,9 @@ u32 sub_0202AD2C(UnkStruct_0202B370 * param0, int param1, int param2); void sub_0202AE2C(UnkStruct_0202B370 * param0, int param1, int param2, u32 param3); DWCFriendData * sub_0202AED8(UnkStruct_0202B370 * param0, int param1); u16 * sub_0202AEF0(UnkStruct_0202B370 * param0, int param1); -void sub_0202AF0C(UnkStruct_0202B370 * param0, int param1, UnkStruct_02023790 * param2); +void sub_0202AF0C(UnkStruct_0202B370 * param0, int param1, Strbuf *param2); u16 * sub_0202AF34(UnkStruct_0202B370 * param0, int param1); -void sub_0202AF50(UnkStruct_0202B370 * param0, int param1, UnkStruct_02023790 * param2); +void sub_0202AF50(UnkStruct_0202B370 * param0, int param1, Strbuf *param2); BOOL sub_0202AF78(UnkStruct_0202B370 * param0, int param1); int sub_0202AF94(UnkStruct_0202B370 * param0); int sub_0202AFB4(UnkStruct_0202B370 * param0); diff --git a/include/unk_0202B37C.h b/include/unk_0202B37C.h index a75e5c2000..18b2ea640a 100644 --- a/include/unk_0202B37C.h +++ b/include/unk_0202B37C.h @@ -14,7 +14,7 @@ u32 sub_0202B400(UnkStruct_0202B4A0 * param0, int param1); void sub_0202B40C(UnkStruct_0202B4A0 * param0, int param1, u32 param2); u32 sub_0202B428(UnkStruct_0202B4A0 * param0); const u16 * sub_0202B42C(const UnkStruct_0202B4A0 * param0, int param1, int param2); -void sub_0202B444(UnkStruct_0202B4A0 * param0, int param1, int param2, UnkStruct_02023790 * param3); +void sub_0202B444(UnkStruct_0202B4A0 * param0, int param1, int param2, Strbuf *param3); void sub_0202B470(UnkStruct_0202B4A0 * param0, int param1, int param2); int sub_0202B47C(const UnkStruct_0202B4A0 * param0, int param1); int sub_0202B488(const UnkStruct_0202B4A0 * param0, int param1); diff --git a/include/unk_02030A80.h b/include/unk_02030A80.h index 91198a6b39..8b5251484b 100644 --- a/include/unk_02030A80.h +++ b/include/unk_02030A80.h @@ -9,14 +9,14 @@ UnkStruct_02030A80 * sub_02030A80(int param0); void sub_02030A98(UnkStruct_02030A80 * param0); void sub_02030AA0(UnkStruct_02030A80 * param0, UnkStruct_021C0794 * param1); -UnkStruct_02023790 * sub_02030B94(const UnkStruct_02030A80 * param0, int param1); +Strbuf* sub_02030B94(const UnkStruct_02030A80 * param0, int param1); u32 sub_02030BAC(const UnkStruct_02030A80 * param0); int sub_02030BBC(const UnkStruct_02030A80 * param0); int sub_02030BCC(const UnkStruct_02030A80 * param0); int sub_02030BEC(const UnkStruct_02030A80 * param0); int sub_02030BFC(const UnkStruct_02030A80 * param0); int sub_02030C08(const UnkStruct_02030A80 * param0); -UnkStruct_02023790 * sub_02030C28(const UnkStruct_02030A80 * param0, UnkStruct_02014A84 * param1, int param2); +Strbuf* sub_02030C28(const UnkStruct_02030A80 * param0, UnkStruct_02014A84 * param1, int param2); int sub_02030CCC(const UnkStruct_02030A80 * param0); int sub_02030CDC(const UnkStruct_02030A80 * param0); diff --git a/include/unk_0205D8CC.h b/include/unk_0205D8CC.h index e47d4a0873..477abeb4fa 100644 --- a/include/unk_0205D8CC.h +++ b/include/unk_0205D8CC.h @@ -10,8 +10,8 @@ void sub_0205D8CC(u32 param0, u32 param1); void sub_0205D8F4(UnkStruct_02018340 * param0, UnkStruct_0205AA50 * param1, u32 param2); void sub_0205D944(UnkStruct_0205AA50 * param0, const UnkStruct_020279FC * param1); void sub_0205D988(UnkStruct_0205AA50 * param0); -u8 sub_0205D994(UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, const UnkStruct_020279FC * param2, u8 param3); -u8 sub_0205D9CC(UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, u8 param4, int param5); +u8 sub_0205D994(UnkStruct_0205AA50 * param0, Strbuf *param1, const UnkStruct_020279FC * param2, u8 param3); +u8 sub_0205D9CC(UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, u8 param4, int param5); u8 sub_0205DA04(u8 param0); void sub_0205DA1C(UnkStruct_02018340 * param0, UnkStruct_0205AA50 * param1, u16 param2, u16 param3); void sub_0205DA80(UnkStruct_0205AA50 * param0, u16 param1, u16 param2); diff --git a/include/unk_02071CFC.h b/include/unk_02071CFC.h index f3d9f66aea..e5e8f2eae2 100644 --- a/include/unk_02071CFC.h +++ b/include/unk_02071CFC.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_0200B144_decl.h" #include "struct_decls/struct_02023790_decl.h" -u32 sub_02071CFC(UnkStruct_0200B144 * param0, const int param1, UnkStruct_02023790 * param2); -void sub_02071D10(const int param0, const u32 param1, UnkStruct_02023790 * param2); +u32 sub_02071CFC(UnkStruct_0200B144 * param0, const int param1, Strbuf *param2); +void sub_02071D10(const int param0, const u32 param1, Strbuf *param2); #endif // POKEPLATINUM_UNK_02071CFC_H diff --git a/include/unk_02079170.h b/include/unk_02079170.h index 8a4315e9f3..f837080135 100644 --- a/include/unk_02079170.h +++ b/include/unk_02079170.h @@ -9,7 +9,7 @@ void sub_02079170(UnkStruct_ov6_02240D5C * param0, const UnkStruct_021C0794 * param1, int param2); u32 sub_02079220(int param0, int param1); BOOL sub_02079280(int param0, int param1, int param2); -void sub_020792F8(int param0, int param1, UnkStruct_02023790 * param2, int param3); +void sub_020792F8(int param0, int param1, Strbuf *param2, int param3); void sub_0207938C(int param0, UnkStruct_0207A9CC * param1); void sub_0207939C(int param0, void * param1); u8 sub_020793AC(int param0); diff --git a/include/unk_020797C8.h b/include/unk_020797C8.h index c240aa5493..85c4df9aa1 100644 --- a/include/unk_020797C8.h +++ b/include/unk_020797C8.h @@ -18,8 +18,8 @@ u32 sub_02079A50(const UnkStruct_020797DC * param0); void sub_02079A94(UnkStruct_020797DC * param0, u32 param1); u32 sub_02079AA8(const UnkStruct_020797DC * param0, u32 param1); void sub_02079AC4(UnkStruct_020797DC * param0, u32 param1, u32 param2); -void sub_02079AF4(const UnkStruct_020797DC * param0, u32 param1, UnkStruct_02023790 * param2); -void sub_02079B24(UnkStruct_020797DC * param0, u32 param1, const UnkStruct_02023790 * param2); +void sub_02079AF4(const UnkStruct_020797DC * param0, u32 param1, Strbuf *param2); +void sub_02079B24(UnkStruct_020797DC * param0, u32 param1, const Strbuf *param2); u32 sub_02079B54(const UnkStruct_020797DC * param0, u32 param1); u32 sub_02079B98(const UnkStruct_020797DC * param0, u32 param1); u32 sub_02079BEC(const UnkStruct_020797DC * param0); diff --git a/include/unk_0207CB08.h b/include/unk_0207CB08.h index 577d1b16d3..0b9117c7b4 100644 --- a/include/unk_0207CB08.h +++ b/include/unk_0207CB08.h @@ -19,7 +19,7 @@ u16 sub_0207CB94(UnkStruct_0207CB08 * param0); u16 sub_0207CB9C(UnkStruct_0207CB08 * param0); u8 sub_0207CBA4(UnkStruct_0207CB08 * param0); u8 sub_0207CBAC(UnkStruct_0207CB08 * param0); -BOOL sub_0207CC10(UnkStruct_021C0794 * param0, UnkStruct_02023790 * param1, u16 param2, u32 param3); -void sub_0207CD34(void * param0, UnkStruct_02023790 * param1, u16 param2, u32 param3, u32 param4); +BOOL sub_0207CC10(UnkStruct_021C0794 * param0, Strbuf *param1, u16 param2, u32 param3); +void sub_0207CD34(void * param0, Strbuf *param1, u16 param2, u32 param3, u32 param4); #endif // POKEPLATINUM_UNK_0207CB08_H diff --git a/include/unk_0209739C.h b/include/unk_0209739C.h index 45255f3c45..78eda08dab 100644 --- a/include/unk_0209739C.h +++ b/include/unk_0209739C.h @@ -11,7 +11,7 @@ void sub_020973B0(NARC * param0); UnkStruct_020973A8 * sub_020973B8(u32 param0, u32 param1); UnkStruct_020973A8 * sub_020973C8(u32 param0, u32 param1); u32 sub_020973D4(UnkStruct_020973A8 * param0, u32 param1); -UnkStruct_02023790 * sub_0209742C(u16 param0, u32 param1); -UnkStruct_02023790 * sub_02097454(u16 param0, u16 param1); +Strbuf* sub_0209742C(u16 param0, u32 param1); +Strbuf* sub_02097454(u16 param0, u16 param1); #endif // POKEPLATINUM_UNK_0209739C_H diff --git a/include/unk_020998EC.h b/include/unk_020998EC.h index 7ebfd618f5..7aed081c8c 100644 --- a/include/unk_020998EC.h +++ b/include/unk_020998EC.h @@ -8,10 +8,10 @@ UnkStruct_020998EC * sub_020998EC(u32 param0, const UnkStruct_0209747C * param1); void sub_0209992C(UnkStruct_020998EC * param0); u32 sub_02099CA0(const UnkStruct_020998EC * param0, u32 param1); -void sub_02099CA8(const UnkStruct_020998EC * param0, u32 param1, u32 param2, UnkStruct_02023790 * param3); +void sub_02099CA8(const UnkStruct_020998EC * param0, u32 param1, u32 param2, Strbuf *param3); u16 sub_02099CC8(const UnkStruct_020998EC * param0, u32 param1, u32 param2); u32 sub_02099CDC(const UnkStruct_020998EC * param0, u32 param1); -void sub_02099CEC(const UnkStruct_020998EC * param0, u32 param1, u32 param2, UnkStruct_02023790 * param3); +void sub_02099CEC(const UnkStruct_020998EC * param0, u32 param1, u32 param2, Strbuf *param3); u16 sub_02099D14(const UnkStruct_020998EC * param0, u32 param1, u32 param2); #endif // POKEPLATINUM_UNK_020998EC_H diff --git a/src/error_message_reset.c b/src/error_message_reset.c index e6db298786..63fbc34efd 100644 --- a/src/error_message_reset.c +++ b/src/error_message_reset.c @@ -96,7 +96,7 @@ void ErrorMessageReset_PrintErrorAndReset (void) UnkStruct_02018340 * bgConfig; UnkStruct_0205AA50 window; UnkStruct_0200B144 * errorMsgData; - UnkStruct_02023790 * errorString; + Strbuf* errorString; int v4; int v5 = 0; diff --git a/src/item.c b/src/item.c index 03a2fbdf14..a5df566c1c 100644 --- a/src/item.c +++ b/src/item.c @@ -790,7 +790,7 @@ void * Item_LoadDataOrGFX (u16 itemID, u16 attributeID, u32 heapID) return NULL; } -void Item_GetNameIntoString (UnkStruct_02023790 * dest, u16 itemID, u32 heapID) +void Item_GetNameIntoString (Strbuf* dest, u16 itemID, u32 heapID) { UnkStruct_0200B144 * msgData = sub_0200B144(1, 26, 392, heapID); @@ -798,7 +798,7 @@ void Item_GetNameIntoString (UnkStruct_02023790 * dest, u16 itemID, u32 heapID) sub_0200B190(msgData); } -void Item_GetDescriptionIntoString (UnkStruct_02023790 * dest, u16 itemID, u16 heapID) +void Item_GetDescriptionIntoString (Strbuf* dest, u16 itemID, u16 heapID) { UnkStruct_0200B144 * msgData = sub_0200B144(1, 26, 391, heapID); diff --git a/src/overlay005/ov5_021DC018.c b/src/overlay005/ov5_021DC018.c index a74603a138..693f051fbe 100644 --- a/src/overlay005/ov5_021DC018.c +++ b/src/overlay005/ov5_021DC018.c @@ -42,7 +42,7 @@ struct UnkStruct_ov5_021DC1A4_t { UnkStruct_0201CD38 * unk_04; UnkStruct_0205AA50 unk_08; UnkStruct_0205AA50 * unk_18; - UnkStruct_02023790 * unk_1C[28]; + Strbuf* unk_1C[28]; UnkStruct_0200B144 * unk_8C; UnkStruct_0200B358 * unk_90; u8 unk_94; @@ -216,7 +216,7 @@ static void ov5_021DC290 (UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param void * v1; { - UnkStruct_02023790 * v2 = sub_02023790((40 * 2), 4); + Strbuf* v2 = sub_02023790((40 * 2), 4); sub_0200B1B8(param0->unk_8C, param1, v2); sub_0200C388(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); @@ -243,7 +243,7 @@ static u32 ov5_021DC300 (UnkStruct_ov5_021DC1A4 * param0) break; } - v1 = sub_02002F04(0, (UnkStruct_02023790 *)param0->unk_BC[v0].unk_00); + v1 = sub_02002F04(0, (Strbuf *)param0->unk_BC[v0].unk_00); if (v2 < v1) { v2 = v1; @@ -440,7 +440,7 @@ static void ov5_021DC708 (UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param void * v1; { - UnkStruct_02023790 * v2 = sub_02023790((40 * 2), 4); + Strbuf* v2 = sub_02023790((40 * 2), 4); sub_0200B1B8(param0->unk_8C, param1, v2); sub_0200C388(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); @@ -473,7 +473,7 @@ static u32 ov5_021DC7A8 (UnkStruct_ov5_021DC1A4 * param0) break; } - v1 = sub_02002F04(0, (UnkStruct_02023790 *)param0->unk_1C4[v0].unk_00); + v1 = sub_02002F04(0, (Strbuf *)param0->unk_1C4[v0].unk_00); if (v2 < v1) { v2 = v1; @@ -609,8 +609,8 @@ static void ov5_021DCA28 (UnkStruct_ov5_021DC1A4 * param0) static void ov5_021DCA90 (UnkStruct_ov5_021DC1A4 * param0, u16 param1, u32 param2) { - UnkStruct_02023790 * v0 = sub_02023790((40 * 2), 4); - UnkStruct_02023790 * v1 = sub_02023790((40 * 2), 4); + Strbuf* v0 = sub_02023790((40 * 2), 4); + Strbuf* v1 = sub_02023790((40 * 2), 4); sub_0201ADA4(param0->unk_18, 15); sub_0200B1B8(param0->unk_8C, param1, v0); @@ -665,8 +665,8 @@ void ov5_021DCB24 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 * para static void ov5_021DCC00 (UnkStruct_ov5_021DC1A4 * param0, u16 param1, u8 param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_02023790((40 * 2), 4); - UnkStruct_02023790 * v1 = sub_02023790((40 * 2), 4); + Strbuf* v0 = sub_02023790((40 * 2), 4); + Strbuf* v1 = sub_02023790((40 * 2), 4); sub_0200B1B8(param0->unk_8C, param1, v0); sub_0200C388(param0->unk_90, v1, v0); @@ -824,7 +824,7 @@ UnkStruct_0205AA50 * ov5_021DCEB0 (UnkStruct_0203CDB0 * param0, u8 param1, u8 pa { UnkStruct_0200B144 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; v1 = sub_0200B144(0, 26, 543, 4); v2 = sub_0200B1EC(v1, 18); @@ -849,8 +849,8 @@ void ov5_021DCF6C (UnkStruct_0203CDB0 * param0, UnkStruct_0205AA50 * param1) { UnkStruct_0200B144 * v0; UnkStruct_0200B358 * v1; - UnkStruct_02023790 * v2; - UnkStruct_02023790 * v3; + Strbuf* v2; + Strbuf* v3; u32 v4; u32 v5; @@ -898,8 +898,8 @@ void ov5_021DD098 (UnkStruct_0203CDB0 * param0, UnkStruct_0205AA50 * param1) { UnkStruct_0200B144 * v0; UnkStruct_0200B358 * v1; - UnkStruct_02023790 * v2; - UnkStruct_02023790 * v3; + Strbuf* v2; + Strbuf* v3; u32 v4; u32 v5; @@ -941,8 +941,8 @@ void ov5_021DD1A4 (UnkStruct_0203CDB0 * param0, UnkStruct_0205AA50 * param1) { UnkStruct_0200B144 * v0; UnkStruct_0200B358 * v1; - UnkStruct_02023790 * v2; - UnkStruct_02023790 * v3; + Strbuf* v2; + Strbuf* v3; u16 v4; u32 v5; diff --git a/src/overlay005/ov5_021DD42C.c b/src/overlay005/ov5_021DD42C.c index 268fb1a762..bfa08f3f86 100644 --- a/src/overlay005/ov5_021DD42C.c +++ b/src/overlay005/ov5_021DD42C.c @@ -25,8 +25,8 @@ #include "overlay005/ov5_021DD42C.h" typedef struct { - UnkStruct_02023790 * unk_00; - UnkStruct_02023790 * unk_04; + Strbuf* unk_00; + Strbuf* unk_04; UnkStruct_0200B358 * unk_08; UnkStruct_0205AA50 * unk_0C; u8 * unk_10; @@ -116,8 +116,8 @@ static u8 ov5_021DD574 (UnkStruct_0203E724 * param0) static void ov5_021DD588 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021DD648 * param1) { - param1->unk_00 = *((UnkStruct_02023790 **)(sub_0203F098(param0, 16))); - param1->unk_04 = *((UnkStruct_02023790 **)(sub_0203F098(param0, 17))); + param1->unk_00 = *((Strbuf **)(sub_0203F098(param0, 16))); + param1->unk_04 = *((Strbuf **)(sub_0203F098(param0, 17))); param1->unk_08 = *((UnkStruct_0200B358 **)(sub_0203F098(param0, 15))); param1->unk_0C = sub_0203F098(param0, 1); param1->unk_10 = sub_0203F098(param0, 6); @@ -126,8 +126,8 @@ static void ov5_021DD588 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021DD648 * static void ov5_021DD5D0 (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param1, UnkStruct_ov5_021DD648 * param2) { - param2->unk_00 = *((UnkStruct_02023790 **)(sub_0203F098(param0, 16))); - param2->unk_04 = *((UnkStruct_02023790 **)(sub_0203F098(param0, 17))); + param2->unk_00 = *((Strbuf **)(sub_0203F098(param0, 16))); + param2->unk_04 = *((Strbuf **)(sub_0203F098(param0, 17))); param2->unk_08 = param1; param2->unk_0C = sub_0203F098(param0, 1); param2->unk_10 = sub_0203F098(param0, 6); @@ -154,7 +154,7 @@ static void ov5_021DD648 (UnkStruct_ov5_021DD648 * param0, const UnkStruct_0200B static void ov5_021DD664 (UnkStruct_ov5_021DD648 * param0, u16 param1, u16 param2, u16 param3, u16 param4) { UnkStruct_02014A84 v0; - UnkStruct_02023790 * v1; + Strbuf* v1; sub_02014A84(&v0); sub_02014CE0(&v0, param1, param2); diff --git a/src/overlay005/ov5_021DD6FC.c b/src/overlay005/ov5_021DD6FC.c index 559fa14729..1fff10bb09 100644 --- a/src/overlay005/ov5_021DD6FC.c +++ b/src/overlay005/ov5_021DD6FC.c @@ -36,7 +36,7 @@ typedef struct UnkStruct_ov5_021DD9C8_t { NNSG2dCharacterData * unk_34; void * unk_38; UnkStruct_0200B144 * unk_3C; - UnkStruct_02023790 * unk_40; + Strbuf* unk_40; } UnkStruct_ov5_021DD9C8; static void ov5_021DD718(UnkStruct_ov5_021DD9C8 * param0); @@ -46,7 +46,7 @@ static void ov5_021DD894(UnkStruct_ov5_021DD9C8 * param0, UnkStruct_02018340 * p static void ov5_021DD8A4(UnkStruct_0201CD38 * param0, void * param1); static void ov5_021DD7A0(UnkStruct_ov5_021DD9C8 * param0, const int param1); static void ov5_021DD980(UnkStruct_ov5_021DD9C8 * param0); -static void ov5_021DD954(UnkStruct_ov5_021DD9C8 * param0, const UnkStruct_02023790 * param1); +static void ov5_021DD954(UnkStruct_ov5_021DD9C8 * param0, const Strbuf *param1); static void ov5_021DD6FC (void * param0, u16 param1, u16 param2) { @@ -210,7 +210,7 @@ static void ov5_021DD8A4 (UnkStruct_0201CD38 * param0, void * param1) } } -static void ov5_021DD954 (UnkStruct_ov5_021DD9C8 * param0, const UnkStruct_02023790 * param1) +static void ov5_021DD954 (UnkStruct_ov5_021DD9C8 * param0, const Strbuf *param1) { u32 v0; diff --git a/src/overlay005/ov5_021E1D20.c b/src/overlay005/ov5_021E1D20.c index 0127cc9430..c837b1c8e2 100644 --- a/src/overlay005/ov5_021E1D20.c +++ b/src/overlay005/ov5_021E1D20.c @@ -139,7 +139,7 @@ static int ov5_021E1E10 (const UnkStruct_ov5_021E1D20 * param0) static void ov5_021E1E20 (const UnkStruct_ov5_021E1FF4 * param0) { - UnkStruct_02023790 * v0; + Strbuf* v0; int v1, v2; int v3; int v4; diff --git a/src/overlay005/ov5_021E2338.c b/src/overlay005/ov5_021E2338.c index 27c595cfea..c24bee15da 100644 --- a/src/overlay005/ov5_021E2338.c +++ b/src/overlay005/ov5_021E2338.c @@ -2618,12 +2618,12 @@ static BOOL ov5_021E51B4 (UnkStruct_ov5_021E5128 * param0) return v2; } -static UnkStruct_02023790 * ov5_021E5240 (u32 param0, u32 param1) +static Strbuf* ov5_021E5240 (u32 param0, u32 param1) { UnkStruct_0200B358 * v0; UnkStruct_0200B144 * v1; - UnkStruct_02023790 * v2; - UnkStruct_02023790 * v3; + Strbuf* v2; + Strbuf* v3; v1 = sub_0200B144(1, 26, 359, param1); v0 = sub_0200B358(param1); @@ -2648,7 +2648,7 @@ static BOOL ov5_021E52A8 (UnkStruct_ov5_021DDC28 * param0, u32 param1, const Unk VecFx32 v4; int v5; int v6; - UnkStruct_02023790 * v7; + Strbuf* v7; switch (param0->unk_00) { case 0: @@ -3107,7 +3107,7 @@ static BOOL ov5_021E5890 (UnkStruct_ov5_021DDC28 * param0, u32 param1, const Unk sub_02021CAC(v0->unk_2CC[3], 1); { - UnkStruct_02023790 * v9; + Strbuf* v9; sub_02007130(param0->unk_20, 11, 0, 2 * 0x20, 0x20, param1); diff --git a/src/overlay005/ov5_021E622C.c b/src/overlay005/ov5_021E622C.c index 93f3e4a441..e2ab144ffe 100644 --- a/src/overlay005/ov5_021E622C.c +++ b/src/overlay005/ov5_021E622C.c @@ -2185,7 +2185,7 @@ int ov5_021E6590 (UnkStruct_02026218 * param0) u8 ov5_021E65B0 (UnkStruct_02026218 * param0, UnkStruct_0200B358 * param1) { int v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u16 v2[10 + 1]; BoxPokemon * v3 = sub_02026220(param0); @@ -2603,7 +2603,7 @@ void ov5_021E6CF0 (Pokemon * param0, u16 param1, u8 param2, UnkStruct_02025E6C * u8 v0, v1, v2; u16 v3; u8 v4 = sub_020759F0(param1, 19); - UnkStruct_02023790 * v5; + Strbuf* v5; sub_02073D80(param0, param1, 1, 32, 0, 0, 0, 0); @@ -2628,7 +2628,7 @@ void ov5_021E6CF0 (Pokemon * param0, u16 param1, u8 param2, UnkStruct_02025E6C * if (param4 == 4) { u32 v6 = sub_02025F20(param3); u32 v7 = sub_02025F30(param3); - UnkStruct_02023790 * v8 = sub_02025F04(param3, 32); + Strbuf* v8 = sub_02025F04(param3, 32); sub_02074B30(param0, 145, v8); sub_02074B30(param0, 7, &v6); @@ -2644,7 +2644,7 @@ void ov5_021E6DE8 (Pokemon * param0, u16 param1, UnkStruct_02026310 * param2, u3 u8 v0; u16 v1; u32 v2; - UnkStruct_02023790 * v3; + Strbuf* v3; u8 v4 = sub_020759F0(param1, 19); v2 = sub_02026248(param2); @@ -3035,7 +3035,7 @@ static void ov5_021E742C (Pokemon * param0, int param1) u32 v3, v4; u8 v5[6], v6; u8 v7, v8, v9, v10, v11, v12, v13, v14; - UnkStruct_02023790 * v15 = sub_02023790(7 + 1, param1); + Strbuf* v15 = sub_02023790(7 + 1, param1); Pokemon * v16 = AllocMonZeroed(param1); v0 = GetMonData(param0, MON_DATA_SPECIES, NULL); diff --git a/src/overlay005/ov5_021EA874.c b/src/overlay005/ov5_021EA874.c index 158bbcf3da..07d59b7331 100644 --- a/src/overlay005/ov5_021EA874.c +++ b/src/overlay005/ov5_021EA874.c @@ -46,8 +46,8 @@ typedef struct { UnkStruct_02013A04 * unk_00; UnkStruct_0200112C * unk_04; - UnkStruct_02023790 * unk_08; - UnkStruct_02023790 * unk_0C; + Strbuf* unk_08; + Strbuf* unk_0C; UnkStruct_0205AA50 unk_10; UnkStruct_0205AA50 unk_20; UnkStruct_0203CDB0 * unk_30; @@ -150,7 +150,7 @@ static BOOL ov5_021EA9BC (UnkStruct_ov5_021EAE78 * param0) static BOOL ov5_021EA9F8 (UnkStruct_ov5_021EAE78 * param0) { DWCFriendData * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; int v2; int v3 = sub_02002114(param0->unk_44, 4); @@ -191,7 +191,7 @@ static BOOL ov5_021EAAA8 (UnkStruct_ov5_021EAE78 * param0) { UnkStruct_02025E6C * v0; DWCFriendData * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; int v3; int v4 = sub_02002114(param0->unk_44, 4); @@ -223,7 +223,7 @@ static BOOL ov5_021EAB28 (UnkStruct_ov5_021EAE78 * param0) { UnkStruct_02025E6C * v0; DWCFriendData * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; int v3; int v4 = sub_02002114(param0->unk_44, 4); @@ -361,7 +361,7 @@ static BOOL ov5_021EAD38 (UnkStruct_ov5_021EAE78 * param0) UnkStruct_0202B370 * v0 = sub_0202B370(param0->unk_34); UnkStruct_02025E6C * v1; DWCFriendData * v2; - UnkStruct_02023790 * v3; + Strbuf* v3; int v4 = sub_02002114(param0->unk_44, 4); if (v4 == 0xffffffff) { diff --git a/src/overlay005/ov5_021F08CC.c b/src/overlay005/ov5_021F08CC.c index e5505a9eb8..a77ca5e2ca 100644 --- a/src/overlay005/ov5_021F08CC.c +++ b/src/overlay005/ov5_021F08CC.c @@ -66,8 +66,8 @@ typedef struct { UnkStruct_0203CDB0 * unk_20; UnkStruct_ov101_021D5D90 * unk_24; u8 unk_28; - UnkStruct_02023790 * unk_2C; - UnkStruct_02023790 * unk_30; + Strbuf* unk_2C; + Strbuf* unk_30; UnkStruct_0200B358 * unk_34; UnkStruct_0205AA50 unk_38; UnkStruct_0200B144 * unk_48; diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index 4a1e4bdb4b..432ea0e3dd 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -73,7 +73,7 @@ struct UnkStruct_ov5_021F6704_t { UnkStruct_0201CD38 * unk_04; UnkStruct_0205AA50 unk_08; UnkStruct_0205AA50 * unk_18; - UnkStruct_02023790 * unk_1C[120]; + Strbuf* unk_1C[120]; UnkStruct_0200B144 * unk_1FC; UnkStruct_0200B358 * unk_200; u8 unk_204; @@ -303,7 +303,7 @@ static void ov5_021F6830 (UnkStruct_ov5_021F6704 * param0, u32 param1, u32 param void * v1; { - UnkStruct_02023790 * v2 = sub_02023790((40 * 2), 4); + Strbuf* v2 = sub_02023790((40 * 2), 4); sub_0200B1B8(param0->unk_1FC, param1, v2); sub_0200C388(param0->unk_200, param0->unk_1C[param0->unk_20B], v2); diff --git a/src/overlay005/ov5_021F77A8.c b/src/overlay005/ov5_021F77A8.c index 2df34d14d5..83f9f4d8d5 100644 --- a/src/overlay005/ov5_021F77A8.c +++ b/src/overlay005/ov5_021F77A8.c @@ -567,7 +567,7 @@ struct UnkStruct_ov5_021F7ED8_t { UnkStruct_0201CD38 * unk_04; UnkStruct_0205AA50 unk_08; UnkStruct_0205AA50 * unk_18; - UnkStruct_02023790 * unk_1C[39]; + Strbuf* unk_1C[39]; UnkStruct_0200B144 * unk_B8; UnkStruct_0200B358 * unk_BC; u8 unk_C0; @@ -1082,7 +1082,7 @@ static void ov5_021F7FF8 (UnkStruct_ov5_021F7ED8 * param0, u32 param1, u32 param void * v1; { - UnkStruct_02023790 * v2 = sub_02023790((40 * 2), 4); + Strbuf* v2 = sub_02023790((40 * 2), 4); sub_0200B1B8(param0->unk_B8, param1, v2); sub_0200C388(param0->unk_BC, param0->unk_1C[param0->unk_C7], v2); diff --git a/src/overlay006/ov6_02246184.c b/src/overlay006/ov6_02246184.c index 047bf49447..db6c910e2c 100644 --- a/src/overlay006/ov6_02246184.c +++ b/src/overlay006/ov6_02246184.c @@ -56,13 +56,13 @@ typedef struct UnkStruct_ov6_02246204_t { u32 unk_10; }; -static UnkStruct_02023790 * ov6_022462E4(u32 param0, u32 param1); +static Strbuf* ov6_022462E4(u32 param0, u32 param1); static void ov6_0224630C(Pokemon * param0, UnkStruct_ov6_0224630C * param1, u32 param2, u32 param3, u32 param4, u32 param5); UnkStruct_ov6_02246204 * ov6_02246184 (u32 param0, u32 param1) { UnkStruct_ov6_02246204 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u16 v2[128]; GF_ASSERT(param1 < 4); @@ -117,7 +117,7 @@ void ov6_02246254 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02246204 * param1, { Party * v0 = Party_GetFromSavedata(param0->unk_0C); Pokemon * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; u32 v3; int v4; @@ -146,9 +146,9 @@ void ov6_02246254 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02246204 * param1, } } -static UnkStruct_02023790 * ov6_022462E4 (u32 param0, u32 param1) +static Strbuf* ov6_022462E4 (u32 param0, u32 param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0200B144 * v1 = sub_0200B144(0, 26, 370, param0); v0 = sub_0200B1EC(v1, param1); @@ -158,7 +158,7 @@ static UnkStruct_02023790 * ov6_022462E4 (u32 param0, u32 param1) static void ov6_0224630C (Pokemon * param0, UnkStruct_ov6_0224630C * param1, u32 param2, u32 param3, u32 param4, u32 param5) { - UnkStruct_02023790 * v0; + Strbuf* v0; u8 v1; u32 v2; diff --git a/src/overlay006/ov6_02247A0C.c b/src/overlay006/ov6_02247A0C.c index 47be470c52..f347c6c8de 100644 --- a/src/overlay006/ov6_02247A0C.c +++ b/src/overlay006/ov6_02247A0C.c @@ -44,7 +44,7 @@ typedef struct { int unk_04; } UnkStruct_ov6_02247A0C; -static int ov6_02247CF4(const UnkStruct_02023790 * param0, int param1, int param2, int param3); +static int ov6_02247CF4(const Strbuf *param0, int param1, int param2, int param3); static BOOL ov6_02247A34(UnkStruct_020508D4 * param0); static const UnkStruct_ov6_022496F4 Unk_ov6_022496F4[] = { @@ -133,7 +133,7 @@ void * ov6_02247A90 (void * param0) { UnkStruct_ov6_02247A90 * v0; UnkStruct_02018340 * v1; - UnkStruct_02023790 * v2, * v3; + Strbuf* v2, * v3; int v4, v5, v6, v7; UnkStruct_021C0794 * v8; @@ -212,7 +212,7 @@ void ov6_02247CC8 (void * param0) Heap_FreeToHeap(v0); } -static int ov6_02247CF4 (const UnkStruct_02023790 * param0, int param1, int param2, int param3) +static int ov6_02247CF4 (const Strbuf *param0, int param1, int param2, int param3) { int v0, v1; diff --git a/src/overlay006/ov6_022489E4.c b/src/overlay006/ov6_022489E4.c index 82e2fd5802..d61dcbbb82 100644 --- a/src/overlay006/ov6_022489E4.c +++ b/src/overlay006/ov6_022489E4.c @@ -260,7 +260,7 @@ void ov6_02248CBC (int param0, int param1, void * param2, void * param3) v0->unk_568++; } -BOOL ov6_02248CE8 (UnkStruct_02095C48 * param0, int param1, const UnkStruct_02023790 * param2) +BOOL ov6_02248CE8 (UnkStruct_02095C48 * param0, int param1, const Strbuf *param2) { int v0, v1; u8 * v2; diff --git a/src/overlay007/ov7_02249960.c b/src/overlay007/ov7_02249960.c index 026876db8d..6ac6c0f102 100644 --- a/src/overlay007/ov7_02249960.c +++ b/src/overlay007/ov7_02249960.c @@ -48,7 +48,7 @@ typedef void (* UnkFuncPtr_ov7_02249C2C)(UnkStruct_0201CD38 *, void *); typedef void (* UnkFuncPtr_ov7_02249C2C_1)(UnkStruct_ov7_02249C2C *); typedef struct UnkStruct_ov7_02249C2C_t { - UnkStruct_02023790 * unk_00[8]; + Strbuf* unk_00[8]; UnkStruct_0205AA50 unk_20; UnkStruct_0205AA50 unk_30; UnkStruct_0205AA50 unk_40; diff --git a/src/overlay007/ov7_0224B4E8.c b/src/overlay007/ov7_0224B4E8.c index 594c96bbac..3bbca9a551 100644 --- a/src/overlay007/ov7_0224B4E8.c +++ b/src/overlay007/ov7_0224B4E8.c @@ -44,10 +44,10 @@ typedef struct { UnkStruct_02013A04 * unk_08; UnkStruct_02013A04 * unk_0C; UnkStruct_0203CDB0 * unk_10; - UnkStruct_02023790 * unk_14; - UnkStruct_02023790 * unk_18; - UnkStruct_02023790 * unk_1C; - UnkStruct_02023790 * unk_20; + Strbuf* unk_14; + Strbuf* unk_18; + Strbuf* unk_1C; + Strbuf* unk_20; UnkStruct_0205AA50 unk_24; UnkStruct_0205AA50 unk_34; UnkStruct_0205AA50 unk_44; @@ -324,8 +324,8 @@ static void ov7_0224B8DC (UnkStruct_ov7_0224B4E8 * param0) { UnkStruct_0200B144 * v0; UnkStruct_0200B358 * v1 = param0->unk_64; - UnkStruct_02023790 * v2; - UnkStruct_02023790 * v3; + Strbuf* v2; + Strbuf* v3; UnkStruct_0205AA50 * v4; int v5, v6, v7, v8; const int v9 = 16; diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c index 2aefa70cbc..e1a4016f16 100644 --- a/src/overlay007/ov7_0224BE9C.c +++ b/src/overlay007/ov7_0224BE9C.c @@ -89,15 +89,15 @@ typedef struct { UnkStruct_0205AA50 * unk_04; u32 unk_08; u32 unk_0C; - UnkStruct_02023790 * unk_10; + Strbuf* unk_10; } UnkStruct_ov7_0224C3EC; typedef struct { u32 unk_00; UnkStruct_0205AA50 * unk_04; UnkStruct_0200B358 * unk_08; - UnkStruct_02023790 * unk_0C; - UnkStruct_02023790 * unk_10[3]; + Strbuf* unk_0C; + Strbuf* unk_10[3]; } UnkStruct_ov7_0224C620; typedef struct { @@ -105,10 +105,10 @@ typedef struct { UnkStruct_0205AA50 * unk_04; UnkStruct_0200112C * unk_08; UnkStruct_02013A04 unk_0C[23]; - UnkStruct_02023790 * unk_C4[23]; + Strbuf* unk_C4[23]; s32 unk_120; UnkStruct_0200B358 * unk_124; - UnkStruct_02023790 * unk_128; + Strbuf* unk_128; u16 unk_12C; u16 unk_12E; void * unk_130; @@ -161,7 +161,7 @@ static void ov7_0224C3E0(UnkStruct_ov7_0224BEFC * param0); static void ov7_0224C338(UnkStruct_ov7_0224BEFC * param0); static void ov7_0224C3EC(UnkStruct_ov7_0224C3EC * param0, UnkStruct_02018340 * param1, u32 param2, u32 param3); static void ov7_0224C444(UnkStruct_ov7_0224C3EC * param0); -static void ov7_0224C468(UnkStruct_ov7_0224C3EC * param0, UnkStruct_02023790 * param1, u32 param2); +static void ov7_0224C468(UnkStruct_ov7_0224C3EC * param0, Strbuf *param1, u32 param2); static BOOL ov7_0224C4B8(UnkStruct_ov7_0224C3EC * param0); static void ov7_0224C4E0(UnkStruct_ov7_0224C3EC * param0, UnkStruct_0200B144 * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4); static void ov7_0224C580(UnkStruct_ov7_0224C3EC * param0, UnkStruct_0200B144 * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4); @@ -219,7 +219,7 @@ void ov7_0224BEFC (UnkStruct_ov7_0224BEFC * param0) BOOL ov7_0224BF2C (UnkStruct_ov7_0224BEFC * param0) { - UnkStruct_02023790 * v0; + Strbuf* v0; BOOL v1; switch (param0->unk_00) { @@ -432,7 +432,7 @@ static void ov7_0224C444 (UnkStruct_ov7_0224C3EC * param0) param0->unk_00 = 0; } -static void ov7_0224C468 (UnkStruct_ov7_0224C3EC * param0, UnkStruct_02023790 * param1, u32 param2) +static void ov7_0224C468 (UnkStruct_ov7_0224C3EC * param0, Strbuf *param1, u32 param2) { GF_ASSERT(param0->unk_10 == NULL); @@ -460,8 +460,8 @@ static BOOL ov7_0224C4B8 (UnkStruct_ov7_0224C3EC * param0) static void ov7_0224C4E0 (UnkStruct_ov7_0224C3EC * param0, UnkStruct_0200B144 * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4) { - UnkStruct_02023790 * v0; - UnkStruct_02023790 * v1; + Strbuf* v0; + Strbuf* v1; UnkStruct_0200B358 * v2; v2 = sub_0200B358(param2); @@ -487,8 +487,8 @@ static void ov7_0224C4E0 (UnkStruct_ov7_0224C3EC * param0, UnkStruct_0200B144 * static void ov7_0224C580 (UnkStruct_ov7_0224C3EC * param0, UnkStruct_0200B144 * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4) { - UnkStruct_02023790 * v0; - UnkStruct_02023790 * v1; + Strbuf* v0; + Strbuf* v1; UnkStruct_0200B358 * v2; v2 = sub_0200B358(param2); @@ -574,7 +574,7 @@ static void ov7_0224C6DC (UnkStruct_ov7_0224C620 * param0, u32 param1, u32 param static void ov7_0224C768 (UnkStruct_ov7_0224C768 * param0, UnkStruct_02018340 * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4, UnkStruct_0200B144 * param5, void * param6, UnkFuncPtr_ov7_0224C768 param7, UnkStruct_020218BC * param8) { int v0; - UnkStruct_02023790 * v1; + Strbuf* v1; UnkStruct_ov19_021DA864 v2; UnkStruct_ov83_0223D9A8 v3; static const u8 v4[2] = { diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c index 73ae4b875e..af343afc1b 100644 --- a/src/overlay007/ov7_0224CD28.c +++ b/src/overlay007/ov7_0224CD28.c @@ -595,7 +595,7 @@ static u32 ov7_0224D698 (UnkStruct_ov7_0224D008 * param0, u16 param1) static void ov7_0224D6BC (UnkStruct_ov7_0224D008 * param0) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; UnkStruct_ov84_02240FA8 v2; u32 v3; u32 v4; @@ -668,7 +668,7 @@ static void ov7_0224D85C (UnkStruct_0200112C * param0, u32 param1, u8 param2) sub_0201ADA4(&v0->unk_08[1], 0); if (param1 != 0xfffffffe) { - UnkStruct_02023790 * v1; + Strbuf* v1; if (v0->unk_2A9 == 0) { v1 = sub_02023790(130, 11); @@ -727,8 +727,8 @@ static void ov7_0224D9B8 (UnkStruct_0200112C * param0, u32 param1, u8 param2) UnkStruct_ov7_0224D008 * v0 = (UnkStruct_ov7_0224D008 *)sub_02001504(param0, 19); if (param1 != 0xfffffffe) { - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; u32 v3; u32 v4; u16 v5 = (u16)param1; @@ -759,7 +759,7 @@ static void ov7_0224D9B8 (UnkStruct_0200112C * param0, u32 param1, u8 param2) } if (param1 == 0xfffffffe) { - UnkStruct_02023790 * v6 = sub_0200B1EC(v0->unk_88, 8); + Strbuf* v6 = sub_0200B1EC(v0->unk_88, 8); sub_0201AE78(&v0->unk_08[0], 15, 0, param2, 19 * 8, 16); sub_0201D78C(&v0->unk_08[0], 0, v6, 0, param2, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -769,8 +769,8 @@ static void ov7_0224D9B8 (UnkStruct_0200112C * param0, u32 param1, u8 param2) static void ov7_0224DAF8 (UnkStruct_ov7_0224D008 * param0, u8 param1) { - UnkStruct_02023790 * v0; - UnkStruct_02023790 * v1; + Strbuf* v0; + Strbuf* v1; u32 v2; u32 v3; @@ -850,7 +850,7 @@ static u8 ov7_0224DC84 (UnkStruct_ov7_0224D008 * param0) default: { - UnkStruct_02023790 * v3; + Strbuf* v3; u32 v4; param0->unk_26C[0] = (u16)sub_02021D34(param0->unk_25C[0]); @@ -937,8 +937,8 @@ static u8 ov7_0224DE94 (UnkStruct_ov7_0224D008 * param0) static void ov7_0224DED4 (UnkStruct_ov7_0224D008 * param0) { - UnkStruct_02023790 * v0; - UnkStruct_02023790 * v1; + Strbuf* v0; + Strbuf* v1; u16 v2; if (param0->unk_2A9 == 0) { @@ -1007,7 +1007,7 @@ static u8 ov7_0224DFB0 (UnkStruct_ov7_0224D008 * param0) static u8 ov7_0224E098 (UnkStruct_ov7_0224D008 * param0) { - UnkStruct_02023790 * v0; + Strbuf* v0; BOOL v1; if (param0->unk_2A9 == 0) { @@ -1076,8 +1076,8 @@ static u8 ov7_0224E098 (UnkStruct_ov7_0224D008 * param0) static void ov7_0224E28C (UnkStruct_ov7_0224D008 * param0, u8 param1) { - UnkStruct_02023790 * v0; - UnkStruct_02023790 * v1; + Strbuf* v0; + Strbuf* v1; u32 v2; sub_0201ADA4(¶m0->unk_08[3], 15); @@ -1126,7 +1126,7 @@ static u8 ov7_0224E3D8 (UnkStruct_ov7_0224D008 * param0) switch (sub_02002114(param0->unk_80, 11)) { case 0: { - UnkStruct_02023790 * v0; + Strbuf* v0; if (param0->unk_2A9 == 0) { v0 = sub_0200B1EC(param0->unk_88, 6); @@ -1233,7 +1233,7 @@ static u8 ov7_0224E6B8 (UnkStruct_ov7_0224D008 * param0) if (((param0->unk_2A9 == 0) || (param0->unk_2A9 == 3)) && (param0->unk_2AA == 4) && (param0->unk_2AC >= 10)) { if (sub_0207D570(param0->unk_274, 12, 1, 11) == 1) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_88, 10); + Strbuf* v0 = sub_0200B1EC(param0->unk_88, 10); sub_0200C388(param0->unk_8C, param0->unk_298, v0); sub_020237BC(v0); @@ -1409,7 +1409,7 @@ static u8 ov7_0224E950 (UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * pa sub_0205D944(¶m1->unk_08[1], param1->unk_278); { - UnkStruct_02023790 * v1 = sub_0200B1EC(param1->unk_88, 2); + Strbuf* v1 = sub_0200B1EC(param1->unk_88, 2); sub_0200C388(param1->unk_8C, param1->unk_298, v1); sub_020237BC(v1); @@ -1434,7 +1434,7 @@ static u8 ov7_0224EA2C (UnkStruct_ov7_0224D008 * param0) static void ov7_0224EA54 (UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; if (param1->unk_2A9 == 3) { v0 = sub_0200B1EC(param1->unk_88, 31); @@ -1572,7 +1572,7 @@ static u8 ov7_0224EC9C (UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * pa sub_0205D944(¶m1->unk_08[1], param1->unk_278); { - UnkStruct_02023790 * v0 = sub_0200B1EC(param1->unk_88, 2); + Strbuf* v0 = sub_0200B1EC(param1->unk_88, 2); sub_0200C388(param1->unk_8C, param1->unk_298, v0); sub_020237BC(v0); diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c index 9a8a9132a1..38c3d8ce12 100644 --- a/src/overlay008/ov8_02249960.c +++ b/src/overlay008/ov8_02249960.c @@ -187,7 +187,7 @@ typedef struct { u32 unk_40; UnkStruct_0205AA50 * unk_44; UnkStruct_0200B144 * unk_48; - UnkStruct_02023790 * unk_4C; + Strbuf* unk_4C; } UnkStruct_ov8_0224B67C; typedef struct { @@ -2969,7 +2969,7 @@ static BOOL ov8_0224B3D4 (UnkStruct_020508D4 * param0) return 0; } -BOOL ov8_0224B67C (UnkStruct_0203CDB0 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0200B144 * param2, UnkStruct_02023790 * param3) +BOOL ov8_0224B67C (UnkStruct_0203CDB0 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0200B144 * param2, Strbuf *param3) { UnkStruct_02027860 * v0; UnkStruct_02071BD0 * v1; diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index 2ca9b05f8b..f0c268b4e6 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -145,7 +145,7 @@ typedef struct UnkStruct_ov10_0221FB28_t { GXBG0As unk_B9C; UnkStruct_0200B144 * unk_BA0; UnkStruct_0200B358 * unk_BA4; - UnkStruct_02023790 * unk_BA8; + Strbuf* unk_BA8; int unk_BAC; int unk_BB0; UnkStruct_02001AF4 * unk_BB4; @@ -1573,7 +1573,7 @@ static void ov10_022212AC (UnkStruct_ov10_0221FB28 * param0) } } -static void ov10_0222130C (UnkStruct_ov10_0221FB28 * param0, u32 param1, UnkStruct_02023790 * param2) +static void ov10_0222130C (UnkStruct_ov10_0221FB28 * param0, u32 param1, Strbuf *param2) { UnkStruct_0205AA50 * v0; UnkStruct_020127E8 v1; @@ -2257,11 +2257,11 @@ static void ov10_022223E8 (UnkStruct_ov10_0221FB28 * param0) } } -static void ov10_02222400 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200C440 * param2, UnkStruct_0200B358 * param3, UnkStruct_02023790 * param4, u32 param5) +static void ov10_02222400 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200C440 * param2, UnkStruct_0200B358 * param3, Strbuf *param4, u32 param5) { Pokemon * v0; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; v1 = ¶m0->unk_10[param5 * 4 + 0]; @@ -2289,20 +2289,20 @@ static void ov10_02222400 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_0200B144 } } -static void ov10_022224F0 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200C440 * param2, UnkStruct_0200B358 * param3, UnkStruct_02023790 * param4, u32 param5) +static void ov10_022224F0 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200C440 * param2, UnkStruct_0200B358 * param3, Strbuf *param4, u32 param5) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = ¶m0->unk_10[param5 * 4 + 1]; sub_0200C648(param2, 1, param0->unk_214[param5].unk_0C, 3, 0, v0, 0, 5 - 3); } -static void ov10_02222528 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200C440 * param2, UnkStruct_0200B358 * param3, UnkStruct_02023790 * param4, u32 param5) +static void ov10_02222528 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200C440 * param2, UnkStruct_0200B358 * param3, Strbuf *param4, u32 param5) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; int v3, v4; @@ -2348,11 +2348,11 @@ static void ov10_02222594 (UnkStruct_ov10_0221FB28 * param0, u32 param1) sub_0201AE78(v0, 10, 0, 5, v1, 1); } -static void ov10_02222684 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200C440 * param2, UnkStruct_0200B358 * param3, UnkStruct_02023790 * param4, u32 param5) +static void ov10_02222684 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200C440 * param2, UnkStruct_0200B358 * param3, Strbuf *param4, u32 param5) { Pokemon * v0; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; u32 v3; v1 = ¶m0->unk_10[param5 * 4]; @@ -2378,7 +2378,7 @@ static void ov10_02222720 (UnkStruct_ov10_0221FB28 * param0) UnkStruct_0200B144 * v0; UnkStruct_0200C440 * v1; UnkStruct_0200B358 * v2; - UnkStruct_02023790 * v3; + Strbuf* v3; u32 v4; v0 = sub_0200B144(0, 26, 453, param0->unk_00->unk_24); diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c index fb303c27b2..d89a3b9b6d 100644 --- a/src/overlay013/ov13_0221FC20.c +++ b/src/overlay013/ov13_0221FC20.c @@ -1602,7 +1602,7 @@ static void ov13_02221738 (UnkStruct_ov13_022213F0 * param0, u8 param1) static u8 ov13_022217A4 (UnkStruct_ov13_022213F0 * param0) { UnkStruct_ov13_02221ED0 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = ¶m0->unk_04[param0->unk_00->unk_11]; diff --git a/src/overlay013/ov13_02221A88.c b/src/overlay013/ov13_02221A88.c index 01781da548..c4e4ed10be 100644 --- a/src/overlay013/ov13_02221A88.c +++ b/src/overlay013/ov13_02221A88.c @@ -312,8 +312,8 @@ static void ov13_02221C54 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par { UnkStruct_0205AA50 * v0; UnkStruct_ov13_02221ED0 * v1; - UnkStruct_02023790 * v2; - UnkStruct_02023790 * v3; + Strbuf* v2; + Strbuf* v3; u32 v4; v0 = ¶m0->unk_206C[param1]; @@ -415,8 +415,8 @@ static void ov13_02221ED0 (UnkStruct_ov13_022213F0 * param0, u32 param1, u16 par static void ov13_02221FA8 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 param2) { UnkStruct_ov13_02221ED0 * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; v0 = ¶m0->unk_04[param2]; v1 = sub_02023790(16, param0->unk_00->unk_0C); @@ -433,8 +433,8 @@ static void ov13_02221FA8 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par static void ov13_02222030 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 param2) { UnkStruct_ov13_02221ED0 * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; v0 = ¶m0->unk_04[param2]; @@ -457,8 +457,8 @@ static void ov13_02222030 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par static void ov13_022220CC (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 param2, u32 param3, u16 param4, u16 param5, u32 param6) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; u32 v3; v0 = ¶m0->unk_206C[param2]; @@ -482,7 +482,7 @@ static void ov13_022220CC (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par static void ov13_02222170 (UnkStruct_ov13_022213F0 * param0, u16 param1, u8 param2, u8 param3) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_0200B1EC(param0->unk_1FA4, 14); @@ -493,7 +493,7 @@ static void ov13_02222170 (UnkStruct_ov13_022213F0 * param0, u16 param1, u8 para static void ov13_022221C8 (UnkStruct_ov13_022213F0 * param0, u32 param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; sub_0200E060(¶m0->unk_204C[0], 1, 1, 14); sub_0201ADA4(¶m0->unk_204C[0], 15); @@ -508,7 +508,7 @@ static void ov13_022221C8 (UnkStruct_ov13_022213F0 * param0, u32 param1) static void ov13_0222222C (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 param2) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; v0 = ¶m0->unk_206C[param1]; @@ -523,8 +523,8 @@ static void ov13_0222222C (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par static void ov13_02222290 (UnkStruct_ov13_022213F0 * param0, u32 param1) { UnkStruct_ov13_02221ED0 * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; u16 v3; u16 v4; @@ -576,8 +576,8 @@ static void ov13_02222290 (UnkStruct_ov13_022213F0 * param0, u32 param1) static void ov13_02222464 (UnkStruct_ov13_022213F0 * param0, u32 param1) { UnkStruct_ov13_02221ED0 * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; u16 v3; u8 v4; u8 v5; @@ -608,8 +608,8 @@ static void ov13_02222464 (UnkStruct_ov13_022213F0 * param0, u32 param1) static void ov13_02222560 (UnkStruct_ov13_022213F0 * param0, u32 param1) { UnkStruct_ov13_02221ED0 * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; u16 v3; u8 v4; u8 v5; @@ -640,8 +640,8 @@ static void ov13_02222560 (UnkStruct_ov13_022213F0 * param0, u32 param1) static void ov13_0222265C (UnkStruct_ov13_022213F0 * param0, u32 param1) { UnkStruct_ov13_02221ED0 * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; u16 v3; u8 v4; u8 v5; @@ -673,8 +673,8 @@ static void ov13_0222265C (UnkStruct_ov13_022213F0 * param0, u32 param1) static void ov13_0222275C (UnkStruct_ov13_022213F0 * param0, u32 param1) { UnkStruct_ov13_02221ED0 * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; u16 v3; u8 v4; u8 v5; @@ -705,8 +705,8 @@ static void ov13_0222275C (UnkStruct_ov13_022213F0 * param0, u32 param1) static void ov13_0222285C (UnkStruct_ov13_022213F0 * param0, u32 param1) { UnkStruct_ov13_02221ED0 * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; u16 v3; u8 v4; u8 v5; @@ -737,8 +737,8 @@ static void ov13_0222285C (UnkStruct_ov13_022213F0 * param0, u32 param1) static void ov13_0222295C (UnkStruct_ov13_022213F0 * param0, u32 param1) { UnkStruct_ov13_02221ED0 * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; u32 v3, v4; u16 v5; u16 v6; @@ -785,7 +785,7 @@ static void ov13_02222AF4 (UnkStruct_ov13_022213F0 * param0, u32 param1) { UnkStruct_ov13_02221ED0 * v0; UnkStruct_0200B144 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; u32 v3; v0 = ¶m0->unk_04[param1]; @@ -802,7 +802,7 @@ static void ov13_02222AF4 (UnkStruct_ov13_022213F0 * param0, u32 param1) static void ov13_02222B6C (UnkStruct_ov13_022213F0 * param0, u32 param1) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = ¶m0->unk_206C[param1]; v1 = sub_0200B1EC(param0->unk_1FA4, 51); @@ -815,8 +815,8 @@ static void ov13_02222B6C (UnkStruct_ov13_022213F0 * param0, u32 param1) static void ov13_02222BB4 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 param2) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; u16 v3; u16 v4; @@ -850,7 +850,7 @@ static void ov13_02222BB4 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par static void ov13_02222C9C (UnkStruct_ov13_022213F0 * param0, u32 param1) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = ¶m0->unk_206C[param1]; v1 = sub_0200B1EC(param0->unk_1FA4, 48); @@ -863,8 +863,8 @@ static void ov13_02222C9C (UnkStruct_ov13_022213F0 * param0, u32 param1) static void ov13_02222CE4 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 param2) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; u16 v3; u16 v4; @@ -899,7 +899,7 @@ static void ov13_02222DCC (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par { UnkStruct_0200B144 * v0; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; v1 = ¶m0->unk_206C[param1]; v0 = sub_0200B144(1, 26, 646, param0->unk_00->unk_0C); @@ -915,7 +915,7 @@ static void ov13_02222E2C (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par { UnkStruct_0200B144 * v0; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; u32 v3; u32 v4; @@ -935,7 +935,7 @@ static void ov13_02222E2C (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par static void ov13_02222E94 (UnkStruct_ov13_022213F0 * param0, u32 param1) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u16 v2; u16 v3; @@ -952,7 +952,7 @@ static void ov13_02222E94 (UnkStruct_ov13_022213F0 * param0, u32 param1) static void ov13_02222EF8 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 param2) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = ¶m0->unk_206C[param1]; @@ -979,8 +979,8 @@ static void ov13_02222EF8 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par static void ov13_02222F74 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 param2, u32 param3) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; u32 v3, v4; u32 v5; @@ -1018,7 +1018,7 @@ static void ov13_02222F74 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par static void ov13_022230A8 (UnkStruct_ov13_022213F0 * param0, u32 param1) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; v0 = ¶m0->unk_206C[param1]; @@ -1039,7 +1039,7 @@ static void ov13_022230A8 (UnkStruct_ov13_022213F0 * param0, u32 param1) void ov13_02223118 (UnkStruct_ov13_022213F0 * param0) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; if (param0->unk_2076 == 7) { v0 = ¶m0->unk_206C[8]; @@ -1059,8 +1059,8 @@ void ov13_02223118 (UnkStruct_ov13_022213F0 * param0) static void ov13_0222317C (UnkStruct_ov13_022213F0 * param0, UnkStruct_ov13_022236B8 * param1, u32 param2) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; u32 v3; v0 = ¶m0->unk_206C[param2]; @@ -1099,8 +1099,8 @@ static void ov13_0222317C (UnkStruct_ov13_022213F0 * param0, UnkStruct_ov13_0222 static void ov13_022232C8 (UnkStruct_ov13_022213F0 * param0, UnkStruct_ov13_022236B8 * param1, u32 param2) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; u32 v3; v0 = ¶m0->unk_206C[param2]; @@ -1195,8 +1195,8 @@ static void ov13_02223550 (UnkStruct_ov13_022213F0 * param0, u32 param1) { UnkStruct_0205AA50 * v0; UnkStruct_ov13_02221ED0 * v1; - UnkStruct_02023790 * v2; - UnkStruct_02023790 * v3; + Strbuf* v2; + Strbuf* v3; u8 v4; u8 v5; u8 v6; @@ -1511,7 +1511,7 @@ static void ov13_02223F7C (UnkStruct_ov13_022213F0 * param0) ov13_02222170(param0, 2, 0, 0); { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_0200B1EC(param0->unk_1FA4, 57); @@ -1559,7 +1559,7 @@ void ov13_02224144 (UnkStruct_ov13_022213F0 * param0) Pokemon * v0; UnkStruct_ov13_0221FC20 * v1; void * v2; - UnkStruct_02023790 * v3; + Strbuf* v3; u16 v4; u8 v5; u8 v6; @@ -1660,7 +1660,7 @@ void ov13_0222449C (UnkStruct_ov13_022213F0 * param0) { Pokemon * v0; UnkStruct_ov13_0221FC20 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; v1 = param0->unk_00; v0 = ov16_0223DFAC(v1->unk_08, v1->unk_28, v1->unk_2C[v1->unk_11]); diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c index e2cb74484c..16c18db876 100644 --- a/src/overlay013/ov13_022264F4.c +++ b/src/overlay013/ov13_022264F4.c @@ -410,7 +410,7 @@ static u8 ov13_02226A5C (UnkStruct_ov13_02227244 * param0) if ((v0->unk_18 != 0) && (v0->unk_1C != 55) && (v2 != 3)) { Pokemon * v3; - UnkStruct_02023790 * v4; + Strbuf* v4; v3 = ov16_0223DFAC(v0->unk_00, v0->unk_10, v1); v4 = sub_0200B1EC(param0->unk_10, 46); @@ -435,7 +435,7 @@ static u8 ov13_02226A5C (UnkStruct_ov13_02227244 * param0) return 13; } else { UnkStruct_0200B144 * v5; - UnkStruct_02023790 * v6; + Strbuf* v6; v5 = sub_0200B144(1, 26, 213, v0->unk_0C); v6 = sub_0200B1EC(v5, 36); diff --git a/src/overlay013/ov13_02227288.c b/src/overlay013/ov13_02227288.c index 775507f1d0..4e6c383f76 100644 --- a/src/overlay013/ov13_02227288.c +++ b/src/overlay013/ov13_02227288.c @@ -141,7 +141,7 @@ void ov13_02227350 (UnkStruct_ov13_02227244 * param0, u32 param1) static void ov13_02227374 (UnkStruct_ov13_02227244 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; u32 v3; @@ -171,7 +171,7 @@ static void ov13_022273CC (UnkStruct_ov13_02227244 * param0) ov13_02227374(param0, 3, 6, 2, 8, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0)))); if (param0->unk_00->unk_20 != 0) { - UnkStruct_02023790 * v1 = sub_0200B1EC(param0->unk_10, 8); + Strbuf* v1 = sub_0200B1EC(param0->unk_10, 8); sub_0201D78C(¶m0->unk_2C[4], 2, v1, 0, 6, 0xff, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))), NULL); sub_020237BC(v1); @@ -191,7 +191,7 @@ static const u32 Unk_ov13_02229AB0[][2] = { static void ov13_022274A8 (UnkStruct_ov13_02227244 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; u32 v3; @@ -217,7 +217,7 @@ static void ov13_022274A8 (UnkStruct_ov13_02227244 * param0, u32 param1, u32 par static void ov13_0222754C (UnkStruct_ov13_02227244 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0205AA50 * v1; v1 = ¶m0->unk_2C[param3]; @@ -269,7 +269,7 @@ void ov13_02227650 (UnkStruct_ov13_02227244 * param0) void ov13_02227698 (UnkStruct_ov13_02227244 * param0) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; u32 v3; @@ -331,7 +331,7 @@ static void ov13_02227888 (UnkStruct_ov13_02227244 * param0) static void ov13_022278A0 (UnkStruct_ov13_02227244 * param0, u32 param1) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = ¶m0->unk_2C[0]; v1 = sub_0200B1EC(param0->unk_10, Unk_ov13_02229AB0[0][0]); @@ -347,7 +347,7 @@ static void ov13_022278A0 (UnkStruct_ov13_02227244 * param0, u32 param1) static void ov13_02227910 (UnkStruct_ov13_02227244 * param0, u32 param1) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = ¶m0->unk_2C[2]; v1 = sub_02023790(130, param0->unk_00->unk_0C); diff --git a/src/overlay016/ov16_0223B140.c b/src/overlay016/ov16_0223B140.c index e2139d656a..770344f78d 100644 --- a/src/overlay016/ov16_0223B140.c +++ b/src/overlay016/ov16_0223B140.c @@ -1744,7 +1744,7 @@ static void ov16_0223D10C (UnkStruct_020067E8 * param0, UnkStruct_ov6_02240D5C * { UnkStruct_0200B144 * v5; - UnkStruct_02023790 * v6; + Strbuf* v6; v5 = sub_0200B144(1, 26, 368, 5); v6 = sub_02023790(0x100, 5); diff --git a/src/overlay016/ov16_0223DF00.c b/src/overlay016/ov16_0223DF00.c index 47ce65bc18..8c9f10dff0 100644 --- a/src/overlay016/ov16_0223DF00.c +++ b/src/overlay016/ov16_0223DF00.c @@ -104,7 +104,7 @@ u16 * ov16_0223E0B0(UnkStruct_0207ADB4 * param0); u16 * ov16_0223E0BC(UnkStruct_0207ADB4 * param0); UnkStruct_ov16_0223E0C8 * ov16_0223E0C8(UnkStruct_0207ADB4 * param0); UnkStruct_0200B358 * ov16_0223E0D0(UnkStruct_0207ADB4 * param0); -UnkStruct_02023790 * ov16_0223E0D4(UnkStruct_0207ADB4 * param0); +Strbuf* ov16_0223E0D4(UnkStruct_0207ADB4 * param0); u16 ov16_0223E0D8(UnkStruct_0207ADB4 * param0, int param1); UnkStruct_0207A9CC * ov16_0223E120(UnkStruct_0207ADB4 * param0, int param1); UnkStruct_02025E6C * ov16_0223E16C(UnkStruct_0207ADB4 * param0, int param1); @@ -410,7 +410,7 @@ UnkStruct_0200B358 * ov16_0223E0D0 (UnkStruct_0207ADB4 * param0) return param0->unk_14; } -UnkStruct_02023790 * ov16_0223E0D4 (UnkStruct_0207ADB4 * param0) +Strbuf* ov16_0223E0D4 (UnkStruct_0207ADB4 * param0) { return param0->unk_18; } @@ -1748,7 +1748,7 @@ u8 ov16_0223F9FC (UnkStruct_0207ADB4 * param0, int param1, int param2, int param if (param0->unk_2C & 0x80) { if (param1 == 10000) { { - UnkStruct_02023790 * v2; + Strbuf* v2; if (param3 == 100) { v2 = sub_02014B34(¶m0->unk_AC[param2].unk_24, 5); @@ -1763,7 +1763,7 @@ u8 ov16_0223F9FC (UnkStruct_0207ADB4 * param0, int param1, int param2, int param } else { { UnkStruct_0200B144 * v3; - UnkStruct_02023790 * v4; + Strbuf* v4; int v5; u32 v6; int v7; @@ -2362,7 +2362,7 @@ static void ov16_02240574 (UnkStruct_0207ADB4 * param0, u32 param1, int param2) static void ov16_02240584 (UnkStruct_0207ADB4 * param0, UnkStruct_0200B144 * param1, UnkStruct_ov16_0225C300 * param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_0200B1EC(param1, param2->unk_02); diff --git a/src/overlay016/ov16_022405FC.c b/src/overlay016/ov16_022405FC.c index 21400df7f1..a1775d2c0d 100644 --- a/src/overlay016/ov16_022405FC.c +++ b/src/overlay016/ov16_022405FC.c @@ -9735,7 +9735,7 @@ static void ov16_0224B520 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B7CC UnkStruct_02002F38 * v3; UnkStruct_0200B144 * v4; UnkStruct_0200B358 * v5; - UnkStruct_02023790 * v6, * v7; + Strbuf* v6, * v7; UnkStruct_02018340 * v8; UnkStruct_0205AA50 v9; int v10; diff --git a/src/overlay016/ov16_0225177C.c b/src/overlay016/ov16_0225177C.c index 2aef5061f8..3759a9f968 100644 --- a/src/overlay016/ov16_0225177C.c +++ b/src/overlay016/ov16_0225177C.c @@ -546,7 +546,7 @@ int ov16_02252060 (UnkStruct_ov16_0224B9DC * param0, int param1, int param2, voi } break; case 46: - sub_02023D28((UnkStruct_02023790 *)param3, v0->unk_36); + sub_02023D28((Strbuf *)param3, v0->unk_36); break; case 47: return v0->unk_4C; diff --git a/src/overlay016/ov16_02266F1C.c b/src/overlay016/ov16_02266F1C.c index dd82621c89..97bbfbd7cb 100644 --- a/src/overlay016/ov16_02266F1C.c +++ b/src/overlay016/ov16_02266F1C.c @@ -950,7 +950,7 @@ static void ov16_02267864 (UnkStruct_ov16_022674C4 * param0) NNSG2dImageProxy * v2; UnkStruct_0205AA50 v3; UnkStruct_0200B144 * v4; - UnkStruct_02023790 * v5, * v6; + Strbuf* v5, * v6; Pokemon * v7; BoxPokemon * v8; UnkStruct_0200B358 * v9; @@ -1163,7 +1163,7 @@ static void ov16_02267CE8 (UnkStruct_ov16_022674C4 * param0, u32 param1) NNSG2dImageProxy * v2; UnkStruct_0205AA50 v3; UnkStruct_0200B144 * v4; - UnkStruct_02023790 * v5; + Strbuf* v5; v0 = ov16_0223DF00(param0->unk_0C); v4 = ov16_0223E05C(param0->unk_0C); @@ -1206,7 +1206,7 @@ static void ov16_02267DC4 (UnkStruct_ov16_022674C4 * param0, u32 param1) NNSG2dImageProxy * v2; UnkStruct_0205AA50 v3; UnkStruct_0200B144 * v4; - UnkStruct_02023790 * v5, * v6; + Strbuf* v5, * v6; UnkStruct_0200B358 * v7; v0 = ov16_0223DF00(param0->unk_0C); diff --git a/src/overlay016/ov16_0226871C.c b/src/overlay016/ov16_0226871C.c index f5d2dc9654..d0a9129efd 100644 --- a/src/overlay016/ov16_0226871C.c +++ b/src/overlay016/ov16_0226871C.c @@ -338,7 +338,7 @@ static void ov16_0226B318(UnkStruct_ov16_02268A14 * param0, int param1); void ov16_0226947C(UnkStruct_ov16_02268A14 * param0, int param1, int param2); static void ov16_022694A8(UnkStruct_0201CD38 * param0, void * param1); static void ov16_0226B314(UnkStruct_ov16_02268A14 * param0, int param1); -static void ov16_0226A98C(UnkStruct_ov16_02268A14 * param0, UnkStruct_ov16_0226A98C * param1, const UnkStruct_02023790 * param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov16_0226AEA0 * param10); +static void ov16_0226A98C(UnkStruct_ov16_02268A14 * param0, UnkStruct_ov16_0226A98C * param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov16_0226AEA0 * param10); static void ov16_0226AAC0(UnkStruct_ov16_02268A14 * param0); static void ov16_0226A698(UnkStruct_ov16_02268A14 * param0); static void ov16_0226A718(UnkStruct_ov16_02268A14 * param0); @@ -365,8 +365,8 @@ static void ov16_0226C9B8(UnkStruct_ov16_02268A14 * param0, int param1); static void ov16_0226B31C(UnkStruct_ov16_02268A14 * param0, const s16 * param1, const UnkStruct_ov16_022702F4 * param2, int param3, int param4); static UnkStruct_ov16_0226ABD4 * ov16_0226ABD4(UnkStruct_ov16_02268A14 * param0, int param1); static void ov16_0226ABE8(UnkStruct_ov16_02268A14 * param0); -static void ov16_0226A95C(const UnkStruct_02023790 * param0, int param1, int * param2, int * param3); -static void ov16_0226AEA0(UnkStruct_ov16_02268A14 * param0, const UnkStruct_02023790 * param1, int param2, UnkStruct_ov16_0226AEA0 * param3, u32 param4); +static void ov16_0226A95C(const Strbuf *param0, int param1, int * param2, int * param3); +static void ov16_0226AEA0(UnkStruct_ov16_02268A14 * param0, const Strbuf *param1, int param2, UnkStruct_ov16_0226AEA0 * param3, u32 param4); static void ov16_0226AAF8(UnkStruct_ov16_02268A14 * param0); static int ov16_0226C100(UnkStruct_ov16_02268A14 * param0, int param1); static void ov16_0226BD74(UnkStruct_0201CD38 * param0, void * param1); @@ -1753,7 +1753,7 @@ static void ov16_02269654 (UnkStruct_ov16_02268A14 * param0, int param1, int par static void ov16_02269668 (UnkStruct_ov16_02268A14 * param0, int param1, int param2) { - UnkStruct_02023790 * v0, * v1, * v2, * v3; + Strbuf* v0, * v1, * v2, * v3; UnkStruct_0200B144 * v4; int v5; UnkStruct_ov16_02269668 * v6; @@ -1918,7 +1918,7 @@ static void ov16_022699AC (UnkStruct_ov16_02268A14 * param0, int param1, int par } { - UnkStruct_02023790 * v5; + Strbuf* v5; v5 = sub_0200B1EC(v2, 929); ov16_0226A98C(param0, ¶m0->unk_4CC[4], v5, 2, ((u32)(((10 & 0xff) << 16) | ((11 & 0xff) << 8) | ((12 & 0xff) << 0))), 2, 20023, 128, 178, 1, NULL); @@ -1973,7 +1973,7 @@ static void ov16_022699AC (UnkStruct_ov16_02268A14 * param0, int param1, int par static void ov16_02269C7C (UnkStruct_ov16_02268A14 * param0, int param1, int param2) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1, * v2; + Strbuf* v1, * v2; v0 = ov16_0223E05C(param0->unk_00); v1 = sub_0200B1EC(v0, 940); @@ -1989,7 +1989,7 @@ static void ov16_02269C7C (UnkStruct_ov16_02268A14 * param0, int param1, int par static void ov16_02269D14 (UnkStruct_ov16_02268A14 * param0, int param1, int param2) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1, * v2; + Strbuf* v1, * v2; v0 = ov16_0223E05C(param0->unk_00); v1 = sub_0200B1EC(v0, 1181); @@ -2005,7 +2005,7 @@ static void ov16_02269D14 (UnkStruct_ov16_02268A14 * param0, int param1, int par static void ov16_02269DB0 (UnkStruct_ov16_02268A14 * param0, int param1, int param2) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1, * v2, * v3, * v4; + Strbuf* v1, * v2, * v3, * v4; UnkStruct_0200B358 * v5; UnkStruct_ov16_022623F0 * v6; @@ -2033,7 +2033,7 @@ static void ov16_02269DB0 (UnkStruct_ov16_02268A14 * param0, int param1, int par static void ov16_02269E94 (UnkStruct_ov16_02268A14 * param0, int param1, int param2) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; G2S_SetBlendAlpha((GX_BLEND_PLANEMASK_BG1), (GX_BLEND_BGALL), 31, 0); @@ -2069,7 +2069,7 @@ static void ov16_02269E94 (UnkStruct_ov16_02268A14 * param0, int param1, int par static void ov16_02269F68 (UnkStruct_ov16_02268A14 * param0, int param1, int param2) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1, * v2, * v3, * v4; + Strbuf* v1, * v2, * v3, * v4; UnkStruct_0200B358 * v5; UnkStruct_ov16_022623F0 * v6; @@ -2097,7 +2097,7 @@ static void ov16_02269F68 (UnkStruct_ov16_02268A14 * param0, int param1, int par static void ov16_0226A04C (UnkStruct_ov16_02268A14 * param0, int param1, int param2) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1, * v2, * v3, * v4; + Strbuf* v1, * v2, * v3, * v4; UnkStruct_0200B358 * v5; UnkStruct_ov16_022623F0 * v6; @@ -2128,7 +2128,7 @@ static void ov16_0226A12C (UnkStruct_ov16_02268A14 * param0, int param1, int par int v1; UnkStruct_0200B144 * v2; u8 v3[4]; - UnkStruct_02023790 * v4, * v5; + Strbuf* v4, * v5; Pokemon * v6; BoxPokemon * v7; UnkStruct_0200B358 * v8; @@ -2200,7 +2200,7 @@ static void ov16_0226A12C (UnkStruct_ov16_02268A14 * param0, int param1, int par sub_020237BC(v4); { - UnkStruct_02023790 * v13; + Strbuf* v13; v13 = sub_0200B1EC(v2, 930); ov16_0226A98C(param0, ¶m0->unk_4CC[4], v13, 2, (((u32)(((10 & 0xff) << 16) | ((11 & 0xff) << 8) | ((12 & 0xff) << 0)))), 2, 20023, Unk_ov16_02270328[4][0], Unk_ov16_02270328[4][1], 1, NULL); @@ -2598,7 +2598,7 @@ static int ov16_0226A934 (u8 param0) return v0; } -static void ov16_0226A95C (const UnkStruct_02023790 * param0, int param1, int * param2, int * param3) +static void ov16_0226A95C (const Strbuf *param0, int param1, int * param2, int * param3) { int v0, v1; @@ -2613,7 +2613,7 @@ static void ov16_0226A95C (const UnkStruct_02023790 * param0, int param1, int * *param3 = v1; } -static void ov16_0226A98C (UnkStruct_ov16_02268A14 * param0, UnkStruct_ov16_0226A98C * param1, const UnkStruct_02023790 * param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov16_0226AEA0 * param10) +static void ov16_0226A98C (UnkStruct_ov16_02268A14 * param0, UnkStruct_ov16_0226A98C * param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov16_0226AEA0 * param10) { UnkStruct_020127E8 v0; UnkStruct_0205AA50 v1; @@ -2792,10 +2792,10 @@ void ov16_0226AC98 (UnkStruct_ov16_02268A14 * param0, int param1, const UnkStruc void * v1; NNSG2dCharacterData * v2; int v3, v4, v5; - UnkStruct_02023790 * v6; - UnkStruct_02023790 * v7; - UnkStruct_02023790 * v8; - UnkStruct_02023790 * v9; + Strbuf* v6; + Strbuf* v7; + Strbuf* v8; + Strbuf* v9; UnkStruct_0200B358 * v10; u32 v11; UnkStruct_0200B144 * v12; @@ -2846,7 +2846,7 @@ void ov16_0226AC98 (UnkStruct_ov16_02268A14 * param0, int param1, const UnkStruc v0->unk_00 = *param2; } -static void ov16_0226AEA0 (UnkStruct_ov16_02268A14 * param0, const UnkStruct_02023790 * param1, int param2, UnkStruct_ov16_0226AEA0 * param3, u32 param4) +static void ov16_0226AEA0 (UnkStruct_ov16_02268A14 * param0, const Strbuf *param1, int param2, UnkStruct_ov16_0226AEA0 * param3, u32 param4) { int v0, v1; @@ -4618,7 +4618,7 @@ void ov16_0226CEB0 (UnkStruct_ov16_02268A14 * param0, int param1) } { - UnkStruct_02023790 * v8; + Strbuf* v8; UnkStruct_0200B144 * v9 = ov16_0223E05C(param0->unk_00); int v10; const u16 v11[][2] = { diff --git a/src/overlay017/ov17_0223F118.c b/src/overlay017/ov17_0223F118.c index 863927512c..3ec3b3ffab 100644 --- a/src/overlay017/ov17_0223F118.c +++ b/src/overlay017/ov17_0223F118.c @@ -111,7 +111,7 @@ void ov17_0223F1E0 (UnkStruct_0207C690 * param0) sub_020242C4(param0); } -void ov17_0223F1E8 (int param0, UnkStruct_02018340 * param1, UnkStruct_0200C704 * param2, UnkStruct_02012744 * param3, UnkStruct_ov17_0223F2E4 * param4, const UnkStruct_02023790 * param5, int param6, u32 param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14) +void ov17_0223F1E8 (int param0, UnkStruct_02018340 * param1, UnkStruct_0200C704 * param2, UnkStruct_02012744 * param3, UnkStruct_ov17_0223F2E4 * param4, const Strbuf *param5, int param6, u32 param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14) { UnkStruct_020127E8 v0; UnkStruct_0205AA50 v1; @@ -188,10 +188,10 @@ void ov17_0223F2F8 (UnkStruct_ov17_0223F2E4 * param0, int param1, int param2, in sub_020128C4(param0->unk_00, param1, param2); } -UnkStruct_02023790 * ov17_0223F310 (u32 param0, u32 param1) +Strbuf* ov17_0223F310 (u32 param0, u32 param1) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = sub_0200B144(1, 26, 207, param1); v1 = sub_0200B1EC(v0, param0); diff --git a/src/overlay017/ov17_0223F7E4.c b/src/overlay017/ov17_0223F7E4.c index f122f60983..0d7b0a74e9 100644 --- a/src/overlay017/ov17_0223F7E4.c +++ b/src/overlay017/ov17_0223F7E4.c @@ -201,7 +201,7 @@ static void ov17_0224051C(UnkStruct_0201CD38 * param0, void * param1); static void ov17_02240658(UnkStruct_0201CD38 * param0, void * param1); static void ov17_022411E4(UnkStruct_0201CD38 * param0, void * param1); static void ov17_02241220(UnkStruct_0201CD38 * param0, void * param1); -static void ov17_02240138(UnkStruct_ov17_0223F7E4 * param0, UnkStruct_ov17_02240138 * param1, const UnkStruct_02023790 * param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov17_02240BF4 * param10); +static void ov17_02240138(UnkStruct_ov17_0223F7E4 * param0, UnkStruct_ov17_02240138 * param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov17_02240BF4 * param10); static void ov17_02240260(UnkStruct_ov17_0223F7E4 * param0); void ov17_0223F80C(UnkStruct_02018340 * param0); void ov17_0223F864(UnkStruct_02018340 * param0); @@ -211,8 +211,8 @@ void ov17_0223F9C4(UnkStruct_ov17_0223F7E4 * param0, int param1, int param2, voi int ov17_0223FAF8(UnkStruct_ov17_0223F7E4 * param0); BOOL ov17_0223FBC0(UnkStruct_ov17_0223F7E4 * param0); static void ov17_022409F4(UnkStruct_ov17_0223F7E4 * param0); -static void ov17_02240BF4(UnkStruct_ov17_0223F7E4 * param0, const UnkStruct_02023790 * param1, int param2, UnkStruct_ov17_02240BF4 * param3, u32 param4); -static void ov17_02240C60(const UnkStruct_02023790 * param0, int param1, int * param2, int * param3); +static void ov17_02240BF4(UnkStruct_ov17_0223F7E4 * param0, const Strbuf *param1, int param2, UnkStruct_ov17_02240BF4 * param3, u32 param4); +static void ov17_02240C60(const Strbuf *param0, int param1, int * param2, int * param3); static void ov17_02240950(UnkStruct_0201CD38 * param0, void * param1); static void ov17_02240930(UnkStruct_ov17_0223F7E4 * param0, int param1); static int ov17_02240C90(UnkStruct_ov17_0223F7E4 * param0); @@ -756,7 +756,7 @@ BOOL ov17_0223FBC0 (UnkStruct_ov17_0223F7E4 * param0) static void ov17_0223FBD4 (UnkStruct_ov17_0223F7E4 * param0, int param1, int param2) { - UnkStruct_02023790 * v0, * v1; + Strbuf* v0, * v1; u32 v2, v3; v2 = sub_02095848(param0->unk_04->unk_00->unk_110, param0->unk_04->unk_00->unk_111, param0->unk_00->unk_155); @@ -776,8 +776,8 @@ static void ov17_0223FCAC (UnkStruct_ov17_0223F7E4 * param0, int param1, int par { u16 v0[4], v1[4]; int v2; - UnkStruct_02023790 * v3; - UnkStruct_02023790 * v4, * v5; + Strbuf* v3; + Strbuf* v4, * v5; u32 v6, v7; UnkStruct_ov17_0223FF38 * v8; @@ -854,7 +854,7 @@ static void ov17_0223FF38 (UnkStruct_ov17_0223F7E4 * param0, int param1, int par { int v0; UnkStruct_02018340 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; UnkStruct_ov17_0223FF38 * v3; v3 = ¶m0->unk_18C; @@ -952,7 +952,7 @@ static int ov17_02240094 (UnkStruct_ov17_0223F7E4 * param0, int param1, int para return param1; } -static void ov17_02240138 (UnkStruct_ov17_0223F7E4 * param0, UnkStruct_ov17_02240138 * param1, const UnkStruct_02023790 * param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov17_02240BF4 * param10) +static void ov17_02240138 (UnkStruct_ov17_0223F7E4 * param0, UnkStruct_ov17_02240138 * param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov17_02240BF4 * param10) { UnkStruct_020127E8 v0; UnkStruct_0205AA50 v1; @@ -1452,8 +1452,8 @@ void ov17_02240A80 (UnkStruct_ov17_0223F7E4 * param0, u16 param1[]) { UnkStruct_ov17_0223FF38 * v0; int v1; - UnkStruct_02023790 * v2; - UnkStruct_02023790 * v3, * v4, * v5; + Strbuf* v2; + Strbuf* v3, * v4, * v5; u32 v6, v7; v0 = ¶m0->unk_18C; @@ -1495,7 +1495,7 @@ void ov17_02240A80 (UnkStruct_ov17_0223F7E4 * param0, u16 param1[]) } } -static void ov17_02240BF4 (UnkStruct_ov17_0223F7E4 * param0, const UnkStruct_02023790 * param1, int param2, UnkStruct_ov17_02240BF4 * param3, u32 param4) +static void ov17_02240BF4 (UnkStruct_ov17_0223F7E4 * param0, const Strbuf *param1, int param2, UnkStruct_ov17_02240BF4 * param3, u32 param4) { int v0, v1; @@ -1513,7 +1513,7 @@ static void ov17_02240BF4 (UnkStruct_ov17_0223F7E4 * param0, const UnkStruct_020 sub_0201D7E0(¶m3->unk_00, param2, param1, 0, 0, 0xff, param4, 0, 0, NULL); } -static void ov17_02240C60 (const UnkStruct_02023790 * param0, int param1, int * param2, int * param3) +static void ov17_02240C60 (const Strbuf *param0, int param1, int * param2, int * param3) { int v0, v1; diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c index bfd10629bb..33d124a64f 100644 --- a/src/overlay017/ov17_022413D8.c +++ b/src/overlay017/ov17_022413D8.c @@ -1513,7 +1513,7 @@ void ov17_02242DA8 (UnkStruct_ov17_02246F24 * param0) static void ov17_02242DC0 (UnkStruct_ov17_02246F24 * param0, UnkStruct_0200B144 * param1, u32 param2, int param3, const UnkStruct_ov17_022449B8 * param4, const void * param5, int param6) { - UnkStruct_02023790 * v0; + Strbuf* v0; u32 v1; if (param6 == 1) { @@ -1578,7 +1578,7 @@ int ov17_02242ECC (UnkStruct_ov17_02246F24 * param0) void ov17_02242EE4 (UnkStruct_ov17_02246F24 * param0, int param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; u32 v1; v0 = sub_02023790(12, 21); diff --git a/src/overlay017/ov17_022476F8.c b/src/overlay017/ov17_022476F8.c index 7f895c24cd..283d10a123 100644 --- a/src/overlay017/ov17_022476F8.c +++ b/src/overlay017/ov17_022476F8.c @@ -206,7 +206,7 @@ static void ov17_0224792C (UnkStruct_ov17_02247A48 * param0, int param1, const U static void ov17_02247990 (UnkStruct_ov17_02247A48 * param0, UnkStruct_0200B144 * param1, u32 param2, int param3, const UnkStruct_ov17_0224792C * param4) { - UnkStruct_02023790 * v0; + Strbuf* v0; int v1; if (param0->unk_00->unk_155 == 0) { diff --git a/src/overlay017/ov17_022492DC.c b/src/overlay017/ov17_022492DC.c index fbf8923e1d..ac52c05569 100644 --- a/src/overlay017/ov17_022492DC.c +++ b/src/overlay017/ov17_022492DC.c @@ -150,7 +150,7 @@ static void ov17_0224A038(UnkStruct_0201CD38 * param0, void * param1); static void ov17_0224A088(UnkStruct_0201CD38 * param0, void * param1); static void ov17_0224A0C8(UnkStruct_0201CD38 * param0, void * param1); static void ov17_022498F4(UnkStruct_ov17_022492DC * param0); -static void ov17_02249BC4(UnkStruct_ov17_022492DC * param0, UnkStruct_ov17_02249BC4 * param1, const UnkStruct_02023790 * param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9); +static void ov17_02249BC4(UnkStruct_ov17_022492DC * param0, UnkStruct_ov17_02249BC4 * param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9); static void ov17_02249CD0(UnkStruct_ov17_022492DC * param0); static void ov17_02249CFC(UnkStruct_ov17_022492DC * param0, int param1); static void ov17_02249828(UnkStruct_ov17_022492DC * param0); @@ -531,7 +531,7 @@ static void ov17_0224981C (UnkStruct_ov17_022492DC * param0, int param1, int par static void ov17_02249828 (UnkStruct_ov17_022492DC * param0) { - UnkStruct_02023790 * v0, * v1; + Strbuf* v0, * v1; u32 v2, v3; UnkStruct_0200B144 * v4; @@ -556,7 +556,7 @@ static void ov17_022498E8 (UnkStruct_ov17_022492DC * param0, int param1, int par static void ov17_022498F4 (UnkStruct_ov17_022492DC * param0) { - UnkStruct_02023790 * v0, * v1, * v2, * v3; + Strbuf* v0, * v1, * v2, * v3; UnkStruct_0200B144 * v4; v4 = param0->unk_04->unk_84; @@ -680,7 +680,7 @@ static void ov17_02249B54 (UnkStruct_ov17_02249B30 * param0) } } -static void ov17_02249BC4 (UnkStruct_ov17_022492DC * param0, UnkStruct_ov17_02249BC4 * param1, const UnkStruct_02023790 * param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9) +static void ov17_02249BC4 (UnkStruct_ov17_022492DC * param0, UnkStruct_ov17_02249BC4 * param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9) { UnkStruct_020127E8 v0; UnkStruct_0205AA50 v1; diff --git a/src/overlay017/ov17_0224A0FC.c b/src/overlay017/ov17_0224A0FC.c index 17c180c12d..83936b07ee 100644 --- a/src/overlay017/ov17_0224A0FC.c +++ b/src/overlay017/ov17_0224A0FC.c @@ -643,7 +643,7 @@ void ov17_0224A650 (UnkStruct_ov17_0224A1EC * param0) void ov17_0224A674 (UnkStruct_ov17_0224A1EC * param0) { int v0; - UnkStruct_02023790 * v1, * v2, * v3; + Strbuf* v1, * v2, * v3; v1 = sub_0200B1EC(param0->unk_84, 5); v2 = sub_0200B1EC(param0->unk_84, 6); @@ -1932,7 +1932,7 @@ static void ov17_0224C0C0 (UnkStruct_ov17_0224DF54 * param0, int param1, const U static void ov17_0224C244 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_0200B144 * param1, u32 param2, int param3, const UnkStruct_ov17_0224C0C0 * param4) { - UnkStruct_02023790 * v0; + Strbuf* v0; int v1; if (param0->unk_00->unk_155 == 0) { @@ -2100,7 +2100,7 @@ int ov17_0224C57C (int param0) void ov17_0224C5A0 (UnkStruct_ov17_0224DF54 * param0, u32 param1, const UnkStruct_ov17_0224C0C0 * param2) { u32 v0, v1; - UnkStruct_02023790 * v2; + Strbuf* v2; GF_ASSERT(param1 < NELEMS(Unk_ov17_0225470C)); diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c index e2d8779b9d..477b5d4e63 100644 --- a/src/overlay017/ov17_02250744.c +++ b/src/overlay017/ov17_02250744.c @@ -241,7 +241,7 @@ static void ov17_022507F0 (UnkStruct_ov17_0224FCA0 * param0, int param1, const U static void ov17_022508E4 (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_0200B144 * param1, u32 param2, int param3, const UnkStruct_ov17_022508E4 * param4) { - UnkStruct_02023790 * v0; + Strbuf* v0; int v1; if (param0->unk_00->unk_155 == 0) { @@ -336,7 +336,7 @@ void ov17_02250B00 (UnkStruct_ov17_0224FCA0 * param0) sub_02003050(param0->unk_10.unk_C0, 38, sub_0200DD08(v0), 24, 0, 0x20, 14 * 16); { - UnkStruct_02023790 * v2; + Strbuf* v2; int v3, v4; v2 = sub_02023790(12, 24); diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c index 4dac6400bb..075240d290 100644 --- a/src/overlay019/ov19_021DA92C.c +++ b/src/overlay019/ov19_021DA92C.c @@ -400,7 +400,7 @@ static void ov19_021DAE2C (UnkStruct_ov19_021DAE2C * param0) static void ov19_021DAE60 (UnkStruct_0205AA50 * param0, UnkStruct_ov19_021DA9E0 * param1, u32 param2, u32 param3) { - const UnkStruct_02023790 * v0; + const Strbuf* v0; u32 v1; v1 = (param3 * 16) + 0; diff --git a/src/overlay019/ov19_021DCF88.c b/src/overlay019/ov19_021DCF88.c index d89510c93e..7434d459c2 100644 --- a/src/overlay019/ov19_021DCF88.c +++ b/src/overlay019/ov19_021DCF88.c @@ -84,7 +84,7 @@ struct UnkStruct_ov19_021DCF88_t { UnkStruct_02022550 * unk_54[10]; int unk_7C; int unk_80; - UnkStruct_02023790 * unk_84; + Strbuf* unk_84; UnkStruct_0205AA50 unk_88; void * unk_98; NNSG2dCellDataBank * unk_9C; diff --git a/src/overlay019/ov19_021DEC04.c b/src/overlay019/ov19_021DEC04.c index 77e580dfcf..7489e28500 100644 --- a/src/overlay019/ov19_021DEC04.c +++ b/src/overlay019/ov19_021DEC04.c @@ -54,7 +54,7 @@ struct UnkStruct_ov19_021DEC04_t { NNSG2dAnimBankData * unk_68; UnkStruct_0200B144 * unk_6C; UnkStruct_0200B144 * unk_70; - UnkStruct_02023790 * unk_74; + Strbuf* unk_74; UnkStruct_0205AA50 unk_78[7]; u8 unk_E8[640]; NNSG2dScreenData * unk_368; @@ -78,7 +78,7 @@ static void ov19_021DF178(UnkStruct_ov19_021DEC04 * param0, int param1); static void ov19_021DF250(UnkStruct_ov19_021DEC04 * param0, int param1); static void ov19_021DF270(UnkStruct_ov19_021DEC04 * param0); static void ov19_021DF2A8(UnkStruct_ov19_021DEC04 * param0); -static inline u32 inline_ov19_021DF3AC(UnkStruct_0205AA50 * param0, u32 param1, const UnkStruct_02023790 * param2); +static inline u32 inline_ov19_021DF3AC(UnkStruct_0205AA50 * param0, u32 param1, const Strbuf *param2); static void ov19_021DF2E0(UnkStruct_ov19_021DEC04 * param0); static void ov19_021DF394(UnkStruct_ov19_021DEC04 * param0); static void ov19_021DF3AC(UnkStruct_ov19_021DEC04 * param0, int param1); @@ -469,7 +469,7 @@ static void ov19_021DF2A8 (UnkStruct_ov19_021DEC04 * param0) } } -static inline u32 inline_ov19_021DF3AC (UnkStruct_0205AA50 * param0, u32 param1, const UnkStruct_02023790 * param2) +static inline u32 inline_ov19_021DF3AC (UnkStruct_0205AA50 * param0, u32 param1, const Strbuf *param2) { return ((param0->unk_07 * 8) - sub_02002D7C(param1, param2, 0)) / 2; } diff --git a/src/overlay020/ov20_021D0D80.c b/src/overlay020/ov20_021D0D80.c index 3d397f6bb3..d415b9f9f4 100644 --- a/src/overlay020/ov20_021D0D80.c +++ b/src/overlay020/ov20_021D0D80.c @@ -1309,7 +1309,7 @@ u16 ov20_021D1FA8 (const UnkStruct_ov20_021D16E8 * param0, int param1) } } -UnkStruct_02023790 * ov20_021D1FC0 (const UnkStruct_ov20_021D16E8 * param0, u32 param1) +Strbuf* ov20_021D1FC0 (const UnkStruct_ov20_021D16E8 * param0, u32 param1) { return sub_02014BA0(&(param0->unk_08), param1); } @@ -1338,7 +1338,7 @@ u32 ov20_021D1FE4 (const UnkStruct_ov20_021D16E8 * param0) } } -void ov20_021D2008 (const UnkStruct_ov20_021D16E8 * param0, u32 param1, UnkStruct_02023790 * param2) +void ov20_021D2008 (const UnkStruct_ov20_021D16E8 * param0, u32 param1, Strbuf *param2) { if (param0->unk_65 == 0) { sub_02099CA8(param0->unk_18, param0->unk_50, param1, param2); diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c index 2e1567e357..3cf9bbab84 100644 --- a/src/overlay020/ov20_021D2EA4.c +++ b/src/overlay020/ov20_021D2EA4.c @@ -38,7 +38,7 @@ typedef struct { } UnkStruct_ov20_021D34CC; typedef struct { - UnkStruct_02023790 * unk_00; + Strbuf* unk_00; const u16 * unk_04; int unk_08; } UnkStruct_ov20_021D33C8; @@ -54,7 +54,7 @@ typedef struct UnkStruct_ov20_021D30F8_t { UnkStruct_02022550 * unk_40; UnkStruct_02022550 * unk_44; UnkStruct_0200B144 * unk_48; - UnkStruct_02023790 * unk_4C; + Strbuf* unk_4C; UnkStruct_020149F0 * unk_50; UnkStruct_ov20_021D34CC unk_54[2]; u32 unk_5C; @@ -70,7 +70,7 @@ static void ov20_021D3184(UnkStruct_ov20_021D30F8 * param0); static u32 ov20_021D32D0(UnkStruct_ov20_021D30F8 * param0); static void ov20_021D33C8(UnkStruct_ov20_021D33C8 * param0, UnkStruct_ov20_021D30F8 * param1); static void ov20_021D33F4(UnkStruct_ov20_021D33C8 * param0); -static int ov20_021D3400(UnkStruct_ov20_021D33C8 * param0, UnkStruct_02023790 * param1); +static int ov20_021D3400(UnkStruct_ov20_021D33C8 * param0, Strbuf *param1); static void ov20_021D34CC(const UnkStruct_ov20_021D34CC * param0, UnkStruct_ov20_021D34CC * param1); static void ov20_021D34E0(const UnkStruct_ov20_021D34CC * param0, UnkStruct_ov20_021D34CC * param1); static void ov20_021D34F4(UnkStruct_0205AA50 * param0, const UnkStruct_ov20_021D34CC * param1); @@ -267,7 +267,7 @@ void ov20_021D3228 (UnkStruct_ov20_021D30F8 * param0) static u32 ov20_021D32D0 (UnkStruct_ov20_021D30F8 * param0) { - UnkStruct_02023790 * v0 = ov20_021D1FC0(param0->unk_04, 35); + Strbuf* v0 = ov20_021D1FC0(param0->unk_04, 35); int v1, v2, v3; BOOL v4; u16 v5; @@ -330,7 +330,7 @@ static void ov20_021D33F4 (UnkStruct_ov20_021D33C8 * param0) sub_020237BC(param0->unk_00); } -static int ov20_021D3400 (UnkStruct_ov20_021D33C8 * param0, UnkStruct_02023790 * param1) +static int ov20_021D3400 (UnkStruct_ov20_021D33C8 * param0, Strbuf *param1) { const u16 * v0 = param0->unk_04; int v1; @@ -436,7 +436,7 @@ void ov20_021D3578 (UnkStruct_ov20_021D30F8 * param0, u32 param1) { UnkStruct_0200B358 * v0 = sub_0200B368(2, 60, 0); - UnkStruct_02023790 * v1 = sub_02023790(300, 0); + Strbuf* v1 = sub_02023790(300, 0); sub_0200B7B4(v0, 0, 0); sub_0200B1B8(param0->unk_48, 0 + ov20_021D1F88(param0->unk_04), param0->unk_4C); diff --git a/src/overlay020/ov20_021D3864.c b/src/overlay020/ov20_021D3864.c index 7d7ce2e278..6ddc96a314 100644 --- a/src/overlay020/ov20_021D3864.c +++ b/src/overlay020/ov20_021D3864.c @@ -80,7 +80,7 @@ void ov20_021D3898 (UnkStruct_ov20_021D3980 * param0, NARC * param1) static void ov20_021D390C (UnkStruct_02018340 * param0, const UnkStruct_ov61_0222C884 * param1, u32 param2) { UnkStruct_0205AA50 v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; sub_0201A8D4(param0, &v0, param1); diff --git a/src/overlay020/ov20_021D3A54.c b/src/overlay020/ov20_021D3A54.c index 875e51f9a5..035df76b2e 100644 --- a/src/overlay020/ov20_021D3A54.c +++ b/src/overlay020/ov20_021D3A54.c @@ -108,7 +108,7 @@ static u32 ov20_021D3B74 (UnkStruct_ov20_021D3E0C * param0, UnkStruct_02018340 * int v0, v1, v2; UnkStruct_0205AA50 v3; UnkStruct_0200B144 * v4; - UnkStruct_02023790 * v5; + Strbuf* v5; u32 v6, v7; v4 = sub_0200B144(1, 26, 436, 35); @@ -155,7 +155,7 @@ static u32 ov20_021D3B74 (UnkStruct_ov20_021D3E0C * param0, UnkStruct_02018340 * static u32 ov20_021D3C78 (UnkStruct_ov20_021D3E0C * param0, UnkStruct_02018340 * param1, u32 param2) { UnkStruct_0205AA50 v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2, v3, v4, v5, v6; GF_ASSERT(param2 < (1024 - 200)); @@ -202,7 +202,7 @@ static u32 ov20_021D3D44 (UnkStruct_ov20_021D3E0C * param0, UnkStruct_02018340 * }; UnkStruct_0205AA50 v1; UnkStruct_0200B144 * v2; - UnkStruct_02023790 * v3; + Strbuf* v3; int v4, v5; v2 = sub_0200B144(1, 26, 436, 35); diff --git a/src/overlay020/ov20_021D40E8.c b/src/overlay020/ov20_021D40E8.c index 89704426e8..c144d5cc06 100644 --- a/src/overlay020/ov20_021D40E8.c +++ b/src/overlay020/ov20_021D40E8.c @@ -35,7 +35,7 @@ typedef struct UnkStruct_ov20_021D4210_t { UnkStruct_02022550 * unk_30; UnkStruct_02022550 * unk_34; UnkStruct_02022550 * unk_38; - UnkStruct_02023790 * unk_3C; + Strbuf* unk_3C; UnkStruct_ov20_021D4FF0 unk_40; UnkStruct_ov20_021D4E8C unk_60; u32 unk_80; diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c index a9df8a0d83..8d43d33a71 100644 --- a/src/overlay020/ov20_021D4728.c +++ b/src/overlay020/ov20_021D4728.c @@ -63,7 +63,7 @@ typedef struct { static void ov20_021D4874(UnkStruct_ov20_021D4AD4 * param0, NARC * param1); static void ov20_021D48C4(UnkStruct_ov20_021D4AD4 * param0, NARC * param1); -static void ov20_021D498C(UnkStruct_0205AA50 * param0, UnkStruct_02018340 * param1, const UnkStruct_02023790 * param2, int param3); +static void ov20_021D498C(UnkStruct_0205AA50 * param0, UnkStruct_02018340 * param1, const Strbuf *param2, int param3); static void ov20_021D4A24(UnkStruct_ov20_021D4AD4 * param0, NARC * param1); static void ov20_021D4AD4(UnkStruct_ov20_021D4AD4 * param0); static void ov20_021D4AF8(UnkStruct_ov20_021D4B2C * param0, NARC * param1, u32 param2, u32 param3); @@ -225,7 +225,7 @@ static const s16 Unk_ov20_021D52EC[] = { 22, (22 + 56 * 1) - 1, (22 + 56 * 2) - 2, (22 + 56 * 3) - 1, }; -asm static void ov20_021D498C (UnkStruct_0205AA50 * param0, UnkStruct_02018340 * param1, const UnkStruct_02023790 * param2, int param3) +asm static void ov20_021D498C (UnkStruct_0205AA50 * param0, UnkStruct_02018340 * param1, const Strbuf *param2, int param3) { push {r4, r5, r6, r7, lr} sub sp, #0x24 diff --git a/src/overlay020/ov20_021D5044.c b/src/overlay020/ov20_021D5044.c index dc26661b1d..a2c92d6501 100644 --- a/src/overlay020/ov20_021D5044.c +++ b/src/overlay020/ov20_021D5044.c @@ -51,7 +51,7 @@ u32 ov20_021D5044 (void) return NELEMS(Unk_ov20_021D5320); } -void ov20_021D5048 (u32 param0, UnkStruct_02023790 * param1) +void ov20_021D5048 (u32 param0, Strbuf *param1) { GF_ASSERT(param0 < NELEMS(Unk_ov20_021D5320)); sub_02023D8C(param1, &(Unk_ov20_021D5320[param0].unk_00), 2); diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c index b9aa105c6f..27913c63d3 100644 --- a/src/overlay021/ov21_021D0D80.c +++ b/src/overlay021/ov21_021D0D80.c @@ -660,8 +660,8 @@ BOOL ov21_021D157C (UnkStruct_ov21_021D157C * param0) void ov21_021D1650 (UnkStruct_0205AA50 * param0, int param1, int param2, int param3) { - UnkStruct_02023790 * v0; - UnkStruct_02023790 * v1; + Strbuf* v0; + Strbuf* v1; if (param1 > 0) { v0 = sub_02023790(4, param3); @@ -974,9 +974,9 @@ u32 ov21_021D1C88 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D33 return v0; } -UnkStruct_02023790 * ov21_021D1CE0 (int param0, int param1) +Strbuf* ov21_021D1CE0 (int param0, int param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0200B144 * v1 = sub_0200B144(0, 26, 697, param1); v0 = sub_0200B1EC(v1, param0); diff --git a/src/overlay021/ov21_021D3208.c b/src/overlay021/ov21_021D3208.c index d513f15cfa..e6095d2e3b 100644 --- a/src/overlay021/ov21_021D3208.c +++ b/src/overlay021/ov21_021D3208.c @@ -556,7 +556,7 @@ int ov21_021D3908 (const UnkStruct_ov21_021D3320 * param0) return param0->unk_173C; } -UnkStruct_02023790 * ov21_021D3914 (const UnkStruct_ov21_021D3320 * param0) +Strbuf* ov21_021D3914 (const UnkStruct_ov21_021D3320 * param0) { return param0->unk_1754; } diff --git a/src/overlay021/ov21_021D4C0C.c b/src/overlay021/ov21_021D4C0C.c index dd8a705aaf..8d0a15e859 100644 --- a/src/overlay021/ov21_021D4C0C.c +++ b/src/overlay021/ov21_021D4C0C.c @@ -146,7 +146,7 @@ void ov21_021D4DA0 (UnkStruct_0205AA50 * param0) u32 ov21_021D4DAC (UnkStruct_ov21_021D4C0C * param0, UnkStruct_0205AA50 * param1, u32 param2, u32 param3, int param4, int param5) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; v0 = sub_0200B144(0, 26, param2, param0->unk_14); @@ -165,7 +165,7 @@ u32 ov21_021D4DAC (UnkStruct_ov21_021D4C0C * param0, UnkStruct_0205AA50 * param1 void ov21_021D4E10 (UnkStruct_ov21_021D4C0C * param0, UnkStruct_0205AA50 * param1, u32 param2, u32 param3) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; int v2; int v3; @@ -183,7 +183,7 @@ void ov21_021D4E10 (UnkStruct_ov21_021D4C0C * param0, UnkStruct_0205AA50 * param sub_0200B190(v0); } -void ov21_021D4E80 (UnkStruct_ov21_021D4C0C * param0, UnkStruct_0205AA50 * param1, UnkStruct_02023790 * param2, int param3, int param4) +void ov21_021D4E80 (UnkStruct_ov21_021D4C0C * param0, UnkStruct_0205AA50 * param1, Strbuf *param2, int param3, int param4) { sub_0201D78C(param1, 2, param2, param3, param4, 0xff, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))), NULL); } diff --git a/src/overlay021/ov21_021D5600.c b/src/overlay021/ov21_021D5600.c index acc4b047f2..28073b6439 100644 --- a/src/overlay021/ov21_021D5600.c +++ b/src/overlay021/ov21_021D5600.c @@ -24,10 +24,10 @@ static const u8 Unk_ov21_021E9CC4[6] = { static inline int inline_ov21_021D5764(int param0); static inline BOOL inline_ov21_021D5764_1(int param0, int param1); -static UnkStruct_02023790 * ov21_021D5724(int param0, int param1, int param2); +static Strbuf* ov21_021D5724(int param0, int param1, int param2); static void ov21_021D5764(int param0, int param1, int * param2, int * param3, int * param4); -void ov21_021D5600 (UnkStruct_02023790 * param0) +void ov21_021D5600 (Strbuf *param0) { sub_020237BC(param0); } @@ -47,7 +47,7 @@ static const u32 Unk_ov21_021E9CCC[] = { 0x2CC }; -asm UnkStruct_02023790 * ov21_021D561C (int param0, int param1, int param2) +asm Strbuf* ov21_021D561C (int param0, int param1, int param2) { push {r4, r5, r6, lr} sub sp, #0x28 @@ -96,7 +96,7 @@ static const u32 Unk_ov21_021E9CE4[] = { 0x2D2 }; -asm UnkStruct_02023790 * ov21_021D566C (int param0, int param1, int param2) +asm Strbuf* ov21_021D566C (int param0, int param1, int param2) { push {r4, r5, r6, lr} sub sp, #0x28 @@ -144,7 +144,7 @@ static const u32 Unk_ov21_021E9CFC[] = { 0x2C0 }; -asm UnkStruct_02023790 * ov21_021D56BC (int param0, int param1, int param2, int param3) +asm Strbuf* ov21_021D56BC (int param0, int param1, int param2, int param3) { push {r4, r5, r6, lr} sub sp, #0x28 @@ -205,12 +205,12 @@ static inline BOOL inline_ov21_021D5764_1 (int param0, int param1) return 1; } -static UnkStruct_02023790 * ov21_021D5724 (int param0, int param1, int param2) +static Strbuf* ov21_021D5724 (int param0, int param1, int param2) { UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, param0, param2); if (v0) { - UnkStruct_02023790 * v1 = sub_02023790(256, param2); + Strbuf* v1 = sub_02023790(256, param2); if (v1) { sub_0200B1B8(v0, param1, v1); diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c index 9e6af93dd9..021c10aca2 100644 --- a/src/overlay021/ov21_021D5AEC.c +++ b/src/overlay021/ov21_021D5AEC.c @@ -743,7 +743,7 @@ static void ov21_021D63C0 (UnkStruct_ov21_021D71A8 * param0) static void ov21_021D63DC (UnkStruct_ov21_021D13FC * param0, int param1, int param2, int param3) { - UnkStruct_02023790 * v0 = sub_02023790(32, param1); + Strbuf* v0 = sub_02023790(32, param1); UnkStruct_0200B144 * v1 = sub_0200B144(0, 26, 697, param1); sub_0200B1B8(v1, 0, v0); @@ -765,7 +765,7 @@ static void ov21_021D63DC (UnkStruct_ov21_021D13FC * param0, int param1, int par static void ov21_021D64B0 (UnkStruct_ov21_021D13FC * param0, int param1, int param2) { - UnkStruct_02023790 * v0 = sub_02023790(32, param1); + Strbuf* v0 = sub_02023790(32, param1); UnkStruct_0200B144 * v1 = sub_0200B144(0, 26, 697, param1); sub_0200B1B8(v1, 109, v0); @@ -1295,7 +1295,7 @@ static void ov21_021D6DF4 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D { UnkStruct_ov21_021D4CB8 v0; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2 = sub_02023790(32, param2); + Strbuf* v2 = sub_02023790(32, param2); UnkStruct_0200B144 * v3 = sub_0200B144(0, 26, 697, param2); v0.unk_00 = param1->unk_14C; diff --git a/src/overlay021/ov21_021D85B0.c b/src/overlay021/ov21_021D85B0.c index 258399cadd..53e683d1d5 100644 --- a/src/overlay021/ov21_021D85B0.c +++ b/src/overlay021/ov21_021D85B0.c @@ -683,7 +683,7 @@ static void ov21_021D8DC0 (UnkStruct_ov21_021D9320 * param0) static void ov21_021D8DD4 (UnkStruct_ov21_021D879C * param0, int param1, int param2) { UnkStruct_ov21_021D13FC * v0 = param0->unk_00; - UnkStruct_02023790 * v1; + Strbuf* v1; int v2; sub_0201AE78(&v0->unk_04, 0, 24, 8, 208, 32); @@ -719,7 +719,7 @@ static void ov21_021D8DD4 (UnkStruct_ov21_021D879C * param0, int param1, int par static void ov21_021D8E68 (UnkStruct_ov21_021D879C * param0, int param1) { UnkStruct_ov21_021D13FC * v0 = param0->unk_00; - UnkStruct_02023790 * v1; + Strbuf* v1; sub_0201AE78(&v0->unk_04, 0, 24, 8, 208, 32); @@ -829,7 +829,7 @@ static void ov21_021D8F98 (UnkStruct_ov21_021D879C * param0, int param1, int par static void ov21_021D9054 (UnkStruct_ov21_021D879C * param0, int param1, int param2) { UnkStruct_ov21_021D13FC * v0 = param0->unk_00; - UnkStruct_02023790 * v1; + Strbuf* v1; int v2; sub_0201AE78(&v0->unk_04, 0, 88, 52, 80, 16); @@ -848,7 +848,7 @@ static void ov21_021D9054 (UnkStruct_ov21_021D879C * param0, int param1, int par static void ov21_021D90B4 (UnkStruct_ov21_021D879C * param0, int param1, int param2) { UnkStruct_ov21_021D13FC * v0 = param0->unk_00; - UnkStruct_02023790 * v1; + Strbuf* v1; int v2; int v3; @@ -900,7 +900,7 @@ static void ov21_021D90B4 (UnkStruct_ov21_021D879C * param0, int param1, int par static void ov21_021D915C (UnkStruct_ov21_021D879C * param0, int param1, int param2, int param3) { UnkStruct_ov21_021D13FC * v0 = param0->unk_00; - UnkStruct_02023790 * v1; + Strbuf* v1; int v2; int v3; @@ -1078,7 +1078,7 @@ static void ov21_021D9390 (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D static void ov21_021D93F4 (UnkStruct_ov21_021D879C * param0, int param1) { UnkStruct_ov21_021D13FC * v0 = param0->unk_00; - UnkStruct_02023790 * v1; + Strbuf* v1; int v2; sub_0201ADA4(¶m0->unk_00->unk_04, 0); diff --git a/src/overlay021/ov21_021DE668.c b/src/overlay021/ov21_021DE668.c index 543fb289d4..28a9bde2ec 100644 --- a/src/overlay021/ov21_021DE668.c +++ b/src/overlay021/ov21_021DE668.c @@ -432,7 +432,7 @@ static void ov21_021DEB58 (UnkStruct_ov21_021DE760 * param0, const UnkStruct_ov2 void ov21_021DEB8C (UnkStruct_0205AA50 * param0, int param1, int param2, int param3, u32 param4) { - UnkStruct_02023790 * v0 = sub_02023790(64, param2); + Strbuf* v0 = sub_02023790(64, param2); UnkStruct_0200B144 * v1 = sub_0200B144(0, 26, 697, param2); sub_0200B1B8(v1, 9, v0); @@ -450,7 +450,7 @@ void ov21_021DEB8C (UnkStruct_0205AA50 * param0, int param1, int param2, int par static void ov21_021DEC2C (UnkStruct_0205AA50 * param0, int param1, int param2, u32 param3) { - UnkStruct_02023790 * v0 = sub_02023790(64, param1); + Strbuf* v0 = sub_02023790(64, param1); UnkStruct_0200B144 * v1; int v2; @@ -465,7 +465,7 @@ static void ov21_021DEC2C (UnkStruct_0205AA50 * param0, int param1, int param2, static void ov21_021DEC80 (UnkStruct_0205AA50 * param0, int param1, int param2, u32 param3) { - UnkStruct_02023790 * v0 = sub_02023790(64, param1); + Strbuf* v0 = sub_02023790(64, param1); UnkStruct_0200B144 * v1; int v2; @@ -480,7 +480,7 @@ static void ov21_021DEC80 (UnkStruct_0205AA50 * param0, int param1, int param2, static void ov21_021DECD4 (UnkStruct_0205AA50 * param0, int param1, int param2, int param3, u32 param4) { - UnkStruct_02023790 * v0 = ov21_021D56BC(param2, GAME_LANGUAGE, param3, param1); + Strbuf* v0 = ov21_021D56BC(param2, GAME_LANGUAGE, param3, param1); u32 v1 = sub_02002EB4(0, v0, 0); u32 v2 = (v1 < 240) ? 128 - v1 / 2 : 8; @@ -793,7 +793,7 @@ static void ov21_021DF214 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D UnkStruct_0205AA50 * ov21_021DF30C (UnkStruct_ov21_021D4C0C * param0, int param1, int param2) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = ov21_021D4D6C(param0, 18, 2); v1 = ov21_021D566C(param1, GAME_LANGUAGE, param2); diff --git a/src/overlay021/ov21_021E0C68.c b/src/overlay021/ov21_021E0C68.c index 6e0ae5e99e..fd818bd7c6 100644 --- a/src/overlay021/ov21_021E0C68.c +++ b/src/overlay021/ov21_021E0C68.c @@ -423,7 +423,7 @@ static void ov21_021E0FBC (UnkStruct_ov21_021E0D7C * param0, int param1) static void ov21_021E10D0 (UnkStruct_ov21_021E0D7C * param0, const UnkStruct_ov21_021E0D68 * param1, int param2) { - UnkStruct_02023790 * v0 = sub_02023790(64, param2); + Strbuf* v0 = sub_02023790(64, param2); UnkStruct_0200B144 * v1 = sub_0200B144(0, 26, 697, param2); int v2 = ov21_021D37BC(param1->unk_04); int v3; @@ -452,7 +452,7 @@ static void ov21_021E10D0 (UnkStruct_ov21_021E0D7C * param0, const UnkStruct_ov2 static void ov21_021E1188 (UnkStruct_ov21_021E0D7C * param0, int param1, int param2, int param3, int param4) { - UnkStruct_02023790 * v0 = ov21_021D56BC(param2, param3, param4, param1); + Strbuf* v0 = ov21_021D56BC(param2, param3, param4, param1); u32 v1 = sub_02002EB4(0, v0, 0); u32 v2 = (v1 < 240) ? 128 - v1 / 2 : 8; @@ -571,7 +571,7 @@ static void ov21_021E136C (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E static UnkStruct_0205AA50 * ov21_021E1460 (UnkStruct_ov21_021E0D7C * param0, int param1, int param2) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = ov21_021D4D6C(param0->unk_00->unk_14C, 18, 2); v1 = ov21_021D566C(param1, GAME_LANGUAGE, param2); @@ -825,7 +825,7 @@ static int ov21_021E185C (int param0) static void ov21_021E18A0 (UnkStruct_ov21_021E0D7C * param0, int param1, int param2, int param3) { - UnkStruct_02023790 * v0 = ov21_021D561C(param2, param3, param1); + Strbuf* v0 = ov21_021D561C(param2, param3, param1); sub_0201D78C(¶m0->unk_00->unk_04, 0, v0, 120, 96, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); ov21_021D5600(v0); @@ -833,7 +833,7 @@ static void ov21_021E18A0 (UnkStruct_ov21_021E0D7C * param0, int param1, int par static void ov21_021E18DC (UnkStruct_ov21_021E0D7C * param0, int param1, int param2, int param3) { - UnkStruct_02023790 * v0 = ov21_021D566C(param2, param3, param1); + Strbuf* v0 = ov21_021D566C(param2, param3, param1); u32 v1; v1 = 240 - sub_02002D7C(0, v0, 0); diff --git a/src/overlay021/ov21_021E6014.c b/src/overlay021/ov21_021E6014.c index 58f5c5d506..f0208f616b 100644 --- a/src/overlay021/ov21_021E6014.c +++ b/src/overlay021/ov21_021E6014.c @@ -459,7 +459,7 @@ static void ov21_021E65FC (UnkStruct_ov21_021E6274 * param0) static void ov21_021E6600 (UnkStruct_ov21_021E6118 * param0, int param1) { - UnkStruct_02023790 * v0 = sub_02023790(32, param1); + Strbuf* v0 = sub_02023790(32, param1); UnkStruct_0200B144 * v1 = sub_0200B144(0, 26, 697, param1); sub_0200B1B8(v1, 43, v0); @@ -479,10 +479,10 @@ static void ov21_021E6600 (UnkStruct_ov21_021E6118 * param0, int param1) static void ov21_021E66B0 (UnkStruct_ov21_021E6118 * param0, const UnkStruct_ov21_021E6104 * param1, int param2) { - UnkStruct_02023790 * v0 = sub_02023790(32, param2); + Strbuf* v0 = sub_02023790(32, param2); UnkStruct_0200B144 * v1; int v2 = ov21_021D37BC(param1->unk_04); - UnkStruct_02023790 * v3 = sub_0200B32C(v2, param2); + Strbuf* v3 = sub_0200B32C(v2, param2); int v4; v4 = sub_020989D0(); diff --git a/src/overlay021/ov21_021E737C.c b/src/overlay021/ov21_021E737C.c index 1b6ff1898f..2080c90eba 100644 --- a/src/overlay021/ov21_021E737C.c +++ b/src/overlay021/ov21_021E737C.c @@ -710,7 +710,7 @@ static void ov21_021E7CF4 (UnkStruct_ov21_021E7714 * param0) static void ov21_021E7CF8 (UnkStruct_ov21_021E747C * param0, int param1) { - UnkStruct_02023790 * v0 = sub_02023790(32, param1); + Strbuf* v0 = sub_02023790(32, param1); UnkStruct_0200B144 * v1 = sub_0200B144(0, 26, 697, param1); sub_0200B1B8(v1, 44, v0); @@ -730,10 +730,10 @@ static void ov21_021E7CF8 (UnkStruct_ov21_021E747C * param0, int param1) static void ov21_021E7DA8 (UnkStruct_ov21_021E747C * param0, const UnkStruct_ov21_021E7468 * param1, int param2) { - UnkStruct_02023790 * v0 = sub_02023790(32, param2); + Strbuf* v0 = sub_02023790(32, param2); UnkStruct_0200B144 * v1; int v2 = ov21_021D37BC(param1->unk_00); - UnkStruct_02023790 * v3 = sub_0200B32C(v2, param2); + Strbuf* v3 = sub_0200B32C(v2, param2); int v4; v4 = sub_020989C4(); diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c index 103025e89f..1dbdbcc851 100644 --- a/src/overlay021/ov21_021E8D48.c +++ b/src/overlay021/ov21_021E8D48.c @@ -760,7 +760,7 @@ static void ov21_021E9968 (UnkStruct_0205AA50 * param0, int param1, int param2) static void ov21_021E998C (UnkStruct_0205AA50 * param0, int param1) { - UnkStruct_02023790 * v0 = sub_02023790(64, param1); + Strbuf* v0 = sub_02023790(64, param1); UnkStruct_0200B144 * v1 = sub_0200B144(0, 26, 697, param1); sub_0200B1B8(v1, 110, v0); diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c index e7ef7c29b1..68e1c5f946 100644 --- a/src/overlay022/ov22_02255D44.c +++ b/src/overlay022/ov22_02255D44.c @@ -112,7 +112,7 @@ typedef struct { UnkStruct_02095C60 * unk_734; const UnkStruct_020279FC * unk_738; u32 unk_73C; - UnkStruct_02023790 * unk_740; + Strbuf* unk_740; UnkStruct_0200B358 * unk_744; } UnkStruct_ov22_02255D44; @@ -1148,7 +1148,7 @@ static void ov22_02256F38 (UnkStruct_02029C68 * param0, UnkStruct_ov22_02257964 { UnkStruct_ov22_02259560 * v0; int v1; - UnkStruct_02023790 * v2; + Strbuf* v2; int v3; sub_02029F84(param0); @@ -1194,7 +1194,7 @@ static void ov22_02256FD8 (UnkStruct_02029C88 * param0, UnkStruct_ov22_02257964 int v1; UnkStruct_ov22_02256FD8 * v2; UnkStruct_ov22_02259560 * v3; - UnkStruct_02023790 * v4; + Strbuf* v4; int v5; v2 = Heap_AllocFromHeap(13, sizeof(UnkStruct_ov22_02256FD8)); @@ -1343,7 +1343,7 @@ static u32 ov22_02257278 (UnkStruct_ov22_02255D44 * param0) static void ov22_022572A0 (UnkStruct_ov22_02255D44 * param0, u32 param1, u8 param2, u8 param3, u8 param4, u8 param5) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; int v2 = sub_02027B50(param0->unk_738); sub_02002E98(0, 7 * 32, 14); @@ -1364,8 +1364,8 @@ static void ov22_022572A0 (UnkStruct_ov22_02255D44 * param0, u32 param1, u8 para static void ov22_02257368 (UnkStruct_ov22_02255D44 * param0, u32 param1) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; sub_0201ADA4(param0->unk_718, 15); @@ -1386,7 +1386,7 @@ static u32 ov22_022573EC (UnkStruct_ov22_02255D44 * param0, u32 param1) u32 v0; UnkStruct_0200B144 * v1; u32 v2; - UnkStruct_02023790 * v3; + Strbuf* v3; GF_ASSERT(param0->unk_740 == NULL); diff --git a/src/overlay022/ov22_02259C58.c b/src/overlay022/ov22_02259C58.c index a7961a162c..32e048e704 100644 --- a/src/overlay022/ov22_02259C58.c +++ b/src/overlay022/ov22_02259C58.c @@ -513,7 +513,7 @@ static void ov22_0225A338 (UnkStruct_ov22_02259C58 * param0, int param1, int par static UnkStruct_0205AA50 * ov22_0225A348 (UnkStruct_ov22_0225A0E4 * param0, u32 param1, u32 param2, u32 param3, int param4, int param5) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; UnkStruct_0205AA50 * v2; v0 = sub_0200B144(0, param1, param2, 13); diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c index 9ff9410332..b5e50def98 100644 --- a/src/overlay022/ov22_0225A428.c +++ b/src/overlay022/ov22_0225A428.c @@ -46,9 +46,9 @@ static void ov22_0225A748(UnkStruct_0205AA50 ** param0, UnkStruct_02018340 * par static void ov22_0225A7B8(UnkStruct_ov22_022597BC * param0); static void ov22_0225A7C0(UnkStruct_0205AA50 * param0); static s32 ov22_0225A7CC(UnkStruct_0205AA50 * param0, int param1, int param2, int param3, int param4, int param5, u32 param6); -static s32 ov22_0225A814(UnkStruct_0205AA50 * param0, int param1, int param2, int param3, int param4, int param5, u32 param6, UnkStruct_02023790 ** param7); +static s32 ov22_0225A814(UnkStruct_0205AA50 * param0, int param1, int param2, int param3, int param4, int param5, u32 param6, Strbuf **param7); static s32 ov22_0225A860(UnkStruct_0205AA50 * param0, int param1, int param2, int param3, int param4, int param5, u32 param6, u32 param7); -static s32 ov22_0225A8B4(UnkStruct_0205AA50 * param0, int param1, int param2, int param3, int param4, int param5, u32 param6, u32 param7, UnkStruct_02023790 ** param8); +static s32 ov22_0225A8B4(UnkStruct_0205AA50 * param0, int param1, int param2, int param3, int param4, int param5, u32 param6, u32 param7, Strbuf **param8); static void ov22_0225A914(UnkStruct_ov22_0225A914 * param0, UnkStruct_020218BC * param1, UnkStruct_02009714 ** param2, int param3, NARC * param4); static void ov22_0225A9C8(UnkStruct_ov22_0225A914 * param0, int param1); static void ov22_0225AA10(UnkStruct_ov22_0225A914 * param0, UnkStruct_02009714 ** param1); @@ -246,7 +246,7 @@ static s32 ov22_0225A7CC (UnkStruct_0205AA50 * param0, int param1, int param2, i return v0; } -static s32 ov22_0225A814 (UnkStruct_0205AA50 * param0, int param1, int param2, int param3, int param4, int param5, u32 param6, UnkStruct_02023790 ** param7) +static s32 ov22_0225A814 (UnkStruct_0205AA50 * param0, int param1, int param2, int param3, int param4, int param5, u32 param6, Strbuf **param7) { s32 v0; @@ -260,7 +260,7 @@ static s32 ov22_0225A814 (UnkStruct_0205AA50 * param0, int param1, int param2, i static s32 ov22_0225A860 (UnkStruct_0205AA50 * param0, int param1, int param2, int param3, int param4, int param5, u32 param6, u32 param7) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; s32 v2; v0 = sub_0200B144(0, param1, param2, 13); @@ -275,7 +275,7 @@ static s32 ov22_0225A860 (UnkStruct_0205AA50 * param0, int param1, int param2, i return v2; } -static s32 ov22_0225A8B4 (UnkStruct_0205AA50 * param0, int param1, int param2, int param3, int param4, int param5, u32 param6, u32 param7, UnkStruct_02023790 ** param8) +static s32 ov22_0225A8B4 (UnkStruct_0205AA50 * param0, int param1, int param2, int param3, int param4, int param5, u32 param6, u32 param7, Strbuf **param8) { UnkStruct_0200B144 * v0; s32 v1; diff --git a/src/overlay022/ov22_0225B660.c b/src/overlay022/ov22_0225B660.c index 89352fc7c0..d4ed2d0304 100644 --- a/src/overlay022/ov22_0225B660.c +++ b/src/overlay022/ov22_0225B660.c @@ -282,8 +282,8 @@ static void ov22_0225BB00 (UnkStruct_ov22_0225B85C * param0) int v3; u16 v4; UnkStruct_0200B358 * v5; - UnkStruct_02023790 * v6; - UnkStruct_02023790 * v7; + Strbuf* v6; + Strbuf* v7; UnkStruct_0200B144 * v8; v8 = sub_0200B144(0, 26, 385, 13); @@ -328,8 +328,8 @@ static void ov22_0225BC18 (UnkStruct_ov22_0225B85C * param0) { int v0; UnkStruct_0200B358 * v1; - UnkStruct_02023790 * v2; - UnkStruct_02023790 * v3; + Strbuf* v2; + Strbuf* v3; int v4; Pokemon * v5; BoxPokemon * v6; diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c index facfdc46f5..8f63c16e69 100644 --- a/src/overlay023/ov23_0223E140.c +++ b/src/overlay023/ov23_0223E140.c @@ -3097,7 +3097,7 @@ static void ov23_022414D4 (void) } } -BOOL ov23_022415B8 (UnkStruct_02023790 * param0) +BOOL ov23_022415B8 (Strbuf *param0) { int v0; UnkStruct_02025E6C * v1; diff --git a/src/overlay023/ov23_022416A8.c b/src/overlay023/ov23_022416A8.c index fd3ed6c227..0805bfadfb 100644 --- a/src/overlay023/ov23_022416A8.c +++ b/src/overlay023/ov23_022416A8.c @@ -486,11 +486,11 @@ int ov23_02241D38 (int param0) return 0; } -BOOL ov23_02241D58 (UnkStruct_02023790 * param0) +BOOL ov23_02241D58 (Strbuf *param0) { int v0; UnkStruct_0200B358 * v1 = NULL; - UnkStruct_02023790 * v2 = NULL; + Strbuf* v2 = NULL; BOOL v3 = 0; if (!Unk_ov23_02257744) { diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c index 4200996113..a58c170bde 100644 --- a/src/overlay023/ov23_02241F74.c +++ b/src/overlay023/ov23_02241F74.c @@ -77,7 +77,7 @@ typedef struct { u8 unk_C2[8]; u8 unk_CA[8]; u8 unk_D2[8]; - UnkStruct_02023790 * unk_DC[8]; + Strbuf* unk_DC[8]; u8 unk_FC[8]; u8 unk_104[8]; u8 unk_10C[8]; @@ -218,10 +218,10 @@ void ov23_022421EC (void) ov23_02254210(Unk_ov23_02257748->unk_128); } -BOOL ov23_0224223C (UnkStruct_02025E6C * param0, UnkStruct_02025E6C * param1, int param2, UnkStruct_02023790 * param3) +BOOL ov23_0224223C (UnkStruct_02025E6C * param0, UnkStruct_02025E6C * param1, int param2, Strbuf *param3) { UnkStruct_0200B358 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; if (param0 && param1) { v0 = sub_0200B358(4); @@ -240,10 +240,10 @@ BOOL ov23_0224223C (UnkStruct_02025E6C * param0, UnkStruct_02025E6C * param1, in return 0; } -BOOL ov23_022422A8 (UnkStruct_02025E6C * param0, int param1, int param2, UnkStruct_02023790 * param3) +BOOL ov23_022422A8 (UnkStruct_02025E6C * param0, int param1, int param2, Strbuf *param3) { UnkStruct_0200B358 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; if (param0) { v0 = sub_0200B358(4); @@ -261,11 +261,11 @@ BOOL ov23_022422A8 (UnkStruct_02025E6C * param0, int param1, int param2, UnkStru return 0; } -static BOOL ov23_02242308 (UnkStruct_02023790 * param0) +static BOOL ov23_02242308 (Strbuf *param0) { int v0; UnkStruct_0200B358 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; UnkStruct_02025E6C * v3; UnkStruct_02025E6C * v4; @@ -855,7 +855,7 @@ void ov23_02242D44 (UnkStruct_0203CDB0 * param0) } } -BOOL ov23_02242D60 (UnkStruct_02023790 * param0) +BOOL ov23_02242D60 (Strbuf *param0) { if (Unk_ov23_02257748->unk_14C) { Unk_ov23_02257748->unk_14C = 0; @@ -1054,7 +1054,7 @@ void ov23_02243020 (int param0) void ov23_02243038 (int param0) { UnkStruct_0200B358 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; if (Unk_ov23_02257748) { if (Unk_ov23_02257748->unk_DC[param0] == NULL) { diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c index c52b425176..24d1ebb0b4 100644 --- a/src/overlay023/ov23_0224340C.c +++ b/src/overlay023/ov23_0224340C.c @@ -1663,7 +1663,7 @@ void ov23_0224467C (int param0, int param1, void * param2, void * param3) } } -BOOL ov23_022446B0 (UnkStruct_02023790 * param0) +BOOL ov23_022446B0 (Strbuf *param0) { int v0, v1; UnkStruct_02025E6C * v2; @@ -1708,7 +1708,7 @@ BOOL ov23_022446B0 (UnkStruct_02023790 * param0) return 0; } -BOOL ov23_02244784 (UnkStruct_02023790 * param0) +BOOL ov23_02244784 (Strbuf *param0) { int v0, v1; UnkStruct_02025E6C * v2; diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c index e3fe666cc9..7df8c19592 100644 --- a/src/overlay023/ov23_02248F1C.c +++ b/src/overlay023/ov23_02248F1C.c @@ -42,9 +42,9 @@ #include "overlay023/ov23_02248F1C.h" typedef struct { - UnkStruct_02023790 * unk_00[32]; - UnkStruct_02023790 * unk_80; - UnkStruct_02023790 * unk_84[2]; + Strbuf* unk_00[32]; + Strbuf* unk_80; + Strbuf* unk_84[2]; int unk_8C; int unk_90; u16 unk_94[80]; @@ -83,8 +83,8 @@ static void ov23_02249438(UnkStruct_02018340 * param0); static void ov23_0224966C(UnkStruct_02018340 * param0, UnkStruct_0205AA50 * param1, int * param2, int * param3, int * param4, UnkStruct_ov23_02249724 * param5); static void ov23_02249724(UnkStruct_ov23_02249724 * param0); static void ov23_02249778(UnkStruct_ov23_02249724 * param0); -static int ov23_02249844(UnkStruct_ov23_02249724 * param0, UnkStruct_02023790 * param1); -static UnkStruct_02023790 * ov23_022498C4(UnkStruct_ov23_02249724 * param0); +static int ov23_02249844(UnkStruct_ov23_02249724 * param0, Strbuf *param1); +static Strbuf* ov23_022498C4(UnkStruct_ov23_02249724 * param0); static int ov23_02249900(UnkStruct_ov23_02249724 * param0); static void ov23_0224937C(int param0[][4], UnkStruct_02022550 * param1[]); static void ov23_02249334(int param0[][4]); @@ -469,7 +469,7 @@ static void ov23_02249584 (UnkStruct_ov23_0224942C * param0) static void ov23_0224966C (UnkStruct_02018340 * param0, UnkStruct_0205AA50 * param1, int * param2, int * param3, int * param4, UnkStruct_ov23_02249724 * param5) { - UnkStruct_02023790 * v0; + Strbuf* v0; while (ov23_02242D60(param5->unk_80)) { ov23_02249844(param5, param5->unk_80); @@ -535,7 +535,7 @@ static void ov23_02249778 (UnkStruct_ov23_02249724 * param0) } } -static int ov23_022497B0 (UnkStruct_ov23_02249724 * param0, UnkStruct_02023790 * param1) +static int ov23_022497B0 (UnkStruct_ov23_02249724 * param0, Strbuf *param1) { int v0, v1, v2; @@ -567,7 +567,7 @@ static int ov23_022497B0 (UnkStruct_ov23_02249724 * param0, UnkStruct_02023790 * return 2; } -static int ov23_02249844 (UnkStruct_ov23_02249724 * param0, UnkStruct_02023790 * param1) +static int ov23_02249844 (UnkStruct_ov23_02249724 * param0, Strbuf *param1) { int v0, v1, v2; @@ -596,7 +596,7 @@ static int ov23_02249844 (UnkStruct_ov23_02249724 * param0, UnkStruct_02023790 * return 1; } -static UnkStruct_02023790 * ov23_022498C4 (UnkStruct_ov23_02249724 * param0) +static Strbuf* ov23_022498C4 (UnkStruct_ov23_02249724 * param0) { int v0; diff --git a/src/overlay023/ov23_0224A1D0.c b/src/overlay023/ov23_0224A1D0.c index 8dd5558c0c..3d7cc94e8e 100644 --- a/src/overlay023/ov23_0224A1D0.c +++ b/src/overlay023/ov23_0224A1D0.c @@ -533,7 +533,7 @@ void ov23_0224AAB0 (void) sub_020360D0(91, v0->unk_290[sub_0203608C()]); } else { UnkStruct_02025E6C * v0 = sub_02025E6C(15); - UnkStruct_02023790 * v1 = sub_02023790(20, 15); + Strbuf* v1 = sub_02023790(20, 15); GF_ASSERT(v0); GF_ASSERT(v1); @@ -555,7 +555,7 @@ void ov23_0224AB30 (int param0, int param1, void * param2, void * param3) UnkStruct_ov23_0224A294 * v0 = sub_02057518(); int v1; const UnkStruct_02025E6C * v2 = param2; - UnkStruct_02023790 * v3; + Strbuf* v3; u8 v4 = param0; if (v0) { diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c index c4c6e87a06..a46e27ce09 100644 --- a/src/overlay023/ov23_0224B05C.c +++ b/src/overlay023/ov23_0224B05C.c @@ -2031,7 +2031,7 @@ void ov23_0224CF18 (int param0, int param1, void * param2, void * param3) } } -BOOL ov23_0224D020 (UnkStruct_02023790 * param0) +BOOL ov23_0224D020 (Strbuf *param0) { int v0, v1; UnkStruct_02025E6C * v2; diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c index 43628e0b7d..9885f96655 100644 --- a/src/overlay023/ov23_0224F294.c +++ b/src/overlay023/ov23_0224F294.c @@ -499,7 +499,7 @@ static void ov23_0224F7F4 (UnkStruct_ov23_02250CD4 * param0) for (v4 = 0; v4 < NELEMS(Unk_ov23_02256924); v4++) { if (v4 == v1) { const UnkStruct_02025E6C * v5 = sub_02025E38(sub_0203D174(param0->unk_0C)); - UnkStruct_02023790 * v6 = sub_02025F04(v5, 4); + Strbuf* v6 = sub_02025F04(v5, 4); sub_02013A6C(param0->unk_40, v6, Unk_ov23_02256924[v4].unk_04); sub_020237BC(v6); diff --git a/src/overlay023/ov23_02253598.c b/src/overlay023/ov23_02253598.c index 57c1059247..2f11c59b26 100644 --- a/src/overlay023/ov23_02253598.c +++ b/src/overlay023/ov23_02253598.c @@ -477,8 +477,8 @@ void ov23_02253A00 (UnkStruct_0202855C * param0, int param1) static void ov23_02253A78 (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, UnkStruct_02025E6C * param2, const UnkStruct_0202855C * param3, const UnkStruct_020298B0 * param4) { UnkStruct_0200B358 * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; int v3, v4; const int v5 = 17; const int v6 = 39; diff --git a/src/overlay023/ov23_02253D40.c b/src/overlay023/ov23_02253D40.c index 9eb750b671..bf0dd7fee3 100644 --- a/src/overlay023/ov23_02253D40.c +++ b/src/overlay023/ov23_02253D40.c @@ -26,8 +26,8 @@ #include "overlay023/ov23_02253D40.h" typedef struct UnkStruct_ov23_02253E2C_t { - UnkStruct_02023790 * unk_00; - UnkStruct_02023790 * unk_04; + Strbuf* unk_00; + Strbuf* unk_04; UnkStruct_0205AA50 unk_08; UnkStruct_02018340 * unk_18; UnkStruct_ov23_02253F60 unk_1C; @@ -154,9 +154,9 @@ static void ov23_02253E40 (UnkStruct_0201CD38 * param0, void * param1) } } -static UnkStruct_02023790 * ov23_02253E6C (UnkStruct_ov23_02253E2C * param0) +static Strbuf* ov23_02253E6C (UnkStruct_ov23_02253E2C * param0) { - UnkStruct_02023790 * v0 = param0->unk_00; + Strbuf* v0 = param0->unk_00; if (param0->unk_44_1) { sub_0200C388(param0->unk_28, param0->unk_04, param0->unk_00); @@ -169,7 +169,7 @@ static UnkStruct_02023790 * ov23_02253E6C (UnkStruct_ov23_02253E2C * param0) static int ov23_02253E90 (UnkStruct_ov23_02253E2C * param0, BOOL param1, UnkStruct_ov23_02253F60 param2, int param3) { - UnkStruct_02023790 * v0; + Strbuf* v0; ov23_02253FA4(param0, 0); ov23_022421EC(); diff --git a/src/overlay023/ov23_022542CC.c b/src/overlay023/ov23_022542CC.c index 9a2509359a..4f5b4b83c4 100644 --- a/src/overlay023/ov23_022542CC.c +++ b/src/overlay023/ov23_022542CC.c @@ -40,7 +40,7 @@ typedef struct UnkStruct_ov23_022542D8_t { UnkStruct_0205AA50 unk_14; UnkStruct_02013A04 * unk_24; UnkStruct_0200112C * unk_28; - UnkStruct_02023790 * unk_2C; + Strbuf* unk_2C; u16 * unk_30; u16 * unk_34; u8 unk_38; @@ -56,7 +56,7 @@ typedef struct UnkStruct_ov23_02254594_t { UnkStruct_02013A04 * unk_28; UnkStruct_ov23_02248D20 * unk_2C; UnkStruct_0200112C * unk_30; - UnkStruct_02023790 * unk_34; + Strbuf* unk_34; u16 * unk_38; u16 * unk_3C; u8 unk_40; @@ -182,7 +182,7 @@ static void ov23_0225437C (UnkStruct_ov23_022542D8 * param0) v5 = sub_0200B144(0, 26, 637, 4); { - UnkStruct_02023790 * v8; + Strbuf* v8; sub_0201ADA4(¶m0->unk_14, 15); v8 = sub_0200B1EC(v5, 0); @@ -425,9 +425,9 @@ static void ov23_022546E0 (UnkStruct_ov23_02254594 * param0) { UnkStruct_0200B144 * v12; - UnkStruct_02023790 * v13; - UnkStruct_02023790 * v14; - UnkStruct_02023790 * v15; + Strbuf* v13; + Strbuf* v14; + Strbuf* v15; UnkStruct_0200B358 * v16; v12 = sub_0200B144(0, 26, 637, 4); diff --git a/src/overlay043/ov43_02256544.c b/src/overlay043/ov43_02256544.c index 47d0cbd35c..b9bf7d1609 100644 --- a/src/overlay043/ov43_02256544.c +++ b/src/overlay043/ov43_02256544.c @@ -44,7 +44,7 @@ struct UnkStruct_ov43_02256544_t { UnkStruct_0205AA50 unk_A4; UnkStruct_0200B144 * unk_B4; UnkStruct_0200B144 * unk_B8; - UnkStruct_02023790 * unk_BC; + Strbuf* unk_BC; }; static void ov43_022565B4(UnkStruct_ov43_02256544 * param0); diff --git a/src/overlay048/ov48_0225650C.c b/src/overlay048/ov48_0225650C.c index a96ef9edfb..72f93108c9 100644 --- a/src/overlay048/ov48_0225650C.c +++ b/src/overlay048/ov48_0225650C.c @@ -157,7 +157,7 @@ static void ov48_022565A8 (UnkStruct_0201CD38 * param0, void * param1) static void ov48_02256650 (UnkStruct_ov48_0225650C * param0, u32 param1) { UnkStruct_0205AA50 v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v1 = sub_0200B010(26, 459, 0, 8); diff --git a/src/overlay052/ov52_02256694.c b/src/overlay052/ov52_02256694.c index ea63ac3d28..c890ba5c29 100644 --- a/src/overlay052/ov52_02256694.c +++ b/src/overlay052/ov52_02256694.c @@ -39,7 +39,7 @@ struct UnkStruct_ov52_02256694_t { UnkStruct_ov25_022558C4 * unk_34[4]; UnkStruct_ov25_02255958 unk_44; UnkStruct_0200B144 * unk_58; - UnkStruct_02023790 * unk_5C; + Strbuf* unk_5C; }; static void ov52_0225670C(UnkStruct_ov52_02256694 * param0, const UnkStruct_ov52_02256694_1 * param1); diff --git a/src/overlay054/ov54_0225642C.c b/src/overlay054/ov54_0225642C.c index d074493182..a7fce656db 100644 --- a/src/overlay054/ov54_0225642C.c +++ b/src/overlay054/ov54_0225642C.c @@ -131,7 +131,7 @@ static void ov54_022564BC (UnkStruct_0201CD38 * param0, void * param1) sub_0201A9F4(&v4); { - UnkStruct_02023790 * v5 = sub_0200B010(26, 458, 0, 8); + Strbuf* v5 = sub_0200B010(26, 458, 0, 8); if (v5) { sub_0201D78C(&v4, 0, v5, (192 - sub_02002D7C(0, v5, 0)) / 2, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL); diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c index 55a523e839..5446dbff47 100644 --- a/src/overlay056/ov56_022561C0.c +++ b/src/overlay056/ov56_022561C0.c @@ -61,7 +61,7 @@ FS_EXTERN_OVERLAY(overlay56); -struct UnkStruct_02023790_t { +struct Strbuf_t { u16 unk_00; u16 unk_02; u32 unk_04; @@ -140,7 +140,7 @@ static int ov56_02256A68(UnkStruct_ov56_02256468 * param0); static int ov56_02256BC0(UnkStruct_ov56_02256468 * param0); static void ov56_02257100(UnkStruct_ov56_02256468 * param0); static void ov56_02257048(UnkStruct_ov56_02256468 * param0, UnkStruct_02025E6C * param1, UnkStruct_02014A84 * param2, u32 param3); -static UnkStruct_02023790 * ov56_02256E5C(UnkStruct_02027F8C * param0, u32 param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, UnkStruct_02025E6C * param4); +static Strbuf* ov56_02256E5C(UnkStruct_02027F8C * param0, u32 param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, UnkStruct_02025E6C * param4); static void ov56_02256D64(UnkStruct_02018340 * param0, NNSG2dScreenData * param1, UnkStruct_ov56_022562EC * param2, int param3, int param4, int * param5); static void ov56_0225710C(UnkStruct_ov56_02256468 * param0); static void ov56_0225712C(UnkStruct_ov56_02256468 * param0); @@ -781,10 +781,10 @@ static void ov56_02256D64 (UnkStruct_02018340 * param0, NNSG2dScreenData * param sub_02019460(param0, 7, sub_02019FE4(param0, 7), 32 * 24 * 2, 0); } -static UnkStruct_02023790 * ov56_02256E5C (UnkStruct_02027F8C * param0, u32 param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, UnkStruct_02025E6C * param4) +static Strbuf* ov56_02256E5C (UnkStruct_02027F8C * param0, u32 param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, UnkStruct_02025E6C * param4) { - UnkStruct_02023790 * v0 = NULL; - UnkStruct_02023790 * v1; + Strbuf* v0 = NULL; + Strbuf* v1; int v2 = 0; if (param1 != sub_02025F20(param4)) { diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c index 9854240c62..0f8016a74b 100644 --- a/src/overlay058/ov58_021D0D80.c +++ b/src/overlay058/ov58_021D0D80.c @@ -1713,7 +1713,7 @@ static int ov58_021D2A54 (UnkStruct_02095EAC * param0) static void ov58_021D2A98 (UnkStruct_02095EAC * param0, int param1, int param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_02023790((40 * 2), 39); diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c index 4f6daef116..f613cde7b7 100644 --- a/src/overlay059/ov59_021D0D80.c +++ b/src/overlay059/ov59_021D0D80.c @@ -91,7 +91,7 @@ static void ov59_021D26D8(UnkStruct_020961E8 * param0); static int ov59_021D23FC(void); static int ov59_021D2528(void); static void ov59_021D2524(UnkStruct_020961E8 * param0); -static void ov59_021D1784(UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2); +static void ov59_021D1784(UnkStruct_0205AA50 * param0, Strbuf *param1, int param2); static void ov59_021D19B0(UnkStruct_020961E8 * param0, int param1); static void ov59_021D26E8(UnkStruct_020961E8 * param0); static void ov59_021D27FC(UnkStruct_020961E8 * param0, NARC * param1); @@ -706,7 +706,7 @@ static void ov59_021D16A0 (UnkStruct_020961E8 * param0, UnkStruct_020067E8 * par } } -static void ov59_021D1784 (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2) +static void ov59_021D1784 (UnkStruct_0205AA50 * param0, Strbuf *param1, int param2) { int v0 = sub_02002D7C(1, param1, 0); int v1 = (26 * 8 - v0) / 2; @@ -1471,7 +1471,7 @@ static int ov59_021D23FC (void) static BOOL ov59_021D2418 (UnkStruct_0205AA50 * param0, int param1, u32 param2, UnkStruct_020961E8 * param3) { int v0, v1 = sub_0203608C(); - UnkStruct_02023790 * v2 = NULL; + Strbuf* v2 = NULL; if (!ov59_021D254C(param3)) { return 0; @@ -1572,7 +1572,7 @@ static BOOL ov59_021D254C (UnkStruct_020961E8 * param0) static void ov59_021D2628 (UnkStruct_020961E8 * param0, int param1, int param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_02023790((90 * 2), 51); diff --git a/src/overlay061/ov61_0222AE60.c b/src/overlay061/ov61_0222AE60.c index 30be38c544..c10e24646a 100644 --- a/src/overlay061/ov61_0222AE60.c +++ b/src/overlay061/ov61_0222AE60.c @@ -32,7 +32,7 @@ void ov61_0222AE80 (const UnkStruct_ov61_0222AE80 * param0, UnkStruct_02029C68 * void ov61_0222AE88 (UnkStruct_021C0794 * param0, const UnkStruct_020797DC * param1, int param2, UnkStruct_ov62_02239DA4 * param3, int param4) { - UnkStruct_02023790 * v0; + Strbuf* v0; int v1; MI_CpuClear8(param3, sizeof(UnkStruct_ov62_02239DA4)); diff --git a/src/overlay061/ov61_0222B008.c b/src/overlay061/ov61_0222B008.c index 9a6dee402b..37c3f03ff2 100644 --- a/src/overlay061/ov61_0222B008.c +++ b/src/overlay061/ov61_0222B008.c @@ -47,7 +47,7 @@ static int ov61_0222B190(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B1 static int ov61_0222B6D8(UnkStruct_ov62_022349A8 * param0); static int ov61_0222B860(UnkStruct_ov62_022349A8 * param0); static int ov61_0222BBE8(UnkStruct_ov62_022349A8 * param0); -static void ov61_0222BB54(UnkStruct_ov62_022349A8 * param0, UnkStruct_02023790 * param1); +static void ov61_0222BB54(UnkStruct_ov62_022349A8 * param0, Strbuf *param1); static void ov61_0222BB60(UnkStruct_ov62_022349A8 * param0, int param1, int param2); static int ov61_0222B960(UnkStruct_ov62_022349A8 * param0); static void * ov61_0222BBF0(int param0); @@ -740,7 +740,7 @@ BOOL ov61_0222BB48 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov62_0223CAA4 ** return param0->unk_17C.unk_00; } -static void ov61_0222BB54 (UnkStruct_ov62_022349A8 * param0, UnkStruct_02023790 * param1) +static void ov61_0222BB54 (UnkStruct_ov62_022349A8 * param0, Strbuf *param1) { param0->unk_04(param0->unk_08, param1); } @@ -748,7 +748,7 @@ static void ov61_0222BB54 (UnkStruct_ov62_022349A8 * param0, UnkStruct_02023790 static void ov61_0222BB60 (UnkStruct_ov62_022349A8 * param0, int param1, int param2) { int v0; - UnkStruct_02023790 * v1; + Strbuf* v1; if (param1 != -1) { v0 = 0 + param1; diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c index faf9aa19fe..f4a8836f13 100644 --- a/src/overlay061/ov61_0222BF44.c +++ b/src/overlay061/ov61_0222BF44.c @@ -69,9 +69,9 @@ typedef struct { UnkStruct_0200B144 * unk_28; UnkStruct_0200B144 * unk_2C; UnkStruct_0200B144 * unk_30; - UnkStruct_02023790 * unk_34; - UnkStruct_02023790 * unk_38; - UnkStruct_02023790 * unk_3C; + Strbuf* unk_34; + Strbuf* unk_38; + Strbuf* unk_3C; int unk_40; UnkStruct_0205AA50 unk_44; UnkStruct_0205AA50 unk_54; @@ -97,8 +97,8 @@ static void ov61_0222C38C(UnkStruct_02018340 * param0); static void ov61_0222C3B0(UnkStruct_ov61_0222C664 * param0); static void ov61_0222C664(UnkStruct_ov61_0222C664 * param0); static void ov61_0222C70C(UnkStruct_ov61_0222C664 * param0); -static int ov61_0222C728(UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, u32 param4, int param5); -void ov61_0222C760(UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, int param4, u32 param5); +static int ov61_0222C728(UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, u32 param4, int param5); +void ov61_0222C760(UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5); static void ov61_0222C794(UnkStruct_ov61_0222C664 * param0, int param1); static void ov61_0222C7F8(UnkStruct_ov61_0222C664 * param0, int param1, int param2); static int ov61_0222C834(int param0); @@ -481,7 +481,7 @@ static void ov61_0222C70C (UnkStruct_ov61_0222C664 * param0) sub_0201A8FC(¶m0->unk_64); } -static int ov61_0222C728 (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, u32 param4, int param5) +static int ov61_0222C728 (UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, u32 param4, int param5) { int v0 = 0, v1; @@ -499,7 +499,7 @@ static int ov61_0222C728 (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * para return param2; } -void ov61_0222C760 (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, int param4, u32 param5) +void ov61_0222C760 (UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5) { param2 = ov61_0222C728(param0, param1, param2, param4, param5, 1); sub_0201D78C(param0, 1, param1, param2, param3, 0, param5, NULL); @@ -507,7 +507,7 @@ void ov61_0222C760 (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, in static void ov61_0222C794 (UnkStruct_ov61_0222C664 * param0, int param1) { - UnkStruct_02023790 * v0 = sub_02023790((16 * 8 * 2), 117); + Strbuf* v0 = sub_02023790((16 * 8 * 2), 117); sub_0200B1B8(param0->unk_2C, param1, v0); sub_0200C388(param0->unk_20, param0->unk_3C, v0); @@ -573,7 +573,7 @@ static UnkStruct_02001AF4 * ov61_0222C884 (UnkStruct_02018340 * param0, int para static void ov61_0222C8B8 (UnkStruct_ov61_0222C664 * param0, UnkStruct_0200B144 * param1, int param2, int param3, u16 param4) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_0200B1EC(param1, param2); diff --git a/src/overlay062/ov62_022300D8.c b/src/overlay062/ov62_022300D8.c index b1cb0ee17c..ad4a79b95f 100644 --- a/src/overlay062/ov62_022300D8.c +++ b/src/overlay062/ov62_022300D8.c @@ -638,7 +638,7 @@ void ov62_02230E80 (UnkStruct_0208C06C * param0) { s16 v0, v1; UnkStruct_020127E8 v2; - UnkStruct_02023790 * v3; + Strbuf* v3; int v4; UnkStruct_0200B144 * v5; UnkStruct_0205AA50 v6; @@ -684,12 +684,12 @@ void ov62_02230E80 (UnkStruct_0208C06C * param0) void ov62_02230FC8 (UnkStruct_0208C06C * param0, UnkStruct_ov62_022307C0_sub1 * param1, int param2, const UnkStruct_020F3DCC * param3) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0200B144 * v1; UnkStruct_0205AA50 v2; UnkStruct_0200B358 * v3; - UnkStruct_02023790 * v4; - UnkStruct_02023790 * v5; + Strbuf* v4; + Strbuf* v5; v1 = param0->unk_14.unk_34; @@ -758,7 +758,7 @@ void ov62_0223118C (UnkStruct_ov62_022312B0 * param0, UnkStruct_ov62_0223118C * { s16 v0, v1; UnkStruct_020127E8 v2; - UnkStruct_02023790 * v3; + Strbuf* v3; int v4; UnkStruct_0200B144 * v5; UnkStruct_0205AA50 v6; @@ -799,7 +799,7 @@ void ov62_0223118C (UnkStruct_ov62_022312B0 * param0, UnkStruct_ov62_0223118C * void ov62_0223124C (UnkStruct_ov62_022312B0 * param0, UnkStruct_ov62_0223118C * param1, int param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0200B144 * v1; UnkStruct_0205AA50 v2; diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c index 8a6fa92ed4..98b708c083 100644 --- a/src/overlay062/ov62_02231690.c +++ b/src/overlay062/ov62_02231690.c @@ -71,7 +71,7 @@ #include "overlay062/ov62_0224112C.h" #include "overlay062/ov62_02248408.h" -static void ov62_022349E4(UnkStruct_02023790 * param0, int param1); +static void ov62_022349E4(Strbuf *param0, int param1); UnkStruct_0200B358 * ov62_02231690 (u32 param0) { @@ -185,7 +185,7 @@ BOOL ov62_02231974 (UnkStruct_0208C06C * param0) void ov62_0223197C (UnkStruct_0208C06C * param0, int param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0205AA50 * v1 = ¶m0->unk_8A4; if (param0->unk_8A0 == 1) { @@ -236,7 +236,7 @@ void ov62_02231A88 (UnkStruct_0208C06C * param0) void ov62_02231AAC (UnkStruct_0208C06C * param0, int param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0205AA50 * v1 = ¶m0->unk_8A4; if (param0->unk_8A0 == 1) { @@ -260,7 +260,7 @@ void ov62_02231AAC (UnkStruct_0208C06C * param0, int param1) void ov62_02231B3C (UnkStruct_0208C06C * param0, int param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0205AA50 * v1 = ¶m0->unk_8A4; if (param0->unk_8A0 == 0) { @@ -291,7 +291,7 @@ void ov62_02231B8C (UnkStruct_0208C06C * param0) void ov62_02231BC4 (UnkStruct_0208C06C * param0, int param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0205AA50 * v1 = ¶m0->unk_8A4; if (param0->unk_8A0 == 1) { @@ -1027,8 +1027,8 @@ void ov62_022323B8 (UnkStruct_ov62_022323B8 * param0, int param1) static void ov62_022323CC (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1) { - UnkStruct_02023790 * v0; - UnkStruct_02023790 * v1; + Strbuf* v0; + Strbuf* v1; UnkStruct_0200B358 * v2; UnkStruct_0205AA50 * v3; int v4 = sub_02030BFC(param1->unk_88C[0]); @@ -1066,7 +1066,7 @@ void ov62_022324A0 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param { int v0; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; v1 = ¶m0->unk_18; @@ -1106,7 +1106,7 @@ void ov62_02232594 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param { int v0; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; v1 = ¶m0->unk_18; @@ -1144,9 +1144,9 @@ void ov62_02232594 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param } } else { int v3; - UnkStruct_02023790 * v4; - UnkStruct_02023790 * v5; - UnkStruct_02023790 * v6; + Strbuf* v4; + Strbuf* v5; + Strbuf* v6; int v7; for (v0 = 0; v0 < param0->unk_10; v0++) { @@ -1180,7 +1180,7 @@ const int Unk_ov62_022488F8[] = { 0x14 }; -asm void ov62_02232778 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, UnkStruct_0200B144 * param2, const UnkStruct_ov62_02248CDC * param3, int param4, int param5, UnkStruct_02023790 * param6) +asm void ov62_02232778 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, UnkStruct_0200B144 * param2, const UnkStruct_ov62_02248CDC * param3, int param4, int param5, Strbuf *param6) { push {r4, r5, r6, r7, lr} sub sp, #0x1fc @@ -1572,7 +1572,7 @@ asm void ov62_02232778 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * p nop } -void ov62_02232AAC (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, const UnkStruct_ov62_02248CDC * param2, UnkStruct_02023790 * param3[20][2]) +void ov62_02232AAC (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, const UnkStruct_ov62_02248CDC * param2, Strbuf *param3[20][2]) { int v0; UnkStruct_0205AA50 * v1; @@ -1609,7 +1609,7 @@ void ov62_02232AAC (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param sub_0201A9A4(v1); } -int ov62_02232BB4 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, UnkStruct_02023790 * param2[20][2]) +int ov62_02232BB4 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, Strbuf *param2[20][2]) { int v0; int v1 = 0; @@ -1659,7 +1659,7 @@ const int Unk_ov62_02248904[] = { 0x14 }; -asm int ov62_02232C78 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, int param2, int param3, UnkStruct_02023790 * param4) +asm int ov62_02232C78 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, int param2, int param3, Strbuf *param4) { push {r4, r5, r6, r7, lr} sub sp, #0x1fc @@ -2027,7 +2027,7 @@ int ov62_02232F68 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1 int v0; int v1 = 0; UnkStruct_0205AA50 * v2; - UnkStruct_02023790 * v3; + Strbuf* v3; if (param0->unk_28->unk_28 != NULL) { for (v0 = 0; v0 < param0->unk_10; v0++) { @@ -2079,7 +2079,7 @@ int ov62_02233064 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1 int v0; int v1 = 0; UnkStruct_0205AA50 * v2; - UnkStruct_02023790 * v3; + Strbuf* v3; if (param0->unk_38.unk_00 == param0->unk_0C) { return v1; @@ -2096,9 +2096,9 @@ int ov62_02233064 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1 int v4; int v5 = 0; int v6; - UnkStruct_02023790 * v7; - UnkStruct_02023790 * v8; - UnkStruct_02023790 * v9; + Strbuf* v7; + Strbuf* v8; + Strbuf* v9; int v10; int v11; @@ -2799,7 +2799,7 @@ static void ov62_02233B50 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C int v0; int v1; UnkStruct_0205AA50 * v2; - UnkStruct_02023790 * v3; + Strbuf* v3; { s16 v4[][4] = { @@ -2837,9 +2837,9 @@ static void ov62_02233B50 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C } { - UnkStruct_02023790 * v6; - UnkStruct_02023790 * v7; - UnkStruct_02023790 * v8; + Strbuf* v6; + Strbuf* v7; + Strbuf* v8; UnkStruct_0200B358 * v9; UnkStruct_0205AA50 * v10; UnkStruct_02030A80 * v11; @@ -2906,9 +2906,9 @@ static void ov62_02233B50 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C u64 v14 = sub_0202FE98(param0->unk_04, 4, 0); u64 v15 = v14; u32 v16[3]; - UnkStruct_02023790 * v17 = sub_02023790(255, 102); - UnkStruct_02023790 * v18 = sub_02023790(255, 102); - UnkStruct_02023790 * v19 = sub_02023790(255, 102); + Strbuf* v17 = sub_02023790(255, 102); + Strbuf* v18 = sub_02023790(255, 102); + Strbuf* v19 = sub_02023790(255, 102); v10 = ¶m0->unk_3C[4]; v16[0] = v15 % 100000; @@ -3181,7 +3181,7 @@ void ov62_0223427C (UnkStruct_ov62_02233F74 * param0, int param1) } } -int ov62_0223429C (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1) +int ov62_0223429C (UnkStruct_0205AA50 * param0, Strbuf *param1) { int v0 = sub_02002D7C(0, param1, 0); int v1 = (sub_0201C294(param0) * 8 - v0) / 2; @@ -3725,10 +3725,10 @@ BOOL ov62_02234970 (UnkStruct_0208C06C * param0, u64 param1) return 0; } -void ov62_022349A8 (UnkStruct_0208C06C * param0, UnkStruct_02023790 * param1) +void ov62_022349A8 (UnkStruct_0208C06C * param0, Strbuf *param1) { UnkStruct_ov62_022349A8 * v0 = ov62_0224112C(param0); - UnkStruct_02023790 * v1; + Strbuf* v1; int v2 = 64; v1 = sub_02023790(v2, v0->unk_144); @@ -3740,7 +3740,7 @@ void ov62_022349A8 (UnkStruct_0208C06C * param0, UnkStruct_02023790 * param1) sub_020237BC(v1); } -static void ov62_022349E4 (UnkStruct_02023790 * param0, int param1) +static void ov62_022349E4 (Strbuf *param0, int param1) { UnkStruct_0200B144 * v0; diff --git a/src/overlay062/ov62_02234A10.c b/src/overlay062/ov62_02234A10.c index 60d06fead9..89902d0123 100644 --- a/src/overlay062/ov62_02234A10.c +++ b/src/overlay062/ov62_02234A10.c @@ -39,7 +39,7 @@ BOOL ov62_02235008(UnkStruct_0208C06C * param0); static void ov62_02234A10 (UnkStruct_0208C06C * param0) { - UnkStruct_02023790 * v0; + Strbuf* v0; int v1; UnkStruct_0205AA50 * v2 = ¶m0->unk_8A4; diff --git a/src/overlay062/ov62_02235E64.c b/src/overlay062/ov62_02235E64.c index e289b2c8fd..dfb8072e3f 100644 --- a/src/overlay062/ov62_02235E64.c +++ b/src/overlay062/ov62_02235E64.c @@ -287,7 +287,7 @@ static void ov62_022362B8 (UnkStruct_0208C06C * param0) { UnkStruct_ov62_02235E64 * v0 = param0->unk_860; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; int v3 = 1; int v4; @@ -714,7 +714,7 @@ static void ov62_02236BC8 (UnkStruct_0208C06C * param0, int param1) { UnkStruct_ov62_02235E64 * v0 = param0->unk_860; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; int v3; v1 = &v0->unk_178[0]; diff --git a/src/overlay062/ov62_02237D24.c b/src/overlay062/ov62_02237D24.c index 41fc989afb..54bee02403 100644 --- a/src/overlay062/ov62_02237D24.c +++ b/src/overlay062/ov62_02237D24.c @@ -1242,7 +1242,7 @@ static void ov62_02239440 (UnkStruct_0208C06C * param0, int param1) { UnkStruct_ov62_02237D24 * v0 = param0->unk_860; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; int v3; v1 = &v0->unk_D0[0]; diff --git a/src/overlay062/ov62_02239D60.c b/src/overlay062/ov62_02239D60.c index 5f622d78ba..54a9079da4 100644 --- a/src/overlay062/ov62_02239D60.c +++ b/src/overlay062/ov62_02239D60.c @@ -83,7 +83,7 @@ typedef struct { UnkStruct_ov62_02239DBC_sub1 unk_380; UnkStruct_ov61_0222BCF8_sub1_sub1 * unk_38C[20]; UnkStruct_ov61_0222BCF8_sub1_sub1 unk_3DC[20]; - UnkStruct_02023790 * unk_2E0C[20][2]; + Strbuf* unk_2E0C[20][2]; UnkStruct_ov62_02248CDC unk_2EAC; UnkStruct_ov62_022323B8 unk_2ED8; int unk_2F64; @@ -910,7 +910,7 @@ static void ov62_0223AB14 (UnkStruct_0208C06C * param0) int v2 = 1; int v3; int v4; - UnkStruct_02023790 * v5; + Strbuf* v5; for (v3 = 0; v3 < NELEMS(Unk_ov62_02248DC4); v3++) { v1 = &v0->unk_234[v3]; @@ -958,7 +958,7 @@ static void ov62_0223AC0C (UnkStruct_0208C06C * param0, int param1) { UnkStruct_ov62_02239DBC * v0 = param0->unk_860; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; v1 = &v0->unk_1B4[2]; v2 = sub_0200B1EC(param0->unk_14.unk_34, param1); @@ -973,9 +973,9 @@ static void ov62_0223AC58 (UnkStruct_0208C06C * param0, int param1) { UnkStruct_ov62_02239DBC * v0 = param0->unk_860; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; - UnkStruct_02023790 * v3; - UnkStruct_02023790 * v4; + Strbuf* v2; + Strbuf* v3; + Strbuf* v4; UnkStruct_0200B358 * v5; int v6 = 28 + v0->unk_380.unk_00; @@ -1002,7 +1002,7 @@ static void ov62_0223AD20 (UnkStruct_0208C06C * param0) { UnkStruct_ov62_02239DBC * v0 = param0->unk_860; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; int v3; v1 = &v0->unk_1B4[1]; @@ -1041,7 +1041,7 @@ static void ov62_0223ADC0 (UnkStruct_0208C06C * param0, int param1) { UnkStruct_ov62_02239DBC * v0 = param0->unk_860; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; int v3; int v4; u16 v5[255]; @@ -1476,7 +1476,7 @@ static void ov62_0223B6AC (UnkStruct_0208C06C * param0) int v3; int v4; int v5[] = {121, 59}; - UnkStruct_02023790 * v6; + Strbuf* v6; for (v3 = 0; v3 < 2; v3++) { v1 = &v0->unk_234[v3]; @@ -1498,7 +1498,7 @@ static void ov62_0223B768 (UnkStruct_0208C06C * param0, int param1) { UnkStruct_ov62_02239DBC * v0 = param0->unk_860; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; int v3; v1 = &v0->unk_234[0]; @@ -1520,7 +1520,7 @@ static void ov62_0223B7C0 (UnkStruct_0208C06C * param0) int v2 = 1; int v3; int v4; - UnkStruct_02023790 * v5; + Strbuf* v5; for (v3 = 0; v3 < 1; v3++) { v1 = &v0->unk_234[v3]; @@ -1573,7 +1573,7 @@ static void ov62_0223B888 (UnkStruct_0208C06C * param0) int v4; int v5; int v6[] = {27, 19, 26}; - UnkStruct_02023790 * v7; + Strbuf* v7; for (v3 = 0; v3 < NELEMS(Unk_ov62_02248D50); v3++) { v1 = &v0->unk_1B4[v3]; diff --git a/src/overlay062/ov62_0223CAEC.c b/src/overlay062/ov62_0223CAEC.c index 4c8ee92c5d..53be9e6767 100644 --- a/src/overlay062/ov62_0223CAEC.c +++ b/src/overlay062/ov62_0223CAEC.c @@ -69,7 +69,7 @@ typedef struct { UnkStruct_ov62_0223DF10 * unk_71C; UnkStruct_ov62_0223D518_sub1 unk_720; UnkStruct_0200B144 * unk_744; - UnkStruct_02023790 * unk_748; + Strbuf* unk_748; UnkStruct_ov62_02249380 unk_74C[3][20]; UnkStruct_ov62_02248CDC unk_B0C; } UnkStruct_ov62_0223D518; @@ -337,7 +337,7 @@ static void ov62_0223CF2C (UnkStruct_0208C06C * param0) int v2 = 1; int v3; int v4; - UnkStruct_02023790 * v5; + Strbuf* v5; for (v3 = 0; v3 < 2; v3++) { v1 = &v0->unk_84[v3]; @@ -373,7 +373,7 @@ static void ov62_0223D004 (UnkStruct_0208C06C * param0) int v2 = 1; int v3; int v4; - UnkStruct_02023790 * v5; + Strbuf* v5; int v6; if (v0->unk_1C == 0) { @@ -413,7 +413,7 @@ static void ov62_0223D100 (UnkStruct_0208C06C * param0) int v2 = 1; int v3; int v4; - UnkStruct_02023790 * v5; + Strbuf* v5; int v6; if (v0->unk_1C == 0) { diff --git a/src/overlay062/ov62_0223DFA8.c b/src/overlay062/ov62_0223DFA8.c index 6cefdcd6b5..bdf5935175 100644 --- a/src/overlay062/ov62_0223DFA8.c +++ b/src/overlay062/ov62_0223DFA8.c @@ -241,14 +241,14 @@ static void ov62_0223E01C (UnkStruct_0208C06C * param0) static void ov62_0223E0FC (UnkStruct_0208C06C * param0, int param1, int param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0205AA50 * v1 = ¶m0->unk_8A4; UnkStruct_ov62_0223E01C * v2 = param0->unk_860; if (param1 == 100) { UnkStruct_0200B358 * v3; - UnkStruct_02023790 * v4; - UnkStruct_02023790 * v5; + Strbuf* v4; + Strbuf* v5; UnkStruct_02030A80 * v6 = v2->unk_194.unk_00; v3 = ov62_02231690(102); @@ -263,8 +263,8 @@ static void ov62_0223E0FC (UnkStruct_0208C06C * param0, int param1, int param2) sub_0200B3F0(v3); } else if (param1 == 102) { UnkStruct_0200B358 * v7; - UnkStruct_02023790 * v8; - UnkStruct_02023790 * v9; + Strbuf* v8; + Strbuf* v9; UnkStruct_02030A80 * v10 = param0->unk_88C[param2]; v7 = ov62_02231690(102); @@ -822,12 +822,12 @@ BOOL(*const Unk_ov62_022490DC[])(UnkStruct_0208C06C *) = { static void ov62_0223EE88 (UnkStruct_ov62_022312B0 * param0, UnkStruct_0208C06C * param1, int param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0200B144 * v1; UnkStruct_0205AA50 v2; UnkStruct_0200B358 * v3; - UnkStruct_02023790 * v4; - UnkStruct_02023790 * v5; + Strbuf* v4; + Strbuf* v5; v1 = param1->unk_14.unk_34; @@ -1166,7 +1166,7 @@ static void ov62_0223F65C (UnkStruct_0208C06C * param0) UnkStruct_ov62_0223E01C * v0 = param0->unk_860; int v1 = 0; int v2 = 32; - UnkStruct_02023790 * v3; + Strbuf* v3; UnkStruct_0205AA50 * v4; int v5[] = {97, 98, 123}; @@ -1759,7 +1759,7 @@ static BOOL ov62_02240084 (UnkStruct_0208C06C * param0) static void ov62_022402FC (UnkStruct_0208C06C * param0, int param1, BOOL param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0205AA50 * v1 = ¶m0->unk_8A4; UnkStruct_ov62_0223E01C * v2 = param0->unk_860; @@ -1771,8 +1771,8 @@ static void ov62_022402FC (UnkStruct_0208C06C * param0, int param1, BOOL param2) if (param1 == 100) { UnkStruct_0200B358 * v3; - UnkStruct_02023790 * v4; - UnkStruct_02023790 * v5; + Strbuf* v4; + Strbuf* v5; UnkStruct_02030A80 * v6 = v2->unk_194.unk_00; v3 = ov62_02231690(102); @@ -2335,7 +2335,7 @@ static void ov62_022408A8 (UnkStruct_0208C06C * param0, int param1) { UnkStruct_ov62_0223E01C * v0 = param0->unk_860; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; int v3; v1 = &v0->unk_94[0]; @@ -2365,7 +2365,7 @@ static void ov62_02240944 (UnkStruct_0208C06C * param0) { UnkStruct_ov62_0223E01C * v0 = param0->unk_860; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; int v3 = 1; int v4; diff --git a/src/overlay062/ov62_02241204.c b/src/overlay062/ov62_02241204.c index f90c3bdd30..92d05d29d7 100644 --- a/src/overlay062/ov62_02241204.c +++ b/src/overlay062/ov62_02241204.c @@ -627,7 +627,7 @@ static void ov62_022417C0 (UnkStruct_0208C06C * param0, int param1) int v7; int v8 = 0; int v9 = 256; - UnkStruct_02023790 * v10; + Strbuf* v10; UnkStruct_0205AA50 * v11; for (v7 = 0; v7 < v0->unk_794; v7++) { @@ -655,7 +655,7 @@ static void ov62_022418DC (UnkStruct_0208C06C * param0, int param1) { UnkStruct_ov62_02241204 * v0 = param0->unk_860; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; int v3; v1 = &v0->unk_614[3]; @@ -682,7 +682,7 @@ static void ov62_02241954 (UnkStruct_0208C06C * param0, int param1) { UnkStruct_ov62_02241204 * v0 = param0->unk_860; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; u16 v3[255]; v1 = &v0->unk_614[4]; @@ -705,8 +705,8 @@ static void ov62_022419D4 (UnkStruct_0208C06C * param0, int param1, int param2) { UnkStruct_ov62_02241204 * v0 = param0->unk_860; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; - UnkStruct_02023790 * v3; + Strbuf* v2; + Strbuf* v3; UnkStruct_0200B358 * v4; v1 = &v0->unk_614[5]; @@ -769,7 +769,7 @@ static void ov62_02241AA4 (UnkStruct_0208C06C * param0, int param1) int v7; int v8 = 0; int v9 = 256; - UnkStruct_02023790 * v10; + Strbuf* v10; UnkStruct_0205AA50 * v11; for (v7 = 0; v7 < v0->unk_798; v7++) { @@ -824,7 +824,7 @@ static void ov62_02241C38 (UnkStruct_0208C06C * param0) UnkStruct_ov62_02241204 * v0 = param0->unk_860; int v1 = 0; int v2 = 32; - UnkStruct_02023790 * v3; + Strbuf* v3; UnkStruct_0205AA50 * v4; v4 = &v0->unk_614[0]; @@ -3119,12 +3119,12 @@ static BOOL ov62_02244720 (UnkStruct_0208C06C * param0) static void ov62_022448E0 (UnkStruct_ov62_022312B0 * param0, UnkStruct_0208C06C * param1, int param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0200B144 * v1; UnkStruct_0205AA50 v2; UnkStruct_0200B358 * v3; - UnkStruct_02023790 * v4; - UnkStruct_02023790 * v5; + Strbuf* v4; + Strbuf* v5; v1 = param1->unk_14.unk_34; @@ -3153,7 +3153,7 @@ static void ov62_022448E0 (UnkStruct_ov62_022312B0 * param0, UnkStruct_0208C06C static void ov62_022449B8 (UnkStruct_0208C06C * param0, int param1, BOOL param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0205AA50 * v1 = ¶m0->unk_8A4; UnkStruct_ov62_02241204 * v2 = param0->unk_860; @@ -3164,8 +3164,8 @@ static void ov62_022449B8 (UnkStruct_0208C06C * param0, int param1, BOOL param2) if (param1 == 100) { UnkStruct_0200B358 * v3; - UnkStruct_02023790 * v4; - UnkStruct_02023790 * v5; + Strbuf* v4; + Strbuf* v5; UnkStruct_02030A80 * v6 = v2->unk_80.unk_00; v3 = ov62_02231690(102); @@ -3190,14 +3190,14 @@ static void ov62_022449B8 (UnkStruct_0208C06C * param0, int param1, BOOL param2) static void ov62_02244AB4 (UnkStruct_0208C06C * param0, int param1, int param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0205AA50 * v1 = ¶m0->unk_8A4; UnkStruct_ov62_02241204 * v2 = param0->unk_860; if (param1 == 100) { UnkStruct_0200B358 * v3; - UnkStruct_02023790 * v4; - UnkStruct_02023790 * v5; + Strbuf* v4; + Strbuf* v5; UnkStruct_02030A80 * v6 = v2->unk_80.unk_00; v3 = ov62_02231690(102); @@ -3212,8 +3212,8 @@ static void ov62_02244AB4 (UnkStruct_0208C06C * param0, int param1, int param2) sub_0200B3F0(v3); } else if (param1 == 102) { UnkStruct_0200B358 * v7; - UnkStruct_02023790 * v8; - UnkStruct_02023790 * v9; + Strbuf* v8; + Strbuf* v9; UnkStruct_02030A80 * v10 = param0->unk_88C[param2]; v7 = ov62_02231690(102); @@ -3704,7 +3704,7 @@ static void ov62_022455E4 (UnkStruct_0208C06C * param0, int param1) { UnkStruct_ov62_02241204 * v0 = param0->unk_860; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; int v3; v1 = &v0->unk_6D4[0]; @@ -3733,7 +3733,7 @@ static void ov62_0224568C (UnkStruct_0208C06C * param0) { UnkStruct_ov62_02241204 * v0 = param0->unk_860; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; int v3 = 1; int v4; @@ -4692,9 +4692,9 @@ void ov62_0224699C (void * param0, const UnkStruct_ov62_0223CAA4 * param1) static void ov62_022469A0 (UnkStruct_ov62_02241204 * param0, UnkStruct_0208C06C * param1) { - UnkStruct_02023790 * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v0; + Strbuf* v1; + Strbuf* v2; UnkStruct_0200B358 * v3; UnkStruct_0205AA50 * v4; @@ -4704,9 +4704,9 @@ static void ov62_022469A0 (UnkStruct_ov62_02241204 * param0, UnkStruct_0208C06C u64 v5 = param0->unk_4B0; u64 v6 = v5; u32 v7[3]; - UnkStruct_02023790 * v8 = sub_02023790(255, 102); - UnkStruct_02023790 * v9 = sub_02023790(255, 102); - UnkStruct_02023790 * v10 = sub_02023790(255, 102); + Strbuf* v8 = sub_02023790(255, 102); + Strbuf* v9 = sub_02023790(255, 102); + Strbuf* v10 = sub_02023790(255, 102); v4 = ¶m1->unk_8A4; v7[0] = v6 % 100000; diff --git a/src/overlay062/ov62_02246B00.c b/src/overlay062/ov62_02246B00.c index 82f6287628..1700c16015 100644 --- a/src/overlay062/ov62_02246B00.c +++ b/src/overlay062/ov62_02246B00.c @@ -320,7 +320,7 @@ void ov62_022470A8 (UnkStruct_ov62_02246BF4 * param0) { int v0; u32 v1 = 0; - UnkStruct_02023790 * v2 = sub_02023790(100, 102); + Strbuf* v2 = sub_02023790(100, 102); param0->unk_2C8 = 1; param0->unk_2CC = 0; diff --git a/src/overlay062/ov62_02247D74.c b/src/overlay062/ov62_02247D74.c index 5847e928f5..e78c21f288 100644 --- a/src/overlay062/ov62_02247D74.c +++ b/src/overlay062/ov62_02247D74.c @@ -62,13 +62,13 @@ static void ov62_02247DB4 (UnkStruct_0208C06C * param0) static void ov62_02247DD8 (UnkStruct_0208C06C * param0, int param1, int param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0205AA50 * v1 = ¶m0->unk_8A4; if (param1 == 282) { UnkStruct_0200B358 * v2; - UnkStruct_02023790 * v3; - UnkStruct_02023790 * v4; + Strbuf* v3; + Strbuf* v4; UnkStruct_02030A80 * v5 = param0->unk_88C[param2]; v2 = ov62_02231690(102); @@ -97,7 +97,7 @@ static void ov62_02247E9C (UnkStruct_0208C06C * param0) { UnkStruct_ov62_02247F7C * v0 = param0->unk_860; UnkStruct_0205AA50 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; int v3 = 1; int v4; diff --git a/src/overlay062/ov62_02248408.c b/src/overlay062/ov62_02248408.c index 47d9d8ec68..5e6b9d1810 100644 --- a/src/overlay062/ov62_02248408.c +++ b/src/overlay062/ov62_02248408.c @@ -24,7 +24,7 @@ #include "party.h" #include "overlay062/ov62_02248408.h" -static void ov62_0224856C(UnkStruct_02023790 * param0, int param1); +static void ov62_0224856C(Strbuf *param0, int param1); extern UnkStruct_0202F264 * Unk_021C07A4; @@ -33,7 +33,7 @@ void ov62_02248408 (UnkStruct_0202F264 * param0, UnkStruct_ov6_02240D5C * param1 UnkStruct_0202F298 * v0 = ¶m0->unk_E8; UnkStruct_0202F41C * v1 = ¶m0->unk_84; int v2, v3, v4, v5; - UnkStruct_02023790 * v6, * v7; + Strbuf* v6, * v7; u16 * v8; int v9 = 64; int v10, v11, v12; @@ -95,7 +95,7 @@ void ov62_02248408 (UnkStruct_0202F264 * param0, UnkStruct_ov6_02240D5C * param1 Heap_FreeToHeap(v8); } -static void ov62_0224856C (UnkStruct_02023790 * param0, int param1) +static void ov62_0224856C (Strbuf *param0, int param1) { UnkStruct_0200B144 * v0; diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c index 90e6b92c3b..f6c32e1493 100644 --- a/src/overlay064/ov64_0222DCE0.c +++ b/src/overlay064/ov64_0222DCE0.c @@ -113,8 +113,8 @@ typedef struct { } UnkStruct_ov64_022300E4; typedef struct { - UnkStruct_02023790 * unk_00; - UnkStruct_02023790 * unk_04; + Strbuf* unk_00; + Strbuf* unk_04; } UnkStruct_ov64_0222E060_sub1; typedef struct { @@ -148,8 +148,8 @@ typedef struct { UnkStruct_0200B144 * unk_218; NARC * unk_21C; UnkStruct_0205AA50 unk_220; - UnkStruct_02023790 * unk_230; - UnkStruct_02023790 * unk_234; + Strbuf* unk_230; + Strbuf* unk_234; u32 unk_238; UnkStruct_ov19_021DA864 unk_23C; UnkStruct_02009DC8 * unk_260[4]; @@ -166,7 +166,7 @@ typedef struct { UnkStruct_02001AF4 * unk_2C; u32 unk_30; u32 unk_34; - UnkStruct_02023790 * unk_38; + Strbuf* unk_38; } UnkStruct_ov64_0222F038; typedef struct { @@ -191,7 +191,7 @@ typedef struct { UnkStruct_ov63_0222AE60 * unk_B0; UnkStruct_0205AA50 unk_B4; UnkStruct_0205AA50 unk_C4; - UnkStruct_02023790 * unk_D4; + Strbuf* unk_D4; u32 unk_D8; u32 unk_DC; UnkStruct_0205AA50 unk_E0; @@ -265,8 +265,8 @@ static void ov64_0222DFD0(UnkStruct_ov64_0222DFD0 * param0); static void ov64_0222E040(UnkStruct_ov64_0222E060 * param0, void * param1, u32 param2); static void ov64_0222E060(UnkStruct_ov64_0222E060 * param0); static void ov64_0222E074(UnkStruct_ov64_0222E060 * param0, u8 param1, u8 param2); -static void ov64_0222E07C(UnkStruct_ov64_0222E060 * param0, const UnkStruct_02023790 * param1, const UnkStruct_02023790 * param2); -static u32 ov64_0222E09C(UnkStruct_ov64_0222E060 * param0, UnkStruct_02023790 * param1, UnkStruct_02023790 * param2); +static void ov64_0222E07C(UnkStruct_ov64_0222E060 * param0, const Strbuf *param1, const Strbuf *param2); +static u32 ov64_0222E09C(UnkStruct_ov64_0222E060 * param0, Strbuf *param1, Strbuf *param2); static void ov64_0222E158(UnkStruct_ov64_0222E060 * param0, const u16 * param1); static void ov64_0222E160(UnkStruct_ov64_0222E060 * param0, u32 param1); static void ov64_0222E164(UnkStruct_ov64_0222E060 * param0); @@ -394,7 +394,7 @@ static void ov64_02231BE0(UnkStruct_ov64_02230F98 * param0, UnkStruct_ov64_0222E static void ov64_02231D58(UnkStruct_ov64_02230F98 * param0, UnkStruct_ov64_0222E060 * param1, UnkStruct_ov64_0222E21C * param2, u32 param3); static void ov64_02231E94(UnkStruct_ov64_02230F98 * param0, UnkStruct_ov64_0222E060 * param1, UnkStruct_ov64_0222E21C * param2, u32 param3); static void ov64_02232038(UnkStruct_ov64_0222E21C * param0, const UnkStruct_ov64_0223221C * param1); -static void ov64_022320B8(UnkStruct_ov64_02230F98 * param0, u32 param1, u32 param2, UnkStruct_ov64_0222E060 * param3, UnkStruct_ov64_0222E21C * param4, u32 param5, u32 param6, u32 param7, u32 param8, UnkStruct_02023790 * param9, UnkStruct_02023790 * param10); +static void ov64_022320B8(UnkStruct_ov64_02230F98 * param0, u32 param1, u32 param2, UnkStruct_ov64_0222E060 * param3, UnkStruct_ov64_0222E21C * param4, u32 param5, u32 param6, u32 param7, u32 param8, Strbuf *param9, Strbuf *param10); static void ov64_02232138(UnkStruct_ov64_02230904 * param0, s32 param1); static BOOL ov64_0223217C(UnkStruct_ov64_0222E060 * param0, u32 param1); @@ -792,7 +792,7 @@ static void ov64_0222E074 (UnkStruct_ov64_0222E060 * param0, u8 param1, u8 param param0->unk_06 = param2; } -static void ov64_0222E07C (UnkStruct_ov64_0222E060 * param0, const UnkStruct_02023790 * param1, const UnkStruct_02023790 * param2) +static void ov64_0222E07C (UnkStruct_ov64_0222E060 * param0, const Strbuf *param1, const Strbuf *param2) { if (param1) { sub_02023810(param0->unk_2C.unk_00, param1); @@ -803,7 +803,7 @@ static void ov64_0222E07C (UnkStruct_ov64_0222E060 * param0, const UnkStruct_020 } } -static u32 ov64_0222E09C (UnkStruct_ov64_0222E060 * param0, UnkStruct_02023790 * param1, UnkStruct_02023790 * param2) +static u32 ov64_0222E09C (UnkStruct_ov64_0222E060 * param0, Strbuf *param1, Strbuf *param2) { int v0; UnkStruct_0202B370 * v1; @@ -1701,7 +1701,7 @@ static void ov64_0222EF64 (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_0222 static void ov64_0222EFBC (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_0222E21C * param1, u32 param2, u32 param3) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_02023790(128, param3); @@ -2593,7 +2593,7 @@ static void ov64_0222FE5C (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222 static void ov64_0222FE70 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222E21C * param1, u32 param2, u32 param3) { - UnkStruct_02023790 * v0; + Strbuf* v0; sub_0201ADA4(¶m0->unk_C4, 15); @@ -2787,7 +2787,7 @@ static void ov64_022302EC (UnkStruct_ov64_02230074 * param0, UnkStruct_ov63_0222 int v0; int v1; UnkStruct_ov64_022302EC v2; - UnkStruct_02023790 * v3; + Strbuf* v3; int v4, v5; static const u32 v6[] = {((u32)(((5 & 0xff) << 16) | ((6 & 0xff) << 8) | ((0 & 0xff) << 0))), ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0))), ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))}; @@ -5357,7 +5357,7 @@ static void ov64_02232038 (UnkStruct_ov64_0222E21C * param0, const UnkStruct_ov6 sub_0201C3C0(param0->unk_00, Unk_ov64_02232258[3]); } -asm static void ov64_022320B8 (UnkStruct_ov64_02230F98 * param0, u32 param1, u32 param2, UnkStruct_ov64_0222E060 * param3, UnkStruct_ov64_0222E21C * param4, u32 param5, u32 param6, u32 param7, u32 param8, UnkStruct_02023790 * param9, UnkStruct_02023790 * param10) +asm static void ov64_022320B8 (UnkStruct_ov64_02230F98 * param0, u32 param1, u32 param2, UnkStruct_ov64_0222E060 * param3, UnkStruct_ov64_0222E21C * param4, u32 param5, u32 param6, u32 param7, u32 param8, Strbuf *param9, Strbuf *param10) { push {r3, r4, r5, r6, r7, lr} sub sp, #0x18 diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index ce7849356e..e0af160040 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -176,7 +176,7 @@ static void ov65_022343CC(UnkStruct_ov65_0222EBE0 * param0, u32 param1); static void ov65_0223449C(UnkStruct_ov65_0222EBE0 * param0, u32 param1); static void ov65_02234628(UnkStruct_ov65_0222EBE0 * param0); static void ov65_02234694(UnkStruct_ov65_0222EBE0 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5); -static void ov65_022346C4(UnkStruct_ov65_0222EBE0 * param0, UnkStruct_02023790 * param1, u32 param2, u32 param3); +static void ov65_022346C4(UnkStruct_ov65_0222EBE0 * param0, Strbuf *param1, u32 param2, u32 param3); static void ov65_02234708(UnkStruct_ov65_0222EBE0 * param0, u32 param1, u32 param2, u32 param3, u32 param4); static void ov65_02234788(UnkStruct_ov65_0222EBE0 * param0, u8 param1, u8 param2, u8 param3, u8 param4); static u32 ov65_0223484C(u32 param0, int * param1); @@ -2309,7 +2309,7 @@ static void ov65_0222FD70 (UnkStruct_ov65_0222EBE0 * param0) int v0, v1, v2; int v3; UnkStruct_02025E6C * v4 = sub_02025E38(param0->unk_160); - UnkStruct_02023790 * v5 = sub_02025F04(v4, 54); + Strbuf* v5 = sub_02025F04(v4, 54); u32 v6; if (!sub_0201A7CC(¶m0->unk_340)) { @@ -6295,7 +6295,7 @@ static void ov65_022342A8 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) int v0; int v1; UnkStruct_0203068C * v2; - UnkStruct_02023790 * v3; + Strbuf* v3; v2 = sub_0203068C(param0->unk_160); v0 = param0->unk_BE0.unk_71 - 1; @@ -6416,7 +6416,7 @@ static void ov65_02234694 (UnkStruct_ov65_0222EBE0 * param0, u32 param1, u32 par ov65_02234708(param0, param1, v0, param4, param5); } -static void ov65_022346C4 (UnkStruct_ov65_0222EBE0 * param0, UnkStruct_02023790 * param1, u32 param2, u32 param3) +static void ov65_022346C4 (UnkStruct_ov65_0222EBE0 * param0, Strbuf *param1, u32 param2, u32 param3) { UnkStruct_0203068C * v0; BOOL v1; @@ -6647,7 +6647,7 @@ static void ov65_02234A68 (UnkStruct_ov65_0222EBE0 * param0, NARC * param1, u32 int v1; UnkStruct_ov19_021DA864 v2; UnkStruct_0205AA50 v3; - UnkStruct_02023790 * v4; + Strbuf* v4; UnkStruct_02012B20 * v5; int v6; UnkStruct_020127E8 v7; diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c index 82638a473f..ffb991ea70 100644 --- a/src/overlay065/ov65_0223648C.c +++ b/src/overlay065/ov65_0223648C.c @@ -114,8 +114,8 @@ typedef struct { UnkStruct_02018340 * unk_00; UnkStruct_0200B358 * unk_04; UnkStruct_0200B144 * unk_08; - UnkStruct_02023790 * unk_0C; - UnkStruct_02023790 * unk_10; + Strbuf* unk_0C; + Strbuf* unk_10; u8 unk_14; u8 unk_15; u16 unk_16; @@ -902,7 +902,7 @@ static void ov65_02236E44 (UnkStruct_ov65_02236840 * param0, const UnkStruct_020 static void ov65_02236E50 (UnkStruct_ov65_02236840 * param0, const UnkStruct_0207DE04 * param1, u32 param2, u8 param3, u32 param4) { - UnkStruct_02023790 * v0; + Strbuf* v0; int v1; if (param0->unk_14 != 0xff) { @@ -970,8 +970,8 @@ static void ov65_02236F38 (UnkStruct_ov65_02236840 * param0) static void ov65_02236F70 (UnkStruct_ov65_02236840 * param0, const UnkStruct_0207DE04 * param1, int param2, u32 param3) { - UnkStruct_02023790 * v0; - UnkStruct_02023790 * v1; + Strbuf* v0; + Strbuf* v1; v0 = sub_02023790(256, param3); v1 = sub_02023790(256, param3); @@ -1021,8 +1021,8 @@ static void ov65_02237034 (UnkStruct_ov65_022367A8 * param0, const UnkStruct_020 static void ov65_0223709C (UnkStruct_ov65_022367A8 * param0, UnkStruct_ov65_02236840 * param1, const UnkStruct_0207DE04 * param2, int param3, u32 param4) { - UnkStruct_02023790 * v0; - UnkStruct_02023790 * v1; + Strbuf* v0; + Strbuf* v1; u8 v2; u8 v3; diff --git a/src/overlay066/ov66_0222DDF0.c b/src/overlay066/ov66_0222DDF0.c index 234ef561bf..a65bc79953 100644 --- a/src/overlay066/ov66_0222DDF0.c +++ b/src/overlay066/ov66_0222DDF0.c @@ -1001,8 +1001,8 @@ void ov66_0222E640 (const UnkStruct_ov66_0222E71C * param0, UnkStruct_02025E6C * sub_02025EC0(param1, param0->unk_08); { - UnkStruct_02023790 * v2; - UnkStruct_02023790 * v3; + Strbuf* v2; + Strbuf* v3; v3 = sub_02023790((7 + 1) * 4, param2); v2 = sub_02023790((7 + 1) * 4, param2); @@ -1022,7 +1022,7 @@ void ov66_0222E640 (const UnkStruct_ov66_0222E71C * param0, UnkStruct_02025E6C * if (v1) { UnkStruct_0200B144 * v4; - UnkStruct_02023790 * v5; + Strbuf* v5; v4 = sub_0200B144(1, 26, 673, param2); v5 = sub_0200B1EC(v4, 64); @@ -2328,7 +2328,7 @@ static void ov66_0222F7C8 (UnkStruct_ov66_0222F6C4 * param0, UnkStruct_021C0794 } { - UnkStruct_02023790 * v5; + Strbuf* v5; v5 = sub_02025F04(v0, param2); diff --git a/src/overlay066/ov66_0223177C.c b/src/overlay066/ov66_0223177C.c index 340793c16f..f95b33f61f 100644 --- a/src/overlay066/ov66_0223177C.c +++ b/src/overlay066/ov66_0223177C.c @@ -41,7 +41,7 @@ typedef struct { typedef struct UnkStruct_ov66_02231FB0_t { u8 unk_00; u32 unk_04[3]; - UnkStruct_02023790 * unk_10[4]; + Strbuf* unk_10[4]; u16 unk_20[4]; u16 unk_28; s16 unk_2A; @@ -84,14 +84,14 @@ static void ov66_02231FB0(UnkStruct_ov66_02231FB0 * param0, UnkStruct_ov66_02231 static void ov66_02231FC0(UnkStruct_ov66_02231E94 * param0, UnkStruct_ov66_02231FB0 * param1); static void ov66_02231FE8(UnkStruct_ov66_02231E94 * param0, UnkStruct_ov66_02231FB0 * param1); static void ov66_02231FFC(UnkStruct_ov66_02231FB0 * param0, u32 param1, u32 param2, u32 param3, const UnkStruct_02025E6C * param4, const UnkStruct_02025E6C * param5, const UnkStruct_02025E6C * param6, const UnkStruct_02025E6C * param7, u16 param8, u16 param9, u16 param10, u16 param11, u32 param12, u32 param13, u32 param14); -static BOOL ov66_02232068(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, UnkStruct_02023790 * param4, u32 param5); -static BOOL ov66_022320BC(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, UnkStruct_02023790 * param4, u32 param5); -static BOOL ov66_0223211C(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, UnkStruct_02023790 * param4, u32 param5); -static BOOL ov66_02232258(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, UnkStruct_02023790 * param4, u32 param5); -static BOOL ov66_022322B8(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, UnkStruct_02023790 * param4, u32 param5); -static BOOL ov66_02232330(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, UnkStruct_02023790 * param4, u32 param5); -static BOOL ov66_022323A0(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, UnkStruct_02023790 * param4, u32 param5); -static BOOL ov66_022323C4(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, UnkStruct_02023790 * param4, u32 param5); +static BOOL ov66_02232068(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, Strbuf *param4, u32 param5); +static BOOL ov66_022320BC(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, Strbuf *param4, u32 param5); +static BOOL ov66_0223211C(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, Strbuf *param4, u32 param5); +static BOOL ov66_02232258(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, Strbuf *param4, u32 param5); +static BOOL ov66_022322B8(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, Strbuf *param4, u32 param5); +static BOOL ov66_02232330(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, Strbuf *param4, u32 param5); +static BOOL ov66_022323A0(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, Strbuf *param4, u32 param5); +static BOOL ov66_022323C4(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, Strbuf *param4, u32 param5); static u32 ov66_0223245C(const UnkStruct_ov66_02231FB0 * param0, u32 param1); static u32 ov66_0223246C(const UnkStruct_ov66_02231FB0 * param0, u32 param1); static u32 ov66_0223247C(const UnkStruct_ov66_02231FB0 * param0, u32 param1); @@ -407,14 +407,14 @@ int ov66_02231C78 (const UnkStruct_ov66_0223177C * param0) return param0->unk_5C.unk_188.unk_2C->unk_00; } -BOOL ov66_02231C94 (const UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02232068 * param1, int param2, UnkStruct_02023790 * param3, u32 param4) +BOOL ov66_02231C94 (const UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02232068 * param1, int param2, Strbuf *param3, u32 param4) { UnkStruct_0200B358 * v0; UnkStruct_0200B144 * v1; UnkStruct_ov66_02231FB0 * v2; BOOL v3; - static BOOL(*const v4[])(UnkStruct_ov66_02231FB0 *, const UnkStruct_ov66_02232068 *, UnkStruct_0200B358 *, UnkStruct_0200B144 *, UnkStruct_02023790 *, u32) = { + static BOOL(*const v4[])(UnkStruct_ov66_02231FB0 *, const UnkStruct_ov66_02232068 *, UnkStruct_0200B358 *, UnkStruct_0200B144 *, Strbuf *, u32) = { ov66_02232068, ov66_022320BC, ov66_0223211C, @@ -733,9 +733,9 @@ static void ov66_02231FFC (UnkStruct_ov66_02231FB0 * param0, u32 param1, u32 par } } -static BOOL ov66_02232068 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, UnkStruct_02023790 * param4, u32 param5) +static BOOL ov66_02232068 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, Strbuf *param4, u32 param5) { - UnkStruct_02023790 * v0; + Strbuf* v0; sub_0200B48C(param2, 0, param0->unk_10[0], 0, 1, Unk_020E4C44); sub_0200B48C(param2, 1, param0->unk_10[1], 0, 1, Unk_020E4C44); @@ -748,9 +748,9 @@ static BOOL ov66_02232068 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 return 1; } -static BOOL ov66_022320BC (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, UnkStruct_02023790 * param4, u32 param5) +static BOOL ov66_022320BC (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, Strbuf *param4, u32 param5) { - UnkStruct_02023790 * v0; + Strbuf* v0; sub_0200B48C(param2, 0, param0->unk_10[0], 0, 1, Unk_020E4C44); sub_0200B48C(param2, 1, param0->unk_10[1], 0, 1, Unk_020E4C44); @@ -764,9 +764,9 @@ static BOOL ov66_022320BC (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 return 1; } -static BOOL ov66_0223211C (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, UnkStruct_02023790 * param4, u32 param5) +static BOOL ov66_0223211C (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, Strbuf *param4, u32 param5) { - UnkStruct_02023790 * v0; + Strbuf* v0; sub_0200C0B0(param2, 0, param0->unk_04[0]); @@ -810,9 +810,9 @@ static BOOL ov66_0223211C (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 return 1; } -static BOOL ov66_02232258 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, UnkStruct_02023790 * param4, u32 param5) +static BOOL ov66_02232258 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, Strbuf *param4, u32 param5) { - UnkStruct_02023790 * v0; + Strbuf* v0; sub_0200C0B0(param2, 0, param0->unk_04[0]); sub_0200B48C(param2, 1, param0->unk_10[0], 0, 1, Unk_020E4C44); @@ -826,9 +826,9 @@ static BOOL ov66_02232258 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 return 1; } -static BOOL ov66_022322B8 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, UnkStruct_02023790 * param4, u32 param5) +static BOOL ov66_022322B8 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, Strbuf *param4, u32 param5) { - UnkStruct_02023790 * v0; + Strbuf* v0; int v1; u32 v2; @@ -850,9 +850,9 @@ static BOOL ov66_022322B8 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 return 1; } -static BOOL ov66_02232330 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, UnkStruct_02023790 * param4, u32 param5) +static BOOL ov66_02232330 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, Strbuf *param4, u32 param5) { - UnkStruct_02023790 * v0; + Strbuf* v0; u32 v1; switch (param0->unk_04[1]) { @@ -885,7 +885,7 @@ static BOOL ov66_02232330 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 return 1; } -static BOOL ov66_022323A0 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, UnkStruct_02023790 * param4, u32 param5) +static BOOL ov66_022323A0 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, Strbuf *param4, u32 param5) { if (param0->unk_04[0] >= 20) { return 0; @@ -900,9 +900,9 @@ static BOOL ov66_022323A0 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 return 1; } -static BOOL ov66_022323C4 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, UnkStruct_02023790 * param4, u32 param5) +static BOOL ov66_022323C4 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, UnkStruct_0200B144 * param3, Strbuf *param4, u32 param5) { - UnkStruct_02023790 * v0; + Strbuf* v0; u32 v1; int v2; static const u16 v3[4] = { diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c index 99d8c7b6ec..dc6137b904 100644 --- a/src/overlay067/ov67_0225C700.c +++ b/src/overlay067/ov67_0225C700.c @@ -57,8 +57,8 @@ typedef struct { UnkStruct_0200B358 * unk_00; UnkStruct_0200B144 * unk_04; UnkStruct_0205AA50 unk_08; - UnkStruct_02023790 * unk_18; - UnkStruct_02023790 * unk_1C; + Strbuf* unk_18; + Strbuf* unk_1C; u32 unk_20; void * unk_24; u32 unk_28; diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c index 0d18040ffa..39df518f82 100644 --- a/src/overlay068/ov68_0225C700.c +++ b/src/overlay068/ov68_0225C700.c @@ -75,8 +75,8 @@ typedef struct { u32 unk_04; BOOL unk_08; BOOL unk_0C; - UnkStruct_02023790 * unk_10; - UnkStruct_02023790 * unk_14[3]; + Strbuf* unk_10; + Strbuf* unk_14[3]; } UnkStruct_ov68_0225DB8C; typedef struct { @@ -113,7 +113,7 @@ typedef struct { u32 unk_00; s32 unk_04; UnkStruct_0205AA50 unk_08; - UnkStruct_02023790 * unk_18; + Strbuf* unk_18; void * unk_1C; UnkStruct_02001AF4 * unk_20; } UnkStruct_ov68_0225D128; @@ -121,8 +121,8 @@ typedef struct { typedef struct { UnkStruct_0200B144 * unk_00[9]; UnkStruct_0200B358 * unk_24; - UnkStruct_02023790 * unk_28; - UnkStruct_02023790 * unk_2C; + Strbuf* unk_28; + Strbuf* unk_2C; UnkStruct_ov66_0222DFF8 * unk_30; } UnkStruct_ov68_0225CB70; @@ -152,14 +152,14 @@ static void ov68_0225CAB4(UnkStruct_ov68_0225C91C * param0, u32 param1); static void ov68_0225CB44(UnkStruct_ov68_0225C91C * param0); static void ov68_0225CB70(UnkStruct_ov68_0225CB70 * param0, UnkStruct_ov66_0222DFF8 * param1, u32 param2); static void ov68_0225CBC0(UnkStruct_ov68_0225CB70 * param0); -static UnkStruct_02023790 * ov68_0225CBEC(UnkStruct_ov68_0225CB70 * param0, u32 param1, u32 param2); -static UnkStruct_02023790 * ov68_0225CC18(UnkStruct_ov68_0225CB70 * param0, u32 param1); -static UnkStruct_02023790 * ov68_0225CC44(UnkStruct_ov68_0225CB70 * param0, u32 param1, u32 param2); +static Strbuf* ov68_0225CBEC(UnkStruct_ov68_0225CB70 * param0, u32 param1, u32 param2); +static Strbuf* ov68_0225CC18(UnkStruct_ov68_0225CB70 * param0, u32 param1); +static Strbuf* ov68_0225CC44(UnkStruct_ov68_0225CB70 * param0, u32 param1, u32 param2); static void ov68_0225CC78(UnkStruct_ov68_0225CB70 * param0, u32 param1, u32 param2); static void ov68_0225DB8C(UnkStruct_ov68_0225DB8C * param0, BOOL param1, u32 param2); static void ov68_0225DC24(UnkStruct_ov68_0225DB8C * param0); -static UnkStruct_02023790 * ov68_0225DC40(const UnkStruct_ov68_0225DB8C * param0, UnkStruct_ov68_0225CB70 * param1); -static UnkStruct_02023790 * ov68_0225DC58(const UnkStruct_ov68_0225DB8C * param0, UnkStruct_ov68_0225CB70 * param1, u32 param2); +static Strbuf* ov68_0225DC40(const UnkStruct_ov68_0225DB8C * param0, UnkStruct_ov68_0225CB70 * param1); +static Strbuf* ov68_0225DC58(const UnkStruct_ov68_0225DB8C * param0, UnkStruct_ov68_0225CB70 * param1, u32 param2); static void ov68_0225DC74(UnkStruct_ov68_0225DC74 * param0); static u32 ov68_0225DCA4(const UnkStruct_ov68_0225DC74 * param0, u32 param1, u32 param2); static void ov68_0225DCCC(UnkStruct_ov68_0225DC74 * param0, const UnkStruct_ov66_0222DFF8 * param1); @@ -185,8 +185,8 @@ static BOOL ov68_0225DA74(UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225C static void ov68_0225DB3C(UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2, u32 param3); static void ov68_0225D128(UnkStruct_ov68_0225D128 * param0, UnkStruct_ov68_0225C91C * param1, UnkStruct_021C0794 * param2, u32 param3); static void ov68_0225D178(UnkStruct_ov68_0225D128 * param0, u32 param1); -static void ov68_0225D1B4(UnkStruct_ov68_0225D128 * param0, const UnkStruct_02023790 * param1); -static void ov68_0225D218(UnkStruct_ov68_0225D128 * param0, const UnkStruct_02023790 * param1); +static void ov68_0225D1B4(UnkStruct_ov68_0225D128 * param0, const Strbuf *param1); +static void ov68_0225D218(UnkStruct_ov68_0225D128 * param0, const Strbuf *param1); static void ov68_0225D284(UnkStruct_ov68_0225D128 * param0); static void ov68_0225D2A0(UnkStruct_ov68_0225D128 * param0); static BOOL ov68_0225D2B4(const UnkStruct_ov68_0225D128 * param0); @@ -604,7 +604,7 @@ static void ov68_0225CBC0 (UnkStruct_ov68_0225CB70 * param0) sub_020237BC(param0->unk_2C); } -static UnkStruct_02023790 * ov68_0225CBEC (UnkStruct_ov68_0225CB70 * param0, u32 param1, u32 param2) +static Strbuf* ov68_0225CBEC (UnkStruct_ov68_0225CB70 * param0, u32 param1, u32 param2) { GF_ASSERT(param1 < 9); @@ -614,7 +614,7 @@ static UnkStruct_02023790 * ov68_0225CBEC (UnkStruct_ov68_0225CB70 * param0, u32 return param0->unk_28; } -static UnkStruct_02023790 * ov68_0225CC18 (UnkStruct_ov68_0225CB70 * param0, u32 param1) +static Strbuf* ov68_0225CC18 (UnkStruct_ov68_0225CB70 * param0, u32 param1) { if (param1 >= (50 + 10)) { GF_ASSERT(param1 >= (50 + 10)); @@ -628,7 +628,7 @@ static UnkStruct_02023790 * ov68_0225CC18 (UnkStruct_ov68_0225CB70 * param0, u32 return ov68_0225CBEC(param0, 2, param1 - 50); } -static UnkStruct_02023790 * ov68_0225CC44 (UnkStruct_ov68_0225CB70 * param0, u32 param1, u32 param2) +static Strbuf* ov68_0225CC44 (UnkStruct_ov68_0225CB70 * param0, u32 param1, u32 param2) { if (param1 >= (50 + 10)) { GF_ASSERT(param1 >= (50 + 10)); @@ -727,7 +727,7 @@ static void ov68_0225CCD0 (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225 static BOOL ov68_0225CE48 (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2, UnkStruct_ov68_0225D128 * param3, UnkStruct_ov66_02231374 * param4, u32 param5) { u32 v0; - UnkStruct_02023790 * v1; + Strbuf* v1; switch (param0->unk_28) { case 0: @@ -887,7 +887,7 @@ static void ov68_0225D02C (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225 static void ov68_0225D06C (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; sub_0201ADA4(¶m0->unk_00[0], 0); @@ -942,7 +942,7 @@ static void ov68_0225D178 (UnkStruct_ov68_0225D128 * param0, u32 param1) ov68_0225D348(param0, param1); } -static void ov68_0225D1B4 (UnkStruct_ov68_0225D128 * param0, const UnkStruct_02023790 * param1) +static void ov68_0225D1B4 (UnkStruct_ov68_0225D128 * param0, const Strbuf *param1) { if (sub_0201D724(param0->unk_00)) { sub_0201D730(param0->unk_00); @@ -954,7 +954,7 @@ static void ov68_0225D1B4 (UnkStruct_ov68_0225D128 * param0, const UnkStruct_020 sub_0200E060(¶m0->unk_08, 1, 1, 5); } -static void ov68_0225D218 (UnkStruct_ov68_0225D128 * param0, const UnkStruct_02023790 * param1) +static void ov68_0225D218 (UnkStruct_ov68_0225D128 * param0, const Strbuf *param1) { if (sub_0201D724(param0->unk_00)) { sub_0201D730(param0->unk_00); @@ -1081,7 +1081,7 @@ static void ov68_0225D388 (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225 static BOOL ov68_0225D478 (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2, UnkStruct_ov68_0225D128 * param3, UnkStruct_ov66_02231374 * param4, u32 param5) { - UnkStruct_02023790 * v0; + Strbuf* v0; u32 v1; switch (param0->unk_60) { @@ -1319,7 +1319,7 @@ static void ov68_0225D868 (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225 static void ov68_0225D89C (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225CB70 * param1, u32 param2, u32 param3) { - UnkStruct_02023790 * v0; + Strbuf* v0; u32 v1; s32 v2; @@ -1335,7 +1335,7 @@ static void ov68_0225D89C (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225 static void ov68_0225D8F0 (UnkStruct_ov68_0225D388 * param0, const UnkStruct_ov68_0225DB8C * param1, UnkStruct_ov68_0225CB70 * param2, UnkStruct_ov68_0225C91C * param3, const UnkStruct_ov66_0222E908 * param4, u32 param5, u32 param6, u32 param7, BOOL param8) { - UnkStruct_02023790 * v0; + Strbuf* v0; sub_0201ADA4(¶m0->unk_00[1], 0); sub_0201ADA4(¶m0->unk_00[5], 0); @@ -1509,7 +1509,7 @@ static void ov68_0225DC24 (UnkStruct_ov68_0225DB8C * param0) } } -static UnkStruct_02023790 * ov68_0225DC40 (const UnkStruct_ov68_0225DB8C * param0, UnkStruct_ov68_0225CB70 * param1) +static Strbuf* ov68_0225DC40 (const UnkStruct_ov68_0225DB8C * param0, UnkStruct_ov68_0225CB70 * param1) { if (param0->unk_0C == 0) { return ov68_0225CC18(param1, param0->unk_00); @@ -1518,7 +1518,7 @@ static UnkStruct_02023790 * ov68_0225DC40 (const UnkStruct_ov68_0225DB8C * param return param0->unk_10; } -static UnkStruct_02023790 * ov68_0225DC58 (const UnkStruct_ov68_0225DB8C * param0, UnkStruct_ov68_0225CB70 * param1, u32 param2) +static Strbuf* ov68_0225DC58 (const UnkStruct_ov68_0225DB8C * param0, UnkStruct_ov68_0225CB70 * param1, u32 param2) { if (param0->unk_0C == 0) { return ov68_0225CC44(param1, param0->unk_00, param2); diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c index b594ab7208..550fc217da 100644 --- a/src/overlay069/ov69_0225C700.c +++ b/src/overlay069/ov69_0225C700.c @@ -251,7 +251,7 @@ typedef struct { u32 unk_00; u32 unk_04; u32 unk_08; - UnkStruct_02023790 * unk_0C; + Strbuf* unk_0C; UnkStruct_0205AA50 unk_10; UnkStruct_02015920 * unk_20; } UnkStruct_ov69_0225DDC8; @@ -259,8 +259,8 @@ typedef struct { typedef struct { UnkStruct_0200B144 * unk_00; UnkStruct_0200B358 * unk_04; - UnkStruct_02023790 * unk_08; - UnkStruct_02023790 * unk_0C; + Strbuf* unk_08; + Strbuf* unk_0C; } UnkStruct_ov69_0225EF54; typedef struct { @@ -406,10 +406,10 @@ static u16 ov69_0225EEEC(u32 param0); static u16 ov69_0225EF04(u32 param0); static void ov69_0225EF1C(UnkStruct_ov69_0225EF54 * param0, u32 param1); static void ov69_0225EF54(UnkStruct_ov69_0225EF54 * param0); -static UnkStruct_02023790 * ov69_0225EF74(UnkStruct_ov69_0225EF54 * param0, u32 param1); -static UnkStruct_02023790 * ov69_0225EF90(UnkStruct_ov69_0225EF54 * param0, u32 param1); -static UnkStruct_02023790 * ov69_0225EFB8(UnkStruct_ov69_0225EF54 * param0, u32 param1, u32 param2); -static void ov69_0225EF84(UnkStruct_ov69_0225EF54 * param0, u32 param1, UnkStruct_02023790 * param2); +static Strbuf* ov69_0225EF74(UnkStruct_ov69_0225EF54 * param0, u32 param1); +static Strbuf* ov69_0225EF90(UnkStruct_ov69_0225EF54 * param0, u32 param1); +static Strbuf* ov69_0225EFB8(UnkStruct_ov69_0225EF54 * param0, u32 param1, u32 param2); +static void ov69_0225EF84(UnkStruct_ov69_0225EF54 * param0, u32 param1, Strbuf *param2); static u32 ov69_0225EFEC(const UnkStruct_ov66_02231560 * param0); static const u32 Unk_ov69_0225F028[3] = { @@ -1851,7 +1851,7 @@ static void ov69_0225DBB4 (UnkStruct_ov69_0225DC48 * param0, UnkStruct_ov69_0225 sub_0201ADA4(¶m0->unk_1C, 15); { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = ov69_0225EF74(param2, 1); @@ -2046,7 +2046,7 @@ static void ov69_0225DEC0 (UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225 } { - UnkStruct_02023790 * v1; + Strbuf* v1; sub_0201A7E8(param1->unk_00, ¶m0->unk_1A8, 4, 2, 19, 27, 4, 11, ((10 + (18 + 12)))); sub_0201ADA4(¶m0->unk_1A8, 15); @@ -2497,7 +2497,7 @@ static void ov69_0225E61C (UnkStruct_ov69_0225E084 * param0) static void ov69_0225E644 (UnkStruct_ov69_0225E084 * param0, u32 param1, const UnkStruct_ov69_0225E0C0 * param2, UnkStruct_ov69_0225EF54 * param3) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0205AA50 * v1; u32 v2; @@ -2958,18 +2958,18 @@ static void ov69_0225EF54 (UnkStruct_ov69_0225EF54 * param0) sub_020237BC(param0->unk_0C); } -static UnkStruct_02023790 * ov69_0225EF74 (UnkStruct_ov69_0225EF54 * param0, u32 param1) +static Strbuf* ov69_0225EF74 (UnkStruct_ov69_0225EF54 * param0, u32 param1) { sub_0200B1B8(param0->unk_00, param1, param0->unk_08); return param0->unk_08; } -static void ov69_0225EF84 (UnkStruct_ov69_0225EF54 * param0, u32 param1, UnkStruct_02023790 * param2) +static void ov69_0225EF84 (UnkStruct_ov69_0225EF54 * param0, u32 param1, Strbuf *param2) { sub_0200B1B8(param0->unk_00, param1, param2); } -static UnkStruct_02023790 * ov69_0225EF90 (UnkStruct_ov69_0225EF54 * param0, u32 param1) +static Strbuf* ov69_0225EF90 (UnkStruct_ov69_0225EF54 * param0, u32 param1) { sub_0200B1B8(param0->unk_00, 3, param0->unk_0C); sub_0200BDD0(param0->unk_04, 0, param1); @@ -2978,7 +2978,7 @@ static UnkStruct_02023790 * ov69_0225EF90 (UnkStruct_ov69_0225EF54 * param0, u32 return param0->unk_08; } -static UnkStruct_02023790 * ov69_0225EFB8 (UnkStruct_ov69_0225EF54 * param0, u32 param1, u32 param2) +static Strbuf* ov69_0225EFB8 (UnkStruct_ov69_0225EF54 * param0, u32 param1, u32 param2) { sub_0200C41C(param0->unk_04); sub_0200B1B8(param0->unk_00, 3, param0->unk_0C); diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index b8dce17b8d..8d6fa59443 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -131,7 +131,7 @@ typedef struct { UnkStruct_0205AA50 unk_00; u32 unk_10; u32 unk_14; - UnkStruct_02023790 * unk_18; + Strbuf* unk_18; void * unk_1C; } UnkStruct_ov70_0225E9C8; @@ -163,8 +163,8 @@ typedef struct { typedef struct { UnkStruct_0200B358 * unk_00; UnkStruct_0200B144 * unk_04[4]; - UnkStruct_02023790 * unk_14; - UnkStruct_02023790 * unk_18; + Strbuf* unk_14; + Strbuf* unk_18; } UnkStruct_ov70_0225F208; typedef struct { @@ -262,8 +262,8 @@ static void ov70_0225E92C(UnkStruct_ov70_0225DEE8 * param0); static void ov70_0225E970(UnkStruct_ov70_0225DEE8 * param0); static void ov70_0225E9C8(UnkStruct_ov70_0225E9C8 * param0, UnkStruct_ov70_0225E4EC * param1, UnkStruct_021C0794 * param2, u32 param3); static void ov70_0225EA14(UnkStruct_ov70_0225E9C8 * param0); -static void ov70_0225EA44(UnkStruct_ov70_0225E9C8 * param0, const UnkStruct_02023790 * param1); -static void ov70_0225EAA4(UnkStruct_ov70_0225E9C8 * param0, const UnkStruct_02023790 * param1); +static void ov70_0225EA44(UnkStruct_ov70_0225E9C8 * param0, const Strbuf *param1); +static void ov70_0225EAA4(UnkStruct_ov70_0225E9C8 * param0, const Strbuf *param1); static void ov70_0225EB08(UnkStruct_ov70_0225E9C8 * param0); static void ov70_0225EB24(UnkStruct_ov70_0225E9C8 * param0); static void ov70_0225EB38(UnkStruct_ov70_0225E9C8 * param0); @@ -272,12 +272,12 @@ static BOOL ov70_0225EB5C(const UnkStruct_ov70_0225E9C8 * param0); static void ov70_0225EB74(UnkStruct_ov70_0225E9C8 * param0); static void ov70_0225EBA8(UnkStruct_ov70_0225E9C8 * param0, UnkStruct_ov70_0225E4EC * param1, UnkStruct_021C0794 * param2, u32 param3); static void ov70_0225EBBC(UnkStruct_ov70_0225E9C8 * param0); -static void ov70_0225EBC4(UnkStruct_ov70_0225E9C8 * param0, const UnkStruct_02023790 * param1); +static void ov70_0225EBC4(UnkStruct_ov70_0225E9C8 * param0, const Strbuf *param1); static void ov70_0225EC20(UnkStruct_ov70_0225EC20 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2); static void ov70_0225ED4C(UnkStruct_ov70_0225EC20 * param0, UnkStruct_ov70_0225E4EC * param1); static void ov70_0225EDA8(UnkStruct_ov70_0225EC20 * param0, u32 param1, u32 param2, u32 param3); static void ov70_0225EDE0(UnkStruct_ov70_0225EC20 * param0); -static void ov70_0225EDF8(UnkStruct_ov70_0225EC20 * param0, const UnkStruct_02023790 * param1, u32 param2); +static void ov70_0225EDF8(UnkStruct_ov70_0225EC20 * param0, const Strbuf *param1, u32 param2); static const UnkStruct_02013A04 * ov70_0225EE04(const UnkStruct_ov70_0225EC20 * param0); static BOOL ov70_0225EE08(const UnkStruct_ov70_0225EC20 * param0, u32 param1); static void ov70_0225EE30(UnkStruct_ov70_0225EC20 * param0, const UnkStruct_ov84_02240FA8 * param1, UnkStruct_ov70_0225E4EC * param2, u16 param3, u16 param4, u32 param5, u8 param6, u8 param7, u8 param8); @@ -290,19 +290,19 @@ static void ov70_0225EFD4(UnkStruct_ov70_0225EFD4 * param0, UnkStruct_ov70_0225E static void ov70_0225EFD8(UnkStruct_ov70_0225EFD4 * param0); static void ov70_0225EFE0(UnkStruct_ov70_0225EFD4 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2, u8 param3, u8 param4, u8 param5, u8 param6); static void ov70_0225F024(UnkStruct_ov70_0225EFD4 * param0); -static void ov70_0225F048(UnkStruct_ov70_0225EFD4 * param0, const UnkStruct_02023790 * param1, u8 param2, u8 param3); +static void ov70_0225F048(UnkStruct_ov70_0225EFD4 * param0, const Strbuf *param1, u8 param2, u8 param3); static void ov70_0225F078(UnkStruct_ov70_0225EFD4 * param0, u16 param1, u16 param2, u16 param3, u16 param4); static void ov70_0225F098(UnkStruct_ov70_0225F098 * param0, UnkStruct_ov70_0225F208 * param1, u32 param2); static void ov70_0225F100(UnkStruct_ov70_0225F098 * param0); static void ov70_0225F114(UnkStruct_ov70_0225F114 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2); static void ov70_0225F144(UnkStruct_ov70_0225F114 * param0); -static void ov70_0225F14C(UnkStruct_ov70_0225F114 * param0, const UnkStruct_02023790 * param1); +static void ov70_0225F14C(UnkStruct_ov70_0225F114 * param0, const Strbuf *param1); static void ov70_0225F184(UnkStruct_ov70_0225F114 * param0, UnkStruct_ov70_0225F208 * param1); static void ov70_0225F1C0(UnkStruct_ov70_0225F114 * param0, UnkStruct_ov70_0225F208 * param1, int param2); static void ov70_0225F1F0(UnkStruct_ov70_0225F114 * param0, UnkStruct_ov70_0225F208 * param1, int param2); static void ov70_0225F208(UnkStruct_ov70_0225F208 * param0, u32 param1); static void ov70_0225F25C(UnkStruct_ov70_0225F208 * param0); -static UnkStruct_02023790 * ov70_0225F288(UnkStruct_ov70_0225F208 * param0, int param1, u32 param2); +static Strbuf* ov70_0225F288(UnkStruct_ov70_0225F208 * param0, int param1, u32 param2); static void ov70_0225F2A8(UnkStruct_ov70_0225F208 * param0, u32 param1, u32 param2, u32 param3, int param4); static void ov70_0225F2C8(UnkStruct_ov70_0225F208 * param0, const UnkStruct_02025E6C * param1, u32 param2); static void ov70_0225F2D8(UnkStruct_ov70_0225F208 * param0, UnkEnum_ov66_022324D0 param1, u32 param2); @@ -941,12 +941,12 @@ BOOL ov70_0225DF84 (const UnkStruct_ov70_0225DEE8 * param0, u8 param1) return param0->unk_0C.unk_14[param1]; } -void ov70_0225DF8C (UnkStruct_ov70_0225DEE8 * param0, const UnkStruct_02023790 * param1) +void ov70_0225DF8C (UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1) { ov70_0225EA44(¶m0->unk_35C, param1); } -void ov70_0225DF9C (UnkStruct_ov70_0225DEE8 * param0, const UnkStruct_02023790 * param1) +void ov70_0225DF9C (UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1) { ov70_0225EAA4(¶m0->unk_35C, param1); } @@ -976,7 +976,7 @@ void ov70_0225DFEC (UnkStruct_ov70_0225DEE8 * param0) ov70_0225EB74(¶m0->unk_35C); } -void ov70_0225DFFC (UnkStruct_ov70_0225DEE8 * param0, const UnkStruct_02023790 * param1) +void ov70_0225DFFC (UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1) { ov70_0225EBC4(¶m0->unk_37C, param1); } @@ -996,7 +996,7 @@ void ov70_0225E034 (UnkStruct_ov70_0225DEE8 * param0) ov70_0225EDE0(¶m0->unk_39C); } -void ov70_0225E044 (UnkStruct_ov70_0225DEE8 * param0, const UnkStruct_02023790 * param1, u32 param2) +void ov70_0225E044 (UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1, u32 param2) { ov70_0225EDF8(¶m0->unk_39C, param1, param2); } @@ -1046,7 +1046,7 @@ void ov70_0225E12C (UnkStruct_ov70_0225DEE8 * param0) ov70_0225F024(¶m0->unk_428); } -void ov70_0225E13C (UnkStruct_ov70_0225DEE8 * param0, const UnkStruct_02023790 * param1, u8 param2, u8 param3) +void ov70_0225E13C (UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1, u8 param2, u8 param3) { ov70_0225F048(¶m0->unk_428, param1, param2, param3); } @@ -1091,7 +1091,7 @@ void ov70_0225E1F8 (UnkStruct_ov70_0225DEE8 * param0) ov70_0225EF14(¶m0->unk_39C, NULL, NULL); } -UnkStruct_02023790 * ov70_0225E20C (UnkStruct_ov70_0225DEE8 * param0, int param1, u32 param2) +Strbuf* ov70_0225E20C (UnkStruct_ov70_0225DEE8 * param0, int param1, u32 param2) { return ov70_0225F288(¶m0->unk_340, param1, param2); } @@ -1568,7 +1568,7 @@ static void ov70_0225EA14 (UnkStruct_ov70_0225E9C8 * param0) sub_0201A8FC(¶m0->unk_00); } -static void ov70_0225EA44 (UnkStruct_ov70_0225E9C8 * param0, const UnkStruct_02023790 * param1) +static void ov70_0225EA44 (UnkStruct_ov70_0225E9C8 * param0, const Strbuf *param1) { if (sub_0201D724(param0->unk_10)) { sub_0201D730(param0->unk_10); @@ -1582,7 +1582,7 @@ static void ov70_0225EA44 (UnkStruct_ov70_0225E9C8 * param0, const UnkStruct_020 sub_0200E060(¶m0->unk_00, 1, 1, 1); } -static void ov70_0225EAA4 (UnkStruct_ov70_0225E9C8 * param0, const UnkStruct_02023790 * param1) +static void ov70_0225EAA4 (UnkStruct_ov70_0225E9C8 * param0, const Strbuf *param1) { if (sub_0201D724(param0->unk_10)) { sub_0201D730(param0->unk_10); @@ -1658,7 +1658,7 @@ static void ov70_0225EBBC (UnkStruct_ov70_0225E9C8 * param0) ov70_0225EA14(param0); } -static void ov70_0225EBC4 (UnkStruct_ov70_0225E9C8 * param0, const UnkStruct_02023790 * param1) +static void ov70_0225EBC4 (UnkStruct_ov70_0225E9C8 * param0, const Strbuf *param1) { if (sub_0201D724(param0->unk_10)) { sub_0201D730(param0->unk_10); @@ -1775,7 +1775,7 @@ static void ov70_0225EDE0 (UnkStruct_ov70_0225EC20 * param0) } } -static void ov70_0225EDF8 (UnkStruct_ov70_0225EC20 * param0, const UnkStruct_02023790 * param1, u32 param2) +static void ov70_0225EDF8 (UnkStruct_ov70_0225EC20 * param0, const Strbuf *param1, u32 param2) { sub_02013A6C(param0->unk_34, param1, param2); } @@ -1927,7 +1927,7 @@ static void ov70_0225F024 (UnkStruct_ov70_0225EFD4 * param0) } } -static void ov70_0225F048 (UnkStruct_ov70_0225EFD4 * param0, const UnkStruct_02023790 * param1, u8 param2, u8 param3) +static void ov70_0225F048 (UnkStruct_ov70_0225EFD4 * param0, const Strbuf *param1, u8 param2, u8 param3) { sub_0201D78C(¶m0->unk_00, 0, param1, param2, param3, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); sub_0201A9A4(¶m0->unk_00); @@ -1940,7 +1940,7 @@ static void ov70_0225F078 (UnkStruct_ov70_0225EFD4 * param0, u16 param1, u16 par static void ov70_0225F098 (UnkStruct_ov70_0225F098 * param0, UnkStruct_ov70_0225F208 * param1, u32 param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; GF_ASSERT(param0->unk_00 == NULL); param0->unk_00 = sub_02013A04(2, param2); @@ -1974,7 +1974,7 @@ static void ov70_0225F144 (UnkStruct_ov70_0225F114 * param0) sub_0201A8FC(¶m0->unk_00); } -static void ov70_0225F14C (UnkStruct_ov70_0225F114 * param0, const UnkStruct_02023790 * param1) +static void ov70_0225F14C (UnkStruct_ov70_0225F114 * param0, const Strbuf *param1) { sub_0201D78C(¶m0->unk_00, 0, param1, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); sub_0200DC48(¶m0->unk_00, 1, ((1 + (18 + 12)) + ((18 + 12) + 24)), 3); @@ -1984,7 +1984,7 @@ static void ov70_0225F14C (UnkStruct_ov70_0225F114 * param0, const UnkStruct_020 static void ov70_0225F184 (UnkStruct_ov70_0225F114 * param0, UnkStruct_ov70_0225F208 * param1) { u32 v0; - UnkStruct_02023790 * v1; + Strbuf* v1; UnkStruct_ov65_0222F6EC * v2; v2 = sub_020382F8(); @@ -1999,7 +1999,7 @@ static void ov70_0225F1C0 (UnkStruct_ov70_0225F114 * param0, UnkStruct_ov70_0225 { u32 v0; s32 v1; - UnkStruct_02023790 * v2; + Strbuf* v2; v1 = ov66_0223270C(param2); ov70_0225F2A8(param1, v1, 5, 0, 2); @@ -2010,7 +2010,7 @@ static void ov70_0225F1C0 (UnkStruct_ov70_0225F114 * param0, UnkStruct_ov70_0225 static void ov70_0225F1F0 (UnkStruct_ov70_0225F114 * param0, UnkStruct_ov70_0225F208 * param1, int param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = ov70_0225F288(param1, 2, 14); ov70_0225F14C(param0, v0); @@ -2047,7 +2047,7 @@ static void ov70_0225F25C (UnkStruct_ov70_0225F208 * param0) sub_020237BC(param0->unk_18); } -static UnkStruct_02023790 * ov70_0225F288 (UnkStruct_ov70_0225F208 * param0, int param1, u32 param2) +static Strbuf* ov70_0225F288 (UnkStruct_ov70_0225F208 * param0, int param1, u32 param2) { sub_0200B1B8(param0->unk_04[param1], param2, param0->unk_18); sub_0200C388(param0->unk_00, param0->unk_14, param0->unk_18); @@ -2909,7 +2909,7 @@ static void ov70_022602C0 (UnkStruct_ov70_0225FA84 * param0) static void ov70_022602DC (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225F208 * param1, u32 param2, u32 param3, u8 param4, u8 param5, u32 param6) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = ov70_0225F288(param1, 1, param3); sub_0201D78C(¶m0->unk_04[param2], 0, v0, param4, param5, 0xff, param6, NULL); @@ -2917,7 +2917,7 @@ static void ov70_022602DC (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225 static void ov70_02260314 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225F208 * param1, u32 param2, u32 param3, u8 param4, u8 param5, u32 param6) { - UnkStruct_02023790 * v0; + Strbuf* v0; u32 v1; s32 v2; @@ -3193,7 +3193,7 @@ static void ov70_02260870 (UnkStruct_ov70_02260744 * param0, UnkStruct_ov70_0225 } { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = ov70_0225F288(param2, 1, 63); diff --git a/src/overlay070/ov70_022630A4.c b/src/overlay070/ov70_022630A4.c index 8c243efde8..a574e1b7a5 100644 --- a/src/overlay070/ov70_022630A4.c +++ b/src/overlay070/ov70_022630A4.c @@ -662,7 +662,7 @@ static BOOL ov70_02263414 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 UnkStruct_ov70_0225CC54 * v1; UnkStruct_ov70_0225CA20 * v2; UnkStruct_ov66_0222DFF8 * v3; - UnkStruct_02023790 * v4; + Strbuf* v4; v3 = ov70_0225DEE8(param1); v2 = ov70_0225DEF0(param1); @@ -1022,7 +1022,7 @@ static BOOL ov70_02263910 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 break; case 3: { - UnkStruct_02023790 * v5; + Strbuf* v5; ov70_0225E27C(param1, v2->unk_08, 0); @@ -1112,7 +1112,7 @@ static BOOL ov70_02263A58 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 break; case 3: { - UnkStruct_02023790 * v7; + Strbuf* v7; ov70_0225E27C(param1, v3->unk_08, 0); v7 = ov70_0225E20C(param1, 0, 8); @@ -1189,7 +1189,7 @@ static BOOL ov70_02263BA4 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 case 3: { - UnkStruct_02023790 * v5; + Strbuf* v5; v5 = ov70_0225E20C(param1, 1, 91); @@ -1481,7 +1481,7 @@ static BOOL ov70_02264150 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 sub_02005748(1501); { - UnkStruct_02023790 * v2; + Strbuf* v2; v2 = ov70_0225E20C(param1, 1, 65); @@ -1496,7 +1496,7 @@ static BOOL ov70_02264150 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 break; case 2: { - UnkStruct_02023790 * v3; + Strbuf* v3; v3 = ov70_0225E20C(param1, 2, 25); @@ -1858,7 +1858,7 @@ static BOOL ov70_02264324 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 v4->unk_00--; if (v4->unk_00 <= 0) { - UnkStruct_02023790 * v27; + Strbuf* v27; ov70_0225E27C(param1, v4->unk_08, 0); v27 = ov70_0225E20C(param1, v4->unk_06, v4->unk_04); @@ -2030,7 +2030,7 @@ static BOOL ov70_022646C8 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 break; case 5: { - UnkStruct_02023790 * v16; + Strbuf* v16; u32 v17; BOOL v18 = 1; @@ -2103,7 +2103,7 @@ static BOOL ov70_02264974 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 UnkStruct_ov70_0225CA20 * v2; UnkStruct_ov70_0225CC54 * v3; UnkStruct_ov66_0222DFF8 * v4; - UnkStruct_02023790 * v5; + Strbuf* v5; v0 = ov70_02262E80(param0); v1 = ov70_0225DF10(param1); @@ -2372,7 +2372,7 @@ static BOOL ov70_02264C9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 switch (ov70_02262E84(param0)) { case 0: { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_ov66_0222DFF8 * v1; v1 = ov70_0225DEE8(param1); @@ -2421,7 +2421,7 @@ static BOOL ov70_02264D38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 UnkStruct_ov70_02260AD4 * v3; UnkStruct_ov66_0222DFF8 * v4; BOOL v5; - UnkStruct_02023790 * v6; + Strbuf* v6; v2 = ov70_0225DEF0(param1); v1 = ov70_0225DEF8(param1); @@ -2753,7 +2753,7 @@ static void ov70_02265370 (UnkStruct_ov70_02265104 * param0, UnkStruct_ov70_0226 static void ov70_022653DC (UnkStruct_ov70_022653DC * param0, UnkStruct_ov70_0225DEE8 * param1) { int v0; - const UnkStruct_02023790 * v1; + const Strbuf* v1; ov70_0225E00C(param1, 18); diff --git a/src/overlay070/ov70_02265F38.c b/src/overlay070/ov70_02265F38.c index 4c3e053c11..7fedd6f756 100644 --- a/src/overlay070/ov70_02265F38.c +++ b/src/overlay070/ov70_02265F38.c @@ -260,7 +260,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * v0->unk_10 = (30 * 30); { - UnkStruct_02023790 * v5; + Strbuf* v5; if (v0->unk_00 > (11 * 30)) { v5 = ov70_0225E20C(param1, 0, 10); @@ -296,7 +296,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02266CCC(&v0->unk_3C, v0->unk_00); if ((v0->unk_00 <= (11 * 30)) && (v0->unk_14 == 0)) { - UnkStruct_02023790 * v8; + Strbuf* v8; ov70_0225DFCC(param1); @@ -320,7 +320,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * { u32 v9; - UnkStruct_02023790 * v10; + Strbuf* v10; if (v7 == 4) { v9 = 16; @@ -388,7 +388,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * if (v0->unk_00 == 0) { ov70_02262E88(param0, 8); { - UnkStruct_02023790 * v11; + Strbuf* v11; ov70_0225DFCC(param1); v11 = ov70_0225E20C(param1, 0, 18); @@ -586,7 +586,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * break; case 16: { - UnkStruct_02023790 * v25; + Strbuf* v25; v25 = ov70_0225E20C(param1, 0, 26); ov70_0225DF8C(param1, v25); @@ -649,7 +649,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02266CFC(&v0->unk_3C, param1, 1); { - UnkStruct_02023790 * v29; + Strbuf* v29; if (v0->unk_00 > (11 * 30)) { v29 = ov70_0225E20C(param1, 0, 10); @@ -672,7 +672,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * { u32 v31; - UnkStruct_02023790 * v32; + Strbuf* v32; if (v30 == 4) { v31 = 16; @@ -693,7 +693,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * break; case 22: { - UnkStruct_02023790 * v33; + Strbuf* v33; v33 = ov70_0225E20C(param1, 0, 18); @@ -794,7 +794,7 @@ BOOL ov70_022669FC (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * switch (ov70_02262E84(param0)) { case 0: { - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; u32 v3; u32 v4; @@ -858,7 +858,7 @@ BOOL ov70_022669FC (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * static void ov70_02266AF0 (UnkStruct_ov70_02266AF0 * param0, UnkStruct_ov70_02263344 * param1, UnkStruct_ov70_0225DEE8 * param2, u32 param3, u32 param4) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = ov70_0225E20C(param2, 0, param3); ov70_0225DF8C(param2, v0); @@ -879,7 +879,7 @@ static void ov70_02266B18 (UnkStruct_ov70_02266AF0 * param0, UnkStruct_ov70_0226 static void ov70_02266B30 (UnkStruct_ov70_02266AF0 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2, u32 param3) { int v0; - UnkStruct_02023790 * v1; + Strbuf* v1; ov70_0225E00C(param1, param2); @@ -1003,7 +1003,7 @@ static void ov70_02266CFC (UnkStruct_ov70_02266C68 * param0, UnkStruct_ov70_0225 static void ov70_02266D08 (UnkStruct_ov70_02266C68 * param0, UnkStruct_ov70_0225DEE8 * param1, BOOL param2, BOOL param3) { - UnkStruct_02023790 * v0; + Strbuf* v0; u32 v1; BOOL v2; BOOL v3; diff --git a/src/overlay070/ov70_02266E9C.c b/src/overlay070/ov70_02266E9C.c index 4f332636ac..7a35ed6d92 100644 --- a/src/overlay070/ov70_02266E9C.c +++ b/src/overlay070/ov70_02266E9C.c @@ -72,8 +72,8 @@ typedef struct { } UnkStruct_ov70_0226DD5C; static u32 ov70_02268A3C(const UnkStruct_ov66_0222E71C * param0); -static UnkStruct_02023790 * ov70_02268AAC(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2); -static UnkStruct_02023790 * ov70_02268AF8(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2); +static Strbuf* ov70_02268AAC(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2); +static Strbuf* ov70_02268AF8(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2); static BOOL ov70_02268B50(UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov66_0222DFF8 * param1, u32 param2); static void ov70_02268BA0(UnkStruct_ov70_02268BA0 * param0); static void ov70_02268BA4(UnkStruct_ov70_02268BA0 * param0, u8 param1, u8 param2, UnkStruct_ov70_02263344 * param3, u8 param4); @@ -488,7 +488,7 @@ BOOL ov70_02266E9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * UnkStruct_ov70_022630A4 * v2; u32 v3; u32 v4; - UnkStruct_02023790 * v5; + Strbuf* v5; const UnkStruct_ov66_0222E71C * v6; const UnkStruct_ov66_0222E71C * v7; @@ -1121,7 +1121,7 @@ BOOL ov70_02267A44 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * UnkStruct_ov66_0222DFF8 * v1; u32 v2; u32 v3; - UnkStruct_02023790 * v4; + Strbuf* v4; const UnkStruct_ov66_0222E71C * v5; const UnkStruct_ov66_0222E71C * v6; @@ -1591,7 +1591,7 @@ BOOL ov70_02267A44 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * BOOL ov70_02268390 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) { UnkStruct_ov70_02268390 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; UnkStruct_ov66_0222DFF8 * v2; v0 = ov70_02262E80(param0); @@ -1880,7 +1880,7 @@ BOOL ov70_0226889C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * { UnkStruct_ov70_02268390 * v0; UnkStruct_ov66_0222DFF8 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; v0 = ov70_02262E80(param0); v1 = ov70_0225DEE8(param1); @@ -2015,7 +2015,7 @@ static u32 ov70_02268A3C (const UnkStruct_ov66_0222E71C * param0) return 1; } -static UnkStruct_02023790 * ov70_02268AAC (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2) +static Strbuf* ov70_02268AAC (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2) { BOOL v0; UnkStruct_ov66_0222DFF8 * v1; @@ -2036,7 +2036,7 @@ static UnkStruct_02023790 * ov70_02268AAC (UnkStruct_ov70_0225DEE8 * param0, u32 return ov70_0225E20C(param0, 3, param2); } -static UnkStruct_02023790 * ov70_02268AF8 (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2) +static Strbuf* ov70_02268AF8 (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2) { BOOL v0, v1; UnkStruct_ov66_0222DFF8 * v2; @@ -2223,7 +2223,7 @@ static void ov70_02268D38 (UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov66_0222 static void ov70_02268D70 (UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov70_0225DEE8 * param1) { UnkStruct_ov66_0222DFF8 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = ov70_0225DEE8(param1); @@ -2252,7 +2252,7 @@ static void ov70_02268DC4 (UnkStruct_ov70_02268BA0 * param0) static void ov70_02268DCC (UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov70_0225DEE8 * param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; if (param0->unk_0D == 1) { if (param0->unk_0E == 450) { @@ -2286,7 +2286,7 @@ static void ov70_02268E20 (UnkStruct_ov70_02268BA0 * param0, const UnkStruct_ov6 static void ov70_02268E44 (UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2, u32 param3, u32 param4) { int v0; - const UnkStruct_02023790 * v1; + const Strbuf* v1; ov70_0225E00C(param1, param2); param0->unk_20 = param2; @@ -2320,7 +2320,7 @@ static void ov70_02268EEC (UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225 int v0; u32 v1; u32 v2; - const UnkStruct_02023790 * v3; + const Strbuf* v3; BOOL v4; ov70_0225E020(param1, param3, param2); @@ -2361,7 +2361,7 @@ static void ov70_02268EEC (UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225 static void ov70_02268FB8 (UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225DEE8 * param1) { int v0; - UnkStruct_02023790 * v1; + Strbuf* v1; static const u8 v2[8] = { 31, 32, 33, 34, 35, 40, 36, 37, }; @@ -2383,7 +2383,7 @@ static void ov70_02268FB8 (UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225 static void ov70_02269018 (UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225DEE8 * param1) { int v0; - UnkStruct_02023790 * v1; + Strbuf* v1; ov70_0225E00C(param1, 4); param0->unk_20 = 4; @@ -2407,7 +2407,7 @@ static void ov70_02269018 (UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225 static void ov70_02269090 (UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225DEE8 * param1) { int v0; - UnkStruct_02023790 * v1; + Strbuf* v1; ov70_0225E00C(param1, 4); param0->unk_20 = 4; diff --git a/src/overlay070/ov70_0226CC74.c b/src/overlay070/ov70_0226CC74.c index b8e927d13e..eb06971612 100644 --- a/src/overlay070/ov70_0226CC74.c +++ b/src/overlay070/ov70_0226CC74.c @@ -27,7 +27,7 @@ BOOL ov70_0226CC74 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * UnkStruct_ov70_0225CA20 * v2; UnkStruct_ov70_0225CC54 * v3; UnkStruct_ov70_0225CC54 * v4; - UnkStruct_02023790 * v5; + Strbuf* v5; v0 = ov70_02262E80(param0); v1 = ov70_0225DEE8(param1); diff --git a/src/overlay071/ov71_0223C69C.c b/src/overlay071/ov71_0223C69C.c index fb1b1d03f6..d012b56508 100644 --- a/src/overlay071/ov71_0223C69C.c +++ b/src/overlay071/ov71_0223C69C.c @@ -19,8 +19,8 @@ #include "unk_0202CBE4.h" #include "overlay071/ov71_0223C69C.h" -static void ov71_0223CD64(UnkStruct_0205AA50 * param0, const u32 param1, const u32 param2, const u32 param3, UnkStruct_02023790 * param4, const u32 param5, const u8 param6, const int param7); -static void ov71_0223CDB0(UnkStruct_0205AA50 * param0, const u32 param1, const u32 param2, const u32 param3, const UnkStruct_02023790 * param4); +static void ov71_0223CD64(UnkStruct_0205AA50 * param0, const u32 param1, const u32 param2, const u32 param3, Strbuf *param4, const u32 param5, const u8 param6, const int param7); +static void ov71_0223CDB0(UnkStruct_0205AA50 * param0, const u32 param1, const u32 param2, const u32 param3, const Strbuf *param4); static const UnkStruct_ov61_0222C884 Unk_ov71_0223D670[] = { {0x7, 0x2, 0x4, 0x11, 0x2, 0xF, 0x6F}, @@ -75,7 +75,7 @@ void ov71_0223C6F0 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * para { u8 v0; UnkStruct_0200B144 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; sub_0201AE78(¶m0[0], 0, 0, 0, 17 * 8, 2 * 8); sub_0201AE78(¶m0[1], 0, 0, 0, 17 * 8, 2 * 8); @@ -96,7 +96,7 @@ void ov71_0223C6F0 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * para } { - UnkStruct_02023790 * v3 = sub_02023790(32, 25); + Strbuf* v3 = sub_02023790(32, 25); UnkStruct_0200B358 * v4 = sub_0200B368(6, 32, 25); ov71_0223CD64(¶m0[0], (8 * 17), 0, 0, v2, param1->unk_28, 5, 2); @@ -532,7 +532,7 @@ void ov71_0223CD44 (UnkStruct_0205AA50 * param0, const u8 param1, const u8 param } } -static void ov71_0223CD64 (UnkStruct_0205AA50 * param0, const u32 param1, const u32 param2, const u32 param3, UnkStruct_02023790 * param4, const u32 param5, const u8 param6, const int param7) +static void ov71_0223CD64 (UnkStruct_0205AA50 * param0, const u32 param1, const u32 param2, const u32 param3, Strbuf *param4, const u32 param5, const u8 param6, const int param7) { u32 v0; @@ -541,7 +541,7 @@ static void ov71_0223CD64 (UnkStruct_0205AA50 * param0, const u32 param1, const sub_0201D78C(param0, 0, param4, param1 - (v0 + param2), param3, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); } -static void ov71_0223CDB0 (UnkStruct_0205AA50 * param0, const u32 param1, const u32 param2, const u32 param3, const UnkStruct_02023790 * param4) +static void ov71_0223CDB0 (UnkStruct_0205AA50 * param0, const u32 param1, const u32 param2, const u32 param3, const Strbuf *param4) { u32 v0; @@ -549,7 +549,7 @@ static void ov71_0223CDB0 (UnkStruct_0205AA50 * param0, const u32 param1, const sub_0201D78C(param0, 0, param4, param1 - (v0 + param2), param3, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); } -void ov71_0223CDE8 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * param1, UnkStruct_02023790 * param2) +void ov71_0223CDE8 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * param1, Strbuf *param2) { int v0; @@ -566,8 +566,8 @@ void ov71_0223CDE8 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * para { u32 v1; UnkStruct_0200B144 * v2 = sub_0200B144(0, 26, 616, 25); - UnkStruct_02023790 * v3 = sub_02023790(32, 25); - UnkStruct_02023790 * v4 = sub_02023790(32, 25); + Strbuf* v3 = sub_02023790(32, 25); + Strbuf* v4 = sub_02023790(32, 25); UnkStruct_0200B358 * v5 = sub_0200B368((1 + 1), 32, 25); sub_0200B60C(v5, 0, sub_0202CC58(param1->unk_18), 3, 1, 1); @@ -584,7 +584,7 @@ void ov71_0223CDE8 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * para } } -void ov71_0223CECC (UnkStruct_0205AA50 * param0, const BOOL param1, UnkStruct_02023790 * param2) +void ov71_0223CECC (UnkStruct_0205AA50 * param0, const BOOL param1, Strbuf *param2) { if (param1) { sub_0201D78C(param0, 0, param2, (207 - 2), 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c index 6fb05bf118..357675a521 100644 --- a/src/overlay072/ov72_0223D7A0.c +++ b/src/overlay072/ov72_0223D7A0.c @@ -100,7 +100,7 @@ static void ov72_0223E3A8(UnkStruct_02022550 ** param0, BOOL param1); static int ov72_0223E528(UnkStruct_ov72_0223DB98 * param0, int param1); static void ov72_0223E430(UnkStruct_02018340 * param0, UnkStruct_02015920 * param1); static void ov72_0223E9B4(u8 * param0, u8 * param1); -static void * ov72_0223E060(UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, u8 param3, const u32 param4); +static void * ov72_0223E060(UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, u8 param3, const u32 param4); static void ov72_0223EA18(UnkStruct_ov72_0223DB98 * param0); static void ov72_0223EAD8(UnkStruct_ov72_0223EAD8 * param0); static void ov72_0223E5E0(UnkStruct_0205AA50 * param0, void * param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9); @@ -556,7 +556,7 @@ static void ov72_0223DF58 (UnkStruct_ov72_0223DB98 * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void * ov72_0223E060 (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, u8 param3, const u32 param4) +static void * ov72_0223E060 (UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, u8 param3, const u32 param4) { int v0, v1; @@ -1099,7 +1099,7 @@ static void ov72_0223E914 (UnkStruct_ov72_0223DB98 * param0) static void ov72_0223E930 (UnkStruct_ov72_0223DB98 * param0, int param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_02023790((40 * 2), 39); diff --git a/src/overlay073/ov73_021D0D80.c b/src/overlay073/ov73_021D0D80.c index d49da5b1fb..425aa127bd 100644 --- a/src/overlay073/ov73_021D0D80.c +++ b/src/overlay073/ov73_021D0D80.c @@ -83,7 +83,7 @@ typedef struct { int unk_50; int unk_54; int unk_58; - UnkStruct_02023790 * unk_5C; + Strbuf* unk_5C; void * unk_60; UnkStruct_0200B358 * unk_64; UnkStruct_02015920 * unk_68; @@ -720,7 +720,7 @@ static BOOL ov73_021D1510 (UnkStruct_ov73_021D1058 * param0, u32 param1, int par sub_02002AE4(0); { - UnkStruct_02023790 * v1 = sub_02023790(0x400, param0->unk_00); + Strbuf* v1 = sub_02023790(0x400, param0->unk_00); param0->unk_5C = sub_02023790(0x400, param0->unk_00); @@ -2128,7 +2128,7 @@ static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) } { - UnkStruct_02023790 * v10 = sub_0200B1EC(param0->unk_4C, v9); + Strbuf* v10 = sub_0200B1EC(param0->unk_4C, v9); sub_02023810(param0->unk_74->unk_18, v10); sub_020237BC(v10); diff --git a/src/overlay074/ov74_021D0D80.c b/src/overlay074/ov74_021D0D80.c index f3366d43f8..3a292334c6 100644 --- a/src/overlay074/ov74_021D0D80.c +++ b/src/overlay074/ov74_021D0D80.c @@ -48,7 +48,7 @@ typedef struct UnkStruct_ov74_021D1720_t { u16 unk_00; u16 unk_02; - UnkStruct_02023790 * unk_04[20]; + Strbuf* unk_04[20]; } UnkStruct_ov74_021D1720; typedef struct UnkStruct_ov74_021D0D80_t { @@ -549,8 +549,8 @@ static void ov74_021D1668 (UnkStruct_ov74_021D0D80 * param0) u32 v0, v1; u16 v2; u32 v3, v4, v5; - UnkStruct_02023790 * v6; - UnkStruct_02023790 * v7; + Strbuf* v6; + Strbuf* v7; static const u8 v8[7] = { 3, 6, 4, 5, 7, 8, 42, }; @@ -669,7 +669,7 @@ static void ov74_021D17CC (UnkStruct_ov74_021D0D80 * param0, u16 param1) static void ov74_021D1968 (UnkStruct_ov74_021D0D80 * param0, u16 param1, BOOL param2) { u32 v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u8 v2; if (ov74_021D1A08(param0) == 0) { diff --git a/src/overlay075/ov75_021D0D80.c b/src/overlay075/ov75_021D0D80.c index d3c0da877a..6581aae050 100644 --- a/src/overlay075/ov75_021D0D80.c +++ b/src/overlay075/ov75_021D0D80.c @@ -92,7 +92,7 @@ typedef struct { UnkStruct_02018340 * unk_18; UnkStruct_020978D8 * unk_1C; UnkStruct_0200B144 * unk_20; - UnkStruct_02023790 * unk_24[3]; + Strbuf* unk_24[3]; UnkStruct_02002F38 * unk_30; void * unk_34; void * unk_38; @@ -273,7 +273,7 @@ static int ov75_021D0E80 (UnkStruct_ov75_021D1184 * param0) static int ov75_021D0FA0 (UnkStruct_ov75_021D1184 * param0) { - UnkStruct_02023790 * v0 = NULL; + Strbuf* v0 = NULL; switch (param0->unk_08) { case 0: @@ -329,7 +329,7 @@ static int ov75_021D1064 (UnkStruct_ov75_021D1184 * param0) static int ov75_021D108C (UnkStruct_ov75_021D1184 * param0) { int v0; - UnkStruct_02023790 * v1 = NULL; + Strbuf* v1 = NULL; switch (param0->unk_08) { case 0: @@ -829,7 +829,7 @@ static void ov75_021D19A8 (UnkStruct_ov75_021D1184 * param0) static void ov75_021D19C8 (UnkStruct_ov75_021D1184 * param0) { int v0 = 0; - UnkStruct_02023790 * v1; + Strbuf* v1; for (v0 = 0; v0 < 3; v0++) { if (!sub_02014BBC(¶m0->unk_1C->unk_1A[v0])) { @@ -844,7 +844,7 @@ static void ov75_021D19C8 (UnkStruct_ov75_021D1184 * param0) } if (param0->unk_0C == 1) { - UnkStruct_02023790 * v2; + Strbuf* v2; int v3; param0->unk_20 = sub_0200B144(1, 26, 409, param0->unk_00); diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c index d7cb15eb62..ff15e761b4 100644 --- a/src/overlay076/ov76_0223B870.c +++ b/src/overlay076/ov76_0223B870.c @@ -149,7 +149,7 @@ void ov76_0223B96C (UnkStruct_ov76_0223DE00 * param0, BOOL param1) void ov76_0223B98C (UnkStruct_ov76_0223DE00 * param0, int param1, int param2, int param3, int param4) { UnkStruct_020127E8 v0; - UnkStruct_02023790 * v1; + Strbuf* v1; int v2; int v3; UnkStruct_0200B144 * v4; @@ -503,7 +503,7 @@ void ov76_0223BF74 (UnkStruct_02018340 * param0, UnkStruct_0205AA50 * param1, in { int v9; - UnkStruct_02023790 * v10; + Strbuf* v10; UnkStruct_0200B144 * v11 = sub_0200B144(0, 26, 8, 53); for (v9 = 0; v9 < v7; v9++) { @@ -938,7 +938,7 @@ void ov76_0223C974 (UnkStruct_02018340 * param0, UnkStruct_02002F38 * param1, in void ov76_0223CA30 (UnkStruct_0205AA50 * param0, int param1) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; if (param1 == 0xFFFF) { sub_0201ADA4(param0, 15); @@ -991,7 +991,7 @@ void ov76_0223CC8C (UnkStruct_ov76_0223DE00 * param0) int v1; int v2; int v3; - UnkStruct_02023790 * v4; + Strbuf* v4; UnkStruct_0205AA50 * v5; for (v0 = 3; v0 < 11; v0++) { @@ -1023,7 +1023,7 @@ void ov76_0223CD20 (UnkStruct_ov76_0223DE00 * param0, int param1) int v1; int v2; int v3; - UnkStruct_02023790 * v4; + Strbuf* v4; UnkStruct_0205AA50 * v5; v5 = ¶m0->unk_D4.unk_18[param1 + 3]; @@ -1060,7 +1060,7 @@ void ov76_0223CDA4 (UnkStruct_ov76_0223DE00 * param0) void ov76_0223CDC4 (UnkStruct_0205AA50 * param0, int param1) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; if (param1 == 0xFFFF) { sub_0201ADA4(param0, 15); diff --git a/src/overlay077/ov77_021D0D80.c b/src/overlay077/ov77_021D0D80.c index 6588364e97..b3e2dbabfe 100644 --- a/src/overlay077/ov77_021D0D80.c +++ b/src/overlay077/ov77_021D0D80.c @@ -1262,7 +1262,7 @@ static void ov77_021D2214 (UnkStruct_02018340 * param0, int param1, UnkStruct_ov { UnkStruct_0200B144 * v4; - UnkStruct_02023790 * v5; + Strbuf* v5; u32 v6; sub_02019690(4, 32, 0, param1); diff --git a/src/overlay078/ov78_021D0D80.c b/src/overlay078/ov78_021D0D80.c index 3ce63619c6..96ac93a77e 100644 --- a/src/overlay078/ov78_021D0D80.c +++ b/src/overlay078/ov78_021D0D80.c @@ -164,7 +164,7 @@ typedef struct { UnkStruct_0205AA50 * unk_98; UnkStruct_0205AA50 * unk_9C[3]; int unk_A8; - UnkStruct_02023790 * unk_AC; + Strbuf* unk_AC; UnkStruct_ov61_0222C884 unk_B0; UnkStruct_02001AF4 * unk_B8; UnkStruct_0200C738 unk_BC; @@ -206,7 +206,7 @@ static void ov78_021D12EC(UnkStruct_02018340 * param0); static void ov78_021D1308(UnkStruct_ov78_021D107C * param0, int param1); static void ov78_021D13A0(UnkStruct_ov78_021D107C * param0); static u8 ov78_021D1FB4(UnkStruct_0205AA50 * param0, int param1, int param2, int param3, u32 param4, u32 param5); -static u8 ov78_021D201C(UnkStruct_0205AA50 * param0, int param1, int param2, int param3, u32 param4, u32 param5, UnkStruct_02023790 ** param6); +static u8 ov78_021D201C(UnkStruct_0205AA50 * param0, int param1, int param2, int param3, u32 param4, u32 param5, Strbuf **param6); static void ov78_021D2090(UnkStruct_ov78_021D107C * param0); static void ov78_021D27CC(UnkStruct_ov78_021D107C * param0, int param1); static void ov78_021D2884(UnkStruct_ov78_021D107C * param0); @@ -1242,7 +1242,7 @@ static void ov78_021D1E44 (UnkStruct_ov78_021D107C * param0, int param1) static u8 ov78_021D1FB4 (UnkStruct_0205AA50 * param0, int param1, int param2, int param3, u32 param4, u32 param5) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u8 v2; v0 = sub_0200B144(0, 26, param2, param1); @@ -1259,7 +1259,7 @@ static u8 ov78_021D1FB4 (UnkStruct_0205AA50 * param0, int param1, int param2, in return v2; } -static u8 ov78_021D201C (UnkStruct_0205AA50 * param0, int param1, int param2, int param3, u32 param4, u32 param5, UnkStruct_02023790 ** param6) +static u8 ov78_021D201C (UnkStruct_0205AA50 * param0, int param1, int param2, int param3, u32 param4, u32 param5, Strbuf **param6) { UnkStruct_0200B144 * v0; u8 v1; @@ -1723,7 +1723,7 @@ static void ov78_021D2884 (UnkStruct_ov78_021D107C * param0) static void ov78_021D28A8 (UnkStruct_0205AA50 * param0, int param1, int param2, int param3, u32 param4) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = sub_0200B144(0, 26, param2, param1); GF_ASSERT(v0); diff --git a/src/overlay079/ov79_021D183C.c b/src/overlay079/ov79_021D183C.c index 2a13dd2e64..586fa8cd8e 100644 --- a/src/overlay079/ov79_021D183C.c +++ b/src/overlay079/ov79_021D183C.c @@ -81,7 +81,7 @@ static void ov79_021D183C (UnkStruct_020989DC * param0) param0->unk_07 = param0->unk_06 = 0xFF; } -static void ov79_021D1850 (UnkStruct_ov79_021D0E1C * param0, UnkStruct_02023790 * param1, u8 param2, u8 param3) +static void ov79_021D1850 (UnkStruct_ov79_021D0E1C * param0, Strbuf *param1, u8 param2, u8 param3) { u32 v0 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0))); diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c index 44c474e923..deac08781b 100644 --- a/src/overlay079/ov79_021D2268.c +++ b/src/overlay079/ov79_021D2268.c @@ -63,8 +63,8 @@ typedef struct { UnkStruct_0200B358 * unk_00; - UnkStruct_02023790 * unk_04; - UnkStruct_02023790 * unk_08[3]; + Strbuf* unk_04; + Strbuf* unk_08[3]; } UnkStruct_ov79_021D2928_sub1; typedef struct { diff --git a/src/overlay080/ov80_021D1458.c b/src/overlay080/ov80_021D1458.c index b8b62e76fb..3662047605 100644 --- a/src/overlay080/ov80_021D1458.c +++ b/src/overlay080/ov80_021D1458.c @@ -35,7 +35,7 @@ #include "unk_02071CFC.h" #include "overlay080/ov80_021D2AF4.h" -void sub_02071D10(const int param0, const u32 param1, UnkStruct_02023790 * param2); +void sub_02071D10(const int param0, const u32 param1, Strbuf *param2); typedef struct { int unk_00; @@ -578,7 +578,7 @@ static void ov80_021D1AB0 (UnkStruct_ov80_021D2A08 * param0, UnkStruct_0205AA50 } if (param0->unk_00 == 1) { - UnkStruct_02023790 * v3 = sub_0200B1EC(param0->unk_84, 0); + Strbuf* v3 = sub_0200B1EC(param0->unk_84, 0); sub_0201D78C(param1, 0, v3, 0, 6, 0xff, v1, NULL); sub_020237BC(v3); @@ -591,8 +591,8 @@ static void ov80_021D1B5C (UnkStruct_ov80_021D2A08 * param0, UnkStruct_0205AA50 { u32 v0; u32 v1; - UnkStruct_02023790 * v2; - UnkStruct_02023790 * v3; + Strbuf* v2; + Strbuf* v3; if (param2 == NULL) { sub_0201ADA4(param1, 0); @@ -670,7 +670,7 @@ static void ov80_021D1D24 (UnkStruct_ov80_021D2A08 * param0, UnkStruct_ov80_021D UnkStruct_ov80_021D1478 * v0 = param0->unk_34; u32 v1; u32 v2; - UnkStruct_02023790 * v3; + Strbuf* v3; param0->unk_90 = param2; param0->unk_94 = param1; @@ -701,7 +701,7 @@ static void ov80_021D1D6C (UnkStruct_ov80_021D2A08 * param0, UnkStruct_0205AA50 { u32 v0; u32 v1; - UnkStruct_02023790 * v2; + Strbuf* v2; sub_02019964(param0->unk_28, 5, 10, 0, 12, 2, param0->unk_CC->rawData, 0, 7, param0->unk_CC->screenWidth / 8, param0->unk_CC->screenHeight / 8); diff --git a/src/overlay081/ov81_021D1610.c b/src/overlay081/ov81_021D1610.c index 6beff753be..01c17e7e35 100644 --- a/src/overlay081/ov81_021D1610.c +++ b/src/overlay081/ov81_021D1610.c @@ -147,7 +147,7 @@ void ov81_021D164C (UnkStruct_ov81_021D1610 * param0, u32 param1) static u8 ov81_021D16B0 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0205AA50 * param2) { UnkStruct_0202BC58 v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; sub_0202C2A4(param0->unk_44, &v0, 0, param0->unk_105C); @@ -326,7 +326,7 @@ static void ov81_021D1A90 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D1AD4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1) { UnkStruct_0202BF4C v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; sub_0202C2A4(param0->unk_44, &v0, 3, param0->unk_105C); @@ -336,7 +336,7 @@ static void ov81_021D1AD4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 } { - UnkStruct_02023790 * v3; + Strbuf* v3; v3 = sub_0200B010(26, 433, sub_0203A138(v0.unk_02), 42); v2 = sub_02023C3C(v3); @@ -464,7 +464,7 @@ static void ov81_021D1C10 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D1E04 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 9); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 9); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); @@ -472,7 +472,7 @@ static void ov81_021D1E04 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D1E40 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 10); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 10); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); @@ -480,7 +480,7 @@ static void ov81_021D1E40 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D1E7C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 11); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 11); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); @@ -488,7 +488,7 @@ static void ov81_021D1E7C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D1EB8 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 12); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 12); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); @@ -496,7 +496,7 @@ static void ov81_021D1EB8 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D1EF4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 13); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 13); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); @@ -504,7 +504,7 @@ static void ov81_021D1EF4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D1F30 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 14); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 14); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); @@ -512,7 +512,7 @@ static void ov81_021D1F30 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D1F6C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 15); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 15); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); @@ -520,7 +520,7 @@ static void ov81_021D1F6C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D1FA8 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 16); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 16); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); @@ -528,7 +528,7 @@ static void ov81_021D1FA8 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D1FE4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 17); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 17); sub_0200BD60(param0->unk_54, 0, param2->unk_02); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -538,7 +538,7 @@ static void ov81_021D1FE4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2038 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 18); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 18); sub_0200BD60(param0->unk_54, 0, param2->unk_02); sub_0200BA08(param0->unk_54, 1, param2->unk_04); @@ -549,7 +549,7 @@ static void ov81_021D2038 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2098 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 19); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 19); sub_0200BA08(param0->unk_54, 0, param2->unk_04); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -559,7 +559,7 @@ static void ov81_021D2098 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D20EC (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 20); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 20); sub_0200BA08(param0->unk_54, 0, param2->unk_04); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -569,7 +569,7 @@ static void ov81_021D20EC (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2140 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 21); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 21); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -579,7 +579,7 @@ static void ov81_021D2140 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D219C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0; + Strbuf* v0; u32 v1; v1 = param2->unk_02; @@ -598,7 +598,7 @@ static void ov81_021D219C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2208 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0; + Strbuf* v0; u32 v1; v1 = param2->unk_02; @@ -617,7 +617,7 @@ static void ov81_021D2208 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2270 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 30); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 30); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); @@ -625,7 +625,7 @@ static void ov81_021D2270 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D22AC (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 31); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 31); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); @@ -633,7 +633,7 @@ static void ov81_021D22AC (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D22E8 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 34); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 34); sub_0200B70C(param0->unk_54, 0, param2->unk_06); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -643,7 +643,7 @@ static void ov81_021D22E8 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D233C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 40); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 40); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -653,7 +653,7 @@ static void ov81_021D233C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2398 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 35); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 35); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -663,7 +663,7 @@ static void ov81_021D2398 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D23F4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 36); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 36); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -673,7 +673,7 @@ static void ov81_021D23F4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2450 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 43); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 43); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -683,7 +683,7 @@ static void ov81_021D2450 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D24AC (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 38); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 38); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -693,7 +693,7 @@ static void ov81_021D24AC (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2508 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 37); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 37); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -703,7 +703,7 @@ static void ov81_021D2508 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2564 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 42); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 42); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -713,7 +713,7 @@ static void ov81_021D2564 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D25C0 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 41); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 41); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -723,7 +723,7 @@ static void ov81_021D25C0 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D261C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 39); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 39); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -733,7 +733,7 @@ static void ov81_021D261C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2678 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 46); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 46); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -743,7 +743,7 @@ static void ov81_021D2678 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D26D4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 44); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 44); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -753,7 +753,7 @@ static void ov81_021D26D4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2730 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 45); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 45); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); @@ -761,7 +761,7 @@ static void ov81_021D2730 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D276C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 47); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 47); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); @@ -769,7 +769,7 @@ static void ov81_021D276C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D27A8 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 48); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 48); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); @@ -777,7 +777,7 @@ static void ov81_021D27A8 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D27E4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 32); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 32); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); @@ -785,7 +785,7 @@ static void ov81_021D27E4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2820 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 33); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 33); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); @@ -794,7 +794,7 @@ static void ov81_021D2820 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D285C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BCC8 * param2, u8 param3, int param4) { u32 v0; - UnkStruct_02023790 * v1; + Strbuf* v1; switch (param4) { case 36: @@ -831,7 +831,7 @@ static void ov81_021D28C8 (UnkStruct_ov81_021D1610 * param0, u16 param1, u8 para static void ov81_021D2908 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BE38 * param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; switch (param2->unk_01_0) { case 0: @@ -860,7 +860,7 @@ static void ov81_021D2908 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D29B4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BE38 * param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; switch (param2->unk_01_0) { case 0: @@ -889,7 +889,7 @@ static void ov81_021D29B4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2A60 (UnkStruct_ov81_021D1610 * param0, u16 * param1, u8 param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_02023790(32, 42); + Strbuf* v0 = sub_02023790(32, 42); sub_02023D28(v0, param1); sub_0200B48C(param0->unk_54, param3, v0, param2, 1, GAME_LANGUAGE); @@ -898,7 +898,7 @@ static void ov81_021D2A60 (UnkStruct_ov81_021D1610 * param0, u16 * param1, u8 pa static void ov81_021D2A9C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - UnkStruct_02023790 * v0; + Strbuf* v0; switch (param2->unk_01_0) { case 0: @@ -921,7 +921,7 @@ static void ov81_021D2A9C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2B20 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - UnkStruct_02023790 * v0; + Strbuf* v0; switch (param2->unk_01_0) { case 0: @@ -944,7 +944,7 @@ static void ov81_021D2B20 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2BA4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - UnkStruct_02023790 * v0; + Strbuf* v0; switch (param2->unk_01_0) { case 0: @@ -968,7 +968,7 @@ static void ov81_021D2BA4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2C38 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - UnkStruct_02023790 * v0; + Strbuf* v0; switch (param2->unk_01_0) { case 0: @@ -991,7 +991,7 @@ static void ov81_021D2C38 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2CBC (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - UnkStruct_02023790 * v0; + Strbuf* v0; switch (param2->unk_01_0) { case 0: @@ -1015,7 +1015,7 @@ static void ov81_021D2CBC (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2D50 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 77); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 77); ov81_021D2A60(param0, param2->unk_02, param2->unk_01_4, 0); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -1025,7 +1025,7 @@ static void ov81_021D2D50 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2DAC (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 78); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 78); ov81_021D2A60(param0, param2->unk_02, param2->unk_01_4, 0); ov81_021D2A60(param0, param2->unk_22, param2->unk_01_6, 1); @@ -1036,7 +1036,7 @@ static void ov81_021D2DAC (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2E18 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 79); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 79); sub_0201D78C(param1, 0, v0, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); @@ -1044,7 +1044,7 @@ static void ov81_021D2E18 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2E54 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 80); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 80); ov81_021D2A60(param0, param2->unk_22, param2->unk_01_6, 0); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -1054,7 +1054,7 @@ static void ov81_021D2E54 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2EB0 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 81); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 81); sub_0201D78C(param1, 0, v0, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); @@ -1062,7 +1062,7 @@ static void ov81_021D2EB0 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2EEC (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - UnkStruct_02023790 * v0; + Strbuf* v0; switch (param2->unk_01_0) { case 0: @@ -1085,7 +1085,7 @@ static void ov81_021D2EEC (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2F70 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 85); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 85); sub_0201D78C(param1, 0, v0, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); @@ -1093,7 +1093,7 @@ static void ov81_021D2F70 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D2FAC (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 87); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 87); sub_0200B60C(param0->unk_54, 0, param2->unk_01_0, 1, 0, 1); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -1103,7 +1103,7 @@ static void ov81_021D2FAC (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D300C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 88); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 88); sub_0201D78C(param1, 0, v0, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); @@ -1111,7 +1111,7 @@ static void ov81_021D300C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D3048 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 89); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 89); ov81_021D2A60(param0, param2->unk_02, param2->unk_01_4, 0); ov81_021D2A60(param0, param2->unk_22, param2->unk_01_6, 1); @@ -1122,7 +1122,7 @@ static void ov81_021D3048 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D30B4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 94); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 94); sub_0201D78C(param1, 0, v0, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); @@ -1130,7 +1130,7 @@ static void ov81_021D30B4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D30F0 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 86); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 86); sub_0201D78C(param1, 0, v0, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); @@ -1138,7 +1138,7 @@ static void ov81_021D30F0 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D312C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3, int param4) { - UnkStruct_02023790 * v0; + Strbuf* v0; u32 v1; switch (param4) { @@ -1164,7 +1164,7 @@ static void ov81_021D312C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D3190 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 95); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 95); ov81_021D2A60(param0, param2->unk_02, param2->unk_01_4, 0); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -1174,7 +1174,7 @@ static void ov81_021D3190 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D31EC (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 96); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 96); ov81_021D2A60(param0, param2->unk_02, param2->unk_01_4, 0); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -1184,7 +1184,7 @@ static void ov81_021D31EC (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D3248 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 97); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 97); sub_0200C0B0(param0->unk_54, 0, param2->unk_01_0); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -1194,7 +1194,7 @@ static void ov81_021D3248 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D32A0 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3, int param4) { - UnkStruct_02023790 * v0; + Strbuf* v0; u32 v1; switch (param4) { @@ -1220,7 +1220,7 @@ static void ov81_021D32A0 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D3304 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_50, 102); + Strbuf* v0 = sub_0200B1EC(param0->unk_50, 102); sub_0201D78C(param1, 0, v0, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020237BC(v0); diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c index ecf89b439e..5c9d122d73 100644 --- a/src/overlay083/ov83_0223D6A8.c +++ b/src/overlay083/ov83_0223D6A8.c @@ -98,7 +98,7 @@ static void ov83_0223E09C(UnkStruct_ov83_0223E138 * param0, u32 param1); static void ov83_0223E138(UnkStruct_ov83_0223E138 * param0); static void ov83_0223E15C(UnkStruct_ov83_0223E138 * param0, u32 param1, NARC * param2); static void ov83_0223E208(UnkStruct_ov83_0223E138 * param0); -static void ov83_0223E21C(UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3); +static void ov83_0223E21C(UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3); static void ov83_0223E77C(UnkStruct_ov83_0223E824 * param0, u32 param1); static void ov83_0223E824(UnkStruct_ov83_0223E824 * param0); static void ov83_0223E844(UnkStruct_ov83_0223E824 * param0, u32 param1, NARC * param2); @@ -118,7 +118,7 @@ static void ov83_0223F670(UnkStruct_ov83_0223F670 * param0); static void ov83_0223F6B4(UnkStruct_ov83_0223F670 * param0); static void ov83_0223F6CC(UnkStruct_ov83_0223F670 * param0, int param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, fx32 param7); -static int ov83_0223D6A8 (int param0, const UnkStruct_02023790 * param1, int param2) +static int ov83_0223D6A8 (int param0, const Strbuf *param1, int param2) { u32 v0; @@ -678,7 +678,7 @@ static void ov83_0223E208 (UnkStruct_ov83_0223E138 * param0) Heap_FreeToHeap(param0->unk_28); } -static void ov83_0223E21C (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3) +static void ov83_0223E21C (UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3) { sub_0201D78C(param0, 1, param1, param2, param3, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); } @@ -1211,7 +1211,7 @@ void ov83_0223EC70 (UnkStruct_ov83_0223E824 * param0) void ov83_0223EC8C (UnkStruct_ov83_0223E824 * param0, u32 param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; int v1; ov83_0223E9D0(param0); diff --git a/src/overlay084/ov84_0223B5A0.c b/src/overlay084/ov84_0223B5A0.c index 5da0d244db..62c42b716a 100644 --- a/src/overlay084/ov84_0223B5A0.c +++ b/src/overlay084/ov84_0223B5A0.c @@ -146,7 +146,7 @@ static int ov84_0223D94C(UnkStruct_ov84_0223B5A0 * param0); static int ov84_0223DA04(UnkStruct_ov84_0223B5A0 * param0); static int ov84_0223DA14(UnkStruct_ov84_0223B5A0 * param0); static BOOL ov84_0223DBF4(UnkStruct_ov84_0223B5A0 * param0, u16 param1); -static UnkStruct_02023790 * ov84_0223DC9C(UnkStruct_ov84_0223B5A0 * param0, u16 param1); +static Strbuf* ov84_0223DC9C(UnkStruct_ov84_0223B5A0 * param0, u16 param1); static void ov84_0223DCF8(UnkStruct_ov84_0223B5A0 * param0); static int ov84_0223DDD0(UnkStruct_ov84_0223B5A0 * param0); static void ov84_0223DCF8(UnkStruct_ov84_0223B5A0 * param0); @@ -874,12 +874,12 @@ u16 ov84_0223BE5C (UnkStruct_ov84_0223B5A0 * param0, u16 param1, u16 param2) return v0->unk_00[param1].unk_02; } -static void ov84_0223BE84 (UnkStruct_0200B144 * param0, UnkStruct_02023790 * param1, u16 param2, u32 param3) +static void ov84_0223BE84 (UnkStruct_0200B144 * param0, Strbuf *param1, u16 param2, u32 param3) { sub_0200B1B8(param0, param2, param1); } -static void ov84_0223BE94 (UnkStruct_0200B144 * param0, UnkStruct_02023790 * param1, u16 param2, u32 param3) +static void ov84_0223BE94 (UnkStruct_0200B144 * param0, Strbuf *param1, u16 param2, u32 param3) { sub_0200B1B8(param0, GetMoveFromTMOrHMItemID(param2), param1); } @@ -2217,7 +2217,7 @@ static int ov84_0223DA14 (UnkStruct_ov84_0223B5A0 * param0) } if ((Unk_021BF67C.unk_48 & (PAD_BUTTON_A | PAD_BUTTON_B)) || Unk_021BF67C.unk_60) { - UnkStruct_02023790 * v1 = sub_0200B1EC(param0->unk_114, 60); + Strbuf* v1 = sub_0200B1EC(param0->unk_114, 60); sub_0201ADA4(¶m0->unk_04[6], 15); sub_0200C388(param0->unk_118, param0->unk_3F8, v1); @@ -2283,7 +2283,7 @@ static int ov84_0223DA14 (UnkStruct_ov84_0223B5A0 * param0) static BOOL ov84_0223DBF4 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; sub_0200B498(param0->unk_118, 0, param0->unk_CC); sub_0200B70C(param0->unk_118, 1, param1); @@ -2307,7 +2307,7 @@ static BOOL ov84_0223DBF4 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) return 1; } -static UnkStruct_02023790 * ov84_0223DC9C (UnkStruct_ov84_0223B5A0 * param0, u16 param1) +static Strbuf* ov84_0223DC9C (UnkStruct_ov84_0223B5A0 * param0, u16 param1) { s32 v0; u8 * v1; @@ -2478,7 +2478,7 @@ static int ov84_0223E01C (UnkStruct_ov84_0223B5A0 * param0) switch (v0) { case 0: { - UnkStruct_02023790 * v1 = sub_0200B1EC(param0->unk_114, 53); + Strbuf* v1 = sub_0200B1EC(param0->unk_114, 53); if (param0->unk_488 == 1) { sub_0200B70C(param0->unk_118, 0, param0->unk_C4->unk_66); @@ -2596,7 +2596,7 @@ static int ov84_0223E27C (UnkStruct_ov84_0223B5A0 * param0) if (v0 == 1) { if (Item_GetAttribute(param0->unk_C4->unk_66, 3, 6) != 0) { - UnkStruct_02023790 * v1; + Strbuf* v1; sub_0201ADA4(¶m0->unk_04[6], 15); sub_0200E060(¶m0->unk_04[6], 0, 1024 - 9 - (18 + 12), 12); @@ -2658,7 +2658,7 @@ static int ov84_0223E3BC (UnkStruct_ov84_0223B5A0 * param0) u8 v0 = ov84_0223C5B8(param0); if (v0 == 1) { - UnkStruct_02023790 * v1; + Strbuf* v1; ov84_02240248(param0, 0); sub_0201ADA4(¶m0->unk_04[6], 15); @@ -2726,7 +2726,7 @@ static int ov84_0223E5C4 (UnkStruct_ov84_0223B5A0 * param0) return 18; } if (ov84_0223D1F4(param0) == 1) { - UnkStruct_02023790 * v0; + Strbuf* v0; ov84_02240D3C(param0, 0); sub_0200DC9C(¶m0->unk_04[7], 1); @@ -2756,7 +2756,7 @@ static int ov84_0223E5C4 (UnkStruct_ov84_0223B5A0 * param0) return 18; } if (Unk_021BF67C.unk_48 & PAD_BUTTON_A) { - UnkStruct_02023790 * v1; + Strbuf* v1; ov84_02240D3C(param0, 0); sub_0200DC9C(¶m0->unk_04[7], 1); @@ -2818,7 +2818,7 @@ static int ov84_0223E7CC (UnkStruct_ov84_0223B5A0 * param0) switch (v0) { case 0: { - UnkStruct_02023790 * v1 = sub_0200B1EC(param0->unk_114, 77); + Strbuf* v1 = sub_0200B1EC(param0->unk_114, 77); if (param0->unk_488 > 1) { sub_0200B77C(param0->unk_118, 0, param0->unk_C4->unk_66); diff --git a/src/overlay084/ov84_0223F040.c b/src/overlay084/ov84_0223F040.c index 56e9f6ee76..dc1ddd4826 100644 --- a/src/overlay084/ov84_0223F040.c +++ b/src/overlay084/ov84_0223F040.c @@ -110,7 +110,7 @@ void ov84_0223F25C (UnkStruct_ov84_0223B5A0 * param0) } } -static void ov84_0223F2C0 (UnkStruct_ov84_0223B5A0 * param0, UnkStruct_02023790 * param1, u16 param2) +static void ov84_0223F2C0 (UnkStruct_ov84_0223B5A0 * param0, Strbuf *param1, u16 param2) { u32 v0; @@ -121,8 +121,8 @@ static void ov84_0223F2C0 (UnkStruct_ov84_0223B5A0 * param0, UnkStruct_02023790 void ov84_0223F2FC (UnkStruct_ov84_0223B5A0 * param0) { UnkStruct_ov84_0223C920 * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; u16 v3; sub_0201ADA4(¶m0->unk_04[2], 0); @@ -206,7 +206,7 @@ static void ov84_0223F508 (UnkStruct_ov84_0223B5A0 * param0, u32 param1, u32 par void ov84_0223F528 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; if (param1 != 0xffff) { v0 = sub_02023790(130, 6); @@ -222,7 +222,7 @@ void ov84_0223F528 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) void ov84_0223F584 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u16 v2; u16 v3; @@ -296,7 +296,7 @@ void ov84_0223F800 (UnkStruct_ov84_0223B5A0 * param0) void ov84_0223F81C (UnkStruct_ov84_0223B5A0 * param0, u16 param1, u16 param2, u32 param3) { - UnkStruct_02023790 * v0; + Strbuf* v0; u32 v1; if (param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_08 == 3) { @@ -359,7 +359,7 @@ static void ov84_0223F9B0 (UnkStruct_ov84_0223B5A0 * param0, u32 param1) void ov84_0223F9F0 (UnkStruct_ov84_0223B5A0 * param0, u32 param1) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param0->unk_114, 41); + Strbuf* v0 = sub_0200B1EC(param0->unk_114, 41); sub_0201AE78(¶m0->unk_04[0], 0, 0, param1, 17 * 8, 16); sub_0201D78C(¶m0->unk_04[0], 0, v0, 0, param1, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -406,8 +406,8 @@ void ov84_0223FB70 (UnkStruct_ov84_0223B5A0 * param0, u8 * param1, u8 param2) { UnkStruct_02081CF4 v0; UnkStruct_ov84_0223BE5C * v1; - UnkStruct_02023790 * v2; - UnkStruct_02023790 * v3; + Strbuf* v2; + Strbuf* v3; u16 v4; u16 v5; @@ -494,8 +494,8 @@ void ov84_0223FD84 (UnkStruct_ov84_0223B5A0 * param0) void ov84_0223FE18 (UnkStruct_ov84_0223B5A0 * param0) { - UnkStruct_02023790 * v0; - UnkStruct_02023790 * v1; + Strbuf* v0; + Strbuf* v1; sub_0201ADA4(¶m0->unk_04[1], 0); @@ -514,8 +514,8 @@ void ov84_0223FE18 (UnkStruct_ov84_0223B5A0 * param0) void ov84_0223FE94 (UnkStruct_ov84_0223B5A0 * param0) { UnkStruct_ov84_0223BE5C * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; u16 v3; sub_0200DC48(¶m0->unk_04[9], 1, 1024 - 9, 14); @@ -539,7 +539,7 @@ void ov84_0223FE94 (UnkStruct_ov84_0223B5A0 * param0) void ov84_0223FF44 (UnkStruct_ov84_0223B5A0 * param0) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; v0 = ¶m0->unk_04[9]; @@ -565,7 +565,7 @@ void ov84_0223FFC0 (UnkStruct_ov84_0223B5A0 * param0) void ov84_0223FFF0 (UnkStruct_ov84_0223B5A0 * param0) { UnkStruct_ov84_0223BE5C * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u16 v2; sub_0200E060(¶m0->unk_04[6], 1, 1024 - 9 - (18 + 12), 12); @@ -623,7 +623,7 @@ void ov84_02240120 (UnkStruct_ov84_0223B5A0 * param0) void ov84_02240148 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; v0 = ¶m0->unk_04[7]; @@ -656,7 +656,7 @@ void ov84_02240148 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) void ov84_02240248 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; v0 = ¶m0->unk_04[8]; @@ -688,7 +688,7 @@ void ov84_02240248 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) void ov84_02240328 (UnkStruct_ov84_0223B5A0 * param0) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; v0 = ¶m0->unk_04[10]; diff --git a/src/overlay085/ov85_02241440.c b/src/overlay085/ov85_02241440.c index 5526328ea7..ea33490de6 100644 --- a/src/overlay085/ov85_02241440.c +++ b/src/overlay085/ov85_02241440.c @@ -493,7 +493,7 @@ static void ov85_02241860 (UnkStruct_0205AA50 * param0) static void ov85_02241878 (UnkStruct_ov85_022417E4 * param0, u32 param1, u32 param2, u32 param3) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; v0 = ¶m0->unk_04[param1]; @@ -544,8 +544,8 @@ static void ov85_0224196C (UnkStruct_ov85_022417E4 * param0) static void ov85_0224198C (UnkStruct_ov85_022417E4 * param0) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; v0 = ¶m0->unk_04[1]; @@ -571,7 +571,7 @@ static void ov85_0224198C (UnkStruct_ov85_022417E4 * param0) static void ov85_02241A58 (UnkStruct_ov85_022417E4 * param0) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = ¶m0->unk_04[11]; @@ -587,7 +587,7 @@ static void ov85_02241A58 (UnkStruct_ov85_022417E4 * param0) static void ov85_02241AA8 (UnkStruct_ov85_022417E4 * param0) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = ¶m0->unk_04[9]; sub_0201ADA4(v0, 0); @@ -601,7 +601,7 @@ static void ov85_02241AA8 (UnkStruct_ov85_022417E4 * param0) static void ov85_02241AF4 (UnkStruct_ov85_022417E4 * param0) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; v0 = ¶m0->unk_04[10]; @@ -624,7 +624,7 @@ static void ov85_02241AF4 (UnkStruct_ov85_022417E4 * param0) static void ov85_02241B50 (UnkStruct_ov85_022417E4 * param0) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = ¶m0->unk_04[7]; sub_0201ADA4(v0, 0); @@ -638,8 +638,8 @@ static void ov85_02241B50 (UnkStruct_ov85_022417E4 * param0) static void ov85_02241B9C (UnkStruct_ov85_022417E4 * param0) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; u32 v3; v0 = ¶m0->unk_04[8]; diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c index 77bbdc75e4..568ca86c67 100644 --- a/src/overlay086/ov86_0223B140.c +++ b/src/overlay086/ov86_0223B140.c @@ -98,8 +98,8 @@ typedef struct { UnkStruct_0201CD38 * unk_1C30; UnkStruct_0201CD38 * unk_1C34[4]; UnkStruct_0200B358 * unk_1C44; - UnkStruct_02023790 * unk_1C48; - UnkStruct_02023790 * unk_1C4C; + Strbuf* unk_1C48; + Strbuf* unk_1C4C; UnkStruct_0200B144 * unk_1C50; NARC * unk_1C54; } UnkStruct_ov86_0223B3C8; @@ -190,8 +190,8 @@ typedef struct { UnkStruct_02018340 * unk_0C; UnkStruct_0205AA50 * unk_10; UnkStruct_0200B358 * unk_14; - UnkStruct_02023790 * unk_18; - UnkStruct_02023790 * unk_1C; + Strbuf* unk_18; + Strbuf* unk_1C; UnkStruct_0200B144 * unk_20; Pokemon * unk_24; const UnkStruct_02025E6C * unk_28; diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c index 5b3bb5d495..1cb3086361 100644 --- a/src/overlay087/ov87_021D106C.c +++ b/src/overlay087/ov87_021D106C.c @@ -61,8 +61,8 @@ typedef struct UnkStruct_ov87_021D106C_t { UnkStruct_0200B144 * unk_1E8; UnkStruct_0200B144 * unk_1EC; UnkStruct_0200B358 * unk_1F0; - UnkStruct_02023790 * unk_1F4; - UnkStruct_02023790 * unk_1F8; + Strbuf* unk_1F4; + Strbuf* unk_1F8; Pokemon * unk_1FC; u8 unk_200[3200]; } UnkStruct_ov87_021D106C; diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index 847475de5d..735d090329 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -359,7 +359,7 @@ static void ov88_0223B2F0 (NNSG2dCharacterData * param0, int param1, int param2, static void ov88_0223B320 (UnkStruct_02095E80 * param0) { - UnkStruct_02023790 * v0, * v1, * v2; + Strbuf* v0, * v1, * v2; UnkStruct_02025E6C * v3, * v4; v3 = sub_02032EE8(sub_0203608C()); @@ -525,7 +525,7 @@ static void ov88_0223B748 (UnkStruct_0205AA50 * param0, UnkStruct_0200B358 * par int v0; for (v0 = 0; v0 < Party_GetCurrentCount(param3); v0++) { - UnkStruct_02023790 * v1 = sub_0200B29C(param1, param2, 1 + param4 + v0, 26); + Strbuf* v1 = sub_0200B29C(param1, param2, 1 + param4 + v0, 26); ov88_0223EC78(¶m0[v0], v1, 8, 0, 1, 0); sub_020237BC(v1); @@ -1298,7 +1298,7 @@ static int ov88_0223C800 (int param0, Pokemon * param1, u8 * param2, UnkStruct_0 static void ov88_0223C860 (UnkStruct_0205AA50 * param0, Party * param1, int param2, int param3, int param4) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_02023790(20, 26); @@ -1324,7 +1324,7 @@ static int ov88_0223C8AC (UnkStruct_ov88_0223C8AC * param0, Party * param1, int static void ov88_0223C8D8 (UnkStruct_0205AA50 * param0, int param1, Party * param2, int param3, UnkStruct_02095E80 * param4) { - UnkStruct_02023790 * v0, * v1; + Strbuf* v0, * v1; u16 v2, v3; int v4; Pokemon * v5; @@ -1924,7 +1924,7 @@ static int ov88_0223D69C (UnkStruct_02095E80 * param0) { UnkStruct_0200B144 * v3; - UnkStruct_02023790 * v4 = sub_02023790(100, 26); + Strbuf* v4 = sub_02023790(100, 26); int v5 = 0; for (v5 = 0; v5 < 32; v5++) { diff --git a/src/overlay088/ov88_0223E9C4.c b/src/overlay088/ov88_0223E9C4.c index becf4f1186..0e4c80cd40 100644 --- a/src/overlay088/ov88_0223E9C4.c +++ b/src/overlay088/ov88_0223E9C4.c @@ -119,7 +119,7 @@ void ov88_0223EC04 (UnkStruct_0205AA50 * param0) sub_0201A8FC(¶m0[25]); } -void ov88_0223EC78 (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, u32 param3, int param4, int param5) +void ov88_0223EC78 (UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, u32 param3, int param4, int param5) { int v0 = 0; @@ -137,7 +137,7 @@ void ov88_0223EC78 (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, in int ov88_0223ECBC (UnkStruct_0205AA50 * param0, int param1, int param2, UnkStruct_0200B144 * param3, UnkStruct_0200B358 * param4) { - UnkStruct_02023790 * v0; + Strbuf* v0; int v1; v0 = sub_0200B29C(param4, param3, param1, 26); diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c index fdbb7b2df5..a4976d3255 100644 --- a/src/overlay090/ov90_021D0D80.c +++ b/src/overlay090/ov90_021D0D80.c @@ -59,19 +59,19 @@ typedef struct { UnkStruct_0200B144 * unk_00; UnkStruct_0200B358 * unk_04; - UnkStruct_02023790 * unk_08; - UnkStruct_02023790 * unk_0C; - UnkStruct_02023790 * unk_10; - UnkStruct_02023790 * unk_14; - UnkStruct_02023790 * unk_18; - UnkStruct_02023790 * unk_1C; - UnkStruct_02023790 * unk_20; - UnkStruct_02023790 * unk_24[6]; - UnkStruct_02023790 * unk_3C[2]; + Strbuf* unk_08; + Strbuf* unk_0C; + Strbuf* unk_10; + Strbuf* unk_14; + Strbuf* unk_18; + Strbuf* unk_1C; + Strbuf* unk_20; + Strbuf* unk_24[6]; + Strbuf* unk_3C[2]; } UnkStruct_ov90_021D0ECC_sub1; typedef struct { - UnkStruct_02023790 * unk_00; + Strbuf* unk_00; u8 unk_04; u8 unk_05; u8 unk_06; @@ -120,7 +120,7 @@ static void ov90_021D15D0(UnkStruct_ov90_021D0ECC * param0); static void ov90_021D1750(UnkStruct_ov90_021D0ECC * param0); static void ov90_021D17DC(UnkStruct_ov90_021D0ECC * param0); static void ov90_021D18BC(UnkStruct_ov90_021D0ECC * param0); -static void ov90_021D17F8(UnkStruct_ov90_021D17F8 * param0, UnkStruct_0205AA50 * param1, UnkStruct_02023790 * param2, u8 param3, u8 param4, u8 param5); +static void ov90_021D17F8(UnkStruct_ov90_021D17F8 * param0, UnkStruct_0205AA50 * param1, Strbuf *param2, u8 param3, u8 param4, u8 param5); static void ov90_021D1984(UnkStruct_ov90_021D0ECC * param0); static void ov90_021D1A48(UnkStruct_ov90_021D0ECC * param0); static void ov90_021D1A9C(UnkStruct_ov90_021D0ECC * param0); @@ -766,7 +766,7 @@ static void ov90_021D17DC (UnkStruct_ov90_021D0ECC * param0) } } -static void ov90_021D17F8 (UnkStruct_ov90_021D17F8 * param0, UnkStruct_0205AA50 * param1, UnkStruct_02023790 * param2, u8 param3, u8 param4, u8 param5) +static void ov90_021D17F8 (UnkStruct_ov90_021D17F8 * param0, UnkStruct_0205AA50 * param1, Strbuf *param2, u8 param3, u8 param4, u8 param5) { UnkStruct_ov90_021D17F8 * v0; int v1, v2, v3, v4, v5; @@ -846,7 +846,7 @@ static void ov90_021D1984 (UnkStruct_ov90_021D0ECC * param0) static void ov90_021D1A48 (UnkStruct_ov90_021D0ECC * param0) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_ov90_021D17F8 * v1 = &(param0->unk_BC[param0->unk_0B * 3 + param0->unk_0C]); v0 = sub_02014B34(&v1->unk_08, param0->unk_00); diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index 07c129ca41..f5bcfa0751 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -70,7 +70,7 @@ typedef struct { UnkStruct_0205AA50 unk_08[15]; UnkStruct_0200B144 * unk_F8; UnkStruct_0200B358 * unk_FC; - UnkStruct_02023790 * unk_100; + Strbuf* unk_100; UnkStruct_0200112C * unk_104; UnkStruct_02013A04 * unk_108; UnkStruct_02001AF4 * unk_10C; @@ -868,7 +868,7 @@ static void ov91_021D1580 (UnkStruct_ov91_021D0ED8 * param0, u32 param1, u32 par static void ov91_021D1618 (UnkStruct_ov91_021D0ED8 * param0, u32 param1, u32 param2, u8 param3, u8 param4) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_0200B1EC(param0->unk_F8, param1); sub_0200B60C(param0->unk_FC, 0, param2, param3, param4, 1); @@ -1103,7 +1103,7 @@ static void ov91_021D1BBC (UnkStruct_ov91_021D0ED8 * param0, u16 param1) static void ov91_021D1C10 (UnkStruct_ov91_021D0ED8 * param0, u32 param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; switch (param1) { case 0: diff --git a/src/overlay092/ov92_021D0D80.c b/src/overlay092/ov92_021D0D80.c index 4a8b89223b..ee3448c56f 100644 --- a/src/overlay092/ov92_021D0D80.c +++ b/src/overlay092/ov92_021D0D80.c @@ -98,7 +98,7 @@ typedef struct { UnkStruct_0200B144 * unk_B860; int unk_B864; int unk_B868; - UnkStruct_02023790 * unk_B86C; + Strbuf* unk_B86C; UnkStruct_0200B358 * unk_B870; NNSG3dRenderObj unk_B874; NNSG3dResMdl * unk_B8C8; @@ -139,7 +139,7 @@ typedef struct { u32 unk_04; } UnkStruct_ov92_021D2958; -BOOL ov92_021D27E8(int param0, int param1, UnkStruct_02023790 * param2, UnkStruct_02023790 * param3, int param4); +BOOL ov92_021D27E8(int param0, int param1, Strbuf *param2, Strbuf *param3, int param4); BOOL ov92_021D2854(int param0); int ov92_021D0D80(UnkStruct_020067E8 * param0, int * param1); int ov92_021D0EB8(UnkStruct_020067E8 * param0, int * param1); @@ -974,7 +974,7 @@ static void ov92_021D1888 (UnkStruct_ov92_021D1B24 * param0, NARC * param1) sub_0201975C(2, 0x0); { - UnkStruct_02023790 * v0 = sub_02023790(16, param0->unk_00); + Strbuf* v0 = sub_02023790(16, param0->unk_00); sub_02002BB8(2, param0->unk_00); { @@ -1110,8 +1110,8 @@ static void ov92_021D1DB4 (UnkStruct_ov92_021D1B24 * param0) static void ov92_021D1DEC (UnkStruct_ov92_021D1B24 * param0) { - UnkStruct_02023790 * v0 = sub_02023790(0x400, param0->unk_00); - UnkStruct_02023790 * v1 = sub_02023790(0x400, param0->unk_00); + Strbuf* v0 = sub_02023790(0x400, param0->unk_00); + Strbuf* v1 = sub_02023790(0x400, param0->unk_00); sub_0201A8D4(param0->unk_B810, ¶m0->unk_B844, &Unk_ov92_021D291C); sub_0201AE78(¶m0->unk_B844, 15, 0, 0, 27 * 8, 6 * 8); @@ -1133,8 +1133,8 @@ static void ov92_021D1DEC (UnkStruct_ov92_021D1B24 * param0) static void ov92_021D1EBC (UnkStruct_ov92_021D1B24 * param0, int param1, int param2) { - UnkStruct_02023790 * v0 = sub_02023790(64, param0->unk_00); - UnkStruct_02023790 * v1 = sub_02023790(64, param0->unk_00); + Strbuf* v0 = sub_02023790(64, param0->unk_00); + Strbuf* v1 = sub_02023790(64, param0->unk_00); sub_0201A8D4(param0->unk_B810, ¶m0->unk_B844, &Unk_ov92_021D291C); sub_0201AE78(¶m0->unk_B844, 15, 0, 0, 27 * 8, 6 * 8); @@ -1162,7 +1162,7 @@ static void ov92_021D1F90 (UnkStruct_ov92_021D1B24 * param0) { if (param0->unk_BB28 == 0) { { - UnkStruct_02023790 * v0 = sub_02023790(0x400, param0->unk_00); + Strbuf* v0 = sub_02023790(0x400, param0->unk_00); sub_0201AE78(¶m0->unk_B814, 15, 0, 0, 27 * 8, 6 * 8); sub_0200B1B8(param0->unk_B860, 14, v0); @@ -1204,8 +1204,8 @@ static void ov92_021D1F90 (UnkStruct_ov92_021D1B24 * param0) } if (v8 != param0->unk_0C.unk_00) { - UnkStruct_02023790 * v12 = sub_02023790(64, param0->unk_00); - UnkStruct_02023790 * v13 = sub_02023790(64, param0->unk_00); + Strbuf* v12 = sub_02023790(64, param0->unk_00); + Strbuf* v13 = sub_02023790(64, param0->unk_00); sub_0201AE78(¶m0->unk_B814, 15, 0, 0, 27 * 8, 6 * 8); ov92_021D27E8(param0->unk_0C.unk_04[v8].unk_2A, param0->unk_0C.unk_04[v8].unk_2C, v12, v13, param0->unk_00); @@ -1514,7 +1514,7 @@ static void ov92_021D26D0 (UnkStruct_ov92_021D1B24 * param0) } } -BOOL ov92_021D27E8 (int param0, int param1, UnkStruct_02023790 * param2, UnkStruct_02023790 * param3, int param4) +BOOL ov92_021D27E8 (int param0, int param1, Strbuf *param2, Strbuf *param3, int param4) { UnkStruct_0200B144 * v0; int v1 = ov92_021D16F8(param0); diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c index 57ed98f63c..557ff62178 100644 --- a/src/overlay094/ov94_0223C610.c +++ b/src/overlay094/ov94_0223C610.c @@ -589,7 +589,7 @@ static void ov94_0223CF3C (UnkStruct_ov94_0223FD4C * param0) static void ov94_0223CF80 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4) { - UnkStruct_02023790 * v0; + Strbuf* v0; sub_0200B1B8(param0->unk_B90, param1, param0->unk_BAC); sub_0201ADA4(¶m0->unk_F5C, 0xf0f); @@ -600,7 +600,7 @@ static void ov94_0223CF80 (UnkStruct_ov94_0223FD4C * param0, int param1, int par static void ov94_0223CFD8 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4) { - UnkStruct_02023790 * v0; + Strbuf* v0; sub_0200B1B8(param0->unk_B90, param1, param0->unk_BAC); sub_0201ADA4(¶m0->unk_109C, 0xf0f); @@ -611,7 +611,7 @@ static void ov94_0223CFD8 (UnkStruct_ov94_0223FD4C * param0, int param1, int par void ov94_0223D030 (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, int param2, u16 param3) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_0200B1EC(param1, param2); diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c index 1837284f65..6d68deb7bc 100644 --- a/src/overlay094/ov94_0223D0C4.c +++ b/src/overlay094/ov94_0223D0C4.c @@ -504,7 +504,7 @@ static int ov94_0223D858 (UnkStruct_ov94_0223FD4C * param0) static void ov94_0223D88C (UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4, Pokemon * param5) { - UnkStruct_02023790 * v0; + Strbuf* v0; sub_0200B538(param0->unk_B8C, 0, sub_02076B10(param5)); v0 = sub_0200B1EC(param0->unk_B90, param1); @@ -525,9 +525,9 @@ static u32 Unk_ov94_022467FC[] = { void ov94_0223D910 (UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], BoxPokemon * param4, UnkStruct_ov94_0223BA88_sub2 * param5) { - UnkStruct_02023790 * v0, * v1, * v2, * v3; - UnkStruct_02023790 * v4 = sub_02023790((10 + 1) * 2, 62); - UnkStruct_02023790 * v5 = sub_02023790((8 + 1) * 2, 62); + Strbuf* v0, * v1, * v2, * v3; + Strbuf* v4 = sub_02023790((10 + 1) * 2, 62); + Strbuf* v5 = sub_02023790((8 + 1) * 2, 62); int v6, v7, v8, v9, v10; sub_02074570(param4, MON_DATA_119, v4); @@ -571,8 +571,8 @@ void ov94_0223D910 (UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, Un void ov94_0223DA78 (UnkStruct_0200B144 * param0, UnkStruct_0205AA50 param1[], u16 * param2, Pokemon * param3, UnkStruct_0205AA50 param4[]) { - UnkStruct_02023790 * v0, * v1; - UnkStruct_02023790 * v2, * v3; + Strbuf* v0, * v1; + Strbuf* v2, * v3; v0 = sub_02023790((7 + 1) * 2, 62); v3 = sub_02023790((7 + 1) * 2, 62); diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c index bf20dda521..05efa12bc3 100644 --- a/src/overlay094/ov94_0223DC04.c +++ b/src/overlay094/ov94_0223DC04.c @@ -59,7 +59,7 @@ static void ov94_0223E240(UnkStruct_ov94_0223FD4C * param0); static void ov94_0223E358(UnkStruct_0200B144 * param0, UnkStruct_0205AA50 param1[]); static void ov94_0223E300(UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4); static void ov94_0223E3B0(UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B144 * param2, UnkStruct_ov94_0223BA88_sub3 * param3); -static void ov94_0223E424(UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, UnkStruct_02023790 * param2); +static void ov94_0223E424(UnkStruct_0205AA50 * param0, Strbuf *param1, Strbuf *param2); static int (* Unk_ov94_0224682C[])(UnkStruct_ov94_0223FD4C * wk) = { ov94_0223E09C, @@ -436,7 +436,7 @@ static int ov94_0223E2E0 (UnkStruct_ov94_0223FD4C * param0) static void ov94_0223E300 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4) { - UnkStruct_02023790 * v0; + Strbuf* v0; sub_0200B1B8(param0->unk_B90, param1, param0->unk_BAC); sub_0201ADA4(¶m0->unk_F5C, 0xf0f); @@ -447,7 +447,7 @@ static void ov94_0223E300 (UnkStruct_ov94_0223FD4C * param0, int param1, int par static void ov94_0223E358 (UnkStruct_0200B144 * param0, UnkStruct_0205AA50 param1[]) { - UnkStruct_02023790 * v0, * v1; + Strbuf* v0, * v1; v0 = sub_0200B1EC(param0, 74); v1 = sub_0200B1EC(param0, 78); @@ -468,7 +468,7 @@ static void ov94_0223E3B0 (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * par ov94_0224226C(param0 + 1, param1, ov94_02242970(param3->unk_03, param3->unk_04, 0), 0, 19, (u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), 0, 8); } -static void ov94_0223E424 (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, UnkStruct_02023790 * param2) +static void ov94_0223E424 (UnkStruct_0205AA50 * param0, Strbuf *param1, Strbuf *param2) { sub_0201ADA4(param0, 0x0); diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c index 78cf04b5d5..343d0a1e1b 100644 --- a/src/overlay094/ov94_0223E46C.c +++ b/src/overlay094/ov94_0223E46C.c @@ -1082,7 +1082,7 @@ static int ov94_0223F970 (UnkStruct_ov94_0223FD4C * param0) static void ov94_0223F9A4 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4) { - UnkStruct_02023790 * v0; + Strbuf* v0; sub_0200B1B8(param0->unk_B90, param1, param0->unk_BAC); sub_0201ADA4(¶m0->unk_F5C, 0xf0f); @@ -1093,7 +1093,7 @@ static void ov94_0223F9A4 (UnkStruct_ov94_0223FD4C * param0, int param1, int par static void ov94_0223F9FC (UnkStruct_0205AA50 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0200B144 * param2) { - UnkStruct_02023790 * v0, * v1, * v2; + Strbuf* v0, * v1, * v2; v0 = sub_0200B1EC(param2, 59); ov94_02245900(¶m0[0], v0, 0, 0, 0, (u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))); diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c index 88e5eedd5e..7760b56729 100644 --- a/src/overlay094/ov94_0223FB48.c +++ b/src/overlay094/ov94_0223FB48.c @@ -1017,7 +1017,7 @@ static int ov94_02240D28 (UnkStruct_ov94_0223FD4C * param0) static void ov94_02240D58 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4, int param5) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v1 = sub_0200B1EC(param0->unk_B90, param1); sub_0200C388(param0->unk_B8C, param0->unk_BAC, v1); diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index 95cc849482..8d699a6731 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -328,7 +328,7 @@ int ov94_02241568 (UnkStruct_ov94_0223FD4C * param0, int param1) static void ov94_0224158C (UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_0200B1EC(param0->unk_B90, param1); @@ -842,7 +842,7 @@ static u32 Unk_ov94_02246920[] = { void ov94_02242158 (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, int param2, int param3, int param4, u32 param5) { - UnkStruct_02023790 * v0; + Strbuf* v0; if (param2 != 0) { v0 = sub_0200B1EC(param1, param2); @@ -853,7 +853,7 @@ void ov94_02242158 (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, in void ov94_0224218C (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B144 * param2, int param3, int param4, int param5, u32 param6) { - UnkStruct_02023790 * v0; + Strbuf* v0; if (param3 != 0) { v0 = sub_0200B1EC(param1, param3); @@ -886,7 +886,7 @@ const int Unk_ov94_02245FD8[] = { void ov94_02242204 (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, int param2, int param3, int param4, int param5, u32 param6) { - UnkStruct_02023790 * v0; + Strbuf* v0; if ((param3 == 0) && (param2 == 3)) { return; @@ -960,7 +960,7 @@ asm void ov94_022422B8 (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1 void ov94_022422D4 (UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], int param4, int param5, int param6) { - UnkStruct_02023790 * v0; + Strbuf* v0; int v1; v0 = sub_0200B1EC(param0, 97); @@ -984,7 +984,7 @@ void ov94_022422D4 (UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, Un void ov94_02242368 (UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], int param4, int param5, int param6) { - UnkStruct_02023790 * v0; + Strbuf* v0; int v1; v0 = sub_0200B1EC(param0, 97); @@ -1008,9 +1008,9 @@ void ov94_02242368 (UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, Un static void ov94_022423FC (UnkStruct_0200B144 * param0, UnkStruct_0200B358 * param1, UnkStruct_0205AA50 param2[], BoxPokemon * param3, UnkStruct_ov94_0223BA88_sub2 * param4) { - UnkStruct_02023790 * v0, * v1; - UnkStruct_02023790 * v2 = sub_02023790(10 + 1, 62); - UnkStruct_02023790 * v3 = sub_02023790(10 + 1, 62); + Strbuf* v0, * v1; + Strbuf* v2 = sub_02023790(10 + 1, 62); + Strbuf* v3 = sub_02023790(10 + 1, 62); int v4, v5, v6; sub_02074570(param3, MON_DATA_119, v2); diff --git a/src/overlay094/ov94_02244950.c b/src/overlay094/ov94_02244950.c index 80541e8ac0..86edcd952c 100644 --- a/src/overlay094/ov94_02244950.c +++ b/src/overlay094/ov94_02244950.c @@ -71,7 +71,7 @@ static int ov94_022451DC(UnkStruct_ov94_0223FD4C * param0); static int ov94_022451EC(UnkStruct_ov94_0223FD4C * param0); static int ov94_02245540(UnkStruct_ov94_0223FD4C * param0); static int ov94_02245564(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02245894(UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, u32 param4, int param5); +static int ov94_02245894(UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, u32 param4, int param5); static int (* Unk_ov94_02246A40[])(UnkStruct_ov94_0223FD4C *) = { ov94_02244F8C, @@ -908,7 +908,7 @@ static int ov94_022457F0 (UnkStruct_ov94_0223FD4C * param0) void ov94_02245824 (UnkStruct_ov94_0223FD4C * param0, UnkStruct_0200B144 * param1, int param2, int param3, u16 param4) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_0200B1EC(param1, param2); @@ -921,7 +921,7 @@ void ov94_02245824 (UnkStruct_ov94_0223FD4C * param0, UnkStruct_0200B144 * param param0->unk_10E0 = 0; } -static int ov94_02245894 (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, u32 param4, int param5) +static int ov94_02245894 (UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, u32 param4, int param5) { int v0 = 0, v1; @@ -939,13 +939,13 @@ static int ov94_02245894 (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * para return param2; } -void ov94_022458CC (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, int param4, u32 param5) +void ov94_022458CC (UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5) { param2 = ov94_02245894(param0, param1, param2, param4, param5, 1); sub_0201D78C(param0, 1, param1, param2, param3, 0, param5, NULL); } -void ov94_02245900 (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, int param4, u32 param5) +void ov94_02245900 (UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5) { param2 = ov94_02245894(param0, param1, param2, param4, param5, 0); sub_0201D78C(param0, 0, param1, param2, param3, 0, param5, NULL); @@ -958,7 +958,7 @@ void ov94_02245934 (UnkStruct_ov94_0223FD4C * param0) static void ov94_0224593C (UnkStruct_ov94_0223FD4C * param0, int param1) { - UnkStruct_02023790 * v0 = sub_02023790((16 * 8 * 2), 62); + Strbuf* v0 = sub_02023790((16 * 8 * 2), 62); sub_0200B1B8(param0->unk_B9C, param1, v0); sub_0200C388(param0->unk_B8C, param0->unk_BDC, v0); diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c index 9249f4cdf5..04c2fa615e 100644 --- a/src/overlay095/ov95_02246C20.c +++ b/src/overlay095/ov95_02246C20.c @@ -58,7 +58,7 @@ struct UnkStruct_ov95_02247628_t { UnkStruct_02018340 * unk_08; UnkStruct_0200B358 * unk_0C; UnkStruct_0200B144 * unk_10; - UnkStruct_02023790 * unk_14; + Strbuf* unk_14; UnkStruct_020218BC * unk_18; UnkStruct_0200C738 unk_1C; UnkStruct_0201CD38 * unk_1A8; diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c index f4a939b8a5..58efd050d3 100644 --- a/src/overlay095/ov95_02247B6C.c +++ b/src/overlay095/ov95_02247B6C.c @@ -58,8 +58,8 @@ typedef struct { UnkStruct_ov95_02247568 unk_44; UnkStruct_02018340 * unk_54; UnkStruct_0205AA50 unk_58; - UnkStruct_02023790 * unk_68; - UnkStruct_02023790 * unk_6C; + Strbuf* unk_68; + Strbuf* unk_6C; UnkStruct_ov95_0224773C * unk_70; UnkStruct_ov95_02247958 * unk_74; UnkStruct_0201CD38 * unk_78; diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c index 5589f4a654..e7be4da3d4 100644 --- a/src/overlay095/ov95_0224B3D8.c +++ b/src/overlay095/ov95_0224B3D8.c @@ -75,8 +75,8 @@ typedef struct { UnkStruct_ov95_02247568 unk_48; UnkStruct_02018340 * unk_58; UnkStruct_0205AA50 unk_5C; - UnkStruct_02023790 * unk_6C; - UnkStruct_02023790 * unk_70; + Strbuf* unk_6C; + Strbuf* unk_70; UnkStruct_ov95_0224773C * unk_74; UnkStruct_ov95_02247958 * unk_78; UnkStruct_0201CD38 * unk_7C; diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c index cc301ba4f2..853c58d931 100644 --- a/src/overlay096/ov96_0223BCE0.c +++ b/src/overlay096/ov96_0223BCE0.c @@ -78,7 +78,7 @@ static int ov96_0223C7B4(UnkStruct_ov96_0223BF40 * param0); static int ov96_0223C7E8(UnkStruct_ov96_0223BF40 * param0); static void ov96_0223D814(UnkStruct_ov96_0223BF40 * param0, UnkStruct_0200B144 * param1, int param2, int param3, u16 param4); static void ov96_0223D750(UnkStruct_ov96_0223BF40 * param0, UnkStruct_0200B144 * param1, int param2, int param3, u16 param4); -static void ov96_0223D90C(UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3); +static void ov96_0223D90C(UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3); static void ov96_0223D9B8(UnkStruct_ov96_0223BF40 * param0, int param1); static void ov96_0223DA34(UnkStruct_ov96_0223BF40 * param0, int param1, int param2); static int ov96_0223C924(UnkStruct_ov96_0223BF40 * param0); @@ -116,7 +116,7 @@ static int ov96_0223D3B8(UnkStruct_ov96_0223BF40 * param0); static int ov96_0223D4EC(UnkStruct_ov96_0223BF40 * param0); static int ov96_0223D4D0(UnkStruct_ov96_0223BF40 * param0); static int ov96_0223D4A0(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D86C(UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, u32 param4, int param5); +static int ov96_0223D86C(UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, u32 param4, int param5); static void ov96_0223D978(UnkStruct_ov96_0223BF40 * param0); static void ov96_0223D99C(UnkStruct_ov96_0223BF40 * param0); @@ -1565,7 +1565,7 @@ static int ov96_0223D71C (UnkStruct_ov96_0223BF40 * param0) static void ov96_0223D750 (UnkStruct_ov96_0223BF40 * param0, UnkStruct_0200B144 * param1, int param2, int param3, u16 param4) { - UnkStruct_02023790 * v0 = sub_0200B1EC(param1, param2); + Strbuf* v0 = sub_0200B1EC(param1, param2); sub_0200C388(param0->unk_BCC, param0->unk_BDC, v0); sub_0201ADA4(¶m0->unk_E38, 0xf0f); @@ -1607,7 +1607,7 @@ static void ov96_0223D814 (UnkStruct_ov96_0223BF40 * param0, UnkStruct_0200B144 param0->unk_BF0 = sub_0201D738(¶m0->unk_E38, 1, param0->unk_BDC, 0, 0, param3, NULL); } -static int ov96_0223D86C (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, u32 param4, int param5) +static int ov96_0223D86C (UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, u32 param4, int param5) { int v0 = 0, v1; @@ -1625,19 +1625,19 @@ static int ov96_0223D86C (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * para return param2; } -void ov96_0223D8A4 (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, int param4, u32 param5) +void ov96_0223D8A4 (UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5) { param2 = ov96_0223D86C(param0, param1, param2, param4, param5, 1); sub_0201D78C(param0, 1, param1, param2, param3, 0, param5, NULL); } -void ov96_0223D8D8 (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, int param4, u32 param5) +void ov96_0223D8D8 (UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5) { param2 = ov96_0223D86C(param0, param1, param2, param4, param5, 0); sub_0201D78C(param0, 0, param1, param2, param3, 0, param5, NULL); } -static void ov96_0223D90C (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3) +static void ov96_0223D90C (UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3) { sub_0201ADA4(param0, 0xf0f); sub_020238A0(param1, param2, param3, 2, 1); @@ -1674,7 +1674,7 @@ static void ov96_0223D99C (UnkStruct_ov96_0223BF40 * param0) static void ov96_0223D9B8 (UnkStruct_ov96_0223BF40 * param0, int param1) { - UnkStruct_02023790 * v0 = sub_02023790((16 * 8 * 2), 68); + Strbuf* v0 = sub_02023790((16 * 8 * 2), 68); sub_0200B1B8(param0->unk_BD8, param1, v0); sub_0200C388(param0->unk_BCC, param0->unk_BEC, v0); diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index 724f9e2431..4405ff14d3 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -543,7 +543,7 @@ static void ov97_0222B4FC (UnkStruct_0222AE60 * param0, int param1, int param2) static void ov97_0222B53C (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B358 * param2, u32 param3, u32 param4, int param5) { int v0, v1; - UnkStruct_02023790 * v2; + Strbuf* v2; v2 = sub_0200B29C(param2, param1, param4, 81); v0 = sub_02002D7C(0, v2, sub_02002DF8(0, 2)); @@ -571,7 +571,7 @@ static void ov97_0222B590 (UnkStruct_0200B358 * param0, int param1) static BOOL ov97_0222B5C0 (void * param0, int param1, UnkStruct_ov97_02237808 * param2, int param3) { int v0, v1, v2; - UnkStruct_02023790 * v3; + Strbuf* v3; UnkStruct_0200B358 * v4; UnkStruct_0200B144 * v5; UnkStruct_0222AE60 * v6 = (UnkStruct_0222AE60 *)param0; diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c index 4ccbcf926c..0693f7b3e3 100644 --- a/src/overlay097/ov97_0222C174.c +++ b/src/overlay097/ov97_0222C174.c @@ -806,7 +806,7 @@ static int ov97_0222C948 (UnkStruct_020067E8 * param0, int * param1) static void ov97_0222C974 (UnkStruct_ov97_0222C388 * param0) { RTCDate v0; - UnkStruct_02023790 * v1; + Strbuf* v1; UnkStruct_0200B358 * v2; UnkStruct_0200B144 * v3; UnkStruct_0202DBAC * v4 = ¶m0->unk_3180; @@ -819,7 +819,7 @@ static void ov97_0222C974 (UnkStruct_ov97_0222C388 * param0) v4->unk_00 = 7; v1 = sub_0200B29C(v2, v3, 76, param0->unk_00); - sub_02023DF0((const UnkStruct_02023790 *)v1, v4->unk_104.unk_00, 36); + sub_02023DF0((const Strbuf *)v1, v4->unk_104.unk_00, 36); sub_020237BC(v1); v4->unk_104.unk_48 = (ov97_02237E4C(10) | ov97_02237E4C(11) | ov97_02237E4C(12)); @@ -832,7 +832,7 @@ static void ov97_0222C974 (UnkStruct_ov97_0222C388 * param0) v1 = sub_0200B29C(v2, v3, 75, param0->unk_00); - sub_02023DF0((const UnkStruct_02023790 *)v1, v4->unk_154, 250); + sub_02023DF0((const Strbuf *)v1, v4->unk_154, 250); sub_020237BC(v1); v4->unk_348 = 0; diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c index 65bd09beff..42919a2bc5 100644 --- a/src/overlay097/ov97_0222D30C.c +++ b/src/overlay097/ov97_0222D30C.c @@ -124,8 +124,8 @@ typedef struct { f32 unk_04; } UnkStruct_ov97_0222EDC0; -void sub_02023DF0(const UnkStruct_02023790 * param0, u16 * param1, u32 param2); -void sub_02023D8C(UnkStruct_02023790 * param0, const u16 * param1, u32 param2); +void sub_02023DF0(const Strbuf *param0, u16 * param1, u32 param2); +void sub_02023D8C(Strbuf *param0, const u16 * param1, u32 param2); UnkStruct_0202442C * sub_0202442C(UnkStruct_021C0794 * param0); void ov97_02231FFC(UnkStruct_02018340 * param0, void *, int param2); static int ov97_0222D474(UnkStruct_020067E8 * param0); @@ -854,7 +854,7 @@ static void ov97_0222DDD0 (UnkStruct_020067E8 * param0, int param1, u32 param2) static void ov97_0222DE78 (UnkStruct_020067E8 * param0, UnkStruct_0205AA50 * param1, u32 param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_ov97_0222D04C * v1 = sub_0200682C(param0); v1->unk_10 = sub_0200B144(1, 26, 421, 86); @@ -883,7 +883,7 @@ static void ov97_0222DE78 (UnkStruct_020067E8 * param0, UnkStruct_0205AA50 * par static void ov97_0222DF10 (UnkStruct_020067E8 * param0, UnkStruct_0205AA50 * param1, u16 * param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_ov97_0222D04C * v1 = sub_0200682C(param0); v0 = sub_02023790(36 + 1, 86); diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c index 366d2d0a2c..59b2866f6e 100644 --- a/src/overlay097/ov97_02230410.c +++ b/src/overlay097/ov97_02230410.c @@ -148,7 +148,7 @@ typedef struct { int unk_2C; } UnkStruct_ov97_0223E680; -void sub_02023D8C(UnkStruct_02023790 * param0, const u16 * param1, u32 param2); +void sub_02023D8C(Strbuf *param0, const u16 * param1, u32 param2); UnkStruct_0202442C * sub_0202442C(UnkStruct_021C0794 * param0); void ov97_02231FFC(UnkStruct_02018340 * param0, void *, int param2); static int ov97_02230728(UnkStruct_020067E8 * param0); @@ -336,7 +336,7 @@ static void ov97_02230530 (UnkStruct_ov97_02230868 * param0, UnkStruct_ov97_0223 static void ov97_022305EC (UnkStruct_0205AA50 * param0, int param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0200B144 * v1 = sub_0200B144(1, 26, 421, 87); UnkStruct_0200B358 * v2 = sub_0200B358(87); @@ -445,7 +445,7 @@ static BOOL ov97_022308B0 (UnkStruct_ov97_02230868 * param0, UnkStruct_0205AA50 static BOOL ov97_022308B4 (UnkStruct_ov97_02230868 * param0, UnkStruct_0205AA50 * param1, u32 param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_02023790(36 + 1, param0->unk_00); @@ -458,7 +458,7 @@ static BOOL ov97_022308B4 (UnkStruct_ov97_02230868 * param0, UnkStruct_0205AA50 static BOOL ov97_02230904 (UnkStruct_ov97_02230868 * param0, UnkStruct_0205AA50 * param1, u32 param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0202DBAC * v1 = param0->unk_2C14[param0->unk_2C20]; int v2; @@ -495,7 +495,7 @@ static BOOL ov97_0223097C (UnkStruct_ov97_02230868 * param0, UnkStruct_0205AA50 static BOOL ov97_022309E4 (UnkStruct_ov97_02230868 * param0, UnkStruct_0205AA50 * param1, u32 param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_02023790(250 + 1, 87); @@ -509,7 +509,7 @@ static BOOL ov97_022309E4 (UnkStruct_ov97_02230868 * param0, UnkStruct_0205AA50 static BOOL ov97_02230A34 (UnkStruct_ov97_02230868 * param0, UnkStruct_0205AA50 * param1, u32 param2) { if (param0->unk_2C14[param0->unk_2C20]->unk_348 == 255) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_0200B29C(param0->unk_2A60, param0->unk_2A64, 51, 87); sub_0201D78C(param1, 1, v0, 0, 0, 0xff, param2, NULL); @@ -587,7 +587,7 @@ static void ov97_02230C10 (UnkStruct_ov97_02230868 * param0, int param1, int par static void ov97_02230C44 (UnkStruct_ov97_02230868 * param0, int param1, int param2) { int v0, v1; - UnkStruct_02023790 * v2; + Strbuf* v2; u32 v3; UnkStruct_ov97_0223E680 * v4 = Unk_ov97_0223E680; @@ -646,7 +646,7 @@ static void ov97_02230C44 (UnkStruct_ov97_02230868 * param0, int param1, int par static int ov97_02230E04 (UnkStruct_ov97_02230868 * param0, UnkStruct_0205AA50 * param1, int param2, int param3) { - UnkStruct_02023790 * v0; + Strbuf* v0; u32 v1; UnkStruct_ov97_0223E680 * v2 = Unk_ov97_0223E680 + param2; @@ -1334,7 +1334,7 @@ static int ov97_02231CA0 (UnkStruct_ov97_02230868 * param0, UnkStruct_0205AA50 * int v0, v1, v2, v3; u32 v4; UnkStruct_02025E6C * v5; - UnkStruct_02023790 * v6; + Strbuf* v6; UnkStruct_0200B358 * v7; UnkStruct_0200B144 * v8; int v9[4]; @@ -1416,7 +1416,7 @@ static int ov97_02231CA0 (UnkStruct_ov97_02230868 * param0, UnkStruct_0205AA50 * static void ov97_02231E78 (UnkStruct_ov97_02230868 * param0, UnkStruct_0205AA50 * param1, int param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; param0->unk_2C54 = param2; param0->unk_2A64 = sub_0200B144(1, 26, 421, 87); diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c index f6f7be1793..887276987c 100644 --- a/src/overlay097/ov97_02233B18.c +++ b/src/overlay097/ov97_02233B18.c @@ -102,7 +102,7 @@ typedef struct { u32 unk_30; int unk_34; u16 * unk_38; - UnkStruct_02023790 * unk_3C; + Strbuf* unk_3C; UnkStruct_0200B358 * unk_40; int unk_44; int unk_48; @@ -171,8 +171,8 @@ typedef struct { UnkStruct_ov97_02233B8C unk_E8F0; UnkStruct_ov97_0223F434 unk_E8FC[30]; void (* unk_12664)(void); - UnkStruct_02023790 * unk_12668; - UnkStruct_02023790 * unk_1266C; + Strbuf* unk_12668; + Strbuf* unk_1266C; } UnkStruct_ov97_02234A2C; static void ov97_02234A2C(UnkStruct_ov97_02234A2C * param0, int param1); @@ -180,8 +180,8 @@ static void ov97_022349E0(UnkStruct_ov97_02234A2C * param0); static void ov97_02234ECC(UnkStruct_ov97_02234A2C * param0); static void ov97_02235310(UnkStruct_ov97_02234A2C * param0); static void ov97_02233D10(UnkStruct_ov97_02234A2C * param0); -void sub_02023D8C(UnkStruct_02023790 * param0, const u16 * param1, u32 param2); -void sub_02023D28(UnkStruct_02023790 * param0, const u16 * param1); +void sub_02023D8C(Strbuf *param0, const u16 * param1, u32 param2); +void sub_02023D28(Strbuf *param0, const u16 * param1); void BoxMonGBAToBoxMon(BoxPokemonGBA * param0, BoxPokemon * param1); UnkStruct_ov97_0223F434 * Unk_ov97_0223F434; @@ -421,12 +421,12 @@ static void ov97_02233D10 (UnkStruct_ov97_02234A2C * param0) } } -static int ov97_02233DAC (UnkStruct_ov97_02233DAC * param0, UnkStruct_02023790 * param1, int param2) +static int ov97_02233DAC (UnkStruct_ov97_02233DAC * param0, Strbuf *param1, int param2) { int v0, v1; if (param2 & 0x1) { - v0 = sub_02002D7C(1, (const UnkStruct_02023790 *)param1, 0); + v0 = sub_02002D7C(1, (const Strbuf *)param1, 0); v1 = param0->unk_10 * 8; return (v1 - v0) / 2; } else { @@ -436,11 +436,11 @@ static int ov97_02233DAC (UnkStruct_ov97_02233DAC * param0, UnkStruct_02023790 * static void ov97_02233DD0 (UnkStruct_ov97_02234A2C * param0, UnkStruct_ov97_02233DAC * param1, int param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0200B358 * v1; UnkStruct_0200B144 * v2; int v3, v4, v5; - UnkStruct_02023790 * v6; + Strbuf* v6; if (param1->unk_44 == 0) { v5 = 0xff; @@ -1188,7 +1188,7 @@ static void ov97_02234B0C (UnkStruct_ov97_02234A2C * param0, BoxPokemonGBA * par UnkStruct_0200B144 * v5; u8 v6[10 + 1]; u16 v7[10 + 1]; - UnkStruct_02023790 * v8; + Strbuf* v8; memset(&v4, 0, sizeof(UnkStruct_ov97_02233DAC)); @@ -1624,7 +1624,7 @@ static void ov97_02235344 (UnkStruct_ov97_02234A2C * param0) { UnkStruct_ov97_02233DAC v0; UnkStruct_0200B358 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; u16 v3[7 + 1]; ov97_0223936C(ov97_02236378(), v3, 7 + 1, ov97_02235DBC()); diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c index 665155deec..5fd541df06 100644 --- a/src/overlay097/ov97_02237694.c +++ b/src/overlay097/ov97_02237694.c @@ -223,7 +223,7 @@ void ov97_02237868 (UnkStruct_ov97_02237808 * param0, int param1, int param2) static int ov97_02237870 (UnkStruct_ov97_02237808 * param0, int param1) { int v0; - UnkStruct_02023790 * v1; + Strbuf* v1; UnkStruct_0200B358 * v2; UnkStruct_0200B144 * v3; UnkStruct_ov97_0223F550 * v4 = &Unk_ov97_0223F550; diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c index a61993d28d..e5df911739 100644 --- a/src/overlay098/ov98_022471C8.c +++ b/src/overlay098/ov98_022471C8.c @@ -81,9 +81,9 @@ typedef struct { UnkStruct_0200B144 * unk_2C; UnkStruct_0200B144 * unk_30; UnkStruct_0200B144 * unk_34; - UnkStruct_02023790 * unk_38; - UnkStruct_02023790 * unk_3C; - UnkStruct_02023790 * unk_40; + Strbuf* unk_38; + Strbuf* unk_3C; + Strbuf* unk_40; int unk_44; UnkStruct_0205AA50 unk_48; UnkStruct_0205AA50 unk_58; @@ -169,8 +169,8 @@ static int ov98_02249798(UnkStruct_ov98_02247704 * param0); static int ov98_022497F8(UnkStruct_ov98_02247704 * param0); static void ov98_02249714(UnkStruct_ov98_02247704 * param0, UnkStruct_0200B144 * param1, int param2, int param3, u16 param4); static int ov98_0224977C(int param0); -static int ov98_02249894(UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, u32 param4, int param5); -void ov98_022498CC(UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, int param4, u32 param5); +static int ov98_02249894(UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, u32 param4, int param5); +void ov98_022498CC(UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5); static void ov98_02249900(UnkStruct_ov98_02247704 * param0, int param1); static void ov98_02249964(UnkStruct_ov98_02247704 * param0, int param1, int param2); static void ov98_022499A0(UnkStruct_0200112C * param0, u32 param1, u8 param2); @@ -928,7 +928,7 @@ static u32 Unk_ov98_02249D60[][2] = { static void ov98_02247F08 (UnkStruct_ov98_02247704 * param0) { - UnkStruct_02023790 * v0; + Strbuf* v0; sub_0201ADA4(¶m0->unk_D4, 0xf0f); @@ -2461,7 +2461,7 @@ static int ov98_022496EC (UnkStruct_ov98_02247704 * param0) static void ov98_02249714 (UnkStruct_ov98_02247704 * param0, UnkStruct_0200B144 * param1, int param2, int param3, u16 param4) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_0200B1EC(param1, param2); @@ -2620,7 +2620,7 @@ asm static int ov98_022497F8 (UnkStruct_ov98_02247704 * param0) nop } -static int ov98_02249894 (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, u32 param4, int param5) +static int ov98_02249894 (UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, u32 param4, int param5) { int v0 = 0, v1; @@ -2639,7 +2639,7 @@ static int ov98_02249894 (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * para return param2; } -void ov98_022498CC (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, int param4, u32 param5) +void ov98_022498CC (UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5) { param2 = ov98_02249894(param0, param1, param2, param4, param5, 1); sub_0201D78C(param0, 1, param1, param2, param3, 0, param5, NULL); @@ -2647,7 +2647,7 @@ void ov98_022498CC (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, in static void ov98_02249900 (UnkStruct_ov98_02247704 * param0, int param1) { - UnkStruct_02023790 * v0 = sub_02023790((16 * 8 * 2), 109); + Strbuf* v0 = sub_02023790((16 * 8 * 2), 109); sub_0200B1B8(param0->unk_30, param1, v0); sub_0200C388(param0->unk_20, param0->unk_40, v0); diff --git a/src/overlay098/ov98_022499C8.c b/src/overlay098/ov98_022499C8.c index 579be998cf..37fcb14b37 100644 --- a/src/overlay098/ov98_022499C8.c +++ b/src/overlay098/ov98_022499C8.c @@ -28,7 +28,7 @@ static const struct { {0x12a, '9'}, }; -asm void ov98_022499C8 (UnkStruct_02023790 * param0, char * param1, int param2) +asm void ov98_022499C8 (Strbuf *param0, char * param1, int param2) { push {r3, r4, r5, r6, r7, lr} sub sp, #8 diff --git a/src/overlay099/ov99_021D1A54.c b/src/overlay099/ov99_021D1A54.c index fd2819fe48..7c74804c09 100644 --- a/src/overlay099/ov99_021D1A54.c +++ b/src/overlay099/ov99_021D1A54.c @@ -1069,7 +1069,7 @@ static void ov99_021D2AAC (UnkStruct_ov99_021D2CB0 * param0) sub_020038B0(param0->unk_0C, 0, 2, 0x0, 0, 1); { - UnkStruct_02023790 * v1; + Strbuf* v1; int v2; param0->unk_24 = sub_0201A778(75, 1); diff --git a/src/overlay099/ov99_021D3E78.c b/src/overlay099/ov99_021D3E78.c index 42aa7c0877..6133312382 100644 --- a/src/overlay099/ov99_021D3E78.c +++ b/src/overlay099/ov99_021D3E78.c @@ -275,7 +275,7 @@ struct UnkStruct_ov99_021D3E78_t { UnkStruct_0205AA50 * unk_24; UnkStruct_0205AA50 * unk_28; UnkStruct_0200B144 * unk_2C; - UnkStruct_02023790 * unk_30; + Strbuf* unk_30; UnkStruct_0201CD38 * unk_34; }; diff --git a/src/overlay100/ov100_021D46C8.c b/src/overlay100/ov100_021D46C8.c index 47e9aba4b6..8cf9d48736 100644 --- a/src/overlay100/ov100_021D46C8.c +++ b/src/overlay100/ov100_021D46C8.c @@ -34,15 +34,15 @@ int ov100_021D46C8 (UnkStruct_ov100_021D46C8 * param0, UnkStruct_020985E4 * para { int v0; UnkStruct_0200B144 * v1; - UnkStruct_02023790 * v2; - UnkStruct_02023790 * v3 = sub_02023790(511, 111); + Strbuf* v2; + Strbuf* v3 = sub_02023790(511, 111); u8 v4 = 0; v1 = param0->unk_2C; v2 = sub_0200B1EC(v1, param2); if (param2 == 22) { - UnkStruct_02023790 * v5 = sub_02025F04(param1->unk_08, 111); + Strbuf* v5 = sub_02025F04(param1->unk_08, 111); UnkStruct_0200B358 * v6 = sub_0200B358(111); sub_0200B48C(v6, 0, v5, 0, 1, GAME_LANGUAGE); diff --git a/src/overlay102/ov102_021D0D80.c b/src/overlay102/ov102_021D0D80.c index 990a051d06..e44157d94e 100644 --- a/src/overlay102/ov102_021D0D80.c +++ b/src/overlay102/ov102_021D0D80.c @@ -398,10 +398,10 @@ static void ov102_021D1274 (UnkStruct_ov102_021D0F8C * param0) static void ov102_021D1420 (UnkStruct_ov102_021D0F8C * param0) { - UnkStruct_02023790 * v0 = sub_02023790(0x200, param0->unk_00); + Strbuf* v0 = sub_02023790(0x200, param0->unk_00); { - UnkStruct_02023790 * v1 = sub_02023790(0x200, param0->unk_00); + Strbuf* v1 = sub_02023790(0x200, param0->unk_00); sub_0200B1B8(param0->unk_34, 0, v1); sub_0200B498(param0->unk_38, 0, param0->unk_0C); diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c index ddc07f0ebe..313a9fab36 100644 --- a/src/overlay104/ov104_0222DCE0.c +++ b/src/overlay104/ov104_0222DCE0.c @@ -131,7 +131,7 @@ UnkStruct_0204B184 * ov104_0222DD04 (UnkStruct_ov104_0223A348_sub1 * param0, int { UnkStruct_0204B184 * v0; UnkStruct_0200B144 * v1 = sub_0200B144(1, 26, 21, param2); - UnkStruct_02023790 * v2; + Strbuf* v2; MI_CpuClear8(param0, sizeof(UnkStruct_ov104_0223A348_sub1)); @@ -319,7 +319,7 @@ void ov104_0222DF40 (const UnkStruct_ov104_0223A348_sub2 * param0, Pokemon * par if (param0->unk_14_val1_30) { UnkStruct_0200B144 * v7; - UnkStruct_02023790 * v8; + Strbuf* v8; v7 = sub_0200B144(1, 26, 412, 4); v8 = sub_0200B1EC(v7, param0->unk_00_val1_0); @@ -353,7 +353,7 @@ void ov104_0222E134(UnkStruct_021C0794 * param0, Pokemon * param1); void ov104_0222E134 (UnkStruct_021C0794 * param0, Pokemon * param1) { u32 v0; - UnkStruct_02023790 * v1; + Strbuf* v1; UnkStruct_0200B144 * v2; int v3; int v4 = 0; diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c index 0bdf356bb2..1b49baadec 100644 --- a/src/overlay104/ov104_0222FBE4.c +++ b/src/overlay104/ov104_0222FBE4.c @@ -211,7 +211,7 @@ static BOOL ov104_02230E20(UnkStruct_ov104_0222E930 * param0); static BOOL ov104_02230E40(UnkStruct_ov104_0222E930 * param0); static BOOL ov104_02230EB8(UnkStruct_ov104_0222E930 * param0); static BOOL ov104_02230ED8(UnkStruct_ov104_0222E930 * param0); -static UnkStruct_02023790 * ov104_02230E90(u16 param0, u32 param1); +static Strbuf* ov104_02230E90(u16 param0, u32 param1); static BOOL ov104_02230EFC(UnkStruct_ov104_0222E930 * param0); static BOOL ov104_02230F28(UnkStruct_ov104_0222E930 * param0); static BOOL ov104_02230F6C(UnkStruct_ov104_0222E930 * param0); @@ -1867,7 +1867,7 @@ BOOL ov104_02230E40 (UnkStruct_ov104_0222E930 * param0) u16 v1 = ov104_0222FC00(param0); u16 v2 = ov104_0222EA48(param0); u8 v3 = (*((param0)->unk_1C++)); - UnkStruct_02023790 * v4 = ov104_02230E90(v1, 11); + Strbuf* v4 = ov104_02230E90(v1, 11); sub_0200B48C(param0->unk_00->unk_44, v0, v4, v2, v3, GAME_LANGUAGE); sub_020237BC(v4); @@ -1875,10 +1875,10 @@ BOOL ov104_02230E40 (UnkStruct_ov104_0222E930 * param0) return 0; } -static UnkStruct_02023790 * ov104_02230E90 (u16 param0, u32 param1) +static Strbuf* ov104_02230E90 (u16 param0, u32 param1) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = sub_0200B144(1, 26, 412, param1); v1 = sub_0200B1EC(v0, param0); diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c index abac87af19..2bde8249fb 100644 --- a/src/overlay104/ov104_02231F74.c +++ b/src/overlay104/ov104_02231F74.c @@ -76,7 +76,7 @@ typedef struct UnkStruct_ov104_02232B5C_t { UnkStruct_0201CD38 * unk_04; UnkStruct_0205AA50 unk_08; UnkStruct_0205AA50 * unk_18; - UnkStruct_02023790 * unk_1C[28]; + Strbuf* unk_1C[28]; UnkStruct_0200B144 * unk_8C; UnkStruct_0200B358 * unk_90; u8 unk_94; @@ -123,7 +123,7 @@ static void ov104_02232570(UnkStruct_ov104_02232B5C * param0); static void ov104_022325D8(UnkStruct_ov104_02232B5C * param0); static void ov104_02232AC4(UnkStruct_ov104_02232B5C * param0, u16 param1, u32 param2); void ov104_022320B4(UnkStruct_ov104_022320B4 * param0, u8 param1, u16 param2, u16 param3, u16 param4, s16 param5, u8 param6); -static void ov104_022320FC(UnkStruct_02023790 * param0, u16 param1, u16 param2, u16 param3, u16 param4); +static void ov104_022320FC(Strbuf *param0, u16 param1, u16 param2, u16 param3, u16 param4); static BOOL ov104_02233184(UnkStruct_ov104_0222E930 * param0); UnkStruct_ov104_02232B5C * ov104_022325FC(UnkStruct_ov104_022320B4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0200B144 * param7); void ov104_0223261C(UnkStruct_ov104_02232B5C * param0, u32 param1, u32 param2, u32 param3); @@ -224,10 +224,10 @@ void ov104_022320B4 (UnkStruct_ov104_022320B4 * param0, u8 param1, u16 param2, u } } -static void ov104_022320FC (UnkStruct_02023790 * param0, u16 param1, u16 param2, u16 param3, u16 param4) +static void ov104_022320FC (Strbuf *param0, u16 param1, u16 param2, u16 param3, u16 param4) { UnkStruct_02014A84 v0; - UnkStruct_02023790 * v1; + Strbuf* v1; sub_02014A84(&v0); sub_02014CE0(&v0, param1, param2); @@ -425,7 +425,7 @@ static void ov104_02232390 (UnkStruct_ov104_02232B5C * param0, u32 param1, u32 p void * v1; { - UnkStruct_02023790 * v2 = sub_02023790((40 * 2), param0->unk_00->unk_34); + Strbuf* v2 = sub_02023790((40 * 2), param0->unk_00->unk_34); sub_0200B1B8(param0->unk_8C, param1, v2); sub_0200C388(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); @@ -453,7 +453,7 @@ static u32 ov104_02232414 (UnkStruct_ov104_02232B5C * param0) break; } - v1 = sub_02002D7C(0, (UnkStruct_02023790 *)param0->unk_B4[v0].unk_00, 0); + v1 = sub_02002D7C(0, (Strbuf *)param0->unk_B4[v0].unk_00, 0); if (v2 < v1) { v2 = v1; @@ -725,7 +725,7 @@ static void ov104_02232750 (UnkStruct_ov104_02232B5C * param0, u32 param1, u32 p void * v1; { - UnkStruct_02023790 * v2 = sub_02023790((40 * 2), param0->unk_00->unk_34); + Strbuf* v2 = sub_02023790((40 * 2), param0->unk_00->unk_34); sub_0200B1B8(param0->unk_8C, param1, v2); sub_0200C388(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); @@ -759,7 +759,7 @@ static u32 ov104_022327F0 (UnkStruct_ov104_02232B5C * param0) break; } - v1 = sub_02002D7C(0, (UnkStruct_02023790 *)param0->unk_1BC[v0].unk_00, 0); + v1 = sub_02002D7C(0, (Strbuf *)param0->unk_1BC[v0].unk_00, 0); if (v2 < v1) { v2 = v1; @@ -903,8 +903,8 @@ static void ov104_02232A58 (UnkStruct_ov104_02232B5C * param0, u8 param1) static void ov104_02232AC4 (UnkStruct_ov104_02232B5C * param0, u16 param1, u32 param2) { - UnkStruct_02023790 * v0 = sub_02023790((40 * 2), param0->unk_00->unk_34); - UnkStruct_02023790 * v1 = sub_02023790((40 * 2), param0->unk_00->unk_34); + Strbuf* v0 = sub_02023790((40 * 2), param0->unk_00->unk_34); + Strbuf* v1 = sub_02023790((40 * 2), param0->unk_00->unk_34); sub_0201ADA4(param0->unk_18, 15); diff --git a/src/overlay104/ov104_022332B4.c b/src/overlay104/ov104_022332B4.c index 7b3e78486b..b1c950ad1e 100644 --- a/src/overlay104/ov104_022332B4.c +++ b/src/overlay104/ov104_022332B4.c @@ -251,7 +251,7 @@ BOOL ov104_022334DC (UnkStruct_ov104_0222E930 * param0) { int v0[18]; UnkStruct_ov104_0223C4CC * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; Pokemon * v3; UnkStruct_ov104_0223ADA0 * v4; u8 v5, v6; diff --git a/src/overlay104/ov104_022358E8.c b/src/overlay104/ov104_022358E8.c index c794bc09a1..359d7b0187 100644 --- a/src/overlay104/ov104_022358E8.c +++ b/src/overlay104/ov104_022358E8.c @@ -293,7 +293,7 @@ BOOL ov104_02235BAC (UnkStruct_ov104_0222E930 * param0) BOOL ov104_02235BC0 (UnkStruct_ov104_0222E930 * param0) { - UnkStruct_02023790 * v0; + Strbuf* v0; Pokemon * v1; Party * v2; UnkStruct_ov104_0223BA10 * v3; diff --git a/src/overlay104/ov104_022361B4.c b/src/overlay104/ov104_022361B4.c index c70708cd24..00658f8016 100644 --- a/src/overlay104/ov104_022361B4.c +++ b/src/overlay104/ov104_022361B4.c @@ -801,8 +801,8 @@ void ov104_02237180 (UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0223BA10 static void ov104_02237284 (UnkStruct_ov104_022320B4 * param0, UnkStruct_0205AA50 * param1, UnkStruct_02025E6C * param2, u16 param3) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1 = sub_02023790((10 * 2), param0->unk_34); - UnkStruct_02023790 * v2 = sub_02023790((10 * 2), param0->unk_34); + Strbuf* v1 = sub_02023790((10 * 2), param0->unk_34); + Strbuf* v2 = sub_02023790((10 * 2), param0->unk_34); v0 = sub_0200B144(0, 26, 199, 11); diff --git a/src/overlay104/ov104_02237378.c b/src/overlay104/ov104_02237378.c index 029cdebdd3..f4ba93812c 100644 --- a/src/overlay104/ov104_02237378.c +++ b/src/overlay104/ov104_02237378.c @@ -310,7 +310,7 @@ BOOL ov104_02237734 (UnkStruct_ov104_0222E930 * param0) BOOL ov104_02237748 (UnkStruct_ov104_0222E930 * param0) { - UnkStruct_02023790 * v0; + Strbuf* v0; Pokemon * v1; Party * v2; UnkStruct_ov104_0223BFFC * v3; diff --git a/src/overlay104/ov104_0223A7F4.c b/src/overlay104/ov104_0223A7F4.c index 6b9758b42b..caec8c160f 100644 --- a/src/overlay104/ov104_0223A7F4.c +++ b/src/overlay104/ov104_0223A7F4.c @@ -350,7 +350,7 @@ UnkStruct_ov6_02240D5C * ov104_0223ABA0 (UnkStruct_ov104_0223ADA0 * param0, UnkS UnkStruct_ov104_0223A348_sub1 v6; UnkStruct_0204B184 * v7; UnkStruct_0200B144 * v8; - UnkStruct_02023790 * v9; + Strbuf* v9; UnkStruct_02025E6C * v10; v2 = ov104_0223AA50(param0->unk_04); diff --git a/src/overlay104/ov104_0223B6F4.c b/src/overlay104/ov104_0223B6F4.c index a0de6c096f..bb71c042ed 100644 --- a/src/overlay104/ov104_0223B6F4.c +++ b/src/overlay104/ov104_0223B6F4.c @@ -168,7 +168,7 @@ UnkStruct_ov6_02240D5C * ov104_0223B810 (UnkStruct_ov104_0223BA10 * param0, UnkS UnkStruct_ov104_0223A348_sub1 v7; UnkStruct_0204B184 * v8; UnkStruct_0200B144 * v9; - UnkStruct_02023790 * v10; + Strbuf* v10; UnkStruct_02025E6C * v11; v2 = ov104_0223B7A8(param0->unk_10, 0); diff --git a/src/overlay104/ov104_0223BCBC.c b/src/overlay104/ov104_0223BCBC.c index 46c54412ac..4bdde71273 100644 --- a/src/overlay104/ov104_0223BCBC.c +++ b/src/overlay104/ov104_0223BCBC.c @@ -171,7 +171,7 @@ UnkStruct_ov6_02240D5C * ov104_0223BDD8 (UnkStruct_ov104_0223BFFC * param0, UnkS UnkStruct_ov104_0223A348_sub1 v7; UnkStruct_0204B184 * v8; UnkStruct_0200B144 * v9; - UnkStruct_02023790 * v10; + Strbuf* v10; UnkStruct_02025E6C * v11; Party * v12; Party * v13; diff --git a/src/overlay104/ov104_0223DC7C.c b/src/overlay104/ov104_0223DC7C.c index a12ecf0f50..2897a6f956 100644 --- a/src/overlay104/ov104_0223DC7C.c +++ b/src/overlay104/ov104_0223DC7C.c @@ -135,7 +135,7 @@ static void ov104_0223DD30(UnkStruct_ov104_0223DD30 * param0, UnkStruct_0201CD38 static void ov104_0223DD5C(UnkStruct_0201CD38 * param0, void * param1); static void ov104_0223DDB4(UnkStruct_0201CD38 * param0, void * param1); static BOOL ov104_0223DDE4(UnkStruct_ov104_0223DD30 * param0, u32 param1, const UnkStruct_ov104_0224191C * param2); -static void ov104_0223E29C(UnkStruct_ov104_0223DD30 * param0, UnkStruct_ov104_0223E3B8 * param1, const UnkStruct_02023790 * param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov104_0223E29C * param10); +static void ov104_0223E29C(UnkStruct_ov104_0223DD30 * param0, UnkStruct_ov104_0223E3B8 * param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov104_0223E29C * param10); static void ov104_0223E3B8(UnkStruct_ov104_0223E3B8 * param0); static void ov104_0223E3FC(UnkStruct_ov104_0223DD30 * param0, UnkStruct_ov104_0223E48C * param1, fx32 param2, fx32 param3, u32 param4); static void ov104_0223E48C(UnkStruct_ov104_0223E48C * param0); @@ -149,7 +149,7 @@ static void ov104_0223E6F0(UnkStruct_ov104_0223DD30 * param0, int param1); static void ov104_0223E740(UnkStruct_0201CD38 * param0, void * param1); static void ov104_0223E7A4(UnkStruct_0201CD38 * param0, void * param1); static BOOL ov104_0223E804(UnkStruct_ov104_0223DD30 * param0, UnkStruct_ov104_0223DDE4 * param1, UnkStruct_ov104_0223E804 * param2); -static void ov104_0223E3CC(const UnkStruct_02023790 * param0, int param1, int * param2, int * param3); +static void ov104_0223E3CC(const Strbuf *param0, int param1, int * param2, int * param3); static const UnkStruct_ov104_0224191C Unk_ov104_0224191C[] = { {0x33A, 0x7D, 0x7E, 0x7F, 0x80, 0x8F, 0x8E, 0x8D, 0x0}, @@ -257,7 +257,7 @@ static BOOL ov104_0223DDE4 (UnkStruct_ov104_0223DD30 * param0, u32 param1, const VecFx32 v4; int v5; int v6, v7 = 0; - UnkStruct_02023790 * v8; + Strbuf* v8; switch (param0->unk_00) { case 0: @@ -272,7 +272,7 @@ static BOOL ov104_0223DDE4 (UnkStruct_ov104_0223DD30 * param0, u32 param1, const { UnkStruct_0200B144 * v9; - UnkStruct_02023790 * v10; + Strbuf* v10; v9 = sub_0200B144(1, 26, 618, param1); v10 = sub_0200B1EC(v9, param2->unk_00); @@ -427,7 +427,7 @@ static BOOL ov104_0223DDE4 (UnkStruct_ov104_0223DD30 * param0, u32 param1, const return 0; } -static void ov104_0223E29C (UnkStruct_ov104_0223DD30 * param0, UnkStruct_ov104_0223E3B8 * param1, const UnkStruct_02023790 * param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov104_0223E29C * param10) +static void ov104_0223E29C (UnkStruct_ov104_0223DD30 * param0, UnkStruct_ov104_0223E3B8 * param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov104_0223E29C * param10) { UnkStruct_020127E8 v0; UnkStruct_0205AA50 v1; @@ -500,7 +500,7 @@ static void ov104_0223E3B8 (UnkStruct_ov104_0223E3B8 * param0) sub_0201EE28(¶m0->unk_04); } -static void ov104_0223E3CC (const UnkStruct_02023790 * param0, int param1, int * param2, int * param3) +static void ov104_0223E3CC (const Strbuf *param0, int param1, int * param2, int * param3) { int v0, v1; diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index 637878a5d0..619eddf224 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -112,9 +112,9 @@ struct UnkStruct_ov105_02241FF4_t { u8 unk_1B; UnkStruct_0200B144 * unk_1C; UnkStruct_0200B358 * unk_20; - UnkStruct_02023790 * unk_24; - UnkStruct_02023790 * unk_28; - UnkStruct_02023790 * unk_2C[4]; + Strbuf* unk_24; + Strbuf* unk_28; + Strbuf* unk_2C[4]; u16 unk_3C[8]; UnkStruct_02018340 * unk_4C; UnkStruct_0205AA50 unk_50[10]; @@ -2716,7 +2716,7 @@ static void ov105_02244F0C (UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA5 { u32 v0; const UnkStruct_02025E6C * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; v1 = sub_02025E38(param0->unk_13C); v2 = sub_02023790((7 + 1), 93); @@ -2740,7 +2740,7 @@ static void ov105_02244F0C (UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA5 static void ov105_02244F84 (UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA50 * param1, u32 param2, u32 param3, u8 param4) { u32 v0; - UnkStruct_02023790 * v1; + Strbuf* v1; UnkStruct_02025E6C * v2; v2 = sub_02032EE8(1 - sub_0203608C()); @@ -2766,7 +2766,7 @@ static void ov105_02244FF8 (UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA5 { u8 v0; u32 v1, v2, v3; - UnkStruct_02023790 * v4; + Strbuf* v4; Pokemon * v5; u16 v6[(10 + 1)]; @@ -2801,7 +2801,7 @@ static void ov105_022450DC (UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA5 u8 v0; u32 v1, v2; UnkStruct_0200B144 * v3; - UnkStruct_02023790 * v4; + Strbuf* v4; Pokemon * v5; u16 v6[(10 + 1)]; diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c index d91de9c9d6..18af108cf2 100644 --- a/src/overlay106/ov106_02241AE0.c +++ b/src/overlay106/ov106_02241AE0.c @@ -101,9 +101,9 @@ struct UnkStruct_ov106_02243118_t { u8 unk_1F; UnkStruct_0200B144 * unk_20; UnkStruct_0200B358 * unk_24; - UnkStruct_02023790 * unk_28; - UnkStruct_02023790 * unk_2C; - UnkStruct_02023790 * unk_30[2]; + Strbuf* unk_28; + Strbuf* unk_2C; + Strbuf* unk_30[2]; u16 unk_38[8]; UnkStruct_02018340 * unk_48; UnkStruct_0205AA50 unk_4C[4]; @@ -1143,7 +1143,7 @@ static void ov106_02242AC4 (UnkStruct_ov106_02243118 * param0, UnkStruct_0205AA5 { u8 v0; u32 v1, v2, v3; - UnkStruct_02023790 * v4; + Strbuf* v4; Pokemon * v5; u16 v6[(10 + 1)]; @@ -1163,7 +1163,7 @@ static void ov106_02242AC4 (UnkStruct_ov106_02243118 * param0, UnkStruct_0205AA5 static void ov106_02242B38 (UnkStruct_ov106_02243118 * param0, UnkStruct_0205AA50 * param1, u8 param2, u8 param3, u8 param4, u8 param5) { int v0, v1; - UnkStruct_02023790 * v2; + Strbuf* v2; UnkStruct_0200B144 * v3; sub_0201ADA4(param1, param4); diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c index 61e9c9d16d..fc58f0af3f 100644 --- a/src/overlay107/ov107_02241AE0.c +++ b/src/overlay107/ov107_02241AE0.c @@ -257,9 +257,9 @@ struct UnkStruct_ov107_02241D6C_t { UnkStruct_0200B144 * unk_1C; UnkStruct_0200B144 * unk_20; UnkStruct_0200B358 * unk_24; - UnkStruct_02023790 * unk_28; - UnkStruct_02023790 * unk_2C; - UnkStruct_02023790 * unk_30[3]; + Strbuf* unk_28; + Strbuf* unk_2C; + Strbuf* unk_30[3]; u16 unk_3C[8]; UnkStruct_02018340 * unk_4C; UnkStruct_0205AA50 unk_50[18]; @@ -3072,7 +3072,7 @@ static void ov107_02244AB4 (UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA5 { u32 v0; const UnkStruct_02025E6C * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; v1 = sub_02025E38(param0->unk_1CC); v2 = sub_02023790((7 + 1), 100); diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c index 165a0c6f7e..3c75130add 100644 --- a/src/overlay107/ov107_02245EB0.c +++ b/src/overlay107/ov107_02245EB0.c @@ -112,9 +112,9 @@ struct UnkStruct_ov107_02246170_t { u16 unk_1E; UnkStruct_0200B144 * unk_20; UnkStruct_0200B358 * unk_24; - UnkStruct_02023790 * unk_28; - UnkStruct_02023790 * unk_2C; - UnkStruct_02023790 * unk_30[3]; + Strbuf* unk_28; + Strbuf* unk_2C; + Strbuf* unk_30[3]; u16 unk_3C[8]; UnkStruct_02018340 * unk_4C; UnkStruct_0205AA50 unk_50[12]; @@ -2356,7 +2356,7 @@ static void ov107_0224812C (UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA5 { u32 v0; const UnkStruct_02025E6C * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; v1 = sub_02025E38(param0->unk_14C); v2 = sub_02023790((7 + 1), 100); diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c index a431ab22fa..e4c0a5d13f 100644 --- a/src/overlay108/ov108_02241AE0.c +++ b/src/overlay108/ov108_02241AE0.c @@ -202,9 +202,9 @@ struct UnkStruct_ov108_02241DB0_t { u8 unk_64; UnkStruct_0200B144 * unk_68; UnkStruct_0200B358 * unk_6C; - UnkStruct_02023790 * unk_70; - UnkStruct_02023790 * unk_74; - UnkStruct_02023790 * unk_78[2]; + Strbuf* unk_70; + Strbuf* unk_74; + Strbuf* unk_78[2]; u16 unk_80[8]; UnkStruct_02018340 * unk_90; UnkStruct_0205AA50 unk_94[2]; diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c index e6e1802939..4242e352dc 100644 --- a/src/overlay109/ov109_021D0D80.c +++ b/src/overlay109/ov109_021D0D80.c @@ -276,7 +276,7 @@ typedef struct { UnkStruct_ov109_021D17EC unk_34; UnkStruct_ov109_021D1048 unk_44[5]; UnkStruct_02025E6C * unk_58[5]; - UnkStruct_02023790 * unk_6C[5]; + Strbuf* unk_6C[5]; } UnkStruct_ov109_021D0F70_sub1; typedef struct UnkStruct_ov109_021D0F70_t { @@ -363,8 +363,8 @@ static void ov109_021D2714(UnkStruct_ov109_021D0F70 * param0, u32 param1, u32 pa static void ov109_021D2788(UnkStruct_ov109_021D0F70 * param0); static void ov109_021D27AC(UnkStruct_ov109_021D0F70 * param0, int param1); static void ov109_021D27F0(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D2820(UnkStruct_ov109_021D0F70 * param0, UnkStruct_02023790 * param1, int param2, u32 param3); -static void ov109_021D2874(UnkStruct_ov109_021D0F70 * param0, UnkStruct_02023790 * param1, int param2, int param3); +static void ov109_021D2820(UnkStruct_ov109_021D0F70 * param0, Strbuf *param1, int param2, u32 param3); +static void ov109_021D2874(UnkStruct_ov109_021D0F70 * param0, Strbuf *param1, int param2, int param3); static void ov109_021D28A0(UnkStruct_ov109_021D0F70 * param0, int param1); static void ov109_021D28C4(UnkStruct_ov109_021D0F70 * param0); static void ov109_021D293C(UnkStruct_ov109_021D0F70 * param0); @@ -2076,7 +2076,7 @@ static void ov109_021D2634 (UnkStruct_ov109_021D0F70 * param0, u32 param1) static void ov109_021D268C (UnkStruct_ov109_021D0F70 * param0, u32 param1, const UnkStruct_02025E6C * param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_ov109_021D24F8 * v1 = ¶m0->unk_C9C; UnkStruct_0205AA50 * v2 = &v1->unk_0C[0]; @@ -2096,7 +2096,7 @@ static void ov109_021D268C (UnkStruct_ov109_021D0F70 * param0, u32 param1, const static void ov109_021D2714 (UnkStruct_ov109_021D0F70 * param0, u32 param1, u32 param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_ov109_021D24F8 * v1 = ¶m0->unk_C9C; UnkStruct_0205AA50 * v2 = &v1->unk_0C[0]; @@ -2147,7 +2147,7 @@ static void ov109_021D27F0 (UnkStruct_ov109_021D0F70 * param0) } } -asm static void ov109_021D2820 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_02023790 * param1, int param2, u32 param3) +asm static void ov109_021D2820 (UnkStruct_ov109_021D0F70 * param0, Strbuf *param1, int param2, u32 param3) { push {r3, r4, r5, r6, r7, lr} sub sp, #0x10 @@ -2185,7 +2185,7 @@ asm static void ov109_021D2820 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_020 pop {r3, r4, r5, r6, r7, pc} } -static void ov109_021D2874 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_02023790 * param1, int param2, int param3) +static void ov109_021D2874 (UnkStruct_ov109_021D0F70 * param0, Strbuf *param1, int param2, int param3) { u32 v0 = ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))); diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c index a481e65508..0628f824b0 100644 --- a/src/overlay109/ov109_021D3D50.c +++ b/src/overlay109/ov109_021D3D50.c @@ -91,7 +91,7 @@ static int ov109_021D5360(void); static int ov109_021D548C(void); static u32 ov109_021D54A8(void); static void ov109_021D5488(UnkStruct_ov109_021D5140 * param0); -static void ov109_021D46D8(UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2); +static void ov109_021D46D8(UnkStruct_0205AA50 * param0, Strbuf *param1, int param2); static void ov109_021D48EC(UnkStruct_ov109_021D5140 * param0, int param1); static void ov109_021D5668(UnkStruct_ov109_021D5140 * param0); static void ov109_021D577C(UnkStruct_ov109_021D5140 * param0, NARC * param1); @@ -694,7 +694,7 @@ static void ov109_021D45F4 (UnkStruct_ov109_021D5140 * param0) } } -static void ov109_021D46D8 (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2) +static void ov109_021D46D8 (UnkStruct_0205AA50 * param0, Strbuf *param1, int param2) { int v0 = sub_02002D7C(1, param1, 0); int v1 = (26 * 8 - v0) / 2; @@ -1465,7 +1465,7 @@ static int ov109_021D5360 (void) static BOOL ov109_021D537C (UnkStruct_0205AA50 * param0, int param1, u32 param2, UnkStruct_ov109_021D5140 * param3) { int v0, v1 = sub_0203608C(); - UnkStruct_02023790 * v2 = NULL; + Strbuf* v2 = NULL; if (!ov109_021D54CC(param3)) { return 0; @@ -1574,7 +1574,7 @@ static BOOL ov109_021D54CC (UnkStruct_ov109_021D5140 * param0) static void ov109_021D55A8 (UnkStruct_ov109_021D5140 * param0, int param1, int param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_02023790((90 * 2), 95); diff --git a/src/overlay110/ov110_021D0D80.c b/src/overlay110/ov110_021D0D80.c index d440529700..fe7fa18abd 100644 --- a/src/overlay110/ov110_021D0D80.c +++ b/src/overlay110/ov110_021D0D80.c @@ -59,8 +59,8 @@ typedef struct { UnkStruct_0205AA50 unk_10[16]; UnkStruct_0200B144 * unk_110; UnkStruct_0200B358 * unk_114; - UnkStruct_02023790 * unk_118; - UnkStruct_02023790 * unk_11C; + Strbuf* unk_118; + Strbuf* unk_11C; UnkStruct_02002F38 * unk_120; const UnkStruct_020279FC * unk_124; UnkStruct_021C0794 * unk_128; @@ -1230,7 +1230,7 @@ asm static void ov110_021D1808 (UnkStruct_ov110_021D0F78 * param0) static void ov110_021D19B0 (UnkStruct_ov110_021D0F78 * param0) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = sub_0200B144(1, 26, 412, 114); v1 = sub_0200B1EC(v0, param0->unk_08); diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c index 2611068e24..8c73465363 100644 --- a/src/overlay111/ov111_021D0D80.c +++ b/src/overlay111/ov111_021D0D80.c @@ -87,8 +87,8 @@ struct UnkStruct_ov111_021D0F7C_t { void * unk_34; UnkStruct_0200B144 * unk_38; UnkStruct_0200B358 * unk_3C; - UnkStruct_02023790 * unk_40; - UnkStruct_02023790 * unk_44; + Strbuf* unk_40; + Strbuf* unk_44; u16 unk_48[8]; UnkStruct_02018340 * unk_58; UnkStruct_0205AA50 unk_5C[16]; diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c index 9f38ee97eb..8735e4640b 100644 --- a/src/overlay112/ov112_0225C700.c +++ b/src/overlay112/ov112_0225C700.c @@ -97,7 +97,7 @@ typedef struct { u16 unk_02; u16 unk_04; u16 unk_06; - UnkStruct_02023790 * unk_08; + Strbuf* unk_08; UnkStruct_0205AA50 unk_0C; UnkStruct_ov112_0225D180 unk_1C; } UnkStruct_ov112_0225D44C; @@ -105,7 +105,7 @@ typedef struct { typedef struct { UnkStruct_ov112_0225D44C unk_00[3]; UnkStruct_0205AA50 unk_60[3]; - UnkStruct_02023790 * unk_90; + Strbuf* unk_90; void * unk_94; NNSG2dPaletteData * unk_98; } UnkStruct_ov112_0225D2D0; @@ -177,7 +177,7 @@ static BOOL ov112_0225D304(UnkStruct_ov112_0225D2D0 * param0, UnkStruct_ov66_022 static void ov112_0225D3E0(UnkStruct_ov112_0225D2D0 * param0); static void ov112_0225D408(UnkStruct_ov112_0225D44C * param0, UnkStruct_ov112_0225C9BC * param1, u32 param2, u32 param3); static void ov112_0225D44C(UnkStruct_ov112_0225D44C * param0); -static void ov112_0225D460(UnkStruct_ov112_0225D44C * param0, const UnkStruct_02023790 * param1, u32 param2, const UnkStruct_ov112_0225D180 * param3, const NNSG2dPaletteData * param4); +static void ov112_0225D460(UnkStruct_ov112_0225D44C * param0, const Strbuf *param1, u32 param2, const UnkStruct_ov112_0225D180 * param3, const NNSG2dPaletteData * param4); static void ov112_0225D4DC(UnkStruct_ov112_0225D44C * param0); static BOOL ov112_0225D4E4(UnkStruct_ov112_0225D44C * param0); static void ov112_0225D4F8(const UnkStruct_ov112_0225D44C * param0, UnkStruct_0205AA50 * param1); @@ -1068,7 +1068,7 @@ static void ov112_0225D44C (UnkStruct_ov112_0225D44C * param0) sub_0201A8FC(¶m0->unk_0C); } -static void ov112_0225D460 (UnkStruct_ov112_0225D44C * param0, const UnkStruct_02023790 * param1, u32 param2, const UnkStruct_ov112_0225D180 * param3, const NNSG2dPaletteData * param4) +static void ov112_0225D460 (UnkStruct_ov112_0225D44C * param0, const Strbuf *param1, u32 param2, const UnkStruct_ov112_0225D180 * param3, const NNSG2dPaletteData * param4) { sub_02023810(param0->unk_08, param1); diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c index 3e0ba33b90..cc6696160c 100644 --- a/src/overlay113/ov113_0225C700.c +++ b/src/overlay113/ov113_0225C700.c @@ -118,7 +118,7 @@ typedef struct UnkStruct_ov113_0225DBCC_t { UnkStruct_0200B144 * unk_30; UnkStruct_0205AA50 unk_34[8]; UnkStruct_0205AA50 unk_B4; - UnkStruct_02023790 * unk_C4; + Strbuf* unk_C4; u8 unk_C8; UnkStruct_020203AC * unk_CC; fx32 unk_D0; @@ -181,9 +181,9 @@ static void ov113_0225E068(UnkStruct_ov113_0225DBCC * param0, int param1); static void ov113_0225E0D4(UnkStruct_ov113_0225DBCC * param0, int param1); static void ov113_0225E118(UnkStruct_ov113_0225DBCC * param0); static int ov113_0225DE98(UnkStruct_ov113_0225DBCC * param0); -static void ov113_0225E15C(UnkStruct_ov113_0225DBCC * param0, UnkStruct_ov113_0225E250 * param1, const UnkStruct_02023790 * param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9); +static void ov113_0225E15C(UnkStruct_ov113_0225DBCC * param0, UnkStruct_ov113_0225E250 * param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9); static void ov113_0225E250(UnkStruct_ov113_0225E250 * param0); -static void ov113_0225E264(const UnkStruct_02023790 * param0, int param1, int * param2, int * param3); +static void ov113_0225E264(const Strbuf *param0, int param1, int * param2, int * param3); static void ov113_0225E294(UnkStruct_ov113_0225DBCC * param0); static BOOL ov113_0225E318(UnkStruct_ov113_0225DBCC * param0, int param1); @@ -1011,7 +1011,7 @@ static void ov113_0225D484 (UnkStruct_ov113_0225DBCC * param0) } { - UnkStruct_02023790 * v2; + Strbuf* v2; v2 = sub_0200B1EC(param0->unk_30, 1); ov113_0225E15C(param0, ¶m0->unk_19C0, v2, 2, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((3 & 0xff) << 0)), 0, 10003, 0x1c * 8, 176, 1); @@ -1513,7 +1513,7 @@ static void ov113_0225E118 (UnkStruct_ov113_0225DBCC * param0) } } -static void ov113_0225E15C (UnkStruct_ov113_0225DBCC * param0, UnkStruct_ov113_0225E250 * param1, const UnkStruct_02023790 * param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9) +static void ov113_0225E15C (UnkStruct_ov113_0225DBCC * param0, UnkStruct_ov113_0225E250 * param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9) { UnkStruct_020127E8 v0; UnkStruct_0205AA50 v1; @@ -1574,7 +1574,7 @@ static void ov113_0225E250 (UnkStruct_ov113_0225E250 * param0) sub_0201EE28(¶m0->unk_04); } -static void ov113_0225E264 (const UnkStruct_02023790 * param0, int param1, int * param2, int * param3) +static void ov113_0225E264 (const Strbuf *param0, int param1, int * param2, int * param3) { int v0, v1; diff --git a/src/overlay113/ov113_02260620.c b/src/overlay113/ov113_02260620.c index cc64d02778..3dc0ba57ea 100644 --- a/src/overlay113/ov113_02260620.c +++ b/src/overlay113/ov113_02260620.c @@ -548,9 +548,9 @@ void ov113_02260620 (UnkStruct_0200B144 * param0, UnkStruct_0200B358 * param1, U { const UnkStruct_ov66_0222E71C * v0; UnkStruct_02025E6C * v1; - UnkStruct_02023790 * v2; - UnkStruct_02023790 * v3; - UnkStruct_02023790 * v4; + Strbuf* v2; + Strbuf* v3; + Strbuf* v4; int v5 = 64; int v6; u32 v7, v8; diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c index 85bd22434b..bc0eb20c0f 100644 --- a/src/overlay114/ov114_0225C700.c +++ b/src/overlay114/ov114_0225C700.c @@ -115,14 +115,14 @@ typedef struct { typedef struct { UnkStruct_0200B144 * unk_00; UnkStruct_0200B358 * unk_04; - UnkStruct_02023790 * unk_08; - UnkStruct_02023790 * unk_0C; + Strbuf* unk_08; + Strbuf* unk_0C; } UnkStruct_ov114_0225D084; typedef struct { UnkStruct_0205AA50 unk_00[2]; u16 unk_20[2]; - UnkStruct_02023790 * unk_24[2]; + Strbuf* unk_24[2]; void * unk_2C[2]; BOOL unk_34; } UnkStruct_ov114_0225D338; @@ -155,7 +155,7 @@ typedef struct { typedef struct { UnkStruct_0205AA50 unk_00; u32 unk_10; - UnkStruct_02023790 * unk_14; + Strbuf* unk_14; UnkStruct_ov114_0225CBF0 unk_18; s16 unk_2C; s16 unk_2E; @@ -306,10 +306,10 @@ static void ov114_0225D138(UnkStruct_ov114_0225D084 * param0, u32 param1, u32 pa static void ov114_0225D154(UnkStruct_ov114_0225D084 * param0, u32 param1); static void ov114_0225D170(UnkStruct_ov114_0225D084 * param0, u32 param1); static void ov114_0225D180(UnkStruct_ov114_0225D084 * param0, u32 param1); -static void ov114_0225D190(UnkStruct_ov114_0225D084 * param0, UnkStruct_02023790 * param1, u32 param2); +static void ov114_0225D190(UnkStruct_ov114_0225D084 * param0, Strbuf *param1, u32 param2); static void ov114_0225D1AC(UnkStruct_ov114_0225D084 * param0, u32 param1, UnkStruct_0205AA50 * param2, u8 param3, u8 param4); static void ov114_0225D1C8(UnkStruct_ov114_0225D084 * param0, u32 param1, UnkStruct_0205AA50 * param2, u8 param3, u8 param4); -static u32 ov114_0225D218(UnkStruct_ov114_0225D084 * param0, u32 param1, UnkStruct_0205AA50 * param2, UnkStruct_02023790 * param3, u32 param4); +static u32 ov114_0225D218(UnkStruct_ov114_0225D084 * param0, u32 param1, UnkStruct_0205AA50 * param2, Strbuf *param3, u32 param4); static void ov114_0225D254(UnkStruct_ov114_0225D084 * param0, u32 param1, UnkStruct_0205AA50 * param2, u8 param3, u8 param4, u32 param5); static void ov114_0225D290(UnkStruct_ov114_0225D338 * param0, UnkStruct_ov114_0225CEF0 * param1, UnkStruct_021C0794 * param2, BOOL param3, u32 param4); static void ov114_0225D338(UnkStruct_ov114_0225D338 * param0); @@ -1490,7 +1490,7 @@ static void ov114_0225D180 (UnkStruct_ov114_0225D084 * param0, u32 param1) sub_0200C0B0(param0->unk_04, 0, param1); } -static void ov114_0225D190 (UnkStruct_ov114_0225D084 * param0, UnkStruct_02023790 * param1, u32 param2) +static void ov114_0225D190 (UnkStruct_ov114_0225D084 * param0, Strbuf *param1, u32 param2) { sub_0200B1B8(param0->unk_00, param2, param0->unk_0C); sub_0200C388(param0->unk_04, param1, param0->unk_0C); @@ -1519,7 +1519,7 @@ static void ov114_0225D1C8 (UnkStruct_ov114_0225D084 * param0, u32 param1, UnkSt sub_0201D78C(param2, 0, param0->unk_08, v1, param4, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } -static u32 ov114_0225D218 (UnkStruct_ov114_0225D084 * param0, u32 param1, UnkStruct_0205AA50 * param2, UnkStruct_02023790 * param3, u32 param4) +static u32 ov114_0225D218 (UnkStruct_ov114_0225D084 * param0, u32 param1, UnkStruct_0205AA50 * param2, Strbuf *param3, u32 param4) { sub_0200B1B8(param0->unk_00, param1, param0->unk_0C); sub_0200C388(param0->unk_04, param3, param0->unk_0C); diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c index a62cf479db..137c1864a0 100644 --- a/src/overlay115/ov115_02260CEC.c +++ b/src/overlay115/ov115_02260CEC.c @@ -272,7 +272,7 @@ typedef struct { UnkStruct_02012CE0 * unk_48; UnkStruct_02012B20 * unk_4C; UnkStruct_0201EE28 unk_50; - UnkStruct_02023790 * unk_5C; + Strbuf* unk_5C; UnkStruct_02009DC8 * unk_60; UnkStruct_ov115_02261304 unk_64; UnkStruct_ov115_02261304 unk_7C; @@ -293,8 +293,8 @@ typedef struct { UnkStruct_02018340 * unk_00; UnkStruct_0200B358 * unk_04; UnkStruct_0200B144 * unk_08; - UnkStruct_02023790 * unk_0C; - UnkStruct_02023790 * unk_10; + Strbuf* unk_0C; + Strbuf* unk_10; u16 unk_14; u16 unk_16; UnkStruct_0207C690 * unk_18; @@ -1437,7 +1437,7 @@ static void ov115_022617D8 (UnkStruct_ov115_022615B0 * param0, u32 param1) static void ov115_022617E8 (UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_02261ADC * param1, const UnkStruct_ov115_02262F50 * param2, u32 param3, u32 param4, NARC * param5, u32 param6) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_ov115_02261520 v1; memset(param0, 0, sizeof(UnkStruct_ov115_022617E8)); @@ -1459,7 +1459,7 @@ static void ov115_022617E8 (UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_0 s32 v3, v4; UnkStruct_0205AA50 v5; u32 v6; - UnkStruct_02023790 * v7; + Strbuf* v7; u32 v8; u32 v9; u32 v10; diff --git a/src/overlay116/ov116_02261870.c b/src/overlay116/ov116_02261870.c index d204b9851c..1907ef81b6 100644 --- a/src/overlay116/ov116_02261870.c +++ b/src/overlay116/ov116_02261870.c @@ -397,7 +397,7 @@ void ov116_02261F70 (UnkStruct_ov116_02262A8C * param0) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = sub_0200B144(0, 26, 410, 106); v1 = sub_0200B1EC(v0, 0); @@ -459,7 +459,7 @@ void ov116_02262034 (UnkStruct_ov116_0226139C * param0, int param1) } } -static int ov116_0226208C (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1) +static int ov116_0226208C (UnkStruct_0205AA50 * param0, Strbuf *param1) { int v0 = sub_02002D7C(0, param1, 0); int v1 = (sub_0201C294(param0) * 8 - v0) / 2; @@ -529,7 +529,7 @@ void ov116_022620AC (UnkStruct_ov116_0226139C * param0, UnkStruct_ov116_02262A8C sub_0201ADA4(v3, 0xFF); { - UnkStruct_02023790 * v11; + Strbuf* v11; int v12; v11 = sub_02025F04(v9, 106); diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c index f0f7df259a..aa34c005f2 100644 --- a/src/overlay117/ov117_02260668.c +++ b/src/overlay117/ov117_02260668.c @@ -846,7 +846,7 @@ static void ov117_02261280 (UnkStruct_ov117_02261280 * param0) static void ov117_02261368 (UnkStruct_ov117_02261280 * param0) { - UnkStruct_02023790 * v0; + Strbuf* v0; sub_0200DC48(¶m0->unk_30[4], 1, ((((((0x8000 - 0x2000) / 32) + (10 * 2)) + (10 * 2)) + (10 * 2)) + (10 * 2)), 6); @@ -867,7 +867,7 @@ static void ov117_022613EC (UnkStruct_ov117_02261280 * param0) { int v0, v1; UnkStruct_02025E6C * v2; - UnkStruct_02023790 * v3; + Strbuf* v3; int v4; u32 v5; int v6, v7; diff --git a/src/overlay117/ov117_02263AF0.c b/src/overlay117/ov117_02263AF0.c index 5f09c49e84..b666bdd332 100644 --- a/src/overlay117/ov117_02263AF0.c +++ b/src/overlay117/ov117_02263AF0.c @@ -2012,7 +2012,7 @@ static BOOL ov117_02265C3C (UnkStruct_ov117_02265C3C * param0, UnkStruct_ov117_0 return 1; } -void ov117_02265DB8 (UnkStruct_02018340 * param0, UnkStruct_0200C704 * param1, UnkStruct_02012744 * param2, UnkStruct_ov117_02265EB0 * param3, const UnkStruct_02023790 * param4, int param5, u32 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14) +void ov117_02265DB8 (UnkStruct_02018340 * param0, UnkStruct_0200C704 * param1, UnkStruct_02012744 * param2, UnkStruct_ov117_02265EB0 * param3, const Strbuf *param4, int param5, u32 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14) { UnkStruct_020127E8 v0; UnkStruct_0205AA50 v1; diff --git a/src/overlay118/ov118_021D0D80.c b/src/overlay118/ov118_021D0D80.c index 41b734b48e..5ed0180d29 100644 --- a/src/overlay118/ov118_021D0D80.c +++ b/src/overlay118/ov118_021D0D80.c @@ -142,7 +142,7 @@ int ov118_021D0DBC (UnkStruct_0207F248 * param0) break; case 9: { - UnkStruct_02023790 * v2; + Strbuf* v2; v2 = sub_0200B1EC(param0->unk_69C, 202); diff --git a/src/overlay119/ov119_021D0D80.c b/src/overlay119/ov119_021D0D80.c index ea2914ea2c..f87d80b1f6 100644 --- a/src/overlay119/ov119_021D0D80.c +++ b/src/overlay119/ov119_021D0D80.c @@ -311,8 +311,8 @@ void ov119_021D10F0 (UnkStruct_02018340 * param0, UnkStruct_0205AA50 * param1, i int ov119_021D1158 (UnkStruct_0205AA50 * param0, int param1, Pokemon * param2, int param3) { int v0; - UnkStruct_02023790 * v1; - UnkStruct_02023790 * v2; + Strbuf* v1; + Strbuf* v2; UnkStruct_0200B358 * v3; BoxPokemon * v4; UnkStruct_0200B144 * v5; @@ -349,7 +349,7 @@ void ov119_021D11E4 (UnkStruct_ov119_021D0FD0 * param0, UnkStruct_02018340 * par { int v1; - UnkStruct_02023790 * v2; + Strbuf* v2; UnkStruct_0200B144 * v3 = sub_0200B144(0, 26, 357, 71); for (v1 = 0; v1 < 2; v1++) { diff --git a/src/unk_02002B7C.c b/src/unk_02002B7C.c index b207504eb0..20c13a58c2 100644 --- a/src/unk_02002B7C.c +++ b/src/unk_02002B7C.c @@ -138,13 +138,13 @@ u32 sub_02002D48 (int param0, const u16 * param1, u32 param2) return sub_02023620(Unk_02101D48->unk_94[param0], param1, param2); } -u32 sub_02002D7C (int param0, const UnkStruct_02023790 * param1, u32 param2) +u32 sub_02002D7C (int param0, const Strbuf *param1, u32 param2) { GF_ASSERT(Unk_02101D48->unk_94[param0] != NULL); return sub_02023620(Unk_02101D48->unk_94[param0], sub_02023E2C(param1), param2); } -u32 sub_02002DB4 (int param0, UnkStruct_02023790 * param1, UnkStruct_02023790 * param2) +u32 sub_02002DB4 (int param0, Strbuf *param1, Strbuf *param2) { GF_ASSERT(Unk_02101D48->unk_94[param0] != NULL); @@ -198,20 +198,20 @@ void sub_02002E98 (u32 param0, u32 param1, u32 param2) sub_02006E84(14, 7, (int)param0, param1, 0x20, param2); } -u32 sub_02002EB4 (int param0, const UnkStruct_02023790 * param1, u32 param2) +u32 sub_02002EB4 (int param0, const Strbuf *param1, u32 param2) { GF_ASSERT(Unk_02101D48->unk_94[param0] != NULL); return sub_020236D0(Unk_02101D48->unk_94[param0], sub_02023E2C(param1), param2); } -u32 sub_02002EEC (int param0, const UnkStruct_02023790 * param1, u32 param2, u32 param3) +u32 sub_02002EEC (int param0, const Strbuf *param1, u32 param2, u32 param3) { u32 v0 = sub_02002D7C(param0, param1, param2); return (v0 < param3) ? (param3 - v0) / 2 : 0; } -u32 sub_02002F04 (int param0, const UnkStruct_02023790 * param1) +u32 sub_02002F04 (int param0, const Strbuf *param1) { GF_ASSERT(Unk_02101D48->unk_94[param0] != NULL); return sub_02023738(Unk_02101D48->unk_94[param0], sub_02023E2C(param1)); diff --git a/src/unk_0200AC5C.c b/src/unk_0200AC5C.c index 6b9ebf038a..b0d7b2ce9a 100644 --- a/src/unk_0200AC5C.c +++ b/src/unk_0200AC5C.c @@ -114,7 +114,7 @@ static void sub_0200AD98 (u16 * param0, const u16 * param1, const UnkStruct_0200 MI_CpuCopy16(param1, param0, param2->unk_04 * sizeof(u16)); } -void sub_0200ADAC (const UnkStruct_0200AC5C * param0, u32 param1, UnkStruct_02023790 * param2) +void sub_0200ADAC (const UnkStruct_0200AC5C * param0, u32 param1, Strbuf *param2) { if (param1 < param0->unk_00) { UnkStruct_0200AC6C v0; @@ -140,7 +140,7 @@ void sub_0200ADAC (const UnkStruct_0200AC5C * param0, u32 param1, UnkStruct_0202 } } -UnkStruct_02023790 * sub_0200AE5C (const UnkStruct_0200AC5C * param0, u32 param1, u32 param2) +Strbuf* sub_0200AE5C (const UnkStruct_0200AC5C * param0, u32 param1, u32 param2) { if (param1 < param0->unk_00) { UnkStruct_0200AC6C v0; @@ -153,7 +153,7 @@ UnkStruct_02023790 * sub_0200AE5C (const UnkStruct_0200AC5C * param0, u32 param1 v1 = Heap_AllocFromHeapAtEnd(param2, v2); if (v1) { - UnkStruct_02023790 * v3; + Strbuf* v3; MI_CpuCopy16((((u8 *)param0) + v0.unk_00), v1, v2); inline_0200AC6C_1(v1, v0.unk_04, param1, param0->unk_02); @@ -175,7 +175,7 @@ UnkStruct_02023790 * sub_0200AE5C (const UnkStruct_0200AC5C * param0, u32 param1 } } -void sub_0200AF20 (u32 param0, u32 param1, u32 param2, u32 param3, UnkStruct_02023790 * param4) +void sub_0200AF20 (u32 param0, u32 param1, u32 param2, u32 param3, Strbuf *param4) { NARC * v0; @@ -187,7 +187,7 @@ void sub_0200AF20 (u32 param0, u32 param1, u32 param2, u32 param3, UnkStruct_020 } } -void sub_0200AF48 (NARC * param0, u32 param1, u32 param2, u32 param3, UnkStruct_02023790 * param4) +void sub_0200AF48 (NARC * param0, u32 param1, u32 param2, u32 param3, Strbuf *param4) { UnkStruct_0200AC5C v0; UnkStruct_0200AC6C v1; @@ -215,10 +215,10 @@ void sub_0200AF48 (NARC * param0, u32 param1, u32 param2, u32 param3, UnkStruct_ } } -UnkStruct_02023790 * sub_0200B010 (u32 param0, u32 param1, u32 param2, u32 param3) +Strbuf* sub_0200B010 (u32 param0, u32 param1, u32 param2, u32 param3) { NARC * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = NARC_ctor(param0, param3); @@ -232,7 +232,7 @@ UnkStruct_02023790 * sub_0200B010 (u32 param0, u32 param1, u32 param2, u32 param return v1; } -UnkStruct_02023790 * sub_0200B044 (NARC * param0, u32 param1, u32 param2, u32 param3) +Strbuf* sub_0200B044 (NARC * param0, u32 param1, u32 param2, u32 param3) { UnkStruct_0200AC5C v0; @@ -240,7 +240,7 @@ UnkStruct_02023790 * sub_0200B044 (NARC * param0, u32 param1, u32 param2, u32 pa if (param2 < v0.unk_00) { UnkStruct_0200AC6C v1; - UnkStruct_02023790 * v2; + Strbuf* v2; NARC_ReadFromMember(param0, param1, inline_0200ACF0(param2), sizeof(UnkStruct_0200AC6C), &v1); inline_0200AC6C(&v1, param2, v0.unk_02); @@ -323,7 +323,7 @@ void sub_0200B190 (UnkStruct_0200B144 * param0) } } -void sub_0200B1B8 (const UnkStruct_0200B144 * param0, u32 param1, UnkStruct_02023790 * param2) +void sub_0200B1B8 (const UnkStruct_0200B144 * param0, u32 param1, Strbuf *param2) { switch (param0->unk_00) { case 0: @@ -335,7 +335,7 @@ void sub_0200B1B8 (const UnkStruct_0200B144 * param0, u32 param1, UnkStruct_0202 } } -UnkStruct_02023790 * sub_0200B1EC (const UnkStruct_0200B144 * param0, u32 param1) +Strbuf* sub_0200B1EC (const UnkStruct_0200B144 * param0, u32 param1) { switch (param0->unk_00) { case 0: diff --git a/src/unk_0200B29C.c b/src/unk_0200B29C.c index 87ac110325..8e1bfc7119 100644 --- a/src/unk_0200B29C.c +++ b/src/unk_0200B29C.c @@ -10,15 +10,15 @@ #include "unk_0200B358.h" #include "unk_02023790.h" -UnkStruct_02023790 * sub_0200B29C (UnkStruct_0200B358 * param0, UnkStruct_0200B144 * param1, u32 param2, u32 param3) +Strbuf* sub_0200B29C (UnkStruct_0200B358 * param0, UnkStruct_0200B144 * param1, u32 param2, u32 param3) { - UnkStruct_02023790 * v0 = NULL; - UnkStruct_02023790 * v1; + Strbuf* v0 = NULL; + Strbuf* v1; v1 = sub_02023790(1024, 0); if (v1) { - UnkStruct_02023790 * v2 = sub_0200B1EC(param1, param2); + Strbuf* v2 = sub_0200B1EC(param1, param2); if (v2) { sub_0200C388(param0, v1, v2); @@ -32,12 +32,12 @@ UnkStruct_02023790 * sub_0200B29C (UnkStruct_0200B358 * param0, UnkStruct_0200B1 return v0; } -UnkStruct_02023790 * sub_0200B2EC (u32 param0, u32 param1) +Strbuf* sub_0200B2EC (u32 param0, u32 param1) { UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 647, param1); if (v0) { - UnkStruct_02023790 * v1 = sub_02023790(16, param1); + Strbuf* v1 = sub_02023790(16, param1); if (v1) { sub_0200B1B8(v0, param0, v1); @@ -50,12 +50,12 @@ UnkStruct_02023790 * sub_0200B2EC (u32 param0, u32 param1) return NULL; } -UnkStruct_02023790 * sub_0200B32C (u32 param0, u32 param1) +Strbuf* sub_0200B32C (u32 param0, u32 param1) { UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 412, param1); if (v0) { - UnkStruct_02023790 * v1 = sub_0200B1EC(v0, param0); + Strbuf* v1 = sub_0200B1EC(v0, param0); sub_0200B190(v0); return v1; diff --git a/src/unk_0200B358.c b/src/unk_0200B358.c index a3ad57ddc2..cf25fd1164 100644 --- a/src/unk_0200B358.c +++ b/src/unk_0200B358.c @@ -38,17 +38,17 @@ typedef struct { typedef struct { UnkStruct_0200B444 unk_00; - UnkStruct_02023790 * unk_04; + Strbuf* unk_04; } UnkStruct_0200B358_sub1; typedef struct UnkStruct_0200B358_t { u32 unk_00; u32 unk_04; UnkStruct_0200B358_sub1 * unk_08; - UnkStruct_02023790 * unk_0C; + Strbuf* unk_0C; } UnkStruct_0200B358; -static void sub_0200B448(UnkStruct_0200B358 * param0, u32 param1, const UnkStruct_02023790 * param2, const UnkStruct_0200B444 * param3); +static void sub_0200B448(UnkStruct_0200B358 * param0, u32 param1, const Strbuf *param2, const UnkStruct_0200B444 * param3); static void sub_0200B444(UnkStruct_0200B444 * param0); void sub_0200B578(UnkStruct_0200B358 * param0, u32 param1, BoxPokemon * param2); void sub_0200B594(UnkStruct_0200B358 * param0, u32 param1, u32 param2); @@ -150,7 +150,7 @@ static void sub_0200B444 (UnkStruct_0200B444 * param0) return; } -static void sub_0200B448 (UnkStruct_0200B358 * param0, u32 param1, const UnkStruct_02023790 * param2, const UnkStruct_0200B444 * param3) +static void sub_0200B448 (UnkStruct_0200B358 * param0, u32 param1, const Strbuf *param2, const UnkStruct_0200B444 * param3) { GF_ASSERT(param1 < param0->unk_00); @@ -163,7 +163,7 @@ static void sub_0200B448 (UnkStruct_0200B358 * param0, u32 param1, const UnkStru } } -void sub_0200B48C (UnkStruct_0200B358 * param0, u32 param1, const UnkStruct_02023790 * param2, u32 param3, BOOL param4, u32 param5) +void sub_0200B48C (UnkStruct_0200B358 * param0, u32 param1, const Strbuf *param2, u32 param3, BOOL param4, u32 param5) { sub_0200B448(param0, param1, param2, NULL); } @@ -791,7 +791,7 @@ void sub_0200C01C (UnkStruct_0200B358 * param0, u32 param1, u32 param2) void sub_0200C054 (UnkStruct_0200B358 * param0, UnkStruct_021C0794 * param1, int param2, int param3, int param4) { int v0, v1; - UnkStruct_02023790 * v2; + Strbuf* v2; UnkStruct_0202B4A0 * v3 = sub_0202B4A0(param1); v0 = sub_0202B47C(v3, param2); @@ -952,7 +952,7 @@ void sub_0200C338 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) } } -void sub_0200C388 (const UnkStruct_0200B358 * param0, UnkStruct_02023790 * param1, const UnkStruct_02023790 * param2) +void sub_0200C388 (const UnkStruct_0200B358 * param0, Strbuf *param1, const Strbuf *param2) { const u16 * v0; u16 * v1; diff --git a/src/unk_02013A04.c b/src/unk_02013A04.c index 556a76008f..6346594cd1 100644 --- a/src/unk_02013A04.c +++ b/src/unk_02013A04.c @@ -51,7 +51,7 @@ void sub_02013A4C (UnkStruct_02013A04 * param0, const UnkStruct_0200B144 * param } } -void sub_02013A6C (UnkStruct_02013A04 * param0, const UnkStruct_02023790 * param1, u32 param2) +void sub_02013A6C (UnkStruct_02013A04 * param0, const Strbuf *param1, u32 param2) { u32 v0; @@ -108,7 +108,7 @@ void sub_02013AE8 (UnkStruct_02013A04 * param0) break; } - sub_020237BC((UnkStruct_02023790 *)(v0->unk_00)); + sub_020237BC((Strbuf *)(v0->unk_00)); v0->unk_00 = NULL; v0++; diff --git a/src/unk_020149F0.c b/src/unk_020149F0.c index f7d9445b13..5506b12f54 100644 --- a/src/unk_020149F0.c +++ b/src/unk_020149F0.c @@ -14,7 +14,7 @@ struct UnkStruct_020149F0_t { u32 unk_00; - UnkStruct_02023790 * unk_04; + Strbuf* unk_04; }; UnkStruct_020149F0 * sub_020149F0 (u32 param0) diff --git a/src/unk_02014A84.c b/src/unk_02014A84.c index d362e44952..97b8e0d417 100644 --- a/src/unk_02014A84.c +++ b/src/unk_02014A84.c @@ -88,9 +88,9 @@ void sub_02014AC4 (UnkStruct_02014A84 * param0, int param1) } } -UnkStruct_02023790 * sub_02014B34 (const UnkStruct_02014A84 * param0, u32 param1) +Strbuf* sub_02014B34 (const UnkStruct_02014A84 * param0, u32 param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0200B358 * v1; UnkStruct_0200B144 * v2; int v3; @@ -114,7 +114,7 @@ UnkStruct_02023790 * sub_02014B34 (const UnkStruct_02014A84 * param0, u32 param1 return v0; } -UnkStruct_02023790 * sub_02014BA0 (const UnkStruct_02014A84 * param0, u32 param1) +Strbuf* sub_02014BA0 (const UnkStruct_02014A84 * param0, u32 param1) { return sub_0200B010(26, Unk_020E5498[param0->unk_00], param0->unk_02, param1); } @@ -141,7 +141,7 @@ BOOL sub_02014BD0 (const UnkStruct_02014A84 * param0) static u32 sub_02014C00 (u32 param0, u32 param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; const u16 * v1; u32 v2; diff --git a/src/unk_02014D38.c b/src/unk_02014D38.c index c69cff3f75..577f04e325 100644 --- a/src/unk_02014D38.c +++ b/src/unk_02014D38.c @@ -168,7 +168,7 @@ void sub_02014D70 (UnkStruct_02014D38 * param0) Heap_FreeToHeap(param0); } -void sub_02014D90 (UnkStruct_02014D38 * param0, u16 param1, UnkStruct_02023790 * param2) +void sub_02014D90 (UnkStruct_02014D38 * param0, u16 param1, Strbuf *param2) { u32 v0, v1; @@ -176,7 +176,7 @@ void sub_02014D90 (UnkStruct_02014D38 * param0, u16 param1, UnkStruct_02023790 * sub_0200B1B8(param0->unk_04[v0], v1, param2); } -void sub_02014DB8 (u16 param0, UnkStruct_02023790 * param1) +void sub_02014DB8 (u16 param0, Strbuf *param1) { if (param0 != 0xffff) { u32 v0, v1; diff --git a/src/unk_020158A8.c b/src/unk_020158A8.c index 1c213c267d..f7b2a8fe3d 100644 --- a/src/unk_020158A8.c +++ b/src/unk_020158A8.c @@ -40,7 +40,7 @@ void sub_020158F4 (UnkStruct_020158A8 * param0) Heap_FreeToHeap(param0); } -const UnkStruct_02023790 * sub_02015918 (UnkStruct_020158A8 * param0, int param1) +const Strbuf* sub_02015918 (UnkStruct_020158A8 * param0, int param1) { - return (const UnkStruct_02023790 *)param0->unk_04[param1]; + return (const Strbuf *)param0->unk_04[param1]; } diff --git a/src/unk_0201D670.c b/src/unk_0201D670.c index 456fc9c941..35c8b4761f 100644 --- a/src/unk_0201D670.c +++ b/src/unk_0201D670.c @@ -99,7 +99,7 @@ void sub_0201D730 (u8 param0) sub_0201D6B0(param0); } -u8 sub_0201D738 (UnkStruct_0205AA50 * param0, u32 param1, const UnkStruct_02023790 * param2, u32 param3, u32 param4, u32 param5, UnkFuncPtr_0201D834 param6) +u8 sub_0201D738 (UnkStruct_0205AA50 * param0, u32 param1, const Strbuf *param2, u32 param3, u32 param4, u32 param5, UnkFuncPtr_0201D834 param6) { UnkStruct_0201D738 v0; @@ -123,7 +123,7 @@ u8 sub_0201D738 (UnkStruct_0205AA50 * param0, u32 param1, const UnkStruct_020237 return sub_0201D834(&v0, param5, param6); } -u8 sub_0201D78C (UnkStruct_0205AA50 * param0, u32 param1, const UnkStruct_02023790 * param2, u32 param3, u32 param4, u32 param5, u32 param6, UnkFuncPtr_0201D834 param7) +u8 sub_0201D78C (UnkStruct_0205AA50 * param0, u32 param1, const Strbuf *param2, u32 param3, u32 param4, u32 param5, u32 param6, UnkFuncPtr_0201D834 param7) { UnkStruct_0201D738 v0; @@ -147,7 +147,7 @@ u8 sub_0201D78C (UnkStruct_0205AA50 * param0, u32 param1, const UnkStruct_020237 return sub_0201D834(&v0, param5, param7); } -u8 sub_0201D7E0 (UnkStruct_0205AA50 * param0, u32 param1, const UnkStruct_02023790 * param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, UnkFuncPtr_0201D834 param9) +u8 sub_0201D7E0 (UnkStruct_0205AA50 * param0, u32 param1, const Strbuf *param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, UnkFuncPtr_0201D834 param9) { UnkStruct_0201D738 v0; diff --git a/src/unk_02023790.c b/src/unk_02023790.c index 80f3a2d334..4b07a81c93 100644 --- a/src/unk_02023790.c +++ b/src/unk_02023790.c @@ -6,18 +6,18 @@ #include "heap.h" #include "unk_02023790.h" -struct UnkStruct_02023790_t { +struct Strbuf_t { u16 unk_00; u16 unk_02; u32 unk_04; u16 unk_08[1]; }; -UnkStruct_02023790 * sub_02023790 (u32 param0, u32 param1) +Strbuf* sub_02023790 (u32 param0, u32 param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; - v0 = Heap_AllocFromHeap(param1, (sizeof(UnkStruct_02023790) - sizeof(u16)) + sizeof(u16) * param0); + v0 = Heap_AllocFromHeap(param1, (sizeof(Strbuf) - sizeof(u16)) + sizeof(u16) * param0); if (v0) { v0->unk_04 = 0xb6f8d2ec; @@ -29,7 +29,7 @@ UnkStruct_02023790 * sub_02023790 (u32 param0, u32 param1) return v0; } -void sub_020237BC (UnkStruct_02023790 * param0) +void sub_020237BC (Strbuf *param0) { GF_ASSERT((param0) != NULL); GF_ASSERT((param0)->unk_04 == 0xb6f8d2ec);; @@ -37,7 +37,7 @@ void sub_020237BC (UnkStruct_02023790 * param0) Heap_FreeToHeap(param0); } -void sub_020237E8 (UnkStruct_02023790 * param0) +void sub_020237E8 (Strbuf *param0) { GF_ASSERT((param0) != NULL); GF_ASSERT((param0)->unk_04 == 0xb6f8d2ec);; @@ -45,7 +45,7 @@ void sub_020237E8 (UnkStruct_02023790 * param0) param0->unk_08[0] = 0xffff; } -void sub_02023810 (UnkStruct_02023790 * param0, const UnkStruct_02023790 * param1) +void sub_02023810 (Strbuf *param0, const Strbuf *param1) { GF_ASSERT((param0) != NULL); GF_ASSERT((param0)->unk_04 == 0xb6f8d2ec);; GF_ASSERT((param1) != NULL); GF_ASSERT((param1)->unk_04 == 0xb6f8d2ec);; @@ -59,9 +59,9 @@ void sub_02023810 (UnkStruct_02023790 * param0, const UnkStruct_02023790 * param GF_ASSERT(0); } -UnkStruct_02023790 * sub_02023868 (const UnkStruct_02023790 * param0, u32 param1) +Strbuf* sub_02023868 (const Strbuf *param0, u32 param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; GF_ASSERT((param0) != NULL); GF_ASSERT((param0)->unk_04 == 0xb6f8d2ec);; @@ -74,7 +74,7 @@ UnkStruct_02023790 * sub_02023868 (const UnkStruct_02023790 * param0, u32 param1 return v0; } -void sub_020238A0 (UnkStruct_02023790 * param0, int param1, u32 param2, int param3, int param4) +void sub_020238A0 (Strbuf *param0, int param1, u32 param2, int param3, int param4) { static const u32 v0[] = { 1, @@ -152,7 +152,7 @@ void sub_020238A0 (UnkStruct_02023790 * param0, int param1, u32 param2, int para GF_ASSERT(0); } -void sub_020239D4 (UnkStruct_02023790 * param0, u64 param1, u32 param2, int param3, int param4) +void sub_020239D4 (Strbuf *param0, u64 param1, u32 param2, int param3, int param4) { static const u64 v0[] = { 1, @@ -240,7 +240,7 @@ void sub_020239D4 (UnkStruct_02023790 * param0, u64 param1, u32 param2, int para GF_ASSERT(0); } -u64 sub_02023B38 (const UnkStruct_02023790 * param0, BOOL * param1) +u64 sub_02023B38 (const Strbuf *param0, BOOL * param1) { u64 v0 = 0, v1 = 0, v2 = 1; int v3; @@ -274,7 +274,7 @@ u64 sub_02023B38 (const UnkStruct_02023790 * param0, BOOL * param1) return v1; } -int sub_02023BE0 (const UnkStruct_02023790 * param0, const UnkStruct_02023790 * param1) +int sub_02023BE0 (const Strbuf *param0, const Strbuf *param1) { GF_ASSERT((param0) != NULL); GF_ASSERT((param0)->unk_04 == 0xb6f8d2ec);; GF_ASSERT((param1) != NULL); GF_ASSERT((param1)->unk_04 == 0xb6f8d2ec);; @@ -292,13 +292,13 @@ int sub_02023BE0 (const UnkStruct_02023790 * param0, const UnkStruct_02023790 * } } -u32 sub_02023C3C (const UnkStruct_02023790 * param0) +u32 sub_02023C3C (const Strbuf *param0) { GF_ASSERT((param0) != NULL); GF_ASSERT((param0)->unk_04 == 0xb6f8d2ec);; return param0->unk_02; } -u32 sub_02023C5C (const UnkStruct_02023790 * param0) +u32 sub_02023C5C (const Strbuf *param0) { GF_ASSERT((param0) != NULL); GF_ASSERT((param0)->unk_04 == 0xb6f8d2ec);; @@ -316,7 +316,7 @@ u32 sub_02023C5C (const UnkStruct_02023790 * param0) } } -void sub_02023C9C (UnkStruct_02023790 * param0, const UnkStruct_02023790 * param1, u32 param2) +void sub_02023C9C (Strbuf *param0, const Strbuf *param1, u32 param2) { GF_ASSERT((param1) != NULL); GF_ASSERT((param1)->unk_04 == 0xb6f8d2ec);; GF_ASSERT((param0) != NULL); GF_ASSERT((param0)->unk_04 == 0xb6f8d2ec);; @@ -347,7 +347,7 @@ void sub_02023C9C (UnkStruct_02023790 * param0, const UnkStruct_02023790 * param } } -void sub_02023D28 (UnkStruct_02023790 * param0, const u16 * param1) +void sub_02023D28 (Strbuf *param0, const u16 * param1) { GF_ASSERT((param0) != NULL); GF_ASSERT((param0)->unk_04 == 0xb6f8d2ec);; @@ -365,7 +365,7 @@ void sub_02023D28 (UnkStruct_02023790 * param0, const u16 * param1) param0->unk_08[param0->unk_02] = 0xffff; } -void sub_02023D8C (UnkStruct_02023790 * param0, const u16 * param1, u32 param2) +void sub_02023D8C (Strbuf *param0, const u16 * param1, u32 param2) { GF_ASSERT((param0) != NULL); GF_ASSERT((param0)->unk_04 == 0xb6f8d2ec);; @@ -392,7 +392,7 @@ void sub_02023D8C (UnkStruct_02023790 * param0, const u16 * param1, u32 param2) GF_ASSERT(0); } -void sub_02023DF0 (const UnkStruct_02023790 * param0, u16 * param1, u32 param2) +void sub_02023DF0 (const Strbuf *param0, u16 * param1, u32 param2) { GF_ASSERT((param0) != NULL); GF_ASSERT((param0)->unk_04 == 0xb6f8d2ec);; @@ -404,13 +404,13 @@ void sub_02023DF0 (const UnkStruct_02023790 * param0, u16 * param1, u32 param2) GF_ASSERT(0); } -const u16 * sub_02023E2C (const UnkStruct_02023790 * param0) +const u16 * sub_02023E2C (const Strbuf *param0) { GF_ASSERT((param0) != NULL); GF_ASSERT((param0)->unk_04 == 0xb6f8d2ec);; return param0->unk_08; } -void sub_02023E4C (UnkStruct_02023790 * param0, const UnkStruct_02023790 * param1) +void sub_02023E4C (Strbuf *param0, const Strbuf *param1) { GF_ASSERT((param0) != NULL); GF_ASSERT((param0)->unk_04 == 0xb6f8d2ec);; GF_ASSERT((param1) != NULL); GF_ASSERT((param1)->unk_04 == 0xb6f8d2ec);; @@ -424,7 +424,7 @@ void sub_02023E4C (UnkStruct_02023790 * param0, const UnkStruct_02023790 * param GF_ASSERT(0); } -void sub_02023EB0 (UnkStruct_02023790 * param0, u16 param1) +void sub_02023EB0 (Strbuf *param0, u16 param1) { GF_ASSERT((param0) != NULL); GF_ASSERT((param0)->unk_04 == 0xb6f8d2ec);; @@ -437,12 +437,12 @@ void sub_02023EB0 (UnkStruct_02023790 * param0, u16 param1) GF_ASSERT(0); } -BOOL sub_02023EF8 (UnkStruct_02023790 * param0) +BOOL sub_02023EF8 (Strbuf *param0) { return (param0->unk_02 > 0) && (param0->unk_08[0] == 0xF100); } -void sub_02023F10 (UnkStruct_02023790 * param0, UnkStruct_02023790 * param1) +void sub_02023F10 (Strbuf *param0, Strbuf *param1) { if (sub_02023EF8(param1)) { u32 v0; @@ -481,7 +481,7 @@ void sub_02023F10 (UnkStruct_02023790 * param0, UnkStruct_02023790 * param1) } } -void sub_02023F8C (UnkStruct_02023790 * param0, int param1) +void sub_02023F8C (Strbuf *param0, int param1) { GF_ASSERT((param0) != NULL); GF_ASSERT((param0)->unk_04 == 0xb6f8d2ec);; diff --git a/src/unk_02025E68.c b/src/unk_02025E68.c index 5e8b96525d..abe123d2fc 100644 --- a/src/unk_02025E68.c +++ b/src/unk_02025E68.c @@ -61,7 +61,7 @@ void sub_02025EC0 (UnkStruct_02025E6C * param0, const u16 * param1) sub_020021B0(param0->unk_00, param1); } -void sub_02025EE0 (UnkStruct_02025E6C * param0, const UnkStruct_02023790 * param1) +void sub_02025EE0 (UnkStruct_02025E6C * param0, const Strbuf *param1) { sub_02023DF0(param1, param0->unk_00, 7 + 1); } @@ -71,14 +71,14 @@ const u16 * sub_02025EF0 (const UnkStruct_02025E6C * param0) return param0->unk_00; } -void sub_02025EF4 (const UnkStruct_02025E6C * param0, UnkStruct_02023790 * param1) +void sub_02025EF4 (const UnkStruct_02025E6C * param0, Strbuf *param1) { sub_02023D28(param1, param0->unk_00); } -UnkStruct_02023790 * sub_02025F04 (const UnkStruct_02025E6C * param0, int param1) +Strbuf* sub_02025F04 (const UnkStruct_02025E6C * param0, int param1) { - UnkStruct_02023790 * v0 = sub_02023790(7 + 1, param1); + Strbuf* v0 = sub_02023790(7 + 1, param1); sub_02025EF4(param0, v0); return v0; diff --git a/src/unk_0202602C.c b/src/unk_0202602C.c index 138789a79a..f6ca227bbb 100644 --- a/src/unk_0202602C.c +++ b/src/unk_0202602C.c @@ -33,14 +33,14 @@ void sub_02026040 (UnkStruct_02026030 * param0) memset(param0, 0, sizeof(UnkStruct_02026030)); } -void sub_0202604C (const UnkStruct_0202610C * param0, UnkStruct_02023790 * param1) +void sub_0202604C (const UnkStruct_0202610C * param0, Strbuf *param1) { sub_02023D8C(param1, param0->unk_00, (11 + 1)); } -UnkStruct_02023790 * sub_0202605C (const UnkStruct_0202610C * param0, int param1) +Strbuf* sub_0202605C (const UnkStruct_0202610C * param0, int param1) { - UnkStruct_02023790 * v0 = sub_02023790((11 + 1) * 2, param1); + Strbuf* v0 = sub_02023790((11 + 1) * 2, param1); sub_02023D28(v0, param0->unk_00); return v0; diff --git a/src/unk_02026150.c b/src/unk_02026150.c index ca5b6672b9..309c23a56a 100644 --- a/src/unk_02026150.c +++ b/src/unk_02026150.c @@ -109,7 +109,7 @@ const UnkStruct_0202610C * sub_02026150 (UnkStruct_021C0794 * param0, int param1 return &v0->unk_00[0]; } -void sub_0202616C (UnkStruct_021C0794 * param0, int param1, UnkStruct_02023790 * param2, int param3) +void sub_0202616C (UnkStruct_021C0794 * param0, int param1, Strbuf *param2, int param3) { UnkStruct_0200B144 * v0; UnkStruct_02026030 * v1 = NULL; diff --git a/src/unk_020277A4.c b/src/unk_020277A4.c index 987d2869b0..704453a55b 100644 --- a/src/unk_020277A4.c +++ b/src/unk_020277A4.c @@ -101,7 +101,7 @@ const u16 * sub_02027870 (const UnkStruct_0202783C * param0) return param0->unk_6A4; } -void sub_0202787C (UnkStruct_0202783C * param0, UnkStruct_02023790 * param1) +void sub_0202787C (UnkStruct_0202783C * param0, Strbuf *param1) { sub_02023DF0(param1, param0->unk_6A4, 7 + 1); } @@ -111,7 +111,7 @@ const u16 * sub_02027894 (const UnkStruct_0202783C * param0) return param0->unk_6B4; } -void sub_020278A0 (UnkStruct_0202783C * param0, UnkStruct_02023790 * param1) +void sub_020278A0 (UnkStruct_0202783C * param0, Strbuf *param1) { sub_02023DF0(param1, param0->unk_6B4, 10 + 1); } diff --git a/src/unk_020298BC.c b/src/unk_020298BC.c index ede4aae9a0..b185298ffb 100644 --- a/src/unk_020298BC.c +++ b/src/unk_020298BC.c @@ -145,7 +145,7 @@ static void sub_02029990 (UnkStruct_0202A138 * param0, Pokemon * param1, UnkStru sub_0202992C(param0, param1, v0, v1, v2); } -static void sub_020299C0 (UnkStruct_0202A138 * param0, const UnkStruct_02023790 * param1, int param2) +static void sub_020299C0 (UnkStruct_0202A138 * param0, const Strbuf *param1, int param2) { sub_02023DF0(param1, param0->unk_20, 8); param0->unk_34 = param2; @@ -618,7 +618,7 @@ void sub_0202A0CC (UnkStruct_02029C68 * param0, const UnkStruct_02029C68 * param memcpy(param0, param1, sizeof(UnkStruct_02029C68)); } -void sub_0202A0EC (UnkStruct_02029C68 * param0, const UnkStruct_02023790 * param1, int param2) +void sub_0202A0EC (UnkStruct_02029C68 * param0, const Strbuf *param1, int param2) { GF_ASSERT(inline_02029CA8(param0)); sub_020299C0(¶m0->unk_04, param1, param2); @@ -653,7 +653,7 @@ u16 sub_0202A184 (const UnkStruct_02029C68 * param0) return sub_0202A5E8(¶m0->unk_04); } -void sub_0202A1A0 (const UnkStruct_02029C68 * param0, UnkStruct_02023790 * param1) +void sub_0202A1A0 (const UnkStruct_02029C68 * param0, Strbuf *param1) { GF_ASSERT(inline_02029CA8(param0)); sub_0202A5EC(¶m0->unk_04, param1); @@ -788,7 +788,7 @@ BOOL sub_0202A488 (const UnkStruct_02029C88 * param0, int param1) return 0; } -void sub_0202A4B4 (UnkStruct_02029C88 * param0, const UnkStruct_02023790 * param1, int param2) +void sub_0202A4B4 (UnkStruct_02029C88 * param0, const Strbuf *param1, int param2) { GF_ASSERT(inline_02029CD0(param0)); sub_020299C0(¶m0->unk_08, param1, param2); @@ -809,7 +809,7 @@ const UnkStruct_0202A150 * sub_0202A4F0 (const UnkStruct_02029C88 * param0, int return ¶m0->unk_44[param1]; } -void sub_0202A524 (const UnkStruct_02029C88 * param0, UnkStruct_02023790 * param1) +void sub_0202A524 (const UnkStruct_02029C88 * param0, Strbuf *param1) { GF_ASSERT(inline_02029CD0(param0)); sub_0202A5EC(¶m0->unk_08, param1); @@ -853,7 +853,7 @@ u16 sub_0202A5E8 (const UnkStruct_0202A138 * param0) return param0->unk_08; } -void sub_0202A5EC (const UnkStruct_0202A138 * param0, UnkStruct_02023790 * param1) +void sub_0202A5EC (const UnkStruct_0202A138 * param0, Strbuf *param1) { sub_02023D28(param1, param0->unk_20); } diff --git a/src/unk_0202ACE0.c b/src/unk_0202ACE0.c index 1d4b560083..a417286c48 100644 --- a/src/unk_0202ACE0.c +++ b/src/unk_0202ACE0.c @@ -142,7 +142,7 @@ u16 * sub_0202AEF0 (UnkStruct_0202B370 * param0, int param1) return param0->unk_1C0[param1].unk_10; } -void sub_0202AF0C (UnkStruct_0202B370 * param0, int param1, UnkStruct_02023790 * param2) +void sub_0202AF0C (UnkStruct_0202B370 * param0, int param1, Strbuf *param2) { GF_ASSERT(param1 < 32); sub_02023DF0(param2, param0->unk_1C0[param1].unk_10, sizeof(param0->unk_1C0[param1].unk_10)); @@ -154,7 +154,7 @@ u16 * sub_0202AF34 (UnkStruct_0202B370 * param0, int param1) return param0->unk_1C0[param1].unk_00; } -void sub_0202AF50 (UnkStruct_0202B370 * param0, int param1, UnkStruct_02023790 * param2) +void sub_0202AF50 (UnkStruct_0202B370 * param0, int param1, Strbuf *param2) { GF_ASSERT(param1 < 32); sub_02023DF0(param2, param0->unk_1C0[param1].unk_00, sizeof(param0->unk_1C0[param1].unk_00)); diff --git a/src/unk_0202B37C.c b/src/unk_0202B37C.c index cc61181430..3efe554f18 100644 --- a/src/unk_0202B37C.c +++ b/src/unk_0202B37C.c @@ -75,7 +75,7 @@ const u16 * sub_0202B42C (const UnkStruct_0202B4A0 * param0, int param1, int par return param0->unk_00[param1].unk_10; } -void sub_0202B444 (UnkStruct_0202B4A0 * param0, int param1, int param2, UnkStruct_02023790 * param3) +void sub_0202B444 (UnkStruct_0202B4A0 * param0, int param1, int param2, Strbuf *param3) { u16 * v0; diff --git a/src/unk_0202DF8C.c b/src/unk_0202DF8C.c index 1dfc63fb54..84b0bd4a36 100644 --- a/src/unk_0202DF8C.c +++ b/src/unk_0202DF8C.c @@ -33,7 +33,7 @@ void sub_0202DFA8 (UnkStruct_0202DF8C * param0, const Party * param1, const RTCD { UnkStruct_0202DFA8 * v0; Pokemon * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; int v3, v4, v5; BOOL v6; diff --git a/src/unk_0202E840.c b/src/unk_0202E840.c index 900ff896ea..7ef1040ab6 100644 --- a/src/unk_0202E840.c +++ b/src/unk_0202E840.c @@ -190,7 +190,7 @@ void * sub_0202E9FC (UnkStruct_021C0794 * param0, int param1) int v0; u32 v1, v2; UnkStruct_0202E91C * v3; - UnkStruct_02023790 * v4; + Strbuf* v4; UnkStruct_02025E6C * v5 = sub_02025E38(param0); u32 * v6; diff --git a/src/unk_02030A80.c b/src/unk_02030A80.c index f864824633..2dcb4236cf 100644 --- a/src/unk_02030A80.c +++ b/src/unk_02030A80.c @@ -80,9 +80,9 @@ void sub_02030AA0 (UnkStruct_02030A80 * param0, UnkStruct_021C0794 * param1) param0->unk_7C.unk_00 = sub_0202486C(param1, param0, sizeof(UnkStruct_02030A80) - (sizeof(UnkStruct_0202F298_sub1))); } -UnkStruct_02023790 * sub_02030B94 (const UnkStruct_02030A80 * param0, int param1) +Strbuf* sub_02030B94 (const UnkStruct_02030A80 * param0, int param1) { - UnkStruct_02023790 * v0 = sub_02023790((7 * 2) + 1, param1); + Strbuf* v0 = sub_02023790((7 * 2) + 1, param1); sub_02023D8C(v0, param0->unk_00, (7 * 2) + 1); return v0; @@ -146,7 +146,7 @@ int sub_02030C08 (const UnkStruct_02030A80 * param0) return param0->unk_18; } -UnkStruct_02023790 * sub_02030C28 (const UnkStruct_02030A80 * param0, UnkStruct_02014A84 * param1, int param2) +Strbuf* sub_02030C28 (const UnkStruct_02030A80 * param0, UnkStruct_02014A84 * param1, int param2) { int v0 = 0; @@ -174,7 +174,7 @@ UnkStruct_02023790 * sub_02030C28 (const UnkStruct_02030A80 * param0, UnkStruct_ return NULL; } else { - UnkStruct_02023790 * v3 = sub_02023790(40, param2); + Strbuf* v3 = sub_02023790(40, param2); sub_02023D8C(v3, param0->unk_20_val2, 40); return v3; diff --git a/src/unk_0203909C.c b/src/unk_0203909C.c index 354097d7aa..e1be801644 100644 --- a/src/unk_0203909C.c +++ b/src/unk_0203909C.c @@ -118,7 +118,7 @@ void sub_02039298 (UnkStruct_021C0794 * param0, int param1, int param2, int para DWCFriendData * v1 = sub_0202AED8(v0, param2); UnkStruct_02025E6C * v2 = sub_02032EE8(param1); DWCFriendData * v3; - UnkStruct_02023790 * v4; + Strbuf* v4; if (param4 != 2) { v3 = sub_02032F1C(param1); diff --git a/src/unk_02039814.c b/src/unk_02039814.c index c64664da39..23d5ef0079 100644 --- a/src/unk_02039814.c +++ b/src/unk_02039814.c @@ -87,8 +87,8 @@ void sub_02039834 (int param0, int param1, int param2) UnkStruct_02018340 * v0; UnkStruct_0205AA50 v1; UnkStruct_0200B144 * v2; - UnkStruct_02023790 * v3; - UnkStruct_02023790 * v4; + Strbuf* v3; + Strbuf* v4; UnkStruct_0200B358 * v5; int v6; diff --git a/src/unk_02039A64.c b/src/unk_02039A64.c index 5ceac31cc0..cdbe1eb8ff 100644 --- a/src/unk_02039A64.c +++ b/src/unk_02039A64.c @@ -81,7 +81,7 @@ void sub_02039A64 (int param0, int param1) UnkStruct_02018340 * v0; UnkStruct_0205AA50 v1; UnkStruct_0200B144 * v2; - UnkStruct_02023790 * v3; + Strbuf* v3; int v4; v4 = 16; diff --git a/src/unk_0203A9C8.c b/src/unk_0203A9C8.c index b0e6458e53..b719f673aa 100644 --- a/src/unk_0203A9C8.c +++ b/src/unk_0203A9C8.c @@ -532,8 +532,8 @@ static void sub_0203ADFC (UnkStruct_020508D4 * param0) for (v4 = 0; v4 < v5; v4++) { if (v1->unk_30[v4] == 3) { UnkStruct_0200B358 * v6; - UnkStruct_02023790 * v7; - UnkStruct_02023790 * v8; + Strbuf* v7; + Strbuf* v8; v6 = sub_0200B358(11); v7 = sub_02023790(8, 11); @@ -645,8 +645,8 @@ static void sub_0203B094 (UnkStruct_020508D4 * param0) UnkStruct_020708E0 * v1; UnkStruct_0200B144 * v2; UnkStruct_0200B358 * v3; - UnkStruct_02023790 * v4; - UnkStruct_02023790 * v5; + Strbuf* v4; + Strbuf* v5; u8 v6; v0 = sub_02050A60(param0); diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index 47a2f1c254..94aef25843 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -228,7 +228,7 @@ typedef struct { int unk_04; u16 * unk_08; UnkStruct_0208737C * unk_0C; - UnkStruct_02023790 * unk_10; + Strbuf* unk_10; } UnkStruct_0203DE98; typedef struct { diff --git a/src/unk_0203E880.c b/src/unk_0203E880.c index 995fe4a132..67c94e1046 100644 --- a/src/unk_0203E880.c +++ b/src/unk_0203E880.c @@ -71,8 +71,8 @@ struct UnkStruct_0203EF60_t { u16 * unk_34; UnkStruct_0203E724 * unk_38[2]; UnkStruct_0200B358 * unk_40; - UnkStruct_02023790 * unk_44; - UnkStruct_02023790 * unk_48; + Strbuf* unk_44; + Strbuf* unk_48; void * unk_4C; UnkStruct_0203E8B0 unk_50[2]; u16 unk_88[14]; diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c index 89fd015409..89efb52d9e 100644 --- a/src/unk_0203F6C4.c +++ b/src/unk_0203F6C4.c @@ -2532,8 +2532,8 @@ static BOOL sub_020403EC (UnkStruct_0203E724 * param0) static BOOL sub_020404A4 (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0; - UnkStruct_02023790 ** v1; - UnkStruct_02023790 ** v2; + Strbuf ** v1; + Strbuf ** v2; UnkStruct_0200B358 ** v3; u16 v4; u16 v5; @@ -2622,8 +2622,8 @@ static BOOL sub_020405DC (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; u8 * v1 = sub_0203F098(v0, 3); - UnkStruct_02023790 ** v2 = sub_0203F098(v0, 17); - UnkStruct_02023790 ** v3 = sub_0203F098(v0, 16); + Strbuf ** v2 = sub_0203F098(v0, 17); + Strbuf ** v3 = sub_0203F098(v0, 16); UnkStruct_0200B358 ** v4 = sub_0203F098(v0, 15); u8 v5 = (*((param0)->unk_08++)); u16 v6 = sub_0203E838(param0); @@ -4944,7 +4944,7 @@ static BOOL sub_02042E64 (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; u16 * v1 = sub_0203F098(v0, 8); - UnkStruct_02023790 ** v2 = sub_0203F098(v0, 16); + Strbuf ** v2 = sub_0203F098(v0, 16); u8 * v3 = sub_0203F098(v0, 6); u8 * v4 = sub_0203F098(v0, 3); u16 v5 = inline_02049538(param0); @@ -7762,8 +7762,8 @@ static BOOL sub_02045F48 (UnkStruct_0203E724 * param0) u16 v5 = inline_02049538(param0); UnkStruct_0200B358 * v6 = sub_0200B358(32); UnkStruct_0200B144 * v7 = sub_0200B144(0, 26, 372, 32); - UnkStruct_02023790 * v8; - UnkStruct_02023790 * v9; + Strbuf* v8; + Strbuf* v9; sub_0200BE48(v6, 0, v2); sub_0200BE48(v6, 1, v3); @@ -7928,7 +7928,7 @@ static BOOL sub_020461E0 (UnkStruct_0203E724 * param0) static BOOL sub_02046294 (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02023790 ** v1 = sub_0203F098(v0, 16); + Strbuf ** v1 = sub_0203F098(v0, 16); UnkStruct_0205AA50 * v2 = sub_0203F098(v0, 1); ov8_0224B67C(v0, v2, param0->unk_2C, *v1); diff --git a/src/unk_02046C7C.c b/src/unk_02046C7C.c index 6a2cdcd595..84d0daefa6 100644 --- a/src/unk_02046C7C.c +++ b/src/unk_02046C7C.c @@ -96,7 +96,7 @@ static BOOL sub_02046CE0 (UnkStruct_0203E724 * param0) BOOL sub_02046CFC (UnkStruct_0203E724 * param0) { - UnkStruct_02023790 * v0; + Strbuf* v0; Pokemon * v1; void ** v2 = sub_0203F098(param0->unk_34, 20); UnkStruct_02025E6C * v3 = sub_02025E38(sub_0203D174(param0->unk_34)); diff --git a/src/unk_020474B8.c b/src/unk_020474B8.c index e314f6a415..88b02943ad 100644 --- a/src/unk_020474B8.c +++ b/src/unk_020474B8.c @@ -40,7 +40,7 @@ #include -static UnkStruct_02023790 * sub_02047998(u16 param0, u32 param1); +static Strbuf* sub_02047998(u16 param0, u32 param1); BOOL sub_020474B8 (UnkStruct_0203E724 * param0) { @@ -278,7 +278,7 @@ BOOL sub_02047930 (UnkStruct_0203E724 * param0) u16 v3 = inline_02049538(param0); u16 v4 = sub_0203E838(param0); u8 v5 = (*((param0)->unk_08++)); - UnkStruct_02023790 * v6 = sub_02047998(v3, 4); + Strbuf* v6 = sub_02047998(v3, 4); sub_0200B48C(*v1, v2, v6, v4, v5, GAME_LANGUAGE); sub_020237BC(v6); @@ -286,10 +286,10 @@ BOOL sub_02047930 (UnkStruct_0203E724 * param0) return 0; } -static UnkStruct_02023790 * sub_02047998 (u16 param0, u32 param1) +static Strbuf* sub_02047998 (u16 param0, u32 param1) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = sub_0200B144(1, 26, 412, param1); v1 = sub_0200B1EC(v0, param0); @@ -303,7 +303,7 @@ BOOL sub_020479C0 (UnkStruct_0203E724 * param0) UnkStruct_0200B358 ** v0 = sub_0203F098(param0->unk_34, 15); u8 v1 = (*((param0)->unk_08++)); u16 v2 = sub_0206B054(sub_020507E4(param0->unk_34->unk_0C)); - UnkStruct_02023790 * v3 = sub_02047998(v2, 4); + Strbuf* v3 = sub_02047998(v2, 4); sub_0200B48C(*v0, v1, v3, 0, 1, GAME_LANGUAGE); sub_020237BC(v3); @@ -316,7 +316,7 @@ BOOL sub_02047A10 (UnkStruct_0203E724 * param0) UnkStruct_0200B358 ** v0 = sub_0203F098(param0->unk_34, 15); u8 v1 = (*((param0)->unk_08++)); u16 v2 = sub_0206B064(sub_020507E4(param0->unk_34->unk_0C)); - UnkStruct_02023790 * v3 = sub_02047998(v2, 4); + Strbuf* v3 = sub_02047998(v2, 4); sub_0200B48C(*v0, v1, v3, 0, 1, GAME_LANGUAGE); sub_020237BC(v3); @@ -329,7 +329,7 @@ BOOL sub_02047A60 (UnkStruct_0203E724 * param0) UnkStruct_0200B358 ** v0 = sub_0203F098(param0->unk_34, 15); u8 v1 = (*((param0)->unk_08++)); u16 v2 = sub_0206B08C(sub_020507E4(param0->unk_34->unk_0C)); - UnkStruct_02023790 * v3 = sub_02047998(v2, 4); + Strbuf* v3 = sub_02047998(v2, 4); sub_0200B48C(*v0, v1, v3, 0, 1, GAME_LANGUAGE); sub_020237BC(v3); @@ -372,7 +372,7 @@ BOOL sub_02047B20 (UnkStruct_0203E724 * param0) BOOL sub_02047B58 (UnkStruct_0203E724 * param0) { - UnkStruct_02023790 * v0 = sub_02023790(22, 4); + Strbuf* v0 = sub_02023790(22, 4); UnkStruct_0200B358 ** v1 = sub_0203F098(param0->unk_34, 15); u8 v2 = (*((param0)->unk_08++)); u16 v3 = inline_02049538(param0); @@ -390,7 +390,7 @@ BOOL sub_02047BB8 (UnkStruct_0203E724 * param0) u8 v1 = (*((param0)->unk_08++)); u16 v2 = inline_02049538(param0); u16 v3 = inline_02049538(param0); - UnkStruct_02023790 * v4 = sub_0209742C(v2 - 149, 32); + Strbuf* v4 = sub_0209742C(v2 - 149, 32); sub_0200B48C(*v0, v1, v4, 0, (v3 < 2 ? 1 : 0), GAME_LANGUAGE); sub_020237BC(v4); @@ -421,7 +421,7 @@ BOOL sub_02047C68 (UnkStruct_0203E724 * param0) BOOL sub_02047CA0 (UnkStruct_0203E724 * param0) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0203CDB0 * v1 = param0->unk_34; UnkStruct_0200B358 ** v2 = sub_0203F098(v1, 15); u8 v3 = (*((param0)->unk_08++)); diff --git a/src/unk_02048BD0.c b/src/unk_02048BD0.c index 139279b69e..00306764ae 100644 --- a/src/unk_02048BD0.c +++ b/src/unk_02048BD0.c @@ -97,7 +97,7 @@ BOOL sub_02048BD0 (UnkStruct_0203E724 * param0) return 0; case 6: { - UnkStruct_02023790 * v14 = sub_02023790(64, 32); + Strbuf* v14 = sub_02023790(64, 32); UnkStruct_02025E6C * v15 = sub_02025E38(param0->unk_34->unk_0C); sub_02025EF4(v15, v14); diff --git a/src/unk_02048DD8.c b/src/unk_02048DD8.c index a8949c6374..a9ffd0f063 100644 --- a/src/unk_02048DD8.c +++ b/src/unk_02048DD8.c @@ -278,7 +278,7 @@ static BOOL sub_020491F4 (UnkStruct_0203CDB0 * param0, int param1) static void sub_0204922C (UnkStruct_0200B358 * param0, int param1, const u16 * param2, int param3, int param4, int param5) { - UnkStruct_02023790 * v0 = sub_02023790(64, 4); + Strbuf* v0 = sub_02023790(64, 4); sub_02023D28(v0, param2); sub_0200B48C(param0, param1, v0, param3, param5, param4); @@ -323,7 +323,7 @@ static void sub_020492D4 (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * para static void sub_02049308 (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; UnkStruct_0202440C * v1 = sub_0202440C(param0->unk_0C); UnkStruct_0202E81C * v2 = sub_0202E81C(v1); diff --git a/src/unk_0204AEE8.c b/src/unk_0204AEE8.c index 02c46ab642..a7dbc5d47e 100644 --- a/src/unk_0204AEE8.c +++ b/src/unk_0204AEE8.c @@ -109,7 +109,7 @@ UnkStruct_0200B358 * sub_0204AEE8 (UnkStruct_021C0794 * param0, u16 param1, u16 { u8 v0; u16 v1; - UnkStruct_02023790 * v2, * v3; + Strbuf* v2, * v3; UnkStruct_02026324 * v4; UnkStruct_0200B358 * v5; UnkStruct_0200B144 * v6; @@ -283,7 +283,7 @@ static UnkStruct_0204B184 * sub_0204B184 (UnkStruct_ov104_0223A348 * param0, u16 { UnkStruct_0204B184 * v0; UnkStruct_0200B144 * v1 = sub_0200B144(1, 26, 21, param2); - UnkStruct_02023790 * v2; + Strbuf* v2; MI_CpuClear8(param0, sizeof(UnkStruct_ov104_0223A348)); diff --git a/src/unk_0204B830.c b/src/unk_0204B830.c index c3e2fe16e2..30356f32ec 100644 --- a/src/unk_0204B830.c +++ b/src/unk_0204B830.c @@ -289,7 +289,7 @@ static void sub_0204BAAC (UnkStruct_0203CDB0 * param0, void * param1) } if (v0->val1.unk_00 == 0) { - UnkStruct_02023790 * v15 = sub_02025F04(v1, 32); + Strbuf* v15 = sub_02025F04(v1, 32); u32 v16 = sub_02025F20(v1); u32 v17 = sub_02025F30(v1); @@ -426,7 +426,7 @@ static void sub_0204BF60 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param { UnkUnion_0204C4D0 * v0 = sub_0204B844(param0->unk_00); const UnkStruct_0202610C * v1 = (const UnkStruct_0202610C *)v0; - UnkStruct_02023790 * v2; + Strbuf* v2; *param1 = 379; *param2 = 10; diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c index 09e9af5891..6f9631ceda 100644 --- a/src/unk_02051D8C.c +++ b/src/unk_02051D8C.c @@ -160,7 +160,7 @@ UnkStruct_ov6_02240D5C * sub_02051F4C (int param0, const UnkStruct_0203CDB0 * pa UnkStruct_02025E6C * v0 = sub_02025E38(param1->unk_0C); UnkStruct_020279FC * v1 = sub_02025E44(param1->unk_0C); UnkStruct_0200B144 * v2; - UnkStruct_02023790 * v3; + Strbuf* v3; UnkStruct_ov6_02240D5C * v4; Pokemon * v5; diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c index ff207ee288..5d148ea539 100644 --- a/src/unk_020528D0.c +++ b/src/unk_020528D0.c @@ -189,8 +189,8 @@ static BOOL sub_020529C4 (UnkStruct_020508D4 * param0) static void sub_02052AA4 (UnkStruct_02052AA4 * param0, u16 param1, u8 param2, u8 param3) { - UnkStruct_02023790 * v0 = sub_02023790(1024, 11); - UnkStruct_02023790 * v1 = sub_02023790(1024, 11); + Strbuf* v0 = sub_02023790(1024, 11); + Strbuf* v1 = sub_02023790(1024, 11); sub_0201ADA4(¶m0->unk_0C, 0); sub_0200B1B8(param0->unk_1C, param1, v0); diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c index 3a77414891..40f1d26225 100644 --- a/src/unk_02052C6C.c +++ b/src/unk_02052C6C.c @@ -57,7 +57,7 @@ typedef struct { UnkStruct_0203E234 unk_04; UnkStruct_0203E274 unk_10; UnkStruct_0205AA50 unk_1C; - UnkStruct_02023790 * unk_2C; + Strbuf* unk_2C; void * unk_30; int unk_34; int unk_38; diff --git a/src/unk_020530C8.c b/src/unk_020530C8.c index 91dd88fdfa..f6a1e1995c 100644 --- a/src/unk_020530C8.c +++ b/src/unk_020530C8.c @@ -126,7 +126,7 @@ typedef struct { u16 unk_1C; void * unk_20; UnkStruct_0205AA50 unk_24; - UnkStruct_02023790 * unk_34; + Strbuf* unk_34; u8 unk_38; UnkStruct_02001AF4 * unk_3C; } UnkStruct_02053FAC; diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c index d5c7a0141b..4fde9bf1d8 100644 --- a/src/unk_0205A0D8.c +++ b/src/unk_0205A0D8.c @@ -61,8 +61,8 @@ typedef struct { UnkStruct_02098D38 * unk_00; UnkStruct_02098C44 * unk_04; UnkFuncPtr_0205AB10 * unk_08; - UnkStruct_02023790 * unk_0C; - UnkStruct_02023790 * unk_10; + Strbuf* unk_0C; + Strbuf* unk_10; UnkStruct_0205AA50 unk_14; UnkStruct_0203CDB0 * unk_24; UnkStruct_0200B358 * unk_28; @@ -98,8 +98,8 @@ typedef struct { } UnkStruct_0205AD20; typedef struct { - UnkStruct_02023790 * unk_00; - UnkStruct_02023790 * unk_04; + Strbuf* unk_00; + Strbuf* unk_04; UnkStruct_0205AA50 unk_08; UnkStruct_0200B358 * unk_18; UnkStruct_0200B144 * unk_1C; @@ -119,7 +119,7 @@ static BOOL sub_0205AD34(UnkStruct_0205A0D8 * param0); static BOOL sub_0205AD70(UnkStruct_0205A0D8 * param0); static void sub_0205ADAC(UnkStruct_0205A0D8 * param0); static void sub_0205AD80(UnkStruct_0205A0D8 * param0); -static int sub_0205AA50(UnkStruct_0205A0D8 * param0, const UnkStruct_02023790 * param1); +static int sub_0205AA50(UnkStruct_0205A0D8 * param0, const Strbuf *param1); static void sub_0205AAA0(UnkStruct_0205A0D8 * param0, BOOL param1); static void sub_0205AF18(UnkStruct_0205A0D8 * param0, int param1); static BOOL sub_0205AD20(UnkStruct_0205A0D8 * param0); @@ -621,7 +621,7 @@ static BOOL sub_0205A324 (UnkStruct_020508D4 * param0) return 0; } -static int sub_0205AA50 (UnkStruct_0205A0D8 * param0, const UnkStruct_02023790 * param1) +static int sub_0205AA50 (UnkStruct_0205A0D8 * param0, const Strbuf *param1) { UnkStruct_0205AA50 * v0 = &(param0->unk_14); @@ -632,7 +632,7 @@ static int sub_0205AA50 (UnkStruct_0205A0D8 * param0, const UnkStruct_02023790 * sub_0205D988(v0); } - return sub_0205D994(v0, (UnkStruct_02023790 *)param1, sub_02025E44(param0->unk_24->unk_0C), 1); + return sub_0205D994(v0, (Strbuf *)param1, sub_02025E44(param0->unk_24->unk_0C), 1); } static void sub_0205AAA0 (UnkStruct_0205A0D8 * param0, BOOL param1) diff --git a/src/unk_0205B33C.c b/src/unk_0205B33C.c index ee47d9a47c..f8648b92da 100644 --- a/src/unk_0205B33C.c +++ b/src/unk_0205B33C.c @@ -1273,7 +1273,7 @@ UnkStruct_02014A84 * sub_0205C028 (UnkStruct_0205B43C * param0) void sub_0205C040 (UnkStruct_0200B358 * param0, int param1, int param2, UnkStruct_02025E6C * param3, UnkStruct_02014EC4 * param4) { UnkStruct_02025E6C * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; UnkStruct_0200B144 * v2 = sub_0200B144(1, 26, 635, 4); int v3, v4; diff --git a/src/unk_0205D8CC.c b/src/unk_0205D8CC.c index 02ba9e1c41..81159c61ad 100644 --- a/src/unk_0205D8CC.c +++ b/src/unk_0205D8CC.c @@ -46,7 +46,7 @@ void sub_0205D988 (UnkStruct_0205AA50 * param0) sub_0201ADA4(param0, 15); } -u8 sub_0205D994 (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, const UnkStruct_020279FC * param2, u8 param3) +u8 sub_0205D994 (UnkStruct_0205AA50 * param0, Strbuf *param1, const UnkStruct_020279FC * param2, u8 param3) { u8 v0; @@ -58,7 +58,7 @@ u8 sub_0205D994 (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, const return v0; } -u8 sub_0205D9CC (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, int param2, int param3, u8 param4, int param5) +u8 sub_0205D9CC (UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, int param3, u8 param4, int param5) { sub_02002AC8(param4); sub_02002AE4(param5); diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c index 82160afe3c..d88ffd236f 100644 --- a/src/unk_020683F4.c +++ b/src/unk_020683F4.c @@ -97,7 +97,7 @@ typedef struct { typedef struct { UnkStruct_0205AA50 unk_00; - UnkStruct_02023790 * unk_10; + Strbuf* unk_10; u16 unk_14; u16 unk_16; } UnkStruct_02068EFC; diff --git a/src/unk_0206CCB0.c b/src/unk_0206CCB0.c index 82a243ca69..cb963b3916 100644 --- a/src/unk_0206CCB0.c +++ b/src/unk_0206CCB0.c @@ -73,7 +73,7 @@ static void sub_0206CD70(UnkStruct_0203CDB0 * param0, int param1, int param2, const void * param3); static void sub_0206CD7C(UnkStruct_021C0794 * param0, int param1, int param2, const void * param3); static u8 sub_0206DE4C(Pokemon * param0); -static UnkStruct_02023790 * sub_0206F0D8(u16 param0, u32 param1); +static Strbuf* sub_0206F0D8(u16 param0, u32 param1); typedef struct { u8 unk_00[40]; @@ -459,7 +459,7 @@ static void sub_0206CD7C (UnkStruct_021C0794 * param0, int param1, int param2, c static void sub_0206CD94 (UnkStruct_0200B358 * param0, int param1, const u16 * param2, int param3, int param4, int param5) { - UnkStruct_02023790 * v0 = sub_02023790(64, 4); + Strbuf* v0 = sub_02023790(64, 4); sub_02023D28(v0, param2); sub_0200B48C(param0, param1, v0, param3, param5, param4); @@ -473,7 +473,7 @@ static void sub_0206CDD0 (UnkStruct_0200B358 * param0, int param1, const UnkStru static void sub_0206CE08 (int param0, u16 * param1, Pokemon * param2) { - UnkStruct_02023790 * v0 = sub_02023790(64, param0); + Strbuf* v0 = sub_02023790(64, param0); GetMonData(param2, MON_DATA_119, v0); sub_02023DF0(v0, param1, 10 + 1); @@ -509,7 +509,7 @@ static void sub_0206CED0 (int param0, Pokemon * param1, u8 * param2, u16 * param *param2 = GetMonData(param1, MON_DATA_77, NULL); if (*param2) { - UnkStruct_02023790 * v0 = sub_02023790(64, param0); + Strbuf* v0 = sub_02023790(64, param0); GetMonData(param1, MON_DATA_119, v0); sub_02023DF0(v0, param3, 10 + 1); @@ -2006,7 +2006,7 @@ static int sub_0206E7AC (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param { int v0; UnkStruct_0206E768 * v1 = ov6_02246498(param2); - UnkStruct_02023790 * v2 = sub_02023790(64, 4); + Strbuf* v2 = sub_02023790(64, 4); sub_0206CDD0(param1, 0, param2); sub_02023D28(v2, v1->unk_00.unk_06); @@ -2741,7 +2741,7 @@ static int sub_0206EDAC (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param UnkStruct_0202D7B0 * v1; u16 v2, v3; u32 v4, v5; - UnkStruct_02023790 * v6 = sub_02023790(22, 4); + Strbuf* v6 = sub_02023790(22, 4); UnkStruct_02025E6C * v7 = sub_02025E38(sub_0203D174(param0)); v1 = sub_0202D834(param0->unk_0C); @@ -2825,7 +2825,7 @@ static int sub_0206EEBC (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param { u16 v6; - UnkStruct_02023790 * v7 = sub_02023790(7 + 1, 4); + Strbuf* v7 = sub_02023790(7 + 1, 4); int v8 = sub_0202A1C0(v0); sub_0202A1A0(v0, v7); @@ -2871,7 +2871,7 @@ static int sub_0206EF7C (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param static int sub_0206F01C (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param1, UnkStruct_ov6_022465F4 * param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; u16 v1, v2, v3; const UnkStruct_02026324 * v4 = sub_02027560(param0->unk_0C); @@ -2908,10 +2908,10 @@ static int sub_0206F01C (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param } } -static UnkStruct_02023790 * sub_0206F0D8 (u16 param0, u32 param1) +static Strbuf* sub_0206F0D8 (u16 param0, u32 param1) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = sub_0200B144(1, 26, 412, param1); v1 = sub_0200B1EC(v0, param0); @@ -2963,7 +2963,7 @@ static int sub_0206F13C (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param static int sub_0206F160 (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param1, UnkStruct_ov6_022465F4 * param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; u16 v1, v2; Pokemon * v3; Party * v4; diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c index 2726192779..26a8c0e0c8 100644 --- a/src/unk_0206F314.c +++ b/src/unk_0206F314.c @@ -52,15 +52,15 @@ typedef struct { UnkStruct_0200B144 * unk_00; UnkStruct_0200B358 * unk_04; - UnkStruct_02023790 * unk_08; - UnkStruct_02023790 * unk_0C; - UnkStruct_02023790 * unk_10; - UnkStruct_02023790 * unk_14; - UnkStruct_02023790 * unk_18; - UnkStruct_02023790 * unk_1C[7]; - UnkStruct_02023790 * unk_38[6]; - UnkStruct_02023790 * unk_50[6]; - UnkStruct_02023790 * unk_68[3]; + Strbuf* unk_08; + Strbuf* unk_0C; + Strbuf* unk_10; + Strbuf* unk_14; + Strbuf* unk_18; + Strbuf* unk_1C[7]; + Strbuf* unk_38[6]; + Strbuf* unk_50[6]; + Strbuf* unk_68[3]; } UnkStruct_0206F7F8_sub1; typedef struct { diff --git a/src/unk_02071CFC.c b/src/unk_02071CFC.c index 62a5f4a832..f1089107ca 100644 --- a/src/unk_02071CFC.c +++ b/src/unk_02071CFC.c @@ -11,7 +11,7 @@ #include "map_header.h" #include "unk_02071CFC.h" -u32 sub_02071CFC (UnkStruct_0200B144 * param0, const int param1, UnkStruct_02023790 * param2) +u32 sub_02071CFC (UnkStruct_0200B144 * param0, const int param1, Strbuf *param2) { u32 v0; @@ -21,7 +21,7 @@ u32 sub_02071CFC (UnkStruct_0200B144 * param0, const int param1, UnkStruct_02023 return v0; } -void sub_02071D10 (const int param0, const u32 param1, UnkStruct_02023790 * param2) +void sub_02071D10 (const int param0, const u32 param1, Strbuf *param2) { int v0; UnkStruct_0200B144 * v1; diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c index 0f27aa74ae..f80abb87ab 100644 --- a/src/unk_020722AC.c +++ b/src/unk_020722AC.c @@ -70,7 +70,7 @@ typedef struct { u8 unk_04; u8 unk_05; u16 unk_06; - UnkStruct_02023790 * unk_08; + Strbuf* unk_08; } UnkStruct_02072EB8; typedef struct { @@ -80,10 +80,10 @@ typedef struct { typedef struct { UnkStruct_0200B358 * unk_00; - UnkStruct_02023790 * unk_04; - UnkStruct_02023790 * unk_08; - UnkStruct_02023790 * unk_0C; - UnkStruct_02023790 * unk_10[6]; + Strbuf* unk_04; + Strbuf* unk_08; + Strbuf* unk_0C; + Strbuf* unk_10[6]; } UnkStruct_02072334_sub1; typedef struct { @@ -1031,7 +1031,7 @@ static void sub_02073130 (UnkStruct_02072334 * param0) { UnkStruct_0200B144 * v0; int v1; - UnkStruct_02023790 * v2; + Strbuf* v2; param0->unk_10C = sub_0200B144(1, 26, 408, param0->unk_00); param0->unk_110.unk_00 = sub_0200B368(1, 128, param0->unk_00); @@ -1084,7 +1084,7 @@ static void sub_02073294 (UnkStruct_02072334 * param0) static void sub_020732C4 (UnkStruct_02072334 * param0, int param1, u8 param2, u8 param3, int param4) { - UnkStruct_02023790 * v0; + Strbuf* v0; if (param4) { sub_0200E060(¶m0->unk_184, 1, (1024 - (18 + 12)), 10); diff --git a/src/unk_02073C2C.c b/src/unk_02073C2C.c index b7cdf94155..1f9a141c92 100644 --- a/src/unk_02073C2C.c +++ b/src/unk_02073C2C.c @@ -1003,12 +1003,12 @@ static u32 sub_020745D0 (BoxPokemon * param0, int param1, void * param2) v0 = v3->unk_10_31; case MON_DATA_119: if (param0->unk_04_2) { - UnkStruct_02023790 * v7 = sub_0200B32C(495, 0); + Strbuf* v7 = sub_0200B32C(495, 0); - sub_02023810((UnkStruct_02023790 *)param2, v7); + sub_02023810((Strbuf *)param2, v7); sub_020237BC(v7); } else { - sub_02023D28((UnkStruct_02023790 *)param2, v4->unk_00); + sub_02023D28((Strbuf *)param2, v4->unk_00); } break; case MON_DATA_121: @@ -1053,7 +1053,7 @@ static u32 sub_020745D0 (BoxPokemon * param0, int param1, void * param2) break; } case MON_DATA_145: - sub_02023D28((UnkStruct_02023790 *)param2, v5->unk_00); + sub_02023D28((Strbuf *)param2, v5->unk_00); break; case MON_DATA_146: v0 = v5->unk_10; @@ -1485,12 +1485,12 @@ static void sub_02074CD8 (BoxPokemon * param0, int param1, const void * param2) u16 v12[10 + 1]; sub_0200B274(v6->species, 0, &v11[0]); - sub_02023DF0((UnkStruct_02023790 *)param2, &v12[0], NELEMS(v12)); + sub_02023DF0((Strbuf *)param2, &v12[0], NELEMS(v12)); v7->unk_10_31 = sub_0200220C(v11, v12); } case MON_DATA_119: - sub_02023DF0((UnkStruct_02023790 *)param2, v8->unk_00, NELEMS(v8->unk_00)); + sub_02023DF0((Strbuf *)param2, v8->unk_00, NELEMS(v8->unk_00)); break; case MON_DATA_121: v8->unk_16 = v5[0]; @@ -1533,7 +1533,7 @@ static void sub_02074CD8 (BoxPokemon * param0, int param1, const void * param2) } break; case MON_DATA_145: - sub_02023DF0((UnkStruct_02023790 *)param2, v9->unk_00, NELEMS(v9->unk_00)); + sub_02023DF0((Strbuf *)param2, v9->unk_00, NELEMS(v9->unk_00)); break; case MON_DATA_146: v9->unk_10 = v5[0]; @@ -1605,7 +1605,7 @@ static void sub_02074CD8 (BoxPokemon * param0, int param1, const void * param2) break; case MON_DATA_179: { - UnkStruct_02023790 * v13; + Strbuf* v13; v13 = sub_0200B32C(v6->species, 0); @@ -5223,8 +5223,8 @@ BOOL sub_0207884C (BoxPokemon * param0, UnkStruct_02025E6C * param1, int param2) u32 v1 = sub_02074570(param0, MON_DATA_OT_ID, NULL); u32 v2 = sub_02025F30(param1); u32 v3 = sub_02074570(param0, MON_DATA_OT_GENDER, NULL); - UnkStruct_02023790 * v4 = sub_02025F04(param1, param2); - UnkStruct_02023790 * v5 = sub_02023790(8, param2); + Strbuf* v4 = sub_02025F04(param1, param2); + Strbuf* v5 = sub_02023790(8, param2); BOOL v6 = 0; sub_02074570(param0, MON_DATA_145, v5); diff --git a/src/unk_02079170.c b/src/unk_02079170.c index 3659e526a1..34cf0b254e 100644 --- a/src/unk_02079170.c +++ b/src/unk_02079170.c @@ -29,7 +29,7 @@ void sub_02079170(UnkStruct_ov6_02240D5C * param0, const UnkStruct_021C0794 * param1, int param2); u32 sub_02079220(int param0, int param1); BOOL sub_02079280(int param0, int param1, int param2); -void sub_020792F8(int param0, int param1, UnkStruct_02023790 * param2, int param3); +void sub_020792F8(int param0, int param1, Strbuf *param2, int param3); void sub_0207938C(int param0, UnkStruct_0207A9CC * param1); void sub_0207939C(int param0, void * param1); u8 sub_020793AC(int param0); @@ -148,7 +148,7 @@ void sub_02079170 (UnkStruct_ov6_02240D5C * param0, const UnkStruct_021C0794 * p UnkStruct_0207A9CC v0; int v1; UnkStruct_0200B144 * v2 = sub_0200B144(1, 26, 618, param2); - UnkStruct_02023790 * v3; + Strbuf* v3; const u16 * v4 = sub_02027870(sub_02027848(param1)); for (v1 = 0; v1 < 4; v1++) { @@ -244,7 +244,7 @@ BOOL sub_02079280 (int param0, int param1, int param2) return v4; } -void sub_020792F8 (int param0, int param1, UnkStruct_02023790 * param2, int param3) +void sub_020792F8 (int param0, int param1, Strbuf *param2, int param3) { NARC * v0; int v1; diff --git a/src/unk_020797C8.c b/src/unk_020797C8.c index fb2ac1d7ed..6e13adb829 100644 --- a/src/unk_020797C8.c +++ b/src/unk_020797C8.c @@ -264,7 +264,7 @@ void sub_02079AC4 (UnkStruct_020797DC * param0, u32 param1, u32 param2) } } -void sub_02079AF4 (const UnkStruct_020797DC * param0, u32 param1, UnkStruct_02023790 * param2) +void sub_02079AF4 (const UnkStruct_020797DC * param0, u32 param1, Strbuf *param2) { if (param1 == 0xffffffff) { param1 = param0->unk_00; @@ -277,7 +277,7 @@ void sub_02079AF4 (const UnkStruct_020797DC * param0, u32 param1, UnkStruct_0202 } } -void sub_02079B24 (UnkStruct_020797DC * param0, u32 param1, const UnkStruct_02023790 * param2) +void sub_02079B24 (UnkStruct_020797DC * param0, u32 param1, const Strbuf *param2) { if (param1 == 0xffffffff) { param1 = param0->unk_00; diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index dd428bd1f2..c5f7b30a69 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -982,7 +982,7 @@ static void sub_0207C520 (void * param0) static u8 sub_0207C584 (UnkStruct_0207AE68 * param0, int param1) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_0200B1EC(param0->unk_08, param1); diff --git a/src/unk_0207CB08.c b/src/unk_0207CB08.c index 4537a0ef4b..b63d0bf87b 100644 --- a/src/unk_0207CB08.c +++ b/src/unk_0207CB08.c @@ -136,11 +136,11 @@ static u32 sub_0207CC00 (UnkStruct_021C0794 * param0) return (u32)sub_0202D230(sub_0202D750(param0), 0, 0); } -BOOL sub_0207CC10 (UnkStruct_021C0794 * param0, UnkStruct_02023790 * param1, u16 param2, u32 param3) +BOOL sub_0207CC10 (UnkStruct_021C0794 * param0, Strbuf *param1, u16 param2, u32 param3) { UnkStruct_0200B144 * v0; UnkStruct_0200B358 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; v0 = sub_0200B144(0, 26, 7, param3); v1 = sub_0200B358(param3); @@ -174,11 +174,11 @@ BOOL sub_0207CC10 (UnkStruct_021C0794 * param0, UnkStruct_02023790 * param1, u16 return 1; } -void sub_0207CD34 (void * param0, UnkStruct_02023790 * param1, u16 param2, u32 param3, u32 param4) +void sub_0207CD34 (void * param0, Strbuf *param1, u16 param2, u32 param3, u32 param4) { UnkStruct_0200B144 * v0; UnkStruct_0200B358 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; switch (param3) { case 1: diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index b8615b74ee..10d24171ff 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -2118,7 +2118,7 @@ static int sub_02080670 (UnkStruct_0207F248 * param0) case 1: { - UnkStruct_02023790 * v1; + Strbuf* v1; int v2; v1 = sub_0200B1EC(param0->unk_69C, 184); @@ -2458,7 +2458,7 @@ static int sub_02080BF4 (UnkStruct_0207F248 * param0) case 3: if (sub_02080F3C(param0, param0->unk_B11, 1) == 1) { Pokemon * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; void * v2; UnkStruct_0203CDB0 * v3; diff --git a/src/unk_020819DC.c b/src/unk_020819DC.c index fa99e50507..828a1f8161 100644 --- a/src/unk_020819DC.c +++ b/src/unk_020819DC.c @@ -189,7 +189,7 @@ void sub_02081BC0 (UnkStruct_0207F248 * param0) void sub_02081CAC (UnkStruct_0207F248 * param0, u16 param1, u8 param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_0200B1EC(param0->unk_69C, 156 + param2); @@ -239,7 +239,7 @@ void sub_02081CF4 (UnkStruct_0207F248 * param0, const u8 * param1, u8 param2) void sub_02081E08 (UnkStruct_0207F248 * param0) { Pokemon * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; if (param0->unk_5A4->unk_20 == 15) { sub_0200B1B8(param0->unk_69C, 42, param0->unk_6A4); @@ -271,7 +271,7 @@ static void sub_02081EAC (UnkStruct_0207F248 * param0, u8 param1) void sub_02081ED8 (UnkStruct_0207F248 * param0, Pokemon * param1, u32 param2) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_0200B1EC(param0->unk_69C, Unk_020F1EA0[param2][0]); @@ -312,7 +312,7 @@ void sub_02081F2C (UnkStruct_0207F248 * param0, u8 param1) void sub_02081FFC (UnkStruct_0207F248 * param0, u8 param1) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = ¶m0->unk_04[1 + param1 * 5]; @@ -328,7 +328,7 @@ void sub_02081FFC (UnkStruct_0207F248 * param0, u8 param1) void sub_02082058 (UnkStruct_0207F248 * param0, u8 param1) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; v0 = ¶m0->unk_04[2 + param1 * 5]; @@ -340,7 +340,7 @@ void sub_02082058 (UnkStruct_0207F248 * param0, u8 param1) void sub_02082098 (UnkStruct_0207F248 * param0, u8 param1) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; v0 = ¶m0->unk_04[2 + param1 * 5]; @@ -352,7 +352,7 @@ void sub_02082098 (UnkStruct_0207F248 * param0, u8 param1) static void sub_020820C4 (UnkStruct_0207F248 * param0, u8 param1) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = ¶m0->unk_04[2 + param1 * 5]; @@ -543,7 +543,7 @@ void sub_02082508 (UnkStruct_0207F248 * param0, u8 param1) sub_02082964(param0, param1, 7); } -static u32 sub_020825A4 (int param0, const UnkStruct_02023790 * param1, u32 param2) +static u32 sub_020825A4 (int param0, const Strbuf *param1, u32 param2) { u32 v0 = sub_02002D7C(param0, param1, 0); @@ -652,7 +652,7 @@ void sub_020827EC (UnkStruct_0207F248 * param0) static void sub_02082810 (UnkStruct_0207F248 * param0, u8 param1, u8 param2) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = ¶m0->unk_04[4 + param1 * 5]; @@ -675,7 +675,7 @@ static void sub_02082810 (UnkStruct_0207F248 * param0, u8 param1, u8 param2) static void sub_02082880 (UnkStruct_0207F248 * param0, u8 param1, u8 param2) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = ¶m0->unk_04[4 + param1 * 5]; @@ -701,7 +701,7 @@ static void sub_02082880 (UnkStruct_0207F248 * param0, u8 param1, u8 param2) static void sub_02082900 (UnkStruct_0207F248 * param0, u8 param1, u8 param2) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = ¶m0->unk_04[4 + param1 * 5]; @@ -721,7 +721,7 @@ static void sub_02082900 (UnkStruct_0207F248 * param0, u8 param1, u8 param2) static void sub_02082964 (UnkStruct_0207F248 * param0, u8 param1, u8 param2) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = ¶m0->unk_04[4 + param1 * 5]; @@ -743,7 +743,7 @@ static void sub_02082964 (UnkStruct_0207F248 * param0, u8 param1, u8 param2) void sub_020829DC (UnkStruct_0207F248 * param0) { Pokemon * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; u16 v3[6]; @@ -784,7 +784,7 @@ void sub_020829DC (UnkStruct_0207F248 * param0) void sub_02082B58 (UnkStruct_0207F248 * param0) { - UnkStruct_02023790 * v0; + Strbuf* v0; u32 v1; u32 v2; diff --git a/src/unk_02084B70.c b/src/unk_02084B70.c index 9ce55cfc12..039146e72e 100644 --- a/src/unk_02084B70.c +++ b/src/unk_02084B70.c @@ -223,7 +223,7 @@ static u8 sub_02084B70 (u16 param0) static void sub_02084E58 (UnkStruct_0207F248 * param0, u16 param1, u32 param2) { Pokemon * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); sub_0200B5CC(param0->unk_6A0, 0, sub_02076B10(v0)); @@ -477,7 +477,7 @@ static int sub_020855C4 (void * param0) { UnkStruct_0207F248 * v0; Pokemon * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; u32 v3; u32 v4; @@ -571,7 +571,7 @@ static u8 sub_020857C0 (UnkStruct_0207F248 * param0, u8 param1) int sub_02085804 (UnkStruct_0207F248 * param0) { Pokemon * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; u8 v3; @@ -661,7 +661,7 @@ static int sub_02085A70 (void * param0) { UnkStruct_0207F248 * v0; Pokemon * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; u32 v3; u32 v4; @@ -714,7 +714,7 @@ static int sub_02085C50 (void * param0) { UnkStruct_0207F248 * v0; Pokemon * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; v0 = param0; @@ -828,7 +828,7 @@ static int sub_02085C50 (void * param0) int sub_02085EF4 (UnkStruct_0207F248 * param0) { Pokemon * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; param0->unk_B00 = sub_02085C50; param0->unk_B13 = 3; @@ -856,7 +856,7 @@ int sub_02085EF4 (UnkStruct_0207F248 * param0) static int sub_02085FB4 (void * param0) { UnkStruct_0207F248 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = param0; v1 = sub_0200B1EC(v0->unk_69C, 59); @@ -874,7 +874,7 @@ static int sub_02085FB4 (void * param0) static int sub_02086008 (void * param0) { UnkStruct_0207F248 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = param0; v1 = sub_0200B1EC(v0->unk_69C, 55); @@ -893,7 +893,7 @@ static int sub_02086008 (void * param0) static int sub_02086060 (void * param0) { UnkStruct_0207F248 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = param0; v1 = sub_0200B1EC(v0->unk_69C, 58); @@ -911,7 +911,7 @@ static int sub_02086060 (void * param0) static int sub_020860AC (void * param0) { UnkStruct_0207F248 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = param0; v1 = sub_0200B1EC(v0->unk_69C, 52); @@ -958,7 +958,7 @@ u8 sub_02086104 (UnkStruct_0207F248 * param0, Pokemon * param1) int sub_0208615C (UnkStruct_0207F248 * param0) { Pokemon * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); @@ -1015,7 +1015,7 @@ int sub_0208615C (UnkStruct_0207F248 * param0) int sub_020862F8 (UnkStruct_0207F248 * param0) { Pokemon * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); sub_0200B5CC(param0->unk_6A0, 0, sub_02076B10(v0)); @@ -1038,7 +1038,7 @@ int sub_020862F8 (UnkStruct_0207F248 * param0) int sub_020863A0 (UnkStruct_0207F248 * param0) { Pokemon * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; if (Unk_021BF67C.unk_48 & (PAD_BUTTON_A | PAD_BUTTON_B)) { v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); @@ -1062,7 +1062,7 @@ int sub_020863A0 (UnkStruct_0207F248 * param0) static int sub_02086438 (void * param0) { UnkStruct_0207F248 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = param0; v1 = sub_0200B1EC(v0->unk_69C, 59); @@ -1080,7 +1080,7 @@ static int sub_02086438 (void * param0) static int sub_0208648C (void * param0) { UnkStruct_0207F248 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = param0; v1 = sub_0200B1EC(v0->unk_69C, 55); @@ -1099,7 +1099,7 @@ static int sub_0208648C (void * param0) static int sub_020864E4 (void * param0) { UnkStruct_0207F248 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = param0; v1 = sub_0200B1EC(v0->unk_69C, 58); @@ -1117,7 +1117,7 @@ static int sub_020864E4 (void * param0) static int sub_02086538 (void * param0) { UnkStruct_0207F248 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = param0; v1 = sub_0200B1EC(v0->unk_69C, 52); @@ -1158,7 +1158,7 @@ static void sub_02086590 (UnkStruct_0207F248 * param0, Pokemon * param1, u32 par static u8 sub_02086614 (UnkStruct_0207F248 * param0, u8 param1) { Pokemon * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u16 v2; v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c index dc015f490e..fac6d4aa99 100644 --- a/src/unk_0208694C.c +++ b/src/unk_0208694C.c @@ -100,10 +100,10 @@ struct UnkStruct_02087A10_t { UnkStruct_0200B144 * unk_16C; UnkStruct_0200B144 * unk_170; UnkStruct_0200B144 * unk_174; - UnkStruct_02023790 * unk_178; - UnkStruct_02023790 * unk_17C; - UnkStruct_02023790 * unk_180; - UnkStruct_02023790 * unk_184; + Strbuf* unk_178; + Strbuf* unk_17C; + Strbuf* unk_180; + Strbuf* unk_184; UnkStruct_020218BC * unk_188; UnkStruct_0200C738 unk_18C; UnkStruct_02009714 * unk_318[4]; @@ -181,9 +181,9 @@ static void sub_02087FC0(UnkStruct_02087A10 * param0, UnkStruct_020067E8 * param static void sub_02088350(UnkStruct_02087A10 * param0); static void sub_02088514(u16 * param0); static void sub_02088554(UnkStruct_0205AA50 * param0, const u16 * param1, int param2, int param3, int param4, int param5, u32 param6, u8 * param7); -static void sub_02088678(UnkStruct_0205AA50 * param0, const u16 * param1, u8 * param2, UnkStruct_02023790 * param3); +static void sub_02088678(UnkStruct_0205AA50 * param0, const u16 * param1, u8 * param2, Strbuf *param3); static void sub_02088844(u16 param0[][13], const int param1); -static void sub_02088754(UnkStruct_0205AA50 * param0, u16 * param1, int param2, u16 * param3, u8 * param4, UnkStruct_02023790 * param5); +static void sub_02088754(UnkStruct_0205AA50 * param0, u16 * param1, int param2, u16 * param3, u8 * param4, Strbuf *param5); static int sub_02088898(UnkStruct_02087A10 * param0, u16 param1, int param2); static int sub_02088D08(int param0, int param1, int param2, int param3, u16 * param4, int param5); static int sub_02088C9C(int param0, int param1, u16 * param2, int param3); @@ -199,11 +199,11 @@ static void sub_0208732C(int param0); static void sub_02087544(UnkStruct_02087A10 * param0, UnkStruct_020067E8 * param1); static void sub_02087BE4(UnkStruct_02087A10 * param0, UnkStruct_ov115_02261520 * param1); static void sub_02086E6C(UnkStruct_02087A10 * param0, UnkStruct_0208737C * param1); -static void sub_02087F48(UnkStruct_0205AA50 * param0, int param1, UnkStruct_02023790 * param2); +static void sub_02087F48(UnkStruct_0205AA50 * param0, int param1, Strbuf *param2); static void sub_02088FD0(UnkStruct_02087A10 * param0); static int sub_02086D38(UnkStruct_02087A10 * param0, int param1); static int sub_02086F14(u16 * param0); -static void * sub_02088654(UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, u8 param2, u32 param3); +static void * sub_02088654(UnkStruct_0205AA50 * param0, Strbuf *param1, u8 param2, u32 param3); static BOOL sub_0208903C(UnkStruct_02087A10 * param0); static const int Unk_020F2984[][4] = { @@ -1087,7 +1087,7 @@ static int sub_02086D38 (UnkStruct_02087A10 * param0, int param1) static void sub_02086E6C (UnkStruct_02087A10 * param0, UnkStruct_0208737C * param1) { if (param0->unk_00 == 0) { - UnkStruct_02023790 * v0; + Strbuf* v0; if (param0->unk_04 == 0) { v0 = sub_0200B1EC(param0->unk_170, 0 + sub_0201D2E8() % 18); @@ -1099,7 +1099,7 @@ static void sub_02086E6C (UnkStruct_02087A10 * param0, UnkStruct_0208737C * para sub_020237BC(v0); sub_02023DF0(param1->unk_18, param1->unk_1C, 10); } else if (param0->unk_00 == 3) { - UnkStruct_02023790 * v1; + Strbuf* v1; v1 = sub_0200B1EC(param0->unk_170, 88 + (sub_0201D2E8() % 2)); @@ -1464,7 +1464,7 @@ static void sub_0208737C (UnkStruct_02087A10 * param0, UnkStruct_020067E8 * para static void sub_02087544 (UnkStruct_02087A10 * param0, UnkStruct_020067E8 * param1) { - UnkStruct_02023790 * v0 = NULL; + Strbuf* v0 = NULL; UnkStruct_0208737C * v1 = (UnkStruct_0208737C *)sub_02006840(param1); if (v1->unk_44 != 0) { @@ -1823,14 +1823,14 @@ static void sub_02087D64 (UnkStruct_02018340 * param0, UnkStruct_0205AA50 * para } } -static void sub_02087F48 (UnkStruct_0205AA50 * param0, int param1, UnkStruct_02023790 * param2) +static void sub_02087F48 (UnkStruct_0205AA50 * param0, int param1, Strbuf *param2) { sub_0200E060(param0, 0, ((32 * 8)), 10); sub_0201D738(param0, 1, param2, 0, 0, 0, NULL); sub_0201A954(param0); } -static void sub_02087F78 (UnkStruct_0205AA50 * param0, int param1, UnkStruct_02023790 * param2) +static void sub_02087F78 (UnkStruct_0205AA50 * param0, int param1, Strbuf *param2) { int v0 = 16; int v1 = sub_02002D7C(0, param2, 0); @@ -2088,7 +2088,7 @@ static void sub_02088554 (UnkStruct_0205AA50 * param0, const u16 * param1, int p { int v0 = 0, v1, v2; u16 v3[2]; - UnkStruct_02023790 * v4; + Strbuf* v4; v4 = sub_02023790(2, 18); @@ -2125,17 +2125,17 @@ static const u8 Unk_020F24D8[] = { 0x58 }; -static void * sub_02088654 (UnkStruct_0205AA50 * param0, UnkStruct_02023790 * param1, u8 param2, const u32 param3) +static void * sub_02088654 (UnkStruct_0205AA50 * param0, Strbuf *param1, u8 param2, const u32 param3) { sub_0201D78C(param0, param2, param1, 0, 0, 0xff, param3, NULL); return param0->unk_0C; } -static void sub_02088678 (UnkStruct_0205AA50 * param0, const u16 * param1, u8 * param2, UnkStruct_02023790 * param3) +static void sub_02088678 (UnkStruct_0205AA50 * param0, const u16 * param1, u8 * param2, Strbuf *param3) { u16 v0[20 + 1], v1, v2; void * v3; - UnkStruct_02023790 * v4; + Strbuf* v4; sub_0201ADA4(¶m0[3], 0); v3 = sub_02088654(¶m0[3], param3, 2, (u32)(((0xd & 0xff) << 16) | ((0xe & 0xff) << 8) | ((0xf & 0xff) << 0))); @@ -2165,7 +2165,7 @@ static void sub_02088678 (UnkStruct_0205AA50 * param0, const u16 * param1, u8 * sub_020237BC(v4); } -static void sub_02088754 (UnkStruct_0205AA50 * param0, u16 * param1, int param2, u16 * param3, u8 * param4, UnkStruct_02023790 * param5) +static void sub_02088754 (UnkStruct_0205AA50 * param0, u16 * param1, int param2, u16 * param3, u8 * param4, Strbuf *param5) { int v0, v1; const u16 * v2 = NULL; diff --git a/src/unk_02089604.c b/src/unk_02089604.c index fd1d12f923..fcd9154408 100644 --- a/src/unk_02089604.c +++ b/src/unk_02089604.c @@ -895,7 +895,7 @@ void sub_02089F80 (UnkStruct_02089688 * param0) { int v0; u32 v1 = 0; - UnkStruct_02023790 * v2 = sub_02023790(100, 101); + Strbuf* v2 = sub_02023790(100, 101); param0->unk_240[1].unk_00 = 1; param0->unk_240[1].unk_14.unk_04 = 0; diff --git a/src/unk_0208A3F4.c b/src/unk_0208A3F4.c index c9fe816c13..18b4e2193d 100644 --- a/src/unk_0208A3F4.c +++ b/src/unk_0208A3F4.c @@ -703,7 +703,7 @@ void sub_0208B090 (UnkStruct_02089688 * param0, int param1, int param2, int para { s16 v0, v1; UnkStruct_020127E8 v2; - UnkStruct_02023790 * v3; + Strbuf* v3; int v4; int v5; UnkStruct_0200B144 * v6; @@ -762,7 +762,7 @@ void sub_0208B1C4 (UnkStruct_02018340 * param0, UnkStruct_0205AA50 * param1, int void sub_0208B230 (UnkStruct_0205AA50 * param0, int param1) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; sub_0201ADA4(param0, 15); diff --git a/src/unk_0208FCF8.c b/src/unk_0208FCF8.c index 6313302f96..16ddd6043e 100644 --- a/src/unk_0208FCF8.c +++ b/src/unk_0208FCF8.c @@ -263,7 +263,7 @@ void sub_0208FEA4 (UnkStruct_0208D7BC * param0) void sub_0208FF3C (UnkStruct_0208D7BC * param0) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = ¶m0->unk_04[33]; @@ -285,7 +285,7 @@ void sub_0208FF3C (UnkStruct_0208D7BC * param0) void sub_0208FFE0 (UnkStruct_0208D7BC * param0) { - UnkStruct_02023790 * v0; + Strbuf* v0; sub_0201ADA4(¶m0->unk_04[32], 0); @@ -356,7 +356,7 @@ static void sub_02090158 (UnkStruct_0208D7BC * param0, u32 param1, u32 param2, u static void sub_02090184 (UnkStruct_0208D7BC * param0, u32 param1, u32 param2, u8 param3, u8 param4) { - UnkStruct_02023790 * v0; + Strbuf* v0; v0 = sub_0200B1EC(param0->unk_688, param1); sub_0200B60C(param0->unk_690, 0, param2, param3, param4, 1); @@ -564,7 +564,7 @@ static void sub_02090800 (UnkStruct_0205AA50 * param0, Pokemon * param1, BOOL pa static void sub_020908CC (UnkStruct_0208D7BC * param0) { - UnkStruct_02023790 * v0; + Strbuf* v0; sub_0201A9A4(¶m0->unk_04[1]); sub_0201ADA4(¶m0->unk_244[0], 0); @@ -627,7 +627,7 @@ static void sub_0209093C (UnkStruct_0208D7BC * param0) { UnkStruct_0200B144 * v1; - UnkStruct_02023790 * v2; + Strbuf* v2; sub_0200B6A0(param0->unk_690, 0, param0->unk_250.unk_32); @@ -772,7 +772,7 @@ static void sub_02090EC8 (UnkStruct_0208D7BC * param0) void sub_02090F84 (UnkStruct_0208D7BC * param0) { - UnkStruct_02023790 * v0; + Strbuf* v0; u8 v1; u8 v2; @@ -827,7 +827,7 @@ void sub_020910E4 (UnkStruct_0208D7BC * param0) static void sub_02091188 (UnkStruct_0208D7BC * param0, u32 param1) { UnkStruct_0205AA50 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; u32 v2; u16 v3; u8 v4, v5; diff --git a/src/unk_02092494.c b/src/unk_02092494.c index 22ba9cd3c6..0d0f563b4a 100644 --- a/src/unk_02092494.c +++ b/src/unk_02092494.c @@ -332,7 +332,7 @@ static void sub_02092878 (UnkStruct_02090800 * param0) static void sub_020928A0 (UnkStruct_02090800 * param0, int param1) { - UnkStruct_02023790 * v0 = sub_02023790((((2 * 18) * 2) * 8), param0->unk_00); + Strbuf* v0 = sub_02023790((((2 * 18) * 2) * 8), param0->unk_00); param0->unk_1C.unk_04 = sub_02023790((((2 * 18) * 2) * 8), param0->unk_00); @@ -352,7 +352,7 @@ static void sub_020928A0 (UnkStruct_02090800 * param0, int param1) static void sub_020929C0 (UnkStruct_02090800 * param0, int param1) { - UnkStruct_02023790 * v0 = sub_02023790((((2 * 18) * 2) * 4), param0->unk_00); + Strbuf* v0 = sub_02023790((((2 * 18) * 2) * 4), param0->unk_00); param0->unk_1C.unk_04 = sub_02023790((((2 * 18) * 2) * 4), param0->unk_00); @@ -395,7 +395,7 @@ static void sub_020929C0 (UnkStruct_02090800 * param0, int param1) static void sub_02092B1C (UnkStruct_02090800 * param0, int param1, int param2) { - UnkStruct_02023790 * v0 = sub_02023790((((2 * 18) * 2) * 5), param0->unk_00); + Strbuf* v0 = sub_02023790((((2 * 18) * 2) * 5), param0->unk_00); param0->unk_1C.unk_04 = sub_02023790((((2 * 18) * 2) * 5), param0->unk_00); @@ -828,7 +828,7 @@ static void sub_020932A4 (BoxPokemon * param0, UnkStruct_02025E6C * param1, int { int v0 = sub_02025F20(param1); int v1 = sub_02025F30(param1); - UnkStruct_02023790 * v2 = sub_02025F04(param1, param2); + Strbuf* v2 = sub_02025F04(param1, param2); SetBoxMonData(param0, 7, &v0); SetBoxMonData(param0, 157, &v1); diff --git a/src/unk_02094EDC.c b/src/unk_02094EDC.c index c6d7ad728a..8f79ada7b0 100644 --- a/src/unk_02094EDC.c +++ b/src/unk_02094EDC.c @@ -632,7 +632,7 @@ void sub_02095380 (const UnkStruct_ov6_02248BE8 * param0, Pokemon * param1, int } { - UnkStruct_02023790 * v3, * v4; + Strbuf* v3, * v4; UnkStruct_0200B144 * v5; v5 = sub_0200B144(1, 26, 205, param2); diff --git a/src/unk_0209739C.c b/src/unk_0209739C.c index 1b325de725..ab927936f0 100644 --- a/src/unk_0209739C.c +++ b/src/unk_0209739C.c @@ -78,10 +78,10 @@ u32 sub_020973D4 (UnkStruct_020973A8 * param0, u32 param1) return 0; } -UnkStruct_02023790 * sub_0209742C (u16 param0, u32 param1) +Strbuf* sub_0209742C (u16 param0, u32 param1) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = sub_0200B144(1, 26, 424, param1); v1 = sub_0200B1EC(v0, param0); @@ -90,10 +90,10 @@ UnkStruct_02023790 * sub_0209742C (u16 param0, u32 param1) return v1; } -UnkStruct_02023790 * sub_02097454 (u16 param0, u16 param1) +Strbuf* sub_02097454 (u16 param0, u16 param1) { UnkStruct_0200B144 * v0; - UnkStruct_02023790 * v1; + Strbuf* v1; v0 = sub_0200B144(1, 26, 423, param1); v1 = sub_0200B1EC(v0, param0); diff --git a/src/unk_020998EC.c b/src/unk_020998EC.c index ad4e9a7a73..bb12016429 100644 --- a/src/unk_020998EC.c +++ b/src/unk_020998EC.c @@ -3385,7 +3385,7 @@ u32 sub_02099CA0 (const UnkStruct_020998EC * param0, u32 param1) return param0->unk_08[param1]; } -void sub_02099CA8 (const UnkStruct_020998EC * param0, u32 param1, u32 param2, UnkStruct_02023790 * param3) +void sub_02099CA8 (const UnkStruct_020998EC * param0, u32 param1, u32 param2, Strbuf *param3) { u32 v0 = param0->unk_38[param1]; sub_02014D90(param0->unk_04, param0->unk_68[v0 + param2], param3); @@ -3402,7 +3402,7 @@ u32 sub_02099CDC (const UnkStruct_020998EC * param0, u32 param1) return param0->unk_C18[param1]; } -void sub_02099CEC (const UnkStruct_020998EC * param0, u32 param1, u32 param2, UnkStruct_02023790 * param3) +void sub_02099CEC (const UnkStruct_020998EC * param0, u32 param1, u32 param2, Strbuf *param3) { if (param0->unk_C18[param1]) { u16 v0 = sub_02099D14(param0, param1, param2); diff --git a/src/unk_02099DFC.c b/src/unk_02099DFC.c index 944324634a..e1a82751dc 100644 --- a/src/unk_02099DFC.c +++ b/src/unk_02099DFC.c @@ -42,7 +42,7 @@ typedef struct { int unk_04; int unk_08; int unk_0C; - UnkStruct_02023790 * unk_10; + Strbuf* unk_10; UnkStruct_02018340 * unk_14; UnkStruct_0200B144 * unk_18; UnkStruct_0205AA50 unk_1C; diff --git a/src/unk_0209A2C4.c b/src/unk_0209A2C4.c index 3953bea469..6e7c6d239f 100644 --- a/src/unk_0209A2C4.c +++ b/src/unk_0209A2C4.c @@ -40,7 +40,7 @@ typedef struct { int unk_08; int unk_0C; int unk_10; - UnkStruct_02023790 * unk_14; + Strbuf* unk_14; UnkStruct_02018340 * unk_18; UnkStruct_0200B144 * unk_1C; UnkStruct_0205AA50 unk_20; diff --git a/src/unk_0209A74C.c b/src/unk_0209A74C.c index f130f4b09a..0dd992bf52 100644 --- a/src/unk_0209A74C.c +++ b/src/unk_0209A74C.c @@ -78,7 +78,7 @@ void sub_0209A74C (int param0) UnkStruct_02018340 * v0; UnkStruct_0205AA50 v1; UnkStruct_0200B144 * v2; - UnkStruct_02023790 * v3; + Strbuf* v3; int v4 = 0; sub_0200F344(0, 0); @@ -153,7 +153,7 @@ void sub_0209A8E0 (int param0) UnkStruct_02018340 * v0; UnkStruct_0205AA50 v1; UnkStruct_0200B144 * v2; - UnkStruct_02023790 * v3; + Strbuf* v3; int v4 = 1; sub_0200F344(0, 0); diff --git a/src/unk_0209AA74.c b/src/unk_0209AA74.c index ae9c185ffa..3dd698a5aa 100644 --- a/src/unk_0209AA74.c +++ b/src/unk_0209AA74.c @@ -80,7 +80,7 @@ void sub_0209AA74 (int param0, int param1) UnkStruct_02018340 * v0; UnkStruct_0205AA50 v1; UnkStruct_0200B144 * v2; - UnkStruct_02023790 * v3; + Strbuf* v3; int v4; if (param1 == 0) { diff --git a/src/unk_0209ACF4.c b/src/unk_0209ACF4.c index 08244c17c6..275be489a6 100644 --- a/src/unk_0209ACF4.c +++ b/src/unk_0209ACF4.c @@ -36,8 +36,8 @@ typedef struct { UnkStruct_0203CDB0 * unk_00; - UnkStruct_02023790 * unk_04; - UnkStruct_02023790 * unk_08; + Strbuf* unk_04; + Strbuf* unk_08; UnkStruct_0200B358 * unk_0C; UnkStruct_0200B144 * unk_10; UnkStruct_020149F0 * unk_14;