commented offsets in entity, linkState

This commit is contained in:
theo3
2020-07-09 01:39:40 -07:00
parent bde7b45adb
commit 03a8e052af
105 changed files with 630 additions and 887 deletions
+2 -1
View File
@@ -139,7 +139,8 @@ typedef struct Entity {
/*0x6a*/ union SplitHWord field_0x6a;
/*0x6c*/ u8 field_0x6c;
/*0x6d*/ u8 field_0x6d;
/*0x6e*/ u8 filler4[6];
/*0x6e*/ u8 filler4[2];
/*0x70*/ u32 field_0x70;
/*0x74*/ u16 field_0x74;
/*0x76*/ u16 field_0x76;
/*0x78*/ union SplitHWord field_0x78;
+2 -2
View File
@@ -46,7 +46,7 @@ extern void sub_0807DDAC(Entity*, u32);
extern void sub_0807DDE4(Entity*);
extern void sub_0806D02C(Entity*);
extern u32 sub_0806F5A4(u32);
extern u32 sub_080045C4(Entity*, Entity*);
extern u32 GetFacingDirection(Entity*, Entity*);
extern void sub_08078784(Entity*, u32);
extern void sub_0807DD50(Entity*);
extern void sub_0807DD94(Entity*, u32);
@@ -65,7 +65,7 @@ extern void sub_0801D2B4(Entity*, u32);
extern void sub_0806FD3C(Entity*);
extern u32 sub_0801E99C(Entity*);
extern void sub_0807DD50(Entity*);
extern u32 sub_080045C4(Entity*, Entity*);
extern u32 GetFacingDirection(Entity*, Entity*);
extern void sub_0806F118(Entity*);
extern void sub_0807DD94(Entity*, u32);
extern void sub_0805ED14(u32*);
+52 -48
View File
@@ -1,3 +1,5 @@
// clang-format off
#ifndef LINK_H
#define LINK_H
@@ -5,53 +7,53 @@
#include "entity.h"
typedef struct {
u8 filler[2];
u8 jumpStatus;
u8 filler2[2];
u8 heldObject;
u8 pushedObject;
u8 unk;
u16 unk2;
u8 unk3;
u8 keepFacing;
u8 linkAction;
u8 filler3[2];
u8 hurtBlinkSpeed;
u8 filler4[4];
u16 filler5[3];
u8 filler6[2];
u8 field_0x1c;
u8 filler9[2];
u16 filler7[2];
u8 swimState;
u8 filler8[5];
u8* unk4;
union {
u32 all;
struct {
u32 filler9 : 3;
u32 noMinishCap : 1;
u32 pullingState : 1;
u32 windyState : 1;
u32 filler10 : 4;
u32 slipperyState : 1;
u32 filler11 : 5;
u32 filler11b : 16;
} PACKED b;
} flags;
u8 filler12[6];
u16 unk5;
u8 filler13[2];
u8 swordGoldParticle : 1;
u8 swordBlueParticle : 1;
u8 filler14 : 6;
u8 unk6;
u8 filler15[75];
u8 unk7;
u32 filler16[7];
u8 filler17[3];
u8 unk71;
u32 unk8;
/*0x00*/ u8 filler[2];
/*0x02*/ u8 jumpStatus;
/*0x03*/ u8 filler2[2];
/*0x05*/ u8 heldObject;
/*0x06*/ u8 pushedObject;
/*0x07*/ u8 unk;
/*0x08*/ u16 unk2;
/*0x0a*/ u8 unk3;
/*0x0b*/ u8 keepFacing;
/*0x0c*/ u8 linkAction;
/*0x0d*/ u8 filler3[2];
/*0x0f*/ u8 hurtBlinkSpeed;
/*0x10*/ u8 filler4[4];
/*0x14*/ u16 filler5[3];
/*0x1a*/ u8 filler6[2];
/*0x1c*/ u8 field_0x1c;
/*0x1d*/ u8 filler9[5];
/*0x22*/ u16 filler7[2];
/*0x26*/ u8 swimState;
/*0x27*/ u8 filler8[5];
/*0x2c*/ u8* unk4;
/*0x30*/ union {
/* */ u32 all;
/* */ struct {
/* */ u32 filler9 : 3;
/* */ u32 noMinishCap : 1;
/* */ u32 pullingState : 1;
/* */ u32 windyState : 1;
/* */ u32 filler10 : 4;
/* */ u32 slipperyState : 1;
/* */ u32 filler11 : 5;
/* */ u32 filler11b : 16;
/* */ } PACKED b;
/* */ } flags;
/*0x34*/ u8 filler12[6];
/*0x3a*/ u16 unk5;
/*0x3c*/ u8 filler13[2];
/*0x3e*/ u8 swordGoldParticle : 1;
/* */ u8 swordBlueParticle : 1;
/* */ u8 filler14 : 6;
/*0x3f*/ u8 unk6;
/*0x40*/ u8 filler15[75];
/*0x8b*/ u8 unk7;
/*0x8c*/ u32 filler16[7];
/*0xa8*/ u8 filler17[3];
/*0xab*/ u8 unk71;
/*0xac*/ u32 unk8;
} LinkState;
@@ -80,4 +82,6 @@ extern Entity gLinkEntity;
extern u32 GetInventoryValue(u32);
extern s32 ModHealth(s32);
#endif
#endif
// clang-format on