mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-21 14:25:22 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Name func_8083721C"

Browse source 
This reverts commit aeb7ea83ab.
This commit is contained in:
Pablo 2024-10-07 21:15:17 +02:00
parent c193eb70f3
commit 52880aca3c
1 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/overlays/actors/ovl_player_actor/z_player.c
View file

@ -3998,7 +3998,7 @@ s32 Player_CalcSpeedAndYawFromControlStick(PlayState* play, Player* this, f32* o
return false;
}
s32 Player_StepHorizontalSpeedToZero(Player* this) {
s32 func_8083721C(Player* this) {
return Math_StepToF(&this->speedXZ, 0.0f, REG(43) / 100.0f);
}
@ -6436,7 +6436,7 @@ s32 func_8083C484(Player* this, f32* arg1, s16* arg2) {
s16 yaw = this->yaw - *arg2;
if (ABS(yaw) > 0x6000) {
if (Player_StepHorizontalSpeedToZero(this)) {
if (func_8083721C(this)) {
*arg1 = 0.0f;
*arg2 = this->yaw;
} else {
@ -7958,7 +7958,7 @@ void Player_Action_80840450(Player* this, PlayState* play) {
func_808401B0(play, this);
}
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
if (!Player_TryActionHandlerList(play, this, sActionHandlerList1, true)) {
if (!Player_UpdateHostileLockOn(this) &&
@ -8025,7 +8025,7 @@ void Player_Action_808407CC(Player* this, PlayState* play) {
Player_AnimPlayOnce(play, this, Player_GetIdleAnim(this));
}
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
if (!Player_TryActionHandlerList(play, this, sActionHandlerList2, true)) {
if (Player_UpdateHostileLockOn(this)) {
@ -8149,7 +8149,7 @@ void Player_Action_80840BC8(Player* this, PlayState* play) {
}
}
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
if (this->av2.actionVar2 == 0) {
if (!Player_TryActionHandlerList(play, this, sActionHandlerList7, true)) {
@ -8330,7 +8330,7 @@ s32 func_80841458(Player* this, f32* arg1, s16* arg2, PlayState* play) {
}
if (*arg1 != 0.0f) {
if (Player_StepHorizontalSpeedToZero(this)) {
if (func_8083721C(this)) {
*arg1 = 0.0f;
*arg2 = this->yaw;
} else {
@ -8391,7 +8391,7 @@ void Player_Action_8084170C(Player* this, PlayState* play) {
s16 yawTarget;
sp34 = LinkAnimation_Update(play, &this->skelAnime);
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
if (!Player_TryActionHandlerList(play, this, sActionHandlerList4, true)) {
Player_GetMovementSpeedAndYaw(this, &speedTarget, &yawTarget, SPEED_MODE_LINEAR, play);
@ -8691,7 +8691,7 @@ void Player_Action_808423EC(Player* this, PlayState* play) {
Player_GetMovementSpeedAndYaw(this, &speedTarget, &yawTarget, SPEED_MODE_LINEAR, play);
if ((this->skelAnime.morphWeight == 0.0f) && (this->skelAnime.curFrame > 5.0f)) {
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
if ((this->skelAnime.curFrame > 10.0f) && (func_8083FC68(this, speedTarget, yawTarget) < 0)) {
func_8083CBF0(this, yawTarget, play);
@ -8712,7 +8712,7 @@ void Player_Action_8084251C(Player* this, PlayState* play) {
sp34 = LinkAnimation_Update(play, &this->skelAnime);
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
if (!Player_TryActionHandlerList(play, this, sActionHandlerList10, true)) {
Player_GetMovementSpeedAndYaw(this, &speedTarget, &yawTarget, SPEED_MODE_LINEAR, play);
@ -8991,7 +8991,7 @@ void Player_Action_80843188(Player* this, PlayState* play) {
this->stateFlags1 &= ~PLAYER_STATE1_22;
}
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
if (this->av2.actionVar2 != 0) {
f32 sp54;
@ -9078,7 +9078,7 @@ void Player_Action_808435C4(Player* this, PlayState* play) {
LinkAnimationHeader* anim;
f32 frames;
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
if (this->av1.actionVar1 == 0) {
sUpperBodyIsBusy = Player_UpdateUpperBody(this, play);
@ -9105,7 +9105,7 @@ void Player_Action_808435C4(Player* this, PlayState* play) {
void Player_Action_8084370C(Player* this, PlayState* play) {
s32 interruptResult;
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
interruptResult = Player_TryActionInterrupt(play, this, &this->skelAnime, 16.0f);
@ -9168,7 +9168,7 @@ void Player_Action_80843954(Player* this, PlayState* play) {
this->stateFlags2 |= PLAYER_STATE2_5 | PLAYER_STATE2_6;
func_808382BC(this);
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
if (LinkAnimation_Update(play, &this->skelAnime) && (this->speedXZ == 0.0f)) {
if (this->stateFlags1 & PLAYER_STATE1_29) {
@ -9269,7 +9269,7 @@ void Player_Action_80843CEC(Player* this, PlayState* play) {
}
}
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
if (LinkAnimation_Update(play, &this->skelAnime)) {
if (this->actor.category == ACTORCAT_PLAYER) {
@ -9704,7 +9704,7 @@ void Player_Action_80844E68(Player* this, PlayState* play) {
this->av2.actionVar2 = -1;
}
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
if (!func_80842964(this, play) && (this->av2.actionVar2 != 0)) {
func_80844E3C(this);
@ -10128,7 +10128,7 @@ void Player_Action_80845EF8(Player* this, PlayState* play) {
}
void Player_Action_80846050(Player* this, PlayState* play) {
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
if (LinkAnimation_Update(play, &this->skelAnime)) {
func_80839F90(this, play);
@ -10181,7 +10181,7 @@ void Player_Action_80846120(Player* this, PlayState* play) {
}
void Player_Action_80846260(Player* this, PlayState* play) {
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
if (LinkAnimation_Update(play, &this->skelAnime)) {
Player_AnimPlayLoop(play, this, &gPlayerAnim_link_silver_wait);
@ -10238,7 +10238,7 @@ void Player_Action_80846408(Player* this, PlayState* play) {
}
void Player_Action_808464B0(Player* this, PlayState* play) {
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
if (LinkAnimation_Update(play, &this->skelAnime)) {
func_80839F90(this, play);
@ -10263,7 +10263,7 @@ void Player_Action_80846578(Player* this, PlayState* play) {
f32 speedTarget;
s16 yawTarget;
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
if (LinkAnimation_Update(play, &this->skelAnime) ||
((this->skelAnime.curFrame >= 8.0f) &&
@ -12274,7 +12274,7 @@ void Player_Action_8084B1D8(Player* this, PlayState* play) {
func_8084B000(this);
func_8084AEEC(this, &this->speedXZ, 0, this->actor.shape.rot.y);
} else {
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
}
if ((this->unk_6AD == 2) && (func_8002DD6C(this) || func_808332E4(this))) {
@ -13408,7 +13408,7 @@ void Player_Action_8084DC48(Player* this, PlayState* play) {
this->actor.velocity.y = -2.0f;
}
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
return;
}
@ -13634,7 +13634,7 @@ void Player_Action_8084E604(Player* this, PlayState* play) {
Player_PlayVoiceSfx(this, NA_SE_VO_LI_SWORD_N);
}
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
}
static AnimSfxEntry D_808549E0[] = {
@ -13831,7 +13831,7 @@ void Player_Action_SwingBottle(Player* this, PlayState* play) {
BottleCatchAnimationData* bottleCatchAnimationData =
&sBottleCatchAnimationDatas[this->av2.useWaterBottleSwingAnimations];
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
if (LinkAnimation_Update(play, &this->skelAnime)) {
if (this->av1.bottleCatchIndex != 0) {
@ -13915,7 +13915,7 @@ static AnimSfxEntry D_80854A34[] = {
};
void Player_Action_8084EFC0(Player* this, PlayState* play) {
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
if (LinkAnimation_Update(play, &this->skelAnime)) {
func_8083C0E8(this, play);
@ -14464,7 +14464,7 @@ void Player_Action_808502D0(Player* this, PlayState* play) {
void Player_Action_808505DC(Player* this, PlayState* play) {
LinkAnimation_Update(play, &this->skelAnime);
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
if (this->skelAnime.curFrame >= 6.0f) {
func_80839FFC(this, play);
@ -14627,7 +14627,7 @@ void Player_Action_808507F4(Player* this, PlayState* play) {
}
}
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
}
void Player_Action_80850AEC(Player* this, PlayState* play) {
@ -14693,7 +14693,7 @@ void Player_Action_80850C68(Player* this, PlayState* play) {
this->av2.actionVar2 = 1;
}
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
if (this->unk_860 == 0) {
func_80853080(this, play);
@ -15335,7 +15335,7 @@ void func_80851CA4(PlayState* play, Player* this, CsCmdActorCue* cue) {
}
if (this->av2.actionVar2 != 0) {
Player_StepHorizontalSpeedToZero(this);
func_8083721C(this);
}
}