diff options
author | KDSKardabox <bollygame94@gmail.com> | 2018-02-13 10:02:27 +0530 |
---|---|---|
committer | KDSKardabox <bollygame94@gmail.com> | 2018-02-13 10:02:27 +0530 |
commit | aaea65c37bb6dbe04de602492f6e175cabc87f22 (patch) | |
tree | dca7115e05ed132733c1e5ea0b4a3322a2d41e9a /include/party_menu.h | |
parent | ae321d6e7c99b557cafd594eb945e7ca1a566ba8 (diff) | |
parent | 398e775d906ff4f1e5aaad3d8a9eee530c7b122d (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald
# Conflicts:
# include/strings.h
Diffstat (limited to 'include/party_menu.h')
-rw-r--r-- | include/party_menu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/party_menu.h b/include/party_menu.h index 1d1661cee..14aacce88 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -18,5 +18,6 @@ u8 pokemon_ailments_get_primary(u32 status); u8 *GetMonNickname(struct Pokemon *mon, u8 *dst); u8 GetCursorSelectionMonId(void); bool8 FieldCallback_Teleport(void); +void sub_81B7F60(void); #endif // GUARD_PARTY_MENU_H |