diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-08-30 16:36:47 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-08-30 16:36:47 -0400 |
| commit | 2d141bc612ffecc984f6b4238c2791ba8419a192 (patch) | |
| tree | 04800ef37ba17134a216c3e679a1d0bb046f0bf8 /include/pokemon.h | |
| parent | e1f2f7d5daee0fead0b8aed8413977e7cad990eb (diff) | |
| parent | d7a6ff0e4dab0c96ac49975a0695014bff2b9654 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 21173d503..594295b40 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -576,6 +576,7 @@ u16 NationalPokedexNumToSpecies(u16 nationalNum); u16 NationalToHoennOrder(u16); u16 SpeciesToNationalPokedexNum(u16); u16 HoennToNationalOrder(u16); +u16 SpeciesToCryId(u16 species); void DrawSpindaSpots(u16, u32, u8 *, u8); u8 sub_803FBBC(void); u8 sub_803FC58(u16); @@ -583,6 +584,7 @@ void AdjustFriendship(struct Pokemon *, u8); u8 CheckPartyHasHadPokerus(struct Pokemon *, u8); void UpdatePartyPokerusTime(u16); u32 CanMonLearnTMHM(struct Pokemon *, u8); +u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves); u8 sub_8040574(struct Pokemon *party); void ClearBattleMonForms(void); void sub_80408BC(); |