diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
| commit | c7722a492017dbd8a5fb3bb216062eb62129daf5 (patch) | |
| tree | 2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /include/choose_party.h | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'include/choose_party.h')
| -rw-r--r-- | include/choose_party.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/choose_party.h b/include/choose_party.h index e31aa3c02..853202a89 100644 --- a/include/choose_party.h +++ b/include/choose_party.h @@ -3,11 +3,11 @@ void sub_8121E10(void); void sub_8121E34(void); -bool8 sub_8121E78(void); -void sub_81222B0(u8 taskId); -bool8 sub_8122854(void); -void sub_8122A48(u8 taskId); -void sub_8122E0C(u8 taskId); +bool8 SetupBattleTowerPartyMenu(void); +void HandleBattleTowerPartyMenu(u8 taskId); +bool8 SetupLinkMultiBattlePartyMenu(void); +void HandleLinkMultiBattlePartyMenu(u8 taskId); +void HandleDaycarePartyMenu(u8 taskId); void sub_8123138(u8 taskId); #endif // GUARD_CHOOSE_PARTY_H |