diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-11-08 17:25:26 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-11-08 17:25:26 -0600 |
| commit | fc11078cef11edc9deedd08c6175fb5e6628504c (patch) | |
| tree | 62823b5dc1335a4d8659104dc4156713674ce757 /include/script_pokemon_80F9.h | |
| parent | ba06c424c974f18f9c4af85eb0ffe8adc6056941 (diff) | |
| parent | 8832b766facd48c85c1b99ac6dad555f1e2aa1c7 (diff) | |
fix merge conflicts
Diffstat (limited to 'include/script_pokemon_80F9.h')
| -rw-r--r-- | include/script_pokemon_80F9.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/script_pokemon_80F9.h b/include/script_pokemon_80F9.h index d65c99c15..fa5d57f0e 100644 --- a/include/script_pokemon_80F9.h +++ b/include/script_pokemon_80F9.h @@ -9,9 +9,13 @@ struct UnknownStruct2018000 extern struct UnknownStruct2018000 unk_2018000; -void sub_80F9A8C(u8); +void OpenPartyMenuFromScriptContext(u8 taskId); void sub_80F9C00(void); void sub_80F9E1C(void); void sub_80F99CC(void); +void HandleSelectPartyMenu(u8 taskId); +bool8 SetupContestPartyMenu(void); +void HandleMoveTutorPartyMenu(u8 taskId); +bool8 SetupMoveTutorPartyMenu(void); #endif |