diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-09-24 13:05:06 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-09-25 20:31:21 -0700 |
| commit | 31748e93d8be0b5e8410c2f11b5719d60c2162db (patch) | |
| tree | 0cde5adac38aad6b6a96c3b737aeecfdc5ae667f /include | |
| parent | c3792f2bd4c6ee3fecea548f45b2a54a9b468ab1 (diff) | |
More party_menu decomp
Diffstat (limited to 'include')
| -rw-r--r-- | include/party_menu.h | 21 | ||||
| -rw-r--r-- | include/pokemon_icon.h | 3 |
2 files changed, 13 insertions, 11 deletions
diff --git a/include/party_menu.h b/include/party_menu.h index cf6d06650..510c12616 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -58,11 +58,9 @@ struct Unk2001000 u8 unk5; u8 unk6; u8 unk7; - u8 unk8; - u8 unk9; - u8 unkA; - u8 unkB; - void* unkC; + s16 unk8; + s16 unkA; + TaskFunc unkC; u16 array[53561]; }; @@ -85,18 +83,23 @@ u8 sub_806BD58(u8, u8); u8 sub_806BD58(u8, u8); u16 sub_806BD80(u8); void task_pc_turn_off(); -void sub_806BF74(u8 arg0, u8 arg1); +void sub_806BF74(u8 arg0, s8 arg1); void sub_806C994(u8 arg0, u8 arg1); u8 sub_806CA38(u8 taskID); void sub_806CB74(u8 taskId); void sub_806CCE4(void); void sub_806CD44(u8 taskId); +void sub_806D3B4(u8 taskId, u16 species1, u16 species2); +void sub_806D4AC(u8 taskId, u16 species, u8 c); +void sub_806D50C(u8 taskId, u8 monIndex); void sub_806D538(u8 arg0, u8 arg1); void sub_806D5A4(void); -void SetMonIconAnim(); -void TryCreatePartyMenuMonIcon(u8, u8, struct Pokemon *); +void SetMonIconAnim(u8 spriteId, struct Pokemon *pokemon); +void CreatePartyMenuMonIcon(u8 taskId, u8 monIndex, u8 c, struct Pokemon *pokemon); +void TryCreatePartyMenuMonIcon(u8 a, u8 monIndex, struct Pokemon *pokemon); void LoadHeldItemIconGraphics(void); void PartyMenuTryGiveMonHeldItem(u8 taskId, u16 newItem, TaskFunc c); +void SetMonIconSpriteId_maybe(u8 taskId, u8 monIndex, u8 spriteId); void CreateHeldItemIcons_806DC34(u8 taskId); void SetHeldItemIconVisibility(u8 a, u8 monIndex); void PartyMenuDoPrintMonNickname(u8 monIndex, int b, const u8 *nameBuffer); @@ -173,7 +176,7 @@ void sub_806CD5C(u8 taskId); void DoTakeMail(u8 taskId, TaskFunc func); void PartyMenuTryGiveMonHeldItem_806ECE8(u8 taskId, TaskFunc func); void PartyMenuTryGiveMonMail(u8 taskId, TaskFunc func); -void sub_806D668(u8 partyID); +void sub_806D668(u8 monIndex); void TaughtMove(u8 taskId); void StopTryingToTeachMove_806F588(u8 taskId); diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index 98f984564..62b3eb438 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -1,7 +1,6 @@ #ifndef GUARD_POKEMON_ICON_H #define GUARD_POKEMON_ICON_H -u8 CreateMonIcon(); u8 sub_809D3A4(u16 arg0, void (*)(struct Sprite *), int, u8 arg3, u32 arg4); u16 GetUnownLetterByPersonality(u32); u16 sub_809D4A8(u16); @@ -9,6 +8,6 @@ void sub_809D510(struct Sprite *); void sub_809D51C(void); void sub_809D580(u16); void sub_809D608(u16); -void UpdateMonIconFrame(struct Sprite *sprite); +void sub_809D824(struct Sprite *sprite, u8 animNum); #endif // GUARD_POKEMON_ICON_H |