diff options
| author | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2017-05-26 15:35:40 +0200 |
|---|---|---|
| committer | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2017-05-26 15:40:20 +0200 |
| commit | 2aae7e99d52fc488e75309909d279b459f5e1d80 (patch) | |
| tree | ab4dcb928f7405b17d06fb6adc2746095e622f1f /include/pokemon.h | |
| parent | f26daa3d6954d2db3a7c44b79d319a7a084462c2 (diff) | |
Make rom build again
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 862ac10bc..3d97e2f3d 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -1,6 +1,8 @@ #ifndef GUARD_POKEMON_H #define GUARD_POKEMON_H +#include "sprite.h" + #define MON_DATA_PERSONALITY 0 #define MON_DATA_OT_ID 1 #define MON_DATA_NICKNAME 2 @@ -488,12 +490,12 @@ u8 sub_8040574(struct Pokemon *party); void ClearBattleMonForms(void); void sub_80408BC(); void current_map_music_set__default_for_battle(u16); -void *species_and_otid_get_pal(u32, u32, u32); +void *species_and_otid_get_pal(u16, u32, u32); const struct SpritePalette *sub_80409C8(u16, u32, u32); bool8 IsOtherTrainer(u32, u8 *); void sub_8040B8C(void); void SetWildMonHeldItem(void); u8 *sub_8040D08(); -int sub_8040D3C(); +bool32 sub_8040D3C(u16 species, u8 *name, u8 language); #endif // GUARD_POKEMON_H |