From 6026b4bb9b4b097efeff3417b37a446cf1b8be2c Mon Sep 17 00:00:00 2001
From: JaxonWasTaken <JaxonWasTaken@users.noreply.github.com>
Date: Wed, 13 May 2026 22:34:14 +0200
Subject: [PATCH 1/3] Apply rebrand to bloom setting value name (#1211)

The display name for BloomSetting::Dusk was unchanged in the rebranding
process, and still shows up as "Dusk" in the settings menu. Rename it to
"Dusklight" to bring it in line with the rebrand.
---
 src/dusk/ui/graphics_tuner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dusk/ui/graphics_tuner.cpp b/src/dusk/ui/graphics_tuner.cpp
index 4f68d4a078..440d9f312a 100644
--- a/src/dusk/ui/graphics_tuner.cpp
+++ b/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:

From 9d2ba3eb49a09f61c2c34382b8d0271b0e59cd6f Mon Sep 17 00:00:00 2001
From: SuperDude88 <82904174+SuperDude88@users.noreply.github.com>
Date: Wed, 13 May 2026 20:26:30 -0400
Subject: [PATCH 2/3] Rename Settings Preset (#1233)

To match the bloom preset, since that name was updated in #1211
---
 src/dusk/ui/preset.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dusk/ui/preset.cpp b/src/dusk/ui/preset.cpp
index 1f96cc0593..7bea7f8bf6 100644
--- a/src/dusk/ui/preset.cpp
+++ b/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},

From 01b4eaa2fa37df61716a189b6d56a6d79881e008 Mon Sep 17 00:00:00 2001
From: TakaRikka <takarikka@outlook.com>
Date: Wed, 13 May 2026 19:27:39 -0700
Subject: [PATCH 3/3] clear e_rd static boss ptr on delete

---
 src/d/actor/d_a_e_rd.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/d/actor/d_a_e_rd.cpp b/src/d/actor/d_a_e_rd.cpp
index e540e7dccd..460bc9dd26 100644
--- a/src/d/actor/d_a_e_rd.cpp
+++ b/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");