From 4739e0ed14d71e40a8189677bd04cfdef2e7f855 Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 26 Jan 2024 20:43:50 -0800 Subject: [PATCH] Label + document ChatotCry struct --- include/overlay006/battle_params.h | 4 +- include/overlay016/ov16_0223DF00.h | 4 +- include/overlay016/struct_ov16_02264408.h | 4 +- include/pokemon.h | 6 +-- include/struct_decls/struct_0202CC84_decl.h | 6 --- include/struct_defs/battle_system.h | 4 +- include/struct_defs/chatot_cry.h | 11 +++++ include/struct_defs/struct_02095E80_t.h | 4 +- include/struct_defs/struct_02098D38.h | 4 +- include/unk_02003B60.h | 4 +- include/unk_02006224.h | 14 +++---- include/unk_0202CC64.h | 18 ++++---- include/unk_02051D8C.h | 4 +- src/overlay005/ov5_021E622C.c | 4 +- src/overlay012/ov12_0221FC20.c | 4 +- src/overlay016/ov16_0223DF00.c | 6 +-- src/overlay019/ov19_021D0D80.c | 4 +- src/overlay088/ov88_0223B140.c | 10 ++--- src/overlay094/ov94_02242AD0.c | 4 +- src/pokemon.c | 6 +-- src/unk_02003B60.c | 10 ++--- src/unk_02005474.c | 6 +-- src/unk_02006224.c | 30 +++++++------- src/unk_0202CC64.c | 46 ++++++++++----------- src/unk_02051D8C.c | 10 ++--- src/unk_0207A6DC.c | 6 +-- 26 files changed, 117 insertions(+), 116 deletions(-) delete mode 100644 include/struct_decls/struct_0202CC84_decl.h create mode 100644 include/struct_defs/chatot_cry.h diff --git a/include/overlay006/battle_params.h b/include/overlay006/battle_params.h index 2eb07f5f36..311ccd1ba9 100644 --- a/include/overlay006/battle_params.h +++ b/include/overlay006/battle_params.h @@ -7,7 +7,7 @@ #include "struct_decls/struct_02027F8C_decl.h" #include "struct_decls/struct_0202B628_decl.h" #include "struct_decls/struct_0202C878_decl.h" -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_02056B24_decl.h" #include "struct_decls/struct_0206D140_decl.h" @@ -31,7 +31,7 @@ typedef struct { UnkStruct_0207D99C * unk_E4; UnkStruct_02026324 * unk_E8; PCBoxes * unk_EC; - UnkStruct_0202CC84 * unk_F0[4]; + ChatotCry * unk_F0[4]; UnkStruct_02056B24 * unk_100; UnkStruct_0202C878 * unk_104; UnkStruct_020279FC * unk_108; diff --git a/include/overlay016/ov16_0223DF00.h b/include/overlay016/ov16_0223DF00.h index a4fe65c754..1d08b6b625 100644 --- a/include/overlay016/ov16_0223DF00.h +++ b/include/overlay016/ov16_0223DF00.h @@ -18,7 +18,7 @@ #include "trainer_info.h" #include "struct_decls/struct_02026324_decl.h" #include "struct_defs/struct_020279FC.h" -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include "struct_defs/struct_0205AA50.h" #include "pokemon.h" #include "struct_decls/struct_020797DC_decl.h" @@ -204,7 +204,7 @@ int ov16_0223EDE0(BattleSystem * param0); u8 BattleSystem_TextSpeed(BattleSystem * param0); int BattleSystem_Ruleset(BattleSystem * param0); PokemonAnimationSys * ov16_0223EE28(BattleSystem * param0); -UnkStruct_0202CC84 * BattleSystem_ChatotVoice(BattleSystem * param0, int param1); +ChatotCry * BattleSystem_ChatotVoice(BattleSystem * param0, int param1); void ov16_0223EE70(BattleSystem * param0); void ov16_0223EF2C(BattleSystem * param0, int param1, int param2); void ov16_0223EF48(BattleSystem * param0, Pokemon * param1); diff --git a/include/overlay016/struct_ov16_02264408.h b/include/overlay016/struct_ov16_02264408.h index 306bfe4de9..3d02198be3 100644 --- a/include/overlay016/struct_ov16_02264408.h +++ b/include/overlay016/struct_ov16_02264408.h @@ -5,7 +5,7 @@ #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include "overlay016/struct_ov16_0223E0C8.h" #include "overlay016/struct_ov16_02264408_sub1.h" @@ -25,7 +25,7 @@ typedef struct { u32 unk_4C[4]; int unk_50; UnkStruct_ov16_02264408_sub1 unk_54; - UnkStruct_0202CC84 * unk_6C; + ChatotCry * unk_6C; u8 * unk_70; u16 * unk_74; } UnkStruct_ov16_02264408; diff --git a/include/pokemon.h b/include/pokemon.h index bb9e6026df..88ddd97972 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -11,7 +11,7 @@ #include "struct_decls/cell_actor_data.h" #include "struct_decls/pokemon_animation_sys_decl.h" #include "trainer_info.h" -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include "struct_decls/struct_02078B40_decl.h" #include "struct_decls/struct_party_decl.h" #include "overlay005/struct_ov5_021DE5D0.h" @@ -919,8 +919,8 @@ BOOL Pokemon_SetRotomForm(Pokemon *mon, int monForm, int moveSlot); */ void Pokemon_LoadLevelUpMovesOf(int monSpecies, int monForm, u16 *monLevelUpMoves); -void sub_02077D3C(UnkStruct_0202CC84 *param0, int param1, u16 monSpecies, int param3, int param4, int param5, int param6, int param7); -void sub_02077DB4(UnkStruct_0202CC84 *param0, int param1, u16 monSpecies, int param3, int param4, int param5, int param6, int param7, u8 param8); +void sub_02077D3C(ChatotCry *param0, int param1, u16 monSpecies, int param3, int param4, int param5, int param6, int param7); +void sub_02077DB4(ChatotCry *param0, int param1, u16 monSpecies, int param3, int param4, int param5, int param6, int param7, u8 param8); BOOL sub_02077E3C(Pokemon *mon); void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5); void sub_02077EE4(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5); diff --git a/include/struct_decls/struct_0202CC84_decl.h b/include/struct_decls/struct_0202CC84_decl.h deleted file mode 100644 index 9bd363927f..0000000000 --- a/include/struct_decls/struct_0202CC84_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_0202CC84_DECL_H -#define POKEPLATINUM_STRUCT_0202CC84_DECL_H - -typedef struct UnkStruct_0202CC84_t UnkStruct_0202CC84; - -#endif // POKEPLATINUM_STRUCT_0202CC84_DECL_H diff --git a/include/struct_defs/battle_system.h b/include/struct_defs/battle_system.h index 2c008cf9f4..3c59cba8a6 100644 --- a/include/struct_defs/battle_system.h +++ b/include/struct_defs/battle_system.h @@ -19,7 +19,7 @@ #include "struct_decls/struct_02026324_decl.h" #include "struct_defs/struct_020279FC.h" #include "struct_decls/struct_02027F8C_decl.h" -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_02056B24_decl.h" #include "struct_defs/struct_0205AA50.h" @@ -65,7 +65,7 @@ struct BattleSystem { UnkStruct_02026324 *pokedex; PCBoxes *pcBoxes; Party *parties[4]; - UnkStruct_0202CC84 * unk_78[4]; + ChatotCry * unk_78[4]; UnkStruct_02007768 * unk_88; UnkStruct_ov12_0221FCDC * unk_8C; UnkStruct_0200C6E4 * unk_90; diff --git a/include/struct_defs/chatot_cry.h b/include/struct_defs/chatot_cry.h new file mode 100644 index 0000000000..37ec9ea703 --- /dev/null +++ b/include/struct_defs/chatot_cry.h @@ -0,0 +1,11 @@ +#ifndef POKEPLATINUM_STRUCT_DEF_CHATOT_CRY_H +#define POKEPLATINUM_STRUCT_DEF_CHATOT_CRY_H + +#define CHATOT_CRY_SIZE 1000 + +typedef struct ChatotCry { + BOOL exists; + s8 data[CHATOT_CRY_SIZE]; +} ChatotCry; + +#endif // POKEPLATINUM_STRUCT_DEF_CHATOT_CRY_H diff --git a/include/struct_defs/struct_02095E80_t.h b/include/struct_defs/struct_02095E80_t.h index 0784c2fc17..98ccba01fe 100644 --- a/include/struct_defs/struct_02095E80_t.h +++ b/include/struct_defs/struct_02095E80_t.h @@ -19,7 +19,7 @@ #include "struct_defs/struct_02027F8C.h" #include "struct_decls/struct_02027F8C_decl.h" #include "struct_decls/struct_0202B370_decl.h" -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include "struct_decls/struct_0203CDB0_decl.h" #include "struct_defs/struct_0205AA50.h" #include "struct_decls/struct_party_decl.h" @@ -110,7 +110,7 @@ struct UnkStruct_02095E80_t { int (* unk_226C)(UnkStruct_02095E80 *); Party * unk_2270; Party * unk_2274; - UnkStruct_0202CC84 * unk_2278; + ChatotCry * unk_2278; UnkStruct_02027F8C * unk_227C; UnkStruct_02027F8C unk_2280; int unk_2308; diff --git a/include/struct_defs/struct_02098D38.h b/include/struct_defs/struct_02098D38.h index d70881c43c..3a1c618044 100644 --- a/include/struct_defs/struct_02098D38.h +++ b/include/struct_defs/struct_02098D38.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_02098D38_H #include "struct_defs/struct_020279FC.h" -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" typedef struct { void * unk_00; @@ -22,7 +22,7 @@ typedef struct { u32 unk_1C; void * unk_20; void * unk_24; - UnkStruct_0202CC84 * unk_28; + ChatotCry * unk_28; BOOL unk_2C; } UnkStruct_02098D38; diff --git a/include/unk_02003B60.h b/include/unk_02003B60.h index 3c02baf761..b90f910f73 100644 --- a/include/unk_02003B60.h +++ b/include/unk_02003B60.h @@ -3,11 +3,11 @@ #include "struct_decls/struct_02003D54_decl.h" #include "struct_defs/struct_020279FC.h" -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include -void sub_02003B60(UnkStruct_0202CC84 * param0, UnkStruct_020279FC * param1); +void sub_02003B60(ChatotCry * param0, UnkStruct_020279FC * param1); void sub_02003BD8(void); void sub_02003D0C(int param0); UnkStruct_02003D54 * sub_02003D54(void); diff --git a/include/unk_02006224.h b/include/unk_02006224.h index e59d2b18d6..4f94090c91 100644 --- a/include/unk_02006224.h +++ b/include/unk_02006224.h @@ -1,21 +1,21 @@ #ifndef POKEPLATINUM_UNK_02006224_H #define POKEPLATINUM_UNK_02006224_H -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include BOOL sub_02006224(void); -BOOL sub_02006260(const UnkStruct_0202CC84 * param0); -BOOL sub_0200629C(const UnkStruct_0202CC84 * param0, u32 param1, int param2, int param3); +BOOL sub_02006260(const ChatotCry * param0); +BOOL sub_0200629C(const ChatotCry * param0, u32 param1, int param2, int param3); void sub_02006350(void); MICResult sub_0200637C(void); MICResult sub_020063B8(void); -void sub_020063C0(UnkStruct_0202CC84 * param0); +void sub_020063C0(ChatotCry * param0); void sub_020063D4(u8 param0); -BOOL sub_020063E4(UnkStruct_0202CC84 * param0, u32 param1, int param2, int param3); -BOOL sub_02006438(UnkStruct_0202CC84 * param0, u32 param1, int param2, int param3, u8 param4); -int Sound_Chatter(UnkStruct_0202CC84 * param0); +BOOL sub_020063E4(ChatotCry * param0, u32 param1, int param2, int param3); +BOOL sub_02006438(ChatotCry * param0, u32 param1, int param2, int param3, u8 param4); +int Sound_Chatter(ChatotCry * param0); BOOL sub_020064C8(int param0); #endif // POKEPLATINUM_UNK_02006224_H diff --git a/include/unk_0202CC64.h b/include/unk_0202CC64.h index 091097227d..b28120292e 100644 --- a/include/unk_0202CC64.h +++ b/include/unk_0202CC64.h @@ -1,18 +1,18 @@ #ifndef POKEPLATINUM_UNK_0202CC64_H #define POKEPLATINUM_UNK_0202CC64_H -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include "struct_decls/struct_021C0794_decl.h" int ChatotCry_SaveSize(void); -void ChatotCry_Init(UnkStruct_0202CC84 * param0); -UnkStruct_0202CC84 * sub_0202CC84(int param0); -UnkStruct_0202CC84 * sub_0202CC98(SaveData * param0); -BOOL sub_0202CCA4(const UnkStruct_0202CC84 * param0); -void sub_0202CCA8(UnkStruct_0202CC84 * param0); -const void * sub_0202CCB0(const UnkStruct_0202CC84 * param0); +void ChatotCry_Init(ChatotCry * param0); +ChatotCry * sub_0202CC84(int param0); +ChatotCry * sub_0202CC98(SaveData * param0); +BOOL sub_0202CCA4(const ChatotCry * param0); +void sub_0202CCA8(ChatotCry * param0); +const void * sub_0202CCB0(const ChatotCry * param0); void sub_0202CCB4(s8 * param0, const s8 * param1); -void sub_0202CCEC(UnkStruct_0202CC84 * param0, const s8 * param1); -void sub_0202CD3C(UnkStruct_0202CC84 * param0, const UnkStruct_0202CC84 * param1); +void sub_0202CCEC(ChatotCry * param0, const s8 * param1); +void sub_0202CD3C(ChatotCry * param0, const ChatotCry * param1); #endif // POKEPLATINUM_UNK_0202CC64_H diff --git a/include/unk_02051D8C.h b/include/unk_02051D8C.h index 28b5082912..4114c8c26c 100644 --- a/include/unk_02051D8C.h +++ b/include/unk_02051D8C.h @@ -3,7 +3,7 @@ #include "trainer_info.h" #include "struct_decls/struct_0202B628_decl.h" -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include "struct_decls/struct_0203CDB0_decl.h" #include "pokemon.h" #include "struct_decls/struct_party_decl.h" @@ -20,7 +20,7 @@ void sub_020520A4(BattleParams * param0); void sub_0205213C(BattleParams * param0, Pokemon * param1, int param2); void sub_02052164(BattleParams * param0, const Party * param1, int param2); void sub_02052184(BattleParams * param0, const TrainerInfo * param1, int param2); -void sub_020521A4(BattleParams * param0, const UnkStruct_0202CC84 * param1, int param2); +void sub_020521A4(BattleParams * param0, const ChatotCry * param1, int param2); void sub_020521B8(BattleParams * param0, const UnkStruct_0203CDB0 * param1, SaveData * param2, int param3, UnkStruct_0202B628 * param4, UnkStruct_0207D99C * param5, UnkStruct_0209C370 * param6); void sub_02052314(BattleParams * param0, const UnkStruct_0203CDB0 * param1); void sub_02052348(BattleParams * param0, const UnkStruct_0203CDB0 * param1, int param2); diff --git a/src/overlay005/ov5_021E622C.c b/src/overlay005/ov5_021E622C.c index d26a0dd3b4..4b0eee2ab7 100644 --- a/src/overlay005/ov5_021E622C.c +++ b/src/overlay005/ov5_021E622C.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02026218_decl.h" #include "struct_decls/struct_02026224_decl.h" #include "struct_decls/struct_02026310_decl.h" -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include "struct_decls/struct_0202CD88_decl.h" #include "pokemon.h" #include "struct_decls/struct_party_decl.h" @@ -2041,7 +2041,7 @@ static void ov5_021E62C4 (Party * param0, int param1, UnkStruct_02026218 * param Party_RemovePokemonBySlotIndex(param0, param1); if (Party_HasSpecies(param0, 441) == 0) { - UnkStruct_0202CC84 * v7 = sub_0202CC98(param3); + ChatotCry * v7 = sub_0202CC98(param3); sub_0202CCA8(v7); } } diff --git a/src/overlay012/ov12_0221FC20.c b/src/overlay012/ov12_0221FC20.c index 259265afb3..06e7b0c883 100644 --- a/src/overlay012/ov12_0221FC20.c +++ b/src/overlay012/ov12_0221FC20.c @@ -12,7 +12,7 @@ #include "struct_decls/struct_02014014_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include "struct_decls/battle_system.h" #include "overlay012/struct_ov12_0222118C_decl.h" #include "overlay012/struct_ov12_022211D8_decl.h" @@ -85,7 +85,7 @@ typedef struct UnkStruct_ov12_02223178_t { u8 unk_E8[4]; u32 unk_EC[4]; u32 unk_FC[4]; - UnkStruct_0202CC84 * unk_10C; + ChatotCry * unk_10C; u8 * unk_110; u16 * unk_114; int unk_118; diff --git a/src/overlay016/ov16_0223DF00.c b/src/overlay016/ov16_0223DF00.c index 7ea8ece307..033f35b9af 100644 --- a/src/overlay016/ov16_0223DF00.c +++ b/src/overlay016/ov16_0223DF00.c @@ -21,7 +21,7 @@ #include "strbuf.h" #include "trainer_info.h" #include "struct_decls/struct_02026324_decl.h" -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/battle_system.h" @@ -143,7 +143,7 @@ int ov16_0223EDE0(BattleSystem * param0); u8 BattleSystem_TextSpeed(BattleSystem * param0); int BattleSystem_Ruleset(BattleSystem * param0); PokemonAnimationSys * ov16_0223EE28(BattleSystem * param0); -UnkStruct_0202CC84 * BattleSystem_ChatotVoice(BattleSystem * param0, int param1); +ChatotCry * BattleSystem_ChatotVoice(BattleSystem * param0, int param1); void ov16_0223EE70(BattleSystem * param0); void ov16_0223EF2C(BattleSystem * param0, int param1, int param2); void ov16_0223EF48(BattleSystem * param0, Pokemon * param1); @@ -1056,7 +1056,7 @@ PokemonAnimationSys * ov16_0223EE28 (BattleSystem * param0) return param0->unk_1C4; } -UnkStruct_0202CC84 * BattleSystem_ChatotVoice (BattleSystem * param0, int param1) +ChatotCry * BattleSystem_ChatotVoice (BattleSystem * param0, int param1) { if ((param0->battleType & 0x8) || ((param0->battleType & 0x10) && (BattleSystem_BattlerSlot(param0, param1) & 0x1))) { return param0->unk_78[param1]; diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c index dcfaccb34c..95c3406384 100644 --- a/src/overlay019/ov19_021D0D80.c +++ b/src/overlay019/ov19_021D0D80.c @@ -11,7 +11,7 @@ #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/sys_task.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include "pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" @@ -330,7 +330,7 @@ int ov19_021D0E58 (UnkStruct_020067E8 * param0, int * param1) UnkStruct_ov19_021D5DF8 * v0 = sub_0200682C(param0); if (Party_HasSpecies(v0->unk_124, 441) == 0) { - UnkStruct_0202CC84 * v1 = sub_0202CC98(v0->unk_11C); + ChatotCry * v1 = sub_0202CC98(v0->unk_11C); sub_0202CCA8(v1); } diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index a037ebf9fc..8ab513a002 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -14,7 +14,7 @@ #include "trainer_info.h" #include "struct_decls/struct_0202B370_decl.h" #include "struct_decls/struct_0202B628_decl.h" -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include "struct_decls/struct_020507E4_decl.h" #include "pokemon.h" #include "struct_decls/struct_party_decl.h" @@ -122,7 +122,7 @@ static void ov88_0223CF68(int param0, UnkStruct_02022550 * param1, int param2); static int ov88_0223CFF4(u32 * param0, int * param1, UnkStruct_02022550 * param2, UnkStruct_ov88_0223C8AC * param3, int param4); static int ov88_0223C800(int param0, Pokemon * param1, u8 * param2, ArchivedSprite * param3); static void ov88_0223E7F0(UnkStruct_0202B628 * param0, Pokemon * param1); -static void ov88_0223D140(UnkStruct_0202CC84 * param0); +static void ov88_0223D140(ChatotCry * param0); static void ov88_0223E894(UnkStruct_02095E80 * param0); static void ov88_0223E8B4(UnkStruct_02095E80 * param0); static int ov88_0223E8D0(UnkStruct_02095E80 * param0); @@ -1697,7 +1697,7 @@ static void ov88_0223D0D4 (TrainerInfo * param0, UnkStruct_02027F8C * param1, Un sub_0203597C(28, param2, sizeof(UnkStruct_02027F8C)); } -static void ov88_0223D140 (UnkStruct_0202CC84 * param0) +static void ov88_0223D140 (ChatotCry * param0) { sub_0203597C(29, param0, 1000); } @@ -1751,7 +1751,7 @@ static void ov88_0223D1EC (UnkStruct_02095E80 * param0, int param1) } else { param0->unk_0C.unk_00 = param0->unk_2274; param0->unk_0C.unk_13 = Party_GetCurrentCount(param0->unk_2274); - param0->unk_0C.unk_28 = (UnkStruct_0202CC84 *)param0->unk_2E6C[sub_0203608C() ^ 1]; + param0->unk_0C.unk_28 = (ChatotCry *)param0->unk_2E6C[sub_0203608C() ^ 1]; sub_0208E9C0(¶m0->unk_0C, sub_02032EE8(sub_0203608C() ^ 1)); } @@ -2528,7 +2528,7 @@ static void ov88_0223E694 (Party * param0, Party * param1, int param2, int param param4->unk_2C = param2; if (Party_HasSpecies(param0, 441) == 0) { - UnkStruct_0202CC84 * v4 = sub_0202CC98(param4->unk_10); + ChatotCry * v4 = sub_0202CC98(param4->unk_10); sub_0202CCA8(v4); } diff --git a/src/overlay094/ov94_02242AD0.c b/src/overlay094/ov94_02242AD0.c index 0bacc9b4af..1ee3747d12 100644 --- a/src/overlay094/ov94_02242AD0.c +++ b/src/overlay094/ov94_02242AD0.c @@ -8,7 +8,7 @@ #include "struct_decls/struct_0202440C_decl.h" #include "struct_decls/struct_0202B628_decl.h" #include "struct_decls/struct_0202C878_decl.h" -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include "struct_decls/struct_0202DA40_decl.h" #include "struct_decls/struct_020507E4_decl.h" #include "pokemon.h" @@ -1264,7 +1264,7 @@ static void ov94_02243B08 (UnkStruct_ov94_0223FD4C * param0, int param1) Party_RemovePokemonBySlotIndex(param0->unk_00->unk_08, param0->unk_112); if (Party_HasSpecies(param0->unk_00->unk_08, 441) == 0) { - UnkStruct_0202CC84 * v2 = sub_0202CC98(param0->unk_00->unk_20); + ChatotCry * v2 = sub_0202CC98(param0->unk_00->unk_20); sub_0202CCA8(v2); } } diff --git a/src/pokemon.c b/src/pokemon.c index 736dec94f7..c8c41a7818 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -10,7 +10,7 @@ #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/sprite_animation_frame.h" @@ -4172,7 +4172,7 @@ void Pokemon_LoadLevelUpMovesOf(int monSpecies, int monForm, u16 *monLevelUpMove NARC_ReadWholeMemberByIndexPair(monLevelUpMoves, NARC_INDEX_POKETOOL__PERSONAL__WOTBL, monSpecies); } -void sub_02077D3C(UnkStruct_0202CC84 *param0, int param1, u16 monSpecies, int param3, int param4, int param5, int param6, int param7) +void sub_02077D3C(ChatotCry *param0, int param1, u16 monSpecies, int param3, int param4, int param5, int param6, int param7) { if (monSpecies == SPECIES_CHATOT) { if (sub_020064C8(param1) == 0) { @@ -4190,7 +4190,7 @@ void sub_02077D3C(UnkStruct_0202CC84 *param0, int param1, u16 monSpecies, int pa } } -void sub_02077DB4(UnkStruct_0202CC84 *param0, int param1, u16 monSpecies, int param3, int param4, int param5, int param6, int param7, u8 param8) +void sub_02077DB4(ChatotCry *param0, int param1, u16 monSpecies, int param3, int param4, int param5, int param6, int param7, u8 param8) { if (monSpecies == SPECIES_CHATOT) { if (sub_020064C8(param1) == 0) { diff --git a/src/unk_02003B60.c b/src/unk_02003B60.c index 4076d7b04b..2d06f14853 100644 --- a/src/unk_02003B60.c +++ b/src/unk_02003B60.c @@ -3,7 +3,7 @@ #include "struct_decls/struct_02003D54_decl.h" #include "struct_decls/sys_task.h" -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include "struct_defs/struct_020052C8.h" #include "struct_defs/struct_020279FC.h" @@ -49,8 +49,8 @@ struct UnkStruct_02003D54_t { void * unk_BCD8C; int unk_BCD90; SysTask * unk_BCD94; - UnkStruct_0202CC84 * unk_BCD98; - UnkStruct_0202CC84 * unk_BCD9C[4]; + ChatotCry * unk_BCD98; + ChatotCry * unk_BCD9C[4]; int unk_BCDAC[2]; int unk_BCDB4[2]; int unk_BCDBC[2]; @@ -61,7 +61,7 @@ struct UnkStruct_02003D54_t { u8 unk_BCDD3; }; -void sub_02003B60(UnkStruct_0202CC84 * param0, UnkStruct_020279FC * param1); +void sub_02003B60(ChatotCry * param0, UnkStruct_020279FC * param1); void sub_02003BD8(void); void sub_02003D0C(int param0); UnkStruct_02003D54 * sub_02003D54(void); @@ -87,7 +87,7 @@ static UnkStruct_02003D54 Unk_02101DF8; static int Unk_02101DF0; static NNSSndCaptureOutputEffectType Unk_02101DF4; -void sub_02003B60 (UnkStruct_0202CC84 * param0, UnkStruct_020279FC * param1) +void sub_02003B60 (ChatotCry * param0, UnkStruct_020279FC * param1) { UnkStruct_02003D54 * v0 = sub_02003D54(); diff --git a/src/unk_02005474.c b/src/unk_02005474.c index 43884cd274..81f0e395b0 100644 --- a/src/unk_02005474.c +++ b/src/unk_02005474.c @@ -2,7 +2,7 @@ #include #include "struct_decls/sys_task.h" -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include "unk_02003B60.h" #include "unk_020041CC.h" @@ -407,7 +407,7 @@ BOOL sub_02005844 (u16 param0, u8 param1) u16 v0; int v1; u8 * v2 = sub_02003D5C(18); - UnkStruct_0202CC84 ** v3 = sub_02003D5C(36); + ChatotCry ** v3 = sub_02003D5C(36); u8 * v4 = sub_02003D5C(53); v0 = param0; @@ -509,7 +509,7 @@ BOOL sub_020059D0 (int param0, u16 param1, int param2, int param3, int param4, u u8 * v9 = sub_02003D5C(17); u8 * v10 = sub_02003D5C(18); u8 * v11 = sub_02003D5C(30); - UnkStruct_0202CC84 ** v12 = sub_02003D5C(36); + ChatotCry ** v12 = sub_02003D5C(36); v4 = 0; v5 = 0; diff --git a/src/unk_02006224.c b/src/unk_02006224.c index 148f5796bf..6ea54aa2b3 100644 --- a/src/unk_02006224.c +++ b/src/unk_02006224.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include "struct_defs/struct_02004CB4.h" @@ -12,16 +12,16 @@ #include "unk_0202CC64.h" BOOL sub_02006224(void); -BOOL sub_02006260(const UnkStruct_0202CC84 * param0); -BOOL sub_0200629C(const UnkStruct_0202CC84 * param0, u32 param1, int param2, int param3); +BOOL sub_02006260(const ChatotCry * param0); +BOOL sub_0200629C(const ChatotCry * param0, u32 param1, int param2, int param3); void sub_02006350(void); MICResult sub_0200637C(void); MICResult sub_020063B8(void); -void sub_020063C0(UnkStruct_0202CC84 * param0); +void sub_020063C0(ChatotCry * param0); void sub_020063D4(u8 param0); -BOOL sub_020063E4(UnkStruct_0202CC84 * param0, u32 param1, int param2, int param3); -BOOL sub_02006438(UnkStruct_0202CC84 * param0, u32 param1, int param2, int param3, u8 param4); -int Sound_Chatter(UnkStruct_0202CC84 * param0); +BOOL sub_020063E4(ChatotCry * param0, u32 param1, int param2, int param3); +BOOL sub_02006438(ChatotCry * param0, u32 param1, int param2, int param3, u8 param4); +int Sound_Chatter(ChatotCry * param0); BOOL sub_020064C8(int param0); BOOL sub_02006224 (void) @@ -44,7 +44,7 @@ BOOL sub_02006224 (void) return 0; } -BOOL sub_02006260 (const UnkStruct_0202CC84 * param0) +BOOL sub_02006260 (const ChatotCry * param0) { u8 * v0 = sub_02003D5C(31); u8 * v1 = sub_02003D5C(54); @@ -64,7 +64,7 @@ BOOL sub_02006260 (const UnkStruct_0202CC84 * param0) return 1; } -BOOL sub_0200629C (const UnkStruct_0202CC84 * param0, u32 param1, int param2, int param3) +BOOL sub_0200629C (const ChatotCry * param0, u32 param1, int param2, int param3) { u16 v0; int v1, v2; @@ -151,7 +151,7 @@ MICResult sub_020063B8 (void) return sub_02004B64(); } -void sub_020063C0 (UnkStruct_0202CC84 * param0) +void sub_020063C0 (ChatotCry * param0) { sub_0202CCEC(param0, (const s8 *)sub_02005014()); return; @@ -165,10 +165,10 @@ void sub_020063D4 (u8 param0) return; } -BOOL sub_020063E4 (UnkStruct_0202CC84 * param0, u32 param1, int param2, int param3) +BOOL sub_020063E4 (ChatotCry * param0, u32 param1, int param2, int param3) { int v0; - UnkStruct_0202CC84 ** v1 = sub_02003D5C(36); + ChatotCry ** v1 = sub_02003D5C(36); if (param0 == NULL) { v0 = sub_0200629C(*v1, param1, param2, param3); @@ -184,10 +184,10 @@ BOOL sub_020063E4 (UnkStruct_0202CC84 * param0, u32 param1, int param2, int para return v0; } -BOOL sub_02006438 (UnkStruct_0202CC84 * param0, u32 param1, int param2, int param3, u8 param4) +BOOL sub_02006438 (ChatotCry * param0, u32 param1, int param2, int param3, u8 param4) { int v0; - UnkStruct_0202CC84 ** v1 = sub_02003D5C(36); + ChatotCry ** v1 = sub_02003D5C(36); if (param0 == NULL) { v0 = sub_0200629C(*v1, param1, param2, param3); @@ -204,7 +204,7 @@ BOOL sub_02006438 (UnkStruct_0202CC84 * param0, u32 param1, int param2, int para return v0; } -int Sound_Chatter (UnkStruct_0202CC84 * param0) +int Sound_Chatter (ChatotCry * param0) { const s8 * v0; s8 v1; diff --git a/src/unk_0202CC64.c b/src/unk_0202CC64.c index 07c4b7d0ef..16521409d2 100644 --- a/src/unk_0202CC64.c +++ b/src/unk_0202CC64.c @@ -2,53 +2,49 @@ #include #include "struct_decls/struct_021C0794_decl.h" +#include "struct_defs/chatot_cry.h" #include "heap.h" #include "unk_020244AC.h" #include "unk_0202CC64.h" -typedef struct UnkStruct_0202CC84_t { - BOOL unk_00; - s8 unk_04[1000]; -} UnkStruct_0202CC84; - int ChatotCry_SaveSize (void) { - return sizeof(UnkStruct_0202CC84); + return sizeof(ChatotCry); } -void ChatotCry_Init (UnkStruct_0202CC84 * param0) +void ChatotCry_Init (ChatotCry * param0) { - MI_CpuClear32(param0, sizeof(UnkStruct_0202CC84)); - param0->unk_00 = 0; + MI_CpuClear32(param0, sizeof(ChatotCry)); + param0->exists = FALSE; } -UnkStruct_0202CC84 * sub_0202CC84 (int param0) +ChatotCry * sub_0202CC84 (int param0) { - UnkStruct_0202CC84 * v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0202CC84)); + ChatotCry * v0 = Heap_AllocFromHeap(param0, sizeof(ChatotCry)); ChatotCry_Init(v0); return v0; } -UnkStruct_0202CC84 * sub_0202CC98 (SaveData * param0) +ChatotCry * sub_0202CC98 (SaveData * param0) { - return (UnkStruct_0202CC84 *)SaveData_Get(param0, 22); + return (ChatotCry *)SaveData_Get(param0, 22); } -BOOL sub_0202CCA4 (const UnkStruct_0202CC84 * param0) +BOOL sub_0202CCA4 (const ChatotCry * param0) { - return param0->unk_00; + return param0->exists; } -void sub_0202CCA8 (UnkStruct_0202CC84 * param0) +void sub_0202CCA8 (ChatotCry * param0) { - param0->unk_00 = 0; + param0->exists = FALSE; } -const void * sub_0202CCB0 (const UnkStruct_0202CC84 * param0) +const void * sub_0202CCB0 (const ChatotCry * param0) { - return param0->unk_04; + return param0->data; } void sub_0202CCB4 (s8 * param0, const s8 * param1) @@ -72,31 +68,31 @@ void sub_0202CCB4 (s8 * param0, const s8 * param1) } } -void sub_0202CCEC (UnkStruct_0202CC84 * param0, const s8 * param1) +void sub_0202CCEC (ChatotCry * param0, const s8 * param1) { int v0, v1; s8 v2; u8 v3; - param0->unk_00 = 1; + param0->exists = TRUE; v1 = 0; for (v0 = 0; v0 < 1000 * 2; v0 += 2) { v2 = (param1[v0] / 16); v3 = v2 + 8; - param0->unk_04[v1] = v3; + param0->data[v1] = v3; v2 = (param1[v0 + 1] / 16); v3 = v2 + 8; - param0->unk_04[v1] |= (v3 << 4); + param0->data[v1] |= (v3 << 4); v1++; } } -void sub_0202CD3C (UnkStruct_0202CC84 * param0, const UnkStruct_0202CC84 * param1) +void sub_0202CD3C (ChatotCry * param0, const ChatotCry * param1) { - MI_CpuCopyFast(param1, param0, sizeof(UnkStruct_0202CC84)); + MI_CpuCopyFast(param1, param0, sizeof(ChatotCry)); } diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c index 779c46bb7a..f17c6e461e 100644 --- a/src/unk_02051D8C.c +++ b/src/unk_02051D8C.c @@ -8,7 +8,7 @@ #include "trainer_info.h" #include "struct_decls/struct_02026324_decl.h" #include "struct_decls/struct_0202B628_decl.h" -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include "struct_decls/struct_0203A790_decl.h" #include "pokemon.h" #include "struct_decls/struct_party_decl.h" @@ -245,7 +245,7 @@ void sub_02052184 (BattleParams * param0, const TrainerInfo * param1, int param2 TrainerInfo_Copy(param1, param0->unk_D0[param2]); } -void sub_020521A4 (BattleParams * param0, const UnkStruct_0202CC84 * param1, int param2) +void sub_020521A4 (BattleParams * param0, const ChatotCry * param1, int param2) { sub_0202CD3C(param0->unk_F0[param2], param1); } @@ -256,7 +256,7 @@ void sub_020521B8 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, Sav Party * v1 = Party_GetFromSavedata(param2); UnkStruct_0207D3C0 * v2 = sub_0207D990(param2); UnkStruct_02026324 * v3 = sub_02027560(param2); - UnkStruct_0202CC84 * v4 = sub_0202CC98(param2); + ChatotCry * v4 = sub_0202CC98(param2); UnkStruct_020279FC * v5 = sub_02025E44(param2); UnkStruct_0203A790 * v6 = sub_0203A790(param2); @@ -311,7 +311,7 @@ void sub_02052348 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, int Party * v3 = Party_GetFromSavedata(param1->unk_0C); UnkStruct_0207D3C0 * v4 = sub_0207D990(param1->unk_0C); UnkStruct_02026324 * v5 = sub_02027560(param1->unk_0C); - UnkStruct_0202CC84 * v6 = sub_0202CC98(param1->unk_0C); + ChatotCry * v6 = sub_0202CC98(param1->unk_0C); UnkStruct_020279FC * v7 = sub_02025E44(param1->unk_0C); Pokemon * v8; @@ -361,7 +361,7 @@ void sub_020524E4 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, con TrainerInfo * v0 = sub_02025E38(param1->unk_0C); UnkStruct_0207D3C0 * v1 = sub_0207D990(param1->unk_0C); UnkStruct_02026324 * v2 = sub_02027560(param1->unk_0C); - UnkStruct_0202CC84 * v3 = sub_0202CC98(param1->unk_0C); + ChatotCry * v3 = sub_0202CC98(param1->unk_0C); UnkStruct_020279FC * v4 = sub_02025E44(param1->unk_0C); const UnkStruct_0202610C * v5 = param1->unk_B0; int v6, v7, v8; diff --git a/src/unk_0207A6DC.c b/src/unk_0207A6DC.c index 8a869d63b2..7fac2abe71 100644 --- a/src/unk_0207A6DC.c +++ b/src/unk_0207A6DC.c @@ -5,7 +5,7 @@ #include "struct_decls/sys_task.h" #include "trainer_info.h" -#include "struct_decls/struct_0202CC84_decl.h" +#include "struct_defs/chatot_cry.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/battle_system.h" @@ -414,13 +414,13 @@ static void sub_0207AA90 (int param0, int param1, void * param2, void * param3) BOOL sub_0207AAA0 (UnkStruct_0207A778 * param0) { - UnkStruct_0202CC84 * v0; + ChatotCry * v0; if (sub_02035B54() != 264) { return 0; } - v0 = (UnkStruct_0202CC84 *)¶m0->unk_20[0]; + v0 = (ChatotCry *)¶m0->unk_20[0]; sub_0202CD3C(v0, param0->unk_00->unk_F0[0]); return 1;