mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-06 20:52:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Document Overriding Player Input (#1489)

Browse Source 
* Override Input

* cleanup

* cleanup

* PR Review

* PR Review, fix merge
This commit is contained in:
engineer124
2023-11-16 16:28:19 +11:00
committed by GitHub
parent 5acaec4486
commit 61e2f12cf5
20 changed files with 168 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_actor.c
+5 -5
View File
@@ -1314,14 +1314,14 @@ f32 Actor_HeightDiff(Actor* actor1, Actor* actor2) {
}
/**
* Sets the current and new inputs.
* Calculates and sets the control stick x/y values and writes these to input.
*/
void func_800B6F20(PlayState* play, Input* input, f32 magnitude, s16 baseYaw) {
s16 relativeYaw = baseYaw - Camera_GetInputDirYaw(GET_ACTIVE_CAM(play));
void Actor_SetControlStickData(PlayState* play, Input* input, f32 controlStickMagnitude, s16 controlStickAngle) {
s16 relativeAngle = controlStickAngle - Camera_GetInputDirYaw(GET_ACTIVE_CAM(play));
input->cur.stick_x = -Math_SinS(relativeYaw) * magnitude;
input->cur.stick_x = -Math_SinS(relativeAngle) * controlStickMagnitude;
input->rel.stick_x = input->cur.stick_x;
input->cur.stick_y = Math_CosS(relativeYaw) * magnitude;
input->cur.stick_y = Math_CosS(relativeAngle) * controlStickMagnitude;
input->rel.stick_y = input->cur.stick_y;
}
src/code/z_kaleido_setup.c
+2 -1
View File
@@ -99,7 +99,8 @@ void KaleidoSetup_Update(PlayState* play) {
if (!CHECK_EVENTINF(EVENTINF_17) && !(player->stateFlags1 & PLAYER_STATE1_20)) {
if (!(play->actorCtx.flags & ACTORCTX_FLAG_1) &&
!(play->actorCtx.flags & ACTORCTX_FLAG_PICTO_BOX_ON)) {
if ((play->actorCtx.unk268 == 0) && CHECK_BTN_ALL(input->press.button, BTN_START)) {
if (!play->actorCtx.isOverrideInputOn &&
CHECK_BTN_ALL(input->press.button, BTN_START)) {
gSaveContext.prevHudVisibility = gSaveContext.hudVisibility;
pauseCtx->itemDescriptionOn = false;
pauseCtx->state = PAUSE_STATE_OPENING_0;
src/code/z_player_lib.c
+18 -15
View File
@@ -96,29 +96,32 @@ s32 func_801226E0(PlayState* play, s32 arg1) {
return arg1;
}
s32 func_80122744(PlayState* play, struct_80122744_arg1* arg1, u32 arg2, Vec3s* arg3) {
arg1->unk_00 = arg2;
arg1->unk_01 = 0;
arg1->unk_04 = arg3;
s32 Player_InitOverrideInput(PlayState* play, PlayerOverrideInputEntry* inputEntry, u32 numPoints,
Vec3s* targetPosList) {
inputEntry->numPoints = numPoints;
inputEntry->curPoint = 0;
inputEntry->targetPosList = targetPosList;
return 1;
}
s32 func_80122760(PlayState* play, struct_80122744_arg1* arg1, f32 arg2) {
if (arg1->unk_01 < arg1->unk_00) {
s32 Player_UpdateOverrideInput(PlayState* play, PlayerOverrideInputEntry* inputEntry, f32 distXZRange) {
if (inputEntry->curPoint < inputEntry->numPoints) {
Player* player = GET_PLAYER(play);
Vec3f sp30;
Vec3f targetPos;
s32 pad;
s16 yaw;
f32 distXZ;
Math_Vec3s_ToVec3f(&sp30, &arg1->unk_04[arg1->unk_01]);
yaw = Math_Vec3f_Yaw(&player->actor.world.pos, &sp30);
func_800B6F20(play, &play->actorCtx.unk_26C, arg2, yaw);
play->actorCtx.unk268 = 1;
distXZ = Math_Vec3f_DistXZ(&player->actor.world.pos, &sp30);
Math_Vec3s_ToVec3f(&targetPos, &inputEntry->targetPosList[inputEntry->curPoint]);
yaw = Math_Vec3f_Yaw(&player->actor.world.pos, &targetPos);
if ((fabsf(player->actor.world.pos.y - sp30.y) < 50.0f) && (distXZ < arg2)) {
arg1->unk_01++;
Actor_SetControlStickData(play, &play->actorCtx.overrideInput, distXZRange, yaw);
play->actorCtx.isOverrideInputOn = true;
distXZ = Math_Vec3f_DistXZ(&player->actor.world.pos, &targetPos);
if ((fabsf(player->actor.world.pos.y - targetPos.y) < 50.0f) && (distXZ < distXZRange)) {
inputEntry->curPoint++;
}
return false;
@@ -498,7 +501,7 @@ bool Player_InBlockingCsMode(PlayState* play, Player* player) {
return (player->stateFlags1 & (PLAYER_STATE1_80 | PLAYER_STATE1_200 | PLAYER_STATE1_20000000)) ||
(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);
(player->stateFlags3 & PLAYER_STATE3_80) || play->actorCtx.isOverrideInputOn;
}
bool Player_InCsMode(PlayState* play) {
src/overlays/actors/ovl_En_Fu/z_en_fu.c
+20 -20
View File
@@ -40,7 +40,7 @@ void func_80963540(EnFu* this);
void func_80963560(EnFu* this, PlayState* play);
void func_80963610(EnFu* this);
void func_80963630(EnFu* this, PlayState* play);
s32 func_80963810(PlayState* play, Vec3f pos);
s32 EnFu_MovePlayerToPos(PlayState* play, Vec3f targetPos);
s32 func_809638F8(PlayState* play);
void func_809639D0(EnFu* this, PlayState* play);
void func_80963DE4(EnFu* this, PlayState* play);
@@ -839,7 +839,7 @@ void func_80963258(EnFu* this) {
void func_8096326C(EnFu* this, PlayState* play) {
func_80963FF8(this, play);
if (func_80963810(play, this->actor.world.pos)) {
if (EnFu_MovePlayerToPos(play, this->actor.world.pos)) {
func_809622FC(this);
}
}
@@ -889,7 +889,7 @@ void func_80963350(EnFu* this, PlayState* play) {
D_80964C24 = 0;
fuKaiten->bounce = 0;
func_80963F88(this, play);
play->actorCtx.unk268 = 1;
play->actorCtx.isOverrideInputOn = true;
func_80963258(this);
}
}
@@ -967,27 +967,27 @@ void func_80963630(EnFu* this, PlayState* play) {
}
}
s32 func_80963810(PlayState* play, Vec3f pos) {
s32 EnFu_MovePlayerToPos(PlayState* play, Vec3f targetPos) {
Player* player = GET_PLAYER(play);
f32 sp28;
f32 phi_f0;
s16 sp22;
f32 distXZ;
f32 controlStickMagnitude;
s16 controlStickAngle;
sp22 = Math_Vec3f_Yaw(&player->actor.world.pos, &pos);
sp28 = Math_Vec3f_DistXZ(&player->actor.world.pos, &pos);
controlStickAngle = Math_Vec3f_Yaw(&player->actor.world.pos, &targetPos);
distXZ = Math_Vec3f_DistXZ(&player->actor.world.pos, &targetPos);
if (sp28 < 80.0f) {
phi_f0 = 10.0f;
} else if (sp28 < 90.0f) {
phi_f0 = 40.0f;
if (distXZ < 80.0f) {
controlStickMagnitude = 10.0f;
} else if (distXZ < 90.0f) {
controlStickMagnitude = 40.0f;
} else {
phi_f0 = 80.0f;
controlStickMagnitude = 80.0f;
}
play->actorCtx.unk268 = 1;
func_800B6F20(play, &play->actorCtx.unk_26C, phi_f0, sp22);
play->actorCtx.isOverrideInputOn = true;
Actor_SetControlStickData(play, &play->actorCtx.overrideInput, controlStickMagnitude, controlStickAngle);
if (sp28 < 80.0f) {
if (distXZ < 80.0f) {
return true;
}
return false;
@@ -1209,10 +1209,10 @@ void func_80963FF8(EnFu* this, PlayState* play) {
Player* player = GET_PLAYER(play);
if (player->stateFlags1 & PLAYER_STATE1_100000) {
play->actorCtx.unk268 = 1;
play->actorCtx.unk_26C.press.button = BTN_A;
play->actorCtx.isOverrideInputOn = true;
play->actorCtx.overrideInput.press.button = BTN_A;
} else {
play->actorCtx.unk268 = 1;
play->actorCtx.isOverrideInputOn = true;
}
}
src/overlays/actors/ovl_En_Jso2/z_en_jso2.c
+3 -3
View File
@@ -520,8 +520,8 @@ void EnJso2_IntroCutscene(EnJso2* this, PlayState* play) {
Math_Vec3f_Copy(&this->subCamEye, &this->subCamEyeNext);
Math_Vec3f_Copy(&this->subCamAt, &this->subCamAtNext);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_END);
func_80122744(play, &this->overrideInputEntry, ARRAY_COUNT(sPlayerOverrideInputPosList),
sPlayerOverrideInputPosList);
Player_InitOverrideInput(play, &this->overrideInputEntry, ARRAY_COUNT(sPlayerOverrideInputPosList),
sPlayerOverrideInputPosList);
this->cutsceneState++;
}
break;
@@ -541,7 +541,7 @@ void EnJso2_IntroCutscene(EnJso2* this, PlayState* play) {
Math_Vec3f_Copy(&this->subCamEye, &this->subCamEyeNext);
Math_Vec3f_Copy(&this->subCamAt, &this->subCamAtNext);
if (func_80122760(play, &this->overrideInputEntry, 60.0f)) {
if (Player_UpdateOverrideInput(play, &this->overrideInputEntry, 60.0f)) {
Player_SetCsActionWithHaltedActors(play, NULL, PLAYER_CSACTION_19);
this->cutsceneTimer = 10;
this->cutsceneState++;
src/overlays/actors/ovl_En_Jso2/z_en_jso2.h
+1 -1
View File
@@ -45,7 +45,7 @@ typedef struct EnJso2 {
/* 0x0188 */ Vec3s jointTable[GARO_MASTER_LIMB_MAX];
/* 0x0200 */ Vec3s morphTable[GARO_MASTER_LIMB_MAX];
/* 0x0278 */ EnJso2ActionFunc actionFunc;
/* 0x027C */ struct_80122744_arg1 overrideInputEntry;
/* 0x027C */ PlayerOverrideInputEntry overrideInputEntry;
/* 0x0284 */ s16 action;
/* 0x0286 */ s16 circlingAngle;
/* 0x0288 */ s16 circlingAngularVelocity;
src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c
+18 -18
View File
@@ -33,7 +33,7 @@ void func_80B276D8(EnKendoJs* this, PlayState* play);
void func_80B27760(EnKendoJs* this);
void func_80B27774(EnKendoJs* this, PlayState* play);
void func_80B2783C(EnKendoJs* this, PlayState* play);
s32 func_80B278C4(PlayState* play, Vec3f arg1);
s32 EnKendoJs_MovePlayerToPos(PlayState* play, Vec3f targetPos);
void func_80B279F0(EnKendoJs* this, PlayState* play, s32 arg2);
void func_80B27A90(EnKendoJs* this, PlayState* play);
@@ -512,7 +512,7 @@ void func_80B27030(EnKendoJs* this, PlayState* play) {
sp20.z += 200.0f;
if (func_80B278C4(play, sp20)) {
if (EnKendoJs_MovePlayerToPos(play, sp20)) {
this->actor.flags |= ACTOR_FLAG_10000;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
@@ -609,7 +609,7 @@ void func_80B2740C(EnKendoJs* this, PlayState* play) {
sp18.z += 300.0f;
if (func_80B278C4(play, sp18)) {
if (EnKendoJs_MovePlayerToPos(play, sp18)) {
this->unk_28C = 0;
player->stateFlags1 &= ~PLAYER_STATE1_20;
this->actionFunc = func_80B274BC;
@@ -718,30 +718,30 @@ void func_80B27880(EnKendoJs* this, PlayState* play) {
}
}
s32 func_80B278C4(PlayState* play, Vec3f arg1) {
s32 EnKendoJs_MovePlayerToPos(PlayState* play, Vec3f targetPos) {
Player* player = GET_PLAYER(play);
f32 temp_f0;
f32 sp28;
s16 sp22 = Math_Vec3f_Yaw(&player->actor.world.pos, &arg1);
f32 distXZ;
f32 controlStickMagnitude;
s16 controlStickAngle;
temp_f0 = Math_Vec3f_DistXZ(&player->actor.world.pos, &arg1);
controlStickAngle = Math_Vec3f_Yaw(&player->actor.world.pos, &targetPos);
distXZ = Math_Vec3f_DistXZ(&player->actor.world.pos, &targetPos);
if (temp_f0 < 20.0f) {
sp28 = 10.0f;
} else if (temp_f0 < 40.0f) {
sp28 = 40.0f;
if (distXZ < 20.0f) {
controlStickMagnitude = 10.0f;
} else if (distXZ < 40.0f) {
controlStickMagnitude = 40.0f;
} else {
sp28 = 80.0f;
controlStickMagnitude = 80.0f;
}
play->actorCtx.unk268 = 1;
func_800B6F20(play, &play->actorCtx.unk_26C, sp28, sp22);
play->actorCtx.isOverrideInputOn = true;
Actor_SetControlStickData(play, &play->actorCtx.overrideInput, controlStickMagnitude, controlStickAngle);
if (temp_f0 < 20.0f) {
if (distXZ < 20.0f) {
return true;
} else {
return false;
}
return false;
}
void func_80B279AC(EnKendoJs* this, PlayState* play) {
src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c
+22 -22
View File
@@ -29,8 +29,8 @@ void EnLiftNuts_StartConversation(EnLiftNuts* this, PlayState* play);
void EnLiftNuts_HandleConversation(EnLiftNuts* this, PlayState* play);
void EnLiftNuts_SetupMove(EnLiftNuts* this);
void EnLiftNuts_Move(EnLiftNuts* this, PlayState* play);
void EnLiftNuts_SetupMovePlayer(EnLiftNuts* this);
void EnLiftNuts_MovePlayer(EnLiftNuts* this, PlayState* play);
void EnLiftNuts_SetupMovePlayerToActor(EnLiftNuts* this);
void EnLiftNuts_MovePlayerToActor(EnLiftNuts* this, PlayState* play);
void EnLiftNuts_SetupStartGame(EnLiftNuts* this);
void EnLiftNuts_StartGame(EnLiftNuts* this, PlayState* play);
void EnLiftNuts_SetupStartGameImmediately(EnLiftNuts* this);
@@ -774,45 +774,45 @@ void EnLiftNuts_Move(EnLiftNuts* this, PlayState* play) {
this->actor.world.pos.y += this->actor.gravity;
if (dist == 0.0f) {
EnLiftNuts_SetupMovePlayer(this);
EnLiftNuts_SetupMovePlayerToActor(this);
}
}
void EnLiftNuts_SetupMovePlayer(EnLiftNuts* this) {
this->actionFunc = EnLiftNuts_MovePlayer;
void EnLiftNuts_SetupMovePlayerToActor(EnLiftNuts* this) {
this->actionFunc = EnLiftNuts_MovePlayerToActor;
}
void EnLiftNuts_MovePlayer(EnLiftNuts* this, PlayState* play) {
void EnLiftNuts_MovePlayerToActor(EnLiftNuts* this, PlayState* play) {
Player* player = GET_PLAYER(play);
f32 dist;
f32 magnitude;
s16 playerYaw;
f32 distXZ;
f32 controlStickMagnitude;
s16 controlStickAngle;
s16 yaw;
s16 yawDiff;
yaw = this->actor.yawTowardsPlayer - 0x8000;
playerYaw = Math_Vec3f_Yaw(&player->actor.world.pos, &this->actor.home.pos);
yawDiff = playerYaw - yaw;
dist = Math_Vec3f_DistXZ(&player->actor.world.pos, &this->actor.home.pos);
controlStickAngle = Math_Vec3f_Yaw(&player->actor.world.pos, &this->actor.home.pos);
yawDiff = controlStickAngle - yaw;
distXZ = Math_Vec3f_DistXZ(&player->actor.world.pos, &this->actor.home.pos);
if (this->actor.xzDistToPlayer < dist) {
if (this->actor.xzDistToPlayer < distXZ) {
if (ABS_ALT(yawDiff) < 0x2000) {
playerYaw = (yawDiff > 0) ? (playerYaw + 0x2000) : (playerYaw - 0x2000);
controlStickAngle = (yawDiff > 0) ? (controlStickAngle + 0x2000) : (controlStickAngle - 0x2000);
}
}
if (dist < 5.0f) {
magnitude = 10.0f;
} else if (dist < 30.0f) {
magnitude = 40.0f;
if (distXZ < 5.0f) {
controlStickMagnitude = 10.0f;
} else if (distXZ < 30.0f) {
controlStickMagnitude = 40.0f;
} else {
magnitude = 80.0f;
controlStickMagnitude = 80.0f;
}
play->actorCtx.unk268 = true;
func_800B6F20(play, &play->actorCtx.unk_26C, magnitude, playerYaw);
play->actorCtx.isOverrideInputOn = true;
Actor_SetControlStickData(play, &play->actorCtx.overrideInput, controlStickMagnitude, controlStickAngle);
if (dist < 5.0f) {
if (distXZ < 5.0f) {
EnLiftNuts_SetupIdle(this);
}
}
src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
+4 -4
View File
@@ -770,10 +770,10 @@ void EnMa4_HorsebackGameEnd(EnMa4* this, PlayState* play) {
Player* player = GET_PLAYER(play);
if (player->stateFlags1 & PLAYER_STATE1_100000) {
play->actorCtx.unk268 = 1;
play->actorCtx.unk_26C.press.button = BTN_A;
play->actorCtx.isOverrideInputOn = true;
play->actorCtx.overrideInput.press.button = BTN_A;
} else {
play->actorCtx.unk268 = 1;
play->actorCtx.isOverrideInputOn = true;
}
if (sFrameCounter == 25) {
@@ -785,7 +785,7 @@ void EnMa4_HorsebackGameEnd(EnMa4* this, PlayState* play) {
this->textId = 0x334B;
}
} else if (sFrameCounter == 50) {
play->actorCtx.unk268 = 0;
play->actorCtx.isOverrideInputOn = false;
play->nextEntrance = ENTRANCE(ROMANI_RANCH, 1);
gSaveContext.nextCutsceneIndex = 0;
sFrameCounter = 0;
src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
+10 -9
View File
@@ -248,24 +248,25 @@ void EnSyatekiMan_Destroy(Actor* thisx, PlayState* play) {
* Moves the player to the destination through automated control stick movements.
* This is used to move the player to the right place to play the shooting game.
*/
s32 EnSyatekiMan_MovePlayerToPos(PlayState* play, Vec3f pos) {
s32 EnSyatekiMan_MovePlayerToPos(PlayState* play, Vec3f targetPos) {
Player* player = GET_PLAYER(play);
f32 distXZ;
f32 magnitude;
s16 yaw = Math_Vec3f_Yaw(&player->actor.world.pos, &pos);
f32 controlStickMagnitude;
s16 controlStickAngle;
distXZ = Math_Vec3f_DistXZ(&player->actor.world.pos, &pos);
controlStickAngle = Math_Vec3f_Yaw(&player->actor.world.pos, &targetPos);
distXZ = Math_Vec3f_DistXZ(&player->actor.world.pos, &targetPos);
if (distXZ < 5.0f) {
magnitude = 10.0f;
controlStickMagnitude = 10.0f;
} else if (distXZ < 30.0f) {
magnitude = 40.0f;
controlStickMagnitude = 40.0f;
} else {
magnitude = 80.0f;
controlStickMagnitude = 80.0f;
}
play->actorCtx.unk268 = 1;
func_800B6F20(play, &play->actorCtx.unk_26C, magnitude, yaw);
play->actorCtx.isOverrideInputOn = true;
Actor_SetControlStickData(play, &play->actorCtx.overrideInput, controlStickMagnitude, controlStickAngle);
if (distXZ < 5.0f) {
return true;
src/overlays/actors/ovl_En_Test3/z_en_test3.c
+21 -17
View File
@@ -265,9 +265,9 @@ static EnTest3_struct_D78 D_80A41854[] = {
s32 D_80A41D20;
s32 D_80A41D24;
Input sEnTest3_Input;
f32 D_80A41D40;
s16 D_80A41D44;
Input sKafeiControlInput;
f32 sKafeiControlStickMagnitude;
s16 sKafeiControlStickAngle;
s32 D_80A41D48;
Vec3f D_80A41D50;
s32 D_80A41D5C;
@@ -951,9 +951,9 @@ s32 func_80A40230(EnTest3* this, PlayState* play) {
dy = this->player.actor.world.pos.z - this->player.actor.prevPos.z;
this->player.linearVelocity = sqrtf(SQ(dx) + SQ(dy));
this->player.linearVelocity *= 1.0f + (1.05f * fabsf(Math_SinS(this->player.floorPitch)));
D_80A41D40 = (this->player.linearVelocity * 10.0f) + 20.0f;
D_80A41D40 = CLAMP_MAX(D_80A41D40, 60.0f);
D_80A41D44 = this->player.actor.world.rot.y;
sKafeiControlStickMagnitude = (this->player.linearVelocity * 10.0f) + 20.0f;
sKafeiControlStickMagnitude = CLAMP_MAX(sKafeiControlStickMagnitude, 60.0f);
sKafeiControlStickAngle = this->player.actor.world.rot.y;
this->player.actor.world.pos.x = this->player.actor.prevPos.x;
this->player.actor.world.pos.z = this->player.actor.prevPos.z;
if (!func_80A3F384(this, play)) {
@@ -1035,7 +1035,7 @@ void func_80A409D4(EnTest3* this, PlayState* play) {
func_80A3F0B0(this, play);
CutsceneManager_SetReturnCamera(CAM_ID_MAIN);
} else {
sEnTest3_Input = *CONTROLLER1(&play->state);
sKafeiControlInput = *CONTROLLER1(&play->state);
}
}
@@ -1047,15 +1047,16 @@ void EnTest3_Update(Actor* thisx, PlayState* play2) {
PlayState* play = play2;
EnTest3* this = THIS;
sEnTest3_Input.rel.button = sEnTest3_Input.cur.button;
sEnTest3_Input.cur.button = 0;
sEnTest3_Input.rel.stick_x = 0;
sEnTest3_Input.rel.stick_y = 0;
sKafeiControlInput.rel.button = sKafeiControlInput.cur.button;
sKafeiControlInput.cur.button = 0;
sKafeiControlInput.rel.stick_x = 0;
sKafeiControlInput.rel.stick_y = 0;
play->actorCtx.flags &= ~ACTORCTX_FLAG_7;
this->player.actor.draw = EnTest3_Draw;
D_80A41D48 = false;
this->player.actor.flags &= ~(ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY);
if (Cutscene_IsCueInChannel(play, CS_CMD_ACTOR_CUE_506) &&
!((this->player.actor.category == ACTORCAT_PLAYER) &&
((play->actorCtx.flags & ACTORCTX_FLAG_5) || (play->actorCtx.flags & ACTORCTX_FLAG_4)))) {
@@ -1077,14 +1078,17 @@ void EnTest3_Update(Actor* thisx, PlayState* play2) {
this->unk_D84 = 0.0f;
}
} else {
D_80A41D40 = 0.0f;
D_80A41D44 = this->player.actor.shape.rot.y;
sKafeiControlStickMagnitude = 0.0f;
sKafeiControlStickAngle = this->player.actor.shape.rot.y;
this->unk_D94(this, play);
sEnTest3_Input.press.button =
(sEnTest3_Input.rel.button ^ sEnTest3_Input.cur.button) & sEnTest3_Input.cur.button;
func_800B6F20(play, &sEnTest3_Input, D_80A41D40, D_80A41D44);
sKafeiControlInput.press.button =
(sKafeiControlInput.rel.button ^ sKafeiControlInput.cur.button) & sKafeiControlInput.cur.button;
Actor_SetControlStickData(play, &sKafeiControlInput, sKafeiControlStickMagnitude, sKafeiControlStickAngle);
}
play->playerUpdate(&this->player, play, &sEnTest3_Input);
play->playerUpdate(&this->player, play, &sKafeiControlInput);
if (D_80A41D48) {
this->player.actor.world.pos.x = D_80A41D50.x;
this->player.actor.world.pos.z = D_80A41D50.z;
src/overlays/actors/ovl_En_Toto/z_en_toto.c
+15 -14
View File
@@ -145,10 +145,10 @@ static EnTotoUnkStruct2 D_80BA50DC[] = {
{ 0x2B2C, 0x2B2D, 0x2B2E, { 0xFFF1, 0x0016, 0xFE74 } },
};
static Vec3s D_80BA510C[] = {
{ 0xFF46, 0xFFF8, 0xFF40 },
{ 0xFF21, 0xFFFD, 0xFF04 },
{ 0xFF64, 0x0016, 0xFE7E },
static Vec3s sPlayerOverrideInputPosList[] = {
{ -186, -8, -192 },
{ -223, -3, -252 },
{ -156, 22, -386 },
};
static u16 sOcarinaActionWindFishPrompts[] = {
@@ -452,30 +452,31 @@ s32 func_80BA4204(EnToto* this, PlayState* play) {
s32 func_80BA42BC(EnToto* this, PlayState* play) {
Player* player = GET_PLAYER(play);
u32 phi_s0 = 0;
Vec3s* end = &D_80BA510C[3];
u32 numPoints = 0;
Vec3s* endPosListPtr = &sPlayerOverrideInputPosList[ARRAY_COUNT(sPlayerOverrideInputPosList)];
func_80BA3FB0(this, play);
Player_SetCsActionWithHaltedActors(play, NULL, PLAYER_CSACTION_END);
if (player->actor.world.pos.z > -310.0f) {
if ((player->actor.world.pos.x > -150.0f) || (player->actor.world.pos.z > -172.0f)) {
phi_s0 = 3;
numPoints = ARRAY_COUNT(sPlayerOverrideInputPosList);
} else if (player->actor.world.pos.z > -232.0f) {
numPoints = ARRAY_COUNT(sPlayerOverrideInputPosList) - 1;
} else {
if (player->actor.world.pos.z > -232.0f) {
phi_s0 = 2;
} else {
phi_s0 = 1;
}
numPoints = ARRAY_COUNT(sPlayerOverrideInputPosList) - 2;
}
}
func_80122744(play, &this->unk_2BC, phi_s0, end - phi_s0);
Player_InitOverrideInput(play, &this->overrideInputEntry, numPoints, &endPosListPtr[0 - numPoints]);
this->spotlights = Actor_Spawn(&play->actorCtx, play, ACTOR_DM_CHAR07, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0xF02);
return 0;
}
s32 func_80BA43F4(EnToto* this, PlayState* play) {
func_80BA3C88(this);
if (func_80122760(play, &this->unk_2BC, 60.0f)) {
if (Player_UpdateOverrideInput(play, &this->overrideInputEntry, 60.0f)) {
Player_SetCsActionWithHaltedActors(play, NULL, PLAYER_CSACTION_19);
return func_80BA4204(this, play);
}
src/overlays/actors/ovl_En_Toto/z_en_toto.h
+1 -1
View File
@@ -41,7 +41,7 @@ typedef struct EnToto {
/* 0x2B6 */ u8 unk2B6;
/* 0x2B7 */ u8 unk2B7;
/* 0x2B8 */ EnTotoText* text;
/* 0x2BC */ struct_80122744_arg1 unk_2BC;
/* 0x2BC */ PlayerOverrideInputEntry overrideInputEntry;
/* 0x2C4 */ Actor* spotlights;
/* 0x2C8 */ s32 pad2C8;
} EnToto; // size = 0x2CC
src/overlays/actors/ovl_player_actor/z_player.c
+4 -4
View File
@@ -12412,8 +12412,8 @@ void Player_Update(Actor* thisx, PlayState* play) {
Player_DetachHeldActor(play, this);
}
if ((play->actorCtx.unk268 != 0) && (this == GET_PLAYER(play))) {
input = play->actorCtx.unk_26C;
if (play->actorCtx.isOverrideInputOn && (this == GET_PLAYER(play))) {
input = play->actorCtx.overrideInput;
} else if ((this->csAction == PLAYER_CSACTION_5) ||
(this->stateFlags1 & (PLAYER_STATE1_20 | PLAYER_STATE1_20000000)) || (this != GET_PLAYER(play)) ||
func_8082DA90(play) || (gSaveContext.save.saveInfo.playerData.health == 0)) {
@@ -12428,8 +12428,8 @@ void Player_Update(Actor* thisx, PlayState* play) {
}
Player_UpdateCommon(this, play, &input);
play->actorCtx.unk268 = 0;
bzero(&play->actorCtx.unk_26C, sizeof(Input));
play->actorCtx.isOverrideInputOn = false;
bzero(&play->actorCtx.overrideInput, sizeof(Input));
MREG(52) = this->actor.world.pos.x;
MREG(53) = this->actor.world.pos.y;