diff options
author | YamaArashi <shadow962@live.com> | 2016-09-12 01:14:08 -0700 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2016-09-12 01:22:26 -0700 |
commit | 6a79077def3dc5fcd971510c7c4d53516d8458c5 (patch) | |
tree | a42f7e64faceef9497a9c5d5bfc3d51b2d105536 /include | |
parent | a1f83e332fb38b2787e7dd3d4e9488a7996730d9 (diff) |
decompile more pokemon functions
Diffstat (limited to 'include')
-rw-r--r-- | include/pokemon.h | 13 | ||||
-rw-r--r-- | include/species.h | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 11de26acc..9b5a1c1bb 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -336,6 +336,12 @@ struct BattleMove u32 flags; }; +struct PokemonStorage +{ + u8 currentBox; + struct BoxPokemon boxes[14][30]; +}; + void ZeroBoxMonData(struct BoxPokemon *boxMon); void ZeroMonData(struct Pokemon *mon); void ZeroPlayerPartyMons(void); @@ -378,10 +384,17 @@ u32 GetMonData(struct Pokemon *mon, s32 field, u8 *data); u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data); void SetMonData(struct Pokemon *mon, s32 field, const u8 *data); void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const u8 *data); +void CopyMon(void *dest, void *src, size_t size); +u8 GiveMonToPlayer(struct Pokemon *mon); +u8 SendMonToPC(struct Pokemon *mon); +u8 CalculatePlayerPartyCount(void); +u8 CalculateEnemyPartyCount(void); u8 GetNature(struct Pokemon *mon); u8 GetNatureFromPersonality(u32 personality); u16 nature_stat_mod(u8 nature, u16 n, u8 statIndex); +void sub_8040B1C(void *); + #endif // GUARD_POKEMON_H diff --git a/include/species.h b/include/species.h index 1d663c145..5802f782d 100644 --- a/include/species.h +++ b/include/species.h @@ -1,6 +1,7 @@ #ifndef GUARD_SPECIES_H #define GUARD_SPECIES_H +#define SPECIES_NONE 0x000 #define SPECIES_BULBASAUR 0x001 #define SPECIES_IVYSAUR 0x002 #define SPECIES_VENUSAUR 0x003 |