diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-25 00:23:12 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-06-25 00:26:50 -0400 |
| commit | 2cae14cf5ae83831d5c387b3823de34d8d476908 (patch) | |
| tree | b776589bf88596d7280011c3ea1d9befd32b287f /include/choose_party.h | |
| parent | 3300def3b39752f9f290f10dbf0cf7748f0dec5b (diff) | |
| parent | e72babd734ab7fd4e5c6d29f456b82d5e76e1bde (diff) | |
Merge remote-tracking branch 'origin/master' into de/integrate-data-includes
Conflicts:
asm/battle_anim_8137220.s
asm-de/battle_message.s
Diffstat (limited to 'include/choose_party.h')
| -rw-r--r-- | include/choose_party.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/choose_party.h b/include/choose_party.h index 1e575a355..e31aa3c02 100644 --- a/include/choose_party.h +++ b/include/choose_party.h @@ -3,6 +3,11 @@ void sub_8121E10(void); void sub_8121E34(void); -void sub_8123138(u8); +bool8 sub_8121E78(void); +void sub_81222B0(u8 taskId); +bool8 sub_8122854(void); +void sub_8122A48(u8 taskId); +void sub_8122E0C(u8 taskId); +void sub_8123138(u8 taskId); #endif // GUARD_CHOOSE_PARTY_H |