summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorfig02 <fig02srl@gmail.com>2024-09-21 18:25:19 -0400
committerGitHub <noreply@github.com>2024-09-21 18:25:19 -0400
commitfcd5745d404493cda2fdb09f749f53f06f79ba48 (patch)
tree4ceadadbe3a3c9b901be7fd6242e54df73d34c56 /include
parent05b908d0eb881da10a0bca74a8649cf4bfc9b1b2 (diff)
PLAYER_STATE1_ACTOR_CARRY -> PLAYER_STATE1_CARRYING_ACTOR (#2213)
Diffstat (limited to 'include')
-rw-r--r--include/z64player.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/z64player.h b/include/z64player.h
index 581c7f7b4..0043cc954 100644
--- a/include/z64player.h
+++ b/include/z64player.h
@@ -659,7 +659,7 @@ typedef struct WeaponInfo {
#define PLAYER_STATE1_START_CHANGING_HELD_ITEM (1 << 8) // Item change process has begun
#define PLAYER_STATE1_9 (1 << 9)
#define PLAYER_STATE1_10 (1 << 10)
-#define PLAYER_STATE1_ACTOR_CARRY (1 << 11) // Currently carrying an actor
+#define PLAYER_STATE1_CARRYING_ACTOR (1 << 11) // Currently carrying an actor
#define PLAYER_STATE1_CHARGING_SPIN_ATTACK (1 << 12) // Currently charing a spin attack (by holding down the B button)
#define PLAYER_STATE1_13 (1 << 13)
#define PLAYER_STATE1_14 (1 << 14)