diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-06-21 20:47:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-21 20:47:58 +0200 |
| commit | c84bb67156d6ab822b6ff1b508e9fae73f054675 (patch) | |
| tree | 5973f1e72156bb75cb6561a11dd7f333b90fcb3f /include/pokemon.h | |
| parent | 11ad653b57d811dbe8df831d4987128da39bdcb5 (diff) | |
| parent | 42ae04c74fe07d05175efb4df143dbcf1b2752bc (diff) | |
Merge pull request #2 from pret/master
be up to date with master2
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 273e7d26e..47990073b 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -440,7 +440,7 @@ u16 sub_803B7C8(struct Pokemon *mon, u8 a2); void DeleteFirstMoveAndGiveMoveToMon(struct Pokemon *mon, u16 move); void DeleteFirstMoveAndGiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move); -u8 sub_803C348(u8 a1); +u8 CountAliveMons(u8 a1); u8 sub_803C434(u8 a1); u8 GetMonGender(struct Pokemon *mon); u8 GetBoxMonGender(struct BoxPokemon *boxMon); @@ -503,8 +503,9 @@ u8 sub_8040574(struct Pokemon *party); void ClearBattleMonForms(void); void sub_80408BC(); void current_map_music_set__default_for_battle(u16); -const u16 *species_and_otid_get_pal(u16, u32, u32); -const struct SpritePalette *sub_80409C8(u16, u32, u32); +const u8 *pokemon_get_pal(struct Pokemon *mon); +const u8 *species_and_otid_get_pal(u16, u32, u32); +const struct CompressedSpritePalette *sub_80409C8(u16, u32, u32); bool8 IsOtherTrainer(u32, u8 *); void sub_8040B8C(void); void SetWildMonHeldItem(void); |