summaryrefslogtreecommitdiff
path: root/include/player.h
diff options
context:
space:
mode:
authortheo3 <arisstephenson2@gmail.com>2021-12-14 23:31:27 -0800
committertheo3 <arisstephenson2@gmail.com>2021-12-14 23:31:27 -0800
commit34e69959df548688ef8535eb4cab18e5a53992a8 (patch)
treed5a822be15b8f06323912e90ad2a25746b47b76e /include/player.h
parent83fc0285020c456beb809d9918515ad1c1c73245 (diff)
cleanup
Diffstat (limited to 'include/player.h')
-rw-r--r--include/player.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/include/player.h b/include/player.h
index e1ef7001..8512db67 100644
--- a/include/player.h
+++ b/include/player.h
@@ -63,8 +63,16 @@ typedef enum {
} PlayerControlMode;
enum PlayerFlags {
+ PL_BUSY = (1 << 0),
+ PL_DROWNING = (1 << 2),
PL_NO_CAP = (1 << 3),
+ PL_USE_PORTAL = (1 << 5),
PL_MINISH = (1 << 7),
+ PL_BURNING = (1 << 10),
+ PL_ROLLING = (1 << 18),
+ PL_IN_HOLE = (1 << 20),
+ PL_USE_LANTERN = (1 << 23),
+ PL_USE_OCARINA = (1 << 28),
};
typedef struct {
@@ -74,7 +82,7 @@ typedef struct {
/*0x05*/ u8 heldObject;
/*0x06*/ u8 pushedObject;
/*0x07*/ u8 field_0x7;
- /*0x08*/ u16 field_0x8;
+ /*0x08*/ u16 animation;
/*0x0a*/ u8 field_0xa;
/*0x0b*/ u8 keepFacing;
/*0x0c*/ u8 playerAction;
@@ -121,7 +129,7 @@ typedef struct {
/*0x40*/ u8 hurtType[64];
/*0x80*/ u16 field_0x80;
/*0x82*/ u8 field_0x82[9];
- /*0x8b*/ u8 field_0x8b;
+ /*0x8b*/ u8 controlMode;
/*0x8c*/ u32 field_0x8c;
/*0x90*/ union SplitWord field_0x90;
/*0x94*/ u32 field_0x94;