mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00
Code Issues Projects Releases Wiki Activity

unk_664 -> focusActor [Target Docs 5/?] (#2126)

Browse source 
* unk_664 -> focusActor

* capitalization

* missed a temp
This commit is contained in:
fig02 2024-09-04 14:33:30 -04:00 • committed by GitHub
parent 78e6b801bc
commit 907e440f3a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 96 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/overlays/actors/ovl_En_Elf/z_en_elf.c
View file

@ -1034,11 +1034,11 @@ void func_80A04414(EnElf* this, PlayState* play) {
}
if (this->fairyFlags & 1) {
if ((naviHoverActor == NULL) || (player->unk_664 == NULL)) {
if ((naviHoverActor == NULL) || (player->focusActor == NULL)) {
this->fairyFlags ^= 1;
}
} else {
if ((naviHoverActor != NULL) && (player->unk_664 != NULL)) {
if ((naviHoverActor != NULL) && (player->focusActor != NULL)) {
if (naviHoverActor->category == ACTORCAT_NPC) {
sfxId = NA_SE_VO_NAVY_HELLO;
} else {
@ -1224,7 +1224,8 @@ void func_80A04DE4(EnElf* this, PlayState* play) {
if (this->fairyFlags & 0x10) {
pos = play->actorCtx.targetCtx.naviHoverPos;
if ((player->unk_664 == NULL) || (&player->actor == player->unk_664) || (&this->actor == player->unk_664)) {
if ((player->focusActor == NULL) || (&player->actor == player->focusActor) ||
(&this->actor == player->focusActor)) {
pos.x = player->bodyPartsPos[PLAYER_BODYPART_HEAD].x + (Math_SinS(player->actor.shape.rot.y) * 20.0f);
pos.y = player->bodyPartsPos[PLAYER_BODYPART_HEAD].y + 5.0f;
pos.z = player->bodyPartsPos[PLAYER_BODYPART_HEAD].z + (Math_CosS(player->actor.shape.rot.y) * 20.0f);
@ -1376,7 +1377,7 @@ void func_80A053F0(Actor* thisx, PlayState* play) {
EnElf* this = (EnElf*)thisx;
if (player->naviTextId == 0) {
if (player->unk_664 == NULL) {
if (player->focusActor == NULL) {
#if OOT_DEBUG
if (((gSaveContext.save.info.playerData.naviTimer >= 600) &&
(gSaveContext.save.info.playerData.naviTimer <= 3000)) ||

12
src/overlays/actors/ovl_En_Zf/z_en_zf.c
View file

@ -539,7 +539,7 @@ s16 EnZf_FindNextPlatformTowardsPlayer(Vec3f* pos, s16 curPlatform, s16 arg2, Pl
// Player not targeting this or another EnZf?
s32 EnZf_CanAttack(PlayState* play, EnZf* this) {
Actor* targetedActor;
Actor* playerFocusActor;
Player* player = GET_PLAYER(play);
if (this->actor.params >= ENZF_TYPE_LIZALFOS_MINIBOSS_A) { // miniboss
@ -553,16 +553,16 @@ s32 EnZf_CanAttack(PlayState* play, EnZf* this) {
return true;
}
if (this->actor.params == ENZF_TYPE_DINOLFOS) {
targetedActor = player->unk_664;
if (targetedActor == NULL) {
playerFocusActor = player->focusActor;
if (playerFocusActor == NULL) {
return false;
} else {
if (targetedActor->category != ACTORCAT_ENEMY) {
if (playerFocusActor->category != ACTORCAT_ENEMY) {
return true;
}
if (targetedActor->id != ACTOR_EN_ZF) {
if (playerFocusActor->id != ACTOR_EN_ZF) {
return false;
} else if (targetedActor->colorFilterTimer != 0) {
} else if (playerFocusActor->colorFilterTimer != 0) {
return true;
}
}

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

@ -2322,7 +2322,7 @@ s32 func_80833B2C(Player* this) {
}
s32 func_80833B54(Player* this) {
if ((this->unk_664 != NULL) && CHECK_FLAG_ALL(this->unk_664->flags, ACTOR_FLAG_0 | ACTOR_FLAG_2)) {
if ((this->focusActor != NULL) && CHECK_FLAG_ALL(this->focusActor->flags, ACTOR_FLAG_0 | ACTOR_FLAG_2)) {
this->stateFlags1 |= PLAYER_STATE1_4;
return 1;
}
@ -3096,14 +3096,14 @@ s32 func_808359FC(Player* this, PlayState* play) {
} else if (LinkAnimation_OnFrame(&this->upperSkelAnime, 6.0f)) {
f32 posX = (Math_SinS(this->actor.shape.rot.y) * 10.0f) + this->actor.world.pos.x;
f32 posZ = (Math_CosS(this->actor.shape.rot.y) * 10.0f) + this->actor.world.pos.z;
s32 yaw = (this->unk_664 != NULL) ? this->actor.shape.rot.y + 14000 : this->actor.shape.rot.y;
s32 yaw = (this->focusActor != NULL) ? this->actor.shape.rot.y + 14000 : this->actor.shape.rot.y;
EnBoom* boomerang =
(EnBoom*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOOM, posX, this->actor.world.pos.y + 30.0f, posZ,
this->actor.focus.rot.x, yaw, 0, 0);
this->boomerangActor = &boomerang->actor;
if (boomerang != NULL) {
boomerang->moveTo = this->unk_664;
boomerang->moveTo = this->focusActor;
boomerang->returnTimer = 20;
this->stateFlags1 |= PLAYER_STATE1_25;
if (!func_8008E9C4(this)) {
@ -3477,11 +3477,11 @@ void Player_UpdateShapeYaw(Player* this, PlayState* play) {
s16 previousYaw = this->actor.shape.rot.y;
if (!(this->stateFlags2 & (PLAYER_STATE2_5 | PLAYER_STATE2_6))) {
Actor* unk_664 = this->unk_664;
Actor* focusActor = this->focusActor;
if ((unk_664 != NULL) &&
if ((focusActor != NULL) &&
((play->actorCtx.targetCtx.reticleSpinCounter != 0) || (this->actor.category != ACTORCAT_PLAYER))) {
Math_ScaledStepToS(&this->actor.shape.rot.y, Math_Vec3f_Yaw(&this->actor.world.pos, &unk_664->focus.pos),
Math_ScaledStepToS(&this->actor.shape.rot.y, Math_Vec3f_Yaw(&this->actor.world.pos, &focusActor->focus.pos),
4000);
} else if ((this->stateFlags1 & PLAYER_STATE1_17) &&
!(this->stateFlags2 & (PLAYER_STATE2_5 | PLAYER_STATE2_6))) {
@ -3587,15 +3587,15 @@ void func_80836BEC(Player* this, PlayState* play) {
this->stateFlags1 |= PLAYER_STATE1_15;
if ((actorToTarget != NULL) && !(actorToTarget->flags & ACTOR_FLAG_27)) {
if ((actorToTarget == this->unk_664) && (this->actor.category == ACTORCAT_PLAYER)) {
if ((actorToTarget == this->focusActor) && (this->actor.category == ACTORCAT_PLAYER)) {
actorToTarget = play->actorCtx.targetCtx.arrowHoverActor;
}
if (actorToTarget != this->unk_664) {
if (actorToTarget != this->focusActor) {
if (!holdTarget) {
this->stateFlags2 |= PLAYER_STATE2_13;
}
this->unk_664 = actorToTarget;
this->focusActor = actorToTarget;
this->unk_66C = 15;
this->stateFlags2 &= ~(PLAYER_STATE2_1 | PLAYER_STATE2_21);
} else {
@ -3612,23 +3612,23 @@ void func_80836BEC(Player* this, PlayState* play) {
}
}
if (this->unk_664 != NULL) {
if ((this->actor.category == ACTORCAT_PLAYER) && (this->unk_664 != this->unk_684) &&
func_8002F0C8(this->unk_664, this, sp1C)) {
if (this->focusActor != NULL) {
if ((this->actor.category == ACTORCAT_PLAYER) && (this->focusActor != this->unk_684) &&
func_8002F0C8(this->focusActor, this, sp1C)) {
func_8008EDF0(this);
this->stateFlags1 |= PLAYER_STATE1_30;
} else if (this->unk_664 != NULL) {
this->unk_664->targetPriority = 40;
} else if (this->focusActor != NULL) {
this->focusActor->targetPriority = 40;
}
} else if (this->unk_684 != NULL) {
this->unk_664 = this->unk_684;
this->focusActor = this->unk_684;
}
}
if (this->unk_664 != NULL) {
if (this->focusActor != NULL) {
this->stateFlags1 &= ~(PLAYER_STATE1_16 | PLAYER_STATE1_17);
if ((this->stateFlags1 & PLAYER_STATE1_11) ||
!CHECK_FLAG_ALL(this->unk_664->flags, ACTOR_FLAG_0 | ACTOR_FLAG_2)) {
!CHECK_FLAG_ALL(this->focusActor->flags, ACTOR_FLAG_0 | ACTOR_FLAG_2)) {
this->stateFlags1 |= PLAYER_STATE1_16;
}
} else {
@ -3748,9 +3748,9 @@ s32 Player_GetMovementSpeedAndYaw(Player* this, f32* outSpeedTarget, s16* outYaw
if (!Player_CalcSpeedAndYawFromControlStick(play, this, outSpeedTarget, outYawTarget, speedMode)) {
*outYawTarget = this->actor.shape.rot.y;
if (this->unk_664 != NULL) {
if (this->focusActor != NULL) {
if ((play->actorCtx.targetCtx.reticleSpinCounter != 0) && !(this->stateFlags2 & PLAYER_STATE2_6)) {
*outYawTarget = Math_Vec3f_Yaw(&this->actor.world.pos, &this->unk_664->focus.pos);
*outYawTarget = Math_Vec3f_Yaw(&this->actor.world.pos, &this->focusActor->focus.pos);
return false;
}
} else if (func_80833B2C(this)) {
@ -5234,7 +5234,7 @@ void func_8083A2F8(PlayState* play, Player* this) {
if (this->actor.textId != 0) {
Message_StartTextbox(play, this->actor.textId, this->talkActor);
this->unk_664 = this->talkActor;
this->focusActor = this->talkActor;
}
}
@ -5667,7 +5667,7 @@ s32 Player_ActionChange_13(Player* this, PlayState* play) {
this->av1.actionVar1 = -1;
}
talkActor->flags |= ACTOR_FLAG_TALK;
this->unk_664 = this->talkActor;
this->focusActor = this->talkActor;
} else if (sp2C == EXCH_ITEM_BOTTLE_RUTOS_LETTER) {
this->av1.actionVar1 = 1;
this->actor.textId = 0x4005;
@ -5746,7 +5746,7 @@ s32 Player_ActionChange_13(Player* this, PlayState* play) {
s32 Player_ActionChange_4(Player* this, PlayState* play) {
Actor* sp34 = this->talkActor;
Actor* sp30 = this->unk_664;
Actor* sp30 = this->focusActor;
Actor* sp2C = NULL;
s32 sp28 = 0;
s32 sp24;
@ -5835,8 +5835,8 @@ s32 Player_ActionChange_0(Player* this, PlayState* play) {
return 1;
}
if ((this->unk_664 != NULL) && (CHECK_FLAG_ALL(this->unk_664->flags, ACTOR_FLAG_0 | ACTOR_FLAG_18) ||
(this->unk_664->naviEnemyId != NAVI_ENEMY_NONE))) {
if ((this->focusActor != NULL) && (CHECK_FLAG_ALL(this->focusActor->flags, ACTOR_FLAG_0 | ACTOR_FLAG_18) ||
(this->focusActor->naviEnemyId != NAVI_ENEMY_NONE))) {
this->stateFlags2 |= PLAYER_STATE2_21;
} else if ((this->naviTextId == 0) && !func_8008E9C4(this) && CHECK_BTN_ALL(sControlInput->press.button, BTN_CUP) &&
(R_SCENE_CAM_TYPE != SCENE_CAM_TYPE_FIXED_SHOP_VIEWPOINT) &&
@ -6034,7 +6034,7 @@ s32 Player_ActionChange_11(Player* this, PlayState* play) {
if ((play->shootingGalleryStatus == 0) && (this->currentShield != PLAYER_SHIELD_NONE) &&
CHECK_BTN_ALL(sControlInput->cur.button, BTN_R) &&
(Player_IsChildWithHylianShield(this) || (!func_80833B2C(this) && (this->unk_664 == NULL)))) {
(Player_IsChildWithHylianShield(this) || (!func_80833B2C(this) && (this->focusActor == NULL)))) {
func_80832318(this);
Player_DetachHeldActor(play, this);
@ -6586,7 +6586,7 @@ void func_8083D6EC(PlayState* play, Player* this) {
}
s32 func_8083DB98(Player* this, s32 arg1) {
Actor* unk_664 = this->unk_664;
Actor* focusActor = this->focusActor;
Vec3f sp30;
s16 sp2E;
s16 sp2C;
@ -6594,8 +6594,8 @@ s32 func_8083DB98(Player* this, s32 arg1) {
sp30.x = this->actor.world.pos.x;
sp30.y = this->bodyPartsPos[PLAYER_BODYPART_HEAD].y + 3.0f;
sp30.z = this->actor.world.pos.z;
sp2E = Math_Vec3f_Pitch(&sp30, &unk_664->focus.pos);
sp2C = Math_Vec3f_Yaw(&sp30, &unk_664->focus.pos);
sp2E = Math_Vec3f_Pitch(&sp30, &focusActor->focus.pos);
sp2C = Math_Vec3f_Yaw(&sp30, &focusActor->focus.pos);
Math_SmoothStepToS(&this->actor.focus.rot.y, sp2C, 4, 10000, 0);
Math_SmoothStepToS(&this->actor.focus.rot.x, sp2E, 4, 10000, 0);
this->unk_6AE |= 2;
@ -6611,7 +6611,7 @@ void func_8083DC54(Player* this, PlayState* play) {
f32 temp1;
Vec3f sp34;
if (this->unk_664 != NULL) {
if (this->focusActor != NULL) {
if (func_8002DD78(this) || func_808334B4(this)) {
func_8083DB98(this, 1);
} else {
@ -7393,7 +7393,7 @@ s32 func_8083FC68(Player* this, f32 arg1, s16 arg2) {
f32 sp1C = (s16)(arg2 - this->actor.shape.rot.y);
f32 temp;
if (this->unk_664 != NULL) {
if (this->focusActor != NULL) {
func_8083DB98(this, func_8002DD78(this) || func_808334B4(this));
}
@ -7412,7 +7412,7 @@ s32 func_8083FD78(Player* this, f32* arg1, s16* arg2, PlayState* play) {
s16 sp2E = *arg2 - this->zTargetYaw;
u16 sp2C = ABS(sp2E);
if ((func_8002DD78(this) || func_808334B4(this)) && (this->unk_664 == NULL)) {
if ((func_8002DD78(this) || func_808334B4(this)) && (this->focusActor == NULL)) {
*arg1 *= Math_SinS(sp2C);
if (*arg1 != 0.0f) {
@ -7421,14 +7421,14 @@ s32 func_8083FD78(Player* this, f32* arg1, s16* arg2, PlayState* play) {
*arg2 = this->actor.shape.rot.y;
}
if (this->unk_664 != NULL) {
if (this->focusActor != NULL) {
func_8083DB98(this, 1);
} else {
Math_SmoothStepToS(&this->actor.focus.rot.x, sControlInput->rel.stick_y * 240.0f, 14, 4000, 30);
func_80836AB8(this, 1);
}
} else {
if (this->unk_664 != NULL) {
if (this->focusActor != NULL) {
return func_8083FC68(this, *arg1, *arg2);
} else {
func_8083DC54(this, play);
@ -7697,7 +7697,7 @@ void func_808409CC(PlayState* play, Player* this) {
s32 sp38;
s32 sp34;
if ((this->unk_664 != NULL) ||
if ((this->focusActor != NULL) ||
(!(heathIsCritical = Health_IsCritical()) && ((this->unk_6AC = (this->unk_6AC + 1) & 1) != 0))) {
this->stateFlags2 &= ~PLAYER_STATE2_28;
anim = func_80833338(this);
@ -10377,7 +10377,7 @@ void Player_UpdateInterface(PlayState* play, Player* this) {
Interface_SetDoAction(play, doAction);
if (this->stateFlags2 & PLAYER_STATE2_21) {
if (this->unk_664 != NULL) {
if (this->focusActor != NULL) {
Interface_SetNaviCall(play, 0x1E);
} else {
Interface_SetNaviCall(play, 0x1D);
@ -10730,7 +10730,7 @@ void Player_ProcessSceneCollision(PlayState* play, Player* this) {
void Player_UpdateCamAndSeqModes(PlayState* play, Player* this) {
u8 seqMode;
s32 pad;
Actor* unk_664;
Actor* focusActor;
s32 camMode;
if (this->actor.category == ACTORCAT_PLAYER) {
@ -10746,7 +10746,7 @@ void Player_UpdateCamAndSeqModes(PlayState* play, Player* this) {
camMode = CAM_MODE_STILL;
} else if (this->stateFlags2 & PLAYER_STATE2_8) {
camMode = CAM_MODE_PUSH_PULL;
} else if ((unk_664 = this->unk_664) != NULL) {
} else if ((focusActor = this->focusActor) != NULL) {
if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_TALK)) {
camMode = CAM_MODE_TALK;
} else if (this->stateFlags1 & PLAYER_STATE1_16) {
@ -10758,7 +10758,7 @@ void Player_UpdateCamAndSeqModes(PlayState* play, Player* this) {
} else {
camMode = CAM_MODE_Z_TARGET_UNFRIENDLY;
}
Camera_SetViewParam(Play_GetCamera(play, CAM_ID_MAIN), CAM_VIEW_TARGET, unk_664);
Camera_SetViewParam(Play_GetCamera(play, CAM_ID_MAIN), CAM_VIEW_TARGET, focusActor);
} else if (this->stateFlags1 & PLAYER_STATE1_12) {
camMode = CAM_MODE_CHARGE;
} else if (this->stateFlags1 & PLAYER_STATE1_25) {
@ -11328,7 +11328,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) {
func_8083D6EC(play, this);
if ((this->unk_664 == NULL) && (this->naviTextId == 0)) {
if ((this->focusActor == NULL) && (this->naviTextId == 0)) {
this->stateFlags2 &= ~(PLAYER_STATE2_1 | PLAYER_STATE2_21);
}
@ -11861,7 +11861,7 @@ void Player_Action_8084B1D8(Player* this, PlayState* play) {
}
if ((this->csAction != PLAYER_CSACTION_NONE) || (this->unk_6AD == 0) || (this->unk_6AD >= 4) ||
func_80833B54(this) || (this->unk_664 != NULL) || (func_8083AD4C(play, this) == CAM_MODE_NORMAL) ||
func_80833B54(this) || (this->focusActor != NULL) || (func_8083AD4C(play, this) == CAM_MODE_NORMAL) ||
(((this->unk_6AD == 2) && (CHECK_BTN_ANY(sControlInput->press.button, BTN_A | BTN_B | BTN_R) ||
func_80833B2C(this) || (!func_8002DD78(this) && !func_808334B4(this)))) ||
((this->unk_6AD == 1) &&
@ -11964,7 +11964,7 @@ void Player_Action_8084B530(Player* this, PlayState* play) {
}
}
if (this->unk_664 != NULL) {
if (this->focusActor != NULL) {
this->yaw = this->actor.shape.rot.y = func_8083DB98(this, 0);
}
}
@ -12735,7 +12735,7 @@ void Player_Action_8084CC98(Player* this, PlayState* play) {
if ((this->csAction != PLAYER_CSACTION_NONE) ||
(!func_8084C9BC(this, play) && !Player_ActionChange_13(this, play))) {
if (this->unk_664 != NULL) {
if (this->focusActor != NULL) {
if (func_8002DD78(this) != 0) {
this->unk_6BE = func_8083DB98(this, 1) - this->actor.shape.rot.y;
this->unk_6BE = CLAMP(this->unk_6BE, -0x4AAA, 0x4AAA);
@ -13561,7 +13561,7 @@ void Player_Action_8084F104(Player* this, PlayState* play) {
Player_ProcessAnimSfxList(this, D_80854A3C);
}
if ((this->av1.actionVar1 == 0) && (this->unk_664 != NULL)) {
if ((this->av1.actionVar1 == 0) && (this->focusActor != NULL)) {
this->yaw = this->actor.shape.rot.y = func_8083DB98(this, 0);
}
}
@ -14626,9 +14626,9 @@ void func_80851314(Player* this) {
this->csActor = NULL;
}
this->unk_664 = this->csActor;
this->focusActor = this->csActor;
if (this->unk_664 != NULL) {
if (this->focusActor != NULL) {
this->actor.shape.rot.y = func_8083DB98(this, 0);
}
}