mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-16 21:05:12 +00:00
Code Issues Projects Releases Wiki Activity

PLAYER_STATE1_ACTOR_CARRY -> PLAYER_STATE1_CARRYING_ACTOR (#2213)

Browse source
This commit is contained in:
fig02 2024-09-21 18:25:19 -04:00 • committed by GitHub
parent 05b908d0eb
commit fcd5745d40
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 60 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/z64player.h
View file

@ -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)