mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes Restore Old GS Cutscene to only trigger on Gold Skulltulas. (#1529)

This commit is contained in:
Christopher Leggett 2022-09-20 21:11:10 -04:00 committed by GitHub
parent 98be9a8472
commit d2153d601c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
soh/src/overlays/actors/ovl_En_Sw/z_en_sw.c
View File

@ -331,11 +331,11 @@ s32 func_80B0C9F0(EnSw* this, GlobalContext* globalCtx) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALTU_DAMAGE); Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALTU_DAMAGE);
return true; return true;
} }
if(CVar_GetS32("gGsCutscene", 0)) {
OnePointCutscene_Init(globalCtx, 2200, 90, &this->actor, MAIN_CAM);
}
Enemy_StartFinishingBlow(globalCtx, &this->actor); Enemy_StartFinishingBlow(globalCtx, &this->actor);
if (((this->actor.params & 0xE000) >> 0xD) != 0) { if (((this->actor.params & 0xE000) >> 0xD) != 0) {
if (CVar_GetS32("gGsCutscene", 0)) {
OnePointCutscene_Init(globalCtx, 2200, 90, &this->actor, MAIN_CAM);
}
this->skelAnime.playSpeed = 8.0f; this->skelAnime.playSpeed = 8.0f;
if ((globalCtx->state.frames & 1) == 0) { if ((globalCtx->state.frames & 1) == 0) {
this->unk_420 = 0.1f; this->unk_420 = 0.1f;