Skip to content

Conversation

@OtherBlue
Copy link
Contributor

@OtherBlue OtherBlue commented Jan 6, 2026

Fixes the deku butler's animation that loops incorrectly in the cutscene that plays when you free the deku princess.

Broken animation:

dekuButlerBrokenfocus.mp4

Fixed:

dekuButler.mp4

Build Artifacts

Copy link
Contributor

@mckinlee mckinlee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So glad you're back! Got some change requests for ya if you will.

@OtherBlue OtherBlue marked this pull request as draft January 6, 2026 21:44
@OtherBlue
Copy link
Contributor Author

aight, switching to a draft while I figure out if I rebased correctly

@OtherBlue OtherBlue changed the base branch from develop-mion to develop January 6, 2026 22:45
@OtherBlue OtherBlue marked this pull request as ready for review January 6, 2026 22:46
@OtherBlue
Copy link
Contributor Author

everything should be ok now

Copy link
Contributor

@mckinlee mckinlee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome! It does look like some changes to the libultraship submodule came through when you rebased though.. I also have a few other suggestions. I'm curious what everyone might think on the name change in particular. Other than that, this is looking good.

Comment on lines +253 to +254
// - `this->animIndex == EN_DNO_ANIM_SHOCK_LOOP` (bool)
VB_DEKU_BUTLER_FIX_SHOCK_ANIM,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking the name should be a bit more descriptive of what the vanilla behavior is. It also might be a good idea to make the comments regarding args more specific. This also needs to be moved since its not in alphabetical order.

Suggested change
// - `this->animIndex == EN_DNO_ANIM_SHOCK_LOOP` (bool)
VB_DEKU_BUTLER_FIX_SHOCK_ANIM,
// - `*EnDno` (this)
// - `*u8` (changeAnim)
VB_DEKU_BUTLER_CHANGE_SHOCK_ANIMATION,

@Eblo
Copy link
Contributor

Eblo commented Jan 8, 2026

I'm curious why there's a LUS commit change in here. The commit hashes are different, but the contents are identical. Was that intentional?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants