actual last one

someone2639 · someone2639 · commit 978fbda4084d · 2024-12-28T19:41:19.000-05:00
diff --git a/src/game/mario_actions_moving.c b/src/game/mario_actions_moving.c
@@ -1965,7 +1965,7 @@ s32 check_common_moving_cancels(struct MarioState *m) {
 }
 
 s32 mario_execute_moving_action(struct MarioState *m) {
-    s32 cancel = FALSE;
+    s32 cancel = ACTION_FINISH;
 
     if (check_common_moving_cancels(m)) {
         return ACTION_CONTINUE;
diff --git a/src/game/mario_actions_stationary.c b/src/game/mario_actions_stationary.c
@@ -1129,7 +1129,7 @@ s32 mario_execute_stationary_action(struct MarioState *m) {
         case ACT_BRAKING_STOP:            cancel = act_braking_stop(m);                     break;
         case ACT_BUTT_SLIDE_STOP:         cancel = act_butt_slide_stop(m);                  break;
         case ACT_HOLD_BUTT_SLIDE_STOP:    cancel = act_hold_butt_slide_stop(m);             break;
-        default:                          cancel = TRUE;                                    break;
+        default:                          cancel = ACTION_CONTINUE;                                    break;
     }
     /* clang-format on */
 

Original file line number	Diff line number	Diff line change
`@@ -1965,7 +1965,7 @@ s32 check_common_moving_cancels(struct MarioState *m) {`
`1965`	`1965`	`}`
`1966`	`1966`
`1967`	`1967`	`s32 mario_execute_moving_action(struct MarioState *m) {`
`1968`		`- s32 cancel = FALSE;`
	`1968`	`+ s32 cancel = ACTION_FINISH;`
`1969`	`1969`
`1970`	`1970`	`if (check_common_moving_cancels(m)) {`
`1971`	`1971`	`return ACTION_CONTINUE;`
Original file line number	Diff line number	Diff line change
`@@ -1129,7 +1129,7 @@ s32 mario_execute_stationary_action(struct MarioState *m) {`
`1129`	`1129`	`case ACT_BRAKING_STOP: cancel = act_braking_stop(m); break;`
`1130`	`1130`	`case ACT_BUTT_SLIDE_STOP: cancel = act_butt_slide_stop(m); break;`
`1131`	`1131`	`case ACT_HOLD_BUTT_SLIDE_STOP: cancel = act_hold_butt_slide_stop(m); break;`
`1132`		`- default: cancel = TRUE; break;`
	`1132`	`+ default: cancel = ACTION_CONTINUE; break;`
`1133`	`1133`	`}`
`1134`	`1134`	`/* clang-format on */`
`1135`	`1135`