diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-09-12 22:59:04 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-09-12 22:59:04 +0200 |
| commit | a08d9dd451dd87a24b833eef2d3c09daae2a524d (patch) | |
| tree | 024875f0465dea995ea30a0d30adf2cd73f4d87a /include | |
| parent | 8a81bd1bce852e58efb9f48f4e8db225a3ee2f15 (diff) | |
| parent | 095cbbc5c297055d2cb2c01a2c8c04dc7d055cb6 (diff) | |
Merge branch 'master' into anims
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_main.h | 2 | ||||
| -rw-r--r-- | include/party_menu.h | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/include/battle_main.h b/include/battle_main.h index 27e61c8fc..5a61b5ef0 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -35,7 +35,7 @@ void CB2_QuitRecordedBattle(void); void sub_8038528(struct Sprite* sprite); void sub_8038A04(void); // unused void VBlankCB_Battle(void); -void nullsub_17(void); +void nullsub_17(struct Sprite *sprite); void sub_8038B74(struct Sprite *sprite); void sub_8038D64(void); u32 sub_80391E0(u8 arrayId, u8 caseId); diff --git a/include/party_menu.h b/include/party_menu.h index 02e481200..b93b78544 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -58,7 +58,18 @@ void sub_81B8904(u8 arg0, void (*callback)(void)); void OpenPartyMenuInBattle(u8 caseId); u16 ItemIdToBattleMoveId(u16 itemId); u8 sub_81B205C(struct Pokemon* a); +void sub_81B617C(void); u8 sub_81B6D14(u16 a); bool8 hm_add_c3_without_phase_2(void); +extern void dp05_ether(u8, u16, TaskFunc); +extern void dp05_pp_up(u8, u16, TaskFunc); +extern void dp05_rare_candy(u8, u16, TaskFunc); + +extern void sub_81B67C8(u8, u16, TaskFunc); +extern void sub_81B79E8(u8, u16, TaskFunc); +extern void sub_81B6DC4(u8, u16, TaskFunc); +extern void sub_81B7C74(u8, u16, TaskFunc); +extern u16 ItemIdToBattleMoveId(u16); + #endif // GUARD_PARTY_MENU_H |