diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-06-11 12:22:15 +0200 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-07-04 16:03:58 +0200 |
| commit | fd640407bba87b9b69cd7707dcb88ae4f8014968 (patch) | |
| tree | 3b1e0b4e714d1f001746817f7e07cdfd90b5eee2 /include | |
| parent | 3664b4a37bfb48d2dc7f13597619ce2d48d8622b (diff) | |
Split item files
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 24 | ||||
| -rw-r--r-- | include/player.h | 2 | ||||
| -rw-r--r-- | include/structures.h | 1 |
3 files changed, 22 insertions, 5 deletions
diff --git a/include/functions.h b/include/functions.h index 33e7b70b..15e0d175 100644 --- a/include/functions.h +++ b/include/functions.h @@ -14,7 +14,7 @@ extern void ShowNPCDialogue(Entity*, Dialog*); extern void DoFade(u32, u32); extern u32 CheckKinstoneFused(u32); -extern void ForceEquipItem(u32, u8); +extern void ForceEquipItem(u32, u32); extern void LoadRoomEntityList(EntityData* listPtr); extern u32 GetAnimationState(Entity*); extern void SetChildOffset(Entity*, s32, s32, s32); @@ -54,7 +54,7 @@ extern void sub_080787A8(Entity*, u32); extern void sub_0806F118(Entity*); extern void sub_080791D0(); extern void sub_0805EC9C(); -extern void sub_0805EC60(); +extern void sub_0805EC60(Entity*); extern u32 sub_080045D4(s16, s16, u32, u32); extern void sub_0806F69C(Entity*); extern void sub_0805E3A0(void*, u32); @@ -82,9 +82,9 @@ extern u32 sub_080041A0(Entity*, Entity*, u32, u32); extern u32 sub_08049EE4(Entity*); extern Entity* sub_0804A98C(Entity*, u8, u8); extern u32 GetBottleContaining(u32); -extern void sub_08077E54(Entity*); +extern void sub_08077E54(ItemBehavior*); extern void sub_080042BA(Entity*, u32); -extern void sub_08077F24(ItemBehavior*, u32); +extern bool32 sub_08077F24(ItemBehavior*, u32); extern void sub_08079184(); extern void sub_08077F50(ItemBehavior* beh, u32 arg1); extern void sub_0807AA80(Entity*); @@ -257,7 +257,7 @@ extern void sub_08056360(); extern u32 sub_080542AC(u32); extern u32 sub_08079FC4(u32); extern void sub_0800455E(Entity*); -extern void sub_08008790(Entity*, u32); +extern u32* sub_08008790(Entity*, u32); extern void sub_0804ACF8(); extern void sub_08073904(Entity*); extern u32 sub_08056134(void); @@ -267,4 +267,18 @@ extern void sub_0805EEB4(u8*, u32); extern void sub_08056BDC(u32); extern void sub_08056F88(u32, u32); extern void sub_0805F8E4(u32 r0, WStruct* r1); + +extern Entity* sub_08077C94(ItemBehavior*, u32); +extern Entity* sub_08077C0C(ItemBehavior*, u32); +extern void sub_08077D38(ItemBehavior*, u32); +extern void sub_08077E78(ItemBehavior*, u32); +extern void UpdateItemAnim(ItemBehavior*); +extern void sub_0806F948(Entity*); +extern void sub_08077DF4(ItemBehavior*, u32); +extern void sub_08077BB8(ItemBehavior*); +extern bool32 sub_08077EFC(ItemBehavior*); + +extern void sub_08078E84(Entity*, Entity*); +extern void sub_080042D0(Entity*, u32, u16); + #endif diff --git a/include/player.h b/include/player.h index da6f324b..c4ef0f0f 100644 --- a/include/player.h +++ b/include/player.h @@ -148,6 +148,8 @@ typedef struct { /*0x4*/ u8 stateID; /*0x5*/ u8 field_0x5[10]; /*0xf*/ u8 field_0xf; + /*0x10*/ u8 field_0x10[8]; + /*0x18*/ u32 field_0x18; } ItemBehavior; extern void (*const gPlayerItemFunctions[])(Entity*); diff --git a/include/structures.h b/include/structures.h index a94d66ce..43455a79 100644 --- a/include/structures.h +++ b/include/structures.h @@ -159,6 +159,7 @@ extern u16 gBG3Buffer[0x800]; struct { u8 filler[0x70]; } extern gUnk_03000B80; +// TODO extern ItemBehavior gUnk_03000B80[4]; static_assert(sizeof(gUnk_03000B80) == 0x70); typedef struct { |