diff options
| author | Theo <65437533+notyourav@users.noreply.github.com> | 2024-01-01 13:10:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-01 13:10:06 -0800 |
| commit | 6fb8b41a8e003d0a4997740f4178aeb0c3f24ead (patch) | |
| tree | 9ada8fe01cc0e308e32e385f9b6965971010cda0 /include | |
| parent | 983412cc77d81692ad9431c0bd55f8d24e5554f8 (diff) | |
| parent | f5c6178ed4830769f65fbc74b18e3403eda05f86 (diff) | |
Merge pull request #686 from notyourav/followtest
document unused zelda follower and gust jar states
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm.h | 2 | ||||
| -rw-r--r-- | include/player.h | 26 |
2 files changed, 23 insertions, 5 deletions
diff --git a/include/asm.h b/include/asm.h index a6c7db62..d42458ee 100644 --- a/include/asm.h +++ b/include/asm.h @@ -39,7 +39,7 @@ extern void ResetCollisionLayer(struct Entity_*); extern void sub_08004596(struct Entity_*, u32); extern u32 sub_080045B4(struct Entity_*, u32, u32); extern u32 CalculateDirectionTo(u32, u32, u32, u32); -extern u32 sub_080045DA(s32, s32); +extern u32 CalcOffsetAngle(s32, s32); extern u32 sub_080086B4(u32, u32, const u8*); extern u32 ResolveCollisionLayer(struct Entity_*); extern void sub_0800417E(struct Entity_*, u32); diff --git a/include/player.h b/include/player.h index e344d0af..dbd1f923 100644 --- a/include/player.h +++ b/include/player.h @@ -11,8 +11,8 @@ typedef struct { /*0x6d*/ u8 unk_6d; /*0x6e*/ u8 unk_6e; /*0x6f*/ u8 unk_6f; - /*0x70*/ Entity* unk_70; - /*0x74*/ Entity* unk_74; + /*0x70*/ Entity* pulledJarEntity; + /*0x74*/ Entity* carriedEntity; /*0x78*/ u8 unk_78; /*0x79*/ u8 unk_79; /*0x7a*/ u16 unk_7a; @@ -299,6 +299,24 @@ typedef enum { } SwordMove; typedef enum { + PL_JAR_NONE = 0x0, + PL_JAR_SUCK = 0x1, + PL_JAR_2 = 0x2, + PL_JAR_3 = 0x3, + PL_JAR_BLAST_INIT = 0x4, + PL_JAR_BLAST_UPDATE = 0x5, + PL_JAR_BLAST_DONE = 0x6, + PL_JAR_ENT_ATTACHED = 0x7, +} GustJarState; + +typedef enum { + JAR_CHARGE_NONE = 0, + JAR_CHARGE_SMALL = 1, + JAR_CHARGE_MID = 2, + JAR_CHARGE_BIG = 3, +} GustJarCharge; + +typedef enum { ANIM_DEFAULT = 0x100, ANIM_WALK = 0x104, ANIM_SWORD = 0x108, @@ -492,8 +510,8 @@ typedef struct { /*0x18*/ u16 startPosY; /*0x1a*/ u8 mobility; /*0x1b*/ u8 sword_state; - /*0x1c*/ u8 field_0x1c; - /*0x1d*/ u8 gustJarSpeed; + /*0x1c*/ u8 gustJarState; + /*0x1d*/ u8 gustJarCharge; /*0x1e*/ u8 dash_state; /*0x1f*/ u8 field_0x1f[2]; /*0x21*/ u8 bow_state; |