From 4466bf4e123569685b7c110306b4db89af645829 Mon Sep 17 00:00:00 2001 From: MelonSpeedruns Date: Wed, 22 Apr 2026 13:00:35 -0400 Subject: [PATCH] wip --- src/d/actor/d_a_alink_dusk.cpp | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/d/actor/d_a_alink_dusk.cpp b/src/d/actor/d_a_alink_dusk.cpp index b081ff1ce8..b35daf445f 100644 --- a/src/d/actor/d_a_alink_dusk.cpp +++ b/src/d/actor/d_a_alink_dusk.cpp @@ -5,9 +5,10 @@ #include "d/d_meter2_info.h" cXyz currentGamepadColor = {0, 0, 0}; +cXyz currentGamepadFlashColor = {0, 0, 0}; cXyz finalGamepadColor = {0, 0, 0}; float lerpSpeed = 0.0f; -const cXyz duskColor = {30, 30, -30}; +const cXyz duskColor = {45, 45, -45}; const cXyz heartColor1 = {255, 0, 0}; const cXyz heartColor2 = {155, 5, 5}; @@ -46,18 +47,21 @@ void daAlink_c::handleGamepadColor() { setColor = true; } - u8 linkHp = Z2GetLink()->getLinkHp(); - if (linkHp <= 2) { - FadeLED(heartColor1, 2.0f); - setColor = true; - } else if (linkHp <= 4) { - FadeLED(heartColor2, 2.0f); - setColor = true; - } else if (linkHp <= 6) { - FadeLED(heartColor3, 2.0f); - setColor = true; + if (!checkEventRun()) { + u8 linkHp = Z2GetLink()->getLinkHp(); + if (linkHp <= 2) { + FadeLED(heartColor1, 2.0f); + setColor = true; + } else if (linkHp <= 4) { + FadeLED(heartColor2, 2.0f); + setColor = true; + } else if (linkHp <= 6) { + FadeLED(heartColor3, 2.0f); + setColor = true; + } } + if (!setColor) { if (checkWolf()) { FadeLED({115, 115, 75}, 5.0f); @@ -92,6 +96,8 @@ void daAlink_c::handleGamepadColor() { AddGamepadCurrentColor(duskColor); } + AddGamepadCurrentColor(currentGamepadFlashColor); + if (finalGamepadColor.x > 255) finalGamepadColor.x = 255; if (finalGamepadColor.x < 0) @@ -108,7 +114,8 @@ void daAlink_c::handleGamepadColor() { finalGamepadColor.z = 0; currentGamepadColor = LerpColor(currentGamepadColor, finalGamepadColor, lerpSpeed); - PADSetColor(PAD_1, (u8)currentGamepadColor.x, (u8)currentGamepadColor.y, (u8)currentGamepadColor.z); + PADSetColor(PAD_CHAN0, (u8)currentGamepadColor.x, (u8)currentGamepadColor.y, + (u8)currentGamepadColor.z); } void daAlink_c::handleWolfHowl() {