diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-09-26 03:15:40 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-25 14:15:40 -0300 |
| commit | 1d1e6ef03b446e8d0ff7533f87989734d88de4ba (patch) | |
| tree | dbdcbe1ebe910d69308197d5c8a1e73706db7cb4 /src/code | |
| parent | 4e9e6c007c399dbe727fc0b73a382de7ceb52bc6 (diff) | |
Name player's generic `actionVar`s (#1392)
* action-vars
* single bracket
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_player_lib.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 2e36ea553..db9a8c974 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -369,13 +369,13 @@ void func_80122F28(Player* player) { s32 func_80122F9C(PlayState* play) { Player* player = GET_PLAYER(play); - return (player->stateFlags2 & PLAYER_STATE2_80000) && (player->unk_AE7 == 2); + return (player->stateFlags2 & PLAYER_STATE2_80000) && (player->actionVar1 == 2); } s32 func_80122FCC(PlayState* play) { Player* player = GET_PLAYER(play); - return (player->stateFlags2 & PLAYER_STATE2_80000) && ((player->unk_AE7 == 1) || (player->unk_AE7 == 3)); + return (player->stateFlags2 & PLAYER_STATE2_80000) && ((player->actionVar1 == 1) || (player->actionVar1 == 3)); } void func_8012300C(PlayState* play, s32 arg1) { @@ -389,15 +389,15 @@ void func_8012301C(Actor* thisx, PlayState* play2) { PlayState* play = play2; Player* this = (Player*)thisx; - this->unk_AE7++; + this->actionVar1++; - if (this->unk_AE7 == 2) { + if (this->actionVar1 == 2) { s16 objectId = gPlayerFormObjectIndices[GET_PLAYER_FORM]; gActorOverlayTable[ACTOR_PLAYER].initInfo->objectId = objectId; func_8012F73C(&play->objectCtx, this->actor.objBankIndex, objectId); this->actor.objBankIndex = Object_GetIndex(&play->objectCtx, GAMEPLAY_KEEP); - } else if (this->unk_AE7 >= 3) { + } else if (this->actionVar1 >= 3) { s32 objBankIndex = Object_GetIndex(&play->objectCtx, gActorOverlayTable[ACTOR_PLAYER].initInfo->objectId); if (Object_IsLoaded(&play->objectCtx, objBankIndex)) { @@ -3744,7 +3744,7 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList1, G } } - if ((player->stateFlags1 & (PLAYER_STATE1_2 | PLAYER_STATE1_100)) && (player->unk_AE8 != 0)) { + if ((player->stateFlags1 & (PLAYER_STATE1_2 | PLAYER_STATE1_100)) && (player->actionVar2 != 0)) { static Vec3f D_801C0E40[PLAYER_FORM_MAX] = { { 0.0f, 0.0f, 0.0f }, // PLAYER_FORM_FIERCE_DEITY { -578.3f, -1100.9f, 0.0f }, // PLAYER_FORM_GORON @@ -3764,7 +3764,7 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList1, G } gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 255, (u8)player->unk_AE8); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 255, (u8)player->actionVar2); gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_054C90); Matrix_Pop(); |