diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-10-26 17:12:04 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-26 17:12:04 +1100 |
| commit | 7176ed42990e6031c07eaf5a3f755e0031e6ba41 (patch) | |
| tree | 670f3b7f99cb1dde736d1bde0e8fde2c177a57ef /src/code/z_player_lib.c | |
| parent | 71fae650621f1abfd40d393449ee789f3c7625e5 (diff) | |
Player Docs: csMode -> csAction (#1433)
* csAction
* more cleanup
* namefixer
* simpleReplace
* fix brackets
* sneak in 2 player typos
* fix merge
Diffstat (limited to 'src/code/z_player_lib.c')
| -rw-r--r-- | src/code/z_player_lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 6c33a5565..486abcbda 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -495,7 +495,7 @@ void func_80123140(PlayState* play, Player* player) { s32 Player_InBlockingCsMode(PlayState* play, Player* player) { return (player->stateFlags1 & (PLAYER_STATE1_80 | PLAYER_STATE1_200 | PLAYER_STATE1_20000000)) || - (player->csMode != PLAYER_CSMODE_NONE) || (play->transitionTrigger == TRANS_TRIGGER_START) || + (player->csAction != PLAYER_CSACTION_NONE) || (play->transitionTrigger == TRANS_TRIGGER_START) || (play->transitionMode != TRANS_MODE_OFF) || (player->stateFlags1 & PLAYER_STATE1_1) || (player->stateFlags3 & PLAYER_STATE3_80) || (play->actorCtx.unk268 != 0); } @@ -1297,9 +1297,9 @@ void func_80123C58(Player* player) { } void Player_SetEquipmentData(PlayState* play, Player* player) { - if (player->csMode != PLAYER_CSMODE_134) { + if (player->csAction != PLAYER_CSACTION_134) { player->currentShield = GET_CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD); - if ((player->transformation != PLAYER_FORM_ZORA) || (((player->currentBoots != PLAYER_BOOTS_ZORA_LAND)) && + if ((player->transformation != PLAYER_FORM_ZORA) || ((player->currentBoots != PLAYER_BOOTS_ZORA_LAND) && (player->currentBoots != PLAYER_BOOTS_ZORA_UNDERWATER))) { player->currentBoots = D_801BFF90[player->transformation]; } |