diff options
author | camthesaxman <cameronghall@cox.net> | 2017-12-05 12:42:30 -0600 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2017-12-05 12:42:30 -0600 |
commit | 19fbf024ff7e5bedc0f297a44c7df298a9bd0ef4 (patch) | |
tree | e9a928ac0d8eaaca476d8704b95fbf5f6838d994 /include/party_menu.h | |
parent | caa13f877797edbb7a1e13bf00b537bafbd4315a (diff) | |
parent | 00896cb3b5813cb843e5e1abd4cbc9ff0ad3a632 (diff) |
fix merge conflicts
Diffstat (limited to 'include/party_menu.h')
-rw-r--r-- | include/party_menu.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/party_menu.h b/include/party_menu.h index 7a7d59cd0..c787bafb1 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -1,8 +1,18 @@ #ifndef GUARD_PARTY_MENU_H #define GUARD_PARTY_MENU_H +enum { + AILMENT_NONE, + AILMENT_PSN, + AILMENT_PRZ, + AILMENT_SLP, + AILMENT_FRZ, + AILMENT_BRN +}; + bool8 pokemon_has_move(struct Pokemon *, u16); void sub_81B58A8(void); void DoWallyTutorialBagMenu(void); +u8 pokemon_ailments_get_primary(u32 status); #endif // GUARD_PARTY_MENU_H |