izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Player Docs: public facing csAction things (#1459)

Browse Source 
* public cs

* comments
This commit is contained in:
engineer124
2023-11-05 20:34:53 -03:00
committed by GitHub
parent 10a14feb2c
commit f8a5f11d6d
60 changed files with 234 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+2 -2
View File
@@ -312,8 +312,8 @@ s32 func_800B7128(Player* player);
s32 func_800B715C(PlayState* play);
void Actor_SetCameraHorseSetting(PlayState* play, Player* player);
void Actor_MountHorse(PlayState* play, Player* player, Actor* horse);
s32 func_800B724C(PlayState* play, Actor* actor, u8 csAction);
s32 func_800B7298(PlayState* play, Actor* actor, u8 csAction);
s32 Player_SetCsAction(PlayState* play, Actor* csActor, u8 csAction);
s32 Player_SetCsActionWithHaltedActors(PlayState* play, Actor* csActor, u8 csAction);
void func_800B72F8(DynaPolyActor* dyna, f32 extraPushForce, s16 yRotation);
s32 Player_IsFacingActor(Actor* actor, s16 maxAngleDiff, PlayState* play);
include/z64.h
+1 -1
View File
@@ -208,7 +208,7 @@ typedef struct PlayState {
/* 0x18770 */ void (*unk_18770)(struct PlayState* play, Player* player);
/* 0x18774 */ s32 (*startPlayerFishing)(struct PlayState* play);
/* 0x18778 */ s32 (*grabPlayer)(struct PlayState* play, Player* player);
/* 0x1877C */ s32 (*startPlayerCutscene)(struct PlayState* play, Player* player, PlayerCsAction csAction);
/* 0x1877C */ s32 (*tryPlayerCsAction)(struct PlayState* play, Player* player, PlayerCsAction csAction);
/* 0x18780 */ void (*func_18780)(Player* player, struct PlayState* play);
/* 0x18784 */ s32 (*damagePlayer)(struct PlayState* play, s32 damage);
/* 0x18788 */ void (*talkWithPlayer)(struct PlayState* play, Actor* actor);
include/z64player.h
+2 -1
View File
@@ -607,6 +607,7 @@ typedef struct struct_80122744_arg1 {
} struct_80122744_arg1; // size = 0x8
typedef enum PlayerCsAction {
/* -1 */ PLAYER_CSACTION_NEG1 = -1, // Specific to Kafei, any negative number works
/* 0x00 */ PLAYER_CSACTION_NONE,
/* 0x01 */ PLAYER_CSACTION_1,
/* 0x02 */ PLAYER_CSACTION_2,
@@ -1145,7 +1146,7 @@ typedef struct Player {
/* 0x395 */ u8 prevCsAction; // PlayerCsAction enum
/* 0x396 */ u8 cueId; // PlayerCueId enum
/* 0x397 */ u8 unk_397; // PlayerDoorType enum
/* 0x398 */ Actor* csActor;
/* 0x398 */ Actor* csActor; // Actor involved in a `csAction`. Typically the actor that invoked the cutscene.
/* 0x39C */ UNK_TYPE1 unk_39C[0x4];
/* 0x3A0 */ Vec3f unk_3A0;
/* 0x3AC */ Vec3f unk_3AC;
src/code/z_actor.c
+25 -4
View File
@@ -1402,7 +1402,17 @@ void Actor_SpawnHorse(PlayState* play, Player* player) {
Horse_Spawn(play, player);
}
s32 func_800B724C(PlayState* play, Actor* actor, u8 csAction) {
/**
* Sets a Player Cutscene Action specified by `csAction`.
*
* `haltActorsDuringCsAction` being set to false in this function means that all actors will
* be able to update while Player is performing the cutscene action.
*
* Note: due to how player implements initializing the cutscene action state, `haltActorsDuringCsAction`
* will only be considered the first time player starts a `csAction`.
* Player must leave the cutscene action state and enter it again before halting actors can be toggled.
*/
s32 Player_SetCsAction(PlayState* play, Actor* csActor, u8 csAction) {
Player* player = GET_PLAYER(play);
if ((player->csAction == PLAYER_CSACTION_5) ||
@@ -1411,15 +1421,26 @@ s32 func_800B724C(PlayState* play, Actor* actor, u8 csAction) {
}
player->csAction = csAction;
player->csActor = actor;
player->csActor = csActor;
player->cv.haltActorsDuringCsAction = false;
return true;
}
s32 func_800B7298(PlayState* play, Actor* actor, u8 csAction) {
/**
* Sets a Player Cutscene Action specified by `csAction`.
*
* `haltActorsDuringCsAction` being set to true in this function means that eventually `PLAYER_STATE1_20000000` will be
* set. This makes it so actors belonging to categories `ACTORCAT_ENEMY` and `ACTORCAT_MISC` will not update while
* Player is performing the cutscene action.
*
* Note: due to how player implements initializing the cutscene action state, `haltActorsDuringCsAction`
* will only be considered the first time player starts a `csAction`.
* Player must leave the cutscene action state and enter it again before halting actors can be toggled.
*/
s32 Player_SetCsActionWithHaltedActors(PlayState* play, Actor* csActor, u8 csAction) {
Player* player = GET_PLAYER(play);
if (func_800B724C(play, actor, csAction)) {
if (Player_SetCsAction(play, csActor, csAction)) {
player->cv.haltActorsDuringCsAction = true;
return true;
}
src/code/z_eventmgr.c
+3 -3
View File
@@ -213,7 +213,7 @@ void CutsceneManager_End(void) {
sCutsceneMgr.targetActor->flags &= ~ACTOR_FLAG_100000;
// fallthrough
case CS_START_1:
func_800B7298(sCutsceneMgr.play, NULL, PLAYER_CSACTION_END);
Player_SetCsActionWithHaltedActors(sCutsceneMgr.play, NULL, PLAYER_CSACTION_END);
sCutsceneMgr.startMethod = CS_START_0;
break;
@@ -344,7 +344,7 @@ s16 CutsceneManager_StartWithPlayerCs(s16 csId, Actor* actor) {
s16 startCsId = CutsceneManager_Start(csId, actor);
if (startCsId >= 0) {
func_800B7298(sCutsceneMgr.play, NULL, PLAYER_CSACTION_WAIT);
Player_SetCsActionWithHaltedActors(sCutsceneMgr.play, NULL, PLAYER_CSACTION_WAIT);
if (sCutsceneMgr.length == 0) {
CutsceneManager_Stop(sCutsceneMgr.csId);
}
@@ -360,7 +360,7 @@ s16 CutsceneManager_StartWithPlayerCsAndSetFlag(s16 csId, Actor* actor) {
s16 startCsId = CutsceneManager_Start(csId, actor);
if (startCsId >= 0) {
func_800B7298(sCutsceneMgr.play, NULL, PLAYER_CSACTION_WAIT);
Player_SetCsActionWithHaltedActors(sCutsceneMgr.play, NULL, PLAYER_CSACTION_WAIT);
if (sCutsceneMgr.length == 0) {
CutsceneManager_Stop(sCutsceneMgr.csId);
}
src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c
+1 -1
View File
@@ -794,7 +794,7 @@ void func_80B819F0(Actor* thisx, PlayState* play) {
if (CutsceneManager_IsNext(this->dyna.actor.csId)) {
CutsceneManager_StartWithPlayerCs(this->dyna.actor.csId, &this->dyna.actor);
if (this->dyna.actor.csId >= 0) {
func_800B7298(play, &this->dyna.actor, PLAYER_CSACTION_WAIT);
Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, PLAYER_CSACTION_WAIT);
}
func_80B81A64(this);
} else {
src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
+7 -7
View File
@@ -126,7 +126,7 @@ s32 func_80953DA8(BgIngate* this, PlayState* play) {
Camera* mainCam = Play_GetCamera(play, CAM_ID_MAIN);
if (CHECK_EVENTINF(EVENTINF_35)) {
func_800B7298(play, &this->dyna.actor, PLAYER_CSACTION_WAIT);
Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, PLAYER_CSACTION_WAIT);
} else {
SET_EVENTINF(EVENTINF_41);
}
@@ -149,7 +149,7 @@ void func_80953E38(PlayState* play) {
void func_80953EA4(BgIngate* this, PlayState* play) {
Player* player = GET_PLAYER(play);
func_800B7298(play, &this->dyna.actor, PLAYER_CSACTION_58);
Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, PLAYER_CSACTION_58);
player->unk_3A0.x = this->dyna.actor.world.pos.x;
player->unk_3A0.z = this->dyna.actor.world.pos.z;
this->unk160 &= ~0x4;
@@ -192,7 +192,7 @@ void func_80953F9C(BgIngate* this, PlayState* play) {
if (this->timePath->additionalPathIndex != ADDITIONAL_PATH_INDEX_NONE) {
func_80953E38(play);
func_800B7298(play, &this->dyna.actor, PLAYER_CSACTION_WAIT);
Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, PLAYER_CSACTION_WAIT);
this->dyna.actor.textId = 0x9E4;
Message_StartTextbox(play, this->dyna.actor.textId, NULL);
this->unk16C += 1;
@@ -231,7 +231,7 @@ void func_809541B8(BgIngate* this, PlayState* play) {
if ((player->transformation == PLAYER_FORM_HUMAN) && (player->actor.bgCheckFlags & BGCHECKFLAG_GROUND) &&
(this->dyna.actor.xzDistToPlayer < 40.0f)) {
if (this->dyna.actor.playerHeightRel > 15.0f) {
func_800B7298(play, &this->dyna.actor, PLAYER_CSACTION_WAIT);
Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, PLAYER_CSACTION_WAIT);
this->dyna.actor.textId = 0x9E6;
Message_StartTextbox(play, this->dyna.actor.textId, NULL);
this->actionFunc = func_809543D4;
@@ -261,7 +261,7 @@ void func_809542A0(BgIngate* this, PlayState* play) {
void func_80954340(BgIngate* this, PlayState* play) {
if (DECR(this->unk16A) == 0) {
if (this->timePath != NULL) {
func_800B7298(play, &this->dyna.actor, PLAYER_CSACTION_END);
Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, PLAYER_CSACTION_END);
this->timePath = &play->setupPathList[this->timePath->additionalPathIndex];
func_80953F14(this, play);
Environment_StopTime();
@@ -280,7 +280,7 @@ void func_809543D4(BgIngate* this, PlayState* play) {
break;
case 0x9E5:
if (play->msgCtx.choiceIndex == 0) {
func_800B7298(play, &this->dyna.actor, PLAYER_CSACTION_END);
Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, PLAYER_CSACTION_END);
this->unk160 &= ~0x4;
this->actionFunc = func_809541B8;
Environment_StartTime();
@@ -301,7 +301,7 @@ void func_809543D4(BgIngate* this, PlayState* play) {
CLEAR_WEEKEVENTREG(WEEKEVENTREG_90_40);
Audio_PlaySfx_MessageDecide();
} else {
func_800B7298(play, &this->dyna.actor, PLAYER_CSACTION_END);
Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, PLAYER_CSACTION_END);
this->unk160 &= ~0x4;
this->actionFunc = func_809541B8;
Environment_StartTime();
src/overlays/actors/ovl_Boss_01/z_boss_01.c
+8 -8
View File
@@ -1001,7 +1001,7 @@ void Boss01_IntroCutscene(Boss01* this, PlayState* play) {
}
Cutscene_StartManual(play, &play->csCtx);
func_800B7298(play, &this->actor, PLAYER_CSACTION_WAIT);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_WAIT);
this->subCamId = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STATUS_WAIT);
Play_ChangeCameraStatus(play, this->subCamId, CAM_STATUS_ACTIVE);
@@ -1036,11 +1036,11 @@ void Boss01_IntroCutscene(Boss01* this, PlayState* play) {
}
if (this->cutsceneTimer == 40) {
func_800B7298(play, &this->actor, PLAYER_CSACTION_21);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_21);
}
if (this->cutsceneTimer == 100) {
func_800B7298(play, &this->actor, PLAYER_CSACTION_4);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_4);
}
if (this->cutsceneTimer >= 90) {
@@ -1136,7 +1136,7 @@ void Boss01_IntroCutscene(Boss01* this, PlayState* play) {
func_80169AFC(play, this->subCamId, 0);
this->subCamId = SUB_CAM_ID_DONE;
Cutscene_StopManual(play, &play->csCtx);
func_800B7298(play, &this->actor, PLAYER_CSACTION_END);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_END);
this->actor.flags |= ACTOR_FLAG_TARGETABLE;
SET_EVENTINF(EVENTINF_54);
}
@@ -1189,7 +1189,7 @@ void Boss01_SummonBugsCutscene(Boss01* this, PlayState* play) {
}
Cutscene_StartManual(play, &play->csCtx);
func_800B7298(play, &this->actor, PLAYER_CSACTION_WAIT);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_WAIT);
this->subCamId = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STATUS_WAIT);
Play_ChangeCameraStatus(play, this->subCamId, CAM_STATUS_ACTIVE);
@@ -1232,7 +1232,7 @@ void Boss01_SummonBugsCutscene(Boss01* this, PlayState* play) {
func_80169AFC(play, this->subCamId, 0);
this->subCamId = SUB_CAM_ID_DONE;
Cutscene_StopManual(play, &play->csCtx);
func_800B7298(play, &this->actor, PLAYER_CSACTION_END);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_END);
this->actor.flags |= ACTOR_FLAG_TARGETABLE;
player->actor.world.rot.y = player->actor.shape.rot.y = -0x8000;
player->actor.world.pos.x = 0.0f;
@@ -2135,7 +2135,7 @@ void Boss01_DeathCutscene(Boss01* this, PlayState* play) {
}
Cutscene_StartManual(play, &play->csCtx);
func_800B7298(play, &this->actor, PLAYER_CSACTION_1);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_1);
this->subCamId = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STATUS_WAIT);
Play_ChangeCameraStatus(play, this->subCamId, CAM_STATUS_ACTIVE);
@@ -2252,7 +2252,7 @@ void Boss01_DeathCutscene(Boss01* this, PlayState* play) {
func_80169AFC(play, this->subCamId, 0);
this->subCamId = SUB_CAM_ID_DONE;
Cutscene_StopManual(play, &play->csCtx);
func_800B7298(play, &this->actor, PLAYER_CSACTION_END);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_END);
this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
}
break;
src/overlays/actors/ovl_Boss_02/z_boss_02.c
+4 -4
View File
@@ -2172,7 +2172,7 @@ void func_809DEAC4(Boss02* this, PlayState* play) {
}
if (this->unk_1D1C == 45) {
func_800B7298(play, &this->actor, PLAYER_CSACTION_21);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_21);
sTwinmoldMusicStartTimer = KREG(91) + 43;
}
@@ -2186,7 +2186,7 @@ void func_809DEAC4(Boss02* this, PlayState* play) {
}
if (this->unk_1D1C == 100) {
func_800B7298(play, &this->actor, PLAYER_CSACTION_115);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_115);
}
if (this->unk_1D1C == 112) {
@@ -2225,7 +2225,7 @@ void func_809DEAC4(Boss02* this, PlayState* play) {
func_80169AFC(play, this->subCamId, 0);
this->subCamId = SUB_CAM_ID_DONE;
Cutscene_StopManual(play, &play->csCtx);
func_800B7298(play, &this->actor, PLAYER_CSACTION_END);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_END);
this->actor.flags |= ACTOR_FLAG_TARGETABLE;
this->unk_1D20 = 0;
sRedTwinmold->unk_0144 = sBlueTwinmold->unk_0144 = 3;
@@ -2286,7 +2286,7 @@ void func_809DEAC4(Boss02* this, PlayState* play) {
func_80169AFC(play, this->subCamId, 0);
this->subCamId = SUB_CAM_ID_DONE;
Cutscene_StopManual(play, &play->csCtx);
func_800B7298(play, &this->actor, PLAYER_CSACTION_END);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_END);
this->unk_1D20 = 0;
this->actor.flags |= ACTOR_FLAG_TARGETABLE;
sp68->unk_0144 = 10;
src/overlays/actors/ovl_Boss_03/z_boss_03.c
+7 -7
View File
@@ -1149,7 +1149,7 @@ void Boss03_IntroCutscene(Boss03* this, PlayState* play) {
case 0:
if (player->actor.world.pos.y < 1350.0f) {
Cutscene_StartManual(play, &play->csCtx);
func_800B7298(play, &this->actor, PLAYER_CSACTION_WAIT);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_WAIT);
this->subCamId = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STATUS_WAIT);
Play_ChangeCameraStatus(play, this->subCamId, CAM_STATUS_ACTIVE);
@@ -1260,7 +1260,7 @@ void Boss03_IntroCutscene(Boss03* this, PlayState* play) {
if (this->csTimer == 5) {
// Rotates Player towards Gyorg
func_800B7298(play, &this->actor, PLAYER_CSACTION_8);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_8);
}
this->subCamEye.x = player->actor.world.pos.x + 30.0f;
@@ -1371,7 +1371,7 @@ void Boss03_IntroCutscene(Boss03* this, PlayState* play) {
func_80169AFC(play, this->subCamId, 0);
Cutscene_StopManual(play, &play->csCtx);
func_800B7298(play, &this->actor, PLAYER_CSACTION_END);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_END);
this->subCamId = SUB_CAM_ID_DONE;
func_809E344C(this, play);
@@ -1449,7 +1449,7 @@ void Boss03_DeathCutscene(Boss03* this, PlayState* play) {
case 0:
if (CutsceneManager_GetCurrentCsId() == CS_ID_NONE) {
Cutscene_StartManual(play, &play->csCtx);
func_800B7298(play, &this->actor, PLAYER_CSACTION_1);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_1);
this->subCamId = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STATUS_WAIT);
Play_ChangeCameraStatus(play, this->subCamId, CAM_STATUS_ACTIVE);
@@ -1628,7 +1628,7 @@ void Boss03_DeathCutscene(Boss03* this, PlayState* play) {
func_80169AFC(play, this->subCamId, 0);
this->subCamId = SUB_CAM_ID_DONE;
Cutscene_StopManual(play, &play->csCtx);
func_800B7298(play, &this->actor, PLAYER_CSACTION_END);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_END);
this->csState = 3;
Play_DisableMotionBlur();
Boss03_PlayUnderwaterSfx(&this->actor.projectedPos, NA_SE_EN_KONB_INIT_OLD);
@@ -1662,7 +1662,7 @@ void Boss03_SpawnSmallFishesCutscene(Boss03* this, PlayState* play) {
case 0:
if (CutsceneManager_GetCurrentCsId() == CS_ID_NONE) {
Cutscene_StartManual(play, &play->csCtx);
func_800B7298(play, &this->actor, PLAYER_CSACTION_1);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_1);
this->subCamId = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STATUS_WAIT);
Play_ChangeCameraStatus(play, this->subCamId, CAM_STATUS_ACTIVE);
@@ -1723,7 +1723,7 @@ void Boss03_SpawnSmallFishesCutscene(Boss03* this, PlayState* play) {
func_80169AFC(play, this->subCamId, 0);
this->subCamId = SUB_CAM_ID_DONE;
Cutscene_StopManual(play, &play->csCtx);
func_800B7298(play, &this->actor, PLAYER_CSACTION_END);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_END);
func_809E344C(this, play);
this->workTimer[WORK_TIMER_UNK1_A] = 50;
src/overlays/actors/ovl_Boss_04/z_boss_04.c
+3 -3
View File
@@ -264,7 +264,7 @@ void func_809EC568(Boss04* this, PlayState* play) {
this->subCamId = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STATUS_WAIT);
Play_ChangeCameraStatus(play, this->subCamId, CAM_STATUS_ACTIVE);
func_800B7298(play, &this->actor, PLAYER_CSACTION_WAIT);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_WAIT);
player->actor.world.pos.x = this->unk_6E8;
player->actor.world.pos.z = this->unk_6F0 + 410.0f;
player->actor.shape.rot.y = 0x7FFF;
@@ -314,7 +314,7 @@ void func_809EC568(Boss04* this, PlayState* play) {
if (this->unk_704 == 45) {
this->unk_708 = 1;
this->unk_704 = 0;
func_800B7298(play, &this->actor, PLAYER_CSACTION_21);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_21);
this->actor.gravity = 0.0f;
break;
}
@@ -391,7 +391,7 @@ void func_809EC568(Boss04* this, PlayState* play) {
func_80169AFC(play, this->subCamId, 0);
this->subCamId = SUB_CAM_ID_DONE;
Cutscene_StopManual(play, &play->csCtx);
func_800B7298(play, &this->actor, PLAYER_CSACTION_END);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_END);
Play_DisableMotionBlur();
SET_EVENTINF(EVENTINF_60);
}
src/overlays/actors/ovl_Boss_06/z_boss_06.c
+3 -3
View File
@@ -200,7 +200,7 @@ void func_809F24C8(Boss06* this, PlayState* play) {
}
Cutscene_StartManual(play, &play->csCtx);
func_800B7298(play, &this->actor, PLAYER_CSACTION_WAIT);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_WAIT);
this->subCamId = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STATUS_WAIT);
Play_ChangeCameraStatus(play, this->subCamId, CAM_STATUS_ACTIVE);
@@ -240,7 +240,7 @@ void func_809F24C8(Boss06* this, PlayState* play) {
this->unk_1D8 = 0.0f;
if (this->unk_1CA == 60) {
D_809F4970->unk_154++;
func_800B7298(play, &this->actor, PLAYER_CSACTION_132);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_132);
player->actor.shape.rot.y = 0;
player->actor.world.rot.y = player->actor.shape.rot.y;
}
@@ -333,7 +333,7 @@ void func_809F24C8(Boss06* this, PlayState* play) {
func_80169AFC(play, this->subCamId, 0);
this->subCamId = SUB_CAM_ID_DONE;
Cutscene_StopManual(play, &play->csCtx);
func_800B7298(play, &this->actor, PLAYER_CSACTION_END);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_END);
D_809F4970->unk_151 = 0;
}
break;
src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c
+2 -2
View File
@@ -154,7 +154,7 @@ s32 func_80C224D8(DmTag* this, PlayState* play) {
break;
case 6:
func_800B7298(play, &this->actor, PLAYER_CSACTION_WAIT);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_WAIT);
play->nextEntrance = ENTRANCE(STOCK_POT_INN, 5);
gSaveContext.nextCutsceneIndex = 0;
play->transitionTrigger = TRANS_TRIGGER_START;
@@ -171,7 +171,7 @@ s32 func_80C224D8(DmTag* this, PlayState* play) {
s32 func_80C227E8(DmTag* this, PlayState* play) {
if (this->unk_1A4 == 0) {
func_800B7298(play, &this->actor, PLAYER_CSACTION_WAIT);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_WAIT);
play->nextEntrance = ENTRANCE(STOCK_POT_INN, 4);
gSaveContext.nextCutsceneIndex = 0;
play->transitionTrigger = TRANS_TRIGGER_START;
src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
+3 -3
View File
@@ -462,7 +462,7 @@ s32 func_808A1478(DoorShutter* this, PlayState* play, f32 arg2) {
}
if ((this->csId != CS_ID_NONE) && (CutsceneManager_GetCurrentCsId() == this->csId)) {
func_800B724C(play, &this->slidingDoor.dyna.actor, PLAYER_CSACTION_1);
Player_SetCsAction(play, &this->slidingDoor.dyna.actor, PLAYER_CSACTION_1);
}
}
@@ -582,7 +582,7 @@ void func_808A1884(DoorShutter* this, PlayState* play) {
if (CutsceneManager_GetCurrentCsId() == CS_ID_GLOBAL_DOOR) {
func_801226E0(play, ((void)0, gSaveContext.respawn[RESPAWN_MODE_DOWN].data));
player->csId = CS_ID_NONE;
func_800B7298(play, NULL, PLAYER_CSACTION_115);
Player_SetCsActionWithHaltedActors(play, NULL, PLAYER_CSACTION_115);
}
}
}
@@ -637,7 +637,7 @@ void func_808A1B48(DoorShutter* this, PlayState* play) {
void func_808A1C50(DoorShutter* this, PlayState* play) {
if (this->unk_167++ > 30) {
if (GET_PLAYER(play)->csAction == PLAYER_CSACTION_115) {
func_800B7298(play, NULL, PLAYER_CSACTION_END);
Player_SetCsActionWithHaltedActors(play, NULL, PLAYER_CSACTION_END);
}
DoorShutter_SetupDoor(this, play);
}
src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
+5 -5
View File
@@ -344,7 +344,7 @@ void func_808B921C(DoorWarp1* this, PlayState* play) {
}
if (func_808B866C(this, play) && !Play_InCsMode(play)) {
func_800B7298(play, &this->dyna.actor, PLAYER_CSACTION_WAIT);
Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, PLAYER_CSACTION_WAIT);
Message_StartTextbox(play, 0xF2, &this->dyna.actor);
DoorWarp1_SetupAction(this, func_808B93A0);
}
@@ -360,14 +360,14 @@ void func_808B93A0(DoorWarp1* this, PlayState* play) {
Message_CloseTextbox(play);
if (play->msgCtx.choiceIndex == 0) {
Audio_PlaySfx_MessageDecide();
func_800B7298(play, &this->dyna.actor, PLAYER_CSACTION_9);
Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, PLAYER_CSACTION_9);
player->unk_3A0.x = this->dyna.actor.world.pos.x;
player->unk_3A0.z = this->dyna.actor.world.pos.z;
this->unk_1CA = 1;
DoorWarp1_SetupAction(this, func_808B9524);
} else {
Audio_PlaySfx_MessageCancel();
func_800B7298(play, &this->dyna.actor, PLAYER_CSACTION_END);
Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, PLAYER_CSACTION_END);
DoorWarp1_SetupAction(this, func_808B94A4);
}
}
@@ -448,7 +448,7 @@ void func_808B977C(DoorWarp1* this, PlayState* play) {
AudioSfx_PlaySfx(NA_SE_EV_LINK_WARP, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
func_800B7298(play, &this->dyna.actor, PLAYER_CSACTION_9);
Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, PLAYER_CSACTION_9);
player->unk_3A0.x = this->dyna.actor.world.pos.x;
player->unk_3A0.z = this->dyna.actor.world.pos.z;
this->unk_1CA = 1;
@@ -602,7 +602,7 @@ void func_808B9F10(DoorWarp1* this, PlayState* play) {
Player* player = GET_PLAYER(play);
Interface_SetHudVisibility(HUD_VISIBILITY_NONE);
func_800B7298(play, &this->dyna.actor, PLAYER_CSACTION_9);
Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, PLAYER_CSACTION_9);
player->unk_3A0.x = this->dyna.actor.world.pos.x;
player->unk_3A0.z = this->dyna.actor.world.pos.z;
this->unk_1CA = 20;
src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c
+1 -1
View File
@@ -448,7 +448,7 @@ void EnAob01_BeforeRace_HandleConversation(EnAob01* this, PlayState* play) {
if (this->stateFlags & ENAOB01_FLAG_PLAYER_CONFIRMED_CHOICE) {
this->stateFlags &= ~ENAOB01_FLAG_PLAYER_CONFIRMED_CHOICE;
Rupees_ChangeBy(-this->rupeesBet);
func_800B7298(play, NULL, PLAYER_CSACTION_WAIT);
Player_SetCsActionWithHaltedActors(play, NULL, PLAYER_CSACTION_WAIT);
play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING;
play->msgCtx.stateTimer = 4;
this->actionFunc = EnAob01_BeforeRace_StartRace;
src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c
+2 -2
View File
@@ -378,7 +378,7 @@ void EnBigokuta_PlayDeathCutscene(EnBigokuta* this, PlayState* play) {
CutsceneManager_Start(this->csId, &this->picto.actor);
if (!CHECK_EVENTINF(EVENTINF_41) && !CHECK_EVENTINF(EVENTINF_35)) {
func_800B724C(play, &this->picto.actor, PLAYER_CSACTION_WAIT);
Player_SetCsAction(play, &this->picto.actor, PLAYER_CSACTION_WAIT);
} else {
player = GET_PLAYER(play);
player->stateFlags1 |= PLAYER_STATE1_20;
@@ -454,7 +454,7 @@ void EnBigokuta_PlayDeathEffects(EnBigokuta* this, PlayState* play) {
Actor_Kill(&this->picto.actor);
if (!CHECK_EVENTINF(EVENTINF_41) && !CHECK_EVENTINF(EVENTINF_35)) {
func_800B724C(play, &this->picto.actor, PLAYER_CSACTION_END);
Player_SetCsAction(play, &this->picto.actor, PLAYER_CSACTION_END);
} else {
Player* player = GET_PLAYER(play);
src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c
+2 -2
View File
@@ -308,7 +308,7 @@ void EnBigpo_SetupSpawnCutscene(EnBigpo* this) {
void EnBigpo_WaitCutsceneQueue(EnBigpo* this, PlayState* play) {
if (CutsceneManager_IsNext(this->actor.csId)) {
CutsceneManager_Start(this->actor.csId, &this->actor);
func_800B724C(play, &this->actor, PLAYER_CSACTION_WAIT);
Player_SetCsAction(play, &this->actor, PLAYER_CSACTION_WAIT);
this->subCamId = CutsceneManager_GetCurrentSubCamId(this->actor.csId);
if (this->actor.params == BIG_POE_TYPE_REGULAR) { // and SUMMONED, got switched earlier
EnBigpo_SpawnCutsceneStage1(this, play);
@@ -478,7 +478,7 @@ void EnBigpo_SpawnCutsceneStage8(EnBigpo* this, PlayState* play) {
} else { // BIG_POE_TYPE_REGULAR
CutsceneManager_Stop(this->actor.csId);
}
func_800B724C(play, &this->actor, PLAYER_CSACTION_END);
Player_SetCsAction(play, &this->actor, PLAYER_CSACTION_END);
EnBigpo_SetupIdleFlying(this); // setup idle flying
}
}
src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
+5 -5
View File
@@ -850,7 +850,7 @@ void EnBigslime_EndCutscene(EnBigslime* this, PlayState* play) {
this->subCamId = SUB_CAM_ID_DONE;
CutsceneManager_Stop(this->csId);
this->csId = CutsceneManager_GetAdditionalCsId(this->actor.csId);
func_800B724C(play, &this->actor, PLAYER_CSACTION_END);
Player_SetCsAction(play, &this->actor, PLAYER_CSACTION_END);
}
}
@@ -939,7 +939,7 @@ void EnBigslime_SetupCutsceneStartBattle(EnBigslime* this, PlayState* play) {
this->bigslimeCollider[0].base.acFlags &= ~AC_ON;
Math_Vec3f_Copy(&subCam->at, &this->actor.focus.pos);
func_800B7298(play, &this->actor, PLAYER_CSACTION_4);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_4);
player->actor.shape.rot.y = this->actor.yawTowardsPlayer + 0x8000;
player->actor.world.pos.x = Math_SinS(this->actor.yawTowardsPlayer) * 347.0f + this->actor.world.pos.x;
@@ -987,7 +987,7 @@ void EnBigslime_SetupCallMinislime(EnBigslime* this, PlayState* play) {
Animation_MorphToPlayOnce(&this->skelAnime, &gGekkoCallAnim, 5.0f);
EnBigslime_GekkoSfxOutsideBigslime(this, NA_SE_EN_FROG_GREET);
this->callTimer = 0;
func_800B7298(play, &this->actor, PLAYER_CSACTION_WAIT);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_WAIT);
this->actionFunc = EnBigslime_CallMinislime;
}
@@ -1011,7 +1011,7 @@ void EnBigslime_CallMinislime(EnBigslime* this, PlayState* play) {
EnBigslime_InitFallMinislime(this);
play->envCtx.lightSettingOverride = LIGHT_SETTING_OVERRIDE_NONE;
this->callTimer = 35;
func_800B7298(play, &this->actor, PLAYER_CSACTION_4);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_4);
}
}
@@ -2546,7 +2546,7 @@ void EnBigslime_PlayCutscene(EnBigslime* this, PlayState* play) {
} else if (CutsceneManager_IsNext(this->csId)) {
CutsceneManager_Start(this->csId, &this->actor);
if (this->actionFuncStored != EnBigslime_SquishFlat) {
func_800B724C(play, &this->actor, PLAYER_CSACTION_WAIT);
Player_SetCsAction(play, &this->actor, PLAYER_CSACTION_WAIT);
}
this->subCamId = CutsceneManager_GetCurrentSubCamId(this->csId);
src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
+3 -3
View File
@@ -427,7 +427,7 @@ void func_809C5310(EnBomBowlMan* this, PlayState* play) {
if (player->actor.world.pos.x < 1510.0f) {
if (player->transformation != PLAYER_FORM_DEKU) {
if (this->actor.xzDistToPlayer < this->unk_2C8) {
func_800B7298(play, &this->actor, PLAYER_CSACTION_WAIT);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_WAIT);
func_809C53A4(this);
}
} else {
@@ -485,7 +485,7 @@ void func_809C5598(EnBomBowlMan* this, PlayState* play) {
} else if (this->actor.textId == 0x734) {
this->actor.textId = 0x715;
} else if (this->actor.textId == 0x715) {
func_800B7298(play, &this->actor, PLAYER_CSACTION_END);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_END);
EnBomBowlMan_ChangeAnim(this, ENBOMBOWLMAN_ANIM_17, 1.0f);
func_809C59A4(this, play);
return;
@@ -497,7 +497,7 @@ void func_809C5598(EnBomBowlMan* this, PlayState* play) {
Message_BombersNotebookQueueEvent(play, BOMBERS_NOTEBOOK_EVENT_LEARNED_SECRET_CODE);
Message_BombersNotebookQueueEvent(play, BOMBERS_NOTEBOOK_EVENT_RECEIVED_BOMBERS_NOTEBOOK);
Message_BombersNotebookQueueEvent(play, BOMBERS_NOTEBOOK_EVENT_MET_BOMBERS);
func_800B7298(play, &this->actor, PLAYER_CSACTION_WAIT);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_WAIT);
this->actionFunc = func_809C5738;
return;
}

Some files were not shown because too many files have changed in this diff Show More