diff --git a/src/game/hud.c b/src/game/hud.c index 8f9219674..747cafc1c 100644 --- a/src/game/hud.c +++ b/src/game/hud.c @@ -250,6 +250,7 @@ void handle_power_meter_actions(s16 numHealthWedges) { || sPowerMeterHUD.animation == POWER_METER_EMPHASIZED) { sPowerMeterHUD.animation = POWER_METER_DEEMPHASIZING; sPowerMeterHUD.y = 166; + sPowerMeterPrevY = 166; } sPowerMeterVisibleTimer = 0; } diff --git a/src/pc/djui/djui.c b/src/pc/djui/djui.c index bbf96e747..429690aa2 100644 --- a/src/pc/djui/djui.c +++ b/src/pc/djui/djui.c @@ -25,7 +25,7 @@ void patch_djui_before(void) { void patch_djui_interpolated(UNUSED f32 delta) { // reset the head and re-render DJUI - if (delta >= 0.5f && !sDjuiRendered60fps) { + if (delta >= 0.5f && !sDjuiRendered60fps && gDjuiInMainMenu) { sDjuiRendered60fps = true; if (sSavedDisplayListHead == NULL) { return; } gDisplayListHead = sSavedDisplayListHead; diff --git a/src/pc/djui/djui_panel.c b/src/pc/djui/djui_panel.c index 84381d561..962cfbd5d 100644 --- a/src/pc/djui/djui_panel.c +++ b/src/pc/djui/djui_panel.c @@ -114,7 +114,8 @@ void djui_panel_update(void) { return; } - sMoveAmount += (config60Fps ? 1.0f : 2.0f) * (moveMax / 10.0f); + extern u8 gRenderingInterpolated; + sMoveAmount += (gRenderingInterpolated ? 1.0f : 2.0f) * (moveMax / 10.0f); if (sMoveAmount >= moveMax) { sMoveAmount = moveMax; if (parentBase != NULL) {