diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-04 23:06:04 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-04 23:06:04 -0500 |
| commit | ecfdc57e1cff1fa34ff7edcf7524aeadbc265b69 (patch) | |
| tree | 123155f492599caf4597b6fc812a0a064d3962bd /include/pokemon.h | |
| parent | 9776f51f0643a8d988fcd5fc2ac404a7ea285235 (diff) | |
| parent | f1f6c7337f4f2f002b456468b0ccc327fc494d02 (diff) | |
Merge branch 'master' into fix_nonmatching
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 6e3e15404..169045c0c 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -428,10 +428,10 @@ struct BattleMove struct PokemonStorage { - /*0x00*/ u8 currentBox; - /*0x01*/ struct BoxPokemon boxes[14][30]; - u8 boxNames[14][9]; - u8 unkArray[14]; + /*0x0000*/ u8 currentBox; + /*0x0004*/ struct BoxPokemon boxes[14][30]; + /*0x8344*/ u8 boxNames[14][9]; + /*0x83c2*/ u8 wallpaper[14]; }; struct SpindaSpot @@ -522,7 +522,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(const struct BoxPokemon *src, struct Pokemon *dest); +void ExpandBoxMon(const struct BoxPokemon *src, struct Pokemon *dest); u8 GetLevelFromMonExp(struct Pokemon *mon); u8 GetLevelFromBoxMonExp(struct BoxPokemon *boxMon); u16 GiveMoveToMon(struct Pokemon *mon, u16 move); @@ -627,9 +627,8 @@ void RandomlyGivePartyPokerus(struct Pokemon *party); void PartySpreadPokerus(struct Pokemon *party); struct Sprite *sub_80F7920(u16, u16, const u16 *); +void BoxMonRestorePP(struct BoxPokemon *); bool8 HealStatusConditions(struct Pokemon *mon, u32 unused, u32 healMask, u8 battleId); - - #endif // GUARD_POKEMON_H |