diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-29 22:53:14 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-29 22:53:14 -0400 |
| commit | b014273d73996d98519f90b1349feb469cd5f765 (patch) | |
| tree | 7e206d7ee1e1a2f9a8ea9eec69d178599e6c624d /include/pokemon.h | |
| parent | 22c795304d6c1edb568dfde9c6de2091d9470785 (diff) | |
| parent | cf0bf8a1f2d3cd97e0fe967270188dda24b8fac2 (diff) | |
Merge branch 'master' into trade
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index c4347a15b..a5f802f24 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -93,6 +93,8 @@ #define MON_DATA_SPATK2 87 #define MON_DATA_SPDEF2 88 +#define MAX_LEVEL 100 + #define MON_MALE 0x00 #define MON_FEMALE 0xFE #define MON_GENDERLESS 0xFF @@ -510,7 +512,7 @@ void sub_803ADE8(struct Pokemon *mon, struct UnknownPokemonStruct *src); void sub_803AF78(struct Pokemon *mon, struct UnknownPokemonStruct *dest); u16 CalculateBoxMonChecksum(struct BoxPokemon *boxMon); void CalculateMonStats(struct Pokemon *mon); -void sub_803B4B4(struct Pokemon *src, struct Pokemon *dest); +void sub_803B4B4(const struct BoxPokemon *src, struct Pokemon *dest); u8 GetLevelFromMonExp(struct Pokemon *mon); u8 GetLevelFromBoxMonExp(struct BoxPokemon *boxMon); u16 GiveMoveToMon(struct Pokemon *mon, u16 move); @@ -602,5 +604,7 @@ u16 GetMonEVCount(struct Pokemon *); u16 GetEvolutionTargetSpecies(struct Pokemon *, u8, u16); const struct CompressedSpritePalette *sub_8040990(struct Pokemon *); bool8 sub_8040A3C(u16); +u8 GetLevelUpMovesBySpecies(u16, u16 *); +u8 TryIncrementMonLevel(struct Pokemon *); #endif // GUARD_POKEMON_H |