diff options
| author | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-08-22 15:10:58 +0200 |
|---|---|---|
| committer | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-08-22 15:10:58 +0200 |
| commit | 23071e67d75ab4a52d68ef4fdecd090215216506 (patch) | |
| tree | 49b432bf55bddacbcfb5112668cb69323c22d824 /include/pokemon.h | |
| parent | d789398ef7fc5a2955199ac4f87be40b90182405 (diff) | |
| parent | d08722a7381c4c05a40ee59bb6de556616e1dfc2 (diff) | |
Merge branch 'master' into unk_02006D98
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index d107bf85..60fa1838 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -10,6 +10,7 @@ #include "constants/pokemon.h" #include "string16.h" #include "player_data.h" +#include "sound_chatot.h" struct BaseStats { /* 0x00 */ u8 hp; @@ -294,7 +295,7 @@ void Party_SpreadPokerus(struct PlayerParty * party); BOOL Pokemon_HasPokerus(struct Pokemon * pokemon); BOOL Pokemon_IsImmuneToPokerus(struct Pokemon * pokemon); void Pokemon_UpdateArceusForme(struct Pokemon * pokemon); -void FUN_02069FB0(u32 r7, u32 r5, u32 r4, u32 r6, u32 sp18, u32 sp1C, u32 sp20); +void FUN_02069FB0(struct SaveChatotSoundClip *r7, u32 r5, u16 r4, s32 r6, s32 sp18, u32 sp1C, u32 sp20); void FUN_0206A014(struct Pokemon * pokemon, struct PlayerData * a1, u32 pokeball, u32 a3, u32 encounterType, u32 heap_id); void FUN_0206A094(struct Pokemon * pokemon, u32 a1, u32 a2); BOOL FUN_0206A13C(struct Pokemon * pokemon, u32 a1); |