From 5e2b0d6849200a4723695b4a763df8cd49e62c7b Mon Sep 17 00:00:00 2001 From: Baoulettes Date: Sat, 23 Apr 2022 05:48:09 +0200 Subject: [PATCH] Shops cursor color with included pulse --- .../overlays/actors/ovl_En_Ossan/z_en_ossan.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 4d5fefec6..98780c39e 100644 --- a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -1887,9 +1887,19 @@ void EnOssan_UpdateCursorAnim(EnOssan* this) { this->cursorAnimState = 0; } } - this->cursorColorR = ColChanMix(0, 0.0f, t); - this->cursorColorG = ColChanMix(255, 80.0f, t); - this->cursorColorB = ColChanMix(80, 0.0f, t); + if (CVar_GetS32("gN64Colors", 0) != 0) { + this->cursorColorR = ColChanMix(0, 0.0f, t); + this->cursorColorG = ColChanMix(80, 80.0f, t); + this->cursorColorB = ColChanMix(255, 0.0f, t); + } else if (CVar_GetS32("gGameCubeColors", 0) != 0) { + this->cursorColorR = ColChanMix(0, 0.0f, t); + this->cursorColorG = ColChanMix(255, 80.0f, t); + this->cursorColorB = ColChanMix(80, 0.0f, t); + } else if (CVar_GetS32("gCustomColors", 0) != 0) { + this->cursorColorR = ColChanMix(CVar_GetInt("gCCABtnPrimR", 90), ((CVar_GetInt("gCCABtnPrimR", 90)/255)*100), t); + this->cursorColorG = ColChanMix(CVar_GetInt("gCCABtnPrimG", 90), ((CVar_GetInt("gCCABtnPrimG", 90)/255)*100), t); + this->cursorColorB = ColChanMix(CVar_GetInt("gCCABtnPrimB", 90), ((CVar_GetInt("gCCABtnPrimB", 90)/255)*100), t); + } this->cursorColorA = ColChanMix(255, 0.0f, t); this->cursorAnimTween = t; }