From 5a48015d5d8724de3d2acd691fdbb304cec20442 Mon Sep 17 00:00:00 2001
From: Baoulettes <perlouzerie@hotmail.fr>
Date: Sat, 23 Apr 2022 05:38:55 +0200
Subject: [PATCH] A & C notes and cursor

---
 .../ovl_kaleido_scope/z_kaleido_collect.c     | 42 +++++++++++++++++--
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
index 80ffe8d4a..d8b3b5ff8 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
@@ -494,9 +494,21 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx
                     gDPPipeSync(POLY_KAL_DISP++);
 
                     if (D_8082A124[sp218] == 0) {
-                        gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 80, 255, 150, D_8082A150[sp218]);
+                        if (CVar_GetS32("gN64Colors", 0) != 0) { // A Button notes
+                          gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 80, 150, 255, D_8082A150[sp218]);
+                        } else if (CVar_GetS32("gGameCubeColors", 0) != 0) {
+                          gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 80, 255, 150, D_8082A150[sp218]);
+                        } else if (CVar_GetS32("gCustomColors", 0) != 0) {
+                          gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, CVar_GetInt("gCCABtnPrimR", 80), CVar_GetInt("gCCABtnPrimG", 255), CVar_GetInt("gCCABtnPrimB", 150), D_8082A150[sp218]);
+                        }
                     } else {
+                      if (CVar_GetS32("gN64Colors", 0) != 0) { // C Buttons notes
                         gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 50, D_8082A150[sp218]);
+                      } else if (CVar_GetS32("gGameCubeColors", 0) != 0) {
+                        gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 50, D_8082A150[sp218]);
+                      } else if (CVar_GetS32("gCustomColors", 0) != 0) {
+                        gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, CVar_GetInt("gCCCBtnPrimR", 255), CVar_GetInt("gCCCBtnPrimG", 160), CVar_GetInt("gCCCBtnPrimB", 0), D_8082A150[sp218]);
+                      }
                     }
 
                     gDPSetEnvColor(POLY_KAL_DISP++, 10, 10, 10, 0);
@@ -524,9 +536,21 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx
 
                 if (pauseCtx->unk_1E4 == 8) {
                     if (gOcarinaSongNotes[sp224].notesIdx[phi_s3] == 0) {
-                        gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 80, 255, 150, 200);
+                        if (CVar_GetS32("gN64Colors", 0) != 0) {
+                          gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 80, 150, 255, 200);
+                        } else if (CVar_GetS32("gGameCubeColors", 0) != 0) {
+                          gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 80, 255, 150, 200);
+                        } else if (CVar_GetS32("gCustomColors", 0) != 0) {
+                          gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, CVar_GetInt("gCCABtnPrimR", 80), CVar_GetInt("gCCABtnPrimG", 255), CVar_GetInt("gCCABtnPrimB", 150), 200);
+                        }
                     } else {
+                      if (CVar_GetS32("gN64Colors", 0) != 0) {
                         gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 50, 200);
+                      } else if (CVar_GetS32("gGameCubeColors", 0) != 0) {
+                        gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 50, 200);
+                      } else if (CVar_GetS32("gCustomColors", 0) != 0) {
+                        gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, CVar_GetInt("gCCCBtnPrimR", 255), CVar_GetInt("gCCCBtnPrimG", 160), CVar_GetInt("gCCCBtnPrimB", 0), 200);
+                      }
                     }
                 } else {
                     gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 150, 150, 150, 150);
@@ -579,9 +603,21 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx
                     gDPPipeSync(POLY_KAL_DISP++);
 
                     if (D_8082A124[phi_s3] == 0) {
-                        gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 80, 255, 150, D_8082A150[phi_s3]);
+                        if (CVar_GetS32("gN64Colors", 0) != 0) {
+                          gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 80, 150, 255, D_8082A150[phi_s3]);
+                        } else if (CVar_GetS32("gGameCubeColors", 0) != 0) {
+                          gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 80, 255, 150, D_8082A150[phi_s3]);
+                        } else if (CVar_GetS32("gCustomColors", 0) != 0) {
+                          gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, CVar_GetInt("gCCABtnPrimR", 80), CVar_GetInt("gCCABtnPrimG", 255), CVar_GetInt("gCCABtnPrimB", 150), D_8082A150[phi_s3]);
+                        }
                     } else {
+                      if (CVar_GetS32("gN64Colors", 0) != 0) {
                         gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 50, D_8082A150[phi_s3]);
+                      } else if (CVar_GetS32("gGameCubeColors", 0) != 0) {
+                        gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 50, D_8082A150[phi_s3]);
+                      } else if (CVar_GetS32("gCustomColors", 0) != 0) {
+                        gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, CVar_GetInt("gCCCBtnPrimR", 255), CVar_GetInt("gCCCBtnPrimG", 160), CVar_GetInt("gCCCBtnPrimB", 0), D_8082A150[phi_s3]);
+                      }
                     }
 
                     gDPSetEnvColor(POLY_KAL_DISP++, 10, 10, 10, 0);