TAKStation
GitHub
parent
4ede87cc6d
commit
253f5fe7eb
|
|
@ -1,286 +0,0 @@
|
|||
diff --git a/soh/src/code/z_construct.c b/soh/src/code/z_construct.c
|
||||
index 2fd6d43..2e4c170 100644
|
||||
--- a/soh/src/code/z_construct.c
|
||||
+++ b/soh/src/code/z_construct.c
|
||||
@@ -155,16 +155,16 @@ void func_801109B0(GlobalContext* globalCtx) {
|
||||
interfaceCtx->unk_23C = interfaceCtx->unk_242 = 0;
|
||||
|
||||
R_ITEM_BTN_X(0) = B_BUTTON_X;
|
||||
- R_B_BTN_COLOR(0) = 255;
|
||||
- R_B_BTN_COLOR(1) = 30;
|
||||
- R_B_BTN_COLOR(2) = 30;
|
||||
+ R_B_BTN_COLOR(0) = 0;
|
||||
+ R_B_BTN_COLOR(1) = 150;
|
||||
+ R_B_BTN_COLOR(2) = 0;
|
||||
R_ITEM_ICON_X(0) = B_BUTTON_X;
|
||||
R_ITEM_AMMO_X(0) = B_BUTTON_X + 2;
|
||||
R_A_BTN_X = A_BUTTON_X;
|
||||
R_A_ICON_X = A_BUTTON_X;
|
||||
- R_A_BTN_COLOR(0) = 0;
|
||||
- R_A_BTN_COLOR(1) = 200;
|
||||
- R_A_BTN_COLOR(2) = 50;
|
||||
+ R_A_BTN_COLOR(0) = 90;
|
||||
+ R_A_BTN_COLOR(1) = 90;
|
||||
+ R_A_BTN_COLOR(2) = 255;
|
||||
}
|
||||
|
||||
void Message_Init(GlobalContext* globalCtx) {
|
||||
diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c
|
||||
index 4979f04..abf7748 100644
|
||||
--- a/soh/src/code/z_message_PAL.c
|
||||
+++ b/soh/src/code/z_message_PAL.c
|
||||
@@ -129,8 +129,8 @@ void Message_ResetOcarinaNoteState(void) {
|
||||
sOcarinaNotesAlphaValues[3] = sOcarinaNotesAlphaValues[4] = sOcarinaNotesAlphaValues[5] =
|
||||
sOcarinaNotesAlphaValues[6] = sOcarinaNotesAlphaValues[7] = sOcarinaNotesAlphaValues[8] = 0;
|
||||
sOcarinaNoteAPrimR = 80;
|
||||
- sOcarinaNoteAPrimG = 255;
|
||||
- sOcarinaNoteAPrimB = 150;
|
||||
+ sOcarinaNoteAPrimG = 150;
|
||||
+ sOcarinaNoteAPrimB = 255;
|
||||
sOcarinaNoteAEnvR = 10;
|
||||
sOcarinaNoteAEnvG = 10;
|
||||
sOcarinaNoteAEnvB = 10;
|
||||
@@ -491,16 +491,16 @@ void Message_SetTextColor(MessageContext* msgCtx, u16 colorParameter) {
|
||||
|
||||
void Message_DrawTextboxIcon(GlobalContext* globalCtx, Gfx** p, s16 x, s16 y) {
|
||||
static s16 sIconPrimColors[][3] = {
|
||||
- { 0, 200, 80 },
|
||||
- { 50, 255, 130 },
|
||||
+ { 4, 84, 204 },
|
||||
+ { 45, 125, 250 },
|
||||
};
|
||||
static s16 sIconEnvColors[][3] = {
|
||||
{ 0, 0, 0 },
|
||||
- { 0, 255, 130 },
|
||||
+ { 0, 70, 255 },
|
||||
};
|
||||
static s16 sIconPrimR = 0;
|
||||
- static s16 sIconPrimG = 200;
|
||||
- static s16 sIconPrimB = 80;
|
||||
+ static s16 sIconPrimG = 70;
|
||||
+ static s16 sIconPrimB = 255;
|
||||
static s16 sIconFlashTimer = 12;
|
||||
static s16 sIconFlashColorIdx = 0;
|
||||
static s16 sIconEnvR = 0;
|
||||
@@ -1971,12 +1971,12 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
|
||||
gOcarinaATex, gOcarinaCDownTex, gOcarinaCRightTex, gOcarinaCLeftTex, gOcarinaCUpTex,
|
||||
};
|
||||
static s16 sOcarinaNoteAPrimColors[][3] = {
|
||||
- { 80, 255, 150 },
|
||||
- { 100, 255, 200 },
|
||||
+ { 80, 150, 255 },
|
||||
+ { 100, 200, 255 },
|
||||
};
|
||||
static s16 sOcarinaNoteAEnvColors[][3] = {
|
||||
{ 10, 10, 10 },
|
||||
- { 50, 255, 50 },
|
||||
+ { 50, 50, 255 },
|
||||
};
|
||||
static s16 sOcarinaNoteCPrimColors[][3] = {
|
||||
{ 255, 255, 50 },
|
||||
@@ -2284,12 +2284,12 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
|
||||
|
||||
sOcarinaNoteFlashTimer--;
|
||||
if (sOcarinaNoteFlashTimer == 0) {
|
||||
- sOcarinaNoteAPrimR = sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][0];
|
||||
- sOcarinaNoteAPrimG = sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][1];
|
||||
- sOcarinaNoteAPrimB = sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][2];
|
||||
- sOcarinaNoteAEnvR = sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][0];
|
||||
- sOcarinaNoteAEnvG = sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][1];
|
||||
- sOcarinaNoteAEnvB = sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][2];
|
||||
+ sOcarinaNoteAPrimR = 70;
|
||||
+ sOcarinaNoteAPrimG = 70;
|
||||
+ sOcarinaNoteAPrimB = 255;
|
||||
+ sOcarinaNoteAEnvR = 50;
|
||||
+ sOcarinaNoteAEnvG = 50;
|
||||
+ sOcarinaNoteAEnvB = 255;
|
||||
sOcarinaNoteCPrimR = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][0];
|
||||
sOcarinaNoteCPrimG = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][1];
|
||||
sOcarinaNoteCPrimB = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][2];
|
||||
@@ -2901,7 +2901,7 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
|
||||
|
||||
gDPPipeSync(gfx++);
|
||||
if (sOcarinaNoteBuf[i] == OCARINA_NOTE_A) {
|
||||
- gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteAPrimR, sOcarinaNoteAPrimG, sOcarinaNoteAPrimB,
|
||||
+ gDPSetPrimColor(gfx++, 0, 0, 81, 135, 221,
|
||||
sOcarinaNotesAlphaValues[i]);
|
||||
gDPSetEnvColor(gfx++, sOcarinaNoteAEnvR, sOcarinaNoteAEnvG, sOcarinaNoteAEnvB, 0);
|
||||
} else {
|
||||
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
|
||||
index 3219527..a4c116b 100644
|
||||
--- a/soh/src/code/z_parameter.c
|
||||
+++ b/soh/src/code/z_parameter.c
|
||||
@@ -2755,7 +2755,8 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) {
|
||||
// Also loads the Item Button Texture reused by other buttons afterwards
|
||||
gDPPipeSync(OVERLAY_DISP++);
|
||||
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), interfaceCtx->bAlpha);
|
||||
+ 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);
|
||||
|
||||
OVERLAY_DISP =
|
||||
@@ -2791,7 +2792,7 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) {
|
||||
if ((globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.debugState != 0)) {
|
||||
// Start Button Texture, Color & Label
|
||||
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,
|
||||
(OTRGetRectDimensionFromRightEdge(startButtonLeftPos[gSaveContext.language]) + 22) << 2, 156,
|
||||
G_TX_RENDERTILE, 0, 0, 1462, 1462);
|
||||
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 04975d9..543c03c 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
|
||||
@@ -2251,7 +2251,7 @@ void EnOssan_DrawCursor(GlobalContext* globalCtx, EnOssan* this, f32 x, f32 y, f
|
||||
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4192);
|
||||
if (drawCursor != 0) {
|
||||
func_80094520(globalCtx->state.gfxCtx);
|
||||
- gDPSetPrimColor(OVERLAY_DISP++, 0, 0, this->cursorColorR, this->cursorColorG, this->cursorColorB,
|
||||
+ gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 0, 42, 238,
|
||||
this->cursorColorA);
|
||||
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);
|
||||
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 46be115..5f79921 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
|
||||
@@ -497,7 +497,7 @@ 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]);
|
||||
+ gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 80, 150, 255, D_8082A150[sp218]);
|
||||
} else {
|
||||
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 (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 {
|
||||
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++);
|
||||
|
||||
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 {
|
||||
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 50, D_8082A150[phi_s3]);
|
||||
}
|
||||
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 a5c1607..7b0daac 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
|
||||
@@ -757,7 +757,7 @@ static void* sCursorTexs[] = {
|
||||
static s16 sCursorColors[][3] = {
|
||||
{ 255, 255, 255 },
|
||||
{ 255, 255, 0 },
|
||||
- { 0, 255, 50 },
|
||||
+ { 0, 50, 255 },
|
||||
};
|
||||
|
||||
static void* sSavePromptTexs[] = {
|
||||
@@ -1063,7 +1063,7 @@ Gfx* KaleidoScope_DrawPageSections(Gfx* gfx, Vtx* vertices, void** textures) {
|
||||
void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
|
||||
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 }, { 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_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,
|
||||
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) {
|
||||
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,
|
||||
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) {
|
||||
gSPDisplayList(POLY_KAL_DISP++, gPromptCursorLeftDL);
|
||||
@@ -1450,6 +1450,12 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
|
||||
}
|
||||
|
||||
void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) {
|
||||
+ static s16 gABtnTexColour[][4] = {
|
||||
+ // A button colors
|
||||
+ { 0, 100, 255, 255 }, // Original N64
|
||||
+ { 0, 255, 100, 255 }, // Gamecube
|
||||
+ };
|
||||
+
|
||||
static void* D_8082AD54[3] = {
|
||||
gPauseToEquipENGTex,
|
||||
gPauseToEquipGERTex,
|
||||
@@ -1766,9 +1772,11 @@ void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) {
|
||||
pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] = D_8082ADE0[gSaveContext.language]
|
||||
<< 5;
|
||||
|
||||
- gSPDisplayList(POLY_KAL_DISP++, gAButtonIconDL);
|
||||
+ gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, gABtnTexColour[0][0], gABtnTexColour[0][1], gABtnTexColour[0][2], gABtnTexColour[0][3]); // Set colour to gABtnSymbolTex
|
||||
+ POLY_KAL_DISP = KaleidoScope_QuadTextureIA8(POLY_KAL_DISP, gABtnSymbolTex, 24, 16, 0);
|
||||
+ //gSPDisplayList(POLY_KAL_DISP++, gAButtonIconDL);
|
||||
|
||||
- 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],
|
||||
@@ -1846,9 +1854,11 @@ void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) {
|
||||
pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] =
|
||||
D_8082ADE8[gSaveContext.language] << 5;
|
||||
|
||||
- gSPDisplayList(POLY_KAL_DISP++, gAButtonIconDL);
|
||||
+ gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, gABtnTexColour[0][0], gABtnTexColour[0][1], gABtnTexColour[0][2], gABtnTexColour[0][3]); // Set colour to gABtnSymbolTex
|
||||
+ POLY_KAL_DISP = KaleidoScope_QuadTextureIA8(POLY_KAL_DISP, gABtnSymbolTex, 24, 16, 0);
|
||||
+ //gSPDisplayList(POLY_KAL_DISP++, gAButtonIconDL);
|
||||
|
||||
- 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_8082AD6C[gSaveContext.language],
|
||||
@@ -1872,15 +1882,19 @@ void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) {
|
||||
pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] =
|
||||
D_8082ADD8[gSaveContext.language] << 5;
|
||||
|
||||
- gSPDisplayList(POLY_KAL_DISP++, gAButtonIconDL);
|
||||
+ gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, gABtnTexColour[0][0], gABtnTexColour[0][1], gABtnTexColour[0][2], gABtnTexColour[0][3]); // Set colour to gABtnSymbolTex
|
||||
+ POLY_KAL_DISP = KaleidoScope_QuadTextureIA8(POLY_KAL_DISP, gABtnSymbolTex, 24, 16, 0);
|
||||
+ //gSPDisplayList(POLY_KAL_DISP++, gAButtonIconDL);
|
||||
|
||||
- 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_8082AD54[gSaveContext.language],
|
||||
D_8082ADD8[gSaveContext.language], 16, 4);
|
||||
+
|
||||
+
|
||||
}
|
||||
- }
|
||||
+ }
|
||||
}
|
||||
|
||||
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_kaleido_scope_PAL.c", 2032);
|
||||
@@ -4069,4 +4083,4 @@ void KaleidoScope_Update(GlobalContext* globalCtx)
|
||||
osSyncPrintf(VT_RST);
|
||||
break;
|
||||
}
|
||||
-}
|
||||
+}
|
||||
\ No newline at end of file
|
||||
Loading…
Reference in New Issue