falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename infoPanelVtx to decorVtx

This commit is contained in:
Dragorn421 2025-06-20 13:27:55 +02:00
parent 2e29e8def8
commit 2320b4f9c7
No known key found for this signature in database
GPG Key ID: 05949E029F4EF294
3 changed files with 146 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pause.h
View File

@ -168,7 +168,7 @@ typedef struct PauseContext {
/* 0x0148 */ Vtx* equipPageVtx;
/* 0x014C */ Vtx* mapPageVtx;
/* 0x0150 */ Vtx* questPageVtx;
/* 0x0154 */ Vtx* infoPanelVtx;
/* 0x0154 */ Vtx* decorVtx;
/* 0x0158 */ Vtx* itemVtx;
/* 0x015C */ Vtx* equipVtx;
/* 0x0160 */ char unk_160[0x04];

286
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
View File

@ -1649,7 +1649,10 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
CLOSE_DISPS(gfxCtx, "../z_kaleido_scope_PAL.c", 1577);
}
void KaleidoScope_DrawInfoPanel(PlayState* play) {
/**
* Draws the buttons for scrolling left/right, and the info plate.
*/
void KaleidoScope_DrawDecor(PlayState* play) {
static void* sToEquipTextTextures[] =
LANGUAGE_ARRAY(gPauseToEquipJPNTex, gPauseToEquipENGTex, gPauseToEquipGERTex, gPauseToEquipFRATex);
static void* sToDecideTextTextures[] =
@ -1744,94 +1747,87 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
}
temp = pauseCtx->infoPanelOffsetY - 76;
for (j = 0, i = 0; i < INFO_PANEL_QUAD_MAX; i++, j += 4) {
pauseCtx->infoPanelVtx[j + 0].v.ob[0] = pauseCtx->infoPanelVtx[j + 2].v.ob[0] = -72;
for (j = 0, i = 0; i < DECOR_QUAD_MAX; i++, j += 4) {
pauseCtx->decorVtx[j + 0].v.ob[0] = pauseCtx->decorVtx[j + 2].v.ob[0] = -72;
pauseCtx->infoPanelVtx[j + 1].v.ob[0] = pauseCtx->infoPanelVtx[j + 3].v.ob[0] = 0;
pauseCtx->decorVtx[j + 1].v.ob[0] = pauseCtx->decorVtx[j + 3].v.ob[0] = 0;
pauseCtx->infoPanelVtx[j + 0].v.ob[1] = pauseCtx->infoPanelVtx[j + 1].v.ob[1] = temp;
pauseCtx->decorVtx[j + 0].v.ob[1] = pauseCtx->decorVtx[j + 1].v.ob[1] = temp;
pauseCtx->infoPanelVtx[j + 2].v.ob[1] = pauseCtx->infoPanelVtx[j + 3].v.ob[1] = temp - 24;
pauseCtx->decorVtx[j + 2].v.ob[1] = pauseCtx->decorVtx[j + 3].v.ob[1] = temp - 24;
pauseCtx->infoPanelVtx[j + 0].v.ob[2] = pauseCtx->infoPanelVtx[j + 1].v.ob[2] =
pauseCtx->infoPanelVtx[j + 2].v.ob[2] = pauseCtx->infoPanelVtx[j + 3].v.ob[2] = 0;
pauseCtx->decorVtx[j + 0].v.ob[2] = pauseCtx->decorVtx[j + 1].v.ob[2] = pauseCtx->decorVtx[j + 2].v.ob[2] =
pauseCtx->decorVtx[j + 3].v.ob[2] = 0;
pauseCtx->infoPanelVtx[j + 0].v.flag = pauseCtx->infoPanelVtx[j + 1].v.flag =
pauseCtx->infoPanelVtx[j + 2].v.flag = pauseCtx->infoPanelVtx[j + 3].v.flag = 0;
pauseCtx->decorVtx[j + 0].v.flag = pauseCtx->decorVtx[j + 1].v.flag = pauseCtx->decorVtx[j + 2].v.flag =
pauseCtx->decorVtx[j + 3].v.flag = 0;
pauseCtx->infoPanelVtx[j + 0].v.tc[0] = pauseCtx->infoPanelVtx[j + 0].v.tc[1] =
pauseCtx->infoPanelVtx[j + 1].v.tc[1] = pauseCtx->infoPanelVtx[j + 2].v.tc[0] = 0;
pauseCtx->decorVtx[j + 0].v.tc[0] = pauseCtx->decorVtx[j + 0].v.tc[1] = pauseCtx->decorVtx[j + 1].v.tc[1] =
pauseCtx->decorVtx[j + 2].v.tc[0] = 0;
pauseCtx->infoPanelVtx[j + 1].v.tc[0] = pauseCtx->infoPanelVtx[j + 3].v.tc[0] = 0x900;
pauseCtx->decorVtx[j + 1].v.tc[0] = pauseCtx->decorVtx[j + 3].v.tc[0] = 0x900;
pauseCtx->infoPanelVtx[j + 2].v.tc[1] = pauseCtx->infoPanelVtx[j + 3].v.tc[1] = 0x300;
pauseCtx->decorVtx[j + 2].v.tc[1] = pauseCtx->decorVtx[j + 3].v.tc[1] = 0x300;
pauseCtx->infoPanelVtx[j + 0].v.cn[0] = pauseCtx->infoPanelVtx[j + 2].v.cn[0] =
pauseCtx->infoPanelVtx[j + 0].v.cn[1] = pauseCtx->infoPanelVtx[j + 2].v.cn[1] =
pauseCtx->infoPanelVtx[j + 0].v.cn[2] = pauseCtx->infoPanelVtx[j + 2].v.cn[2] =
pauseCtx->infoPanelVtx[j + 1].v.cn[0] = pauseCtx->infoPanelVtx[j + 3].v.cn[0] =
pauseCtx->infoPanelVtx[j + 1].v.cn[1] = pauseCtx->infoPanelVtx[j + 3].v.cn[1] =
pauseCtx->infoPanelVtx[j + 1].v.cn[2] = pauseCtx->infoPanelVtx[j + 3].v.cn[2] = 200;
pauseCtx->decorVtx[j + 0].v.cn[0] = pauseCtx->decorVtx[j + 2].v.cn[0] = pauseCtx->decorVtx[j + 0].v.cn[1] =
pauseCtx->decorVtx[j + 2].v.cn[1] = pauseCtx->decorVtx[j + 0].v.cn[2] = pauseCtx->decorVtx[j + 2].v.cn[2] =
pauseCtx->decorVtx[j + 1].v.cn[0] = pauseCtx->decorVtx[j + 3].v.cn[0] =
pauseCtx->decorVtx[j + 1].v.cn[1] = pauseCtx->decorVtx[j + 3].v.cn[1] =
pauseCtx->decorVtx[j + 1].v.cn[2] = pauseCtx->decorVtx[j + 3].v.cn[2] = 200;
pauseCtx->infoPanelVtx[j + 0].v.cn[3] = pauseCtx->infoPanelVtx[j + 2].v.cn[3] =
pauseCtx->infoPanelVtx[j + 1].v.cn[3] = pauseCtx->infoPanelVtx[j + 3].v.cn[3] = pauseCtx->alpha;
pauseCtx->decorVtx[j + 0].v.cn[3] = pauseCtx->decorVtx[j + 2].v.cn[3] = pauseCtx->decorVtx[j + 1].v.cn[3] =
pauseCtx->decorVtx[j + 3].v.cn[3] = pauseCtx->alpha;
}
// INFO_PANEL_QUAD_BG_RIGHT
pauseCtx->infoPanelVtx[4].v.ob[0] = pauseCtx->infoPanelVtx[6].v.ob[0] = pauseCtx->infoPanelVtx[0].v.ob[0] + 72;
// DECOR_QUAD_INFO_BG_RIGHT
pauseCtx->decorVtx[4].v.ob[0] = pauseCtx->decorVtx[6].v.ob[0] = pauseCtx->decorVtx[0].v.ob[0] + 72;
pauseCtx->infoPanelVtx[5].v.ob[0] = pauseCtx->infoPanelVtx[7].v.ob[0] = pauseCtx->infoPanelVtx[4].v.ob[0] + 72;
pauseCtx->decorVtx[5].v.ob[0] = pauseCtx->decorVtx[7].v.ob[0] = pauseCtx->decorVtx[4].v.ob[0] + 72;
// INFO_PANEL_QUAD_BUTTON_LEFT
// DECOR_QUAD_BUTTON_LEFT
if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_LEFT) && (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE)) {
pauseCtx->infoPanelVtx[8].v.ob[0] = pauseCtx->infoPanelVtx[10].v.ob[0] = WREG(16);
pauseCtx->decorVtx[8].v.ob[0] = pauseCtx->decorVtx[10].v.ob[0] = WREG(16);
pauseCtx->infoPanelVtx[9].v.ob[0] = pauseCtx->infoPanelVtx[11].v.ob[0] = pauseCtx->infoPanelVtx[8].v.ob[0] + 24;
pauseCtx->decorVtx[9].v.ob[0] = pauseCtx->decorVtx[11].v.ob[0] = pauseCtx->decorVtx[8].v.ob[0] + 24;
pauseCtx->infoPanelVtx[8].v.ob[1] = pauseCtx->infoPanelVtx[9].v.ob[1] = WREG(18);
pauseCtx->decorVtx[8].v.ob[1] = pauseCtx->decorVtx[9].v.ob[1] = WREG(18);
pauseCtx->infoPanelVtx[10].v.ob[1] = pauseCtx->infoPanelVtx[11].v.ob[1] =
pauseCtx->infoPanelVtx[8].v.ob[1] - 32;
pauseCtx->decorVtx[10].v.ob[1] = pauseCtx->decorVtx[11].v.ob[1] = pauseCtx->decorVtx[8].v.ob[1] - 32;
} else {
pauseCtx->infoPanelVtx[8].v.ob[0] = pauseCtx->infoPanelVtx[10].v.ob[0] = WREG(16) + 3;
pauseCtx->decorVtx[8].v.ob[0] = pauseCtx->decorVtx[10].v.ob[0] = WREG(16) + 3;
pauseCtx->infoPanelVtx[9].v.ob[0] = pauseCtx->infoPanelVtx[11].v.ob[0] = pauseCtx->infoPanelVtx[8].v.ob[0] + 18;
pauseCtx->decorVtx[9].v.ob[0] = pauseCtx->decorVtx[11].v.ob[0] = pauseCtx->decorVtx[8].v.ob[0] + 18;
pauseCtx->infoPanelVtx[8].v.ob[1] = pauseCtx->infoPanelVtx[9].v.ob[1] = WREG(18) - 3;
pauseCtx->decorVtx[8].v.ob[1] = pauseCtx->decorVtx[9].v.ob[1] = WREG(18) - 3;
pauseCtx->infoPanelVtx[10].v.ob[1] = pauseCtx->infoPanelVtx[11].v.ob[1] =
pauseCtx->infoPanelVtx[8].v.ob[1] - 26;
pauseCtx->decorVtx[10].v.ob[1] = pauseCtx->decorVtx[11].v.ob[1] = pauseCtx->decorVtx[8].v.ob[1] - 26;
}
// INFO_PANEL_QUAD_BUTTON_RIGHT
// DECOR_QUAD_BUTTON_RIGHT
if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_RIGHT) && (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE)) {
pauseCtx->infoPanelVtx[12].v.ob[0] = pauseCtx->infoPanelVtx[14].v.ob[0] = WREG(17);
pauseCtx->decorVtx[12].v.ob[0] = pauseCtx->decorVtx[14].v.ob[0] = WREG(17);
pauseCtx->infoPanelVtx[13].v.ob[0] = pauseCtx->infoPanelVtx[15].v.ob[0] =
pauseCtx->infoPanelVtx[12].v.ob[0] + 24;
pauseCtx->decorVtx[13].v.ob[0] = pauseCtx->decorVtx[15].v.ob[0] = pauseCtx->decorVtx[12].v.ob[0] + 24;
pauseCtx->infoPanelVtx[12].v.ob[1] = pauseCtx->infoPanelVtx[13].v.ob[1] = WREG(18);
pauseCtx->decorVtx[12].v.ob[1] = pauseCtx->decorVtx[13].v.ob[1] = WREG(18);
pauseCtx->infoPanelVtx[14].v.ob[1] = pauseCtx->infoPanelVtx[15].v.ob[1] =
pauseCtx->infoPanelVtx[12].v.ob[1] - 32;
pauseCtx->decorVtx[14].v.ob[1] = pauseCtx->decorVtx[15].v.ob[1] = pauseCtx->decorVtx[12].v.ob[1] - 32;
} else {
pauseCtx->infoPanelVtx[12].v.ob[0] = pauseCtx->infoPanelVtx[14].v.ob[0] = WREG(17) + 3;
pauseCtx->decorVtx[12].v.ob[0] = pauseCtx->decorVtx[14].v.ob[0] = WREG(17) + 3;
pauseCtx->infoPanelVtx[13].v.ob[0] = pauseCtx->infoPanelVtx[15].v.ob[0] =
pauseCtx->infoPanelVtx[12].v.ob[0] + 18;
pauseCtx->decorVtx[13].v.ob[0] = pauseCtx->decorVtx[15].v.ob[0] = pauseCtx->decorVtx[12].v.ob[0] + 18;
pauseCtx->infoPanelVtx[12].v.ob[1] = pauseCtx->infoPanelVtx[13].v.ob[1] = WREG(18) - 3;
pauseCtx->decorVtx[12].v.ob[1] = pauseCtx->decorVtx[13].v.ob[1] = WREG(18) - 3;
pauseCtx->infoPanelVtx[14].v.ob[1] = pauseCtx->infoPanelVtx[15].v.ob[1] =
pauseCtx->infoPanelVtx[12].v.ob[1] - 26;
pauseCtx->decorVtx[14].v.ob[1] = pauseCtx->decorVtx[15].v.ob[1] = pauseCtx->decorVtx[12].v.ob[1] - 26;
}
// INFO_PANEL_QUAD_BUTTON_LEFT, INFO_PANEL_QUAD_BUTTON_RIGHT
pauseCtx->infoPanelVtx[9].v.tc[0] = pauseCtx->infoPanelVtx[11].v.tc[0] = pauseCtx->infoPanelVtx[13].v.tc[0] =
pauseCtx->infoPanelVtx[15].v.tc[0] = 0x300;
// DECOR_QUAD_BUTTON_LEFT, DECOR_QUAD_BUTTON_RIGHT
pauseCtx->decorVtx[9].v.tc[0] = pauseCtx->decorVtx[11].v.tc[0] = pauseCtx->decorVtx[13].v.tc[0] =
pauseCtx->decorVtx[15].v.tc[0] = 0x300;
pauseCtx->infoPanelVtx[10].v.tc[1] = pauseCtx->infoPanelVtx[11].v.tc[1] = pauseCtx->infoPanelVtx[14].v.tc[1] =
pauseCtx->infoPanelVtx[15].v.tc[1] = 0x400;
pauseCtx->decorVtx[10].v.tc[1] = pauseCtx->decorVtx[11].v.tc[1] = pauseCtx->decorVtx[14].v.tc[1] =
pauseCtx->decorVtx[15].v.tc[1] = 0x400;
gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
@ -1841,16 +1837,16 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_kaleido_scope_PAL.c", 1755);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 90, 100, 130, 255);
gSPVertex(POLY_OPA_DISP++, &pauseCtx->infoPanelVtx[0], 16, 0);
gSPVertex(POLY_OPA_DISP++, &pauseCtx->decorVtx[0], 16, 0);
// Draw INFO_PANEL_QUAD_BG_LEFT, INFO_PANEL_QUAD_BG_RIGHT
// Draw DECOR_QUAD_INFO_BG_LEFT, DECOR_QUAD_INFO_BG_RIGHT
gSPDisplayList(POLY_OPA_DISP++, gInfoPanelBgDL);
if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_LEFT) && (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE)) {
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, D_808321A0, D_808321A2, D_808321A4, D_808321A6);
}
// Draw INFO_PANEL_QUAD_BUTTON_LEFT
// Draw DECOR_QUAD_BUTTON_LEFT
gSPDisplayList(POLY_OPA_DISP++, gLButtonIconDL);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 180, 210, 255, 220);
@ -1859,23 +1855,23 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, D_808321A0, D_808321A2, D_808321A4, D_808321A6);
}
// Draw INFO_PANEL_QUAD_BUTTON_RIGHT
// Draw DECOR_QUAD_BUTTON_RIGHT
gSPDisplayList(POLY_OPA_DISP++, gRButtonIconDL);
if (pauseCtx->cursorSpecialPos != 0) {
j = (pauseCtx->cursorSpecialPos - 8) * 4;
pauseCtx->cursorVtx[0].v.ob[0] = pauseCtx->infoPanelVtx[j].v.ob[0];
pauseCtx->cursorVtx[0].v.ob[1] = pauseCtx->infoPanelVtx[j].v.ob[1];
pauseCtx->cursorVtx[0].v.ob[0] = pauseCtx->decorVtx[j].v.ob[0];
pauseCtx->cursorVtx[0].v.ob[1] = pauseCtx->decorVtx[j].v.ob[1];
KaleidoScope_DrawCursor(play, pauseCtx->pageIndex);
}
// INFO_PANEL_QUAD_INFO_ICON
// DECOR_QUAD_INFO_ICON
temp = pauseCtx->infoPanelOffsetY - 80;
pauseCtx->infoPanelVtx[16].v.ob[1] = pauseCtx->infoPanelVtx[17].v.ob[1] = temp;
pauseCtx->decorVtx[16].v.ob[1] = pauseCtx->decorVtx[17].v.ob[1] = temp;
pauseCtx->infoPanelVtx[18].v.ob[1] = pauseCtx->infoPanelVtx[19].v.ob[1] = pauseCtx->infoPanelVtx[16].v.ob[1] - 16;
pauseCtx->decorVtx[18].v.ob[1] = pauseCtx->decorVtx[19].v.ob[1] = pauseCtx->decorVtx[16].v.ob[1] - 16;
pauseCtx->infoPanelVtx[18].v.tc[1] = pauseCtx->infoPanelVtx[19].v.tc[1] = 0x200;
pauseCtx->decorVtx[18].v.tc[1] = pauseCtx->decorVtx[19].v.tc[1] = 0x200;
gDPPipeSync(POLY_OPA_DISP++);
gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE,
@ -1896,15 +1892,14 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
(pauseCtx->mainState <= PAUSE_MAIN_STATE_EQUIP_CHANGED)) ||
(pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) {
// INFO_PANEL_QUAD_INFO_ICON
pauseCtx->infoPanelVtx[16].v.ob[0] = pauseCtx->infoPanelVtx[18].v.ob[0] = -63;
// DECOR_QUAD_INFO_ICON
pauseCtx->decorVtx[16].v.ob[0] = pauseCtx->decorVtx[18].v.ob[0] = -63;
pauseCtx->infoPanelVtx[17].v.ob[0] = pauseCtx->infoPanelVtx[19].v.ob[0] =
pauseCtx->infoPanelVtx[16].v.ob[0] + 128;
pauseCtx->decorVtx[17].v.ob[0] = pauseCtx->decorVtx[19].v.ob[0] = pauseCtx->decorVtx[16].v.ob[0] + 128;
pauseCtx->infoPanelVtx[17].v.tc[0] = pauseCtx->infoPanelVtx[19].v.tc[0] = 0x1000;
pauseCtx->decorVtx[17].v.tc[0] = pauseCtx->decorVtx[19].v.tc[0] = 0x1000;
gSPVertex(POLY_OPA_DISP++, &pauseCtx->infoPanelVtx[16], 4, 0);
gSPVertex(POLY_OPA_DISP++, &pauseCtx->decorVtx[16], 4, 0);
if (pauseCtx->nameColorSet == 1) {
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 70, 70, 70, 255);
@ -1938,22 +1933,19 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
if (GET_GS_FLAGS(D_8082AE30[pauseCtx->cursorPoint[PAUSE_WORLD_MAP]]) ==
gAreaGsFlags[D_8082AE30[pauseCtx->cursorPoint[PAUSE_WORLD_MAP]]]) {
// INFO_PANEL_QUAD_HAVE_ALL_GS
pauseCtx->infoPanelVtx[24].v.ob[0] = pauseCtx->infoPanelVtx[26].v.ob[0] = -74;
// DECOR_QUAD_HAVE_ALL_GS
pauseCtx->decorVtx[24].v.ob[0] = pauseCtx->decorVtx[26].v.ob[0] = -74;
pauseCtx->infoPanelVtx[25].v.ob[0] = pauseCtx->infoPanelVtx[27].v.ob[0] =
pauseCtx->infoPanelVtx[24].v.ob[0] + 19;
pauseCtx->decorVtx[25].v.ob[0] = pauseCtx->decorVtx[27].v.ob[0] = pauseCtx->decorVtx[24].v.ob[0] + 19;
pauseCtx->infoPanelVtx[24].v.ob[1] = pauseCtx->infoPanelVtx[25].v.ob[1] =
pauseCtx->infoPanelVtx[24].v.ob[1] - 2;
pauseCtx->decorVtx[24].v.ob[1] = pauseCtx->decorVtx[25].v.ob[1] = pauseCtx->decorVtx[24].v.ob[1] - 2;
pauseCtx->infoPanelVtx[26].v.ob[1] = pauseCtx->infoPanelVtx[27].v.ob[1] =
pauseCtx->infoPanelVtx[24].v.ob[1] - 19;
pauseCtx->decorVtx[26].v.ob[1] = pauseCtx->decorVtx[27].v.ob[1] = pauseCtx->decorVtx[24].v.ob[1] - 19;
pauseCtx->infoPanelVtx[25].v.tc[0] = pauseCtx->infoPanelVtx[27].v.tc[0] = 0x300;
pauseCtx->decorVtx[25].v.tc[0] = pauseCtx->decorVtx[27].v.tc[0] = 0x300;
gDPPipeSync(POLY_OPA_DISP++);
gSPVertex(POLY_OPA_DISP++, &pauseCtx->infoPanelVtx[24], 4, 0);
gSPVertex(POLY_OPA_DISP++, &pauseCtx->decorVtx[24], 4, 0);
gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0,
PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
@ -1966,37 +1958,34 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
}
} else if ((pauseCtx->mainState < PAUSE_MAIN_STATE_3) || (pauseCtx->mainState == PAUSE_MAIN_STATE_EQUIP_CHANGED) ||
(pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) {
// INFO_PANEL_QUAD_INFO_TEXT
pauseCtx->infoPanelVtx[20].v.ob[1] = pauseCtx->infoPanelVtx[21].v.ob[1] = temp;
// DECOR_QUAD_INFO_TEXT
pauseCtx->decorVtx[20].v.ob[1] = pauseCtx->decorVtx[21].v.ob[1] = temp;
pauseCtx->infoPanelVtx[22].v.ob[1] = pauseCtx->infoPanelVtx[23].v.ob[1] =
pauseCtx->infoPanelVtx[20].v.ob[1] - 16;
pauseCtx->decorVtx[22].v.ob[1] = pauseCtx->decorVtx[23].v.ob[1] = pauseCtx->decorVtx[20].v.ob[1] - 16;
pauseCtx->infoPanelVtx[22].v.tc[1] = pauseCtx->infoPanelVtx[23].v.tc[1] = 0x200;
pauseCtx->decorVtx[22].v.tc[1] = pauseCtx->decorVtx[23].v.tc[1] = 0x200;
gSPVertex(POLY_OPA_DISP++, &pauseCtx->infoPanelVtx[16], 8, 0);
gSPVertex(POLY_OPA_DISP++, &pauseCtx->decorVtx[16], 8, 0);
if (pauseCtx->state == PAUSE_STATE_SAVE_PROMPT) {
// INFO_PANEL_QUAD_INFO_ICON
pauseCtx->infoPanelVtx[16].v.ob[0] = pauseCtx->infoPanelVtx[18].v.ob[0] =
R_KALEIDO_UNK5(gSaveContext.language);
// DECOR_QUAD_INFO_ICON
pauseCtx->decorVtx[16].v.ob[0] = pauseCtx->decorVtx[18].v.ob[0] = R_KALEIDO_UNK5(gSaveContext.language);
pauseCtx->infoPanelVtx[17].v.ob[0] = pauseCtx->infoPanelVtx[19].v.ob[0] =
pauseCtx->infoPanelVtx[16].v.ob[0] + 24;
pauseCtx->decorVtx[17].v.ob[0] = pauseCtx->decorVtx[19].v.ob[0] = pauseCtx->decorVtx[16].v.ob[0] + 24;
// INFO_PANEL_QUAD_INFO_TEXT
pauseCtx->infoPanelVtx[20].v.ob[0] = pauseCtx->infoPanelVtx[22].v.ob[0] =
pauseCtx->infoPanelVtx[16].v.ob[0] + R_KALEIDO_UNK2(gSaveContext.language);
// DECOR_QUAD_INFO_TEXT
pauseCtx->decorVtx[20].v.ob[0] = pauseCtx->decorVtx[22].v.ob[0] =
pauseCtx->decorVtx[16].v.ob[0] + R_KALEIDO_UNK2(gSaveContext.language);
pauseCtx->infoPanelVtx[21].v.ob[0] = pauseCtx->infoPanelVtx[23].v.ob[0] =
pauseCtx->infoPanelVtx[20].v.ob[0] + sToDecideTextWidths[gSaveContext.language];
pauseCtx->decorVtx[21].v.ob[0] = pauseCtx->decorVtx[23].v.ob[0] =
pauseCtx->decorVtx[20].v.ob[0] + sToDecideTextWidths[gSaveContext.language];
// INFO_PANEL_QUAD_INFO_ICON
pauseCtx->infoPanelVtx[17].v.tc[0] = pauseCtx->infoPanelVtx[19].v.tc[0] = 0x300;
// DECOR_QUAD_INFO_ICON
pauseCtx->decorVtx[17].v.tc[0] = pauseCtx->decorVtx[19].v.tc[0] = 0x300;
// INFO_PANEL_QUAD_INFO_TEXT
pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] =
sToDecideTextWidths[gSaveContext.language] << 5;
// DECOR_QUAD_INFO_TEXT
pauseCtx->decorVtx[21].v.tc[0] = pauseCtx->decorVtx[23].v.tc[0] = sToDecideTextWidths[gSaveContext.language]
<< 5;
gSPDisplayList(POLY_OPA_DISP++, gAButtonIconDL);
@ -2007,13 +1996,12 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
sToDecideTextWidths[gSaveContext.language], 16, 4);
} else if (pauseCtx->cursorSpecialPos != 0) {
if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE)) {
// INFO_PANEL_QUAD_INFO_ICON
pauseCtx->infoPanelVtx[16].v.ob[0] = pauseCtx->infoPanelVtx[18].v.ob[0] = -63;
// DECOR_QUAD_INFO_ICON
pauseCtx->decorVtx[16].v.ob[0] = pauseCtx->decorVtx[18].v.ob[0] = -63;
pauseCtx->infoPanelVtx[17].v.ob[0] = pauseCtx->infoPanelVtx[19].v.ob[0] =
pauseCtx->infoPanelVtx[16].v.ob[0] + 128;
pauseCtx->decorVtx[17].v.ob[0] = pauseCtx->decorVtx[19].v.ob[0] = pauseCtx->decorVtx[16].v.ob[0] + 128;
pauseCtx->infoPanelVtx[17].v.tc[0] = pauseCtx->infoPanelVtx[19].v.tc[0] = 0x1000;
pauseCtx->decorVtx[17].v.tc[0] = pauseCtx->decorVtx[19].v.tc[0] = 0x1000;
gDPPipeSync(POLY_OPA_DISP++);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 200, 0, 255);
@ -2030,25 +2018,23 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
}
} else {
if ((u32)pauseCtx->pageIndex == PAUSE_ITEM) {
// INFO_PANEL_QUAD_INFO_ICON
pauseCtx->infoPanelVtx[16].v.ob[0] = pauseCtx->infoPanelVtx[18].v.ob[0] =
R_KALEIDO_UNK1(gSaveContext.language);
// DECOR_QUAD_INFO_ICON
pauseCtx->decorVtx[16].v.ob[0] = pauseCtx->decorVtx[18].v.ob[0] = R_KALEIDO_UNK1(gSaveContext.language);
pauseCtx->infoPanelVtx[17].v.ob[0] = pauseCtx->infoPanelVtx[19].v.ob[0] =
pauseCtx->infoPanelVtx[16].v.ob[0] + 48;
pauseCtx->decorVtx[17].v.ob[0] = pauseCtx->decorVtx[19].v.ob[0] = pauseCtx->decorVtx[16].v.ob[0] + 48;
// INFO_PANEL_QUAD_INFO_TEXT
pauseCtx->infoPanelVtx[20].v.ob[0] = pauseCtx->infoPanelVtx[22].v.ob[0] =
pauseCtx->infoPanelVtx[16].v.ob[0] + R_KALEIDO_UNK4(gSaveContext.language);
// DECOR_QUAD_INFO_TEXT
pauseCtx->decorVtx[20].v.ob[0] = pauseCtx->decorVtx[22].v.ob[0] =
pauseCtx->decorVtx[16].v.ob[0] + R_KALEIDO_UNK4(gSaveContext.language);
pauseCtx->infoPanelVtx[21].v.ob[0] = pauseCtx->infoPanelVtx[23].v.ob[0] =
pauseCtx->infoPanelVtx[20].v.ob[0] + sToEquipTextWidths[gSaveContext.language];
pauseCtx->decorVtx[21].v.ob[0] = pauseCtx->decorVtx[23].v.ob[0] =
pauseCtx->decorVtx[20].v.ob[0] + sToEquipTextWidths[gSaveContext.language];
// INFO_PANEL_QUAD_INFO_ICON
pauseCtx->infoPanelVtx[17].v.tc[0] = pauseCtx->infoPanelVtx[19].v.tc[0] = 0x600;
// DECOR_QUAD_INFO_ICON
pauseCtx->decorVtx[17].v.tc[0] = pauseCtx->decorVtx[19].v.tc[0] = 0x600;
// INFO_PANEL_QUAD_INFO_TEXT
pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] =
// DECOR_QUAD_INFO_TEXT
pauseCtx->decorVtx[21].v.tc[0] = pauseCtx->decorVtx[23].v.tc[0] =
sToEquipTextWidths[gSaveContext.language] << 5;
gSPDisplayList(POLY_OPA_DISP++, gCButtonIconsDL);
@ -2063,32 +2049,32 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
} else if ((pauseCtx->pageIndex == PAUSE_QUEST) &&
((pauseCtx->cursorSlot[PAUSE_QUEST] >= 6) && (pauseCtx->cursorSlot[PAUSE_QUEST] <= 0x11))) {
if (pauseCtx->namedItem != PAUSE_ITEM_NONE) {
// INFO_PANEL_QUAD_INFO_ICON
pauseCtx->infoPanelVtx[16].v.ob[0] = pauseCtx->infoPanelVtx[18].v.ob[0] =
// DECOR_QUAD_INFO_ICON
pauseCtx->decorVtx[16].v.ob[0] = pauseCtx->decorVtx[18].v.ob[0] =
R_KALEIDO_UNK3(gSaveContext.language);
pauseCtx->infoPanelVtx[17].v.ob[0] = pauseCtx->infoPanelVtx[19].v.ob[0] =
pauseCtx->infoPanelVtx[16].v.ob[0] + 24;
pauseCtx->decorVtx[17].v.ob[0] = pauseCtx->decorVtx[19].v.ob[0] =
pauseCtx->decorVtx[16].v.ob[0] + 24;
// INFO_PANEL_QUAD_INFO_TEXT
pauseCtx->infoPanelVtx[20].v.ob[0] = pauseCtx->infoPanelVtx[22].v.ob[0] =
pauseCtx->infoPanelVtx[16].v.ob[0] + R_KALEIDO_UNK2(gSaveContext.language);
// DECOR_QUAD_INFO_TEXT
pauseCtx->decorVtx[20].v.ob[0] = pauseCtx->decorVtx[22].v.ob[0] =
pauseCtx->decorVtx[16].v.ob[0] + R_KALEIDO_UNK2(gSaveContext.language);
#if OOT_PAL
if (gSaveContext.language == LANGUAGE_GER) {
pauseCtx->infoPanelVtx[20].v.ob[0] = pauseCtx->infoPanelVtx[22].v.ob[0] =
pauseCtx->infoPanelVtx[16].v.ob[0] - 99;
pauseCtx->decorVtx[20].v.ob[0] = pauseCtx->decorVtx[22].v.ob[0] =
pauseCtx->decorVtx[16].v.ob[0] - 99;
}
#endif
pauseCtx->infoPanelVtx[21].v.ob[0] = pauseCtx->infoPanelVtx[23].v.ob[0] =
pauseCtx->infoPanelVtx[20].v.ob[0] + sToPlayMelodyTextWidths[gSaveContext.language];
pauseCtx->decorVtx[21].v.ob[0] = pauseCtx->decorVtx[23].v.ob[0] =
pauseCtx->decorVtx[20].v.ob[0] + sToPlayMelodyTextWidths[gSaveContext.language];
// INFO_PANEL_QUAD_INFO_ICON
pauseCtx->infoPanelVtx[17].v.tc[0] = pauseCtx->infoPanelVtx[19].v.tc[0] = 0x300;
// DECOR_QUAD_INFO_ICON
pauseCtx->decorVtx[17].v.tc[0] = pauseCtx->decorVtx[19].v.tc[0] = 0x300;
// INFO_PANEL_QUAD_INFO_TEXT
pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] =
// DECOR_QUAD_INFO_TEXT
pauseCtx->decorVtx[21].v.tc[0] = pauseCtx->decorVtx[23].v.tc[0] =
sToPlayMelodyTextWidths[gSaveContext.language] << 5;
gSPDisplayList(POLY_OPA_DISP++, gAButtonIconDL);
@ -2101,25 +2087,23 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
sToPlayMelodyTextWidths[gSaveContext.language], 16, 4);
}
} else if (pauseCtx->pageIndex == PAUSE_EQUIP) {
// INFO_PANEL_QUAD_INFO_ICON
pauseCtx->infoPanelVtx[16].v.ob[0] = pauseCtx->infoPanelVtx[18].v.ob[0] =
R_KALEIDO_UNK6(gSaveContext.language);
// DECOR_QUAD_INFO_ICON
pauseCtx->decorVtx[16].v.ob[0] = pauseCtx->decorVtx[18].v.ob[0] = R_KALEIDO_UNK6(gSaveContext.language);
pauseCtx->infoPanelVtx[17].v.ob[0] = pauseCtx->infoPanelVtx[19].v.ob[0] =
pauseCtx->infoPanelVtx[16].v.ob[0] + 24;
pauseCtx->decorVtx[17].v.ob[0] = pauseCtx->decorVtx[19].v.ob[0] = pauseCtx->decorVtx[16].v.ob[0] + 24;
// INFO_PANEL_QUAD_INFO_TEXT
pauseCtx->infoPanelVtx[20].v.ob[0] = pauseCtx->infoPanelVtx[22].v.ob[0] =
pauseCtx->infoPanelVtx[16].v.ob[0] + R_KALEIDO_UNK2(gSaveContext.language);
// DECOR_QUAD_INFO_TEXT
pauseCtx->decorVtx[20].v.ob[0] = pauseCtx->decorVtx[22].v.ob[0] =
pauseCtx->decorVtx[16].v.ob[0] + R_KALEIDO_UNK2(gSaveContext.language);
pauseCtx->infoPanelVtx[21].v.ob[0] = pauseCtx->infoPanelVtx[23].v.ob[0] =
pauseCtx->infoPanelVtx[20].v.ob[0] + sToEquipTextWidths[gSaveContext.language];
pauseCtx->decorVtx[21].v.ob[0] = pauseCtx->decorVtx[23].v.ob[0] =
pauseCtx->decorVtx[20].v.ob[0] + sToEquipTextWidths[gSaveContext.language];
// INFO_PANEL_QUAD_INFO_ICON
pauseCtx->infoPanelVtx[17].v.tc[0] = pauseCtx->infoPanelVtx[19].v.tc[0] = 0x300;
// DECOR_QUAD_INFO_ICON
pauseCtx->decorVtx[17].v.tc[0] = pauseCtx->decorVtx[19].v.tc[0] = 0x300;
// INFO_PANEL_QUAD_INFO_TEXT
pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] =
// DECOR_QUAD_INFO_TEXT
pauseCtx->decorVtx[21].v.tc[0] = pauseCtx->decorVtx[23].v.tc[0] =
sToEquipTextWidths[gSaveContext.language] << 5;
gSPDisplayList(POLY_OPA_DISP++, gAButtonIconDL);
@ -3357,7 +3341,7 @@ void KaleidoScope_SetVertices(PlayState* play, GraphicsContext* gfxCtx) {
pauseCtx->questVtx[k + 3].v.cn[3] = pauseCtx->alpha;
}
pauseCtx->infoPanelVtx = GRAPH_ALLOC(gfxCtx, (INFO_PANEL_QUAD_MAX * 4) * sizeof(Vtx));
pauseCtx->decorVtx = GRAPH_ALLOC(gfxCtx, (DECOR_QUAD_MAX * 4) * sizeof(Vtx));
pauseCtx->promptPageVtx = GRAPH_ALLOC(gfxCtx, ((PAGE_BG_QUADS + VTX_PAGE_PROMPT_QUADS) * 4) * sizeof(Vtx));
KaleidoScope_SetPageVertices(play, pauseCtx->promptPageVtx, VTX_PAGE_PROMPT, VTX_PAGE_PROMPT_QUADS);
@ -3440,7 +3424,7 @@ void KaleidoScope_Draw(PlayState* play) {
KaleidoScope_SetView(pauseCtx, 0.0f, 0.0f, 64.0f);
if (!IS_PAUSE_STATE_GAMEOVER(pauseCtx)) {
KaleidoScope_DrawInfoPanel(play);
KaleidoScope_DrawDecor(play);
}
}

20
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h
View File

@ -221,16 +221,16 @@ typedef enum ItemQuad {
#define TO_PAGE_LABEL_TEX_WIDTH 128
#define TO_PAGE_LABEL_TEX_HEIGHT 16
typedef enum InfoPanelQuad {
/* 0 */ INFO_PANEL_QUAD_BG_LEFT, // The left half of the info plate background
/* 1 */ INFO_PANEL_QUAD_BG_RIGHT, // The right half of the info plate background
/* 2 */ INFO_PANEL_QUAD_BUTTON_LEFT, // The button for scrolling to the left page
/* 3 */ INFO_PANEL_QUAD_BUTTON_RIGHT, // The button for scrolling to the right page
/* 4 */ INFO_PANEL_QUAD_INFO_ICON, // The icon in the info plate
/* 5 */ INFO_PANEL_QUAD_INFO_TEXT, // The text in the info plate
/* 6 */ INFO_PANEL_QUAD_HAVE_ALL_GS, // On the overworld map page, the indicator that the selected area has been cleared of gold skulltulas
/* 7 */ INFO_PANEL_QUAD_MAX
} InfoPanelQuad;
typedef enum DecorQuad {
/* 0 */ DECOR_QUAD_INFO_BG_LEFT, // The left half of the info plate background
/* 1 */ DECOR_QUAD_INFO_BG_RIGHT, // The right half of the info plate background
/* 2 */ DECOR_QUAD_BUTTON_LEFT, // The button for scrolling to the left page
/* 3 */ DECOR_QUAD_BUTTON_RIGHT, // The button for scrolling to the right page
/* 4 */ DECOR_QUAD_INFO_ICON, // The icon in the info plate
/* 5 */ DECOR_QUAD_INFO_TEXT, // The text in the info plate
/* 6 */ DECOR_QUAD_HAVE_ALL_GS, // On the overworld map page, the indicator that the selected area has been cleared of gold skulltulas
/* 7 */ DECOR_QUAD_MAX
} DecorQuad;
void KaleidoScope_DrawQuestStatus(struct PlayState* play, GraphicsContext* gfxCtx);
s32 KaleidoScope_UpdateQuestStatusPoint(PauseContext* pauseCtx, s32 point);