[Vanilla Fix] Slow Down Darunia's Dance #3438
Conversation
…factors, partially successful.
Malkierian
changed the title
| { &gDaruniaDancingLoop1Anim, 0.78f, 0.0f, -1.0f, ANIMMODE_ONCE, -10.0f }, // | ||
| { &gDaruniaDancingLoop1Anim, 0.77f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f }, // hop | ||
| { &gDaruniaDancingLoop2Anim, 0.78f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f }, // from hop to spin | ||
| { &gDaruniaDancingLoop3Anim, 0.77f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f }, // spin | ||
| { NULL }, | ||
| { NULL }, | ||
| { &gDaruniaDancingLoop4Anim, 0.78f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f }, // from spin to hop |
There was a problem hiding this comment.
These 0.77 and 0.78 feel arbitrary.
I believe someone said that the animation key frames were adjusted on PAL to account for the 50hz vs 60hz difference so that it stayed in sync with the music,
From my understanding PAL ran at 17 fps instead of the true 20 (16.67 rounded up from 20 * (50/60))
Based on that, I believe these values should all either be:
0.85 (derived from 17/20), or
0.8333... (derived from 50/60)
There was a problem hiding this comment.
But could the n64 run the cutscene at full speed? I know the frog game timing is a hardware slowdown not existing on the port issue
There was a problem hiding this comment.
Yeah, this is working against both the PAL adjustment and the lag timing, I believe. I had tried .85 ish before and it was still too fast.
There was a problem hiding this comment.
Fair, I wasn't aware of any lag due to original hardware. In my testing it is hard to really tell the exact speed it should be anyways, so it seemed fine to me 🤷♂️
Then maybe just add a TODO comment to come back when NTSC is added so we don't forget.
There was a problem hiding this comment.
It's a little easier for someone like me who might have had more extensive experience and training in music XD
| @@ -255,7 +275,13 @@ void func_809FE040(EnDu* this) { | |||
| if (this->unk_1E6 >= 8) { | |||
| this->unk_1E6 = 0; | |||
| } | |||
| Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, animationIndices[this->unk_1E6]); | |||
| // #region SOH[Enhancement] | |||
| if (CVarGetInteger("gEnhancements.FixDaruniaDanceSpeed", 1)) { | |||
There was a problem hiding this comment.
We only support PAL, but we should probably add a PAL check here so that in the future when NTSC is added, this fix wont be applied.
You can do that with the following (ref z_file_nameset_PAL.c:707)
ResourceMgr_GetGameRegion(ResourceMgr_GameHasMasterQuest() && ResourceMgr_GameHasOriginal()) == GAME_REGION_PAL
Where it will read the region value of either the first rom if only one rom is applied, or the second rom if two roms are applied.
There was a problem hiding this comment.
Considering the rest of the convo, NTSC will likely need a different set of adjustments, because of lag still existing, but yeah, the check could still be there. Honestly, I'm hoping for a better method by the time NTSC support comes around XD
| @@ -271,7 +297,13 @@ void func_809FE104(EnDu* this) { | |||
| if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { | |||
| this->unk_1E6++; | |||
| if (this->unk_1E6 < 4) { | |||
| Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, animationIndices[this->unk_1E6]); | |||
| // #region SOH[Enhancement] | |||
| if (CVarGetInteger("gEnhancements.FixDaruniaDanceSpeed", 1) && this->unk_1E6 <= 1) { | |||
| @@ -1064,6 +1064,9 @@ void DrawEnhancementsMenu() { | |||
| UIWidgets::Tooltip("Prevents immediately falling off climbable surfaces if climbing on the edges."); | |||
| UIWidgets::PaddedEnhancementCheckbox("Fix Link's eyes open while sleeping", "gFixEyesOpenWhileSleeping", true, false); | |||
| UIWidgets::Tooltip("Fixes Link's eyes being open in the opening cutscene when he is supposed to be sleeping."); | |||
| UIWidgets::PaddedEnhancementCheckbox("Fix Darunia dancing too fast", "gEnhancements.FixDaruniaDanceSpeed", | |||
| true, false, false, "", UIWidgets::CheckboxGraphics::Cross, true); | |||
| UIWidgets::Tooltip("Fixes Darunia's dancing speed so he dances to the beat of Saria's Song, like in vanilla."); | |||
There was a problem hiding this comment.
Probably should mention that this would only apply to PAL.
There was a problem hiding this comment.
I think that would only lead to confusion as long as we don't support NTSC.
hardwarehttps://youtu.be/HRY_9u2CTO0?t=11148 SoH 8.0.2charliedancescaled.mp4This PRmalkdancescaled.mp4 |
* Fix Darunia's dancing animation speed (static for now; needs toggle later). * Moved previous code to toggleable fix in enhancements. Tweaked speed factors, partially successful.
This adds a fix enhancement to slow down Darunia's dance during Saria's Song. Defaults to on.
Known issue: while the values used make the dance virtually perfectly synced during the cutscene, as soon as you get to the last textbox and let it sit instead of closing the box, the dance desyncs within 2 loops. Honestly don't know how that's happening. Figure most people won't be looking past that box very long, so it might still be mergeable.
Next PR work: timing of camera and textbox changes (I tried for 2 hours and just couldn't figure it out XD).
Build Artifacts