github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-07-30 03:28:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix credits timing (#1254)

Browse source 
* Fix credits timing

* Add documentation

* Fix typo
This commit is contained in:
Josh Bodner 2022-11-18 15:42:58 -08:00 • committed by GitHub
parent d141876af4
commit 2c0ec96eff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

49
soh/src/code/z_demo.c
View file

@ -511,7 +511,54 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
temp = 1;
}
if ((csCtx->frames == cmd->startFrame) || (temp != 0) || ((csCtx->frames > 20) && (randoCsSkip || debugCsSkip))) {
bool playCutscene = false;
if (!CVar_GetS32("gCreditsFix", 1) && (cmd->startFrame == csCtx->frames)) {
playCutscene = true;
} else if (CVar_GetS32("gCreditsFix", 1)) {
u16 delay = 0;
// HACK: Align visual timing with audio during credits sequence
switch (cmd->base) {
case 55: // Gerudo fortress (second scene of credits roll)
delay = 20;
break;
case 56: // Kakariko village
delay = 40;
break;
case 57: // Death mountain trail
delay = 20;
break;
case 58: // Goron city
delay = 20;
break;
case 59: // Lake hylia
delay = 20;
break;
case 62: // Kokiri forest (houses)
delay = 40;
break;
case 63: // Kokiri forest (deku tree)
delay = 40;
break;
case 74: // First gorons dancing
delay = 100;
break;
case 75: // Magic carpet guy and old shop keepers
delay = 180;
break;
case 77: // Sad mido and king zora (plays after scene 78)
delay = 100;
break;
case 78: // Second gorons dancing
delay = 160;
break;
}
if (cmd->startFrame + delay == csCtx->frames) {
playCutscene = true;
}
}
if (playCutscene || (temp != 0) || ((csCtx->frames > 20) && (randoCsSkip || debugCsSkip))) {
csCtx->state = CS_STATE_UNSKIPPABLE_EXEC;
Audio_SetCutsceneFlag(0);