From f7db8868d04a1e3cd0a2c3343a9def5a95f8c481 Mon Sep 17 00:00:00 2001 From: aMannus Date: Thu, 14 Jul 2022 04:04:19 +0200 Subject: [PATCH] Skip warp song cutscenes in rando (#664) Does it by skipping to the last part of the cutscene data. Tested on all songs, both adult and child. --- soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index 32eab2b64..b365b3038 100644 --- a/soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -788,7 +788,14 @@ void DemoKankyo_DrawWarpSparkles(Actor* thisx, GlobalContext* globalCtx) { this->unk_150[i].unk_0.y = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f22); this->unk_150[i].unk_0.z = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f22); this->unk_150[i].unk_23 = 0; - this->unk_150[i].unk_22++; + + // Skip the first part of warp song cutscenes in rando + if (gSaveContext.n64ddFlag && this->actor.params == DEMOKANKYO_WARP_OUT) { + this->unk_150[i].unk_22 = 2; + } else { + this->unk_150[i].unk_22++; + } + case 1: if (this->actor.params == DEMOKANKYO_WARP_OUT) { if (func_800BB2B4(&camPos, &sWarpRoll, &sWarpFoV, sWarpOutCameraPoints, &this->unk_150[i].unk_20,