Fix roll out of fancy jump not working out of roll jump

Neirn · Neirn · commit 3f1b3d205633 · 2025-05-13T22:23:47.000-07:00
diff --git a/src/fancy_jumps.c b/src/fancy_jumps.c
@@ -105,7 +105,7 @@ void onJumpEnd(PlayState *play, Player *this) {
     if (recomp_get_config_u32("allow_roll_after_fancy_jump") == MOD_OPT_ALWAYS_ALLOW_ROLL) {
         if (this->transformation != PLAYER_FORM_DEKU) {
             LinkAnimationHeader *animation = this->skelAnime.animation;
-            if (animation == &gPlayerAnim_link_normal_newside_jump_20f || animation == &gPlayerAnim_link_normal_newside_jump_20f) {
+            if (animation == &gPlayerAnim_link_normal_newside_jump_20f || animation == &gPlayerAnim_link_normal_newroll_jump_20f) {
                 if (shouldRollAfterJump(this)) {
                     player->stateFlags2 &= ~PLAYER_STATE2_80000;
                 }

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ void onJumpEnd(PlayState play, Player this) {`
`105`	`105`	`if (recomp_get_config_u32("allow_roll_after_fancy_jump") == MOD_OPT_ALWAYS_ALLOW_ROLL) {`
`106`	`106`	`if (this->transformation != PLAYER_FORM_DEKU) {`
`107`	`107`	`LinkAnimationHeader *animation = this->skelAnime.animation;`
`108`		`- if (animation == &gPlayerAnim_link_normal_newside_jump_20f \|\| animation == &gPlayerAnim_link_normal_newside_jump_20f) {`
	`108`	`+ if (animation == &gPlayerAnim_link_normal_newside_jump_20f \|\| animation == &gPlayerAnim_link_normal_newroll_jump_20f) {`
`109`	`109`	`if (shouldRollAfterJump(this)) {`
`110`	`110`	`player->stateFlags2 &= ~PLAYER_STATE2_80000;`
`111`	`111`	`}`