mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 06:21:16 +00:00
Code Issues Projects Releases Wiki Activity

Player Docs: public facing csAction things (#1561)

Browse source 
* name public csAction functions

* format

* adjust function comment

* format
This commit is contained in:
fig02 2023-10-28 07:46:24 -04:00 • committed by GitHub
parent 3475651701
commit 4908b8b37c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
64 changed files with 359 additions and 317 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
View file

@ -269,7 +269,7 @@ void BossDodongo_IntroCutscene(BossDodongo* this, PlayState* play) {
break;
case 1:
Cutscene_StartManual(play, &play->csCtx);
func_8002DF54(play, &this->actor, PLAYER_CSACTION_1);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_1);
Play_ClearAllSubCameras(play);
this->subCamId = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STAT_WAIT);
@ -297,11 +297,11 @@ void BossDodongo_IntroCutscene(BossDodongo* this, PlayState* play) {
}
if (this->unk_198 == 110) {
func_8002DF54(play, &this->actor, PLAYER_CSACTION_9);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_9);
}
if (this->unk_198 == 5) {
func_8002DF54(play, &this->actor, PLAYER_CSACTION_12);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_12);
}
if (this->unk_198 < 6) {
@ -416,7 +416,7 @@ void BossDodongo_IntroCutscene(BossDodongo* this, PlayState* play) {
Play_ReturnToMainCam(play, this->subCamId, 0);
this->subCamId = SUB_CAM_ID_DONE;
Cutscene_StopManual(play, &play->csCtx);
func_8002DF54(play, &this->actor, PLAYER_CSACTION_7);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_7);
BossDodongo_SetupWalk(this);
this->unk_1DA = 50;
this->unk_1BC = 0;
@ -1302,7 +1302,7 @@ void BossDodongo_DeathCutscene(BossDodongo* this, PlayState* play) {
case 0:
this->csState = 5;
Cutscene_StartManual(play, &play->csCtx);
func_8002DF54(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_STAT_UNK3);
Play_ChangeCameraStatus(play, this->subCamId, CAM_STAT_ACTIVE);
@ -1612,7 +1612,7 @@ void BossDodongo_DeathCutscene(BossDodongo* this, PlayState* play) {
this->csState = 100;
Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STAT_ACTIVE);
Cutscene_StopManual(play, &play->csCtx);
func_8002DF54(play, &this->actor, PLAYER_CSACTION_7);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_7);
Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, -890.0f, -1523.76f, -3304.0f,
0, 0, 0, WARP_DUNGEON_CHILD);
this->skelAnime.playSpeed = 0.0f;