From e27cce0e3c178632f6dd6d08cecffa3778d3ba00 Mon Sep 17 00:00:00 2001 From: ZipoLabs <287713975+ZipoLabs@users.noreply.github.com> Date: Mon, 8 Jun 2026 04:18:10 +0100 Subject: [PATCH] Add Green Chu merging functionality to "Restore Wii 1.0 Glitches" setting (#2000) --- src/d/actor/d_a_e_sm2.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/d/actor/d_a_e_sm2.cpp b/src/d/actor/d_a_e_sm2.cpp index d9db6eb841..808301527e 100644 --- a/src/d/actor/d_a_e_sm2.cpp +++ b/src/d/actor/d_a_e_sm2.cpp @@ -923,6 +923,14 @@ static void damage_check(e_sm2_class* i_this) { sm_hit_actor->mode = 10; u8 new_color_type = new_col_d[(sm_hit_actor->type * 7) + i_this->type]; + #if TARGET_PC + if (dusk::getSettings().game.restoreWiiGlitches && + ((sm_hit_actor->type == TYPE_BLUE && i_this->type == TYPE_YELLOW) || + (sm_hit_actor->type == TYPE_YELLOW && i_this->type == TYPE_BLUE))) + { + new_color_type = TYPE_GREEN; + } + #endif i_this->type = new_color_type; sm_hit_actor->type = new_color_type;