parent
ae48a9df5f
commit
42d1d681a6
|
@ -399,6 +399,10 @@ void mario_set_bubbled(struct MarioState* m) {
|
||||||
m->statusForCamera->cameraEvent = 0;
|
m->statusForCamera->cameraEvent = 0;
|
||||||
extern s16 gCutsceneTimer;
|
extern s16 gCutsceneTimer;
|
||||||
gCutsceneTimer = 0;
|
gCutsceneTimer = 0;
|
||||||
|
|
||||||
|
if (m->playerIndex == 0) {
|
||||||
|
set_camera_mode(m->area->camera, m->area->camera->defMode, 1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -951,6 +951,9 @@ s32 act_bubbled(struct MarioState* m) {
|
||||||
m->vel[1] = 0;
|
m->vel[1] = 0;
|
||||||
m->vel[2] = 0;
|
m->vel[2] = 0;
|
||||||
m->marioObj->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE;
|
m->marioObj->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE;
|
||||||
|
if (m->playerIndex == 0) {
|
||||||
|
set_camera_mode(m->area->camera, m->area->camera->defMode, 1);
|
||||||
|
}
|
||||||
return force_idle_state(m);
|
return force_idle_state(m);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue