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

Apply format

Browse source
This commit is contained in:
Pablo 2024-10-06 20:37:14 +02:00
parent 777b849eb7
commit c193eb70f3
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6508,7 +6508,8 @@ s32 func_8083C6B8(PlayState* play, Player* this) {
this->av2.useWaterBottleSwingAnimations = true; this->av2.useWaterBottleSwingAnimations = true;
} }
Player_AnimPlayOnceAdjusted(play, this, sBottleCatchAnimationDatas[this->av2.useWaterBottleSwingAnimations].missAnimation); Player_AnimPlayOnceAdjusted(
play, this, sBottleCatchAnimationDatas[this->av2.useWaterBottleSwingAnimations].missAnimation);
Player_PlaySfx(this, NA_SE_IT_SWORD_SWING); Player_PlaySfx(this, NA_SE_IT_SWORD_SWING);
Player_PlayVoiceSfx(this, NA_SE_VO_LI_AUTO_JUMP); Player_PlayVoiceSfx(this, NA_SE_VO_LI_AUTO_JUMP);
@ -13827,7 +13828,8 @@ static BottleCatchInfo sBottleCatchInfos[] = {
void Player_Action_SwingBottle(Player* this, PlayState* play) { void Player_Action_SwingBottle(Player* this, PlayState* play) {
//! @note: after av2 is set as startedTextbox, this will not necessarily get the correct animations, //! @note: after av2 is set as startedTextbox, this will not necessarily get the correct animations,
//! this doesn't matter as at that point this is not used anymore //! this doesn't matter as at that point this is not used anymore
BottleCatchAnimationData* bottleCatchAnimationData = &sBottleCatchAnimationDatas[this->av2.useWaterBottleSwingAnimations]; BottleCatchAnimationData* bottleCatchAnimationData =
&sBottleCatchAnimationDatas[this->av2.useWaterBottleSwingAnimations];
Player_StepHorizontalSpeedToZero(this); Player_StepHorizontalSpeedToZero(this);