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

Revert GCN colors to N64

Browse source
This commit is contained in:
Zelllll 2022-03-26 14:28:49 -05:00
commit 13fe3e7649
6 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
soh/src/code/z_construct.c
View file

@ -155,16 +155,16 @@ void func_801109B0(GlobalContext* globalCtx) {
interfaceCtx->unk_23C = interfaceCtx->unk_242 = 0; interfaceCtx->unk_23C = interfaceCtx->unk_242 = 0;
R_ITEM_BTN_X(0) = B_BUTTON_X; R_ITEM_BTN_X(0) = B_BUTTON_X;
R_B_BTN_COLOR(0) = 255; R_B_BTN_COLOR(0) = 0;
R_B_BTN_COLOR(1) = 30; R_B_BTN_COLOR(1) = 150;
R_B_BTN_COLOR(2) = 30; R_B_BTN_COLOR(2) = 0;
R_ITEM_ICON_X(0) = B_BUTTON_X; R_ITEM_ICON_X(0) = B_BUTTON_X;
R_ITEM_AMMO_X(0) = B_BUTTON_X + 2; R_ITEM_AMMO_X(0) = B_BUTTON_X + 2;
R_A_BTN_X = A_BUTTON_X; R_A_BTN_X = A_BUTTON_X;
R_A_ICON_X = A_BUTTON_X; R_A_ICON_X = A_BUTTON_X;
R_A_BTN_COLOR(0) = 0; R_A_BTN_COLOR(0) = 90;
R_A_BTN_COLOR(1) = 200; R_A_BTN_COLOR(1) = 90;
R_A_BTN_COLOR(2) = 50; R_A_BTN_COLOR(2) = 255;
} }
void Message_Init(GlobalContext* globalCtx) { void Message_Init(GlobalContext* globalCtx) {

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

@ -129,8 +129,8 @@ void Message_ResetOcarinaNoteState(void) {
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 = 255; sOcarinaNoteAPrimG = 150;
sOcarinaNoteAPrimB = 150; sOcarinaNoteAPrimB = 255;
sOcarinaNoteAEnvR = 10; sOcarinaNoteAEnvR = 10;
sOcarinaNoteAEnvG = 10; sOcarinaNoteAEnvG = 10;
sOcarinaNoteAEnvB = 10; sOcarinaNoteAEnvB = 10;
@ -491,12 +491,12 @@ void Message_SetTextColor(MessageContext* msgCtx, u16 colorParameter) {
void Message_DrawTextboxIcon(GlobalContext* globalCtx, Gfx** p, s16 x, s16 y) { void Message_DrawTextboxIcon(GlobalContext* globalCtx, Gfx** p, s16 x, s16 y) {
static s16 sIconPrimColors[][3] = { static s16 sIconPrimColors[][3] = {
{ 0, 200, 80 }, { 0, 80, 200 },
{ 50, 255, 130 }, { 50, 130, 255 },
}; };
static s16 sIconEnvColors[][3] = { static s16 sIconEnvColors[][3] = {
{ 0, 0, 0 }, { 0, 0, 0 },
{ 0, 255, 130 }, { 0, 130, 255 },
}; };
static s16 sIconPrimR = 0; static s16 sIconPrimR = 0;
static s16 sIconPrimG = 200; static s16 sIconPrimG = 200;
@ -1971,12 +1971,12 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
gOcarinaATex, gOcarinaCDownTex, gOcarinaCRightTex, gOcarinaCLeftTex, gOcarinaCUpTex, gOcarinaATex, gOcarinaCDownTex, gOcarinaCRightTex, gOcarinaCLeftTex, gOcarinaCUpTex,
}; };
static s16 sOcarinaNoteAPrimColors[][3] = { static s16 sOcarinaNoteAPrimColors[][3] = {
{ 80, 255, 150 }, { 80, 150, 255 },
{ 100, 255, 200 }, { 100, 200, 255 },
}; };
static s16 sOcarinaNoteAEnvColors[][3] = { static s16 sOcarinaNoteAEnvColors[][3] = {
{ 10, 10, 10 }, { 10, 10, 10 },
{ 50, 255, 50 }, { 50, 50, 255 },
}; };
static s16 sOcarinaNoteCPrimColors[][3] = { static s16 sOcarinaNoteCPrimColors[][3] = {
{ 255, 255, 50 }, { 255, 255, 50 },

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

@ -2791,7 +2791,7 @@ 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, 120, 120, 120, interfaceCtx->startAlpha); 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);

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

@ -1880,8 +1880,8 @@ void EnOssan_UpdateCursorAnim(EnOssan* this) {
} }
} }
this->cursorColorR = ColChanMix(0, 0.0f, t); this->cursorColorR = ColChanMix(0, 0.0f, t);
this->cursorColorG = ColChanMix(255, 80.0f, t); this->cursorColorG = ColChanMix(80, 0.0f, t);
this->cursorColorB = ColChanMix(80, 0.0f, t); this->cursorColorB = ColChanMix(255, 80.0f, t);
this->cursorColorA = ColChanMix(255, 0.0f, t); this->cursorColorA = ColChanMix(255, 0.0f, t);
this->cursorAnimTween = t; this->cursorAnimTween = t;
} }

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

@ -497,7 +497,7 @@ 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, 255, 150, D_8082A150[sp218]); 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]);
} }
@ -527,7 +527,7 @@ 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, 255, 150, 200); 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);
} }
@ -582,7 +582,7 @@ 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, 255, 150, D_8082A150[phi_s3]); 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]);
} }

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

@ -757,7 +757,7 @@ static void* sCursorTexs[] = {
static s16 sCursorColors[][3] = { static s16 sCursorColors[][3] = {
{ 255, 255, 255 }, { 255, 255, 255 },
{ 255, 255, 0 }, { 255, 255, 0 },
{ 0, 255, 50 }, { 0, 50, 255 },
}; };
static void* sSavePromptTexs[] = { static void* sSavePromptTexs[] = {
@ -1063,7 +1063,7 @@ Gfx* KaleidoScope_DrawPageSections(Gfx* gfx, Vtx* vertices, void** textures) {
void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) { void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
static s16 D_8082ACF4[][3] = { static s16 D_8082ACF4[][3] = {
{ 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, 255, 50 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 255, 50 }, { 0, 0, 0 }, { 255, 255, 0 }, { 0, 50, 255 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 50, 255 },
}; };
static s16 D_8082AD3C = 20; static s16 D_8082AD3C = 20;
static s16 D_8082AD40 = 0; static s16 D_8082AD40 = 0;
@ -1392,7 +1392,7 @@ 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, 255, 100, VREG(61)); 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);
@ -1416,7 +1416,7 @@ 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, 255, 100, VREG(61)); 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);