diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/pokemon.h | 17 | ||||
| -rw-r--r-- | include/pokemon_summary_screen.h | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 8864aee8a..9e3dd2e34 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -118,6 +118,23 @@ #define TYPE_DRAGON 0x10 #define TYPE_DARK 0x11 +#define FRIENDSHIP_EVENT_GROW_LEVEL 0x0 +#define FRIENDSHIP_EVENT_VITAMIN 0x1 // unused +#define FRIENDSHIP_EVENT_BATTLE_ITEM 0x2 // unused +#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 0x3 +#define FRIENDSHIP_EVENT_LEARN_TMHM 0x4 +#define FRIENDSHIP_EVENT_WALKING 0x5 +#define FRIENDSHIP_EVENT_FAINT_SMALL 0x6 +#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 0x7 +#define FRIENDSHIP_EVENT_FAINT_LARGE 0x8 + +#define STATUS_PRIMARY_NONE 0x0 +#define STATUS_PRIMARY_POISON 0x1 +#define STATUS_PRIMARY_PARALYSIS 0x2 +#define STATUS_PRIMARY_SLEEP 0x3 +#define STATUS_PRIMARY_FREEZE 0x4 +#define STATUS_PRIMARY_BURN 0x5 + #define PARTY_SIZE 6 #define MAX_TOTAL_EVS 510 #define NUM_STATS 6 diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h index 945e810a3..f1dbe0089 100644 --- a/include/pokemon_summary_screen.h +++ b/include/pokemon_summary_screen.h @@ -61,7 +61,7 @@ struct PokemonSummaryScreenStruct void ShowPokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u8); void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16); u8 sub_809FA30(void); -u8 pokemon_ailments_get_primary(u32); +u8 GetPrimaryStatus(u32); u8 GetMonStatusAndPokerus(); u8 *sub_80A1E9C(u8 *dest, const u8 *src, u8); u8 *PokemonSummaryScreen_CopyPokemonLevel(u8 *dest, u8 level); |