github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-19 13:00:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

N64 Colors V3 (Added Gamecube colors toggle under Enhancement so player can switch them easily and have both colors)

Browse source
This commit is contained in:
takstation 2022-04-20 17:31:03 +04:30
commit cd5292b8f1
8 changed files with 283 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libultraship/libultraship/GameSettings.cpp
View file

@ -64,6 +64,9 @@ namespace Game {
Settings.enhancements.mm_bunny_hood = stob(Conf[EnhancementSection]["mm_bunny_hood"]); Settings.enhancements.mm_bunny_hood = stob(Conf[EnhancementSection]["mm_bunny_hood"]);
CVar_SetS32("gMMBunnyHood", Settings.enhancements.mm_bunny_hood); CVar_SetS32("gMMBunnyHood", Settings.enhancements.mm_bunny_hood);
Settings.enhancements.gc_colors = stob(Conf[EnhancementSection]["gc_colors"]);
CVar_SetS32("gGameCubeColors", Settings.enhancements.gc_colors);
// Audio // Audio
Settings.audio.master = Ship::stof(Conf[AudioSection]["master"]); Settings.audio.master = Ship::stof(Conf[AudioSection]["master"]);
CVar_SetFloat("gGameMasterVolume", Settings.audio.master); CVar_SetFloat("gGameMasterVolume", Settings.audio.master);
@ -156,6 +159,7 @@ namespace Game {
Conf[EnhancementSection]["animated_pause_menu"] = std::to_string(Settings.enhancements.animated_pause_menu); Conf[EnhancementSection]["animated_pause_menu"] = std::to_string(Settings.enhancements.animated_pause_menu);
Conf[EnhancementSection]["minimal_ui"] = std::to_string(Settings.enhancements.minimal_ui); Conf[EnhancementSection]["minimal_ui"] = std::to_string(Settings.enhancements.minimal_ui);
Conf[EnhancementSection]["mm_bunny_hood"] = std::to_string(Settings.enhancements.mm_bunny_hood); Conf[EnhancementSection]["mm_bunny_hood"] = std::to_string(Settings.enhancements.mm_bunny_hood);
Conf[EnhancementSection]["gc_colors"] = std::to_string(Settings.enhancements.gc_colors);
// Controllers // Controllers
Conf[ControllerSection]["gyro_sensitivity"] = std::to_string(Settings.controller.gyro_sensitivity); Conf[ControllerSection]["gyro_sensitivity"] = std::to_string(Settings.controller.gyro_sensitivity);

1
libultraship/libultraship/GameSettings.h
View file

@ -25,6 +25,7 @@ struct SoHConfigType {
bool animated_pause_menu = false; bool animated_pause_menu = false;
bool minimal_ui = false; bool minimal_ui = false;
bool mm_bunny_hood = false; bool mm_bunny_hood = false;
bool gc_colors = false;
} enhancements; } enhancements;
// Controller // Controller

5
libultraship/libultraship/SohImGuiImpl.cpp
View file

@ -425,6 +425,11 @@ namespace SohImGui {
needs_save = true; needs_save = true;
} }
if (ImGui::Checkbox("GameCube Colors", &Game::Settings.enhancements.gc_colors)) {
CVar_SetS32("gGameCubeColors", Game::Settings.enhancements.gc_colors);
needs_save = true;
}
ImGui::EndMenu(); ImGui::EndMenu();
} }

151
soh/src/code/z_message_PAL.c
View file

@ -128,18 +128,18 @@ void Message_ResetOcarinaNoteState(void) {
sOcarinaNotesAlphaValues[0] = sOcarinaNotesAlphaValues[1] = sOcarinaNotesAlphaValues[2] = sOcarinaNotesAlphaValues[0] = sOcarinaNotesAlphaValues[1] = sOcarinaNotesAlphaValues[2] =
sOcarinaNotesAlphaValues[3] = sOcarinaNotesAlphaValues[4] = sOcarinaNotesAlphaValues[5] = sOcarinaNotesAlphaValues[3] = sOcarinaNotesAlphaValues[4] = sOcarinaNotesAlphaValues[5] =
sOcarinaNotesAlphaValues[6] = sOcarinaNotesAlphaValues[7] = sOcarinaNotesAlphaValues[8] = 0; sOcarinaNotesAlphaValues[6] = sOcarinaNotesAlphaValues[7] = sOcarinaNotesAlphaValues[8] = 0;
sOcarinaNoteAPrimR = 80; sOcarinaNoteAPrimR = 80;
sOcarinaNoteAPrimG = 150; sOcarinaNoteAPrimG = 150;
sOcarinaNoteAPrimB = 255; sOcarinaNoteAPrimB = 255;
sOcarinaNoteAEnvR = 10; sOcarinaNoteAEnvR = 10;
sOcarinaNoteAEnvG = 10; sOcarinaNoteAEnvG = 10;
sOcarinaNoteAEnvB = 10; sOcarinaNoteAEnvB = 10;
sOcarinaNoteCPrimR = 255; sOcarinaNoteCPrimR = 255;
sOcarinaNoteCPrimG = 255; sOcarinaNoteCPrimG = 255;
sOcarinaNoteCPrimB = 50; sOcarinaNoteCPrimB = 50;
sOcarinaNoteCEnvR = 10; sOcarinaNoteCEnvR = 10;
sOcarinaNoteCEnvG = 10; sOcarinaNoteCEnvG = 10;
sOcarinaNoteCEnvB = 10; sOcarinaNoteCEnvB = 10;
} }
void Message_UpdateOcarinaGame(GlobalContext* globalCtx) { void Message_UpdateOcarinaGame(GlobalContext* globalCtx) {
@ -495,9 +495,41 @@ void Message_DrawTextboxIcon(GlobalContext* globalCtx, Gfx** p, s16 x, s16 y) {
{ 4, 84, 204 }, { 4, 84, 204 },
{ 45, 125, 250 }, { 45, 125, 250 },
}; };
if (CVar_GetS32("gGameCubeColors", 0) != 0) {
sIconPrimColors[0][0] = 0;
sIconPrimColors[0][1] = 200;
sIconPrimColors[0][2] = 80;
sIconPrimColors[1][0] = 50;
sIconPrimColors[1][0] = 255;
sIconPrimColors[1][0] = 130;
} else {
sIconPrimColors[0][0] = 4;
sIconPrimColors[0][1] = 84;
sIconPrimColors[0][2] = 204;
sIconPrimColors[1][0] = 45;
sIconPrimColors[1][1] = 125;
sIconPrimColors[1][2] = 255;
};
static s16 sIconEnvColors[][3] = { static s16 sIconEnvColors[][3] = {
{ 0, 0, 0 }, { 0, 0, 0 },
{ 0, 70, 255 }, { 0, 70, 255 },
{ 0, 0, 0 },
{ 0, 255, 130 },
};
if (CVar_GetS32("gGameCubeColors", 0) != 0) {
sIconEnvColors[0][0] = 0;
sIconEnvColors[0][1] = 0;
sIconEnvColors[0][2] = 0;
sIconEnvColors[1][0] = 0;
sIconEnvColors[1][1] = 255;
sIconEnvColors[1][2] = 130;
} else {
sIconEnvColors[0][0] = 0;
sIconEnvColors[0][1] = 0;
sIconEnvColors[0][2] = 0;
sIconEnvColors[1][0] = 0;
sIconEnvColors[1][1] = 70;
sIconEnvColors[1][2] = 255;
}; };
static s16 sIconPrimR = 0; static s16 sIconPrimR = 0;
static s16 sIconPrimG = 70; static s16 sIconPrimG = 70;
@ -544,27 +576,27 @@ void Message_DrawTextboxIcon(GlobalContext* globalCtx, Gfx** p, s16 x, s16 y) {
sIconPrimB += primB; sIconPrimB += primB;
} }
envR = (ABS(sIconEnvR - sIconEnvColors[sIconFlashColorIdx][0])) / sIconFlashTimer; envR = (ABS(sIconEnvR - sIconEnvColors[sIconFlashColorIdx][0])) / sIconFlashTimer;
envG = (ABS(sIconEnvG - sIconEnvColors[sIconFlashColorIdx][1])) / sIconFlashTimer; envG = (ABS(sIconEnvG - sIconEnvColors[sIconFlashColorIdx][1])) / sIconFlashTimer;
envB = (ABS(sIconEnvB - sIconEnvColors[sIconFlashColorIdx][2])) / sIconFlashTimer; envB = (ABS(sIconEnvB - sIconEnvColors[sIconFlashColorIdx][2])) / sIconFlashTimer;
if (sIconEnvR >= sIconEnvColors[sIconFlashColorIdx][0]) { if (sIconEnvR >= sIconEnvColors[sIconFlashColorIdx][0]) {
sIconEnvR -= envR; sIconEnvR -= envR;
} else { } else {
sIconEnvR += envR; sIconEnvR += envR;
} }
if (sIconEnvG >= sIconEnvColors[sIconFlashColorIdx][1]) { if (sIconEnvG >= sIconEnvColors[sIconFlashColorIdx][1]) {
sIconEnvG -= envG; sIconEnvG -= envG;
} else { } else {
sIconEnvG += envG; sIconEnvG += envG;
} }
if (sIconEnvB >= sIconEnvColors[sIconFlashColorIdx][2]) { if (sIconEnvB >= sIconEnvColors[sIconFlashColorIdx][2]) {
sIconEnvB -= envB; sIconEnvB -= envB;
} else { } else {
sIconEnvB += envB; sIconEnvB += envB;
} }
sIconFlashTimer--; sIconFlashTimer--;
@ -584,8 +616,12 @@ void Message_DrawTextboxIcon(GlobalContext* globalCtx, Gfx** p, s16 x, s16 y) {
gDPSetCombineLERP(gfx++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, gDPSetCombineLERP(gfx++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE,
ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
gDPSetPrimColor(gfx++, 0, 0, sIconPrimR, sIconPrimG, sIconPrimB, 255); if (CVar_GetS32("gGameCubeColors", 0) != 0) {
gDPSetEnvColor(gfx++, sIconEnvR, sIconEnvG, sIconEnvB, 255); gDPSetPrimColor(gfx++, 0, 0, 0, 200, 80, 255);
} else {
gDPSetPrimColor(gfx++, 0, 0, sIconPrimR, sIconPrimG, sIconPrimB, 255);
}
gDPSetEnvColor(gfx++, sIconEnvR, sIconEnvG, sIconEnvB, 255);
gDPLoadTextureBlock_4b(gfx++, iconTexture, G_IM_FMT_I, FONT_CHAR_TEX_WIDTH, FONT_CHAR_TEX_HEIGHT, 0, gDPLoadTextureBlock_4b(gfx++, iconTexture, G_IM_FMT_I, FONT_CHAR_TEX_WIDTH, FONT_CHAR_TEX_HEIGHT, 0,
G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
@ -1987,6 +2023,33 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
{ 10, 10, 10 }, { 10, 10, 10 },
{ 110, 110, 50 }, { 110, 110, 50 },
}; };
if (CVar_GetS32("gGameCubeColors", 0) != 0) {
sOcarinaNoteAPrimColors[0][0] = 80;
sOcarinaNoteAPrimColors[0][1] = 255;
sOcarinaNoteAPrimColors[0][2] = 150;
sOcarinaNoteAPrimColors[1][0] = 100;
sOcarinaNoteAPrimColors[1][1] = 255;
sOcarinaNoteAPrimColors[1][2] = 200;
sOcarinaNoteAEnvColors[0][0] = 10;
sOcarinaNoteAEnvColors[0][1] = 10;
sOcarinaNoteAEnvColors[0][2] = 10;
sOcarinaNoteAEnvColors[1][0] = 50;
sOcarinaNoteAEnvColors[1][1] = 150;
sOcarinaNoteAEnvColors[1][2] = 50;
} else {
sOcarinaNoteAPrimColors[0][0] = 80;
sOcarinaNoteAPrimColors[0][1] = 150;
sOcarinaNoteAPrimColors[0][2] = 255;
sOcarinaNoteAPrimColors[1][0] = 100;
sOcarinaNoteAPrimColors[1][1] = 200;
sOcarinaNoteAPrimColors[1][2] = 255;
sOcarinaNoteAEnvColors[0][0] = 10;
sOcarinaNoteAEnvColors[0][1] = 10;
sOcarinaNoteAEnvColors[0][2] = 10;
sOcarinaNoteAEnvColors[1][0] = 50;
sOcarinaNoteAEnvColors[1][1] = 50;
sOcarinaNoteAEnvColors[1][2] = 150;
};
static s16 sOcarinaNoteFlashTimer = 12; static s16 sOcarinaNoteFlashTimer = 12;
static s16 sOcarinaNoteFlashColorIdx = 1; static s16 sOcarinaNoteFlashColorIdx = 1;
static s16 sOcarinaSongFanfares[] = { static s16 sOcarinaSongFanfares[] = {
@ -2285,12 +2348,12 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
sOcarinaNoteFlashTimer--; sOcarinaNoteFlashTimer--;
if (sOcarinaNoteFlashTimer == 0) { if (sOcarinaNoteFlashTimer == 0) {
sOcarinaNoteAPrimR = 70; sOcarinaNoteAPrimR = sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][0];
sOcarinaNoteAPrimG = 70; sOcarinaNoteAPrimG = sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][1];
sOcarinaNoteAPrimB = 255; sOcarinaNoteAPrimB = sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][2];
sOcarinaNoteAEnvR = 50; sOcarinaNoteAEnvR = sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][0];
sOcarinaNoteAEnvG = 50; sOcarinaNoteAEnvG = sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][1];
sOcarinaNoteAEnvB = 255; sOcarinaNoteAEnvB = sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][2];
sOcarinaNoteCPrimR = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][0]; sOcarinaNoteCPrimR = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][0];
sOcarinaNoteCPrimG = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][1]; sOcarinaNoteCPrimG = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][1];
sOcarinaNoteCPrimB = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][2]; sOcarinaNoteCPrimB = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][2];
@ -2902,8 +2965,14 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
gDPPipeSync(gfx++); gDPPipeSync(gfx++);
if (sOcarinaNoteBuf[i] == OCARINA_NOTE_A) { if (sOcarinaNoteBuf[i] == OCARINA_NOTE_A) {
gDPSetPrimColor(gfx++, 0, 0, 81, 135, 221, if (CVar_GetS32("gGameCubeColors", 0) != 0) {
sOcarinaNotesAlphaValues[i]); gDPSetPrimColor(gfx++, 0, 0, 80, 255, 150,
sOcarinaNotesAlphaValues[i]);
} else {
gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteAPrimR, sOcarinaNoteAPrimG, sOcarinaNoteAPrimB,
sOcarinaNotesAlphaValues[i]);
}
gDPSetEnvColor(gfx++, sOcarinaNoteAEnvR, sOcarinaNoteAEnvG, sOcarinaNoteAEnvB, 0); gDPSetEnvColor(gfx++, sOcarinaNoteAEnvR, sOcarinaNoteAEnvG, sOcarinaNoteAEnvB, 0);
} else { } else {
gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteCPrimR, sOcarinaNoteCPrimG, sOcarinaNoteCPrimB, gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteCPrimR, sOcarinaNoteCPrimG, sOcarinaNoteCPrimB,

26
soh/src/code/z_parameter.c
View file

@ -2759,8 +2759,14 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) {
// Also loads the Item Button Texture reused by other buttons afterwards // Also loads the Item Button Texture reused by other buttons afterwards
gDPPipeSync(OVERLAY_DISP++); gDPPipeSync(OVERLAY_DISP++);
gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
gDPSetPrimColor(OVERLAY_DISP++, 0, 0, R_B_BTN_COLOR(0), R_B_BTN_COLOR(1), R_B_BTN_COLOR(2), if (CVar_GetS32("gGameCubeColors", 0) != 0) {
interfaceCtx->bAlpha); gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 30, 30,
interfaceCtx->bAlpha);
} else {
gDPSetPrimColor(OVERLAY_DISP++, 0, 0, R_B_BTN_COLOR(0), R_B_BTN_COLOR(1), R_B_BTN_COLOR(2),
interfaceCtx->bAlpha);
}
gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 255); gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 255);
OVERLAY_DISP = OVERLAY_DISP =
@ -2796,7 +2802,11 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) {
if ((globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.debugState != 0)) { if ((globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.debugState != 0)) {
// Start Button Texture, Color & Label // Start Button Texture, Color & Label
gDPPipeSync(OVERLAY_DISP++); gDPPipeSync(OVERLAY_DISP++);
gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 200, 0, 0, interfaceCtx->startAlpha); if (CVar_GetS32("gGameCubeColors", 0) != 0) {
gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 120, 120, 120, interfaceCtx->startAlpha);
} else {
gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 200, 0, 0, interfaceCtx->startAlpha);
}
gSPWideTextureRectangle(OVERLAY_DISP++, OTRGetRectDimensionFromRightEdge(startButtonLeftPos[gSaveContext.language]) << 2, 68, gSPWideTextureRectangle(OVERLAY_DISP++, OTRGetRectDimensionFromRightEdge(startButtonLeftPos[gSaveContext.language]) << 2, 68,
(OTRGetRectDimensionFromRightEdge(startButtonLeftPos[gSaveContext.language]) + 22) << 2, 156, (OTRGetRectDimensionFromRightEdge(startButtonLeftPos[gSaveContext.language]) + 22) << 2, 156,
G_TX_RENDERTILE, 0, 0, 1462, 1462); G_TX_RENDERTILE, 0, 0, 1462, 1462);
@ -3382,8 +3392,14 @@ void Interface_Draw(GlobalContext* globalCtx) {
//func_8008A8B8(globalCtx, R_A_BTN_Y, R_A_BTN_Y + 45, rABtnX, rABtnX + 45); //func_8008A8B8(globalCtx, R_A_BTN_Y, R_A_BTN_Y + 45, rABtnX, rABtnX + 45);
gSPClearGeometryMode(OVERLAY_DISP++, G_CULL_BOTH); gSPClearGeometryMode(OVERLAY_DISP++, G_CULL_BOTH);
gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
gDPSetPrimColor(OVERLAY_DISP++, 0, 0, R_A_BTN_COLOR(0), R_A_BTN_COLOR(1), R_A_BTN_COLOR(2), if (CVar_GetS32("gGameCubeColors", 0) != 0) {
interfaceCtx->aAlpha); gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 0, 200, 50,
interfaceCtx->aAlpha);
} else {
gDPSetPrimColor(OVERLAY_DISP++, 0, 0, R_A_BTN_COLOR(0), R_A_BTN_COLOR(1), R_A_BTN_COLOR(2),
interfaceCtx->aAlpha);
}
if (fullUi) { if (fullUi) {
Interface_DrawActionButton(globalCtx, rABtnX, R_A_BTN_Y); Interface_DrawActionButton(globalCtx, rABtnX, R_A_BTN_Y);
} }

20
soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
View file

@ -1887,11 +1887,19 @@ void EnOssan_UpdateCursorAnim(EnOssan* this) {
this->cursorAnimState = 0; this->cursorAnimState = 0;
} }
} }
this->cursorColorR = ColChanMix(0, 0.0f, t); if (CVar_GetS32("gGameCubeColors", 0) != 0) {
this->cursorColorG = ColChanMix(255, 80.0f, t); this->cursorColorR = ColChanMix(0, 0.0f, t);
this->cursorColorB = ColChanMix(80, 0.0f, t); this->cursorColorG = ColChanMix(255, 80.0f, t);
this->cursorColorA = ColChanMix(255, 0.0f, t); this->cursorColorB = ColChanMix(80, 0.0f, t);
this->cursorAnimTween = t; this->cursorColorA = ColChanMix(255, 0.0f, t);
this->cursorAnimTween = t;
} else {
this->cursorColorR = ColChanMix(0, 0.0f, t);
this->cursorColorG = ColChanMix(80, 80.0f, t);
this->cursorColorB = ColChanMix(255, 0.0f, t);
this->cursorColorA = ColChanMix(255, 0.0f, t);
this->cursorAnimTween = t;
}
} }
void EnOssan_UpdateStickDirectionPromptAnim(EnOssan* this) { void EnOssan_UpdateStickDirectionPromptAnim(EnOssan* this) {
@ -2259,7 +2267,7 @@ void EnOssan_DrawCursor(GlobalContext* globalCtx, EnOssan* this, f32 x, f32 y, f
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4192); OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4192);
if (drawCursor != 0) { if (drawCursor != 0) {
func_80094520(globalCtx->state.gfxCtx); func_80094520(globalCtx->state.gfxCtx);
gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 0, 42, 238, gDPSetPrimColor(OVERLAY_DISP++, 0, 0, this->cursorColorR, this->cursorColorG, this->cursorColorB,
this->cursorColorA); this->cursorColorA);
gDPLoadTextureBlock_4b(OVERLAY_DISP++, gSelectionCursorTex, G_IM_FMT_IA, 16, 16, 0, G_TX_MIRROR | G_TX_WRAP, gDPLoadTextureBlock_4b(OVERLAY_DISP++, gSelectionCursorTex, G_IM_FMT_IA, 16, 16, 0, G_TX_MIRROR | G_TX_WRAP,
G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD); G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD);

18
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
View file

@ -494,7 +494,11 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx
gDPPipeSync(POLY_KAL_DISP++); gDPPipeSync(POLY_KAL_DISP++);
if (D_8082A124[sp218] == 0) { if (D_8082A124[sp218] == 0) {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 80, 150, 255, D_8082A150[sp218]); if (CVar_GetS32("gGameCubeColors", 0) != 0) {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 80, 255, 150, D_8082A150[sp218]);
} else {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 80, 150, 255, D_8082A150[sp218]);
}
} else { } else {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 50, D_8082A150[sp218]); gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 50, D_8082A150[sp218]);
} }
@ -524,7 +528,11 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx
if (pauseCtx->unk_1E4 == 8) { if (pauseCtx->unk_1E4 == 8) {
if (gOcarinaSongNotes[sp224].notesIdx[phi_s3] == 0) { if (gOcarinaSongNotes[sp224].notesIdx[phi_s3] == 0) {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 80, 150, 255, 200); if (CVar_GetS32("gGameCubeColors", 0) != 0) {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 80, 255, 150, 200);
} else {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 80, 150, 255, 200);
}
} else { } else {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 50, 200); gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 50, 200);
} }
@ -579,7 +587,11 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx
gDPPipeSync(POLY_KAL_DISP++); gDPPipeSync(POLY_KAL_DISP++);
if (D_8082A124[phi_s3] == 0) { if (D_8082A124[phi_s3] == 0) {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 80, 150, 255, D_8082A150[phi_s3]); if (CVar_GetS32("gGameCubeColors", 0) != 0) {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 80, 255, 150, D_8082A150[phi_s3]);
} else {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 80, 150, 255, D_8082A150[phi_s3]);
}
} else { } else {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 50, D_8082A150[phi_s3]); gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 50, D_8082A150[phi_s3]);
} }

146
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
View file

@ -966,6 +966,16 @@ void KaleidoScope_DrawCursor(GlobalContext* globalCtx, u16 pageIndex) {
temp = pauseCtx->unk_1E4; temp = pauseCtx->unk_1E4;
if (CVar_GetS32("gGameCubeColors", 0) != 0) {
sCursorColors[2][0] = 0;
sCursorColors[2][1] = 255;
sCursorColors[2][2] = 50;
} else {
sCursorColors[2][0] = 0;
sCursorColors[2][1] = 50;
sCursorColors[2][2] = 255;
}
if ((((pauseCtx->unk_1E4 == 0) || (temp == 8)) && (pauseCtx->state == 6)) || if ((((pauseCtx->unk_1E4 == 0) || (temp == 8)) && (pauseCtx->state == 6)) ||
((pauseCtx->pageIndex == PAUSE_QUEST) && ((temp < 3) || (temp == 5) || (temp == 8)))) { ((pauseCtx->pageIndex == PAUSE_QUEST) && ((temp < 3) || (temp == 5) || (temp == 8)))) {
@ -1036,6 +1046,10 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
{ 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 255, 255, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 255, 255, 0 }, { 0, 0, 0 },
{ 0, 0, 0 }, { 255, 255, 0 }, { 0, 50, 255 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 50, 255 }, { 0, 0, 0 }, { 255, 255, 0 }, { 0, 50, 255 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 50, 255 },
}; };
static s16 D_8082ACF5[][3] = {
{ 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 255, 255, 0 }, { 0, 0, 0 },
{ 0, 0, 0 }, { 255, 255, 0 }, { 0, 255, 50 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 255, 50 },
};
static s16 D_8082AD3C = 20; static s16 D_8082AD3C = 20;
static s16 D_8082AD40 = 0; static s16 D_8082AD40 = 0;
static s16 D_8082AD44 = 0; static s16 D_8082AD44 = 0;
@ -1051,37 +1065,73 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
if ((pauseCtx->state < 8) || (pauseCtx->state > 0x11)) { if ((pauseCtx->state < 8) || (pauseCtx->state > 0x11)) {
if (pauseCtx->state != 7) { if (pauseCtx->state != 7) {
stepR = ABS(D_8082AB8C - D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][0]) / D_8082AD3C; if (CVar_GetS32("gGameCubeColors", 0) != 0) {
stepG = ABS(D_8082AB90 - D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][1]) / D_8082AD3C; stepR = ABS(D_8082AB8C - D_8082ACF5[pauseCtx->cursorColorSet + D_8082AD40][0]) / D_8082AD3C;
stepB = ABS(D_8082AB94 - D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][2]) / D_8082AD3C; stepG = ABS(D_8082AB90 - D_8082ACF5[pauseCtx->cursorColorSet + D_8082AD40][1]) / D_8082AD3C;
if (D_8082AB8C >= D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][0]) { stepB = ABS(D_8082AB94 - D_8082ACF5[pauseCtx->cursorColorSet + D_8082AD40][2]) / D_8082AD3C;
D_8082AB8C -= stepR; if (D_8082AB8C >= D_8082ACF5[pauseCtx->cursorColorSet + D_8082AD40][0]) {
D_8082AB8C -= stepR;
} else {
D_8082AB8C += stepR;
}
if (D_8082AB90 >= D_8082ACF5[pauseCtx->cursorColorSet + D_8082AD40][1]) {
D_8082AB90 -= stepG;
} else {
D_8082AB90 += stepG;
}
if (D_8082AB94 >= D_8082ACF5[pauseCtx->cursorColorSet + D_8082AD40][2]) {
D_8082AB94 -= stepB;
} else {
D_8082AB94 += stepB;
}
} else { } else {
D_8082AB8C += stepR; stepR = ABS(D_8082AB8C - D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][0]) / D_8082AD3C;
} stepG = ABS(D_8082AB90 - D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][1]) / D_8082AD3C;
if (D_8082AB90 >= D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][1]) { stepB = ABS(D_8082AB94 - D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][2]) / D_8082AD3C;
D_8082AB90 -= stepG; if (D_8082AB8C >= D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][0]) {
} else { D_8082AB8C -= stepR;
D_8082AB90 += stepG; } else {
} D_8082AB8C += stepR;
if (D_8082AB94 >= D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][2]) { }
D_8082AB94 -= stepB; if (D_8082AB90 >= D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][1]) {
} else { D_8082AB90 -= stepG;
D_8082AB94 += stepB; } else {
} D_8082AB90 += stepG;
}
D_8082AD3C--; if (D_8082AB94 >= D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][2]) {
if (D_8082AD3C == 0) { D_8082AB94 -= stepB;
D_8082AB8C = D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][0]; } else {
D_8082AB90 = D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][1]; D_8082AB94 += stepB;
D_8082AB94 = D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][2];
D_8082AD3C = ZREG(28 + D_8082AD40);
D_8082AD40++;
if (D_8082AD40 >= 4) {
D_8082AD40 = 0;
} }
} }
if (CVar_GetS32("gGameCubeColors", 0) != 0) {
D_8082AD3C--;
if (D_8082AD3C == 0) {
D_8082AB8C = D_8082ACF5[pauseCtx->cursorColorSet + D_8082AD40][0];
D_8082AB90 = D_8082ACF5[pauseCtx->cursorColorSet + D_8082AD40][1];
D_8082AB94 = D_8082ACF5[pauseCtx->cursorColorSet + D_8082AD40][2];
D_8082AD3C = ZREG(28 + D_8082AD40);
D_8082AD40++;
if (D_8082AD40 >= 4) {
D_8082AD40 = 0;
}
}
} else {
D_8082AD3C--;
if (D_8082AD3C == 0) {
D_8082AB8C = D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][0];
D_8082AB90 = D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][1];
D_8082AB94 = D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][2];
D_8082AD3C = ZREG(28 + D_8082AD40);
D_8082AD40++;
if (D_8082AD40 >= 4) {
D_8082AD40 = 0;
}
}
}
if (pauseCtx->stickRelX < -30) { if (pauseCtx->stickRelX < -30) {
if (D_8082AD4C == -1) { if (D_8082AD4C == -1) {
if (--D_8082AD44 < 0) { if (--D_8082AD44 < 0) {
@ -1363,7 +1413,11 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
gDPSetCombineLERP(POLY_KAL_DISP++, 1, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, 1, 0, PRIMITIVE, 0, TEXEL0, gDPSetCombineLERP(POLY_KAL_DISP++, 1, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, 1, 0, PRIMITIVE, 0, TEXEL0,
0, PRIMITIVE, 0); 0, PRIMITIVE, 0);
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 100, 100, 255, VREG(61)); if (CVar_GetS32("gGameCubeColors", 0) != 0) {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 100, 255, 100, VREG(61));
} else {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 100, 100, 255, VREG(61));
}
if (pauseCtx->promptChoice == 0) { if (pauseCtx->promptChoice == 0) {
gSPDisplayList(POLY_KAL_DISP++, gPromptCursorLeftDL); gSPDisplayList(POLY_KAL_DISP++, gPromptCursorLeftDL);
@ -1387,8 +1441,11 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
gDPSetCombineLERP(POLY_KAL_DISP++, 1, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, 1, 0, PRIMITIVE, 0, gDPSetCombineLERP(POLY_KAL_DISP++, 1, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, 1, 0, PRIMITIVE, 0,
TEXEL0, 0, PRIMITIVE, 0); TEXEL0, 0, PRIMITIVE, 0);
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 100, 100, 255, VREG(61)); if (CVar_GetS32("gGameCubeColors", 0) != 0) {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 100, 255, 100, VREG(61));
} else {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 100, 100, 255, VREG(61));
}
if (pauseCtx->promptChoice == 0) { if (pauseCtx->promptChoice == 0) {
gSPDisplayList(POLY_KAL_DISP++, gPromptCursorLeftDL); gSPDisplayList(POLY_KAL_DISP++, gPromptCursorLeftDL);
} else { } else {
@ -1743,7 +1800,14 @@ void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) {
pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] = D_8082ADE0[gSaveContext.language] pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] = D_8082ADE0[gSaveContext.language]
<< 5; << 5;
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, gABtnTexColour[0][0], gABtnTexColour[0][1], gABtnTexColour[0][2], gABtnTexColour[0][3]); // Set colour to gABtnSymbolTex if (CVar_GetS32("gGameCubeColors", 0) != 0) {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, gABtnTexColour[1][0], gABtnTexColour[1][1], gABtnTexColour[1][2],
gABtnTexColour[0][3]); // Set colour to gABtnSymbolTex - Gamecube
} else {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, gABtnTexColour[0][0], gABtnTexColour[0][1], gABtnTexColour[0][2],
gABtnTexColour[0][3]); // Set colour to gABtnSymbolTex - N64
}
POLY_KAL_DISP = KaleidoScope_QuadTextureIA8(POLY_KAL_DISP, gABtnSymbolTex, 24, 16, 0); POLY_KAL_DISP = KaleidoScope_QuadTextureIA8(POLY_KAL_DISP, gABtnSymbolTex, 24, 16, 0);
//gSPDisplayList(POLY_KAL_DISP++, gAButtonIconDL); //gSPDisplayList(POLY_KAL_DISP++, gAButtonIconDL);
@ -1825,7 +1889,15 @@ void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) {
pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] = pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] =
D_8082ADE8[gSaveContext.language] << 5; D_8082ADE8[gSaveContext.language] << 5;
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, gABtnTexColour[0][0], gABtnTexColour[0][1], gABtnTexColour[0][2], gABtnTexColour[0][3]); // Set colour to gABtnSymbolTex if (CVar_GetS32("gGameCubeColors", 0) != 0) {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, gABtnTexColour[1][0], gABtnTexColour[1][1],
gABtnTexColour[1][2],
gABtnTexColour[0][3]); // Set colour to gABtnSymbolTex - Gamecube
} else {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, gABtnTexColour[0][0], gABtnTexColour[0][1],
gABtnTexColour[0][2],
gABtnTexColour[0][3]); // Set colour to gABtnSymbolTex - N64
}
POLY_KAL_DISP = KaleidoScope_QuadTextureIA8(POLY_KAL_DISP, gABtnSymbolTex, 24, 16, 0); POLY_KAL_DISP = KaleidoScope_QuadTextureIA8(POLY_KAL_DISP, gABtnSymbolTex, 24, 16, 0);
//gSPDisplayList(POLY_KAL_DISP++, gAButtonIconDL); //gSPDisplayList(POLY_KAL_DISP++, gAButtonIconDL);
@ -1853,7 +1925,15 @@ void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) {
pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] = pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] =
D_8082ADD8[gSaveContext.language] << 5; D_8082ADD8[gSaveContext.language] << 5;
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, gABtnTexColour[0][0], gABtnTexColour[0][1], gABtnTexColour[0][2], gABtnTexColour[0][3]); // Set colour to gABtnSymbolTex if (CVar_GetS32("gGameCubeColors", 0) != 0) {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, gABtnTexColour[1][0], gABtnTexColour[1][1],
gABtnTexColour[1][2],
gABtnTexColour[0][3]); // Set colour to gABtnSymbolTex - Gamecube
} else {
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, gABtnTexColour[0][0], gABtnTexColour[0][1],
gABtnTexColour[0][2],
gABtnTexColour[0][3]); // Set colour to gABtnSymbolTex - N64
}
POLY_KAL_DISP = KaleidoScope_QuadTextureIA8(POLY_KAL_DISP, gABtnSymbolTex, 24, 16, 0); POLY_KAL_DISP = KaleidoScope_QuadTextureIA8(POLY_KAL_DISP, gABtnSymbolTex, 24, 16, 0);
//gSPDisplayList(POLY_KAL_DISP++, gAButtonIconDL); //gSPDisplayList(POLY_KAL_DISP++, gAButtonIconDL);