diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-10-07 16:33:02 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-10-07 16:37:17 -0700 |
| commit | c2d448767c6de4c9028454f279c8e43d2ecb174c (patch) | |
| tree | 315f3e544e10f66be13c78bd01d1f286c16902fe /include | |
| parent | 31748e93d8be0b5e8410c2f11b5719d60c2162db (diff) | |
Finish decompiling party_menu, and remove its asm/ file
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 2 | ||||
| -rw-r--r-- | include/party_menu.h | 25 |
2 files changed, 16 insertions, 11 deletions
diff --git a/include/battle.h b/include/battle.h index 47cb7cf8e..86e15ad49 100644 --- a/include/battle.h +++ b/include/battle.h @@ -19,6 +19,8 @@ #define BATTLE_TYPE_LEGENDARY 0x2000 #define BATTLE_TYPE_REGI 0x4000 +#define BATTLE_TYPE_LINK_DOUBLE (BATTLE_TYPE_MULTI | BATTLE_TYPE_TRAINER | BATTLE_TYPE_LINK | BATTLE_TYPE_DOUBLE) + #define BATTLE_WON 0x1 #define BATTLE_LOST 0x2 #define BATTLE_DREW 0x3 diff --git a/include/party_menu.h b/include/party_menu.h index 510c12616..74ef72519 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -15,11 +15,11 @@ struct PartyPopupMenu struct Unk201B000 { - //u8 filler0[0x260]; struct Pokemon unk0[6]; - u8 filler258[1]; + u8 unk258; u8 unk259; - u8 filler25A[6]; + u8 filler25A[2]; + TaskFunc taskFunc; u8 unk260; u8 unk261; u8 unk262; @@ -71,20 +71,23 @@ extern u8 ewram[]; #define EWRAM_1B000 ewram1B000_alt void sub_806AEDC(void); -void sub_806AF4C(u8 arg0, u8 arg1, void* arg2, u8 arg3); -void OpenPartyMenu(u8, u8); -void OpenPartyMenu(); +void sub_806AF4C(u8 a, u8 battleFlags, TaskFunc func, u8 d); +void OpenPartyMenu(u8 a, u8 b); bool8 sub_806B124(void); -u8 IsLinkDoubleBattle(void); +bool8 IsLinkDoubleBattle(void); u8 sub_806B58C(u8); u8 sub_806B58C(u8); +void sub_806B908(void); void sub_806BC3C(u8, u8); +void sub_806BCE8(void); u8 sub_806BD58(u8, u8); u8 sub_806BD58(u8, u8); -u16 sub_806BD80(u8); -void task_pc_turn_off(); -void sub_806BF74(u8 arg0, s8 arg1); -void sub_806C994(u8 arg0, u8 arg1); +u16 sub_806BD80(u8 taskId); +u16 sub_806BE38(u8 taskId); +void task_pc_turn_off(const u8 *a, u8 b); +void sub_806BF74(u8 taskId, s8 directionPressed); +void sub_806C890(u8 taskId); +void sub_806C994(u8 taskId, u8 b); u8 sub_806CA38(u8 taskID); void sub_806CB74(u8 taskId); void sub_806CCE4(void); |