mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00
Code Issues Projects Releases Wiki Activity

Document Sequence Cutscene Effects (Sequence 109) (#1246)

Browse source 
* Seq 109 docs

* Fix

* Reorder function name
This commit is contained in:
engineer124 2022-06-02 17:49:10 +10:00 • committed by GitHub
parent fa1ea37d54
commit 0a95d17aa8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 42 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
View file

@ -227,7 +227,7 @@ void func_80966E98(Demo6K* this, PlayState* play) {
}
if (play->csCtx.frames == 342) {
func_800F3F3C(2);
Audio_PlayCutsceneEffectsSequence(SEQ_CS_EFFECTS_SAGE_SEAL);
}
if (this->timer1 == 39) {

8
src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
View file

@ -716,7 +716,7 @@ void DemoEffect_InitTimeWarp(DemoEffect* this, PlayState* play) {
void DemoEffect_UpdateTimeWarpPullMasterSword(DemoEffect* this, PlayState* play) {
if (Flags_GetEnv(play, 1)) {
if (!(this->effectFlags & 0x2)) {
func_800F3F3C(0);
Audio_PlayCutsceneEffectsSequence(SEQ_CS_EFFECTS_SWORD_GLOW);
this->effectFlags |= 0x2;
}
@ -879,7 +879,7 @@ void DemoEffect_UpdateLightRingShrinking(DemoEffect* this, PlayState* play) {
}
if (this->lightRing.timer == 255) {
func_800F3F3C(5);
Audio_PlayCutsceneEffectsSequence(SEQ_CS_EFFECTS_DIN_MAGIC);
}
}
@ -1232,7 +1232,7 @@ void DemoEffect_UpdateGodLgtNayru(DemoEffect* this, PlayState* play) {
Audio_PlayActorSound2(&this->actor, NA_SE_IT_DM_FLYING_GOD_DASH);
}
if (play->csCtx.frames == 80) {
func_800F3F3C(4);
Audio_PlayCutsceneEffectsSequence(SEQ_CS_EFFECTS_NAYRU_MAGIC);
}
}
}
@ -1262,7 +1262,7 @@ void DemoEffect_UpdateGodLgtFarore(DemoEffect* this, PlayState* play) {
}
Audio_PlayActorSound2(&this->actor, NA_SE_IT_DM_FLYING_GOD_DASH);
func_800F3F3C(3);
Audio_PlayCutsceneEffectsSequence(SEQ_CS_EFFECTS_FARORE_MAGIC);
}
if (gSaveContext.entranceIndex == ENTR_HIRAL_DEMO_0) {

2
src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c
View file

@ -487,7 +487,7 @@ void func_8097EF00(DemoGt* this, PlayState* play) {
u16 frames = play->csCtx.frames;
if (frames == 527) {
func_800F3F3C(13);
Audio_PlayCutsceneEffectsSequence(SEQ_CS_EFFECTS_TOWER_COLLAPSE);
}
}

4
src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
View file

@ -161,7 +161,7 @@ void DemoKekkai_TowerBarrier(DemoKekkai* this, PlayState* play) {
if ((play->csCtx.state != CS_STATE_IDLE) && (play->csCtx.npcActions[0] != NULL) &&
(play->csCtx.npcActions[0]->action != 1) && (play->csCtx.npcActions[0]->action == 2)) {
if (!(this->sfxFlag & 1)) {
func_800F3F3C(0xC);
Audio_PlayCutsceneEffectsSequence(SEQ_CS_EFFECTS_DISPEL_BARRIER);
this->sfxFlag |= 1;
}
if (this->barrierScrollRate < 7.0f) {
@ -208,7 +208,7 @@ void DemoKekkai_TrialBarrierDispel(Actor* thisx, PlayState* play) {
DemoKekkai* this = (DemoKekkai*)thisx;
if (play->csCtx.frames == csFrames[this->actor.params]) {
func_800F3F3C(0xA);
Audio_PlayCutsceneEffectsSequence(SEQ_CS_EFFECTS_TRIAL_WARP);
}
if (this->energyAlpha >= 0.05f) {
this->energyAlpha -= 0.05f;

4
src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c
View file

@ -50,10 +50,10 @@ void func_80991298(DemoShd* this, PlayState* play) {
if ((play->csCtx.state != CS_STATE_IDLE && play->csCtx.npcActions[0] != NULL) ||
(play->csCtx.state != CS_STATE_IDLE && play->csCtx.npcActions[1] != NULL)) {
if (play->csCtx.frames == 800) {
func_800F3F3C(9);
Audio_PlayCutsceneEffectsSequence(SEQ_CS_EFFECTS_BONGO_EMERGES);
}
if (play->csCtx.frames == 1069) {
func_800F3F3C(8);
Audio_PlayCutsceneEffectsSequence(SEQ_CS_EFFECTS_BONGO_HOVER);
}
}

2
src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c
View file

@ -78,7 +78,7 @@ void EfcErupc_UpdateAction(EfcErupc* this, PlayState* play) {
switch (play->csCtx.npcActions[2]->action) {
case 2:
if (this->unk_14E == 0) {
func_800F3F3C(6);
Audio_PlayCutsceneEffectsSequence(SEQ_CS_EFFECTS_LAVA_ERUPT);
SET_EVENTCHKINF(EVENTCHKINF_2F);
}
this->unk_14E++;

4
src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
View file

@ -131,13 +131,13 @@ static u16 sBgmList[] = {
NA_BGM_SHADOW_TEMPLE,
NA_BGM_WATER_TEMPLE,
NA_BGM_BRIDGE_TO_GANONS,
NA_BGM_VARIOUS_SFX,
NA_BGM_CUTSCENE_EFFECTS,
NA_BGM_OCARINA_OF_TIME,
NA_BGM_OCARINA_OF_TIME,
NA_BGM_GERUDO_VALLEY,
NA_BGM_POTION_SHOP,
NA_BGM_KOTAKE_KOUME,
NA_BGM_VARIOUS_SFX,
NA_BGM_CUTSCENE_EFFECTS,
NA_BGM_ESCAPE,
NA_BGM_UNDERGROUND,
NA_BGM_GANONDORF_BOSS,

4
src/overlays/actors/ovl_En_Xc/z_en_xc.c
View file

@ -1522,7 +1522,7 @@ void func_80B3FA08(EnXc* this, PlayState* play) {
}
void func_80B3FA2C(void) {
func_800F3F3C(1);
Audio_PlayCutsceneEffectsSequence(SEQ_CS_EFFECTS_SHEIK_TRANSFORM);
}
void EnXc_PlayTriforceSFX(Actor* thisx, PlayState* play) {
@ -1759,7 +1759,7 @@ void EnXc_SetThrownAroundSFX(EnXc* this) {
void EnXc_PlayLinkScreamSFX(EnXc* this, PlayState* play) {
if (play->csCtx.frames == 1455) {
func_800F3F3C(7);
Audio_PlayCutsceneEffectsSequence(SEQ_CS_EFFECTS_BONGO_HURL_LINK);
}
}

2
src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
View file

@ -883,7 +883,7 @@ void ObjectKankyo_Beams(ObjectKankyo* this, PlayState* play) {
for (i = 0; i < 6; i++) {
if (play->csCtx.npcActions[i + 1] != NULL && play->csCtx.npcActions[i + 1]->action == 2) {
if (this->effects[i].size == 0.1f) {
func_800F3F3C(11);
Audio_PlayCutsceneEffectsSequence(SEQ_CS_EFFECTS_TRIAL_DESTROY);
}
Math_ApproachZeroF(&this->effects[i].size, 0.1f, 0.1f);
}