From ad1f73f49e53f166bf3d4c9610d2fa60977fb6a3 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 18 Sep 2017 00:32:52 -0700 Subject: Decompile Task_RareCandy3 --- include/pokemon.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/pokemon.h') diff --git a/include/pokemon.h b/include/pokemon.h index 9c6f16442..29fd763db 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -520,7 +520,7 @@ void SetMonMoveSlot(struct Pokemon *mon, u16 move, u8 slot); void SetBattleMonMoveSlot(struct BattlePokemon *mon, u16 move, u8 slot); void GiveMonInitialMoveset(struct Pokemon *mon); void GiveBoxMonInitialMoveset(struct BoxPokemon *boxMon); -u16 MonTryLearningNewMove(struct Pokemon *mon, bool8 a2); +u16 MonTryLearningNewMove(struct Pokemon *mon, bool8 firstMove); void DeleteFirstMoveAndGiveMoveToMon(struct Pokemon *mon, u16 move); void DeleteFirstMoveAndGiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move); @@ -566,6 +566,8 @@ void CopyPlayerPartyMonToBattleData(u8 battleIndex, u8 partyIndex); u8 GetNature(struct Pokemon *mon); u8 GetNatureFromPersonality(u32 personality); +u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem); + u16 nature_stat_mod(u8 nature, u16 n, u8 statIndex); void MonRestorePP(struct Pokemon *); -- cgit v1.2.3 From 18e88baffa65cc6a647f96441446238616df275c Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 21 Sep 2017 20:40:14 -0700 Subject: Decompile PartyMenuPrintGenderIcon funcs --- include/pokemon.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/pokemon.h') diff --git a/include/pokemon.h b/include/pokemon.h index 29fd763db..2266c2ea4 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -598,8 +598,10 @@ bool8 IsOtherTrainer(u32, u8 *); void sub_8040B8C(void); void SetWildMonHeldItem(void); u8 *sub_8040D08(); -bool32 sub_8040D3C(u16 species, u8 *name, u8 language); +bool32 ShouldHideGenderIconForLanguage(u16 species, u8 *name, u8 language); +bool32 ShouldHideGenderIcon(u16 species, u8 *name); s8 sub_8040A54(struct Pokemon *, u8); u16 GetMonEVCount(struct Pokemon *); + #endif // GUARD_POKEMON_H -- cgit v1.2.3