summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/z64player.h2
-rw-r--r--src/code/z_actor.c9
-rw-r--r--src/code/z_camera.c2
-rw-r--r--src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c2
-rw-r--r--src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c4
-rw-r--r--src/overlays/actors/ovl_player_actor/z_player.c15
6 files changed, 18 insertions, 16 deletions
diff --git a/include/z64player.h b/include/z64player.h
index 0ae8e0e43..dfea5da66 100644
--- a/include/z64player.h
+++ b/include/z64player.h
@@ -660,7 +660,7 @@ typedef struct WeaponInfo {
#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_12 (1 << 12)
+#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)
#define PLAYER_STATE1_Z_TARGETING (1 << 15) // Either lock-on or parallel is active. This flag is never checked for and is practically unused.
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 5785d62a1..e3e1d3479 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -1807,8 +1807,9 @@ u32 Actor_HasParent(Actor* actor, PlayState* play) {
s32 Actor_OfferGetItem(Actor* actor, PlayState* play, s32 getItemId, f32 xzRange, f32 yRange) {
Player* player = GET_PLAYER(play);
- if (!(player->stateFlags1 & (PLAYER_STATE1_7 | PLAYER_STATE1_12 | PLAYER_STATE1_13 | PLAYER_STATE1_14 |
- PLAYER_STATE1_18 | PLAYER_STATE1_19 | PLAYER_STATE1_20 | PLAYER_STATE1_21)) &&
+ if (!(player->stateFlags1 &
+ (PLAYER_STATE1_7 | PLAYER_STATE1_CHARGING_SPIN_ATTACK | PLAYER_STATE1_13 | PLAYER_STATE1_14 |
+ PLAYER_STATE1_18 | PLAYER_STATE1_19 | PLAYER_STATE1_20 | PLAYER_STATE1_21)) &&
Player_GetExplosiveHeld(player) < 0) {
if ((((player->heldActor != NULL) || (actor == player->talkActor)) && (getItemId > GI_NONE) &&
(getItemId < GI_MAX)) ||
@@ -1881,8 +1882,8 @@ u32 Actor_SetRideActor(PlayState* play, Actor* horse, s32 mountSide) {
Player* player = GET_PLAYER(play);
if (!(player->stateFlags1 &
- (PLAYER_STATE1_7 | PLAYER_STATE1_ACTOR_CARRY | PLAYER_STATE1_12 | PLAYER_STATE1_13 | PLAYER_STATE1_14 |
- PLAYER_STATE1_18 | PLAYER_STATE1_19 | PLAYER_STATE1_20 | PLAYER_STATE1_21))) {
+ (PLAYER_STATE1_7 | PLAYER_STATE1_ACTOR_CARRY | PLAYER_STATE1_CHARGING_SPIN_ATTACK | PLAYER_STATE1_13 |
+ PLAYER_STATE1_14 | PLAYER_STATE1_18 | PLAYER_STATE1_19 | PLAYER_STATE1_20 | PLAYER_STATE1_21))) {
player->rideActor = horse;
player->mountSide = mountSide;
return true;
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index 58c6c87ee..50485d3bc 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -2927,7 +2927,7 @@ s32 Camera_Battle1(Camera* camera) {
sp78 = roData->swingPitchFinal;
fov = roData->fov;
- if (camera->player->stateFlags1 & PLAYER_STATE1_12) {
+ if (camera->player->stateFlags1 & PLAYER_STATE1_CHARGING_SPIN_ATTACK) {
// charging sword.
rwData->unk_10 =
Camera_LERPCeilF(CAM_GLOBAL_12 * (1.0f - 0.5f), rwData->unk_10, CAM_UPDATE_RATE_STEP_SCALE_XZ, 0.1f);
diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
index 35363c4aa..907f6d096 100644
--- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
+++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
@@ -180,7 +180,7 @@ void EffDust_UpdateFunc_8099DFC0(EffDust* this, PlayState* play) {
s32 i;
s32 j;
- if (parent == NULL || parent->update == NULL || !(player->stateFlags1 & PLAYER_STATE1_12)) {
+ if (parent == NULL || parent->update == NULL || !(player->stateFlags1 & PLAYER_STATE1_CHARGING_SPIN_ATTACK)) {
if (this->life != 0) {
this->life--;
} else {
diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
index 4c81a52a1..f2dc78a83 100644
--- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
+++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
@@ -135,7 +135,7 @@ void func_80A9F350(EnMThunder* this, PlayState* play) {
return;
}
- if (!(player->stateFlags1 & PLAYER_STATE1_12)) {
+ if (!(player->stateFlags1 & PLAYER_STATE1_CHARGING_SPIN_ATTACK)) {
Actor_Kill(&this->actor);
}
}
@@ -218,7 +218,7 @@ void func_80A9F408(EnMThunder* this, PlayState* play) {
}
}
- if (!(player->stateFlags1 & PLAYER_STATE1_12)) {
+ if (!(player->stateFlags1 & PLAYER_STATE1_CHARGING_SPIN_ATTACK)) {
if (this->actor.child != NULL) {
this->actor.child->parent = NULL;
}
diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c
index 83c88e560..024631690 100644
--- a/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/src/overlays/actors/ovl_player_actor/z_player.c
@@ -3642,7 +3642,7 @@ void func_80836BEC(Player* this, PlayState* play) {
isTalking = func_8083224C(play);
if (isTalking || (this->zTargetActiveTimer != 0) ||
- (this->stateFlags1 & (PLAYER_STATE1_12 | PLAYER_STATE1_BOOMERANG_THROWN))) {
+ (this->stateFlags1 & (PLAYER_STATE1_CHARGING_SPIN_ATTACK | PLAYER_STATE1_BOOMERANG_THROWN))) {
if (!isTalking) {
if (!(this->stateFlags1 & PLAYER_STATE1_BOOMERANG_THROWN) &&
((this->heldItemAction != PLAYER_IA_FISHING_POLE) || (this->unk_860 == 0)) &&
@@ -4065,7 +4065,7 @@ void func_80837530(PlayState* play, Player* this, s32 arg2) {
this->unk_858 = 0.5f;
}
- this->stateFlags1 |= PLAYER_STATE1_12;
+ this->stateFlags1 |= PLAYER_STATE1_CHARGING_SPIN_ATTACK;
if (this->actor.category == ACTORCAT_PLAYER) {
Actor_Spawn(&play->actorCtx, play, ACTOR_EN_M_THUNDER, this->bodyPartsPos[PLAYER_BODYPART_WAIST].x,
@@ -9383,7 +9383,7 @@ void Player_Action_80844E68(Player* this, PlayState* play) {
s16 yawTarget;
s32 temp;
- this->stateFlags1 |= PLAYER_STATE1_12;
+ this->stateFlags1 |= PLAYER_STATE1_CHARGING_SPIN_ATTACK;
if (LinkAnimation_Update(play, &this->skelAnime)) {
func_80832DBC(this);
@@ -9435,7 +9435,7 @@ void Player_Action_80845000(Player* this, PlayState* play) {
sp5C = fabsf(this->speedXZ);
sp58 = sp5C * 1.5f;
- this->stateFlags1 |= PLAYER_STATE1_12;
+ this->stateFlags1 |= PLAYER_STATE1_CHARGING_SPIN_ATTACK;
if (sp58 < 1.5f) {
sp58 = 1.5f;
@@ -9497,7 +9497,7 @@ void Player_Action_80845308(Player* this, PlayState* play) {
sp5C = fabsf(this->speedXZ);
- this->stateFlags1 |= PLAYER_STATE1_12;
+ this->stateFlags1 |= PLAYER_STATE1_CHARGING_SPIN_ATTACK;
if (sp5C == 0.0f) {
sp5C = ABS(this->unk_87C) * 0.0015f;
@@ -10856,7 +10856,7 @@ void Player_UpdateCamAndSeqModes(PlayState* play, Player* this) {
camMode = CAM_MODE_Z_TARGET_UNFRIENDLY;
}
Camera_SetViewParam(Play_GetCamera(play, CAM_ID_MAIN), CAM_VIEW_TARGET, focusActor);
- } else if (this->stateFlags1 & PLAYER_STATE1_12) {
+ } else if (this->stateFlags1 & PLAYER_STATE1_CHARGING_SPIN_ATTACK) {
camMode = CAM_MODE_CHARGE;
} else if (this->stateFlags1 & PLAYER_STATE1_BOOMERANG_THROWN) {
camMode = CAM_MODE_FOLLOW_BOOMERANG;
@@ -11429,7 +11429,8 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) {
this->stateFlags2 &= ~(PLAYER_STATE2_1 | PLAYER_STATE2_21);
}
- this->stateFlags1 &= ~(PLAYER_STATE1_SWINGING_BOTTLE | PLAYER_STATE1_9 | PLAYER_STATE1_12 | PLAYER_STATE1_22);
+ this->stateFlags1 &=
+ ~(PLAYER_STATE1_SWINGING_BOTTLE | PLAYER_STATE1_9 | PLAYER_STATE1_CHARGING_SPIN_ATTACK | PLAYER_STATE1_22);
this->stateFlags2 &= ~(PLAYER_STATE2_0 | PLAYER_STATE2_2 | PLAYER_STATE2_3 | PLAYER_STATE2_5 | PLAYER_STATE2_6 |
PLAYER_STATE2_8 | PLAYER_STATE2_FORCE_SAND_FLOOR_SOUND | PLAYER_STATE2_12 |
PLAYER_STATE2_14 | PLAYER_STATE2_DO_ACTION_ENTER | PLAYER_STATE2_22 | PLAYER_STATE2_26);
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 06:50:28 +0000