diff --git a/mods/sm74/main.lua b/mods/sm74/main.lua index 92b105982..2b867da47 100644 --- a/mods/sm74/main.lua +++ b/mods/sm74/main.lua @@ -29,7 +29,7 @@ gBehaviorValues.dialogs.KoopaQuickThiWinDialog = DIALOG_031 -- force server settings -- --------------------------- -gLevelValues.fixCollisionBugs = 1 +gServerSettings.skipIntro = 1 -------------- -- movtexs -- diff --git a/src/game/mario_actions_automatic.c b/src/game/mario_actions_automatic.c index ecea74043..5eaca685b 100644 --- a/src/game/mario_actions_automatic.c +++ b/src/game/mario_actions_automatic.c @@ -1047,9 +1047,7 @@ s32 act_bubbled(struct MarioState* m) { m->health = 0x100; m->marioObj->oIntangibleTimer = 0; m->peakHeight = m->pos[1]; - m->vel[0] = 0; - m->vel[1] = 0; - m->vel[2] = 0; + mario_set_forward_vel(m, 0.0f); m->marioObj->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE; if (m->playerIndex == 0) { soft_reset_camera(m->area->camera);