mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-09 13:45:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Setup for Player Cutscene Docs (#1270)

Browse Source 
* player cs docs setup

* more docs

* more docs

* missed enums

* more docs, but broken. Need to fix sPlayerCsModeAnimFuncs

* fix

* rm enum

* more minor docs

* PR suggestion

* typo

* csActionFunc

* PR Suggestion

* fix bss

* fix bss
This commit is contained in:
engineer124
2023-06-25 22:33:22 +10:00
committed by GitHub
parent 21655f31c5
commit 541199888c
15 changed files with 907 additions and 789 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_actor.c
+7 -5
View File
@@ -1370,7 +1370,8 @@ void Actor_MountHorse(PlayState* play, Player* player, Actor* horse) {
}
s32 func_800B7200(Player* player) {
return (player->stateFlags1 & (PLAYER_STATE1_80 | PLAYER_STATE1_20000000)) || (player->csMode != PLAYER_CSMODE_0);
return (player->stateFlags1 & (PLAYER_STATE1_80 | PLAYER_STATE1_20000000)) ||
(player->csMode != PLAYER_CSMODE_NONE);
}
void Actor_SpawnHorse(PlayState* play, Player* player) {
@@ -1380,13 +1381,14 @@ void Actor_SpawnHorse(PlayState* play, Player* player) {
s32 func_800B724C(PlayState* play, Actor* actor, u8 csMode) {
Player* player = GET_PLAYER(play);
if ((player->csMode == PLAYER_CSMODE_5) || ((csMode == PLAYER_CSMODE_END) && (player->csMode == PLAYER_CSMODE_0))) {
if ((player->csMode == PLAYER_CSMODE_5) ||
((csMode == PLAYER_CSMODE_END) && (player->csMode == PLAYER_CSMODE_NONE))) {
return false;
}
player->csMode = csMode;
player->unk_398 = actor;
player->doorBgCamIndex = 0;
player->csActor = actor;
player->unk_3BA = false;
return true;
}
@@ -1394,7 +1396,7 @@ s32 func_800B7298(PlayState* play, Actor* actor, u8 csMode) {
Player* player = GET_PLAYER(play);
if (func_800B724C(play, actor, csMode)) {
player->doorBgCamIndex = 1;
player->unk_3BA = true;
return true;
}
return false;
src/code/z_demo.c
+1 -1
View File
@@ -43,7 +43,7 @@ void Cutscene_InitContext(PlayState* play, CutsceneContext* csCtx) {
sCueTypeList[i] = 0;
}
gDisablePlayerCsModeStartPos = 0;
gDisablePlayerCsModeStartPos = false;
Audio_SetCutsceneFlag(false);
}
src/code/z_eventmgr.c
+3 -3
View File
@@ -204,7 +204,7 @@ void CutsceneManager_End(void) {
sCutsceneMgr.targetActor->flags &= ~ACTOR_FLAG_100000;
// fallthrough
case CS_START_1:
func_800B7298(sCutsceneMgr.play, 0, PLAYER_CSMODE_END);
func_800B7298(sCutsceneMgr.play, NULL, PLAYER_CSMODE_END);
sCutsceneMgr.startMethod = CS_START_0;
break;
@@ -335,7 +335,7 @@ s16 CutsceneManager_StartWithPlayerCs(s16 csId, Actor* actor) {
s16 startCsId = CutsceneManager_Start(csId, actor);
if (startCsId >= 0) {
func_800B7298(sCutsceneMgr.play, 0, PLAYER_CSMODE_WAIT);
func_800B7298(sCutsceneMgr.play, NULL, PLAYER_CSMODE_WAIT);
if (sCutsceneMgr.length == 0) {
CutsceneManager_Stop(sCutsceneMgr.csId);
}
@@ -351,7 +351,7 @@ s16 CutsceneManager_StartWithPlayerCsAndSetFlag(s16 csId, Actor* actor) {
s16 startCsId = CutsceneManager_Start(csId, actor);
if (startCsId >= 0) {
func_800B7298(sCutsceneMgr.play, 0, PLAYER_CSMODE_WAIT);
func_800B7298(sCutsceneMgr.play, NULL, PLAYER_CSMODE_WAIT);
if (sCutsceneMgr.length == 0) {
CutsceneManager_Stop(sCutsceneMgr.csId);
}
src/code/z_player_lib.c
+1 -1
View File
@@ -495,7 +495,7 @@ void func_80123140(PlayState* play, Player* player) {
s32 Player_InBlockingCsMode(PlayState* play, Player* player) {
return (player->stateFlags1 & (PLAYER_STATE1_80 | PLAYER_STATE1_200 | PLAYER_STATE1_20000000)) ||
(player->csMode != PLAYER_CSMODE_0) || (play->transitionTrigger == TRANS_TRIGGER_START) ||
(player->csMode != PLAYER_CSMODE_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);
}