From a8744edcd65d97d113081e2b6ecf27469476e7cb Mon Sep 17 00:00:00 2001 From: Baoulettes Date: Wed, 27 Apr 2022 04:40:59 +0200 Subject: [PATCH] to lazy to name this one --- soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 98780c39e..bd85ded7a 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,18 +1887,18 @@ void EnOssan_UpdateCursorAnim(EnOssan* this) { this->cursorAnimState = 0; } } - if (CVar_GetS32("gN64Colors", 0) != 0) { + if (CVar_GetS32("gHudColors", 1) == 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) { + } else if (CVar_GetS32("gHudColors", 1) == 1) { 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); + } else if (CVar_GetS32("gHudColors", 1) == 2) { + this->cursorColorR = ColChanMix(CVar_GetS32("gCCABtnPrimR", 90), ((CVar_GetS32("gCCABtnPrimR", 90)/255)*100), t); + this->cursorColorG = ColChanMix(CVar_GetS32("gCCABtnPrimG", 90), ((CVar_GetS32("gCCABtnPrimG", 90)/255)*100), t); + this->cursorColorB = ColChanMix(CVar_GetS32("gCCABtnPrimB", 90), ((CVar_GetS32("gCCABtnPrimB", 90)/255)*100), t); } this->cursorColorA = ColChanMix(255, 0.0f, t); this->cursorAnimTween = t;