Skip to content

Commit

Permalink
Merge pull request #7 from Archez/choas_fix_hover_boots
Browse files Browse the repository at this point in the history
fix hover boot conditional grouping
  • Loading branch information
CDi-Fails authored Nov 21, 2022
2 parents ff91060 + d325fe2 commit 2741717
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions soh/src/overlays/actors/ovl_player_actor/z_player.c
Original file line number Diff line number Diff line change
Expand Up @@ -11723,8 +11723,8 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) {
if (!(this->skelAnime.moveFlags & 0x80)) {
if (CVar_GetS32("gSlipperyFloor", 0) ||
((this->actor.bgCheckFlags & 1) &&
(((sFloorSpecialProperty == 5) && (this->currentBoots != PLAYER_BOOTS_IRON)) ||
((this->currentBoots == PLAYER_BOOTS_HOVER))) &&
(sFloorSpecialProperty == 5) && (this->currentBoots != PLAYER_BOOTS_IRON)) ||
((this->currentBoots == PLAYER_BOOTS_HOVER) &&
!(this->stateFlags1 & (PLAYER_STATE1_SWIMMING | PLAYER_STATE1_IN_CUTSCENE)))) {
f32 sp70 = this->linearVelocity;
s16 sp6E = this->currentYaw;
Expand Down

0 comments on commit 2741717

Please sign in to comment.