diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-29 22:53:43 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-29 22:53:43 -0400 |
commit | b3477c99c6d53c02ed38c2a0fcd02fd5c8d5278d (patch) | |
tree | 30b1690824dd0486b0e7abe84f56b17aad799b87 /include/pokemon.h | |
parent | f482547407aec0514b50232c7f14d98ad9f58184 (diff) | |
parent | cf0bf8a1f2d3cd97e0fe967270188dda24b8fac2 (diff) |
Merge branch 'master' into field_effect_helpers
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 9c6f16442..5d76a8a05 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); @@ -599,5 +601,7 @@ u8 *sub_8040D08(); bool32 sub_8040D3C(u16 species, u8 *name, u8 language); s8 sub_8040A54(struct Pokemon *, u8); u16 GetMonEVCount(struct Pokemon *); +u8 GetLevelUpMovesBySpecies(u16, u16 *); +u8 TryIncrementMonLevel(struct Pokemon *); #endif // GUARD_POKEMON_H |