diff options
| author | Tyler McGavran <tyler.taggerung@gmail.com> | 2022-06-11 17:55:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-11 14:55:45 -0700 |
| commit | 0923e944204da352b7b45fd75682bfc6d5744c1b (patch) | |
| tree | 4ddd0534a91a6445de7a88d9213fe1f5696e5e98 /include/actor_types.h | |
| parent | 56120481f993fd5a99df52d6714eb56dcf06ace8 (diff) | |
Match all but one function in code_802B0210.c (#217)
Required getting the .rodata for that file correct too.
Matched a couple other funtions here and there as well.
Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
Diffstat (limited to 'include/actor_types.h')
| -rw-r--r-- | include/actor_types.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/actor_types.h b/include/actor_types.h index 450befb6a..0efe7c7c6 100644 --- a/include/actor_types.h +++ b/include/actor_types.h @@ -245,7 +245,10 @@ struct ShellActor { /* 0x08 */ f32 shellId; // 0, 1, or 2. Indicates which shell in the triplet this one is /* 0x0C */ f32 boundingBoxSize; /* 0x10 */ s16 rotVelocity; // Change in rotAngle on a per-update basis - /* 0x12 */ s16 rotAngle; // Angle of rotation around player (or parent?), not the rotation of the shell itself + union { + /* 0x12 */ s16 rotAngle; // Angle of rotation around player (or parent?), not the rotation of the shell itself + /* 0x12 */ u16 pathIndex; // Index in the set of points that make up the "path" the red/blue shell follows (may be GP mode exclusive) + }; /* 0x14 */ s16 playerId; // Id of the player that "owns" the shell /* 0x16 */ s16 unk_16; /* 0x18 */ Vec3f pos; |