diff options
| author | fig02 <fig02srl@gmail.com> | 2024-10-10 22:04:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-10 22:04:30 -0400 |
| commit | 53c57599a4b2116a2900465f2567b2da21147c3e (patch) | |
| tree | 0c4105cccf9e49b58179271007cace8096e4b157 /include | |
| parent | fdf502dcdd55657a63d641a7a52628542eed277f (diff) | |
Name talking action related things (#2260)
* name talking related things
* Player_Action_TalkExchangeItem -> Player_Action_ExchangeItem
* splitting action stuff to new PR
* format
Diffstat (limited to 'include')
| -rw-r--r-- | include/z64player.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/z64player.h b/include/z64player.h index 3f79d7ca5..8b9ea8ce5 100644 --- a/include/z64player.h +++ b/include/z64player.h @@ -675,7 +675,7 @@ typedef struct WeaponInfo { #define PLAYER_STATE1_3 (1 << 3) #define PLAYER_STATE1_HOSTILE_LOCK_ON (1 << 4) // Currently locked onto a hostile actor. Triggers a "battle" variant of many actions. #define PLAYER_STATE1_5 (1 << 5) -#define PLAYER_STATE1_6 (1 << 6) +#define PLAYER_STATE1_TALKING (1 << 6) // Currently talking to an actor. This includes item exchanges. #define PLAYER_STATE1_DEAD (1 << 7) // Player has died. Note that this gets set when the death cutscene has started, after landing from the air. #define PLAYER_STATE1_START_CHANGING_HELD_ITEM (1 << 8) // Item change process has begun #define PLAYER_STATE1_9 (1 << 9) @@ -903,7 +903,7 @@ typedef struct Player { /* 0x0888 */ f32 distToInteractWall; // xyz distance to the interact wall /* 0x088C */ u8 ledgeClimbType; /* 0x088D */ u8 ledgeClimbDelayTimer; - /* 0x088E */ u8 unk_88E; + /* 0x088E */ u8 textboxBtnCooldownTimer; // Prevents usage of A/B/C-up when counting down /* 0x088F */ u8 damageFlickerAnimCounter; // Used to flicker Link after taking damage /* 0x0890 */ u8 unk_890; /* 0x0891 */ u8 bodyShockTimer; |