From 5546d19b6f38768a72419067eeea6ee6521e3242 Mon Sep 17 00:00:00 2001 From: Baoulettes Date: Wed, 27 Apr 2022 04:47:58 +0200 Subject: [PATCH] guess what, variable renaming. --- .../ovl_kaleido_scope/z_kaleido_scope_PAL.c | 83 ++++++++++--------- 1 file changed, 44 insertions(+), 39 deletions(-) diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c index 8fcc07824..2848307b5 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -966,18 +966,18 @@ void KaleidoScope_DrawCursor(GlobalContext* globalCtx, u16 pageIndex) { temp = pauseCtx->unk_1E4; - if (CVar_GetS32("gN64Colors", 0) != 0) { + if (CVar_GetS32("gHudColors", 1) == 0) { sCursorColors[2][0] = 0; sCursorColors[2][1] = 50; sCursorColors[2][2] = 255; - } else if (CVar_GetS32("gGameCubeColors", 0) != 0) { + } else if (CVar_GetS32("gHudColors", 1) == 1) { sCursorColors[2][0] = 0; sCursorColors[2][1] = 255; sCursorColors[2][2] = 50; - } else if (CVar_GetS32("gCustomColors", 0) != 0) { - sCursorColors[2][0] = CVar_GetInt("gCCABtnPrimR", 0); - sCursorColors[2][1] = CVar_GetInt("gCCABtnPrimG", 50); - sCursorColors[2][2] = CVar_GetInt("gCCABtnPrimB", 255); + } else if (CVar_GetS32("gHudColors", 1) == 2) { + sCursorColors[2][0] = CVar_GetS32("gCCABtnPrimR", 0); + sCursorColors[2][1] = CVar_GetS32("gCCABtnPrimG", 50); + sCursorColors[2][2] = CVar_GetS32("gCCABtnPrimB", 255); } if ((((pauseCtx->unk_1E4 == 0) || (temp == 8)) && (pauseCtx->state == 6)) || @@ -1051,22 +1051,27 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) { { 0, 0, 0 }, { 255, 255, 0 }, { 0, 255, 50 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 255, 50 }, }; - if (CVar_GetS32("gN64Colors", 0) != 0) { + if (CVar_GetS32("gHudColors", 1) == 0) { D_8082ACF4[8][0] = 0; D_8082ACF4[8][1] = 50; D_8082ACF4[8][2] = 255; D_8082ACF4[11][0] = 0; D_8082ACF4[11][1] = 50; D_8082ACF4[11][2] = 255; - } else if (CVar_GetS32("gGameCubeColors", 0) != 0) { - //Do nothing since gamecube is original colors. - } else if (CVar_GetS32("gCustomColors", 0) != 0) { - D_8082ACF4[8][0] = CVar_GetInt("gCCABtnPrimR", 0); - D_8082ACF4[8][1] = CVar_GetInt("gCCABtnPrimG", 50); - D_8082ACF4[8][2] = CVar_GetInt("gCCABtnPrimB", 255); - D_8082ACF4[11][0] = CVar_GetInt("gCCABtnPrimR", 0); - D_8082ACF4[11][1] = CVar_GetInt("gCCABtnPrimG", 50); - D_8082ACF4[11][2] = CVar_GetInt("gCCABtnPrimB", 255); + } else if (CVar_GetS32("gHudColors", 1) == 1) { + D_8082ACF4[8][0] = 0; + D_8082ACF4[8][1] = 255; + D_8082ACF4[8][2] = 50; + D_8082ACF4[11][0] = 0; + D_8082ACF4[11][1] = 255; + D_8082ACF4[11][2] = 50; + } else if (CVar_GetS32("gHudColors", 1) == 2) { + D_8082ACF4[8][0] = CVar_GetS32("gCCABtnPrimR", 0); + D_8082ACF4[8][1] = CVar_GetS32("gCCABtnPrimG", 50); + D_8082ACF4[8][2] = CVar_GetS32("gCCABtnPrimB", 255); + D_8082ACF4[11][0] = CVar_GetS32("gCCABtnPrimR", 0); + D_8082ACF4[11][1] = CVar_GetS32("gCCABtnPrimG", 50); + D_8082ACF4[11][2] = CVar_GetS32("gCCABtnPrimB", 255); } static s16 D_8082AD3C = 20; @@ -1397,12 +1402,12 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) { gDPSetCombineLERP(POLY_KAL_DISP++, 1, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, 1, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0); - if (CVar_GetS32("gN64Colors", 0) != 0) {//Save prompt cursor colour + if (CVar_GetS32("gHudColors", 1) == 0) {//Save prompt cursor colour gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 100, 100, 255, VREG(61)); - } else if (CVar_GetS32("gGameCubeColors", 0) != 0) { + } else if (CVar_GetS32("gHudColors", 1) == 1) { gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 100, 255, 100, VREG(61)); - } else if (CVar_GetS32("gCustomColors", 0) != 0) { - gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, CVar_GetInt("gCCABtnPrimR", 0), CVar_GetInt("gCCABtnPrimG", 50), CVar_GetInt("gCCABtnPrimB", 255), VREG(61)); //Save prompt cursor colour + } else if (CVar_GetS32("gHudColors", 1) == 2) { + gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, CVar_GetS32("gCCABtnPrimR", 0), CVar_GetS32("gCCABtnPrimG", 50), CVar_GetS32("gCCABtnPrimB", 255), VREG(61)); //Save prompt cursor colour } if (pauseCtx->promptChoice == 0) { @@ -1790,18 +1795,18 @@ void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) { pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] = D_8082ADE0[gSaveContext.language] << 5; - if (CVar_GetS32("gN64Colors", 0) != 0) {//A icon to decide in save prompt + if (CVar_GetS32("gHudColors", 1) == 0) {//A icon to decide in save prompt gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, gABtnTexColour[1][0], gABtnTexColour[1][1], gABtnTexColour[1][2], gABtnTexColour[1][3]); - } else if (CVar_GetS32("gGameCubeColors", 0) != 0) { + } else if (CVar_GetS32("gHudColors", 1) == 1) { gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, gABtnTexColour[0][0], gABtnTexColour[0][1], gABtnTexColour[0][2], gABtnTexColour[0][3]); - } else if (CVar_GetS32("gCustomColors", 0) != 0) { - gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, CVar_GetInt("gCCABtnPrimR", 0), CVar_GetInt("gCCABtnPrimG", 50), CVar_GetInt("gCCABtnPrimB", 255), 255); + } else if (CVar_GetS32("gHudColors", 1) == 2) { + gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, CVar_GetS32("gCCABtnPrimR", 0), CVar_GetS32("gCCABtnPrimG", 50), CVar_GetS32("gCCABtnPrimB", 255), 255); } //gSPDisplayList(POLY_KAL_DISP++, gAButtonIconDL);//This is changed to load the texture only so we can prim color it. gDPLoadTextureBlock(POLY_KAL_DISP++, gABtnSymbolTex, G_IM_FMT_IA, G_IM_SIZ_8b, 24, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD); gSP1Quadrangle(POLY_KAL_DISP++, 0, 2, 3, 1, 0); - gDPPipeSync(POLY_KAL_DISP++); + //gDPPipeSync(POLY_KAL_DISP++); gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 255, 255); POLY_KAL_DISP = KaleidoScope_QuadTextureIA8(POLY_KAL_DISP, D_8082AD60[gSaveContext.language], @@ -1845,12 +1850,12 @@ void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) { pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] = D_8082ADD8[gSaveContext.language] << 5; - if (CVar_GetS32("gN64Colors", 0) != 0) {//To equip text C button icon + if (CVar_GetS32("gHudColors", 1) == 0) {//To equip text C button icon gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), 255); - } else if (CVar_GetS32("gGameCubeColors", 0) != 0) { + } else if (CVar_GetS32("gHudColors", 1) == 1) { gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), 255); - } else if (CVar_GetS32("gCustomColors", 0) != 0) { - gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, CVar_GetInt("gCCCBtnPrimR", 0), CVar_GetInt("gCCCBtnPrimG", 50), CVar_GetInt("gCCCBtnPrimB", 255), 255); + } else if (CVar_GetS32("gHudColors", 1) == 2) { + gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, CVar_GetS32("gCCCBtnPrimR", 0), CVar_GetS32("gCCCBtnPrimG", 50), CVar_GetS32("gCCCBtnPrimB", 255), 255); } //gSPDisplayList(POLY_KAL_DISP++, gCButtonIconsDL); //Same reason for every A button, to be able to recolor them. gDPLoadTextureBlock(POLY_KAL_DISP++, gCBtnSymbolsTex, G_IM_FMT_IA, G_IM_SIZ_8b, 48, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD); @@ -1887,12 +1892,12 @@ void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) { pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] = D_8082ADE8[gSaveContext.language] << 5; - if (CVar_GetS32("gN64Colors", 0) != 0) {//To play melody A button + if (CVar_GetS32("gHudColors", 1) == 0) {//To play melody A button gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, gABtnTexColour[1][0], gABtnTexColour[1][1], gABtnTexColour[1][2], gABtnTexColour[1][3]); - } else if (CVar_GetS32("gGameCubeColors", 0) != 0) { + } else if (CVar_GetS32("gHudColors", 1) == 1) { gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, gABtnTexColour[0][0], gABtnTexColour[0][1], gABtnTexColour[0][2], gABtnTexColour[0][3]); - } else if (CVar_GetS32("gCustomColors", 0) != 0) { - gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, CVar_GetInt("gCCABtnPrimR", 0), CVar_GetInt("gCCABtnPrimG", 50), CVar_GetInt("gCCABtnPrimB", 255), 255); + } else if (CVar_GetS32("gHudColors", 1) == 2) { + gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, CVar_GetS32("gCCABtnPrimR", 0), CVar_GetS32("gCCABtnPrimG", 50), CVar_GetS32("gCCABtnPrimB", 255), 255); } //gSPDisplayList(POLY_KAL_DISP++, gAButtonIconDL); gDPLoadTextureBlock(POLY_KAL_DISP++, gABtnSymbolTex, G_IM_FMT_IA, G_IM_SIZ_8b, 24, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD); @@ -1920,12 +1925,12 @@ void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) { pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] = D_8082ADD8[gSaveContext.language] << 5; - if (CVar_GetS32("gN64Colors", 0) != 0) { - gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, gABtnTexColour[1][0], gABtnTexColour[1][1], gABtnTexColour[1][2], gABtnTexColour[1][3]); - } else if (CVar_GetS32("gGameCubeColors", 0) != 0) { - gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, gABtnTexColour[0][0], gABtnTexColour[0][1], gABtnTexColour[0][2], gABtnTexColour[0][3]); - } else if (CVar_GetS32("gCustomColors", 0) != 0) { - gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, CVar_GetInt("gCCABtnPrimR", 0), CVar_GetInt("gCCABtnPrimG", 50), CVar_GetInt("gCCABtnPrimB", 255), 255); + if (CVar_GetS32("gHudColors", 1) == 0) {//To equip A button + gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, gABtnTexColour[1][0], gABtnTexColour[1][1], gABtnTexColour[1][2], gABtnTexColour[1][3]); + } else if (CVar_GetS32("gHudColors", 1) == 1) { + gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, gABtnTexColour[0][0], gABtnTexColour[0][1], gABtnTexColour[0][2], gABtnTexColour[0][3]); + } else if (CVar_GetS32("gHudColors", 1) == 2) { + gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, CVar_GetS32("gCCABtnPrimR", 0), CVar_GetS32("gCCABtnPrimG", 50), CVar_GetS32("gCCABtnPrimB", 255), 255); } gDPLoadTextureBlock(POLY_KAL_DISP++, gABtnSymbolTex, G_IM_FMT_IA, G_IM_SIZ_8b, 24, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD); gSP1Quadrangle(POLY_KAL_DISP++, 0, 2, 3, 1, 0);