diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2018-08-12 12:11:35 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-08-12 12:11:35 +0200 |
commit | 957dcd01b382fb74e9b1967851ef3cfb6ca983eb (patch) | |
tree | 5eb81cbb67be2303952d85da2ca5f9b2ec61c044 /include/party_menu.h | |
parent | e787d5b60230550a4a8f1f3251b90e141bfcc5ff (diff) | |
parent | 40cf61307b411ea4de858902c7081fde8ef71ea5 (diff) |
merge with master
Diffstat (limited to 'include/party_menu.h')
-rw-r--r-- | include/party_menu.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/party_menu.h b/include/party_menu.h index 6e1344213..cb2c38891 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -34,6 +34,8 @@ struct Struct203CEC8 extern struct Struct203CEC8 gUnknown_0203CEC8; +extern const u16 gUnknown_0861500C[]; + bool8 pokemon_has_move(struct Pokemon *, u16); void sub_81B58A8(void); void DoWallyTutorialBagMenu(void); @@ -54,5 +56,6 @@ void sub_81B8518(u8 unused); u8 sub_81B1360(void); void sub_81B8904(u8 arg0, void (*callback)(void)); void OpenPartyMenuInBattle(u8 caseId); +u16 ItemIdToBattleMoveId(u16 itemId); #endif // GUARD_PARTY_MENU_H |