Misc fixing to entering paintings

src/game/ingame_menu.c

@@ -3092,6 +3092,12 @@ s16 render_course_complete_screen(void) {
     gInGameLanguage = eu_get_language();
 #endif
 
+    // if we went into a painting, no more save menu!
+    if (gInsidePainting == TRUE) {
+        gMenuMode = -1;
+        return 0;
+    }
+
     switch (gDialogBoxState) {
         case DIALOG_STATE_OPENING:
             render_course_complete_lvl_info_and_hud_str();
@@ -3110,7 +3116,6 @@ s16 render_course_complete_screen(void) {
 #else
             render_save_confirmation(100, 86, &gDialogLineNum, 20);
 #endif
-
             if (gCourseDoneMenuTimer > 110
                 && (gPlayer3Controller->buttonPressed & A_BUTTON
                  || gPlayer3Controller->buttonPressed & START_BUTTON

src/game/level_update.c

@@ -710,6 +710,7 @@ void initiate_painting_warp_node(struct WarpNode *pWarpNode, u8 instant) {
  * Return the time left until the delayed warp is initiated.
  */
 s16 level_trigger_warp(struct MarioState *m, s32 warpOp) {
+    gControlPainting = FALSE;
     s32 val04 = TRUE;
 
     if (sDelayedWarpOp == WARP_OP_NONE) {