diff --git a/src/game/mario_actions_airborne.c b/src/game/mario_actions_airborne.c index cbaf53ac4..1af70f6a2 100644 --- a/src/game/mario_actions_airborne.c +++ b/src/game/mario_actions_airborne.c @@ -1820,7 +1820,9 @@ s32 act_flying(struct MarioState *m) { if (is_anim_at_end(m)) { if (m->actionArg == 2) { - load_level_init_text(0); + if (m == &gMarioStates[0]) { + load_level_init_text(0); + } m->actionArg = 1; } diff --git a/src/game/mario_actions_cutscene.c b/src/game/mario_actions_cutscene.c index 375dc848b..8665e96a8 100644 --- a/src/game/mario_actions_cutscene.c +++ b/src/game/mario_actions_cutscene.c @@ -1113,7 +1113,9 @@ s32 act_emerge_from_pipe(struct MarioState *m) { s32 act_spawn_spin_airborne(struct MarioState *m) { // entered water, exit action if (m->pos[1] < m->waterLevel - 100) { - load_level_init_text(0); + if (m == &gMarioStates[0]) { + load_level_init_text(0); + } return set_water_plunge_action(m); } @@ -1146,7 +1148,9 @@ s32 act_spawn_spin_landing(struct MarioState *m) { stop_and_set_height_to_floor(m); set_mario_animation(m, MARIO_ANIM_GENERAL_LAND); if (is_anim_at_end(m)) { - load_level_init_text(0); + if (m == &gMarioStates[0]) { + load_level_init_text(0); + } set_mario_action(m, ACT_IDLE, 0); } return FALSE; @@ -1383,7 +1387,9 @@ s32 act_spawn_no_spin_landing(struct MarioState *m) { set_mario_animation(m, MARIO_ANIM_GENERAL_LAND); stop_and_set_height_to_floor(m); if (is_anim_at_end(m)) { - load_level_init_text(0); + if (m == &gMarioStates[0]) { + load_level_init_text(0); + } set_mario_action(m, ACT_IDLE, 0); } return FALSE; diff --git a/src/game/mario_actions_stationary.c b/src/game/mario_actions_stationary.c index ebaa260a7..2e0c3fca5 100644 --- a/src/game/mario_actions_stationary.c +++ b/src/game/mario_actions_stationary.c @@ -1114,7 +1114,9 @@ s32 check_common_stationary_cancels(struct MarioState *m) { if (m->pos[1] < m->waterLevel - 100) { if (m->action == ACT_SPAWN_SPIN_LANDING) { - load_level_init_text(0); + if (m == &gMarioStates[0]) { + load_level_init_text(0); + } } update_mario_sound_and_camera(m); return set_water_plunge_action(m);