Merge branch 'main' into mods

src/d/actor/d_a_e_rd.cpp

@@ -7053,6 +7053,12 @@ static int daE_RD_IsDelete(e_rd_class*) {
 }
 
 static int daE_RD_Delete(e_rd_class* i_this) {
+#if TARGET_PC
+    if (boss == i_this) {
+        boss = NULL;
+    }
+#endif
+
     fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy;
     fopAcM_RegisterDeleteID(i_this, "E_RD");
 

src/dusk/ui/graphics_tuner.cpp

@@ -184,7 +184,7 @@ Rml::String format_graphics_setting_value(GraphicsOption option, int value) {
         case BloomMode::Classic:
             return "Classic";
         case BloomMode::Dusk:
-            return "Dusk";
+            return "Dusklight";
         }
         break;
     case GraphicsOption::BloomMultiplier:

src/dusk/ui/preset.cpp

@@ -83,7 +83,7 @@ PresetWindow::PresetWindow() : WindowSmall("modal", "modal-dialog") {
          "Enhancements disabled to match the GameCube version. "
          "Good for speedrunning or simple nostalgia!",
          applyPresetClassic},
-        {"Dusk",
+        {"Dusklight",
          "Graphics & quality of life tweaks, including some from the Wii U version. "
          "Our recommended way to play!",
          applyPresetDusk},