diff --git a/include/overlay005/ov5_021DC018.h b/include/overlay005/ov5_021DC018.h index 894fa7c900..e8a5170f2f 100644 --- a/include/overlay005/ov5_021DC018.h +++ b/include/overlay005/ov5_021DC018.h @@ -1,17 +1,17 @@ #ifndef POKEPLATINUM_OV5_021DC018_H #define POKEPLATINUM_OV5_021DC018_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0203CDB0_decl.h" #include "struct_defs/struct_0205AA50.h" #include "overlay005/struct_ov5_021DC1A4_decl.h" -UnkStruct_ov5_021DC1A4 * ov5_021DC150(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, UnkStruct_0200B144 * param8); +UnkStruct_ov5_021DC1A4 * ov5_021DC150(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, MessageLoader * param8); void ov5_021DC1A4(UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2); void ov5_021DC1AC(UnkStruct_ov5_021DC1A4 * param0); void ov5_021DC424(UnkStruct_ov5_021DC1A4 * param0); -UnkStruct_ov5_021DC1A4 * ov5_021DC48C(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, UnkStruct_0200B144 * param8); +UnkStruct_ov5_021DC1A4 * ov5_021DC48C(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, MessageLoader * param8); void ov5_021DC4B0(UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2, u32 param3); void ov5_021DC4B8(UnkStruct_ov5_021DC1A4 * param0); void ov5_021DC528(UnkStruct_ov5_021DC1A4 * param0, u16 param1); diff --git a/include/overlay005/ov5_021DD42C.h b/include/overlay005/ov5_021DD42C.h index 9516856baf..c3eab8f2f2 100644 --- a/include/overlay005/ov5_021DD42C.h +++ b/include/overlay005/ov5_021DD42C.h @@ -1,14 +1,14 @@ #ifndef POKEPLATINUM_OV5_021DD42C_H #define POKEPLATINUM_OV5_021DD42C_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0203E724_decl.h" #include "overlay005/struct_ov5_021DD42C.h" void ov5_021DD42C(UnkStruct_ov5_021DD42C * param0, UnkStruct_0203E724 * param1); -void ov5_021DD444(UnkStruct_0203E724 * param0, const UnkStruct_0200B144 * param1, u16 param2, u8 param3, UnkStruct_ov5_021DD42C * param4); -void ov5_021DD498(UnkStruct_0203E724 * param0, const UnkStruct_0200B144 * param1, int param2); +void ov5_021DD444(UnkStruct_0203E724 * param0, const MessageLoader * param1, u16 param2, u8 param3, UnkStruct_ov5_021DD42C * param4); +void ov5_021DD498(UnkStruct_0203E724 * param0, const MessageLoader * param1, int param2); void ov5_021DD4CC(UnkStruct_0203E724 * param0, u16 param1, u16 param2, u16 param3, s16 param4, u8 param5); void ov5_021DD530(UnkStruct_0203E724 * param0, UnkStruct_0200B358 * param1, u8 param2, u8 param3); diff --git a/include/overlay007/struct_ov7_0224D008.h b/include/overlay007/struct_ov7_0224D008.h index d03e297c05..cb2e5d5deb 100644 --- a/include/overlay007/struct_ov7_0224D008.h +++ b/include/overlay007/struct_ov7_0224D008.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_02013A04_decl.h" @@ -29,7 +29,7 @@ typedef struct { UnkStruct_02013A04 * unk_7C; UnkStruct_02001AF4 * unk_80; UnkStruct_02013A04 * unk_84; - UnkStruct_0200B144 * unk_88; + MessageLoader * unk_88; UnkStruct_0200B358 * unk_8C; UnkStruct_020203AC * unk_90; UnkStruct_ov5_021D30A8 unk_94; diff --git a/include/overlay008/ov8_02249960.h b/include/overlay008/ov8_02249960.h index b96ac37ea2..80a46b5ab8 100644 --- a/include/overlay008/ov8_02249960.h +++ b/include/overlay008/ov8_02249960.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV8_02249960_H #define POKEPLATINUM_OV8_02249960_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "strbuf.h" #include "struct_decls/struct_0203CDB0_decl.h" #include "struct_defs/struct_0205AA50.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, Strbuf *param3); +BOOL ov8_0224B67C(UnkStruct_0203CDB0 * param0, UnkStruct_0205AA50 * param1, MessageLoader * 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/overlay013/struct_ov13_022213F0.h b/include/overlay013/struct_ov13_022213F0.h index f5ea9e93ff..8d8ab01c5f 100644 --- a/include/overlay013/struct_ov13_022213F0.h +++ b/include/overlay013/struct_ov13_022213F0.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV13_022213F0_H #include "struct_decls/struct_02002F38_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -38,7 +38,7 @@ typedef struct { u8 unk_1F9F_4 : 3; u8 unk_1F9F_7 : 1; UnkStruct_0200C440 * unk_1FA0; - UnkStruct_0200B144 * unk_1FA4; + MessageLoader * unk_1FA4; UnkStruct_0200B358 * unk_1FA8; Strbuf* unk_1FAC; UnkStruct_0200C704 * unk_1FB0; diff --git a/include/overlay013/struct_ov13_02227244.h b/include/overlay013/struct_ov13_02227244.h index 822a928c0a..c86f9a179c 100644 --- a/include/overlay013/struct_ov13_02227244.h +++ b/include/overlay013/struct_ov13_02227244.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV13_02227244_H #include "struct_decls/struct_02002F38_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -20,7 +20,7 @@ typedef struct { UnkStruct_02018340 * unk_04; UnkStruct_02002F38 * unk_08; UnkStruct_0200C440 * unk_0C; - UnkStruct_0200B144 * unk_10; + MessageLoader * unk_10; UnkStruct_0200B358 * unk_14; Strbuf* unk_18; UnkStruct_0205AA50 unk_1C; diff --git a/include/overlay016/ov16_0223DF00.h b/include/overlay016/ov16_0223DF00.h index c81cf31564..e3883eabab 100644 --- a/include/overlay016/ov16_0223DF00.h +++ b/include/overlay016/ov16_0223DF00.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02007C7C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" @@ -55,8 +55,8 @@ UnkStruct_ov16_0226D160 * ov16_0223E034(UnkStruct_0207ADB4 * param0, UnkEnum_ov1 void ov16_0223E040(UnkStruct_0207ADB4 * param0, UnkEnum_ov16_0226D194 param1, UnkStruct_ov16_0226D160 * param2); UnkStruct_0200C440 * ov16_0223E04C(UnkStruct_0207ADB4 * param0); UnkStruct_0200C440 * ov16_0223E054(UnkStruct_0207ADB4 * param0); -UnkStruct_0200B144 * ov16_0223E05C(UnkStruct_0207ADB4 * param0); -UnkStruct_0200B144 * ov16_0223E060(UnkStruct_0207ADB4 * param0); +MessageLoader * ov16_0223E05C(UnkStruct_0207ADB4 * param0); +MessageLoader * ov16_0223E060(UnkStruct_0207ADB4 * param0); UnkStruct_02002F38 * ov16_0223E064(UnkStruct_0207ADB4 * param0); UnkStruct_02026324 * ov16_0223E068(UnkStruct_0207ADB4 * param0); u8 * ov16_0223E06C(UnkStruct_0207ADB4 * param0); @@ -171,7 +171,7 @@ void ov16_0223F9A0(UnkStruct_0207ADB4 * param0, int param1); BOOL ov16_0223F9E0(UnkStruct_0207ADB4 * param0, int param1); void ov16_0223F9F0(void); u8 ov16_0223F9FC(UnkStruct_0207ADB4 * param0, int param1, int param2, int param3, int param4); -u8 ov16_0223FB24(UnkStruct_0207ADB4 * param0, UnkStruct_0200B144 * param1, BattleMessage * param2, int param3); -u8 ov16_0223FB78(UnkStruct_0207ADB4 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0200B144 * param2, BattleMessage * param3, int param4, int param5, int param6, int param7, int param8); +u8 ov16_0223FB24(UnkStruct_0207ADB4 * param0, MessageLoader * param1, BattleMessage * param2, int param3); +u8 ov16_0223FB78(UnkStruct_0207ADB4 * param0, UnkStruct_0205AA50 * param1, MessageLoader * param2, BattleMessage * param3, int param4, int param5, int param6, int param7, int param8); #endif // POKEPLATINUM_OV16_0223DF00_H diff --git a/include/overlay017/struct_ov17_0223F88C.h b/include/overlay017/struct_ov17_0223F88C.h index f59fad8961..0fe993ef9e 100644 --- a/include/overlay017/struct_ov17_0223F88C.h +++ b/include/overlay017/struct_ov17_0223F88C.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02007C7C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -27,10 +27,10 @@ typedef struct { UnkStruct_ov12_0221FCDC * unk_20; UnkStruct_02018340 * unk_24; UnkStruct_0205AA50 unk_28[1]; - UnkStruct_0200B144 * unk_38; - UnkStruct_0200B144 * unk_3C; - UnkStruct_0200B144 * unk_40; - UnkStruct_0200B144 * unk_44; + MessageLoader * unk_38; + MessageLoader * unk_3C; + MessageLoader * unk_40; + MessageLoader * unk_44; UnkStruct_0200B358 * unk_48; Strbuf* unk_4C; UnkStruct_02002F38 * unk_50; diff --git a/include/overlay017/struct_ov17_022476F8.h b/include/overlay017/struct_ov17_022476F8.h index f1b818c589..456c1e91b0 100644 --- a/include/overlay017/struct_ov17_022476F8.h +++ b/include/overlay017/struct_ov17_022476F8.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02007C7C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -25,7 +25,7 @@ typedef struct { UnkStruct_0200C704 * unk_20; UnkStruct_02018340 * unk_24; UnkStruct_0205AA50 unk_28[1]; - UnkStruct_0200B144 * unk_38; + MessageLoader * unk_38; UnkStruct_0200B358 * unk_3C; Strbuf* unk_40; UnkStruct_02002F38 * unk_44; diff --git a/include/overlay017/struct_ov17_0224A1EC.h b/include/overlay017/struct_ov17_0224A1EC.h index f0263c1c60..9d2c64a3fb 100644 --- a/include/overlay017/struct_ov17_0224A1EC.h +++ b/include/overlay017/struct_ov17_0224A1EC.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02007C7C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -36,7 +36,7 @@ typedef struct { UnkStruct_0200C704 * unk_5C; UnkStruct_02018340 * unk_60; UnkStruct_0205AA50 unk_64[2]; - UnkStruct_0200B144 * unk_84; + MessageLoader * unk_84; UnkStruct_0200B358 * unk_88; Strbuf* unk_8C; UnkStruct_02002F38 * unk_90; diff --git a/include/overlay017/struct_ov17_022507C4.h b/include/overlay017/struct_ov17_022507C4.h index 4ef5f9f2e4..32738a7808 100644 --- a/include/overlay017/struct_ov17_022507C4.h +++ b/include/overlay017/struct_ov17_022507C4.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02007C7C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -26,7 +26,7 @@ typedef struct { UnkStruct_0200C704 * unk_1C; UnkStruct_02018340 * unk_20; UnkStruct_0205AA50 unk_24[9]; - UnkStruct_0200B144 * unk_B4; + MessageLoader * unk_B4; UnkStruct_0200B358 * unk_B8; Strbuf* unk_BC; UnkStruct_02002F38 * unk_C0; diff --git a/include/overlay019/ov19_021D0D80.h b/include/overlay019/ov19_021D0D80.h index c91a55b158..3c73fcf944 100644 --- a/include/overlay019/ov19_021D0D80.h +++ b/include/overlay019/ov19_021D0D80.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_OV19_021D0D80_H #include "struct_decls/struct_020067E8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_defs/box_pokemon.h" #include "struct_decls/struct_020797DC_decl.h" @@ -17,7 +17,7 @@ int ov19_021D0DEC(UnkStruct_020067E8 * param0, int * param1); int ov19_021D0E58(UnkStruct_020067E8 * param0, int * param1); BOOL ov19_021D3B18(const UnkStruct_ov19_021D5DF8 * param0); BOOL ov19_021D3B20(const UnkStruct_ov19_021D5DF8 * param0); -UnkStruct_0200B144 * ov19_021D5DE8(const UnkStruct_ov19_021D5DF8 * param0); +MessageLoader * ov19_021D5DE8(const UnkStruct_ov19_021D5DF8 * param0); const UnkStruct_0200B358 * ov19_021D5DF0(const UnkStruct_ov19_021D5DF8 * param0); int ov19_021D5DF8(const UnkStruct_ov19_021D5DF8 * param0); u32 ov19_021D5E08(const UnkStruct_ov19_021D4DF0 * param0); diff --git a/include/overlay019/ov19_021DA92C.h b/include/overlay019/ov19_021DA92C.h index 334ead0dc0..adcc0a23e4 100644 --- a/include/overlay019/ov19_021DA92C.h +++ b/include/overlay019/ov19_021DA92C.h @@ -2,14 +2,14 @@ #define POKEPLATINUM_OV19_021DA92C_H #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DA9E0.h" -BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_02018340 * param3, UnkStruct_020218BC * param4, const UnkStruct_0200B144 * param5, NARC * param6); +BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_02018340 * param3, UnkStruct_020218BC * param4, const MessageLoader * param5, NARC * param6); void ov19_021DA9E0(UnkStruct_ov19_021DA9E0 * param0); void ov19_021DAA80(UnkStruct_ov19_021DA9E0 * param0); void ov19_021DAA90(UnkStruct_ov19_021DA9E0 * param0); diff --git a/include/overlay019/ov19_021DB2FC.h b/include/overlay019/ov19_021DB2FC.h index 9fe2c5ae33..95a5b9015b 100644 --- a/include/overlay019/ov19_021DB2FC.h +++ b/include/overlay019/ov19_021DB2FC.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_OV19_021DB2FC_H #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" @@ -11,7 +11,7 @@ #include "overlay019/struct_ov19_021DB6F0.h" #include "overlay019/struct_ov19_021DF964.h" -BOOL ov19_021DB2FC(UnkStruct_ov19_021DB6F0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_02018340 * param3, UnkStruct_020218BC * param4, UnkStruct_0200B144 * param5, const UnkStruct_0200B358 * param6, int param7, NARC * param8); +BOOL ov19_021DB2FC(UnkStruct_ov19_021DB6F0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_02018340 * param3, UnkStruct_020218BC * param4, MessageLoader * param5, const UnkStruct_0200B358 * param6, int param7, NARC * param8); void ov19_021DB370(UnkStruct_ov19_021DB6F0 * param0); void ov19_021DB3C4(UnkStruct_ov19_021DB6F0 * param0); void ov19_021DB448(UnkStruct_ov19_021DB6F0 * param0, u32 param1); diff --git a/include/overlay019/ov19_021DEC04.h b/include/overlay019/ov19_021DEC04.h index cab98328c0..1ff8ace06b 100644 --- a/include/overlay019/ov19_021DEC04.h +++ b/include/overlay019/ov19_021DEC04.h @@ -2,14 +2,14 @@ #define POKEPLATINUM_OV19_021DEC04_H #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DEC04_decl.h" -BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_02018340 * param3, UnkStruct_020218BC * param4, UnkStruct_0200B144 * param5, NARC * param6); +BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_02018340 * param3, UnkStruct_020218BC * param4, MessageLoader * param5, NARC * param6); void ov19_021DECAC(UnkStruct_ov19_021DEC04 * param0); void ov19_021DECE8(UnkStruct_ov19_021DEC04 * param0, NARC * param1); void ov19_021DEDDC(UnkStruct_ov19_021DEC04 * param0, BOOL param1); diff --git a/include/overlay019/struct_ov19_021DB6F0.h b/include/overlay019/struct_ov19_021DB6F0.h index e0112200e8..410428a4aa 100644 --- a/include/overlay019/struct_ov19_021DB6F0.h +++ b/include/overlay019/struct_ov19_021DB6F0.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV19_021DB6F0_H #define POKEPLATINUM_STRUCT_OV19_021DB6F0_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" @@ -16,8 +16,8 @@ typedef struct { u8 padding_04[4]; const UnkStruct_ov19_021D4DF0 * unk_08; UnkStruct_ov19_021D61B0 * unk_0C; - UnkStruct_0200B144 * unk_10; - UnkStruct_0200B144 * unk_14; + MessageLoader * unk_10; + MessageLoader * unk_14; UnkStruct_0205AA50 * unk_18; u16 unk_1C; u16 unk_1E; diff --git a/include/overlay019/struct_ov19_021DBA9C.h b/include/overlay019/struct_ov19_021DBA9C.h index 03147b28c5..c5fd5e9327 100644 --- a/include/overlay019/struct_ov19_021DBA9C.h +++ b/include/overlay019/struct_ov19_021DBA9C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV19_021DBA9C_H #define POKEPLATINUM_STRUCT_OV19_021DBA9C_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0201AE08.h" @@ -41,7 +41,7 @@ typedef struct { u8 unk_3E4[18][1024]; u8 unk_4BE4[18]; u8 padding_4BF6[2]; - UnkStruct_0200B144 * unk_4BF8; + MessageLoader * unk_4BF8; Strbuf* unk_4BFC; } UnkStruct_ov19_021DBA9C; diff --git a/include/overlay023/ov23_02253D40.h b/include/overlay023/ov23_02253D40.h index a741ae38db..3c94ccee31 100644 --- a/include/overlay023/ov23_02253D40.h +++ b/include/overlay023/ov23_02253D40.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV23_02253D40_H #define POKEPLATINUM_OV23_02253D40_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02025E6C_decl.h" #include "overlay023/struct_ov23_02253E2C_decl.h" @@ -13,7 +13,7 @@ UnkStruct_ov23_02253E2C * ov23_02253D48(int param0, int param1, UnkStruct_020183 void ov23_02253DD8(UnkStruct_ov23_02253E2C * param0); void ov23_02253DFC(UnkStruct_ov23_02253E2C * param0, int param1, int param2); void ov23_02253E2C(UnkStruct_ov23_02253E2C * param0, UnkStruct_02018340 * param1, u16 param2, u16 param3); -UnkStruct_0200B144 * ov23_02253E3C(UnkStruct_ov23_02253E2C * param0); +MessageLoader * ov23_02253E3C(UnkStruct_ov23_02253E2C * param0); int ov23_02253F40(UnkStruct_ov23_02253E2C * param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3); int ov23_02253F60(UnkStruct_ov23_02253E2C * param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3); int ov23_02253F78(UnkStruct_ov23_02253E2C * param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3, int param4); diff --git a/include/overlay062/ov62_02231690.h b/include/overlay062/ov62_02231690.h index 093d7d039f..73c24e542d 100644 --- a/include/overlay062/ov62_02231690.h +++ b/include/overlay062/ov62_02231690.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_OV62_02231690_H #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200D0F4_decl.h" #include "strbuf.h" @@ -39,8 +39,8 @@ void ov62_02232378(UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C * param1 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, Strbuf *param6); +void ov62_02232594(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, MessageLoader * param2, const UnkStruct_ov62_02248CDC * param3); +void ov62_02232778(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, MessageLoader * 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); diff --git a/include/overlay062/struct_ov62_0223118C.h b/include/overlay062/struct_ov62_0223118C.h index 87a0ad7d25..375b27d661 100644 --- a/include/overlay062/struct_ov62_0223118C.h +++ b/include/overlay062/struct_ov62_0223118C.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" @@ -27,8 +27,8 @@ typedef struct { UnkStruct_02023FCC * unk_18; UnkUnion_02022594 unk_1C[5]; BOOL unk_30; - UnkStruct_0200B144 * unk_34; - UnkStruct_0200B144 * unk_38; + MessageLoader * unk_34; + MessageLoader * unk_38; UnkStruct_02012744 * unk_3C; int unk_40; int unk_44; diff --git a/include/overlay062/struct_ov62_02233310.h b/include/overlay062/struct_ov62_02233310.h index cd1b816077..d2e7927ffb 100644 --- a/include/overlay062/struct_ov62_02233310.h +++ b/include/overlay062/struct_ov62_02233310.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV62_02233310_H #define POKEPLATINUM_STRUCT_OV62_02233310_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200D0F4_decl.h" #include "struct_defs/struct_0205AA50.h" #include "overlay062/struct_ov62_02233310_sub1.h" @@ -18,7 +18,7 @@ typedef struct { UnkStruct_0205AA50 unk_18; const UnkStruct_ov62_02248CDC * unk_28; UnkStruct_0200D0F4 * unk_2C[2]; - UnkStruct_0200B144 * unk_34; + MessageLoader * unk_34; UnkStruct_ov62_02233310_sub1 unk_38; BOOL unk_48; u8 padding_4C[4]; diff --git a/include/overlay062/struct_ov62_022349A8.h b/include/overlay062/struct_ov62_022349A8.h index a3de144acf..76769f1779 100644 --- a/include/overlay062/struct_ov62_022349A8.h +++ b/include/overlay062/struct_ov62_022349A8.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV62_022349A8_H #define POKEPLATINUM_STRUCT_OV62_022349A8_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "strbuf.h" #include "struct_decls/struct_021C0794_decl.h" @@ -39,7 +39,7 @@ typedef struct { int unk_3E8; int unk_3EC; int unk_3F0; - UnkStruct_0200B144 * unk_3F4; + MessageLoader * unk_3F4; UnkStruct_0200B358 * unk_3F8; Strbuf* unk_3FC; UnkStruct_ov61_0222B920 unk_400; diff --git a/include/overlay062/struct_ov62_0223E01C_sub1.h b/include/overlay062/struct_ov62_0223E01C_sub1.h index d754f41d10..1d8576c1a4 100644 --- a/include/overlay062/struct_ov62_0223E01C_sub1.h +++ b/include/overlay062/struct_ov62_0223E01C_sub1.h @@ -1,13 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_OV62_0223E01C_SUB1_H #define POKEPLATINUM_STRUCT_OV62_0223E01C_SUB1_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" typedef struct { int unk_00; int unk_04; u16 * unk_08; - UnkStruct_0200B144 * unk_0C; + MessageLoader * unk_0C; BOOL unk_10; } UnkStruct_ov62_0223E01C_sub1; diff --git a/include/overlay065/struct_ov65_0222EBE0_t.h b/include/overlay065/struct_ov65_0222EBE0_t.h index f8bc8b5f6d..177aa4127d 100644 --- a/include/overlay065/struct_ov65_0222EBE0_t.h +++ b/include/overlay065/struct_ov65_0222EBE0_t.h @@ -5,7 +5,7 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02009714_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_02012744_decl.h" @@ -39,8 +39,8 @@ struct UnkStruct_ov65_0222EBE0_t { UnkStruct_02018340 * unk_15C; UnkStruct_021C0794 * unk_160; UnkStruct_0200B358 * unk_164; - UnkStruct_0200B144 * unk_168; - UnkStruct_0200B144 * unk_16C; + MessageLoader * unk_168; + MessageLoader * unk_16C; Strbuf* unk_170; Strbuf* unk_174; Strbuf* unk_178; diff --git a/include/overlay072/struct_ov72_0223DB98_t.h b/include/overlay072/struct_ov72_0223DB98_t.h index d2f3a68bd3..8f260fd3a8 100644 --- a/include/overlay072/struct_ov72_0223DB98_t.h +++ b/include/overlay072/struct_ov72_0223DB98_t.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_02015920_decl.h" @@ -25,7 +25,7 @@ struct UnkStruct_ov72_0223DB98_t { UnkStruct_0202CD88 * unk_08; UnkStruct_020279FC * unk_0C; UnkStruct_0200B358 * unk_10; - UnkStruct_0200B144 * unk_14; + MessageLoader * unk_14; Strbuf* unk_18[5]; Strbuf* unk_2C; Strbuf* unk_30; diff --git a/include/overlay079/struct_ov79_021D0E1C.h b/include/overlay079/struct_ov79_021D0E1C.h index d20efbd722..a17a6ab8d4 100644 --- a/include/overlay079/struct_ov79_021D0E1C.h +++ b/include/overlay079/struct_ov79_021D0E1C.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02013A04_decl.h" @@ -37,7 +37,7 @@ typedef struct UnkStruct_ov79_021D0E1C_t { UnkStruct_0203D9B8 * unk_20; UnkStruct_02018340 * unk_24; UnkStruct_020158A8 * unk_28; - UnkStruct_0200B144 * unk_2C; + MessageLoader * unk_2C; UnkStruct_ov79_021D0E1C_sub1 unk_30; u16 unk_80; u16 unk_82; diff --git a/include/overlay080/struct_ov80_021D2A08.h b/include/overlay080/struct_ov80_021D2A08.h index 87f5e501ff..5bb795f51f 100644 --- a/include/overlay080/struct_ov80_021D2A08.h +++ b/include/overlay080/struct_ov80_021D2A08.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV80_021D2A08_H #define POKEPLATINUM_STRUCT_OV80_021D2A08_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_0200D0F4_decl.h" @@ -37,8 +37,8 @@ typedef struct UnkStruct_ov80_021D2A08_t { UnkStruct_ov80_021D2C1C * unk_3C; UnkStruct_ov80_021D2E10 * unk_40; UnkStruct_ov80_021D259C unk_44[5]; - UnkStruct_0200B144 * unk_80; - UnkStruct_0200B144 * unk_84; + MessageLoader * unk_80; + MessageLoader * unk_84; Strbuf* unk_88; int unk_8C; int unk_90; diff --git a/include/overlay081/struct_ov81_021D1610.h b/include/overlay081/struct_ov81_021D1610.h index 136fd5803a..b946f75147 100644 --- a/include/overlay081/struct_ov81_021D1610.h +++ b/include/overlay081/struct_ov81_021D1610.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV81_021D1610_H #define POKEPLATINUM_STRUCT_OV81_021D1610_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" @@ -16,7 +16,7 @@ typedef struct { UnkStruct_0202B628 * unk_44; UnkStruct_02025E6C * unk_48; UnkStruct_021C0794 * unk_4C; - UnkStruct_0200B144 * unk_50; + MessageLoader * unk_50; UnkStruct_0200B358 * unk_54; Strbuf* unk_58; u16 unk_5C[1024]; diff --git a/include/overlay083/struct_ov83_0223DEA0.h b/include/overlay083/struct_ov83_0223DEA0.h index 59f23a9f88..7d0424a402 100644 --- a/include/overlay083/struct_ov83_0223DEA0.h +++ b/include/overlay083/struct_ov83_0223DEA0.h @@ -1,12 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_OV83_0223DEA0_H #define POKEPLATINUM_STRUCT_OV83_0223DEA0_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "strbuf.h" typedef struct { - UnkStruct_0200B144 * unk_00; + MessageLoader * unk_00; UnkStruct_0200B358 * unk_04; Strbuf* unk_08; Strbuf* unk_0C; diff --git a/include/overlay084/struct_ov84_0223B5A0.h b/include/overlay084/struct_ov84_0223B5A0.h index 97e55af0b5..14b3eefa26 100644 --- a/include/overlay084/struct_ov84_0223B5A0.h +++ b/include/overlay084/struct_ov84_0223B5A0.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" @@ -34,10 +34,10 @@ typedef struct { UnkStruct_0200C704 * unk_DC; UnkStruct_0200D0F4 * unk_E0[12]; UnkStruct_0200C440 * unk_110; - UnkStruct_0200B144 * unk_114; + MessageLoader * unk_114; UnkStruct_0200B358 * unk_118; - UnkStruct_0200B144 * unk_11C; - UnkStruct_0200B144 * unk_120; + MessageLoader * unk_11C; + MessageLoader * unk_120; Strbuf* unk_124[12]; UnkStruct_02013A04 * unk_154; UnkStruct_02001AF4 * unk_158; diff --git a/include/overlay088/ov88_0223E9C4.h b/include/overlay088/ov88_0223E9C4.h index b11632bff1..8d4af3074a 100644 --- a/include/overlay088/ov88_0223E9C4.h +++ b/include/overlay088/ov88_0223E9C4.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -14,7 +14,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, 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); +int ov88_0223ECBC(UnkStruct_0205AA50 * param0, int param1, int param2, MessageLoader * param3, UnkStruct_0200B358 * param4); u32 ov88_0223ED2C(UnkStruct_02018340 * param0, UnkStruct_02001AF4 ** param1, int * param2); void ov88_0223ED80(UnkStruct_0205AA50 * param0); UnkStruct_0200112C * ov88_0223ED94(UnkStruct_02013A04 * param0, int param1, UnkStruct_0205AA50 * param2, UnkStruct_02018340 * param3); diff --git a/include/overlay094/ov94_0223C610.h b/include/overlay094/ov94_0223C610.h index efdb3bd8f5..5cafc6b554 100644 --- a/include/overlay094/ov94_0223C610.h +++ b/include/overlay094/ov94_0223C610.h @@ -1,14 +1,14 @@ #ifndef POKEPLATINUM_OV94_0223C610_H #define POKEPLATINUM_OV94_0223C610_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_defs/struct_0205AA50.h" #include "overlay094/struct_ov94_0223FD4C_decl.h" int ov94_0223C610(UnkStruct_ov94_0223FD4C * param0, int param1); int ov94_0223C6D4(UnkStruct_ov94_0223FD4C * param0, int param1); int ov94_0223C6F4(UnkStruct_ov94_0223FD4C * param0, int param1); -void ov94_0223D030(UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, int param2, u16 param3); +void ov94_0223D030(UnkStruct_0205AA50 * param0, MessageLoader * param1, int param2, u16 param3); void ov94_0223D068(UnkStruct_ov94_0223FD4C * param0); #endif // POKEPLATINUM_OV94_0223C610_H diff --git a/include/overlay094/ov94_0223D0C4.h b/include/overlay094/ov94_0223D0C4.h index a224fcf8bd..65496d62f7 100644 --- a/include/overlay094/ov94_0223D0C4.h +++ b/include/overlay094/ov94_0223D0C4.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV94_0223D0C4_H #define POKEPLATINUM_OV94_0223D0C4_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/pokemon.h" @@ -12,8 +12,8 @@ int ov94_0223D0C4(UnkStruct_ov94_0223FD4C * param0, int param1); int ov94_0223D19C(UnkStruct_ov94_0223FD4C * param0, int param1); int ov94_0223D1B0(UnkStruct_ov94_0223FD4C * param0, int param1); -void ov94_0223D910(UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], BoxPokemon * param4, UnkStruct_ov94_0223BA88_sub2 * param5); -void ov94_0223DA78(UnkStruct_0200B144 * param0, UnkStruct_0205AA50 param1[], u16 * param2, Pokemon * param3, UnkStruct_0205AA50 param4[]); +void ov94_0223D910(MessageLoader * param0, MessageLoader * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], BoxPokemon * param4, UnkStruct_ov94_0223BA88_sub2 * param5); +void ov94_0223DA78(MessageLoader * param0, UnkStruct_0205AA50 param1[], u16 * param2, Pokemon * param3, UnkStruct_0205AA50 param4[]); void ov94_0223DB2C(Pokemon * param0); #endif // POKEPLATINUM_OV94_0223D0C4_H diff --git a/include/overlay094/ov94_022414B8.h b/include/overlay094/ov94_022414B8.h index 93884cecaf..eb2bc7f076 100644 --- a/include/overlay094/ov94_022414B8.h +++ b/include/overlay094/ov94_022414B8.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_OV94_022414B8_H #include "struct_decls/struct_0200112C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02026324_decl.h" @@ -17,23 +17,23 @@ int ov94_022414B8(UnkStruct_ov94_0223FD4C * param0, int param1); int ov94_02241548(UnkStruct_ov94_0223FD4C * param0, int param1); int ov94_02241568(UnkStruct_ov94_0223FD4C * param0, int param1); int ov94_02241B80(UnkStruct_ov94_0223BA88_sub3 * param0, int param1); -void ov94_02242158(UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, int param2, int param3, int param4, u32 param5); -void ov94_0224218C(UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B144 * param2, int param3, int param4, int param5, u32 param6); -void ov94_02242204(UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, int param2, int param3, int param4, int param5, u32 param6); -void ov94_0224226C(UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, int param2, int param3, int param4, u32 param5, int param6, int param7); -void ov94_022422B8(UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, int param2, int param3, int param4, u32 param5, int param6); -void ov94_022422D4(UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], int param4, int param5, int param6); -void ov94_02242368(UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], int param4, int param5, int param6); +void ov94_02242158(UnkStruct_0205AA50 * param0, MessageLoader * param1, int param2, int param3, int param4, u32 param5); +void ov94_0224218C(UnkStruct_0205AA50 * param0, MessageLoader * param1, MessageLoader * param2, int param3, int param4, int param5, u32 param6); +void ov94_02242204(UnkStruct_0205AA50 * param0, MessageLoader * param1, int param2, int param3, int param4, int param5, u32 param6); +void ov94_0224226C(UnkStruct_0205AA50 * param0, MessageLoader * param1, int param2, int param3, int param4, u32 param5, int param6, int param7); +void ov94_022422B8(UnkStruct_0205AA50 * param0, MessageLoader * param1, int param2, int param3, int param4, u32 param5, int param6); +void ov94_022422D4(MessageLoader * param0, MessageLoader * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], int param4, int param5, int param6); +void ov94_02242368(MessageLoader * param0, MessageLoader * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], int param4, int param5, int param6); u16 * ov94_02242524(int param0, int param1, int * param2); u8 * ov94_02242548(int param0); void ov94_022425A8(UnkStruct_ov94_0223BA88 * param0, UnkStruct_ov94_0223FD4C * param1); -UnkStruct_0200112C * ov94_022426A8(UnkStruct_ov94_0223FD4C * param0, UnkStruct_02013A04 ** param1, UnkStruct_0205AA50 * param2, UnkStruct_0200B144 * param3); -UnkStruct_0200112C * ov94_022427C0(UnkStruct_ov94_0223FD4C * param0, UnkStruct_02013A04 ** param1, UnkStruct_0205AA50 * param2, UnkStruct_0200B144 * param3, UnkStruct_0200B144 * param4, UnkStruct_ov94_0223FD4C_sub3 * param5, UnkStruct_02026324 * param6); -UnkStruct_0200112C * ov94_02242840(UnkStruct_02013A04 ** param0, UnkStruct_0205AA50 * param1, UnkStruct_0200B144 * param2); -UnkStruct_0200112C * ov94_022428B0(UnkStruct_02013A04 ** param0, UnkStruct_0205AA50 * param1, UnkStruct_0200B144 * param2, int param3); +UnkStruct_0200112C * ov94_022426A8(UnkStruct_ov94_0223FD4C * param0, UnkStruct_02013A04 ** param1, UnkStruct_0205AA50 * param2, MessageLoader * param3); +UnkStruct_0200112C * ov94_022427C0(UnkStruct_ov94_0223FD4C * param0, UnkStruct_02013A04 ** param1, UnkStruct_0205AA50 * param2, MessageLoader * param3, MessageLoader * param4, UnkStruct_ov94_0223FD4C_sub3 * param5, UnkStruct_02026324 * param6); +UnkStruct_0200112C * ov94_02242840(UnkStruct_02013A04 ** param0, UnkStruct_0205AA50 * param1, MessageLoader * param2); +UnkStruct_0200112C * ov94_022428B0(UnkStruct_02013A04 ** param0, UnkStruct_0205AA50 * param1, MessageLoader * param2, int param3); void ov94_02242934(UnkStruct_ov94_0223BA88_sub3 * param0, int param1, int param2); int ov94_02242970(int param0, int param1, int param2); -UnkStruct_0200112C * ov94_022429B4(UnkStruct_02013A04 ** param0, UnkStruct_0205AA50 * param1, UnkStruct_0200B144 * param2, UnkStruct_0200B144 * param3); +UnkStruct_0200112C * ov94_022429B4(UnkStruct_02013A04 ** param0, UnkStruct_0205AA50 * param1, MessageLoader * param2, MessageLoader * param3); void ov94_02242A44(UnkStruct_ov94_0223FD4C * param0, int param1); u32 ov94_02242A6C(UnkStruct_0200112C * param0, u16 * param1); void ov94_02242AAC(UnkStruct_ov94_02242AAC * param0); diff --git a/include/overlay094/ov94_02244950.h b/include/overlay094/ov94_02244950.h index 919018dbd2..72f444647f 100644 --- a/include/overlay094/ov94_02244950.h +++ b/include/overlay094/ov94_02244950.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV94_02244950_H #define POKEPLATINUM_OV94_02244950_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "strbuf.h" #include "struct_defs/struct_0205AA50.h" #include "overlay094/struct_ov94_0223FD4C_decl.h" @@ -9,7 +9,7 @@ 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_02245824(UnkStruct_ov94_0223FD4C * param0, MessageLoader * param1, int param2, int param3, u16 param4); 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); diff --git a/include/overlay094/struct_ov94_0223FD4C.h b/include/overlay094/struct_ov94_0223FD4C.h index 63a1e30791..cefe9363a9 100644 --- a/include/overlay094/struct_ov94_0223FD4C.h +++ b/include/overlay094/struct_ov94_0223FD4C.h @@ -6,7 +6,7 @@ #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_02013A04_decl.h" @@ -89,11 +89,11 @@ typedef struct UnkStruct_ov94_0223FD4C_t { UnkStruct_ov94_0223BA88_sub3 unk_B80; int unk_B88; UnkStruct_0200B358 * unk_B8C; - UnkStruct_0200B144 * unk_B90; - UnkStruct_0200B144 * unk_B94; - UnkStruct_0200B144 * unk_B98; - UnkStruct_0200B144 * unk_B9C; - UnkStruct_0200B144 * unk_BA0; + MessageLoader * unk_B90; + MessageLoader * unk_B94; + MessageLoader * unk_B98; + MessageLoader * unk_B9C; + MessageLoader * unk_BA0; Strbuf* unk_BA4; Strbuf* unk_BA8; Strbuf* unk_BAC; diff --git a/include/overlay095/ov95_02246C20.h b/include/overlay095/ov95_02246C20.h index b579dbd9d9..d578125d00 100644 --- a/include/overlay095/ov95_02246C20.h +++ b/include/overlay095/ov95_02246C20.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_OV95_02246C20_H #include "struct_decls/struct_020067E8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" @@ -30,7 +30,7 @@ void ov95_022475C4(UnkStruct_ov19_021DA864 * param0, UnkStruct_ov95_02247568 * p UnkStruct_02022550 * ov95_022475E4(UnkStruct_ov95_02247628 * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5); UnkStruct_02018340 * ov95_02247628(UnkStruct_ov95_02247628 * param0); UnkStruct_0200B358 * ov95_0224762C(UnkStruct_ov95_02247628 * param0); -UnkStruct_0200B144 * ov95_02247630(UnkStruct_ov95_02247628 * param0); +MessageLoader * ov95_02247630(UnkStruct_ov95_02247628 * param0); const BoxPokemon * ov95_02247634(UnkStruct_ov95_02247628 * param0); const BoxPokemon * ov95_0224763C(UnkStruct_ov95_02247628 * param0); u32 ov95_02247644(UnkStruct_ov95_02247628 * param0); diff --git a/include/overlay096/struct_ov96_0223BF40_t.h b/include/overlay096/struct_ov96_0223BF40_t.h index a9682475ab..d1eb68c4cd 100644 --- a/include/overlay096/struct_ov96_0223BF40_t.h +++ b/include/overlay096/struct_ov96_0223BF40_t.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_02018340_decl.h" @@ -51,9 +51,9 @@ struct UnkStruct_ov96_0223BF40_t { int unk_BC4; int unk_BC8; UnkStruct_0200B358 * unk_BCC; - UnkStruct_0200B144 * unk_BD0; - UnkStruct_0200B144 * unk_BD4; - UnkStruct_0200B144 * unk_BD8; + MessageLoader * unk_BD0; + MessageLoader * unk_BD4; + MessageLoader * unk_BD8; Strbuf* unk_BDC; Strbuf* unk_BE0; Strbuf* unk_BE4; diff --git a/include/overlay097/struct_ov97_0222D04C.h b/include/overlay097/struct_ov97_0222D04C.h index d9d77783e6..6d052f0e40 100644 --- a/include/overlay097/struct_ov97_0222D04C.h +++ b/include/overlay097/struct_ov97_0222D04C.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_02013A04_decl.h" @@ -26,7 +26,7 @@ typedef struct { UnkStruct_021C0794 * unk_04; UnkStruct_020279FC * unk_08; UnkStruct_0200B358 * unk_0C; - UnkStruct_0200B144 * unk_10; + MessageLoader * unk_10; Strbuf* unk_14; UnkStruct_0205AA50 unk_18; UnkStruct_0205AA50 unk_28[3]; diff --git a/include/overlay099/ov99_021D3E78.h b/include/overlay099/ov99_021D3E78.h index 10a3497c17..a316c61879 100644 --- a/include/overlay099/ov99_021D3E78.h +++ b/include/overlay099/ov99_021D3E78.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV99_021D3E78_H #define POKEPLATINUM_OV99_021D3E78_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "overlay099/struct_ov99_021D3E78_decl.h" -UnkStruct_ov99_021D3E78 * ov99_021D3E78(UnkStruct_02018340 * param0, int param1, int param2, int param3, UnkStruct_0200B144 * param4); +UnkStruct_ov99_021D3E78 * ov99_021D3E78(UnkStruct_02018340 * param0, int param1, int param2, int param3, MessageLoader * param4); void ov99_021D3F38(UnkStruct_ov99_021D3E78 * param0); BOOL ov99_021D3F6C(UnkStruct_ov99_021D3E78 * param0, int param1); int ov99_021D4130(void); diff --git a/include/overlay099/struct_ov99_021D2CB0.h b/include/overlay099/struct_ov99_021D2CB0.h index 18270e5f2c..d1b89abdd0 100644 --- a/include/overlay099/struct_ov99_021D2CB0.h +++ b/include/overlay099/struct_ov99_021D2CB0.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_0200D0F4_decl.h" @@ -29,7 +29,7 @@ typedef struct { UnkStruct_0201CD38 * unk_14; UnkStruct_0200C6E4 * unk_18; UnkStruct_0200C704 * unk_1C; - UnkStruct_0200B144 * unk_20; + MessageLoader * unk_20; UnkStruct_0205AA50 * unk_24; UnkStruct_020203AC * unk_28; UnkStruct_020170F4 unk_2C[4]; diff --git a/include/overlay100/struct_ov100_021D46C8.h b/include/overlay100/struct_ov100_021D46C8.h index df15726269..b19e28263c 100644 --- a/include/overlay100/struct_ov100_021D46C8.h +++ b/include/overlay100/struct_ov100_021D46C8.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -27,7 +27,7 @@ typedef struct { UnkStruct_0207C690 * unk_14; UnkStruct_020203AC * unk_18; NNSFndAllocator unk_1C; - UnkStruct_0200B144 * unk_2C; + MessageLoader * unk_2C; UnkStruct_0205AA50 unk_30; int unk_40; VecFx32 unk_44; diff --git a/include/overlay101/struct_ov101_021D148C.h b/include/overlay101/struct_ov101_021D148C.h index 4457e0be2a..dfff3fa976 100644 --- a/include/overlay101/struct_ov101_021D148C.h +++ b/include/overlay101/struct_ov101_021D148C.h @@ -1,12 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_OV101_021D148C_H #define POKEPLATINUM_STRUCT_OV101_021D148C_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_defs/struct_0205AA50.h" typedef struct { - UnkStruct_0200B144 * unk_00; + MessageLoader * unk_00; UnkStruct_0200B358 * unk_04; UnkStruct_0205AA50 unk_08[1]; void * unk_18; diff --git a/include/overlay104/ov104_02231F74.h b/include/overlay104/ov104_02231F74.h index 897a8b4c17..1cdecc2c73 100644 --- a/include/overlay104/ov104_02231F74.h +++ b/include/overlay104/ov104_02231F74.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV104_02231F74_H #define POKEPLATINUM_OV104_02231F74_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200D0F4_decl.h" #include "struct_decls/struct_0201CD38_decl.h" @@ -14,13 +14,13 @@ #include "overlay104/struct_ov104_02232B5C_decl.h" #include "overlay104/struct_ov104_0223C4CC_decl.h" -void ov104_02231F74(UnkStruct_ov104_022320B4 * param0, const UnkStruct_0200B144 * param1, u16 param2, u8 param3, UnkStruct_ov104_0222FEDC * param4); +void ov104_02231F74(UnkStruct_ov104_022320B4 * param0, const MessageLoader * param1, u16 param2, u8 param3, UnkStruct_ov104_0222FEDC * param4); void ov104_02232088(UnkStruct_ov104_022320B4 * param0); void ov104_022320B4(UnkStruct_ov104_022320B4 * param0, u8 param1, u16 param2, u16 param3, u16 param4, s16 param5, u8 param6); -UnkStruct_ov104_02232B5C * ov104_02232258(UnkStruct_ov104_022320B4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0200B144 * param7); +UnkStruct_ov104_02232B5C * ov104_02232258(UnkStruct_ov104_022320B4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, MessageLoader * param7); void ov104_022322A8(UnkStruct_ov104_02232B5C * param0, u32 param1, u32 param2, u32 param3); void ov104_022322B0(UnkStruct_ov104_02232B5C * 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); +UnkStruct_ov104_02232B5C * ov104_022325FC(UnkStruct_ov104_022320B4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, MessageLoader * param7); void ov104_0223261C(UnkStruct_ov104_02232B5C * param0, u32 param1, u32 param2, u32 param3); void ov104_02232624(UnkStruct_ov104_02232B5C * param0); void ov104_02232B5C(UnkStruct_ov104_02232B5C * param0); diff --git a/include/overlay104/struct_ov104_0222E930_t.h b/include/overlay104/struct_ov104_0222E930_t.h index ee6ef633d7..a8c64d03dc 100644 --- a/include/overlay104/struct_ov104_0222E930_t.h +++ b/include/overlay104/struct_ov104_0222E930_t.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV104_0222E930_T_H #define POKEPLATINUM_STRUCT_OV104_0222E930_T_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "overlay104/funcptr_ov104_0222E930.h" #include "overlay104/funcptr_ov104_0222E974.h" #include "overlay104/struct_ov104_022320B4_decl.h" @@ -17,7 +17,7 @@ struct UnkStruct_ov104_0222E930_t { const UnkFuncPtr_ov104_0222E930 * unk_70; u32 unk_74; u16 unk_78[4]; - UnkStruct_0200B144 * unk_80; + MessageLoader * unk_80; u8 * unk_84; UnkFuncPtr_ov104_0222E974 unk_88; u8 unk_8C; diff --git a/include/overlay104/struct_ov104_022320B4_t.h b/include/overlay104/struct_ov104_022320B4_t.h index c840c085ce..a9e1f6ec4e 100644 --- a/include/overlay104/struct_ov104_022320B4_t.h +++ b/include/overlay104/struct_ov104_022320B4_t.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV104_022320B4_T_H #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "strbuf.h" #include "struct_defs/struct_0205AA50.h" @@ -17,7 +17,7 @@ struct UnkStruct_ov104_022320B4_t { UnkStruct_ov104_0222E8C8 unk_24; int unk_34; u8 unk_38; - UnkStruct_0200B144 * unk_3C; + MessageLoader * unk_3C; u8 * unk_40; UnkStruct_0200B358 * unk_44; Strbuf* unk_48; diff --git a/include/overlay109/struct_ov109_021D5140.h b/include/overlay109/struct_ov109_021D5140.h index 466731e8a9..b873e71a9f 100644 --- a/include/overlay109/struct_ov109_021D5140.h +++ b/include/overlay109/struct_ov109_021D5140.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_02018340_decl.h" @@ -34,7 +34,7 @@ typedef struct UnkStruct_ov109_021D5140_t { UnkStruct_ov109_021D5140_sub1 unk_1C; UnkStruct_0201CD38 * unk_30; UnkStruct_0200B358 * unk_34; - UnkStruct_0200B144 * unk_38; + MessageLoader * unk_38; Strbuf* unk_3C[5]; Strbuf* unk_50; Strbuf* unk_54; diff --git a/include/overlay113/ov113_02260620.h b/include/overlay113/ov113_02260620.h index 30ecc0fa35..db2abba117 100644 --- a/include/overlay113/ov113_02260620.h +++ b/include/overlay113/ov113_02260620.h @@ -1,13 +1,13 @@ #ifndef POKEPLATINUM_OV113_02260620_H #define POKEPLATINUM_OV113_02260620_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_defs/struct_0205AA50.h" #include "overlay066/struct_ov66_0222DFF8_decl.h" #include "overlay113/struct_ov113_02260818.h" -void ov113_02260620(UnkStruct_0200B144 * param0, UnkStruct_0200B358 * param1, UnkStruct_0205AA50 param2[], UnkStruct_ov66_0222DFF8 * param3, s32 param4); +void ov113_02260620(MessageLoader * param0, UnkStruct_0200B358 * param1, UnkStruct_0205AA50 param2[], UnkStruct_ov66_0222DFF8 * param3, s32 param4); void ov113_02260714(UnkStruct_0205AA50 param0[], u32 param1); u16 ov113_0226072C(int param0, u32 param1); int ov113_02260748(UnkStruct_ov113_02260818 * param0, int param1); diff --git a/include/overlay117/struct_ov117_02261280.h b/include/overlay117/struct_ov117_02261280.h index e95f7db60c..81b591f179 100644 --- a/include/overlay117/struct_ov117_02261280.h +++ b/include/overlay117/struct_ov117_02261280.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV117_02261280_H #include "struct_decls/struct_02002F38_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -46,7 +46,7 @@ typedef struct UnkStruct_ov117_02261280_t { UnkStruct_0200C704 * unk_28; UnkStruct_02018340 * unk_2C; UnkStruct_0205AA50 unk_30[5]; - UnkStruct_0200B144 * unk_80; + MessageLoader * unk_80; UnkStruct_0200B358 * unk_84; Strbuf* unk_88; UnkStruct_02002F38 * unk_8C; diff --git a/include/struct_decls/struct_0200AC5C_decl.h b/include/struct_decls/struct_0200AC5C_decl.h index 8513fecc4b..f91a4ffa29 100644 --- a/include/struct_decls/struct_0200AC5C_decl.h +++ b/include/struct_decls/struct_0200AC5C_decl.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_0200AC5C_DECL_H #define POKEPLATINUM_STRUCT_0200AC5C_DECL_H -typedef struct UnkStruct_0200AC5C_t UnkStruct_0200AC5C; +typedef struct MessageBank_t MessageBank; #endif // POKEPLATINUM_STRUCT_0200AC5C_DECL_H diff --git a/include/struct_decls/struct_0200B144_decl.h b/include/struct_decls/struct_0200B144_decl.h index d64df1d628..9d987e66d5 100644 --- a/include/struct_decls/struct_0200B144_decl.h +++ b/include/struct_decls/struct_0200B144_decl.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_0200B144_DECL_H #define POKEPLATINUM_STRUCT_0200B144_DECL_H -typedef struct UnkStruct_0200B144_t UnkStruct_0200B144; +typedef struct MessageLoader_t MessageLoader; #endif // POKEPLATINUM_STRUCT_0200B144_DECL_H diff --git a/include/struct_defs/struct_020158A8.h b/include/struct_defs/struct_020158A8.h index a6a66a40a4..99be7f6c90 100644 --- a/include/struct_defs/struct_020158A8.h +++ b/include/struct_defs/struct_020158A8.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_STRUCT_020158A8_H #define POKEPLATINUM_STRUCT_020158A8_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "strbuf.h" typedef struct { - UnkStruct_0200B144 * unk_00; + MessageLoader * unk_00; Strbuf* unk_04[29]; } UnkStruct_020158A8; diff --git a/include/struct_defs/struct_0203E724_t.h b/include/struct_defs/struct_0203E724_t.h index 6b05c509b9..c0a7861235 100644 --- a/include/struct_defs/struct_0203E724_t.h +++ b/include/struct_defs/struct_0203E724_t.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_0203E724_T_H #define POKEPLATINUM_STRUCT_0203E724_T_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0203CDB0_decl.h" #include "functypes/funcptr_0203E724.h" @@ -17,7 +17,7 @@ struct UnkStruct_0203E724_t { u32 unk_14; u32 unk_18[4]; void * unk_28; - UnkStruct_0200B144 * unk_2C; + MessageLoader * unk_2C; u8 * unk_30; UnkStruct_0203CDB0 * unk_34; }; diff --git a/include/struct_defs/struct_0207ADB4_t.h b/include/struct_defs/struct_0207ADB4_t.h index e9ed9ae52d..ef9e770268 100644 --- a/include/struct_defs/struct_0207ADB4_t.h +++ b/include/struct_defs/struct_0207ADB4_t.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" @@ -44,8 +44,8 @@ struct UnkStruct_0207ADB4_t { UnkStruct_0207C690 * unk_00; UnkStruct_02018340 * unk_04; UnkStruct_0205AA50 * unk_08; - UnkStruct_0200B144 * unk_0C; - UnkStruct_0200B144 * unk_10; + MessageLoader * unk_0C; + MessageLoader * unk_10; UnkStruct_0200B358 * unk_14; Strbuf* unk_18; UnkStruct_0201CD38 * unk_1C; diff --git a/include/struct_defs/struct_0207AE68_t.h b/include/struct_defs/struct_0207AE68_t.h index 27bcad4f18..a026543e30 100644 --- a/include/struct_defs/struct_0207AE68_t.h +++ b/include/struct_defs/struct_0207AE68_t.h @@ -6,7 +6,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02007C7C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02015F84_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -26,7 +26,7 @@ struct UnkStruct_0207AE68_t { UnkStruct_02018340 * unk_00; UnkStruct_0205AA50 * unk_04; - UnkStruct_0200B144 * unk_08; + MessageLoader * unk_08; UnkStruct_0200B358 * unk_0C; Strbuf* unk_10; UnkStruct_02002F38 * unk_14; diff --git a/include/struct_defs/struct_0207F248.h b/include/struct_defs/struct_0207F248.h index 5891e69562..a0a2f6ec79 100644 --- a/include/struct_defs/struct_0207F248.h +++ b/include/struct_defs/struct_0207F248.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_0207F248_H #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" @@ -37,7 +37,7 @@ typedef struct { UnkStruct_02022550 * unk_5B0[29]; UnkStruct_0200D0F4 * unk_624[29]; UnkStruct_0200C440 * unk_698; - UnkStruct_0200B144 * unk_69C; + MessageLoader * unk_69C; UnkStruct_0200B358 * unk_6A0; Strbuf* unk_6A4; Strbuf* unk_6A8; diff --git a/include/struct_defs/struct_0208D7BC.h b/include/struct_defs/struct_0208D7BC.h index f2105e3aa8..c72b5fb13d 100644 --- a/include/struct_defs/struct_0208D7BC.h +++ b/include/struct_defs/struct_0208D7BC.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_0208D7BC_H #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" @@ -34,12 +34,12 @@ typedef struct { UnkStruct_02022550 * unk_41C[77]; UnkStruct_0200D0F4 * unk_550[77]; UnkStruct_0200C440 * unk_684; - UnkStruct_0200B144 * unk_688; - UnkStruct_0200B144 * unk_68C; + MessageLoader * unk_688; + MessageLoader * unk_68C; UnkStruct_0200B358 * unk_690; Strbuf* unk_694; Strbuf* unk_698; - UnkStruct_0200B144 * unk_69C; + MessageLoader * unk_69C; NARC * unk_6A0; s8 unk_6A4; u8 unk_6A5_0 : 4; diff --git a/include/struct_defs/struct_02090800.h b/include/struct_defs/struct_02090800.h index 2fdb425b50..9d41d6ac02 100644 --- a/include/struct_defs/struct_02090800.h +++ b/include/struct_defs/struct_02090800.h @@ -1,14 +1,14 @@ #ifndef POKEPLATINUM_STRUCT_02090800_H #define POKEPLATINUM_STRUCT_02090800_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_defs/pokemon.h" #include "struct_defs/struct_02090800_sub1.h" typedef struct { int unk_00; - UnkStruct_0200B144 * unk_04; + MessageLoader * unk_04; UnkStruct_0200B358 * unk_08; Pokemon * unk_0C; BOOL unk_10; diff --git a/include/struct_defs/struct_02095E80_t.h b/include/struct_defs/struct_02095E80_t.h index 7f0700c4f2..af0c2a8811 100644 --- a/include/struct_defs/struct_02095E80_t.h +++ b/include/struct_defs/struct_02095E80_t.h @@ -7,7 +7,7 @@ #include "struct_defs/struct_02008A90.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_02013A04_decl.h" @@ -67,7 +67,7 @@ struct UnkStruct_02095E80_t { UnkStruct_0200B358 * unk_178; UnkStruct_0200B358 * unk_17C; UnkStruct_0200B358 * unk_180; - UnkStruct_0200B144 * unk_184; + MessageLoader * unk_184; Strbuf* unk_188; Strbuf* unk_18C; Strbuf* unk_190; @@ -126,7 +126,7 @@ struct UnkStruct_02095E80_t { int unk_36C4; int unk_36C8; UnkStruct_0200B358 * unk_36CC; - UnkStruct_0200B144 * unk_36D0; + MessageLoader * unk_36D0; UnkStruct_02013A04 * unk_36D4; UnkStruct_0200112C * unk_36D8; UnkStruct_0205AA50 unk_36DC; diff --git a/include/struct_defs/struct_02095EAC_t.h b/include/struct_defs/struct_02095EAC_t.h index 3e4ef3a3b1..fb7a494248 100644 --- a/include/struct_defs/struct_02095EAC_t.h +++ b/include/struct_defs/struct_02095EAC_t.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_02015920_decl.h" @@ -24,7 +24,7 @@ struct UnkStruct_02095EAC_t { BOOL unk_04; UnkStruct_0203DDFC * unk_08; UnkStruct_0200B358 * unk_0C; - UnkStruct_0200B144 * unk_10; + MessageLoader * unk_10; Strbuf* unk_14[5]; Strbuf* unk_28; Strbuf* unk_2C; diff --git a/include/struct_defs/struct_020961E8_t.h b/include/struct_defs/struct_020961E8_t.h index c3581965d1..bfbada8b81 100644 --- a/include/struct_defs/struct_020961E8_t.h +++ b/include/struct_defs/struct_020961E8_t.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_02018340_decl.h" @@ -30,7 +30,7 @@ struct UnkStruct_020961E8_t { UnkStruct_ov59_021D109C unk_0C; UnkStruct_0201CD38 * unk_20; UnkStruct_0200B358 * unk_24; - UnkStruct_0200B144 * unk_28; + MessageLoader * unk_28; Strbuf* unk_2C[5]; Strbuf* unk_40; Strbuf* unk_44; diff --git a/include/unk_0200AC5C.h b/include/unk_0200AC5C.h index ca77f187d3..82e73ac606 100644 --- a/include/unk_0200AC5C.h +++ b/include/unk_0200AC5C.h @@ -2,28 +2,48 @@ #define POKEPLATINUM_UNK_0200AC5C_H #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200AC5C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" #include "strbuf.h" -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, 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, 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); +typedef struct MessageBankEntry { + u32 unk_00; + u32 unk_04; +} MessageBankEntry; + +typedef struct MessageBank { + u16 unk_00; + u16 unk_02; + MessageBankEntry unk_04[]; +} MessageBank; + +typedef struct MessageLoader { + u16 unk_00; + u16 unk_02; + u16 unk_04; + u16 unk_06; + union { + MessageBank * unk_08_val1; + NARC * unk_08_val2; + }; +} MessageLoader; + +MessageBank * MessageBank_Load(u32 param0, u32 param1, u32 param2); +void MessageBank_Free(MessageBank * param0); +void MessageBank_Get(const MessageBank * param0, u32 param1, u16 * param2); +void MessageBank_GetFromNARC(u32 param0, u32 param1, u32 param2, u32 param3, u16 * param4); +void MessageBank_GetStrbuf(const MessageBank * param0, u32 param1, Strbuf *param2); +Strbuf* MessageBank_GetNewStrbuf(const MessageBank * param0, u32 param1, u32 param2); +void MessageBank_GetStrbufFromNARC(u32 param0, u32 param1, u32 param2, u32 param3, Strbuf *param4); +void MessageBank_GetStrbufFromHandle(NARC * param0, u32 param1, u32 param2, u32 param3, Strbuf *param4); +Strbuf* MessageBank_GetNewStrbufFromNARC(u32 param0, u32 param1, u32 param2, u32 param3); +Strbuf* MessageBank_GetNewStrbufFromHandle(NARC * param0, u32 param1, u32 param2, u32 param3); +u32 MessageBank_EntryCount(const MessageBank * param0); +u32 MessageBank_NARCEntryCount(u32 param0, u32 param1); +MessageLoader * MessageLoader_Init(int param0, u32 param1, u32 param2, u32 param3); +void MessageLoader_Free(MessageLoader * param0); +void MessageLoader_GetStrbuf(const MessageLoader * param0, u32 param1, Strbuf *param2); +Strbuf* MessageLoader_GetNewStrbuf(const MessageLoader * param0, u32 param1); +u32 MessageLoader_MessageCount(const MessageLoader * param0); +void MessageLoader_Get(const MessageLoader * param0, u32 param1, u16 * param2); +void MessageLoader_GetSpeciesName(u32 param0, u32 param1, u16 * param2); #endif // POKEPLATINUM_UNK_0200AC5C_H diff --git a/include/unk_0200B29C.h b/include/unk_0200B29C.h index b40a0a6a07..4dbe3f365c 100644 --- a/include/unk_0200B29C.h +++ b/include/unk_0200B29C.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_UNK_0200B29C_H #define POKEPLATINUM_UNK_0200B29C_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "strbuf.h" -Strbuf* sub_0200B29C(UnkStruct_0200B358 * param0, UnkStruct_0200B144 * param1, u32 param2, u32 param3); +Strbuf* sub_0200B29C(UnkStruct_0200B358 * param0, MessageLoader * param1, u32 param2, u32 param3); Strbuf* sub_0200B2EC(u32 param0, u32 param1); Strbuf* sub_0200B32C(u32 param0, u32 param1); diff --git a/include/unk_02013A04.h b/include/unk_02013A04.h index df53c9542f..719ce00ced 100644 --- a/include/unk_02013A04.h +++ b/include/unk_02013A04.h @@ -1,13 +1,13 @@ #ifndef POKEPLATINUM_UNK_02013A04_H #define POKEPLATINUM_UNK_02013A04_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02013A04_decl.h" #include "strbuf.h" 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_02013A4C(UnkStruct_02013A04 * param0, const MessageLoader * param1, u32 param2, u32 param3); 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_02071CFC.h b/include/unk_02071CFC.h index de03a7dbbb..d5fa84ce8a 100644 --- a/include/unk_02071CFC.h +++ b/include/unk_02071CFC.h @@ -1,10 +1,10 @@ #ifndef POKEPLATINUM_UNK_02071CFC_H #define POKEPLATINUM_UNK_02071CFC_H -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "strbuf.h" -u32 sub_02071CFC(UnkStruct_0200B144 * param0, const int param1, Strbuf *param2); +u32 sub_02071CFC(MessageLoader * 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/src/berry_data.c b/src/berry_data.c index 509c810dbd..ddb26f55c8 100644 --- a/src/berry_data.c +++ b/src/berry_data.c @@ -2,12 +2,11 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" -#include "strbuf.h" #include "narc.h" #include "unk_0200AC5C.h" #include "berry_data.h" +#include "strbuf.h" typedef struct BerryData { u16 size; @@ -80,24 +79,24 @@ u32 BerryData_GetAttribute (BerryData * berryData, u32 attributeID) Strbuf* BerryData_AllocAndGetName (u16 index, u32 heapID) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; Strbuf* v1; - v0 = sub_0200B144(1, 26, 424, heapID); - v1 = sub_0200B1EC(v0, index); + v0 = MessageLoader_Init(1, 26, 424, heapID); + v1 = MessageLoader_GetNewStrbuf(v0, index); - sub_0200B190(v0); + MessageLoader_Free(v0); return v1; } Strbuf* BerryData_AllocAndGetDescription (u16 index, u16 heapID) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; Strbuf* v1; - v0 = sub_0200B144(1, 26, 423, heapID); - v1 = sub_0200B1EC(v0, index); + v0 = MessageLoader_Init(1, 26, 423, heapID); + v1 = MessageLoader_GetNewStrbuf(v0, index); - sub_0200B190(v0); + MessageLoader_Free(v0); return v1; } diff --git a/src/error_message_reset.c b/src/error_message_reset.c index db05d5c54a..ef519a68b3 100644 --- a/src/error_message_reset.c +++ b/src/error_message_reset.c @@ -3,7 +3,7 @@ #include "data_021BF67C.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" @@ -95,7 +95,7 @@ void ErrorMessageReset_PrintErrorAndReset (void) { UnkStruct_02018340 * bgConfig; UnkStruct_0205AA50 window; - UnkStruct_0200B144 * errorMsgData; + MessageLoader * errorMsgData; Strbuf* errorString; int v4; int v5 = 0; @@ -148,7 +148,7 @@ void ErrorMessageReset_PrintErrorAndReset (void) sub_0201975C(0, 0x6c21); sub_0201975C(4, 0x6c21); - errorMsgData = sub_0200B144(1, 26, 214, v5); + errorMsgData = MessageLoader_Init(1, 26, 214, v5); errorString = Strbuf_Init(0x180, v5); sub_0201D710(); @@ -156,7 +156,7 @@ void ErrorMessageReset_PrintErrorAndReset (void) sub_0201A8D4(bgConfig, &window, &sErrorMessageWindowTemplate); sub_0201AE78(&window, 15, 0, 0, 26 * 8, 18 * 8); sub_0200DC48(&window, 0, (512 - 9), 2); - sub_0200B1B8(errorMsgData, v4, errorString); + MessageLoader_GetStrbuf(errorMsgData, v4, errorString); sub_0201D738(&window, 0, errorString, 0, 0, 0, NULL); Strbuf_Free(errorString); @@ -191,7 +191,7 @@ void ErrorMessageReset_PrintErrorAndReset (void) sub_0200F344(1, 0x7fff); sub_0201A8FC(&window); - sub_0200B190(errorMsgData); + MessageLoader_Free(errorMsgData); Heap_FreeToHeap(bgConfig); OS_ResetSystem(0); diff --git a/src/item.c b/src/item.c index d922af68ff..750fdc6132 100644 --- a/src/item.c +++ b/src/item.c @@ -4,8 +4,6 @@ #include "constants/items.h" #include "constants/moves.h" -#include "struct_decls/struct_0200B144_decl.h" - #include "struct_defs/struct_0207CDEC.h" #include "unk_0200AC5C.h" @@ -788,18 +786,18 @@ void* Item_Load(u16 item, enum ItemFileType type, u32 heapID) void Item_LoadName(Strbuf *dst, u16 item, u32 heapID) { - UnkStruct_0200B144 *msgData = sub_0200B144(1, 26, 392, heapID); + MessageLoader *msgData = MessageLoader_Init(1, 26, 392, heapID); - sub_0200B1B8(msgData, item, dst); - sub_0200B190(msgData); + MessageLoader_GetStrbuf(msgData, item, dst); + MessageLoader_Free(msgData); } void Item_LoadDescription(Strbuf *dst, u16 item, u16 heapID) { - UnkStruct_0200B144 *msgData = sub_0200B144(1, 26, 391, heapID); + MessageLoader *msgData = MessageLoader_Init(1, 26, 391, heapID); - sub_0200B1B8(msgData, item, dst); - sub_0200B190(msgData); + MessageLoader_GetStrbuf(msgData, item, dst); + MessageLoader_Free(msgData); } s32 Item_LoadParam(u16 item, enum ItemDataParam param, u32 heapID) diff --git a/src/overlay005/ov5_021DC018.c b/src/overlay005/ov5_021DC018.c index 0005b11f63..a0fd5f2d45 100644 --- a/src/overlay005/ov5_021DC018.c +++ b/src/overlay005/ov5_021DC018.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_0201CD38_decl.h" @@ -43,7 +43,7 @@ struct UnkStruct_ov5_021DC1A4_t { UnkStruct_0205AA50 unk_08; UnkStruct_0205AA50 * unk_18; Strbuf* unk_1C[28]; - UnkStruct_0200B144 * unk_8C; + MessageLoader * unk_8C; UnkStruct_0200B358 * unk_90; u8 unk_94; u8 unk_95; @@ -73,8 +73,8 @@ struct UnkStruct_ov5_021DC1A4_t { u16 unk_2DC; }; -static void ov5_021DC018(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021DC1A4 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, UnkStruct_0200B358 * param7, UnkStruct_0205AA50 * param8, UnkStruct_0200B144 * param9); -UnkStruct_ov5_021DC1A4 * ov5_021DC150(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, UnkStruct_0200B144 * param8); +static void ov5_021DC018(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021DC1A4 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, UnkStruct_0200B358 * param7, UnkStruct_0205AA50 * param8, MessageLoader * param9); +UnkStruct_ov5_021DC1A4 * ov5_021DC150(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, MessageLoader * param8); void ov5_021DC1A4(UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2); void ov5_021DC1AC(UnkStruct_ov5_021DC1A4 * param0); void ov5_021DCD94(UnkStruct_ov5_021DC1A4 * param0, u8 param1); @@ -83,7 +83,7 @@ static void ov5_021DC290(UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2 static u32 ov5_021DC300(UnkStruct_ov5_021DC1A4 * param0); static void ov5_021DC33C(UnkStruct_ov5_021DC1A4 * param0); static void ov5_021DC3B0(UnkStruct_0201CD38 * param0, void * param1); -UnkStruct_ov5_021DC1A4 * ov5_021DC48C(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, UnkStruct_0200B144 * param8); +UnkStruct_ov5_021DC1A4 * ov5_021DC48C(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, MessageLoader * param8); void ov5_021DC4B0(UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2, u32 param3); void ov5_021DC4B8(UnkStruct_ov5_021DC1A4 * param0); void ov5_021DC528(UnkStruct_ov5_021DC1A4 * param0, u16 param1); @@ -104,12 +104,12 @@ u16 ov5_021DCCC8(int param0); UnkStruct_ov5_021DC1A4 * ov5_021DD250(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 * param3, UnkStruct_0200B358 * param4, u8 param5, u8 param6, u8 param7, u8 param8); void ov5_021DD3A8(UnkStruct_ov5_021DC1A4 * param0); -static void ov5_021DC018 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021DC1A4 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, UnkStruct_0200B358 * param7, UnkStruct_0205AA50 * param8, UnkStruct_0200B144 * param9) +static void ov5_021DC018 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021DC1A4 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, UnkStruct_0200B358 * param7, UnkStruct_0205AA50 * param8, MessageLoader * param9) { int v0; if (param9 == NULL) { - param1->unk_8C = sub_0200B144(1, 26, 361, 4); + param1->unk_8C = MessageLoader_Init(1, 26, 361, 4); param1->unk_97_1 = 1; } else { param1->unk_8C = param9; @@ -155,7 +155,7 @@ static void ov5_021DC018 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021DC1A4 * return; } -UnkStruct_ov5_021DC1A4 * ov5_021DC150 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, UnkStruct_0200B144 * param8) +UnkStruct_ov5_021DC1A4 * ov5_021DC150 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, MessageLoader * param8) { UnkStruct_ov5_021DC1A4 * v0; int v1; @@ -218,7 +218,7 @@ static void ov5_021DC290 (UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param { Strbuf* v2 = Strbuf_Init((40 * 2), 4); - sub_0200B1B8(param0->unk_8C, param1, v2); + MessageLoader_GetStrbuf(param0->unk_8C, param1, v2); sub_0200C388(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); param0->unk_BC[param0->unk_9B].unk_00 = (const void *)param0->unk_1C[param0->unk_9B]; Strbuf_Free(v2); @@ -322,7 +322,7 @@ void ov5_021DC424 (UnkStruct_ov5_021DC1A4 * param0) } if (param0->unk_97_1 == 1) { - sub_0200B190(param0->unk_8C); + MessageLoader_Free(param0->unk_8C); } sub_0200DA58(param0->unk_04); @@ -331,7 +331,7 @@ void ov5_021DC424 (UnkStruct_ov5_021DC1A4 * param0) return; } -UnkStruct_ov5_021DC1A4 * ov5_021DC48C (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, UnkStruct_0200B144 * param8) +UnkStruct_ov5_021DC1A4 * ov5_021DC48C (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, MessageLoader * param8) { return ov5_021DC150(param0, param1, param2, param3, param4, param5, param6, param7, param8); } @@ -442,7 +442,7 @@ static void ov5_021DC708 (UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param { Strbuf* v2 = Strbuf_Init((40 * 2), 4); - sub_0200B1B8(param0->unk_8C, param1, v2); + MessageLoader_GetStrbuf(param0->unk_8C, param1, v2); sub_0200C388(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); param0->unk_1C4[param0->unk_9B].unk_00 = (const void *)param0->unk_1C[param0->unk_9B]; Strbuf_Free(v2); @@ -598,7 +598,7 @@ static void ov5_021DCA28 (UnkStruct_ov5_021DC1A4 * param0) } if (param0->unk_97_1 == 1) { - sub_0200B190(param0->unk_8C); + MessageLoader_Free(param0->unk_8C); } sub_0200DA58(param0->unk_04); @@ -613,7 +613,7 @@ static void ov5_021DCA90 (UnkStruct_ov5_021DC1A4 * param0, u16 param1, u32 param Strbuf* v1 = Strbuf_Init((40 * 2), 4); sub_0201ADA4(param0->unk_18, 15); - sub_0200B1B8(param0->unk_8C, param1, v0); + MessageLoader_GetStrbuf(param0->unk_8C, param1, v0); sub_0200C388(param0->unk_90, v1, v0); sub_0201D738(param0->unk_18, 1, v1, 0, 0, param2, NULL); Strbuf_Free(v0); @@ -668,7 +668,7 @@ static void ov5_021DCC00 (UnkStruct_ov5_021DC1A4 * param0, u16 param1, u8 param2 Strbuf* v0 = Strbuf_Init((40 * 2), 4); Strbuf* v1 = Strbuf_Init((40 * 2), 4); - sub_0200B1B8(param0->unk_8C, param1, v0); + MessageLoader_GetStrbuf(param0->unk_8C, param1, v0); sub_0200C388(param0->unk_90, v1, v0); sub_0201D738(¶m0->unk_08, 0, v1, param2, param3, 0xff, NULL); Strbuf_Free(v0); @@ -693,7 +693,7 @@ static void ov5_021DCC64 (UnkStruct_0201CD38 * param0, void * param1) } if (v1->unk_97_1 == 1) { - sub_0200B190(v1->unk_8C); + MessageLoader_Free(v1->unk_8C); } sub_0200DA58(v1->unk_04); @@ -823,14 +823,14 @@ UnkStruct_0205AA50 * ov5_021DCEB0 (UnkStruct_0203CDB0 * param0, u8 param1, u8 pa sub_0201ADA4(v0, 15); { - UnkStruct_0200B144 * v1; + MessageLoader * v1; Strbuf* v2; - v1 = sub_0200B144(0, 26, 543, 4); - v2 = sub_0200B1EC(v1, 18); + v1 = MessageLoader_Init(0, 26, 543, 4); + v2 = MessageLoader_GetNewStrbuf(v1, 18); sub_0201D738(v0, 0, v2, 0, 0, 0xff, NULL); - sub_0200B190(v1); + MessageLoader_Free(v1); Strbuf_Free(v2); } @@ -847,7 +847,7 @@ void ov5_021DCF58 (UnkStruct_0205AA50 * param0) void ov5_021DCF6C (UnkStruct_0203CDB0 * param0, UnkStruct_0205AA50 * param1) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; UnkStruct_0200B358 * v1; Strbuf* v2; Strbuf* v3; @@ -856,10 +856,10 @@ void ov5_021DCF6C (UnkStruct_0203CDB0 * param0, UnkStruct_0205AA50 * param1) sub_0201AE78(param1, 15, 0, 16, 10 * 8, 4 * 8 - 16); - v0 = sub_0200B144(0, 26, 543, 4); + v0 = MessageLoader_Init(0, 26, 543, 4); v1 = sub_0200B358(4); v2 = Strbuf_Init(16, 4); - v3 = sub_0200B1EC(v0, 19); + v3 = MessageLoader_GetNewStrbuf(v0, 19); v4 = sub_02025F74(sub_02025E38(param0->unk_0C)); sub_0200B60C(v1, 0, v4, 6, 1, 1); @@ -871,7 +871,7 @@ void ov5_021DCF6C (UnkStruct_0203CDB0 * param0, UnkStruct_0205AA50 * param1) Strbuf_Free(v3); Strbuf_Free(v2); sub_0200B3F0(v1); - sub_0200B190(v0); + MessageLoader_Free(v0); sub_0201A9A4(param1); } @@ -896,7 +896,7 @@ void ov5_021DD084 (UnkStruct_0205AA50 * param0) void ov5_021DD098 (UnkStruct_0203CDB0 * param0, UnkStruct_0205AA50 * param1) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; UnkStruct_0200B358 * v1; Strbuf* v2; Strbuf* v3; @@ -905,10 +905,10 @@ void ov5_021DD098 (UnkStruct_0203CDB0 * param0, UnkStruct_0205AA50 * param1) sub_0201ADA4(param1, 15); - v0 = sub_0200B144(0, 26, 361, 4); + v0 = MessageLoader_Init(0, 26, 361, 4); v1 = sub_0200B358(4); v2 = Strbuf_Init(16, 4); - v3 = sub_0200B1EC(v0, 197); + v3 = MessageLoader_GetNewStrbuf(v0, 197); v4 = Coins_GetValue(sub_02025E50(param0->unk_0C)); sub_0200B60C(v1, 0, v4, 5, 1, 1); @@ -920,7 +920,7 @@ void ov5_021DD098 (UnkStruct_0203CDB0 * param0, UnkStruct_0205AA50 * param1) Strbuf_Free(v3); Strbuf_Free(v2); sub_0200B3F0(v1); - sub_0200B190(v0); + MessageLoader_Free(v0); sub_0201A9A4(param1); } @@ -939,7 +939,7 @@ UnkStruct_0205AA50 * ov5_021DD140 (UnkStruct_0203CDB0 * param0, u8 param1, u8 pa void ov5_021DD1A4 (UnkStruct_0203CDB0 * param0, UnkStruct_0205AA50 * param1) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; UnkStruct_0200B358 * v1; Strbuf* v2; Strbuf* v3; @@ -948,10 +948,10 @@ void ov5_021DD1A4 (UnkStruct_0203CDB0 * param0, UnkStruct_0205AA50 * param1) sub_0201ADA4(param1, 15); - v0 = sub_0200B144(0, 26, 361, 4); + v0 = MessageLoader_Init(0, 26, 361, 4); v1 = sub_0200B358(4); v2 = Strbuf_Init(16, 4); - v3 = sub_0200B1EC(v0, 230); + v3 = MessageLoader_GetNewStrbuf(v0, 230); v4 = sub_0202D230(sub_0202D750(param0->unk_0C), 0, 0); sub_0200B60C(v1, 0, v4, 5, 1, 1); @@ -963,7 +963,7 @@ void ov5_021DD1A4 (UnkStruct_0203CDB0 * param0, UnkStruct_0205AA50 * param1) Strbuf_Free(v3); Strbuf_Free(v2); sub_0200B3F0(v1); - sub_0200B190(v0); + MessageLoader_Free(v0); sub_0201A9A4(param1); } @@ -1012,7 +1012,7 @@ void ov5_021DD3A8 (UnkStruct_ov5_021DC1A4 * param0) } if (param0->unk_97_1 == 1) { - sub_0200B190(param0->unk_8C); + MessageLoader_Free(param0->unk_8C); } Heap_FreeToHeap(param0); diff --git a/src/overlay005/ov5_021DD42C.c b/src/overlay005/ov5_021DD42C.c index 9290b969ba..8c0f697ad7 100644 --- a/src/overlay005/ov5_021DD42C.c +++ b/src/overlay005/ov5_021DD42C.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "strbuf.h" #include "struct_decls/struct_0203E724_decl.h" @@ -37,7 +37,7 @@ static u8 ov5_021DD574(UnkStruct_0203E724 * param0); static void ov5_021DD588(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021DD648 * param1); static void ov5_021DD5D0(UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param1, UnkStruct_ov5_021DD648 * param2); static void ov5_021DD610(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021DD648 * param1); -static void ov5_021DD648(UnkStruct_ov5_021DD648 * param0, const UnkStruct_0200B144 * param1, u32 param2); +static void ov5_021DD648(UnkStruct_ov5_021DD648 * param0, const MessageLoader * param1, u32 param2); static void ov5_021DD664(UnkStruct_ov5_021DD648 * param0, u16 param1, u16 param2, u16 param3, u16 param4); static void ov5_021DD6B4(UnkStruct_ov5_021DD648 * param0, int param1, int param2, int param3, int param4); static void ov5_021DD6DC(UnkStruct_ov5_021DD648 * param0, int param1); @@ -49,7 +49,7 @@ void ov5_021DD42C (UnkStruct_ov5_021DD42C * param0, UnkStruct_0203E724 * param1) param0->unk_02 = 1; } -void ov5_021DD444 (UnkStruct_0203E724 * param0, const UnkStruct_0200B144 * param1, u16 param2, u8 param3, UnkStruct_ov5_021DD42C * param4) +void ov5_021DD444 (UnkStruct_0203E724 * param0, const MessageLoader * param1, u16 param2, u8 param3, UnkStruct_ov5_021DD42C * param4) { UnkStruct_ov5_021DD648 v0; u8 v1; @@ -73,7 +73,7 @@ void ov5_021DD444 (UnkStruct_0203E724 * param0, const UnkStruct_0200B144 * param ov5_021DD6B4(&v0, v3, v1, param3, v2); } -void ov5_021DD498 (UnkStruct_0203E724 * param0, const UnkStruct_0200B144 * param1, int param2) +void ov5_021DD498 (UnkStruct_0203E724 * param0, const MessageLoader * param1, int param2) { UnkStruct_ov5_021DD648 v0; @@ -145,9 +145,9 @@ static void ov5_021DD610 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021DD648 * sub_0201ADA4(param1->unk_0C, 15); } -static void ov5_021DD648 (UnkStruct_ov5_021DD648 * param0, const UnkStruct_0200B144 * param1, u32 param2) +static void ov5_021DD648 (UnkStruct_ov5_021DD648 * param0, const MessageLoader * param1, u32 param2) { - sub_0200B1B8(param1, param2, param0->unk_04); + MessageLoader_GetStrbuf(param1, param2, param0->unk_04); sub_0200C388(param0->unk_08, param0->unk_00, param0->unk_04); } diff --git a/src/overlay005/ov5_021DD6FC.c b/src/overlay005/ov5_021DD6FC.c index b9c7aac480..647e1e8d9b 100644 --- a/src/overlay005/ov5_021DD6FC.c +++ b/src/overlay005/ov5_021DD6FC.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "strbuf.h" @@ -35,7 +35,7 @@ typedef struct UnkStruct_ov5_021DD9C8_t { u8 unk_31; NNSG2dCharacterData * unk_34; void * unk_38; - UnkStruct_0200B144 * unk_3C; + MessageLoader * unk_3C; Strbuf* unk_40; } UnkStruct_ov5_021DD9C8; @@ -234,13 +234,13 @@ UnkStruct_ov5_021DD9C8 * ov5_021DD98C (UnkStruct_02018340 * param0) ov5_021DD894(v0, param0); ov5_021DD718(v0); - v0->unk_3C = sub_0200B144(1, 26, 433, 4); + v0->unk_3C = MessageLoader_Init(1, 26, 433, 4); return v0; } void ov5_021DD9C8 (UnkStruct_ov5_021DD9C8 * param0) { - sub_0200B190(param0->unk_3C); + MessageLoader_Free(param0->unk_3C); sub_0201A8FC(¶m0->unk_20); Strbuf_Free(param0->unk_40); Heap_FreeToHeap(param0); diff --git a/src/overlay005/ov5_021E1D20.c b/src/overlay005/ov5_021E1D20.c index 19ebe93de6..5bcf3935ad 100644 --- a/src/overlay005/ov5_021E1D20.c +++ b/src/overlay005/ov5_021E1D20.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" @@ -50,7 +50,7 @@ struct UnkStruct_ov5_021E1FF4_t { UnkStruct_02018340 * unk_0C; UnkStruct_0205AA50 * unk_10; UnkStruct_0200B358 * unk_14; - UnkStruct_0200B144 * unk_18; + MessageLoader * unk_18; UnkStruct_ov5_021E1D20 unk_1C; int unk_2C; int unk_30; @@ -157,7 +157,7 @@ static void ov5_021E1E20 (const UnkStruct_ov5_021E1FF4 * param0) } v2 += v3; - v0 = sub_0200B1EC(param0->unk_18, Unk_ov5_021F9CCC[v4]); + v0 = MessageLoader_GetNewStrbuf(param0->unk_18, Unk_ov5_021F9CCC[v4]); sub_0201D738(param0->unk_10, 0, v0, 0, v2, 0xff, NULL); Strbuf_Free(v0); @@ -200,7 +200,7 @@ UnkStruct_ov5_021E1FF4 * ov5_021E1F98 (UnkStruct_0203CDB0 * param0, int param1, v0->unk_08 = param2; v0->unk_0C = param0->unk_08; v0->unk_14 = sub_0200B358(param1); - v0->unk_18 = sub_0200B144(1, 26, 534, param1); + v0->unk_18 = MessageLoader_Init(1, 26, 534, param1); ov5_021E1D20(&v0->unk_1C, v0->unk_00); ov5_021E1D6C(v0->unk_14, &v0->unk_1C); @@ -213,7 +213,7 @@ UnkStruct_ov5_021E1FF4 * ov5_021E1F98 (UnkStruct_0203CDB0 * param0, int param1, void ov5_021E1FF4 (UnkStruct_ov5_021E1FF4 * param0) { - sub_0200B190(param0->unk_18); + MessageLoader_Free(param0->unk_18); sub_0200B3F0(param0->unk_14); Heap_FreeToHeap(param0); } diff --git a/src/overlay005/ov5_021E2338.c b/src/overlay005/ov5_021E2338.c index 35585f048d..2909faaf23 100644 --- a/src/overlay005/ov5_021E2338.c +++ b/src/overlay005/ov5_021E2338.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013BE0_decl.h" #include "struct_decls/struct_0201CD38_decl.h" @@ -2621,19 +2621,19 @@ static BOOL ov5_021E51B4 (UnkStruct_ov5_021E5128 * param0) static Strbuf* ov5_021E5240 (u32 param0, u32 param1) { UnkStruct_0200B358 * v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; Strbuf* v2; Strbuf* v3; - v1 = sub_0200B144(1, 26, 359, param1); + v1 = MessageLoader_Init(1, 26, 359, param1); v0 = sub_0200B358(param1); v2 = Strbuf_Init(128, param1); v3 = Strbuf_Init(128, param1); - sub_0200B1B8(v1, 0, v3); + MessageLoader_GetStrbuf(v1, 0, v3); sub_0200BA08(v0, 0, param0); sub_0200C388(v0, v2, v3); - sub_0200B190(v1); + MessageLoader_Free(v1); sub_0200B3F0(v0); Strbuf_Free(v3); return v2; diff --git a/src/overlay005/ov5_021E622C.c b/src/overlay005/ov5_021E622C.c index f2a1cb0a80..541e98bd89 100644 --- a/src/overlay005/ov5_021E622C.c +++ b/src/overlay005/ov5_021E622C.c @@ -3145,7 +3145,7 @@ void ov5_021E771C (Pokemon * param0, int param1) v4 = GetMonData(param0, MON_DATA_SPECIES, NULL); - sub_0200B274(v4, 0, v5); + MessageLoader_GetSpeciesName(v4, 0, v5); sub_02074B30(param0, 117, v5); sub_02074B30(param0, 77, &v1); sub_02074B30(param0, 155, &v2); diff --git a/src/overlay005/ov5_021EA874.c b/src/overlay005/ov5_021EA874.c index a879db9888..5646dcf964 100644 --- a/src/overlay005/ov5_021EA874.c +++ b/src/overlay005/ov5_021EA874.c @@ -3,7 +3,7 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "strbuf.h" @@ -53,7 +53,7 @@ typedef struct { UnkStruct_0203CDB0 * unk_30; UnkStruct_021C0794 * unk_34; UnkStruct_0200B358 * unk_38; - UnkStruct_0200B144 * unk_3C; + MessageLoader * unk_3C; int unk_40; UnkStruct_02001AF4 * unk_44; int unk_48; @@ -274,7 +274,7 @@ static BOOL ov5_021EAB58 (UnkStruct_ov5_021EAE78 * param0) sub_0200DC48(¶m0->unk_20, 1, 1024 - (18 + 12) - 9, 11); { - UnkStruct_0200B144 * v4; + MessageLoader * v4; int v5 = 0; for (v5 = 0; v5 < 32; v5++) { @@ -443,7 +443,7 @@ static void ov5_021EAE78 (UnkStruct_ov5_021EAE78 * param0, int param1) sub_0201A8FC(¶m0->unk_10); } - sub_0200B1B8(param0->unk_3C, param1, param0->unk_08); + MessageLoader_GetStrbuf(param0->unk_3C, param1, param0->unk_08); sub_0200C388(param0->unk_38, param0->unk_0C, param0->unk_08); sub_0205D8F4(param0->unk_30->unk_08, ¶m0->unk_10, 3); sub_0205D944(¶m0->unk_10, sub_02025E44(param0->unk_30->unk_0C)); @@ -456,14 +456,14 @@ static void ov5_021EAEE0 (UnkStruct_ov5_021EAE78 * param0) MI_CpuClear8(param0, sizeof(UnkStruct_ov5_021EAE78)); param0->unk_38 = sub_0200B358(4); - param0->unk_3C = sub_0200B144(0, 26, 675, 4); + param0->unk_3C = MessageLoader_Init(0, 26, 675, 4); param0->unk_0C = Strbuf_Init(110, 4); param0->unk_08 = Strbuf_Init(110, 4); } static void ov5_021EAF1C (UnkStruct_ov5_021EAE78 * param0) { - sub_0200B190(param0->unk_3C); + MessageLoader_Free(param0->unk_3C); sub_0200B3F0(param0->unk_38); Strbuf_Free(param0->unk_0C); Strbuf_Free(param0->unk_08); diff --git a/src/overlay005/ov5_021F08CC.c b/src/overlay005/ov5_021F08CC.c index d673cee100..c9e24f0270 100644 --- a/src/overlay005/ov5_021F08CC.c +++ b/src/overlay005/ov5_021F08CC.c @@ -3,7 +3,7 @@ #include "data_021BF67C.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "strbuf.h" @@ -70,7 +70,7 @@ typedef struct { Strbuf* unk_30; UnkStruct_0200B358 * unk_34; UnkStruct_0205AA50 unk_38; - UnkStruct_0200B144 * unk_48; + MessageLoader * unk_48; } UnkStruct_ov5_021F0D6C; static void ov5_021F0A04(UnkStruct_0201CD38 * param0, void * param1); @@ -509,7 +509,7 @@ static void ov5_021F0D6C (UnkStruct_ov5_021F0D6C * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_20; - param0->unk_48 = sub_0200B144(1, 26, 213, 4); + param0->unk_48 = MessageLoader_Init(1, 26, 213, 4); param0->unk_2C = Strbuf_Init(0x400, 4); param0->unk_30 = Strbuf_Init(0x400, 4); param0->unk_34 = sub_0200B368(8, 64, 4); @@ -520,7 +520,7 @@ static void ov5_021F0DA4 (UnkStruct_ov5_021F0D6C * param0) sub_0200B3F0(param0->unk_34); Strbuf_Free(param0->unk_2C); Strbuf_Free(param0->unk_30); - sub_0200B190(param0->unk_48); + MessageLoader_Free(param0->unk_48); } static void ov5_021F0DC4 (UnkStruct_ov5_021F0D6C * param0) @@ -538,7 +538,7 @@ static void ov5_021F0DE8 (UnkStruct_ov5_021F0D6C * param0, u32 param1) { UnkStruct_0203CDB0 * v0 = param0->unk_20; - sub_0200B1B8(param0->unk_48, param1, param0->unk_30); + MessageLoader_GetStrbuf(param0->unk_48, param1, param0->unk_30); sub_0200C388(param0->unk_34, param0->unk_2C, param0->unk_30); param0->unk_28 = sub_0205D994(¶m0->unk_38, param0->unk_2C, sub_02025E44(v0->unk_0C), 1); diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index eb4564a427..e1834ade45 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -4,7 +4,7 @@ #include "inlines.h" #include "struct_decls/struct_0200112C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_0201CD38_decl.h" @@ -74,7 +74,7 @@ struct UnkStruct_ov5_021F6704_t { UnkStruct_0205AA50 unk_08; UnkStruct_0205AA50 * unk_18; Strbuf* unk_1C[120]; - UnkStruct_0200B144 * unk_1FC; + MessageLoader * unk_1FC; UnkStruct_0200B358 * unk_200; u8 unk_204; u8 unk_205; @@ -108,9 +108,9 @@ BOOL ov5_021F7208(UnkStruct_0203E724 * param0); BOOL ov5_021F72B8(UnkStruct_0203E724 * param0); BOOL ov5_021F6B3C(UnkStruct_0203E724 * param0); BOOL ov5_021F6E50(UnkStruct_0203E724 * param0); -static void ov5_021F661C(UnkStruct_ov5_021F6704 * param0, UnkStruct_0200B144 * param1); -static void ov5_021F6624(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021F6704 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, UnkStruct_0200B358 * param7, UnkStruct_0205AA50 * param8, UnkStruct_0200B144 * param9, u16 * param10, u16 * param11); -UnkStruct_ov5_021F6704 * ov5_021F6704(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, UnkStruct_0200B144 * param8, u16 * param9, u16 * param10); +static void ov5_021F661C(UnkStruct_ov5_021F6704 * param0, MessageLoader * param1); +static void ov5_021F6624(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021F6704 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, UnkStruct_0200B358 * param7, UnkStruct_0205AA50 * param8, MessageLoader * param9, u16 * param10, u16 * param11); +UnkStruct_ov5_021F6704 * ov5_021F6704(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, MessageLoader * param8, u16 * param9, u16 * param10); void ov5_021F6760(UnkStruct_ov5_021F6704 * param0, u32 param1, u32 param2, u32 param3); static void ov5_021F6768(UnkStruct_ov5_021F6704 * param0); static void ov5_021F6830(UnkStruct_ov5_021F6704 * param0, u32 param1, u32 param2, u32 param3); @@ -139,8 +139,8 @@ BOOL ov5_021F6454 (UnkStruct_0203E724 * param0) u16 v2; u16 * v3; int v4, v5; - UnkStruct_0200B144 * v6; - UnkStruct_0200B144 * v7; + MessageLoader * v6; + MessageLoader * v7; UnkStruct_0203CDB0 * v8 = param0->unk_34; UnkStruct_ov5_021F6704 * v9; UnkStruct_0200B358 ** v10 = sub_0203F098(v8, 15); @@ -152,7 +152,7 @@ BOOL ov5_021F6454 (UnkStruct_0203E724 * param0) param0->unk_18[0] = v13; - v6 = sub_0200B144(0, 26, 412, 32); + v6 = MessageLoader_Init(0, 26, 412, 32); v9 = ov5_021F6704(v8, 20, 1, 0, 1, sub_0203F118(v8, v13), *v10, sub_0203F098(param0->unk_34, 1), v6, sub_0203F118(v8, v14), sub_0203F118(v8, v15)); v1 = sub_020308A0(v8->unk_0C, 11, &v0); @@ -174,18 +174,18 @@ BOOL ov5_021F6454 (UnkStruct_0203E724 * param0) Heap_FreeToHeap(v1); } - v7 = sub_0200B144(1, 26, 361, 32); + v7 = MessageLoader_Init(1, 26, 361, 32); ov5_021F661C(v9, v7); ov5_021F6760(v9, 12, 0xff, 0xfffe); - sub_0200B190(v7); + MessageLoader_Free(v7); ov5_021F661C(v9, v6); ov5_021F6768(v9); sub_0203E764(param0, ov5_021F65D4); - sub_0200B190(v6); + MessageLoader_Free(v6); return 1; } @@ -213,13 +213,13 @@ static u16 * ov5_021F65FC (int param0, int param1, int * param2) return v1; } -static void ov5_021F661C (UnkStruct_ov5_021F6704 * param0, UnkStruct_0200B144 * param1) +static void ov5_021F661C (UnkStruct_ov5_021F6704 * param0, MessageLoader * param1) { param0->unk_1FC = param1; return; } -static void ov5_021F6624 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021F6704 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, UnkStruct_0200B358 * param7, UnkStruct_0205AA50 * param8, UnkStruct_0200B144 * param9, u16 * param10, u16 * param11) +static void ov5_021F6624 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021F6704 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, UnkStruct_0200B358 * param7, UnkStruct_0205AA50 * param8, MessageLoader * param9, u16 * param10, u16 * param11) { int v0; @@ -256,7 +256,7 @@ static void ov5_021F6624 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021F6704 * return; } -UnkStruct_ov5_021F6704 * ov5_021F6704 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, UnkStruct_0200B144 * param8, u16 * param9, u16 * param10) +UnkStruct_ov5_021F6704 * ov5_021F6704 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, MessageLoader * param8, u16 * param9, u16 * param10) { UnkStruct_ov5_021F6704 * v0; int v1; @@ -305,7 +305,7 @@ static void ov5_021F6830 (UnkStruct_ov5_021F6704 * param0, u32 param1, u32 param { Strbuf* v2 = Strbuf_Init((40 * 2), 4); - sub_0200B1B8(param0->unk_1FC, param1, v2); + MessageLoader_GetStrbuf(param0->unk_1FC, param1, v2); sub_0200C388(param0->unk_200, param0->unk_1C[param0->unk_20B], v2); param0->unk_244[param0->unk_20B].unk_00 = (const void *)param0->unk_1C[param0->unk_20B]; Strbuf_Free(v2); @@ -434,7 +434,7 @@ static void ov5_021F6AD4 (UnkStruct_ov5_021F6704 * param0) } if (param0->unk_207_1 == 1) { - sub_0200B190(param0->unk_1FC); + MessageLoader_Free(param0->unk_1FC); } sub_0200DA58(param0->unk_04); diff --git a/src/overlay005/ov5_021F77A8.c b/src/overlay005/ov5_021F77A8.c index 3d3d99ca92..6cb5ca355f 100644 --- a/src/overlay005/ov5_021F77A8.c +++ b/src/overlay005/ov5_021F77A8.c @@ -4,7 +4,7 @@ #include "inlines.h" #include "struct_decls/struct_0200112C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_0201CD38_decl.h" @@ -568,7 +568,7 @@ struct UnkStruct_ov5_021F7ED8_t { UnkStruct_0205AA50 unk_08; UnkStruct_0205AA50 * unk_18; Strbuf* unk_1C[39]; - UnkStruct_0200B144 * unk_B8; + MessageLoader * unk_B8; UnkStruct_0200B358 * unk_BC; u8 unk_C0; u8 unk_C1; @@ -601,9 +601,9 @@ static u16 ov5_021F7A3C(u16 param0); static u16 ov5_021F7A4C(u16 param0); static u8 ov5_021F7A74(Pokemon * param0, u8 param1); static u16 ov5_021F7B60(Pokemon * param0, u16 param1); -static void ov5_021F7E10(UnkStruct_ov5_021F7ED8 * param0, UnkStruct_0200B144 * param1); -static void ov5_021F7E18(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021F7ED8 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, UnkStruct_0200B358 * param7, UnkStruct_0205AA50 * param8, UnkStruct_0200B144 * param9); -UnkStruct_ov5_021F7ED8 * ov5_021F7ED8(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, UnkStruct_0200B144 * param8); +static void ov5_021F7E10(UnkStruct_ov5_021F7ED8 * param0, MessageLoader * param1); +static void ov5_021F7E18(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021F7ED8 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, UnkStruct_0200B358 * param7, UnkStruct_0205AA50 * param8, MessageLoader * param9); +UnkStruct_ov5_021F7ED8 * ov5_021F7ED8(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, MessageLoader * param8); void ov5_021F7F2C(UnkStruct_ov5_021F7ED8 * param0, u32 param1, u32 param2, u32 param3); static void ov5_021F7F34(UnkStruct_ov5_021F7ED8 * param0); static void ov5_021F7FF8(UnkStruct_ov5_021F7ED8 * param0, u32 param1, u32 param2, u32 param3); @@ -906,8 +906,8 @@ BOOL ov5_021F7C04 (UnkStruct_0203E724 * param0) u8 v0, v1; int v2, v3, v4, v5; Pokemon * v6; - UnkStruct_0200B144 * v7; - UnkStruct_0200B144 * v8; + MessageLoader * v7; + MessageLoader * v8; UnkStruct_0203CDB0 * v9 = param0->unk_34; UnkStruct_ov5_021F7ED8 * v10; u16 v11[4]; @@ -923,7 +923,7 @@ BOOL ov5_021F7C04 (UnkStruct_0203E724 * param0) v6 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->unk_0C), v14); } - v7 = sub_0200B144(0, 26, 647, 32); + v7 = MessageLoader_Init(0, 26, 647, 32); v10 = ov5_021F7ED8(v9, 20, 1, 0, 1, sub_0203F118(v9, v16), *v13, sub_0203F098(param0->unk_34, 1), v7); for (v2 = 0; v2 < (NELEMS(Unk_ov5_02200CE4)); v2++) { @@ -970,16 +970,16 @@ BOOL ov5_021F7C04 (UnkStruct_0203E724 * param0) ov5_021F7F2C(v10, v12[v2], 0xff, v12[v2]); } - v8 = sub_0200B144(1, 26, 361, 32); + v8 = MessageLoader_Init(1, 26, 361, 32); ov5_021F7E10(v10, v8); ov5_021F7F2C(v10, 5, 0xff, 0xfffe); - sub_0200B190(v8); + MessageLoader_Free(v8); ov5_021F7E10(v10, v7); ov5_021F7F34(v10); sub_0203E764(param0, ov5_021F7DE8); - sub_0200B190(v7); + MessageLoader_Free(v7); return 1; } @@ -996,13 +996,13 @@ static BOOL ov5_021F7DE8 (UnkStruct_0203E724 * param0) return 1; } -static void ov5_021F7E10 (UnkStruct_ov5_021F7ED8 * param0, UnkStruct_0200B144 * param1) +static void ov5_021F7E10 (UnkStruct_ov5_021F7ED8 * param0, MessageLoader * param1) { param0->unk_B8 = param1; return; } -static void ov5_021F7E18 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021F7ED8 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, UnkStruct_0200B358 * param7, UnkStruct_0205AA50 * param8, UnkStruct_0200B144 * param9) +static void ov5_021F7E18 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021F7ED8 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, UnkStruct_0200B358 * param7, UnkStruct_0205AA50 * param8, MessageLoader * param9) { int v0; @@ -1035,7 +1035,7 @@ static void ov5_021F7E18 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021F7ED8 * return; } -UnkStruct_ov5_021F7ED8 * ov5_021F7ED8 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, UnkStruct_0200B144 * param8) +UnkStruct_ov5_021F7ED8 * ov5_021F7ED8 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, MessageLoader * param8) { UnkStruct_ov5_021F7ED8 * v0; int v1; @@ -1084,7 +1084,7 @@ static void ov5_021F7FF8 (UnkStruct_ov5_021F7ED8 * param0, u32 param1, u32 param { Strbuf* v2 = Strbuf_Init((40 * 2), 4); - sub_0200B1B8(param0->unk_B8, param1, v2); + MessageLoader_GetStrbuf(param0->unk_B8, param1, v2); sub_0200C388(param0->unk_BC, param0->unk_1C[param0->unk_C7], v2); param0->unk_F8[param0->unk_C7].unk_00 = (const void *)param0->unk_1C[param0->unk_C7]; Strbuf_Free(v2); @@ -1198,7 +1198,7 @@ static void ov5_021F8250 (UnkStruct_ov5_021F7ED8 * param0) } if (param0->unk_C3_1 == 1) { - sub_0200B190(param0->unk_B8); + MessageLoader_Free(param0->unk_B8); } sub_0200DA58(param0->unk_04); diff --git a/src/overlay006/ov6_02246184.c b/src/overlay006/ov6_02246184.c index d3de9315bd..8679426ae5 100644 --- a/src/overlay006/ov6_02246184.c +++ b/src/overlay006/ov6_02246184.c @@ -1,8 +1,6 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" -#include "strbuf.h" #include "struct_decls/struct_02025E6C_decl.h" #include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" @@ -149,10 +147,10 @@ void ov6_02246254 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02246204 * param1, static Strbuf* ov6_022462E4 (u32 param0, u32 param1) { Strbuf* v0; - UnkStruct_0200B144 * v1 = sub_0200B144(0, 26, 370, param0); + MessageLoader * v1 = MessageLoader_Init(0, 26, 370, param0); - v0 = sub_0200B1EC(v1, param1); - sub_0200B190(v1); + v0 = MessageLoader_GetNewStrbuf(v1, param1); + MessageLoader_Free(v1); return v0; } diff --git a/src/overlay006/ov6_02247A0C.c b/src/overlay006/ov6_02247A0C.c index ee4ec18e68..e4a84a12c0 100644 --- a/src/overlay006/ov6_02247A0C.c +++ b/src/overlay006/ov6_02247A0C.c @@ -3,7 +3,7 @@ #include "data_021BF67C.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" @@ -29,7 +29,7 @@ typedef struct { UnkStruct_0205AA50 unk_00; - UnkStruct_0200B144 * unk_10; + MessageLoader * unk_10; UnkStruct_0200B358 * unk_14; } UnkStruct_ov6_02247A90; @@ -143,7 +143,7 @@ void * ov6_02247A90 (void * param0) MI_CpuClear8(v0, sizeof(UnkStruct_ov6_02247A90)); - v0->unk_10 = sub_0200B144(0, 26, 208, 11); + v0->unk_10 = MessageLoader_Init(0, 26, 208, 11); v0->unk_14 = sub_0200B358(11); sub_0201A7E8(v1, &v0->unk_00, 3, 1, 3, 30, 17, 12, (1 + 10)); @@ -152,7 +152,7 @@ void * ov6_02247A90 (void * param0) sub_0201ADA4(&v0->unk_00, 15); v3 = Strbuf_Init(100, 11); - v2 = sub_0200B1EC(v0->unk_10, 0); + v2 = MessageLoader_GetNewStrbuf(v0->unk_10, 0); sub_0200B498(v0->unk_14, 0, sub_02025E38(v8)); sub_0200C388(v0->unk_14, v3, v2); @@ -162,21 +162,21 @@ void * ov6_02247A90 (void * param0) sub_0201D738(&v0->unk_00, 0, v3, v4, (8 * 0), 0xff, NULL); Strbuf_Free(v2); - v2 = sub_0200B1EC(v0->unk_10, 1); + v2 = MessageLoader_GetNewStrbuf(v0->unk_10, 1); v4 = ov6_02247CF4(v2, 0, 1, ((15 * 8))); sub_0201D738(&v0->unk_00, 0, v2, v4, (8 * 2), 0xff, NULL); Strbuf_Free(v2); for (v6 = 0; v6 < 5; v6++) { - v2 = sub_0200B1EC(v0->unk_10, Unk_ov6_022496F4[v6].unk_00); + v2 = MessageLoader_GetNewStrbuf(v0->unk_10, Unk_ov6_022496F4[v6].unk_00); v4 = ov6_02247CF4(v2, 0, 0, Unk_ov6_022496F4[v6].unk_04); sub_0201D738(&v0->unk_00, 0, v2, v4, Unk_ov6_022496F4[v6].unk_06, 0xff, NULL); Strbuf_Free(v2); } for (v6 = 0; v6 < 4; v6++) { - v2 = sub_0200B1EC(v0->unk_10, Unk_ov6_022496D4[v6].unk_00); + v2 = MessageLoader_GetNewStrbuf(v0->unk_10, Unk_ov6_022496D4[v6].unk_00); v4 = ov6_02247CF4(v2, 0, 2, Unk_ov6_022496D4[v6].unk_04); sub_0201D738(&v0->unk_00, 0, v2, v4, Unk_ov6_022496D4[v6].unk_06, 0xff, NULL); Strbuf_Free(v2); @@ -185,7 +185,7 @@ void * ov6_02247A90 (void * param0) for (v7 = 0; v7 < 5; v7++) { for (v6 = 0; v6 < 4; v6++) { v5 = sub_0202F160(v8, v7, v6); - v2 = sub_0200B1EC(v0->unk_10, Unk_ov6_0224971C[v7][v6].unk_00); + v2 = MessageLoader_GetNewStrbuf(v0->unk_10, Unk_ov6_0224971C[v7][v6].unk_00); sub_0200B60C(v0->unk_14, 0, v5, 4, 1, 1); sub_0200C388(v0->unk_14, v3, v2); v4 = ov6_02247CF4(v3, 0, 2, Unk_ov6_0224971C[v7][v6].unk_04); @@ -207,7 +207,7 @@ void ov6_02247CC8 (void * param0) sub_0200DC9C(&v0->unk_00, 1); sub_0201ACF4(&v0->unk_00); sub_0201A8FC(&v0->unk_00); - sub_0200B190(v0->unk_10); + MessageLoader_Free(v0->unk_10); sub_0200B3F0(v0->unk_14); Heap_FreeToHeap(v0); } diff --git a/src/overlay007/ov7_02249960.c b/src/overlay007/ov7_02249960.c index 4737477f08..d4b8c9a9bd 100644 --- a/src/overlay007/ov7_02249960.c +++ b/src/overlay007/ov7_02249960.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_0201CD38_decl.h" @@ -61,7 +61,7 @@ typedef struct UnkStruct_ov7_02249C2C_t { UnkStruct_0203CDB0 * unk_68; UnkFuncPtr_ov7_02249C2C unk_6C; UnkFuncPtr_ov7_02249C2C_1 unk_70; - UnkStruct_0200B144 * unk_74; + MessageLoader * unk_74; UnkStruct_02025E6C * unk_78; UnkStruct_02025E6C * unk_7C; u8 unk_80[8]; @@ -153,10 +153,10 @@ static void ov7_02249960 (int param0, BOOL param1) } if (param1) { - sub_0200B1B8(Unk_ov7_0224F5A0->unk_74, param0, Unk_ov7_0224F5A0->unk_00[4]); + MessageLoader_GetStrbuf(Unk_ov7_0224F5A0->unk_74, param0, Unk_ov7_0224F5A0->unk_00[4]); sub_0200C388(Unk_ov7_0224F5A0->unk_58, Unk_ov7_0224F5A0->unk_00[5], Unk_ov7_0224F5A0->unk_00[4]); } else { - sub_0200B1B8(Unk_ov7_0224F5A0->unk_74, param0, Unk_ov7_0224F5A0->unk_00[5]); + MessageLoader_GetStrbuf(Unk_ov7_0224F5A0->unk_74, param0, Unk_ov7_0224F5A0->unk_00[5]); } if (!sub_0201A7CC(&Unk_ov7_0224F5A0->unk_40)) { @@ -197,7 +197,7 @@ static void ov7_02249AB4 (UnkStruct_0203CDB0 * param0) Unk_ov7_0224F5A0->unk_88 = 0; Unk_ov7_0224F5A0->unk_68 = param0; Unk_ov7_0224F5A0->unk_97 = 0; - Unk_ov7_0224F5A0->unk_74 = sub_0200B144(1, 26, 353, 4); + Unk_ov7_0224F5A0->unk_74 = MessageLoader_Init(1, 26, 353, 4); Unk_ov7_0224F5A0->unk_78 = sub_02025E38(sub_0203D174(Unk_ov7_0224F5A0->unk_68)); Unk_ov7_0224F5A0->unk_7C = sub_02025E6C(4); @@ -244,7 +244,7 @@ static void ov7_02249B98 (void) Unk_ov7_0224F5A0->unk_58 = NULL; } - sub_0200B190(Unk_ov7_0224F5A0->unk_74); + MessageLoader_Free(Unk_ov7_0224F5A0->unk_74); if (Unk_ov7_0224F5A0->unk_40.unk_0C != NULL) { sub_0201A8FC(&Unk_ov7_0224F5A0->unk_40); @@ -316,16 +316,16 @@ static void ov7_02249C94 (UnkStruct_0200112C * param0, u32 param1, u8 param2) sub_020339AC(v1, Unk_ov7_0224F5A0->unk_7C); sub_0200B60C(Unk_ov7_0224F5A0->unk_50, 0, v1 + 1, 2, 2, 1); sub_0200B498(Unk_ov7_0224F5A0->unk_50, 1, Unk_ov7_0224F5A0->unk_7C); - sub_0200B1B8(Unk_ov7_0224F5A0->unk_74, 63, Unk_ov7_0224F5A0->unk_00[1]); + MessageLoader_GetStrbuf(Unk_ov7_0224F5A0->unk_74, 63, Unk_ov7_0224F5A0->unk_00[1]); sub_0200C388(Unk_ov7_0224F5A0->unk_50, Unk_ov7_0224F5A0->unk_00[0], Unk_ov7_0224F5A0->unk_00[1]); sub_0201D738(&Unk_ov7_0224F5A0->unk_20, 0, Unk_ov7_0224F5A0->unk_00[0], 8, param2 * 16, 0xff, NULL); sub_0200B60C(Unk_ov7_0224F5A0->unk_50, 2, sub_02025F20(Unk_ov7_0224F5A0->unk_7C) % 0x10000, 5, 2, 1); - sub_0200B1B8(Unk_ov7_0224F5A0->unk_74, 65, Unk_ov7_0224F5A0->unk_00[3]); + MessageLoader_GetStrbuf(Unk_ov7_0224F5A0->unk_74, 65, Unk_ov7_0224F5A0->unk_00[3]); sub_0200C388(Unk_ov7_0224F5A0->unk_50, Unk_ov7_0224F5A0->unk_00[2], Unk_ov7_0224F5A0->unk_00[3]); sub_0201D738(&Unk_ov7_0224F5A0->unk_20, 0, Unk_ov7_0224F5A0->unk_00[2], 11 * 8, param2 * 16, 0xff, NULL); } else { sub_0200B60C(Unk_ov7_0224F5A0->unk_50, 0, v1 + 1, 2, 2, 1); - sub_0200B1B8(Unk_ov7_0224F5A0->unk_74, 64, Unk_ov7_0224F5A0->unk_00[1]); + MessageLoader_GetStrbuf(Unk_ov7_0224F5A0->unk_74, 64, Unk_ov7_0224F5A0->unk_00[1]); sub_0200C388(Unk_ov7_0224F5A0->unk_50, Unk_ov7_0224F5A0->unk_00[0], Unk_ov7_0224F5A0->unk_00[1]); sub_0201D738(&Unk_ov7_0224F5A0->unk_20, 0, Unk_ov7_0224F5A0->unk_00[0], 8, param2 * 16, 0xff, NULL); } @@ -398,7 +398,7 @@ static void ov7_02249EE0 (UnkStruct_ov7_02249C2C * param0) { sub_0200B498(Unk_ov7_0224F5A0->unk_54, 0, Unk_ov7_0224F5A0->unk_78); sub_0200B60C(Unk_ov7_0224F5A0->unk_54, 1, sub_02025F20(Unk_ov7_0224F5A0->unk_78) % 0x10000, 5, 2, 1); - sub_0200B1B8(Unk_ov7_0224F5A0->unk_74, 62, Unk_ov7_0224F5A0->unk_00[6]); + MessageLoader_GetStrbuf(Unk_ov7_0224F5A0->unk_74, 62, Unk_ov7_0224F5A0->unk_00[6]); sub_0200C388(Unk_ov7_0224F5A0->unk_54, Unk_ov7_0224F5A0->unk_00[7], Unk_ov7_0224F5A0->unk_00[6]); sub_0201D738(&Unk_ov7_0224F5A0->unk_30, 0, Unk_ov7_0224F5A0->unk_00[7], 2, 2, 0, NULL); } @@ -415,7 +415,7 @@ static void ov7_02249F54 (UnkStruct_0201CD38 * param0, void * param1) for (v2 = 0; v2 < 16; v2++) { sub_0200B60C(Unk_ov7_0224F5A0->unk_50, 0, v2 + 1, 2, 2, 1); - sub_0200B1B8(Unk_ov7_0224F5A0->unk_74, 64, Unk_ov7_0224F5A0->unk_00[1]); + MessageLoader_GetStrbuf(Unk_ov7_0224F5A0->unk_74, 64, Unk_ov7_0224F5A0->unk_00[1]); sub_0200C388(Unk_ov7_0224F5A0->unk_50, Unk_ov7_0224F5A0->unk_00[0], Unk_ov7_0224F5A0->unk_00[1]); sub_02013A6C(Unk_ov7_0224F5A0->unk_64, Unk_ov7_0224F5A0->unk_00[0], 0); } @@ -545,7 +545,7 @@ asm static void ov7_0224A128 (UnkStruct_0201CD38 * param0, void * param1) ldr r2, [r0, #0] ldr r0, [r2, #0x74] ldr r2, [r2, #0x10] - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf ldr r0, = Unk_ov7_0224F5A0 ldr r2, [r0, #0] ldr r0, [r2, #0x58] @@ -729,11 +729,11 @@ static void ov7_0224A438 (UnkStruct_0200112C * param0, u32 param1, u8 param2) if (NULL != sub_02032EE8(v0)) { sub_0200B498(Unk_ov7_0224F5A0->unk_50, 0, sub_02032EE8(v0)); - sub_0200B1B8(Unk_ov7_0224F5A0->unk_74, 66, Unk_ov7_0224F5A0->unk_00[1]); + MessageLoader_GetStrbuf(Unk_ov7_0224F5A0->unk_74, 66, Unk_ov7_0224F5A0->unk_00[1]); sub_0200C388(Unk_ov7_0224F5A0->unk_50, Unk_ov7_0224F5A0->unk_00[0], Unk_ov7_0224F5A0->unk_00[1]); sub_0201D738(&Unk_ov7_0224F5A0->unk_20, 0, Unk_ov7_0224F5A0->unk_00[0], 8, param2 * 16, 0, NULL); sub_0200B60C(Unk_ov7_0224F5A0->unk_50, 2, sub_02025F24(sub_02032EE8(v0)), 5, 2, 1); - sub_0200B1B8(Unk_ov7_0224F5A0->unk_74, 65, Unk_ov7_0224F5A0->unk_00[3]); + MessageLoader_GetStrbuf(Unk_ov7_0224F5A0->unk_74, 65, Unk_ov7_0224F5A0->unk_00[3]); sub_0200C388(Unk_ov7_0224F5A0->unk_50, Unk_ov7_0224F5A0->unk_00[2], Unk_ov7_0224F5A0->unk_00[3]); sub_0201D738(&Unk_ov7_0224F5A0->unk_20, 0, Unk_ov7_0224F5A0->unk_00[2], 9 * 8, param2 * 16, 0, NULL); } @@ -840,7 +840,7 @@ static void ov7_0224A64C (UnkStruct_ov7_02249C2C * param0) sub_0200B60C(Unk_ov7_0224F5A0->unk_54, 0, v1, 2, 5, 1); sub_0201ADA4(&Unk_ov7_0224F5A0->unk_30, 15); - sub_0200B1B8(Unk_ov7_0224F5A0->unk_74, v0, Unk_ov7_0224F5A0->unk_00[7]); + MessageLoader_GetStrbuf(Unk_ov7_0224F5A0->unk_74, v0, Unk_ov7_0224F5A0->unk_00[7]); sub_0200C388(Unk_ov7_0224F5A0->unk_54, Unk_ov7_0224F5A0->unk_00[6], Unk_ov7_0224F5A0->unk_00[7]); sub_0201D738(&Unk_ov7_0224F5A0->unk_30, 0, Unk_ov7_0224F5A0->unk_00[6], 2, 2, 0, NULL); } diff --git a/src/overlay007/ov7_0224B4E8.c b/src/overlay007/ov7_0224B4E8.c index 4dc5deedb3..ab5b926d3f 100644 --- a/src/overlay007/ov7_0224B4E8.c +++ b/src/overlay007/ov7_0224B4E8.c @@ -4,7 +4,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_0200112C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "strbuf.h" @@ -53,7 +53,7 @@ typedef struct { UnkStruct_0205AA50 unk_44; UnkStruct_0205AA50 unk_54; UnkStruct_0200B358 * unk_64; - UnkStruct_0200B144 * unk_68; + MessageLoader * unk_68; UnkStruct_02098700 * unk_6C; u16 * unk_70; int unk_74; @@ -101,7 +101,7 @@ static void ov7_0224B4E8 (UnkStruct_ov7_0224B4E8 * param0, int param1) sub_0205D988(¶m0->unk_54); } - sub_0200B1B8(param0->unk_68, param1, param0->unk_14); + MessageLoader_GetStrbuf(param0->unk_68, param1, param0->unk_14); sub_0200C388(param0->unk_64, param0->unk_18, param0->unk_14); param0->unk_74 = sub_0205D994(¶m0->unk_54, param0->unk_18, sub_02025E44(param0->unk_10->unk_0C), 1); @@ -146,7 +146,7 @@ static void ov7_0224B5A8 (UnkStruct_ov7_0224B4E8 * param0) for (v4 = 0; v4 < v3; v4++) { ov7_0224B57C(param0, v4); - sub_0200B1B8(param0->unk_68, 113, param0->unk_1C); + MessageLoader_GetStrbuf(param0->unk_68, 113, param0->unk_1C); sub_0200C388(param0->unk_64, param0->unk_20, param0->unk_1C); sub_02013A6C(param0->unk_08, param0->unk_20, v4); } @@ -322,7 +322,7 @@ static u8 Unk_ov7_0224F4CC[] = { static void ov7_0224B8DC (UnkStruct_ov7_0224B4E8 * param0) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; UnkStruct_0200B358 * v1 = param0->unk_64; Strbuf* v2; Strbuf* v3; @@ -334,7 +334,7 @@ static void ov7_0224B8DC (UnkStruct_ov7_0224B4E8 * param0) const int v12 = 55; const int v13 = (24 * 8) - 1; - v0 = sub_0200B144(0, 26, 353, 4); + v0 = MessageLoader_Init(0, 26, 353, 4); v2 = Strbuf_Init((90 * 2), 4); v3 = Strbuf_Init((90 * 2), 4); v4 = ¶m0->unk_24; @@ -345,12 +345,12 @@ static void ov7_0224B8DC (UnkStruct_ov7_0224B4E8 * param0) ov7_0224B57C(param0, param0->unk_78 - 1); - sub_0200B1B8(v0, 95, v2); + MessageLoader_GetStrbuf(v0, 95, v2); sub_0200C388(v1, v3, v2); sub_0201D738(v4, 0, v3, v10 + v12, 0, 0xff, NULL); for (v5 = 0; v5 < 9; v5++) { - sub_0200B1B8(v0, 75 + v5, v2); + MessageLoader_GetStrbuf(v0, 75 + v5, v2); sub_0201D738(v4, 0, v2, v10, v9 + v11 * v5, 0xff, NULL); } @@ -406,7 +406,7 @@ static void ov7_0224B8DC (UnkStruct_ov7_0224B4E8 * param0) break; } - sub_0200B1B8(v0, v7, v2); + MessageLoader_GetStrbuf(v0, v7, v2); sub_0200C388(v1, v3, v2); { int v14 = sub_02002D7C(0, v3, 0); @@ -418,7 +418,7 @@ static void ov7_0224B8DC (UnkStruct_ov7_0224B4E8 * param0) Strbuf_Free(v2); Strbuf_Free(v3); - sub_0200B190(v0); + MessageLoader_Free(v0); sub_0201A954(v4); } @@ -542,7 +542,7 @@ static BOOL ov7_0224BC74 (UnkStruct_020508D4 * param0) ov7_0224B6AC(v1); ov7_0224B558(v1, 0); sub_0200B3F0(v1->unk_64); - sub_0200B190(v1->unk_68); + MessageLoader_Free(v1->unk_68); Strbuf_Free(v1->unk_14); Strbuf_Free(v1->unk_18); Strbuf_Free(v1->unk_1C); @@ -567,7 +567,7 @@ static UnkStruct_ov7_0224B4E8 * ov7_0224BE10 (UnkStruct_0203CDB0 * param0) v0->unk_10 = param0; v0->unk_10->unk_B0 = NULL; v0->unk_64 = sub_0200B358(4); - v0->unk_68 = sub_0200B144(0, 26, 221, 4); + v0->unk_68 = MessageLoader_Init(0, 26, 221, 4); v0->unk_14 = Strbuf_Init((90 * 2), 4); v0->unk_18 = Strbuf_Init((90 * 2), 4); v0->unk_1C = Strbuf_Init((90 * 2), 4); diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c index 47bb7dde9e..ce29908164 100644 --- a/src/overlay007/ov7_0224BE9C.c +++ b/src/overlay007/ov7_0224BE9C.c @@ -8,7 +8,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -144,7 +144,7 @@ typedef struct UnkStruct_ov7_0224BEFC_t { u32 unk_18; UnkStruct_020218BC * unk_1C; UnkStruct_0200C738 unk_20; - UnkStruct_0200B144 * unk_1AC; + MessageLoader * unk_1AC; u32 unk_1B0; u32 unk_1B4; UnkStruct_ov7_0224C3EC unk_1B8; @@ -163,12 +163,12 @@ static void ov7_0224C3EC(UnkStruct_ov7_0224C3EC * param0, UnkStruct_02018340 * p static void ov7_0224C444(UnkStruct_ov7_0224C3EC * param0); 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); -static void ov7_0224C620(UnkStruct_ov7_0224C620 * param0, UnkStruct_02018340 * param1, UnkStruct_0200B144 * param2, u32 param3); +static void ov7_0224C4E0(UnkStruct_ov7_0224C3EC * param0, MessageLoader * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4); +static void ov7_0224C580(UnkStruct_ov7_0224C3EC * param0, MessageLoader * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4); +static void ov7_0224C620(UnkStruct_ov7_0224C620 * param0, UnkStruct_02018340 * param1, MessageLoader * param2, u32 param3); static void ov7_0224C698(UnkStruct_ov7_0224C620 * param0); static void ov7_0224C6DC(UnkStruct_ov7_0224C620 * param0, u32 param1, u32 param2, u32 param3); -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); +static void ov7_0224C768(UnkStruct_ov7_0224C768 * param0, UnkStruct_02018340 * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4, MessageLoader * param5, void * param6, UnkFuncPtr_ov7_0224C768 param7, UnkStruct_020218BC * param8); static void ov7_0224C934(UnkStruct_ov7_0224C768 * param0); static u32 ov7_0224C9A4(UnkStruct_ov7_0224C768 * param0); static void ov7_0224CA0C(UnkStruct_ov7_0224C768 * param0); @@ -197,7 +197,7 @@ UnkStruct_ov7_0224BEFC * ov7_0224BE9C (u32 param0, UnkStruct_021C0794 * param1, v0->unk_08 = param1; v0->unk_0C = sub_02029D04(sub_0202A750(v0->unk_08)); v0->unk_10 = sub_0207D990(param1); - v0->unk_1AC = sub_0200B144(0, 26, 572, v0->unk_18); + v0->unk_1AC = MessageLoader_Init(0, 26, 572, v0->unk_18); ov7_0224C338(v0); ov7_0224C35C(v0); @@ -208,7 +208,7 @@ UnkStruct_ov7_0224BEFC * ov7_0224BE9C (u32 param0, UnkStruct_021C0794 * param1, void ov7_0224BEFC (UnkStruct_ov7_0224BEFC * param0) { - sub_0200B190(param0->unk_1AC); + MessageLoader_Free(param0->unk_1AC); ov7_0224C3B8(param0); ov7_0224C3E0(param0); @@ -225,7 +225,7 @@ BOOL ov7_0224BF2C (UnkStruct_ov7_0224BEFC * param0) switch (param0->unk_00) { case 0: ov7_0224C3EC(¶m0->unk_1B8, param0->unk_14, param0->unk_18, param0->unk_1B4); - v0 = sub_0200B1EC(param0->unk_1AC, 4); + v0 = MessageLoader_GetNewStrbuf(param0->unk_1AC, 4); ov7_0224C468(¶m0->unk_1B8, v0, param0->unk_18); Strbuf_Free(v0); param0->unk_00 = 11; @@ -233,7 +233,7 @@ BOOL ov7_0224BF2C (UnkStruct_ov7_0224BEFC * param0) break; case 1: if (ov7_0224CC88(param0->unk_0C, Unk_ov7_0224F1B4, 22)) { - v0 = sub_0200B1EC(param0->unk_1AC, 5); + v0 = MessageLoader_GetNewStrbuf(param0->unk_1AC, 5); ov7_0224C468(¶m0->unk_1B8, v0, param0->unk_18); Strbuf_Free(v0); param0->unk_00 = 11; @@ -248,7 +248,7 @@ BOOL ov7_0224BF2C (UnkStruct_ov7_0224BEFC * param0) ov7_0224C768(¶m0->unk_1E8, param0->unk_14, param0->unk_18, Unk_ov7_0224F1B4, 22, param0->unk_1AC, ¶m0->unk_354, ov7_0224CBE4, param0->unk_1C); case 3: ov7_0224CA0C(¶m0->unk_1E8); - v0 = sub_0200B1EC(param0->unk_1AC, 6); + v0 = MessageLoader_GetNewStrbuf(param0->unk_1AC, 6); ov7_0224C468(¶m0->unk_1B8, v0, param0->unk_18); Strbuf_Free(v0); param0->unk_00 = 10; @@ -268,7 +268,7 @@ BOOL ov7_0224BF2C (UnkStruct_ov7_0224BEFC * param0) sub_02005748(1500); } else if (v1 == 0xfffffffe) { - v0 = sub_0200B1EC(param0->unk_1AC, 11); + v0 = MessageLoader_GetNewStrbuf(param0->unk_1AC, 11); ov7_0224C468(¶m0->unk_1B8, v0, param0->unk_18); Strbuf_Free(v0); param0->unk_00 = 11; @@ -285,7 +285,7 @@ BOOL ov7_0224BF2C (UnkStruct_ov7_0224BEFC * param0) if (v1 == 0) { if (ov7_0224CCB8(param0->unk_10, Unk_ov7_0224F1B4, param0->unk_1E8.unk_12C, param0->unk_18) == 0) { - v0 = sub_0200B1EC(param0->unk_1AC, 9); + v0 = MessageLoader_GetNewStrbuf(param0->unk_1AC, 9); ov7_0224C468(¶m0->unk_1B8, v0, param0->unk_18); Strbuf_Free(v0); param0->unk_00 = 11; @@ -295,7 +295,7 @@ BOOL ov7_0224BF2C (UnkStruct_ov7_0224BEFC * param0) } if (ov7_0224CCE4(param0->unk_0C, Unk_ov7_0224F1B4, param0->unk_1E8.unk_12C) == 0) { - v0 = sub_0200B1EC(param0->unk_1AC, 10); + v0 = MessageLoader_GetNewStrbuf(param0->unk_1AC, 10); ov7_0224C468(¶m0->unk_1B8, v0, param0->unk_18); Strbuf_Free(v0); ov7_0224CC6C(¶m0->unk_348); @@ -304,7 +304,7 @@ BOOL ov7_0224BF2C (UnkStruct_ov7_0224BEFC * param0) break; } - v0 = sub_0200B1EC(param0->unk_1AC, 8); + v0 = MessageLoader_GetNewStrbuf(param0->unk_1AC, 8); ov7_0224C468(¶m0->unk_1B8, v0, param0->unk_18); Strbuf_Free(v0); @@ -330,14 +330,14 @@ BOOL ov7_0224BF2C (UnkStruct_ov7_0224BEFC * param0) } break; case 8: - v0 = sub_0200B1EC(param0->unk_1AC, 13); + v0 = MessageLoader_GetNewStrbuf(param0->unk_1AC, 13); ov7_0224C468(¶m0->unk_1B8, v0, param0->unk_18); Strbuf_Free(v0); param0->unk_00 = 11; param0->unk_04 = 9; break; case 9: - v0 = sub_0200B1EC(param0->unk_1AC, 5); + v0 = MessageLoader_GetNewStrbuf(param0->unk_1AC, 5); ov7_0224C468(¶m0->unk_1B8, v0, param0->unk_18); Strbuf_Free(v0); param0->unk_00 = 11; @@ -458,7 +458,7 @@ static BOOL ov7_0224C4B8 (UnkStruct_ov7_0224C3EC * param0) return 0; } -static void ov7_0224C4E0 (UnkStruct_ov7_0224C3EC * param0, UnkStruct_0200B144 * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4) +static void ov7_0224C4E0 (UnkStruct_ov7_0224C3EC * param0, MessageLoader * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4) { Strbuf* v0; Strbuf* v1; @@ -466,7 +466,7 @@ static void ov7_0224C4E0 (UnkStruct_ov7_0224C3EC * param0, UnkStruct_0200B144 * v2 = sub_0200B358(param2); v1 = Strbuf_Init(200, param2); - v0 = sub_0200B1EC(param1, 7); + v0 = MessageLoader_GetNewStrbuf(param1, 7); if (param3[param4].unk_08 == 1) { sub_0200B70C(v2, 0, param3[param4].unk_04 + 149); @@ -485,7 +485,7 @@ static void ov7_0224C4E0 (UnkStruct_ov7_0224C3EC * param0, UnkStruct_0200B144 * Strbuf_Free(v0); } -static void ov7_0224C580 (UnkStruct_ov7_0224C3EC * param0, UnkStruct_0200B144 * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4) +static void ov7_0224C580 (UnkStruct_ov7_0224C3EC * param0, MessageLoader * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4) { Strbuf* v0; Strbuf* v1; @@ -493,7 +493,7 @@ static void ov7_0224C580 (UnkStruct_ov7_0224C3EC * param0, UnkStruct_0200B144 * v2 = sub_0200B358(param2); v1 = Strbuf_Init(200, param2); - v0 = sub_0200B1EC(param1, 12); + v0 = MessageLoader_GetNewStrbuf(param1, 12); if (param3[param4].unk_08 == 1) { sub_0200B70C(v2, 0, param3[param4].unk_04 + 149); @@ -512,7 +512,7 @@ static void ov7_0224C580 (UnkStruct_ov7_0224C3EC * param0, UnkStruct_0200B144 * Strbuf_Free(v0); } -static void ov7_0224C620 (UnkStruct_ov7_0224C620 * param0, UnkStruct_02018340 * param1, UnkStruct_0200B144 * param2, u32 param3) +static void ov7_0224C620 (UnkStruct_ov7_0224C620 * param0, UnkStruct_02018340 * param1, MessageLoader * param2, u32 param3) { int v0; @@ -525,7 +525,7 @@ static void ov7_0224C620 (UnkStruct_ov7_0224C620 * param0, UnkStruct_02018340 * param0->unk_08 = sub_0200B358(param3); for (v0 = 0; v0 < 3; v0++) { - param0->unk_10[v0] = sub_0200B1EC(param2, 16 + v0); + param0->unk_10[v0] = MessageLoader_GetNewStrbuf(param2, 16 + v0); } param0->unk_0C = Strbuf_Init(32, param3); @@ -571,7 +571,7 @@ static void ov7_0224C6DC (UnkStruct_ov7_0224C620 * param0, u32 param1, u32 param sub_0200DC48(param0->unk_04, 0, (1 + (18 + 12)), 11); } -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) +static void ov7_0224C768 (UnkStruct_ov7_0224C768 * param0, UnkStruct_02018340 * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4, MessageLoader * param5, void * param6, UnkFuncPtr_ov7_0224C768 param7, UnkStruct_020218BC * param8) { int v0; Strbuf* v1; @@ -617,7 +617,7 @@ static void ov7_0224C768 (UnkStruct_ov7_0224C768 * param0, UnkStruct_02018340 * param0->unk_124 = sub_0200B358(param2); param0->unk_128 = Strbuf_Init(32, param2); - v1 = sub_0200B1EC(param5, 16); + v1 = MessageLoader_GetNewStrbuf(param5, 16); for (v0 = 0; v0 < param4; v0++) { sub_0200BFAC(param0->unk_124, 0, param3[v0].unk_00); @@ -628,7 +628,7 @@ static void ov7_0224C768 (UnkStruct_ov7_0224C768 * param0, UnkStruct_02018340 * param0->unk_0C[v0].unk_04 = v0; } - param0->unk_C4[param4] = sub_0200B1EC(param5, 19); + param0->unk_C4[param4] = MessageLoader_GetNewStrbuf(param5, 19); param0->unk_0C[param4].unk_00 = param0->unk_C4[param4]; param0->unk_0C[param4].unk_04 = param4; diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c index c06a859a3e..dd46e88677 100644 --- a/src/overlay007/ov7_0224CD28.c +++ b/src/overlay007/ov7_0224CD28.c @@ -6,8 +6,6 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" -#include "strbuf.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_0207D3C0_decl.h" @@ -322,7 +320,7 @@ static void ov7_0224D008 (UnkStruct_ov7_0224D008 * param0) static void ov7_0224D018 (UnkStruct_ov7_0224D008 * param0) { - param0->unk_88 = sub_0200B144(0, 26, 543, 11); + param0->unk_88 = MessageLoader_Init(0, 26, 543, 11); param0->unk_8C = sub_0200B358(11); } @@ -407,7 +405,7 @@ static u8 ov7_0224D250 (UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * pa sub_0200E084(¶m1->unk_08[1], 0); sub_0201A8FC(¶m1->unk_08[1]); - sub_0200B190(param1->unk_88); + MessageLoader_Free(param1->unk_88); sub_0200B3F0(param1->unk_8C); Strbuf_Free(param1->unk_298); @@ -594,21 +592,21 @@ static u32 ov7_0224D698 (UnkStruct_ov7_0224D008 * param0, u16 param1) static void ov7_0224D6BC (UnkStruct_ov7_0224D008 * param0) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; Strbuf* v1; UnkStruct_ov84_02240FA8 v2; u32 v3; u32 v4; - UnkStruct_0200B144 * v5; + MessageLoader * v5; BOOL v6 = 0; if ((param0->unk_2A9 == 0) || (param0->unk_2A9 == 3)) { - v0 = sub_0200B144(0, 26, 392, 11); - v5 = sub_0200B144(0, 26, 647, 11); + v0 = MessageLoader_Init(0, 26, 392, 11); + v5 = MessageLoader_Init(0, 26, 647, 11); } else if (param0->unk_2A9 == 1) { - v0 = sub_0200B144(0, 26, 626, 11); + v0 = MessageLoader_Init(0, 26, 626, 11); } else { - v0 = sub_0200B144(0, 26, 12, 11); + v0 = MessageLoader_Init(0, 26, 12, 11); } param0->unk_7C = sub_02013A04(param0->unk_294 + 1, 11); @@ -617,13 +615,13 @@ static void ov7_0224D6BC (UnkStruct_ov7_0224D008 * param0) v4 = ov7_0224D698(param0, param0->unk_290[v3]); if ((v4 <= 420) && (v4 >= 328)) { - v1 = sub_0200B1EC(v5, Item_MoveForTMHM(v4)); + v1 = MessageLoader_GetNewStrbuf(v5, Item_MoveForTMHM(v4)); sub_02013A6C(param0->unk_7C, v1, param0->unk_290[v3]); Strbuf_Free(v1); v6 = 1; } else { - v1 = sub_0200B1EC(v0, v4); + v1 = MessageLoader_GetNewStrbuf(v0, v4); sub_02013A6C(param0->unk_7C, v1, param0->unk_290[v3]); Strbuf_Free(v1); } @@ -635,10 +633,10 @@ static void ov7_0224D6BC (UnkStruct_ov7_0224D008 * param0) sub_02013A4C(param0->unk_7C, param0->unk_88, 8, 0xfffffffe); } - sub_0200B190(v0); + MessageLoader_Free(v0); if ((param0->unk_2A9 == 0) || (param0->unk_2A9 == 3)) { - sub_0200B190(v5); + MessageLoader_Free(v5); } v2 = Unk_ov7_0224F308; @@ -677,18 +675,18 @@ static void ov7_0224D85C (UnkStruct_0200112C * param0, u32 param1, u8 param2) v1 = Strbuf_Init(130, 11); Item_LoadDescription(v1, (u16)param1, 11); } else if (v0->unk_2A9 == 1) { - UnkStruct_0200B144 * v2; + MessageLoader * v2; - v2 = sub_0200B144(0, 26, 626, 11); - v1 = sub_0200B1EC(v2, 139 + param1 - 1); - sub_0200B190(v2); + v2 = MessageLoader_Init(0, 26, 626, 11); + v1 = MessageLoader_GetNewStrbuf(v2, 139 + param1 - 1); + MessageLoader_Free(v2); } else { - UnkStruct_0200B144 * v3; + MessageLoader * v3; - v3 = sub_0200B144(0, 26, 542, 11); - v1 = sub_0200B1EC(v3, sub_020981F4((u8)param1)); + v3 = MessageLoader_Init(0, 26, 542, 11); + v1 = MessageLoader_GetNewStrbuf(v3, sub_020981F4((u8)param1)); - sub_0200B190(v3); + MessageLoader_Free(v3); } sub_0201D78C(&v0->unk_08[1], 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -743,9 +741,9 @@ static void ov7_0224D9B8 (UnkStruct_0200112C * param0, u32 param1, u8 param2) v1 = Strbuf_Init(12, 11); if (v0->unk_2A9 == 3) { - v2 = sub_0200B1EC(v0->unk_88, 32); + v2 = MessageLoader_GetNewStrbuf(v0->unk_88, 32); } else { - v2 = sub_0200B1EC(v0->unk_88, 9); + v2 = MessageLoader_GetNewStrbuf(v0->unk_88, 9); } sub_0200B60C(v0->unk_8C, 0, v3, 4, 1, 1); @@ -759,7 +757,7 @@ static void ov7_0224D9B8 (UnkStruct_0200112C * param0, u32 param1, u8 param2) } if (param1 == 0xfffffffe) { - Strbuf* v6 = sub_0200B1EC(v0->unk_88, 8); + Strbuf* v6 = MessageLoader_GetNewStrbuf(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); @@ -784,7 +782,7 @@ static void ov7_0224DAF8 (UnkStruct_ov7_0224D008 * param0, u8 param1) } v0 = Strbuf_Init(16, 11); - v1 = sub_0200B1EC(param0->unk_88, 38); + v1 = MessageLoader_GetNewStrbuf(param0->unk_88, 38); v2 = ov7_0224E8F4(param0); sub_0200B60C(param0->unk_8C, 0, v2, 6, 1, 1); @@ -798,7 +796,7 @@ static void ov7_0224DAF8 (UnkStruct_ov7_0224D008 * param0, u8 param1) sub_0201ADA4(¶m0->unk_08[2], 15); sub_0200DC48(¶m0->unk_08[2], 1, (1 + (18 + 12)), 11); - v1 = sub_0200B1EC(param0->unk_88, 18); + v1 = MessageLoader_GetNewStrbuf(param0->unk_88, 18); sub_0201D738(¶m0->unk_08[2], 0, v1, 0, 0, 0xff, NULL); Strbuf_Free(v1); @@ -807,7 +805,7 @@ static void ov7_0224DAF8 (UnkStruct_ov7_0224D008 * param0, u8 param1) } v0 = Strbuf_Init(16, 11); - v1 = sub_0200B1EC(param0->unk_88, 19); + v1 = MessageLoader_GetNewStrbuf(param0->unk_88, 19); v2 = ov7_0224E8F4(param0); sub_0200B60C(param0->unk_8C, 0, v2, 6, 1, 1); @@ -873,9 +871,9 @@ static u8 ov7_0224DC84 (UnkStruct_ov7_0224D008 * param0) if (v4 < param0->unk_2B0) { if (param0->unk_2A9 == 3) { - v3 = sub_0200B1EC(param0->unk_88, 37); + v3 = MessageLoader_GetNewStrbuf(param0->unk_88, 37); } else { - v3 = sub_0200B1EC(param0->unk_88, 3); + v3 = MessageLoader_GetNewStrbuf(param0->unk_88, 3); } sub_0200C388(param0->unk_8C, param0->unk_298, v3); @@ -900,9 +898,9 @@ static u8 ov7_0224DC84 (UnkStruct_ov7_0224D008 * param0) ov7_0224E834(param0, param0->unk_2AA, 0); if (param0->unk_2A9 == 3) { - v3 = sub_0200B1EC(param0->unk_88, 33); + v3 = MessageLoader_GetNewStrbuf(param0->unk_88, 33); } else { - v3 = sub_0200B1EC(param0->unk_88, 4); + v3 = MessageLoader_GetNewStrbuf(param0->unk_88, 4); } sub_0200C388(param0->unk_8C, param0->unk_298, v3); @@ -955,7 +953,7 @@ static void ov7_0224DED4 (UnkStruct_ov7_0224D008 * param0) sub_0200DC48(¶m0->unk_08[4], 1, (1 + (18 + 12)), 11); v0 = Strbuf_Init((12 * 2), 11); - v1 = sub_0200B1EC(param0->unk_88, 20); + v1 = MessageLoader_GetNewStrbuf(param0->unk_88, 20); sub_0200B60C(param0->unk_8C, 0, v2, 3, 1, 1); sub_0200C388(param0->unk_8C, v0, v1); @@ -1028,13 +1026,13 @@ static u8 ov7_0224E098 (UnkStruct_ov7_0224D008 * param0) param0->unk_2AC = 0; if (param0->unk_2A9 == 0) { - v0 = sub_0200B1EC(param0->unk_88, 7); + v0 = MessageLoader_GetNewStrbuf(param0->unk_88, 7); } else if (param0->unk_2A9 == 3) { - v0 = sub_0200B1EC(param0->unk_88, 7); + v0 = MessageLoader_GetNewStrbuf(param0->unk_88, 7); } else if (param0->unk_2A9 == 1) { - v0 = sub_0200B1EC(param0->unk_88, 12); + v0 = MessageLoader_GetNewStrbuf(param0->unk_88, 12); } else { - v0 = sub_0200B1EC(param0->unk_88, 14); + v0 = MessageLoader_GetNewStrbuf(param0->unk_88, 14); } sub_0200C388(param0->unk_8C, param0->unk_298, v0); @@ -1055,15 +1053,15 @@ static u8 ov7_0224E098 (UnkStruct_ov7_0224D008 * param0) sub_0200B630(param0->unk_8C, 3, v2); if (param0->unk_2A9 == 3) { - v0 = sub_0200B1EC(param0->unk_88, 36); + v0 = MessageLoader_GetNewStrbuf(param0->unk_88, 36); } else { - v0 = sub_0200B1EC(param0->unk_88, 27); + v0 = MessageLoader_GetNewStrbuf(param0->unk_88, 27); } } else { if (param0->unk_2A9 == 3) { - v0 = sub_0200B1EC(param0->unk_88, 35); + v0 = MessageLoader_GetNewStrbuf(param0->unk_88, 35); } else { - v0 = sub_0200B1EC(param0->unk_88, 5); + v0 = MessageLoader_GetNewStrbuf(param0->unk_88, 5); } } @@ -1087,7 +1085,7 @@ static void ov7_0224E28C (UnkStruct_ov7_0224D008 * param0, u8 param1) } v0 = Strbuf_Init(24, 11); - v1 = sub_0200B1EC(param0->unk_88, 21); + v1 = MessageLoader_GetNewStrbuf(param0->unk_88, 21); sub_0200B60C(param0->unk_8C, 0, param0->unk_2AC, 2, 2, 1); sub_0200C388(param0->unk_8C, v0, v1); @@ -1095,9 +1093,9 @@ static void ov7_0224E28C (UnkStruct_ov7_0224D008 * param0, u8 param1) Strbuf_Free(v1); if (param0->unk_2A9 == 3) { - v1 = sub_0200B1EC(param0->unk_88, 34); + v1 = MessageLoader_GetNewStrbuf(param0->unk_88, 34); } else { - v1 = sub_0200B1EC(param0->unk_88, 22); + v1 = MessageLoader_GetNewStrbuf(param0->unk_88, 22); } sub_0200B60C(param0->unk_8C, 0, param0->unk_2B0 * param0->unk_2AC, 6, 1, 1); @@ -1129,7 +1127,7 @@ static u8 ov7_0224E3D8 (UnkStruct_ov7_0224D008 * param0) Strbuf* v0; if (param0->unk_2A9 == 0) { - v0 = sub_0200B1EC(param0->unk_88, 6); + v0 = MessageLoader_GetNewStrbuf(param0->unk_88, 6); if (param0->unk_2AC == 1) { sub_0200B70C(param0->unk_8C, 0, param0->unk_2AA); @@ -1145,12 +1143,12 @@ static u8 ov7_0224E3D8 (UnkStruct_ov7_0224D008 * param0) sub_0200B77C(param0->unk_8C, 0, param0->unk_2AA); } - v0 = sub_0200B1EC(param0->unk_88, 6); + v0 = MessageLoader_GetNewStrbuf(param0->unk_88, 6); sub_0200B7B4(param0->unk_8C, 1, Item_LoadParam(param0->unk_2AA, 5, 11)); } else { if (param0->unk_2A9 == 1) { ov7_0224E834(param0, param0->unk_2AA, 0); - v0 = sub_0200B1EC(param0->unk_88, 11); + v0 = MessageLoader_GetNewStrbuf(param0->unk_88, 11); } else { if (param0->unk_2AC == 1) { sub_0200BE64(param0->unk_8C, 0, sub_02098164((u8)param0->unk_2AA)); @@ -1158,7 +1156,7 @@ static u8 ov7_0224E3D8 (UnkStruct_ov7_0224D008 * param0) sub_0200BE98(param0->unk_8C, 0, sub_02098164((u8)param0->unk_2AA)); } - v0 = sub_0200B1EC(param0->unk_88, 13); + v0 = MessageLoader_GetNewStrbuf(param0->unk_88, 13); } } @@ -1233,7 +1231,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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_88, 10); + Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_88, 10); sub_0200C388(param0->unk_8C, param0->unk_298, v0); Strbuf_Free(v0); @@ -1409,7 +1407,7 @@ static u8 ov7_0224E950 (UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * pa sub_0205D944(¶m1->unk_08[1], param1->unk_278); { - Strbuf* v1 = sub_0200B1EC(param1->unk_88, 2); + Strbuf* v1 = MessageLoader_GetNewStrbuf(param1->unk_88, 2); sub_0200C388(param1->unk_8C, param1->unk_298, v1); Strbuf_Free(v1); @@ -1437,9 +1435,9 @@ static void ov7_0224EA54 (UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * Strbuf* v0; if (param1->unk_2A9 == 3) { - v0 = sub_0200B1EC(param1->unk_88, 31); + v0 = MessageLoader_GetNewStrbuf(param1->unk_88, 31); } else { - v0 = sub_0200B1EC(param1->unk_88, 1); + v0 = MessageLoader_GetNewStrbuf(param1->unk_88, 1); } sub_0200C388(param1->unk_8C, param1->unk_298, v0); @@ -1572,7 +1570,7 @@ static u8 ov7_0224EC9C (UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * pa sub_0205D944(¶m1->unk_08[1], param1->unk_278); { - Strbuf* v0 = sub_0200B1EC(param1->unk_88, 2); + Strbuf* v0 = MessageLoader_GetNewStrbuf(param1->unk_88, 2); sub_0200C388(param1->unk_8C, param1->unk_298, v0); Strbuf_Free(v0); diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c index 96d4a9309d..48ed70d083 100644 --- a/src/overlay008/ov8_02249960.c +++ b/src/overlay008/ov8_02249960.c @@ -3,7 +3,7 @@ #include "data_021BF67C.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0201CD38_decl.h" #include "strbuf.h" #include "struct_decls/struct_02027860_decl.h" @@ -186,7 +186,7 @@ typedef struct { UnkStruct_ov8_0224B28C unk_1C; u32 unk_40; UnkStruct_0205AA50 * unk_44; - UnkStruct_0200B144 * unk_48; + MessageLoader * unk_48; Strbuf* unk_4C; } UnkStruct_ov8_0224B67C; @@ -2938,7 +2938,7 @@ static BOOL ov8_0224B3D4 (UnkStruct_020508D4 * param0) v2->unk_00++; sub_020057A4(1593, 0); - sub_0200B1B8(v2->unk_48, 12, v2->unk_4C); + MessageLoader_GetStrbuf(v2->unk_48, 12, v2->unk_4C); sub_0205D8F4(v1->unk_08, v2->unk_44, 3); sub_0200E084(v2->unk_44, 0); sub_0205D944(v2->unk_44, sub_02025E44(v1->unk_0C)); @@ -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, Strbuf *param3) +BOOL ov8_0224B67C (UnkStruct_0203CDB0 * param0, UnkStruct_0205AA50 * param1, MessageLoader * param2, Strbuf *param3) { UnkStruct_02027860 * v0; UnkStruct_02071BD0 * v1; diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index 05d8fc6faf..9dbadbce81 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" @@ -143,7 +143,7 @@ typedef struct UnkStruct_ov10_0221FB28_t { UnkStruct_0205AA50 unk_B7C; UnkStruct_0205AA50 unk_B8C; GXBG0As unk_B9C; - UnkStruct_0200B144 * unk_BA0; + MessageLoader * unk_BA0; UnkStruct_0200B358 * unk_BA4; Strbuf* unk_BA8; int unk_BAC; @@ -489,7 +489,7 @@ static void ov10_0221F930 (UnkStruct_ov10_0221FB28 * param0) break; case 1: ov10_022229D4(param0); - sub_0200B1B8(param0->unk_BA0, 0, param0->unk_BA8); + MessageLoader_GetStrbuf(param0->unk_BA0, 0, param0->unk_BA8); param0->unk_BAC = sub_0201D738(¶m0->unk_B7C, 1, param0->unk_BA8, 0, 0, 0, NULL); sub_0201C3C0(param0->unk_0C, 0); param0->unk_BB0 = 2; @@ -503,9 +503,9 @@ static void ov10_0221F930 (UnkStruct_ov10_0221FB28 * param0) break; case 3: if (param0->unk_BC0 == 1) { - sub_0200B1B8(param0->unk_BA0, 2, param0->unk_BA8); + MessageLoader_GetStrbuf(param0->unk_BA0, 2, param0->unk_BA8); } else { - sub_0200B1B8(param0->unk_BA0, 1, param0->unk_BA8); + MessageLoader_GetStrbuf(param0->unk_BA0, 1, param0->unk_BA8); } sub_0201AE78(¶m0->unk_B8C, 15, 0, 0, 27 * 8, 4 * 8); @@ -535,7 +535,7 @@ static void ov10_0221F930 (UnkStruct_ov10_0221FB28 * param0) break; case 5: ov10_022229D4(param0); - sub_0200B1B8(param0->unk_BA0, 5, param0->unk_BA8); + MessageLoader_GetStrbuf(param0->unk_BA0, 5, param0->unk_BA8); param0->unk_BAC = sub_0201D738(¶m0->unk_B7C, 1, param0->unk_BA8, 0, 0, 0, NULL); sub_0201C3C0(param0->unk_0C, 0); param0->unk_BB0 = 6; @@ -705,7 +705,7 @@ static u8 ov10_0221FD00 (UnkStruct_ov10_0221FB28 * param0) param0->unk_B70 = 4; param0->unk_B71 = 2; param0->unk_B68 = 12; - param0->unk_BA0 = sub_0200B144(0, 26, 605, param0->unk_00->unk_24); + param0->unk_BA0 = MessageLoader_Init(0, 26, 605, param0->unk_00->unk_24); param0->unk_BA4 = sub_0200B358(param0->unk_00->unk_24); param0->unk_BA8 = Strbuf_Init((2 * 160), param0->unk_00->unk_24); param0->unk_BB0 = 1; @@ -1031,7 +1031,7 @@ static u8 ov10_02220700 (UnkStruct_ov10_0221FB28 * param0) switch (param0->unk_B76) { case 0: ov10_022229D4(param0); - sub_0200B1B8(param0->unk_BA0, 8, param0->unk_BA8); + MessageLoader_GetStrbuf(param0->unk_BA0, 8, param0->unk_BA8); param0->unk_BAC = sub_0201D738(¶m0->unk_B7C, 1, param0->unk_BA8, 0, 0, 0, NULL); ov10_02222A28(param0); param0->unk_B76++; @@ -1043,10 +1043,10 @@ static u8 ov10_02220700 (UnkStruct_ov10_0221FB28 * param0) v0 = sub_0202F41C(param0->unk_00->unk_00->unk_198, param0->unk_00->unk_2C, 0, 0, ¶m0->unk_B78, ¶m0->unk_B7A); if (v0 == 2) { - sub_0200B1B8(param0->unk_BA0, 6, param0->unk_BA8); + MessageLoader_GetStrbuf(param0->unk_BA0, 6, param0->unk_BA8); sub_02005748(1563); } else if (v0 == 3) { - sub_0200B1B8(param0->unk_BA0, 7, param0->unk_BA8); + MessageLoader_GetStrbuf(param0->unk_BA0, 7, param0->unk_BA8); } else { break; } @@ -1085,7 +1085,7 @@ static u8 ov10_022208B0 (UnkStruct_ov10_0221FB28 * param0) switch (param0->unk_B76) { case 0: ov10_022229D4(param0); - sub_0200B1B8(param0->unk_BA0, 9, param0->unk_BA8); + MessageLoader_GetStrbuf(param0->unk_BA0, 9, param0->unk_BA8); param0->unk_BAC = sub_0201D738(¶m0->unk_B7C, 1, param0->unk_BA8, 0, 0, 0, NULL); sub_020364F0(62); @@ -1418,7 +1418,7 @@ static void ov10_02220DFC (UnkStruct_ov10_0221FB28 * param0) } if (param0->unk_BA0 != NULL) { - sub_0200B190(param0->unk_BA0); + MessageLoader_Free(param0->unk_BA0); } } @@ -2257,7 +2257,7 @@ 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, Strbuf *param4, u32 param5) +static void ov10_02222400 (UnkStruct_ov10_0221FB28 * param0, MessageLoader * param1, UnkStruct_0200C440 * param2, UnkStruct_0200B358 * param3, Strbuf *param4, u32 param5) { Pokemon * v0; UnkStruct_0205AA50 * v1; @@ -2271,7 +2271,7 @@ static void ov10_02222400 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_0200B144 v0 = Party_GetPokemonBySlotIndex(param0->unk_00->unk_04[2], param5 - 3); } - v2 = sub_0200B1EC(param1, 8 + param5); + v2 = MessageLoader_GetNewStrbuf(param1, 8 + param5); sub_0200B5CC(param3, 0, sub_02076B10(v0)); sub_0200C388(param3, param4, v2); @@ -2280,16 +2280,16 @@ static void ov10_02222400 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_0200B144 if (param0->unk_214[param5].unk_0E == 0) { if (param0->unk_214[param5].unk_0D == 0) { - sub_0200B1B8(param1, 27, param4); + MessageLoader_GetStrbuf(param1, 27, param4); sub_0201D78C(v1, 0, param4, 64, 0, 0xff, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } else if (param0->unk_214[param5].unk_0D == 1) { - sub_0200B1B8(param1, 28, param4); + MessageLoader_GetStrbuf(param1, 28, param4); sub_0201D78C(v1, 0, param4, 64, 0, 0xff, ((u32)(((5 & 0xff) << 16) | ((6 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } } } -static void ov10_022224F0 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200C440 * param2, UnkStruct_0200B358 * param3, Strbuf *param4, u32 param5) +static void ov10_022224F0 (UnkStruct_ov10_0221FB28 * param0, MessageLoader * param1, UnkStruct_0200C440 * param2, UnkStruct_0200B358 * param3, Strbuf *param4, u32 param5) { UnkStruct_0205AA50 * v0; Strbuf* v1; @@ -2299,7 +2299,7 @@ static void ov10_022224F0 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_0200B144 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, Strbuf *param4, u32 param5) +static void ov10_02222528 (UnkStruct_ov10_0221FB28 * param0, MessageLoader * param1, UnkStruct_0200C440 * param2, UnkStruct_0200B358 * param3, Strbuf *param4, u32 param5) { UnkStruct_0205AA50 * v0; Strbuf* v1; @@ -2348,7 +2348,7 @@ 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, Strbuf *param4, u32 param5) +static void ov10_02222684 (UnkStruct_ov10_0221FB28 * param0, MessageLoader * param1, UnkStruct_0200C440 * param2, UnkStruct_0200B358 * param3, Strbuf *param4, u32 param5) { Pokemon * v0; UnkStruct_0205AA50 * v1; @@ -2375,13 +2375,13 @@ static void ov10_02222684 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_0200B144 static void ov10_02222720 (UnkStruct_ov10_0221FB28 * param0) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; UnkStruct_0200C440 * v1; UnkStruct_0200B358 * v2; Strbuf* v3; u32 v4; - v0 = sub_0200B144(0, 26, 453, param0->unk_00->unk_24); + v0 = MessageLoader_Init(0, 26, 453, param0->unk_00->unk_24); v1 = sub_0200C440(15, 14, 0, param0->unk_00->unk_24); v2 = sub_0200B358(param0->unk_00->unk_24); v3 = Strbuf_Init(32, param0->unk_00->unk_24); @@ -2395,7 +2395,7 @@ static void ov10_02222720 (UnkStruct_ov10_0221FB28 * param0) } Strbuf_Free(v3); - sub_0200B190(v0); + MessageLoader_Free(v0); sub_0200C560(v1); sub_0200B3F0(v2); } diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c index bd0f1d9742..2b017728a9 100644 --- a/src/overlay013/ov13_0221FC20.c +++ b/src/overlay013/ov13_0221FC20.c @@ -406,7 +406,7 @@ static u8 ov13_0221FFDC (UnkStruct_ov13_022213F0 * param0) param0->unk_2078 = 0; return 22; } else { - sub_0200B1B8(param0->unk_1FA4, 81, param0->unk_1FAC); + MessageLoader_GetStrbuf(param0->unk_1FA4, 81, param0->unk_1FAC); ov13_022240E0(param0); param0->unk_00->unk_11 = 6; param0->unk_2075 = 25; @@ -742,7 +742,7 @@ static u8 ov13_02220628 (UnkStruct_ov13_022213F0 * param0) param0->unk_2075 = 23; return 22; } else { - sub_0200B1B8(param0->unk_1FA4, 81, param0->unk_1FAC); + MessageLoader_GetStrbuf(param0->unk_1FA4, 81, param0->unk_1FAC); ov13_022240E0(param0); param0->unk_00->unk_11 = 6; param0->unk_2075 = 25; @@ -1187,7 +1187,7 @@ static void ov13_02220D4C (UnkStruct_ov13_022213F0 * param0) static void ov13_02220F08 (UnkStruct_ov13_022213F0 * param0) { - param0->unk_1FA4 = sub_0200B144(0, 26, 3, param0->unk_00->unk_0C); + param0->unk_1FA4 = MessageLoader_Init(0, 26, 3, param0->unk_00->unk_0C); param0->unk_1FA0 = sub_0200C440(15, 14, 0, param0->unk_00->unk_0C); param0->unk_1FA8 = sub_0200B358(param0->unk_00->unk_0C); param0->unk_1FAC = Strbuf_Init(512, param0->unk_00->unk_0C); @@ -1195,7 +1195,7 @@ static void ov13_02220F08 (UnkStruct_ov13_022213F0 * param0) static void ov13_02220F60 (UnkStruct_ov13_022213F0 * param0) { - sub_0200B190(param0->unk_1FA4); + MessageLoader_Free(param0->unk_1FA4); sub_0200C560(param0->unk_1FA0); sub_0200B3F0(param0->unk_1FA8); Strbuf_Free(param0->unk_1FAC); @@ -1607,7 +1607,7 @@ static u8 ov13_022217A4 (UnkStruct_ov13_022213F0 * param0) v0 = ¶m0->unk_04[param0->unk_00->unk_11]; if (ov13_022219AC(param0, param0->unk_00->unk_11) == 1) { - v1 = sub_0200B1EC(param0->unk_1FA4, 80); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 80); { int v2; @@ -1620,7 +1620,7 @@ static u8 ov13_022217A4 (UnkStruct_ov13_022213F0 * param0) } if (v0->unk_10 == 0) { - v1 = sub_0200B1EC(param0->unk_1FA4, 77); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 77); sub_0200B5CC(param0->unk_1FA8, 0, sub_02076B10(v0->unk_00)); sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v1); Strbuf_Free(v1); @@ -1628,7 +1628,7 @@ static u8 ov13_022217A4 (UnkStruct_ov13_022213F0 * param0) } if ((param0->unk_00->unk_2C[param0->unk_00->unk_11] == param0->unk_00->unk_14) || (param0->unk_00->unk_2C[param0->unk_00->unk_11] == param0->unk_00->unk_15)) { - v1 = sub_0200B1EC(param0->unk_1FA4, 76); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 76); sub_0200B5CC(param0->unk_1FA8, 0, sub_02076B10(v0->unk_00)); sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v1); Strbuf_Free(v1); @@ -1636,13 +1636,13 @@ static u8 ov13_022217A4 (UnkStruct_ov13_022213F0 * param0) } if (ov13_0222194C(param0) == 1) { - sub_0200B1B8(param0->unk_1FA4, 79, param0->unk_1FAC); + MessageLoader_GetStrbuf(param0->unk_1FA4, 79, param0->unk_1FAC); return 0; } if ((param0->unk_00->unk_12 != 6) && (param0->unk_00->unk_2C[param0->unk_00->unk_11] == param0->unk_00->unk_12)) { v0 = ¶m0->unk_04[param0->unk_00->unk_11]; - v1 = sub_0200B1EC(param0->unk_1FA4, 93); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 93); sub_0200B5CC(param0->unk_1FA8, 0, sub_02076B10(v0->unk_00)); sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v1); @@ -1652,7 +1652,7 @@ static u8 ov13_022217A4 (UnkStruct_ov13_022213F0 * param0) if (param0->unk_00->unk_24 != 0) { v0 = ¶m0->unk_04[param0->unk_2072]; - v1 = sub_0200B1EC(param0->unk_1FA4, 78); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 78); sub_0200B5CC(param0->unk_1FA8, 0, sub_02076B10(v0->unk_00)); sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v1); diff --git a/src/overlay013/ov13_02221A88.c b/src/overlay013/ov13_02221A88.c index f6edfe173e..35efd54c00 100644 --- a/src/overlay013/ov13_02221A88.c +++ b/src/overlay013/ov13_02221A88.c @@ -1,10 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" -#include "strbuf.h" #include "struct_defs/pokemon.h" - #include "struct_defs/struct_0205AA50.h" #include "overlay013/struct_ov13_0221FC20.h" #include "overlay013/struct_ov13_022213F0.h" @@ -319,7 +316,7 @@ static void ov13_02221C54 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par v0 = ¶m0->unk_206C[param1]; v1 = ¶m0->unk_04[param3]; v2 = Strbuf_Init(12, param0->unk_00->unk_0C); - v3 = sub_0200B1EC(param0->unk_1FA4, Unk_ov13_02228EC4[param3]); + v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, Unk_ov13_02228EC4[param3]); sub_0200B5CC(param0->unk_1FA8, 0, sub_02076B10(v1->unk_00)); sub_0200C388(param0->unk_1FA8, v2, v3); @@ -335,7 +332,7 @@ static void ov13_02221C54 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par if ((v1->unk_16_7 == 0) && (v1->unk_17_7 == 0)) { if (v1->unk_17_0 == 0) { - v3 = sub_0200B1EC(param0->unk_1FA4, 16); + v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 16); v4 = sub_0201C294(v0) * 8 - sub_02002D7C(0, v3, 0); if (param2 == 0) { @@ -346,7 +343,7 @@ static void ov13_02221C54 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par Strbuf_Free(v3); } else if (v1->unk_17_0 == 1) { - v3 = sub_0200B1EC(param0->unk_1FA4, 17); + v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 17); v4 = sub_0201C294(v0) * 8 - sub_02002D7C(0, v3, 0); if (param2 == 0) { @@ -420,7 +417,7 @@ static void ov13_02221FA8 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par v0 = ¶m0->unk_04[param2]; v1 = Strbuf_Init(16, param0->unk_00->unk_0C); - v2 = sub_0200B1EC(param0->unk_1FA4, 8); + v2 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 8); sub_0200B6A0(param0->unk_1FA8, 0, v0->unk_18); sub_0200C388(param0->unk_1FA8, v1, v2); @@ -439,10 +436,10 @@ static void ov13_02222030 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par v0 = ¶m0->unk_04[param2]; if (v0->unk_1A == 0) { - v1 = sub_0200B1EC(param0->unk_1FA4, 20); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 20); } else { v1 = Strbuf_Init(18, param0->unk_00->unk_0C); - v2 = sub_0200B1EC(param0->unk_1FA4, 9); + v2 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 9); sub_0200B70C(param0->unk_1FA8, 0, v0->unk_1A); sub_0200C388(param0->unk_1FA8, v1, v2); @@ -463,7 +460,7 @@ static void ov13_022220CC (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par v0 = ¶m0->unk_206C[param2]; v1 = Strbuf_Init(16, param0->unk_00->unk_0C); - v2 = sub_0200B1EC(param0->unk_1FA4, param3); + v2 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, param3); sub_0200B630(param0->unk_1FA8, 0, param1); sub_0200C388(param0->unk_1FA8, v1, v2); @@ -484,7 +481,7 @@ static void ov13_02222170 (UnkStruct_ov13_022213F0 * param0, u16 param1, u8 para { Strbuf* v0; - v0 = sub_0200B1EC(param0->unk_1FA4, 14); + v0 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 14); sub_0201D78C(¶m0->unk_206C[param1], 0, v0, param2, param3, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); @@ -498,7 +495,7 @@ static void ov13_022221C8 (UnkStruct_ov13_022213F0 * param0, u32 param1) sub_0200E060(¶m0->unk_204C[0], 1, 1, 14); sub_0201ADA4(¶m0->unk_204C[0], 15); - v0 = sub_0200B1EC(param0->unk_1FA4, param1); + v0 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, param1); sub_0201D78C(¶m0->unk_204C[0], 1, v0, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); @@ -512,7 +509,7 @@ static void ov13_0222222C (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par u32 v2; v0 = ¶m0->unk_206C[param1]; - v1 = sub_0200B1EC(param0->unk_1FA4, param2); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, param2); v2 = sub_02002D7C(2, v1, 0); sub_0201D78C(v0, 2, v1, (sub_0201C294(v0) * 8 - v2) / 2, 6, 0xff, ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((9 & 0xff) << 0))), NULL); @@ -530,12 +527,12 @@ static void ov13_02222290 (UnkStruct_ov13_022213F0 * param0, u32 param1) v0 = ¶m0->unk_04[param1]; v4 = 22 * param0->unk_2071; - v1 = sub_0200B1EC(param0->unk_1FA4, 23); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 23); sub_0201D78C(¶m0->unk_206C[19], 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_1FA4, 24); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 24); v2 = Strbuf_Init((3 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, v0->unk_16_0, 3, 0, 1); @@ -544,12 +541,12 @@ static void ov13_02222290 (UnkStruct_ov13_022213F0 * param0, u32 param1) Strbuf_Free(v1); Strbuf_Free(v2); - v1 = sub_0200B1EC(param0->unk_1FA4, 25); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 25); sub_0201D78C(¶m0->unk_206C[20], 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_1FA4, 26); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 26); v2 = Strbuf_Init((6 + 1) * 2, param0->unk_00->unk_0C); if (v0->unk_16_0 < 100) { @@ -584,12 +581,12 @@ static void ov13_02222464 (UnkStruct_ov13_022213F0 * param0, u32 param1) v0 = ¶m0->unk_04[param1]; v3 = 22 * param0->unk_2071; - v1 = sub_0200B1EC(param0->unk_1FA4, 32); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 32); sub_0201D78C(¶m0->unk_206C[14], 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_1FA4, 33); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 33); v2 = Strbuf_Init((3 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, v0->unk_06, 3, 0, 1); @@ -616,12 +613,12 @@ static void ov13_02222560 (UnkStruct_ov13_022213F0 * param0, u32 param1) v0 = ¶m0->unk_04[param1]; v3 = 22 * param0->unk_2071; - v1 = sub_0200B1EC(param0->unk_1FA4, 34); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 34); sub_0201D78C(¶m0->unk_206C[15], 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_1FA4, 35); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 35); v2 = Strbuf_Init((3 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, v0->unk_08, 3, 0, 1); @@ -648,12 +645,12 @@ static void ov13_0222265C (UnkStruct_ov13_022213F0 * param0, u32 param1) v0 = ¶m0->unk_04[param1]; v3 = 22 * param0->unk_2071; - v1 = sub_0200B1EC(param0->unk_1FA4, 40); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 40); sub_0201D78C(¶m0->unk_206C[16], 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_1FA4, 41); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 41); v2 = Strbuf_Init((3 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, v0->unk_0A, 3, 0, 1); @@ -681,12 +678,12 @@ static void ov13_0222275C (UnkStruct_ov13_022213F0 * param0, u32 param1) v0 = ¶m0->unk_04[param1]; v3 = 22 * param0->unk_2071; - v1 = sub_0200B1EC(param0->unk_1FA4, 36); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 36); sub_0201D78C(¶m0->unk_206C[17], 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_1FA4, 37); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 37); v2 = Strbuf_Init((3 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, v0->unk_0C, 3, 0, 1); @@ -713,12 +710,12 @@ static void ov13_0222285C (UnkStruct_ov13_022213F0 * param0, u32 param1) v0 = ¶m0->unk_04[param1]; v3 = 22 * param0->unk_2071; - v1 = sub_0200B1EC(param0->unk_1FA4, 38); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 38); sub_0201D78C(¶m0->unk_206C[18], 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_1FA4, 39); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 39); v2 = Strbuf_Init((3 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, v0->unk_0E, 3, 0, 1); @@ -745,19 +742,19 @@ static void ov13_0222295C (UnkStruct_ov13_022213F0 * param0, u32 param1) v0 = ¶m0->unk_04[param1]; v6 = 22 * param0->unk_2071; - v1 = sub_0200B1EC(param0->unk_1FA4, 28); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 28); sub_0201D78C(¶m0->unk_206C[13], 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_1FA4, 31); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 31); v3 = sub_02002D7C(0, v1, 0); v5 = (sub_0201C294(¶m0->unk_206C[4]) * 8 - v3) / 2; sub_0201D78C(¶m0->unk_206C[4 + v6], 0, v1, v5, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_1FA4, 29); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 29); v2 = Strbuf_Init((3 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, v0->unk_10, 3, 0, 1); @@ -769,7 +766,7 @@ static void ov13_0222295C (UnkStruct_ov13_022213F0 * param0, u32 param1) Strbuf_Free(v1); Strbuf_Free(v2); - v1 = sub_0200B1EC(param0->unk_1FA4, 30); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 30); v2 = Strbuf_Init((3 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, v0->unk_12, 3, 0, 1); @@ -784,18 +781,18 @@ static void ov13_0222295C (UnkStruct_ov13_022213F0 * param0, u32 param1) static void ov13_02222AF4 (UnkStruct_ov13_022213F0 * param0, u32 param1) { UnkStruct_ov13_02221ED0 * v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; Strbuf* v2; u32 v3; v0 = ¶m0->unk_04[param1]; v3 = 22 * param0->unk_2071; - v1 = sub_0200B144(1, 26, 612, param0->unk_00->unk_0C); - v2 = sub_0200B1EC(v1, v0->unk_18); + v1 = MessageLoader_Init(1, 26, 612, param0->unk_00->unk_0C); + v2 = MessageLoader_GetNewStrbuf(v1, v0->unk_18); sub_0201D78C(¶m0->unk_206C[2 + v3], 0, v2, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v2); - sub_0200B190(v1); + MessageLoader_Free(v1); sub_0201A9A4(¶m0->unk_206C[2 + v3]); } @@ -805,7 +802,7 @@ static void ov13_02222B6C (UnkStruct_ov13_022213F0 * param0, u32 param1) Strbuf* v1; v0 = ¶m0->unk_206C[param1]; - v1 = sub_0200B1EC(param0->unk_1FA4, 51); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 51); sub_0201D78C(v0, 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); @@ -823,14 +820,14 @@ static void ov13_02222BB4 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par v0 = ¶m0->unk_206C[param1]; if (param2 == 0) { - v1 = sub_0200B1EC(param0->unk_1FA4, 50); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 50); v3 = sub_02002D7C(0, v1, 0); v4 = sub_0201C294(v0) * 8 - v3; sub_0201D78C(v0, 0, v1, v4, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); } else { - v1 = sub_0200B1EC(param0->unk_1FA4, 52); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 52); v2 = Strbuf_Init((3 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, param2, 3, 0, 1); @@ -853,7 +850,7 @@ static void ov13_02222C9C (UnkStruct_ov13_022213F0 * param0, u32 param1) Strbuf* v1; v0 = ¶m0->unk_206C[param1]; - v1 = sub_0200B1EC(param0->unk_1FA4, 48); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 48); sub_0201D78C(v0, 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); @@ -871,14 +868,14 @@ static void ov13_02222CE4 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par v0 = ¶m0->unk_206C[param1]; if (param2 <= 1) { - v1 = sub_0200B1EC(param0->unk_1FA4, 50); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 50); v3 = sub_02002D7C(0, v1, 0); v4 = sub_0201C294(v0) * 8 - v3; sub_0201D78C(v0, 0, v1, v4, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); } else { - v1 = sub_0200B1EC(param0->unk_1FA4, 49); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 49); v2 = Strbuf_Init((3 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, param2, 3, 0, 1); @@ -897,23 +894,23 @@ static void ov13_02222CE4 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par static void ov13_02222DCC (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; UnkStruct_0205AA50 * v1; Strbuf* v2; v1 = ¶m0->unk_206C[param1]; - v0 = sub_0200B144(1, 26, 646, param0->unk_00->unk_0C); - v2 = sub_0200B1EC(v0, param2); + v0 = MessageLoader_Init(1, 26, 646, param0->unk_00->unk_0C); + v2 = MessageLoader_GetNewStrbuf(v0, param2); sub_0201D78C(v1, 0, v2, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v2); - sub_0200B190(v0); + MessageLoader_Free(v0); sub_0201A9A4(v1); } static void ov13_02222E2C (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; UnkStruct_0205AA50 * v1; Strbuf* v2; u32 v3; @@ -922,13 +919,13 @@ static void ov13_02222E2C (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par v1 = ¶m0->unk_206C[param1]; v3 = MoveTable_LoadParam(param2, MOVEATTRIBUTE_CONTEST_EFFECT); v4 = sub_0209577C(v3); - v0 = sub_0200B144(0, 26, 210, param0->unk_00->unk_0C); - v2 = sub_0200B1EC(v0, v4); + v0 = MessageLoader_Init(0, 26, 210, param0->unk_00->unk_0C); + v2 = MessageLoader_GetNewStrbuf(v0, v4); sub_0201D78C(v1, 0, v2, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v2); - sub_0200B190(v0); + MessageLoader_Free(v0); sub_0201A9A4(v1); } @@ -940,7 +937,7 @@ static void ov13_02222E94 (UnkStruct_ov13_022213F0 * param0, u32 param1) u16 v3; v0 = ¶m0->unk_206C[param1]; - v1 = sub_0200B1EC(param0->unk_1FA4, 53); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 53); v2 = sub_02002D7C(0, v1, 0); v3 = (sub_0201C294(v0) * 8 - v2) / 2; @@ -958,13 +955,13 @@ static void ov13_02222EF8 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par switch (param2) { case 0: - v1 = sub_0200B1EC(param0->unk_1FA4, 54); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 54); break; case 1: - v1 = sub_0200B1EC(param0->unk_1FA4, 56); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 56); break; case 2: - v1 = sub_0200B1EC(param0->unk_1FA4, 55); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 55); } { @@ -985,14 +982,14 @@ static void ov13_02222F74 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par u32 v5; v0 = ¶m0->unk_206C[param1]; - v1 = sub_0200B1EC(param0->unk_1FA4, 46); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 46); v3 = sub_02002D7C(0, v1, 0); v5 = (sub_0201C294(v0) * 8 - v3) / 2; sub_0201D78C(v0, 0, v1, v5, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_1FA4, 44); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 44); v2 = Strbuf_Init((2 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, param2, 3, 0, 1); @@ -1004,7 +1001,7 @@ static void ov13_02222F74 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par Strbuf_Free(v1); Strbuf_Free(v2); - v1 = sub_0200B1EC(param0->unk_1FA4, 45); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 45); v2 = Strbuf_Init((2 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, param3, 3, 0, 1); @@ -1024,9 +1021,9 @@ static void ov13_022230A8 (UnkStruct_ov13_022213F0 * param0, u32 param1) v0 = ¶m0->unk_206C[param1]; if (param0->unk_00->unk_34 == 4) { - v1 = sub_0200B1EC(param0->unk_1FA4, 59); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 59); } else { - v1 = sub_0200B1EC(param0->unk_1FA4, 58); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 58); } v2 = sub_02002D7C(2, v1, 0); @@ -1049,7 +1046,7 @@ void ov13_02223118 (UnkStruct_ov13_022213F0 * param0) sub_0201ADA4(v0, 0); - v1 = sub_0200B1EC(param0->unk_1FA4, 60); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 60); sub_0201D78C(v0, 0, v1, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); @@ -1065,25 +1062,25 @@ static void ov13_0222317C (UnkStruct_ov13_022213F0 * param0, UnkStruct_ov13_0222 v0 = ¶m0->unk_206C[param2]; v2 = Strbuf_Init((2 + 1) * 2, param0->unk_00->unk_0C); - v1 = sub_0200B1EC(param0->unk_1FA4, 43); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 43); sub_0201D78C(v0, 0, v1, 40, 24, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_1FA4, 46); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 46); v3 = sub_02002D7C(0, v1, 0); sub_0201D78C(v0, 0, v1, 80, 24, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_1FA4, 45); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 45); sub_0200B60C(param0->unk_1FA8, 0, param1->unk_03, 2, 0, 1); sub_0200C388(param0->unk_1FA8, v2, v1); sub_0201D78C(v0, 0, v2, 80 + v3, 24, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_1FA4, 44); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 44); sub_0200B60C(param0->unk_1FA8, 0, param1->unk_02, 2, 0, 1); sub_0200C388(param0->unk_1FA8, v2, v1); @@ -1105,13 +1102,13 @@ static void ov13_022232C8 (UnkStruct_ov13_022213F0 * param0, UnkStruct_ov13_0222 v0 = ¶m0->unk_206C[param2]; v2 = Strbuf_Init((2 + 1) * 2, param0->unk_00->unk_0C); - v1 = sub_0200B1EC(param0->unk_1FA4, 43); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 43); v3 = sub_02002D7C(0, v1, 0); Strbuf_Free(v1); sub_0201AE78(v0, 0, 40 + v3, 24, 80 - (40 + v3), 16); - v1 = sub_0200B1EC(param0->unk_1FA4, 44); + v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 44); sub_0200B60C(param0->unk_1FA8, 0, param1->unk_02, 2, 0, 1); sub_0200C388(param0->unk_1FA8, v2, v1); @@ -1205,7 +1202,7 @@ static void ov13_02223550 (UnkStruct_ov13_022213F0 * param0, u32 param1) v0 = ¶m0->unk_206C[0]; v1 = ¶m0->unk_04[param1]; v2 = Strbuf_Init(12, param0->unk_00->unk_0C); - v3 = sub_0200B1EC(param0->unk_1FA4, Unk_ov13_02228EC4[param1]); + v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, Unk_ov13_02228EC4[param1]); sub_0200B5CC(param0->unk_1FA8, 0, sub_02076B10(v1->unk_00)); sub_0200C388(param0->unk_1FA8, v2, v3); @@ -1215,9 +1212,9 @@ static void ov13_02223550 (UnkStruct_ov13_022213F0 * param0, u32 param1) if ((v1->unk_16_7 == 0) && (v1->unk_17_7 == 0)) { if (v1->unk_17_0 == 0) { - v3 = sub_0200B1EC(param0->unk_1FA4, 16); + v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 16); } else if (v1->unk_17_0 == 1) { - v3 = sub_0200B1EC(param0->unk_1FA4, 17); + v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 17); } } @@ -1513,7 +1510,7 @@ static void ov13_02223F7C (UnkStruct_ov13_022213F0 * param0) { Strbuf* v0; - v0 = sub_0200B1EC(param0->unk_1FA4, 57); + v0 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 57); { u32 v1 = sub_02002EEC(0, v0, 0, 12 * 8); @@ -1599,55 +1596,55 @@ void ov13_02224144 (UnkStruct_ov13_022213F0 * param0) } if ((param0->unk_04[v1->unk_11].unk_10 == 0) && (v4 != 0)) { - v3 = sub_0200B1EC(param0->unk_1FA4, 88); + v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 88); sub_0200B5CC(param0->unk_1FA8, 0, sub_02076B10(v0)); sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v3); Strbuf_Free(v3); } else if (param0->unk_04[v1->unk_11].unk_10 != v4) { - v3 = sub_0200B1EC(param0->unk_1FA4, 82); + v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 82); sub_0200B5CC(param0->unk_1FA8, 0, sub_02076B10(v0)); sub_0200B60C(param0->unk_1FA8, 1, v4 - param0->unk_04[v1->unk_11].unk_10, 3, 0, 1); sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v3); Strbuf_Free(v3); } else if ((Item_Get(v2, 36) != 0) || (Item_Get(v2, 37) != 0)) { - sub_0200B1B8(param0->unk_1FA4, 87, param0->unk_1FAC); + MessageLoader_GetStrbuf(param0->unk_1FA4, 87, param0->unk_1FAC); } else if (v5 == 0x1) { - v3 = sub_0200B1EC(param0->unk_1FA4, 92); + v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 92); sub_0200B5CC(param0->unk_1FA8, 0, sub_02076B10(v0)); sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v3); Strbuf_Free(v3); } else if (v5 == 0x2) { - v3 = sub_0200B1EC(param0->unk_1FA4, 83); + v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 83); sub_0200B5CC(param0->unk_1FA8, 0, sub_02076B10(v0)); sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v3); Strbuf_Free(v3); } else if (v5 == 0x4) { - v3 = sub_0200B1EC(param0->unk_1FA4, 85); + v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 85); sub_0200B5CC(param0->unk_1FA8, 0, sub_02076B10(v0)); sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v3); Strbuf_Free(v3); } else if (v5 == 0x8) { - v3 = sub_0200B1EC(param0->unk_1FA4, 86); + v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 86); sub_0200B5CC(param0->unk_1FA8, 0, sub_02076B10(v0)); sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v3); Strbuf_Free(v3); } else if (v5 == 0x10) { - v3 = sub_0200B1EC(param0->unk_1FA4, 84); + v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 84); sub_0200B5CC(param0->unk_1FA8, 0, sub_02076B10(v0)); sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v3); Strbuf_Free(v3); } else if (v5 == 0x20) { - v3 = sub_0200B1EC(param0->unk_1FA4, 90); + v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 90); sub_0200B5CC(param0->unk_1FA8, 0, sub_02076B10(v0)); sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v3); Strbuf_Free(v3); } else if (v5 == 0x40) { - v3 = sub_0200B1EC(param0->unk_1FA4, 91); + v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 91); sub_0200B5CC(param0->unk_1FA8, 0, sub_02076B10(v0)); sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v3); Strbuf_Free(v3); } else { - v3 = sub_0200B1EC(param0->unk_1FA4, 89); + v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 89); sub_0200B5CC(param0->unk_1FA8, 0, sub_02076B10(v0)); sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v3); Strbuf_Free(v3); @@ -1664,7 +1661,7 @@ void ov13_0222449C (UnkStruct_ov13_022213F0 * param0) v1 = param0->unk_00; v0 = ov16_0223DFAC(v1->unk_08, v1->unk_28, v1->unk_2C[v1->unk_11]); - v2 = sub_0200B1EC(param0->unk_1FA4, 95); + v2 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 95); sub_0200B5CC(param0->unk_1FA8, 0, sub_02076B10(v0)); sub_0200B630(param0->unk_1FA8, 1, 373); diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c index a6b1f5e047..093f1f5bbb 100644 --- a/src/overlay013/ov13_022264F4.c +++ b/src/overlay013/ov13_022264F4.c @@ -4,7 +4,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "strbuf.h" @@ -413,7 +413,7 @@ static u8 ov13_02226A5C (UnkStruct_ov13_02227244 * param0) Strbuf* v4; v3 = ov16_0223DFAC(v0->unk_00, v0->unk_10, v1); - v4 = sub_0200B1EC(param0->unk_10, 46); + v4 = MessageLoader_GetNewStrbuf(param0->unk_10, 46); sub_0200B5CC(param0->unk_14, 0, sub_02076B10(v3)); sub_0200B630(param0->unk_14, 1, 373); @@ -434,42 +434,42 @@ static u8 ov13_02226A5C (UnkStruct_ov13_02227244 * param0) ov13_02227260(v0->unk_00, v0->unk_1C, param0->unk_114D, v0->unk_0C); return 13; } else { - UnkStruct_0200B144 * v5; + MessageLoader * v5; Strbuf* v6; - v5 = sub_0200B144(1, 26, 213, v0->unk_0C); - v6 = sub_0200B1EC(v5, 36); + v5 = MessageLoader_Init(1, 26, 213, v0->unk_0C); + v6 = MessageLoader_GetNewStrbuf(v5, 36); sub_0200B498(param0->unk_14, 0, v0->unk_04); sub_0200C388(param0->unk_14, param0->unk_18, v6); Strbuf_Free(v6); - sub_0200B190(v5); + MessageLoader_Free(v5); ov13_022279F4(param0); param0->unk_114B = 8; return 9; } } else { - sub_0200B1B8(param0->unk_10, 34, param0->unk_18); + MessageLoader_GetStrbuf(param0->unk_10, 34, param0->unk_18); ov13_022279F4(param0); param0->unk_114B = 8; return 9; } } else if (param0->unk_114D == 2) { if (v0->unk_22 == 1) { - sub_0200B1B8(param0->unk_10, 44, param0->unk_18); + MessageLoader_GetStrbuf(param0->unk_10, 44, param0->unk_18); ov13_022279F4(param0); param0->unk_114B = 8; return 9; } if (v0->unk_23 == 1) { - sub_0200B1B8(param0->unk_10, 47, param0->unk_18); + MessageLoader_GetStrbuf(param0->unk_10, 47, param0->unk_18); ov13_022279F4(param0); param0->unk_114B = 8; return 9; } if (v0->unk_24 == 1) { - sub_0200B1B8(param0->unk_10, 48, param0->unk_18); + MessageLoader_GetStrbuf(param0->unk_10, 48, param0->unk_18); ov13_022279F4(param0); param0->unk_114B = 8; return 9; @@ -480,7 +480,7 @@ static u8 ov13_02226A5C (UnkStruct_ov13_02227244 * param0) UnkStruct_020797DC * v8 = ov16_0223E228(v0->unk_00); if ((Party_GetCurrentCount(v7) == 6) && (sub_020799A0(v8) == 18)) { - sub_0200B1B8(param0->unk_10, 45, param0->unk_18); + MessageLoader_GetStrbuf(param0->unk_10, 45, param0->unk_18); ov13_022279F4(param0); param0->unk_114B = 8; return 9; @@ -765,7 +765,7 @@ static void ov13_02226FC4 (UnkStruct_ov13_02227244 * param0) static void ov13_022270B8 (UnkStruct_ov13_02227244 * param0) { - param0->unk_10 = sub_0200B144(0, 26, 2, param0->unk_00->unk_0C); + param0->unk_10 = MessageLoader_Init(0, 26, 2, param0->unk_00->unk_0C); param0->unk_0C = sub_0200C440(15, 14, 0, param0->unk_00->unk_0C); param0->unk_14 = sub_0200B358(param0->unk_00->unk_0C); param0->unk_18 = Strbuf_Init(512, param0->unk_00->unk_0C); @@ -773,7 +773,7 @@ static void ov13_022270B8 (UnkStruct_ov13_02227244 * param0) static void ov13_022270F8 (UnkStruct_ov13_02227244 * param0) { - sub_0200B190(param0->unk_10); + MessageLoader_Free(param0->unk_10); sub_0200C560(param0->unk_0C); sub_0200B3F0(param0->unk_14); Strbuf_Free(param0->unk_18); diff --git a/src/overlay013/ov13_02227288.c b/src/overlay013/ov13_02227288.c index f0dceffbad..ca4e727646 100644 --- a/src/overlay013/ov13_02227288.c +++ b/src/overlay013/ov13_02227288.c @@ -146,7 +146,7 @@ static void ov13_02227374 (UnkStruct_ov13_02227244 * param0, u32 param1, u32 par u32 v3; v0 = ¶m0->unk_2C[param1]; - v1 = sub_0200B1EC(param0->unk_10, param2); + v1 = MessageLoader_GetNewStrbuf(param0->unk_10, param2); v2 = sub_02002D7C(param3, v1, 0); v3 = (sub_0201C294(v0) * 8 - v2) / 2; @@ -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) { - Strbuf* v1 = sub_0200B1EC(param0->unk_10, 8); + Strbuf* v1 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(v1); @@ -200,7 +200,7 @@ static void ov13_022274A8 (UnkStruct_ov13_02227244 * param0, u32 param1, u32 par sub_0201ADA4(v0, 0); if (param0->unk_3C[param0->unk_114D][param1].item != 0) { - v1 = sub_0200B1EC(param0->unk_10, Unk_ov13_02229AB0[param2][0]); + v1 = MessageLoader_GetNewStrbuf(param0->unk_10, Unk_ov13_02229AB0[param2][0]); sub_0200B70C(param0->unk_14, 0, param0->unk_3C[param0->unk_114D][param1].item); sub_0200C388(param0->unk_14, param0->unk_18, v1); @@ -225,7 +225,7 @@ static void ov13_0222754C (UnkStruct_ov13_02227244 * param0, u32 param1, u32 par sub_0201ADA4(v1, 0); if (param0->unk_3C[param0->unk_114D][param1].quantity != 0) { - v0 = sub_0200B1EC(param0->unk_10, Unk_ov13_02229AB0[param2][1]); + v0 = MessageLoader_GetNewStrbuf(param0->unk_10, Unk_ov13_02229AB0[param2][1]); sub_0200B60C(param0->unk_14, 0, param0->unk_3C[param0->unk_114D][param1].quantity, 3, 0, 1); sub_0200C388(param0->unk_14, param0->unk_18, v0); @@ -276,20 +276,20 @@ void ov13_02227698 (UnkStruct_ov13_02227244 * param0) sub_0201ADA4(¶m0->unk_2C[25], 0); v0 = ¶m0->unk_2C[25]; - v1 = sub_0200B1EC(param0->unk_10, 28); + v1 = MessageLoader_GetNewStrbuf(param0->unk_10, 28); v2 = sub_02002D7C(0, v1, 0); v3 = (sub_0201C294(v0) * 8 - v2) / 2; sub_0201D78C(v0, 0, v1, v3, 4, 0xff, (((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_10, 29); + v1 = MessageLoader_GetNewStrbuf(param0->unk_10, 29); sub_0200B60C(param0->unk_14, 0, param0->unk_1154[param0->unk_114D] + 1, 2, 0, 1); sub_0200C388(param0->unk_14, param0->unk_18, v1); sub_0201D78C(v0, 0, param0->unk_18, v3 + v2, 4, 0xff, (((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_10, 30); + v1 = MessageLoader_GetNewStrbuf(param0->unk_10, 30); sub_0200B60C(param0->unk_14, 0, param0->unk_00->unk_2C[param0->unk_114D] + 1, 2, 0, 1); sub_0200C388(param0->unk_14, param0->unk_18, v1); @@ -334,7 +334,7 @@ static void ov13_022278A0 (UnkStruct_ov13_02227244 * param0, u32 param1) Strbuf* v1; v0 = ¶m0->unk_2C[0]; - v1 = sub_0200B1EC(param0->unk_10, Unk_ov13_02229AB0[0][0]); + v1 = MessageLoader_GetNewStrbuf(param0->unk_10, Unk_ov13_02229AB0[0][0]); sub_0200B70C(param0->unk_14, 0, param0->unk_3C[param0->unk_114D][param1].item); sub_0200C388(param0->unk_14, param0->unk_18, v1); diff --git a/src/overlay016/ov16_0223B140.c b/src/overlay016/ov16_0223B140.c index bda876af42..3153a84222 100644 --- a/src/overlay016/ov16_0223B140.c +++ b/src/overlay016/ov16_0223B140.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "strbuf.h" @@ -624,8 +624,8 @@ static void ov16_0223B790 (UnkStruct_020067E8 * param0) sub_0201E3D8(); sub_0201E450(4); - v0->unk_0C = sub_0200B144(1, 26, 368, 5); - v0->unk_10 = sub_0200B144(1, 26, 0, 5); + v0->unk_0C = MessageLoader_Init(1, 26, 368, 5); + v0->unk_10 = MessageLoader_Init(1, 26, 0, 5); v0->unk_14 = sub_0200B358(5); v0->unk_18 = Strbuf_Init((2 * 160), 5); @@ -769,8 +769,8 @@ static void ov16_0223BCB4 (UnkStruct_020067E8 * param0) sub_02002FA0(v0->unk_28, 2); sub_02002FA0(v0->unk_28, 3); sub_02002F54(v0->unk_28); - sub_0200B190(v0->unk_0C); - sub_0200B190(v0->unk_10); + MessageLoader_Free(v0->unk_0C); + MessageLoader_Free(v0->unk_10); sub_0200B3F0(v0->unk_14); sub_02015FB8(v0->unk_1C4); sub_020141E4(); @@ -1745,17 +1745,17 @@ static void ov16_0223D10C (UnkStruct_020067E8 * param0, BattleParams * param1) sub_0200E060(v0->unk_08, 0, 1, 10); { - UnkStruct_0200B144 * v5; + MessageLoader * v5; Strbuf* v6; - v5 = sub_0200B144(1, 26, 368, 5); + v5 = MessageLoader_Init(1, 26, 368, 5); v6 = Strbuf_Init(0x100, 5); - sub_0200B1B8(v5, 923, v6); + MessageLoader_GetStrbuf(v5, 923, v6); sub_0201D738(v0->unk_08, 1, v6, 0, 0, NULL, NULL); Strbuf_Free(v6); - sub_0200B190(v5); + MessageLoader_Free(v5); } sub_02017798(ov16_0223CF1C, v0); diff --git a/src/overlay016/ov16_0223DF00.c b/src/overlay016/ov16_0223DF00.c index 14d51502e7..e1a2776f56 100644 --- a/src/overlay016/ov16_0223DF00.c +++ b/src/overlay016/ov16_0223DF00.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02007C7C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" @@ -90,8 +90,8 @@ UnkStruct_ov16_02268520 * ov16_0223E020(UnkStruct_0207ADB4 * param0, int param1) UnkStruct_ov16_02268A14 * ov16_0223E02C(UnkStruct_0207ADB4 * param0); UnkStruct_0200C440 * ov16_0223E04C(UnkStruct_0207ADB4 * param0); UnkStruct_0200C440 * ov16_0223E054(UnkStruct_0207ADB4 * param0); -UnkStruct_0200B144 * ov16_0223E05C(UnkStruct_0207ADB4 * param0); -UnkStruct_0200B144 * ov16_0223E060(UnkStruct_0207ADB4 * param0); +MessageLoader * ov16_0223E05C(UnkStruct_0207ADB4 * param0); +MessageLoader * ov16_0223E060(UnkStruct_0207ADB4 * param0); UnkStruct_02002F38 * ov16_0223E064(UnkStruct_0207ADB4 * param0); UnkStruct_02026324 * ov16_0223E068(UnkStruct_0207ADB4 * param0); u8 * ov16_0223E06C(UnkStruct_0207ADB4 * param0); @@ -204,11 +204,11 @@ void ov16_0223F9A0(UnkStruct_0207ADB4 * param0, int param1); BOOL ov16_0223F9E0(UnkStruct_0207ADB4 * param0, int param1); void ov16_0223F9F0(void); u8 ov16_0223F9FC(UnkStruct_0207ADB4 * param0, int param1, int param2, int param3, int param4); -u8 ov16_0223FB24(UnkStruct_0207ADB4 * param0, UnkStruct_0200B144 * param1, BattleMessage * param2, int param3); -u8 ov16_0223FB78(UnkStruct_0207ADB4 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0200B144 * param2, BattleMessage * param3, int param4, int param5, int param6, int param7, int param8); +u8 ov16_0223FB24(UnkStruct_0207ADB4 * param0, MessageLoader * param1, BattleMessage * param2, int param3); +u8 ov16_0223FB78(UnkStruct_0207ADB4 * param0, UnkStruct_0205AA50 * param1, MessageLoader * param2, BattleMessage * param3, int param4, int param5, int param6, int param7, int param8); static void ov16_0223FBE8(UnkStruct_0207ADB4 * param0, BattleMessage * param1); static void ov16_0223FDE4(UnkStruct_0207ADB4 * param0, BattleMessage * param1); -static void ov16_02240584(UnkStruct_0207ADB4 * param0, UnkStruct_0200B144 * param1, BattleMessage * param2); +static void ov16_02240584(UnkStruct_0207ADB4 * param0, MessageLoader * param1, BattleMessage * param2); static BOOL ov16_022405A4(UnkStruct_0201D738 * param0, u16 param1); static void ov16_02240460(UnkStruct_0207ADB4 * param0, u32 param1, int param2); static void ov16_02240484(UnkStruct_0207ADB4 * param0, u32 param1, int param2); @@ -340,12 +340,12 @@ UnkStruct_0200C440 * ov16_0223E054 (UnkStruct_0207ADB4 * param0) return param0->unk_1A8; } -UnkStruct_0200B144 * ov16_0223E05C (UnkStruct_0207ADB4 * param0) +MessageLoader * ov16_0223E05C (UnkStruct_0207ADB4 * param0) { return param0->unk_0C; } -UnkStruct_0200B144 * ov16_0223E060 (UnkStruct_0207ADB4 * param0) +MessageLoader * ov16_0223E060 (UnkStruct_0207ADB4 * param0) { return param0->unk_10; } @@ -1762,7 +1762,7 @@ u8 ov16_0223F9FC (UnkStruct_0207ADB4 * param0, int param1, int param2, int param } } else { { - UnkStruct_0200B144 * v3; + MessageLoader * v3; Strbuf* v4; int v5; u32 v6; @@ -1786,14 +1786,14 @@ u8 ov16_0223F9FC (UnkStruct_0207ADB4 * param0, int param1, int param2, int param v6 = 613; } - v3 = sub_0200B144(0, 26, v6, 5); - v4 = sub_0200B1EC(v3, v5); + v3 = MessageLoader_Init(0, 26, v6, 5); + v4 = MessageLoader_GetNewStrbuf(v3, v5); sub_0201ADA4(v0, 0xff); v1 = sub_0201D738(v0, 1, v4, 0, 0, param4, ov16_022405A4); Strbuf_Free(v4); - sub_0200B190(v3); + MessageLoader_Free(v3); } } } else { @@ -1805,7 +1805,7 @@ u8 ov16_0223F9FC (UnkStruct_0207ADB4 * param0, int param1, int param2, int param return v1; } -u8 ov16_0223FB24 (UnkStruct_0207ADB4 * param0, UnkStruct_0200B144 * param1, BattleMessage * param2, int param3) +u8 ov16_0223FB24 (UnkStruct_0207ADB4 * param0, MessageLoader * param1, BattleMessage * param2, int param3) { UnkStruct_0205AA50 * v0 = ov16_0223DF04(param0, 0); @@ -1818,7 +1818,7 @@ u8 ov16_0223FB24 (UnkStruct_0207ADB4 * param0, UnkStruct_0200B144 * param1, Batt return sub_0201D738(v0, 1, param0->unk_18, 0, 0, param3, ov16_022405A4); } -u8 ov16_0223FB78 (UnkStruct_0207ADB4 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0200B144 * param2, BattleMessage * param3, int param4, int param5, int param6, int param7, int param8) +u8 ov16_0223FB78 (UnkStruct_0207ADB4 * param0, UnkStruct_0205AA50 * param1, MessageLoader * param2, BattleMessage * param3, int param4, int param5, int param6, int param7, int param8) { int v0; @@ -2360,11 +2360,11 @@ static void ov16_02240574 (UnkStruct_0207ADB4 * param0, u32 param1, int param2) sub_0200BD40(param0->unk_14, param1, param0->unk_64, param2); } -static void ov16_02240584 (UnkStruct_0207ADB4 * param0, UnkStruct_0200B144 * param1, BattleMessage * param2) +static void ov16_02240584 (UnkStruct_0207ADB4 * param0, MessageLoader * param1, BattleMessage * param2) { Strbuf* v0; - v0 = sub_0200B1EC(param1, param2->id); + v0 = MessageLoader_GetNewStrbuf(param1, param2->id); sub_0200C388(param0->unk_14, param0->unk_18, v0); Strbuf_Free(v0); diff --git a/src/overlay016/ov16_022405FC.c b/src/overlay016/ov16_022405FC.c index 82df6a2776..7fcac06096 100644 --- a/src/overlay016/ov16_022405FC.c +++ b/src/overlay016/ov16_022405FC.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02007C7C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -7651,7 +7651,7 @@ static void ov16_02248E74 (UnkStruct_0201CD38 * param0, void * param1) BattleMessage v4; int v5; int v6; - UnkStruct_0200B144 * v7; + MessageLoader * v7; u32 v8; int v9; int v10; @@ -8216,7 +8216,7 @@ static void ov16_02249B80 (UnkStruct_0201CD38 * param0, void * param1) Pokemon * v3; UnkStruct_02002F38 * v4; UnkStruct_02007768 * v5; - UnkStruct_0200B144 * v6; + MessageLoader * v6; v6 = ov16_0223E05C(v2->unk_00); v4 = ov16_0223E064(v2->unk_00); @@ -9733,7 +9733,7 @@ static void ov16_0224B520 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B7CC UnkStruct_0200C6E4 * v1; UnkStruct_0200C704 * v2; UnkStruct_02002F38 * v3; - UnkStruct_0200B144 * v4; + MessageLoader * v4; UnkStruct_0200B358 * v5; Strbuf* v6, * v7; UnkStruct_02018340 * v8; @@ -9778,11 +9778,11 @@ static void ov16_0224B520 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B7CC } if (v13 == 0) { - v6 = sub_0200B1EC(v4, 944); + v6 = MessageLoader_GetNewStrbuf(v4, 944); } else if (v13 == 1) { - v6 = sub_0200B1EC(v4, 945); + v6 = MessageLoader_GetNewStrbuf(v4, 945); } else { - v6 = sub_0200B1EC(v4, 946); + v6 = MessageLoader_GetNewStrbuf(v4, 946); } sub_0200B5CC(v5, 0, sub_02076B10(param2)); diff --git a/src/overlay016/ov16_0225CBB8.c b/src/overlay016/ov16_0225CBB8.c index 07e839fb8c..6be9777862 100644 --- a/src/overlay016/ov16_0225CBB8.c +++ b/src/overlay016/ov16_0225CBB8.c @@ -10,7 +10,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02007C7C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -910,7 +910,7 @@ void ov16_0225D8AC (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param void ov16_0225D8F0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param1, UnkStruct_ov16_0225C2EC * param2) { UnkStruct_ov16_0225D8F0 * v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; BattleMessage v2; v1 = ov16_0223E060(param0); @@ -932,7 +932,7 @@ void ov16_0225D8F0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param void ov16_0225D958 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param1, BattleMessage * param2) { UnkStruct_ov16_0225D8F0 * v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; v1 = ov16_0223E05C(param0); v0 = (UnkStruct_ov16_0225D8F0 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225D8F0)); @@ -1158,7 +1158,7 @@ void ov16_0225DD7C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param void ov16_0225DDD8 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param1, UnkStruct_ov16_0225C3F8 * param2) { UnkStruct_ov16_0225D8F0 * v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; BattleMessage v2; ov16_02263C1C(param0, param1, param2, &v2); @@ -1177,7 +1177,7 @@ void ov16_0225DDD8 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param void ov16_0225DE30 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param1, UnkStruct_ov16_0225C40C * param2) { UnkStruct_ov16_0225D8F0 * v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; BattleMessage v2; ov16_02263CF0(param0, param1, param2, &v2); @@ -1196,7 +1196,7 @@ void ov16_0225DE30 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param void ov16_0225DE88 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param1) { UnkStruct_ov16_0225D8F0 * v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; BattleMessage v2; ov16_02263DD0(param0, param1, &v2); @@ -1215,7 +1215,7 @@ void ov16_0225DE88 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param void ov16_0225DEDC (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param1, UnkStruct_ov16_0225C430 * param2) { UnkStruct_ov16_0225D8F0 * v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; BattleMessage v2; ov16_02263E7C(param0, param1, param2, &v2); @@ -1249,7 +1249,7 @@ void ov16_0225DF34 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param void ov16_0225DF6C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param1, UnkStruct_ov16_0225C454 * param2) { UnkStruct_ov16_0225DF6C * v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; if (param1->unk_192 == 0x0) { v1 = ov16_0223E05C(param0); @@ -1415,7 +1415,7 @@ void ov16_0225E200 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param void ov16_0225E23C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param1) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; BattleMessage v1; if (param1->unk_192 == 0x0) { @@ -1475,7 +1475,7 @@ void ov16_0225E300 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param void ov16_0225E338 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param1) { UnkStruct_ov16_0225D8F0 * v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; BattleMessage v2; ov16_022641B4(param0, param1, &v2); @@ -1494,7 +1494,7 @@ void ov16_0225E338 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param void ov16_0225E38C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param1, UnkStruct_ov16_0225C9F0 * param2) { UnkStruct_ov16_0225D8F0 * v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; BattleMessage v2; ov16_02264270(param0, param1, param2, &v2); @@ -1513,7 +1513,7 @@ void ov16_0225E38C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param void ov16_0225E3E0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param1) { UnkStruct_ov16_0225D8F0 * v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; BattleMessage v2; ov16_02264360(param0, param1, &v2); @@ -2959,7 +2959,7 @@ static void ov16_022604C8 (UnkStruct_0201CD38 * param0, void * param1) case 1: { - UnkStruct_0200B144 * v9; + MessageLoader * v9; BattleMessage v10; v9 = ov16_0223E05C(v0->unk_00); @@ -3303,7 +3303,7 @@ static void ov16_02260C00 (UnkStruct_0201CD38 * param0, void * param1) } { - UnkStruct_0200B144 * v6; + MessageLoader * v6; BattleMessage v7; v6 = ov16_0223E05C(v0->unk_00); @@ -3873,7 +3873,7 @@ static void ov16_022611DC (UnkStruct_0201CD38 * param0, void * param1) break; case 9: { - UnkStruct_0200B144 * v8; + MessageLoader * v8; BattleMessage v9; v9.id = 1206; @@ -3935,7 +3935,7 @@ static void ov16_022611DC (UnkStruct_0201CD38 * param0, void * param1) break; case 15: { - UnkStruct_0200B144 * v14; + MessageLoader * v14; BattleMessage v15; v15.id = 1203; @@ -4032,7 +4032,7 @@ static void ov16_022611DC (UnkStruct_0201CD38 * param0, void * param1) break; case 23: { - UnkStruct_0200B144 * v24; + MessageLoader * v24; BattleMessage v25; int v26; @@ -4060,7 +4060,7 @@ static void ov16_022611DC (UnkStruct_0201CD38 * param0, void * param1) { UnkStruct_ov16_022674C4 * v27; int v28; - UnkStruct_0200B144 * v29; + MessageLoader * v29; BattleMessage v30; int v31; int v32 = 0; @@ -4520,7 +4520,7 @@ static void ov16_022623F0 (UnkStruct_0201CD38 * param0, void * param1) if (v0->unk_10) { { UnkStruct_0205AA50 * v6; - UnkStruct_0200B144 * v7; + MessageLoader * v7; BattleMessage v8; v7 = ov16_0223E05C(v0->unk_00); diff --git a/src/overlay016/ov16_02266F1C.c b/src/overlay016/ov16_02266F1C.c index 12ebac8d03..0d222221ae 100644 --- a/src/overlay016/ov16_02266F1C.c +++ b/src/overlay016/ov16_02266F1C.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -949,7 +949,7 @@ static void ov16_02267864 (UnkStruct_ov16_022674C4 * param0) u8 * v1; NNSG2dImageProxy * v2; UnkStruct_0205AA50 v3; - UnkStruct_0200B144 * v4; + MessageLoader * v4; Strbuf* v5, * v6; Pokemon * v7; BoxPokemon * v8; @@ -959,7 +959,7 @@ static void ov16_02267864 (UnkStruct_ov16_022674C4 * param0) v4 = ov16_0223E05C(param0->unk_0C); v9 = ov16_0223E0D0(param0->unk_0C); v5 = Strbuf_Init((12 + (5 * 2)), 5); - v6 = sub_0200B1EC(v4, 964); + v6 = MessageLoader_GetNewStrbuf(v4, 964); v7 = ov16_0223DFAC(param0->unk_0C, param0->unk_24, param0->unk_26); v8 = sub_02076B10(v7); @@ -1162,16 +1162,16 @@ static void ov16_02267CE8 (UnkStruct_ov16_022674C4 * param0, u32 param1) u8 * v1; NNSG2dImageProxy * v2; UnkStruct_0205AA50 v3; - UnkStruct_0200B144 * v4; + MessageLoader * v4; Strbuf* v5; v0 = ov16_0223DF00(param0->unk_0C); v4 = ov16_0223E05C(param0->unk_0C); if (param1 & (1 << 10)) { - v5 = sub_0200B1EC(v4, 950); + v5 = MessageLoader_GetNewStrbuf(v4, 950); } else { - v5 = sub_0200B1EC(v4, 1220); + v5 = MessageLoader_GetNewStrbuf(v4, 1220); } sub_0201A870(v0, &v3, 13, 2, 0, 0xf); @@ -1205,7 +1205,7 @@ static void ov16_02267DC4 (UnkStruct_ov16_022674C4 * param0, u32 param1) u8 * v1; NNSG2dImageProxy * v2; UnkStruct_0205AA50 v3; - UnkStruct_0200B144 * v4; + MessageLoader * v4; Strbuf* v5, * v6; UnkStruct_0200B358 * v7; @@ -1215,9 +1215,9 @@ static void ov16_02267DC4 (UnkStruct_ov16_022674C4 * param0, u32 param1) v5 = Strbuf_Init(30, 5); if (param1 & (1 << 10)) { - v6 = sub_0200B1EC(v4, 951); + v6 = MessageLoader_GetNewStrbuf(v4, 951); } else { - v6 = sub_0200B1EC(v4, 1221); + v6 = MessageLoader_GetNewStrbuf(v4, 1221); } sub_0200B60C(v7, 0, param0->unk_27, 2, 1, 1); diff --git a/src/overlay016/ov16_0226871C.c b/src/overlay016/ov16_0226871C.c index fcde35af01..dd3b44a750 100644 --- a/src/overlay016/ov16_0226871C.c +++ b/src/overlay016/ov16_0226871C.c @@ -8,7 +8,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -1754,7 +1754,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) { Strbuf* v0, * v1, * v2, * v3; - UnkStruct_0200B144 * v4; + MessageLoader * v4; int v5; UnkStruct_ov16_02269668 * v6; @@ -1768,24 +1768,24 @@ static void ov16_02269668 (UnkStruct_ov16_02268A14 * param0, int param1, int par param0->unk_66A = v5; if (ov16_0223DF0C(param0->unk_00) & 0x20) { - v0 = sub_0200B1EC(v4, 931); - v1 = sub_0200B1EC(v4, 932); - v2 = sub_0200B1EC(v4, 933); + v0 = MessageLoader_GetNewStrbuf(v4, 931); + v1 = MessageLoader_GetNewStrbuf(v4, 932); + v2 = MessageLoader_GetNewStrbuf(v4, 933); } else if (ov16_0223DF0C(param0->unk_00) & 0x200) { - v0 = sub_0200B1EC(v4, 1223); - v1 = sub_0200B1EC(v4, 932); - v2 = sub_0200B1EC(v4, 933); + v0 = MessageLoader_GetNewStrbuf(v4, 1223); + v1 = MessageLoader_GetNewStrbuf(v4, 932); + v2 = MessageLoader_GetNewStrbuf(v4, 933); } else { - v0 = sub_0200B1EC(v4, 924); - v1 = sub_0200B1EC(v4, 925); - v2 = sub_0200B1EC(v4, 926); + v0 = MessageLoader_GetNewStrbuf(v4, 924); + v1 = MessageLoader_GetNewStrbuf(v4, 925); + v2 = MessageLoader_GetNewStrbuf(v4, 926); } if (param0->unk_6C1 == 1) { - v3 = sub_0200B1EC(v4, 928); + v3 = MessageLoader_GetNewStrbuf(v4, 928); param0->unk_66F = 1; } else { - v3 = sub_0200B1EC(v4, 927); + v3 = MessageLoader_GetNewStrbuf(v4, 927); param0->unk_66F = 0; } @@ -1888,7 +1888,7 @@ static void ov16_022699AC (UnkStruct_ov16_02268A14 * param0, int param1, int par { UnkStruct_ov16_02260C00 * v0; int v1; - UnkStruct_0200B144 * v2; + MessageLoader * v2; UnkStruct_ov16_0226ABD4 * v3; u32 v4; @@ -1920,7 +1920,7 @@ static void ov16_022699AC (UnkStruct_ov16_02268A14 * param0, int param1, int par { Strbuf* v5; - v5 = sub_0200B1EC(v2, 929); + v5 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(v5); } @@ -1972,12 +1972,12 @@ 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; + MessageLoader * v0; Strbuf* v1, * v2; v0 = ov16_0223E05C(param0->unk_00); - v1 = sub_0200B1EC(v0, 940); - v2 = sub_0200B1EC(v0, 941); + v1 = MessageLoader_GetNewStrbuf(v0, 940); + v2 = MessageLoader_GetNewStrbuf(v0, 941); ov16_0226A98C(param0, ¶m0->unk_4CC[0], v1, 2, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((3 & 0xff) << 0))), 2, 20023, 128, 68, 1, NULL); ov16_0226A98C(param0, ¶m0->unk_4CC[1], v2, 2, ((u32)(((10 & 0xff) << 16) | ((11 & 0xff) << 8) | ((12 & 0xff) << 0))), 2, 20023, 128, 140, 1, NULL); @@ -1988,12 +1988,12 @@ 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; + MessageLoader * v0; Strbuf* v1, * v2; v0 = ov16_0223E05C(param0->unk_00); - v1 = sub_0200B1EC(v0, 1181); - v2 = sub_0200B1EC(v0, 1182); + v1 = MessageLoader_GetNewStrbuf(v0, 1181); + v2 = MessageLoader_GetNewStrbuf(v0, 1182); ov16_0226A98C(param0, ¶m0->unk_4CC[0], v1, 2, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((3 & 0xff) << 0))), 2, 20023, 128, 68, 1, NULL); ov16_0226A98C(param0, ¶m0->unk_4CC[1], v2, 2, ((u32)(((10 & 0xff) << 16) | ((11 & 0xff) << 8) | ((12 & 0xff) << 0))), 2, 20023, 128, 140, 1, NULL); @@ -2004,7 +2004,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; + MessageLoader * v0; Strbuf* v1, * v2, * v3, * v4; UnkStruct_0200B358 * v5; UnkStruct_ov16_022623F0 * v6; @@ -2012,8 +2012,8 @@ static void ov16_02269DB0 (UnkStruct_ov16_02268A14 * param0, int param1, int par v6 = ¶m0->unk_1A.val4; v0 = ov16_0223E05C(param0->unk_00); v5 = ov16_0223E0D0(param0->unk_00); - v1 = sub_0200B1EC(v0, 1186); - v2 = sub_0200B1EC(v0, 1187); + v1 = MessageLoader_GetNewStrbuf(v0, 1186); + v2 = MessageLoader_GetNewStrbuf(v0, 1187); v3 = Strbuf_Init(100, 5); v4 = Strbuf_Init(100, 5); @@ -2032,13 +2032,13 @@ 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; + MessageLoader * v0; Strbuf* v1; G2S_SetBlendAlpha((GX_BLEND_PLANEMASK_BG1), (GX_BLEND_BGALL), 31, 0); v0 = ov16_0223E05C(param0->unk_00); - v1 = sub_0200B1EC(v0, 1260); + v1 = MessageLoader_GetNewStrbuf(v0, 1260); { UnkStruct_02018340 * v2; @@ -2068,7 +2068,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; + MessageLoader * v0; Strbuf* v1, * v2, * v3, * v4; UnkStruct_0200B358 * v5; UnkStruct_ov16_022623F0 * v6; @@ -2076,8 +2076,8 @@ static void ov16_02269F68 (UnkStruct_ov16_02268A14 * param0, int param1, int par v6 = ¶m0->unk_1A.val4; v0 = ov16_0223E05C(param0->unk_00); v5 = ov16_0223E0D0(param0->unk_00); - v1 = sub_0200B1EC(v0, 1217); - v2 = sub_0200B1EC(v0, 1218); + v1 = MessageLoader_GetNewStrbuf(v0, 1217); + v2 = MessageLoader_GetNewStrbuf(v0, 1218); v3 = Strbuf_Init(100, 5); v4 = Strbuf_Init(100, 5); @@ -2096,7 +2096,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; + MessageLoader * v0; Strbuf* v1, * v2, * v3, * v4; UnkStruct_0200B358 * v5; UnkStruct_ov16_022623F0 * v6; @@ -2104,8 +2104,8 @@ static void ov16_0226A04C (UnkStruct_ov16_02268A14 * param0, int param1, int par v6 = ¶m0->unk_1A.val4; v0 = ov16_0223E05C(param0->unk_00); v5 = ov16_0223E0D0(param0->unk_00); - v1 = sub_0200B1EC(v0, 1215); - v2 = sub_0200B1EC(v0, 1216); + v1 = MessageLoader_GetNewStrbuf(v0, 1215); + v2 = MessageLoader_GetNewStrbuf(v0, 1216); v3 = Strbuf_Init(100, 5); v4 = Strbuf_Init(100, 5); @@ -2126,7 +2126,7 @@ static void ov16_0226A12C (UnkStruct_ov16_02268A14 * param0, int param1, int par { UnkStruct_ov16_02260F14 * v0; int v1; - UnkStruct_0200B144 * v2; + MessageLoader * v2; u8 v3[4]; Strbuf* v4, * v5; Pokemon * v6; @@ -2158,11 +2158,11 @@ static void ov16_0226A12C (UnkStruct_ov16_02268A14 * param0, int param1, int par if ((v0->unk_00[v12].unk_01_2 == 1) && (v3[v1] == 1)) { if (v0->unk_00[v12].unk_01_0 == 0) { - v5 = sub_0200B1EC(v2, 962); + v5 = MessageLoader_GetNewStrbuf(v2, 962); } else if (v0->unk_00[v12].unk_01_0 == 1) { - v5 = sub_0200B1EC(v2, 963); + v5 = MessageLoader_GetNewStrbuf(v2, 963); } else { - v5 = sub_0200B1EC(v2, 964); + v5 = MessageLoader_GetNewStrbuf(v2, 964); } v6 = ov16_0223DFAC(param0->unk_00, v12, v0->unk_00[v12].unk_00); @@ -2202,7 +2202,7 @@ static void ov16_0226A12C (UnkStruct_ov16_02268A14 * param0, int param1, int par { Strbuf* v13; - v13 = sub_0200B1EC(v2, 930); + v13 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(v13); } @@ -2798,15 +2798,15 @@ void ov16_0226AC98 (UnkStruct_ov16_02268A14 * param0, int param1, const UnkStruc Strbuf* v9; UnkStruct_0200B358 * v10; u32 v11; - UnkStruct_0200B144 * v12; + MessageLoader * v12; v12 = ov16_0223E05C(param0->unk_00); v0 = ov16_0226ABD4(param0, param1); v3 = sub_0208C098(6); - v9 = sub_0200B1EC(v12, 938); + v9 = MessageLoader_GetNewStrbuf(v12, 938); v10 = ov16_0223E0D0(param0->unk_00); v7 = Strbuf_Init(((2 + 2 + 1 + 2) * 2 + 2), 5); - v8 = sub_0200B1EC(v12, 937); + v8 = MessageLoader_GetNewStrbuf(v12, 937); for (v4 = 0; v4 < 4; v4++) { if ((param2->unk_00[v4] != v0->unk_00.unk_00[v4]) && (param2->unk_00[v4] != 0)) { @@ -4619,7 +4619,7 @@ void ov16_0226CEB0 (UnkStruct_ov16_02268A14 * param0, int param1) { Strbuf* v8; - UnkStruct_0200B144 * v9 = ov16_0223E05C(param0->unk_00); + MessageLoader * v9 = ov16_0223E05C(param0->unk_00); int v10; const u16 v11[][2] = { {1261, 1262}, @@ -4633,7 +4633,7 @@ void ov16_0226CEB0 (UnkStruct_ov16_02268A14 * param0, int param1) return; } - v8 = sub_0200B1EC(v9, v11[param1][v10]); + v8 = MessageLoader_GetNewStrbuf(v9, v11[param1][v10]); ov16_0226A98C(param0, ¶m0->unk_4CC[1 + v10], v8, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 4, 20023, 1 * 8 + 8, 6 * 8 + 16 + 16 * v10, 0, NULL); Strbuf_Free(v8); diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c index 6231735cbf..8687550750 100644 --- a/src/overlay017/ov17_0223B140.c +++ b/src/overlay017/ov17_0223B140.c @@ -211,10 +211,10 @@ int ov17_0223B140 (UnkStruct_020067E8 * param0, int * param1) v0->unk_0C.unk_20 = ov12_0221FCDC(21); ov12_0221FDC0(v0->unk_0C.unk_20, 1); - v0->unk_0C.unk_38 = sub_0200B144(0, 26, 204, 21); - v0->unk_0C.unk_3C = sub_0200B144(0, 26, 205, 21); - v0->unk_0C.unk_40 = sub_0200B144(0, 26, 210, 21); - v0->unk_0C.unk_44 = sub_0200B144(0, 26, 211, 21); + v0->unk_0C.unk_38 = MessageLoader_Init(0, 26, 204, 21); + v0->unk_0C.unk_3C = MessageLoader_Init(0, 26, 205, 21); + v0->unk_0C.unk_40 = MessageLoader_Init(0, 26, 210, 21); + v0->unk_0C.unk_44 = MessageLoader_Init(0, 26, 211, 21); v0->unk_0C.unk_54 = sub_02012744((2 * 4), 21); v0->unk_0C.unk_48 = sub_0200B358(21); v0->unk_0C.unk_4C = Strbuf_Init((3 * 160), 21); @@ -365,10 +365,10 @@ int ov17_0223B580 (UnkStruct_020067E8 * param0, int * param1) Strbuf_Free(v0->unk_0C.unk_4C); sub_0200B3F0(v0->unk_0C.unk_48); - sub_0200B190(v0->unk_0C.unk_38); - sub_0200B190(v0->unk_0C.unk_3C); - sub_0200B190(v0->unk_0C.unk_40); - sub_0200B190(v0->unk_0C.unk_44); + MessageLoader_Free(v0->unk_0C.unk_38); + MessageLoader_Free(v0->unk_0C.unk_3C); + MessageLoader_Free(v0->unk_0C.unk_40); + MessageLoader_Free(v0->unk_0C.unk_44); Heap_FreeToHeap(v0->unk_0C.unk_24); sub_0200DA58(v0->unk_04); diff --git a/src/overlay017/ov17_0223CB1C.c b/src/overlay017/ov17_0223CB1C.c index 55b8d47487..a99a90cad9 100644 --- a/src/overlay017/ov17_0223CB1C.c +++ b/src/overlay017/ov17_0223CB1C.c @@ -186,7 +186,7 @@ int ov17_0223CB1C (UnkStruct_020067E8 * param0, int * param1) v0->unk_0C.unk_04 = sub_0200762C(22); ov17_0223D350(); - v0->unk_0C.unk_38 = sub_0200B144(0, 26, 209, 22); + v0->unk_0C.unk_38 = MessageLoader_Init(0, 26, 209, 22); v0->unk_0C.unk_3C = sub_0200B358(22); v0->unk_0C.unk_40 = Strbuf_Init((2 * 160), 22); @@ -333,7 +333,7 @@ int ov17_0223CF8C (UnkStruct_020067E8 * param0, int * param1) sub_02002F54(v0->unk_0C.unk_44); sub_0200B3F0(v0->unk_0C.unk_3C); Strbuf_Free(v0->unk_0C.unk_40); - sub_0200B190(v0->unk_0C.unk_38); + MessageLoader_Free(v0->unk_0C.unk_38); Heap_FreeToHeap(v0->unk_0C.unk_24); sub_0200DA58(v0->unk_04); diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c index 24f36d4e34..be1e4515c0 100644 --- a/src/overlay017/ov17_0223DAD0.c +++ b/src/overlay017/ov17_0223DAD0.c @@ -290,7 +290,7 @@ int ov17_0223DAD0 (UnkStruct_020067E8 * param0, int * param1) v0->unk_14.unk_44 = sub_0200762C(23); ov17_0223E450(); - v0->unk_14.unk_84 = sub_0200B144(0, 26, 206, 23); + v0->unk_14.unk_84 = MessageLoader_Init(0, 26, 206, 23); v0->unk_14.unk_88 = sub_0200B358(23); v0->unk_14.unk_8C = Strbuf_Init((2 * 160), 23); v0->unk_14.unk_94 = sub_02012744((3 * 3), 23); @@ -442,7 +442,7 @@ int ov17_0223DF0C (UnkStruct_020067E8 * param0, int * param1) sub_02002F54(v0->unk_14.unk_90); Strbuf_Free(v0->unk_14.unk_8C); sub_0200B3F0(v0->unk_14.unk_88); - sub_0200B190(v0->unk_14.unk_84); + MessageLoader_Free(v0->unk_14.unk_84); Heap_FreeToHeap(v0->unk_14.unk_60); sub_0200DA58(v0->unk_04); diff --git a/src/overlay017/ov17_0223F118.c b/src/overlay017/ov17_0223F118.c index 6c25001ff5..62bb2adacc 100644 --- a/src/overlay017/ov17_0223F118.c +++ b/src/overlay017/ov17_0223F118.c @@ -3,7 +3,7 @@ #include #include "struct_decls/struct_02002F38_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" @@ -190,13 +190,13 @@ void ov17_0223F2F8 (UnkStruct_ov17_0223F2E4 * param0, int param1, int param2, in Strbuf* ov17_0223F310 (u32 param0, u32 param1) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; Strbuf* v1; - v0 = sub_0200B144(1, 26, 207, param1); - v1 = sub_0200B1EC(v0, param0); + v0 = MessageLoader_Init(1, 26, 207, param1); + v1 = MessageLoader_GetNewStrbuf(v0, param0); - sub_0200B190(v0); + MessageLoader_Free(v0); return v1; } diff --git a/src/overlay017/ov17_0223F7E4.c b/src/overlay017/ov17_0223F7E4.c index 9e4dc009b8..64fdb73d23 100644 --- a/src/overlay017/ov17_0223F7E4.c +++ b/src/overlay017/ov17_0223F7E4.c @@ -761,8 +761,8 @@ static void ov17_0223FBD4 (UnkStruct_ov17_0223F7E4 * param0, int param1, int par v2 = sub_02095848(param0->unk_04->unk_00->unk_110, param0->unk_04->unk_00->unk_111, param0->unk_00->unk_155); v3 = sub_020958C4(param0->unk_04->unk_00->unk_10F, param0->unk_04->unk_00->unk_111); - v0 = sub_0200B1EC(param0->unk_04->unk_38, v2); - v1 = sub_0200B1EC(param0->unk_04->unk_38, v3); + v0 = MessageLoader_GetNewStrbuf(param0->unk_04->unk_38, v2); + v1 = MessageLoader_GetNewStrbuf(param0->unk_04->unk_38, v3); ov17_02240138(param0, ¶m0->unk_40[0], v0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 0, 33008, 128, (8 * 0x10 - 1), 1, NULL); ov17_02240138(param0, ¶m0->unk_40[1], v1, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 0, 33008, 128, (8 * 0x14 - 1), 1, NULL); @@ -864,7 +864,7 @@ static void ov17_0223FF38 (UnkStruct_ov17_0223F7E4 * param0, int param1, int par ov17_02240138(param0, ¶m0->unk_40[0 + v0], NULL, 2, ((u32)(((1 & 0xff) << 16) | ((9 & 0xff) << 8) | ((0xa & 0xff) << 0))), 0, 33008, Unk_ov17_0225325C[v0][0], Unk_ov17_0225325C[v0][1], 1, &v3->unk_F0[v0]); } - v2 = sub_0200B1EC(param0->unk_04->unk_38, 53); + v2 = MessageLoader_GetNewStrbuf(param0->unk_04->unk_38, 53); ov17_02240138(param0, ¶m0->unk_40[0 + v0], v2, 2, ((u32)(((1 & 0xff) << 16) | ((9 & 0xff) << 8) | ((0xa & 0xff) << 0))), 0, 33008, 128, (0x14 * 8 + 4), 1, NULL); Strbuf_Free(v2); @@ -1473,8 +1473,8 @@ void ov17_02240A80 (UnkStruct_ov17_0223F7E4 * param0, u16 param1[]) Strbuf_Free(v2); sub_02095750(v0->unk_12C[v1], &v6, &v7); - v3 = sub_0200B1EC(param0->unk_04->unk_40, v6); - v4 = sub_0200B1EC(param0->unk_04->unk_40, v7); + v3 = MessageLoader_GetNewStrbuf(param0->unk_04->unk_40, v6); + v4 = MessageLoader_GetNewStrbuf(param0->unk_04->unk_40, v7); ov17_02240BF4(param0, v3, 0, &v0->unk_50[v1], ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))); ov17_02240BF4(param0, v4, 0, &v0->unk_A0[v1], ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))); diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c index 390ad85b16..aff1808e6d 100644 --- a/src/overlay017/ov17_022413D8.c +++ b/src/overlay017/ov17_022413D8.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_0201CD38_decl.h" @@ -1511,7 +1511,7 @@ void ov17_02242DA8 (UnkStruct_ov17_02246F24 * param0) sub_0201A954(¶m0->unk_0C.unk_28[0]); } -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) +static void ov17_02242DC0 (UnkStruct_ov17_02246F24 * param0, MessageLoader * param1, u32 param2, int param3, const UnkStruct_ov17_022449B8 * param4, const void * param5, int param6) { Strbuf* v0; u32 v1; @@ -1526,7 +1526,7 @@ static void ov17_02242DC0 (UnkStruct_ov17_02246F24 * param0, UnkStruct_0200B144 } } - v0 = sub_0200B1EC(param1, param2); + v0 = MessageLoader_GetNewStrbuf(param1, param2); ov17_0224290C(param0, param3, param4, param5); sub_0200C388(param0->unk_0C.unk_48, param0->unk_0C.unk_4C, v0); diff --git a/src/overlay017/ov17_022476F8.c b/src/overlay017/ov17_022476F8.c index 6cff2fa788..cba9e8f05b 100644 --- a/src/overlay017/ov17_022476F8.c +++ b/src/overlay017/ov17_022476F8.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_0201CD38_decl.h" @@ -204,7 +204,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) +static void ov17_02247990 (UnkStruct_ov17_02247A48 * param0, MessageLoader * param1, u32 param2, int param3, const UnkStruct_ov17_0224792C * param4) { Strbuf* v0; int v1; @@ -215,7 +215,7 @@ static void ov17_02247990 (UnkStruct_ov17_02247A48 * param0, UnkStruct_0200B144 v1 = 1; } - v0 = sub_0200B1EC(param1, param2); + v0 = MessageLoader_GetNewStrbuf(param1, param2); ov17_0224792C(param0, param3, param4); sub_0200C388(param0->unk_0C.unk_3C, param0->unk_0C.unk_40, v0); diff --git a/src/overlay017/ov17_022492DC.c b/src/overlay017/ov17_022492DC.c index 6dba6a0de8..a9409ef6e9 100644 --- a/src/overlay017/ov17_022492DC.c +++ b/src/overlay017/ov17_022492DC.c @@ -3,7 +3,7 @@ #include "data_021BF67C.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" @@ -533,20 +533,20 @@ static void ov17_02249828 (UnkStruct_ov17_022492DC * param0) { Strbuf* v0, * v1; u32 v2, v3; - UnkStruct_0200B144 * v4; + MessageLoader * v4; - v4 = sub_0200B144(1, 26, 204, 23); + v4 = MessageLoader_Init(1, 26, 204, 23); v2 = sub_02095848(param0->unk_04->unk_00->unk_110, param0->unk_04->unk_00->unk_111, param0->unk_00->unk_155); v3 = sub_020958C4(param0->unk_04->unk_00->unk_10F, param0->unk_04->unk_00->unk_111); - v0 = sub_0200B1EC(v4, v2); - v1 = sub_0200B1EC(v4, v3); + v0 = MessageLoader_GetNewStrbuf(v4, v2); + v1 = MessageLoader_GetNewStrbuf(v4, v3); ov17_02249BC4(param0, ¶m0->unk_1C[0], v0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 0, 33003, 128, (8 * 0x10 - 1), 1); ov17_02249BC4(param0, ¶m0->unk_1C[1], v1, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 0, 33003, 128, (8 * 0x14 - 1), 1); Strbuf_Free(v0); Strbuf_Free(v1); - sub_0200B190(v4); + MessageLoader_Free(v4); } static void ov17_022498E8 (UnkStruct_ov17_022492DC * param0, int param1, int param2) @@ -557,19 +557,19 @@ static void ov17_022498E8 (UnkStruct_ov17_022492DC * param0, int param1, int par static void ov17_022498F4 (UnkStruct_ov17_022492DC * param0) { Strbuf* v0, * v1, * v2, * v3; - UnkStruct_0200B144 * v4; + MessageLoader * v4; v4 = param0->unk_04->unk_84; if (param0->unk_04->unk_A14[param0->unk_04->unk_00->unk_113] == 1) { - v0 = sub_0200B1EC(v4, 0); + v0 = MessageLoader_GetNewStrbuf(v4, 0); } else { - v0 = sub_0200B1EC(v4, 1); + v0 = MessageLoader_GetNewStrbuf(v4, 1); } - v1 = sub_0200B1EC(v4, 2); - v2 = sub_0200B1EC(v4, 3); - v3 = sub_0200B1EC(v4, 4); + v1 = MessageLoader_GetNewStrbuf(v4, 2); + v2 = MessageLoader_GetNewStrbuf(v4, 3); + v3 = MessageLoader_GetNewStrbuf(v4, 4); ov17_02249BC4(param0, ¶m0->unk_1C[2], v0, 2, ((u32)(((1 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0xb & 0xff) << 0))), 0, 33003, 128, 24, 1); ov17_02249BC4(param0, ¶m0->unk_1C[3], v1, 2, ((u32)(((1 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0xb & 0xff) << 0))), 0, 33003, 128, 120, 1); diff --git a/src/overlay017/ov17_0224A0FC.c b/src/overlay017/ov17_0224A0FC.c index 4d5bb7e3fe..479a090e58 100644 --- a/src/overlay017/ov17_0224A0FC.c +++ b/src/overlay017/ov17_0224A0FC.c @@ -8,7 +8,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007C7C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_0201CD38_decl.h" @@ -645,9 +645,9 @@ void ov17_0224A674 (UnkStruct_ov17_0224A1EC * param0) int v0; Strbuf* v1, * v2, * v3; - v1 = sub_0200B1EC(param0->unk_84, 5); - v2 = sub_0200B1EC(param0->unk_84, 6); - v3 = sub_0200B1EC(param0->unk_84, 7); + v1 = MessageLoader_GetNewStrbuf(param0->unk_84, 5); + v2 = MessageLoader_GetNewStrbuf(param0->unk_84, 6); + v3 = MessageLoader_GetNewStrbuf(param0->unk_84, 7); for (v0 = 0; v0 < 3; v0++) { ov17_0223F1E8(23, param0->unk_60, param0->unk_5C, param0->unk_94, ¶m0->unk_96C[0][v0], v1, 0, ((u32)(((0xb & 0xff) << 16) | ((0xc & 0xff) << 8) | ((0 & 0xff) << 0))), 0, 33001, 0, 0, 1, 1, 12); @@ -1930,7 +1930,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) +static void ov17_0224C244 (UnkStruct_ov17_0224DF54 * param0, MessageLoader * param1, u32 param2, int param3, const UnkStruct_ov17_0224C0C0 * param4) { Strbuf* v0; int v1; @@ -1941,7 +1941,7 @@ static void ov17_0224C244 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_0200B144 v1 = 1; } - v0 = sub_0200B1EC(param1, param2); + v0 = MessageLoader_GetNewStrbuf(param1, param2); ov17_0224C0C0(param0, param3, param4); sub_0200C388(param0->unk_14.unk_88, param0->unk_14.unk_8C, v0); @@ -2113,7 +2113,7 @@ void ov17_0224C5A0 (UnkStruct_ov17_0224DF54 * param0, u32 param1, const UnkStruc v0 = Unk_ov17_0225470C[param1].unk_00; v1 = Unk_ov17_0225470C[param1].unk_02; - v2 = sub_0200B1EC(param0->unk_14.unk_84, v0); + v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_84, v0); ov17_0224C0C0(param0, v1, param2); diff --git a/src/overlay017/ov17_0224F4D4.c b/src/overlay017/ov17_0224F4D4.c index 4f34779eb5..8f326a5e9f 100644 --- a/src/overlay017/ov17_0224F4D4.c +++ b/src/overlay017/ov17_0224F4D4.c @@ -195,7 +195,7 @@ int ov17_0224F4D4 (UnkStruct_020067E8 * param0, int * param1) ov17_0224FDDC(); - v0->unk_10.unk_B4 = sub_0200B144(0, 26, 218, 24); + v0->unk_10.unk_B4 = MessageLoader_Init(0, 26, 218, 24); v0->unk_10.unk_B8 = sub_0200B358(24); v0->unk_10.unk_BC = Strbuf_Init((2 * 160), 24); v0->unk_10.unk_C4 = sub_02012744(10, 24); @@ -319,7 +319,7 @@ int ov17_0224F86C (UnkStruct_020067E8 * param0, int * param1) Strbuf_Free(v0->unk_10.unk_BC); sub_0200B3F0(v0->unk_10.unk_B8); - sub_0200B190(v0->unk_10.unk_B4); + MessageLoader_Free(v0->unk_10.unk_B4); Heap_FreeToHeap(v0->unk_10.unk_20); sub_0200DA58(v0->unk_04); diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c index 33209b5350..412cf0ea18 100644 --- a/src/overlay017/ov17_02250744.c +++ b/src/overlay017/ov17_02250744.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007C7C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0201CD38_decl.h" #include "strbuf.h" @@ -75,7 +75,7 @@ typedef struct { } UnkStruct_ov17_02251070; static void ov17_022507F0(UnkStruct_ov17_0224FCA0 * param0, int param1, const UnkStruct_ov17_022508E4 * param2); -static void ov17_022508E4(UnkStruct_ov17_0224FCA0 * param0, UnkStruct_0200B144 * param1, u32 param2, int param3, const UnkStruct_ov17_022508E4 * param4); +static void ov17_022508E4(UnkStruct_ov17_0224FCA0 * param0, MessageLoader * param1, u32 param2, int param3, const UnkStruct_ov17_022508E4 * param4); void ov17_02250744(UnkStruct_ov17_0224FCA0 * param0); void ov17_022507C4(UnkStruct_ov17_022507C4 * param0); void ov17_02250968(UnkStruct_ov17_0224FCA0 * param0, u32 param1, const UnkStruct_ov17_022508E4 * param2); @@ -239,7 +239,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) +static void ov17_022508E4 (UnkStruct_ov17_0224FCA0 * param0, MessageLoader * param1, u32 param2, int param3, const UnkStruct_ov17_022508E4 * param4) { Strbuf* v0; int v1; @@ -250,7 +250,7 @@ static void ov17_022508E4 (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_0200B144 v1 = 1; } - v0 = sub_0200B1EC(param1, param2); + v0 = MessageLoader_GetNewStrbuf(param1, param2); ov17_022507F0(param0, param3, param4); sub_0200C388(param0->unk_10.unk_B8, param0->unk_10.unk_BC, v0); diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c index 712ed6c378..f5d76c9248 100644 --- a/src/overlay019/ov19_021D0D80.c +++ b/src/overlay019/ov19_021D0D80.c @@ -7,7 +7,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_020067E8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_02023FCC_decl.h" @@ -137,10 +137,10 @@ typedef struct UnkStruct_ov19_021D5DF8_t { UnkStruct_02023FCC * unk_180; u32 unk_184; u32 unk_188; - UnkStruct_0200B144 * unk_18C; - UnkStruct_0200B144 * unk_190; - UnkStruct_0200B144 * unk_194; - UnkStruct_0200B144 * unk_198; + MessageLoader * unk_18C; + MessageLoader * unk_190; + MessageLoader * unk_194; + MessageLoader * unk_198; UnkStruct_0200B358 * unk_19C; Pokemon * unk_1A0; UnkStruct_020279FC * unk_1A4; @@ -3317,10 +3317,10 @@ static void ov19_021D4BE0 (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_02042434 param0->unk_1A4 = sub_02025E44(param1->unk_00); param0->unk_118 = param1; param1->unk_08 = 0; - param0->unk_18C = sub_0200B144(0, 26, 19, 9); - param0->unk_190 = sub_0200B144(1, 26, 412, 9); - param0->unk_194 = sub_0200B144(0, 26, 202, 9); - param0->unk_198 = sub_0200B144(0, 26, 610, 9); + param0->unk_18C = MessageLoader_Init(0, 26, 19, 9); + param0->unk_190 = MessageLoader_Init(1, 26, 412, 9); + param0->unk_194 = MessageLoader_Init(0, 26, 202, 9); + param0->unk_198 = MessageLoader_Init(0, 26, 610, 9); param0->unk_19C = sub_0200B358(9); param0->unk_1A0 = Heap_AllocFromHeap(9, PokemonStructSize()); @@ -3358,10 +3358,10 @@ static void ov19_021D4D58 (UnkStruct_ov19_021D5DF8 * param0) } sub_0200B3F0(param0->unk_19C); - sub_0200B190(param0->unk_18C); - sub_0200B190(param0->unk_190); - sub_0200B190(param0->unk_194); - sub_0200B190(param0->unk_198); + MessageLoader_Free(param0->unk_18C); + MessageLoader_Free(param0->unk_190); + MessageLoader_Free(param0->unk_194); + MessageLoader_Free(param0->unk_198); sub_0208716C(param0->unk_128); ov19_021D4EC0(&(param0->unk_00.unk_4C)); @@ -4167,7 +4167,7 @@ static void ov19_021D58AC (UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1 sub_02074570(param1, MON_DATA_119, v0->unk_14); if (v0->unk_0F == 0) { - sub_0200B1B8(param2->unk_190, v0->unk_04, v0->unk_18); + MessageLoader_GetStrbuf(param2->unk_190, v0->unk_04, v0->unk_18); } else { Strbuf_Copy(v0->unk_18, v0->unk_14); Strbuf_Clear(v0->unk_14); @@ -4176,15 +4176,15 @@ static void ov19_021D58AC (UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1 if (v0->unk_06 != 0) { Item_LoadName(v0->unk_1C, v0->unk_06, 9); } else { - sub_0200B1B8(param2->unk_18C, 20, v0->unk_1C); + MessageLoader_GetStrbuf(param2->unk_18C, 20, v0->unk_1C); } { u32 v3 = sub_02075BD4(param1); - sub_0200B1B8(param2->unk_194, v3, v0->unk_20); + MessageLoader_GetStrbuf(param2->unk_194, v3, v0->unk_20); v3 = sub_02074570(param1, MON_DATA_10, NULL); - sub_0200B1B8(param2->unk_198, v3, v0->unk_24); + MessageLoader_GetStrbuf(param2->unk_198, v3, v0->unk_24); } sub_020759B8(v2); @@ -4283,7 +4283,7 @@ static void ov19_021D5BE8 (UnkStruct_ov19_021D4DF0 * param0, u16 param1, UnkStru if (v0->unk_06 != 0) { Item_LoadName(v0->unk_1C, v0->unk_06, 9); } else { - sub_0200B1B8(param2->unk_18C, 20, v0->unk_1C); + MessageLoader_GetStrbuf(param2->unk_18C, 20, v0->unk_1C); } if ((ov19_021D5E10(param0) == 0) && (ov19_021D5E38(param0) == 1)) { @@ -4305,7 +4305,7 @@ static void ov19_021D5BE8 (UnkStruct_ov19_021D4DF0 * param0, u16 param1, UnkStru sub_02077A1C(v0->unk_00); v3 = sub_02074570(v0->unk_00, MON_DATA_10, NULL); - sub_0200B1B8(param2->unk_198, v3, v0->unk_24); + MessageLoader_GetStrbuf(param2->unk_198, v3, v0->unk_24); } } } @@ -4355,7 +4355,7 @@ static void ov19_021D5D28 (UnkStruct_ov19_021D4DF0 * param0, UnkStruct_ov19_021D param0->unk_112 = v0->unk_06; - sub_0200B1B8(param1->unk_18C, 20, v0->unk_1C); + MessageLoader_GetStrbuf(param1->unk_18C, 20, v0->unk_1C); ov19_021D5BE8(param0, v1, param1); } @@ -4420,7 +4420,7 @@ static void ov19_021D5DD8 (UnkStruct_ov19_021D4DF0 * param0) param0->unk_48.unk_01 ^= 1; } -UnkStruct_0200B144 * ov19_021D5DE8 (const UnkStruct_ov19_021D5DF8 * param0) +MessageLoader * ov19_021D5DE8 (const UnkStruct_ov19_021D5DF8 * param0) { return param0->unk_18C; } diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c index 9c9cc3700d..4e30471a42 100644 --- a/src/overlay019/ov19_021DA92C.c +++ b/src/overlay019/ov19_021DA92C.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_020218BC_decl.h" @@ -62,7 +62,7 @@ static void ov19_021DAE60(UnkStruct_0205AA50 * param0, UnkStruct_ov19_021DA9E0 * static void ov19_021DB0E4(UnkStruct_ov19_021DA9E0 * param0); static void ov19_021DB24C(UnkStruct_ov19_021DA9E0 * param0, u8 param1); -BOOL ov19_021DA92C (UnkStruct_ov19_021DA9E0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_02018340 * param3, UnkStruct_020218BC * param4, const UnkStruct_0200B144 * param5, NARC * param6) +BOOL ov19_021DA92C (UnkStruct_ov19_021DA9E0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_02018340 * param3, UnkStruct_020218BC * param4, const MessageLoader * param5, NARC * param6) { int v0; @@ -83,8 +83,8 @@ BOOL ov19_021DA92C (UnkStruct_ov19_021DA9E0 * param0, UnkStruct_ov19_021D61B0 * param0->unk_1C = sub_0200C440(1, 2, 15, 10); param0->unk_28 = sub_02007204(param6, 16, 1, &(param0->unk_2C), 10); param0->unk_30 = NULL; - param0->unk_44 = sub_0200B1EC(param5, 21); - param0->unk_48 = sub_0200B1EC(param5, 22); + param0->unk_44 = MessageLoader_GetNewStrbuf(param5, 21); + param0->unk_48 = MessageLoader_GetNewStrbuf(param5, 22); param0->unk_34 = sub_02006FA0(sub_0207C944(), sub_0207C924(), 1, &(param0->unk_38), 10); for (v0 = 0; v0 < 2; v0++) { diff --git a/src/overlay019/ov19_021DB2FC.c b/src/overlay019/ov19_021DB2FC.c index bf64aee056..0d593df799 100644 --- a/src/overlay019/ov19_021DB2FC.c +++ b/src/overlay019/ov19_021DB2FC.c @@ -4,7 +4,7 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" @@ -34,7 +34,7 @@ static void ov19_021DB7BC(UnkStruct_02018340 * param0, u32 param1, u32 param2, u static void ov19_021DB84C(UnkStruct_02018340 * param0, UnkStruct_0205AA50 * param1); static void ov19_021DB898(UnkStruct_02018340 * param0, UnkStruct_0205AA50 * param1); -BOOL ov19_021DB2FC (UnkStruct_ov19_021DB6F0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_02018340 * param3, UnkStruct_020218BC * param4, UnkStruct_0200B144 * param5, const UnkStruct_0200B358 * param6, int param7, NARC * param8) +BOOL ov19_021DB2FC (UnkStruct_ov19_021DB6F0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_02018340 * param3, UnkStruct_020218BC * param4, MessageLoader * param5, const UnkStruct_0200B358 * param6, int param7, NARC * param8) { param0->unk_0C = param1; param0->unk_00 = param3; @@ -42,7 +42,7 @@ BOOL ov19_021DB2FC (UnkStruct_ov19_021DB6F0 * param0, UnkStruct_ov19_021D61B0 * param0->unk_2C = param6; param0->unk_20 = param7; param0->unk_10 = param5; - param0->unk_14 = sub_0200B144(0, 26, 18, 10); + param0->unk_14 = MessageLoader_Init(0, 26, 18, 10); param0->unk_30 = Strbuf_Init(64, 10); param0->unk_34 = Strbuf_Init(64, 10); param0->unk_1C = 0; @@ -71,7 +71,7 @@ void ov19_021DB370 (UnkStruct_ov19_021DB6F0 * param0) } if (param0->unk_14) { - sub_0200B190(param0->unk_14); + MessageLoader_Free(param0->unk_14); } if (param0->unk_30) { @@ -114,7 +114,7 @@ void ov19_021DB448 (UnkStruct_ov19_021DB6F0 * param0, u32 param1) sub_0201A9F4(¶m0->unk_18[0]); ov19_021DB4B4(param0->unk_00, param0->unk_18[0].unk_04, param0->unk_18[0].unk_05, param0->unk_18[0].unk_06, param0->unk_18[0].unk_07, param0->unk_18[0].unk_08); sub_0201ADA4(¶m0->unk_18[0], 15); - sub_0200B1B8(param0->unk_10, param1, param0->unk_30); + MessageLoader_GetStrbuf(param0->unk_10, param1, param0->unk_30); sub_0200C388(param0->unk_2C, param0->unk_34, param0->unk_30); sub_0201D738(&(param0->unk_18[0]), 1, param0->unk_34, 0, 0, 0xff, NULL); sub_0201ACCC(&(param0->unk_18[0])); @@ -182,7 +182,7 @@ void ov19_021DB57C (UnkStruct_ov19_021DB6F0 * param0, const UnkStruct_ov19_021DF if ((param1->unk_00[v2] >= UnkEnum_021DFB94_56) && (param1->unk_00[v2] <= UnkEnum_021DFB94_61)) { ov19_021DB638(param0, v0, param1->unk_22, param1->unk_00[v2] - UnkEnum_021DFB94_56); } else { - sub_0200B1B8(param0->unk_14, 24 + param1->unk_00[v2], param0->unk_30); + MessageLoader_GetStrbuf(param0->unk_14, 24 + param1->unk_00[v2], param0->unk_30); sub_0201D78C(v0, 0, param0->unk_30, 10, v1, 0xff, (u32)(((11 & 0xff) << 16) | ((12 & 0xff) << 8) | ((15 & 0xff) << 0)), NULL); } diff --git a/src/overlay019/ov19_021DB8E4.c b/src/overlay019/ov19_021DB8E4.c index 334cc0d614..9b378c45d1 100644 --- a/src/overlay019/ov19_021DB8E4.c +++ b/src/overlay019/ov19_021DB8E4.c @@ -125,7 +125,7 @@ BOOL ov19_021DB8E4 (UnkStruct_ov19_021DBA9C * param0, UnkStruct_ov19_021D61B0 * param0->unk_3C.unk_00 = param0->unk_18->pRawData; param0->unk_3C.unk_04 = 32; param0->unk_3C.unk_06 = 32; - param0->unk_4BF8 = sub_0200B144(1, 26, 391, 10); + param0->unk_4BF8 = MessageLoader_Init(1, 26, 391, 10); for (v0 = 0; v0 < 18; v0++) { param0->unk_48[v0] = NULL; @@ -160,7 +160,7 @@ void ov19_021DBA9C (UnkStruct_ov19_021DBA9C * param0) void ov19_021DBAD0 (UnkStruct_ov19_021DBA9C * param0) { if (param0->unk_4BF8) { - sub_0200B190(param0->unk_4BF8); + MessageLoader_Free(param0->unk_4BF8); } if (param0->unk_14) { @@ -595,7 +595,7 @@ void ov19_021DC29C (UnkStruct_ov19_021DBA9C * param0) sub_02019184(param0->unk_04, 1, 3, 0); sub_020198C0(param0->unk_04, 1, param0->unk_38->rawData, 0, 24, 32, 7); sub_0201ADA4(¶m0->unk_10[2], 4); - sub_0200B1B8(param0->unk_4BF8, v1, param0->unk_4BFC); + MessageLoader_GetStrbuf(param0->unk_4BF8, v1, param0->unk_4BFC); sub_0201D78C(¶m0->unk_10[2], 0, param0->unk_4BFC, 0, 0, 0xff, (u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL); sub_0201A954(¶m0->unk_10[2]); diff --git a/src/overlay019/ov19_021DEC04.c b/src/overlay019/ov19_021DEC04.c index c3a482a55a..3bb3dbbee5 100644 --- a/src/overlay019/ov19_021DEC04.c +++ b/src/overlay019/ov19_021DEC04.c @@ -4,7 +4,7 @@ #include "inlines.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_020218BC_decl.h" @@ -52,8 +52,8 @@ struct UnkStruct_ov19_021DEC04_t { NNSG2dCellDataBank * unk_60; void * unk_64; NNSG2dAnimBankData * unk_68; - UnkStruct_0200B144 * unk_6C; - UnkStruct_0200B144 * unk_70; + MessageLoader * unk_6C; + MessageLoader * unk_70; Strbuf* unk_74; UnkStruct_0205AA50 unk_78[7]; u8 unk_E8[640]; @@ -90,7 +90,7 @@ static void ov19_021DF834(UnkStruct_ov19_021DEC04 * param0); static void ov19_021DF8C8(UnkStruct_ov19_021DEC04 * param0, int param1); static void ov19_021DF930(UnkStruct_0201CD38 * param0, void * param1); -BOOL ov19_021DEC04 (UnkStruct_ov19_021DEC04 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_02018340 * param3, UnkStruct_020218BC * param4, UnkStruct_0200B144 * param5, NARC * param6) +BOOL ov19_021DEC04 (UnkStruct_ov19_021DEC04 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_02018340 * param3, UnkStruct_020218BC * param4, MessageLoader * param5, NARC * param6) { if (ov19_021D5E08(param2) != 4) { *param0 = NULL; @@ -107,7 +107,7 @@ BOOL ov19_021DEC04 (UnkStruct_ov19_021DEC04 ** param0, UnkStruct_ov19_021D61B0 * v0->unk_370 = sub_020071D0(param6, 7, 1, &(v0->unk_368), 10); v0->unk_374 = sub_020071D0(param6, 8, 1, &(v0->unk_36C), 10); v0->unk_6C = param5; - v0->unk_70 = sub_0200B144(1, 26, 647, 10); + v0->unk_70 = MessageLoader_Init(1, 26, 647, 10); v0->unk_74 = Strbuf_Init(32, 10); v0->unk_380 = NULL; *param0 = v0; @@ -123,7 +123,7 @@ void ov19_021DECAC (UnkStruct_ov19_021DEC04 * param0) if (param0) { Heap_FreeToHeap(param0->unk_370); Heap_FreeToHeap(param0->unk_374); - sub_0200B190(param0->unk_70); + MessageLoader_Free(param0->unk_70); ov19_021DF7D0(param0); ov19_021DF03C(param0); Strbuf_Free(param0->unk_74); @@ -487,12 +487,12 @@ static void ov19_021DF2E0 (UnkStruct_ov19_021DEC04 * param0) switch (ov19_021D5FA4(param0->unk_08)) { case 0: for (v2 = 0; v2 < NELEMS(v0); v2++) { - sub_0200B1B8(param0->unk_6C, v0[v2], param0->unk_74); + MessageLoader_GetStrbuf(param0->unk_6C, v0[v2], param0->unk_74); sub_0201D78C(v1, 0, param0->unk_74, inline_ov19_021DF3AC(v1, 0, param0->unk_74), 0 + 16 * v2, 0xff, (u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); } break; case 2: - sub_0200B1B8(param0->unk_6C, 43, param0->unk_74); + MessageLoader_GetStrbuf(param0->unk_6C, 43, param0->unk_74); sub_0201D78C(v1, 0, param0->unk_74, inline_ov19_021DF3AC(v1, 0, param0->unk_74), 0, 0xff, (u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); break; } @@ -535,7 +535,7 @@ static void ov19_021DF3AC (UnkStruct_ov19_021DEC04 * param0, int param1) sub_0201D78C(v0, 0, param0->unk_74, inline_ov19_021DF3AC(v0, 0, param0->unk_74), (1 + v5) * 16, 0xff, (u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); } } else { - sub_0200B1B8(param0->unk_6C, 44, param0->unk_74); + MessageLoader_GetStrbuf(param0->unk_6C, 44, param0->unk_74); for (v5 = 0; v5 < 8; v5++) { sub_0201D78C(v0, 0, param0->unk_74, inline_ov19_021DF3AC(v0, 0, param0->unk_74), v5 * 16, 0xff, (u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); @@ -566,12 +566,12 @@ static void ov19_021DF4D0 (UnkStruct_ov19_021DEC04 * param0, int param1) if (v1->unk_06 == 0) { for (v5 = 0; v5 < 4; v5++) { if (v1->unk_20[v5]) { - sub_0200B1B8(param0->unk_70, v1->unk_20[v5], param0->unk_74); + MessageLoader_GetStrbuf(param0->unk_70, v1->unk_20[v5], param0->unk_74); sub_0201D78C(v0, 0, param0->unk_74, inline_ov19_021DF3AC(v0, 0, param0->unk_74), 4 + 24 * v5, 0xff, (u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); } } } else { - sub_0200B1B8(param0->unk_6C, 44, param0->unk_74); + MessageLoader_GetStrbuf(param0->unk_6C, 44, param0->unk_74); for (v5 = 0; v5 < 4; v5++) { sub_0201D78C(v0, 0, param0->unk_74, inline_ov19_021DF3AC(v0, 0, param0->unk_74), 4 + 24 * v5, 0xff, (u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c index 10ae927794..eb2b27a0eb 100644 --- a/src/overlay020/ov20_021D2EA4.c +++ b/src/overlay020/ov20_021D2EA4.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_020149F0_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -53,7 +53,7 @@ typedef struct UnkStruct_ov20_021D30F8_t { UnkStruct_02022550 * unk_3C; UnkStruct_02022550 * unk_40; UnkStruct_02022550 * unk_44; - UnkStruct_0200B144 * unk_48; + MessageLoader * unk_48; Strbuf* unk_4C; UnkStruct_020149F0 * unk_50; UnkStruct_ov20_021D34CC unk_54[2]; @@ -88,7 +88,7 @@ UnkStruct_ov20_021D30F8 * ov20_021D2EA4 (UnkStruct_ov20_021D2128 * param0, const v0->unk_40 = NULL; v0->unk_44 = NULL; v0->unk_4C = Strbuf_Init(128, 35); - v0->unk_48 = sub_0200B144(0, 26, 437, 35); + v0->unk_48 = MessageLoader_Init(0, 26, 437, 35); v0->unk_50 = sub_020149F0(35); return v0; @@ -113,7 +113,7 @@ void ov20_021D2EF0 (UnkStruct_ov20_021D30F8 * param0) } if (param0->unk_48) { - sub_0200B190(param0->unk_48); + MessageLoader_Free(param0->unk_48); } if (param0->unk_4C) { @@ -439,7 +439,7 @@ void ov20_021D3578 (UnkStruct_ov20_021D30F8 * param0, u32 param1) Strbuf* v1 = Strbuf_Init(300, 0); sub_0200B7B4(v0, 0, 0); - sub_0200B1B8(param0->unk_48, 0 + ov20_021D1F88(param0->unk_04), param0->unk_4C); + MessageLoader_GetStrbuf(param0->unk_48, 0 + ov20_021D1F88(param0->unk_04), param0->unk_4C); sub_0200C388(v0, v1, param0->unk_4C); sub_0201D78C(¶m0->unk_1C, 1, v1, 0, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((9 & 0xff) << 0)), NULL); @@ -448,15 +448,15 @@ void ov20_021D3578 (UnkStruct_ov20_021D30F8 * param0, u32 param1) } break; case 2: - sub_0200B1B8(param0->unk_48, 6, param0->unk_4C); + MessageLoader_GetStrbuf(param0->unk_48, 6, param0->unk_4C); sub_0201D78C(¶m0->unk_1C, 1, param0->unk_4C, 0, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((9 & 0xff) << 0)), NULL); break; case 1: - sub_0200B1B8(param0->unk_48, 7, param0->unk_4C); + MessageLoader_GetStrbuf(param0->unk_48, 7, param0->unk_4C); sub_0201D78C(¶m0->unk_1C, 1, param0->unk_4C, 0, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((9 & 0xff) << 0)), NULL); break; case 3: - sub_0200B1B8(param0->unk_48, 8, param0->unk_4C); + MessageLoader_GetStrbuf(param0->unk_48, 8, param0->unk_4C); sub_0201D78C(¶m0->unk_1C, 1, param0->unk_4C, 0, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((9 & 0xff) << 0)), NULL); break; } @@ -543,10 +543,10 @@ void ov20_021D3790 (UnkStruct_ov20_021D30F8 * param0, int param1) { sub_0201ADA4(¶m0->unk_2C, 9); - sub_0200B1B8(param0->unk_48, 9, param0->unk_4C); + MessageLoader_GetStrbuf(param0->unk_48, 9, param0->unk_4C); sub_0201D78C(¶m0->unk_2C, 0, param0->unk_4C, 14, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((9 & 0xff) << 0)), NULL); - sub_0200B1B8(param0->unk_48, 10, param0->unk_4C); + MessageLoader_GetStrbuf(param0->unk_48, 10, param0->unk_4C); sub_0201D78C(¶m0->unk_2C, 0, param0->unk_4C, 14, 0 + 16, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((9 & 0xff) << 0)), NULL); sub_0200DC48(¶m0->unk_2C, 0, param0->unk_60, 14); diff --git a/src/overlay020/ov20_021D3864.c b/src/overlay020/ov20_021D3864.c index 325db652ab..bc84e05d0a 100644 --- a/src/overlay020/ov20_021D3864.c +++ b/src/overlay020/ov20_021D3864.c @@ -87,7 +87,7 @@ static void ov20_021D390C (UnkStruct_02018340 * param0, const UnkStruct_ov61_022 sub_0201A9F4(&v0); sub_0201ADA4(&v0, 14); - v1 = sub_0200B010(26, 438, param2, 35); + v1 = MessageBank_GetNewStrbufFromNARC(26, 438, param2, 35); v2 = ((param1->unk_03 * 8) - sub_02002D7C(0, v1, 0)) / 2; sub_0201D78C(&v0, 0, v1, v2, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((14 & 0xff) << 0)), NULL); diff --git a/src/overlay020/ov20_021D3A54.c b/src/overlay020/ov20_021D3A54.c index 65c0b16622..379734d1c8 100644 --- a/src/overlay020/ov20_021D3A54.c +++ b/src/overlay020/ov20_021D3A54.c @@ -4,7 +4,7 @@ #include "enums.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_02022550_decl.h" @@ -107,11 +107,11 @@ static u32 ov20_021D3B74 (UnkStruct_ov20_021D3E0C * param0, UnkStruct_02018340 * { int v0, v1, v2; UnkStruct_0205AA50 v3; - UnkStruct_0200B144 * v4; + MessageLoader * v4; Strbuf* v5; u32 v6, v7; - v4 = sub_0200B144(1, 26, 436, 35); + v4 = MessageLoader_Init(1, 26, 436, 35); v1 = 1; v2 = 9; @@ -123,10 +123,10 @@ static u32 ov20_021D3B74 (UnkStruct_ov20_021D3E0C * param0, UnkStruct_02018340 * } if (sub_02099CA0(param0->unk_08, v0)) { - v5 = sub_0200B1EC(v4, 0 + v0); + v5 = MessageLoader_GetNewStrbuf(v4, 0 + v0); v6 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0)); } else { - v5 = sub_0200B1EC(v4, 12); + v5 = MessageLoader_GetNewStrbuf(v4, 12); v6 = (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((15 & 0xff) << 0)); } @@ -147,7 +147,7 @@ static u32 ov20_021D3B74 (UnkStruct_ov20_021D3E0C * param0, UnkStruct_02018340 * v1 += (9 + 1); } - sub_0200B190(v4); + MessageLoader_Free(v4); return param2; } @@ -201,12 +201,12 @@ static u32 ov20_021D3D44 (UnkStruct_ov20_021D3E0C * param0, UnkStruct_02018340 * {44, 21}, }; UnkStruct_0205AA50 v1; - UnkStruct_0200B144 * v2; + MessageLoader * v2; Strbuf* v3; int v4, v5; - v2 = sub_0200B144(1, 26, 436, 35); - v3 = sub_0200B1EC(v2, 13); + v2 = MessageLoader_Init(1, 26, 436, 35); + v3 = MessageLoader_GetNewStrbuf(v2, 13); v5 = ((8 * 8) - sub_02002D7C(0, v3, 0)) / 2; for (v4 = 0; v4 < NELEMS(v0); v4++) { @@ -223,7 +223,7 @@ static u32 ov20_021D3D44 (UnkStruct_ov20_021D3E0C * param0, UnkStruct_02018340 * } Strbuf_Free(v3); - sub_0200B190(v2); + MessageLoader_Free(v2); return param2; } diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c index a2fb0ab74a..6a45bf05b6 100644 --- a/src/overlay020/ov20_021D4728.c +++ b/src/overlay020/ov20_021D4728.c @@ -146,13 +146,13 @@ asm static void ov20_021D48C4 (UnkStruct_ov20_021D4AD4 * param0, NARC * param1) mov r0, #0x1a mov r2, #0xb mov r3, #0x23 - bl sub_0200B010 + bl MessageBank_GetNewStrbufFromNARC add r6, r0, #0 ldr r1, = 0x1B5 mov r0, #0x1a mov r2, #0xc mov r3, #0x23 - bl sub_0200B010 + bl MessageBank_GetNewStrbufFromNARC add r4, r0, #0 mov r0, #0x23 str r0, [sp] diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c index 8834cdc187..0aa265e234 100644 --- a/src/overlay021/ov21_021D0D80.c +++ b/src/overlay021/ov21_021D0D80.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "strbuf.h" @@ -977,10 +977,10 @@ u32 ov21_021D1C88 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D33 Strbuf* ov21_021D1CE0 (int param0, int param1) { Strbuf* v0; - UnkStruct_0200B144 * v1 = sub_0200B144(0, 26, 697, param1); + MessageLoader * v1 = MessageLoader_Init(0, 26, 697, param1); - v0 = sub_0200B1EC(v1, param0); - sub_0200B190(v1); + v0 = MessageLoader_GetNewStrbuf(v1, param0); + MessageLoader_Free(v1); return v0; } diff --git a/src/overlay021/ov21_021D4C0C.c b/src/overlay021/ov21_021D4C0C.c index 0f2cf13816..18b2f61fed 100644 --- a/src/overlay021/ov21_021D4C0C.c +++ b/src/overlay021/ov21_021D4C0C.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" @@ -145,34 +145,34 @@ 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; + MessageLoader * v0; Strbuf* v1; u32 v2; - v0 = sub_0200B144(0, 26, param2, param0->unk_14); + v0 = MessageLoader_Init(0, 26, param2, param0->unk_14); GF_ASSERT(v0); - v1 = sub_0200B1EC(v0, param3); + v1 = MessageLoader_GetNewStrbuf(v0, param3); sub_0201D78C(param1, 2, v1, param4, param5, 0xff, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))), NULL); v2 = sub_02002D7C(2, v1, 0); Strbuf_Free(v1); - sub_0200B190(v0); + MessageLoader_Free(v0); return v2; } void ov21_021D4E10 (UnkStruct_ov21_021D4C0C * param0, UnkStruct_0205AA50 * param1, u32 param2, u32 param3) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; Strbuf* v1; int v2; int v3; - v0 = sub_0200B144(0, 26, param2, param0->unk_14); + v0 = MessageLoader_Init(0, 26, param2, param0->unk_14); GF_ASSERT(v0); - v1 = sub_0200B1EC(v0, param3); + v1 = MessageLoader_GetNewStrbuf(v0, param3); v2 = sub_02002D7C(2, v1, 0); v3 = sub_0201C294(param1) * 8; v3 = v3 - v2; @@ -180,7 +180,7 @@ void ov21_021D4E10 (UnkStruct_ov21_021D4C0C * param0, UnkStruct_0205AA50 * param sub_0201D78C(param1, 2, v1, v3, 0, 0xff, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))), NULL); Strbuf_Free(v1); - sub_0200B190(v0); + MessageLoader_Free(v0); } void ov21_021D4E80 (UnkStruct_ov21_021D4C0C * param0, UnkStruct_0205AA50 * param1, Strbuf *param2, int param3, int param4) diff --git a/src/overlay021/ov21_021D5600.c b/src/overlay021/ov21_021D5600.c index bc2bd17884..bf15fb080c 100644 --- a/src/overlay021/ov21_021D5600.c +++ b/src/overlay021/ov21_021D5600.c @@ -3,9 +3,6 @@ #include "inlines.h" -#include "struct_decls/struct_0200B144_decl.h" -#include "strbuf.h" - #include "unk_0200AC5C.h" #include "unk_0200B29C.h" #include "error_handling.h" @@ -207,16 +204,16 @@ static inline BOOL inline_ov21_021D5764_1 (int param0, int param1) static Strbuf* ov21_021D5724 (int param0, int param1, int param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, param0, param2); + MessageLoader * v0 = MessageLoader_Init(1, 26, param0, param2); if (v0) { Strbuf* v1 = Strbuf_Init(256, param2); if (v1) { - sub_0200B1B8(v0, param1, v1); + MessageLoader_GetStrbuf(v0, param1, v1); } - sub_0200B190(v0); + MessageLoader_Free(v0); return v1; } diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c index 47afa1672b..54000c3973 100644 --- a/src/overlay021/ov21_021D5AEC.c +++ b/src/overlay021/ov21_021D5AEC.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02007C7C_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02022550_decl.h" #include "strbuf.h" #include "overlay021/struct_ov21_021D0F60_decl.h" @@ -744,12 +744,12 @@ static void ov21_021D63C0 (UnkStruct_ov21_021D71A8 * param0) static void ov21_021D63DC (UnkStruct_ov21_021D13FC * param0, int param1, int param2, int param3) { Strbuf* v0 = Strbuf_Init(32, param1); - UnkStruct_0200B144 * v1 = sub_0200B144(0, 26, 697, param1); + MessageLoader * v1 = MessageLoader_Init(0, 26, 697, param1); - sub_0200B1B8(v1, 0, v0); + MessageLoader_GetStrbuf(v1, 0, v0); sub_0201D78C(¶m0->unk_04, 0, v0, 8, 152, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); - sub_0200B1B8(v1, 1, v0); + MessageLoader_GetStrbuf(v1, 1, v0); sub_0201D78C(¶m0->unk_04, 0, v0, 128, 152, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_FormatInt(v0, param2, 3, 2, 1); @@ -759,21 +759,21 @@ static void ov21_021D63DC (UnkStruct_ov21_021D13FC * param0, int param1, int par sub_0201D78C(¶m0->unk_04, 0, v0, 180, 170, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); - sub_0200B190(v1); + MessageLoader_Free(v1); sub_0201C3C0(param0->unk_00, 1); } static void ov21_021D64B0 (UnkStruct_ov21_021D13FC * param0, int param1, int param2) { Strbuf* v0 = Strbuf_Init(32, param1); - UnkStruct_0200B144 * v1 = sub_0200B144(0, 26, 697, param1); + MessageLoader * v1 = MessageLoader_Init(0, 26, 697, param1); - sub_0200B1B8(v1, 109, v0); + MessageLoader_GetStrbuf(v1, 109, v0); sub_0201D78C(¶m0->unk_04, 0, v0, 8, 152, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_FormatInt(v0, param2, 3, 2, 1); sub_0201D78C(¶m0->unk_04, 0, v0, 48, 170, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); - sub_0200B190(v1); + MessageLoader_Free(v1); sub_0201C3C0(param0->unk_00, 1); } @@ -1296,7 +1296,7 @@ static void ov21_021D6DF4 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D UnkStruct_ov21_021D4CB8 v0; UnkStruct_0205AA50 * v1; Strbuf* v2 = Strbuf_Init(32, param2); - UnkStruct_0200B144 * v3 = sub_0200B144(0, 26, 697, param2); + MessageLoader * v3 = MessageLoader_Init(0, 26, 697, param2); v0.unk_00 = param1->unk_14C; v0.unk_08 = param0->unk_90.unk_08; @@ -1312,7 +1312,7 @@ static void ov21_021D6DF4 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D Strbuf_FormatInt(v2, param4, 3, 2, 1); sub_0201D78C(v1, 2, v2, 22, 0, 0xff, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))), NULL); - sub_0200B1B8(v3, 99, v2); + MessageLoader_GetStrbuf(v3, 99, v2); sub_0201D78C(v1, 2, v2, 49, 0, 0xff, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))), NULL); if (param0->unk_28[param3]) { @@ -1325,7 +1325,7 @@ static void ov21_021D6DF4 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D ov21_021D4DA0(v1); Strbuf_Free(v2); - sub_0200B190(v3); + MessageLoader_Free(v3); } static void ov21_021D6ED0 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov21_021D5B68 * param1) diff --git a/src/overlay021/ov21_021DE668.c b/src/overlay021/ov21_021DE668.c index 978d0ac1f0..167a03ef9b 100644 --- a/src/overlay021/ov21_021DE668.c +++ b/src/overlay021/ov21_021DE668.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007C7C_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02022550_decl.h" #include "strbuf.h" #include "overlay021/struct_ov21_021D0F60_decl.h" @@ -433,15 +433,15 @@ 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) { Strbuf* v0 = Strbuf_Init(64, param2); - UnkStruct_0200B144 * v1 = sub_0200B144(0, 26, 697, param2); + MessageLoader * v1 = MessageLoader_Init(0, 26, 697, param2); - sub_0200B1B8(v1, 9, v0); + MessageLoader_GetStrbuf(v1, 9, v0); sub_0201D78C(param0, 0, v0, 152, 88, 0, param4, NULL); - sub_0200B1B8(v1, 10, v0); + MessageLoader_GetStrbuf(v1, 10, v0); sub_0201D78C(param0, 0, v0, 152, 104, 0, param4, NULL); Strbuf_Free(v0); - sub_0200B190(v1); + MessageLoader_Free(v1); ov21_021DEC2C(param0, param2, param1, param4); ov21_021DEC80(param0, param2, param1, param4); @@ -451,31 +451,31 @@ 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) { Strbuf* v0 = Strbuf_Init(64, param1); - UnkStruct_0200B144 * v1; + MessageLoader * v1; int v2; v2 = sub_020989D0(); - v1 = sub_0200B144(0, 26, v2, param1); + v1 = MessageLoader_Init(0, 26, v2, param1); - sub_0200B1B8(v1, param2, v0); + MessageLoader_GetStrbuf(v1, param2, v0); sub_0201D78C(param0, 0, v0, 184, 88, 0, param3, NULL); Strbuf_Free(v0); - sub_0200B190(v1); + MessageLoader_Free(v1); } static void ov21_021DEC80 (UnkStruct_0205AA50 * param0, int param1, int param2, u32 param3) { Strbuf* v0 = Strbuf_Init(64, param1); - UnkStruct_0200B144 * v1; + MessageLoader * v1; int v2; v2 = sub_020989C4(); - v1 = sub_0200B144(0, 26, v2, param1); + v1 = MessageLoader_Init(0, 26, v2, param1); - sub_0200B1B8(v1, param2, v0); + MessageLoader_GetStrbuf(v1, param2, v0); sub_0201D78C(param0, 0, v0, 184, 104, 0, param3, NULL); Strbuf_Free(v0); - sub_0200B190(v1); + MessageLoader_Free(v1); } static void ov21_021DECD4 (UnkStruct_0205AA50 * param0, int param1, int param2, int param3, u32 param4) diff --git a/src/overlay021/ov21_021E0C68.c b/src/overlay021/ov21_021E0C68.c index 926a4f16a7..33648d922c 100644 --- a/src/overlay021/ov21_021E0C68.c +++ b/src/overlay021/ov21_021E0C68.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007C7C_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02022550_decl.h" #include "strbuf.h" #include "overlay021/struct_ov21_021D0F60_decl.h" @@ -424,7 +424,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) { Strbuf* v0 = Strbuf_Init(64, param2); - UnkStruct_0200B144 * v1 = sub_0200B144(0, 26, 697, param2); + MessageLoader * v1 = MessageLoader_Init(0, 26, 697, param2); int v2 = ov21_021D37BC(param1->unk_04); int v3; int v4; @@ -436,14 +436,14 @@ static void ov21_021E10D0 (UnkStruct_ov21_021E0D7C * param0, const UnkStruct_ov2 v3 = ov21_021E185C(param1->unk_18); - sub_0200B1B8(v1, v3, v0); + MessageLoader_GetStrbuf(v1, v3, v0); v4 = sub_02002D7C(0, v0, 0); v4 /= 2; sub_0201D78C(¶m0->unk_00->unk_04, 0, v0, 176 - v4, 72, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); - sub_0200B190(v1); + MessageLoader_Free(v1); ov21_021E1188(param0, param2, v2, param1->unk_18, param1->unk_1C); ov21_021E18A0(param0, param2, v2, param1->unk_18); diff --git a/src/overlay021/ov21_021E6014.c b/src/overlay021/ov21_021E6014.c index 7b62b071e7..b64d3d7be8 100644 --- a/src/overlay021/ov21_021E6014.c +++ b/src/overlay021/ov21_021E6014.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007C7C_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02022550_decl.h" #include "strbuf.h" #include "overlay021/struct_ov21_021D0F60_decl.h" @@ -460,36 +460,36 @@ static void ov21_021E65FC (UnkStruct_ov21_021E6274 * param0) static void ov21_021E6600 (UnkStruct_ov21_021E6118 * param0, int param1) { Strbuf* v0 = Strbuf_Init(32, param1); - UnkStruct_0200B144 * v1 = sub_0200B144(0, 26, 697, param1); + MessageLoader * v1 = MessageLoader_Init(0, 26, 697, param1); - sub_0200B1B8(v1, 43, v0); + MessageLoader_GetStrbuf(v1, 43, v0); { u32 v2 = sub_02002EEC(0, v0, 0, 256); sub_0201D78C(¶m0->unk_00->unk_04, 0, v0, v2, 24, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } - sub_0200B1B8(v1, 9, v0); + MessageLoader_GetStrbuf(v1, 9, v0); sub_0201D78C(¶m0->unk_00->unk_04, 0, v0, 32, 168, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); - sub_0200B1B8(v1, 9, v0); + MessageLoader_GetStrbuf(v1, 9, v0); sub_0201D78C(¶m0->unk_00->unk_04, 0, v0, 152, 168, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); - sub_0200B190(v1); + MessageLoader_Free(v1); } static void ov21_021E66B0 (UnkStruct_ov21_021E6118 * param0, const UnkStruct_ov21_021E6104 * param1, int param2) { Strbuf* v0 = Strbuf_Init(32, param2); - UnkStruct_0200B144 * v1; + MessageLoader * v1; int v2 = ov21_021D37BC(param1->unk_04); Strbuf* v3 = sub_0200B32C(v2, param2); int v4; v4 = sub_020989D0(); - v1 = sub_0200B144(0, 26, v4, param2); + v1 = MessageLoader_Init(0, 26, v4, param2); sub_0201D78C(¶m0->unk_00->unk_04, 0, v3, 26, 152, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); - sub_0200B1B8(v1, v2, v0); + MessageLoader_GetStrbuf(v1, v2, v0); { u32 v5 = 32 + 78 - sub_02002D7C(0, v0, 0); @@ -497,16 +497,16 @@ static void ov21_021E66B0 (UnkStruct_ov21_021E6118 * param0, const UnkStruct_ov2 } Strbuf_Free(v3); - sub_0200B190(v1); + MessageLoader_Free(v1); - v1 = sub_0200B144(0, 26, 697, param2); + v1 = MessageLoader_Init(0, 26, 697, param2); sub_0201D78C(¶m0->unk_00->unk_04, 0, ov21_021D3914(param1->unk_04), 146, 152, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); if (ov21_021D3920(param1->unk_04) == 0) { - sub_0200B1B8(v1, 95, v0); + MessageLoader_GetStrbuf(v1, 95, v0); } else { - sub_0200B1B8(v1, 96, v0); + MessageLoader_GetStrbuf(v1, 96, v0); } { @@ -515,7 +515,7 @@ static void ov21_021E66B0 (UnkStruct_ov21_021E6118 * param0, const UnkStruct_ov2 } Strbuf_Free(v0); - sub_0200B190(v1); + MessageLoader_Free(v1); } static void ov21_021E67C8 (UnkStruct_ov21_021E6118 * param0, const UnkStruct_ov21_021E6104 * param1) diff --git a/src/overlay021/ov21_021E737C.c b/src/overlay021/ov21_021E737C.c index be737053be..0fcef3a796 100644 --- a/src/overlay021/ov21_021E737C.c +++ b/src/overlay021/ov21_021E737C.c @@ -3,7 +3,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" #include "struct_decls/struct_02015214_decl.h" @@ -711,36 +711,36 @@ static void ov21_021E7CF4 (UnkStruct_ov21_021E7714 * param0) static void ov21_021E7CF8 (UnkStruct_ov21_021E747C * param0, int param1) { Strbuf* v0 = Strbuf_Init(32, param1); - UnkStruct_0200B144 * v1 = sub_0200B144(0, 26, 697, param1); + MessageLoader * v1 = MessageLoader_Init(0, 26, 697, param1); - sub_0200B1B8(v1, 44, v0); + MessageLoader_GetStrbuf(v1, 44, v0); { u32 v2 = sub_02002EEC(0, v0, 0, 256); sub_0201D78C(¶m0->unk_00->unk_04, 0, v0, v2, 24, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } - sub_0200B1B8(v1, 10, v0); + MessageLoader_GetStrbuf(v1, 10, v0); sub_0201D78C(¶m0->unk_00->unk_04, 0, v0, 32, 168, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); - sub_0200B1B8(v1, 10, v0); + MessageLoader_GetStrbuf(v1, 10, v0); sub_0201D78C(¶m0->unk_00->unk_04, 0, v0, 152, 168, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); - sub_0200B190(v1); + MessageLoader_Free(v1); } static void ov21_021E7DA8 (UnkStruct_ov21_021E747C * param0, const UnkStruct_ov21_021E7468 * param1, int param2) { Strbuf* v0 = Strbuf_Init(32, param2); - UnkStruct_0200B144 * v1; + MessageLoader * v1; int v2 = ov21_021D37BC(param1->unk_00); Strbuf* v3 = sub_0200B32C(v2, param2); int v4; v4 = sub_020989C4(); - v1 = sub_0200B144(0, 26, v4, param2); + v1 = MessageLoader_Init(0, 26, v4, param2); sub_0201D78C(¶m0->unk_00->unk_04, 0, v3, 26, 152, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); - sub_0200B1B8(v1, v2, v0); + MessageLoader_GetStrbuf(v1, v2, v0); { u32 v5 = 32 + 78 - sub_02002D7C(0, v0, 0); @@ -748,16 +748,16 @@ static void ov21_021E7DA8 (UnkStruct_ov21_021E747C * param0, const UnkStruct_ov2 } Strbuf_Free(v3); - sub_0200B190(v1); + MessageLoader_Free(v1); - v1 = sub_0200B144(0, 26, 697, param2); + v1 = MessageLoader_Init(0, 26, 697, param2); sub_0201D78C(¶m0->unk_00->unk_04, 0, ov21_021D3914(param1->unk_00), 146, 152, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); if (ov21_021D3920(param1->unk_00) == 0) { - sub_0200B1B8(v1, 97, v0); + MessageLoader_GetStrbuf(v1, 97, v0); } else { - sub_0200B1B8(v1, 98, v0); + MessageLoader_GetStrbuf(v1, 98, v0); } { @@ -766,7 +766,7 @@ static void ov21_021E7DA8 (UnkStruct_ov21_021E747C * param0, const UnkStruct_ov2 } Strbuf_Free(v0); - sub_0200B190(v1); + MessageLoader_Free(v1); } static void ov21_021E7EC0 (UnkStruct_ov21_021E747C * param0, int param1) diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c index cea51f0c6f..1cba0e3f07 100644 --- a/src/overlay021/ov21_021E8D48.c +++ b/src/overlay021/ov21_021E8D48.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02007C7C_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_020218BC_decl.h" @@ -761,13 +761,13 @@ static void ov21_021E9968 (UnkStruct_0205AA50 * param0, int param1, int param2) static void ov21_021E998C (UnkStruct_0205AA50 * param0, int param1) { Strbuf* v0 = Strbuf_Init(64, param1); - UnkStruct_0200B144 * v1 = sub_0200B144(0, 26, 697, param1); + MessageLoader * v1 = MessageLoader_Init(0, 26, 697, param1); - sub_0200B1B8(v1, 110, v0); + MessageLoader_GetStrbuf(v1, 110, v0); sub_0201D78C(param0, 0, v0, 32, 0, 0, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); - sub_0200B190(v1); + MessageLoader_Free(v1); } static UnkStruct_02007C7C * ov21_021E99E0 (UnkStruct_02007768 * param0, Pokemon * param1, int param2, int param3, int param4) diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c index e6f6f1a14d..ecc567f213 100644 --- a/src/overlay022/ov22_02255D44.c +++ b/src/overlay022/ov22_02255D44.c @@ -4,7 +4,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_020067E8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02015920_decl.h" #include "struct_decls/struct_0201CD38_decl.h" @@ -1342,7 +1342,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; + MessageLoader * v0; Strbuf* v1; int v2 = sub_02027B50(param0->unk_738); @@ -1352,39 +1352,39 @@ static void ov22_022572A0 (UnkStruct_ov22_02255D44 * param0, u32 param1, u8 para sub_0200DD0C(param0->unk_00.unk_40, 3, (0 + (29 * 4)), 8, v2, 14); sub_0200E060(param0->unk_718, 0, (0 + (29 * 4)), 8); - v0 = sub_0200B144(0, 26, 385, 13); - v1 = sub_0200B1EC(v0, param1); + v0 = MessageLoader_Init(0, 26, 385, 13); + v1 = MessageLoader_GetNewStrbuf(v0, param1); sub_0201D78C(param0->unk_718, 1, v1, 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); Strbuf_Free(v1); - sub_0200B190(v0); + MessageLoader_Free(v0); sub_0201A954(param0->unk_718); } static void ov22_02257368 (UnkStruct_ov22_02255D44 * param0, u32 param1) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; Strbuf* v1; Strbuf* v2; sub_0201ADA4(param0->unk_718, 15); - v0 = sub_0200B144(0, 26, 385, 13); - v2 = sub_0200B1EC(v0, param1); + v0 = MessageLoader_Init(0, 26, 385, 13); + v2 = MessageLoader_GetNewStrbuf(v0, param1); v1 = Strbuf_Init(256, 13); sub_0200C388(param0->unk_744, v1, v2); sub_0201D78C(param0->unk_718, 1, v1, 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); Strbuf_Free(v1); Strbuf_Free(v2); - sub_0200B190(v0); + MessageLoader_Free(v0); sub_0201A954(param0->unk_718); } static u32 ov22_022573EC (UnkStruct_ov22_02255D44 * param0, u32 param1) { u32 v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; u32 v2; Strbuf* v3; @@ -1392,8 +1392,8 @@ static u32 ov22_022573EC (UnkStruct_ov22_02255D44 * param0, u32 param1) sub_0201ADA4(param0->unk_718, 15); - v1 = sub_0200B144(0, 26, 385, 13); - v3 = sub_0200B1EC(v1, param1); + v1 = MessageLoader_Init(0, 26, 385, 13); + v3 = MessageLoader_GetNewStrbuf(v1, param1); param0->unk_740 = Strbuf_Init(256, 13); sub_0200C388(param0->unk_744, param0->unk_740, v3); @@ -1407,7 +1407,7 @@ static u32 ov22_022573EC (UnkStruct_ov22_02255D44 * param0, u32 param1) v0 = sub_0201D78C(param0->unk_718, 1, param0->unk_740, 0, 0, v2, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); Strbuf_Free(v3); - sub_0200B190(v1); + MessageLoader_Free(v1); sub_0201A954(param0->unk_718); return v0; diff --git a/src/overlay022/ov22_02259C58.c b/src/overlay022/ov22_02259C58.c index 82e662eef4..eaffe3a272 100644 --- a/src/overlay022/ov22_02259C58.c +++ b/src/overlay022/ov22_02259C58.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02012744_decl.h" #include "strbuf.h" @@ -512,13 +512,13 @@ 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; + MessageLoader * v0; Strbuf* v1; UnkStruct_0205AA50 * v2; - v0 = sub_0200B144(0, param1, param2, 13); + v0 = MessageLoader_Init(0, param1, param2, 13); GF_ASSERT(v0); - v1 = sub_0200B1EC(v0, param3); + v1 = MessageLoader_GetNewStrbuf(v0, param3); v2 = sub_0201A778(14, 1); sub_0201A7A0(v2); @@ -530,7 +530,7 @@ static UnkStruct_0205AA50 * ov22_0225A348 (UnkStruct_ov22_0225A0E4 * param0, u32 } Strbuf_Free(v1); - sub_0200B190(v0); + MessageLoader_Free(v0); return v2; } diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c index 42832d7903..eb7192e663 100644 --- a/src/overlay022/ov22_0225A428.c +++ b/src/overlay022/ov22_0225A428.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "strbuf.h" @@ -259,35 +259,35 @@ 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; + MessageLoader * v0; Strbuf* v1; s32 v2; - v0 = sub_0200B144(0, param1, param2, 13); + v0 = MessageLoader_Init(0, param1, param2, 13); GF_ASSERT(v0); - v1 = sub_0200B1EC(v0, param3); + v1 = MessageLoader_GetNewStrbuf(v0, param3); v2 = sub_0201D78C(param0, 1, v1, param4, param5, param7, param6, NULL); Strbuf_Free(v1); - sub_0200B190(v0); + MessageLoader_Free(v0); return v2; } 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; + MessageLoader * v0; s32 v1; GF_ASSERT(*param8 == NULL); - v0 = sub_0200B144(0, param1, param2, 13); + v0 = MessageLoader_Init(0, param1, param2, 13); GF_ASSERT(v0); - *param8 = sub_0200B1EC(v0, param3); + *param8 = MessageLoader_GetNewStrbuf(v0, param3); v1 = sub_0201D78C(param0, 1, *param8, param4, param5, param7, param6, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); return v1; } diff --git a/src/overlay022/ov22_0225B660.c b/src/overlay022/ov22_0225B660.c index 1c40305274..52d81dc320 100644 --- a/src/overlay022/ov22_0225B660.c +++ b/src/overlay022/ov22_0225B660.c @@ -4,7 +4,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_020067E8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "strbuf.h" @@ -284,9 +284,9 @@ static void ov22_0225BB00 (UnkStruct_ov22_0225B85C * param0) UnkStruct_0200B358 * v5; Strbuf* v6; Strbuf* v7; - UnkStruct_0200B144 * v8; + MessageLoader * v8; - v8 = sub_0200B144(0, 26, 385, 13); + v8 = MessageLoader_Init(0, 26, 385, 13); GF_ASSERT(v8); v5 = sub_0200B358(13); @@ -310,7 +310,7 @@ static void ov22_0225BB00 (UnkStruct_ov22_0225B85C * param0) sub_0200BE48(v5, 0, v4); v7 = Strbuf_Init(200, 13); - v6 = sub_0200B1EC(v8, 45); + v6 = MessageLoader_GetNewStrbuf(v8, 45); sub_0200C388(v5, v7, v6); v3 = sub_02002D7C(0, v7, 0); @@ -320,7 +320,7 @@ static void ov22_0225BB00 (UnkStruct_ov22_0225B85C * param0) sub_0201D78C(param0->unk_200, 0, v7, v1, v2, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v7); Strbuf_Free(v6); - sub_0200B190(v8); + MessageLoader_Free(v8); sub_0200B3F0(v5); } @@ -333,7 +333,7 @@ static void ov22_0225BC18 (UnkStruct_ov22_0225B85C * param0) int v4; Pokemon * v5; BoxPokemon * v6; - UnkStruct_0200B144 * v7; + MessageLoader * v7; int v8, v9; int v10; @@ -356,10 +356,10 @@ static void ov22_0225BC18 (UnkStruct_ov22_0225B85C * param0) sub_0200B5CC(v1, 4, v6); Heap_FreeToHeap(v5); - v7 = sub_0200B144(0, 26, 385, 13); + v7 = MessageLoader_Init(0, 26, 385, 13); GF_ASSERT(v7); - v3 = sub_0200B1EC(v7, 43); + v3 = MessageLoader_GetNewStrbuf(v7, 43); sub_0200C388(v1, v2, v3); Strbuf_Free(v3); v10 = sub_02002D7C(0, v2, 0); @@ -367,7 +367,7 @@ static void ov22_0225BC18 (UnkStruct_ov22_0225B85C * param0) v9 = 7; sub_0201D78C(param0->unk_200, 0, v2, v8, v9, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); - v3 = sub_0200B1EC(v7, 44); + v3 = MessageLoader_GetNewStrbuf(v7, 44); sub_0200C388(v1, v2, v3); Strbuf_Free(v3); v10 = sub_02002D7C(0, v2, 0); @@ -376,6 +376,6 @@ static void ov22_0225BC18 (UnkStruct_ov22_0225B85C * param0) sub_0201D78C(param0->unk_200, 0, v2, v8, v9, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v2); - sub_0200B190(v7); + MessageLoader_Free(v7); sub_0200B3F0(v1); } diff --git a/src/overlay023/ov23_022416A8.c b/src/overlay023/ov23_022416A8.c index f8f1f7e76e..02e0dc1261 100644 --- a/src/overlay023/ov23_022416A8.c +++ b/src/overlay023/ov23_022416A8.c @@ -504,7 +504,7 @@ BOOL ov23_02241D58 (Strbuf *param0) sub_0200BACC(v1, 2, Unk_ov23_02257744->unk_468[v0]); sub_0200C324(v1, 2); - sub_0200B1B8(ov23_02253E3C(ov23_0224219C()), 95, v2); + MessageLoader_GetStrbuf(ov23_02253E3C(ov23_0224219C()), 95, v2); sub_0200C388(v1, param0, v2); Unk_ov23_02257744->unk_468[v0] = 0; diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c index 602be16eba..d0b1247558 100644 --- a/src/overlay023/ov23_02241F74.c +++ b/src/overlay023/ov23_02241F74.c @@ -229,7 +229,7 @@ BOOL ov23_0224223C (UnkStruct_02025E6C * param0, UnkStruct_02025E6C * param1, in sub_0200B498(v0, 0, param0); sub_0200B498(v0, 1, param1); - sub_0200B1B8(ov23_02253E3C(ov23_0224219C()), param2, v1); + MessageLoader_GetStrbuf(ov23_02253E3C(ov23_0224219C()), param2, v1); sub_0200C388(v0, param3, v1); Strbuf_Free(v1); sub_0200B3F0(v0); @@ -250,7 +250,7 @@ BOOL ov23_022422A8 (UnkStruct_02025E6C * param0, int param1, int param2, Strbuf v1 = Strbuf_Init((50 * 2), 4); sub_0200B498(v0, param1, param0); - sub_0200B1B8(ov23_02253E3C(ov23_0224219C()), param2, v1); + MessageLoader_GetStrbuf(ov23_02253E3C(ov23_0224219C()), param2, v1); sub_0200C388(v0, param3, v1); Strbuf_Free(v1); sub_0200B3F0(v0); @@ -1064,7 +1064,7 @@ void ov23_02243038 (int param0) v1 = Strbuf_Init((50 * 2), 11); sub_0200B498(v0, 0, sub_02032EE8(param0)); - sub_0200B1B8(ov23_02253E3C(ov23_0224219C()), 115, v1); + MessageLoader_GetStrbuf(ov23_02253E3C(ov23_0224219C()), 115, v1); sub_0200C388(v0, Unk_ov23_02257748->unk_DC[param0], v1); Strbuf_Free(v1); sub_0200B3F0(v0); diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c index fb9ccc308b..4a42d9ff92 100644 --- a/src/overlay023/ov23_0224B05C.c +++ b/src/overlay023/ov23_0224B05C.c @@ -4,7 +4,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" @@ -1016,7 +1016,7 @@ static int ov23_0224BD1C (int param0, BOOL param1) static UnkStruct_02001AF4 * ov23_0224BD90 (UnkStruct_02018340 * param0, const UnkStruct_ov61_0222C884 * param1, u16 param2, u8 param3, u32 param4) { UnkStruct_02081CF4 v0; - UnkStruct_0200B144 * v1 = ov23_02253E3C(ov23_0224219C()); + MessageLoader * v1 = ov23_02253E3C(ov23_0224219C()); UnkStruct_02013A04 * v2; v2 = sub_02013A04(2, param4); diff --git a/src/overlay023/ov23_0224DC40.c b/src/overlay023/ov23_0224DC40.c index 947d21c8fc..8d73198287 100644 --- a/src/overlay023/ov23_0224DC40.c +++ b/src/overlay023/ov23_0224DC40.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_02025E6C_decl.h" @@ -246,16 +246,16 @@ static void ov23_0224DD2C (UnkStruct_ov23_0224E280 * param0) sub_0200DC48(¶m0->unk_0C, 1, 1024 - (18 + 12) - 9, 11); { - UnkStruct_0200B144 * v1; + MessageLoader * v1; int v2; - v1 = sub_0200B144(0, 26, 634, 4); + v1 = MessageLoader_Init(0, 26, 634, 4); for (v2 = 0; v2 < NELEMS(Unk_ov23_022568B4); v2++) { sub_02013A4C(param0->unk_1C, v1, Unk_ov23_022568B4[v2].unk_00, Unk_ov23_022568B4[v2].unk_04); } - sub_0200B190(v1); + MessageLoader_Free(v1); } MI_CpuCopy8(ov23_02253D40(), &v0, sizeof(UnkStruct_ov84_02240FA8)); @@ -307,11 +307,11 @@ static void ov23_0224DE3C (UnkStruct_ov23_0224E280 * param0) sub_0200DC48(¶m0->unk_0C, 1, 1024 - (18 + 12) - 9, 11); { - UnkStruct_0200B144 * v1; + MessageLoader * v1; int v2, v3; u8 v4[4]; - v1 = sub_0200B144(0, 26, 633, 4); + v1 = MessageLoader_Init(0, 26, 633, 4); for (v2 = 0; v2 < 4; v2++) { u32 v5 = sub_0201D35C() % 12; @@ -330,7 +330,7 @@ static void ov23_0224DE3C (UnkStruct_ov23_0224E280 * param0) } } - sub_0200B190(v1); + MessageLoader_Free(v1); } v0 = Unk_ov23_02256894; @@ -395,10 +395,10 @@ static void ov23_0224DFA0 (UnkStruct_ov23_0224E280 * param0) sub_0200DC48(¶m0->unk_0C, 1, 1024 - (18 + 12) - 9, 11); { - UnkStruct_0200B144 * v1; + MessageLoader * v1; int v2; - v1 = sub_0200B144(0, 26, 632, 4); + v1 = MessageLoader_Init(0, 26, 632, 4); for (v2 = 0; v2 < 4; v2++) { u32 v3 = 4 * param0->unk_32 + v2; @@ -406,7 +406,7 @@ static void ov23_0224DFA0 (UnkStruct_ov23_0224E280 * param0) sub_02013A4C(param0->unk_1C, v1, 0 + v3, v2); } - sub_0200B190(v1); + MessageLoader_Free(v1); } v0 = Unk_ov23_02256894; @@ -988,10 +988,10 @@ static void ov23_0224EAA4 (UnkStruct_ov23_022577B0 * param0) sub_0201A7E8(param0->unk_04->unk_08, ¶m0->unk_08, 3, 1, 1, 16, v1 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (16 * v1 * 2)); sub_0200DC48(¶m0->unk_08, 1, 1024 - (18 + 12) - 9, 11); { - UnkStruct_0200B144 * v2; + MessageLoader * v2; int v3; - v2 = sub_0200B144(0, 26, 632, 4); + v2 = MessageLoader_Init(0, 26, 632, 4); for (v3 = 0; v3 < 4; v3++) { u32 v4 = 4 * param0->unk_2E + v3; @@ -1000,7 +1000,7 @@ static void ov23_0224EAA4 (UnkStruct_ov23_022577B0 * param0) } sub_02013A4C(param0->unk_18, v2, 48, 51); - sub_0200B190(v2); + MessageLoader_Free(v2); } v0 = Unk_ov23_02256894; diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c index 0967867b6d..7ff3049f19 100644 --- a/src/overlay023/ov23_0224F294.c +++ b/src/overlay023/ov23_0224F294.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "strbuf.h" @@ -491,7 +491,7 @@ static void ov23_0224F7F4 (UnkStruct_ov23_02250CD4 * param0) sub_0200DC48(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { - UnkStruct_0200B144 * v3; + MessageLoader * v3; int v4; v3 = ov23_02253E3C(ov23_0224219C()); @@ -748,7 +748,7 @@ static void ov23_0224FBFC (UnkStruct_ov23_02250CD4 * param0, int param1) sub_0200DC48(¶m0->unk_20, 1, 1024 - (18 + 12) - 9, 11); { - UnkStruct_0200B144 * v7; + MessageLoader * v7; int v8; v7 = ov23_02253E3C(ov23_0224219C()); @@ -860,7 +860,7 @@ static void ov23_0224FE38 (UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_022 sub_0200DC48(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { - UnkStruct_0200B144 * v5; + MessageLoader * v5; int v6 = 0; v5 = ov23_02253E3C(ov23_022421DC()); @@ -1052,7 +1052,7 @@ static void ov23_0225021C (UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_022 sub_0200DC48(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { - UnkStruct_0200B144 * v6; + MessageLoader * v6; int v7; v6 = ov23_02253E3C(ov23_022421DC()); @@ -1060,7 +1060,7 @@ static void ov23_0225021C (UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_022 for (v7 = 0; v7 < v4; v7++) { sub_0200BA94(param0->unk_70, 2, v1(v7, param0)); sub_0200B60C(param0->unk_70, 6, v2(v7, param0), 2, 2, 1); - sub_0200B1B8(ov23_02253E3C(ov23_0224219C()), 128, param0->unk_6C); + MessageLoader_GetStrbuf(ov23_02253E3C(ov23_0224219C()), 128, param0->unk_6C); sub_0200C388(param0->unk_70, param0->unk_68, param0->unk_6C); sub_02013A6C(param0->unk_40, param0->unk_68, v7); } @@ -1228,7 +1228,7 @@ static void ov23_022505EC (UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_022 sub_0200DC48(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { - UnkStruct_0200B144 * v5; + MessageLoader * v5; int v6 = 0; v5 = ov23_02253E3C(ov23_022421DC()); @@ -1629,7 +1629,7 @@ static void ov23_02250D90 (UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_022 sub_0200DC48(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { - UnkStruct_0200B144 * v5; + MessageLoader * v5; int v6 = 0; v5 = ov23_02253E3C(ov23_022421DC()); diff --git a/src/overlay023/ov23_0225128C.c b/src/overlay023/ov23_0225128C.c index 038b9a08c8..c264c55204 100644 --- a/src/overlay023/ov23_0225128C.c +++ b/src/overlay023/ov23_0225128C.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_020298B0_decl.h" #include "struct_decls/struct_020508D4_decl.h" @@ -368,10 +368,10 @@ static void ov23_022515D8 (UnkStruct_ov23_02250CD4 * param0, int param1, int par sub_0200DC48(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { - UnkStruct_0200B144 * v3; + MessageLoader * v3; int v4 = 0; - v3 = sub_0200B144(0, 26, 639, 4); + v3 = MessageLoader_Init(0, 26, 639, 4); for (v4 = 0; v4 < v1; v4++) { if (v4 == (v1 - 1)) { @@ -381,7 +381,7 @@ static void ov23_022515D8 (UnkStruct_ov23_02250CD4 * param0, int param1, int par } } - sub_0200B190(v3); + MessageLoader_Free(v3); } MI_CpuCopy8(ov23_02253D40(), &v0, sizeof(UnkStruct_ov84_02240FA8)); @@ -414,10 +414,10 @@ static void ov23_022516E8 (UnkStruct_ov23_02250CD4 * param0, int param1, int par sub_0200DC48(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { - UnkStruct_0200B144 * v3; + MessageLoader * v3; int v4 = 0; - v3 = sub_0200B144(0, 26, 639, 4); + v3 = MessageLoader_Init(0, 26, 639, 4); for (v4 = 0; v4 < v1; v4++) { if (v4 == param2) { @@ -427,7 +427,7 @@ static void ov23_022516E8 (UnkStruct_ov23_02250CD4 * param0, int param1, int par } } - sub_0200B190(v3); + MessageLoader_Free(v3); } MI_CpuCopy8(ov23_02253D40(), &v0, sizeof(UnkStruct_ov84_02240FA8)); diff --git a/src/overlay023/ov23_022521F0.c b/src/overlay023/ov23_022521F0.c index a2e19884e5..ecb990e13f 100644 --- a/src/overlay023/ov23_022521F0.c +++ b/src/overlay023/ov23_022521F0.c @@ -4,7 +4,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_0200112C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_020298B0_decl.h" #include "struct_decls/struct_02061AB4_decl.h" @@ -272,13 +272,13 @@ static void ov23_0225265C (UnkStruct_0200112C * param0, u32 param1, u8 param2) u32 v1 = param1; sub_0201ADA4(&v0->unk_20, 15); - sub_0200B1B8(ov23_02253E3C(ov23_022421BC()), 23 + v0->unk_2AB, v0->unk_68); + MessageLoader_GetStrbuf(ov23_02253E3C(ov23_022421BC()), 23 + v0->unk_2AB, v0->unk_68); sub_0201D738(&v0->unk_20, 0, v0->unk_68, 1, 1, 0xff, NULL); if (param1 != 0xfffffffe) { sub_0200BA94(v0->unk_70, 2, v0->unk_279[v1]); sub_0200B60C(v0->unk_70, 6, v0->unk_27E[v1], 2, 1, 1); - sub_0200B1B8(ov23_02253E3C(ov23_022421BC()), 25, v0->unk_68); + MessageLoader_GetStrbuf(ov23_02253E3C(ov23_022421BC()), 25, v0->unk_68); sub_0200C388(v0->unk_70, v0->unk_6C, v0->unk_68); sub_0201D738(&v0->unk_20, 0, v0->unk_6C, 1, 17, 0xff, NULL); } else { @@ -352,7 +352,7 @@ static void ov23_02252754 (UnkStruct_0200112C * param0, u32 param1, u8 param2) } } - sub_0200B1B8(ov23_02253E3C(ov23_022421BC()), 23 + v1->unk_2AB, v1->unk_68); + MessageLoader_GetStrbuf(ov23_02253E3C(ov23_022421BC()), 23 + v1->unk_2AB, v1->unk_68); sub_0201D738(&v1->unk_20, 0, v1->unk_68, 1, 1, 0xff, NULL); if (param1 == 0xfffffffe) { @@ -360,7 +360,7 @@ static void ov23_02252754 (UnkStruct_0200112C * param0, u32 param1, u8 param2) } else if (v7 != 0) { sub_0200BA94(v1->unk_70, 2, v7); sub_0200B60C(v1->unk_70, 6, v8, 2, 1, 1); - sub_0200B1B8(ov23_02253E3C(ov23_022421BC()), 25, v1->unk_68); + MessageLoader_GetStrbuf(ov23_02253E3C(ov23_022421BC()), 25, v1->unk_68); sub_0200C388(v1->unk_70, v1->unk_6C, v1->unk_68); sub_0201D738(&v1->unk_20, 0, v1->unk_6C, 1, 17, 0xff, NULL); @@ -369,7 +369,7 @@ static void ov23_02252754 (UnkStruct_0200112C * param0, u32 param1, u8 param2) } else { v1->unk_279[0] = v7; - sub_0200B1B8(ov23_02253E3C(ov23_022421BC()), 26, v1->unk_68); + MessageLoader_GetStrbuf(ov23_02253E3C(ov23_022421BC()), 26, v1->unk_68); sub_0201D738(&v1->unk_20, 0, v1->unk_68, 1, 17, 0xff, NULL); } @@ -407,17 +407,17 @@ static void ov23_02252A18 (UnkStruct_ov23_02250CD4 * param0) sub_0200DC48(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { - UnkStruct_0200B144 * v2; + MessageLoader * v2; int v3; if (param0->unk_2AC == 1) { - v2 = sub_0200B144(0, 26, 630, 4); + v2 = MessageLoader_Init(0, 26, 630, 4); ov23_02253DFC(ov23_022421DC(), 630, 0); } else if (param0->unk_2AC == 0) { - v2 = sub_0200B144(0, 26, 626, 4); + v2 = MessageLoader_Init(0, 26, 626, 4); ov23_02253DFC(ov23_022421DC(), 626, 0); } else { - v2 = sub_0200B144(0, 26, 628, 4); + v2 = MessageLoader_Init(0, 26, 628, 4); ov23_02253DFC(ov23_022421DC(), 628, 0); } @@ -426,7 +426,7 @@ static void ov23_02252A18 (UnkStruct_ov23_02250CD4 * param0) } sub_02013A4C(param0->unk_40, v2, 0, 0xfffffffe); - sub_0200B190(v2); + MessageLoader_Free(v2); } MI_CpuCopy8(ov23_02253D40(), &v0, sizeof(UnkStruct_ov84_02240FA8)); @@ -567,7 +567,7 @@ void ov23_02252D74 (UnkStruct_ov23_02250CD4 * param0, int param1) sub_0201ADA4(¶m0->unk_30, 15); sub_0201A954(¶m0->unk_30); - sub_0200B1B8(ov23_02253E3C(ov23_022421BC()), param1, param0->unk_68); + MessageLoader_GetStrbuf(ov23_02253E3C(ov23_022421BC()), param1, param0->unk_68); sub_0201D738(¶m0->unk_30, 0, param0->unk_68, 1, 1, 0xff, NULL); sub_0201A9A4(¶m0->unk_30); } diff --git a/src/overlay023/ov23_02253598.c b/src/overlay023/ov23_02253598.c index 10d72a2a26..55943aaded 100644 --- a/src/overlay023/ov23_02253598.c +++ b/src/overlay023/ov23_02253598.c @@ -4,7 +4,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_0200112C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -120,7 +120,7 @@ static UnkFuncPtr_ov23_022576EC Unk_ov23_022576EC[] = { sub_020295B8 }; -asm static void ov23_0225360C (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, UnkStruct_02025E6C * param2, const UnkStruct_0202855C * param3) +asm static void ov23_0225360C (UnkStruct_0205AA50 * param0, MessageLoader * param1, UnkStruct_02025E6C * param2, const UnkStruct_0202855C * param3) { push {r3, r4, r5, r6, r7, lr} sub sp, #0x20 @@ -142,7 +142,7 @@ asm static void ov23_0225360C (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * ldr r0, [sp, #0xc] mov r1, #0 add r2, r4, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #1 str r0, [sp] mov r0, #0xff @@ -156,7 +156,7 @@ asm static void ov23_0225360C (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * ldr r0, [sp, #0xc] mov r1, #1 add r2, r4, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #0x11 str r0, [sp] mov r0, #0xff @@ -170,7 +170,7 @@ asm static void ov23_0225360C (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * ldr r0, [sp, #0xc] mov r1, #2 add r2, r4, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #1 str r0, [sp] mov r0, #0xff @@ -195,7 +195,7 @@ asm static void ov23_0225360C (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * ldr r0, [sp, #0xc] mov r1, #5 add r2, r4, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] add r2, r4, #0 @@ -217,7 +217,7 @@ asm static void ov23_0225360C (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * ldr r0, [sp, #0xc] mov r1, #4 add r2, r4, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] add r2, r4, #0 @@ -238,7 +238,7 @@ asm static void ov23_0225360C (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * ldr r0, [sp, #0xc] add r1, #0x14 add r2, r4, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #0x11 str r0, [sp] mov r0, #0xff @@ -255,7 +255,7 @@ asm static void ov23_0225360C (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * ldr r0, [sp, #0xc] add r1, r5, #6 add r2, r4, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf str r6, [sp] mov r0, #0xff str r0, [sp, #4] @@ -289,7 +289,7 @@ asm static void ov23_0225360C (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * ldr r0, [sp, #0xc] mov r1, #0xd add r2, r4, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] add r2, r4, #0 @@ -357,7 +357,7 @@ static void ov23_0225381C (UnkStruct_0201CD38 * param0, void * param1) void ov23_02253834 (UnkStruct_02018340 * param0, UnkStruct_02025E6C * param1, UnkFuncPtr_ov23_02253834 param2, void * param3, BOOL param4) { UnkStruct_0202855C * v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; UnkStruct_ov84_02240FA8 v2; int v3 = 10; UnkStruct_ov23_022537D4 * v4 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov23_022537D4)); @@ -370,7 +370,7 @@ void ov23_02253834 (UnkStruct_02018340 * param0, UnkStruct_02025E6C * param1, Un sub_0201A7E8(param0, &v4->unk_08, 3, 4, 2, 24, 19, 13, 1); sub_0200DC48(&v4->unk_08, 1, 1024 - (18 + 12) - 9, 11); - v1 = sub_0200B144(0, 26, 640, 4); + v1 = MessageLoader_Init(0, 26, 640, 4); sub_0201ADA4(&v4->unk_08, 15); if (param4) { @@ -387,7 +387,7 @@ void ov23_02253834 (UnkStruct_02018340 * param0, UnkStruct_02025E6C * param1, Un Unk_ov23_022577BC->unk_04 = sub_0200D9E8(ov23_0225381C, v4, 10); Unk_ov23_022577BC->unk_00 = v4; - sub_0200B190(v1); + MessageLoader_Free(v1); } void ov23_022538FC (int param0) @@ -474,7 +474,7 @@ void ov23_02253A00 (UnkStruct_0202855C * param0, int param1) ov23_02253F40(ov23_022421BC(), param1, 1, ov23_022539F8); } -static void ov23_02253A78 (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, UnkStruct_02025E6C * param2, const UnkStruct_0202855C * param3, const UnkStruct_020298B0 * param4) +static void ov23_02253A78 (UnkStruct_0205AA50 * param0, MessageLoader * param1, UnkStruct_02025E6C * param2, const UnkStruct_0202855C * param3, const UnkStruct_020298B0 * param4) { UnkStruct_0200B358 * v0; Strbuf* v1; @@ -494,19 +494,19 @@ static void ov23_02253A78 (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * par v2 = Strbuf_Init(40, 4); sub_0200B498(v0, 1, param2); - sub_0200B1B8(param1, 12, v1); + MessageLoader_GetStrbuf(param1, 12, v1); sub_0200C388(v0, v2, v1); sub_0201D738(param0, 0, v2, v7, 1, 0xff, NULL); - sub_0200B1B8(param1, 13, v1); + MessageLoader_GetStrbuf(param1, 13, v1); sub_0201D738(param0, 0, v1, v7, 1 + v8, 0xff, NULL); sub_0200B60C(v0, 6, sub_020295B8(param3), 6, 1, 1); - sub_0200B1B8(param1, 14, v1); + MessageLoader_GetStrbuf(param1, 14, v1); sub_0200C388(v0, v2, v1); sub_0201D738(param0, 0, v2, v7 + 100, 1 + v8, 0xff, NULL); - sub_0200B1B8(param1, 15, v1); + MessageLoader_GetStrbuf(param1, 15, v1); sub_0201D738(param0, 0, v1, v7, 1 + v8 * 3, 0xff, NULL); for (v3 = 0; v3 < 5; v3++) { @@ -514,20 +514,20 @@ static void ov23_02253A78 (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * par if (v13) { sub_0200B498(v0, 0, v13); - sub_0200B1B8(param1, 16, v1); + MessageLoader_GetStrbuf(param1, 16, v1); sub_0200C388(v0, v2, v1); sub_0201D738(param0, 0, v2, v7, 1 + v8 * (4 + v3), 0xff, NULL); sub_0200B60C(v0, 5, sub_02025F24(v13), 5, 2, 1); - sub_0200B1B8(param1, 17, v1); + MessageLoader_GetStrbuf(param1, 17, v1); sub_0200C388(v0, v2, v1); sub_0201D738(param0, 0, v2, v7 + v12, 1 + v8 * (4 + v3), 0xff, NULL); Heap_FreeToHeap(v13); } else { - sub_0200B1B8(param1, 51, v1); + MessageLoader_GetStrbuf(param1, 51, v1); sub_0201D738(param0, 0, v1, v7, 1 + v8 * (4 + v3), 0xff, NULL); - sub_0200B1B8(param1, 52, v1); + MessageLoader_GetStrbuf(param1, 52, v1); sub_0201D738(param0, 0, v1, v7 + v12, 1 + v8 * (4 + v3), 0xff, NULL); } } @@ -540,7 +540,7 @@ static void ov23_02253A78 (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * par void * ov23_02253C64 (UnkStruct_02018340 * param0, UnkStruct_02025E6C * param1, UnkStruct_020298B0 * param2, UnkFuncPtr_ov23_02253834 param3, void * param4) { UnkStruct_0202855C * v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; UnkStruct_ov84_02240FA8 v2; int v3 = 10; UnkStruct_ov23_022537D4 * v4 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov23_022537D4)); @@ -553,7 +553,7 @@ void * ov23_02253C64 (UnkStruct_02018340 * param0, UnkStruct_02025E6C * param1, sub_0201A7E8(param0, &v4->unk_08, 3, 4, 2, 24, 19, 13, 1); sub_0200DC48(&v4->unk_08, 1, 1024 - (18 + 12) - 9, 11); - v1 = sub_0200B144(0, 26, 639, 4); + v1 = MessageLoader_Init(0, 26, 639, 4); sub_0201ADA4(&v4->unk_08, 15); v0 = Unk_ov23_022577BC->unk_0C; @@ -561,7 +561,7 @@ void * ov23_02253C64 (UnkStruct_02018340 * param0, UnkStruct_02025E6C * param1, sub_02005748(1533); sub_0201A9A4(&v4->unk_08); - sub_0200B190(v1); + MessageLoader_Free(v1); return v4; } diff --git a/src/overlay023/ov23_02253D40.c b/src/overlay023/ov23_02253D40.c index f2d952a73a..ac245d5f9c 100644 --- a/src/overlay023/ov23_02253D40.c +++ b/src/overlay023/ov23_02253D40.c @@ -3,7 +3,7 @@ #include "data_021BF67C.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" @@ -32,7 +32,7 @@ typedef struct UnkStruct_ov23_02253E2C_t { UnkStruct_02018340 * unk_18; UnkStruct_ov23_02253F60 unk_1C; UnkStruct_0201CD38 * unk_20; - UnkStruct_0200B144 * unk_24; + MessageLoader * unk_24; UnkStruct_0200B358 * unk_28; int unk_2C; int unk_30; @@ -91,7 +91,7 @@ UnkStruct_ov23_02253E2C * ov23_02253D48 (int param0, int param1, UnkStruct_02018 v1->unk_04 = Strbuf_Init(v0, param1); v1->unk_28 = sub_0200B358(param1); v1->unk_2C = param0; - v1->unk_24 = sub_0200B144(1, 26, param0, param1); + v1->unk_24 = MessageLoader_Init(1, 26, param0, param1); v1->unk_34 = param1; v1->unk_18 = param2; @@ -112,7 +112,7 @@ void ov23_02253DD8 (UnkStruct_ov23_02253E2C * param0) Strbuf_Free(param0->unk_00); Strbuf_Free(param0->unk_04); sub_0200B3F0(param0->unk_28); - sub_0200B190(param0->unk_24); + MessageLoader_Free(param0->unk_24); Heap_FreeToHeap(param0); } @@ -120,9 +120,9 @@ void ov23_02253DFC (UnkStruct_ov23_02253E2C * param0, int param1, int param2) { if (param0->unk_2C != param1) { param0->unk_2C = param1; - sub_0200B190(param0->unk_24); + MessageLoader_Free(param0->unk_24); - param0->unk_24 = sub_0200B144(param2, 26, param1, param0->unk_34); + param0->unk_24 = MessageLoader_Init(param2, 26, param1, param0->unk_34); GF_ASSERT(param0->unk_24 != NULL); } } @@ -134,7 +134,7 @@ void ov23_02253E2C (UnkStruct_ov23_02253E2C * param0, UnkStruct_02018340 * param param0->unk_40 = param3; } -UnkStruct_0200B144 * ov23_02253E3C (UnkStruct_ov23_02253E2C * param0) +MessageLoader * ov23_02253E3C (UnkStruct_ov23_02253E2C * param0) { return param0->unk_24; } @@ -199,7 +199,7 @@ static int ov23_02253E90 (UnkStruct_ov23_02253E2C * param0, BOOL param1, UnkStru int ov23_02253F40 (UnkStruct_ov23_02253E2C * param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3) { - sub_0200B1B8(param0->unk_24, param1, param0->unk_00); + MessageLoader_GetStrbuf(param0->unk_24, param1, param0->unk_00); return ov23_02253E90(param0, param2, param3, 0); } @@ -219,7 +219,7 @@ int ov23_02253F60 (UnkStruct_ov23_02253E2C * param0, int param1, BOOL param2, Un int ov23_02253F78 (UnkStruct_ov23_02253E2C * param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3, int param4) { - sub_0200B1B8(param0->unk_24, param1, param0->unk_00); + MessageLoader_GetStrbuf(param0->unk_24, param1, param0->unk_00); return ov23_02253E90(param0, param2, param3, param4); } diff --git a/src/overlay023/ov23_022542CC.c b/src/overlay023/ov23_022542CC.c index 77ee032c16..ac03663579 100644 --- a/src/overlay023/ov23_022542CC.c +++ b/src/overlay023/ov23_022542CC.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_0200112C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "strbuf.h" @@ -173,19 +173,19 @@ static void ov23_0225437C (UnkStruct_ov23_022542D8 * param0) sub_0200DC48(¶m0->unk_14, 1, 1024 - (18 + 12) - 9, 11); { - UnkStruct_0200B144 * v5; + MessageLoader * v5; int v6; const int v7[3 + 1] = { 1, 2, 3, 4, }; - v5 = sub_0200B144(0, 26, 637, 4); + v5 = MessageLoader_Init(0, 26, 637, 4); { Strbuf* v8; sub_0201ADA4(¶m0->unk_14, 15); - v8 = sub_0200B1EC(v5, 0); + v8 = MessageLoader_GetNewStrbuf(v5, 0); sub_0201D738(¶m0->unk_14, 0, v8, 0, 0, 0xff, NULL); Strbuf_Free(v8); } @@ -194,7 +194,7 @@ static void ov23_0225437C (UnkStruct_ov23_022542D8 * param0) sub_02013A4C(param0->unk_24, v5, v7[v6], v6); } - sub_0200B190(v5); + MessageLoader_Free(v5); } v0 = Unk_ov23_02256B3C; @@ -414,28 +414,28 @@ static void ov23_022546E0 (UnkStruct_ov23_02254594 * param0) sub_0200DC48(¶m0->unk_18, 1, 1024 - (18 + 12) - 9, 11); { - UnkStruct_0200B144 * v6; + MessageLoader * v6; int v7 = 0; int v8; BOOL v9; int v10; u8 v11; - v6 = sub_0200B144(0, 26, 626, 4); + v6 = MessageLoader_Init(0, 26, 626, 4); { - UnkStruct_0200B144 * v12; + MessageLoader * v12; Strbuf* v13; Strbuf* v14; Strbuf* v15; UnkStruct_0200B358 * v16; - v12 = sub_0200B144(0, 26, 637, 4); + v12 = MessageLoader_Init(0, 26, 637, 4); sub_0201ADA4(¶m0->unk_18, 15); - v13 = sub_0200B1EC(v12, 9); - v14 = sub_0200B1EC(v12, 10); + v13 = MessageLoader_GetNewStrbuf(v12, 9); + v14 = MessageLoader_GetNewStrbuf(v12, 10); v15 = Strbuf_Init(6, 4); sub_0201D738(¶m0->unk_18, 0, v13, 0, 0, 0xff, NULL); @@ -451,7 +451,7 @@ static void ov23_022546E0 (UnkStruct_ov23_02254594 * param0) Strbuf_Free(v14); Strbuf_Free(v15); - sub_0200B190(v12); + MessageLoader_Free(v12); } for (v7 = 0; v7 < v4; v7++) { @@ -471,7 +471,7 @@ static void ov23_022546E0 (UnkStruct_ov23_02254594 * param0) v10 = (v7 << 1) + 1; sub_02013A4C(param0->unk_28, v6, 277, v10); - sub_0200B190(v6); + MessageLoader_Free(v6); } ov23_02253DFC(ov23_022421DC(), 626, 0); diff --git a/src/overlay043/ov43_02256544.c b/src/overlay043/ov43_02256544.c index 19d1675b13..81a3a38a99 100644 --- a/src/overlay043/ov43_02256544.c +++ b/src/overlay043/ov43_02256544.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "strbuf.h" @@ -42,8 +42,8 @@ struct UnkStruct_ov43_02256544_t { UnkStruct_0205AA50 unk_84; UnkStruct_0205AA50 unk_94; UnkStruct_0205AA50 unk_A4; - UnkStruct_0200B144 * unk_B4; - UnkStruct_0200B144 * unk_B8; + MessageLoader * unk_B4; + MessageLoader * unk_B8; Strbuf* unk_BC; }; @@ -71,8 +71,8 @@ BOOL ov43_02256544 (UnkStruct_ov43_02256544 ** param0, const UnkStruct_ov43_0225 v0->unk_00 = param1; v0->unk_04 = ov25_02254674(); v0->unk_30 = ov25_02254664(); - v0->unk_B4 = sub_0200B144(1, 26, 624, 8); - v0->unk_B8 = sub_0200B144(1, 26, 456, 8); + v0->unk_B4 = MessageLoader_Init(1, 26, 624, 8); + v0->unk_B8 = MessageLoader_Init(1, 26, 456, 8); v0->unk_BC = Strbuf_Init(128, 8); ov43_022565B4(v0); *param0 = v0; @@ -181,8 +181,8 @@ void ov43_02256680 (UnkStruct_ov43_02256544 * param0) { if (param0 != NULL) { Strbuf_Free(param0->unk_BC); - sub_0200B190(param0->unk_B4); - sub_0200B190(param0->unk_B8); + MessageLoader_Free(param0->unk_B4); + MessageLoader_Free(param0->unk_B8); ov43_02256640(param0); Heap_FreeToHeap(param0); } @@ -349,9 +349,9 @@ static void ov43_02256988 (UnkStruct_ov43_02256544 * param0, UnkStruct_0205AA50 sub_0201ADA4(param1, 4); if (param2 == 18) { - sub_0200B1B8(param0->unk_B8, 6, param0->unk_BC); + MessageLoader_GetStrbuf(param0->unk_B8, 6, param0->unk_BC); } else { - sub_0200B1B8(param0->unk_B4, param2, param0->unk_BC); + MessageLoader_GetStrbuf(param0->unk_B4, param2, param0->unk_BC); } v0 = sub_02002D7C(0, param0->unk_BC, 0); @@ -363,7 +363,7 @@ static void ov43_02256988 (UnkStruct_ov43_02256544 * param0, UnkStruct_0205AA50 static void ov43_02256A00 (UnkStruct_ov43_02256544 * param0, UnkStruct_0205AA50 * param1, u32 param2) { sub_0201ADA4(param1, 4); - sub_0200B1B8(param0->unk_B8, param2, param0->unk_BC); + MessageLoader_GetStrbuf(param0->unk_B8, param2, param0->unk_BC); sub_0201D78C(param1, 0, param0->unk_BC, 0, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL); sub_0201ACCC(param1); } diff --git a/src/overlay048/ov48_0225650C.c b/src/overlay048/ov48_0225650C.c index 3414e6f454..211d9ab111 100644 --- a/src/overlay048/ov48_0225650C.c +++ b/src/overlay048/ov48_0225650C.c @@ -159,7 +159,7 @@ static void ov48_02256650 (UnkStruct_ov48_0225650C * param0, u32 param1) UnkStruct_0205AA50 v0; Strbuf* v1; - v1 = sub_0200B010(26, 459, 0, 8); + v1 = MessageBank_GetNewStrbufFromNARC(26, 459, 0, 8); if (v1) { sub_0201A7E8(param0->unk_04, &v0, 6, 18, 20, 8, 2, 0, param1); diff --git a/src/overlay052/ov52_02256694.c b/src/overlay052/ov52_02256694.c index 677b5b388c..16bb1ccb9c 100644 --- a/src/overlay052/ov52_02256694.c +++ b/src/overlay052/ov52_02256694.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "strbuf.h" @@ -38,7 +38,7 @@ struct UnkStruct_ov52_02256694_t { UnkStruct_ov25_022555E8 * unk_30; UnkStruct_ov25_022558C4 * unk_34[4]; UnkStruct_ov25_02255958 unk_44; - UnkStruct_0200B144 * unk_58; + MessageLoader * unk_58; Strbuf* unk_5C; }; @@ -68,7 +68,7 @@ BOOL ov52_02256694 (UnkStruct_ov52_02256694 ** param0, const UnkStruct_ov52_0225 v0->unk_00 = param1; v0->unk_04 = ov25_02254674(); v0->unk_30 = ov25_02254664(); - v0->unk_58 = sub_0200B144(1, 26, 461, 8); + v0->unk_58 = MessageLoader_Init(1, 26, 461, 8); v0->unk_5C = Strbuf_Init(96, 8); ov52_0225670C(v0, param1); *param0 = v0; @@ -83,7 +83,7 @@ void ov52_022566EC (UnkStruct_ov52_02256694 * param0) { if (param0 != NULL) { Strbuf_Free(param0->unk_5C); - sub_0200B190(param0->unk_58); + MessageLoader_Free(param0->unk_58); ov52_0225677C(param0); Heap_FreeToHeap(param0); } @@ -327,12 +327,12 @@ static void ov52_02256A7C (UnkStruct_ov52_02256694 * param0) u32 v0; sub_0201ADA4(¶m0->unk_20, 4); - sub_0200B1B8(param0->unk_58, 0, param0->unk_5C); + MessageLoader_GetStrbuf(param0->unk_58, 0, param0->unk_5C); v0 = ((24 * 8) - sub_02002D7C(0, param0->unk_5C, 0)) / 2; sub_0201D78C(¶m0->unk_20, 0, param0->unk_5C, v0, 8, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL); - sub_0200B1B8(param0->unk_58, 10, param0->unk_5C); + MessageLoader_GetStrbuf(param0->unk_58, 10, param0->unk_5C); v0 = ((24 * 8) - sub_02002EB4(0, param0->unk_5C, 0)) / 2; @@ -349,7 +349,7 @@ static void ov52_02256A7C (UnkStruct_ov52_02256694 * param0) static void ov52_02256B10 (UnkStruct_ov52_02256694 * param0) { sub_0201ADA4(¶m0->unk_20, 4); - sub_0200B1B8(param0->unk_58, 1, param0->unk_5C); + MessageLoader_GetStrbuf(param0->unk_58, 1, param0->unk_5C); { u32 v0 = (24 * 8 - sub_02002EB4(0, param0->unk_5C, 0)) / 2; @@ -364,12 +364,12 @@ static void ov52_02256B64 (UnkStruct_ov52_02256694 * param0) u32 v0; sub_0201ADA4(¶m0->unk_20, 4); - sub_0200B1B8(param0->unk_58, 2, param0->unk_5C); + MessageLoader_GetStrbuf(param0->unk_58, 2, param0->unk_5C); v0 = ((24 * 8) - sub_02002D7C(0, param0->unk_5C, 0)) / 2; sub_0201D78C(¶m0->unk_20, 0, param0->unk_5C, v0, 8, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL); - sub_0200B1B8(param0->unk_58, 3, param0->unk_5C); + MessageLoader_GetStrbuf(param0->unk_58, 3, param0->unk_5C); sub_0201D78C(¶m0->unk_20, 0, param0->unk_5C, 16, 24, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL); sub_0201ACCC(¶m0->unk_20); } @@ -385,7 +385,7 @@ asm static void ov52_02256BDC (UnkStruct_ov52_02256694 * param0) ldr r0, [r4, #0x58] ldr r2, [r4, #0x5c] mov r1, #2 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #0 ldr r1, [r4, #0x5c] add r2, r0, #0 @@ -408,7 +408,7 @@ asm static void ov52_02256BDC (UnkStruct_ov52_02256694 * param0) ldr r0, [r4, #0x58] ldr r2, [r4, #0x5c] mov r1, #4 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #0 ldr r1, [r4, #0x5c] add r2, r0, #0 @@ -445,13 +445,13 @@ static void ov52_02256C64 (UnkStruct_ov52_02256694 * param0, const UnkStruct_ov5 int v2; sub_0201ADA4(¶m0->unk_20, 4); - sub_0200B1B8(param0->unk_58, 5, param0->unk_5C); + MessageLoader_GetStrbuf(param0->unk_58, 5, param0->unk_5C); v1 = ((24 * 8) - sub_02002D7C(0, param0->unk_5C, 0)) / 2; sub_0201D78C(¶m0->unk_20, 0, param0->unk_5C, v1, 8, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL); for (v2 = 0; v2 < 4; v2++) { - sub_0200B1B8(param0->unk_58, v0[v2], param0->unk_5C); + MessageLoader_GetStrbuf(param0->unk_58, v0[v2], param0->unk_5C); sub_0201D78C(¶m0->unk_20, 0, param0->unk_5C, 8, 32 + 16 * v2, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL); Strbuf_FormatInt(param0->unk_5C, param1->unk_00[v2], 2, 2, 1); sub_0201D78C(¶m0->unk_20, 0, param0->unk_5C, 160, 32 + 16 * v2, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL); diff --git a/src/overlay054/ov54_0225642C.c b/src/overlay054/ov54_0225642C.c index aeed17a208..cb5621058e 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); { - Strbuf* v5 = sub_0200B010(26, 458, 0, 8); + Strbuf* v5 = MessageBank_GetNewStrbufFromNARC(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 9c4e7464cf..3c3a8b6cea 100644 --- a/src/overlay056/ov56_022561C0.c +++ b/src/overlay056/ov56_022561C0.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" @@ -84,7 +84,7 @@ struct UnkStruct_ov56_02256468_t { UnkStruct_02025E6C * unk_10; UnkStruct_02018340 * unk_14; UnkStruct_0200B358 * unk_18; - UnkStruct_0200B144 * unk_1C; + MessageLoader * unk_1C; u16 * unk_20; NNSG2dScreenData * unk_24; UnkStruct_020218BC * unk_28; @@ -133,7 +133,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 Strbuf* 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, MessageLoader * 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); @@ -199,7 +199,7 @@ static void ov56_02256294 (UnkStruct_ov56_02256468 * param0) param0->unk_2D8.unk_04 = 0; param0->unk_2D8.unk_06 = 0; param0->unk_18 = sub_0200B358(4); - param0->unk_1C = sub_0200B144(0, 26, 635, 4); + param0->unk_1C = MessageLoader_Init(0, 26, 635, 4); param0->unk_20 = sub_02006F6C(74, 3, 1, &(param0->unk_24), 4); } @@ -271,7 +271,7 @@ void ov56_02256468 (UnkStruct_ov56_02256468 * param0) } sub_02021964(param0->unk_28); - sub_0200B190(param0->unk_1C); + MessageLoader_Free(param0->unk_1C); sub_0200B3F0(param0->unk_18); ov56_022563E8(param0->unk_22C); @@ -774,7 +774,7 @@ static void ov56_02256D64 (UnkStruct_02018340 * param0, NNSG2dScreenData * param sub_02019460(param0, 7, sub_02019FE4(param0, 7), 32 * 24 * 2, 0); } -static Strbuf* 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, MessageLoader * param3, UnkStruct_02025E6C * param4) { Strbuf* v0 = NULL; Strbuf* v1; diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c index f9aab67f38..c04499de93 100644 --- a/src/overlay058/ov58_021D0D80.c +++ b/src/overlay058/ov58_021D0D80.c @@ -186,7 +186,7 @@ int ov58_021D0D80 (UnkStruct_020067E8 * param0, int * param1) v0->unk_00 = sub_02018340(39); v0->unk_0C = sub_0200B358(39); - v0->unk_10 = sub_0200B144(0, 26, 425, 39); + v0->unk_10 = MessageLoader_Init(0, 26, 425, 39); sub_02017DD4(4, 8); @@ -338,7 +338,7 @@ int ov58_021D1018 (UnkStruct_020067E8 * param0, int * param1) ov58_021D13F0(v0->unk_00); sub_0201E530(); - sub_0200B190(v0->unk_10); + MessageLoader_Free(v0->unk_10); sub_0200B3F0(v0->unk_0C); (*param1)++; break; @@ -560,7 +560,7 @@ static void ov58_021D12C4 (UnkStruct_02095EAC * param0) ov58_021D2CB0(param0, 4); } - sub_0200B1B8(param0->unk_10, 7, param0->unk_28); + MessageLoader_GetStrbuf(param0->unk_10, 7, param0->unk_28); param0->unk_442C = Heap_AllocFromHeap(39, 30 * 16 * 32); param0->unk_9454 = sub_02015920(39); @@ -1717,7 +1717,7 @@ static void ov58_021D2A98 (UnkStruct_02095EAC * param0, int param1, int param2) v0 = Strbuf_Init((40 * 2), 39); - sub_0200B1B8(param0->unk_10, param1, v0); + MessageLoader_GetStrbuf(param0->unk_10, param1, v0); sub_0200C388(param0->unk_0C, param0->unk_2C, v0); Strbuf_Free(v0); diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c index ed0f9362be..cf80569bfa 100644 --- a/src/overlay059/ov59_021D0D80.c +++ b/src/overlay059/ov59_021D0D80.c @@ -194,7 +194,7 @@ int ov59_021D0D80 (UnkStruct_020067E8 * param0, int * param1) v0->unk_08 = (UnkStruct_0203DE34 *)sub_02006840(param0); v0->unk_4A9C = v0->unk_08->unk_00; v0->unk_24 = sub_0200B358(51); - v0->unk_28 = sub_0200B144(0, 26, 533, 51); + v0->unk_28 = MessageLoader_Init(0, 26, 533, 51); sub_02017DD4(4, 8); @@ -321,7 +321,7 @@ int ov59_021D0FF4 (UnkStruct_020067E8 * param0, int * param1) sub_02037B58(2); sub_02036AC4(); sub_0205C2C8(v0->unk_08->unk_04); - sub_0200B190(v0->unk_28); + MessageLoader_Free(v0->unk_28); sub_0200B3F0(v0->unk_24); ov59_021D131C(v0); @@ -534,7 +534,7 @@ static void ov59_021D1250 (UnkStruct_020961E8 * param0, NARC * param1) param0->unk_48 = Strbuf_Init((20 * 2), 51); param0->unk_3A8 = 0; - sub_0200B1B8(param0->unk_28, 17, param0->unk_48); + MessageLoader_GetStrbuf(param0->unk_28, 17, param0->unk_48); ov59_021D27FC(param0, param1); param0->unk_40C = sub_0205CA4C(51); @@ -1049,7 +1049,7 @@ static int ov59_021D1D14 (UnkStruct_020961E8 * param0, int param1) void ov59_021D1D40 (UnkStruct_020961E8 * param0) { - sub_0200B1B8(param0->unk_28, 18, param0->unk_48); + MessageLoader_GetStrbuf(param0->unk_28, 18, param0->unk_48); ov59_021D1784(¶m0->unk_36C, param0->unk_48, 0); sub_02021D6C(param0->unk_28C[0], 37); @@ -1576,7 +1576,7 @@ static void ov59_021D2628 (UnkStruct_020961E8 * param0, int param1, int param2) v0 = Strbuf_Init((90 * 2), 51); - sub_0200B1B8(param0->unk_28, param1, v0); + MessageLoader_GetStrbuf(param0->unk_28, param1, v0); sub_0200C388(param0->unk_24, param0->unk_44, v0); Strbuf_Free(v0); sub_0201ADA4(¶m0->unk_34C, 0xf0f); diff --git a/src/overlay061/ov61_0222B008.c b/src/overlay061/ov61_0222B008.c index 10156e88e5..f8cb38a6fc 100644 --- a/src/overlay061/ov61_0222B008.c +++ b/src/overlay061/ov61_0222B008.c @@ -95,7 +95,7 @@ int ov61_0222B008 (UnkStruct_ov62_022349A8 * param0, const UnkStruct_ov62_022411 MI_CpuClear8(param0->unk_3B4, ov61_0222DE8C(-1)); - param0->unk_3F4 = sub_0200B144(0, 26, 695, param1->unk_04); + param0->unk_3F4 = MessageLoader_Init(0, 26, 695, param1->unk_04); param0->unk_3F8 = sub_0200B358(param1->unk_04); param0->unk_3FC = Strbuf_Init((16 * 8 * 2), param1->unk_04); param0->unk_18C = ov61_0222BBF0(param1->unk_04); @@ -120,7 +120,7 @@ void ov61_0222B0F0 (UnkStruct_ov62_022349A8 * param0) Strbuf_Free(param0->unk_3FC); sub_0200B3F0(param0->unk_3F8); - sub_0200B190(param0->unk_3F4); + MessageLoader_Free(param0->unk_3F4); Heap_FreeToHeap(param0->unk_3B4); ov61_0222BC40(); Heap_FreeToHeap(param0->unk_18C); @@ -757,7 +757,7 @@ static void ov61_0222BB60 (UnkStruct_ov62_022349A8 * param0, int param1, int par } sub_0200B60C(param0->unk_3F8, 0, param2, 5, 2, 1); - v1 = sub_0200B1EC(param0->unk_3F4, v0); + v1 = MessageLoader_GetNewStrbuf(param0->unk_3F4, v0); sub_0200C388(param0->unk_3F8, param0->unk_3FC, v1); Strbuf_Free(v1); ov61_0222BB54(param0, param0->unk_3FC); diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c index 2f70428ede..d1d2322345 100644 --- a/src/overlay061/ov61_0222BF44.c +++ b/src/overlay061/ov61_0222BF44.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -65,10 +65,10 @@ typedef struct { int unk_18; int unk_1C; UnkStruct_0200B358 * unk_20; - UnkStruct_0200B144 * unk_24; - UnkStruct_0200B144 * unk_28; - UnkStruct_0200B144 * unk_2C; - UnkStruct_0200B144 * unk_30; + MessageLoader * unk_24; + MessageLoader * unk_28; + MessageLoader * unk_2C; + MessageLoader * unk_30; Strbuf* unk_34; Strbuf* unk_38; Strbuf* unk_3C; @@ -105,7 +105,7 @@ static int ov61_0222C834(int param0); static void ov61_0222C850(UnkStruct_ov61_0222C664 * param0); static void ov61_0222C86C(UnkStruct_ov61_0222C664 * param0); static UnkStruct_02001AF4 * ov61_0222C884(UnkStruct_02018340 * param0, int param1, int param2); -static void ov61_0222C8B8(UnkStruct_ov61_0222C664 * param0, UnkStruct_0200B144 * param1, int param2, int param3, u16 param4); +static void ov61_0222C8B8(UnkStruct_ov61_0222C664 * param0, MessageLoader * param1, int param2, int param3, u16 param4); static void ov61_0222C920(UnkStruct_ov61_0222C664 * param0, int param1, int param2); static BOOL ov61_0222C928(int param0, int param1); static int ov61_0222C960(UnkStruct_ov61_0222C664 * param0); @@ -179,12 +179,12 @@ int ov61_0222BF44 (UnkStruct_020067E8 * param0, int * param1) sub_0201E450(4); v0->unk_20 = sub_0200B368(11, 64, 117); - v0->unk_24 = sub_0200B144(0, 26, 671, 117); - v0->unk_28 = sub_0200B144(0, 26, 674, 117); - v0->unk_2C = sub_0200B144(0, 26, 695, 117); + v0->unk_24 = MessageLoader_Init(0, 26, 671, 117); + v0->unk_28 = MessageLoader_Init(0, 26, 674, 117); + v0->unk_2C = MessageLoader_Init(0, 26, 695, 117); v0->unk_34 = Strbuf_Init((90 * 2), 117); v0->unk_3C = Strbuf_Init((16 * 8 * 2), 117); - v0->unk_38 = sub_0200B1EC(v0->unk_24, 31); + v0->unk_38 = MessageLoader_GetNewStrbuf(v0->unk_24, 31); ov61_0222C3B0(v0); ov61_0222C664(v0); @@ -261,9 +261,9 @@ int ov61_0222C160 (UnkStruct_020067E8 * param0, int * param1) inline_ov61_0222C160(&v0->unk_A4); - sub_0200B190(v0->unk_2C); - sub_0200B190(v0->unk_28); - sub_0200B190(v0->unk_24); + MessageLoader_Free(v0->unk_2C); + MessageLoader_Free(v0->unk_28); + MessageLoader_Free(v0->unk_24); sub_0200B3F0(v0->unk_20); Strbuf_Free(v0->unk_38); Strbuf_Free(v0->unk_3C); @@ -509,7 +509,7 @@ static void ov61_0222C794 (UnkStruct_ov61_0222C664 * param0, int param1) { Strbuf* v0 = Strbuf_Init((16 * 8 * 2), 117); - sub_0200B1B8(param0->unk_2C, param1, v0); + MessageLoader_GetStrbuf(param0->unk_2C, param1, v0); sub_0200C388(param0->unk_20, param0->unk_3C, v0); sub_0201ADA4(¶m0->unk_64, 15); sub_0200DC48(¶m0->unk_64, 1, (1 + (18 + 12)), 11); @@ -571,11 +571,11 @@ static UnkStruct_02001AF4 * ov61_0222C884 (UnkStruct_02018340 * param0, int para return sub_02002100(param0, &v0, (1 + (18 + 12)), 11, 117); } -static void ov61_0222C8B8 (UnkStruct_ov61_0222C664 * param0, UnkStruct_0200B144 * param1, int param2, int param3, u16 param4) +static void ov61_0222C8B8 (UnkStruct_ov61_0222C664 * param0, MessageLoader * param1, int param2, int param3, u16 param4) { Strbuf* v0; - v0 = sub_0200B1EC(param1, param2); + v0 = MessageLoader_GetNewStrbuf(param1, param2); sub_0200C388(param0->unk_20, param0->unk_34, v0); Strbuf_Free(v0); diff --git a/src/overlay062/ov62_0222F2C0.c b/src/overlay062/ov62_0222F2C0.c index 0a9f6ca516..57735a28e3 100644 --- a/src/overlay062/ov62_0222F2C0.c +++ b/src/overlay062/ov62_0222F2C0.c @@ -133,8 +133,8 @@ void ov62_0222F2C0 (UnkStruct_0208C06C * param0) { param0->unk_14.unk_3C = sub_02012744((5 * 2) + 10, 102); - param0->unk_14.unk_34 = sub_0200B144(0, 26, 10, 102); - param0->unk_14.unk_38 = sub_0200B144(0, 26, 20, 102); + param0->unk_14.unk_34 = MessageLoader_Init(0, 26, 10, 102); + param0->unk_14.unk_38 = MessageLoader_Init(0, 26, 20, 102); } ov62_022338A8(param0); @@ -203,8 +203,8 @@ void ov62_0222F514 (UnkStruct_0208C06C * param0) { sub_020127BC(param0->unk_14.unk_3C); - sub_0200B190(param0->unk_14.unk_34); - sub_0200B190(param0->unk_14.unk_38); + MessageLoader_Free(param0->unk_14.unk_34); + MessageLoader_Free(param0->unk_14.unk_38); } sub_020242C4(param0->unk_14.unk_4C); diff --git a/src/overlay062/ov62_022300D8.c b/src/overlay062/ov62_022300D8.c index 445b2b7f09..a1ee756f5f 100644 --- a/src/overlay062/ov62_022300D8.c +++ b/src/overlay062/ov62_022300D8.c @@ -3,7 +3,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -640,7 +640,7 @@ void ov62_02230E80 (UnkStruct_0208C06C * param0) UnkStruct_020127E8 v2; Strbuf* v3; int v4; - UnkStruct_0200B144 * v5; + MessageLoader * v5; UnkStruct_0205AA50 v6; UnkStruct_ov62_022307C0_sub1 * v7[2]; int v8[2] = {NNS_G2D_VRAM_TYPE_2DMAIN, NNS_G2D_VRAM_TYPE_2DSUB}; @@ -685,7 +685,7 @@ void ov62_02230E80 (UnkStruct_0208C06C * param0) void ov62_02230FC8 (UnkStruct_0208C06C * param0, UnkStruct_ov62_022307C0_sub1 * param1, int param2, const UnkStruct_020F3DCC * param3) { Strbuf* v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; UnkStruct_0205AA50 v2; UnkStruct_0200B358 * v3; Strbuf* v4; @@ -695,10 +695,10 @@ void ov62_02230FC8 (UnkStruct_0208C06C * param0, UnkStruct_ov62_022307C0_sub1 * if (param2 == 8) { if (param0->unk_88C[param3->unk_18] == NULL) { - v0 = sub_0200B1EC(v1, param2); + v0 = MessageLoader_GetNewStrbuf(v1, param2); } else { v3 = ov62_02231690(102); - v4 = sub_0200B1EC(param0->unk_14.unk_34, 7); + v4 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 7); v5 = sub_02030B94(param0->unk_88C[param3->unk_18], 102); ov62_022349A8(param0, v5); v0 = Strbuf_Init(255, 102); @@ -711,10 +711,10 @@ void ov62_02230FC8 (UnkStruct_0208C06C * param0, UnkStruct_ov62_022307C0_sub1 * } } else if (param2 == 41) { if (param0->unk_88C[param3->unk_18] == NULL) { - v0 = sub_0200B1EC(v1, param2); + v0 = MessageLoader_GetNewStrbuf(v1, param2); } else { v3 = ov62_02231690(102); - v4 = sub_0200B1EC(param0->unk_14.unk_34, 7); + v4 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 7); v5 = sub_02030B94(param0->unk_88C[param3->unk_18], 102); ov62_022349A8(param0, v5); v0 = Strbuf_Init(255, 102); @@ -726,7 +726,7 @@ void ov62_02230FC8 (UnkStruct_0208C06C * param0, UnkStruct_ov62_022307C0_sub1 * sub_0200B3F0(v3); } } else { - v0 = sub_0200B1EC(v1, param2); + v0 = MessageLoader_GetNewStrbuf(v1, param2); } sub_0201A7A0(&v2); @@ -760,7 +760,7 @@ void ov62_0223118C (UnkStruct_ov62_022312B0 * param0, UnkStruct_ov62_0223118C * UnkStruct_020127E8 v2; Strbuf* v3; int v4; - UnkStruct_0200B144 * v5; + MessageLoader * v5; UnkStruct_0205AA50 v6; int v7 = 9999; @@ -800,11 +800,11 @@ void ov62_0223118C (UnkStruct_ov62_022312B0 * param0, UnkStruct_ov62_0223118C * void ov62_0223124C (UnkStruct_ov62_022312B0 * param0, UnkStruct_ov62_0223118C * param1, int param2) { Strbuf* v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; UnkStruct_0205AA50 v2; v1 = param1->unk_34; - v0 = sub_0200B1EC(v1, param2); + v0 = MessageLoader_GetNewStrbuf(v1, param2); sub_0201A7A0(&v2); sub_0201A870(param1->unk_10, &v2, 20, 2, 0, 0); diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c index 038d6073b2..675a2a546b 100644 --- a/src/overlay062/ov62_02231690.c +++ b/src/overlay062/ov62_02231690.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -201,7 +201,7 @@ void ov62_0223197C (UnkStruct_0208C06C * param0, int param1) sub_0201A7A0(v1); sub_0201A7E8(param0->unk_14.unk_10, v1, 6, 1, 19, 30, 4, 14, 32); - v0 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); sub_0201ADA4(v1, 0xCC); sub_0201D78C(v1, 0, v0, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((12 & 0xff) << 0))), NULL); @@ -250,7 +250,7 @@ void ov62_02231AAC (UnkStruct_0208C06C * param0, int param1) sub_0201A7A0(v1); sub_0201A7E8(param0->unk_14.unk_10, v1, 2, 1, 19, 30, 4, 14, 32); - v0 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); sub_0201ADA4(v1, 0xCC); sub_0201D78C(v1, 0, v0, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((12 & 0xff) << 0))), NULL); @@ -267,7 +267,7 @@ void ov62_02231B3C (UnkStruct_0208C06C * param0, int param1) return; } - v0 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); sub_0201ADA4(v1, 0xCC); sub_0201D78C(v1, 0, v0, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((12 & 0xff) << 0))), NULL); @@ -313,7 +313,7 @@ void ov62_02231BC4 (UnkStruct_0208C06C * param0, int param1) sub_0201A7A0(v1); sub_0201A7E8(param0->unk_14.unk_10, v1, 6, 1, 19, 30, 4, 14, 32); - v0 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); sub_0201ADA4(v1, 0xCC); sub_0201D78C(v1, 0, v0, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((12 & 0xff) << 0))), NULL); @@ -395,7 +395,7 @@ asm static void ov62_02231C78 (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C ldr r1, [sp, #0x1c] ldr r0, [r7, #0x48] ldr r1, [r1, #0] - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf add r6, r0, #0 add r0, r4, #0 bl sub_0201A7A0 @@ -487,7 +487,7 @@ asm static void ov62_02231C78 (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C bl ov62_022349A8 ldr r0, [r7, #0x48] mov r1, #0xd - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf str r0, [sp, #0x30] mov r0, #0xff mov r1, #0x66 @@ -540,7 +540,7 @@ asm static void ov62_02231C78 (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C ldr r0, [r7, #0x48] mov r1, #0xf add r5, #0x2c - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf str r0, [sp, #0x38] ldr r0, [sp, #0x20] mov r1, #0x66 @@ -592,7 +592,7 @@ asm static void ov62_02231C78 (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C ldr r0, [r7, #0x48] add r5, #0x3c mov r1, #0x10 - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf add r6, r0, #0 add r0, r5, #0 mov r1, #0 @@ -630,7 +630,7 @@ asm static void ov62_02231C78 (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C bne _02231F18 ldr r0, [r7, #0x48] mov r1, #0x15 - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf mov r1, #0 add r6, r0, #0 str r1, [sp] @@ -655,7 +655,7 @@ asm static void ov62_02231C78 (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C str r0, [sp, #0x44] ldr r0, [r7, #0x48] mov r1, #0x16 - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf str r0, [sp, #0x48] add r0, r4, #0 mov r1, #0 @@ -697,7 +697,7 @@ asm static void ov62_02231C78 (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C add r5, r0, #0 ldr r0, [r7, #0x48] mov r1, #0x17 - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf str r0, [sp, #0x4c] ldr r3, [sp, #0x40] add r0, r4, #0 @@ -732,7 +732,7 @@ asm static void ov62_02231C78 (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C ldr r0, [r7, #0x48] add r5, #0x6c mov r1, #0x11 - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf add r6, r0, #0 add r0, r5, #0 mov r1, #0 @@ -1037,18 +1037,18 @@ static void ov62_022323CC (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C v3 = ¶m0->unk_18; if ((v4 == 0) && (v5 == 0)) { - v0 = sub_0200B1EC(param1->unk_14.unk_34, 125); + v0 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 125); } else { v2 = ov62_02231690(102); if (v5 != 0) { v0 = Strbuf_Init(255, 102); - v1 = sub_0200B1EC(param1->unk_14.unk_34, 23); + v1 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 23); sub_0200BE08(v2, 0, v4, v5); sub_0200C388(v2, v0, v1); } else { v0 = Strbuf_Init(255, 102); - v1 = sub_0200B1EC(param1->unk_14.unk_34, 22); + v1 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 22); sub_0200BDD0(v2, 0, v4); sub_0200C388(v2, v0, v1); } @@ -1089,7 +1089,7 @@ void ov62_022324A0 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param sub_0201ADA4(v1, 0x0); for (v0 = 0; v0 < param0->unk_10; v0++) { - v2 = sub_0200B1EC(param0->unk_34, param2->unk_00[v0].unk_00); + v2 = MessageLoader_GetNewStrbuf(param0->unk_34, param2->unk_00[v0].unk_00); sub_0201D78C(v1, 0, v2, 0, (param2->unk_08 * 16) * v0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v2); @@ -1102,7 +1102,7 @@ void ov62_022324A0 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param sub_0201A9A4(v1); } -void ov62_02232594 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, UnkStruct_0200B144 * param2, const UnkStruct_ov62_02248CDC * param3) +void ov62_02232594 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, MessageLoader * param2, const UnkStruct_ov62_02248CDC * param3) { int v0; UnkStruct_0205AA50 * v1; @@ -1138,7 +1138,7 @@ void ov62_02232594 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param if (param3->unk_00) { for (v0 = 0; v0 < param0->unk_10; v0++) { - v2 = sub_0200B1EC(param0->unk_34, param3->unk_00[v0].unk_00); + v2 = MessageLoader_GetNewStrbuf(param0->unk_34, param3->unk_00[v0].unk_00); sub_0201D78C(v1, 0, v2, 0, (param3->unk_08 * 16) * v0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v2); } @@ -1152,7 +1152,7 @@ void ov62_02232594 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param for (v0 = 0; v0 < param0->unk_10; v0++) { v4 = Strbuf_Init(255, 102); v5 = Strbuf_Init(255, 102); - v6 = sub_0200B1EC(param1->unk_14.unk_34, 99); + v6 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 99); Strbuf_FormatInt(v5, (v0 + 1), 2, 1, 1); Strbuf_CopyChars(v4, param1->unk_8B4.unk_1D58[v0]->unk_00.unk_00); @@ -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, Strbuf *param6) +asm void ov62_02232778 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, MessageLoader * param2, const UnkStruct_ov62_02248CDC * param3, int param4, int param5, Strbuf *param6) { push {r4, r5, r6, r7, lr} sub sp, #0x1fc @@ -1359,7 +1359,7 @@ asm void ov62_02232778 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * p ldr r0, [sp, #0x14] ldr r1, [sp, #0x1c] ldr r0, [r0, #0x48] - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf str r0, [sp, #0x4c] mov r0, #0xff mov r1, #0x66 @@ -1387,7 +1387,7 @@ asm void ov62_02232778 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * p ldr r1, [r1, #0] add r1, r1, r6 ldr r1, [r1, #4] - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf str r0, [sp, #0x44] mov r0, #1 str r0, [sp] @@ -1427,7 +1427,7 @@ asm void ov62_02232778 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * p ldr r0, [sp, #0x2c] mov r1, #0x66 add r2, sp, #0x64 - bl sub_0200B274 + bl MessageLoader_GetSpeciesName ldr r0, [sp, #0x44] add r1, sp, #0x64 bl Strbuf_CopyChars @@ -1801,7 +1801,7 @@ asm int ov62_02232C78 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * pa ldr r0, [sp, #0x10] ldr r1, [sp, #0x1c] ldr r0, [r0, #0x48] - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf str r0, [sp, #0x54] mov r0, #0xff mov r1, #0x66 @@ -1829,7 +1829,7 @@ asm int ov62_02232C78 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * pa ldr r1, [r1, #0] add r1, r1, r6 ldr r1, [r1, #4] - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf str r0, [sp, #0x4c] mov r0, #1 str r0, [sp] @@ -1869,7 +1869,7 @@ asm int ov62_02232C78 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * pa ldr r0, [sp, #0x2c] mov r1, #0x66 add r2, sp, #0x6c - bl sub_0200B274 + bl MessageLoader_GetSpeciesName ldr r0, [sp, #0x4c] add r1, sp, #0x6c bl Strbuf_CopyChars @@ -2061,7 +2061,7 @@ int ov62_02232F68 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1 } for (v0 = v5; v0 < v6; v0++) { - v3 = sub_0200B1EC(param0->unk_34, param0->unk_28->unk_00[v0].unk_00); + v3 = MessageLoader_GetNewStrbuf(param0->unk_34, param0->unk_28->unk_00[v0].unk_00); sub_0201D78C(v2, 0, v3, 0, (param0->unk_28->unk_08 * 16) * v4, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v3); v4++; @@ -2113,7 +2113,7 @@ int ov62_02233064 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1 for (v4 = 0; v4 < param0->unk_10; v4++) { v7 = Strbuf_Init(255, 102); v8 = Strbuf_Init(255, 102); - v9 = sub_0200B1EC(param1->unk_14.unk_34, 99); + v9 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 99); Strbuf_FormatInt(v8, (v5 + v4 + 1), 2, 1, 1); Strbuf_CopyChars(v7, param1->unk_8B4.unk_1D58[v5 + v4]->unk_00.unk_00); @@ -2822,7 +2822,7 @@ static void ov62_02233B50 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C } v2 = ¶m0->unk_3C[v0]; - v3 = sub_0200B1EC(param1->unk_14.unk_34, v5[v0]); + v3 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, v5[v0]); sub_0201A7A0(v2); sub_0201A7E8(param1->unk_14.unk_10, v2, 2, v4[v0][0], v4[v0][1], v4[v0][2], v4[v0][3], 14, v1); @@ -2850,7 +2850,7 @@ static void ov62_02233B50 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C v10 = ¶m0->unk_3C[0]; v6 = sub_02030B94(v11, 102); ov62_022349A8(param1, v6); - v7 = sub_0200B1EC(param1->unk_14.unk_34, 7); + v7 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 7); v8 = Strbuf_Init(255, 102); sub_0200B48C(v9, 0, v6, 0, 1, GAME_LANGUAGE); @@ -2867,7 +2867,7 @@ static void ov62_02233B50 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C int v12 = sub_0202FE98(param0->unk_04, 3, 0); v10 = ¶m0->unk_3C[1]; - v8 = sub_0200B1EC(param1->unk_14.unk_34, 132 + v12); + v8 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 132 + v12); sub_0201ADA4(v10, 0x0); sub_0201D78C(v10, 0, v8, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -2882,7 +2882,7 @@ static void ov62_02233B50 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C if (v13 != 0) { v10 = ¶m0->unk_3C[2]; v6 = Strbuf_Init(255, 102); - v7 = sub_0200B1EC(param1->unk_14.unk_34, 9); + v7 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 9); v8 = Strbuf_Init(255, 102); Strbuf_FormatInt(v6, v13, 4, 0, 1); @@ -2921,9 +2921,9 @@ static void ov62_02233B50 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C int v20 = (v16[2] / 10) % 10; if ((v20 == 0) && (v14 != 0)) { - v7 = sub_0200B1EC(param1->unk_14.unk_34, 12); + v7 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 12); } else { - v7 = sub_0200B1EC(param1->unk_14.unk_34, 11); + v7 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 11); } } @@ -3742,11 +3742,11 @@ void ov62_022349A8 (UnkStruct_0208C06C * param0, Strbuf *param1) static void ov62_022349E4 (Strbuf *param0, int param1) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; Strbuf_Clear(param0); - v0 = sub_0200B144(1, 26, 10, param1); + v0 = MessageLoader_Init(1, 26, 10, param1); - sub_0200B1B8(v0, 332, param0); - sub_0200B190(v0); + MessageLoader_GetStrbuf(v0, 332, param0); + MessageLoader_Free(v0); } diff --git a/src/overlay062/ov62_02234A10.c b/src/overlay062/ov62_02234A10.c index 3b955a3d34..41036300a3 100644 --- a/src/overlay062/ov62_02234A10.c +++ b/src/overlay062/ov62_02234A10.c @@ -47,7 +47,7 @@ static void ov62_02234A10 (UnkStruct_0208C06C * param0) sub_0201A7E8(param0->unk_14.unk_10, v2, 2, 8, 16, 16, 2, 14, 300); sub_0201ADA4(v2, 0x0); - v0 = sub_0200B1EC(param0->unk_14.unk_34, 192); + v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 192); v1 = ov62_0223429C(v2, v0); sub_0201D78C(v2, 0, v0, v1, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); diff --git a/src/overlay062/ov62_02235E64.c b/src/overlay062/ov62_02235E64.c index 72d9d64282..f0e4f35587 100644 --- a/src/overlay062/ov62_02235E64.c +++ b/src/overlay062/ov62_02235E64.c @@ -296,7 +296,7 @@ static void ov62_022362B8 (UnkStruct_0208C06C * param0) sub_0201A7E8(param0->unk_14.unk_10, v1, 6, 4, 6, 10, 2, 14, v3); sub_0201ADA4(v1, 0x0); - v2 = sub_0200B1EC(param0->unk_14.unk_34, 130); + v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 130); v4 = ov62_0223429C(v1, v2); sub_0201D78C(v1, 0, v2, v4, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -310,7 +310,7 @@ static void ov62_022362B8 (UnkStruct_0208C06C * param0) sub_0201A7E8(param0->unk_14.unk_10, v1, 6, 18, 6, 10, 2, 14, v3); sub_0201ADA4(v1, 0x0); - v2 = sub_0200B1EC(param0->unk_14.unk_34, 131); + v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 131); v4 = ov62_0223429C(v1, v2); sub_0201D78C(v1, 0, v2, v4, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -721,7 +721,7 @@ static void ov62_02236BC8 (UnkStruct_0208C06C * param0, int param1) sub_0201ADA4(v1, 0x0); - v2 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); v3 = ov62_0223429C(v1, v2); sub_0201D78C(v1, 0, v2, v3, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); diff --git a/src/overlay062/ov62_02237D24.c b/src/overlay062/ov62_02237D24.c index b5737cf7eb..baa8e495ee 100644 --- a/src/overlay062/ov62_02237D24.c +++ b/src/overlay062/ov62_02237D24.c @@ -1249,7 +1249,7 @@ static void ov62_02239440 (UnkStruct_0208C06C * param0, int param1) sub_0201ADA4(v1, 0x0); - v2 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); v3 = ov62_0223429C(v1, v2); sub_0201D78C(v1, 0, v2, v3, 0, 0xff, (((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); @@ -1404,7 +1404,7 @@ asm static void ov62_02239724 (UnkStruct_0208C06C * param0) add r7, r0, #0 ldr r0, [r5, #0x48] mov r1, #0x38 - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf str r0, [sp, #0x1c] mov r0, #0xff mov r1, #0x66 @@ -1539,7 +1539,7 @@ asm static void ov62_02239854 (UnkStruct_0208C06C * param0, int param1) add r7, r0, #0 ldr r0, [r5, #0x48] mov r1, #0x38 - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf str r0, [sp, #0x1c] mov r0, #0xff mov r1, #0x66 @@ -1729,7 +1729,7 @@ static void ov62_02239A0C (UnkStruct_0208C06C * param0, int param1) v4->unk_1E8[v5].unk_04 = v4->unk_1D4.unk_08[v5]; } } - v4->unk_1D4.unk_0C = sub_0200B144(0, 26, 412, 102); + v4->unk_1D4.unk_0C = MessageLoader_Init(0, 26, 412, 102); v4->unk_1D4.unk_10 = 1; } @@ -1737,7 +1737,7 @@ static void ov62_02239B7C (UnkStruct_0208C06C * param0) { UnkStruct_ov62_02237D24 * v0 = param0->unk_860; - sub_0200B190(v0->unk_1D4.unk_0C); + MessageLoader_Free(v0->unk_1D4.unk_0C); Heap_FreeToHeap(v0->unk_1E8); Heap_FreeToHeap(v0->unk_1D4.unk_08); @@ -1822,7 +1822,7 @@ asm static void ov62_02239BD8 (UnkStruct_0208C06C * param0) add r1, r7, #0 ldr r0, [r0, #0x48] add r1, #0x44 - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf str r0, [sp, #0x2c] ldr r1, [sp, #0x2c] add r0, r4, #0 diff --git a/src/overlay062/ov62_02239D60.c b/src/overlay062/ov62_02239D60.c index 882113674c..7ea8ebdc4f 100644 --- a/src/overlay062/ov62_02239D60.c +++ b/src/overlay062/ov62_02239D60.c @@ -917,7 +917,7 @@ static void ov62_0223AB14 (UnkStruct_0208C06C * param0) sub_0201A7A0(v1); sub_0201A7E8(param0->unk_14.unk_10, v1, 6, Unk_ov62_02248DC4[v3][0], Unk_ov62_02248DC4[v3][1], Unk_ov62_02248DC4[v3][2], Unk_ov62_02248DC4[v3][3], 14, v2); - v5 = sub_0200B1EC(param0->unk_14.unk_34, 60 + v3); + v5 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 60 + v3); v4 = ov62_0223429C(v1, v5); sub_0201ADA4(v1, Unk_ov62_02248D78[0]); @@ -961,7 +961,7 @@ static void ov62_0223AC0C (UnkStruct_0208C06C * param0, int param1) Strbuf* v2; v1 = &v0->unk_1B4[2]; - v2 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); sub_0201ADA4(v1, Unk_ov62_02248D78[2]); sub_0201D78C(v1, 0, v2, 0, Unk_ov62_02248DA8[2], 0xff, Unk_ov62_02248D90[2], NULL); @@ -980,7 +980,7 @@ static void ov62_0223AC58 (UnkStruct_0208C06C * param0, int param1) int v6 = 28 + v0->unk_380.unk_00; v1 = &v0->unk_1B4[2]; - v2 = sub_0200B1EC(param0->unk_14.unk_34, v6); + v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, v6); v3 = Strbuf_Init(255, 102); v4 = Strbuf_Init(255, 102); v5 = ov62_02231690(102); @@ -1061,7 +1061,7 @@ static void ov62_0223ADC0 (UnkStruct_0208C06C * param0, int param1) v4 = 494; } - sub_0200B274(v4, 102, v5); + MessageLoader_GetSpeciesName(v4, 102, v5); Strbuf_CopyChars(v2, v5); v3 = ov62_0223429C(v1, v2); @@ -1484,7 +1484,7 @@ static void ov62_0223B6AC (UnkStruct_0208C06C * param0) sub_0201A7E8(param0->unk_14.unk_10, v1, 6, Unk_ov62_02248D5C[v3][0], Unk_ov62_02248D5C[v3][1], Unk_ov62_02248D5C[v3][2], Unk_ov62_02248D5C[v3][3], 14, v2); sub_0201ADA4(v1, 0x0); - v6 = sub_0200B1EC(param0->unk_14.unk_34, v5[v3]); + v6 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, v5[v3]); v4 = ov62_0223429C(v1, v6); sub_0201D78C(v1, 0, v6, v4, 0, 0xff, (((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); @@ -1505,7 +1505,7 @@ static void ov62_0223B768 (UnkStruct_0208C06C * param0, int param1) sub_0201ADA4(v1, 0x0); - v2 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); v3 = ov62_0223429C(v1, v2); sub_0201D78C(v1, 0, v2, v3, 0, 0xff, (((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); @@ -1529,7 +1529,7 @@ static void ov62_0223B7C0 (UnkStruct_0208C06C * param0) sub_0201A7E8(param0->unk_14.unk_10, v1, 6, 12, 6, 8, 4, 14, v2); sub_0201ADA4(v1, 0x0); - v5 = sub_0200B1EC(param0->unk_14.unk_34, 34); + v5 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 34); { u32 v6 = (64 - sub_02002EB4(0, v5, 0)) / 2; @@ -1583,7 +1583,7 @@ static void ov62_0223B888 (UnkStruct_0208C06C * param0) sub_0201ADA4(v1, 0x0); if (v3 == 0) { - v7 = sub_0200B1EC(param0->unk_14.unk_34, 310 + v0->unk_380.unk_00); + v7 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 310 + v0->unk_380.unk_00); v4 = ov62_0223429C(v1, v7); v5 = 0; } diff --git a/src/overlay062/ov62_0223CAEC.c b/src/overlay062/ov62_0223CAEC.c index 31e21b2710..bb1f1e05f8 100644 --- a/src/overlay062/ov62_0223CAEC.c +++ b/src/overlay062/ov62_0223CAEC.c @@ -3,7 +3,7 @@ #include "overlay062/ov62_const_funcptr_tables.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "strbuf.h" #include "struct_decls/struct_02023FCC_decl.h" @@ -68,7 +68,7 @@ typedef struct { UnkStruct_ov61_0222BDAC_1 * unk_718; UnkStruct_ov62_0223DF10 * unk_71C; UnkStruct_ov62_0223D518_sub1 unk_720; - UnkStruct_0200B144 * unk_744; + MessageLoader * unk_744; Strbuf* unk_748; UnkStruct_ov62_02249380 unk_74C[3][20]; UnkStruct_ov62_02248CDC unk_B0C; @@ -200,7 +200,7 @@ asm static void ov62_0223CAEC (UnkStruct_0208C06C * param0) ldrb r1, [r3, r1] ldr r0, [r5, #0x4c] add r1, #0x5e - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf ldr r1, = 0x748 str r0, [r4, r1] _0223CB46: @@ -345,7 +345,7 @@ static void ov62_0223CF2C (UnkStruct_0208C06C * param0) v2 += (Unk_ov62_02248EA0[v3][2] * Unk_ov62_02248EA0[v3][3]); sub_0201ADA4(v1, 0x0); - v5 = sub_0200B1EC(param0->unk_14.unk_34, 80 + v3); + v5 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 80 + v3); v4 = ov62_0223429C(v1, v5); sub_0201D78C(v1, 0, v5, v4, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -397,7 +397,7 @@ static void ov62_0223D004 (UnkStruct_0208C06C * param0) sub_0201ADA4(v1, 0x0); - v5 = sub_0200B1EC(param0->unk_14.unk_34, 67); + v5 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 67); v4 = 0; sub_0201D78C(v1, 0, v5, v4, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -568,7 +568,7 @@ asm static void ov62_0223D160 (UnkStruct_0208C06C * param0) mul r2, r3 ldrb r1, [r1, r2] sub r1, r1, #1 - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf b _0223D1BA _0223D1A6: ldr r1, = 0x714 @@ -579,7 +579,7 @@ asm static void ov62_0223D160 (UnkStruct_0208C06C * param0) mul r2, r3 ldrb r1, [r1, r2] sub r1, r1, #1 - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf _0223D1BA: mov r1, #0 add r7, r0, #0 @@ -609,11 +609,11 @@ asm static void ov62_0223D160 (UnkStruct_0208C06C * param0) bne _0223D200 ldr r1, [r4, #0x14] add r1, #0x52 - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf b _0223D206 _0223D200: mov r1, #0x5b - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf _0223D206: mov r1, #0 add r7, r0, #0 @@ -656,7 +656,7 @@ asm static void ov62_0223D160 (UnkStruct_0208C06C * param0) str r0, [sp, #0x20] ldr r0, [r5, #0x48] mov r1, #0x55 - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf add r7, r0, #0 ldr r0, [sp, #0x20] mov r1, #4 @@ -664,7 +664,7 @@ asm static void ov62_0223D160 (UnkStruct_0208C06C * param0) add r1, r0, #0 ldr r0, = 0x744 ldr r0, [r4, r0] - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf str r0, [sp, #0x1c] mov r0, #1 str r0, [sp] @@ -683,7 +683,7 @@ asm static void ov62_0223D160 (UnkStruct_0208C06C * param0) str r0, [sp, #0x24] ldr r0, [r5, #0x48] mov r1, #0x56 - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf add r7, r0, #0 mov r0, #0xff mov r1, #0x66 @@ -705,7 +705,7 @@ asm static void ov62_0223D160 (UnkStruct_0208C06C * param0) str r0, [sp, #0x28] ldr r0, [r5, #0x48] mov r1, #0x57 - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf add r7, r0, #0 ldr r0, [sp, #0x28] cmp r0, #0 @@ -723,7 +723,7 @@ asm static void ov62_0223D160 (UnkStruct_0208C06C * param0) ldr r0, [sp, #0x10] mov r1, #0x66 add r2, sp, #0x2c - bl sub_0200B274 + bl MessageLoader_GetSpeciesName ldr r0, [sp, #0x1c] add r1, sp, #0x2c bl Strbuf_CopyChars @@ -731,7 +731,7 @@ asm static void ov62_0223D160 (UnkStruct_0208C06C * param0) _0223D308: ldr r0, [r5, #0x48] mov r1, #0x15 - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf str r0, [sp, #0x1c] _0223D312: mov r0, #1 diff --git a/src/overlay062/ov62_0223DFA8.c b/src/overlay062/ov62_0223DFA8.c index de98314149..47220f9bdb 100644 --- a/src/overlay062/ov62_0223DFA8.c +++ b/src/overlay062/ov62_0223DFA8.c @@ -3,7 +3,7 @@ #include "overlay062/ov62_const_funcptr_tables.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "strbuf.h" #include "struct_decls/struct_02023FCC_decl.h" @@ -255,7 +255,7 @@ static void ov62_0223E0FC (UnkStruct_0208C06C * param0, int param1, int param2) v0 = Strbuf_Init(255, 102); v4 = sub_02030B94(v6, 102); ov62_022349A8(param0, v4); - v5 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v5 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); sub_0200B48C(v3, 0, v4, 0, 1, GAME_LANGUAGE); sub_0200C388(v3, v0, v5); Strbuf_Free(v4); @@ -271,7 +271,7 @@ static void ov62_0223E0FC (UnkStruct_0208C06C * param0, int param1, int param2) v0 = Strbuf_Init(255, 102); v8 = sub_02030B94(v10, 102); ov62_022349A8(param0, v8); - v9 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v9 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); sub_0200B48C(v7, 0, v8, 0, 1, GAME_LANGUAGE); sub_0200C388(v7, v0, v9); @@ -279,7 +279,7 @@ static void ov62_0223E0FC (UnkStruct_0208C06C * param0, int param1, int param2) Strbuf_Free(v9); sub_0200B3F0(v7); } else { - v0 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); } sub_0201ADA4(v1, 0xCC); @@ -823,7 +823,7 @@ BOOL(*const Unk_ov62_022490DC[])(UnkStruct_0208C06C *) = { static void ov62_0223EE88 (UnkStruct_ov62_022312B0 * param0, UnkStruct_0208C06C * param1, int param2) { Strbuf* v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; UnkStruct_0205AA50 v2; UnkStruct_0200B358 * v3; Strbuf* v4; @@ -832,10 +832,10 @@ static void ov62_0223EE88 (UnkStruct_ov62_022312B0 * param0, UnkStruct_0208C06C v1 = param1->unk_14.unk_34; if (param1->unk_88C[param2] == NULL) { - v0 = sub_0200B1EC(v1, 8); + v0 = MessageLoader_GetNewStrbuf(v1, 8); } else { v3 = ov62_02231690(102); - v4 = sub_0200B1EC(param1->unk_14.unk_34, 7); + v4 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 7); v5 = sub_02030B94(param1->unk_88C[param2], 102); ov62_022349A8(param1, v5); v0 = Strbuf_Init(255, 102); @@ -1176,7 +1176,7 @@ static void ov62_0223F65C (UnkStruct_0208C06C * param0) sub_0201A7E8(param0->unk_14.unk_10, v4, 2, 3, 3, 20, 4, 14, v2); sub_0201ADA4(v4, 0x0); - v3 = sub_0200B1EC(param0->unk_14.unk_34, v5[v0->unk_0C]); + v3 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, v5[v0->unk_0C]); sub_0201D78C(v4, 0, v3, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_0201A9A4(v4); @@ -1189,7 +1189,7 @@ static void ov62_0223F65C (UnkStruct_0208C06C * param0) sub_0201A7E8(param0->unk_14.unk_10, v4, 6, 11, 6, 10, 4, 14, v2); sub_0201ADA4(v4, 0x0); - v3 = sub_0200B1EC(param0->unk_14.unk_34, 95); + v3 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 95); { u32 v6 = (80 - sub_02002EB4(0, v3, 0)) / 2; @@ -1779,14 +1779,14 @@ static void ov62_022402FC (UnkStruct_0208C06C * param0, int param1, BOOL param2) v0 = Strbuf_Init(255, 102); v4 = sub_02030B94(v6, 102); ov62_022349A8(param0, v4); - v5 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v5 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); sub_0200B48C(v3, 0, v4, 0, 1, GAME_LANGUAGE); sub_0200C388(v3, v0, v5); Strbuf_Free(v4); Strbuf_Free(v5); sub_0200B3F0(v3); } else { - v0 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); } sub_0201ADA4(v1, 0xCC); @@ -2340,7 +2340,7 @@ static void ov62_022408A8 (UnkStruct_0208C06C * param0, int param1) v1 = &v0->unk_94[0]; sub_0201ADA4(v1, 0x0); - v2 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); v3 = ov62_0223429C(v1, v2); sub_0201D78C(v1, 0, v2, v3, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -2375,7 +2375,7 @@ static void ov62_02240944 (UnkStruct_0208C06C * param0) sub_0201A7E8(param0->unk_14.unk_10, v1, 6, 4, 6, 10, 2, 14, v3); sub_0201ADA4(v1, 0x0); - v2 = sub_0200B1EC(param0->unk_14.unk_34, 130); + v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 130); v4 = ov62_0223429C(v1, v2); sub_0201D78C(v1, 0, v2, v4, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -2389,7 +2389,7 @@ static void ov62_02240944 (UnkStruct_0208C06C * param0) sub_0201A7E8(param0->unk_14.unk_10, v1, 6, 18, 6, 10, 2, 14, v3); sub_0201ADA4(v1, 0x0); - v2 = sub_0200B1EC(param0->unk_14.unk_34, 131); + v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 131); v4 = ov62_0223429C(v1, v2); sub_0201D78C(v1, 0, v2, v4, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); diff --git a/src/overlay062/ov62_02241204.c b/src/overlay062/ov62_02241204.c index e30e6c358d..b0e1f9260d 100644 --- a/src/overlay062/ov62_02241204.c +++ b/src/overlay062/ov62_02241204.c @@ -5,7 +5,7 @@ #include "overlay062/ov62_const_funcptr_tables.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "strbuf.h" #include "struct_decls/struct_02023FCC_decl.h" @@ -637,7 +637,7 @@ static void ov62_022417C0 (UnkStruct_0208C06C * param0, int param1) sub_0201A7E8(param0->unk_14.unk_10, v11, 2, v3[v7][0], v3[v7][1], v3[v7][2], v3[v7][3], 14, v9); sub_0201ADA4(v11, 0x0); - v10 = sub_0200B1EC(param0->unk_14.unk_34, v4[v7]); + v10 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, v4[v7]); v9 += v3[v7][2] * v3[v7][3]; if (v2) { @@ -662,14 +662,14 @@ static void ov62_022418DC (UnkStruct_0208C06C * param0, int param1) sub_0201ADA4(v1, 0x0); if (param1 == 0xff) { - v2 = sub_0200B1EC(param0->unk_14.unk_34, 125); + v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 125); } else { if ((param1 == UnkEnum_0202F510_33) || (param1 == UnkEnum_0202F510_34) || (param1 == UnkEnum_0202F510_35) || (param1 == UnkEnum_0202F510_36)) { v3 = 165 + (param1 - UnkEnum_0202F510_33); - v2 = sub_0200B1EC(param0->unk_14.unk_34, v3); + v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, v3); } else { v3 = 132 + param1; - v2 = sub_0200B1EC(param0->unk_14.unk_34, v3); + v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, v3); } } @@ -689,10 +689,10 @@ static void ov62_02241954 (UnkStruct_0208C06C * param0, int param1) sub_0201ADA4(v1, 0x0); if (param1 == 0xffff) { - v2 = sub_0200B1EC(param0->unk_14.unk_34, 125); + v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 125); } else { v2 = Strbuf_Init(255, 102); - sub_0200B274(param1, 102, v3); + MessageLoader_GetSpeciesName(param1, 102, v3); Strbuf_CopyChars(v2, v3); } @@ -713,18 +713,18 @@ static void ov62_022419D4 (UnkStruct_0208C06C * param0, int param1, int param2) sub_0201ADA4(v1, 0x0); if ((param1 == 0xff) && (param2 == 0xff)) { - v2 = sub_0200B1EC(param0->unk_14.unk_34, 125); + v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 125); } else { v4 = ov62_02231690(102); if (param2 != 0) { v2 = Strbuf_Init(255, 102); - v3 = sub_0200B1EC(param0->unk_14.unk_34, 23); + v3 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 23); sub_0200BE08(v4, 0, param1, param2); sub_0200C388(v4, v2, v3); } else { v2 = Strbuf_Init(255, 102); - v3 = sub_0200B1EC(param0->unk_14.unk_34, 22); + v3 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 22); sub_0200BDD0(v4, 0, param1); sub_0200C388(v4, v2, v3); } @@ -779,7 +779,7 @@ static void ov62_02241AA4 (UnkStruct_0208C06C * param0, int param1) sub_0201A7E8(param0->unk_14.unk_10, v11, 6, v3[v7][0], v3[v7][1], v3[v7][2], v3[v7][3], 14, v9); sub_0201ADA4(v11, 0x0); - v10 = sub_0200B1EC(param0->unk_14.unk_34, v4[v7]); + v10 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, v4[v7]); v9 += v3[v7][2] * v3[v7][3]; if (v2) { @@ -832,7 +832,7 @@ static void ov62_02241C38 (UnkStruct_0208C06C * param0) sub_0201A7E8(param0->unk_14.unk_10, v4, 2, 3, 3, 20, 4, 14, v2); sub_0201ADA4(v4, 0x0); - v3 = sub_0200B1EC(param0->unk_14.unk_34, 126); + v3 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 126); sub_0201D78C(v4, 0, v3, 0, 0, 0xff, (((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); sub_0201A9A4(v4); Strbuf_Free(v3); @@ -842,7 +842,7 @@ static void ov62_02241C38 (UnkStruct_0208C06C * param0) sub_0201A7A0(v4); sub_0201A7E8(param0->unk_14.unk_10, v4, 6, 11, 6, 10, 4, 14, v2); sub_0201ADA4(v4, 0x0); - v3 = sub_0200B1EC(param0->unk_14.unk_34, 95); + v3 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 95); { u32 v5 = (80 - sub_02002EB4(0, v3, 0)) / 2; @@ -1270,7 +1270,7 @@ asm static void ov62_022422C0 (UnkStruct_0208C06C * param0) add r1, r7, #0 ldr r0, [r0, #0x48] add r1, #0x44 - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf str r0, [sp, #0x2c] ldr r1, [sp, #0x2c] add r0, r4, #0 @@ -1605,7 +1605,7 @@ static void ov62_022427D0 (UnkStruct_0208C06C * param0, int param1) } } - v4->unk_4C8.unk_0C = sub_0200B144(0, 26, 412, 102); + v4->unk_4C8.unk_0C = MessageLoader_Init(0, 26, 412, 102); v4->unk_4C8.unk_10 = 1; } @@ -1613,7 +1613,7 @@ static void ov62_02242938 (UnkStruct_0208C06C * param0) { UnkStruct_ov62_02241204 * v0 = param0->unk_860; - sub_0200B190(v0->unk_4C8.unk_0C); + MessageLoader_Free(v0->unk_4C8.unk_0C); Heap_FreeToHeap(v0->unk_4DC); Heap_FreeToHeap(v0->unk_4C8.unk_08); @@ -3120,7 +3120,7 @@ static BOOL ov62_02244720 (UnkStruct_0208C06C * param0) static void ov62_022448E0 (UnkStruct_ov62_022312B0 * param0, UnkStruct_0208C06C * param1, int param2) { Strbuf* v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; UnkStruct_0205AA50 v2; UnkStruct_0200B358 * v3; Strbuf* v4; @@ -3129,10 +3129,10 @@ static void ov62_022448E0 (UnkStruct_ov62_022312B0 * param0, UnkStruct_0208C06C v1 = param1->unk_14.unk_34; if (param1->unk_88C[param2] == NULL) { - v0 = sub_0200B1EC(v1, 8); + v0 = MessageLoader_GetNewStrbuf(v1, 8); } else { v3 = ov62_02231690(102); - v4 = sub_0200B1EC(param1->unk_14.unk_34, 7); + v4 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 7); v5 = sub_02030B94(param1->unk_88C[param2], 102); ov62_022349A8(param1, v5); v0 = Strbuf_Init(255, 102); @@ -3172,14 +3172,14 @@ static void ov62_022449B8 (UnkStruct_0208C06C * param0, int param1, BOOL param2) v0 = Strbuf_Init(255, 102); v4 = sub_02030B94(v6, 102); ov62_022349A8(param0, v4); - v5 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v5 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); sub_0200B48C(v3, 0, v4, 0, 1, GAME_LANGUAGE); sub_0200C388(v3, v0, v5); Strbuf_Free(v4); Strbuf_Free(v5); sub_0200B3F0(v3); } else { - v0 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); } sub_0201ADA4(v1, 0xCC); @@ -3204,7 +3204,7 @@ static void ov62_02244AB4 (UnkStruct_0208C06C * param0, int param1, int param2) v0 = Strbuf_Init(255, 102); v4 = sub_02030B94(v6, 102); ov62_022349A8(param0, v4); - v5 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v5 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); sub_0200B48C(v3, 0, v4, 0, 1, GAME_LANGUAGE); sub_0200C388(v3, v0, v5); Strbuf_Free(v4); @@ -3220,14 +3220,14 @@ static void ov62_02244AB4 (UnkStruct_0208C06C * param0, int param1, int param2) v0 = Strbuf_Init(255, 102); v8 = sub_02030B94(v10, 102); ov62_022349A8(param0, v8); - v9 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v9 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); sub_0200B48C(v7, 0, v8, 0, 1, GAME_LANGUAGE); sub_0200C388(v7, v0, v9); Strbuf_Free(v8); Strbuf_Free(v9); sub_0200B3F0(v7); } else { - v0 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); } sub_0201ADA4(v1, 0xCC); @@ -3709,7 +3709,7 @@ static void ov62_022455E4 (UnkStruct_0208C06C * param0, int param1) v1 = &v0->unk_6D4[0]; sub_0201ADA4(v1, 0x0); - v2 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); v3 = ov62_0223429C(v1, v2); sub_0201D78C(v1, 0, v2, v3, 0, 0xff, (((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); Strbuf_Free(v2); @@ -3743,7 +3743,7 @@ static void ov62_0224568C (UnkStruct_0208C06C * param0) sub_0201A7E8(param0->unk_14.unk_10, v1, 6, 4, 6, 10, 2, 14, v3); sub_0201ADA4(v1, 0x0); - v2 = sub_0200B1EC(param0->unk_14.unk_34, 130); + v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 130); v4 = ov62_0223429C(v1, v2); sub_0201D78C(v1, 0, v2, v4, 0, 0xff, (((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); @@ -3758,7 +3758,7 @@ static void ov62_0224568C (UnkStruct_0208C06C * param0) sub_0201A7E8(param0->unk_14.unk_10, v1, 6, 18, 6, 10, 2, 14, v3); sub_0201ADA4(v1, 0x0); - v2 = sub_0200B1EC(param0->unk_14.unk_34, 131); + v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 131); v4 = ov62_0223429C(v1, v2); sub_0201D78C(v1, 0, v2, v4, 0, 0xff, (((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); @@ -4714,7 +4714,7 @@ static void ov62_022469A0 (UnkStruct_ov62_02241204 * param0, UnkStruct_0208C06C v7[1] = v6 % 100000; v6 /= 100000; v7[2] = v6; - v1 = sub_0200B1EC(param1->unk_14.unk_34, 295); + v1 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 295); v2 = Strbuf_Init(255, 102); Strbuf_FormatInt(v8, v7[0], 5, 2, 1); diff --git a/src/overlay062/ov62_02247D74.c b/src/overlay062/ov62_02247D74.c index db8189e510..d107e173eb 100644 --- a/src/overlay062/ov62_02247D74.c +++ b/src/overlay062/ov62_02247D74.c @@ -76,7 +76,7 @@ static void ov62_02247DD8 (UnkStruct_0208C06C * param0, int param1, int param2) v3 = sub_02030B94(v5, 102); ov62_022349A8(param0, v3); - v4 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v4 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); sub_0200B48C(v2, 0, v3, 0, 1, GAME_LANGUAGE); sub_0200C388(v2, v0, v4); @@ -84,7 +84,7 @@ static void ov62_02247DD8 (UnkStruct_0208C06C * param0, int param1, int param2) Strbuf_Free(v4); sub_0200B3F0(v2); } else { - v0 = sub_0200B1EC(param0->unk_14.unk_34, param1); + v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); } sub_0201ADA4(v1, 0xCC); @@ -107,7 +107,7 @@ static void ov62_02247E9C (UnkStruct_0208C06C * param0) sub_0201A7E8(param0->unk_14.unk_10, v1, 6, 4, 6, 10, 2, 14, v3); sub_0201ADA4(v1, 0x0); - v2 = sub_0200B1EC(param0->unk_14.unk_34, 130); + v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 130); v4 = ov62_0223429C(v1, v2); sub_0201D78C(v1, 0, v2, v4, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -121,7 +121,7 @@ static void ov62_02247E9C (UnkStruct_0208C06C * param0) sub_0201A7E8(param0->unk_14.unk_10, v1, 6, 18, 6, 10, 2, 14, v3); sub_0201ADA4(v1, 0x0); - v2 = sub_0200B1EC(param0->unk_14.unk_34, 131); + v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 131); v4 = ov62_0223429C(v1, v2); sub_0201D78C(v1, 0, v2, v4, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); diff --git a/src/overlay062/ov62_02248408.c b/src/overlay062/ov62_02248408.c index 573f318bc1..36fea01363 100644 --- a/src/overlay062/ov62_02248408.c +++ b/src/overlay062/ov62_02248408.c @@ -1,8 +1,6 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" -#include "strbuf.h" #include "struct_decls/struct_021C0794_decl.h" #include "struct_defs/struct_0202F264.h" @@ -97,14 +95,14 @@ void ov62_02248408 (UnkStruct_0202F264 * param0, BattleParams * param1, int para static void ov62_0224856C (Strbuf *param0, int param1) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; Strbuf_Clear(param0); - v0 = sub_0200B144(1, 26, 10, param1); + v0 = MessageLoader_Init(1, 26, 10, param1); - sub_0200B1B8(v0, 332, param0); - sub_0200B190(v0); + MessageLoader_GetStrbuf(v0, 332, param0); + MessageLoader_Free(v0); } int ov62_02248598 (UnkStruct_021C0794 * param0, int param1, u8 param2, u16 * param3, u16 * param4) diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c index c483460f83..31a2d0b638 100644 --- a/src/overlay064/ov64_0222DCE0.c +++ b/src/overlay064/ov64_0222DCE0.c @@ -13,7 +13,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -145,7 +145,7 @@ typedef struct { UnkStruct_0200C738 unk_78; UnkStruct_02009714 * unk_204[4]; UnkStruct_0200B358 * unk_214; - UnkStruct_0200B144 * unk_218; + MessageLoader * unk_218; NARC * unk_21C; UnkStruct_0205AA50 unk_220; Strbuf* unk_230; @@ -1064,12 +1064,12 @@ static void ov64_0222E570 (UnkStruct_ov64_0222E21C * param0) static void ov64_0222E5D8 (UnkStruct_ov64_0222E21C * param0, u32 param1) { param0->unk_214 = sub_0200B358(param1); - param0->unk_218 = sub_0200B144(0, 26, 675, param1); + param0->unk_218 = MessageLoader_Init(0, 26, 675, param1); } static void ov64_0222E604 (UnkStruct_ov64_0222E21C * param0) { - sub_0200B190(param0->unk_218); + MessageLoader_Free(param0->unk_218); sub_0200B3F0(param0->unk_214); } @@ -1124,7 +1124,7 @@ static void ov64_0222E738 (UnkStruct_ov64_0222E21C * param0, u32 param1) } sub_0201ADA4(¶m0->unk_220, 0); - sub_0200B1B8(param0->unk_218, param1, param0->unk_234); + MessageLoader_GetStrbuf(param0->unk_218, param1, param0->unk_234); sub_0200C388(param0->unk_214, param0->unk_230, param0->unk_234); param0->unk_238 = sub_0201D78C(¶m0->unk_220, 1, param0->unk_230, 0, 4, 2, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -1536,7 +1536,7 @@ asm static void ov64_0222EC94 (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_ ldr r1, [sp, #0x2c] ldr r2, [sp, #0x24] ldrb r1, [r1] - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #0x62 ldr r1, [sp, #0x18] lsl r0, r0, #2 @@ -1706,7 +1706,7 @@ static void ov64_0222EFBC (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_0222 v0 = Strbuf_Init(128, param3); sub_0201ADA4(¶m0->unk_1C, 15); - sub_0200B1B8(param1->unk_218, param2, v0); + MessageLoader_GetStrbuf(param1->unk_218, param2, v0); sub_0200C388(param1->unk_214, param0->unk_38, v0); param0->unk_30 = sub_0201D78C(¶m0->unk_1C, 1, param0->unk_38, 0, 0, param0->unk_34, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -2055,7 +2055,7 @@ asm static void ov64_0222F414 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_ ldr r0, [r7, r0] mov r1, #7 add r2, r4, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #0 add r1, r4, #0 add r2, r0, #0 @@ -2599,7 +2599,7 @@ static void ov64_0222FE70 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222 v0 = Strbuf_Init(128, param3); - sub_0200B1B8(param1->unk_218, param2, v0); + MessageLoader_GetStrbuf(param1->unk_218, param2, v0); sub_0200C388(param1->unk_214, param0->unk_D4, v0); param0->unk_D8 = sub_0201D78C(¶m0->unk_C4, 1, param0->unk_D4, 0, 0, param0->unk_DC, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -3047,7 +3047,7 @@ asm static void ov64_02230680 (UnkStruct_ov64_02230620 * param0, UnkStruct_ov64_ ldr r0, [r4, r0] mov r1, #0x2f add r2, r6, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #0 add r1, r6, #0 add r2, r0, #0 @@ -3074,7 +3074,7 @@ asm static void ov64_02230680 (UnkStruct_ov64_02230620 * param0, UnkStruct_ov64_ ldr r0, [r4, r0] ldr r2, [sp, #0x20] mov r1, #0x33 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #0x62 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -3105,7 +3105,7 @@ asm static void ov64_02230680 (UnkStruct_ov64_02230620 * param0, UnkStruct_ov64_ ldr r0, [r4, r0] mov r1, #0x30 add r2, r6, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #0 add r1, r6, #0 add r2, r0, #0 @@ -5372,7 +5372,7 @@ asm static void ov64_022320B8 (UnkStruct_ov64_02230F98 * param0, u32 param1, u32 ldr r2, [sp, #0x48] ldr r5, [sp, #0x38] ldr r4, [sp, #0x44] - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #0x62 lsl r0, r0, #2 ldr r0, [r6, r0] diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index c140530d10..883ba49935 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -717,8 +717,8 @@ static void ov65_0222E01C (UnkStruct_ov65_0222EBE0 * param0) param0->unk_15C = sub_02018340(54); param0->unk_164 = sub_0200B358(54); - param0->unk_168 = sub_0200B144(0, 26, 674, 54); - param0->unk_16C = sub_0200B144(0, 26, 695, 54); + param0->unk_168 = MessageLoader_Init(0, 26, 674, 54); + param0->unk_16C = MessageLoader_Init(0, 26, 695, 54); ov65_0222E618(); ov65_0222E638(param0->unk_15C); @@ -888,8 +888,8 @@ static void ov65_0222E47C (UnkStruct_ov65_0222EBE0 * param0) ov65_0222EF4C(param0); ov65_0222EC5C(param0->unk_15C); - sub_0200B190(param0->unk_16C); - sub_0200B190(param0->unk_168); + MessageLoader_Free(param0->unk_16C); + MessageLoader_Free(param0->unk_168); sub_0200B3F0(param0->unk_164); Overlay_UnloadByID(FS_OVERLAY_ID(overlay63)); } @@ -1538,7 +1538,7 @@ static void ov65_0222EE98 (UnkStruct_ov65_0222EBE0 * param0) sub_0201A7E8(param0->unk_15C, ¶m0->unk_350, 3, 5, 1, 22, 2, 13, 512 - 18 * 3); sub_0201ADA4(¶m0->unk_350, 0x8000); - sub_0200B1B8(param0->unk_168, 21, param0->unk_178); + MessageLoader_GetStrbuf(param0->unk_168, 21, param0->unk_178); { u32 v2 = sub_02002EEC(0, param0->unk_178, 0, 22 * 8); @@ -2335,7 +2335,7 @@ static void ov65_0222FD70 (UnkStruct_ov65_0222EBE0 * param0) if (v6 == 1) { if (ov4_021D2388() == -1) { - sub_0200B1B8(param0->unk_168, v3, param0->unk_170); + MessageLoader_GetStrbuf(param0->unk_168, v3, param0->unk_170); } else { v1 = sub_0202AD2C(param0->unk_00, ov4_021D2388(), 8); @@ -2348,7 +2348,7 @@ static void ov65_0222FD70 (UnkStruct_ov65_0222EBE0 * param0) Strbuf_CopyChars(param0->unk_170, sub_0202AEF0(param0->unk_00, ov4_021D2388())); } } else { - sub_0200B1B8(param0->unk_168, v3, param0->unk_170); + MessageLoader_GetStrbuf(param0->unk_168, v3, param0->unk_170); } sub_0201D78C(¶m0->unk_340, 0, param0->unk_170, 102, 0, 0xff, v0, NULL); @@ -3480,7 +3480,7 @@ static int ov65_0223128C (UnkStruct_ov65_0222EBE0 * param0, int param1) sub_02013A4C(param0->unk_154, param0->unk_168, v3[v0].unk_00, v3[v0].unk_04); } else { sub_0200C0B0(param0->unk_164, 0, v0); - sub_0200B1B8(param0->unk_168, v3[v0].unk_00, param0->unk_170); + MessageLoader_GetStrbuf(param0->unk_168, v3[v0].unk_00, param0->unk_170); sub_0200C388(param0->unk_164, param0->unk_178, param0->unk_170); sub_02013A6C(param0->unk_154, param0->unk_178, v3[v0].unk_04); } @@ -4762,9 +4762,9 @@ static void ov65_02232B58 (UnkStruct_ov65_0222EBE0 * param0, int param1, BOOL pa sub_0201A7E8(param0->unk_15C, ¶m0->unk_330, 2, 2, 19, 27, 4, 12, (((512 - (18 + 12)) - 73) - (27 * 4))); if (param2) { - sub_0200B1B8(param0->unk_16C, param1, param0->unk_170); + MessageLoader_GetStrbuf(param0->unk_16C, param1, param0->unk_170); } else { - sub_0200B1B8(param0->unk_168, param1, param0->unk_170); + MessageLoader_GetStrbuf(param0->unk_168, param1, param0->unk_170); } sub_0200C388(param0->unk_164, param0->unk_174, param0->unk_170); @@ -4800,7 +4800,7 @@ static void ov65_02232CA8 (UnkStruct_ov65_0222EBE0 * param0, int param1) } sub_0201A7E8(param0->unk_15C, ¶m0->unk_360, 2, 4, 4, 23, 16, 12, (((512 - (18 + 12)) - 9) - (23 * 16))); - sub_0200B1B8(param0->unk_16C, param1, param0->unk_170); + MessageLoader_GetStrbuf(param0->unk_16C, param1, param0->unk_170); sub_0200C388(param0->unk_164, param0->unk_174, param0->unk_170); sub_0201ADA4(¶m0->unk_360, 15); @@ -5426,7 +5426,7 @@ asm static void ov65_02233940 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) add r2, #8 ldr r2, [r5, r2] mov r1, #0x2a - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r2, #0x5e ldr r0, = 0xB18 lsl r2, r2, #2 @@ -5466,7 +5466,7 @@ asm static void ov65_02233940 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) ldr r0, [r5, r2] add r2, #8 ldr r2, [r5, r2] - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #8 str r0, [sp] mov r2, #0xff @@ -5503,7 +5503,7 @@ asm static void ov65_02233940 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) add r2, #0x10 ldr r2, [r5, r2] mov r1, #0x2b - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #0x20 str r0, [sp] mov r2, #0xff @@ -5525,7 +5525,7 @@ asm static void ov65_02233940 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) add r2, #0xda ldr r0, [r5, r0] ldr r2, [r5, r2] - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r2, #0x5e ldr r0, = 0xB18 lsl r2, r2, #2 @@ -5561,7 +5561,7 @@ asm static void ov65_02233940 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) add r2, #0x10 ldr r2, [r5, r2] mov r1, #0x2c - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #0x38 str r0, [sp] mov r2, #0xff @@ -5595,7 +5595,7 @@ asm static void ov65_02233940 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) add r2, #8 ldr r2, [r5, r2] mov r1, #0x2d - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r2, #0x5e ldr r0, = 0xB18 lsl r2, r2, #2 @@ -5637,7 +5637,7 @@ asm static void ov65_02233940 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) lsl r2, r1, #3 ldr r0, [r5, r0] ldr r2, [r5, r2] - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r2, #0x5e ldr r0, = 0xB18 lsl r2, r2, #2 @@ -5673,7 +5673,7 @@ asm static void ov65_02233940 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) lsl r2, r1, #3 ldr r0, [r5, r0] ldr r2, [r5, r2] - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #0x50 str r0, [sp] mov r2, #0xff @@ -5707,7 +5707,7 @@ asm static void ov65_02233940 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) add r2, #8 ldr r2, [r5, r2] mov r1, #0x30 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r2, #0x5e ldr r0, = 0xB18 lsl r2, r2, #2 @@ -5747,7 +5747,7 @@ asm static void ov65_02233940 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) add r2, #0x10 ldr r2, [r5, r2] mov r1, #0x31 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #0x68 str r0, [sp] mov r2, #0xff @@ -5781,7 +5781,7 @@ asm static void ov65_02233940 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) add r2, #8 ldr r2, [r5, r2] mov r1, #0x32 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r2, #0x5e ldr r0, = 0xB18 lsl r2, r2, #2 @@ -5820,7 +5820,7 @@ asm static void ov65_02233940 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) add r2, #0x10 ldr r2, [r5, r2] mov r1, #0x33 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #0x80 str r0, [sp] mov r2, #0xff @@ -5878,7 +5878,7 @@ asm static void ov65_02233940 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) add r2, #8 ldr r2, [r5, r2] mov r1, #0x4a - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r2, #0x5e ldr r0, = 0xB18 lsl r2, r2, #2 @@ -5954,7 +5954,7 @@ static void ov65_02233E20 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) v0 = param0->unk_BE0.unk_71 - 1; { - sub_0200B1B8(param0->unk_168, 52, param0->unk_178); + MessageLoader_GetStrbuf(param0->unk_168, 52, param0->unk_178); sub_0201D78C(¶m0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } @@ -5965,7 +5965,7 @@ static void ov65_02233E20 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) } { - sub_0200B1B8(param0->unk_168, 59, param0->unk_178); + MessageLoader_GetStrbuf(param0->unk_168, 59, param0->unk_178); sub_0201D78C(¶m0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 48, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); ov65_02234694(param0, 65, 112, v0, 120, 48); } @@ -5985,7 +5985,7 @@ asm static void ov65_02233EF0 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) ldr r0, [r5, r2] add r2, #0x10 ldr r2, [r5, r2] - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r1, #0 str r1, [sp] mov r2, #0xff @@ -6005,7 +6005,7 @@ asm static void ov65_02233EF0 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) add r2, #0x10 ldr r2, [r5, r2] mov r1, #0x3c - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #0x18 str r0, [sp] mov r2, #0xff @@ -6026,7 +6026,7 @@ asm static void ov65_02233EF0 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) add r2, #0x10 ldr r2, [r5, r2] mov r1, #0x3e - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r1, #0x5e lsl r1, r1, #2 mov r0, #0 @@ -6093,7 +6093,7 @@ asm static void ov65_02233EF0 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) add r2, #0x10 ldr r2, [r5, r2] mov r1, #0x3b - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #0x40 str r0, [sp] mov r2, #0xff @@ -6132,7 +6132,7 @@ asm static void ov65_02233EF0 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) add r2, #0x10 ldr r2, [r5, r2] mov r1, #0x3d - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #0x58 str r0, [sp] mov r2, #0xff @@ -6153,7 +6153,7 @@ asm static void ov65_02233EF0 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) add r2, #0x10 ldr r2, [r5, r2] mov r1, #0x3e - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r1, #0x5e lsl r1, r1, #2 mov r0, #0 @@ -6220,7 +6220,7 @@ asm static void ov65_02233EF0 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) add r2, #0x10 ldr r2, [r5, r2] mov r1, #0x3b - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #0x80 str r0, [sp] mov r2, #0xff @@ -6264,9 +6264,9 @@ static void ov65_0223416C (UnkStruct_ov65_0222EBE0 * param0, u32 param1) v0 = param0->unk_BE0.unk_71 - 1; { - sub_0200B1B8(param0->unk_168, 54, param0->unk_178); + MessageLoader_GetStrbuf(param0->unk_168, 54, param0->unk_178); sub_0201D78C(¶m0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); - sub_0200B1B8(param0->unk_168, 63, param0->unk_178); + MessageLoader_GetStrbuf(param0->unk_168, 63, param0->unk_178); { u32 v1 = 180 - (sub_02002D7C(0, param0->unk_178, 0) + 1) / 2; @@ -6282,7 +6282,7 @@ static void ov65_0223416C (UnkStruct_ov65_0222EBE0 * param0, u32 param1) } { - sub_0200B1B8(param0->unk_168, 59, param0->unk_178); + MessageLoader_GetStrbuf(param0->unk_168, 59, param0->unk_178); sub_0201D78C(¶m0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 80, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); ov65_02234694(param0, 68, 134, v0, 104, 80); @@ -6301,7 +6301,7 @@ static void ov65_022342A8 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) v0 = param0->unk_BE0.unk_71 - 1; { - sub_0200B1B8(param0->unk_168, 55, param0->unk_178); + MessageLoader_GetStrbuf(param0->unk_168, 55, param0->unk_178); sub_0201D78C(¶m0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); v1 = sub_02030698(v2, 124, v0); @@ -6322,7 +6322,7 @@ static void ov65_022342A8 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) } { - sub_0200B1B8(param0->unk_168, 59, param0->unk_178); + MessageLoader_GetStrbuf(param0->unk_168, 59, param0->unk_178); sub_0201D78C(¶m0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 80, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); ov65_02234694(param0, 65, 122, v0, 108, 80); } @@ -6335,7 +6335,7 @@ static void ov65_022343CC (UnkStruct_ov65_0222EBE0 * param0, u32 param1) v0 = param0->unk_BE0.unk_71 - 1; { - sub_0200B1B8(param0->unk_168, 56, param0->unk_178); + MessageLoader_GetStrbuf(param0->unk_168, 56, param0->unk_178); sub_0201D78C(¶m0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } @@ -6346,7 +6346,7 @@ static void ov65_022343CC (UnkStruct_ov65_0222EBE0 * param0, u32 param1) } { - sub_0200B1B8(param0->unk_168, 59, param0->unk_178); + MessageLoader_GetStrbuf(param0->unk_168, 59, param0->unk_178); sub_0201D78C(¶m0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 48, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); ov65_02234694(param0, 69, 142, v0, 112, 48); } @@ -6362,13 +6362,13 @@ static void ov65_0223449C (UnkStruct_ov65_0222EBE0 * param0, u32 param1) v0 = param0->unk_BE0.unk_71 - 1; { - sub_0200B1B8(param0->unk_168, 70, param0->unk_178); + MessageLoader_GetStrbuf(param0->unk_168, 70, param0->unk_178); sub_0201D78C(¶m0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } { sub_0200C0B0(param0->unk_BE0.unk_00, 0, UnkEnum_ov66_022324D0_00); - sub_0200B1B8(param0->unk_168, 71, param0->unk_170); + MessageLoader_GetStrbuf(param0->unk_168, 71, param0->unk_170); sub_0200C388(param0->unk_BE0.unk_00, param0->unk_178, param0->unk_170); sub_0201D78C(¶m0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 24, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); ov65_02234708(param0, 72, sub_0202AD2C(v1, v0, 10), 164, 24); @@ -6376,7 +6376,7 @@ static void ov65_0223449C (UnkStruct_ov65_0222EBE0 * param0, u32 param1) { sub_0200C0B0(param0->unk_BE0.unk_00, 0, UnkEnum_ov66_022324D0_01); - sub_0200B1B8(param0->unk_168, 71, param0->unk_170); + MessageLoader_GetStrbuf(param0->unk_168, 71, param0->unk_170); sub_0200C388(param0->unk_BE0.unk_00, param0->unk_178, param0->unk_170); sub_0201D78C(¶m0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 48, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); ov65_02234708(param0, 72, sub_0202AD2C(v1, v0, 11), 164, 48); @@ -6384,7 +6384,7 @@ static void ov65_0223449C (UnkStruct_ov65_0222EBE0 * param0, u32 param1) { sub_0200C0B0(param0->unk_BE0.unk_00, 0, UnkEnum_ov66_022324D0_02); - sub_0200B1B8(param0->unk_168, 71, param0->unk_170); + MessageLoader_GetStrbuf(param0->unk_168, 71, param0->unk_170); sub_0200C388(param0->unk_BE0.unk_00, param0->unk_178, param0->unk_170); sub_0201D78C(¶m0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 72, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); ov65_02234708(param0, 72, sub_0202AD2C(v1, v0, 12), 164, 72); @@ -6436,13 +6436,13 @@ static void ov65_022346C4 (UnkStruct_ov65_0222EBE0 * param0, Strbuf *param1, u32 v2 = 58; } - sub_0200B1B8(param0->unk_168, v2, param1); + MessageLoader_GetStrbuf(param0->unk_168, v2, param1); } static void ov65_02234708 (UnkStruct_ov65_0222EBE0 * param0, u32 param1, u32 param2, u32 param3, u32 param4) { sub_0200B60C(param0->unk_BE0.unk_00, 0, param2, 4, 1, 1); - sub_0200B1B8(param0->unk_168, param1, param0->unk_170); + MessageLoader_GetStrbuf(param0->unk_168, param1, param0->unk_170); sub_0200C388(param0->unk_BE0.unk_00, param0->unk_178, param0->unk_170); { @@ -6578,7 +6578,7 @@ static void ov65_02234900 (UnkStruct_ov65_0222EBE0 * param0, UnkStruct_0205AA50 ov65_02234F68(param0, param2 - 1); - sub_0200B1B8(param0->unk_168, 42, param0->unk_170); + MessageLoader_GetStrbuf(param0->unk_168, 42, param0->unk_170); sub_0200C388(param0->unk_BE0.unk_00, param0->unk_178, param0->unk_170); sub_0201D78C(param1, 1, param0->unk_178, 0, v2, 0xff, v1, NULL); sub_0201A9A4(param1); @@ -6717,7 +6717,7 @@ static void ov65_02234A68 (UnkStruct_ov65_0222EBE0 * param0, NARC * param1, u32 sub_0201A870(param0->unk_15C, &v3, 8, 2, 0, 0); v4 = Strbuf_Init(64, param2); - sub_0200B1B8(param0->unk_168, 73, v4); + MessageLoader_GetStrbuf(param0->unk_168, 73, v4); { v8 = -((sub_02002D7C(0, param0->unk_178, 0) + 1) / 2); diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c index a42a379c99..e8d9f687de 100644 --- a/src/overlay065/ov65_0223648C.c +++ b/src/overlay065/ov65_0223648C.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" @@ -113,7 +113,7 @@ typedef struct { typedef struct { UnkStruct_02018340 * unk_00; UnkStruct_0200B358 * unk_04; - UnkStruct_0200B144 * unk_08; + MessageLoader * unk_08; Strbuf* unk_0C; Strbuf* unk_10; u8 unk_14; @@ -803,7 +803,7 @@ static void ov65_02236B90 (UnkStruct_ov65_02236840 * param0, u32 param1) static void ov65_02236C10 (UnkStruct_ov65_02236840 * param0, const UnkStruct_0207DE04 * param1, u32 param2) { param0->unk_04 = sub_0200B358(param2); - param0->unk_08 = sub_0200B144(0, 26, 674, param2); + param0->unk_08 = MessageLoader_Init(0, 26, 674, param2); param0->unk_0C = Strbuf_Init(256, param2); param0->unk_10 = Strbuf_Init(256, param2); param0->unk_14 = 0xff; @@ -814,7 +814,7 @@ static void ov65_02236C5C (UnkStruct_ov65_02236840 * param0) { Strbuf_Free(param0->unk_10); Strbuf_Free(param0->unk_0C); - sub_0200B190(param0->unk_08); + MessageLoader_Free(param0->unk_08); sub_0200B3F0(param0->unk_04); } @@ -834,12 +834,12 @@ static void ov65_02236C7C (UnkStruct_ov65_02236840 * param0, const UnkStruct_020 break; } - sub_0200B1B8(param0->unk_08, Unk_ov65_02239E5C[param1->unk_00], param0->unk_10); + MessageLoader_GetStrbuf(param0->unk_08, Unk_ov65_02239E5C[param1->unk_00], param0->unk_10); sub_0200C388(param0->unk_04, param0->unk_0C, param0->unk_10); sub_0201D78C(¶m0->unk_200, 0, param0->unk_0C, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); sub_0201A9A4(¶m0->unk_200); sub_0201A9A4(¶m0->unk_220); - sub_0200B1B8(param0->unk_08, 128, param0->unk_0C); + MessageLoader_GetStrbuf(param0->unk_08, 128, param0->unk_0C); sub_0201D78C(¶m0->unk_210, 0, param0->unk_0C, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_0201A9A4(¶m0->unk_210); sub_0201A9A4(¶m0->unk_1F0); @@ -915,7 +915,7 @@ static void ov65_02236E50 (UnkStruct_ov65_02236840 * param0, const UnkStruct_020 sub_0201ADA4(¶m0->unk_1F0, 15); v0 = Strbuf_Init(256, param4); - sub_0200B1B8(param0->unk_08, param2, v0); + MessageLoader_GetStrbuf(param0->unk_08, param2, v0); sub_0200C388(param0->unk_04, param0->unk_0C, v0); param0->unk_14 = sub_0201D78C(¶m0->unk_1F0, 1, param0->unk_0C, 0, 0, param0->unk_16, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); @@ -979,7 +979,7 @@ static void ov65_02236F70 (UnkStruct_ov65_02236840 * param0, const UnkStruct_020 ov65_0223726C(param0, param1, param2, 0, param3); ov65_02237284(param0, param1, param2, 1, param3); - sub_0200B1B8(param0->unk_08, 131, v0); + MessageLoader_GetStrbuf(param0->unk_08, 131, v0); sub_0200C388(param0->unk_04, v1, v0); sub_0201ADA4(¶m0->unk_230, 15); @@ -1031,14 +1031,14 @@ static void ov65_0223709C (UnkStruct_ov65_022367A8 * param0, UnkStruct_ov65_0223 ov65_0223726C(param1, param2, param3, 0, param4); - sub_0200B1B8(param1->unk_08, 129, v0); + MessageLoader_GetStrbuf(param1->unk_08, 129, v0); sub_0200C388(param1->unk_04, v1, v0); sub_0201AE78(¶m1->unk_220, 15, 0, param3 * (2 * 8), (20 * 8), (2 * 8)); sub_0201D78C(¶m1->unk_220, 0, v1, 0, param3 * (2 * 8), 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); ov65_02237284(param1, param2, param3, 0, param4); - sub_0200B1B8(param1->unk_08, 130, v0); + MessageLoader_GetStrbuf(param1->unk_08, 130, v0); sub_0200C388(param1->unk_04, v1, v0); sub_0201D78C(¶m1->unk_220, 0, v1, 72, param3 * (2 * 8), 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); sub_0201A9A4(¶m1->unk_220); diff --git a/src/overlay066/ov66_0222DDF0.c b/src/overlay066/ov66_0222DDF0.c index ce40d10d13..7bfb15a73a 100644 --- a/src/overlay066/ov66_0222DDF0.c +++ b/src/overlay066/ov66_0222DDF0.c @@ -7,7 +7,7 @@ #include "inlines.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02014FB0_decl.h" #include "strbuf.h" #include "struct_decls/struct_02025E6C_decl.h" @@ -1021,15 +1021,15 @@ void ov66_0222E640 (const UnkStruct_ov66_0222E71C * param0, UnkStruct_02025E6C * } if (v1) { - UnkStruct_0200B144 * v4; + MessageLoader * v4; Strbuf* v5; - v4 = sub_0200B144(1, 26, 673, param2); - v5 = sub_0200B1EC(v4, 64); + v4 = MessageLoader_Init(1, 26, 673, param2); + v5 = MessageLoader_GetNewStrbuf(v4, 64); sub_02025EE0(param1, v5); Strbuf_Free(v5); - sub_0200B190(v4); + MessageLoader_Free(v4); } sub_02025F1C(param1, ov66_0222E79C(param0)); diff --git a/src/overlay066/ov66_0223177C.c b/src/overlay066/ov66_0223177C.c index ec841a2dd8..625a4cbbb9 100644 --- a/src/overlay066/ov66_0223177C.c +++ b/src/overlay066/ov66_0223177C.c @@ -3,7 +3,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "strbuf.h" #include "struct_decls/struct_02025E6C_decl.h" @@ -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, 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 BOOL ov66_02232068(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, MessageLoader * param3, Strbuf *param4, u32 param5); +static BOOL ov66_022320BC(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, MessageLoader * param3, Strbuf *param4, u32 param5); +static BOOL ov66_0223211C(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, MessageLoader * param3, Strbuf *param4, u32 param5); +static BOOL ov66_02232258(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, MessageLoader * param3, Strbuf *param4, u32 param5); +static BOOL ov66_022322B8(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, MessageLoader * param3, Strbuf *param4, u32 param5); +static BOOL ov66_02232330(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, MessageLoader * param3, Strbuf *param4, u32 param5); +static BOOL ov66_022323A0(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, MessageLoader * param3, Strbuf *param4, u32 param5); +static BOOL ov66_022323C4(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, MessageLoader * 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); @@ -410,11 +410,11 @@ int ov66_02231C78 (const UnkStruct_ov66_0223177C * param0) 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; + MessageLoader * v1; UnkStruct_ov66_02231FB0 * v2; BOOL v3; - static BOOL(*const v4[])(UnkStruct_ov66_02231FB0 *, const UnkStruct_ov66_02232068 *, UnkStruct_0200B358 *, UnkStruct_0200B144 *, Strbuf *, u32) = { + static BOOL(*const v4[])(UnkStruct_ov66_02231FB0 *, const UnkStruct_ov66_02232068 *, UnkStruct_0200B358 *, MessageLoader *, Strbuf *, u32) = { ov66_02232068, ov66_022320BC, ov66_0223211C, @@ -429,7 +429,7 @@ BOOL ov66_02231C94 (const UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66 GF_ASSERT(ov66_02231C60(param0)); v2 = param0->unk_5C.unk_188.unk_2C; - v1 = sub_0200B144(1, 26, 653, param4); + v1 = MessageLoader_Init(1, 26, 653, param4); v0 = sub_0200B358(param4); if (v2->unk_00 < 9) { @@ -438,7 +438,7 @@ BOOL ov66_02231C94 (const UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66 v3 = 0; } - sub_0200B190(v1); + MessageLoader_Free(v1); sub_0200B3F0(v0); return v3; @@ -733,14 +733,14 @@ 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, Strbuf *param4, u32 param5) +static BOOL ov66_02232068 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, MessageLoader * param3, Strbuf *param4, u32 param5) { 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); - v0 = sub_0200B1EC(param3, 7); + v0 = MessageLoader_GetNewStrbuf(param3, 7); sub_0200C388(param2, param4, v0); Strbuf_Free(v0); @@ -748,7 +748,7 @@ 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, Strbuf *param4, u32 param5) +static BOOL ov66_022320BC (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, MessageLoader * param3, Strbuf *param4, u32 param5) { Strbuf* v0; @@ -756,7 +756,7 @@ static BOOL ov66_022320BC (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 sub_0200B48C(param2, 1, param0->unk_10[1], 0, 1, Unk_020E4C44); sub_0200C120(param2, 2, param0->unk_04[0]); - v0 = sub_0200B1EC(param3, 8); + v0 = MessageLoader_GetNewStrbuf(param3, 8); sub_0200C388(param2, param4, v0); Strbuf_Free(v0); @@ -764,7 +764,7 @@ 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, Strbuf *param4, u32 param5) +static BOOL ov66_0223211C (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, MessageLoader * param3, Strbuf *param4, u32 param5) { Strbuf* v0; @@ -796,12 +796,12 @@ static BOOL ov66_0223211C (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 return 0; } - v0 = sub_0200B1EC(param3, v1); + v0 = MessageLoader_GetNewStrbuf(param3, v1); } else { sub_0200B48C(param2, 1, param0->unk_10[0], 0, 1, Unk_020E4C44); sub_0200B60C(param2, 2, 4 - param0->unk_04[1], 1, 1, 1); - v0 = sub_0200B1EC(param3, 5); + v0 = MessageLoader_GetNewStrbuf(param3, 5); } sub_0200C388(param2, param4, v0); @@ -810,7 +810,7 @@ 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, Strbuf *param4, u32 param5) +static BOOL ov66_02232258 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, MessageLoader * param3, Strbuf *param4, u32 param5) { Strbuf* v0; @@ -818,7 +818,7 @@ static BOOL ov66_02232258 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 sub_0200B48C(param2, 1, param0->unk_10[0], 0, 1, Unk_020E4C44); sub_0200B60C(param2, 2, 8 - param0->unk_04[1], 1, 1, 1); - v0 = sub_0200B1EC(param3, 9); + v0 = MessageLoader_GetNewStrbuf(param3, 9); sub_0200C388(param2, param4, v0); Strbuf_Free(v0); @@ -826,7 +826,7 @@ 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, Strbuf *param4, u32 param5) +static BOOL ov66_022322B8 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, MessageLoader * param3, Strbuf *param4, u32 param5) { Strbuf* v0; int v1; @@ -842,7 +842,7 @@ static BOOL ov66_022322B8 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 sub_0200C0B0(param2, param0->unk_04[0], UnkEnum_ov66_022324D0_06); } - v0 = sub_0200B1EC(param3, 10 + (4 - param0->unk_04[0])); + v0 = MessageLoader_GetNewStrbuf(param3, 10 + (4 - param0->unk_04[0])); sub_0200C388(param2, param4, v0); Strbuf_Free(v0); @@ -850,7 +850,7 @@ 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, Strbuf *param4, u32 param5) +static BOOL ov66_02232330 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, MessageLoader * param3, Strbuf *param4, u32 param5) { Strbuf* v0; u32 v1; @@ -877,7 +877,7 @@ static BOOL ov66_02232330 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 return 0; } - v0 = sub_0200B1EC(param3, v1); + v0 = MessageLoader_GetNewStrbuf(param3, v1); sub_0200C388(param2, param4, v0); Strbuf_Free(v0); @@ -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, Strbuf *param4, u32 param5) +static BOOL ov66_022323A0 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, UnkStruct_0200B358 * param2, MessageLoader * param3, Strbuf *param4, u32 param5) { if (param0->unk_04[0] >= 20) { return 0; @@ -895,12 +895,12 @@ static BOOL ov66_022323A0 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 return 0; } - sub_0200B1B8(param3, 21, param4); + MessageLoader_GetStrbuf(param3, 21, param4); return 1; } -static BOOL ov66_022323C4 (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, MessageLoader * param3, Strbuf *param4, u32 param5) { Strbuf* v0; u32 v1; @@ -923,9 +923,9 @@ static BOOL ov66_022323C4 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 } if ((param0->unk_04[0] == UnkEnum_ov66_022324D0_00) || (param0->unk_04[0] == UnkEnum_ov66_022324D0_01)) { - v0 = sub_0200B1EC(param3, v4[param0->unk_04[1] - 1]); + v0 = MessageLoader_GetNewStrbuf(param3, v4[param0->unk_04[1] - 1]); } else { - v0 = sub_0200B1EC(param3, v3[param0->unk_04[1] - 1]); + v0 = MessageLoader_GetNewStrbuf(param3, v3[param0->unk_04[1] - 1]); } sub_0200C388(param2, param4, v0); diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c index 331ede5d88..70e9b63dc0 100644 --- a/src/overlay067/ov67_0225C700.c +++ b/src/overlay067/ov67_0225C700.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" @@ -55,7 +55,7 @@ typedef struct { UnkStruct_0200B358 * unk_00; - UnkStruct_0200B144 * unk_04; + MessageLoader * unk_04; UnkStruct_0205AA50 unk_08; Strbuf* unk_18; Strbuf* unk_1C; @@ -646,7 +646,7 @@ static void ov67_0225D17C (UnkStruct_ov67_0225D154 * param0) static void ov67_0225D188 (UnkStruct_ov67_0225D210 * param0, UnkStruct_02018340 * param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, UnkStruct_021C0794 * param9, u32 param10) { param0->unk_00 = sub_0200B358(param10); - param0->unk_04 = sub_0200B144(0, 26, param3, param10); + param0->unk_04 = MessageLoader_Init(0, 26, param3, param10); param0->unk_18 = Strbuf_Init(256, param10); param0->unk_1C = Strbuf_Init(256, param10); param0->unk_20 = param2; @@ -663,7 +663,7 @@ static void ov67_0225D210 (UnkStruct_ov67_0225D210 * param0, u32 param1) } sub_0201ADA4(¶m0->unk_08, 15); - sub_0200B1B8(param0->unk_04, param1, param0->unk_1C); + MessageLoader_GetStrbuf(param0->unk_04, param1, param0->unk_1C); sub_0200C388(param0->unk_00, param0->unk_18, param0->unk_1C); sub_0201D738(¶m0->unk_08, 1, param0->unk_18, 0, 0, 0xff, NULL); @@ -725,7 +725,7 @@ static void ov67_0225D330 (UnkStruct_ov67_0225D210 * param0) sub_0201A8FC(¶m0->unk_08); Strbuf_Free(param0->unk_1C); Strbuf_Free(param0->unk_18); - sub_0200B190(param0->unk_04); + MessageLoader_Free(param0->unk_04); sub_0200B3F0(param0->unk_00); } @@ -741,7 +741,7 @@ asm static void ov67_0225D37C (UnkStruct_ov67_0225D210 * param0, u32 param1) ldr r0, [r4, #4] ldr r2, [r4, #0x1c] add r1, r5, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf ldr r0, [r4, #0] ldr r1, [r4, #0x18] ldr r2, [r4, #0x1c] diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c index 5a1e594327..700c169e8a 100644 --- a/src/overlay068/ov68_0225C700.c +++ b/src/overlay068/ov68_0225C700.c @@ -10,7 +10,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" @@ -119,7 +119,7 @@ typedef struct { } UnkStruct_ov68_0225D128; typedef struct { - UnkStruct_0200B144 * unk_00[9]; + MessageLoader * unk_00[9]; UnkStruct_0200B358 * unk_24; Strbuf* unk_28; Strbuf* unk_2C; @@ -583,7 +583,7 @@ static void ov68_0225CB70 (UnkStruct_ov68_0225CB70 * param0, UnkStruct_ov66_0222 param0->unk_30 = param1; for (v0 = 0; v0 < 9; v0++) { - param0->unk_00[v0] = sub_0200B144(0, 26, v1[v0], param2); + param0->unk_00[v0] = MessageLoader_Init(0, 26, v1[v0], param2); } param0->unk_24 = sub_0200B358(param2); @@ -596,7 +596,7 @@ static void ov68_0225CBC0 (UnkStruct_ov68_0225CB70 * param0) int v0; for (v0 = 0; v0 < 9; v0++) { - sub_0200B190(param0->unk_00[v0]); + MessageLoader_Free(param0->unk_00[v0]); } sub_0200B3F0(param0->unk_24); @@ -608,7 +608,7 @@ static Strbuf* ov68_0225CBEC (UnkStruct_ov68_0225CB70 * param0, u32 param1, u32 { GF_ASSERT(param1 < 9); - sub_0200B1B8(param0->unk_00[param1], param2, param0->unk_2C); + MessageLoader_GetStrbuf(param0->unk_00[param1], param2, param0->unk_2C); sub_0200C388(param0->unk_24, param0->unk_28, param0->unk_2C); return param0->unk_28; diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c index 214824c921..fa3c1e1e2a 100644 --- a/src/overlay069/ov69_0225C700.c +++ b/src/overlay069/ov69_0225C700.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02015920_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -257,7 +257,7 @@ typedef struct { } UnkStruct_ov69_0225DDC8; typedef struct { - UnkStruct_0200B144 * unk_00; + MessageLoader * unk_00; UnkStruct_0200B358 * unk_04; Strbuf* unk_08; Strbuf* unk_0C; @@ -2933,7 +2933,7 @@ static u16 ov69_0225EF04 (u32 param0) static void ov69_0225EF1C (UnkStruct_ov69_0225EF54 * param0, u32 param1) { { - param0->unk_00 = sub_0200B144(0, 26, 696, param1); + param0->unk_00 = MessageLoader_Init(0, 26, 696, param1); } { @@ -2947,7 +2947,7 @@ static void ov69_0225EF1C (UnkStruct_ov69_0225EF54 * param0, u32 param1) static void ov69_0225EF54 (UnkStruct_ov69_0225EF54 * param0) { { - sub_0200B190(param0->unk_00); + MessageLoader_Free(param0->unk_00); } { @@ -2960,18 +2960,18 @@ static void ov69_0225EF54 (UnkStruct_ov69_0225EF54 * param0) static Strbuf* ov69_0225EF74 (UnkStruct_ov69_0225EF54 * param0, u32 param1) { - sub_0200B1B8(param0->unk_00, param1, param0->unk_08); + MessageLoader_GetStrbuf(param0->unk_00, param1, param0->unk_08); return param0->unk_08; } static void ov69_0225EF84 (UnkStruct_ov69_0225EF54 * param0, u32 param1, Strbuf *param2) { - sub_0200B1B8(param0->unk_00, param1, param2); + MessageLoader_GetStrbuf(param0->unk_00, param1, param2); } static Strbuf* ov69_0225EF90 (UnkStruct_ov69_0225EF54 * param0, u32 param1) { - sub_0200B1B8(param0->unk_00, 3, param0->unk_0C); + MessageLoader_GetStrbuf(param0->unk_00, 3, param0->unk_0C); sub_0200BDD0(param0->unk_04, 0, param1); sub_0200C388(param0->unk_04, param0->unk_08, param0->unk_0C); @@ -2981,7 +2981,7 @@ static Strbuf* ov69_0225EF90 (UnkStruct_ov69_0225EF54 * param0, u32 param1) 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); + MessageLoader_GetStrbuf(param0->unk_00, 3, param0->unk_0C); sub_0200BE08(param0->unk_04, 0, param1, param2); sub_0200C388(param0->unk_04, param0->unk_08, param0->unk_0C); diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index be0170d153..e071c07eb0 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -11,7 +11,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -162,7 +162,7 @@ typedef struct { typedef struct { UnkStruct_0200B358 * unk_00; - UnkStruct_0200B144 * unk_04[4]; + MessageLoader * unk_04[4]; Strbuf* unk_14; Strbuf* unk_18; } UnkStruct_ov70_0225F208; @@ -2026,7 +2026,7 @@ static void ov70_0225F208 (UnkStruct_ov70_0225F208 * param0, u32 param1) param0->unk_00 = sub_0200B368(8, 64, param1); for (v0 = 0; v0 < 4; v0++) { - param0->unk_04[v0] = sub_0200B144(1, 26, v1[v0], param1); + param0->unk_04[v0] = MessageLoader_Init(1, 26, v1[v0], param1); } param0->unk_14 = Strbuf_Init(480, param1); @@ -2040,7 +2040,7 @@ static void ov70_0225F25C (UnkStruct_ov70_0225F208 * param0) sub_0200B3F0(param0->unk_00); for (v0 = 0; v0 < 4; v0++) { - sub_0200B190(param0->unk_04[v0]); + MessageLoader_Free(param0->unk_04[v0]); } Strbuf_Free(param0->unk_14); @@ -2049,7 +2049,7 @@ static void ov70_0225F25C (UnkStruct_ov70_0225F208 * param0) static Strbuf* ov70_0225F288 (UnkStruct_ov70_0225F208 * param0, int param1, u32 param2) { - sub_0200B1B8(param0->unk_04[param1], param2, param0->unk_18); + MessageLoader_GetStrbuf(param0->unk_04[param1], param2, param0->unk_18); sub_0200C388(param0->unk_00, param0->unk_14, param0->unk_18); return param0->unk_14; } diff --git a/src/overlay071/ov71_0223B140.c b/src/overlay071/ov71_0223B140.c index 1134f05c4a..64364fc6c1 100644 --- a/src/overlay071/ov71_0223B140.c +++ b/src/overlay071/ov71_0223B140.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/union_02022594_020225E0.h" @@ -414,12 +414,12 @@ static void ov71_0223B620 (UnkStruct_ov71_0223B620 * param0) param0->unk_3370 = Strbuf_Init(5, 25); { - UnkStruct_0200B144 * v0; + MessageLoader * v0; - v0 = sub_0200B144(0, 26, 616, 25); + v0 = MessageLoader_Init(0, 26, 616, 25); - sub_0200B1B8(v0, 11, param0->unk_3370); - sub_0200B190(v0); + MessageLoader_GetStrbuf(v0, 11, param0->unk_3370); + MessageLoader_Free(v0); } } diff --git a/src/overlay071/ov71_0223C69C.c b/src/overlay071/ov71_0223C69C.c index 941f338c6e..2afc5f079c 100644 --- a/src/overlay071/ov71_0223C69C.c +++ b/src/overlay071/ov71_0223C69C.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" @@ -74,7 +74,7 @@ static const int Unk_ov71_0223D644[] = { void ov71_0223C6F0 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * param1) { u8 v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; Strbuf* v2; sub_0201AE78(¶m0[0], 0, 0, 0, 17 * 8, 2 * 8); @@ -85,12 +85,12 @@ void ov71_0223C6F0 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * para sub_0201AE78(¶m0[5], 0, 0, 0, 28 * 8, 2 * 8); sub_0201AE78(¶m0[6], 0, 0, 0, 28 * 8, 2 * 8); - v1 = sub_0200B144(0, 26, 616, 25); + v1 = MessageLoader_Init(0, 26, 616, 25); v2 = Strbuf_Init(32, 25); for (v0 = 0; v0 < 7; v0++) { if ((v0 != 3) || (v0 == 3) && (param1->unk_04_3)) { - sub_0200B1B8(v1, Unk_ov71_0223D644[v0], v2); + MessageLoader_GetStrbuf(v1, Unk_ov71_0223D644[v0], v2); sub_0201D78C(¶m0[v0], 0, v2, 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); } } @@ -107,7 +107,7 @@ void ov71_0223C6F0 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * para u32 v5; sub_0200B60C(v4, 5, param1->unk_1C, 6, 0, 1); - sub_0200B1B8(v1, 14, v3); + MessageLoader_GetStrbuf(v1, 14, v3); sub_0200C388(v4, v2, v3); v5 = (8 * 17) - sub_02002D7C(0, v2, 0); @@ -119,7 +119,7 @@ void ov71_0223C6F0 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * para u32 v6; sub_0200B60C(v4, 5, param1->unk_20, 3, 0, 1); - sub_0200B1B8(v1, 21, v3); + MessageLoader_GetStrbuf(v1, 21, v3); sub_0200C388(v4, v2, v3); v6 = (8 * 17) - sub_02002D7C(0, v2, 0); @@ -135,11 +135,11 @@ void ov71_0223C6F0 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * para if (param1->unk_04_1) { sub_0200B60C(v4, 0, sub_0202CC58(param1->unk_18), 3, 1, 1); sub_0200B60C(v4, 1, sub_0202CC5C(param1->unk_18), 2, 2, 1); - sub_0200B1B8(v1, 16, v3); + MessageLoader_GetStrbuf(v1, 16, v3); } else { sub_0200B60C(v4, 0, param1->unk_2A, 3, 1, 1); sub_0200B60C(v4, 1, param1->unk_2E, 2, 2, 1); - sub_0200B1B8(v1, 15, v3); + MessageLoader_GetStrbuf(v1, 15, v3); } sub_0200C388(v4, v2, v3); @@ -153,7 +153,7 @@ void ov71_0223C6F0 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * para sub_0200B60C(v4, 2, param1->unk_2F, 2, 2, 1); sub_0200C2E0(v4, 3, param1->unk_30); sub_0200B60C(v4, 4, param1->unk_31, 2, 2, 1); - sub_0200B1B8(v1, 17, v3); + MessageLoader_GetStrbuf(v1, 17, v3); sub_0200C388(v4, v2, v3); v8 = (8 * 28) - sub_02002D7C(0, v2, 0); @@ -166,7 +166,7 @@ void ov71_0223C6F0 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * para } Strbuf_Free(v2); - sub_0200B190(v1); + MessageLoader_Free(v1); } asm void ov71_0223CA28 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * param1) @@ -220,7 +220,7 @@ asm void ov71_0223CA28 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * mov r1, #0x1a lsl r2, r2, #2 mov r3, #0x19 - bl sub_0200B144 + bl MessageLoader_Init add r7, r0, #0 mov r0, #0x20 mov r1, #0x19 @@ -233,7 +233,7 @@ asm void ov71_0223CA28 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * ldr r1, [r1, r2] add r0, r7, #0 add r2, r5, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -312,7 +312,7 @@ asm void ov71_0223CA28 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * ldr r2, [sp, #0x14] add r0, r7, #0 mov r1, #0x11 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf ldr r2, [sp, #0x14] add r0, r4, #0 add r1, r5, #0 @@ -322,7 +322,7 @@ asm void ov71_0223CA28 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * ldr r2, [sp, #0x14] add r0, r7, #0 mov r1, #0xc - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r1, #0 str r1, [sp] mov r0, #2 @@ -342,7 +342,7 @@ asm void ov71_0223CA28 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * add r0, r7, #0 mov r1, #0x14 add r2, r5, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf _0223CBA6: mov r0, #0 add r1, r5, #0 @@ -363,7 +363,7 @@ asm void ov71_0223CA28 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * ldr r2, [sp, #0x14] add r0, r7, #0 mov r1, #0xf - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf ldr r2, [sp, #0x14] add r0, r4, #0 add r1, r5, #0 @@ -398,7 +398,7 @@ asm void ov71_0223CA28 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * ldr r2, [sp, #0x14] add r0, r7, #0 mov r1, #0x16 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf ldr r2, [sp, #0x14] add r0, r4, #0 add r1, r5, #0 @@ -422,7 +422,7 @@ asm void ov71_0223CA28 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * add r0, r7, #0 mov r1, #0x12 add r2, r5, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r1, #0 str r1, [sp] ldr r0, = 0x10200 @@ -451,7 +451,7 @@ asm void ov71_0223CA28 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * add r0, r7, #0 mov r1, #0x13 add r2, r5, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r1, #0 str r1, [sp] ldr r0, = 0x10200 @@ -490,7 +490,7 @@ asm void ov71_0223CA28 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * ldr r2, [sp, #0x14] add r0, r7, #0 mov r1, #0x16 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf ldr r2, [sp, #0x14] add r0, r4, #0 add r1, r5, #0 @@ -518,7 +518,7 @@ asm void ov71_0223CA28 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * add r0, r5, #0 bl Strbuf_Free add r0, r7, #0 - bl sub_0200B190 + bl MessageLoader_Free add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} } @@ -565,19 +565,19 @@ void ov71_0223CDE8 (UnkStruct_0205AA50 * param0, const UnkStruct_02072014 * para { u32 v1; - UnkStruct_0200B144 * v2 = sub_0200B144(0, 26, 616, 25); + MessageLoader * v2 = MessageLoader_Init(0, 26, 616, 25); Strbuf* v3 = Strbuf_Init(32, 25); Strbuf* v4 = Strbuf_Init(32, 25); UnkStruct_0200B358 * v5 = sub_0200B368((1 + 1), 32, 25); sub_0200B60C(v5, 0, sub_0202CC58(param1->unk_18), 3, 1, 1); sub_0200B60C(v5, 1, sub_0202CC5C(param1->unk_18), 2, 2, 1); - sub_0200B1B8(v2, 16, v4); + MessageLoader_GetStrbuf(v2, 16, v4); sub_0200C388(v5, v3, v4); v1 = (8 * 28) - sub_02002D7C(0, v3, 0); sub_0201D78C(¶m0[5], 0, v3, v1, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); - sub_0200B190(v2); + MessageLoader_Free(v2); Strbuf_Free(v3); Strbuf_Free(v4); sub_0200B3F0(v5); diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c index fa53ca394d..d415d27e4b 100644 --- a/src/overlay072/ov72_0223D7A0.c +++ b/src/overlay072/ov72_0223D7A0.c @@ -139,7 +139,7 @@ int ov72_0223D7A0 (UnkStruct_020067E8 * param0, int * param1) v0->unk_00 = sub_02018340(39); v1 = NARC_ctor(NARC_INDEX_GRAPHIC__MYSIGN, 39); v0->unk_10 = sub_0200B358(39); - v0->unk_14 = sub_0200B144(0, 26, 425, 39); + v0->unk_14 = MessageLoader_Init(0, 26, 425, 39); sub_02017DD4(4, 8); ov72_0223DA70(); @@ -238,7 +238,7 @@ int ov72_0223D984 (UnkStruct_020067E8 * param0, int * param1) sub_02002C60(2); ov72_0223DC6C(v0->unk_00); sub_0201E530(); - sub_0200B190(v0->unk_14); + MessageLoader_Free(v0->unk_14); sub_0200B3F0(v0->unk_10); ov72_0223DC34(v0); sub_02006830(param0); @@ -414,8 +414,8 @@ static void ov72_0223DB98 (UnkStruct_ov72_0223DB98 * param0) param0->unk_437E = 0; param0->unk_370 = 1; - sub_0200B1B8(param0->unk_14, 12, param0->unk_2C); - sub_0200B1B8(param0->unk_14, 9, param0->unk_30); + MessageLoader_GetStrbuf(param0->unk_14, 12, param0->unk_2C); + MessageLoader_GetStrbuf(param0->unk_14, 9, param0->unk_30); param0->unk_5D00 = sub_02015920(39); @@ -1103,7 +1103,7 @@ static void ov72_0223E930 (UnkStruct_ov72_0223DB98 * param0, int param1) v0 = Strbuf_Init((40 * 2), 39); - sub_0200B1B8(param0->unk_14, param1, v0); + MessageLoader_GetStrbuf(param0->unk_14, param1, v0); sub_0200C388(param0->unk_10, param0->unk_34, v0); Strbuf_Free(v0); sub_0201ADA4(¶m0->unk_338, 0xf0f); diff --git a/src/overlay073/ov73_021D0D80.c b/src/overlay073/ov73_021D0D80.c index 29335bd4f5..1cc822cd35 100644 --- a/src/overlay073/ov73_021D0D80.c +++ b/src/overlay073/ov73_021D0D80.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_020067E8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02015920_decl.h" @@ -79,7 +79,7 @@ typedef struct { UnkStruct_0200112C * unk_40; UnkStruct_02013A04 * unk_44; int unk_48; - UnkStruct_0200B144 * unk_4C; + MessageLoader * unk_4C; int unk_50; int unk_54; int unk_58; @@ -460,7 +460,7 @@ static void ov73_021D1238 (UnkStruct_ov73_021D1058 * param0) static void ov73_021D12C4 (UnkStruct_ov73_021D1058 * param0) { - param0->unk_4C = sub_0200B144(1, 26, 389, param0->unk_00); + param0->unk_4C = MessageLoader_Init(1, 26, 389, param0->unk_00); sub_0201D710(); @@ -475,7 +475,7 @@ static void ov73_021D1300 (UnkStruct_ov73_021D1058 * param0) { sub_0200B3F0(param0->unk_64); sub_02015760(param0->unk_60); - sub_0200B190(param0->unk_4C); + MessageLoader_Free(param0->unk_4C); } static void ov73_021D1318 (UnkStruct_ov73_021D1058 * param0) @@ -724,7 +724,7 @@ static BOOL ov73_021D1510 (UnkStruct_ov73_021D1058 * param0, u32 param1, int par param0->unk_5C = Strbuf_Init(0x400, param0->unk_00); - sub_0200B1B8(param0->unk_4C, param1, v1); + MessageLoader_GetStrbuf(param0->unk_4C, param1, v1); sub_0200B48C(param0->unk_64, 0, param0->unk_70->unk_18, param0->unk_84, 1, GAME_LANGUAGE); sub_0200B48C(param0->unk_64, 1, param0->unk_74->unk_18, 0, 1, GAME_LANGUAGE); sub_0200C388(param0->unk_64, param0->unk_5C, v1); @@ -849,7 +849,7 @@ static BOOL ov73_021D1784 (UnkStruct_ov73_021D1058 * param0, u32 param1, int par case 0: sub_02019120(0, 0); param0->unk_5C = Strbuf_Init(0x400, param0->unk_00); - sub_0200B1B8(param0->unk_4C, param1, param0->unk_5C); + MessageLoader_GetStrbuf(param0->unk_4C, param1, param0->unk_5C); if (param2 == 1) { v1 = Unk_ov72_021D37D4; @@ -2128,7 +2128,7 @@ static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) } { - Strbuf* v10 = sub_0200B1EC(param0->unk_4C, v9); + Strbuf* v10 = MessageLoader_GetNewStrbuf(param0->unk_4C, v9); Strbuf_Copy(param0->unk_74->unk_18, v10); Strbuf_Free(v10); diff --git a/src/overlay073/ov73_021D3250.c b/src/overlay073/ov73_021D3250.c index 5b7cef9951..529b55a367 100644 --- a/src/overlay073/ov73_021D3250.c +++ b/src/overlay073/ov73_021D3250.c @@ -4,7 +4,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_020067E8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" @@ -33,7 +33,7 @@ typedef struct { int unk_00; UnkStruct_02018340 * unk_04; - UnkStruct_0200B144 * unk_08; + MessageLoader * unk_08; int unk_0C; UnkStruct_0205AA50 unk_10; int unk_20; @@ -335,7 +335,7 @@ static void ov73_021D35F4 (UnkStruct_ov73_021D342C * param0) static void ov73_021D366C (UnkStruct_ov73_021D342C * param0) { - param0->unk_08 = sub_0200B144(1, 26, 607, param0->unk_00); + param0->unk_08 = MessageLoader_Init(1, 26, 607, param0->unk_00); sub_0201D710(); param0->unk_0C = 0; @@ -343,7 +343,7 @@ static void ov73_021D366C (UnkStruct_ov73_021D342C * param0) static void ov73_021D368C (UnkStruct_ov73_021D342C * param0) { - sub_0200B190(param0->unk_08); + MessageLoader_Free(param0->unk_08); } static const UnkStruct_ov61_0222C884 Unk_ov72_021D3A38 = { @@ -387,7 +387,7 @@ asm static BOOL ov73_021D3698 (UnkStruct_ov73_021D342C * param0, int param1, int ldr r0, [r4, #8] add r1, r7, #0 add r2, r5, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf add r1, r4, #0 ldr r0, [r4, #4] ldr r2, = Unk_ov72_021D3A38 diff --git a/src/overlay074/ov74_021D0D80.c b/src/overlay074/ov74_021D0D80.c index f2bbe27c3f..b18a1d7eb4 100644 --- a/src/overlay074/ov74_021D0D80.c +++ b/src/overlay074/ov74_021D0D80.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -64,7 +64,7 @@ typedef struct UnkStruct_ov74_021D0D80_t { UnkStruct_02018340 * unk_14; UnkStruct_0203D8EC unk_18; UnkStruct_020279FC * unk_1C; - UnkStruct_0200B144 * unk_20; + MessageLoader * unk_20; void * unk_24; NNSG2dScreenData * unk_28; UnkStruct_0205AA50 unk_2C[3]; @@ -285,7 +285,7 @@ static int ov74_021D1178 (UnkStruct_ov74_021D0D80 * param0) break; case 1: ov74_021D1390(param0); - param0->unk_20 = sub_0200B144(1, 26, 220, param0->unk_00); + param0->unk_20 = MessageLoader_Init(1, 26, 220, param0->unk_00); ov74_021D1720(param0); break; case 2: @@ -318,7 +318,7 @@ static int ov74_021D122C (UnkStruct_ov74_021D0D80 * param0) } } - sub_0200B190(param0->unk_20); + MessageLoader_Free(param0->unk_20); ov74_021D14E8(param0); ov74_021D135C(param0); break; @@ -560,7 +560,7 @@ static void ov74_021D1668 (UnkStruct_ov74_021D0D80 * param0) v4 = (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | (((15 & 0xff) << 0))); v6 = Strbuf_Init(256, param0->unk_00); - sub_0200B1B8(param0->unk_20, 0, v6); + MessageLoader_GetStrbuf(param0->unk_20, 0, v6); v1 = 2; sub_0201D78C(¶m0->unk_2C[0], 0, v6, v1, 2, 0, v5, NULL); @@ -569,7 +569,7 @@ static void ov74_021D1668 (UnkStruct_ov74_021D0D80 * param0) for (v2 = 0; v2 < 7; v2++) { Strbuf_Clear(v6); - sub_0200B1B8(param0->unk_20, v8[v2], v6); + MessageLoader_GetStrbuf(param0->unk_20, v8[v2], v6); sub_0201D78C(¶m0->unk_2C[1], 0, v6, v1, 16 * v2, 0xff, v3, NULL); } @@ -599,7 +599,7 @@ static void ov74_021D1720 (UnkStruct_ov74_021D0D80 * param0) param0->unk_5C[v0].unk_00 = v3[v0]; for (v1 = 0; v1 < v3[v0]; v1++) { - param0->unk_5C[v0].unk_04[v1] = sub_0200B1EC(param0->unk_20, v2[v0] + v1); + param0->unk_5C[v0].unk_04[v1] = MessageLoader_GetNewStrbuf(param0->unk_20, v2[v0] + v1); } } @@ -683,7 +683,7 @@ static void ov74_021D1968 (UnkStruct_ov74_021D0D80 * param0, u16 param1, BOOL pa v0 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0))); v1 = Strbuf_Init(256, param0->unk_00); - sub_0200B1B8(param0->unk_20, param1, v1); + MessageLoader_GetStrbuf(param0->unk_20, param1, v1); if (param2 == 0) { param0->unk_2AC = sub_0201D78C(¶m0->unk_2C[2], 1, v1, 4, 0, v2, v0, NULL); diff --git a/src/overlay075/ov75_021D0D80.c b/src/overlay075/ov75_021D0D80.c index 657dcad0cf..4270c92abb 100644 --- a/src/overlay075/ov75_021D0D80.c +++ b/src/overlay075/ov75_021D0D80.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -91,7 +91,7 @@ typedef struct { u8 unk_17; UnkStruct_02018340 * unk_18; UnkStruct_020978D8 * unk_1C; - UnkStruct_0200B144 * unk_20; + MessageLoader * unk_20; Strbuf* unk_24[3]; UnkStruct_02002F38 * unk_30; void * unk_34; @@ -282,7 +282,7 @@ static int ov75_021D0FA0 (UnkStruct_ov75_021D1184 * param0) v0 = Strbuf_Init((19 * 2 * 2), param0->unk_00); - sub_0200B1B8(param0->unk_20, 2, v0); + MessageLoader_GetStrbuf(param0->unk_20, 2, v0); sub_0201D78C(¶m0->unk_44[5], 1, v0, 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0)))), NULL); Strbuf_Free(v0); break; @@ -339,7 +339,7 @@ static int ov75_021D108C (UnkStruct_ov75_021D1184 * param0) sub_0201ADA4(&(param0->unk_44[5]), ((15 << 4) | 15)); v1 = Strbuf_Init((19 * 2 * 2), param0->unk_00); - sub_0200B1B8(param0->unk_20, 3, v1); + MessageLoader_GetStrbuf(param0->unk_20, 3, v1); param0->unk_0F = sub_0201D78C(¶m0->unk_44[5], 1, v1, 0, 0, param0->unk_10, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0)))), NULL); Strbuf_Free(v1); @@ -546,7 +546,7 @@ static int ov75_021D1434 (UnkStruct_ov75_021D1184 * param0) ov75_021D1CB8(param0); if (param0->unk_24 != NULL) { - sub_0200B190(param0->unk_20); + MessageLoader_Free(param0->unk_20); } ov75_021D19A8(param0); @@ -847,13 +847,13 @@ static void ov75_021D19C8 (UnkStruct_ov75_021D1184 * param0) Strbuf* v2; int v3; - param0->unk_20 = sub_0200B144(1, 26, 409, param0->unk_00); + param0->unk_20 = MessageLoader_Init(1, 26, 409, param0->unk_00); v2 = Strbuf_Init(8 * 2, param0->unk_00); for (v0 = 0; v0 < 2; v0++) { Strbuf_Clear(v2); - sub_0200B1B8(param0->unk_20, 0 + v0, v2); + MessageLoader_GetStrbuf(param0->unk_20, 0 + v0, v2); v3 = (8 * 8) - sub_02002D7C(1, v2, 0); v3 /= 2; diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c index fcb9982d65..0d57addfa3 100644 --- a/src/overlay076/ov76_0223B870.c +++ b/src/overlay076/ov76_0223B870.c @@ -3,7 +3,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -152,11 +152,11 @@ void ov76_0223B98C (UnkStruct_ov76_0223DE00 * param0, int param1, int param2, in Strbuf* v1; int v2; int v3; - UnkStruct_0200B144 * v4; + MessageLoader * v4; UnkStruct_0205AA50 v5; - v4 = sub_0200B144(0, 26, 8, 53); - v1 = sub_0200B1EC(v4, 5 + param1); + v4 = MessageLoader_Init(0, 26, 8, 53); + v1 = MessageLoader_GetNewStrbuf(v4, 5 + param1); { sub_0201A7A0(&v5); @@ -184,7 +184,7 @@ void ov76_0223B98C (UnkStruct_ov76_0223DE00 * param0, int param1, int param2, in sub_02012AC0(param0->unk_D4.unk_164[param1], param4); Strbuf_Free(v1); - sub_0200B190(v4); + MessageLoader_Free(v4); sub_0201A8FC(&v5); } @@ -504,16 +504,16 @@ void ov76_0223BF74 (UnkStruct_02018340 * param0, UnkStruct_0205AA50 * param1, in { int v9; Strbuf* v10; - UnkStruct_0200B144 * v11 = sub_0200B144(0, 26, 8, 53); + MessageLoader * v11 = MessageLoader_Init(0, 26, 8, 53); for (v9 = 0; v9 < v7; v9++) { - v10 = sub_0200B1EC(v11, Unk_ov76_0223EF3C[v8[v9]].unk_00); + v10 = MessageLoader_GetNewStrbuf(v11, Unk_ov76_0223EF3C[v8[v9]].unk_00); sub_02013A6C(param3->unk_D4.unk_C8, v10, Unk_ov76_0223EF3C[v8[v9]].unk_04); Strbuf_Free(v10); } - sub_0200B190(v11); + MessageLoader_Free(v11); } v0.unk_00 = param3->unk_D4.unk_C8; @@ -937,7 +937,7 @@ void ov76_0223C974 (UnkStruct_02018340 * param0, UnkStruct_02002F38 * param1, in void ov76_0223CA30 (UnkStruct_0205AA50 * param0, int param1) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; Strbuf* v1; if (param1 == 0xFFFF) { @@ -946,14 +946,14 @@ void ov76_0223CA30 (UnkStruct_0205AA50 * param0, int param1) return; } - v0 = sub_0200B144(0, 26, 8, 53); - v1 = sub_0200B1EC(v0, param1); + v0 = MessageLoader_Init(0, 26, 8, 53); + v1 = MessageLoader_GetNewStrbuf(v0, param1); sub_0201ADA4(param0, 15); sub_0201D738(param0, 1, v1, 0, 0, 0, NULL); sub_0201A954(param0); Strbuf_Free(v1); - sub_0200B190(v0); + MessageLoader_Free(v0); } void ov76_0223CA98 (UnkStruct_02018340 * param0, UnkStruct_0205AA50 * param1, int param2, int param3, int param4, int param5, int param6, int param7) @@ -1059,7 +1059,7 @@ void ov76_0223CDA4 (UnkStruct_ov76_0223DE00 * param0) void ov76_0223CDC4 (UnkStruct_0205AA50 * param0, int param1) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; Strbuf* v1; if (param1 == 0xFFFF) { @@ -1068,14 +1068,14 @@ void ov76_0223CDC4 (UnkStruct_0205AA50 * param0, int param1) return; } - v0 = sub_0200B144(0, 26, 12, 53); - v1 = sub_0200B1EC(v0, param1); + v0 = MessageLoader_Init(0, 26, 12, 53); + v1 = MessageLoader_GetNewStrbuf(v0, param1); sub_0201ADA4(param0, 15); sub_0201D738(param0, 1, v1, 0, 0, 0, NULL); sub_0201A954(param0); Strbuf_Free(v1); - sub_0200B190(v0); + MessageLoader_Free(v0); } void ov76_0223CE2C (void) diff --git a/src/overlay077/ov77_021D0D80.c b/src/overlay077/ov77_021D0D80.c index 61ee08c63d..29c353416d 100644 --- a/src/overlay077/ov77_021D0D80.c +++ b/src/overlay077/ov77_021D0D80.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020203AC_decl.h" #include "strbuf.h" @@ -1261,24 +1261,24 @@ static void ov77_021D2214 (UnkStruct_02018340 * param0, int param1, UnkStruct_ov sub_0201975C(4, 0x0); { - UnkStruct_0200B144 * v4; + MessageLoader * v4; Strbuf* v5; u32 v6; sub_02019690(4, 32, 0, param1); - v4 = sub_0200B144(1, 26, 609, param1); + v4 = MessageLoader_Init(1, 26, 609, param1); v5 = Strbuf_Init(64, param1); sub_0201A8D4(param0, ¶m2->unk_22C, &Unk_ov77_021D72D0); sub_0201AE78(¶m2->unk_22C, 0, 0, 0, 28 * 8, 2 * 8); - sub_0200B1B8(v4, 0, v5); + MessageLoader_GetStrbuf(v4, 0, v5); v6 = sub_02002EEC(0, v5, 1, param2->unk_22C.unk_07 * 8); sub_0201D7E0(¶m2->unk_22C, 0, v5, v6, 0, 0, (u32)(((1 & 0xff) << 16) | ((1 & 0xff) << 8) | (((0 & 0xff) << 0))), 1, 0, NULL); Strbuf_Free(v5); - sub_0200B190(v4); + MessageLoader_Free(v4); { u16 v7 = 0x15; diff --git a/src/overlay078/ov78_021D0D80.c b/src/overlay078/ov78_021D0D80.c index aac00e7545..3fb55ff196 100644 --- a/src/overlay078/ov78_021D0D80.c +++ b/src/overlay078/ov78_021D0D80.c @@ -10,7 +10,7 @@ #include "struct_decls/struct_02007C7C_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02015064_decl.h" #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" @@ -1241,40 +1241,40 @@ 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; + MessageLoader * v0; Strbuf* v1; u8 v2; - v0 = sub_0200B144(0, 26, param2, param1); + v0 = MessageLoader_Init(0, 26, param2, param1); GF_ASSERT(v0); - v1 = sub_0200B1EC(v0, param3); + v1 = MessageLoader_GetNewStrbuf(v0, param3); sub_0201ADA4(param0, 15); v2 = sub_0201D78C(param0, 1, v1, 0, 0, param5, param4, NULL); sub_0200E060(param0, 0, 512, 0); Strbuf_Free(v1); - sub_0200B190(v0); + MessageLoader_Free(v0); return v2; } static u8 ov78_021D201C (UnkStruct_0205AA50 * param0, int param1, int param2, int param3, u32 param4, u32 param5, Strbuf **param6) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; u8 v1; GF_ASSERT((*param6) == NULL); - v0 = sub_0200B144(0, 26, param2, param1); + v0 = MessageLoader_Init(0, 26, param2, param1); GF_ASSERT(v0); - *param6 = sub_0200B1EC(v0, param3); + *param6 = MessageLoader_GetNewStrbuf(v0, param3); sub_0201ADA4(param0, 15); v1 = sub_0201D78C(param0, 1, *param6, 0, 0, param5, param4, NULL); sub_0200E060(param0, 0, 512, 0); - sub_0200B190(v0); + MessageLoader_Free(v0); return v1; } @@ -1722,17 +1722,17 @@ 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; + MessageLoader * v0; Strbuf* v1; - v0 = sub_0200B144(0, 26, param2, param1); + v0 = MessageLoader_Init(0, 26, param2, param1); GF_ASSERT(v0); - v1 = sub_0200B1EC(v0, param3); + v1 = MessageLoader_GetNewStrbuf(v0, param3); sub_0201ADA4(param0, (((param4) >> 0) & 0xff)); sub_0201D78C(param0, 0, v1, 1, 0, 0xff, param4, NULL); Strbuf_Free(v1); - sub_0200B190(v0); + MessageLoader_Free(v0); } static void ov78_021D2904 (UnkStruct_ov78_021D107C * param0) diff --git a/src/overlay079/ov79_021D0D80.c b/src/overlay079/ov79_021D0D80.c index 41d7d99a4d..9c5cbfb191 100644 --- a/src/overlay079/ov79_021D0D80.c +++ b/src/overlay079/ov79_021D0D80.c @@ -690,25 +690,25 @@ static void ov79_021D1568 (UnkStruct_ov79_021D0E1C * param0) sub_02002BB8(2, param0->unk_00); - param0->unk_2C = sub_0200B144(0, 26, 463, param0->unk_00); + param0->unk_2C = MessageLoader_Init(0, 26, 463, param0->unk_00); param0->unk_28 = sub_020158A8(param0->unk_00); param0->unk_30.unk_00 = sub_0200B368(2, 64, param0->unk_00); param0->unk_30.unk_04 = Strbuf_Init(64, param0->unk_00); - param0->unk_30.unk_08 = sub_0200B1EC(param0->unk_2C, 6); - param0->unk_30.unk_0C = sub_0200B1EC(param0->unk_2C, 22); - param0->unk_30.unk_10 = sub_0200B1EC(param0->unk_2C, 4); - param0->unk_30.unk_14 = sub_0200B1EC(param0->unk_2C, 7); - param0->unk_30.unk_18 = sub_0200B1EC(param0->unk_2C, 8); - param0->unk_30.unk_1C = sub_0200B1EC(param0->unk_2C, 0); + param0->unk_30.unk_08 = MessageLoader_GetNewStrbuf(param0->unk_2C, 6); + param0->unk_30.unk_0C = MessageLoader_GetNewStrbuf(param0->unk_2C, 22); + param0->unk_30.unk_10 = MessageLoader_GetNewStrbuf(param0->unk_2C, 4); + param0->unk_30.unk_14 = MessageLoader_GetNewStrbuf(param0->unk_2C, 7); + param0->unk_30.unk_18 = MessageLoader_GetNewStrbuf(param0->unk_2C, 8); + param0->unk_30.unk_1C = MessageLoader_GetNewStrbuf(param0->unk_2C, 0); for (v0 = 0; v0 < 6; v0++) { - param0->unk_30.unk_20[v0] = sub_0200B1EC(param0->unk_2C, 11 + v0); + param0->unk_30.unk_20[v0] = MessageLoader_GetNewStrbuf(param0->unk_2C, 11 + v0); if (v0 >= 5) { break; } - param0->unk_30.unk_38[v0] = sub_0200B1EC(param0->unk_2C, 17 + v0); + param0->unk_30.unk_38[v0] = MessageLoader_GetNewStrbuf(param0->unk_2C, 17 + v0); } param0->unk_30.unk_4C = sub_02027AC0(param0->unk_20->unk_18); @@ -737,7 +737,7 @@ static void ov79_021D1618 (UnkStruct_ov79_021D0E1C * param0) Strbuf_Free(param0->unk_30.unk_04); sub_0200B3F0(param0->unk_30.unk_00); sub_020158F4(param0->unk_28); - sub_0200B190(param0->unk_2C); + MessageLoader_Free(param0->unk_2C); sub_02002C60(2); } diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c index cb1ed8b90b..d2d4308c9f 100644 --- a/src/overlay079/ov79_021D2268.c +++ b/src/overlay079/ov79_021D2268.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007C7C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -113,7 +113,7 @@ typedef struct { u16 unk_0E; UnkStruct_02098DE8 * unk_10; UnkStruct_020158A8 * unk_14; - UnkStruct_0200B144 * unk_18; + MessageLoader * unk_18; UnkStruct_ov79_021D2928_sub1 unk_1C; UnkStruct_ov79_021D38D0 unk_30; UnkStruct_ov79_021D3820 unk_40; @@ -502,12 +502,12 @@ static void ov79_021D2768 (UnkStruct_ov79_021D2928 * param0) { int v0 = 0; - param0->unk_18 = sub_0200B144(0, 26, 462, param0->unk_00); + param0->unk_18 = MessageLoader_Init(0, 26, 462, param0->unk_00); param0->unk_1C.unk_00 = sub_0200B368(1, 64, param0->unk_00); param0->unk_1C.unk_04 = Strbuf_Init(64, param0->unk_00); for (v0 = 0; v0 < 3; v0++) { - param0->unk_1C.unk_08[v0] = sub_0200B1EC(param0->unk_18, v0); + param0->unk_1C.unk_08[v0] = MessageLoader_GetNewStrbuf(param0->unk_18, v0); } } @@ -521,7 +521,7 @@ static void ov79_021D27AC (UnkStruct_ov79_021D2928 * param0) Strbuf_Free(param0->unk_1C.unk_04); sub_0200B3F0(param0->unk_1C.unk_00); - sub_0200B190(param0->unk_18); + MessageLoader_Free(param0->unk_18); } static void ov79_021D27D8 (UnkStruct_ov79_021D2928 * param0) diff --git a/src/overlay080/ov80_021D0D80.c b/src/overlay080/ov80_021D0D80.c index 2978f98df2..a614a2b422 100644 --- a/src/overlay080/ov80_021D0D80.c +++ b/src/overlay080/ov80_021D0D80.c @@ -222,8 +222,8 @@ static int ov80_021D0EC8 (UnkStruct_ov80_021D2A08 * param0) param0->unk_18 = param0->unk_20; param0->unk_1C = param0->unk_24; - param0->unk_80 = sub_0200B144(1, 26, 433, param0->unk_04); - param0->unk_84 = sub_0200B144(1, 26, 615, param0->unk_04); + param0->unk_80 = MessageLoader_Init(1, 26, 433, param0->unk_04); + param0->unk_84 = MessageLoader_Init(1, 26, 615, param0->unk_04); param0->unk_88 = Strbuf_Init(22, param0->unk_04); param0->unk_30 = sub_02039EBC(param0->unk_04); param0->unk_40 = ov80_021D2D70("data/tmap_block.dat", param0->unk_04); @@ -269,8 +269,8 @@ static void ov80_021D0FF4 (UnkStruct_ov80_021D2A08 * param0) ov80_021D2E10(param0->unk_40); sub_02039EF0(param0->unk_30); Strbuf_Free(param0->unk_88); - sub_0200B190(param0->unk_84); - sub_0200B190(param0->unk_80); + MessageLoader_Free(param0->unk_84); + MessageLoader_Free(param0->unk_80); } static void ov80_021D1068 (UnkStruct_ov80_021D2A08 * param0) diff --git a/src/overlay080/ov80_021D1458.c b/src/overlay080/ov80_021D1458.c index cdc1181c95..d3ce23ea1a 100644 --- a/src/overlay080/ov80_021D1458.c +++ b/src/overlay080/ov80_021D1458.c @@ -578,7 +578,7 @@ static void ov80_021D1AB0 (UnkStruct_ov80_021D2A08 * param0, UnkStruct_0205AA50 } if (param0->unk_00 == 1) { - Strbuf* v3 = sub_0200B1EC(param0->unk_84, 0); + Strbuf* v3 = MessageLoader_GetNewStrbuf(param0->unk_84, 0); sub_0201D78C(param1, 0, v3, 0, 6, 0xff, v1, NULL); Strbuf_Free(v3); @@ -605,13 +605,13 @@ static void ov80_021D1B5C (UnkStruct_ov80_021D2A08 * param0, UnkStruct_0205AA50 sub_0201ADA4(param1, 0); if ((param2->unk_08 != 0xFFFF) && ((param0->unk_2C->unk_5C[param2->unk_16].val1_0 == 0) || param0->unk_2C->unk_5C[param2->unk_16].val1_2)) { - v2 = sub_0200B1EC(param0->unk_84, param2->unk_08); + v2 = MessageLoader_GetNewStrbuf(param0->unk_84, param2->unk_08); sub_0201D78C(param1, 0, v2, param2->unk_0C, param2->unk_0E, 0xff, v1, NULL); Strbuf_Free(v2); } if ((param2->unk_0A != 0xFFFF) && ((param0->unk_2C->unk_5C[param2->unk_16].val1_4 == 0) || param0->unk_2C->unk_5C[param2->unk_16].val1_6)) { - v3 = sub_0200B1EC(param0->unk_84, param2->unk_0A); + v3 = MessageLoader_GetNewStrbuf(param0->unk_84, param2->unk_0A); sub_0201D78C(param1, 0, v3, param2->unk_10, param2->unk_12, 0xff, v1, NULL); Strbuf_Free(v3); } @@ -705,7 +705,7 @@ static void ov80_021D1D6C (UnkStruct_ov80_021D2A08 * param0, UnkStruct_0205AA50 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); - v2 = sub_0200B1EC(param0->unk_84, 1); + v2 = MessageLoader_GetNewStrbuf(param0->unk_84, 1); v0 = (10 * 8) - sub_02002D7C(0, v2, 0); v0 /= 2; v1 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)); diff --git a/src/overlay081/ov81_021D0D80.c b/src/overlay081/ov81_021D0D80.c index e02f078a07..0d92529abf 100644 --- a/src/overlay081/ov81_021D0D80.c +++ b/src/overlay081/ov81_021D0D80.c @@ -318,14 +318,14 @@ static void ov81_021D1050 (UnkStruct_ov81_021D1610 * param0) static void ov81_021D1130 (UnkStruct_ov81_021D1610 * param0) { - param0->unk_50 = sub_0200B144(0, 26, 366, 42); + param0->unk_50 = MessageLoader_Init(0, 26, 366, 42); param0->unk_54 = sub_0200B358(42); param0->unk_58 = Strbuf_Init(128, 42); } static void ov81_021D115C (UnkStruct_ov81_021D1610 * param0) { - sub_0200B190(param0->unk_50); + MessageLoader_Free(param0->unk_50); sub_0200B3F0(param0->unk_54); Strbuf_Free(param0->unk_58); } diff --git a/src/overlay081/ov81_021D1610.c b/src/overlay081/ov81_021D1610.c index f9c1cdb443..a1e0f6caa3 100644 --- a/src/overlay081/ov81_021D1610.c +++ b/src/overlay081/ov81_021D1610.c @@ -156,7 +156,7 @@ static u8 ov81_021D16B0 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * return 0; } - v1 = sub_0200B1EC(param0->unk_50, 1); + v1 = MessageLoader_GetNewStrbuf(param0->unk_50, 1); sub_0200C2E0(param0->unk_54, 0, v0.unk_00_7); sub_0200B60C(param0->unk_54, 1, v0.unk_00_14, 2, 0, 1); @@ -165,11 +165,11 @@ static u8 ov81_021D16B0 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * sub_0201D78C(param1, 0, param0->unk_58, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); v2 = sub_02002D7C(0, param0->unk_58, 0); - v1 = sub_0200B1EC(param0->unk_50, 2 + v0.unk_00_11); + v1 = MessageLoader_GetNewStrbuf(param0->unk_50, 2 + v0.unk_00_11); sub_0201D78C(param1, 0, v1, v2 + 12, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_50, 0); + v1 = MessageLoader_GetNewStrbuf(param0->unk_50, 0); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(v0.unk_00_19)); sub_0200C388(param0->unk_54, param0->unk_58, v1); @@ -338,18 +338,18 @@ static void ov81_021D1AD4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 { Strbuf* v3; - v3 = sub_0200B010(26, 433, sub_0203A138(v0.unk_02), 42); + v3 = MessageBank_GetNewStrbufFromNARC(26, 433, sub_0203A138(v0.unk_02), 42); v2 = Strbuf_Length(v3); Strbuf_Free(v3); if (sub_02079220(v0.unk_00_1, 1) == 63) { - v3 = sub_0200B1EC(param0->unk_50, 61); + v3 = MessageLoader_GetNewStrbuf(param0->unk_50, 61); sub_0200B4BC(param0->unk_54, 1, param0->unk_4C); sub_0200C388(param0->unk_54, param0->unk_58, v3); v2 += Strbuf_Length(param0->unk_58); Strbuf_Free(v3); } else { - v3 = sub_0200B010(26, 618, v0.unk_00_1, 42); + v3 = MessageBank_GetNewStrbufFromNARC(26, 618, v0.unk_00_1, 42); v2 += Strbuf_Length(v3); Strbuf_Free(v3); sub_0200BA08(param0->unk_54, 1, v0.unk_00_1); @@ -357,13 +357,13 @@ static void ov81_021D1AD4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 } if (v2 <= 14) { - v1 = sub_0200B1EC(param0->unk_50, 57); + v1 = MessageLoader_GetNewStrbuf(param0->unk_50, 57); } else if (v2 <= 16) { - v1 = sub_0200B1EC(param0->unk_50, 58); + v1 = MessageLoader_GetNewStrbuf(param0->unk_50, 58); } else if (v2 <= 19) { - v1 = sub_0200B1EC(param0->unk_50, 59); + v1 = MessageLoader_GetNewStrbuf(param0->unk_50, 59); } else { - v1 = sub_0200B1EC(param0->unk_50, 60); + v1 = MessageLoader_GetNewStrbuf(param0->unk_50, 60); } sub_0200B8C8(param0->unk_54, 0, sub_0203A138(v0.unk_02)); @@ -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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 9); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 10); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 11); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 12); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 13); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 14); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 15); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 16); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 17); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 18); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 19); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 20); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 21); + Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 21); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -585,9 +585,9 @@ static void ov81_021D219C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 v1 = param2->unk_02; if ((v1 == 47) || (v1 == 64) || (v1 == 49)) { - v0 = sub_0200B1EC(param0->unk_50, 23); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 23); } else { - v0 = sub_0200B1EC(param0->unk_50, 22); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 22); } sub_0200B8C8(param0->unk_54, 0, v1); @@ -604,9 +604,9 @@ static void ov81_021D2208 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 v1 = param2->unk_02; if (sub_0202C6A4(v1) == 0) { - v0 = sub_0200B1EC(param0->unk_50, 23); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 23); } else { - v0 = sub_0200B1EC(param0->unk_50, 24); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 24); } sub_0200B8C8(param0->unk_54, 0, v1); @@ -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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 30); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 31); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 34); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 40); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 35); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 36); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 43); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 38); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 37); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 42); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 41); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 39); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 46); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 44); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 45); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 47); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 48); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 32); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 33); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(v0); @@ -815,7 +815,7 @@ static void ov81_021D285C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 break; } - v1 = sub_0200B1EC(param0->unk_50, v0); + v1 = MessageLoader_GetNewStrbuf(param0->unk_50, v0); sub_0201D78C(param1, 0, v1, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); } @@ -835,18 +835,18 @@ static void ov81_021D2908 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 switch (param2->unk_01_0) { case 0: - v0 = sub_0200B1EC(param0->unk_50, 49); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 49); break; case 1: - v0 = sub_0200B1EC(param0->unk_50, 50); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 50); break; default: if (param2->unk_01_6 == 0) { - v0 = sub_0200B1EC(param0->unk_50, 51); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 51); } else if (param2->unk_01_6 == 1) { - v0 = sub_0200B1EC(param0->unk_50, 52); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 52); } else { - v0 = sub_0200B1EC(param0->unk_50, 49); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 49); } } @@ -864,18 +864,18 @@ static void ov81_021D29B4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 switch (param2->unk_01_0) { case 0: - v0 = sub_0200B1EC(param0->unk_50, 53); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 53); break; case 1: - v0 = sub_0200B1EC(param0->unk_50, 54); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 54); break; default: if (param2->unk_01_6 == 0) { - v0 = sub_0200B1EC(param0->unk_50, 55); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 55); } else if (param2->unk_01_6 == 1) { - v0 = sub_0200B1EC(param0->unk_50, 56); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 56); } else { - v0 = sub_0200B1EC(param0->unk_50, 53); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 53); } } @@ -902,14 +902,14 @@ static void ov81_021D2A9C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 switch (param2->unk_01_0) { case 0: - v0 = sub_0200B1EC(param0->unk_50, 62); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 62); break; case 1: - v0 = sub_0200B1EC(param0->unk_50, 63); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 63); break; case 2: default: - v0 = sub_0200B1EC(param0->unk_50, 64); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 64); break; } @@ -925,14 +925,14 @@ static void ov81_021D2B20 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 switch (param2->unk_01_0) { case 0: - v0 = sub_0200B1EC(param0->unk_50, 65); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 65); break; case 1: - v0 = sub_0200B1EC(param0->unk_50, 66); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 66); break; case 2: default: - v0 = sub_0200B1EC(param0->unk_50, 67); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 67); break; } @@ -948,14 +948,14 @@ static void ov81_021D2BA4 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 switch (param2->unk_01_0) { case 0: - v0 = sub_0200B1EC(param0->unk_50, 68); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 68); break; case 1: - v0 = sub_0200B1EC(param0->unk_50, 69); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 69); break; case 2: default: - v0 = sub_0200B1EC(param0->unk_50, 70); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 70); break; } @@ -972,14 +972,14 @@ static void ov81_021D2C38 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 switch (param2->unk_01_0) { case 0: - v0 = sub_0200B1EC(param0->unk_50, 71); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 71); break; case 1: - v0 = sub_0200B1EC(param0->unk_50, 72); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 72); break; case 2: default: - v0 = sub_0200B1EC(param0->unk_50, 73); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 73); break; } @@ -995,14 +995,14 @@ static void ov81_021D2CBC (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 switch (param2->unk_01_0) { case 0: - v0 = sub_0200B1EC(param0->unk_50, 74); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 74); break; case 1: - v0 = sub_0200B1EC(param0->unk_50, 75); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 75); break; case 2: default: - v0 = sub_0200B1EC(param0->unk_50, 76); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 76); break; } @@ -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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 77); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 78); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 79); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 80); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 81); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(v0); @@ -1066,14 +1066,14 @@ static void ov81_021D2EEC (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 switch (param2->unk_01_0) { case 0: - v0 = sub_0200B1EC(param0->unk_50, 82); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 82); break; case 1: - v0 = sub_0200B1EC(param0->unk_50, 83); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 83); break; case 2: default: - v0 = sub_0200B1EC(param0->unk_50, 84); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 84); break; } @@ -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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 85); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 87); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 88); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 89); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 94); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 86); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(v0); @@ -1157,14 +1157,14 @@ static void ov81_021D312C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 break; } - v0 = sub_0200B1EC(param0->unk_50, v1); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, v1); 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); Strbuf_Free(v0); } static void ov81_021D3190 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 95); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 96); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 97); + Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 97); sub_0200C0B0(param0->unk_54, 0, param2->unk_01_0); sub_0200C388(param0->unk_54, param0->unk_58, v0); @@ -1213,14 +1213,14 @@ static void ov81_021D32A0 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 break; } - v0 = sub_0200B1EC(param0->unk_50, v1); + v0 = MessageLoader_GetNewStrbuf(param0->unk_50, v1); 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); Strbuf_Free(v0); } static void ov81_021D3304 (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0202BFCC * param2, u8 param3) { - Strbuf* v0 = sub_0200B1EC(param0->unk_50, 102); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); Strbuf_Free(v0); diff --git a/src/overlay083/ov83_0223C958.c b/src/overlay083/ov83_0223C958.c index 54bd27302f..c006663821 100644 --- a/src/overlay083/ov83_0223C958.c +++ b/src/overlay083/ov83_0223C958.c @@ -378,27 +378,27 @@ static void ov83_0223CF2C (UnkStruct_ov83_0223B784 * param0) { int v0; - param0->unk_15E0.unk_00 = sub_0200B144(0, 26, 464, param0->unk_00); + param0->unk_15E0.unk_00 = MessageLoader_Init(0, 26, 464, param0->unk_00); param0->unk_15E0.unk_04 = sub_0200B368(4, 64, param0->unk_00); param0->unk_15E0.unk_08 = Strbuf_Init(64, param0->unk_00); - param0->unk_15E0.unk_0C = sub_0200B1EC(param0->unk_15E0.unk_00, 0); - param0->unk_15E0.unk_10 = sub_0200B1EC(param0->unk_15E0.unk_00, 1); - param0->unk_15E0.unk_14 = sub_0200B1EC(param0->unk_15E0.unk_00, 2); - param0->unk_15E0.unk_18 = sub_0200B1EC(param0->unk_15E0.unk_00, 20); - param0->unk_15E0.unk_1C = sub_0200B1EC(param0->unk_15E0.unk_00, 21); - param0->unk_15E0.unk_20 = sub_0200B1EC(param0->unk_15E0.unk_00, 22); - param0->unk_15E0.unk_24 = sub_0200B1EC(param0->unk_15E0.unk_00, 23); - param0->unk_15E0.unk_28 = sub_0200B1EC(param0->unk_15E0.unk_00, 24); - param0->unk_15E0.unk_2C = sub_0200B1EC(param0->unk_15E0.unk_00, 25); - param0->unk_15E0.unk_30 = sub_0200B1EC(param0->unk_15E0.unk_00, 8); - param0->unk_15E0.unk_34 = sub_0200B1EC(param0->unk_15E0.unk_00, 9); + param0->unk_15E0.unk_0C = MessageLoader_GetNewStrbuf(param0->unk_15E0.unk_00, 0); + param0->unk_15E0.unk_10 = MessageLoader_GetNewStrbuf(param0->unk_15E0.unk_00, 1); + param0->unk_15E0.unk_14 = MessageLoader_GetNewStrbuf(param0->unk_15E0.unk_00, 2); + param0->unk_15E0.unk_18 = MessageLoader_GetNewStrbuf(param0->unk_15E0.unk_00, 20); + param0->unk_15E0.unk_1C = MessageLoader_GetNewStrbuf(param0->unk_15E0.unk_00, 21); + param0->unk_15E0.unk_20 = MessageLoader_GetNewStrbuf(param0->unk_15E0.unk_00, 22); + param0->unk_15E0.unk_24 = MessageLoader_GetNewStrbuf(param0->unk_15E0.unk_00, 23); + param0->unk_15E0.unk_28 = MessageLoader_GetNewStrbuf(param0->unk_15E0.unk_00, 24); + param0->unk_15E0.unk_2C = MessageLoader_GetNewStrbuf(param0->unk_15E0.unk_00, 25); + param0->unk_15E0.unk_30 = MessageLoader_GetNewStrbuf(param0->unk_15E0.unk_00, 8); + param0->unk_15E0.unk_34 = MessageLoader_GetNewStrbuf(param0->unk_15E0.unk_00, 9); for (v0 = 0; v0 < 5; v0++) { - param0->unk_15E0.unk_38[v0] = sub_0200B1EC(param0->unk_15E0.unk_00, 3 + v0); + param0->unk_15E0.unk_38[v0] = MessageLoader_GetNewStrbuf(param0->unk_15E0.unk_00, 3 + v0); } for (v0 = 0; v0 < 10; v0++) { - param0->unk_15E0.unk_4C[v0] = sub_0200B1EC(param0->unk_15E0.unk_00, 10 + v0); + param0->unk_15E0.unk_4C[v0] = MessageLoader_GetNewStrbuf(param0->unk_15E0.unk_00, 10 + v0); } } @@ -428,5 +428,5 @@ static void ov83_0223D068 (UnkStruct_ov83_0223B784 * param0) Strbuf_Free(param0->unk_15E0.unk_08); sub_0200B3F0(param0->unk_15E0.unk_04); - sub_0200B190(param0->unk_15E0.unk_00); + MessageLoader_Free(param0->unk_15E0.unk_00); } diff --git a/src/overlay084/ov84_0223B5A0.c b/src/overlay084/ov84_0223B5A0.c index 6ba3bdc6d4..4ac8a6df7f 100644 --- a/src/overlay084/ov84_0223B5A0.c +++ b/src/overlay084/ov84_0223B5A0.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_020067E8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" @@ -590,9 +590,9 @@ int ov84_0223B900 (UnkStruct_020067E8 * param0, int * param1) ov84_0223C178(v0); Strbuf_Free(v0->unk_3F8); - sub_0200B190(v0->unk_120); - sub_0200B190(v0->unk_11C); - sub_0200B190(v0->unk_114); + MessageLoader_Free(v0->unk_120); + MessageLoader_Free(v0->unk_11C); + MessageLoader_Free(v0->unk_114); sub_0200C560(v0->unk_110); sub_0200B3F0(v0->unk_118); NARC_dtor(v0->unk_D4); @@ -842,11 +842,11 @@ static void ov84_0223BC1C (UnkStruct_ov84_0223B5A0 * param0) static void ov84_0223BDB4 (UnkStruct_ov84_0223B5A0 * param0) { - param0->unk_114 = sub_0200B144(0, 26, 7, 6); + param0->unk_114 = MessageLoader_Init(0, 26, 7, 6); param0->unk_110 = sub_0200C440(1, 2, 0, 6); param0->unk_118 = sub_0200B358(6); - param0->unk_11C = sub_0200B144(0, 26, 392, 6); - param0->unk_120 = sub_0200B144(0, 26, 647, 6); + param0->unk_11C = MessageLoader_Init(0, 26, 392, 6); + param0->unk_120 = MessageLoader_Init(0, 26, 647, 6); param0->unk_3F8 = Strbuf_Init(256, 6); } @@ -874,14 +874,14 @@ u16 ov84_0223BE5C (UnkStruct_ov84_0223B5A0 * param0, u16 param1, u16 param2) return v0->unk_00[param1].quantity; } -static void ov84_0223BE84 (UnkStruct_0200B144 * param0, Strbuf *param1, u16 param2, u32 param3) +static void ov84_0223BE84 (MessageLoader * param0, Strbuf *param1, u16 param2, u32 param3) { - sub_0200B1B8(param0, param2, param1); + MessageLoader_GetStrbuf(param0, param2, param1); } -static void ov84_0223BE94 (UnkStruct_0200B144 * param0, Strbuf *param1, u16 param2, u32 param3) +static void ov84_0223BE94 (MessageLoader * param0, Strbuf *param1, u16 param2, u32 param3) { - sub_0200B1B8(param0, Item_MoveForTMHM(param2), param1); + MessageLoader_GetStrbuf(param0, Item_MoveForTMHM(param2), param1); } static void ov84_0223BEAC (UnkStruct_ov84_0223B5A0 * param0) @@ -2200,9 +2200,9 @@ static int ov84_0223DA14 (UnkStruct_ov84_0223B5A0 * param0) sub_0200B630(param0->unk_118, 0, v0); if (Item_IsHMMove(v0) == 1) { - sub_0200B1B8(param0->unk_114, 59, param0->unk_3F8); + MessageLoader_GetStrbuf(param0->unk_114, 59, param0->unk_3F8); } else { - sub_0200B1B8(param0->unk_114, 58, param0->unk_3F8); + MessageLoader_GetStrbuf(param0->unk_114, 58, param0->unk_3F8); } } sub_0201ADA4(¶m0->unk_04[6], 15); @@ -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) { - Strbuf* v1 = sub_0200B1EC(param0->unk_114, 60); + Strbuf* v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 60); sub_0201ADA4(¶m0->unk_04[6], 15); sub_0200C388(param0->unk_118, param0->unk_3F8, v1); @@ -2289,11 +2289,11 @@ static BOOL ov84_0223DBF4 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) sub_0200B70C(param0->unk_118, 1, param1); if (param1 == 68) { - v0 = sub_0200B1EC(param0->unk_114, 64); + v0 = MessageLoader_GetNewStrbuf(param0->unk_114, 64); ov84_0223BA04(param0, 1); param0->unk_488 = 0; } else if (param1 == 69) { - v0 = sub_0200B1EC(param0->unk_114, 63); + v0 = MessageLoader_GetNewStrbuf(param0->unk_114, 63); ov84_0223BA04(param0, 2); param0->unk_488 = 0; } else if ((param1 == 77) || (param1 == 76) || (param1 == 79)) { @@ -2314,7 +2314,7 @@ static Strbuf* ov84_0223DC9C (UnkStruct_ov84_0223B5A0 * param0, u16 param1) if (sub_0202D9D8(ov84_0223B9E4(param0)) == 0) { param0->unk_488 = 0; - return sub_0200B1EC(param0->unk_114, 62); + return MessageLoader_GetNewStrbuf(param0->unk_114, 62); } v0 = Item_LoadParam(param1, 2, 6); @@ -2322,7 +2322,7 @@ static Strbuf* ov84_0223DC9C (UnkStruct_ov84_0223B5A0 * param0, u16 param1) param0->unk_488 = 1; sub_02005748(1536); - return sub_0200B1EC(param0->unk_114, 61); + return MessageLoader_GetNewStrbuf(param0->unk_114, 61); } static void ov84_0223DCF8 (UnkStruct_ov84_0223B5A0 * param0) @@ -2478,7 +2478,7 @@ static int ov84_0223E01C (UnkStruct_ov84_0223B5A0 * param0) switch (v0) { case 0: { - Strbuf* v1 = sub_0200B1EC(param0->unk_114, 53); + Strbuf* v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 53); if (param0->unk_488 == 1) { sub_0200B70C(param0->unk_118, 0, param0->unk_C4->unk_66); @@ -2602,7 +2602,7 @@ static int ov84_0223E27C (UnkStruct_ov84_0223B5A0 * param0) sub_0200E060(¶m0->unk_04[6], 0, 1024 - 9 - (18 + 12), 12); sub_0200B70C(param0->unk_118, 0, param0->unk_C4->unk_66); - v1 = sub_0200B1EC(param0->unk_114, 46); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 46); sub_0200C388(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); @@ -2669,7 +2669,7 @@ static int ov84_0223E3BC (UnkStruct_ov84_0223B5A0 * param0) param0->unk_48C = Item_LoadParam(param0->unk_C4->unk_66, 0, 6); if ((Item_LoadParam(param0->unk_C4->unk_66, 3, 6) != 0) || (param0->unk_48C == 0)) { - v1 = sub_0200B1EC(param0->unk_114, 74); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 74); sub_0200C388(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); @@ -2681,7 +2681,7 @@ static int ov84_0223E3BC (UnkStruct_ov84_0223B5A0 * param0) param0->unk_48C >>= 1; if (sub_0207D748(param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_00, param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_09 - 3, param0->unk_C4->unk_66, 6) == 1) { - v1 = sub_0200B1EC(param0->unk_114, 76); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 76); sub_0200B60C(param0->unk_118, 0, param0->unk_488 * param0->unk_48C, 6, 0, 1); sub_0200C388(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); @@ -2690,7 +2690,7 @@ static int ov84_0223E3BC (UnkStruct_ov84_0223B5A0 * param0) return 19; } - v1 = sub_0200B1EC(param0->unk_114, 75); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 75); sub_0200C388(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); @@ -2731,7 +2731,7 @@ static int ov84_0223E5C4 (UnkStruct_ov84_0223B5A0 * param0) ov84_02240D3C(param0, 0); sub_0200DC9C(¶m0->unk_04[7], 1); sub_0201ADA4(¶m0->unk_04[6], 15); - v0 = sub_0200B1EC(param0->unk_114, 76); + v0 = MessageLoader_GetNewStrbuf(param0->unk_114, 76); sub_0200B60C(param0->unk_118, 0, param0->unk_488 * param0->unk_48C, 6, 0, 1); sub_0200C388(param0->unk_118, param0->unk_3F8, v0); Strbuf_Free(v0); @@ -2762,7 +2762,7 @@ static int ov84_0223E5C4 (UnkStruct_ov84_0223B5A0 * param0) sub_0200DC9C(¶m0->unk_04[7], 1); sub_0201ADA4(¶m0->unk_04[6], 15); - v1 = sub_0200B1EC(param0->unk_114, 76); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 76); sub_0200B60C(param0->unk_118, 0, param0->unk_488 * param0->unk_48C, 6, 0, 1); sub_0200C388(param0->unk_118, param0->unk_3F8, v1); @@ -2818,7 +2818,7 @@ static int ov84_0223E7CC (UnkStruct_ov84_0223B5A0 * param0) switch (v0) { case 0: { - Strbuf* v1 = sub_0200B1EC(param0->unk_114, 77); + Strbuf* v1 = MessageLoader_GetNewStrbuf(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 be028635b9..bfa4d39b73 100644 --- a/src/overlay084/ov84_0223F040.c +++ b/src/overlay084/ov84_0223F040.c @@ -1,9 +1,6 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" -#include "strbuf.h" - #include "struct_defs/struct_0201D738.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207CB08.h" @@ -76,16 +73,16 @@ void ov84_0223F1DC (UnkStruct_0205AA50 * param0) void ov84_0223F1F8 (UnkStruct_ov84_0223B5A0 * param0) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; u16 v1; - v0 = sub_0200B144(1, 26, 395, 6); + v0 = MessageLoader_Init(1, 26, 395, 6); for (v1 = 0; v1 < 8; v1++) { - param0->unk_404[v1] = sub_0200B1EC(v0, v1); + param0->unk_404[v1] = MessageLoader_GetNewStrbuf(v0, v1); } - sub_0200B190(v0); + MessageLoader_Free(v0); } void ov84_0223F238 (UnkStruct_ov84_0223B5A0 * param0) @@ -212,7 +209,7 @@ void ov84_0223F528 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) v0 = Strbuf_Init(130, 6); Item_LoadDescription(v0, param1, 6); } else { - v0 = sub_0200B1EC(param0->unk_114, 94); + v0 = MessageLoader_GetNewStrbuf(param0->unk_114, 94); } sub_0201D78C(¶m0->unk_04[1], 0, v0, 40, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -229,28 +226,28 @@ void ov84_0223F584 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) v0 = ¶m0->unk_04[1]; v2 = Item_MoveForTMHM(param1); - v1 = sub_0200B1EC(param0->unk_114, 98); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 98); sub_0201D78C(v0, 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_114, 86); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 86); sub_0201D78C(v0, 0, v1, 0, 16, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_114, 89); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 89); sub_0201D78C(v0, 0, v1, 96, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_114, 87); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 87); sub_0201D78C(v0, 0, v1, 96, 16, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_114, 88); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 88); sub_0201D78C(v0, 0, v1, 96, 32, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); v3 = MoveTable_CalcMaxPP(v2, 0); - v1 = sub_0200B1EC(param0->unk_114, 90); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 90); sub_0200B60C(param0->unk_118, 0, v3, 2, 1, 1); sub_0200C388(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); @@ -259,9 +256,9 @@ void ov84_0223F584 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) v3 = MoveTable_LoadParam(v2, MOVEATTRIBUTE_POWER); if (v3 <= 1) { - v1 = sub_0200B1EC(param0->unk_114, 24); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 24); } else { - v1 = sub_0200B1EC(param0->unk_114, 91); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 91); } sub_0200B60C(param0->unk_118, 0, v3, 3, 0, 1); @@ -271,9 +268,9 @@ void ov84_0223F584 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) v3 = MoveTable_LoadParam(v2, MOVEATTRIBUTE_ACCURACY); if (v3 == 0) { - v1 = sub_0200B1EC(param0->unk_114, 24); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 24); } else { - v1 = sub_0200B1EC(param0->unk_114, 91); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 91); } sub_0200B60C(param0->unk_118, 0, v3, 3, 0, 1); @@ -284,8 +281,8 @@ void ov84_0223F584 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) void ov84_0223F7D4 (UnkStruct_ov84_0223B5A0 * param0) { - param0->unk_3FC = sub_0200B1EC(param0->unk_114, 38); - param0->unk_400 = sub_0200B1EC(param0->unk_114, 37); + param0->unk_3FC = MessageLoader_GetNewStrbuf(param0->unk_114, 38); + param0->unk_400 = MessageLoader_GetNewStrbuf(param0->unk_114, 37); } void ov84_0223F800 (UnkStruct_ov84_0223B5A0 * param0) @@ -359,7 +356,7 @@ static void ov84_0223F9B0 (UnkStruct_ov84_0223B5A0 * param0, u32 param1) void ov84_0223F9F0 (UnkStruct_ov84_0223B5A0 * param0, u32 param1) { - Strbuf* v0 = sub_0200B1EC(param0->unk_114, 41); + Strbuf* v0 = MessageLoader_GetNewStrbuf(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); @@ -379,18 +376,18 @@ void ov84_0223FA44 (UnkStruct_ov84_0223B5A0 * param0, u32 param1) void ov84_0223FA88 (UnkStruct_ov84_0223B5A0 * param0) { - param0->unk_124[0] = sub_0200B1EC(param0->unk_114, 0); - param0->unk_124[1] = sub_0200B1EC(param0->unk_114, 6); - param0->unk_124[2] = sub_0200B1EC(param0->unk_114, 16); - param0->unk_124[3] = sub_0200B1EC(param0->unk_114, 95); - param0->unk_124[4] = sub_0200B1EC(param0->unk_114, 96); - param0->unk_124[5] = sub_0200B1EC(param0->unk_114, 1); - param0->unk_124[6] = sub_0200B1EC(param0->unk_114, 2); - param0->unk_124[7] = sub_0200B1EC(param0->unk_114, 18); - param0->unk_124[8] = sub_0200B1EC(param0->unk_114, 3); - param0->unk_124[9] = sub_0200B1EC(param0->unk_114, 4); - param0->unk_124[10] = sub_0200B1EC(param0->unk_114, 5); - param0->unk_124[11] = sub_0200B1EC(param0->unk_114, 8); + param0->unk_124[0] = MessageLoader_GetNewStrbuf(param0->unk_114, 0); + param0->unk_124[1] = MessageLoader_GetNewStrbuf(param0->unk_114, 6); + param0->unk_124[2] = MessageLoader_GetNewStrbuf(param0->unk_114, 16); + param0->unk_124[3] = MessageLoader_GetNewStrbuf(param0->unk_114, 95); + param0->unk_124[4] = MessageLoader_GetNewStrbuf(param0->unk_114, 96); + param0->unk_124[5] = MessageLoader_GetNewStrbuf(param0->unk_114, 1); + param0->unk_124[6] = MessageLoader_GetNewStrbuf(param0->unk_114, 2); + param0->unk_124[7] = MessageLoader_GetNewStrbuf(param0->unk_114, 18); + param0->unk_124[8] = MessageLoader_GetNewStrbuf(param0->unk_114, 3); + param0->unk_124[9] = MessageLoader_GetNewStrbuf(param0->unk_114, 4); + param0->unk_124[10] = MessageLoader_GetNewStrbuf(param0->unk_114, 5); + param0->unk_124[11] = MessageLoader_GetNewStrbuf(param0->unk_114, 8); } void ov84_0223FB50 (UnkStruct_ov84_0223B5A0 * param0) @@ -450,7 +447,7 @@ void ov84_0223FB70 (UnkStruct_ov84_0223B5A0 * param0, u8 * param1, u8 param2) sub_0200E060(¶m0->unk_04[v5], 1, 1024 - 9 - (18 + 12), 12); sub_0201ADA4(¶m0->unk_04[v5], 15); - v2 = sub_0200B1EC(param0->unk_114, 42); + v2 = MessageLoader_GetNewStrbuf(param0->unk_114, 42); v3 = Strbuf_Init((14 * 2 * 2), 6); v1 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64]; @@ -499,7 +496,7 @@ void ov84_0223FE18 (UnkStruct_ov84_0223B5A0 * param0) sub_0201ADA4(¶m0->unk_04[1], 0); - v0 = sub_0200B1EC(param0->unk_114, 45); + v0 = MessageLoader_GetNewStrbuf(param0->unk_114, 45); v1 = Strbuf_Init(130, 6); ov84_0223F4E8(param0, param0->unk_47B - 1, 0); @@ -523,7 +520,7 @@ void ov84_0223FE94 (UnkStruct_ov84_0223B5A0 * param0) sub_0200E060(¶m0->unk_04[3], 1, 1024 - 9 - (18 + 12), 12); sub_0201ADA4(¶m0->unk_04[3], 15); - v1 = sub_0200B1EC(param0->unk_114, 52); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 52); v2 = Strbuf_Init(14 * 2 * 2, 6); v0 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64]; @@ -544,7 +541,7 @@ void ov84_0223FF44 (UnkStruct_ov84_0223B5A0 * param0) v0 = ¶m0->unk_04[9]; sub_0201ADA4(v0, 15); - v1 = sub_0200B1EC(param0->unk_114, 84); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 84); sub_0200B60C(param0->unk_118, 0, param0->unk_488, 3, 2, 1); sub_0200C388(param0->unk_118, param0->unk_3F8, v1); @@ -571,7 +568,7 @@ void ov84_0223FFF0 (UnkStruct_ov84_0223B5A0 * param0) sub_0200E060(¶m0->unk_04[6], 1, 1024 - 9 - (18 + 12), 12); sub_0201ADA4(¶m0->unk_04[6], 15); - v1 = sub_0200B1EC(param0->unk_114, 54); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 54); v0 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64]; if (param0->unk_488 == 1) { @@ -634,14 +631,14 @@ void ov84_02240148 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) sub_0201ADA4(v0, 15); - v1 = sub_0200B1EC(param0->unk_114, 80); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 80); sub_0200B60C(param0->unk_118, 0, param0->unk_488, 2, 2, 1); sub_0200C388(param0->unk_118, param0->unk_3F8, v1); sub_0201D738(v0, 0, param0->unk_3F8, 0, 8, 0xff, NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_114, 81); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 81); sub_0200B60C(param0->unk_118, 0, param0->unk_48C * param0->unk_488, 6, 1, 1); sub_0200C388(param0->unk_118, param0->unk_3F8, v1); @@ -665,7 +662,7 @@ void ov84_02240248 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) sub_0201ADA4(v0, 15); sub_0200DC48(v0, 1, 1024 - 9, 14); - v1 = sub_0200B1EC(param0->unk_114, 78); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 78); sub_0201D738(v0, 0, v1, 0, 0, 0xff, NULL); Strbuf_Free(v1); @@ -673,7 +670,7 @@ void ov84_02240248 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) sub_0201AE78(v0, 15, 0, 16, (10 * 8), 16); } - v1 = sub_0200B1EC(param0->unk_114, 79); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 79); sub_0200B60C(param0->unk_118, 0, sub_02025F74(param0->unk_CC), 6, 1, 1); sub_0200C388(param0->unk_118, param0->unk_3F8, v1); @@ -695,11 +692,11 @@ void ov84_02240328 (UnkStruct_ov84_0223B5A0 * param0) sub_0201ADA4(v0, 15); sub_0200DC48(v0, 1, 1024 - 9, 14); - v1 = sub_0200B1EC(param0->unk_114, 108); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 108); sub_0201D738(v0, 0, v1, 0, 0, 0xff, NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_114, 109); + v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 109); sub_0200B60C(param0->unk_118, 0, sub_0202AC98(Poffin_GetSavedataBlock(param0->unk_C4->unk_00)), 3, 1, 1); sub_0200C388(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); diff --git a/src/overlay085/ov85_02241440.c b/src/overlay085/ov85_02241440.c index 4e28df37d5..250e8fd8f5 100644 --- a/src/overlay085/ov85_02241440.c +++ b/src/overlay085/ov85_02241440.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -54,7 +54,7 @@ typedef struct { typedef struct { UnkStruct_02018340 * unk_00; UnkStruct_0205AA50 unk_04[12]; - UnkStruct_0200B144 * unk_C4; + MessageLoader * unk_C4; UnkStruct_0200B358 * unk_C8; UnkStruct_0200C440 * unk_CC; UnkStruct_020203AC * unk_D0; @@ -460,14 +460,14 @@ static void ov85_022417CC (void) static void ov85_022417E4 (UnkStruct_ov85_022417E4 * param0) { - param0->unk_C4 = sub_0200B144(0, 26, 398, 36); + param0->unk_C4 = MessageLoader_Init(0, 26, 398, 36); param0->unk_CC = sub_0200C440(15, 2, 0, 36); param0->unk_C8 = sub_0200B358(36); } static void ov85_0224181C (UnkStruct_ov85_022417E4 * param0) { - sub_0200B190(param0->unk_C4); + MessageLoader_Free(param0->unk_C4); sub_0200C560(param0->unk_CC); sub_0200B3F0(param0->unk_C8); } @@ -497,7 +497,7 @@ static void ov85_02241878 (UnkStruct_ov85_022417E4 * param0, u32 param1, u32 par u32 v2; v0 = ¶m0->unk_04[param1]; - v1 = sub_0200B1EC(param0->unk_C4, param2); + v1 = MessageLoader_GetNewStrbuf(param0->unk_C4, param2); v2 = sub_02002D7C(0, v1, 0); sub_0201D78C(v0, 0, v1, (sub_0201C294(v0) * 8 - v2) / 2, 0, 0xff, param3, NULL); @@ -552,7 +552,7 @@ static void ov85_0224198C (UnkStruct_ov85_022417E4 * param0) sub_0201ADA4(v0, 0); sub_0200C578(param0->unk_CC, 2, v0, 0, 5); - v1 = sub_0200B1EC(param0->unk_C4, 6); + v1 = MessageLoader_GetNewStrbuf(param0->unk_C4, 6); v2 = Strbuf_Init((2 + 1) * 2, 36); sub_0200B60C(param0->unk_C8, 0, param0->unk_1F8->unk_08 + 1, 2, 2, 1); @@ -591,7 +591,7 @@ static void ov85_02241AA8 (UnkStruct_ov85_022417E4 * param0) v0 = ¶m0->unk_04[9]; sub_0201ADA4(v0, 0); - v1 = sub_0200B1EC(param0->unk_C4, 10); + v1 = MessageLoader_GetNewStrbuf(param0->unk_C4, 10); sub_0201D78C(v0, 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); @@ -614,7 +614,7 @@ static void ov85_02241AF4 (UnkStruct_ov85_022417E4 * param0) v2--; } - v1 = sub_0200B1EC(param0->unk_C4, 11 + v2); + v1 = MessageLoader_GetNewStrbuf(param0->unk_C4, 11 + v2); sub_0201D78C(v0, 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); @@ -628,7 +628,7 @@ static void ov85_02241B50 (UnkStruct_ov85_022417E4 * param0) v0 = ¶m0->unk_04[7]; sub_0201ADA4(v0, 0); - v1 = sub_0200B1EC(param0->unk_C4, 8); + v1 = MessageLoader_GetNewStrbuf(param0->unk_C4, 8); sub_0201D78C(v0, 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); @@ -648,7 +648,7 @@ static void ov85_02241B9C (UnkStruct_ov85_022417E4 * param0) v3 = BerryData_GetAttribute(param0->unk_1FC, 0); v3 = (((v3 * 1000) / 254 + 5) / 10); - v1 = sub_0200B1EC(param0->unk_C4, 9); + v1 = MessageLoader_GetNewStrbuf(param0->unk_C4, 9); v2 = Strbuf_Init(32, 36); sub_0200B60C(param0->unk_C8, 0, v3 / 10, 2, 0, 1); diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c index ef99e02a45..4c40cdc623 100644 --- a/src/overlay086/ov86_0223B140.c +++ b/src/overlay086/ov86_0223B140.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" @@ -100,7 +100,7 @@ typedef struct { UnkStruct_0200B358 * unk_1C44; Strbuf* unk_1C48; Strbuf* unk_1C4C; - UnkStruct_0200B144 * unk_1C50; + MessageLoader * unk_1C50; NARC * unk_1C54; } UnkStruct_ov86_0223B3C8; @@ -192,7 +192,7 @@ typedef struct { UnkStruct_0200B358 * unk_14; Strbuf* unk_18; Strbuf* unk_1C; - UnkStruct_0200B144 * unk_20; + MessageLoader * unk_20; Pokemon * unk_24; const UnkStruct_02025E6C * unk_28; int unk_2C; @@ -315,7 +315,7 @@ int ov86_0223B140 (UnkStruct_020067E8 * param0, int * param1) v0 = sub_0200681C(param0, sizeof(UnkStruct_ov86_0223B3C8), 63); v0->unk_0C = sub_02006840(param0); - v0->unk_1C50 = sub_0200B144(0, 26, 351, 63); + v0->unk_1C50 = MessageLoader_Init(0, 26, 351, 63); v0->unk_1C48 = Strbuf_Init(500, 63); v0->unk_1C4C = Strbuf_Init(500, 63); v0->unk_1C44 = sub_0200B358(63); @@ -379,7 +379,7 @@ int ov86_0223B2E4 (UnkStruct_020067E8 * param0, int * param1) sub_0200B3F0(v0->unk_1C44); Strbuf_Free(v0->unk_1C48); Strbuf_Free(v0->unk_1C4C); - sub_0200B190(v0->unk_1C50); + MessageLoader_Free(v0->unk_1C50); NARC_dtor(v0->unk_1C54); sub_02006830(param0); Heap_Destroy(63); @@ -1308,14 +1308,14 @@ static void ov86_0223C4DC (UnkStruct_ov86_0223C3E4 * param0) switch (sub_02075D6C(param0->unk_24)) { case 0: - sub_0200B1B8(param0->unk_20, 1, param0->unk_18); + MessageLoader_GetStrbuf(param0->unk_20, 1, param0->unk_18); break; case 1: - sub_0200B1B8(param0->unk_20, 2, param0->unk_18); + MessageLoader_GetStrbuf(param0->unk_20, 2, param0->unk_18); break; case 2: default: - sub_0200B1B8(param0->unk_20, 3, param0->unk_18); + MessageLoader_GetStrbuf(param0->unk_20, 3, param0->unk_18); break; } @@ -1333,7 +1333,7 @@ static void ov86_0223C54C (UnkStruct_ov86_0223C3E4 * param0) break; } - sub_0200B1B8(param0->unk_20, 5 + v0, param0->unk_18); + MessageLoader_GetStrbuf(param0->unk_20, 5 + v0, param0->unk_18); sub_0200C388(param0->unk_14, param0->unk_1C, param0->unk_18); } @@ -1348,7 +1348,7 @@ static void ov86_0223C58C (UnkStruct_0201CD38 * param0, void * param1) switch (v0->unk_34) { case 0: - sub_0200B1B8(v0->unk_20, 0, v0->unk_1C); + MessageLoader_GetStrbuf(v0->unk_20, 0, v0->unk_1C); ov86_0223C47C(v0, 16); sub_0201ACCC(v0->unk_10); v0->unk_30 = 20; @@ -1365,7 +1365,7 @@ static void ov86_0223C58C (UnkStruct_0201CD38 * param0, void * param1) break; case 2: sub_0200B5EC(v0->unk_14, 0, sub_02076B10(v0->unk_24)); - sub_0200B1B8(v0->unk_20, 4, v0->unk_18); + MessageLoader_GetStrbuf(v0->unk_20, 4, v0->unk_18); sub_0200C388(v0->unk_14, v0->unk_1C, v0->unk_18); ov86_0223C47C(v0, 96); ov86_0223C54C(v0); @@ -1432,7 +1432,7 @@ static void ov86_0223C72C (UnkStruct_ov86_0223B3C8 * param0) { int v0; - sub_0200B1B8(param0->unk_1C50, 12, param0->unk_1C48); + MessageLoader_GetStrbuf(param0->unk_1C50, 12, param0->unk_1C48); v0 = (256 - sub_02002D7C(0, param0->unk_1C48, 0)) / 2; sub_0201D78C(¶m0->unk_14, 0, param0->unk_1C48, v0, 4, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); @@ -1441,7 +1441,7 @@ static void ov86_0223C72C (UnkStruct_ov86_0223B3C8 * param0) sub_0200B60C(param0->unk_1C44, 1, sub_02025F24(param0->unk_0C->unk_00), 5, 2, 1); sub_0200B60C(param0->unk_1C44, 2, sub_0202CC58(param0->unk_0C->unk_08), 3, 0, 1); sub_0200B60C(param0->unk_1C44, 3, sub_0202CC5C(param0->unk_0C->unk_08), 2, 2, 1); - sub_0200B1B8(param0->unk_1C50, 13, param0->unk_1C4C); + MessageLoader_GetStrbuf(param0->unk_1C50, 13, param0->unk_1C4C); sub_0200C388(param0->unk_1C44, param0->unk_1C48, param0->unk_1C4C); v0 = (256 - sub_02002D7C(0, param0->unk_1C48, 0)) / 2; diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c index df34e2c25d..dc75424df3 100644 --- a/src/overlay087/ov87_021D106C.c +++ b/src/overlay087/ov87_021D106C.c @@ -3,7 +3,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" @@ -57,9 +57,9 @@ typedef struct UnkStruct_ov87_021D106C_t { UnkStruct_02022550 * unk_1C4[6]; void * unk_1DC; void * unk_1E0; - UnkStruct_0200B144 * unk_1E4; - UnkStruct_0200B144 * unk_1E8; - UnkStruct_0200B144 * unk_1EC; + MessageLoader * unk_1E4; + MessageLoader * unk_1E8; + MessageLoader * unk_1EC; UnkStruct_0200B358 * unk_1F0; Strbuf* unk_1F4; Strbuf* unk_1F8; @@ -108,9 +108,9 @@ UnkStruct_ov87_021D106C * ov87_021D106C (UnkStruct_ov87_021D0D80 * param0, const sub_0200A784(0, 128, 0, 32, 0, 128, 0, 32, 61); v0->unk_34 = sub_020095C4(64, &v0->unk_38, 61); - v0->unk_1E4 = sub_0200B144(0, 26, 352, 61); - v0->unk_1E8 = sub_0200B144(1, 26, 412, 61); - v0->unk_1EC = sub_0200B144(1, 26, 647, 61); + v0->unk_1E4 = MessageLoader_Init(0, 26, 352, 61); + v0->unk_1E8 = MessageLoader_Init(1, 26, 412, 61); + v0->unk_1EC = MessageLoader_Init(1, 26, 647, 61); v0->unk_1F0 = sub_0200B358(61); v0->unk_1F4 = Strbuf_Init(256, 61); v0->unk_1F8 = Strbuf_Init(256, 61); @@ -130,9 +130,9 @@ void ov87_021D1140 (UnkStruct_ov87_021D106C * param0) Strbuf_Free(param0->unk_1F8); Strbuf_Free(param0->unk_1F4); sub_0200B3F0(param0->unk_1F0); - sub_0200B190(param0->unk_1EC); - sub_0200B190(param0->unk_1E8); - sub_0200B190(param0->unk_1E4); + MessageLoader_Free(param0->unk_1EC); + MessageLoader_Free(param0->unk_1E8); + MessageLoader_Free(param0->unk_1E4); sub_02021964(param0->unk_34); sub_0200A878(); Heap_FreeToHeap(param0->unk_10); @@ -388,7 +388,7 @@ static void ov87_021D1590 (UnkStruct_ov87_021D106C * param0) sub_0200B60C(param0->unk_1F0, 1, v0->unk_04.year + 2000, 4, 0, 1); sub_0200C2E0(param0->unk_1F0, 2, v0->unk_04.month); sub_0200B60C(param0->unk_1F0, 3, v0->unk_04.day, 2, 0, 1); - sub_0200B1B8(param0->unk_1E4, 0, param0->unk_1F4); + MessageLoader_GetStrbuf(param0->unk_1E4, 0, param0->unk_1F4); sub_0200C388(param0->unk_1F0, param0->unk_1F8, param0->unk_1F4); sub_0201ADA4(v1, 15); sub_0201D738(v1, 0, param0->unk_1F8, 0, 0, 0xff, NULL); @@ -406,17 +406,17 @@ static void ov87_021D1640 (UnkStruct_ov87_021D106C * param0) switch (v0->unk_1C) { case UnkEnum_ov87_021D12C0_0: sub_0201D738(v2, 0, v1->unk_00, 0, 0, 0xff, NULL); - sub_0200B1B8(param0->unk_1E4, 5, param0->unk_1F4); + MessageLoader_GetStrbuf(param0->unk_1E4, 5, param0->unk_1F4); sub_0201D738(v2, 0, param0->unk_1F4, 72, 0, 0xff, NULL); - sub_0200B1B8(param0->unk_1E8, v1->unk_10, param0->unk_1F4); + MessageLoader_GetStrbuf(param0->unk_1E8, v1->unk_10, param0->unk_1F4); sub_0201D738(v2, 0, param0->unk_1F4, 94, 0, 0xff, NULL); switch (sub_02075DAC(v1->unk_10, v1->unk_08)) { case 0: - sub_0200B1B8(param0->unk_1E4, 3, param0->unk_1F4); + MessageLoader_GetStrbuf(param0->unk_1E4, 3, param0->unk_1F4); break; case 1: - sub_0200B1B8(param0->unk_1E4, 4, param0->unk_1F4); + MessageLoader_GetStrbuf(param0->unk_1E4, 4, param0->unk_1F4); break; default: Strbuf_Clear(param0->unk_1F4); @@ -424,11 +424,11 @@ static void ov87_021D1640 (UnkStruct_ov87_021D106C * param0) } sub_0201D738(v2, 0, param0->unk_1F4, 174, 0, 0xff, NULL); - sub_0200B1B8(param0->unk_1E4, 1, param0->unk_1F4); + MessageLoader_GetStrbuf(param0->unk_1E4, 1, param0->unk_1F4); sub_0200B60C(param0->unk_1F0, 0, v1->unk_12, 4, 1, 1); sub_0200C388(param0->unk_1F0, param0->unk_1F8, param0->unk_1F4); sub_0201D738(v2, 0, param0->unk_1F8, 194, 0, 0xff, NULL); - sub_0200B1B8(param0->unk_1E4, 2, param0->unk_1F4); + MessageLoader_GetStrbuf(param0->unk_1E4, 2, param0->unk_1F4); sub_0201D738(v2, 0, param0->unk_1F4, 0, 16, 0xff, NULL); sub_0201D738(v2, 0, v1->unk_04, sub_02002D7C(0, param0->unk_1F4, 0), 16, 0xff, NULL); break; @@ -438,7 +438,7 @@ static void ov87_021D1640 (UnkStruct_ov87_021D106C * param0) for (v3 = 0; v3 < 4; v3++) { if (v1->unk_14[v3]) { - sub_0200B1B8(param0->unk_1EC, v1->unk_14[v3], param0->unk_1F4); + MessageLoader_GetStrbuf(param0->unk_1EC, v1->unk_14[v3], param0->unk_1F4); sub_0201D738(v2, 0, param0->unk_1F4, (v3 & 1) * 96, (v3 / 2) * 16, 0xff, NULL); } else { break; diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index 2fcaaf59b8..b3104e6306 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" @@ -130,7 +130,7 @@ static int ov88_0223E914(UnkStruct_02095E80 * param0); static void ov88_0223E984(UnkStruct_02095E80 * param0); static void ov88_0223E998(UnkStruct_02095E80 * param0); static void ov88_0223B710(UnkStruct_0200B358 * param0, Party * param1, int param2); -static void ov88_0223B748(UnkStruct_0205AA50 * param0, UnkStruct_0200B358 * param1, UnkStruct_0200B144 * param2, Party * param3, int param4); +static void ov88_0223B748(UnkStruct_0205AA50 * param0, UnkStruct_0200B358 * param1, MessageLoader * param2, Party * param3, int param4); static void ov88_0223C8D8(UnkStruct_0205AA50 * param0, int param1, Party * param2, int param3, UnkStruct_02095E80 * param4); static void ov88_0223E694(Party * param0, Party * param1, int param2, int param3, UnkStruct_ov88_0223C370 * param4); static void ov88_0223BF7C(UnkStruct_02095E80 * param0); @@ -311,7 +311,7 @@ int ov88_0223B140 (UnkStruct_020067E8 * param0, int * param1) v0->unk_178 = sub_0200B368(12, (10 + 1) * 2, 26); v0->unk_17C = sub_0200B358(26); v0->unk_180 = sub_0200B358(26); - v0->unk_184 = sub_0200B144(0, 26, 354, 26); + v0->unk_184 = MessageLoader_Init(0, 26, 354, 26); v0->unk_40 = NULL; ov88_0223C370(v0, param0); @@ -366,7 +366,7 @@ static void ov88_0223B320 (UnkStruct_02095E80 * param0) v4 = sub_02032EE8(sub_0203608C() ^ 1); v0 = sub_02025F04(v3, 26); v1 = sub_02025F04(v4, 26); - v2 = sub_0200B1EC(param0->unk_184, 50); + v2 = MessageLoader_GetNewStrbuf(param0->unk_184, 50); ov88_0223EC78(¶m0->unk_49C[0], v0, 10, 0, 1, 1); ov88_0223EC78(¶m0->unk_49C[1], v1, 10, 0, 1, 1); @@ -520,7 +520,7 @@ static void ov88_0223B710 (UnkStruct_0200B358 * param0, Party * param1, int para } } -static void ov88_0223B748 (UnkStruct_0205AA50 * param0, UnkStruct_0200B358 * param1, UnkStruct_0200B144 * param2, Party * param3, int param4) +static void ov88_0223B748 (UnkStruct_0205AA50 * param0, UnkStruct_0200B358 * param1, MessageLoader * param2, Party * param3, int param4) { int v0; @@ -900,7 +900,7 @@ int ov88_0223C03C (UnkStruct_020067E8 * param0, int * param1) ov88_0223C44C(v0->unk_174); Heap_FreeToHeapExplicit(26, v0->unk_174); - sub_0200B190(v0->unk_184); + MessageLoader_Free(v0->unk_184); sub_0200B3F0(v0->unk_180); sub_0200B3F0(v0->unk_17C); sub_0200B3F0(v0->unk_178); @@ -1168,7 +1168,7 @@ static void ov88_0223C370 (UnkStruct_02095E80 * param0, UnkStruct_020067E8 * par memset(param0->unk_2274, 0xff, Party_sizeof()); param0->unk_18C = sub_02025F04(v0->unk_04, 26); - param0->unk_190 = sub_0200B1EC(param0->unk_184, 42); + param0->unk_190 = MessageLoader_GetNewStrbuf(param0->unk_184, 42); sub_02038F8C(v0->unk_14); } @@ -1370,7 +1370,7 @@ static void ov88_0223C8D8 (UnkStruct_0205AA50 * param0, int param1, Party * para if (!param4->unk_6F4[param1 * 6 + param3].unk_05) { v0 = Strbuf_Init(10, 26); sub_0201ADA4(¶m0[28 + param1], 0); - sub_0200B1B8(param4->unk_184, 41, v0); + MessageLoader_GetStrbuf(param4->unk_184, 41, v0); ov88_0223EC78(¶m0[28 + param1], v0, 9, 0xff, 6, 0); v3 = GetMonData(Party_GetPokemonBySlotIndex(param2, param3), MON_DATA_161, NULL); @@ -1923,7 +1923,7 @@ static int ov88_0223D69C (UnkStruct_02095E80 * param0) param0->unk_36D4 = sub_02013A04(v1 + 1, 26); { - UnkStruct_0200B144 * v3; + MessageLoader * v3; Strbuf* v4 = Strbuf_Init(100, 26); int v5 = 0; @@ -2023,7 +2023,7 @@ static int ov88_0223D854 (UnkStruct_02095E80 * param0) } if (param0->unk_36C4 == -1) { - sub_0200B190(param0->unk_36D0); + MessageLoader_Free(param0->unk_36D0); sub_0200B3F0(param0->unk_36CC); sub_020364F0(19); ov88_0223ECBC(¶m0->unk_49C[23], 28, 1, param0->unk_184, param0->unk_178); @@ -2064,7 +2064,7 @@ static int ov88_0223D96C (UnkStruct_02095E80 * param0) } param0->unk_36CC = sub_0200B358(26); - param0->unk_36D0 = sub_0200B144(0, 26, 675, 26); + param0->unk_36D0 = MessageLoader_Init(0, 26, 675, 26); param0->unk_36EC = sub_0202B370(param0->unk_04); param0->unk_226C = ov88_0223D854; diff --git a/src/overlay088/ov88_0223E9C4.c b/src/overlay088/ov88_0223E9C4.c index a1633d33f7..89bcda6354 100644 --- a/src/overlay088/ov88_0223E9C4.c +++ b/src/overlay088/ov88_0223E9C4.c @@ -3,7 +3,7 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -135,7 +135,7 @@ void ov88_0223EC78 (UnkStruct_0205AA50 * param0, Strbuf *param1, int param2, u32 sub_0201D78C(param0, 0, param1, v0, param5, param3, (u32)(((11 & 0xff) << 16) | ((12 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); } -int ov88_0223ECBC (UnkStruct_0205AA50 * param0, int param1, int param2, UnkStruct_0200B144 * param3, UnkStruct_0200B358 * param4) +int ov88_0223ECBC (UnkStruct_0205AA50 * param0, int param1, int param2, MessageLoader * param3, UnkStruct_0200B358 * param4) { Strbuf* v0; int v1; diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c index 8dc96d21b5..d5a8843296 100644 --- a/src/overlay090/ov90_021D0D80.c +++ b/src/overlay090/ov90_021D0D80.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -57,7 +57,7 @@ #include "overlay090/ov90_021D0D80.h" typedef struct { - UnkStruct_0200B144 * unk_00; + MessageLoader * unk_00; UnkStruct_0200B358 * unk_04; Strbuf* unk_08; Strbuf* unk_0C; @@ -622,22 +622,22 @@ static void ov90_021D13D8 (UnkStruct_ov90_021D0ECC * param0) { int v0 = 0; - param0->unk_28.unk_00 = sub_0200B144(0, 26, 22, param0->unk_00); + param0->unk_28.unk_00 = MessageLoader_Init(0, 26, 22, param0->unk_00); param0->unk_28.unk_04 = sub_0200B368(2, ((18 + 1) * 4), param0->unk_00); param0->unk_28.unk_08 = Strbuf_Init(((18 + 1) * 4), param0->unk_00); for (v0 = 0; v0 < 6; v0++) { - param0->unk_28.unk_24[v0] = sub_0200B1EC(param0->unk_28.unk_00, 9 + v0); + param0->unk_28.unk_24[v0] = MessageLoader_GetNewStrbuf(param0->unk_28.unk_00, 9 + v0); } - param0->unk_28.unk_10 = sub_0200B1EC(param0->unk_28.unk_00, 15); - param0->unk_28.unk_14 = sub_0200B1EC(param0->unk_28.unk_00, 17); - param0->unk_28.unk_0C = sub_0200B1EC(param0->unk_28.unk_00, 18); - param0->unk_28.unk_18 = sub_0200B1EC(param0->unk_28.unk_00, 19); - param0->unk_28.unk_1C = sub_0200B1EC(param0->unk_28.unk_00, 20); - param0->unk_28.unk_20 = sub_0200B1EC(param0->unk_28.unk_00, 21); - param0->unk_28.unk_3C[0] = sub_0200B1EC(param0->unk_28.unk_00, 22); - param0->unk_28.unk_3C[1] = sub_0200B1EC(param0->unk_28.unk_00, 23); + param0->unk_28.unk_10 = MessageLoader_GetNewStrbuf(param0->unk_28.unk_00, 15); + param0->unk_28.unk_14 = MessageLoader_GetNewStrbuf(param0->unk_28.unk_00, 17); + param0->unk_28.unk_0C = MessageLoader_GetNewStrbuf(param0->unk_28.unk_00, 18); + param0->unk_28.unk_18 = MessageLoader_GetNewStrbuf(param0->unk_28.unk_00, 19); + param0->unk_28.unk_1C = MessageLoader_GetNewStrbuf(param0->unk_28.unk_00, 20); + param0->unk_28.unk_20 = MessageLoader_GetNewStrbuf(param0->unk_28.unk_00, 21); + param0->unk_28.unk_3C[0] = MessageLoader_GetNewStrbuf(param0->unk_28.unk_00, 22); + param0->unk_28.unk_3C[1] = MessageLoader_GetNewStrbuf(param0->unk_28.unk_00, 23); } static void ov90_021D146C (UnkStruct_ov90_021D0ECC * param0) @@ -659,7 +659,7 @@ static void ov90_021D146C (UnkStruct_ov90_021D0ECC * param0) Strbuf_Free(param0->unk_28.unk_08); sub_0200B3F0(param0->unk_28.unk_04); - sub_0200B190(param0->unk_28.unk_00); + MessageLoader_Free(param0->unk_28.unk_00); } static void ov90_021D14C8 (UnkStruct_ov90_021D0ECC * param0, UnkStruct_0205AA50 * param1, u8 param2, u8 param3, u8 param4) @@ -693,15 +693,15 @@ static void ov90_021D15D0 (UnkStruct_ov90_021D0ECC * param0) int v0; u16 v1, v2; - sub_0200B1B8(param0->unk_28.unk_00, 0 + param0->unk_0A, param0->unk_28.unk_08); + MessageLoader_GetStrbuf(param0->unk_28.unk_00, 0 + param0->unk_0A, param0->unk_28.unk_08); v0 = sub_02002D7C(0, param0->unk_28.unk_08, 0); v0 = (24 * 8) - v0; sub_0201D78C(¶m0->unk_6C[0], 0, param0->unk_28.unk_08, v0 / 2, 8, 0, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); - sub_0200B1B8(param0->unk_28.unk_00, 3 + param0->unk_0A, param0->unk_28.unk_08); + MessageLoader_GetStrbuf(param0->unk_28.unk_00, 3 + param0->unk_0A, param0->unk_28.unk_08); sub_0201D78C(¶m0->unk_6C[1], 0, param0->unk_28.unk_08, 0, 0, 0, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); - sub_0200B1B8(param0->unk_28.unk_00, 6 + param0->unk_0A, param0->unk_28.unk_08); + MessageLoader_GetStrbuf(param0->unk_28.unk_00, 6 + param0->unk_0A, param0->unk_28.unk_08); sub_0201D78C(¶m0->unk_6C[2], 0, param0->unk_28.unk_08, 0, 3, 0, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); switch (param0->unk_0A) { @@ -714,7 +714,7 @@ static void ov90_021D15D0 (UnkStruct_ov90_021D0ECC * param0) ov90_021D14C8(param0, ¶m0->unk_6C[4], 3, 6, 3); break; case 2: - sub_0200B1B8(param0->unk_28.unk_00, 12, param0->unk_28.unk_08); + MessageLoader_GetStrbuf(param0->unk_28.unk_00, 12, param0->unk_28.unk_08); sub_0201D78C(¶m0->unk_6C[3], 0, param0->unk_28.unk_08, 4, 10, 0, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); sub_0200B60C(param0->unk_28.unk_04, 0, sub_0202D2C0(param0->unk_20, 0), 2, 0, 1); sub_0200C388(param0->unk_28.unk_04, param0->unk_28.unk_08, param0->unk_28.unk_24[5]); @@ -814,7 +814,7 @@ static void ov90_021D18BC (UnkStruct_ov90_021D0ECC * param0) v1 = 24 * 8 - sub_02002D7C(0, param0->unk_28.unk_08, 0); sub_0201D78C(¶m0->unk_6C[0], 0, param0->unk_28.unk_08, v1 / 2, 4, 0xff, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); - sub_0200B1B8(param0->unk_28.unk_00, 16 + param0->unk_0A, param0->unk_28.unk_08); + MessageLoader_GetStrbuf(param0->unk_28.unk_00, 16 + param0->unk_0A, param0->unk_28.unk_08); v1 = 24 * 8 - sub_02002D7C(0, param0->unk_28.unk_08, 0); sub_0201D78C(¶m0->unk_6C[0], 0, param0->unk_28.unk_08, v1 / 2, 20, 0, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index 1164a8026b..d075f4caed 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -68,7 +68,7 @@ typedef struct { UnkStruct_020997B8 * unk_00; UnkStruct_02018340 * unk_04; UnkStruct_0205AA50 unk_08[15]; - UnkStruct_0200B144 * unk_F8; + MessageLoader * unk_F8; UnkStruct_0200B358 * unk_FC; Strbuf* unk_100; UnkStruct_0200112C * unk_104; @@ -648,14 +648,14 @@ static void ov91_021D11A0 (UnkStruct_ov91_021D0ED8 * param0) static void ov91_021D11B8 (UnkStruct_ov91_021D0ED8 * param0) { - param0->unk_F8 = sub_0200B144(0, 26, 645, 67); + param0->unk_F8 = MessageLoader_Init(0, 26, 645, 67); param0->unk_FC = sub_0200B358(67); param0->unk_100 = Strbuf_Init(256, 67); } static void ov91_021D11F0 (UnkStruct_ov91_021D0ED8 * param0) { - sub_0200B190(param0->unk_F8); + MessageLoader_Free(param0->unk_F8); sub_0200B3F0(param0->unk_FC); Strbuf_Free(param0->unk_100); } @@ -870,7 +870,7 @@ static void ov91_021D1618 (UnkStruct_ov91_021D0ED8 * param0, u32 param1, u32 par { Strbuf* v0; - v0 = sub_0200B1EC(param0->unk_F8, param1); + v0 = MessageLoader_GetNewStrbuf(param0->unk_F8, param1); sub_0200B60C(param0->unk_FC, 0, param2, param3, param4, 1); sub_0200C388(param0->unk_FC, param0->unk_100, v0); Strbuf_Free(v0); @@ -880,25 +880,25 @@ static void ov91_021D1664 (UnkStruct_ov91_021D0ED8 * param0) { u32 v0; - sub_0200B1B8(param0->unk_F8, 26, param0->unk_100); + MessageLoader_GetStrbuf(param0->unk_F8, 26, param0->unk_100); ov91_021D1580(param0, 0, 0, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), 2); - sub_0200B1B8(param0->unk_F8, 28, param0->unk_100); + MessageLoader_GetStrbuf(param0->unk_F8, 28, param0->unk_100); ov91_021D1580(param0, 1, 0, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), 2); - sub_0200B1B8(param0->unk_F8, 22, param0->unk_100); + MessageLoader_GetStrbuf(param0->unk_F8, 22, param0->unk_100); ov91_021D1580(param0, 2, 0, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), 0); - sub_0200B1B8(param0->unk_F8, 23, param0->unk_100); + MessageLoader_GetStrbuf(param0->unk_F8, 23, param0->unk_100); ov91_021D1580(param0, 3, 0, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), 0); - sub_0200B1B8(param0->unk_F8, 24, param0->unk_100); + MessageLoader_GetStrbuf(param0->unk_F8, 24, param0->unk_100); ov91_021D1580(param0, 4, 0, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), 0); - sub_0200B1B8(param0->unk_F8, 25, param0->unk_100); + MessageLoader_GetStrbuf(param0->unk_F8, 25, param0->unk_100); ov91_021D1580(param0, 5, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 0); - sub_0200B1B8(param0->unk_F8, 27, param0->unk_100); + MessageLoader_GetStrbuf(param0->unk_F8, 27, param0->unk_100); ov91_021D1580(param0, 6, 0, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), 2); } @@ -917,14 +917,14 @@ static u32 ov91_021D175C (UnkStruct_ov91_021D0ED8 * param0) static void ov91_021D1784 (UnkStruct_ov91_021D0ED8 * param0) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; UnkStruct_ov84_02240FA8 v1; u32 v2; param0->unk_184 = (u8)ov91_021D175C(param0) + 1; param0->unk_108 = sub_02013A04(param0->unk_184, 67); - v0 = sub_0200B144( + v0 = MessageLoader_Init( 0, 26, 647, 67); for (v2 = 0; v2 < param0->unk_184; v2++) { @@ -938,7 +938,7 @@ static void ov91_021D1784 (UnkStruct_ov91_021D0ED8 * param0) } } - sub_0200B190(v0); + MessageLoader_Free(v0); v1 = Unk_ov91_021D27BC; v1.unk_00 = param0->unk_108; @@ -986,13 +986,13 @@ static void ov91_021D18C8 (UnkStruct_ov91_021D0ED8 * param0, u32 param1) sub_0200D3F4(param0->unk_118[5], 0); if (param1 != 0xfffffffe) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; u32 v1; v1 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_POWER); if (v1 <= 1) { - sub_0200B1B8(param0->unk_F8, 33, param0->unk_100); + MessageLoader_GetStrbuf(param0->unk_F8, 33, param0->unk_100); } else { ov91_021D1618(param0, 29, v1, 3, 1); } @@ -1002,7 +1002,7 @@ static void ov91_021D18C8 (UnkStruct_ov91_021D0ED8 * param0, u32 param1) v1 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_ACCURACY); if (v1 == 0) { - sub_0200B1B8(param0->unk_F8, 33, param0->unk_100); + MessageLoader_GetStrbuf(param0->unk_F8, 33, param0->unk_100); } else { ov91_021D1618(param0, 30, v1, 3, 1); } @@ -1013,10 +1013,10 @@ static void ov91_021D18C8 (UnkStruct_ov91_021D0ED8 * param0, u32 param1) ov91_021D1618(param0, 31, v1, 2, 0); ov91_021D1580(param0, 9, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 2); - v0 = sub_0200B144(1, 26, 646, 67); - sub_0200B1B8(v0, param1, param0->unk_100); + v0 = MessageLoader_Init(1, 26, 646, 67); + MessageLoader_GetStrbuf(v0, param1, param0->unk_100); ov91_021D1580(param0, 10, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 0); - sub_0200B190(v0); + MessageLoader_Free(v0); ov91_021D24B4(param0, param1); sub_0200D3F4(param0->unk_118[5], 1); sub_0201A9A4(¶m0->unk_08[2]); @@ -1041,17 +1041,17 @@ static void ov91_021D1A68 (UnkStruct_ov91_021D0ED8 * param0, u32 param1) sub_0201ADA4(¶m0->unk_08[11], 0); if (param1 != 0xfffffffe) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; u32 v1; u32 v2; v1 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_CONTEST_EFFECT); v2 = sub_0209577C(v1); - v0 = sub_0200B144(0, 26, 210, 67); + v0 = MessageLoader_Init(0, 26, 210, 67); - sub_0200B1B8(v0, v2, param0->unk_100); + MessageLoader_GetStrbuf(v0, v2, param0->unk_100); sub_0201D78C(¶m0->unk_08[11], 0, param0->unk_100, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); ov91_021D1BBC(param0, (u16)param1); sub_0201A9A4(¶m0->unk_08[6]); } else { @@ -1146,7 +1146,7 @@ static void ov91_021D1C10 (UnkStruct_ov91_021D0ED8 * param0, u32 param1) break; } - v0 = sub_0200B1EC(param0->unk_F8, Unk_ov91_021D282C[param0->unk_00->unk_15][param1]); + v0 = MessageLoader_GetNewStrbuf(param0->unk_F8, Unk_ov91_021D282C[param0->unk_00->unk_15][param1]); sub_0200C388(param0->unk_FC, param0->unk_100, v0); Strbuf_Free(v0); } diff --git a/src/overlay092/ov92_021D0D80.c b/src/overlay092/ov92_021D0D80.c index 000455a553..5840c5eff9 100644 --- a/src/overlay092/ov92_021D0D80.c +++ b/src/overlay092/ov92_021D0D80.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -95,7 +95,7 @@ typedef struct { UnkStruct_0200112C * unk_B854; UnkStruct_02013A04 * unk_B858; UnkStruct_02001AF4 * unk_B85C; - UnkStruct_0200B144 * unk_B860; + MessageLoader * unk_B860; int unk_B864; int unk_B868; Strbuf* unk_B86C; @@ -385,7 +385,7 @@ int ov92_021D0EB8 (UnkStruct_020067E8 * param0, int * param1) switch (*param1) { case 0: - v0->unk_B860 = sub_0200B144(1, 26, 356, v0->unk_00); + v0->unk_B860 = MessageLoader_Init(1, 26, 356, v0->unk_00); v2 = NARC_ctor(NARC_INDEX_APPLICATION__WIFI_EARTH__WIFI_EARTH, v0->unk_00); ov92_021D2150(v0, v2); @@ -688,7 +688,7 @@ int ov92_021D0EB8 (UnkStruct_020067E8 * param0, int * param1) ov92_021D1B24(v0); ov92_021D2210(v0); - sub_0200B190(v0->unk_B860); + MessageLoader_Free(v0->unk_B860); (*param1) = 0; v1 = 1; } @@ -991,7 +991,7 @@ static void ov92_021D1888 (UnkStruct_ov92_021D1B24 * param0, NARC * param1) sub_0201A8D4(param0->unk_B810, ¶m0->unk_B834, &Unk_ov92_021D2924); sub_0201AE78(¶m0->unk_B834, 15, 0, 0, 27 * 8, 4 * 8); - sub_0200B1B8(param0->unk_B860, 12, v0); + MessageLoader_GetStrbuf(param0->unk_B860, 12, v0); { u32 v5; @@ -1023,7 +1023,7 @@ static BOOL ov92_021D1B70 (UnkStruct_ov92_021D1B24 * param0, u32 param1, int par case 0: sub_0201AE78(¶m0->unk_B814, 15, 0, 0, 27 * 8, 4 * 8); param0->unk_B86C = Strbuf_Init(0x400, param0->unk_00); - sub_0200B1B8(param0->unk_B860, param1, param0->unk_B86C); + MessageLoader_GetStrbuf(param0->unk_B860, param1, param0->unk_B86C); param0->unk_B868 = sub_0201D738(¶m0->unk_B814, 1, param0->unk_B86C, 0, 0, sub_02027AC0(param0->unk_08), NULL); param0->unk_B864 = 1; break; @@ -1075,18 +1075,18 @@ static void ov92_021D1C4C (UnkStruct_ov92_021D1B24 * param0, UnkStruct_0205AA50 static void ov92_021D1CF4 (UnkStruct_ov92_021D1B24 * param0, UnkStruct_0205AA50 * param1, const UnkStruct_ov61_0222C884 * param2, const UnkStruct_ov84_02240FA8 * param3, u32 param4, const u8 * param5, u32 param6) { UnkStruct_ov84_02240FA8 v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; int v2; sub_0201A8D4(param0->unk_B810, param1, param2); - v1 = sub_0200B144(0, 26, param4, param0->unk_00); + v1 = MessageLoader_Init(0, 26, param4, param0->unk_00); param0->unk_B858 = sub_02013A04(param6, param0->unk_00); for (v2 = 0; v2 < param6; v2++) { sub_02013A4C(param0->unk_B858, v1, param5[v2], v2); } - sub_0200B190(v1); + MessageLoader_Free(v1); v0 = *param3; v0.unk_00 = param0->unk_B858; @@ -1120,7 +1120,7 @@ static void ov92_021D1DEC (UnkStruct_ov92_021D1B24 * param0) sub_0200BDD0(param0->unk_B870, 0, param0->unk_BB14); sub_0200BE08(param0->unk_B870, 1, param0->unk_BB14, param0->unk_BB18); - sub_0200B1B8(param0->unk_B860, 13, v1); + MessageLoader_GetStrbuf(param0->unk_B860, 13, v1); sub_0200C388(param0->unk_B870, v0, v1); sub_0201D738(¶m0->unk_B844, 0, v0, 0, 0, 0, NULL); @@ -1165,7 +1165,7 @@ static void ov92_021D1F90 (UnkStruct_ov92_021D1B24 * param0) Strbuf* v0 = Strbuf_Init(0x400, param0->unk_00); sub_0201AE78(¶m0->unk_B814, 15, 0, 0, 27 * 8, 6 * 8); - sub_0200B1B8(param0->unk_B860, 14, v0); + MessageLoader_GetStrbuf(param0->unk_B860, 14, v0); sub_0201D738(¶m0->unk_B814, 1, v0, 0, 0, 0, NULL); Strbuf_Free(v0); } @@ -1516,14 +1516,14 @@ static void ov92_021D26D0 (UnkStruct_ov92_021D1B24 * param0) BOOL ov92_021D27E8 (int param0, int param1, Strbuf *param2, Strbuf *param3, int param4) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; int v1 = ov92_021D16F8(param0); BOOL v2; - v0 = sub_0200B144(0, 26, 694, param4); + v0 = MessageLoader_Init(0, 26, 694, param4); - sub_0200B1B8(v0, param0, param2); - sub_0200B190(v0); + MessageLoader_GetStrbuf(v0, param0, param2); + MessageLoader_Free(v0); if (v1 == 0) { v1 = 1; @@ -1533,10 +1533,10 @@ BOOL ov92_021D27E8 (int param0, int param1, Strbuf *param2, Strbuf *param3, int v2 = 1; } - v0 = sub_0200B144(0, 26, sub_0209972C(v1), param4); + v0 = MessageLoader_Init(0, 26, sub_0209972C(v1), param4); - sub_0200B1B8(v0, param1, param3); - sub_0200B190(v0); + MessageLoader_GetStrbuf(v0, param1, param3); + MessageLoader_Free(v0); return v2; } diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c index c027cc57e6..b236eef7a5 100644 --- a/src/overlay094/ov94_0223BCB0.c +++ b/src/overlay094/ov94_0223BCB0.c @@ -124,11 +124,11 @@ int ov94_0223BCB0 (UnkStruct_020067E8 * param0, int * param1) } v0->unk_B8C = sub_0200B368(11, 64, 62); - v0->unk_B90 = sub_0200B144(0, 26, 671, 62); - v0->unk_B98 = sub_0200B144(0, 26, 674, 62); - v0->unk_B9C = sub_0200B144(0, 26, 695, 62); - v0->unk_B94 = sub_0200B144(0, 26, 412, 62); - v0->unk_BA0 = sub_0200B144(0, 26, 694, 62); + v0->unk_B90 = MessageLoader_Init(0, 26, 671, 62); + v0->unk_B98 = MessageLoader_Init(0, 26, 674, 62); + v0->unk_B9C = MessageLoader_Init(0, 26, 695, 62); + v0->unk_B94 = MessageLoader_Init(0, 26, 412, 62); + v0->unk_BA0 = MessageLoader_Init(0, 26, 694, 62); sub_02017DD4(4, 8); @@ -221,11 +221,11 @@ int ov94_0223BF54 (UnkStruct_020067E8 * param0, int * param1) ov94_0223C508(v0); - sub_0200B190(v0->unk_B94); - sub_0200B190(v0->unk_B9C); - sub_0200B190(v0->unk_B98); - sub_0200B190(v0->unk_B90); - sub_0200B190(v0->unk_BA0); + MessageLoader_Free(v0->unk_B94); + MessageLoader_Free(v0->unk_B9C); + MessageLoader_Free(v0->unk_B98); + MessageLoader_Free(v0->unk_B90); + MessageLoader_Free(v0->unk_BA0); sub_0200B3F0(v0->unk_B8C); ov94_0223C0A0(v0); diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c index 0c3a3c262a..5a36947538 100644 --- a/src/overlay094/ov94_0223C610.c +++ b/src/overlay094/ov94_0223C610.c @@ -5,7 +5,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" @@ -362,7 +362,7 @@ static void ov94_0223CAC8 (UnkStruct_ov94_0223FD4C * param0) static void ov94_0223CB0C (UnkStruct_ov94_0223FD4C * param0) { param0->unk_BAC = Strbuf_Init((90 * 2), 62); - param0->unk_BB0 = sub_0200B1EC(param0->unk_B90, 39); + param0->unk_BB0 = MessageLoader_GetNewStrbuf(param0->unk_B90, 39); } static void ov94_0223CB34 (UnkStruct_ov94_0223FD4C * param0) @@ -591,7 +591,7 @@ static void ov94_0223CF80 (UnkStruct_ov94_0223FD4C * param0, int param1, int par { Strbuf* v0; - sub_0200B1B8(param0->unk_B90, param1, param0->unk_BAC); + MessageLoader_GetStrbuf(param0->unk_B90, param1, param0->unk_BAC); sub_0201ADA4(¶m0->unk_F5C, 0xf0f); sub_0200E060(¶m0->unk_F5C, 0, 1, 10); @@ -602,18 +602,18 @@ static void ov94_0223CFD8 (UnkStruct_ov94_0223FD4C * param0, int param1, int par { Strbuf* v0; - sub_0200B1B8(param0->unk_B90, param1, param0->unk_BAC); + MessageLoader_GetStrbuf(param0->unk_B90, param1, param0->unk_BAC); sub_0201ADA4(¶m0->unk_109C, 0xf0f); sub_0200E060(¶m0->unk_109C, 0, 1, 10); param0->unk_BE0 = sub_0201D738(¶m0->unk_109C, 1, param0->unk_BAC, 0, 0, param2, NULL); } -void ov94_0223D030 (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, int param2, u16 param3) +void ov94_0223D030 (UnkStruct_0205AA50 * param0, MessageLoader * param1, int param2, u16 param3) { Strbuf* v0; - v0 = sub_0200B1EC(param1, param2); + v0 = MessageLoader_GetNewStrbuf(param1, param2); sub_0201ADA4(param0, param3); sub_0201D738(param0, 1, v0, 0, 0, 0, NULL); diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c index fd4ca1c5f9..01d8302a94 100644 --- a/src/overlay094/ov94_0223D0C4.c +++ b/src/overlay094/ov94_0223D0C4.c @@ -5,7 +5,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" @@ -335,7 +335,7 @@ static void ov94_0223D53C (UnkStruct_ov94_0223FD4C * param0) int v0; param0->unk_BAC = Strbuf_Init((90 * 2), 62); - param0->unk_BB0 = sub_0200B1EC(param0->unk_B90, 39); + param0->unk_BB0 = MessageLoader_GetNewStrbuf(param0->unk_B90, 39); for (v0 = 0; v0 < 10; v0++) { param0->unk_BB4[v0] = Strbuf_Init((10 * 2), 62); @@ -507,7 +507,7 @@ static void ov94_0223D88C (UnkStruct_ov94_0223FD4C * param0, int param1, int par Strbuf* v0; sub_0200B538(param0->unk_B8C, 0, sub_02076B10(param5)); - v0 = sub_0200B1EC(param0->unk_B90, param1); + v0 = MessageLoader_GetNewStrbuf(param0->unk_B90, param1); sub_0200C388(param0->unk_B8C, param0->unk_BAC, v0); sub_0201ADA4(¶m0->unk_F5C, 0xf0f); sub_0200E060(¶m0->unk_F5C, 0, 1, 10); @@ -523,7 +523,7 @@ static u32 Unk_ov94_022467FC[] = { (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0)) }; -void ov94_0223D910 (UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], BoxPokemon * param4, UnkStruct_ov94_0223BA88_sub2 * param5) +void ov94_0223D910 (MessageLoader * param0, MessageLoader * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], BoxPokemon * param4, UnkStruct_ov94_0223BA88_sub2 * param5) { Strbuf* v0, * v1, * v2, * v3; Strbuf* v4 = Strbuf_Init((10 + 1) * 2, 62); @@ -536,13 +536,13 @@ void ov94_0223D910 (UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, Un v6 = param5->unk_02; v7 = param5->unk_03; v8 = sub_02074570(param4, MON_DATA_HELD_ITEM, NULL); - v3 = sub_0200B1EC(param0, 70); - v1 = sub_0200B1EC(param0, Unk_ov94_02245FD8[v6]); + v3 = MessageLoader_GetNewStrbuf(param0, 70); + v1 = MessageLoader_GetNewStrbuf(param0, Unk_ov94_02245FD8[v6]); sub_0200B60C(param2, 3, v7, 3, 0, 1); v2 = sub_0200B29C(param2, param0, 102, 62); - v0 = sub_0200B1EC(param1, v10); + v0 = MessageLoader_GetNewStrbuf(param1, v10); Item_LoadName(v5, v8, 62); @@ -569,7 +569,7 @@ void ov94_0223D910 (UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, Un Strbuf_Free(v0); } -void ov94_0223DA78 (UnkStruct_0200B144 * param0, UnkStruct_0205AA50 param1[], u16 * param2, Pokemon * param3, UnkStruct_0205AA50 param4[]) +void ov94_0223DA78 (MessageLoader * param0, UnkStruct_0205AA50 param1[], u16 * param2, Pokemon * param3, UnkStruct_0205AA50 param4[]) { Strbuf* v0, * v1; Strbuf* v2, * v3; @@ -577,10 +577,10 @@ void ov94_0223DA78 (UnkStruct_0200B144 * param0, UnkStruct_0205AA50 param1[], u1 v0 = Strbuf_Init((7 + 1) * 2, 62); v3 = Strbuf_Init((7 + 1) * 2, 62); - v1 = sub_0200B1EC(param0, 48); + v1 = MessageLoader_GetNewStrbuf(param0, 48); Strbuf_CopyChars(v0, param2); - v2 = sub_0200B1EC(param0, 172); + v2 = MessageLoader_GetNewStrbuf(param0, 172); GetMonData(param3, MON_DATA_145, v3); ov94_02245900(¶m1[0], v1, 0, 0, 0, (u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))); diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c index a6f23ba780..ea98d6e2ee 100644 --- a/src/overlay094/ov94_0223DC04.c +++ b/src/overlay094/ov94_0223DC04.c @@ -4,7 +4,7 @@ #include "data_021BF67C.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" #include "struct_defs/pokemon.h" @@ -56,9 +56,9 @@ static int ov94_0223E1B0(UnkStruct_ov94_0223FD4C * param0); static int ov94_0223E1D0(UnkStruct_ov94_0223FD4C * param0); static int ov94_0223E2D0(UnkStruct_ov94_0223FD4C * param0); static void ov94_0223E240(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223E358(UnkStruct_0200B144 * param0, UnkStruct_0205AA50 param1[]); +static void ov94_0223E358(MessageLoader * 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_0223E3B0(UnkStruct_0205AA50 * param0, MessageLoader * param1, MessageLoader * param2, UnkStruct_ov94_0223BA88_sub3 * param3); static void ov94_0223E424(UnkStruct_0205AA50 * param0, Strbuf *param1, Strbuf *param2); static int (* Unk_ov94_0224682C[])(UnkStruct_ov94_0223FD4C * wk) = { @@ -294,7 +294,7 @@ static void ov94_0223DFA4 (UnkStruct_ov94_0223FD4C * param0) static void ov94_0223DFDC (UnkStruct_ov94_0223FD4C * param0) { int v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; UnkStruct_ov94_0223BA88 * v2 = ¶m0->unk_250[param0->unk_11C]; param0->unk_BAC = Strbuf_Init((90 * 2), 62); @@ -438,19 +438,19 @@ static void ov94_0223E300 (UnkStruct_ov94_0223FD4C * param0, int param1, int par { Strbuf* v0; - sub_0200B1B8(param0->unk_B90, param1, param0->unk_BAC); + MessageLoader_GetStrbuf(param0->unk_B90, param1, param0->unk_BAC); sub_0201ADA4(¶m0->unk_F5C, 0xf0f); sub_0200E060(¶m0->unk_F5C, 0, 1, 10); param0->unk_BE0 = sub_0201D738(¶m0->unk_F5C, 1, param0->unk_BAC, 0, 0, param2, NULL); } -static void ov94_0223E358 (UnkStruct_0200B144 * param0, UnkStruct_0205AA50 param1[]) +static void ov94_0223E358 (MessageLoader * param0, UnkStruct_0205AA50 param1[]) { Strbuf* v0, * v1; - v0 = sub_0200B1EC(param0, 74); - v1 = sub_0200B1EC(param0, 78); + v0 = MessageLoader_GetNewStrbuf(param0, 74); + v1 = MessageLoader_GetNewStrbuf(param0, 78); ov94_02245900(¶m1[0], v0, 0, 2, 0, (u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))); ov94_02245900(¶m1[1], v1, 0, 2, 1, (u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))); @@ -459,7 +459,7 @@ static void ov94_0223E358 (UnkStruct_0200B144 * param0, UnkStruct_0205AA50 param Strbuf_Free(v1); } -static void ov94_0223E3B0 (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B144 * param2, UnkStruct_ov94_0223BA88_sub3 * param3) +static void ov94_0223E3B0 (UnkStruct_0205AA50 * param0, MessageLoader * param1, MessageLoader * param2, UnkStruct_ov94_0223BA88_sub3 * param3) { sub_0201ADA4(param0, 0x0); diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c index 45dedc76e0..fd6628f454 100644 --- a/src/overlay094/ov94_0223E46C.c +++ b/src/overlay094/ov94_0223E46C.c @@ -6,7 +6,7 @@ #include "inlines.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" @@ -89,7 +89,7 @@ static void ov94_0223F9A4(UnkStruct_ov94_0223FD4C * param0, int param1, int para static int ov94_0223EEE0(UnkStruct_ov94_0223FD4C * param0); static int ov94_0223EF1C(UnkStruct_ov94_0223FD4C * param0); static int ov94_0223EF58(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223F9FC(UnkStruct_0205AA50 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0200B144 * param2); +static void ov94_0223F9FC(UnkStruct_0205AA50 * param0, UnkStruct_0205AA50 * param1, MessageLoader * param2); static int ov94_0223EC74(UnkStruct_ov94_0223FD4C * param0, int param1); static int ov94_0223FB0C(const UnkStruct_ov94_0223BA88_sub3 * param0, const UnkStruct_ov94_0223BA88_sub3 * param1, int param2, int param3); static int ov94_0223F970(UnkStruct_ov94_0223FD4C * param0); @@ -386,7 +386,7 @@ static void ov94_0223E9B8 (UnkStruct_ov94_0223FD4C * param0) int v0; param0->unk_BAC = Strbuf_Init((90 * 2), 62); - param0->unk_BB0 = sub_0200B1EC(param0->unk_B90, 41); + param0->unk_BB0 = MessageLoader_GetNewStrbuf(param0->unk_B90, 41); param0->unk_10E4 = Heap_AllocFromHeap(62, sizeof(UnkStruct_ov94_0223FD4C_sub3)); MI_CpuClearFast(param0->unk_10E4, sizeof(UnkStruct_ov94_0223FD4C_sub3)); @@ -1084,34 +1084,34 @@ static void ov94_0223F9A4 (UnkStruct_ov94_0223FD4C * param0, int param1, int par { Strbuf* v0; - sub_0200B1B8(param0->unk_B90, param1, param0->unk_BAC); + MessageLoader_GetStrbuf(param0->unk_B90, param1, param0->unk_BAC); sub_0201ADA4(¶m0->unk_F5C, 0xf0f); sub_0200E060(¶m0->unk_F5C, 0, 1, 10); param0->unk_BE0 = sub_0201D738(¶m0->unk_F5C, 1, param0->unk_BAC, 0, 0, param2, NULL); } -static void ov94_0223F9FC (UnkStruct_0205AA50 * param0, UnkStruct_0205AA50 * param1, UnkStruct_0200B144 * param2) +static void ov94_0223F9FC (UnkStruct_0205AA50 * param0, UnkStruct_0205AA50 * param1, MessageLoader * param2) { Strbuf* v0, * v1, * v2; - v0 = sub_0200B1EC(param2, 59); + v0 = MessageLoader_GetNewStrbuf(param2, 59); ov94_02245900(¶m0[0], v0, 0, 0, 0, (u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))); Strbuf_Free(v0); - v2 = sub_0200B1EC(param2, 61); + v2 = MessageLoader_GetNewStrbuf(param2, 61); ov94_02245900(¶m0[2], v2, 0, 0, 0, (u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))); Strbuf_Free(v2); - v1 = sub_0200B1EC(param2, 63); + v1 = MessageLoader_GetNewStrbuf(param2, 63); ov94_02245900(¶m0[4], v1, 0, 0, 0, (u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))); Strbuf_Free(v1); - v1 = sub_0200B1EC(param2, 165); + v1 = MessageLoader_GetNewStrbuf(param2, 165); ov94_02245900(¶m1[0], v1, 0, 0, 0, (u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))); Strbuf_Free(v1); - v0 = sub_0200B1EC(param2, 65); + v0 = MessageLoader_GetNewStrbuf(param2, 65); { int v3 = sub_02002EEC(0, v0, 0, param0[6].unk_07 * 8); @@ -1120,7 +1120,7 @@ static void ov94_0223F9FC (UnkStruct_0205AA50 * param0, UnkStruct_0205AA50 * par Strbuf_Free(v0); - v0 = sub_0200B1EC(param2, 66); + v0 = MessageLoader_GetNewStrbuf(param2, 66); { int v4 = sub_02002EEC(0, v0, 0, param0[7].unk_07 * 8); diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c index feefeb1fab..31ad8c8bf4 100644 --- a/src/overlay094/ov94_0223FB48.c +++ b/src/overlay094/ov94_0223FB48.c @@ -480,12 +480,12 @@ static void ov94_022401E0 (UnkStruct_ov94_0223FD4C * param0) param0->unk_BAC = Strbuf_Init((90 * 2), 62); if (param0->unk_24 == 5) { - param0->unk_BB0 = sub_0200B1EC(param0->unk_B90, 21); + param0->unk_BB0 = MessageLoader_GetNewStrbuf(param0->unk_B90, 21); } else if (param0->unk_24 == 6) { - param0->unk_BB0 = sub_0200B1EC(param0->unk_B90, 17); + param0->unk_BB0 = MessageLoader_GetNewStrbuf(param0->unk_B90, 17); } - param0->unk_BA8 = sub_0200B1EC(param0->unk_B90, 103); + param0->unk_BA8 = MessageLoader_GetNewStrbuf(param0->unk_B90, 103); if (param0->unk_112 == 30) { param0->unk_112 = 0; @@ -1019,7 +1019,7 @@ static void ov94_02240D58 (UnkStruct_ov94_0223FD4C * param0, int param1, int par UnkStruct_0205AA50 * v0; Strbuf* v1; - v1 = sub_0200B1EC(param0->unk_B90, param1); + v1 = MessageLoader_GetNewStrbuf(param0->unk_B90, param1); sub_0200C388(param0->unk_B8C, param0->unk_BAC, v1); if (param5 == 0) { @@ -1190,7 +1190,7 @@ static void ov94_02240FA0 (UnkStruct_ov94_0223FD4C * param0, int param1) } } - sub_0200B1B8(param0->unk_B90, 89, param0->unk_BA4); + MessageLoader_GetStrbuf(param0->unk_B90, 89, param0->unk_BA4); } NARC_dtor(v6); diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index 4904fa634e..6871b4a41e 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -5,7 +5,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_0200112C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -77,7 +77,7 @@ static int ov94_02241B2C(UnkStruct_ov94_0223FD4C * param0); static int ov94_02241BAC(UnkStruct_ov94_0223FD4C * param0); static int ov94_022420E4(UnkStruct_ov94_0223FD4C * param0); static int ov94_02242138(UnkStruct_ov94_0223FD4C * param0); -static void ov94_022423FC(UnkStruct_0200B144 * param0, UnkStruct_0200B358 * param1, UnkStruct_0205AA50 param2[], BoxPokemon * param3, UnkStruct_ov94_0223BA88_sub2 * param4); +static void ov94_022423FC(MessageLoader * param0, UnkStruct_0200B358 * param1, UnkStruct_0205AA50 param2[], BoxPokemon * param3, UnkStruct_ov94_0223BA88_sub2 * param4); static int ov94_02241DA0(UnkStruct_ov94_0223FD4C * param0); static int ov94_02241D64(UnkStruct_ov94_0223FD4C * param0); static int ov94_02241D08(UnkStruct_ov94_0223FD4C * param0); @@ -88,7 +88,7 @@ static int ov94_02242040(UnkStruct_ov94_0223FD4C * param0); static int ov94_02242068(UnkStruct_ov94_0223FD4C * param0); static int ov94_0224208C(UnkStruct_ov94_0223FD4C * param0); static void ov94_02242668(UnkStruct_ov94_0223BA88 * param0, UnkStruct_ov94_0223FD4C * param1); -static int ov94_02242718(UnkStruct_02013A04 ** param0, UnkStruct_0200B144 * param1, UnkStruct_0200B144 * param2, u16 * param3, u8 * param4, int param5, int param6, UnkStruct_02026324 * param7); +static int ov94_02242718(UnkStruct_02013A04 ** param0, MessageLoader * param1, MessageLoader * param2, u16 * param3, u8 * param4, int param5, int param6, UnkStruct_02026324 * param7); static u32 ov94_022421E8(int param0, u32 param1); static int (* Unk_ov94_0224695C[])(UnkStruct_ov94_0223FD4C *) = { @@ -330,7 +330,7 @@ static void ov94_0224158C (UnkStruct_ov94_0223FD4C * param0, int param1, int par { Strbuf* v0; - v0 = sub_0200B1EC(param0->unk_B90, param1); + v0 = MessageLoader_GetNewStrbuf(param0->unk_B90, param1); sub_0200C388(param0->unk_B8C, param0->unk_BAC, v0); sub_0201ADA4(¶m0->unk_F5C, 0xf0f); @@ -504,7 +504,7 @@ static void ov94_02241880 (UnkStruct_ov94_0223FD4C * param0) static void ov94_022418B8 (UnkStruct_ov94_0223FD4C * param0) { param0->unk_BAC = Strbuf_Init((90 * 2), 62); - param0->unk_BB0 = sub_0200B1EC(param0->unk_B90, 90); + param0->unk_BB0 = MessageLoader_GetNewStrbuf(param0->unk_B90, 90); param0->unk_10E4 = Heap_AllocFromHeap(62, sizeof(UnkStruct_ov94_0223FD4C_sub3)); MI_CpuClearFast(param0->unk_10E4, sizeof(UnkStruct_ov94_0223FD4C_sub3)); @@ -840,27 +840,27 @@ static u32 Unk_ov94_02246920[] = { (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0)) }; -void ov94_02242158 (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, int param2, int param3, int param4, u32 param5) +void ov94_02242158 (UnkStruct_0205AA50 * param0, MessageLoader * param1, int param2, int param3, int param4, u32 param5) { Strbuf* v0; if (param2 != 0) { - v0 = sub_0200B1EC(param1, param2); + v0 = MessageLoader_GetNewStrbuf(param1, param2); ov94_02245900(param0, v0, 0, param4, param3, param5); Strbuf_Free(v0); } } -void ov94_0224218C (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B144 * param2, int param3, int param4, int param5, u32 param6) +void ov94_0224218C (UnkStruct_0205AA50 * param0, MessageLoader * param1, MessageLoader * param2, int param3, int param4, int param5, u32 param6) { Strbuf* v0; if (param3 != 0) { - v0 = sub_0200B1EC(param1, param3); + v0 = MessageLoader_GetNewStrbuf(param1, param3); ov94_02245900(param0, v0, 0, param5, param4, param6); Strbuf_Free(v0); } else { - v0 = sub_0200B1EC(param2, 167); + v0 = MessageLoader_GetNewStrbuf(param2, 167); ov94_02245900(param0, v0, 0, param5, param4, param6); Strbuf_Free(v0); } @@ -884,7 +884,7 @@ const int Unk_ov94_02245FD8[] = { 0x76 }; -void ov94_02242204 (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, int param2, int param3, int param4, int param5, u32 param6) +void ov94_02242204 (UnkStruct_0205AA50 * param0, MessageLoader * param1, int param2, int param3, int param4, int param5, u32 param6) { Strbuf* v0; @@ -892,7 +892,7 @@ void ov94_02242204 (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, in return; } - v0 = sub_0200B1EC(param1, Unk_ov94_02245FD8[param2]); + v0 = MessageLoader_GetNewStrbuf(param1, Unk_ov94_02245FD8[param2]); if (param5 > 3) { ov94_02245900(param0, v0, param5, param4, 0, ov94_022421E8(param2, param6)); @@ -903,7 +903,7 @@ void ov94_02242204 (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, in Strbuf_Free(v0); } -asm void ov94_0224226C (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, int param2, int param3, int param4, u32 param5, int param6, int param7) +asm void ov94_0224226C (UnkStruct_0205AA50 * param0, MessageLoader * param1, int param2, int param3, int param4, u32 param5, int param6, int param7) { push {r4, r5, r6, lr} sub sp, #8 @@ -924,7 +924,7 @@ asm void ov94_0224226C (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1 add r0, r1, #0 lsl r1, r2, #3 ldr r1, [r3, r1] - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf add r4, r0, #0 ldr r0, [sp, #0x1c] str r5, [sp] @@ -941,7 +941,7 @@ asm void ov94_0224226C (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1 pop {r4, r5, r6, pc} } -asm void ov94_022422B8 (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, int param2, int param3, int param4, u32 param5, int param6) +asm void ov94_022422B8 (UnkStruct_0205AA50 * param0, MessageLoader * param1, int param2, int param3, int param4, u32 param5, int param6) { push {r4, lr} sub sp, #0x10 @@ -958,12 +958,12 @@ asm void ov94_022422B8 (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1 pop {r4, pc} } -void ov94_022422D4 (UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], int param4, int param5, int param6) +void ov94_022422D4 (MessageLoader * param0, MessageLoader * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], int param4, int param5, int param6) { Strbuf* v0; int v1; - v0 = sub_0200B1EC(param0, 97); + v0 = MessageLoader_GetNewStrbuf(param0, 97); ov94_02245900(¶m3[0], v0, 0, 0, 0, (u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))); for (v1 = 1; v1 < 3; v1++) { @@ -982,12 +982,12 @@ void ov94_022422D4 (UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, Un Strbuf_Free(v0); } -void ov94_02242368 (UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], int param4, int param5, int param6) +void ov94_02242368 (MessageLoader * param0, MessageLoader * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], int param4, int param5, int param6) { Strbuf* v0; int v1; - v0 = sub_0200B1EC(param0, 97); + v0 = MessageLoader_GetNewStrbuf(param0, 97); ov94_02245900(¶m3[0], v0, 0, 0, 0, (u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))); for (v1 = 1; v1 < 3; v1++) { @@ -1006,7 +1006,7 @@ void ov94_02242368 (UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, Un Strbuf_Free(v0); } -static void ov94_022423FC (UnkStruct_0200B144 * param0, UnkStruct_0200B358 * param1, UnkStruct_0205AA50 param2[], BoxPokemon * param3, UnkStruct_ov94_0223BA88_sub2 * param4) +static void ov94_022423FC (MessageLoader * param0, UnkStruct_0200B358 * param1, UnkStruct_0205AA50 param2[], BoxPokemon * param3, UnkStruct_ov94_0223BA88_sub2 * param4) { Strbuf* v0, * v1; Strbuf* v2 = Strbuf_Init(10 + 1, 62); @@ -1017,13 +1017,13 @@ static void ov94_022423FC (UnkStruct_0200B144 * param0, UnkStruct_0200B358 * par v4 = sub_02074570(param3, MON_DATA_111, NULL) + 1; v5 = sub_02075B40(param3); - v0 = sub_0200B1EC(param0, 100); + v0 = MessageLoader_GetNewStrbuf(param0, 100); sub_0200B60C(param1, 3, v5, 3, 0, 1); v1 = sub_0200B29C(param1, param0, 102, 62); if (v4 != 3) { - sub_0200B1B8(param0, Unk_ov94_02245FD8[v4], v3); + MessageLoader_GetStrbuf(param0, Unk_ov94_02245FD8[v4], v3); } for (v6 = 0; v6 < 3; v6++) { @@ -1135,7 +1135,7 @@ static const UnkStruct_ov84_02240FA8 Unk_ov94_0224608C = { NULL }; -UnkStruct_0200112C * ov94_022426A8 (UnkStruct_ov94_0223FD4C * param0, UnkStruct_02013A04 ** param1, UnkStruct_0205AA50 * param2, UnkStruct_0200B144 * param3) +UnkStruct_0200112C * ov94_022426A8 (UnkStruct_ov94_0223FD4C * param0, UnkStruct_02013A04 ** param1, UnkStruct_0205AA50 * param2, MessageLoader * param3) { UnkStruct_ov84_02240FA8 v0; int v1; @@ -1168,7 +1168,7 @@ static u16 Unk_ov94_02246928[] = { 0x1ED }; -static int ov94_02242718 (UnkStruct_02013A04 ** param0, UnkStruct_0200B144 * param1, UnkStruct_0200B144 * param2, u16 * param3, u8 * param4, int param5, int param6, UnkStruct_02026324 * param7) +static int ov94_02242718 (UnkStruct_02013A04 ** param0, MessageLoader * param1, MessageLoader * param2, u16 * param3, u8 * param4, int param5, int param6, UnkStruct_02026324 * param7) { int v0, v1, v2 = 0; int v3 = Unk_ov94_02246928[param6 + 1] - Unk_ov94_02246928[param6]; @@ -1211,7 +1211,7 @@ static int ov94_02242718 (UnkStruct_02013A04 ** param0, UnkStruct_0200B144 * par return v2 + 1; } -UnkStruct_0200112C * ov94_022427C0 (UnkStruct_ov94_0223FD4C * param0, UnkStruct_02013A04 ** param1, UnkStruct_0205AA50 * param2, UnkStruct_0200B144 * param3, UnkStruct_0200B144 * param4, UnkStruct_ov94_0223FD4C_sub3 * param5, UnkStruct_02026324 * param6) +UnkStruct_0200112C * ov94_022427C0 (UnkStruct_ov94_0223FD4C * param0, UnkStruct_02013A04 ** param1, UnkStruct_0205AA50 * param2, MessageLoader * param3, MessageLoader * param4, UnkStruct_ov94_0223FD4C_sub3 * param5, UnkStruct_02026324 * param6) { UnkStruct_ov84_02240FA8 v0; int v1, v2, v3; @@ -1238,7 +1238,7 @@ static Unk_ov94_0224693C[][2] = { {0x79, 0xFFFFFFFE} }; -UnkStruct_0200112C * ov94_02242840 (UnkStruct_02013A04 ** param0, UnkStruct_0205AA50 * param1, UnkStruct_0200B144 * param2) +UnkStruct_0200112C * ov94_02242840 (UnkStruct_02013A04 ** param0, UnkStruct_0205AA50 * param1, MessageLoader * param2) { UnkStruct_ov84_02240FA8 v0; int v1; @@ -1259,7 +1259,7 @@ UnkStruct_0200112C * ov94_02242840 (UnkStruct_02013A04 ** param0, UnkStruct_0205 return sub_0200112C(&v0, 0, 0, 62); } -UnkStruct_0200112C * ov94_022428B0 (UnkStruct_02013A04 ** param0, UnkStruct_0205AA50 * param1, UnkStruct_0200B144 * param2, int param3) +UnkStruct_0200112C * ov94_022428B0 (UnkStruct_02013A04 ** param0, UnkStruct_0205AA50 * param1, MessageLoader * param2, int param3) { UnkStruct_ov84_02240FA8 v0; int v1; @@ -1329,7 +1329,7 @@ int ov94_02242970 (int param0, int param1, int param2) return 0; } -UnkStruct_0200112C * ov94_022429B4 (UnkStruct_02013A04 ** param0, UnkStruct_0205AA50 * param1, UnkStruct_0200B144 * param2, UnkStruct_0200B144 * param3) +UnkStruct_0200112C * ov94_022429B4 (UnkStruct_02013A04 ** param0, UnkStruct_0205AA50 * param1, MessageLoader * param2, MessageLoader * param3) { UnkStruct_ov84_02240FA8 v0; int v1; diff --git a/src/overlay094/ov94_02244950.c b/src/overlay094/ov94_02244950.c index bd4ce7dc38..e296a44830 100644 --- a/src/overlay094/ov94_02244950.c +++ b/src/overlay094/ov94_02244950.c @@ -6,7 +6,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" @@ -321,7 +321,7 @@ static void ov94_02244F2C (UnkStruct_ov94_0223FD4C * param0) { param0->unk_BAC = Strbuf_Init((90 * 2), 62); param0->unk_BDC = Strbuf_Init((16 * 8 * 2), 62); - param0->unk_BB0 = sub_0200B1EC(param0->unk_B90, 31); + param0->unk_BB0 = MessageLoader_GetNewStrbuf(param0->unk_B90, 31); } static void ov94_02244F64 (UnkStruct_ov94_0223FD4C * param0) @@ -906,11 +906,11 @@ static int ov94_022457F0 (UnkStruct_ov94_0223FD4C * param0) return 3; } -void ov94_02245824 (UnkStruct_ov94_0223FD4C * param0, UnkStruct_0200B144 * param1, int param2, int param3, u16 param4) +void ov94_02245824 (UnkStruct_ov94_0223FD4C * param0, MessageLoader * param1, int param2, int param3, u16 param4) { Strbuf* v0; - v0 = sub_0200B1EC(param1, param2); + v0 = MessageLoader_GetNewStrbuf(param1, param2); sub_0200C388(param0->unk_B8C, param0->unk_BAC, v0); Strbuf_Free(v0); @@ -960,7 +960,7 @@ static void ov94_0224593C (UnkStruct_ov94_0223FD4C * param0, int param1) { Strbuf* v0 = Strbuf_Init((16 * 8 * 2), 62); - sub_0200B1B8(param0->unk_B9C, param1, v0); + MessageLoader_GetStrbuf(param0->unk_B9C, param1, v0); sub_0200C388(param0->unk_B8C, param0->unk_BDC, v0); sub_0201ADA4(¶m0->unk_F8C, 15); diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c index a12d9883c6..6b69f1e753 100644 --- a/src/overlay095/ov95_02246C20.c +++ b/src/overlay095/ov95_02246C20.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_020067E8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" @@ -57,7 +57,7 @@ struct UnkStruct_ov95_02247628_t { int unk_04; UnkStruct_02018340 * unk_08; UnkStruct_0200B358 * unk_0C; - UnkStruct_0200B144 * unk_10; + MessageLoader * unk_10; Strbuf* unk_14; UnkStruct_020218BC * unk_18; UnkStruct_0200C738 unk_1C; @@ -152,7 +152,7 @@ int ov95_02246C20 (UnkStruct_020067E8 * param0, int * param1) v0->unk_04 = 0; v0->unk_08 = sub_02018340(57); v0->unk_14 = Strbuf_Init(400, 57); - v0->unk_10 = sub_0200B144(0, 26, 350, 57); + v0->unk_10 = MessageLoader_Init(0, 26, 350, 57); v0->unk_0C = sub_0200B358(57); switch (v0->unk_00->unk_10) { @@ -220,7 +220,7 @@ int ov95_02246E1C (UnkStruct_020067E8 * param0, int * param1) sub_0200DA58(v1->unk_1A8); sub_02039794(); sub_0200B3F0(v1->unk_0C); - sub_0200B190(v1->unk_10); + MessageLoader_Free(v1->unk_10); Strbuf_Free(v1->unk_14); Heap_FreeToHeap(v1->unk_08); sub_02021964(v1->unk_18); @@ -684,7 +684,7 @@ UnkStruct_0200B358 * ov95_0224762C (UnkStruct_ov95_02247628 * param0) return param0->unk_0C; } -UnkStruct_0200B144 * ov95_02247630 (UnkStruct_ov95_02247628 * param0) +MessageLoader * ov95_02247630 (UnkStruct_ov95_02247628 * param0) { return param0->unk_10; } diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c index 553f73f5b3..9378a6e7ee 100644 --- a/src/overlay095/ov95_02247B6C.c +++ b/src/overlay095/ov95_02247B6C.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02007C7C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" @@ -328,7 +328,7 @@ static int ov95_02247F04 (UnkStruct_ov95_02247C6C * param0, int * param1) break; case 1: if (++(param0->unk_08) > 10) { - UnkStruct_0200B144 * v0 = ov95_02247630(param0->unk_00); + MessageLoader * v0 = ov95_02247630(param0->unk_00); UnkStruct_0200B358 * v1 = ov95_0224762C(param0->unk_00); int v2, v3; @@ -340,7 +340,7 @@ static int ov95_02247F04 (UnkStruct_ov95_02247C6C * param0, int * param1) v3 = 3; } - sub_0200B1B8(v0, v2, param0->unk_68); + MessageLoader_GetStrbuf(v0, v2, param0->unk_68); sub_0200C388(v1, param0->unk_6C, param0->unk_68); sub_0201D738(&(param0->unk_58), 1, param0->unk_6C, 0, 0, 0xff, NULL); sub_0200E010(&(param0->unk_58), 109, 2); @@ -351,10 +351,10 @@ static int ov95_02247F04 (UnkStruct_ov95_02247C6C * param0, int * param1) break; case 2: if (++(param0->unk_08) > 60) { - UnkStruct_0200B144 * v4 = ov95_02247630(param0->unk_00); + MessageLoader * v4 = ov95_02247630(param0->unk_00); UnkStruct_0200B358 * v5 = ov95_0224762C(param0->unk_00); - sub_0200B1B8(v4, 1, param0->unk_68); + MessageLoader_GetStrbuf(v4, 1, param0->unk_68); sub_0200C388(v5, param0->unk_6C, param0->unk_68); { diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c index 6f89ae1be0..5416f756ed 100644 --- a/src/overlay095/ov95_0224B3D8.c +++ b/src/overlay095/ov95_0224B3D8.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02007C7C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" @@ -403,7 +403,7 @@ static int ov95_0224B81C (UnkStruct_ov95_0224B4D4 * param0, int * param1) break; case 1: if (++(param0->unk_08) > 10) { - UnkStruct_0200B144 * v0 = ov95_02247630(param0->unk_00); + MessageLoader * v0 = ov95_02247630(param0->unk_00); UnkStruct_0200B358 * v1 = ov95_0224762C(param0->unk_00); int v2, v3; @@ -415,7 +415,7 @@ static int ov95_0224B81C (UnkStruct_ov95_0224B4D4 * param0, int * param1) v3 = 3; } - sub_0200B1B8(v0, v2, param0->unk_6C); + MessageLoader_GetStrbuf(v0, v2, param0->unk_6C); sub_0200C388(v1, param0->unk_70, param0->unk_6C); sub_0201D738(&(param0->unk_5C), 1, param0->unk_70, 0, 0, 0xff, NULL); @@ -430,10 +430,10 @@ static int ov95_0224B81C (UnkStruct_ov95_0224B4D4 * param0, int * param1) break; case 2: if (ov95_0224B990(param0, 60)) { - UnkStruct_0200B144 * v4 = ov95_02247630(param0->unk_00); + MessageLoader * v4 = ov95_02247630(param0->unk_00); UnkStruct_0200B358 * v5 = ov95_0224762C(param0->unk_00); - sub_0200B1B8(v4, 3, param0->unk_6C); + MessageLoader_GetStrbuf(v4, 3, param0->unk_6C); sub_0200C388(v5, param0->unk_70, param0->unk_6C); sub_0201ADA4(&(param0->unk_5C), 0xf); sub_0201D738(&(param0->unk_5C), 1, param0->unk_70, 0, 0, 0xff, NULL); diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c index 418255de5c..59bf682bb8 100644 --- a/src/overlay096/ov96_0223B6A0.c +++ b/src/overlay096/ov96_0223B6A0.c @@ -95,9 +95,9 @@ int ov96_0223B6A0 (UnkStruct_020067E8 * param0, int * param1) } v0->unk_BCC = sub_0200B368(11, 32, 68); - v0->unk_BD0 = sub_0200B144(0, 26, 670, 68); - v0->unk_BD4 = sub_0200B144(0, 26, 674, 68); - v0->unk_BD8 = sub_0200B144(0, 26, 695, 68); + v0->unk_BD0 = MessageLoader_Init(0, 26, 670, 68); + v0->unk_BD4 = MessageLoader_Init(0, 26, 674, 68); + v0->unk_BD8 = MessageLoader_Init(0, 26, 695, 68); sub_02017DD4(4, 8); ov96_0223B980(v0, param0); @@ -179,9 +179,9 @@ int ov96_0223B8CC (UnkStruct_020067E8 * param0, int * param1) ov96_0223BC8C(v0); - sub_0200B190(v0->unk_BD8); - sub_0200B190(v0->unk_BD4); - sub_0200B190(v0->unk_BD0); + MessageLoader_Free(v0->unk_BD8); + MessageLoader_Free(v0->unk_BD4); + MessageLoader_Free(v0->unk_BD0); sub_0200B3F0(v0->unk_BCC); ov96_0223B99C(v0); diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c index 92c5fd9d14..7a247e4c22 100644 --- a/src/overlay096/ov96_0223BCE0.c +++ b/src/overlay096/ov96_0223BCE0.c @@ -6,7 +6,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" #include "overlay096/struct_ov96_0223BF40_decl.h" @@ -76,8 +76,8 @@ static int ov96_0223D7B8(UnkStruct_ov96_0223BF40 * param0); static int ov96_0223D7E4(UnkStruct_ov96_0223BF40 * param0); 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_0223D814(UnkStruct_ov96_0223BF40 * param0, MessageLoader * param1, int param2, int param3, u16 param4); +static void ov96_0223D750(UnkStruct_ov96_0223BF40 * param0, MessageLoader * param1, int param2, int param3, u16 param4); 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); @@ -404,7 +404,7 @@ static void ov96_0223C358 (UnkStruct_ov96_0223BF40 * param0) param0->unk_BDC = Strbuf_Init((90 * 2), 68); param0->unk_BE4 = Strbuf_Init(4, 68); param0->unk_BE8 = Strbuf_Init(3, 68); - param0->unk_BE0 = sub_0200B1EC(param0->unk_BD0, 10); + param0->unk_BE0 = MessageLoader_GetNewStrbuf(param0->unk_BD0, 10); param0->unk_BEC = Strbuf_Init((16 * 8 * 2), 68); } @@ -1563,9 +1563,9 @@ static int ov96_0223D71C (UnkStruct_ov96_0223BF40 * param0) return 3; } -static void ov96_0223D750 (UnkStruct_ov96_0223BF40 * param0, UnkStruct_0200B144 * param1, int param2, int param3, u16 param4) +static void ov96_0223D750 (UnkStruct_ov96_0223BF40 * param0, MessageLoader * param1, int param2, int param3, u16 param4) { - Strbuf* v0 = sub_0200B1EC(param1, param2); + Strbuf* v0 = MessageLoader_GetNewStrbuf(param1, param2); sub_0200C388(param0->unk_BCC, param0->unk_BDC, v0); sub_0201ADA4(¶m0->unk_E38, 0xf0f); @@ -1598,9 +1598,9 @@ static int ov96_0223D7E4 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static void ov96_0223D814 (UnkStruct_ov96_0223BF40 * param0, UnkStruct_0200B144 * param1, int param2, int param3, u16 param4) +static void ov96_0223D814 (UnkStruct_ov96_0223BF40 * param0, MessageLoader * param1, int param2, int param3, u16 param4) { - sub_0200B1B8(param1, param2, param0->unk_BDC); + MessageLoader_GetStrbuf(param1, param2, param0->unk_BDC); sub_0201ADA4(¶m0->unk_E38, 0xf0f); sub_0200E060(¶m0->unk_E38, 0, 1, 14); @@ -1676,7 +1676,7 @@ static void ov96_0223D9B8 (UnkStruct_ov96_0223BF40 * param0, int param1) { Strbuf* v0 = Strbuf_Init((16 * 8 * 2), 68); - sub_0200B1B8(param0->unk_BD8, param1, v0); + MessageLoader_GetStrbuf(param0->unk_BD8, param1, v0); sub_0200C388(param0->unk_BCC, param0->unk_BEC, v0); sub_0201ADA4(¶m0->unk_E78, 15); sub_0200DC48(¶m0->unk_E78, 1, (1 + (18 + 12)), 11); diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index c572af45e2..c5dfc22814 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -4,7 +4,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_020067E8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" @@ -540,7 +540,7 @@ static void ov97_0222B4FC (UnkStruct_0222AE60 * param0, int param1, int param2) sub_02019448(param0->unk_00, 2); } -static void ov97_0222B53C (UnkStruct_0205AA50 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B358 * param2, u32 param3, u32 param4, int param5) +static void ov97_0222B53C (UnkStruct_0205AA50 * param0, MessageLoader * param1, UnkStruct_0200B358 * param2, u32 param3, u32 param4, int param5) { int v0, v1; Strbuf* v2; @@ -573,11 +573,11 @@ static BOOL ov97_0222B5C0 (void * param0, int param1, UnkStruct_ov97_02237808 * int v0, v1, v2; Strbuf* v3; UnkStruct_0200B358 * v4; - UnkStruct_0200B144 * v5; + MessageLoader * v5; UnkStruct_0222AE60 * v6 = (UnkStruct_0222AE60 *)param0; u32 v7; - v5 = sub_0200B144(1, 26, 550, 81); + v5 = MessageLoader_Init(1, 26, 550, 81); v4 = sub_0200B358(81); if (sub_02025F30(v6->unk_0C) == 1) { @@ -618,7 +618,7 @@ static BOOL ov97_0222B5C0 (void * param0, int param1, UnkStruct_ov97_02237808 * v6->unk_DC[param1] = Unk_ov97_0223E014[param1].unk_00; sub_0200B3F0(v4); - sub_0200B190(v5); + MessageLoader_Free(v5); return 1; } diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c index 1edc146480..d0a2511e47 100644 --- a/src/overlay097/ov97_0222C174.c +++ b/src/overlay097/ov97_0222C174.c @@ -6,7 +6,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_020067E8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" @@ -808,12 +808,12 @@ static void ov97_0222C974 (UnkStruct_ov97_0222C388 * param0) RTCDate v0; Strbuf* v1; UnkStruct_0200B358 * v2; - UnkStruct_0200B144 * v3; + MessageLoader * v3; UnkStruct_0202DBAC * v4 = ¶m0->unk_3180; MI_CpuClear8(v4, sizeof(UnkStruct_0202DBAC)); - v3 = sub_0200B144(1, 26, 421, param0->unk_00); + v3 = MessageLoader_Init(1, 26, 421, param0->unk_00); v2 = sub_0200B358(param0->unk_00); v4->unk_00 = 7; @@ -844,7 +844,7 @@ static void ov97_0222C974 (UnkStruct_ov97_0222C388 * param0) v4->unk_354 = RTC_ConvertDateToDay(&v0); sub_0200B3F0(v2); - sub_0200B190(v3); + MessageLoader_Free(v3); sub_0202DB2C(param0->unk_3174, &v4->unk_00, 3); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 0); diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c index 0b467764a5..947ec8e897 100644 --- a/src/overlay097/ov97_0222D30C.c +++ b/src/overlay097/ov97_0222D30C.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" @@ -802,13 +802,13 @@ static void ov97_0222DD1C (UnkStruct_020067E8 * param0, UnkStruct_ov97_0223E5B8 } v2->unk_7C = sub_02013A04(param2, 86); - v2->unk_10 = sub_0200B144(0, 26, 421, 86); + v2->unk_10 = MessageLoader_Init(0, 26, 421, 86); for (v0 = 0; v0 < param2; v0++) { sub_02013A4C(v2->unk_7C, v2->unk_10, param1[v0].unk_00, param1[v0].unk_04); } - sub_0200B190(v2->unk_10); + MessageLoader_Free(v2->unk_10); v1 = Unk_ov97_0223E5D0; @@ -857,7 +857,7 @@ static void ov97_0222DE78 (UnkStruct_020067E8 * param0, UnkStruct_0205AA50 * par Strbuf* v0; UnkStruct_ov97_0222D04C * v1 = sub_0200682C(param0); - v1->unk_10 = sub_0200B144(1, 26, 421, 86); + v1->unk_10 = MessageLoader_Init(1, 26, 421, 86); v1->unk_0C = sub_0200B358(86); sub_0201ADA4(param1, sub_02002DF8(1, 6)); @@ -875,7 +875,7 @@ static void ov97_0222DE78 (UnkStruct_020067E8 * param0, UnkStruct_0205AA50 * par } sub_0200E060(param1, 0, 1, 2); - sub_0200B190(v1->unk_10); + MessageLoader_Free(v1->unk_10); sub_0200B3F0(v1->unk_0C); v1->unk_68 = 0xff; @@ -1044,11 +1044,11 @@ static int ov97_0222E1D8 (UnkStruct_020067E8 * param0) static int ov97_0222E228 (UnkStruct_020067E8 * param0, UnkStruct_0205AA50 * param1, int param2, int param3) { UnkStruct_0200B358 * v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; UnkStruct_ov97_0222D04C * v2 = sub_0200682C(param0); if (param1 && param2) { - v1 = sub_0200B144(1, 26, 421, 86); + v1 = MessageLoader_Init(1, 26, 421, 86); v0 = sub_0200B358(86); v2->unk_14 = sub_0200B29C(v0, v1, param2, 86); v2->unk_68 = 1; @@ -1057,7 +1057,7 @@ static int ov97_0222E228 (UnkStruct_020067E8 * param0, UnkStruct_0205AA50 * para v2->unk_74 = param3; sub_0200B3F0(v0); - sub_0200B190(v1); + MessageLoader_Free(v1); } else { if (sub_0201D724(v2->unk_6C) == 0) { Strbuf_Free(v2->unk_14); diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c index 214d7b3d4d..71a6f7fc26 100644 --- a/src/overlay097/ov97_02230410.c +++ b/src/overlay097/ov97_02230410.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02013B10_decl.h" @@ -87,7 +87,7 @@ typedef struct { UnkStruct_ov97_0222D04C unk_04; UnkStruct_02018340 * unk_2A5C; UnkStruct_0200B358 * unk_2A60; - UnkStruct_0200B144 * unk_2A64; + MessageLoader * unk_2A64; UnkStruct_0205AA50 unk_2A68[20]; int unk_2BA8[20]; int unk_2BF8; @@ -317,13 +317,13 @@ static void ov97_02230530 (UnkStruct_ov97_02230868 * param0, UnkStruct_ov97_0223 } param0->unk_2C2C = sub_02013A04(param2, 87); - param0->unk_2A64 = sub_0200B144(0, 26, 421, 87); + param0->unk_2A64 = MessageLoader_Init(0, 26, 421, 87); for (v0 = 0; v0 < param2; v0++) { sub_02013A4C(param0->unk_2C2C, param0->unk_2A64, param1[v0].unk_00, param1[v0].unk_04); } - sub_0200B190(param0->unk_2A64); + MessageLoader_Free(param0->unk_2A64); v1 = Unk_ov97_0223E660; @@ -337,7 +337,7 @@ static void ov97_02230530 (UnkStruct_ov97_02230868 * param0, UnkStruct_ov97_0223 static void ov97_022305EC (UnkStruct_0205AA50 * param0, int param1) { Strbuf* v0; - UnkStruct_0200B144 * v1 = sub_0200B144(1, 26, 421, 87); + MessageLoader * v1 = MessageLoader_Init(1, 26, 421, 87); UnkStruct_0200B358 * v2 = sub_0200B358(87); sub_0201ADA4(param0, sub_02002DF8(1, 6)); @@ -347,7 +347,7 @@ static void ov97_022305EC (UnkStruct_0205AA50 * param0, int param1) sub_0201A954(param0); Strbuf_Free(v0); - sub_0200B190(v1); + MessageLoader_Free(v1); sub_0200B3F0(v2); } @@ -591,7 +591,7 @@ static void ov97_02230C44 (UnkStruct_ov97_02230868 * param0, int param1, int par u32 v3; UnkStruct_ov97_0223E680 * v4 = Unk_ov97_0223E680; - param0->unk_2A64 = sub_0200B144(1, 26, 421, param0->unk_00); + param0->unk_2A64 = MessageLoader_Init(1, 26, 421, param0->unk_00); param0->unk_2A60 = sub_0200B358(param0->unk_00); param0->unk_2C24 = param2; @@ -636,7 +636,7 @@ static void ov97_02230C44 (UnkStruct_ov97_02230868 * param0, int param1, int par } } - sub_0200B190(param0->unk_2A64); + MessageLoader_Free(param0->unk_2A64); sub_0200B3F0(param0->unk_2A60); if (param2 == 0) { @@ -657,7 +657,7 @@ static int ov97_02230E04 (UnkStruct_ov97_02230868 * param0, UnkStruct_0205AA50 * sub_0201ADA4(param1, v2->unk_1C); if (v2->unk_20) { - param0->unk_2A64 = sub_0200B144(1, 26, 421, 87); + param0->unk_2A64 = MessageLoader_Init(1, 26, 421, 87); param0->unk_2A60 = sub_0200B358(87); } @@ -671,7 +671,7 @@ static int ov97_02230E04 (UnkStruct_ov97_02230868 * param0, UnkStruct_0205AA50 * sub_0201D78C(param1, v2->unk_14, v0, 0, 0, 0xff, v2->unk_18, NULL); Strbuf_Free(v0); - sub_0200B190(param0->unk_2A64); + MessageLoader_Free(param0->unk_2A64); sub_0200B3F0(param0->unk_2A60); } @@ -1336,7 +1336,7 @@ static int ov97_02231CA0 (UnkStruct_ov97_02230868 * param0, UnkStruct_0205AA50 * UnkStruct_02025E6C * v5; Strbuf* v6; UnkStruct_0200B358 * v7; - UnkStruct_0200B144 * v8; + MessageLoader * v8; int v9[4]; int v10[4]; @@ -1374,7 +1374,7 @@ static int ov97_02231CA0 (UnkStruct_ov97_02230868 * param0, UnkStruct_0205AA50 * v10[3] = ov97_02231C48(v9); v7 = sub_0200B358(87); - v8 = sub_0200B144(1, 26, 421, 87); + v8 = MessageLoader_Init(1, 26, 421, 87); v2 = 0; sub_0201ADA4(param1, 0); @@ -1408,7 +1408,7 @@ static int ov97_02231CA0 (UnkStruct_ov97_02230868 * param0, UnkStruct_0205AA50 * sub_0201A954(param1); } - sub_0200B190(v8); + MessageLoader_Free(v8); sub_0200B3F0(v7); return v1; @@ -1419,7 +1419,7 @@ static void ov97_02231E78 (UnkStruct_ov97_02230868 * param0, UnkStruct_0205AA50 Strbuf* v0; param0->unk_2C54 = param2; - param0->unk_2A64 = sub_0200B144(1, 26, 421, 87); + param0->unk_2A64 = MessageLoader_Init(1, 26, 421, 87); param0->unk_2A60 = sub_0200B358(87); sub_0201ADA4(param1, 0); @@ -1431,7 +1431,7 @@ static void ov97_02231E78 (UnkStruct_ov97_02230868 * param0, UnkStruct_0205AA50 sub_0201A954(param1); Strbuf_Free(v0); - sub_0200B190(param0->unk_2A64); + MessageLoader_Free(param0->unk_2A64); sub_0200B3F0(param0->unk_2A60); } diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c index 853f82d7b3..92e4c26528 100644 --- a/src/overlay097/ov97_02233B18.c +++ b/src/overlay097/ov97_02233B18.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02015920_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -438,7 +438,7 @@ static void ov97_02233DD0 (UnkStruct_ov97_02234A2C * param0, UnkStruct_ov97_0223 { Strbuf* v0; UnkStruct_0200B358 * v1; - UnkStruct_0200B144 * v2; + MessageLoader * v2; int v3, v4, v5; Strbuf* v6; @@ -457,7 +457,7 @@ static void ov97_02233DD0 (UnkStruct_ov97_02234A2C * param0, UnkStruct_ov97_0223 } if (param1->unk_34 != -1) { - v2 = sub_0200B144(1, 26, 454, 78); + v2 = MessageLoader_Init(1, 26, 454, 78); if (param1->unk_40) { v1 = param1->unk_40; @@ -468,7 +468,7 @@ static void ov97_02233DD0 (UnkStruct_ov97_02234A2C * param0, UnkStruct_ov97_0223 Strbuf_Clear(param0->unk_12668); v0 = param0->unk_12668; - v6 = sub_0200B1EC(v2, param1->unk_34); + v6 = MessageLoader_GetNewStrbuf(v2, param1->unk_34); sub_0200C388(v1, param0->unk_12668, v6); Strbuf_Free(v6); @@ -480,7 +480,7 @@ static void ov97_02233DD0 (UnkStruct_ov97_02234A2C * param0, UnkStruct_ov97_0223 sub_0200B3F0(v1); } - sub_0200B190(v2); + MessageLoader_Free(v2); param1->unk_34 = -1; } @@ -1185,7 +1185,7 @@ static void ov97_02234B0C (UnkStruct_ov97_02234A2C * param0, BoxPokemonGBA * par int v0, v1; int v2, v3; UnkStruct_ov97_02233DAC v4; - UnkStruct_0200B144 * v5; + MessageLoader * v5; u8 v6[10 + 1]; u16 v7[10 + 1]; Strbuf* v8; @@ -1232,10 +1232,10 @@ static void ov97_02234B0C (UnkStruct_ov97_02234A2C * param0, BoxPokemonGBA * par ov97_02233DD0(param0, &v4, 0x4 | 0x2); v8 = Strbuf_Init(64, 78); - v5 = sub_0200B144(1, 26, 412, 78); + v5 = MessageLoader_Init(1, 26, 412, 78); v0 = ov97_02236DD0(GetGBABoxMonData(param1, 11, NULL)); - sub_0200B1B8(v5, v0, v8); + MessageLoader_GetStrbuf(v5, v0, v8); v4.unk_3C = v8; v4.unk_34 = -1; @@ -1244,7 +1244,7 @@ static void ov97_02234B0C (UnkStruct_ov97_02234A2C * param0, BoxPokemonGBA * par ov97_02233DD0(param0, &v4, 0x4 | 0x2); - sub_0200B190(v5); + MessageLoader_Free(v5); Strbuf_Free(v8); v2 = GetGBABoxMonData(param1, 12, NULL); diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c index 12671e4cf1..e6fc68d897 100644 --- a/src/overlay097/ov97_02237694.c +++ b/src/overlay097/ov97_02237694.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_020067E8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" @@ -225,7 +225,7 @@ static int ov97_02237870 (UnkStruct_ov97_02237808 * param0, int param1) int v0; Strbuf* v1; UnkStruct_0200B358 * v2; - UnkStruct_0200B144 * v3; + MessageLoader * v3; UnkStruct_ov97_0223F550 * v4 = &Unk_ov97_0223F550; if ((param1 != -1) && (param0->unk_4C != param1)) { @@ -236,7 +236,7 @@ static int ov97_02237870 (UnkStruct_ov97_02237808 * param0, int param1) } if (param0->unk_4C != -1) { - v3 = sub_0200B144(1, 26, param0->unk_34, v4->unk_08); + v3 = MessageLoader_Init(1, 26, param0->unk_34, v4->unk_08); if (param0->unk_14 == NULL) { v2 = sub_0200B358(v4->unk_08); @@ -264,7 +264,7 @@ static int ov97_02237870 (UnkStruct_ov97_02237808 * param0, int param1) sub_0200B3F0(v2); } - sub_0200B190(v3); + MessageLoader_Free(v3); } } diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c index bfc0cf6caf..e319f258c1 100644 --- a/src/overlay098/ov98_022471C8.c +++ b/src/overlay098/ov98_022471C8.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_020149F0_decl.h" @@ -76,11 +76,11 @@ typedef struct { int unk_18; int unk_1C; UnkStruct_0200B358 * unk_20; - UnkStruct_0200B144 * unk_24; - UnkStruct_0200B144 * unk_28; - UnkStruct_0200B144 * unk_2C; - UnkStruct_0200B144 * unk_30; - UnkStruct_0200B144 * unk_34; + MessageLoader * unk_24; + MessageLoader * unk_28; + MessageLoader * unk_2C; + MessageLoader * unk_30; + MessageLoader * unk_34; Strbuf* unk_38; Strbuf* unk_3C; Strbuf* unk_40; @@ -167,7 +167,7 @@ static int ov98_022496C0(UnkStruct_ov98_02247704 * param0); static int ov98_022496EC(UnkStruct_ov98_02247704 * param0); 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 void ov98_02249714(UnkStruct_ov98_02247704 * param0, MessageLoader * param1, int param2, int param3, u16 param4); static int ov98_0224977C(int param0); 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); @@ -326,14 +326,14 @@ int ov98_022471C8 (UnkStruct_020067E8 * param0, int * param1) sub_0201E450(4); v0->unk_20 = sub_0200B368(11, 64, 109); - v0->unk_24 = sub_0200B144(0, 26, 671, 109); - v0->unk_2C = sub_0200B144(0, 26, 674, 109); - v0->unk_30 = sub_0200B144(0, 26, 695, 109); - v0->unk_28 = sub_0200B144(0, 26, 412, 109); - v0->unk_34 = sub_0200B144(0, 26, 358, 109); + v0->unk_24 = MessageLoader_Init(0, 26, 671, 109); + v0->unk_2C = MessageLoader_Init(0, 26, 674, 109); + v0->unk_30 = MessageLoader_Init(0, 26, 695, 109); + v0->unk_28 = MessageLoader_Init(0, 26, 412, 109); + v0->unk_34 = MessageLoader_Init(0, 26, 358, 109); v0->unk_38 = Strbuf_Init((90 * 2), 109); v0->unk_40 = Strbuf_Init((16 * 8 * 2), 109); - v0->unk_3C = sub_0200B1EC(v0->unk_24, 31); + v0->unk_3C = MessageLoader_GetNewStrbuf(v0->unk_24, 31); ov98_02247704(v0); ov98_02247A24(v0); @@ -422,11 +422,11 @@ int ov98_02247440 (UnkStruct_020067E8 * param0, int * param1) inline_ov61_0222C160(&v0->unk_EC); - sub_0200B190(v0->unk_34); - sub_0200B190(v0->unk_28); - sub_0200B190(v0->unk_30); - sub_0200B190(v0->unk_2C); - sub_0200B190(v0->unk_24); + MessageLoader_Free(v0->unk_34); + MessageLoader_Free(v0->unk_28); + MessageLoader_Free(v0->unk_30); + MessageLoader_Free(v0->unk_2C); + MessageLoader_Free(v0->unk_24); sub_0200B3F0(v0->unk_20); Strbuf_Free(v0->unk_3C); Strbuf_Free(v0->unk_40); @@ -932,11 +932,11 @@ static void ov98_02247F08 (UnkStruct_ov98_02247704 * param0) sub_0201ADA4(¶m0->unk_D4, 0xf0f); - v0 = sub_0200B1EC(param0->unk_34, 42); + v0 = MessageLoader_GetNewStrbuf(param0->unk_34, 42); sub_0201D738(¶m0->unk_D4, 0, v0, Unk_ov98_02249D60[0][0] + 12, Unk_ov98_02249D60[0][1], 0xff, NULL); Strbuf_Free(v0); - v0 = sub_0200B1EC(param0->unk_34, 43); + v0 = MessageLoader_GetNewStrbuf(param0->unk_34, 43); sub_0201D738(¶m0->unk_D4, 0, v0, Unk_ov98_02249D60[1][0] + 12, Unk_ov98_02249D60[1][1], 0xff, NULL); Strbuf_Free(v0); sub_02014A58(param0->unk_E4, ¶m0->unk_D4, Unk_ov98_02249D60[param0->unk_B0][0], Unk_ov98_02249D60[param0->unk_B0][1]); @@ -995,7 +995,7 @@ asm static void ov98_022482CC (UnkStruct_ov98_02247704 * param0) bl sub_0201ADA4 ldr r0, [r7, #0x34] mov r1, #0x2c - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf str r0, [sp, #0xc] bl Strbuf_Length mov r1, #0x6d @@ -1069,7 +1069,7 @@ asm static int ov98_02248350 (UnkStruct_ov98_02247704 * param0) _0224836E: ldr r0, [r5, #0x34] mov r1, #0x2c - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf str r0, [sp, #0x14] bl Strbuf_NumLines add r1, r5, #0 @@ -2459,11 +2459,11 @@ static int ov98_022496EC (UnkStruct_ov98_02247704 * param0) return 0; } -static void ov98_02249714 (UnkStruct_ov98_02247704 * param0, UnkStruct_0200B144 * param1, int param2, int param3, u16 param4) +static void ov98_02249714 (UnkStruct_ov98_02247704 * param0, MessageLoader * param1, int param2, int param3, u16 param4) { Strbuf* v0; - v0 = sub_0200B1EC(param1, param2); + v0 = MessageLoader_GetNewStrbuf(param1, param2); sub_0200C388(param0->unk_20, param0->unk_38, v0); Strbuf_Free(v0); @@ -2649,7 +2649,7 @@ static void ov98_02249900 (UnkStruct_ov98_02247704 * param0, int param1) { Strbuf* v0 = Strbuf_Init((16 * 8 * 2), 109); - sub_0200B1B8(param0->unk_30, param1, v0); + MessageLoader_GetStrbuf(param0->unk_30, param1, v0); sub_0200C388(param0->unk_20, param0->unk_40, v0); sub_0201ADA4(¶m0->unk_68, 15); diff --git a/src/overlay099/ov99_021D0D80.c b/src/overlay099/ov99_021D0D80.c index 5a25dece1d..c526a4ccca 100644 --- a/src/overlay099/ov99_021D0D80.c +++ b/src/overlay099/ov99_021D0D80.c @@ -132,7 +132,7 @@ int ov99_021D0D80 (UnkStruct_020067E8 * param0, int * param1) sub_0201E3D8(); sub_0201E450(4); - v0->unk_20 = sub_0200B144(0, 26, 548, 75); + v0->unk_20 = MessageLoader_Init(0, 26, 548, 75); v0->unk_10F8 = NARC_ctor(NARC_INDEX_GRAPHIC__ENDING, 75); ov99_021D1918(v0); @@ -272,7 +272,7 @@ int ov99_021D11A8 (UnkStruct_020067E8 * param0, int * param1) ov99_021D1314(v0); } - sub_0200B190(v0->unk_20); + MessageLoader_Free(v0->unk_20); sub_0200D0B0(v0->unk_18, v0->unk_1C); sub_0200C8D4(v0->unk_18); sub_02002FA0(v0->unk_0C, 0); diff --git a/src/overlay099/ov99_021D1A54.c b/src/overlay099/ov99_021D1A54.c index 04f822fb98..138c2ea894 100644 --- a/src/overlay099/ov99_021D1A54.c +++ b/src/overlay099/ov99_021D1A54.c @@ -1078,7 +1078,7 @@ static void ov99_021D2AAC (UnkStruct_ov99_021D2CB0 * param0) sub_0201ADA4(param0->unk_24, 15); sub_0201A9F4(param0->unk_24); - v1 = sub_0200B1EC(param0->unk_20, ov99_021D4130()); + v1 = MessageLoader_GetNewStrbuf(param0->unk_20, ov99_021D4130()); v2 = (256 - sub_02002D7C(0, v1, 0)) / 2; sub_0201D7E0(param0->unk_24, 0, v1, v2, 80, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0)), 3, 0, NULL); diff --git a/src/overlay099/ov99_021D3E78.c b/src/overlay099/ov99_021D3E78.c index 07707a189a..01b9ceaec9 100644 --- a/src/overlay099/ov99_021D3E78.c +++ b/src/overlay099/ov99_021D3E78.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "strbuf.h" @@ -274,14 +274,14 @@ struct UnkStruct_ov99_021D3E78_t { UnkStruct_02018340 * unk_20; UnkStruct_0205AA50 * unk_24; UnkStruct_0205AA50 * unk_28; - UnkStruct_0200B144 * unk_2C; + MessageLoader * unk_2C; Strbuf* unk_30; UnkStruct_0201CD38 * unk_34; }; static void ov99_021D4104(UnkStruct_0201CD38 * param0, void * param1); -UnkStruct_ov99_021D3E78 * ov99_021D3E78 (UnkStruct_02018340 * param0, int param1, int param2, int param3, UnkStruct_0200B144 * param4) +UnkStruct_ov99_021D3E78 * ov99_021D3E78 (UnkStruct_02018340 * param0, int param1, int param2, int param3, MessageLoader * param4) { UnkStruct_ov99_021D3E78 * v0 = Heap_AllocFromHeap(75, sizeof(UnkStruct_ov99_021D3E78)); @@ -337,7 +337,7 @@ BOOL ov99_021D3F6C (UnkStruct_ov99_021D3E78 * param0, int param1) if (v0 >= Unk_ov99_021D4CE4[param0->unk_0C].unk_02) { int v1, v2; - sub_0200B1B8(param0->unk_2C, Unk_ov99_021D4CE4[param0->unk_0C].unk_00, param0->unk_30); + MessageLoader_GetStrbuf(param0->unk_2C, Unk_ov99_021D4CE4[param0->unk_0C].unk_00, param0->unk_30); if (Unk_ov99_021D4CE4[param0->unk_0C].unk_04) { v1 = (256 - sub_02002D7C(0, param0->unk_30, 0)) / 2; diff --git a/src/overlay100/ov100_021D0D80.c b/src/overlay100/ov100_021D0D80.c index 8baab0d45e..65017ab29b 100644 --- a/src/overlay100/ov100_021D0D80.c +++ b/src/overlay100/ov100_021D0D80.c @@ -229,7 +229,7 @@ static void ov100_021D1034 (UnkStruct_ov100_021D46C8 * param0) param0->unk_10 = sub_02002F38(111); param0->unk_14 = sub_02024220(111, 0, 1, 0, 4, NULL); param0->unk_18 = sub_020203AC(111); - param0->unk_2C = sub_0200B144(0, 26, 234, 111); + param0->unk_2C = MessageLoader_Init(0, 26, 234, 111); sub_02003858(param0->unk_10, 1); sub_02002F70(param0->unk_10, 0, 0x200, 111); @@ -275,7 +275,7 @@ static void ov100_021D111C (UnkStruct_ov100_021D46C8 * param0) sub_020203B8(param0->unk_18); sub_0200D0B0(param0->unk_04, param0->unk_08); sub_0200C8D4(param0->unk_04); - sub_0200B190(param0->unk_2C); + MessageLoader_Free(param0->unk_2C); G3X_AlphaBlend(0); } diff --git a/src/overlay100/ov100_021D46C8.c b/src/overlay100/ov100_021D46C8.c index c7b9b5489b..aed8f54666 100644 --- a/src/overlay100/ov100_021D46C8.c +++ b/src/overlay100/ov100_021D46C8.c @@ -4,7 +4,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "strbuf.h" @@ -33,13 +33,13 @@ int ov100_021D46C8 (UnkStruct_ov100_021D46C8 * param0, UnkStruct_020985E4 * param1, int param2) { int v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; Strbuf* v2; Strbuf* v3 = Strbuf_Init(511, 111); u8 v4 = 0; v1 = param0->unk_2C; - v2 = sub_0200B1EC(v1, param2); + v2 = MessageLoader_GetNewStrbuf(v1, param2); if (param2 == 22) { Strbuf* v5 = sub_02025F04(param1->unk_08, 111); diff --git a/src/overlay101/ov101_021D0D80.c b/src/overlay101/ov101_021D0D80.c index 1e9f039ef0..bb3b43e927 100644 --- a/src/overlay101/ov101_021D0D80.c +++ b/src/overlay101/ov101_021D0D80.c @@ -437,7 +437,7 @@ void ov101_021D13C8 (UnkStruct_ov101_021D13C8 * param0) sub_0200DD0C(param0->unk_43C, 0, (1 + (18 + 12)), 14, param0->unk_4C4, 79); sub_02002E98(0, 15 * 32, 79); - v1->unk_00 = sub_0200B144(0, 26, 544, 79); + v1->unk_00 = MessageLoader_Init(0, 26, 544, 79); v1->unk_04 = sub_0200B358(79); for (v0 = 0; v0 < 1; v0++) { @@ -457,7 +457,7 @@ void ov101_021D1458 (UnkStruct_ov101_021D13C8 * param0) sub_0201A8FC(&v1->unk_08[v0]); } - sub_0200B190(v1->unk_00); + MessageLoader_Free(v1->unk_00); sub_0200B3F0(v1->unk_04); Strbuf_Free(v1->unk_18); } @@ -468,7 +468,7 @@ void ov101_021D148C (UnkStruct_ov101_021D13C8 * param0, u32 param1) sub_0200E060(&v0->unk_08[0], 1, (1 + (18 + 12)), 14); sub_0201ADA4(&v0->unk_08[0], 15); - sub_0200B1B8(v0->unk_00, param1, v0->unk_18); + MessageLoader_GetStrbuf(v0->unk_00, param1, v0->unk_18); sub_0201D738(&v0->unk_08[0], 1, v0->unk_18, 0, 0, 0xff, NULL); sub_0201A9A4(&v0->unk_08[0]); } diff --git a/src/overlay102/ov102_021D0D80.c b/src/overlay102/ov102_021D0D80.c index d5ea2c399c..fb70482076 100644 --- a/src/overlay102/ov102_021D0D80.c +++ b/src/overlay102/ov102_021D0D80.c @@ -4,7 +4,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_020067E8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" @@ -43,7 +43,7 @@ typedef struct { UnkStruct_02018340 * unk_10; UnkStruct_0205AA50 unk_14; UnkStruct_0205AA50 unk_24; - UnkStruct_0200B144 * unk_34; + MessageLoader * unk_34; UnkStruct_0200B358 * unk_38; s16 unk_3C; int unk_40; @@ -315,7 +315,7 @@ static void ov102_021D1174 (UnkStruct_ov102_021D0F8C * param0) sub_0201D710(); - param0->unk_34 = sub_0200B144(1, 26, 1, param0->unk_00); + param0->unk_34 = MessageLoader_Init(1, 26, 1, param0->unk_00); param0->unk_38 = sub_0200B358(param0->unk_00); v0.unk_00 = 0; @@ -334,7 +334,7 @@ static void ov102_021D1204 (UnkStruct_ov102_021D0F8C * param0) sub_0201A8FC(¶m0->unk_24); sub_0201A8FC(¶m0->unk_14); sub_0200B3F0(param0->unk_38); - sub_0200B190(param0->unk_34); + MessageLoader_Free(param0->unk_34); } static void ov102_021D1224 (UnkStruct_ov102_021D0F8C * param0) @@ -403,7 +403,7 @@ static void ov102_021D1420 (UnkStruct_ov102_021D0F8C * param0) { Strbuf* v1 = Strbuf_Init(0x200, param0->unk_00); - sub_0200B1B8(param0->unk_34, 0, v1); + MessageLoader_GetStrbuf(param0->unk_34, 0, v1); sub_0200B498(param0->unk_38, 0, param0->unk_0C); sub_0200C388(param0->unk_38, v0, v1); sub_0201D78C(¶m0->unk_14, 0, v0, 48, 32, 0, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); @@ -419,12 +419,12 @@ static void ov102_021D1420 (UnkStruct_ov102_021D0F8C * param0) v2 = 2; } - sub_0200B1B8(param0->unk_34, v2, v0); + MessageLoader_GetStrbuf(param0->unk_34, v2, v0); sub_0201D78C(¶m0->unk_14, 0, v0, 64, 64, 0, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); sub_0201D78C(¶m0->unk_24, 0, v0, 64, 64, 0, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); } { - sub_0200B1B8(param0->unk_34, 3, v0); + MessageLoader_GetStrbuf(param0->unk_34, 3, v0); sub_0201D78C(¶m0->unk_14, 0, v0, 138, 144, 0, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); sub_0201D78C(¶m0->unk_24, 0, v0, 138, 144, 0, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); } diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c index c8adf79e70..928940b07a 100644 --- a/src/overlay104/ov104_0222DCE0.c +++ b/src/overlay104/ov104_0222DCE0.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "strbuf.h" @@ -130,7 +130,7 @@ void ov104_0222DCF4 (UnkStruct_0204B1E8 * param0, int param1, int param2) UnkStruct_0204B184 * ov104_0222DD04 (UnkStruct_ov104_0223A348_sub1 * param0, int param1, int param2, int param3) { UnkStruct_0204B184 * v0; - UnkStruct_0200B144 * v1 = sub_0200B144(1, 26, 21, param2); + MessageLoader * v1 = MessageLoader_Init(1, 26, 21, param2); Strbuf* v2; MI_CpuClear8(param0, sizeof(UnkStruct_ov104_0223A348_sub1)); @@ -142,11 +142,11 @@ UnkStruct_0204B184 * ov104_0222DD04 (UnkStruct_ov104_0223A348_sub1 * param0, int param0->unk_18[1] = param1 * 3; param0->unk_04 = v0->unk_00; - v2 = sub_0200B1EC(v1, param1); + v2 = MessageLoader_GetNewStrbuf(v1, param1); Strbuf_ToChars(v2, ¶m0->unk_08[0], 8); Strbuf_Free(v2); - sub_0200B190(v1); + MessageLoader_Free(v1); return v0; } @@ -248,7 +248,7 @@ u32 ov104_0222DD6C (UnkStruct_ov104_0223A348_sub2 * param0, u16 param1, u32 para } param0->unk_21 = v3; - sub_0200B274(param0->unk_00_val1_0, param7, &(param0->unk_22[0])); + MessageLoader_GetSpeciesName(param0->unk_00_val1_0, param7, &(param0->unk_22[0])); return v2; } @@ -318,15 +318,15 @@ void ov104_0222DF40 (const UnkStruct_ov104_0223A348_sub2 * param0, Pokemon * par sub_02074B30(param1, 9, ¶m0->unk_21); if (param0->unk_14_val1_30) { - UnkStruct_0200B144 * v7; + MessageLoader * v7; Strbuf* v8; - v7 = sub_0200B144(1, 26, 412, 4); - v8 = sub_0200B1EC(v7, param0->unk_00_val1_0); + v7 = MessageLoader_Init(1, 26, 412, 4); + v8 = MessageLoader_GetNewStrbuf(v7, param0->unk_00_val1_0); sub_02074B30(param1, 119, v8); Strbuf_Free(v8); - sub_0200B190(v7); + MessageLoader_Free(v7); } else { sub_02074B30(param1, 117, param0->unk_22); } @@ -354,7 +354,7 @@ void ov104_0222E134 (UnkStruct_021C0794 * param0, Pokemon * param1) { u32 v0; Strbuf* v1; - UnkStruct_0200B144 * v2; + MessageLoader * v2; int v3; int v4 = 0; UnkStruct_02025E6C * v5 = sub_02025E38(param0); @@ -365,14 +365,14 @@ void ov104_0222E134 (UnkStruct_021C0794 * param0, Pokemon * param1) v3 = sub_0203A138(562); sub_0209304C(param1, v5, v4, v3, 11); - v2 = sub_0200B144(0, 26, 363, 11); - v1 = sub_0200B1EC(v2, 0); + v2 = MessageLoader_Init(0, 26, 363, 11); + v1 = MessageLoader_GetNewStrbuf(v2, 0); sub_02074B30(param1, 145, v1); sub_02074B30(param1, 7, &v0); Strbuf_Free(v1); - sub_0200B190(v2); + MessageLoader_Free(v2); return; } diff --git a/src/overlay104/ov104_0222E63C.c b/src/overlay104/ov104_0222E63C.c index 836220baa7..e40c062d11 100644 --- a/src/overlay104/ov104_0222E63C.c +++ b/src/overlay104/ov104_0222E63C.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0209B75C_decl.h" #include "overlay104/struct_ov104_0222E930_decl.h" #include "overlay104/struct_ov104_022320B4_decl.h" @@ -28,7 +28,7 @@ static BOOL ov104_0222E7CC(UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0222E930 * param1); static void ov104_0222E7FC(UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0222E930 * param1); static void ov104_0222E82C(UnkStruct_ov104_022320B4 * param0, u16 param1, u32 * param2, void * param3); -static void ov104_0222E830(u8 ** param0, UnkStruct_0200B144 ** param1, int param2, int param3); +static void ov104_0222E830(u8 ** param0, MessageLoader ** param1, int param2, int param3); static void ov104_0222E904(UnkStruct_ov104_0222E930 * param0, int param1); UnkStruct_ov104_022320B4 * ov104_0222E63C (UnkStruct_0209B75C * param0, int param1, int param2) @@ -97,7 +97,7 @@ void ov104_0222E710 (UnkStruct_ov104_022320B4 * param0) Strbuf_Free(param0->unk_48); Strbuf_Free(param0->unk_4C); Heap_FreeToHeap(param0->unk_40); - sub_0200B190(param0->unk_3C); + MessageLoader_Free(param0->unk_3C); Heap_FreeToHeap(param0); } @@ -144,7 +144,7 @@ static BOOL ov104_0222E7CC (UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0 static void ov104_0222E7FC (UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0222E930 * param1) { if (param1->unk_80 != param0->unk_3C) { - sub_0200B190(param1->unk_80); + MessageLoader_Free(param1->unk_80); } if (param1->unk_84 != param0->unk_40) { @@ -161,7 +161,7 @@ static void ov104_0222E82C (UnkStruct_ov104_022320B4 * param0, u16 param1, u32 * } } -static void ov104_0222E830 (u8 ** param0, UnkStruct_0200B144 ** param1, int param2, int param3) +static void ov104_0222E830 (u8 ** param0, MessageLoader ** param1, int param2, int param3) { int v0, v1; @@ -169,7 +169,7 @@ static void ov104_0222E830 (u8 ** param0, UnkStruct_0200B144 ** param1, int para v1 = ov104_0222EA90(param2, 2); *param0 = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_FRONTIER__SCRIPT__FR_SCRIPT, v0, param3); - *param1 = sub_0200B144(1, 26, v1, param3); + *param1 = MessageLoader_Init(1, 26, v1, param3); } void ov104_0222E86C (UnkStruct_ov104_022320B4 * param0, int param1, int param2) @@ -177,7 +177,7 @@ void ov104_0222E86C (UnkStruct_ov104_022320B4 * param0, int param1, int param2) int v0; UnkStruct_ov104_0222E930 * v1; int v2, v3; - UnkStruct_0200B144 * v4; + MessageLoader * v4; v2 = ov104_0222EA90(param0->unk_52, 2); v3 = ov104_0222EA90(param1, 2); @@ -186,7 +186,7 @@ void ov104_0222E86C (UnkStruct_ov104_022320B4 * param0, int param1, int param2) return; } - v4 = sub_0200B144(1, 26, v3, param2); + v4 = MessageLoader_Init(1, 26, v3, param2); for (v0 = 0; v0 < 8; v0++) { v1 = param0->unk_04[v0]; @@ -198,7 +198,7 @@ void ov104_0222E86C (UnkStruct_ov104_022320B4 * param0, int param1, int param2) } } - sub_0200B190(param0->unk_3C); + MessageLoader_Free(param0->unk_3C); param0->unk_3C = v4; } diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c index 77b0e55629..d19b4857f1 100644 --- a/src/overlay104/ov104_0222FBE4.c +++ b/src/overlay104/ov104_0222FBE4.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02014014_decl.h" @@ -1877,13 +1877,13 @@ BOOL ov104_02230E40 (UnkStruct_ov104_0222E930 * param0) static Strbuf* ov104_02230E90 (u16 param0, u32 param1) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; Strbuf* v1; - v0 = sub_0200B144(1, 26, 412, param1); - v1 = sub_0200B1EC(v0, param0); + v0 = MessageLoader_Init(1, 26, 412, param1); + v1 = MessageLoader_GetNewStrbuf(v0, param0); - sub_0200B190(v0); + MessageLoader_Free(v0); return v1; } diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c index 109520c969..d9f611fd58 100644 --- a/src/overlay104/ov104_02231F74.c +++ b/src/overlay104/ov104_02231F74.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -77,7 +77,7 @@ typedef struct UnkStruct_ov104_02232B5C_t { UnkStruct_0205AA50 unk_08; UnkStruct_0205AA50 * unk_18; Strbuf* unk_1C[28]; - UnkStruct_0200B144 * unk_8C; + MessageLoader * unk_8C; UnkStruct_0200B358 * unk_90; u8 unk_94; u8 unk_95; @@ -109,10 +109,10 @@ typedef struct { } UnkStruct_ov104_022419A0; static void ov104_02231FC4(UnkStruct_ov104_022320B4 * param0); -static void ov104_02232034(UnkStruct_ov104_022320B4 * param0, const UnkStruct_0200B144 * param1, u32 param2); +static void ov104_02232034(UnkStruct_ov104_022320B4 * param0, const MessageLoader * param1, u32 param2); static void ov104_02232050(UnkStruct_ov104_022320B4 * param0, int param1, int param2, int param3, int param4); -static void ov104_0223214C(UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_02232B5C * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, UnkStruct_0200B358 * param7, UnkStruct_0200B144 * param8); -UnkStruct_ov104_02232B5C * ov104_02232258(UnkStruct_ov104_022320B4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0200B144 * param7); +static void ov104_0223214C(UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_02232B5C * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, UnkStruct_0200B358 * param7, MessageLoader * param8); +UnkStruct_ov104_02232B5C * ov104_02232258(UnkStruct_ov104_022320B4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, MessageLoader * param7); void ov104_022322A8(UnkStruct_ov104_02232B5C * param0, u32 param1, u32 param2, u32 param3); void ov104_022322B0(UnkStruct_ov104_02232B5C * param0); static void ov104_02232390(UnkStruct_ov104_02232B5C * param0, u32 param1, u32 param2, u32 param3); @@ -125,7 +125,7 @@ static void ov104_02232AC4(UnkStruct_ov104_02232B5C * param0, u16 param1, u32 pa void ov104_022320B4(UnkStruct_ov104_022320B4 * param0, u8 param1, u16 param2, u16 param3, u16 param4, s16 param5, u8 param6); 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); +UnkStruct_ov104_02232B5C * ov104_022325FC(UnkStruct_ov104_022320B4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, MessageLoader * param7); void ov104_0223261C(UnkStruct_ov104_02232B5C * param0, u32 param1, u32 param2, u32 param3); void ov104_02232624(UnkStruct_ov104_02232B5C * param0); static void ov104_02232750(UnkStruct_ov104_02232B5C * param0, u32 param1, u32 param2, u32 param3); @@ -142,7 +142,7 @@ void ov104_0223310C(UnkStruct_ov104_0222E930 * param0, u16 * param1, u32 param2) extern void ov104_0223327C(void); extern void ov104_02233298(void); -void ov104_02231F74 (UnkStruct_ov104_022320B4 * param0, const UnkStruct_0200B144 * param1, u16 param2, u8 param3, UnkStruct_ov104_0222FEDC * param4) +void ov104_02231F74 (UnkStruct_ov104_022320B4 * param0, const MessageLoader * param1, u16 param2, u8 param3, UnkStruct_ov104_0222FEDC * param4) { u8 v0; u8 v1; @@ -185,9 +185,9 @@ static void ov104_02231FC4 (UnkStruct_ov104_022320B4 * param0) } } -static void ov104_02232034 (UnkStruct_ov104_022320B4 * param0, const UnkStruct_0200B144 * param1, u32 param2) +static void ov104_02232034 (UnkStruct_ov104_022320B4 * param0, const MessageLoader * param1, u32 param2) { - sub_0200B1B8(param1, param2, param0->unk_4C); + MessageLoader_GetStrbuf(param1, param2, param0->unk_4C); sub_0200C388(param0->unk_44, param0->unk_48, param0->unk_4C); } @@ -239,12 +239,12 @@ static void ov104_022320FC (Strbuf *param0, u16 param1, u16 param2, u16 param3, Strbuf_Free(v1); } -static void ov104_0223214C (UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_02232B5C * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, UnkStruct_0200B358 * param7, UnkStruct_0200B144 * param8) +static void ov104_0223214C (UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_02232B5C * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, UnkStruct_0200B358 * param7, MessageLoader * param8) { int v0; if (param8 == NULL) { - param1->unk_8C = sub_0200B144(1, 26, 361, param0->unk_34); + param1->unk_8C = MessageLoader_Init(1, 26, 361, param0->unk_34); param1->unk_97_1 = 1; } else { param1->unk_8C = param8; @@ -287,7 +287,7 @@ static void ov104_0223214C (UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0 return; } -UnkStruct_ov104_02232B5C * ov104_02232258 (UnkStruct_ov104_022320B4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0200B144 * param7) +UnkStruct_ov104_02232B5C * ov104_02232258 (UnkStruct_ov104_022320B4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, MessageLoader * param7) { UnkStruct_ov104_02232B5C * v0; int v1; @@ -427,7 +427,7 @@ static void ov104_02232390 (UnkStruct_ov104_02232B5C * param0, u32 param1, u32 p { Strbuf* v2 = Strbuf_Init((40 * 2), param0->unk_00->unk_34); - sub_0200B1B8(param0->unk_8C, param1, v2); + MessageLoader_GetStrbuf(param0->unk_8C, param1, v2); sub_0200C388(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); param0->unk_B4[param0->unk_9B].unk_00 = (const void *)param0->unk_1C[param0->unk_9B]; Strbuf_Free(v2); @@ -539,7 +539,7 @@ static void ov104_02232570 (UnkStruct_ov104_02232B5C * param0) } if (param0->unk_97_1 == 1) { - sub_0200B190(param0->unk_8C); + MessageLoader_Free(param0->unk_8C); } sub_0200DA58(param0->unk_04); @@ -560,7 +560,7 @@ static void ov104_022325D8 (UnkStruct_ov104_02232B5C * param0) return; } -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) +UnkStruct_ov104_02232B5C * ov104_022325FC (UnkStruct_ov104_022320B4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, MessageLoader * param7) { return ov104_02232258(param0, param1, param2, param3, param4, param5, param6, param7); } @@ -727,7 +727,7 @@ static void ov104_02232750 (UnkStruct_ov104_02232B5C * param0, u32 param1, u32 p { Strbuf* v2 = Strbuf_Init((40 * 2), param0->unk_00->unk_34); - sub_0200B1B8(param0->unk_8C, param1, v2); + MessageLoader_GetStrbuf(param0->unk_8C, param1, v2); sub_0200C388(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); param0->unk_1BC[param0->unk_9B].unk_00 = (const void *)param0->unk_1C[param0->unk_9B]; @@ -893,7 +893,7 @@ static void ov104_02232A58 (UnkStruct_ov104_02232B5C * param0, u8 param1) } if (param0->unk_97_1 == 1) { - sub_0200B190(param0->unk_8C); + MessageLoader_Free(param0->unk_8C); } sub_0200DA58(param0->unk_04); @@ -908,7 +908,7 @@ static void ov104_02232AC4 (UnkStruct_ov104_02232B5C * param0, u16 param1, u32 p sub_0201ADA4(param0->unk_18, 15); - sub_0200B1B8(param0->unk_8C, param1, v0); + MessageLoader_GetStrbuf(param0->unk_8C, param1, v0); sub_0200C388(param0->unk_90, v1, v0); @@ -1287,14 +1287,14 @@ void ov104_022330FC (UnkStruct_ov104_0222E930 * param0, u16 * param1) void ov104_0223310C (UnkStruct_ov104_0222E930 * param0, u16 * param1, u32 param2) { u8 v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; UnkStruct_ov104_02230BE4 * v2 = sub_0209B970(param0->unk_00->unk_00); if (param1[0] == 0xFFFF) { - v1 = sub_0200B144(1, 26, param2, 32); + v1 = MessageLoader_Init(1, 26, param2, 32); ov104_02231F74(param0->unk_00, v1, param1[1], 1, NULL); - sub_0200B190(v1); + MessageLoader_Free(v1); } else { v0 = sub_02027AC0(sub_02025E44(v2->unk_08)); ov104_022320B4(param0->unk_00, v0, param1[0], param1[1], param1[2], param1[3], 1); diff --git a/src/overlay104/ov104_022361B4.c b/src/overlay104/ov104_022361B4.c index 3faf3dee91..df89f81a69 100644 --- a/src/overlay104/ov104_022361B4.c +++ b/src/overlay104/ov104_022361B4.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" #include "struct_decls/struct_02025E6C_decl.h" @@ -800,27 +800,27 @@ 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; + MessageLoader * v0; Strbuf* v1 = Strbuf_Init((10 * 2), param0->unk_34); Strbuf* v2 = Strbuf_Init((10 * 2), param0->unk_34); - v0 = sub_0200B144(0, 26, 199, 11); + v0 = MessageLoader_Init(0, 26, 199, 11); sub_0200B60C(param0->unk_44, 0, param3, 4, 1, 1); - sub_0200B1B8(v0, 2, v1); + MessageLoader_GetStrbuf(v0, 2, v1); sub_0200C388(param0->unk_44, v2, v1); sub_0201D738(param1, 0, v2, 16, 2 * 8, 0xff, NULL); sub_0200B498(param0->unk_44, 0, param2); - sub_0200B1B8(v0, 0, v1); + MessageLoader_GetStrbuf(v0, 0, v1); sub_0200C388(param0->unk_44, v2, v1); sub_0201D738(param1, 0, v2, 0, 0, 0, NULL); Strbuf_Free(v1); Strbuf_Free(v2); - sub_0200B190(v0); + MessageLoader_Free(v0); sub_0201A954(param1); diff --git a/src/overlay104/ov104_0223A0C4.c b/src/overlay104/ov104_0223A0C4.c index 75622954f7..76e1ae53d2 100644 --- a/src/overlay104/ov104_0223A0C4.c +++ b/src/overlay104/ov104_0223A0C4.c @@ -895,7 +895,7 @@ static u32 ov104_0223A3A8 (UnkStruct_0204AFC4 * param0, UnkStruct_ov104_0223A348 } param1->unk_21 = v3; - sub_0200B274(param1->unk_00_val1_0, param8, &(param1->unk_22[0])); + MessageLoader_GetSpeciesName(param1->unk_00_val1_0, param8, &(param1->unk_22[0])); return v2; } diff --git a/src/overlay104/ov104_0223A7F4.c b/src/overlay104/ov104_0223A7F4.c index 3acc3a54b7..943d4c5eac 100644 --- a/src/overlay104/ov104_0223A7F4.c +++ b/src/overlay104/ov104_0223A7F4.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "strbuf.h" #include "struct_decls/struct_02025E6C_decl.h" #include "struct_defs/pokemon.h" @@ -349,7 +349,7 @@ BattleParams * ov104_0223ABA0 (UnkStruct_ov104_0223ADA0 * param0, UnkStruct_ov10 Pokemon * v5; UnkStruct_ov104_0223A348_sub1 v6; UnkStruct_0204B184 * v7; - UnkStruct_0200B144 * v8; + MessageLoader * v8; Strbuf* v9; UnkStruct_02025E6C * v10; diff --git a/src/overlay104/ov104_0223B6F4.c b/src/overlay104/ov104_0223B6F4.c index ce4832d613..64cd87ddf9 100644 --- a/src/overlay104/ov104_0223B6F4.c +++ b/src/overlay104/ov104_0223B6F4.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" #include "struct_decls/struct_02025E6C_decl.h" @@ -167,7 +167,7 @@ BattleParams * ov104_0223B810 (UnkStruct_ov104_0223BA10 * param0, UnkStruct_ov10 Pokemon * v6; UnkStruct_ov104_0223A348_sub1 v7; UnkStruct_0204B184 * v8; - UnkStruct_0200B144 * v9; + MessageLoader * v9; Strbuf* v10; UnkStruct_02025E6C * v11; diff --git a/src/overlay104/ov104_0223BCBC.c b/src/overlay104/ov104_0223BCBC.c index 2074755298..a89c016320 100644 --- a/src/overlay104/ov104_0223BCBC.c +++ b/src/overlay104/ov104_0223BCBC.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "strbuf.h" #include "struct_decls/struct_02025E6C_decl.h" #include "struct_defs/pokemon.h" @@ -170,7 +170,7 @@ BattleParams * ov104_0223BDD8 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov10 Pokemon * v6; UnkStruct_ov104_0223A348_sub1 v7; UnkStruct_0204B184 * v8; - UnkStruct_0200B144 * v9; + MessageLoader * v9; Strbuf* v10; UnkStruct_02025E6C * v11; Party * v12; diff --git a/src/overlay104/ov104_0223DC7C.c b/src/overlay104/ov104_0223DC7C.c index 4e3534c048..fa7149344f 100644 --- a/src/overlay104/ov104_0223DC7C.c +++ b/src/overlay104/ov104_0223DC7C.c @@ -3,7 +3,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" @@ -271,17 +271,17 @@ static BOOL ov104_0223DDE4 (UnkStruct_ov104_0223DD30 * param0, u32 param1, const param0->unk_30 = sub_02012744(4, 94); { - UnkStruct_0200B144 * v9; + MessageLoader * v9; Strbuf* v10; - v9 = sub_0200B144(1, 26, 618, param1); - v10 = sub_0200B1EC(v9, param2->unk_00); + v9 = MessageLoader_Init(1, 26, 618, param1); + v10 = MessageLoader_GetNewStrbuf(v9, param2->unk_00); ov104_0223E29C(param0, &v0->unk_7C, v10, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 0, 2004, 208 + -92 + param0->unk_28, 11 * 8 + param0->unk_2A, 0, NULL); sub_020129D0(v0->unk_7C.unk_00, 0); Strbuf_Free(v10); - sub_0200B190(v9); + MessageLoader_Free(v9); } { diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index 48b57f89d1..369a1771db 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02007C7C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -110,7 +110,7 @@ struct UnkStruct_ov105_02241FF4_t { u8 unk_19; u8 unk_1A; u8 unk_1B; - UnkStruct_0200B144 * unk_1C; + MessageLoader * unk_1C; UnkStruct_0200B358 * unk_20; Strbuf* unk_24; Strbuf* unk_28; @@ -2609,7 +2609,7 @@ static void ov105_02244C0C (UnkStruct_ov105_02241FF4 * param0, u32 param1) static u8 ov105_02244C60 (UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA50 * param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9) { sub_0201ADA4(param1, param8); - sub_0200B1B8(param0->unk_1C, param2, param0->unk_28); + MessageLoader_GetStrbuf(param0->unk_1C, param2, param0->unk_28); sub_0200C388(param0->unk_20, param0->unk_24, param0->unk_28); return sub_0201D78C(param1, param9, param0->unk_24, param3, param4, param5, (u32)((((param6) & 0xff) << 16) | (((param7) & 0xff) << 8) | (((param8) & 0xff) << 0)), NULL); @@ -2617,7 +2617,7 @@ static u8 ov105_02244C60 (UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA50 static u8 ov105_02244CC0 (UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA50 * param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9) { - sub_0200B1B8(param0->unk_1C, param2, param0->unk_28); + MessageLoader_GetStrbuf(param0->unk_1C, param2, param0->unk_28); sub_0200C388(param0->unk_20, param0->unk_24, param0->unk_28); return sub_0201D78C(param1, param9, param0->unk_24, param3, param4, param5, (u32)((((param6) & 0xff) << 16) | (((param7) & 0xff) << 8) | (((param8) & 0xff) << 0)), NULL); @@ -2659,7 +2659,7 @@ static void ov105_02244DC4 (UnkStruct_ov105_02241FF4 * param0, u8 param1, u8 par int v0; void * v1; - sub_0200B1B8(param0->unk_1C, param3, param0->unk_2C[param1]); + MessageLoader_GetStrbuf(param0->unk_1C, param3, param0->unk_2C[param1]); param0->unk_100[param1].unk_00 = (const void *)param0->unk_2C[param1]; param0->unk_100[param1].unk_04 = param2; @@ -2786,7 +2786,7 @@ static void ov105_02244FF8 (UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA5 Strbuf_Clear(v4); if (v1 != 2) { - sub_0200B1B8(param0->unk_1C, v2, v4); + MessageLoader_GetStrbuf(param0->unk_1C, v2, v4); sub_0201D78C(param1, param8, v4, v0 * 8, param4, 0xff, v3, NULL); } @@ -2800,17 +2800,17 @@ static void ov105_022450DC (UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA5 { u8 v0; u32 v1, v2; - UnkStruct_0200B144 * v3; + MessageLoader * v3; Strbuf* v4; Pokemon * v5; u16 v6[(10 + 1)]; sub_0201ADA4(param1, param6); - v3 = sub_0200B144(1, 26, 412, 93); - v4 = sub_0200B1EC(v3, param8); + v3 = MessageLoader_Init(1, 26, 412, 93); + v4 = MessageLoader_GetNewStrbuf(v3, param8); - sub_0200B190(v3); + MessageLoader_Free(v3); sub_0201D78C(param1, param7, v4, param2, param3, 0xff, (u32)((((param4) & 0xff) << 16) | (((param5) & 0xff) << 8) | (((param6) & 0xff) << 0)), NULL); v0 = sub_0201C294(param1) - 1; @@ -2820,7 +2820,7 @@ static void ov105_022450DC (UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA5 Strbuf_Clear(v4); if (param9 != 2) { - sub_0200B1B8(param0->unk_1C, v1, v4); + MessageLoader_GetStrbuf(param0->unk_1C, v1, v4); sub_0201D78C(param1, param7, v4, v0 * 8, param3, 0xff, v2, NULL); } @@ -2861,7 +2861,7 @@ static void ov105_022451B4 (UnkStruct_ov105_02241FF4 * param0) } sub_02007B6C(param0->unk_128); - sub_0200B190(param0->unk_1C); + MessageLoader_Free(param0->unk_1C); sub_0200B3F0(param0->unk_20); Strbuf_Free(param0->unk_24); Strbuf_Free(param0->unk_28); @@ -2917,7 +2917,7 @@ static void ov105_0224531C (UnkStruct_ov105_02241FF4 * param0) ov105_02244678(param0); ov105_0224472C(param0); - param0->unk_1C = sub_0200B144(1, 26, 364, 93); + param0->unk_1C = MessageLoader_Init(1, 26, 364, 93); param0->unk_20 = sub_0200B358(93); param0->unk_24 = Strbuf_Init(800, 93); param0->unk_28 = Strbuf_Init(800, 93); diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c index 744449aaf0..836547c37d 100644 --- a/src/overlay106/ov106_02241AE0.c +++ b/src/overlay106/ov106_02241AE0.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_02013A04_decl.h" @@ -99,7 +99,7 @@ struct UnkStruct_ov106_02243118_t { u16 unk_1C; u8 unk_1E; u8 unk_1F; - UnkStruct_0200B144 * unk_20; + MessageLoader * unk_20; UnkStruct_0200B358 * unk_24; Strbuf* unk_28; Strbuf* unk_2C; @@ -764,7 +764,7 @@ static void ov106_022423E8 (UnkStruct_ov106_02243118 * param0) ov106_02243570(¶m0->unk_C0); - sub_0200B190(param0->unk_20); + MessageLoader_Free(param0->unk_20); sub_0200B3F0(param0->unk_24); Strbuf_Free(param0->unk_28); Strbuf_Free(param0->unk_2C); @@ -820,7 +820,7 @@ static void ov106_02242500 (UnkStruct_ov106_02243118 * param0) ov106_0224262C(param0); ov106_02242688(param0); - param0->unk_20 = sub_0200B144(1, 26, 549, 98); + param0->unk_20 = MessageLoader_Init(1, 26, 549, 98); param0->unk_24 = sub_0200B358(98); param0->unk_28 = Strbuf_Init(600, 98); param0->unk_2C = Strbuf_Init(600, 98); @@ -1070,7 +1070,7 @@ static void ov106_022428B8 (UnkStruct_ov106_02243118 * param0, u32 param1) static u8 ov106_02242918 (UnkStruct_ov106_02243118 * param0, UnkStruct_0205AA50 * param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9) { sub_0201ADA4(param1, param8); - sub_0200B1B8(param0->unk_20, param2, param0->unk_2C); + MessageLoader_GetStrbuf(param0->unk_20, param2, param0->unk_2C); sub_0200C388(param0->unk_24, param0->unk_28, param0->unk_2C); return sub_0201D78C(param1, param9, param0->unk_28, param3, param4, param5, (u32)((((param6) & 0xff) << 16) | (((param7) & 0xff) << 8) | (((param8) & 0xff) << 0)), NULL); @@ -1112,7 +1112,7 @@ static void ov106_02242A28 (UnkStruct_ov106_02243118 * param0, u8 param1, u8 par int v0; void * v1; - sub_0200B1B8(param0->unk_20, param3, param0->unk_30[param1]); + MessageLoader_GetStrbuf(param0->unk_20, param3, param0->unk_30[param1]); param0->unk_9C[param1].unk_00 = (const void *)param0->unk_30[param1]; param0->unk_9C[param1].unk_04 = param2; @@ -1164,25 +1164,25 @@ static void ov106_02242B38 (UnkStruct_ov106_02243118 * param0, UnkStruct_0205AA5 { int v0, v1; Strbuf* v2; - UnkStruct_0200B144 * v3; + MessageLoader * v3; sub_0201ADA4(param1, param4); - v3 = sub_0200B144(1, 26, 624, 98); + v3 = MessageLoader_Init(1, 26, 624, 98); v2 = Strbuf_Init((10 + 1), 98); for (v0 = 0; v0 < 5; v0++) { for (v1 = 0; v1 < 4; v1++) { if (ov104_0223B5A4(v0 * 4 + v1) != 0xfe) { Strbuf_Clear(v2); - sub_0200B1B8(v3, ov104_0223B5A4(v0 * 4 + v1), v2); + MessageLoader_GetStrbuf(v3, ov104_0223B5A4(v0 * 4 + v1), v2); sub_0201D78C(param1, param5, v2, 1 + (64 * v1), 16 + (36 * v0), 0, (u32)((((param2) & 0xff) << 16) | (((param3) & 0xff) << 8) | (((param4) & 0xff) << 0)), NULL); } } } Strbuf_Free(v2); - sub_0200B190(v3); + MessageLoader_Free(v3); sub_0201A954(param1); return; diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c index 6ee43b42d6..179d84dd68 100644 --- a/src/overlay107/ov107_02241AE0.c +++ b/src/overlay107/ov107_02241AE0.c @@ -8,7 +8,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_02013A04_decl.h" @@ -254,8 +254,8 @@ struct UnkStruct_ov107_02241D6C_t { u16 unk_16; u16 unk_18; u16 unk_1A; - UnkStruct_0200B144 * unk_1C; - UnkStruct_0200B144 * unk_20; + MessageLoader * unk_1C; + MessageLoader * unk_20; UnkStruct_0200B358 * unk_24; Strbuf* unk_28; Strbuf* unk_2C; @@ -1414,8 +1414,8 @@ static void ov107_02242E14 (UnkStruct_ov107_02241D6C * param0) ov107_02249954(¶m0->unk_1D8); - sub_0200B190(param0->unk_20); - sub_0200B190(param0->unk_1C); + MessageLoader_Free(param0->unk_20); + MessageLoader_Free(param0->unk_1C); sub_0200B3F0(param0->unk_24); Strbuf_Free(param0->unk_28); Strbuf_Free(param0->unk_2C); @@ -1460,8 +1460,8 @@ static void ov107_02242F5C (UnkStruct_ov107_02241D6C * param0) ov107_02243324(param0); ov107_02243384(param0); - param0->unk_20 = sub_0200B144(1, 26, 199, 100); - param0->unk_1C = sub_0200B144(1, 26, 391, 100); + param0->unk_20 = MessageLoader_Init(1, 26, 199, 100); + param0->unk_1C = MessageLoader_Init(1, 26, 391, 100); param0->unk_24 = sub_0200B358(100); param0->unk_28 = Strbuf_Init(600, 100); param0->unk_2C = Strbuf_Init(600, 100); @@ -1863,7 +1863,7 @@ asm static u8 ov107_022437CC (UnkStruct_ov107_02241D6C * param0, UnkStruct_0205A ldr r0, [r5, #0x20] ldr r2, [r5, #0x2c] add r1, r7, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf ldr r0, [r5, #0x24] ldr r1, [r5, #0x28] ldr r2, [r5, #0x2c] @@ -1958,7 +1958,7 @@ asm static u8 ov107_02243890 (UnkStruct_ov107_02241D6C * param0, UnkStruct_0205A ldr r0, [r5, #0x20] ldr r2, [r5, #0x2c] add r4, r3, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf ldr r0, [r5, #0x24] ldr r1, [r5, #0x28] ldr r2, [r5, #0x2c] @@ -2439,7 +2439,7 @@ static u8 ov107_02243EF8 (UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 u8 v0; sub_0201ADA4(param1, 0); - sub_0200B1B8(param0->unk_1C, param2, param0->unk_2C); + MessageLoader_GetStrbuf(param0->unk_1C, param2, param0->unk_2C); sub_0200C388(param0->unk_24, param0->unk_28, param0->unk_2C); v0 = sub_0201D78C(param1, 0, param0->unk_28, 0, 6, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0))), NULL); @@ -2633,7 +2633,7 @@ static void ov107_022441B0 (UnkStruct_ov107_02241D6C * param0, u8 param1, u8 par int v0; void * v1; - sub_0200B1B8(param0->unk_20, param3, param0->unk_30[param1]); + MessageLoader_GetStrbuf(param0->unk_20, param3, param0->unk_30[param1]); param0->unk_180[param1].unk_00 = (const void *)param0->unk_30[param1]; param0->unk_180[param1].unk_04 = param2; @@ -2659,7 +2659,7 @@ static void ov107_02244240 (UnkStruct_ov107_02241D6C * param0, u8 param1) u8 v0, v1, v2; u16 v3; int v4; - UnkStruct_0200B144 * v5; + MessageLoader * v5; ov107_0224503C(param0, param0->unk_0D, 1); v2 = ov107_02249C98(param0->unk_14, param0->unk_0D); @@ -2674,7 +2674,7 @@ static void ov107_02244240 (UnkStruct_ov107_02241D6C * param0, u8 param1) ov107_02249BAC(param0->unk_3EC, 1); ov107_02249BAC(param0->unk_434, 1); - v5 = sub_0200B144(1, 26, 392, 100); + v5 = MessageLoader_Init(1, 26, 392, 100); v0 = ov107_02249CAC(param0->unk_1CC, param0->unk_09, 1); if (param1 == 6) { @@ -2711,7 +2711,7 @@ static void ov107_02244240 (UnkStruct_ov107_02241D6C * param0, u8 param1) param0->unk_198 = sub_0200112C(¶m0->unk_1A0, 0, 0, 100); ov107_02245650(param0, ¶m0->unk_50[5]); - sub_0200B190(v5); + MessageLoader_Free(v5); return; } diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c index 7f0c7c285e..41410ace16 100644 --- a/src/overlay107/ov107_02245EB0.c +++ b/src/overlay107/ov107_02245EB0.c @@ -8,7 +8,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_02013A04_decl.h" @@ -110,7 +110,7 @@ struct UnkStruct_ov107_02246170_t { u16 unk_1A; u16 unk_1C; u16 unk_1E; - UnkStruct_0200B144 * unk_20; + MessageLoader * unk_20; UnkStruct_0200B358 * unk_24; Strbuf* unk_28; Strbuf* unk_2C; @@ -1091,7 +1091,7 @@ static void ov107_02246D84 (UnkStruct_ov107_02246170 * param0) ov107_02249954(¶m0->unk_158); - sub_0200B190(param0->unk_20); + MessageLoader_Free(param0->unk_20); sub_0200B3F0(param0->unk_24); Strbuf_Free(param0->unk_28); Strbuf_Free(param0->unk_2C); @@ -1135,7 +1135,7 @@ static void ov107_02246EE4 (UnkStruct_ov107_02246170 * param0) ov107_02247220(param0); ov107_02247280(param0); - param0->unk_20 = sub_0200B144(1, 26, 201, 100); + param0->unk_20 = MessageLoader_Init(1, 26, 201, 100); param0->unk_24 = sub_0200B358(100); param0->unk_28 = Strbuf_Init(600, 100); param0->unk_2C = Strbuf_Init(600, 100); @@ -1522,7 +1522,7 @@ asm static u8 ov107_02247680 (UnkStruct_ov107_02246170 * param0, UnkStruct_0205A ldr r0, [r5, #0x20] ldr r2, [r5, #0x2c] add r1, r7, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf ldr r0, [r5, #0x24] ldr r1, [r5, #0x28] ldr r2, [r5, #0x2c] @@ -1617,7 +1617,7 @@ asm static u8 ov107_02247744 (UnkStruct_ov107_02246170 * param0, UnkStruct_0205A ldr r0, [r5, #0x20] ldr r2, [r5, #0x2c] add r4, r3, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf ldr r0, [r5, #0x24] ldr r1, [r5, #0x28] ldr r2, [r5, #0x2c] @@ -2112,7 +2112,7 @@ static void ov107_02247D68 (UnkStruct_ov107_02246170 * param0, u8 param1, u8 par int v0; void * v1; - sub_0200B1B8(param0->unk_20, param3, param0->unk_30[param1]); + MessageLoader_GetStrbuf(param0->unk_20, param3, param0->unk_30[param1]); param0->unk_120[param1].unk_00 = (const void *)param0->unk_30[param1]; param0->unk_120[param1].unk_04 = param2; diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c index 565c15380a..a9ae315557 100644 --- a/src/overlay108/ov108_02241AE0.c +++ b/src/overlay108/ov108_02241AE0.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -200,7 +200,7 @@ struct UnkStruct_ov108_02241DB0_t { u8 unk_34[16]; u8 unk_44[32]; u8 unk_64; - UnkStruct_0200B144 * unk_68; + MessageLoader * unk_68; UnkStruct_0200B358 * unk_6C; Strbuf* unk_70; Strbuf* unk_74; @@ -784,7 +784,7 @@ static void ov108_02242238 (UnkStruct_ov108_02241DB0 * param0) param0->unk_D4 = NULL; ov108_02243194(¶m0->unk_E8); - sub_0200B190(param0->unk_68); + MessageLoader_Free(param0->unk_68); sub_0200B3F0(param0->unk_6C); Strbuf_Free(param0->unk_70); Strbuf_Free(param0->unk_74); @@ -827,7 +827,7 @@ static void ov108_0224237C (UnkStruct_ov108_02241DB0 * param0) ov108_02242658(param0); ov108_022426B0(param0); - param0->unk_68 = sub_0200B144(1, 26, 536, 103); + param0->unk_68 = MessageLoader_Init(1, 26, 536, 103); param0->unk_6C = sub_0200B358(103); param0->unk_70 = Strbuf_Init(600, 103); param0->unk_74 = Strbuf_Init(600, 103); diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c index fe2d3d484c..60b5acbb94 100644 --- a/src/overlay109/ov109_021D0D80.c +++ b/src/overlay109/ov109_021D0D80.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -151,7 +151,7 @@ typedef struct { typedef struct { int unk_00; - UnkStruct_0200B144 * unk_04; + MessageLoader * unk_04; UnkStruct_0200B358 * unk_08; UnkStruct_0205AA50 unk_0C[1]; UnkStruct_0205AA50 unk_1C[5]; @@ -2024,7 +2024,7 @@ static void ov109_021D24F8 (UnkStruct_ov109_021D0F70 * param0) sub_02003050(param0->unk_D9C, 38, sub_0200DD08(param0->unk_CC->unk_14.unk_04), 95, 0, 0x20, 14 * 16); sub_02003050(param0->unk_D9C, 14, 7, 95, 0, 0x20, 15 * 16); - v1->unk_04 = sub_0200B144(0, 26, 376, 95); + v1->unk_04 = MessageLoader_Init(0, 26, 376, 95); v1->unk_08 = sub_0200B358(95); for (v0 = 0; v0 < 1; v0++) { @@ -2052,7 +2052,7 @@ static void ov109_021D25E8 (UnkStruct_ov109_021D0F70 * param0) ov109_021D27F0(param0); - sub_0200B190(v1->unk_04); + MessageLoader_Free(v1->unk_04); sub_0200B3F0(v1->unk_08); Strbuf_Free(v1->unk_6C); @@ -2069,7 +2069,7 @@ static void ov109_021D2634 (UnkStruct_ov109_021D0F70 * param0, u32 param1) sub_0201ADA4(v1, 15); sub_0200E060(v1, 1, (1 + 9), 14); sub_0201ADA4(v1, 15); - sub_0200B1B8(v0->unk_04, param1, v0->unk_6C); + MessageLoader_GetStrbuf(v0->unk_04, param1, v0->unk_6C); sub_0201D738(v1, 1, v0->unk_6C, 0, 0, 0xff, NULL); sub_0201A9A4(v1); } @@ -2085,7 +2085,7 @@ static void ov109_021D268C (UnkStruct_ov109_021D0F70 * param0, u32 param1, const v0 = Strbuf_Init(0x100, 95); - sub_0200B1B8(v1->unk_04, param1, v0); + MessageLoader_GetStrbuf(v1->unk_04, param1, v0); sub_0200C388(v1->unk_08, v1->unk_6C, v0); Strbuf_Free(v0); sub_0200E060(v2, 1, (1 + 9), 14); @@ -2104,7 +2104,7 @@ static void ov109_021D2714 (UnkStruct_ov109_021D0F70 * param0, u32 param1, u32 p v0 = Strbuf_Init(0x100, 95); - sub_0200B1B8(v1->unk_04, param1, v0); + MessageLoader_GetStrbuf(v1->unk_04, param1, v0); sub_0200C388(v1->unk_08, v1->unk_6C, v0); Strbuf_Free(v0); sub_0200E060(v2, 1, (1 + 9), 14); diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c index 0064ccfb03..f3794073b8 100644 --- a/src/overlay109/ov109_021D3D50.c +++ b/src/overlay109/ov109_021D3D50.c @@ -200,7 +200,7 @@ int ov109_021D3D50 (UnkStruct_020067E8 * param0, int * param1) v0->unk_10 = v2->unk_34; v0->unk_14 = sub_02018340(95); v0->unk_34 = sub_0200B358(95); - v0->unk_38 = sub_0200B144(0, 26, 377, 95); + v0->unk_38 = MessageLoader_Init(0, 26, 377, 95); sub_02017DD4(4, 8); ov109_021D40D0(); @@ -317,7 +317,7 @@ int ov109_021D3F9C (UnkStruct_020067E8 * param0, int * param1) ov109_021D471C(v1); ov109_021D42CC(v1->unk_14); - sub_0200B190(v1->unk_38); + MessageLoader_Free(v1->unk_38); sub_0200B3F0(v1->unk_34); GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); @@ -531,7 +531,7 @@ static void ov109_021D41F8 (UnkStruct_ov109_021D5140 * param0, NARC * param1) param0->unk_58 = Strbuf_Init((20 * 2), 95); param0->unk_3B8 = 0; - sub_0200B1B8(param0->unk_38, 17, param0->unk_58); + MessageLoader_GetStrbuf(param0->unk_38, 17, param0->unk_58); ov109_021D577C(param0, param1); param0->unk_41C = sub_0205CA4C(95); @@ -1578,7 +1578,7 @@ static void ov109_021D55A8 (UnkStruct_ov109_021D5140 * param0, int param1, int p v0 = Strbuf_Init((90 * 2), 95); - sub_0200B1B8(param0->unk_38, param1, v0); + MessageLoader_GetStrbuf(param0->unk_38, param1, v0); sub_0200C388(param0->unk_34, param0->unk_54, v0); Strbuf_Free(v0); sub_0201ADA4(¶m0->unk_35C, 0xf0f); diff --git a/src/overlay110/ov110_021D0D80.c b/src/overlay110/ov110_021D0D80.c index 1f68906738..d4261129bf 100644 --- a/src/overlay110/ov110_021D0D80.c +++ b/src/overlay110/ov110_021D0D80.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" @@ -57,7 +57,7 @@ typedef struct { u16 unk_0A; UnkStruct_02018340 * unk_0C; UnkStruct_0205AA50 unk_10[16]; - UnkStruct_0200B144 * unk_110; + MessageLoader * unk_110; UnkStruct_0200B358 * unk_114; Strbuf* unk_118; Strbuf* unk_11C; @@ -133,7 +133,7 @@ int ov110_021D0D80 (UnkStruct_020067E8 * param0, int * param1) ov110_021D1180(v1); - v1->unk_110 = sub_0200B144(1, 26, 16, 114); + v1->unk_110 = MessageLoader_Init(1, 26, 16, 114); v1->unk_114 = sub_0200B358(114); v1->unk_118 = Strbuf_Init(800, 114); v1->unk_11C = Strbuf_Init(800, 114); @@ -182,7 +182,7 @@ int ov110_021D0EF0 (UnkStruct_020067E8 * param0, int * param1) v1->unk_120 = NULL; - sub_0200B190(v1->unk_110); + MessageLoader_Free(v1->unk_110); sub_0200B3F0(v1->unk_114); Strbuf_Free(v1->unk_118); Strbuf_Free(v1->unk_11C); @@ -505,7 +505,7 @@ asm static u8 ov110_021D1324 (UnkStruct_ov110_021D0F78 * param0, UnkStruct_0205A add r2, #0xc ldr r2, [r5, r2] add r1, r7, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf mov r2, #0x45 lsl r2, r2, #2 add r1, r2, #4 @@ -1229,13 +1229,13 @@ asm static void ov110_021D1808 (UnkStruct_ov110_021D0F78 * param0) static void ov110_021D19B0 (UnkStruct_ov110_021D0F78 * param0) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; Strbuf* v1; - v0 = sub_0200B144(1, 26, 412, 114); - v1 = sub_0200B1EC(v0, param0->unk_08); + v0 = MessageLoader_Init(1, 26, 412, 114); + v1 = MessageLoader_GetNewStrbuf(v0, param0->unk_08); - sub_0200B190(v0); + MessageLoader_Free(v0); sub_0200B48C(param0->unk_114, 0, v1, 0, 0, GAME_LANGUAGE); Strbuf_Free(v1); diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c index a6488d8040..680c8b5fad 100644 --- a/src/overlay111/ov111_021D0D80.c +++ b/src/overlay111/ov111_021D0D80.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_02015920_decl.h" @@ -85,7 +85,7 @@ struct UnkStruct_ov111_021D0F7C_t { VecFx32 unk_1C; VecFx32 unk_28; void * unk_34; - UnkStruct_0200B144 * unk_38; + MessageLoader * unk_38; UnkStruct_0200B358 * unk_3C; Strbuf* unk_40; Strbuf* unk_44; @@ -1122,7 +1122,7 @@ static void ov111_021D1C0C (UnkStruct_ov111_021D0F7C * param0) ov111_021D3320(¶m0->unk_16C); sub_02015760(param0->unk_34); - sub_0200B190(param0->unk_38); + MessageLoader_Free(param0->unk_38); sub_0200B3F0(param0->unk_3C); Strbuf_Free(param0->unk_40); Strbuf_Free(param0->unk_44); @@ -1159,7 +1159,7 @@ static void ov111_021D1D68 (UnkStruct_ov111_021D0F7C * param0) ov111_021D1FC4(param0); ov111_021D2034(param0); - param0->unk_38 = sub_0200B144(1, 26, 540, 115); + param0->unk_38 = MessageLoader_Init(1, 26, 540, 115); param0->unk_3C = sub_0200B358(115); param0->unk_40 = Strbuf_Init(600, 115); param0->unk_44 = Strbuf_Init(600, 115); @@ -1532,7 +1532,7 @@ static void ov111_021D2380 (UnkStruct_ov111_021D0F7C * param0, u32 param1) static u8 ov111_021D23C4 (UnkStruct_ov111_021D0F7C * param0, UnkStruct_0205AA50 * param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9) { sub_0201ADA4(param1, param8); - sub_0200B1B8(param0->unk_38, param2, param0->unk_44); + MessageLoader_GetStrbuf(param0->unk_38, param2, param0->unk_44); sub_0200C388(param0->unk_3C, param0->unk_40, param0->unk_44); return sub_0201D78C(param1, param9, param0->unk_40, param3, param4, param5, (u32)((((param6) & 0xff) << 16) | (((param7) & 0xff) << 8) | (((param8) & 0xff) << 0)), NULL); @@ -1553,7 +1553,7 @@ asm static u8 ov111_021D2424 (UnkStruct_ov111_021D0F7C * param0, UnkStruct_0205A ldr r0, [r5, #0x38] ldr r2, [r5, #0x44] add r1, r7, #0 - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf ldr r0, [r5, #0x3c] ldr r1, [r5, #0x40] ldr r2, [r5, #0x44] diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c index 3f1a4ea266..bce4f8a009 100644 --- a/src/overlay112/ov112_0225C700.c +++ b/src/overlay112/ov112_0225C700.c @@ -8,7 +8,7 @@ #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "strbuf.h" @@ -1147,7 +1147,7 @@ asm static void ov112_0225D57C (UnkStruct_ov112_0225D6DC * param0, UnkStruct_ov1 ldr r3, [sp, #0x1c] mov r0, #0 mov r1, #0x1a - bl sub_0200B144 + bl MessageLoader_Init str r0, [sp, #0x38] ldr r1, [sp, #0x1c] mov r0, #0x80 @@ -1193,7 +1193,7 @@ asm static void ov112_0225D57C (UnkStruct_ov112_0225D6DC * param0, UnkStruct_ov1 ldr r0, [sp, #0x38] ldr r1, [sp, #0x3c] ldr r2, [sp, #0x34] - bl sub_0200B1B8 + bl MessageLoader_GetStrbuf ldr r0, [sp, #0x34] bl Strbuf_NumLines str r0, [sp, #0x30] @@ -1288,7 +1288,7 @@ asm static void ov112_0225D57C (UnkStruct_ov112_0225D6DC * param0, UnkStruct_ov1 ldr r0, [sp, #0x34] bl Strbuf_Free ldr r0, [sp, #0x38] - bl sub_0200B190 + bl MessageLoader_Free add sp, #0x40 pop {r3, r4, r5, r6, r7, pc} nop diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c index 519a0db9ee..78683d2033 100644 --- a/src/overlay113/ov113_0225C700.c +++ b/src/overlay113/ov113_0225C700.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -115,7 +115,7 @@ typedef struct UnkStruct_ov113_0225DBCC_t { u8 unk_28; u8 unk_29; UnkStruct_0200B358 * unk_2C; - UnkStruct_0200B144 * unk_30; + MessageLoader * unk_30; UnkStruct_0205AA50 unk_34[8]; UnkStruct_0205AA50 unk_B4; Strbuf* unk_C4; @@ -402,7 +402,7 @@ int ov113_0225C700 (UnkStruct_020067E8 * param0, int * param1) sub_02002BB8(2, 118); v0->unk_2C = sub_0200B358(118); - v0->unk_30 = sub_0200B144(0, 26, 650, 118); + v0->unk_30 = MessageLoader_Init(0, 26, 650, 118); v0->unk_10 = sub_02012744(4, 118); v0->unk_160 = NARC_ctor(NARC_INDEX_GRAPHIC__FOOTPRINT_BOARD, 118); v0->unk_164 = NARC_ctor(NARC_INDEX_POKETOOL__POKEFOOT__POKEFOOT, 118); @@ -519,7 +519,7 @@ int ov113_0225CA04 (UnkStruct_020067E8 * param0, int * param1) case 3: sub_0201ADA4(&v0->unk_B4, 0xf); sub_0200E060(&v0->unk_B4, 0, 1, 14); - sub_0200B1B8(v0->unk_30, 2, v0->unk_C4); + MessageLoader_GetStrbuf(v0->unk_30, 2, v0->unk_C4); v0->unk_C8 = sub_0201D738(&v0->unk_B4, 1, v0->unk_C4, 0, 0, sub_02027AC0(sub_02025E44(v0->unk_04)), NULL); (*param1)++; break; @@ -569,7 +569,7 @@ int ov113_0225CA04 (UnkStruct_020067E8 * param0, int * param1) case 6: sub_0201ADA4(&v0->unk_B4, 0xf); sub_0200E060(&v0->unk_B4, 0, 1, 14); - sub_0200B1B8(v0->unk_30, 3, v0->unk_C4); + MessageLoader_GetStrbuf(v0->unk_30, 3, v0->unk_C4); v0->unk_C8 = sub_0201D738(&v0->unk_B4, 1, v0->unk_C4, 0, 0, sub_02027AC0(sub_02025E44(v0->unk_04)), NULL); (*param1)++; break; @@ -650,7 +650,7 @@ int ov113_0225CDFC (UnkStruct_020067E8 * param0, int * param1) Strbuf_Free(v0->unk_C4); sub_02002C60(2); sub_020127BC(v0->unk_10); - sub_0200B190(v0->unk_30); + MessageLoader_Free(v0->unk_30); sub_0200B3F0(v0->unk_2C); ov113_0225DC4C(v0); @@ -1013,7 +1013,7 @@ static void ov113_0225D484 (UnkStruct_ov113_0225DBCC * param0) { Strbuf* v2; - v2 = sub_0200B1EC(param0->unk_30, 1); + v2 = MessageLoader_GetNewStrbuf(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); sub_020129D0(param0->unk_19C0.unk_00, 1); Strbuf_Free(v2); diff --git a/src/overlay113/ov113_02260620.c b/src/overlay113/ov113_02260620.c index 522c44d1ff..0f624f6b21 100644 --- a/src/overlay113/ov113_02260620.c +++ b/src/overlay113/ov113_02260620.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "strbuf.h" #include "struct_decls/struct_02025E6C_decl.h" @@ -544,7 +544,7 @@ static const UnkUnion_02022594 Unk_ov113_02260D4C[] = { {0xFF, 0x0, 0x0, 0x0} }; -void ov113_02260620 (UnkStruct_0200B144 * param0, UnkStruct_0200B358 * param1, UnkStruct_0205AA50 param2[], UnkStruct_ov66_0222DFF8 * param3, s32 param4) +void ov113_02260620 (MessageLoader * param0, UnkStruct_0200B358 * param1, UnkStruct_0205AA50 param2[], UnkStruct_ov66_0222DFF8 * param3, s32 param4) { const UnkStruct_ov66_0222E71C * v0; UnkStruct_02025E6C * v1; @@ -587,7 +587,7 @@ void ov113_02260620 (UnkStruct_0200B144 * param0, UnkStruct_0200B358 * param1, U sub_0200B48C(param1, 0, v4, v6, 1, GAME_LANGUAGE); - v2 = sub_0200B1EC(param0, 0); + v2 = MessageLoader_GetNewStrbuf(param0, 0); v3 = Strbuf_Init(v5, 118); sub_0200C388(param1, v3, v2); diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c index c73ec65962..0bd990bdab 100644 --- a/src/overlay114/ov114_0225C700.c +++ b/src/overlay114/ov114_0225C700.c @@ -8,7 +8,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013B10_decl.h" #include "struct_decls/struct_02015920_decl.h" @@ -113,7 +113,7 @@ typedef struct { } UnkStruct_ov114_0225CEF0; typedef struct { - UnkStruct_0200B144 * unk_00; + MessageLoader * unk_00; UnkStruct_0200B358 * unk_04; Strbuf* unk_08; Strbuf* unk_0C; @@ -1433,7 +1433,7 @@ static void ov114_0225D07C (UnkStruct_ov114_0225CFCC * param0) static void ov114_0225D084 (UnkStruct_ov114_0225D084 * param0, u32 param1) { - param0->unk_00 = sub_0200B144(0, 26, 411, param1); + param0->unk_00 = MessageLoader_Init(0, 26, 411, param1); param0->unk_04 = sub_0200B368(8, 64, param1); param0->unk_08 = Strbuf_Init(128, param1); param0->unk_0C = Strbuf_Init(128, param1); @@ -1447,7 +1447,7 @@ static void ov114_0225D0D8 (UnkStruct_ov114_0225D084 * param0) Strbuf_Free(param0->unk_0C); Strbuf_Free(param0->unk_08); sub_0200B3F0(param0->unk_04); - sub_0200B190(param0->unk_00); + MessageLoader_Free(param0->unk_00); } static void ov114_0225D0F8 (UnkStruct_ov114_0225D084 * param0) @@ -1492,7 +1492,7 @@ static void ov114_0225D180 (UnkStruct_ov114_0225D084 * param0, u32 param1) static void ov114_0225D190 (UnkStruct_ov114_0225D084 * param0, Strbuf *param1, u32 param2) { - sub_0200B1B8(param0->unk_00, param2, param0->unk_0C); + MessageLoader_GetStrbuf(param0->unk_00, param2, param0->unk_0C); sub_0200C388(param0->unk_04, param1, param0->unk_0C); } @@ -1506,7 +1506,7 @@ static void ov114_0225D1C8 (UnkStruct_ov114_0225D084 * param0, u32 param1, UnkSt u32 v0; s32 v1; - sub_0200B1B8(param0->unk_00, param1, param0->unk_0C); + MessageLoader_GetStrbuf(param0->unk_00, param1, param0->unk_0C); sub_0200C388(param0->unk_04, param0->unk_08, param0->unk_0C); v0 = sub_02002D7C(0, param0->unk_08, 0); @@ -1521,7 +1521,7 @@ static void ov114_0225D1C8 (UnkStruct_ov114_0225D084 * param0, u32 param1, UnkSt 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); + MessageLoader_GetStrbuf(param0->unk_00, param1, param0->unk_0C); sub_0200C388(param0->unk_04, param3, param0->unk_0C); return sub_0201D78C(param2, 1, param3, 0, 0, param4, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); @@ -1529,7 +1529,7 @@ static u32 ov114_0225D218 (UnkStruct_ov114_0225D084 * param0, u32 param1, UnkStr static void ov114_0225D254 (UnkStruct_ov114_0225D084 * param0, u32 param1, UnkStruct_0205AA50 * param2, u8 param3, u8 param4, u32 param5) { - sub_0200B1B8(param0->unk_00, param1, param0->unk_0C); + MessageLoader_GetStrbuf(param0->unk_00, param1, param0->unk_0C); sub_0200C388(param0->unk_04, param0->unk_08, param0->unk_0C); sub_0201D78C(param2, 0, param0->unk_08, param3, param4, 0xff, param5, NULL); } diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c index a328cd51e2..f38413cffa 100644 --- a/src/overlay115/ov115_02260CEC.c +++ b/src/overlay115/ov115_02260CEC.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02012B20_decl.h" @@ -292,7 +292,7 @@ typedef struct { typedef struct { UnkStruct_02018340 * unk_00; UnkStruct_0200B358 * unk_04; - UnkStruct_0200B144 * unk_08; + MessageLoader * unk_08; Strbuf* unk_0C; Strbuf* unk_10; u16 unk_14; @@ -1447,7 +1447,7 @@ static void ov115_022617E8 (UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_0 v0 = Strbuf_Init(128, param6); - sub_0200B1B8(param1->unk_08, 0, v0); + MessageLoader_GetStrbuf(param1->unk_08, 0, v0); sub_0201D78C(¶m0->unk_0C, 0, v0, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); Strbuf_Free(v0); sub_020070E8(param5, 18, param1->unk_00, 2, 0, 0, 0, param6); @@ -3263,7 +3263,7 @@ static void ov115_02263B78 (UnkStruct_ov115_02261ADC * param0) static void ov115_02263BCC (UnkStruct_ov115_02261ADC * param0, u32 param1) { param0->unk_04 = sub_0200B358(param1); - param0->unk_08 = sub_0200B144(0, 26, 407, param1); + param0->unk_08 = MessageLoader_Init(0, 26, 407, param1); param0->unk_0C = Strbuf_Init(128, param1); param0->unk_10 = Strbuf_Init(128, param1); } @@ -3272,7 +3272,7 @@ static void ov115_02263C04 (UnkStruct_ov115_02261ADC * param0) { Strbuf_Free(param0->unk_10); Strbuf_Free(param0->unk_0C); - sub_0200B190(param0->unk_08); + MessageLoader_Free(param0->unk_08); sub_0200B3F0(param0->unk_04); } diff --git a/src/overlay116/ov116_02261870.c b/src/overlay116/ov116_02261870.c index 3f7c8ee60e..67c96f5e14 100644 --- a/src/overlay116/ov116_02261870.c +++ b/src/overlay116/ov116_02261870.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -396,15 +396,15 @@ void ov116_02261F70 (UnkStruct_ov116_02262A8C * param0) sub_0201ADA4(¶m0->unk_1FC8, 0xFF); { - UnkStruct_0200B144 * v0; + MessageLoader * v0; Strbuf* v1; - v0 = sub_0200B144(0, 26, 410, 106); - v1 = sub_0200B1EC(v0, 0); + v0 = MessageLoader_Init(0, 26, 410, 106); + v1 = MessageLoader_GetNewStrbuf(v0, 0); sub_0201D738(¶m0->unk_1FC8, 0, v1, 0, 0, 0, NULL); Strbuf_Free(v1); - sub_0200B190(v0); + MessageLoader_Free(v0); } sub_0200DC48(¶m0->unk_1FC8, 0, 180, 13); diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c index 053704596e..07051cdec7 100644 --- a/src/overlay117/ov117_02260668.c +++ b/src/overlay117/ov117_02260668.c @@ -236,7 +236,7 @@ int ov117_02260668 (UnkStruct_020067E8 * param0, int * param1) sub_0200964C(sub_0200C738(v0->unk_24), 0, ((192 + 160) << FX32_SHIFT)); ov117_02261574(v0); - v0->unk_80 = sub_0200B144(0, 26, 9, 110); + v0->unk_80 = MessageLoader_Init(0, 26, 9, 110); v0->unk_84 = sub_0200B358(110); v0->unk_88 = Strbuf_Init((2 * 160), 110); v0->unk_90 = sub_02012744((2 * 6 + 6 + 1), 110); @@ -476,7 +476,7 @@ int ov117_02260C10 (UnkStruct_020067E8 * param0, int * param1) sub_02002F54(v0->unk_8C); Strbuf_Free(v0->unk_88); sub_0200B3F0(v0->unk_84); - sub_0200B190(v0->unk_80); + MessageLoader_Free(v0->unk_80); Heap_FreeToHeap(v0->unk_2C); ov117_02260F64(v0); sub_0200DA58(v0->unk_94); @@ -850,7 +850,7 @@ static void ov117_02261368 (UnkStruct_ov117_02261280 * param0) sub_0200DC48(¶m0->unk_30[4], 1, ((((((0x8000 - 0x2000) / 32) + (10 * 2)) + (10 * 2)) + (10 * 2)) + (10 * 2)), 6); - v0 = sub_0200B1EC(param0->unk_80, 3); + v0 = MessageLoader_GetNewStrbuf(param0->unk_80, 3); sub_0201D78C(¶m0->unk_30[4], 0, v0, 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); Strbuf_Free(v0); @@ -1015,7 +1015,7 @@ asm static void ov117_0226168C (UnkStruct_ov117_02261280 * param0, NARC * param1 add r0, #0x80 ldr r0, [r0, #0] mov r1, #2 - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf add r6, r0, #0 mov r0, #0 add r1, r6, #0 @@ -1059,13 +1059,13 @@ asm static void ov117_0226168C (UnkStruct_ov117_02261280 * param0, NARC * param1 add r0, #0x80 ldr r0, [r0, #0] mov r1, #0 - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf str r0, [sp, #0x30] add r0, r5, #0 add r0, #0x80 ldr r0, [r0, #0] mov r1, #1 - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf str r0, [sp, #0x38] mov r0, #0 str r0, [sp, #0x34] diff --git a/src/overlay117/ov117_02263AF0.c b/src/overlay117/ov117_02263AF0.c index 97c2403384..8684aba851 100644 --- a/src/overlay117/ov117_02263AF0.c +++ b/src/overlay117/ov117_02263AF0.c @@ -2272,7 +2272,7 @@ asm void ov117_02266150 (UnkStruct_ov117_02261280 * param0) add r0, #0x80 ldr r0, [r0, #0] add r1, r1, #4 - bl sub_0200B1EC + bl MessageLoader_GetNewStrbuf str r0, [sp, #0x34] ldr r0, [sp, #0x2c] mov r1, #0xa diff --git a/src/overlay118/ov118_021D0D80.c b/src/overlay118/ov118_021D0D80.c index 44b42dd82e..3c9fc169e4 100644 --- a/src/overlay118/ov118_021D0D80.c +++ b/src/overlay118/ov118_021D0D80.c @@ -144,7 +144,7 @@ int ov118_021D0DBC (UnkStruct_0207F248 * param0) { Strbuf* v2; - v2 = sub_0200B1EC(param0->unk_69C, 202); + v2 = MessageLoader_GetNewStrbuf(param0->unk_69C, 202); sub_0200B5CC(param0->unk_6A0, 0, sub_02076B10(v1)); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v2); diff --git a/src/overlay119/ov119_021D0D80.c b/src/overlay119/ov119_021D0D80.c index 9835638a11..c975c73edf 100644 --- a/src/overlay119/ov119_021D0D80.c +++ b/src/overlay119/ov119_021D0D80.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_02002F38_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" @@ -315,13 +315,13 @@ int ov119_021D1158 (UnkStruct_0205AA50 * param0, int param1, Pokemon * param2, i Strbuf* v2; UnkStruct_0200B358 * v3; BoxPokemon * v4; - UnkStruct_0200B144 * v5; + MessageLoader * v5; sub_0201ADA4(param0, 15); - v5 = sub_0200B144(0, 26, 357, 71); + v5 = MessageLoader_Init(0, 26, 357, 71); v3 = sub_0200B358(71); - v1 = sub_0200B1EC(v5, param1); + v1 = MessageLoader_GetNewStrbuf(v5, param1); v2 = Strbuf_Init(255, 71); v4 = sub_02076B10(param2); @@ -330,7 +330,7 @@ int ov119_021D1158 (UnkStruct_0205AA50 * param0, int param1, Pokemon * param2, i v0 = sub_0201D738(param0, 1, v2, 0, 0, param3, NULL); - sub_0200B190(v5); + MessageLoader_Free(v5); Strbuf_Free(v2); Strbuf_Free(v1); sub_0200B3F0(v3); @@ -350,15 +350,15 @@ void ov119_021D11E4 (UnkStruct_ov119_021D0FD0 * param0, UnkStruct_02018340 * par { int v1; Strbuf* v2; - UnkStruct_0200B144 * v3 = sub_0200B144(0, 26, 357, 71); + MessageLoader * v3 = MessageLoader_Init(0, 26, 357, 71); for (v1 = 0; v1 < 2; v1++) { - v2 = sub_0200B1EC(v3, 2 + v1); + v2 = MessageLoader_GetNewStrbuf(v3, 2 + v1); sub_02013A6C(param0->unk_04.unk_44, v2, v1); Strbuf_Free(v2); } - sub_0200B190(v3); + MessageLoader_Free(v3); } v0.unk_00 = param0->unk_04.unk_44; diff --git a/src/overlay120/ov120_021D0D80.c b/src/overlay120/ov120_021D0D80.c index 2bc630a8ff..4da1e6ddec 100644 --- a/src/overlay120/ov120_021D0D80.c +++ b/src/overlay120/ov120_021D0D80.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_020067E8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0205AA50.h" @@ -25,7 +25,7 @@ typedef struct { int unk_00; UnkStruct_02018340 * unk_04; - UnkStruct_0200B144 * unk_08; + MessageLoader * unk_08; int unk_0C; UnkStruct_0205AA50 unk_10; int unk_20; @@ -323,14 +323,14 @@ static void ov120_021D10D4 (UnkStruct_ov120_021D0F24 * param0) static void ov120_021D114C (UnkStruct_ov120_021D0F24 * param0) { - param0->unk_08 = sub_0200B144(1, 26, 607, param0->unk_00); + param0->unk_08 = MessageLoader_Init(1, 26, 607, param0->unk_00); sub_0201D710(); param0->unk_0C = 0; } static void ov120_021D116C (UnkStruct_ov120_021D0F24 * param0) { - sub_0200B190(param0->unk_08); + MessageLoader_Free(param0->unk_08); } static void ov120_021D1178 (UnkStruct_ov120_021D0F24 * param0) diff --git a/src/unk_02001AF4.c b/src/unk_02001AF4.c index 45762e1394..e7ff3da4fa 100644 --- a/src/unk_02001AF4.c +++ b/src/unk_02001AF4.c @@ -3,7 +3,7 @@ #include "data_021BF67C.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_020149F0_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -380,15 +380,15 @@ static void sub_02002018 (UnkStruct_02001AF4 * param0, u8 * param1, u8 * param2, UnkStruct_02001AF4 * sub_02002054 (UnkStruct_02018340 * param0, const UnkStruct_ov61_0222C884 * param1, u16 param2, u8 param3, u8 param4, u32 param5) { UnkStruct_02081CF4 v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; UnkStruct_02013A04 * v2; - v1 = sub_0200B144(1, 26, 361, param5); + v1 = MessageLoader_Init(1, 26, 361, param5); v2 = sub_02013A04(2, param5); sub_02013A4C(v2, v1, 41, 0); sub_02013A4C(v2, v1, 42, 0xfffffffe); - sub_0200B190(v1); + MessageLoader_Free(v1); v0.unk_00 = v2; v0.unk_04 = sub_0201A778(param5, 1); diff --git a/src/unk_0200AC5C.c b/src/unk_0200AC5C.c index 2450bc99e8..1abcdfc162 100644 --- a/src/unk_0200AC5C.c +++ b/src/unk_0200AC5C.c @@ -11,46 +11,24 @@ #include "heap.h" #include "strbuf.h" -typedef struct { - u32 unk_00; - u32 unk_04; -} UnkStruct_0200AC6C; +static void sub_0200AD98(u16 * param0, const u16 * param1, const MessageBankEntry * param2); -typedef struct UnkStruct_0200AC5C_t { - u16 unk_00; - u16 unk_02; - UnkStruct_0200AC6C unk_04[]; -} UnkStruct_0200AC5C; - -typedef struct UnkStruct_0200B144_t { - u16 unk_00; - u16 unk_02; - u16 unk_04; - u16 unk_06; - union { - UnkStruct_0200AC5C * unk_08_val1; - NARC * unk_08_val2; - }; -} UnkStruct_0200B144; - -static void sub_0200AD98(u16 * param0, const u16 * param1, const UnkStruct_0200AC6C * param2); - -UnkStruct_0200AC5C * sub_0200AC5C (u32 param0, u32 param1, u32 param2) +MessageBank * MessageBank_Load (u32 param0, u32 param1, u32 param2) { return NARC_AllocAndReadWholeMemberByIndexPair(param0, param1, param2); } -void sub_0200AC64 (UnkStruct_0200AC5C * param0) +void MessageBank_Free (MessageBank * param0) { Heap_FreeToHeap(param0); } static inline int inline_0200ACF0 (u32 param0) { - return sizeof(UnkStruct_0200AC5C) + sizeof(UnkStruct_0200AC6C) * param0; + return sizeof(MessageBank) + sizeof(MessageBankEntry) * param0; } -static inline void inline_0200AC6C (UnkStruct_0200AC6C * param0, u32 param1, u32 param2) +static inline void inline_0200AC6C (MessageBankEntry * param0, u32 param1, u32 param2) { param2 = (param2 * 765 * (param1 + 1)) & 0xffff; param2 |= (param2 << 16); @@ -70,10 +48,10 @@ static inline void inline_0200AC6C_1 (u16 * param0, u32 param1, u32 param2, u16 } } -void sub_0200AC6C (const UnkStruct_0200AC5C * param0, u32 param1, u16 * param2) +void MessageBank_Get (const MessageBank * param0, u32 param1, u16 * param2) { if (param1 < param0->unk_00) { - UnkStruct_0200AC6C v0; + MessageBankEntry v0; const u16 * v1; v0 = param0->unk_04[param1]; @@ -86,18 +64,18 @@ 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 MessageBank_GetFromNARC (u32 param0, u32 param1, u32 param2, u32 param3, u16 * param4) { NARC * v0 = NARC_ctor(param0, param3); if (v0) { - UnkStruct_0200AC5C v1; - UnkStruct_0200AC6C v2; + MessageBank v1; + MessageBankEntry v2; u16 * v3; u32 v4; - NARC_ReadFromMember(v0, param1, 0, sizeof(UnkStruct_0200AC5C), &v1); - NARC_ReadFromMember(v0, param1, inline_0200ACF0(param2), sizeof(UnkStruct_0200AC6C), &v2); + NARC_ReadFromMember(v0, param1, 0, sizeof(MessageBank), &v1); + NARC_ReadFromMember(v0, param1, inline_0200ACF0(param2), sizeof(MessageBankEntry), &v2); inline_0200AC6C(&v2, param2, v1.unk_02); @@ -109,15 +87,15 @@ void sub_0200ACF0 (u32 param0, u32 param1, u32 param2, u32 param3, u16 * param4) } } -static void sub_0200AD98 (u16 * param0, const u16 * param1, const UnkStruct_0200AC6C * param2) +static void sub_0200AD98 (u16 * param0, const u16 * param1, const MessageBankEntry * param2) { MI_CpuCopy16(param1, param0, param2->unk_04 * sizeof(u16)); } -void sub_0200ADAC (const UnkStruct_0200AC5C * param0, u32 param1, Strbuf *param2) +void MessageBank_GetStrbuf (const MessageBank * param0, u32 param1, Strbuf *param2) { if (param1 < param0->unk_00) { - UnkStruct_0200AC6C v0; + MessageBankEntry v0; u16 * v1; u32 v2; @@ -140,10 +118,10 @@ void sub_0200ADAC (const UnkStruct_0200AC5C * param0, u32 param1, Strbuf *param2 } } -Strbuf* sub_0200AE5C (const UnkStruct_0200AC5C * param0, u32 param1, u32 param2) +Strbuf* MessageBank_GetNewStrbuf (const MessageBank * param0, u32 param1, u32 param2) { if (param1 < param0->unk_00) { - UnkStruct_0200AC6C v0; + MessageBankEntry v0; u16 * v1; u32 v2; @@ -175,29 +153,29 @@ 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 MessageBank_GetStrbufFromNARC (u32 param0, u32 param1, u32 param2, u32 param3, Strbuf *param4) { NARC * v0; v0 = NARC_ctor(param0, param3); if (v0) { - sub_0200AF48(v0, param1, param2, param3, param4); + MessageBank_GetStrbufFromHandle(v0, param1, param2, param3, param4); NARC_dtor(v0); } } -void sub_0200AF48 (NARC * param0, u32 param1, u32 param2, u32 param3, Strbuf *param4) +void MessageBank_GetStrbufFromHandle (NARC * param0, u32 param1, u32 param2, u32 param3, Strbuf *param4) { - UnkStruct_0200AC5C v0; - UnkStruct_0200AC6C v1; + MessageBank v0; + MessageBankEntry v1; u16 * v2; u32 v3; - NARC_ReadFromMember(param0, param1, 0, sizeof(UnkStruct_0200AC5C), &v0); + NARC_ReadFromMember(param0, param1, 0, sizeof(MessageBank), &v0); if (param2 < v0.unk_00) { - NARC_ReadFromMember(param0, param1, inline_0200ACF0(param2), sizeof(UnkStruct_0200AC6C), &v1); + NARC_ReadFromMember(param0, param1, inline_0200ACF0(param2), sizeof(MessageBankEntry), &v1); inline_0200AC6C(&v1, param2, v0.unk_02); v3 = v1.unk_04 * sizeof(u16); @@ -215,7 +193,7 @@ void sub_0200AF48 (NARC * param0, u32 param1, u32 param2, u32 param3, Strbuf *pa } } -Strbuf* sub_0200B010 (u32 param0, u32 param1, u32 param2, u32 param3) +Strbuf* MessageBank_GetNewStrbufFromNARC (u32 param0, u32 param1, u32 param2, u32 param3) { NARC * v0; Strbuf* v1; @@ -223,7 +201,7 @@ Strbuf* sub_0200B010 (u32 param0, u32 param1, u32 param2, u32 param3) v0 = NARC_ctor(param0, param3); if (v0) { - v1 = sub_0200B044(v0, param1, param2, param3); + v1 = MessageBank_GetNewStrbufFromHandle(v0, param1, param2, param3); NARC_dtor(v0); } else { v1 = Strbuf_Init(4, param3); @@ -232,17 +210,17 @@ Strbuf* sub_0200B010 (u32 param0, u32 param1, u32 param2, u32 param3) return v1; } -Strbuf* sub_0200B044 (NARC * param0, u32 param1, u32 param2, u32 param3) +Strbuf* MessageBank_GetNewStrbufFromHandle (NARC * param0, u32 param1, u32 param2, u32 param3) { - UnkStruct_0200AC5C v0; + MessageBank v0; - NARC_ReadFromMember(param0, param1, 0, sizeof(UnkStruct_0200AC5C), &v0); + NARC_ReadFromMember(param0, param1, 0, sizeof(MessageBank), &v0); if (param2 < v0.unk_00) { - UnkStruct_0200AC6C v1; + MessageBankEntry v1; Strbuf* v2; - NARC_ReadFromMember(param0, param1, inline_0200ACF0(param2), sizeof(UnkStruct_0200AC6C), &v1); + NARC_ReadFromMember(param0, param1, inline_0200ACF0(param2), sizeof(MessageBankEntry), &v1); inline_0200AC6C(&v1, param2, v0.unk_02); v2 = Strbuf_Init(v1.unk_04, param3); @@ -269,26 +247,26 @@ Strbuf* sub_0200B044 (NARC * param0, u32 param1, u32 param2, u32 param3) } } -u32 sub_0200B120 (const UnkStruct_0200AC5C * param0) +u32 MessageBank_EntryCount (const MessageBank * param0) { return param0->unk_00; } -u32 sub_0200B124 (u32 param0, u32 param1) +u32 MessageBank_NARCEntryCount (u32 param0, u32 param1) { - UnkStruct_0200AC5C v0; + MessageBank v0; - NARC_ReadFromMemberByIndexPair(&v0, param0, param1, 0, sizeof(UnkStruct_0200AC5C)); + NARC_ReadFromMemberByIndexPair(&v0, param0, param1, 0, sizeof(MessageBank)); return v0.unk_00; } -UnkStruct_0200B144 * sub_0200B144 (int param0, u32 param1, u32 param2, u32 param3) +MessageLoader * MessageLoader_Init (int param0, u32 param1, u32 param2, u32 param3) { - UnkStruct_0200B144 * v0 = Heap_AllocFromHeapAtEnd(param3, sizeof(UnkStruct_0200B144)); + MessageLoader * v0 = Heap_AllocFromHeapAtEnd(param3, sizeof(MessageLoader)); if (v0) { if (param0 == 0) { - v0->unk_08_val1 = sub_0200AC5C(param1, param2, param3); + v0->unk_08_val1 = MessageBank_Load(param1, param2, param3); if (v0->unk_08_val1 == NULL) { Heap_FreeToHeap(v0); @@ -307,12 +285,12 @@ UnkStruct_0200B144 * sub_0200B144 (int param0, u32 param1, u32 param2, u32 param return v0; } -void sub_0200B190 (UnkStruct_0200B144 * param0) +void MessageLoader_Free (MessageLoader * param0) { if (param0) { switch (param0->unk_00) { case 0: - sub_0200AC64(param0->unk_08_val1); + MessageBank_Free(param0->unk_08_val1); break; case 1: NARC_dtor(param0->unk_08_val2); @@ -323,58 +301,58 @@ void sub_0200B190 (UnkStruct_0200B144 * param0) } } -void sub_0200B1B8 (const UnkStruct_0200B144 * param0, u32 param1, Strbuf *param2) +void MessageLoader_GetStrbuf (const MessageLoader * param0, u32 param1, Strbuf *param2) { switch (param0->unk_00) { case 0: - sub_0200ADAC(param0->unk_08_val1, param1, param2); + MessageBank_GetStrbuf(param0->unk_08_val1, param1, param2); break; case 1: - sub_0200AF48(param0->unk_08_val2, param0->unk_06, param1, param0->unk_02, param2); + MessageBank_GetStrbufFromHandle(param0->unk_08_val2, param0->unk_06, param1, param0->unk_02, param2); break; } } -Strbuf* sub_0200B1EC (const UnkStruct_0200B144 * param0, u32 param1) +Strbuf* MessageLoader_GetNewStrbuf (const MessageLoader * param0, u32 param1) { switch (param0->unk_00) { case 0: - return sub_0200AE5C(param0->unk_08_val1, param1, param0->unk_02); + return MessageBank_GetNewStrbuf(param0->unk_08_val1, param1, param0->unk_02); case 1: - return sub_0200B044(param0->unk_08_val2, param0->unk_06, param1, param0->unk_02); + return MessageBank_GetNewStrbufFromHandle(param0->unk_08_val2, param0->unk_06, param1, param0->unk_02); } return NULL; } -u32 sub_0200B218 (const UnkStruct_0200B144 * param0) +u32 MessageLoader_MessageCount (const MessageLoader * param0) { switch (param0->unk_00) { case 0: - return sub_0200B120(param0->unk_08_val1); + return MessageBank_EntryCount(param0->unk_08_val1); case 1: - return sub_0200B124(param0->unk_04, param0->unk_06); + return MessageBank_NARCEntryCount(param0->unk_04, param0->unk_06); } return 0; } -void sub_0200B240 (const UnkStruct_0200B144 * param0, u32 param1, u16 * param2) +void MessageLoader_Get (const MessageLoader * param0, u32 param1, u16 * param2) { switch (param0->unk_00) { case 0: - sub_0200AC6C(param0->unk_08_val1, param1, param2); + MessageBank_Get(param0->unk_08_val1, param1, param2); break; case 1: - sub_0200ACF0(param0->unk_04, param0->unk_06, param1, param0->unk_02, param2); + MessageBank_GetFromNARC(param0->unk_04, param0->unk_06, param1, param0->unk_02, param2); break; } } -void sub_0200B274 (u32 param0, u32 param1, u16 * param2) +void MessageLoader_GetSpeciesName (u32 param0, u32 param1, u16 * param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 412, param1); + MessageLoader * v0 = MessageLoader_Init(1, 26, 412, param1); - sub_0200B240(v0, 0 + param0, param2); - sub_0200B190(v0); + MessageLoader_Get(v0, 0 + param0, param2); + MessageLoader_Free(v0); } diff --git a/src/unk_0200B29C.c b/src/unk_0200B29C.c index 8cbe100180..cc70c55b35 100644 --- a/src/unk_0200B29C.c +++ b/src/unk_0200B29C.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "strbuf.h" @@ -10,7 +10,7 @@ #include "unk_0200B358.h" #include "strbuf.h" -Strbuf* sub_0200B29C (UnkStruct_0200B358 * param0, UnkStruct_0200B144 * param1, u32 param2, u32 param3) +Strbuf* sub_0200B29C (UnkStruct_0200B358 * param0, MessageLoader * param1, u32 param2, u32 param3) { Strbuf* v0 = NULL; Strbuf* v1; @@ -18,7 +18,7 @@ Strbuf* sub_0200B29C (UnkStruct_0200B358 * param0, UnkStruct_0200B144 * param1, v1 = Strbuf_Init(1024, 0); if (v1) { - Strbuf* v2 = sub_0200B1EC(param1, param2); + Strbuf* v2 = MessageLoader_GetNewStrbuf(param1, param2); if (v2) { sub_0200C388(param0, v1, v2); @@ -34,16 +34,16 @@ Strbuf* sub_0200B29C (UnkStruct_0200B358 * param0, UnkStruct_0200B144 * param1, Strbuf* sub_0200B2EC (u32 param0, u32 param1) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 647, param1); + MessageLoader * v0 = MessageLoader_Init(1, 26, 647, param1); if (v0) { Strbuf* v1 = Strbuf_Init(16, param1); if (v1) { - sub_0200B1B8(v0, param0, v1); + MessageLoader_GetStrbuf(v0, param0, v1); } - sub_0200B190(v0); + MessageLoader_Free(v0); return v1; } @@ -52,12 +52,12 @@ Strbuf* sub_0200B2EC (u32 param0, u32 param1) Strbuf* sub_0200B32C (u32 param0, u32 param1) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 412, param1); + MessageLoader * v0 = MessageLoader_Init(1, 26, 412, param1); if (v0) { - Strbuf* v1 = sub_0200B1EC(v0, param0); + Strbuf* v1 = MessageLoader_GetNewStrbuf(v0, param0); - sub_0200B190(v0); + MessageLoader_Free(v0); return v1; } diff --git a/src/unk_0200B358.c b/src/unk_0200B358.c index 66e583c06e..27c10dc8d9 100644 --- a/src/unk_0200B358.c +++ b/src/unk_0200B358.c @@ -5,8 +5,6 @@ #include "constants/pokemon.h" -#include "struct_decls/struct_0200B144_decl.h" -#include "strbuf.h" #include "struct_decls/struct_02025E6C_decl.h" #include "struct_decls/struct_0202B4A0_decl.h" #include "struct_defs/box_pokemon.h" @@ -191,31 +189,31 @@ void sub_0200B4BC (UnkStruct_0200B358 * param0, u32 param1, const UnkStruct_021C void sub_0200B4E4 (UnkStruct_0200B358 * param0, u32 param1, const UnkStruct_021C0794 * param2) { const UnkStruct_02025E6C * v0 = sub_02025E38((UnkStruct_021C0794 *)param2); - UnkStruct_0200B144 * v1; + MessageLoader * v1; - v1 = sub_0200B144(1, 26, 553, param0->unk_04); + v1 = MessageLoader_Init(1, 26, 553, param0->unk_04); if (sub_02025F30(v0) == 0) { - sub_0200B1B8(v1, 1, param0->unk_0C); + MessageLoader_GetStrbuf(v1, 1, param0->unk_0C); } else { - sub_0200B1B8(v1, 0, param0->unk_0C); + MessageLoader_GetStrbuf(v1, 0, param0->unk_0C); } sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v1); + MessageLoader_Free(v1); } void sub_0200B538 (UnkStruct_0200B358 * param0, u32 param1, BoxPokemon * param2) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; u32 v1; - v0 = sub_0200B144(1, 26, 412, param0->unk_04); + v0 = MessageLoader_Init(1, 26, 412, param0->unk_04); v1 = sub_02074570(param2, MON_DATA_SPECIES, NULL); - sub_0200B1B8(v0, v1, param0->unk_0C); + MessageLoader_GetStrbuf(v0, v1, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } void sub_0200B578 (UnkStruct_0200B358 * param0, u32 param1, BoxPokemon * param2) @@ -228,13 +226,13 @@ void sub_0200B578 (UnkStruct_0200B358 * param0, u32 param1, BoxPokemon * param2) void sub_0200B594 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; - v0 = sub_0200B144(1, 26, 413, param0->unk_04); + v0 = MessageLoader_Init(1, 26, 413, param0->unk_04); - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } void sub_0200B5CC (UnkStruct_0200B358 * param0, u32 param1, BoxPokemon * param2) @@ -257,216 +255,216 @@ void sub_0200B60C (UnkStruct_0200B358 * param0, u32 param1, s32 param2, u32 para void sub_0200B630 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 647, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 647, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200B668 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 535, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 535, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200B6A0 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 610, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 610, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200B6D8 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; - v0 = sub_0200B144(1, 26, 202, param0->unk_04); + v0 = MessageLoader_Init(1, 26, 202, param0->unk_04); - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } void sub_0200B70C (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 392, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 392, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200B744 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 393, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 393, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200B77C (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 394, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 394, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200B7B4 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 396, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 396, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200B7EC (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 624, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 624, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200B824 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 551, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 551, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200B85C (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 219, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 219, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200B890 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 606, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 606, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200B8C8 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 433, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 433, param0->unk_04); if (v0) { - if ((param2 == 0) || (param2 >= sub_0200B218(v0))) { - sub_0200B190(v0); - v0 = sub_0200B144(1, 26, 434, param0->unk_04); + if ((param2 == 0) || (param2 >= MessageLoader_MessageCount(v0))) { + MessageLoader_Free(v0); + v0 = MessageLoader_Init(1, 26, 434, param0->unk_04); param2 = 2; } - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200B928 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 457, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 457, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200B960 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 619, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 619, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200B998 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 620, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 620, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200B9D0 (UnkStruct_0200B358 * param0, u32 param1, TrainerData * param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 619, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 619, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2->class, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2->class, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200BA08 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 618, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 618, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200BA40 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 21, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 21, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } @@ -478,144 +476,144 @@ void sub_0200BA74 (UnkStruct_0200B358 * param0, u32 param1, TrainerData * param2 void sub_0200BA94 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 628, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 628, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200BACC (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 629, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 629, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200BB04 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 630, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 630, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200BB3C (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 631, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 631, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200BB74 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 207, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 207, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200BBA8 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 204, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 204, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200BBDC (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 204, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 204, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200BC10 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 633, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 633, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200BC48 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 632, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 632, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200BC80 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 626, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 626, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200BCB8 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 627, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 627, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200BCF0 (UnkStruct_0200B358 * param0, u32 param1, u8 param2) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; - v0 = sub_0200B144(1, 26, 213, param0->unk_04); + v0 = MessageLoader_Init(1, 26, 213, param0->unk_04); switch (param2) { case 0: - sub_0200B1B8(v0, 68, param0->unk_0C); + MessageLoader_GetStrbuf(v0, 68, param0->unk_0C); break; case 1: - sub_0200B1B8(v0, 69, param0->unk_0C); + MessageLoader_GetStrbuf(v0, 69, param0->unk_0C); break; default: Strbuf_Clear(param0->unk_0C); } sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } void sub_0200BD40 (UnkStruct_0200B358 * param0, u32 param1, const UnkStruct_020797DC * param2, u32 param3) @@ -626,34 +624,34 @@ void sub_0200BD40 (UnkStruct_0200B358 * param0, u32 param1, const UnkStruct_0207 void sub_0200BD60 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 378, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 378, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200BD98 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 608, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 608, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200BDD0 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 694, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 694, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } @@ -665,12 +663,12 @@ void sub_0200BE08 (UnkStruct_0200B358 * param0, u32 param1, u32 param2, u32 para if (v0) { if (param3) { - UnkStruct_0200B144 * v1 = sub_0200B144(1, 26, v0, param0->unk_04); + MessageLoader * v1 = MessageLoader_Init(1, 26, v0, param0->unk_04); if (v1) { - sub_0200B1B8(v1, param3, param0->unk_0C); + MessageLoader_GetStrbuf(v1, param3, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v1); + MessageLoader_Free(v1); } } } @@ -684,23 +682,23 @@ void sub_0200BE48 (UnkStruct_0200B358 * param0, u32 param1, u16 param2) void sub_0200BE64 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 12, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 12, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200BE98 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 13, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 13, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } @@ -711,21 +709,21 @@ void sub_0200BECC (UnkStruct_0200B358 * param0, u32 param1, u32 param2) }; int v1; int v2; - UnkStruct_0200B144 * v3; + MessageLoader * v3; v1 = sub_02017038(param2); v2 = sub_02017058(param2); - v3 = sub_0200B144(1, 26, v0[v1], param0->unk_04); + v3 = MessageLoader_Init(1, 26, v0[v1], param0->unk_04); if (v3) { - if ((v2 < sub_0200B218(v3)) && (!((v1 == 0) && (v2 == 0)))) { - sub_0200B1B8(v3, v2, param0->unk_0C); + if ((v2 < MessageLoader_MessageCount(v3)) && (!((v1 == 0) && (v2 == 0)))) { + MessageLoader_GetStrbuf(v3, v2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v3); + MessageLoader_Free(v3); } else { u32 v4, v5; - sub_0200B190(v3); + MessageLoader_Free(v3); if ((v1 == 0) && (v2 == 0)) { v4 = v0[1]; @@ -735,12 +733,12 @@ void sub_0200BECC (UnkStruct_0200B358 * param0, u32 param1, u32 param2) v5 = 2; } - v3 = sub_0200B144(1, 26, v4, param0->unk_04); + v3 = MessageLoader_Init(1, 26, v4, param0->unk_04); if (v3) { - sub_0200B1B8(v3, v5, param0->unk_0C); + MessageLoader_GetStrbuf(v3, v5, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v3); + MessageLoader_Free(v3); } } } @@ -748,45 +746,45 @@ void sub_0200BECC (UnkStruct_0200B358 * param0, u32 param1, u32 param2) void sub_0200BF74 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 465, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 465, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200BFAC (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 386, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 386, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200BFE4 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 387, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 387, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200C01C (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 388, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 388, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } @@ -807,126 +805,126 @@ void sub_0200C054 (UnkStruct_0200B358 * param0, UnkStruct_021C0794 * param1, int void sub_0200C0B0 (UnkStruct_0200B358 * param0, u32 param1, UnkEnum_ov66_022324D0 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 651, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 651, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200C0E8 (UnkStruct_0200B358 * param0, u32 param1, int param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 649, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 649, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200C120 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 652, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 652, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200C158 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 667, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 667, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200C190 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 663, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 663, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200C1C8 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 664, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 664, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200C200 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 666, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 666, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200C238 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 665, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 665, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200C270 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 668, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 668, param0->unk_04); if (v0) { - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } void sub_0200C2A8 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; - v0 = sub_0200B144(1, 26, 371, param0->unk_04); + v0 = MessageLoader_Init(1, 26, 371, param0->unk_04); - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } void sub_0200C2E0 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 414, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 414, param0->unk_04); if (v0) { if ((param2 < 1) || (param2 > 12)) { param2 = 1; } - sub_0200B1B8(v0, param2 - 1 + 0, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2 - 1 + 0, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } @@ -937,7 +935,7 @@ void sub_0200C324 (UnkStruct_0200B358 * param0, u32 param1) void sub_0200C338 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 361, param0->unk_04); + MessageLoader * v0 = MessageLoader_Init(1, 26, 361, param0->unk_04); GF_ASSERT(param2 <= 5); @@ -948,9 +946,9 @@ void sub_0200C338 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) param2 += 115; } - sub_0200B1B8(v0, param2, param0->unk_0C); + MessageLoader_GetStrbuf(v0, param2, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); } } diff --git a/src/unk_02013A04.c b/src/unk_02013A04.c index 5616d83b4a..c09a15e26a 100644 --- a/src/unk_02013A04.c +++ b/src/unk_02013A04.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02013A04_decl.h" #include "strbuf.h" @@ -39,14 +39,14 @@ void sub_02013A3C (UnkStruct_02013A04 * param0) Heap_FreeToHeap(param0); } -void sub_02013A4C (UnkStruct_02013A04 * param0, const UnkStruct_0200B144 * param1, u32 param2, u32 param3) +void sub_02013A4C (UnkStruct_02013A04 * param0, const MessageLoader * param1, u32 param2, u32 param3) { u32 v0; param0 = sub_02013AAC(param0, &v0); if (param0) { - param0->unk_00 = sub_0200B1EC(param1, param2); + param0->unk_00 = MessageLoader_GetNewStrbuf(param1, param2); param0->unk_04 = param3; } } diff --git a/src/unk_02014A84.c b/src/unk_02014A84.c index b379cb6b3b..ad4a82025e 100644 --- a/src/unk_02014A84.c +++ b/src/unk_02014A84.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "strbuf.h" @@ -92,7 +92,7 @@ Strbuf* sub_02014B34 (const UnkStruct_02014A84 * param0, u32 param1) { Strbuf* v0; UnkStruct_0200B358 * v1; - UnkStruct_0200B144 * v2; + MessageLoader * v2; int v3; v1 = sub_0200B358(param1); @@ -105,10 +105,10 @@ Strbuf* sub_02014B34 (const UnkStruct_02014A84 * param0, u32 param1) } } - v2 = sub_0200B144(1, 26, Unk_020E5498[param0->unk_00], param1); + v2 = MessageLoader_Init(1, 26, Unk_020E5498[param0->unk_00], param1); v0 = sub_0200B29C(v1, v2, param0->unk_02, param1); - sub_0200B190(v2); + MessageLoader_Free(v2); sub_0200B3F0(v1); return v0; @@ -116,7 +116,7 @@ Strbuf* sub_02014B34 (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); + return MessageBank_GetNewStrbufFromNARC(26, Unk_020E5498[param0->unk_00], param0->unk_02, param1); } BOOL sub_02014BBC (const UnkStruct_02014A84 * param0) @@ -148,7 +148,7 @@ static u32 sub_02014C00 (u32 param0, u32 param1) GF_ASSERT(param0 < 5); GF_ASSERT(param1 < sub_02014CD4(param0)); - v0 = sub_0200B010(26, Unk_020E5498[param0], param1, 0); + v0 = MessageBank_GetNewStrbufFromNARC(26, Unk_020E5498[param0], param1, 0); v1 = Strbuf_GetData(v0); v2 = 0; diff --git a/src/unk_02014D38.c b/src/unk_02014D38.c index ad1604ed60..66982a8344 100644 --- a/src/unk_02014D38.c +++ b/src/unk_02014D38.c @@ -1,8 +1,6 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" -#include "strbuf.h" #include "struct_decls/struct_021C0794_decl.h" #include "unk_02006E3C.h" @@ -123,7 +121,7 @@ static const struct { typedef struct UnkStruct_02014D38_t { u32 unk_00; - UnkStruct_0200B144 * unk_04[11]; + MessageLoader * unk_04[11]; } UnkStruct_02014D38; typedef struct UnkStruct_02014EC4_t { @@ -151,7 +149,7 @@ UnkStruct_02014D38 * sub_02014D38 (u32 param0) for (v0 = 0; v0 < 11; v0++) { v1->unk_00 = param0; - v1->unk_04[v0] = sub_0200B144(1, 26, Unk_020E550C[v0], param0); + v1->unk_04[v0] = MessageLoader_Init(1, 26, Unk_020E550C[v0], param0); } return v1; @@ -162,7 +160,7 @@ void sub_02014D70 (UnkStruct_02014D38 * param0) int v0; for (v0 = 0; v0 < 11; v0++) { - sub_0200B190(param0->unk_04[v0]); + MessageLoader_Free(param0->unk_04[v0]); } Heap_FreeToHeap(param0); @@ -173,7 +171,7 @@ void sub_02014D90 (UnkStruct_02014D38 * param0, u16 param1, Strbuf *param2) u32 v0, v1; sub_02014E4C(param1, &v0, &v1); - sub_0200B1B8(param0->unk_04[v0], v1, param2); + MessageLoader_GetStrbuf(param0->unk_04[v0], v1, param2); } void sub_02014DB8 (u16 param0, Strbuf *param1) @@ -183,7 +181,7 @@ void sub_02014DB8 (u16 param0, Strbuf *param1) sub_02014E4C(param0, &v0, &v1); v0 = Unk_020E550C[v0]; - sub_0200AF20(26, v0, v1, 0, param1); + MessageBank_GetStrbufFromNARC(26, v0, v1, 0, param1); } else { Strbuf_Clear(param1); } diff --git a/src/unk_020158A8.c b/src/unk_020158A8.c index 2f9ff8c086..80600c21c7 100644 --- a/src/unk_020158A8.c +++ b/src/unk_020158A8.c @@ -18,11 +18,11 @@ UnkStruct_020158A8 * sub_020158A8 (int param0) v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_020158A8)); MI_CpuClear8(v0, sizeof(UnkStruct_020158A8)); - v0->unk_00 = sub_0200B144(0, 26, 465, param0); + v0->unk_00 = MessageLoader_Init(0, 26, 465, param0); for (v1 = 0; v1 < 29; v1++) { v0->unk_04[v1] = Strbuf_Init(22, param0); - sub_0200B1B8(v0->unk_00, v1, v0->unk_04[v1]); + MessageLoader_GetStrbuf(v0->unk_00, v1, v0->unk_04[v1]); } return v0; @@ -36,7 +36,7 @@ void sub_020158F4 (UnkStruct_020158A8 * param0) Strbuf_Free(param0->unk_04[v0]); } - sub_0200B190(param0->unk_00); + MessageLoader_Free(param0->unk_00); Heap_FreeToHeap(param0); } diff --git a/src/unk_02026150.c b/src/unk_02026150.c index 0820cb95ce..3d02997d34 100644 --- a/src/unk_02026150.c +++ b/src/unk_02026150.c @@ -1,8 +1,6 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" -#include "strbuf.h" #include "struct_decls/struct_02026030_decl.h" #include "struct_decls/struct_021C0794_decl.h" @@ -14,6 +12,7 @@ #include "unk_020244AC.h" #include "unk_0202602C.h" #include "unk_02026150.h" +#include "strbuf.h" UnkStruct_0202610C Unk_02100880[] = { { @@ -111,13 +110,13 @@ const UnkStruct_0202610C * sub_02026150 (UnkStruct_021C0794 * param0, int param1 void sub_0202616C (UnkStruct_021C0794 * param0, int param1, Strbuf *param2, int param3) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; UnkStruct_02026030 * v1 = NULL; if (param1 < NELEMS(Unk_02100880)) { - v0 = sub_0200B144(0, 26, 353, param3); - sub_0200B1B8(v0, 70 + param1, param2); - sub_0200B190(v0); + v0 = MessageLoader_Init(0, 26, 353, param3); + MessageLoader_GetStrbuf(v0, 70 + param1, param2); + MessageLoader_Free(v0); } else { sub_0202604C(sub_0202610C(param0, 0), param2); } diff --git a/src/unk_0202D05C.c b/src/unk_0202D05C.c index febcb6bd96..7ac662ed23 100644 --- a/src/unk_0202D05C.c +++ b/src/unk_0202D05C.c @@ -3,7 +3,7 @@ #include "inlines.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_021C0794_decl.h" #include "struct_defs/struct_02014A84.h" @@ -495,7 +495,7 @@ void sub_0202D63C (UnkStruct_0202D764 * param0, UnkStruct_ov104_0223A348 * param UnkStruct_ov104_0223A348_sub1 * v0; UnkStruct_ov104_0223A348_sub2 * v1; UnkStruct_0202D63C * v2; - UnkStruct_0200B144 * v3; + MessageLoader * v3; v0 = &(param1->unk_00); v1 = param1->unk_30; @@ -505,10 +505,10 @@ void sub_0202D63C (UnkStruct_0202D764 * param0, UnkStruct_ov104_0223A348 * param v0->unk_04 = v2->unk_C9; if (v2->unk_C8_val1_unk_00_0) { - v3 = sub_0200B144(0, 26, 22, 11); + v3 = MessageLoader_Init(0, 26, 22, 11); - sub_0200B240(v3, 22 + v2->unk_C8_val1_unk_00_1, v0->unk_08); - sub_0200B190(v3); + MessageLoader_Get(v3, 22 + v2->unk_C8_val1_unk_00_1, v0->unk_08); + MessageLoader_Free(v3); } else { MI_CpuCopy8(v2->unk_A8, v0->unk_08, 16); } diff --git a/src/unk_02039814.c b/src/unk_02039814.c index a97c969f96..9cea1cf2f3 100644 --- a/src/unk_02039814.c +++ b/src/unk_02039814.c @@ -3,7 +3,7 @@ #include "data_021BF67C.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" @@ -86,7 +86,7 @@ void sub_02039834 (int param0, int param1, int param2) { UnkStruct_02018340 * v0; UnkStruct_0205AA50 v1; - UnkStruct_0200B144 * v2; + MessageLoader * v2; Strbuf* v3; Strbuf* v4; UnkStruct_0200B358 * v5; @@ -153,7 +153,7 @@ void sub_02039834 (int param0, int param1, int param2) sub_0201975C(0, 0x6c21); sub_0201975C(4, 0x6c21); - v2 = sub_0200B144(1, 26, 214, param0); + v2 = MessageLoader_Init(1, 26, 214, param0); v3 = Strbuf_Init(0x180, param0); v4 = Strbuf_Init(0x180, param0); sub_0201D710(); @@ -164,7 +164,7 @@ void sub_02039834 (int param0, int param1, int param2) sub_0200DC48(&v1, 0, (512 - 9), 2); sub_0200B60C(v5, 0, param2, 5, 2, 1); - sub_0200B1B8(v2, v6, v4); + MessageLoader_GetStrbuf(v2, v6, v4); sub_0200C388(v5, v3, v4); sub_0201D738(&v1, 0, v3, 0, 0, 0, NULL); @@ -176,7 +176,7 @@ void sub_02039834 (int param0, int param1, int param2) sub_0200AB4C(0, (GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD), 3); sub_0201A8FC(&v1); - sub_0200B190(v2); + MessageLoader_Free(v2); sub_0200B3F0(v5); Heap_FreeToHeap(v0); } diff --git a/src/unk_02039A64.c b/src/unk_02039A64.c index a36cbbb0f4..51b09559b9 100644 --- a/src/unk_02039A64.c +++ b/src/unk_02039A64.c @@ -3,7 +3,7 @@ #include "data_021BF67C.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" @@ -80,7 +80,7 @@ void sub_02039A64 (int param0, int param1) { UnkStruct_02018340 * v0; UnkStruct_0205AA50 v1; - UnkStruct_0200B144 * v2; + MessageLoader * v2; Strbuf* v3; int v4; @@ -116,14 +116,14 @@ void sub_02039A64 (int param0, int param1) sub_0201975C(0, 0x6c21); sub_0201975C(4, 0x6c21); - v2 = sub_0200B144(1, 26, 695, param0); + v2 = MessageLoader_Init(1, 26, 695, param0); v3 = Strbuf_Init(0x180, param0); sub_0201D710(); sub_0201A8D4(v0, &v1, &Unk_020E5F48); sub_0201AE78(&v1, 15, 0, 0, 26 * 8, 18 * 8); sub_0200DC48(&v1, 0, (512 - 9), 2); - sub_0200B1B8(v2, v4, v3); + MessageLoader_GetStrbuf(v2, v4, v3); sub_0201D738(&v1, 0, v3, 0, 0, 0, NULL); Strbuf_Free(v3); GXLayers_TurnBothDispOn(); @@ -144,7 +144,7 @@ void sub_02039A64 (int param0, int param1) } sub_0201A8FC(&v1); - sub_0200B190(v2); + MessageLoader_Free(v2); sub_02019120(0, 0); sub_02019120(1, 0); diff --git a/src/unk_0203A9C8.c b/src/unk_0203A9C8.c index f5df88e099..8efa1074e7 100644 --- a/src/unk_0203A9C8.c +++ b/src/unk_0203A9C8.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "strbuf.h" @@ -512,7 +512,7 @@ static void sub_0203ADFC (UnkStruct_020508D4 * param0) { UnkStruct_0203CDB0 * v0; UnkStruct_020708E0 * v1; - UnkStruct_0200B144 * v2; + MessageLoader * v2; UnkStruct_02081CF4 v3; u32 v4, v5; @@ -524,7 +524,7 @@ static void sub_0203ADFC (UnkStruct_020508D4 * param0) sub_0200DAA4(v0->unk_08, 3, 1024 - (18 + 12) - 9, 11, 1, 11); sub_0200DC48(&v1->unk_00, 1, 1024 - (18 + 12) - 9, 11); - v2 = sub_0200B144(0, 26, 367, 11); + v2 = MessageLoader_Init(0, 26, 367, 11); v1->unk_24 = sub_02013A04(v5, 11); v1->unk_28 = 0; @@ -537,7 +537,7 @@ static void sub_0203ADFC (UnkStruct_020508D4 * param0) v6 = sub_0200B358(11); v7 = Strbuf_Init(8, 11); - v8 = sub_0200B1EC(v2, Unk_020EA05C[v1->unk_30[v4]][0]); + v8 = MessageLoader_GetNewStrbuf(v2, Unk_020EA05C[v1->unk_30[v4]][0]); sub_0200B498(v6, 0, sub_02025E38(v0->unk_0C)); sub_0200C388(v6, v7, v8); @@ -556,7 +556,7 @@ static void sub_0203ADFC (UnkStruct_020508D4 * param0) } v0->unk_90 = v1->unk_30[v1->unk_28]; - sub_0200B190(v2); + MessageLoader_Free(v2); v3.unk_00 = v1->unk_24; v3.unk_04 = &v1->unk_00; @@ -643,7 +643,7 @@ static void sub_0203B094 (UnkStruct_020508D4 * param0) { UnkStruct_0203CDB0 * v0; UnkStruct_020708E0 * v1; - UnkStruct_0200B144 * v2; + MessageLoader * v2; UnkStruct_0200B358 * v3; Strbuf* v4; Strbuf* v5; @@ -665,12 +665,12 @@ static void sub_0203B094 (UnkStruct_020508D4 * param0) sub_0200DC48(&v1->unk_10, 1, 1024 - (18 + 12) - 9, 11); sub_0201ADA4(&v1->unk_10, 15); - v2 = sub_0200B144(0, 26, 367, 11); + v2 = MessageLoader_Init(0, 26, 367, 11); if (v6 == 0) { - v5 = sub_0200B1EC(v2, 9); + v5 = MessageLoader_GetNewStrbuf(v2, 9); } else { - v5 = sub_0200B1EC(v2, 10); + v5 = MessageLoader_GetNewStrbuf(v2, 10); } sub_0201D738(&v1->unk_10, 0, v5, 0, 0, 0xff, NULL); @@ -678,7 +678,7 @@ static void sub_0203B094 (UnkStruct_020508D4 * param0) v3 = sub_0200B358(11); v4 = Strbuf_Init(32, 11); - v5 = sub_0200B1EC(v2, 11); + v5 = MessageLoader_GetNewStrbuf(v2, 11); if (v6 == 0) { u16 * v7 = sub_0203A784(sub_0203A790(v0->unk_0C)); @@ -695,7 +695,7 @@ static void sub_0203B094 (UnkStruct_020508D4 * param0) Strbuf_Free(v4); Strbuf_Free(v5); sub_0200B3F0(v3); - sub_0200B190(v2); + MessageLoader_Free(v2); sub_0201A9A4(&v1->unk_10); } diff --git a/src/unk_0203E880.c b/src/unk_0203E880.c index 7b9509d303..da1f3620ad 100644 --- a/src/unk_0203E880.c +++ b/src/unk_0203E880.c @@ -516,7 +516,7 @@ static UnkStruct_0203EF60 * sub_0203EA28 () static void sub_0203EA50 (UnkStruct_0203E724 * param0) { - sub_0200B190(param0->unk_2C); + MessageLoader_Free(param0->unk_2C); Heap_FreeToHeap(param0->unk_30); Heap_FreeToHeap(param0); @@ -683,7 +683,7 @@ static void sub_0203EF14 (UnkStruct_0203CDB0 * param0, UnkStruct_0203E724 * para u8 * v0 = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__SCRIPT__SCR_SEQ, param2, 11); param1->unk_30 = (u8 *)v0; - param1->unk_2C = sub_0200B144(1, 26, param3, 11); + param1->unk_2C = MessageLoader_Init(1, 26, param3, 11); return; } @@ -693,7 +693,7 @@ static void sub_0203EF38 (UnkStruct_0203CDB0 * param0, UnkStruct_0203E724 * para u8 * v0 = sub_0203F0FC(param0->unk_1C->unk_00); param1->unk_30 = (u8 *)v0; - param1->unk_2C = sub_0200B144(1, 26, sub_0203F110(param0->unk_1C->unk_00), 11); + param1->unk_2C = MessageLoader_Init(1, 26, sub_0203F110(param0->unk_1C->unk_00), 11); return; } diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c index 4d91b382a6..bfd25726e0 100644 --- a/src/unk_0203F6C4.c +++ b/src/unk_0203F6C4.c @@ -5,7 +5,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02014EC4_decl.h" #include "struct_decls/struct_0201CD38_decl.h" @@ -2147,28 +2147,28 @@ static BOOL sub_0203FD5C (UnkStruct_0203E724 * param0) static BOOL sub_0203FD70 (UnkStruct_0203E724 * param0) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; u16 v1 = inline_02049538(param0); u16 v2 = inline_02049538(param0); - v0 = sub_0200B144(1, 26, v1, 32); + v0 = MessageLoader_Init(1, 26, v1, 32); ov5_021DD498(param0, v0, v2); - sub_0200B190(v0); + MessageLoader_Free(v0); return 0; } static BOOL sub_0203FDBC (UnkStruct_0203E724 * param0) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; u16 v1 = inline_02049538(param0); u16 v2 = inline_02049538(param0); - v0 = sub_0200B144(1, 26, v1, 32); + v0 = MessageLoader_Init(1, 26, v1, 32); ov5_021DD444(param0, v0, v2, 1, NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); sub_0203E764(param0, sub_02040014); return 1; @@ -2202,7 +2202,7 @@ static BOOL sub_0203FEAC (UnkStruct_0203E724 * param0) { u16 * v0; UnkStruct_0204AFC4 * v1; - UnkStruct_0200B144 * v2; + MessageLoader * v2; u16 v3 = (*((param0)->unk_08++)); v1 = param0->unk_34->unk_AC; @@ -2214,9 +2214,9 @@ static BOOL sub_0203FEAC (UnkStruct_0203E724 * param0) v0 = v1->unk_78[v3].unk_00.unk_18; if (v0[0] == 0xFFFF) { - v2 = sub_0200B144(1, 26, 613, 32); + v2 = MessageLoader_Init(1, 26, 613, 32); ov5_021DD444(param0, v2, v0[1], 1, NULL); - sub_0200B190(v2); + MessageLoader_Free(v2); } else { ov5_021DD4CC(param0, v0[0], v0[1], v0[2], v0[3], 1); } @@ -2559,7 +2559,7 @@ static BOOL sub_020404A4 (UnkStruct_0203E724 * param0) ov5_021E1B40(v0->unk_64, 1); ov5_021E1B68(v0); - sub_0200B1B8(param0->unk_2C, v7, *v1); + MessageLoader_GetStrbuf(param0->unk_2C, v7, *v1); sub_0200C388(*v3, *v2, *v1); sub_0201D738(ov5_021E1B50(v0->unk_64), 1, *v2, 0, 0, 0, NULL); @@ -2628,7 +2628,7 @@ static BOOL sub_020405DC (UnkStruct_0203E724 * param0) u8 v5 = (*((param0)->unk_08++)); u16 v6 = sub_0203E838(param0); - sub_0200B1B8(param0->unk_2C, v5, *v2); + MessageLoader_GetStrbuf(param0->unk_2C, v5, *v2); sub_0200C388(*v4, *v3, *v2); *v1 = sub_0205D994(ov5_021E1B50(v0->unk_64), *v3, sub_02025E44(param0->unk_34->unk_0C), 1); @@ -7761,7 +7761,7 @@ static BOOL sub_02045F48 (UnkStruct_0203E724 * param0) u16 v4 = inline_02049538(param0); u16 v5 = inline_02049538(param0); UnkStruct_0200B358 * v6 = sub_0200B358(32); - UnkStruct_0200B144 * v7 = sub_0200B144(0, 26, 372, 32); + MessageLoader * v7 = MessageLoader_Init(0, 26, 372, 32); Strbuf* v8; Strbuf* v9; @@ -7771,12 +7771,12 @@ static BOOL sub_02045F48 (UnkStruct_0203E724 * param0) sub_0200BE48(v6, 3, v5); v8 = sub_0200B29C(v6, v7, 1, 32); - v9 = sub_0200B1EC(v7, 0); + v9 = MessageLoader_GetNewStrbuf(v7, 0); *v1 = (Strbuf_Compare(v8, v9) == 0); Strbuf_Free(v8); Strbuf_Free(v9); - sub_0200B190(v7); + MessageLoader_Free(v7); sub_0200B3F0(v6); return 0; diff --git a/src/unk_020474B8.c b/src/unk_020474B8.c index c8d1f050e3..aff98caef9 100644 --- a/src/unk_020474B8.c +++ b/src/unk_020474B8.c @@ -3,7 +3,7 @@ #include "inlines.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "strbuf.h" #include "struct_decls/struct_02025E6C_decl.h" @@ -288,13 +288,13 @@ BOOL sub_02047930 (UnkStruct_0203E724 * param0) static Strbuf* sub_02047998 (u16 param0, u32 param1) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; Strbuf* v1; - v0 = sub_0200B144(1, 26, 412, param1); - v1 = sub_0200B1EC(v0, param0); + v0 = MessageLoader_Init(1, 26, 412, param1); + v1 = MessageLoader_GetNewStrbuf(v0, param0); - sub_0200B190(v0); + MessageLoader_Free(v0); return v1; } diff --git a/src/unk_02048DD8.c b/src/unk_02048DD8.c index 980b217dd6..b12cde81b0 100644 --- a/src/unk_02048DD8.c +++ b/src/unk_02048DD8.c @@ -307,7 +307,7 @@ static void sub_020492A0 (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * para UnkStruct_0202440C * v1 = sub_0202440C(param0->unk_0C); UnkStruct_0202E7E4 * v2 = sub_0202E7E4(v1); - sub_0200B274(v2->unk_02, 4, v0); + MessageLoader_GetSpeciesName(v2->unk_02, 4, v0); sub_0204922C(param1, 0, v0, 0, GAME_LANGUAGE, 1); } @@ -317,7 +317,7 @@ static void sub_020492D4 (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * para UnkStruct_0202440C * v1 = sub_0202440C(param0->unk_0C); UnkStruct_0202E810 * v2 = sub_0202E810(v1); - sub_0200B274(v2->unk_02, 4, v0); + MessageLoader_GetSpeciesName(v2->unk_02, 4, v0); sub_0204922C(param1, 0, v0, 0, GAME_LANGUAGE, 1); } diff --git a/src/unk_0204AEE8.c b/src/unk_0204AEE8.c index e298e042dd..79cfcaf738 100644 --- a/src/unk_0204AEE8.c +++ b/src/unk_0204AEE8.c @@ -3,7 +3,7 @@ #include "assert.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "strbuf.h" #include "struct_decls/struct_02025E6C_decl.h" @@ -112,12 +112,12 @@ UnkStruct_0200B358 * sub_0204AEE8 (UnkStruct_021C0794 * param0, u16 param1, u16 Strbuf* v2, * v3; UnkStruct_02026324 * v4; UnkStruct_0200B358 * v5; - UnkStruct_0200B144 * v6; + MessageLoader * v6; v2 = Strbuf_Init(12 + 2, 4); v3 = Strbuf_Init(2, 4); v4 = sub_02027560(param0); - v6 = sub_0200B144(1, 26, 412, 4); + v6 = MessageLoader_Init(1, 26, 412, 4); v5 = sub_0200B368(18 + 1, 12 + 2, 4); sub_0200B60C(v5, 0, param1, 1, 0, 1); @@ -126,13 +126,13 @@ UnkStruct_0200B358 * sub_0204AEE8 (UnkStruct_021C0794 * param0, u16 param1, u16 v1 = sub_02078824(v0); if (sub_02026FE8(v4, v1)) { - sub_0200B1B8(v6, v1, v2); + MessageLoader_GetStrbuf(v6, v1, v2); sub_0200B48C(v5, (*param4) + 1, v2, param2, param3, GAME_LANGUAGE); (*param4)++; } } - sub_0200B190(v6); + MessageLoader_Free(v6); Strbuf_Free(v3); Strbuf_Free(v2); @@ -282,7 +282,7 @@ u16 sub_0204B0F0 (UnkStruct_0204AFC4 * param0, u8 param1, u8 param2, int param3) static UnkStruct_0204B184 * sub_0204B184 (UnkStruct_ov104_0223A348 * param0, u16 param1, int param2) { UnkStruct_0204B184 * v0; - UnkStruct_0200B144 * v1 = sub_0200B144(1, 26, 21, param2); + MessageLoader * v1 = MessageLoader_Init(1, 26, 21, param2); Strbuf* v2; MI_CpuClear8(param0, sizeof(UnkStruct_ov104_0223A348)); @@ -294,11 +294,11 @@ static UnkStruct_0204B184 * sub_0204B184 (UnkStruct_ov104_0223A348 * param0, u16 param0->unk_00.unk_18[1] = param1 * 3; param0->unk_00.unk_04 = v0->unk_00; - v2 = sub_0200B1EC(v1, param1); + v2 = MessageLoader_GetNewStrbuf(v1, param1); Strbuf_ToChars(v2, ¶m0->unk_00.unk_08[0], 8); Strbuf_Free(v2); - sub_0200B190(v1); + MessageLoader_Free(v1); return v0; } @@ -396,7 +396,7 @@ static u32 sub_0204B1E8 (UnkStruct_0204AFC4 * param0, UnkStruct_ov104_0223A348_s } param1->unk_21 = v3; - sub_0200B274(param1->unk_00_val1_0, param8, &(param1->unk_22[0])); + MessageLoader_GetSpeciesName(param1->unk_00_val1_0, param8, &(param1->unk_22[0])); return v2; } diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c index 750d729540..999fc51990 100644 --- a/src/unk_02051D8C.c +++ b/src/unk_02051D8C.c @@ -5,8 +5,6 @@ #include "data_021BF67C.h" -#include "struct_decls/struct_0200B144_decl.h" -#include "strbuf.h" #include "struct_decls/struct_02025E6C_decl.h" #include "struct_decls/struct_02026324_decl.h" #include "struct_decls/struct_0202B628_decl.h" @@ -161,19 +159,19 @@ BattleParams * sub_02051F4C (int param0, const UnkStruct_0203CDB0 * param1) { UnkStruct_02025E6C * v0 = sub_02025E38(param1->unk_0C); UnkStruct_020279FC * v1 = sub_02025E44(param1->unk_0C); - UnkStruct_0200B144 * v2; + MessageLoader * v2; Strbuf* v3; BattleParams * v4; Pokemon * v5; v4 = sub_02051D8C(param0, 0x400); - v2 = sub_0200B144(1, 26, 553, param0); + v2 = MessageLoader_Init(1, 26, 553, param0); v3 = Strbuf_Init(8, param0); - sub_0200B1B8(v2, sub_02025F30(v0) ^ 1, v3); + MessageLoader_GetStrbuf(v2, sub_02025F30(v0) ^ 1, v3); sub_02025EC0(v4->unk_D0[0], Strbuf_GetData(v3)); Strbuf_Free(v3); - sub_0200B190(v2); + MessageLoader_Free(v2); sub_02025F2C(v4->unk_D0[0], sub_02025F30(v0) ^ 1); sub_0205281C(v4, param1); sub_02027A10(v1, v4->unk_108); diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c index 919dc00797..558ed46f76 100644 --- a/src/unk_020528D0.c +++ b/src/unk_020528D0.c @@ -3,7 +3,7 @@ #include "data_021BF67C.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" @@ -50,7 +50,7 @@ typedef struct { UnkStruct_0203CDB0 * unk_04; UnkStruct_02018340 * unk_08; UnkStruct_0205AA50 unk_0C; - UnkStruct_0200B144 * unk_1C; + MessageLoader * unk_1C; UnkStruct_0200B358 * unk_20; } UnkStruct_02052AA4; @@ -128,7 +128,7 @@ static void sub_02052914 (UnkStruct_0203CDB0 * param0, UnkStruct_020508D4 * para sub_020528D0(v0->unk_08); - v0->unk_1C = sub_0200B144(1, 26, 373, 11); + v0->unk_1C = MessageLoader_Init(1, 26, 373, 11); v0->unk_20 = sub_0200B358(11); sub_0201A8D4(v0->unk_08, &v0->unk_0C, &Unk_020EC2F0); @@ -176,7 +176,7 @@ static BOOL sub_020529C4 (UnkStruct_020508D4 * param0) sub_0200E084(&v0->unk_0C, 0); sub_0201A8FC(&v0->unk_0C); sub_0200B3F0(v0->unk_20); - sub_0200B190(v0->unk_1C); + MessageLoader_Free(v0->unk_1C); sub_02019044(v0->unk_08, 3); Heap_FreeToHeap(v0->unk_08); Heap_FreeToHeap(v0); @@ -193,7 +193,7 @@ static void sub_02052AA4 (UnkStruct_02052AA4 * param0, u16 param1, u8 param2, u8 Strbuf* v1 = Strbuf_Init(1024, 11); sub_0201ADA4(¶m0->unk_0C, 0); - sub_0200B1B8(param0->unk_1C, param1, v0); + MessageLoader_GetStrbuf(param0->unk_1C, param1, v0); sub_0200C388(param0->unk_20, v1, v0); { diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c index 0506b071d3..430a556f6e 100644 --- a/src/unk_02052C6C.c +++ b/src/unk_02052C6C.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "strbuf.h" #include "struct_decls/struct_02025E6C_decl.h" @@ -279,7 +279,7 @@ static void sub_02052FA8 (UnkStruct_0203CDB0 * param0, UnkStruct_0205300C * para { UnkStruct_020279FC * v0 = sub_02025E44(param0->unk_0C); - param1->unk_2C = sub_0200B010(26, 213, 15, 32); + param1->unk_2C = MessageBank_GetNewStrbufFromNARC(26, 213, 15, 32); sub_0205D8F4(param0->unk_08, ¶m1->unk_1C, 3); sub_0205D944(¶m1->unk_1C, v0); @@ -302,7 +302,7 @@ static void sub_0205300C (UnkStruct_0205300C * param0) static void sub_02053028 (UnkStruct_0203CDB0 * param0, UnkStruct_0205300C * param1, int param2) { - UnkStruct_0200B144 * v0 = sub_0200B144(1, 26, 213, 4); + MessageLoader * v0 = MessageLoader_Init(1, 26, 213, 4); if (param2 == 2) { UnkStruct_0200B358 * v1; @@ -312,10 +312,10 @@ static void sub_02053028 (UnkStruct_0203CDB0 * param0, UnkStruct_0205300C * para param1->unk_2C = sub_0200B29C(v1, v0, 16, 4); sub_0200B3F0(v1); } else { - param1->unk_2C = sub_0200B1EC(v0, 18); + param1->unk_2C = MessageLoader_GetNewStrbuf(v0, 18); } - sub_0200B190(v0); + MessageLoader_Free(v0); param1->unk_34 = sub_0205D994(¶m1->unk_1C, param1->unk_2C, sub_02025E44(param0->unk_0C), 1); } diff --git a/src/unk_020530C8.c b/src/unk_020530C8.c index 6b735e932e..c0aa7e1564 100644 --- a/src/unk_020530C8.c +++ b/src/unk_020530C8.c @@ -5,7 +5,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0201CD38_decl.h" #include "strbuf.h" #include "struct_decls/struct_0203A790_decl.h" @@ -1172,10 +1172,10 @@ BOOL sub_02054084 (UnkStruct_020508D4 * param0) switch (v1->unk_00) { case 0: { - UnkStruct_0200B144 * v2 = sub_0200B144(1, 26, 221, 11); + MessageLoader * v2 = MessageLoader_Init(1, 26, 221, 11); - v1->unk_34 = sub_0200B1EC(v2, 124); - sub_0200B190(v2); + v1->unk_34 = MessageLoader_GetNewStrbuf(v2, 124); + MessageLoader_Free(v2); } sub_0205D8F4(v0->unk_08, &v1->unk_24, 3); sub_0205D944(&v1->unk_24, sub_02025E44(v0->unk_0C)); diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c index a20511b6f5..a6337af6cc 100644 --- a/src/unk_0205A0D8.c +++ b/src/unk_0205A0D8.c @@ -3,7 +3,7 @@ #include "data_021BF67C.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_020149F0_decl.h" #include "strbuf.h" @@ -66,7 +66,7 @@ typedef struct { UnkStruct_0205AA50 unk_14; UnkStruct_0203CDB0 * unk_24; UnkStruct_0200B358 * unk_28; - UnkStruct_0200B144 * unk_2C; + MessageLoader * unk_2C; int unk_30; int unk_34; int unk_38; @@ -102,7 +102,7 @@ typedef struct { Strbuf* unk_04; UnkStruct_0205AA50 unk_08; UnkStruct_0200B358 * unk_18; - UnkStruct_0200B144 * unk_1C; + MessageLoader * unk_1C; int unk_20; int unk_24; int unk_28; @@ -273,7 +273,7 @@ static BOOL sub_0205A324 (UnkStruct_020508D4 * param0) } break; case 1: - sub_0200B1B8(v0->unk_2C, 1, v0->unk_0C); + MessageLoader_GetStrbuf(v0->unk_2C, 1, v0->unk_0C); v0->unk_30 = sub_0205AA50(v0, v0->unk_0C); v0->unk_34 = 2; break; @@ -340,7 +340,7 @@ static BOOL sub_0205A324 (UnkStruct_020508D4 * param0) break; case 11: sub_02059240(); - sub_0200B1B8(v0->unk_2C, 13, v0->unk_0C); + MessageLoader_GetStrbuf(v0->unk_2C, 13, v0->unk_0C); v0->unk_30 = sub_0205AA50(v0, v0->unk_0C); v0->unk_34 = 12; @@ -432,7 +432,7 @@ static BOOL sub_0205A324 (UnkStruct_020508D4 * param0) break; case 24: sub_02059240(); - sub_0200B1B8(v0->unk_2C, 19, v0->unk_0C); + MessageLoader_GetStrbuf(v0->unk_2C, 19, v0->unk_0C); v0->unk_30 = sub_0205AA50(v0, v0->unk_0C); v0->unk_34 = 25; break; @@ -450,7 +450,7 @@ static BOOL sub_0205A324 (UnkStruct_020508D4 * param0) sub_0205AC80(v0, v0->unk_82); sub_020364F0(0); sub_0200B498(v0->unk_28, 0, v0->unk_74); - sub_0200B1B8(v0->unk_2C, 14, v0->unk_0C); + MessageLoader_GetStrbuf(v0->unk_2C, 14, v0->unk_0C); sub_0200C388(v0->unk_28, v0->unk_10, v0->unk_0C); v0->unk_30 = sub_0205AA50(v0, v0->unk_10); v0->unk_34 = 27; @@ -478,7 +478,7 @@ static BOOL sub_0205A324 (UnkStruct_020508D4 * param0) v0->unk_83 = sub_0205AD20(v0); if (v0->unk_82 && v0->unk_83) { - sub_0200B1B8(v0->unk_2C, 20, v0->unk_0C); + MessageLoader_GetStrbuf(v0->unk_2C, 20, v0->unk_0C); v0->unk_30 = sub_0205AA50(v0, v0->unk_0C); v0->unk_34 = 30; } else { @@ -489,7 +489,7 @@ static BOOL sub_0205A324 (UnkStruct_020508D4 * param0) case 30: if (sub_0205DA04(v0->unk_30)) { v0->unk_89 = 0; - sub_0200B1B8(v0->unk_2C, 17, v0->unk_0C); + MessageLoader_GetStrbuf(v0->unk_2C, 17, v0->unk_0C); v0->unk_30 = sub_0205AA50(v0, v0->unk_0C); v0->unk_84 = 0; v0->unk_34 = 31; @@ -512,7 +512,7 @@ static BOOL sub_0205A324 (UnkStruct_020508D4 * param0) case 2: sub_0205B0B4(v0); v0->unk_84 = 255; - sub_0200B1B8(v0->unk_2C, 15, v0->unk_0C); + MessageLoader_GetStrbuf(v0->unk_2C, 15, v0->unk_0C); v0->unk_30 = sub_0205AA50(v0, v0->unk_0C); sub_020364F0(2); v0->unk_34 = 39; @@ -521,7 +521,7 @@ static BOOL sub_0205A324 (UnkStruct_020508D4 * param0) break; case 36: sub_0200B538(v0->unk_28, 1, sub_02076B10(Party_GetPokemonBySlotIndex(v0->unk_50, v0->unk_84))); - sub_0200B1B8(v0->unk_2C, 18, v0->unk_0C); + MessageLoader_GetStrbuf(v0->unk_2C, 18, v0->unk_0C); sub_0200C388(v0->unk_28, v0->unk_10, v0->unk_0C); v0->unk_30 = sub_0205AA50(v0, v0->unk_10); v0->unk_34 = 37; @@ -536,14 +536,14 @@ static BOOL sub_0205A324 (UnkStruct_020508D4 * param0) switch (sub_0205AFE4(v0)) { case 2: sub_0205B0B4(v0); - sub_0200B1B8(v0->unk_2C, 17, v0->unk_0C); + MessageLoader_GetStrbuf(v0->unk_2C, 17, v0->unk_0C); v0->unk_30 = sub_0205AA50(v0, v0->unk_0C); v0->unk_34 = 31; break; case 1: if (v0->unk_81 == 1) { sub_0205B0B4(v0); - sub_0200B1B8(v0->unk_2C, 14, v0->unk_0C); + MessageLoader_GetStrbuf(v0->unk_2C, 14, v0->unk_0C); sub_0200C388(v0->unk_28, v0->unk_10, v0->unk_0C); v0->unk_30 = sub_0205AA50(v0, v0->unk_10); sub_020364F0(2); @@ -596,7 +596,7 @@ static BOOL sub_0205A324 (UnkStruct_020508D4 * param0) } break; case 42: - sub_0200B1B8(v0->unk_2C, 15, v0->unk_0C); + MessageLoader_GetStrbuf(v0->unk_2C, 15, v0->unk_0C); v0->unk_30 = sub_0205AA50(v0, v0->unk_0C); v0->unk_43 = 0; v0->unk_34 = 43; @@ -674,7 +674,7 @@ void sub_0205AB10 (UnkStruct_0203CDB0 * param0, UnkFuncPtr_0205AB10 * param1) v0->unk_24 = param0; v0->unk_08 = param1; v0->unk_28 = sub_0200B358(11); - v0->unk_2C = sub_0200B144(0, 26, 11, 11); + v0->unk_2C = MessageLoader_Init(0, 26, 11, 11); v0->unk_0C = Strbuf_Init((100 * 2), 11); v0->unk_10 = Strbuf_Init((100 * 2), 11); @@ -735,7 +735,7 @@ static void sub_0205AC28 (UnkStruct_0205A0D8 * param0) Heap_FreeToHeap(param0->unk_48); } - sub_0200B190(param0->unk_2C); + MessageLoader_Free(param0->unk_2C); sub_0200B3F0(param0->unk_28); Strbuf_Free(param0->unk_0C); Strbuf_Free(param0->unk_10); @@ -877,9 +877,9 @@ static void sub_0205ADF8 (UnkStruct_0205A0D8 * param0, int param1) if (sub_0201A7CC(v0) == 0) { int v1, v2, v3; - UnkStruct_0200B144 * v4; + MessageLoader * v4; - v4 = sub_0200B144(1, 26, 412, 4); + v4 = MessageLoader_Init(1, 26, 412, 4); v3 = sub_02076AF0(); sub_0201A7E8(param0->unk_24->unk_08, v0, 3, 21, 9, 10, 8, 13, 10); @@ -889,13 +889,13 @@ static void sub_0205ADF8 (UnkStruct_0205A0D8 * param0, int param1) for (v1 = 0; v1 < 3; v1++) { v2 = GetMonData((Pokemon *)(¶m0->unk_48[v1 * v3]), MON_DATA_SPECIES, NULL); - sub_0200B1B8(v4, v2, param0->unk_0C); + MessageLoader_GetStrbuf(v4, v2, param0->unk_0C); sub_0201D738(v0, 0, param0->unk_0C, 16, v1 * 16, 0xff, NULL); } - sub_0200B1B8(param0->unk_2C, 21, param0->unk_0C); + MessageLoader_GetStrbuf(param0->unk_2C, 21, param0->unk_0C); sub_0201D738(v0, 0, param0->unk_0C, 16, v1 * 16, 0xff, NULL); - sub_0200B190(v4); + MessageLoader_Free(v4); } sub_0201AE78(v0, 15, 0, 0, 16, v0->unk_08 * 8); @@ -919,7 +919,7 @@ static void sub_0205AF18 (UnkStruct_0205A0D8 * param0, int param1) sub_0201ADA4(v0, 15); for (v1 = 0; v1 < 3; v1++) { - sub_0200B1B8(param0->unk_2C, 22 + v1, param0->unk_0C); + MessageLoader_GetStrbuf(param0->unk_2C, 22 + v1, param0->unk_0C); sub_0201D738(v0, 0, param0->unk_0C, 16, v1 * 16, 0xff, NULL); } } @@ -1021,11 +1021,11 @@ static BOOL sub_0205B140 (UnkStruct_020508D4 * param0) switch (v1->unk_28) { case 0: v1->unk_18 = sub_0200B358(4); - v1->unk_1C = sub_0200B144(0, 26, 11, 4); + v1->unk_1C = MessageLoader_Init(0, 26, 11, 4); v1->unk_00 = Strbuf_Init((100 * 2), 4); v1->unk_04 = Strbuf_Init((100 * 2), 4); - sub_0200B1B8(v1->unk_1C, 2 + v2->unk_03, v1->unk_00); + MessageLoader_GetStrbuf(v1->unk_1C, 2 + v2->unk_03, v1->unk_00); sub_0200B498(v1->unk_18, 0, sub_02032EE8(v1->unk_24)); sub_0200C388(v1->unk_18, v1->unk_04, v1->unk_00); sub_0205D8F4(v0->unk_08, &v1->unk_08, 3); @@ -1037,7 +1037,7 @@ static BOOL sub_0205B140 (UnkStruct_020508D4 * param0) case 1: if (sub_0205DA04(v1->unk_20)) { if (Unk_021BF67C.unk_48 & PAD_BUTTON_A) { - sub_0200B190(v1->unk_1C); + MessageLoader_Free(v1->unk_1C); sub_0200B3F0(v1->unk_18); Strbuf_Free(v1->unk_00); Strbuf_Free(v1->unk_04); diff --git a/src/unk_0205B33C.c b/src/unk_0205B33C.c index f82db163e3..022b785526 100644 --- a/src/unk_0205B33C.c +++ b/src/unk_0205B33C.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02014EC4_decl.h" #include "struct_decls/struct_0201CD38_decl.h" @@ -1274,7 +1274,7 @@ void sub_0205C040 (UnkStruct_0200B358 * param0, int param1, int param2, UnkStruc { UnkStruct_02025E6C * v0; Strbuf* v1; - UnkStruct_0200B144 * v2 = sub_0200B144(1, 26, 635, 4); + MessageLoader * v2 = MessageLoader_Init(1, 26, 635, 4); int v3, v4; param2--; @@ -1286,7 +1286,7 @@ void sub_0205C040 (UnkStruct_0200B358 * param0, int param1, int param2, UnkStruc } if (v0 == NULL) { - sub_0200B190(v2); + MessageLoader_Free(v2); return; } @@ -1329,11 +1329,11 @@ void sub_0205C040 (UnkStruct_0200B358 * param0, int param1, int param2, UnkStruc v4 = 217; } - v1 = sub_0200B1EC(v2, v4); + v1 = MessageLoader_GetNewStrbuf(v2, v4); sub_0200B48C(param0, 2, v1, 0, 1, v3); Heap_FreeToHeap(v1); - sub_0200B190(v2); + MessageLoader_Free(v2); } void sub_0205C12C (UnkStruct_02014A84 * param0) diff --git a/src/unk_0206CCB0.c b/src/unk_0206CCB0.c index adf702fbc8..9ffe99681c 100644 --- a/src/unk_0206CCB0.c +++ b/src/unk_0206CCB0.c @@ -3,7 +3,7 @@ #include "inlines.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "strbuf.h" #include "struct_decls/struct_0202440C_decl.h" @@ -492,7 +492,7 @@ static void sub_0206CE74 (UnkStruct_0200B358 * param0, int param1, u16 param2, u { u16 v0[11]; - sub_0200B274(param2, 4, v0); + MessageLoader_GetSpeciesName(param2, 4, v0); sub_0206CD94(param0, param1, v0, param3, param4, 1); } @@ -500,7 +500,7 @@ static void sub_0206CEA4 (UnkStruct_0200B358 * param0, int param1, u16 param2) { u16 v0[11]; - sub_0200B274(param2, 4, v0); + MessageLoader_GetSpeciesName(param2, 4, v0); sub_0206CD94(param0, param1, v0, 0, GAME_LANGUAGE, 1); } @@ -2910,13 +2910,13 @@ static int sub_0206F01C (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param static Strbuf* sub_0206F0D8 (u16 param0, u32 param1) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; Strbuf* v1; - v0 = sub_0200B144(1, 26, 412, param1); - v1 = sub_0200B1EC(v0, param0); + v0 = MessageLoader_Init(1, 26, 412, param1); + v1 = MessageLoader_GetNewStrbuf(v0, param0); - sub_0200B190(v0); + MessageLoader_Free(v0); return v1; } diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c index 2b8006bd39..0b85707b25 100644 --- a/src/unk_0206F314.c +++ b/src/unk_0206F314.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -50,7 +50,7 @@ #include "overlay005/ov5_021D2F14.h" typedef struct { - UnkStruct_0200B144 * unk_00; + MessageLoader * unk_00; UnkStruct_0200B358 * unk_04; Strbuf* unk_08; Strbuf* unk_0C; @@ -537,25 +537,25 @@ static void sub_0206FA08 (UnkStruct_0206F7F8 * param0) { int v0; - param0->unk_2C.unk_00 = sub_0200B144(0, 26, 532, param0->unk_00); + param0->unk_2C.unk_00 = MessageLoader_Init(0, 26, 532, param0->unk_00); param0->unk_2C.unk_04 = sub_0200B368(2, (38 * 2), param0->unk_00); param0->unk_2C.unk_08 = Strbuf_Init((38 * 2), param0->unk_00); - param0->unk_2C.unk_0C = sub_0200B1EC(param0->unk_2C.unk_00, 13); - param0->unk_2C.unk_10 = sub_0200B1EC(param0->unk_2C.unk_00, 22); - param0->unk_2C.unk_14 = sub_0200B1EC(param0->unk_2C.unk_00, 36); - param0->unk_2C.unk_18 = sub_0200B1EC(param0->unk_2C.unk_00, 14); + param0->unk_2C.unk_0C = MessageLoader_GetNewStrbuf(param0->unk_2C.unk_00, 13); + param0->unk_2C.unk_10 = MessageLoader_GetNewStrbuf(param0->unk_2C.unk_00, 22); + param0->unk_2C.unk_14 = MessageLoader_GetNewStrbuf(param0->unk_2C.unk_00, 36); + param0->unk_2C.unk_18 = MessageLoader_GetNewStrbuf(param0->unk_2C.unk_00, 14); for (v0 = 0; v0 < param0->unk_18; v0++) { - param0->unk_2C.unk_38[v0] = sub_0200B1EC(param0->unk_2C.unk_00, 0 + param0->unk_19 + v0); - param0->unk_2C.unk_50[v0] = sub_0200B1EC(param0->unk_2C.unk_00, 23 + param0->unk_19 + v0); + param0->unk_2C.unk_38[v0] = MessageLoader_GetNewStrbuf(param0->unk_2C.unk_00, 0 + param0->unk_19 + v0); + param0->unk_2C.unk_50[v0] = MessageLoader_GetNewStrbuf(param0->unk_2C.unk_00, 23 + param0->unk_19 + v0); } for (v0 = 0; v0 < 7; v0++) { - param0->unk_2C.unk_1C[v0] = sub_0200B1EC(param0->unk_2C.unk_00, 15 + v0); + param0->unk_2C.unk_1C[v0] = MessageLoader_GetNewStrbuf(param0->unk_2C.unk_00, 15 + v0); } for (v0 = 0; v0 < 3; v0++) { - param0->unk_2C.unk_68[v0] = sub_0200B1EC(param0->unk_2C.unk_00, 37 + v0); + param0->unk_2C.unk_68[v0] = MessageLoader_GetNewStrbuf(param0->unk_2C.unk_00, 37 + v0); } } @@ -582,7 +582,7 @@ static void sub_0206FAC0 (UnkStruct_0206F7F8 * param0) Strbuf_Free(param0->unk_2C.unk_0C); Strbuf_Free(param0->unk_2C.unk_08); sub_0200B3F0(param0->unk_2C.unk_04); - sub_0200B190(param0->unk_2C.unk_00); + MessageLoader_Free(param0->unk_2C.unk_00); } static void sub_0206FB38 (UnkStruct_0206F7F8 * param0) diff --git a/src/unk_02071CFC.c b/src/unk_02071CFC.c index 0d491266c9..7c153844ca 100644 --- a/src/unk_02071CFC.c +++ b/src/unk_02071CFC.c @@ -1,21 +1,19 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" -#include "strbuf.h" - #include "struct_defs/struct_0203CDB0_sub2_t.h" #include "unk_02002B7C.h" #include "unk_0200AC5C.h" #include "map_header.h" +#include "strbuf.h" #include "unk_02071CFC.h" -u32 sub_02071CFC (UnkStruct_0200B144 * param0, const int param1, Strbuf *param2) +u32 sub_02071CFC (MessageLoader * param0, const int param1, Strbuf *param2) { u32 v0; - sub_0200B1B8(param0, param1, param2); + MessageLoader_GetStrbuf(param0, param1, param2); v0 = sub_02002D7C(0, param2, 0); return v0; @@ -24,11 +22,11 @@ u32 sub_02071CFC (UnkStruct_0200B144 * param0, const int param1, Strbuf *param2) void sub_02071D10 (const int param0, const u32 param1, Strbuf *param2) { int v0; - UnkStruct_0200B144 * v1; + MessageLoader * v1; - v1 = sub_0200B144(1, 26, 433, param1); + v1 = MessageLoader_Init(1, 26, 433, param1); v0 = sub_0203A138(param0); sub_02071CFC(v1, v0, param2); - sub_0200B190(v1); + MessageLoader_Free(v1); } diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c index 73a6183e95..c5429a1899 100644 --- a/src/unk_020722AC.c +++ b/src/unk_020722AC.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -101,7 +101,7 @@ typedef struct { u8 unk_1A; u8 unk_1B; UnkStruct_02072EB8 unk_1C[20]; - UnkStruct_0200B144 * unk_10C; + MessageLoader * unk_10C; UnkStruct_02072334_sub1 unk_110; u8 unk_138; u8 unk_139; @@ -1029,18 +1029,18 @@ static void sub_020730B8 (UnkStruct_02072334 * param0, u8 param1, BOOL param2) static void sub_02073130 (UnkStruct_02072334 * param0) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; int v1; Strbuf* v2; - param0->unk_10C = sub_0200B144(1, 26, 408, param0->unk_00); + param0->unk_10C = MessageLoader_Init(1, 26, 408, param0->unk_00); param0->unk_110.unk_00 = sub_0200B368(1, 128, param0->unk_00); param0->unk_110.unk_04 = Strbuf_Init(128, param0->unk_00); - param0->unk_110.unk_08 = sub_0200B1EC(param0->unk_10C, 4); - param0->unk_110.unk_0C = sub_0200B1EC(param0->unk_10C, 0); + param0->unk_110.unk_08 = MessageLoader_GetNewStrbuf(param0->unk_10C, 4); + param0->unk_110.unk_0C = MessageLoader_GetNewStrbuf(param0->unk_10C, 0); for (v1 = 0; v1 < 6; v1++) { - param0->unk_110.unk_10[v1] = sub_0200B1EC(param0->unk_10C, 6 + v1); + param0->unk_110.unk_10[v1] = MessageLoader_GetNewStrbuf(param0->unk_10C, 6 + v1); } } @@ -1056,7 +1056,7 @@ static void sub_020731A4 (UnkStruct_02072334 * param0) Strbuf_Free(param0->unk_110.unk_08); Strbuf_Free(param0->unk_110.unk_04); sub_0200B3F0(param0->unk_110.unk_00); - sub_0200B190(param0->unk_10C); + MessageLoader_Free(param0->unk_10C); } static void sub_020731F4 (UnkStruct_02072334 * param0) diff --git a/src/unk_02073C2C.c b/src/unk_02073C2C.c index 0a1732bf40..211eb1dcd5 100644 --- a/src/unk_02073C2C.c +++ b/src/unk_02073C2C.c @@ -986,7 +986,7 @@ static u32 sub_020745D0 (BoxPokemon * param0, int param1, void * param2) break; case MON_DATA_117: if (param0->unk_04_2) { - sub_0200B274(495, 0, param2); + MessageLoader_GetSpeciesName(495, 0, param2); } else { { u16 * v6 = param2; @@ -1126,7 +1126,7 @@ static u32 sub_020745D0 (BoxPokemon * param0, int param1, void * param2) } break; case MON_DATA_179: - sub_0200B274(v2->species, 0, param2); + MessageLoader_GetSpeciesName(v2->species, 0, param2); break; } @@ -1471,7 +1471,7 @@ static void sub_02074CD8 (BoxPokemon * param0, int param1, const void * param2) { u16 v10[10 + 1]; - sub_0200B274(v6->species, 0, &v10[0]); + MessageLoader_GetSpeciesName(v6->species, 0, &v10[0]); v7->unk_10_31 = sub_0200220C(v10, &v4[0]); } case MON_DATA_117: @@ -1484,7 +1484,7 @@ static void sub_02074CD8 (BoxPokemon * param0, int param1, const void * param2) u16 v11[10 + 1]; u16 v12[10 + 1]; - sub_0200B274(v6->species, 0, &v11[0]); + MessageLoader_GetSpeciesName(v6->species, 0, &v11[0]); Strbuf_ToChars((Strbuf *)param2, &v12[0], NELEMS(v12)); v7->unk_10_31 = sub_0200220C(v11, v12); diff --git a/src/unk_02079170.c b/src/unk_02079170.c index 6cb6e6ff74..c3f5abd5b6 100644 --- a/src/unk_02079170.c +++ b/src/unk_02079170.c @@ -4,8 +4,6 @@ #include "constants/trainer.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" -#include "strbuf.h" #include "struct_defs/pokemon.h" #include "struct_decls/struct_021C0794_decl.h" @@ -149,7 +147,7 @@ void sub_02079170 (BattleParams * param0, const UnkStruct_021C0794 * param1, int { TrainerData v0; int v1; - UnkStruct_0200B144 * v2 = sub_0200B144(1, 26, 618, param2); + MessageLoader * v2 = MessageLoader_Init(1, 26, 618, param2); Strbuf *v3; const u16 * v4 = sub_02027870(sub_02027848(param1)); @@ -161,7 +159,7 @@ void sub_02079170 (BattleParams * param0, const UnkStruct_021C0794 * param1, int if (v0.class == TRAINER_CLASS_RIVAL) { sub_020021B0(¶m0->trainerData[v1].unk_14[0], v4); } else { - v3 = sub_0200B1EC(v2, param0->unk_18[v1]); + v3 = MessageLoader_GetNewStrbuf(v2, param0->unk_18[v1]); Strbuf_ToChars(v3, ¶m0->trainerData[v1].unk_14[0], 8); Strbuf_Free(v3); } @@ -172,7 +170,7 @@ void sub_02079170 (BattleParams * param0, const UnkStruct_021C0794 * param1, int param0->battleType |= v0.unk_10; - sub_0200B190(v2); + MessageLoader_Free(v2); } u32 sub_02079220 (int param0, int param1) @@ -261,7 +259,7 @@ void sub_020792F8 (int param0, int param1, Strbuf *param2, int param3) NARC_ReadFromMember(v0, 0, v2, 4, &v3[0]); if ((v3[0] == param0) && (v3[1] == param1)) { - sub_0200AF20(26, 617, v2 / 4, param3, param2); + MessageBank_GetStrbufFromNARC(26, 617, v2 / 4, param3, param2); break; } diff --git a/src/unk_020797C8.c b/src/unk_020797C8.c index 3aff684bda..20024cdb47 100644 --- a/src/unk_020797C8.c +++ b/src/unk_020797C8.c @@ -1,9 +1,6 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" -#include "strbuf.h" - #include "struct_defs/box_pokemon.h" #include "unk_0200AC5C.h" @@ -36,7 +33,7 @@ u32 sub_020797D4 (void) static void sub_020797DC (UnkStruct_020797DC * param0) { u32 v0, v1; - UnkStruct_0200B144 * v2; + MessageLoader * v2; for (v0 = 0; v0 < 18; v0++) { for (v1 = 0; v1 < (5 * 6); v1++) { @@ -53,14 +50,14 @@ static void sub_020797DC (UnkStruct_020797DC * param0) } param0->unk_13C6 = 0; - v2 = sub_0200B144(1, 26, 18, 0); + v2 = MessageLoader_Init(1, 26, 18, 0); if (v2) { for (v0 = 0; v0 < 18; v0++) { - sub_0200B240(v2, 6 + v0, param0->unk_10E4[v0]); + MessageLoader_Get(v2, 6 + v0, param0->unk_10E4[v0]); } - sub_0200B190(v2); + MessageLoader_Free(v2); } param0->unk_00 = 0; diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index 02c5e1a986..3ae03fa642 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -146,7 +146,7 @@ UnkStruct_0207AE68 * sub_0207AE68 (Party * param0, Pokemon * param1, int param2, v0->unk_44 = sub_02015F84(param11, 1, 0); v0->unk_67 = 0; v0->unk_66 = 2; - v0->unk_08 = sub_0200B144(1, 26, 368, param11); + v0->unk_08 = MessageLoader_Init(1, 26, 368, param11); v0->unk_0C = sub_0200B358(param11); v0->unk_10 = Strbuf_Init((2 * 160), param11); v0->unk_3C = Heap_AllocFromHeap(param11, sizeof(UnkStruct_02098D38)); @@ -211,7 +211,7 @@ void sub_0207B0E0 (UnkStruct_0207AE68 * param0) sub_02015FB8(param0->unk_44); sub_020242C4(param0->unk_34); sub_0207C460(param0->unk_00); - sub_0200B190(param0->unk_08); + MessageLoader_Free(param0->unk_08); sub_0200B3F0(param0->unk_0C); Heap_FreeToHeap(param0->unk_10); Heap_FreeToHeap(param0->unk_3C); @@ -984,7 +984,7 @@ static u8 sub_0207C584 (UnkStruct_0207AE68 * param0, int param1) { Strbuf* v0; - v0 = sub_0200B1EC(param0->unk_08, param1); + v0 = MessageLoader_GetNewStrbuf(param0->unk_08, param1); sub_0200C388(param0->unk_0C, param0->unk_10, v0); Heap_FreeToHeap(v0); diff --git a/src/unk_0207CB08.c b/src/unk_0207CB08.c index 5b77411f93..27cc104305 100644 --- a/src/unk_0207CB08.c +++ b/src/unk_0207CB08.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "strbuf.h" #include "struct_decls/struct_02029D04_decl.h" @@ -138,72 +138,72 @@ static u32 sub_0207CC00 (UnkStruct_021C0794 * param0) BOOL sub_0207CC10 (UnkStruct_021C0794 * param0, Strbuf *param1, u16 param2, u32 param3) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; UnkStruct_0200B358 * v1; Strbuf* v2; - v0 = sub_0200B144(0, 26, 7, param3); + v0 = MessageLoader_Init(0, 26, 7, param3); v1 = sub_0200B358(param3); if (param2 == 0) { - v2 = sub_0200B1EC(v0, 99); + v2 = MessageLoader_GetNewStrbuf(v0, 99); } else if (param2 == 432) { - v2 = sub_0200B1EC(v0, 97); + v2 = MessageLoader_GetNewStrbuf(v0, 97); sub_0200B60C(v1, 0, sub_0207CC00(param0), 4, 0, 1); } else if (param2 == 434) { - v2 = sub_0200B1EC(v0, 92); + v2 = MessageLoader_GetNewStrbuf(v0, 92); sub_0200B60C(v1, 0, sub_0207CBC0(param0), 4, 0, 1); } else if (param2 == 435) { - v2 = sub_0200B1EC(v0, 93); + v2 = MessageLoader_GetNewStrbuf(v0, 93); sub_0200B60C(v1, 0, sub_0207CBE0(param0), 3, 0, 1); sub_0200B60C(v1, 1, sub_0207CBF0(param0), 2, 0, 1); } else if (param2 == 444) { - v2 = sub_0200B1EC(v0, 57); + v2 = MessageLoader_GetNewStrbuf(v0, 57); sub_0200B60C(v1, 0, sub_0207CBB4(param0), 5, 0, 1); } else { sub_0200B3F0(v1); - sub_0200B190(v0); + MessageLoader_Free(v0); return 0; } sub_0200C388(v1, param1, v2); Strbuf_Free(v2); sub_0200B3F0(v1); - sub_0200B190(v0); + MessageLoader_Free(v0); return 1; } void sub_0207CD34 (void * param0, Strbuf *param1, u16 param2, u32 param3, u32 param4) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; UnkStruct_0200B358 * v1; Strbuf* v2; switch (param3) { case 1: - v0 = sub_0200B144(1, 26, 7, param4); - sub_0200B1B8(v0, 56, param1); - sub_0200B190(v0); + v0 = MessageLoader_Init(1, 26, 7, param4); + MessageLoader_GetStrbuf(v0, 56, param1); + MessageLoader_Free(v0); break; case 2: - v0 = sub_0200B144(1, 26, 7, param4); - sub_0200B1B8(v0, 111, param1); - sub_0200B190(v0); + v0 = MessageLoader_Init(1, 26, 7, param4); + MessageLoader_GetStrbuf(v0, 111, param1); + MessageLoader_Free(v0); break; case 3: - v0 = sub_0200B144(1, 26, 7, param4); - sub_0200B1B8(v0, 112, param1); - sub_0200B190(v0); + v0 = MessageLoader_Init(1, 26, 7, param4); + MessageLoader_GetStrbuf(v0, 112, param1); + MessageLoader_Free(v0); break; default: - v0 = sub_0200B144(1, 26, 213, param4); + v0 = MessageLoader_Init(1, 26, 213, param4); v1 = sub_0200B358(param4); - v2 = sub_0200B1EC(v0, 36); + v2 = MessageLoader_GetNewStrbuf(v0, 36); sub_0200B498(v1, 0, param0); sub_0200C388(v1, param1, v2); Strbuf_Free(v2); sub_0200B3F0(v1); - sub_0200B190(v0); + MessageLoader_Free(v0); } } diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index e691510d6e..c7b5a28352 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -639,7 +639,7 @@ static int sub_0207E750 (UnkStruct_0207F248 * param0) sub_02082708(param0, 0xffffffff, 1); param0->unk_5A4->unk_23 = 0; param0->unk_B0E = 25; - sub_0200B1B8(param0->unk_69C, 105, param0->unk_6A4); + MessageLoader_GetStrbuf(param0->unk_69C, 105, param0->unk_6A4); return 24; } } else if (v0 == 3) { @@ -673,7 +673,7 @@ static int sub_0207E7E0 (UnkStruct_020067E8 * param0, int * param1) Strbuf_Free(v0->unk_6AC[v1]); } - sub_0200B190(v0->unk_69C); + MessageLoader_Free(v0->unk_69C); sub_0200C560(v0->unk_698); sub_0200B3F0(v0->unk_6A0); @@ -968,7 +968,7 @@ static UnkStruct_0207F248 * sub_0207ECC0 (UnkStruct_020067E8 * param0) v0->unk_B20 = NULL; } - v0->unk_69C = sub_0200B144(0, 26, 453, 12); + v0->unk_69C = MessageLoader_Init(0, 26, 453, 12); v0->unk_698 = sub_0200C440(15, 14, 0, 12); v0->unk_6A0 = sub_0200B358(12); @@ -2120,7 +2120,7 @@ static int sub_02080670 (UnkStruct_0207F248 * param0) Strbuf* v1; int v2; - v1 = sub_0200B1EC(param0->unk_69C, 184); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 184); v2 = sub_02026074(param0->unk_5A4->unk_14, 3); sub_0200B60C(param0->unk_6A0, 0, v2, 3, 0, 1); @@ -2462,7 +2462,7 @@ static int sub_02080BF4 (UnkStruct_0207F248 * param0) UnkStruct_0203CDB0 * v3; v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); - v1 = sub_0200B1EC(param0->unk_69C, 64); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 64); sub_0200B5CC(param0->unk_6A0, 0, sub_02076B10(v0)); sub_0200B60C(param0->unk_6A0, 1, param0->unk_B14[2], 3, 0, 1); @@ -2655,14 +2655,14 @@ static int sub_02081224 (UnkStruct_0207F248 * param0) if (param0->unk_5A4->unk_24 == 112) { if (GetMonData(v0, MON_DATA_SPECIES, NULL) != 487) { - sub_0200B1B8(param0->unk_69C, 203, param0->unk_6A8); + MessageLoader_GetStrbuf(param0->unk_69C, 203, param0->unk_6A8); sub_0200B5CC(param0->unk_6A0, 0, sub_02076B10(v0)); sub_0200B744(param0->unk_6A0, 1, param0->unk_5A4->unk_24); sub_0200C388(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); v2 = 11; } else if (v4 != NULL) { if (v4->unk_1C->unk_00 == 466) { - sub_0200B1B8(param0->unk_69C, 204, param0->unk_6A8); + MessageLoader_GetStrbuf(param0->unk_69C, 204, param0->unk_6A8); sub_0200B70C(param0->unk_6A0, 0, param0->unk_5A4->unk_24); sub_0200C388(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); v2 = 11; @@ -2680,20 +2680,20 @@ static int sub_02081224 (UnkStruct_0207F248 * param0) v2 = sub_02081408(param0, v0, &v3); - sub_0200B1B8(param0->unk_69C, 118, param0->unk_6A8); + MessageLoader_GetStrbuf(param0->unk_69C, 118, param0->unk_6A8); sub_0200B5CC(param0->unk_6A0, 0, sub_02076B10(v0)); sub_0200B70C(param0->unk_6A0, 1, param0->unk_5A4->unk_24); sub_0200C388(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); break; case 1: - sub_0200B1B8(param0->unk_69C, 78, param0->unk_6A8); + MessageLoader_GetStrbuf(param0->unk_69C, 78, param0->unk_6A8); sub_0200B5CC(param0->unk_6A0, 0, sub_02076B10(v0)); sub_0200B744(param0->unk_6A0, 1, param0->unk_704[param0->unk_B11].unk_0C); sub_0200C388(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); v2 = 9; break; case 2: - sub_0200B1B8(param0->unk_69C, 77, param0->unk_6A4); + MessageLoader_GetStrbuf(param0->unk_69C, 77, param0->unk_6A4); v2 = 11; break; } @@ -2808,7 +2808,7 @@ static int sub_020815B8 (UnkStruct_0207F248 * param0) if (sub_0207D570(param0->unk_5A4->unk_04, (u16)v5, 1, 12) == 0) { sub_020814A8(param0, v2, v4, v5); - sub_0200B1B8(param0->unk_69C, 83, param0->unk_6A4); + MessageLoader_GetStrbuf(param0->unk_69C, 83, param0->unk_6A4); v0 = 11; } else { if (Item_IsMail(param0->unk_5A4->unk_24) == 1) { @@ -2818,7 +2818,7 @@ static int sub_020815B8 (UnkStruct_0207F248 * param0) return 32; } - sub_0200B1B8(param0->unk_69C, 84, param0->unk_6A8); + MessageLoader_GetStrbuf(param0->unk_69C, 84, param0->unk_6A8); sub_0200B70C(param0->unk_6A0, 1, v5); sub_0200B70C(param0->unk_6A0, 2, v4); sub_0200C388(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); @@ -2874,13 +2874,13 @@ static int sub_02081760 (UnkStruct_0207F248 * param0) } if (v3 == 0) { - sub_0200B1B8(param0->unk_69C, 118, param0->unk_6A8); + MessageLoader_GetStrbuf(param0->unk_69C, 118, param0->unk_6A8); sub_0200B5CC(param0->unk_6A0, 0, sub_02076B10(v0)); sub_0200B70C(param0->unk_6A0, 1, param0->unk_5A4->unk_24); sub_0200C388(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); } else { sub_0207D570(param0->unk_5A4->unk_04, (u16)v3, 1, 12); - sub_0200B1B8(param0->unk_69C, 84, param0->unk_6A8); + MessageLoader_GetStrbuf(param0->unk_69C, 84, param0->unk_6A8); sub_0200B70C(param0->unk_6A0, 1, v3); sub_0200B70C(param0->unk_6A0, 2, v2); sub_0200C388(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); diff --git a/src/unk_020819DC.c b/src/unk_020819DC.c index fcc377ed49..05a292022d 100644 --- a/src/unk_020819DC.c +++ b/src/unk_020819DC.c @@ -169,29 +169,29 @@ void sub_02081B90 (UnkStruct_0207F248 * param0) void sub_02081BC0 (UnkStruct_0207F248 * param0) { - sub_0200B1B8(param0->unk_69C, 145, param0->unk_6AC[0]); - sub_0200B1B8(param0->unk_69C, 146, param0->unk_6AC[1]); - sub_0200B1B8(param0->unk_69C, 147, param0->unk_6AC[2]); - sub_0200B1B8(param0->unk_69C, 160, param0->unk_6AC[3]); - sub_0200B1B8(param0->unk_69C, 161, param0->unk_6AC[4]); - sub_0200B1B8(param0->unk_69C, 148, param0->unk_6AC[5]); - sub_0200B1B8(param0->unk_69C, 149, param0->unk_6AC[6]); - sub_0200B1B8(param0->unk_69C, 150, param0->unk_6AC[7]); - sub_0200B1B8(param0->unk_69C, 151, param0->unk_6AC[8]); - sub_0200B1B8(param0->unk_69C, 152, param0->unk_6AC[9]); - sub_0200B1B8(param0->unk_69C, 153, param0->unk_6AC[10]); - sub_0200B1B8(param0->unk_69C, 154, param0->unk_6AC[11]); - sub_0200B1B8(param0->unk_69C, 155, param0->unk_6AC[12]); - sub_0200B1B8(param0->unk_69C, 154, param0->unk_6AC[13]); - sub_0200B1B8(param0->unk_69C, 166, param0->unk_6AC[14]); - sub_0200B1B8(param0->unk_69C, 200, param0->unk_6AC[15]); + MessageLoader_GetStrbuf(param0->unk_69C, 145, param0->unk_6AC[0]); + MessageLoader_GetStrbuf(param0->unk_69C, 146, param0->unk_6AC[1]); + MessageLoader_GetStrbuf(param0->unk_69C, 147, param0->unk_6AC[2]); + MessageLoader_GetStrbuf(param0->unk_69C, 160, param0->unk_6AC[3]); + MessageLoader_GetStrbuf(param0->unk_69C, 161, param0->unk_6AC[4]); + MessageLoader_GetStrbuf(param0->unk_69C, 148, param0->unk_6AC[5]); + MessageLoader_GetStrbuf(param0->unk_69C, 149, param0->unk_6AC[6]); + MessageLoader_GetStrbuf(param0->unk_69C, 150, param0->unk_6AC[7]); + MessageLoader_GetStrbuf(param0->unk_69C, 151, param0->unk_6AC[8]); + MessageLoader_GetStrbuf(param0->unk_69C, 152, param0->unk_6AC[9]); + MessageLoader_GetStrbuf(param0->unk_69C, 153, param0->unk_6AC[10]); + MessageLoader_GetStrbuf(param0->unk_69C, 154, param0->unk_6AC[11]); + MessageLoader_GetStrbuf(param0->unk_69C, 155, param0->unk_6AC[12]); + MessageLoader_GetStrbuf(param0->unk_69C, 154, param0->unk_6AC[13]); + MessageLoader_GetStrbuf(param0->unk_69C, 166, param0->unk_6AC[14]); + MessageLoader_GetStrbuf(param0->unk_69C, 200, param0->unk_6AC[15]); } void sub_02081CAC (UnkStruct_0207F248 * param0, u16 param1, u8 param2) { Strbuf* v0; - v0 = sub_0200B1EC(param0->unk_69C, 156 + param2); + v0 = MessageLoader_GetNewStrbuf(param0->unk_69C, 156 + param2); sub_0200B630(param0->unk_6A0, 0, param1); sub_0200C388(param0->unk_6A0, param0->unk_6AC[16 + param2], v0); @@ -242,12 +242,12 @@ void sub_02081E08 (UnkStruct_0207F248 * param0) Strbuf* v1; if (param0->unk_5A4->unk_20 == 15) { - sub_0200B1B8(param0->unk_69C, 42, param0->unk_6A4); + MessageLoader_GetStrbuf(param0->unk_69C, 42, param0->unk_6A4); } else if ((param0->unk_5A4->unk_20 == 21) && (param0->unk_704[param0->unk_B11].unk_10 == 1)) { - sub_0200B1B8(param0->unk_69C, 198, param0->unk_6A4); + MessageLoader_GetStrbuf(param0->unk_69C, 198, param0->unk_6A4); } else { v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); - v1 = sub_0200B1EC(param0->unk_69C, 37); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 37); sub_0200B5CC(param0->unk_6A0, 0, sub_02076B10(v0)); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); @@ -273,7 +273,7 @@ void sub_02081ED8 (UnkStruct_0207F248 * param0, Pokemon * param1, u32 param2) { Strbuf* v0; - v0 = sub_0200B1EC(param0->unk_69C, Unk_020F1EA0[param2][0]); + v0 = MessageLoader_GetNewStrbuf(param0->unk_69C, Unk_020F1EA0[param2][0]); sub_0200B5CC(param0->unk_6A0, 0, sub_02076B10(param1)); sub_0200C388(param0->unk_6A0, param0->unk_704[param2].unk_00, v0); @@ -296,11 +296,11 @@ void sub_02081F2C (UnkStruct_0207F248 * param0, u8 param1) if (param0->unk_704[param1].unk_0E_12 == 0) { if (param0->unk_704[param1].unk_0E_13 == 0) { - sub_0200B1B8(param0->unk_69C, 27, param0->unk_6A8); + MessageLoader_GetStrbuf(param0->unk_69C, 27, param0->unk_6A8); sub_0201D78C( v0, 0, param0->unk_6A8, (9 * 8 - 8), 0, 0xff, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } else if (param0->unk_704[param1].unk_0E_13 == 1) { - sub_0200B1B8(param0->unk_69C, 28, param0->unk_6A8); + MessageLoader_GetStrbuf(param0->unk_69C, 28, param0->unk_6A8); sub_0201D78C( v0, 0, param0->unk_6A8, (9 * 8 - 8), 0, 0xff, ((u32)(((5 & 0xff) << 16) | ((6 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } @@ -558,14 +558,14 @@ void sub_020825B4 (UnkStruct_0207F248 * param0, u8 param1) sub_0201ADA4(¶m0->unk_04[31], 0); if (param1 & 1) { - sub_0200B1B8(param0->unk_69C, 0, param0->unk_6A8); + MessageLoader_GetStrbuf(param0->unk_69C, 0, param0->unk_6A8); v0 = sub_020825A4(0, param0->unk_6A8, param0->unk_04[30].unk_07 * 8); sub_0201D78C(¶m0->unk_04[30], 0, param0->unk_6A8, v0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_0201A9A4(¶m0->unk_04[30]); } if (param1 & 2) { - sub_0200B1B8(param0->unk_69C, 1, param0->unk_6A8); + MessageLoader_GetStrbuf(param0->unk_69C, 1, param0->unk_6A8); v0 = sub_020825A4(0, param0->unk_6A8, param0->unk_04[31].unk_07 * 8); sub_0201D78C(¶m0->unk_04[31], 0, param0->unk_6A8, v0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_0201A9A4(¶m0->unk_04[31]); @@ -581,7 +581,7 @@ static void sub_02082680 (UnkStruct_0207F248 * param0, UnkStruct_0205AA50 * para sub_0201ADA4(param1, 15); if (param2 != 0xffffffff) { - sub_0200B1B8(param0->unk_69C, param2, param0->unk_6A4); + MessageLoader_GetStrbuf(param0->unk_69C, param2, param0->unk_6A4); } sub_0201D738(param1, 1, param0->unk_6A4, 0, 0, 0xff, NULL); @@ -609,7 +609,7 @@ void sub_02082708 (UnkStruct_0207F248 * param0, u32 param1, u8 param2) sub_0201ADA4(v0, 15); if (param1 != 0xffffffff) { - sub_0200B1B8(param0->unk_69C, param1, param0->unk_6A4); + MessageLoader_GetStrbuf(param0->unk_69C, param1, param0->unk_6A4); } sub_0208274C(param0); @@ -660,10 +660,10 @@ static void sub_02082810 (UnkStruct_0207F248 * param0, u8 param1, u8 param2) switch (param2) { case 0: - v1 = sub_0200B1EC(param0->unk_69C, 178); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 178); break; case 1: - v1 = sub_0200B1EC(param0->unk_69C, 179); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 179); break; } @@ -683,13 +683,13 @@ static void sub_02082880 (UnkStruct_0207F248 * param0, u8 param1, u8 param2) switch (param2) { case 0: - v1 = sub_0200B1EC(param0->unk_69C, 175); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 175); break; case 1: - v1 = sub_0200B1EC(param0->unk_69C, 176); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 176); break; case 2: - v1 = sub_0200B1EC(param0->unk_69C, 177); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 177); break; } @@ -708,9 +708,9 @@ static void sub_02082900 (UnkStruct_0207F248 * param0, u8 param1, u8 param2) sub_0201ADA4(v0, 0); if (param2 == 0) { - v1 = sub_0200B1EC(param0->unk_69C, 181); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 181); } else { - v1 = sub_0200B1EC(param0->unk_69C, 180); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 180); } sub_0201D78C(v0, 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -728,11 +728,11 @@ static void sub_02082964 (UnkStruct_0207F248 * param0, u8 param1, u8 param2) sub_0201ADA4(v0, 0); if (param2 < 6) { - v1 = sub_0200B1EC(param0->unk_69C, 169 + param2); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 169 + param2); } else if (param2 == 7) { - v1 = sub_0200B1EC(param0->unk_69C, 167); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 167); } else { - v1 = sub_0200B1EC(param0->unk_69C, 168); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 168); } sub_0201D78C(v0, 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -761,11 +761,11 @@ void sub_020829DC (UnkStruct_0207F248 * param0) sub_0201ADA4(¶m0->unk_254[0], 15); for (v2 = 0; v2 < 6; v2++) { - v1 = sub_0200B1EC(param0->unk_69C, 185 + v2); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 185 + v2); sub_0201D738(¶m0->unk_254[0], 0, v1, 0, 16 * v2, 0xff, NULL); Strbuf_Free(v1); - v1 = sub_0200B1EC(param0->unk_69C, 191); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 191); sub_0200B60C(param0->unk_6A0, 0, v3[v2] - param0->unk_B14[v2], 2, 0, 1); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); @@ -789,7 +789,7 @@ void sub_02082B58 (UnkStruct_0207F248 * param0) u32 v2; sub_0201AE78(¶m0->unk_254[0], 15, 80, 0, 32, 14 * 8); - v0 = sub_0200B1EC(param0->unk_69C, 192); + v0 = MessageLoader_GetNewStrbuf(param0->unk_69C, 192); for (v2 = 0; v2 < 6; v2++) { sub_0200B60C(param0->unk_6A0, 0, param0->unk_B14[v2], 3, 0, 1); diff --git a/src/unk_02083370.c b/src/unk_02083370.c index 09dd24da07..1502bd7b0e 100644 --- a/src/unk_02083370.c +++ b/src/unk_02083370.c @@ -176,7 +176,7 @@ static void sub_020834B0 (UnkStruct_0207F248 * param0, int * param1) if (param0->unk_704[param0->unk_B11].unk_0C == 0) { v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); - sub_0200B1B8(param0->unk_69C, 81, param0->unk_6A8); + MessageLoader_GetStrbuf(param0->unk_69C, 81, param0->unk_6A8); sub_0200B5CC(param0->unk_6A0, 0, sub_02076B10(v0)); sub_0200C388(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); } else if (sub_0207D570(param0->unk_5A4->unk_04, param0->unk_704[param0->unk_B11].unk_0C, 1, 12) == 1) { @@ -196,7 +196,7 @@ static void sub_020834B0 (UnkStruct_0207F248 * param0, int * param1) } } - sub_0200B1B8(param0->unk_69C, 82, param0->unk_6A8); + MessageLoader_GetStrbuf(param0->unk_69C, 82, param0->unk_6A8); sub_0200B5CC(param0->unk_6A0, 0, sub_02076B10(v0)); sub_0200B70C(param0->unk_6A0, 1, param0->unk_704[param0->unk_B11].unk_0C); sub_0200C388(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); @@ -205,7 +205,7 @@ static void sub_020834B0 (UnkStruct_0207F248 * param0, int * param1) sub_02083040(param0, param0->unk_B11, param0->unk_704[param0->unk_B11].unk_0C); } else { - sub_0200B1B8(param0->unk_69C, 83, param0->unk_6A4); + MessageLoader_GetStrbuf(param0->unk_69C, 83, param0->unk_6A4); } sub_0200E060(¶m0->unk_04[34], 1, (1 + 9), 15); @@ -846,10 +846,10 @@ int sub_02084780 (UnkStruct_0207F248 * param0) Pokemon * v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); if (GetMonData(v0, MON_DATA_162, NULL) == 0) { - sub_0200B1B8(param0->unk_69C, 129, param0->unk_6A4); + MessageLoader_GetStrbuf(param0->unk_69C, 129, param0->unk_6A4); sub_02021CAC(param0->unk_5B0[22 + param0->unk_B11], 1); } else { - sub_0200B1B8(param0->unk_69C, 130, param0->unk_6A4); + MessageLoader_GetStrbuf(param0->unk_69C, 130, param0->unk_6A4); param0->unk_B11 = 7; } diff --git a/src/unk_02084B70.c b/src/unk_02084B70.c index f07743f64d..5284a5eb2b 100644 --- a/src/unk_02084B70.c +++ b/src/unk_02084B70.c @@ -229,129 +229,129 @@ static void sub_02084E58 (UnkStruct_0207F248 * param0, u16 param1, u32 param2) switch (sub_02084B70(param1)) { case 4: - v1 = sub_0200B1EC(param0->unk_69C, 65); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 65); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 3: - v1 = sub_0200B1EC(param0->unk_69C, 91); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 91); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 5: - v1 = sub_0200B1EC(param0->unk_69C, 67); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 67); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 6: - v1 = sub_0200B1EC(param0->unk_69C, 68); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 68); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 7: - v1 = sub_0200B1EC(param0->unk_69C, 66); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 66); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 8: - v1 = sub_0200B1EC(param0->unk_69C, 73); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 73); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 10: - v1 = sub_0200B1EC(param0->unk_69C, 74); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 74); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 9: - v1 = sub_0200B1EC(param0->unk_69C, 71); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 71); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 12: - v1 = sub_0200B1EC(param0->unk_69C, 75); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 75); sub_0200B824(param0->unk_6A0, 1, 0); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 13: - v1 = sub_0200B1EC(param0->unk_69C, 75); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 75); sub_0200B824(param0->unk_6A0, 1, 1); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 14: - v1 = sub_0200B1EC(param0->unk_69C, 75); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 75); sub_0200B824(param0->unk_6A0, 1, 2); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 15: - v1 = sub_0200B1EC(param0->unk_69C, 75); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 75); sub_0200B824(param0->unk_6A0, 1, 3); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 16: - v1 = sub_0200B1EC(param0->unk_69C, 75); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 75); sub_0200B824(param0->unk_6A0, 1, 4); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 17: - v1 = sub_0200B1EC(param0->unk_69C, 75); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 75); sub_0200B824(param0->unk_6A0, 1, 5); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 18: - v1 = sub_0200B1EC(param0->unk_69C, 110 + param2); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 110 + param2); sub_0200B824(param0->unk_6A0, 1, 0); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 19: - v1 = sub_0200B1EC(param0->unk_69C, 110 + param2); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 110 + param2); sub_0200B824(param0->unk_6A0, 1, 1); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 20: - v1 = sub_0200B1EC(param0->unk_69C, 110 + param2); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 110 + param2); sub_0200B824(param0->unk_6A0, 1, 2); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 21: - v1 = sub_0200B1EC(param0->unk_69C, 110 + param2); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 110 + param2); sub_0200B824(param0->unk_6A0, 1, 3); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 22: - v1 = sub_0200B1EC(param0->unk_69C, 110 + param2); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 110 + param2); sub_0200B824(param0->unk_6A0, 1, 4); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 23: - v1 = sub_0200B1EC(param0->unk_69C, 110 + param2); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 110 + param2); sub_0200B824(param0->unk_6A0, 1, 5); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 25: case 26: - v1 = sub_0200B1EC(param0->unk_69C, 72); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 72); sub_0200B630(param0->unk_6A0, 0, param2); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 27: - sub_0200B1B8(param0->unk_69C, 69, param0->unk_6A4); + MessageLoader_GetStrbuf(param0->unk_69C, 69, param0->unk_6A4); break; default: - sub_0200B1B8(param0->unk_69C, 105, param0->unk_6A4); + MessageLoader_GetStrbuf(param0->unk_69C, 105, param0->unk_6A4); } } @@ -488,11 +488,11 @@ static int sub_020855C4 (void * param0) v3 = GetMonData(v1, MON_DATA_163, NULL); if (v0->unk_704[v0->unk_B11].unk_06 == 0) { - v2 = sub_0200B1EC(v0->unk_69C, 70); + v2 = MessageLoader_GetNewStrbuf(v0->unk_69C, 70); } else if (v0->unk_704[v0->unk_B11].unk_06 == v3) { - v2 = sub_0200B1EC(v0->unk_69C, 71); + v2 = MessageLoader_GetNewStrbuf(v0->unk_69C, 71); } else { - v2 = sub_0200B1EC(v0->unk_69C, 64); + v2 = MessageLoader_GetNewStrbuf(v0->unk_69C, 64); } sub_0200B5CC(v0->unk_6A0, 0, sub_02076B10(v1)); @@ -579,7 +579,7 @@ int sub_02085804 (UnkStruct_0207F248 * param0) param0->unk_B11 = sub_020857C0(param0, 0); if (param0->unk_B11 == 0xff) { - sub_0200B1B8(param0->unk_69C, 105, param0->unk_6A4); + MessageLoader_GetStrbuf(param0->unk_69C, 105, param0->unk_6A4); sub_02082708(param0, 0xffffffff, 1); param0->unk_B00 = sub_02085348; sub_0208327C(param0, 0, 1); @@ -597,7 +597,7 @@ int sub_02085804 (UnkStruct_0207F248 * param0) sub_02096954(v0, param0->unk_5A4->unk_24, 0, sub_02086930(param0), 12); v2 = GetMonData(v0, MON_DATA_163, NULL); - v1 = sub_0200B1EC(param0->unk_69C, 70); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 70); sub_0200B5CC(param0->unk_6A0, 0, sub_02076B10(v0)); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); @@ -680,7 +680,7 @@ static int sub_02085A70 (void * param0) v0->unk_704[v0->unk_B11].unk_06 = GetMonData(v1, MON_DATA_163, NULL); v0->unk_704[v0->unk_B11].unk_08 = GetMonData(v1, MON_DATA_164, NULL); - v2 = sub_0200B1EC(v0->unk_69C, 193); + v2 = MessageLoader_GetNewStrbuf(v0->unk_69C, 193); sub_0200B5CC(v0->unk_6A0, 0, sub_02076B10(v1)); sub_0200B60C(v0->unk_6A0, 1, v0->unk_704[v0->unk_B11].unk_0A, 3, 0, 1); @@ -753,7 +753,7 @@ static int sub_02085C50 (void * param0) sub_0200B5CC(v0->unk_6A0, 0, sub_02076B10(v1)); sub_0200B630(v0->unk_6A0, 1, v0->unk_5A4->unk_26); - v2 = sub_0200B1EC(v0->unk_69C, 52); + v2 = MessageLoader_GetNewStrbuf(v0->unk_69C, 52); sub_0200C388(v0->unk_6A0, v0->unk_6A4, v2); Strbuf_Free(v2); @@ -770,7 +770,7 @@ static int sub_02085C50 (void * param0) sub_0200B5CC(v0->unk_6A0, 0, sub_02076B10(v1)); sub_0200B630(v0->unk_6A0, 1, v0->unk_5A4->unk_26); - v2 = sub_0200B1EC(v0->unk_69C, 194); + v2 = MessageLoader_GetNewStrbuf(v0->unk_69C, 194); sub_0200C388(v0->unk_6A0, v0->unk_6A4, v2); Strbuf_Free(v2); @@ -791,7 +791,7 @@ static int sub_02085C50 (void * param0) if (Unk_021BF67C.unk_48 & (PAD_BUTTON_A | PAD_BUTTON_B)) { v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11); sub_02086590(v0, v1, v0->unk_5A4->unk_28); - v2 = sub_0200B1EC(v0->unk_69C, 61); + v2 = MessageLoader_GetNewStrbuf(v0->unk_69C, 61); sub_0200B630(v0->unk_6A0, 1, v0->unk_5A4->unk_26); sub_0200C388(v0->unk_6A0, v0->unk_6A4, v2); @@ -841,7 +841,7 @@ int sub_02085EF4 (UnkStruct_0207F248 * param0) } sub_0200B630(param0->unk_6A0, 1, GetMonData(v0, 54 + param0->unk_5A4->unk_28, NULL)); - v1 = sub_0200B1EC(param0->unk_69C, 60); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 60); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(param0, 0xffffffff, 1); @@ -858,7 +858,7 @@ static int sub_02085FB4 (void * param0) Strbuf* v1; v0 = param0; - v1 = sub_0200B1EC(v0->unk_69C, 59); + v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 59); sub_0200C388(v0->unk_6A0, v0->unk_6A4, v1); Strbuf_Free(v1); @@ -876,7 +876,7 @@ static int sub_02086008 (void * param0) Strbuf* v1; v0 = param0; - v1 = sub_0200B1EC(v0->unk_69C, 55); + v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 55); sub_0200C388(v0->unk_6A0, v0->unk_6A4, v1); Strbuf_Free(v1); @@ -895,7 +895,7 @@ static int sub_02086060 (void * param0) Strbuf* v1; v0 = param0; - v1 = sub_0200B1EC(v0->unk_69C, 58); + v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 58); sub_0200C388(v0->unk_6A0, v0->unk_6A4, v1); Strbuf_Free(v1); @@ -913,7 +913,7 @@ static int sub_020860AC (void * param0) Strbuf* v1; v0 = param0; - v1 = sub_0200B1EC(v0->unk_69C, 52); + v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 52); sub_0200C388(v0->unk_6A0, v0->unk_6A4, v1); Strbuf_Free(v1); @@ -972,7 +972,7 @@ int sub_0208615C (UnkStruct_0207F248 * param0) case 2: case 3: sub_02086590(param0, v0, v2); - v1 = sub_0200B1EC(param0->unk_69C, 61); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 61); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(param0, 0xffffffff, 1); @@ -980,7 +980,7 @@ int sub_0208615C (UnkStruct_0207F248 * param0) param0->unk_B0E = 25; break; case 0xfd: - v1 = sub_0200B1EC(param0->unk_69C, 63); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 63); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(param0, 0xffffffff, 1); @@ -988,7 +988,7 @@ int sub_0208615C (UnkStruct_0207F248 * param0) param0->unk_B0E = 25; break; case 0xfe: - v1 = sub_0200B1EC(param0->unk_69C, 52); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 52); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(param0, 0xffffffff, 1); @@ -998,7 +998,7 @@ int sub_0208615C (UnkStruct_0207F248 * param0) param0->unk_B0E = 26; break; case 0xff: - v1 = sub_0200B1EC(param0->unk_69C, 62); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 62); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(param0, 0xffffffff, 1); @@ -1025,7 +1025,7 @@ int sub_020862F8 (UnkStruct_0207F248 * param0) } sub_0200B630(param0->unk_6A0, 1, GetMonData(v0, 54 + param0->unk_5A4->unk_28, NULL)); - v1 = sub_0200B1EC(param0->unk_69C, 60); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 60); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(param0, 0xffffffff, 1); @@ -1043,7 +1043,7 @@ int sub_020863A0 (UnkStruct_0207F248 * param0) v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); sub_02086590(param0, v0, param0->unk_5A4->unk_28); - v1 = sub_0200B1EC(param0->unk_69C, 61); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 61); sub_0200B630(param0->unk_6A0, 1, param0->unk_5A4->unk_26); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); @@ -1064,7 +1064,7 @@ static int sub_02086438 (void * param0) Strbuf* v1; v0 = param0; - v1 = sub_0200B1EC(v0->unk_69C, 59); + v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 59); sub_0200C388(v0->unk_6A0, v0->unk_6A4, v1); Strbuf_Free(v1); @@ -1082,7 +1082,7 @@ static int sub_0208648C (void * param0) Strbuf* v1; v0 = param0; - v1 = sub_0200B1EC(v0->unk_69C, 55); + v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 55); sub_0200C388(v0->unk_6A0, v0->unk_6A4, v1); Strbuf_Free(v1); @@ -1101,7 +1101,7 @@ static int sub_020864E4 (void * param0) Strbuf* v1; v0 = param0; - v1 = sub_0200B1EC(v0->unk_69C, 58); + v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 58); sub_0200C388(v0->unk_6A0, v0->unk_6A4, v1); Strbuf_Free(v1); @@ -1119,7 +1119,7 @@ static int sub_02086538 (void * param0) Strbuf* v1; v0 = param0; - v1 = sub_0200B1EC(v0->unk_69C, 52); + v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 52); sub_0200C388(v0->unk_6A0, v0->unk_6A4, v1); Strbuf_Free(v1); @@ -1162,7 +1162,7 @@ static u8 sub_02086614 (UnkStruct_0207F248 * param0, u8 param1) v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); v2 = (u16)GetMonData(v0, MON_DATA_MOVE1 + param1, NULL); - v1 = sub_0200B1EC(param0->unk_69C, 162 + param1); + v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 162 + param1); sub_0200B630(param0->unk_6A0, 0, v2); sub_0200C388(param0->unk_6A0, param0->unk_6A8, v1); @@ -1239,7 +1239,7 @@ int sub_02086774 (UnkStruct_0207F248 * param0) sub_0207D60C(param0->unk_5A4->unk_04, param0->unk_5A4->unk_24, 1, 12); sub_02005748(1516); } else { - sub_0200B1B8(param0->unk_69C, 105, param0->unk_6A4); + MessageLoader_GetStrbuf(param0->unk_69C, 105, param0->unk_6A4); } sub_02082708(param0, 0xffffffff, 1); @@ -1258,10 +1258,10 @@ void sub_020868B0 (UnkStruct_0207F248 * param0) sub_0200E084(¶m0->unk_04[32], 1); if (param0->unk_704[param0->unk_B11].unk_0C == 0) { - sub_0200B1B8(param0->unk_69C, 127, param0->unk_6A4); + MessageLoader_GetStrbuf(param0->unk_69C, 127, param0->unk_6A4); sub_02083080(param0, param0->unk_B11); } else { - sub_0200B1B8(param0->unk_69C, 128, param0->unk_6A4); + MessageLoader_GetStrbuf(param0->unk_69C, 128, param0->unk_6A4); param0->unk_B11 = 7; } diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c index dc6b859210..2ec515b980 100644 --- a/src/unk_0208694C.c +++ b/src/unk_0208694C.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" @@ -97,9 +97,9 @@ struct UnkStruct_02087A10_t { UnkStruct_02018340 * unk_160; BOOL unk_164; UnkStruct_0200B358 * unk_168; - UnkStruct_0200B144 * unk_16C; - UnkStruct_0200B144 * unk_170; - UnkStruct_0200B144 * unk_174; + MessageLoader * unk_16C; + MessageLoader * unk_170; + MessageLoader * unk_174; Strbuf* unk_178; Strbuf* unk_17C; Strbuf* unk_180; @@ -912,9 +912,9 @@ static int sub_0208694C (UnkStruct_020067E8 * param0, int * param1) v1 = NARC_ctor(NARC_INDEX_DATA__NAMEIN, 18); v0->unk_168 = sub_0200B358(18); - v0->unk_16C = sub_0200B144(0, 26, 422, 18); - v0->unk_170 = sub_0200B144(1, 26, 427, 18); - v0->unk_174 = sub_0200B144(1, 26, 368, 18); + v0->unk_16C = MessageLoader_Init(0, 26, 422, 18); + v0->unk_170 = MessageLoader_Init(1, 26, 427, 18); + v0->unk_174 = MessageLoader_Init(1, 26, 368, 18); sub_02017DD4(4, 8); sub_020871CC(); @@ -1090,9 +1090,9 @@ static void sub_02086E6C (UnkStruct_02087A10 * param0, UnkStruct_0208737C * para Strbuf* v0; if (param0->unk_04 == 0) { - v0 = sub_0200B1EC(param0->unk_170, 0 + sub_0201D2E8() % 18); + v0 = MessageLoader_GetNewStrbuf(param0->unk_170, 0 + sub_0201D2E8() % 18); } else if (param0->unk_04 == 1) { - v0 = sub_0200B1EC(param0->unk_170, 18 + sub_0201D2E8() % 18); + v0 = MessageLoader_GetNewStrbuf(param0->unk_170, 18 + sub_0201D2E8() % 18); } Strbuf_Copy(param1->unk_18, v0); @@ -1101,7 +1101,7 @@ static void sub_02086E6C (UnkStruct_02087A10 * param0, UnkStruct_0208737C * para } else if (param0->unk_00 == 3) { Strbuf* v1; - v1 = sub_0200B1EC(param0->unk_170, 88 + (sub_0201D2E8() % 2)); + v1 = MessageLoader_GetNewStrbuf(param0->unk_170, 88 + (sub_0201D2E8() % 2)); Strbuf_Copy(param1->unk_18, v1); Strbuf_Free(v1); @@ -1194,9 +1194,9 @@ static int sub_02086F3C (UnkStruct_020067E8 * param0, int * param1) Strbuf_Free(v0->unk_178); Strbuf_Free(v0->unk_17C); - sub_0200B190(v0->unk_174); - sub_0200B190(v0->unk_170); - sub_0200B190(v0->unk_16C); + MessageLoader_Free(v0->unk_174); + MessageLoader_Free(v0->unk_170); + MessageLoader_Free(v0->unk_16C); sub_0200B3F0(v0->unk_168); sub_02006830(param0); sub_02017798(NULL, NULL); @@ -1431,7 +1431,7 @@ static void sub_0208737C (UnkStruct_02087A10 * param0, UnkStruct_020067E8 * para param0->unk_178 = sub_0200B29C(param0->unk_168, param0->unk_16C, Unk_020F2850[param0->unk_00], 18); param0->unk_17C = sub_0200B29C(param0->unk_168, param0->unk_16C, 8, 18); - param0->unk_184 = sub_0200B1EC(param0->unk_16C, 7); + param0->unk_184 = MessageLoader_GetNewStrbuf(param0->unk_16C, 7); param0->unk_158 = sub_020021F0(param0->unk_118); param0->unk_1C.unk_00 = 0; param0->unk_1C.unk_04 = 1; diff --git a/src/unk_0208A3F4.c b/src/unk_0208A3F4.c index 3f18ac28f1..6f60116672 100644 --- a/src/unk_0208A3F4.c +++ b/src/unk_0208A3F4.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012CE0_decl.h" @@ -706,11 +706,11 @@ void sub_0208B090 (UnkStruct_02089688 * param0, int param1, int param2, int para Strbuf* v3; int v4; int v5; - UnkStruct_0200B144 * v6; + MessageLoader * v6; UnkStruct_0205AA50 v7; - v6 = sub_0200B144(0, 26, 212, 101); - v3 = sub_0200B1EC(v6, 2 + param1); + v6 = MessageLoader_Init(0, 26, 212, 101); + v3 = MessageLoader_GetNewStrbuf(v6, 2 + param1); { sub_0201A7A0(&v7); @@ -745,7 +745,7 @@ void sub_0208B090 (UnkStruct_02089688 * param0, int param1, int param2, int para sub_02012AC0(param0->unk_2C0.unk_90[param1], param4); Strbuf_Free(v3); - sub_0200B190(v6); + MessageLoader_Free(v6); sub_0201A8FC(&v7); } @@ -761,18 +761,18 @@ void sub_0208B1C4 (UnkStruct_02018340 * param0, UnkStruct_0205AA50 * param1, int void sub_0208B230 (UnkStruct_0205AA50 * param0, int param1) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; Strbuf* v1; sub_0201ADA4(param0, 15); - v0 = sub_0200B144(0, 26, 212, 101); - v1 = sub_0200B1EC(v0, param1); + v0 = MessageLoader_Init(0, 26, 212, 101); + v1 = MessageLoader_GetNewStrbuf(v0, param1); sub_0201ADA4(param0, 15); sub_0201D738(param0, 1, v1, 0, 0, 0, NULL); sub_0201A954(param0); Strbuf_Free(v1); - sub_0200B190(v0); + MessageLoader_Free(v0); } diff --git a/src/unk_0208C324.c b/src/unk_0208C324.c index 4adbe53925..0bea4cd6b4 100644 --- a/src/unk_0208C324.c +++ b/src/unk_0208C324.c @@ -488,15 +488,15 @@ static void sub_0208C86C (void) static void sub_0208C884 (UnkStruct_0208D7BC * param0) { - param0->unk_688 = sub_0200B144(0, 26, 455, 19); - param0->unk_68C = sub_0200B144(1, 26, 535, 19); + param0->unk_688 = MessageLoader_Init(0, 26, 455, 19); + param0->unk_68C = MessageLoader_Init(1, 26, 535, 19); param0->unk_684 = sub_0200C440(1, 2, 0, 19); param0->unk_690 = sub_0200B358(19); param0->unk_250.unk_00 = Strbuf_Init(12, 19); param0->unk_250.unk_04 = Strbuf_Init(12, 19); param0->unk_250.unk_08 = Strbuf_Init(8, 19); param0->unk_694 = Strbuf_Init(128, 19); - param0->unk_69C = sub_0200B144(0, 26, 647, 19); + param0->unk_69C = MessageLoader_Init(0, 26, 647, 19); param0->unk_698 = Strbuf_Init(7 + 1, 19); if (param0->unk_24C->unk_08 != NULL) { @@ -506,9 +506,9 @@ static void sub_0208C884 (UnkStruct_0208D7BC * param0) static void sub_0208C950 (UnkStruct_0208D7BC * param0) { - sub_0200B190(param0->unk_69C); - sub_0200B190(param0->unk_68C); - sub_0200B190(param0->unk_688); + MessageLoader_Free(param0->unk_69C); + MessageLoader_Free(param0->unk_68C); + MessageLoader_Free(param0->unk_688); sub_0200C560(param0->unk_684); sub_0200B3F0(param0->unk_690); Strbuf_Free(param0->unk_250.unk_00); @@ -1032,15 +1032,15 @@ static void sub_0208D200 (UnkStruct_0208D7BC * param0, Pokemon * param1, UnkStru v0 = sub_02076B10(param1); - sub_0200B1B8(param0->unk_688, 11, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_688, 11, param0->unk_694); sub_0200B538(param0->unk_690, 0, v0); sub_0200C388(param0->unk_690, param0->unk_250.unk_00, param0->unk_694); - sub_0200B1B8(param0->unk_688, 0, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_688, 0, param0->unk_694); sub_0200B5CC(param0->unk_690, 0, v0); sub_0200C388(param0->unk_690, param0->unk_250.unk_04, param0->unk_694); - sub_0200B1B8(param0->unk_688, 14, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_688, 14, param0->unk_694); sub_0200B5EC(param0->unk_690, 0, v0); sub_0200C388(param0->unk_690, param0->unk_250.unk_08, param0->unk_694); diff --git a/src/unk_0208FCF8.c b/src/unk_0208FCF8.c index d06b9d70b6..531be59dfb 100644 --- a/src/unk_0208FCF8.c +++ b/src/unk_0208FCF8.c @@ -1,8 +1,6 @@ #include #include -#include "struct_decls/struct_0200B144_decl.h" -#include "strbuf.h" #include "struct_defs/pokemon.h" #include "struct_defs/struct_0205AA50.h" @@ -249,10 +247,10 @@ void sub_0208FEA4 (UnkStruct_0208D7BC * param0) if (param0->unk_250.unk_12_7 == 0) { if (param0->unk_250.unk_13_0 == 0) { - sub_0200B1B8(param0->unk_688, 1, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_688, 1, param0->unk_694); sub_020900D8(param0, v0, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0))), 1); } else if (param0->unk_250.unk_13_0 == 1) { - sub_0200B1B8(param0->unk_688, 2, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_688, 2, param0->unk_694); sub_020900D8(param0, v0, ((u32)(((5 & 0xff) << 16) | ((6 & 0xff) << 8) | ((0 & 0xff) << 0))), 1); } } @@ -272,7 +270,7 @@ void sub_0208FF3C (UnkStruct_0208D7BC * param0) if (param0->unk_250.unk_50_28 == 0) { sub_0200C578(param0->unk_684, 1, v0, 0, 5); - v1 = sub_0200B1EC(param0->unk_688, 3); + v1 = MessageLoader_GetNewStrbuf(param0->unk_688, 3); sub_0200B60C(param0->unk_690, 0, param0->unk_250.unk_12_0, 3, 0, 1); sub_0200C388(param0->unk_690, param0->unk_694, v1); @@ -291,11 +289,11 @@ void sub_0208FFE0 (UnkStruct_0208D7BC * param0) if (param0->unk_250.unk_0E != 0) { sub_0200B70C(param0->unk_690, 0, param0->unk_250.unk_0E); - v0 = sub_0200B1EC(param0->unk_688, 5); + v0 = MessageLoader_GetNewStrbuf(param0->unk_688, 5); sub_0200C388(param0->unk_690, param0->unk_694, v0); Strbuf_Free(v0); } else { - sub_0200B1B8(param0->unk_688, 6, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_688, 6, param0->unk_694); } sub_020900D8(param0, ¶m0->unk_04[32], ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 0); @@ -350,7 +348,7 @@ static void sub_02090158 (UnkStruct_0208D7BC * param0, u32 param1, u32 param2, u u8 v1; u8 v2; - sub_0200B1B8(param0->unk_688, param2, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_688, param2, param0->unk_694); sub_020900D8(param0, ¶m0->unk_04[param1], param3, param4); } @@ -358,7 +356,7 @@ static void sub_02090184 (UnkStruct_0208D7BC * param0, u32 param1, u32 param2, u { Strbuf* v0; - v0 = sub_0200B1EC(param0->unk_688, param1); + v0 = MessageLoader_GetNewStrbuf(param0->unk_688, param1); sub_0200B60C(param0->unk_690, 0, param2, param3, param4, 1); sub_0200C388(param0->unk_690, param0->unk_694, v0); Strbuf_Free(v0); @@ -373,7 +371,7 @@ static void sub_020901D0 (UnkStruct_0208D7BC * param0, u32 param1, u32 param2, u v0 = ¶m0->unk_244[param1]; - sub_0200B1B8(param0->unk_688, param2, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_688, param2, param0->unk_694); v1 = sub_02002D7C(0, param0->unk_694, 0); v2 = param8 - v1 / 2; v3 = v2 + v1; @@ -414,7 +412,7 @@ static void sub_020902B0 (UnkStruct_0208D7BC * param0) sub_02090158(param0, 22, 127, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), 0); { - sub_0200B1B8(param0->unk_688, 146, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_688, 146, param0->unk_694); sub_0201D78C(¶m0->unk_04[24], 0, param0->unk_694, 0, 2, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } @@ -485,7 +483,7 @@ static void sub_02090578 (UnkStruct_0208D7BC * param0) if (v0 != 0) { sub_02090184(param0, 9, v0, 3, 2); } else { - sub_0200B1B8(param0->unk_688, 22, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_688, 22, param0->unk_694); } } @@ -626,19 +624,19 @@ static void sub_0209093C (UnkStruct_0208D7BC * param0) sub_020900D8(param0, ¶m0->unk_244[5], ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 1); { - UnkStruct_0200B144 * v1; + MessageLoader * v1; Strbuf* v2; sub_0200B6A0(param0->unk_690, 0, param0->unk_250.unk_32); - v2 = sub_0200B1EC(param0->unk_688, 125); + v2 = MessageLoader_GetNewStrbuf(param0->unk_688, 125); sub_0200C388(param0->unk_690, param0->unk_694, v2); Strbuf_Free(v2); sub_020900D8(param0, ¶m0->unk_244[6], ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 0); - v1 = sub_0200B144(1, 26, 612, 19); - sub_0200B1B8(v1, param0->unk_250.unk_32, param0->unk_694); - sub_0200B190(v1); + v1 = MessageLoader_Init(1, 26, 612, 19); + MessageLoader_GetStrbuf(v1, param0->unk_250.unk_32, param0->unk_694); + MessageLoader_Free(v1); sub_020900D8(param0, ¶m0->unk_244[7], ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 0); } @@ -662,15 +660,15 @@ static void sub_02090BDC (UnkStruct_0208D7BC * param0) } sub_0201ADA4(¶m0->unk_244[1], 0); - sub_0200B1B8(param0->unk_688, 165, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_688, 165, param0->unk_694); sub_020900D8(param0, ¶m0->unk_244[1], ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), 0); - sub_0200B1B8(param0->unk_688, 166 + param0->unk_250.unk_4B, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_688, 166 + param0->unk_250.unk_4B, param0->unk_694); sub_0201D78C(¶m0->unk_244[1], 0, param0->unk_694, 0, 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_0201A9A4(¶m0->unk_244[1]); if (param0->unk_24C->unk_12 == 3) { sub_0201ADA4(¶m0->unk_244[0], 0); - sub_0200B1B8(param0->unk_688, 163, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_688, 163, param0->unk_694); sub_020900D8(param0, ¶m0->unk_244[0], ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), 0); sub_0201A9A4(¶m0->unk_244[0]); sub_0208F6DC(param0, ¶m0->unk_244[0]); @@ -761,10 +759,10 @@ static void sub_02090EC8 (UnkStruct_0208D7BC * param0) sub_0201ADA4(¶m0->unk_244[1], 0); - sub_0200B1B8(param0->unk_688, 165, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_688, 165, param0->unk_694); sub_020900D8(param0, ¶m0->unk_244[1], ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), 0); - sub_0200B1B8(param0->unk_688, 166 + param0->unk_250.unk_4B, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_688, 166 + param0->unk_250.unk_4B, param0->unk_694); sub_0201D78C(¶m0->unk_244[1], 0, param0->unk_694, 0, 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_0201A9A4(¶m0->unk_244[1]); @@ -778,7 +776,7 @@ void sub_02090F84 (UnkStruct_0208D7BC * param0) sub_0201ADA4(¶m0->unk_244[1], 0); - v0 = sub_0200B1EC(param0->unk_688, 186); + v0 = MessageLoader_GetNewStrbuf(param0->unk_688, 186); sub_0200B60C(param0->unk_690, 0, param0->unk_6B1, 3, 0, 1); sub_0200C388(param0->unk_690, param0->unk_694, v0); @@ -789,14 +787,14 @@ void sub_02090F84 (UnkStruct_0208D7BC * param0) sub_0201D78C(¶m0->unk_244[1], 0, param0->unk_694, v1, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); - v0 = sub_0200B1EC(param0->unk_688, 185); + v0 = MessageLoader_GetNewStrbuf(param0->unk_688, 185); v2 = sub_02002D7C(0, v0, 0); v1 -= v2; sub_0201D78C(¶m0->unk_244[1], 0, v0, v1, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); - v0 = sub_0200B1EC(param0->unk_688, 184); + v0 = MessageLoader_GetNewStrbuf(param0->unk_688, 184); sub_0200B60C(param0->unk_690, 0, param0->unk_6AF + param0->unk_6B0 * 4 + 1, 3, 0, 1); sub_0200C388(param0->unk_690, param0->unk_694, v0); @@ -814,10 +812,10 @@ void sub_020910E4 (UnkStruct_0208D7BC * param0) sub_0201ADA4(¶m0->unk_244[2], 0); sub_0201ADA4(¶m0->unk_244[3], 0); - sub_0200B1B8(param0->unk_68C, sub_020923C0(param0->unk_6B2, 3), param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_68C, sub_020923C0(param0->unk_6B2, 3), param0->unk_694); sub_020900D8(param0, ¶m0->unk_244[2], ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), 0); - sub_0200B1B8(param0->unk_68C, sub_02092424(param0->unk_24C->unk_20, param0->unk_6B2), param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_68C, sub_02092424(param0->unk_24C->unk_20, param0->unk_6B2), param0->unk_694); sub_020900D8(param0, ¶m0->unk_244[3], ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 0); sub_0201A9A4(¶m0->unk_244[2]); @@ -844,15 +842,15 @@ static void sub_02091188 (UnkStruct_0208D7BC * param0, u32 param1) v5 = v4; } - sub_0200B1B8(param0->unk_69C, v3, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_69C, v3, param0->unk_694); sub_0201D78C(v0, 0, param0->unk_694, 1, 2, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); if (v3 != 0) { - sub_0200B1B8(param0->unk_688, 135, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_688, 135, param0->unk_694); sub_0201D78C(v0, 0, param0->unk_694, 16, 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_020901D0(param0, 0 + param1, 117, 136 + param1, 141 + param1, v4, v5, 2, (40 + 20), 16); } else { - sub_0200B1B8(param0->unk_688, 153, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_688, 153, param0->unk_694); v2 = sub_02002D7C(0, param0->unk_694, 0); sub_0201D78C(v0, 0, param0->unk_694, (40 + 20) - v2 / 2, 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } @@ -860,7 +858,7 @@ static void sub_02091188 (UnkStruct_0208D7BC * param0, u32 param1) void sub_020912A4 (UnkStruct_0208D7BC * param0, u32 param1) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; u32 v1; u32 v2; @@ -875,7 +873,7 @@ void sub_020912A4 (UnkStruct_0208D7BC * param0, u32 param1) v2 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_POWER); if (v2 <= 1) { - sub_0200B1B8(param0->unk_688, 154, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_688, 154, param0->unk_694); } else { sub_02090184(param0, 150, v2, 3, 1); } @@ -885,18 +883,18 @@ void sub_020912A4 (UnkStruct_0208D7BC * param0, u32 param1) v2 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_ACCURACY); if (v2 == 0) { - sub_0200B1B8(param0->unk_688, 154, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_688, 154, param0->unk_694); } else { sub_02090184(param0, 151, v2, 3, 1); } sub_020900D8(param0, ¶m0->unk_244[6], ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 2); - v0 = sub_0200B144(1, 26, 646, 19); + v0 = MessageLoader_Init(1, 26, 646, 19); - sub_0200B1B8(v0, param1, param0->unk_694); + MessageLoader_GetStrbuf(v0, param1, param0->unk_694); sub_020900D8(param0, ¶m0->unk_244[7], ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 0); - sub_0200B190(v0); + MessageLoader_Free(v0); sub_0201A9A4(¶m0->unk_244[5]); sub_0201A9A4(¶m0->unk_244[6]); @@ -956,14 +954,14 @@ void sub_020914F8 (UnkStruct_0208D7BC * param0) } sub_0201ADA4(v0, 0); - sub_0200B1B8(param0->unk_688, 156, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_688, 156, param0->unk_694); sub_020900D8(param0, v0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 0); sub_0201A9A4(v0); } void sub_02091570 (UnkStruct_0208D7BC * param0, u32 param1) { - UnkStruct_0200B144 * v0; + MessageLoader * v0; u32 v1; u32 v2; @@ -971,12 +969,12 @@ void sub_02091570 (UnkStruct_0208D7BC * param0, u32 param1) v1 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_CONTEST_EFFECT); v2 = sub_0209577C(v1); - v0 = sub_0200B144(0, 26, 210, 19); + v0 = MessageLoader_Init(0, 26, 210, 19); - sub_0200B1B8(v0, v2, param0->unk_694); + MessageLoader_GetStrbuf(v0, v2, param0->unk_694); sub_0201D78C(¶m0->unk_244[5], 0, param0->unk_694, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); - sub_0200B190(v0); + MessageLoader_Free(v0); sub_0201A9A4(¶m0->unk_04[29]); sub_0201A9A4(¶m0->unk_244[5]); @@ -1020,7 +1018,7 @@ void sub_02091610 (UnkStruct_0208D7BC * param0, u8 param1) sub_0200E060(v0, 1, (1024 - (18 + 12)), 13); sub_0201ADA4(v0, 15); - sub_0200B1B8(param0->unk_688, v1, param0->unk_694); + MessageLoader_GetStrbuf(param0->unk_688, v1, param0->unk_694); sub_0201D78C(v0, 1, param0->unk_694, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); sub_0201A9A4(v0); } diff --git a/src/unk_02092494.c b/src/unk_02092494.c index 4f92d537c0..933d530cd2 100644 --- a/src/unk_02092494.c +++ b/src/unk_02092494.c @@ -38,7 +38,7 @@ UnkStruct_02090800 * sub_02092494 (Pokemon * param0, BOOL param1, int param2) v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_02090800)); v0->unk_00 = param2; - v0->unk_04 = sub_0200B144(1, 26, 455, v0->unk_00); + v0->unk_04 = MessageLoader_Init(1, 26, 455, v0->unk_00); v0->unk_08 = sub_0200B368(9, 32, v0->unk_00); v0->unk_0C = param0; v0->unk_10 = param1; @@ -314,7 +314,7 @@ void sub_0209282C (UnkStruct_02090800 * param0) } sub_0200B3F0(param0->unk_08); - sub_0200B190(param0->unk_04); + MessageLoader_Free(param0->unk_04); Heap_FreeToHeap(param0); } @@ -327,7 +327,7 @@ static void sub_02092878 (UnkStruct_02090800 * param0) } param0->unk_14.unk_04 = Strbuf_Init(((2 * 18) * 2), param0->unk_00); - sub_0200B1B8(param0->unk_04, (24 + v0), param0->unk_14.unk_04); + MessageLoader_GetStrbuf(param0->unk_04, (24 + v0), param0->unk_14.unk_04); } static void sub_020928A0 (UnkStruct_02090800 * param0, int param1) @@ -336,7 +336,7 @@ static void sub_020928A0 (UnkStruct_02090800 * param0, int param1) param0->unk_1C.unk_04 = Strbuf_Init((((2 * 18) * 2) * 8), param0->unk_00); - sub_0200B1B8(param0->unk_04, param1, v0); + MessageLoader_GetStrbuf(param0->unk_04, param1, v0); sub_0200B60C(param0->unk_08, 0, GetMonData(param0->unk_0C, MON_DATA_149, NULL), 2, 2, 1); sub_0200C2E0(param0->unk_08, 1, GetMonData(param0->unk_0C, MON_DATA_150, NULL)); sub_0200B60C(param0->unk_08, 2, GetMonData(param0->unk_0C, MON_DATA_151, NULL), 2, 0, 1); @@ -356,7 +356,7 @@ static void sub_020929C0 (UnkStruct_02090800 * param0, int param1) param0->unk_1C.unk_04 = Strbuf_Init((((2 * 18) * 2) * 4), param0->unk_00); - sub_0200B1B8(param0->unk_04, param1, v0); + MessageLoader_GetStrbuf(param0->unk_04, param1, v0); sub_0200B60C(param0->unk_08, 0, GetMonData(param0->unk_0C, MON_DATA_149, NULL), 2, 2, 1); sub_0200C2E0(param0->unk_08, 1, GetMonData(param0->unk_0C, MON_DATA_150, NULL)); sub_0200B60C(param0->unk_08, 2, GetMonData(param0->unk_0C, MON_DATA_151, NULL), 2, 0, 1); @@ -399,7 +399,7 @@ static void sub_02092B1C (UnkStruct_02090800 * param0, int param1, int param2) param0->unk_1C.unk_04 = Strbuf_Init((((2 * 18) * 2) * 5), param0->unk_00); - sub_0200B1B8(param0->unk_04, param1, v0); + MessageLoader_GetStrbuf(param0->unk_04, param1, v0); if (param2 == 0) { sub_0200B60C(param0->unk_08, 5, GetMonData(param0->unk_0C, MON_DATA_146, NULL), 2, 2, 1); @@ -589,7 +589,7 @@ static void sub_02092C24 (UnkStruct_02090800 * param0) } v4 = Unk_020F5578[v1][(v2 % 5)]; - sub_0200B1B8(param0->unk_04, v4, param0->unk_24.unk_04); + MessageLoader_GetStrbuf(param0->unk_04, v4, param0->unk_24.unk_04); } static const u16 Unk_020F556C[6] = { @@ -615,7 +615,7 @@ static void sub_02092E10 (UnkStruct_02090800 * param0) } v2 = Unk_020F556C[v1]; - sub_0200B1B8(param0->unk_04, v2, param0->unk_2C.unk_04); + MessageLoader_GetStrbuf(param0->unk_04, v2, param0->unk_2C.unk_04); } static void sub_02092E4C (UnkStruct_02090800 * param0) @@ -635,7 +635,7 @@ static void sub_02092E4C (UnkStruct_02090800 * param0) v1 = 108; } - sub_0200B1B8(param0->unk_04, v1, param0->unk_34.unk_04); + MessageLoader_GetStrbuf(param0->unk_04, v1, param0->unk_34.unk_04); } static int sub_02092E8C (Pokemon * param0, BOOL param1, int param2) diff --git a/src/unk_02094EDC.c b/src/unk_02094EDC.c index fa0848e2e4..b187d916e0 100644 --- a/src/unk_02094EDC.c +++ b/src/unk_02094EDC.c @@ -3,8 +3,6 @@ #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02007C7C_decl.h" -#include "struct_decls/struct_0200B144_decl.h" -#include "strbuf.h" #include "struct_defs/pokemon.h" #include "struct_defs/struct_02008A90.h" @@ -633,18 +631,18 @@ void sub_02095380 (const UnkStruct_ov6_02248BE8 * param0, Pokemon * param1, int { Strbuf* v3, * v4; - UnkStruct_0200B144 * v5; + MessageLoader * v5; - v5 = sub_0200B144(1, 26, 205, param2); - v3 = sub_0200B1EC(v5, param0->unk_16); - v4 = sub_0200B1EC(v5, param0->unk_18); + v5 = MessageLoader_Init(1, 26, 205, param2); + v3 = MessageLoader_GetNewStrbuf(v5, param0->unk_16); + v4 = MessageLoader_GetNewStrbuf(v5, param0->unk_18); sub_02074B30(param1, 119, v3); sub_02074B30(param1, 145, v4); Strbuf_Free(v3); Strbuf_Free(v4); - sub_0200B190(v5); + MessageLoader_Free(v5); } { diff --git a/src/unk_02099DFC.c b/src/unk_02099DFC.c index cd67528b0e..171daed460 100644 --- a/src/unk_02099DFC.c +++ b/src/unk_02099DFC.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_020067E8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" #include "struct_decls/struct_021C0794_decl.h" @@ -44,7 +44,7 @@ typedef struct { int unk_0C; Strbuf* unk_10; UnkStruct_02018340 * unk_14; - UnkStruct_0200B144 * unk_18; + MessageLoader * unk_18; UnkStruct_0205AA50 unk_1C; UnkStruct_02001AF4 * unk_2C; UnkStruct_021C0794 * unk_30; @@ -252,7 +252,7 @@ static void sub_0209A044 (UnkStruct_02099DFC * param0) static void sub_0209A098 (UnkStruct_02099DFC * param0) { - param0->unk_18 = sub_0200B144(1, 26, 4, param0->unk_00); + param0->unk_18 = MessageLoader_Init(1, 26, 4, param0->unk_00); sub_0201D710(); param0->unk_08 = 0; sub_0201A8D4(param0->unk_14, ¶m0->unk_1C, &Unk_020F89E4); @@ -262,7 +262,7 @@ static void sub_0209A098 (UnkStruct_02099DFC * param0) static void sub_0209A0E0 (UnkStruct_02099DFC * param0) { sub_0201A8FC(¶m0->unk_1C); - sub_0200B190(param0->unk_18); + MessageLoader_Free(param0->unk_18); } static BOOL sub_0209A0F4 (UnkStruct_02099DFC * param0) @@ -339,7 +339,7 @@ static BOOL sub_0209A200 (UnkStruct_02099DFC * param0, u32 param1, int param2, i sub_0200E060(¶m0->unk_1C, 0, 512 - (18 + 12), 2); param0->unk_10 = Strbuf_Init(0x400, param0->unk_00); - sub_0200B1B8(param0->unk_18, param1, param0->unk_10); + MessageLoader_GetStrbuf(param0->unk_18, param1, param0->unk_10); param0->unk_0C = sub_0201D738(¶m0->unk_1C, 1, param0->unk_10, 0, 0, param3, NULL); if (param3 == 0) { diff --git a/src/unk_0209A2C4.c b/src/unk_0209A2C4.c index f7510aec08..8d5733d103 100644 --- a/src/unk_0209A2C4.c +++ b/src/unk_0209A2C4.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_020067E8_decl.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" #include "struct_decls/struct_021C0794_decl.h" @@ -42,7 +42,7 @@ typedef struct { int unk_10; Strbuf* unk_14; UnkStruct_02018340 * unk_18; - UnkStruct_0200B144 * unk_1C; + MessageLoader * unk_1C; UnkStruct_0205AA50 unk_20; UnkStruct_02001AF4 * unk_30; UnkStruct_021C0794 * unk_34; @@ -218,7 +218,7 @@ static void sub_0209A490 (UnkStruct_0209A3D0 * param0) static void sub_0209A4E4 (UnkStruct_0209A3D0 * param0) { - param0->unk_1C = sub_0200B144(1, 26, 406, param0->unk_00); + param0->unk_1C = MessageLoader_Init(1, 26, 406, param0->unk_00); sub_0201D710(); param0->unk_0C = 0; @@ -229,7 +229,7 @@ static void sub_0209A4E4 (UnkStruct_0209A3D0 * param0) static void sub_0209A530 (UnkStruct_0209A3D0 * param0) { sub_0201A8FC(¶m0->unk_20); - sub_0200B190(param0->unk_1C); + MessageLoader_Free(param0->unk_1C); } static BOOL sub_0209A544 (UnkStruct_0209A3D0 * param0) @@ -315,7 +315,7 @@ static BOOL sub_0209A688 (UnkStruct_0209A3D0 * param0, u32 param1, int param2, i sub_0200E060(¶m0->unk_20, 0, 512 - (18 + 12), 2); param0->unk_14 = Strbuf_Init(0x400, param0->unk_00); - sub_0200B1B8(param0->unk_1C, param1, param0->unk_14); + MessageLoader_GetStrbuf(param0->unk_1C, param1, param0->unk_14); param0->unk_10 = sub_0201D738(¶m0->unk_20, 1, param0->unk_14, 0, 0, param3, NULL); if (param3 == 0) { diff --git a/src/unk_0209A74C.c b/src/unk_0209A74C.c index acf26ca65e..7c32511ec8 100644 --- a/src/unk_0209A74C.c +++ b/src/unk_0209A74C.c @@ -3,7 +3,7 @@ #include "data_021BF67C.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" @@ -77,7 +77,7 @@ void sub_0209A74C (int param0) { UnkStruct_02018340 * v0; UnkStruct_0205AA50 v1; - UnkStruct_0200B144 * v2; + MessageLoader * v2; Strbuf* v3; int v4 = 0; @@ -112,14 +112,14 @@ void sub_0209A74C (int param0) sub_0201975C(0, 27681); sub_0201975C(4, 27681); - v2 = sub_0200B144(1, 26, 5, param0); + v2 = MessageLoader_Init(1, 26, 5, param0); v3 = Strbuf_Init(384, param0); sub_0201D710(); sub_0201A8D4(v0, &v1, &Unk_020F8AC4); sub_0201AE78(&v1, 15, 0, 0, 26 * 8, 18 * 8); sub_0200DC48(&v1, 0, 512 - 9, 2); - sub_0200B1B8(v2, v4, v3); + MessageLoader_GetStrbuf(v2, v4, v3); sub_0201D738(&v1, 0, v3, 0, 0, 0, NULL); Strbuf_Free(v3); GXLayers_TurnBothDispOn(); @@ -133,7 +133,7 @@ void sub_0209A74C (int param0) } sub_0201A8FC(&v1); - sub_0200B190(v2); + MessageLoader_Free(v2); sub_02019120(0, 0); sub_02019120(1, 0); sub_02019120(2, 0); @@ -152,7 +152,7 @@ void sub_0209A8E0 (int param0) { UnkStruct_02018340 * v0; UnkStruct_0205AA50 v1; - UnkStruct_0200B144 * v2; + MessageLoader * v2; Strbuf* v3; int v4 = 1; @@ -186,14 +186,14 @@ void sub_0209A8E0 (int param0) sub_0201975C(0, 0x6c21); sub_0201975C(4, 0x6c21); - v2 = sub_0200B144(1, 26, 5, param0); + v2 = MessageLoader_Init(1, 26, 5, param0); v3 = Strbuf_Init(0x180, param0); sub_0201D710(); sub_0201A8D4(v0, &v1, &Unk_020F8AC4); sub_0201AE78(&v1, 15, 0, 0, 26 * 8, 18 * 8); sub_0200DC48(&v1, 0, (512 - 9), 2); - sub_0200B1B8(v2, v4, v3); + MessageLoader_GetStrbuf(v2, v4, v3); sub_0201D738(&v1, 0, v3, 0, 0, 0, NULL); Strbuf_Free(v3); GXLayers_TurnBothDispOn(); @@ -207,7 +207,7 @@ void sub_0209A8E0 (int param0) } sub_0201A8FC(&v1); - sub_0200B190(v2); + MessageLoader_Free(v2); sub_02019120(0, 0); sub_02019120(1, 0); sub_02019120(2, 0); diff --git a/src/unk_0209AA74.c b/src/unk_0209AA74.c index 408c717cc8..01d142db8b 100644 --- a/src/unk_0209AA74.c +++ b/src/unk_0209AA74.c @@ -3,7 +3,7 @@ #include "data_021BF67C.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" @@ -79,7 +79,7 @@ void sub_0209AA74 (int param0, int param1) { UnkStruct_02018340 * v0; UnkStruct_0205AA50 v1; - UnkStruct_0200B144 * v2; + MessageLoader * v2; Strbuf* v3; int v4; @@ -122,14 +122,14 @@ void sub_0209AA74 (int param0, int param1) sub_0201975C(0, 0x6c21); sub_0201975C(4, 0x6c21); - v2 = sub_0200B144(1, 26, 6, param0); + v2 = MessageLoader_Init(1, 26, 6, param0); v3 = Strbuf_Init(0x180, param0); sub_0201D710(); sub_0201A8D4(v0, &v1, &Unk_020F8B20); sub_0201AE78(&v1, 15, 0, 0, 26 * 8, 18 * 8); sub_0200DC48(&v1, 0, (512 - 9), 2); - sub_0200B1B8(v2, v4, v3); + MessageLoader_GetStrbuf(v2, v4, v3); sub_0201D738(&v1, 0, v3, 0, 0, 0, NULL); Strbuf_Free(v3); GXLayers_TurnBothDispOn(); @@ -143,7 +143,7 @@ void sub_0209AA74 (int param0, int param1) } sub_0201A8FC(&v1); - sub_0200B190(v2); + MessageLoader_Free(v2); sub_02019120(0, 0); sub_02019120(1, 0); sub_02019120(2, 0); diff --git a/src/unk_0209ACF4.c b/src/unk_0209ACF4.c index add4e95ec4..e221483ef8 100644 --- a/src/unk_0209ACF4.c +++ b/src/unk_0209ACF4.c @@ -3,7 +3,7 @@ #include "data_021BF67C.h" -#include "struct_decls/struct_0200B144_decl.h" +#include "unk_0200AC5C.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_020149F0_decl.h" #include "strbuf.h" @@ -39,7 +39,7 @@ typedef struct { Strbuf* unk_04; Strbuf* unk_08; UnkStruct_0200B358 * unk_0C; - UnkStruct_0200B144 * unk_10; + MessageLoader * unk_10; UnkStruct_020149F0 * unk_14; UnkStruct_0205AA50 unk_18; UnkStruct_0205AA50 unk_28; @@ -75,7 +75,7 @@ void sub_0209ACF4 (UnkStruct_020508D4 * param0) v1->unk_04 = Strbuf_Init(400, 32); v1->unk_08 = Strbuf_Init(400, 32); v1->unk_0C = sub_0200B358(32); - v1->unk_10 = sub_0200B144(1, 26, 420, 32); + v1->unk_10 = MessageLoader_Init(1, 26, 420, 32); v1->unk_14 = sub_020149F0(32); v1->unk_50 = sub_0209747C(2, 0, v1->unk_00->unk_0C, 32); @@ -96,7 +96,7 @@ static void sub_0209AD84 (UnkStruct_0209AD84 * param0) Strbuf_Free(param0->unk_04); Strbuf_Free(param0->unk_08); sub_0200B3F0(param0->unk_0C); - sub_0200B190(param0->unk_10); + MessageLoader_Free(param0->unk_10); sub_0209ADBC(param0); Heap_FreeToHeap(param0); } @@ -265,10 +265,10 @@ static void sub_0209B084 (UnkStruct_0209AD84 * param0, int param1, BOOL param2) UnkStruct_0205AA50 * v0 = &(param0->unk_18); if (param2) { - sub_0200B1B8(param0->unk_10, param1, param0->unk_04); + MessageLoader_GetStrbuf(param0->unk_10, param1, param0->unk_04); sub_0200C388(param0->unk_0C, param0->unk_08, param0->unk_04); } else { - sub_0200B1B8(param0->unk_10, param1, param0->unk_08); + MessageLoader_GetStrbuf(param0->unk_10, param1, param0->unk_08); } if (sub_0201A7CC(v0) == 0) { @@ -308,7 +308,7 @@ static void sub_0209B12C (UnkStruct_0209AD84 * param0) sub_0201ADA4(v0, 15); for (v1 = 0; v1 < 5; v1++) { - sub_0200B1B8(param0->unk_10, 9 + v1, param0->unk_08); + MessageLoader_GetStrbuf(param0->unk_10, 9 + v1, param0->unk_08); sub_0201D738(v0, 0, param0->unk_08, 12, v1 * 16, 0xff, NULL); } @@ -340,7 +340,7 @@ static void sub_0209B1D8 (UnkStruct_0209AD84 * param0) sub_0201ADA4(v0, 15); for (v1 = 0; v1 < 2; v1++) { - sub_0200B1B8(param0->unk_10, v1 + 14, param0->unk_08); + MessageLoader_GetStrbuf(param0->unk_10, v1 + 14, param0->unk_08); sub_0201D738(v0, 0, param0->unk_08, 12, v1 * 16, 0xff, NULL); }