diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-31 19:36:25 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-31 19:36:25 +0100 |
| commit | 6cb1c4fd6e7c52e528f36e3511ac4b4db4dbb2ee (patch) | |
| tree | c5d4f93c251472daa4cded616da3141448a37e6b /include/pokemon.h | |
| parent | 665734d689fbd6da708e482b1cb9fdf3ee2345bc (diff) | |
| parent | 4cb8528d94216f69c4a37d470c1d5f3487a87239 (diff) | |
fix merge conflicts, evo scene
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index c1c61d241..0c7d6ac40 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -629,7 +629,7 @@ bool8 IsShinyOtIdPersonality(u32 otId, u32 personality); void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies); bool8 IsTradedMon(struct Pokemon *mon); void HandleSetPokedexFlag(u16 nationalNum, u8 caseId, u32 personality); -s32 sub_806D864(u16 a1); +s32 GetBankMultiplayerId(u16 a1); bool16 sub_806D82C(u8 id); u16 MonTryLearningNewMove(struct Pokemon* mon, bool8); void sub_8068AA4(void); // sets stats for deoxys @@ -643,6 +643,11 @@ void PartySpreadPokerus(struct Pokemon *party); s8 GetMonFlavourRelation(struct Pokemon *mon, u8 a2); s8 GetFlavourRelationByPersonality(u32 personality, u8 a2); u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit); +u8 GetDefaultMoveTarget(u8 atkBank); +u16 PlayerGenderToFrontTrainerPicId(u8 playerGender); +void sub_806A1C0(u16 arg0, u8 bankIdentity); +void sub_806A12C(u16 trainerSpriteId, u8 bankIdentity); +u8 GetSecretBaseTrainerPicIndex(void); #include "sprite.h" |