diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-09-18 00:32:52 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-09-18 00:32:52 -0700 |
| commit | ad1f73f49e53f166bf3d4c9610d2fa60977fb6a3 (patch) | |
| tree | df5606e0dc4e6136f9af561d611deb2cf3545fc2 /include | |
| parent | ee45710b2b62b099f1d1919678ca1f21839b1251 (diff) | |
Decompile Task_RareCandy3
Diffstat (limited to 'include')
| -rw-r--r-- | include/party_menu.h | 2 | ||||
| -rw-r--r-- | include/pokemon.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/party_menu.h b/include/party_menu.h index b485d982f..b1c6ccd02 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -123,7 +123,7 @@ void sub_806E750(u8, const struct PartyPopupMenu *, const struct PartyMenuItem * void sub_806E7D0(u8, const struct PartyPopupMenu *); TaskFunc PartyMenuGetPopupMenuFunc(u8, const struct PartyPopupMenu *, const struct PartyMenuItem *, u8); void Task_RareCandy3(u8); -void sub_8070C54(); +void sub_8070C54(u8); void DoEvolutionStoneItemEffect(u8, u16, TaskFunc); u8 GetItemEffectType(); u8 sub_806E834(const u8 *message, u8 arg1); 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 *); |