diff --git a/src/game/camera.c b/src/game/camera.c index 92a949bd..74505226 100644 --- a/src/game/camera.c +++ b/src/game/camera.c @@ -10866,6 +10866,7 @@ void cutscene_palette_editor(struct Camera *c) { } gCutsceneTimer = CUTSCENE_STOP; c->cutscene = 0; + skip_camera_interpolation(); return; } diff --git a/src/game/level_update.c b/src/game/level_update.c index 94f90cec..570ac57d 100644 --- a/src/game/level_update.c +++ b/src/game/level_update.c @@ -1638,12 +1638,6 @@ void update_menu_level(void) { break; } - if (gCurrentArea != NULL) { - vec3f_copy(gCurrentArea->camera->pos, gLakituState.curPos); - } - vec3f_copy(gLakituState.pos, gLakituState.curPos); - vec3f_copy(gLakituState.goalPos, gLakituState.curPos); - gMarioState->health = 0x880; // reset input gMarioState->input = 0; @@ -1660,7 +1654,6 @@ void update_menu_level(void) { s32 update_level(void) { // update main menu level if (gDjuiInMainMenu) { - skip_camera_interpolation(); // we can't have nice things with this engine and interpolation update_menu_level(); } sCancelNextActSelector = gDjuiInMainMenu; diff --git a/src/pc/nametags.c b/src/pc/nametags.c index f72eebe9..a3e013de 100644 --- a/src/pc/nametags.c +++ b/src/pc/nametags.c @@ -96,9 +96,9 @@ void nametags_render(void) { snprintf(name, MAX_CONFIG_STRING, "%s", np->name); name_without_hex(name); Color color = { - np->palette.parts[CAP][0], - np->palette.parts[CAP][1], - np->palette.parts[CAP][2] + np->palette.parts[EMBLEM][0], + np->palette.parts[EMBLEM][1], + np->palette.parts[EMBLEM][2] }; f32 measure = djui_hud_measure_text(name) * scale * 0.5f;