From 7f38362a61631c1f23c57d59af76e90e07e69aef Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sat, 14 Jun 2025 23:03:13 +0200 Subject: [PATCH 1/6] Pause docs: "InfoPanel" quads --- .../icon_item_static/icon_item_static.c | 20 +++++------ .../icon_item_static/icon_item_static.h | 2 +- assets/xml/textures/icon_item_static.xml | 6 ++-- assets/xml/textures/icon_item_static_pal.xml | 6 ++-- .../misc/ovl_kaleido_scope/z_kaleido_scope.c | 35 +++++++++++++++++-- .../misc/ovl_kaleido_scope/z_kaleido_scope.h | 11 ++++++ 6 files changed, 60 insertions(+), 20 deletions(-) diff --git a/assets/textures/icon_item_static/icon_item_static.c b/assets/textures/icon_item_static/icon_item_static.c index 2adb277ebd..1eaccace0b 100644 --- a/assets/textures/icon_item_static/icon_item_static.c +++ b/assets/textures/icon_item_static/icon_item_static.c @@ -710,16 +710,16 @@ u64 gCBtnSymbolsTex[TEX_LEN(u64, gCBtnSymbolsTex_WIDTH, gCBtnSymbolsTex_HEIGHT, #include "assets/textures/icon_item_static/gCBtnSymbolsTex.ia8.inc.c" }; -#define gNamePanelLeftTex_WIDTH 72 -#define gNamePanelLeftTex_HEIGHT 24 -u64 gNamePanelLeftTex[TEX_LEN(u64, gNamePanelLeftTex_WIDTH, gNamePanelLeftTex_HEIGHT, 8)] = { -#include "assets/textures/icon_item_static/gNamePanelLeftTex.ia8.inc.c" +#define gInfoPanelBgLeftTex_WIDTH 72 +#define gInfoPanelBgLeftTex_HEIGHT 24 +u64 gInfoPanelBgLeftTex[TEX_LEN(u64, gInfoPanelBgLeftTex_WIDTH, gInfoPanelBgLeftTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_static/gInfoPanelBgLeftTex.ia8.inc.c" }; -#define gNamePanelRightTex_WIDTH 72 -#define gNamePanelRightTex_HEIGHT 24 -u64 gNamePanelRightTex[TEX_LEN(u64, gNamePanelRightTex_WIDTH, gNamePanelRightTex_HEIGHT, 8)] = { -#include "assets/textures/icon_item_static/gNamePanelRightTex.ia8.inc.c" +#define gInfoPanelBgRightTex_WIDTH 72 +#define gInfoPanelBgRightTex_HEIGHT 24 +u64 gInfoPanelBgRightTex[TEX_LEN(u64, gInfoPanelBgRightTex_WIDTH, gInfoPanelBgRightTex_HEIGHT, 8)] = { +#include "assets/textures/icon_item_static/gInfoPanelBgRightTex.ia8.inc.c" }; #define gLButtonTex_WIDTH 24 @@ -748,8 +748,8 @@ u64 gMagicArrowEquipEffectTex[TEX_LEN(u64, gMagicArrowEquipEffectTex_WIDTH, gMag #include "assets/textures/icon_item_static/gMagicArrowEquipEffectTex.ia8.inc.c" }; -Gfx gItemNamePanelDL[18] = { -#include "assets/textures/icon_item_static/gItemNamePanelDL.inc.c" +Gfx gInfoPanelBgDL[18] = { +#include "assets/textures/icon_item_static/gInfoPanelBgDL.inc.c" }; Gfx gLButtonIconDL[10] = { diff --git a/assets/textures/icon_item_static/icon_item_static.h b/assets/textures/icon_item_static/icon_item_static.h index e8aff38236..8e0a51e1e8 100644 --- a/assets/textures/icon_item_static/icon_item_static.h +++ b/assets/textures/icon_item_static/icon_item_static.h @@ -193,7 +193,7 @@ extern u64 gSongNoteTex[TEX_LEN(u64, gSongNoteTex_WIDTH, gSongNoteTex_HEIGHT, 8) #define gMagicArrowEquipEffectTex_HEIGHT gMagicArrowEquipEffectTex_SIZE extern u64 gMagicArrowEquipEffectTex[TEX_LEN(u64, gMagicArrowEquipEffectTex_WIDTH, gMagicArrowEquipEffectTex_HEIGHT, 8)]; -extern Gfx gItemNamePanelDL[18]; +extern Gfx gInfoPanelBgDL[18]; extern Gfx gLButtonIconDL[10]; extern Gfx gRButtonIconDL[10]; extern Gfx gCButtonIconsDL[11]; diff --git a/assets/xml/textures/icon_item_static.xml b/assets/xml/textures/icon_item_static.xml index 2d67bfa108..4454a3316f 100644 --- a/assets/xml/textures/icon_item_static.xml +++ b/assets/xml/textures/icon_item_static.xml @@ -169,14 +169,14 @@ - - + + - + diff --git a/assets/xml/textures/icon_item_static_pal.xml b/assets/xml/textures/icon_item_static_pal.xml index 161d4039a0..1869bb2ff1 100644 --- a/assets/xml/textures/icon_item_static_pal.xml +++ b/assets/xml/textures/icon_item_static_pal.xml @@ -171,14 +171,14 @@ - - + + - + diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c index 84b7687bb4..a844982928 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c @@ -1747,7 +1747,7 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) { } temp = pauseCtx->infoPanelOffsetY - 76; - for (j = 0, i = 0; i < 7; i++, j += 4) { + 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; pauseCtx->infoPanelVtx[j + 1].v.ob[0] = pauseCtx->infoPanelVtx[j + 3].v.ob[0] = 0; @@ -1780,10 +1780,12 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) { pauseCtx->infoPanelVtx[j + 1].v.cn[3] = pauseCtx->infoPanelVtx[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; pauseCtx->infoPanelVtx[5].v.ob[0] = pauseCtx->infoPanelVtx[7].v.ob[0] = pauseCtx->infoPanelVtx[4].v.ob[0] + 72; + // INFO_PANEL_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); @@ -1804,6 +1806,7 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) { pauseCtx->infoPanelVtx[8].v.ob[1] - 26; } + // INFO_PANEL_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); @@ -1826,6 +1829,7 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) { pauseCtx->infoPanelVtx[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; @@ -1842,12 +1846,14 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 90, 100, 130, 255); gSPVertex(POLY_OPA_DISP++, &pauseCtx->infoPanelVtx[0], 16, 0); - gSPDisplayList(POLY_OPA_DISP++, gItemNamePanelDL); + // Draw INFO_PANEL_QUAD_BG_LEFT, INFO_PANEL_QUAD_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 gSPDisplayList(POLY_OPA_DISP++, gLButtonIconDL); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 180, 210, 255, 220); @@ -1856,6 +1862,7 @@ 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 gSPDisplayList(POLY_OPA_DISP++, gRButtonIconDL); if (pauseCtx->cursorSpecialPos != 0) { @@ -1865,6 +1872,7 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) { KaleidoScope_DrawCursor(play, pauseCtx->pageIndex); } + // INFO_PANEL_QUAD_INFO_ICON temp = pauseCtx->infoPanelOffsetY - 80; pauseCtx->infoPanelVtx[16].v.ob[1] = pauseCtx->infoPanelVtx[17].v.ob[1] = temp; @@ -1890,6 +1898,8 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) { ((pauseCtx->mainState >= PAUSE_MAIN_STATE_SONG_PROMPT_INIT) && (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; pauseCtx->infoPanelVtx[17].v.ob[0] = pauseCtx->infoPanelVtx[19].v.ob[0] = @@ -1931,6 +1941,7 @@ 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; pauseCtx->infoPanelVtx[25].v.ob[0] = pauseCtx->infoPanelVtx[27].v.ob[0] = @@ -1958,6 +1969,7 @@ 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; pauseCtx->infoPanelVtx[22].v.ob[1] = pauseCtx->infoPanelVtx[23].v.ob[1] = @@ -1968,20 +1980,24 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) { gSPVertex(POLY_OPA_DISP++, &pauseCtx->infoPanelVtx[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); pauseCtx->infoPanelVtx[17].v.ob[0] = pauseCtx->infoPanelVtx[19].v.ob[0] = pauseCtx->infoPanelVtx[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); pauseCtx->infoPanelVtx[21].v.ob[0] = pauseCtx->infoPanelVtx[23].v.ob[0] = pauseCtx->infoPanelVtx[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; + // INFO_PANEL_QUAD_INFO_TEXT pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] = sToDecideTextWidths[gSaveContext.language] << 5; @@ -1994,6 +2010,7 @@ 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; pauseCtx->infoPanelVtx[17].v.ob[0] = pauseCtx->infoPanelVtx[19].v.ob[0] = @@ -2016,20 +2033,24 @@ 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); pauseCtx->infoPanelVtx[17].v.ob[0] = pauseCtx->infoPanelVtx[19].v.ob[0] = pauseCtx->infoPanelVtx[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); pauseCtx->infoPanelVtx[21].v.ob[0] = pauseCtx->infoPanelVtx[23].v.ob[0] = pauseCtx->infoPanelVtx[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; + // INFO_PANEL_QUAD_INFO_TEXT pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] = sToEquipTextWidths[gSaveContext.language] << 5; @@ -2045,12 +2066,14 @@ 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] = R_KALEIDO_UNK3(gSaveContext.language); pauseCtx->infoPanelVtx[17].v.ob[0] = pauseCtx->infoPanelVtx[19].v.ob[0] = pauseCtx->infoPanelVtx[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); @@ -2064,8 +2087,10 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) { pauseCtx->infoPanelVtx[21].v.ob[0] = pauseCtx->infoPanelVtx[23].v.ob[0] = pauseCtx->infoPanelVtx[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; + // INFO_PANEL_QUAD_INFO_TEXT pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] = sToPlayMelodyTextWidths[gSaveContext.language] << 5; @@ -2079,20 +2104,24 @@ 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); pauseCtx->infoPanelVtx[17].v.ob[0] = pauseCtx->infoPanelVtx[19].v.ob[0] = pauseCtx->infoPanelVtx[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); pauseCtx->infoPanelVtx[21].v.ob[0] = pauseCtx->infoPanelVtx[23].v.ob[0] = pauseCtx->infoPanelVtx[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; + // INFO_PANEL_QUAD_INFO_TEXT pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] = sToEquipTextWidths[gSaveContext.language] << 5; @@ -3335,7 +3364,7 @@ void KaleidoScope_SetVertices(PlayState* play, GraphicsContext* gfxCtx) { pauseCtx->questVtx[k + 3].v.cn[3] = pauseCtx->alpha; } - pauseCtx->infoPanelVtx = GRAPH_ALLOC(gfxCtx, 28 * sizeof(Vtx)); + pauseCtx->infoPanelVtx = GRAPH_ALLOC(gfxCtx, (INFO_PANEL_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); diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h index 566b087e68..7548d6cd71 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h @@ -221,6 +221,17 @@ 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; + void KaleidoScope_DrawQuestStatus(struct PlayState* play, GraphicsContext* gfxCtx); s32 KaleidoScope_UpdateQuestStatusPoint(PauseContext* pauseCtx, s32 point); void KaleidoScope_DrawInventoryEditor(struct PlayState* play); From 374560271f2427689e5f324dba9bab0ce9062b5c Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Tue, 17 Jun 2025 11:55:07 +0200 Subject: [PATCH 2/6] bss --- src/code/z_parameter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index fa8ec09c55..7ef03e1aa1 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -29,7 +29,8 @@ #include "assets/textures/do_action_static/do_action_static.h" #include "assets/textures/icon_item_static/icon_item_static.h" -#pragma increment_block_number "gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" +#pragma increment_block_number "gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128 ntsc-1.0:128 ntsc-1.1:128" \ + "ntsc-1.2:128" typedef struct RestrictionFlags { /* 0x00 */ u8 sceneId; From 2320b4f9c714a636d31b66d70b550590f9506f0b Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Fri, 20 Jun 2025 13:27:55 +0200 Subject: [PATCH 3/6] rename infoPanelVtx to decorVtx --- include/pause.h | 2 +- .../misc/ovl_kaleido_scope/z_kaleido_scope.c | 286 +++++++++--------- .../misc/ovl_kaleido_scope/z_kaleido_scope.h | 20 +- 3 files changed, 146 insertions(+), 162 deletions(-) diff --git a/include/pause.h b/include/pause.h index f8a54fc5dd..26839e86fa 100644 --- a/include/pause.h +++ b/include/pause.h @@ -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]; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c index 6606af02ac..d5c89b04d3 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c @@ -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); } } diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h index 7548d6cd71..10ecdcdad8 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h @@ -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); From ad7ef14b5d8efb00ee5a422c7f0d713569c36715 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sun, 22 Jun 2025 16:36:09 +0100 Subject: [PATCH 4/6] Name `HIT_BACKLASH_` and `HIT_SPECIAL_EFFECT_` values (#2639) * Name HIT_BACKLASH_ and HIT_SPECIAL_EFFECT_ values * SHOCK -> ELECTRIC --- include/collision_check.h | 14 +++++++------- src/code/z_collision_check.c | 4 ++-- src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 2 +- src/overlays/actors/ovl_En_Bb/z_en_bb.c | 2 +- src/overlays/actors/ovl_En_Bili/z_en_bili.c | 4 ++-- src/overlays/actors/ovl_En_Bubble/z_en_bubble.c | 2 +- src/overlays/actors/ovl_En_Bw/z_en_bw.c | 4 ++-- src/overlays/actors/ovl_En_Firefly/z_en_firefly.c | 8 ++++---- src/overlays/actors/ovl_En_Reeba/z_en_reeba.c | 2 +- src/overlays/actors/ovl_En_Vali/z_en_vali.c | 4 ++-- src/overlays/actors/ovl_player_actor/z_player.c | 12 ++++++------ 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/include/collision_check.h b/include/collision_check.h index 0d2a621039..194ae1e699 100644 --- a/include/collision_check.h +++ b/include/collision_check.h @@ -81,11 +81,11 @@ typedef struct ColliderInitToActor { } ColliderInitToActor; // size = 0x08 typedef enum HitSpecialEffect { - HIT_SPECIAL_EFFECT_0, // None - HIT_SPECIAL_EFFECT_1, // Fire - HIT_SPECIAL_EFFECT_2, // Ice - HIT_SPECIAL_EFFECT_3, - HIT_SPECIAL_EFFECT_4 + HIT_SPECIAL_EFFECT_NONE, + HIT_SPECIAL_EFFECT_FIRE, + HIT_SPECIAL_EFFECT_ICE, + HIT_SPECIAL_EFFECT_ELECTRIC, + HIT_SPECIAL_EFFECT_KNOCKBACK } HitSpecialEffect; typedef struct ColliderElementDamageInfoAT { @@ -95,8 +95,8 @@ typedef struct ColliderElementDamageInfoAT { } ColliderElementDamageInfoAT; // size = 0x08 typedef enum HitBacklash { - HIT_BACKLASH_0, - HIT_BACKLASH_1 // Shock? + HIT_BACKLASH_NONE, + HIT_BACKLASH_ELECTRIC } HitBacklash; typedef struct ColliderElementDamageInfoAC { diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 98ea5c09a9..2b7ed05de0 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -3015,8 +3015,8 @@ void CollisionCheck_InitInfo(CollisionCheckInfo* info) { void CollisionCheck_ResetDamage(CollisionCheckInfo* info) { info->damage = 0; info->damageReaction = 0; - info->atHitBacklash = HIT_BACKLASH_0; - info->acHitSpecialEffect = HIT_SPECIAL_EFFECT_0; + info->atHitBacklash = HIT_BACKLASH_NONE; + info->acHitSpecialEffect = HIT_SPECIAL_EFFECT_NONE; info->displacement.x = info->displacement.y = info->displacement.z = 0.0f; } diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index 964f9edc66..9c75e35f23 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -492,7 +492,7 @@ void BossTw_Init(Actor* thisx, PlayState* play2) { if (this->actor.params == TW_FIRE_BLAST || this->actor.params == TW_FIRE_BLAST_GROUND) { this->actionFunc = BossTw_BlastFire; - this->collider.elem.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_1; + this->collider.elem.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_FIRE; } else if (this->actor.params == TW_ICE_BLAST || this->actor.params == TW_ICE_BLAST_GROUND) { this->actionFunc = BossTw_BlastIce; } else if (this->actor.params >= TW_DEATHBALL_KOTAKE) { diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index f792e59002..4f80a28b8f 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -369,7 +369,7 @@ void EnBb_Init(Actor* thisx, PlayState* play) { thisx->naviEnemyId = NAVI_ENEMY_RED_BUBBLE; thisx->colChkInfo.damageTable = &sDamageTableRed; this->flameEnvColor.r = 255; - this->collider.elements[0].base.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_1; + this->collider.elements[0].base.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_FIRE; EnBb_SetupRed(play, this); break; case ENBB_WHITE: diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.c b/src/overlays/actors/ovl_En_Bili/z_en_bili.c index 804f5e59c1..9c219eb8ee 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -157,7 +157,7 @@ void EnBili_Destroy(Actor* thisx, PlayState* play) { void EnBili_SetupFloatIdle(EnBili* this) { this->actor.speed = 0.7f; - this->collider.elem.acDmgInfo.hitBacklash = HIT_BACKLASH_1; + this->collider.elem.acDmgInfo.hitBacklash = HIT_BACKLASH_ELECTRIC; this->timer = 32; this->actor.home.pos.y = this->actor.world.pos.y; this->actor.gravity = 0.0f; @@ -253,7 +253,7 @@ void EnBili_SetupDie(EnBili* this) { */ void EnBili_SetupStunned(EnBili* this) { this->timer = 80; - this->collider.elem.acDmgInfo.hitBacklash = HIT_BACKLASH_0; + this->collider.elem.acDmgInfo.hitBacklash = HIT_BACKLASH_NONE; this->actor.gravity = -1.0f; this->actor.speed = 0.0f; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 150, COLORFILTER_BUFFLAG_XLU, 80); diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index 7cb0eece74..c45b53ddfe 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -110,7 +110,7 @@ u32 func_809CBCBC(EnBubble* this) { ColliderElement* elem = &this->colliderJntSph.elements[0].base; elem->atDmgInfo.dmgFlags = DMG_EXPLOSIVE; - elem->atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_0; + elem->atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_NONE; elem->atDmgInfo.damage = 4; elem->atElemFlags = ATELEM_ON; this->actor.velocity.y = 0.0f; diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/src/overlays/actors/ovl_En_Bw/z_en_bw.c index 2aa76f7e57..8e7e20e8a5 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -786,7 +786,7 @@ void EnBw_Update(Actor* thisx, PlayState* play2) { func_8002836C(play, &thisx->world.pos, &velocity, &accel, &sp50, &sp4C, 0x3C, 0, 0x14); } if (this->unk_248 <= 0.4f) { - this->collider1.elem.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_0; + this->collider1.elem.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_NONE; if (((play->gameplayFrames & 1) == 0) && (this->unk_220 < 5) && (this->unk_23C == 0)) { accel.y = -0.1f; velocity.x = Rand_CenteredFloat(4.0f); @@ -806,7 +806,7 @@ void EnBw_Update(Actor* thisx, PlayState* play2) { 20.0f - (this->unk_248 * 40.0f)); } } else { - this->collider1.elem.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_1; + this->collider1.elem.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_FIRE; } this->unk_234 = Actor_TestFloorInDirection(thisx, play, 50.0f, thisx->world.rot.y); diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index 486e5af3a3..5666de0818 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -134,7 +134,7 @@ static InitChainEntry sInitChain[] = { void EnFirefly_Extinguish(EnFirefly* this) { this->actor.params += 2; - this->collider.elements[0].base.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_0; + this->collider.elements[0].base.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_NONE; this->auraType = KEESE_AURA_NONE; this->onFire = false; this->actor.naviEnemyId = NAVI_ENEMY_KEESE; @@ -146,7 +146,7 @@ void EnFirefly_Ignite(EnFirefly* this) { } else { this->actor.params -= 2; } - this->collider.elements[0].base.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_1; + this->collider.elements[0].base.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_FIRE; this->auraType = KEESE_AURA_FIRE; this->onFire = true; this->actor.naviEnemyId = NAVI_ENEMY_FIRE_KEESE; @@ -190,10 +190,10 @@ void EnFirefly_Init(Actor* thisx, PlayState* play) { } if (this->actor.params == KEESE_ICE_FLY) { - this->collider.elements[0].base.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_2; + this->collider.elements[0].base.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_ICE; this->actor.naviEnemyId = NAVI_ENEMY_ICE_KEESE; } else { - this->collider.elements[0].base.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_0; + this->collider.elements[0].base.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_NONE; this->actor.naviEnemyId = NAVI_ENEMY_KEESE; } diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index 258e270949..e535d66edd 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -151,7 +151,7 @@ void EnReeba_Init(Actor* thisx, PlayState* play) { PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ リーバぼす登場 ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Reeba boss appears ☆☆☆☆☆ %f\n") VT_RST, this->scale); this->actor.colChkInfo.health = 20; - this->collider.elem.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_4; + this->collider.elem.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_KNOCKBACK; this->collider.elem.atDmgInfo.damage = 16; Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_ENEMY); } diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.c b/src/overlays/actors/ovl_En_Vali/z_en_vali.c index f6f11e51e6..bf9262099b 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -272,7 +272,7 @@ void EnVali_SetupStunned(EnVali* this) { this->timer = 80; this->actor.velocity.y = 0.0f; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_XLU, 80); - this->bodyCollider.elem.acDmgInfo.hitBacklash = HIT_BACKLASH_0; + this->bodyCollider.elem.acDmgInfo.hitBacklash = HIT_BACKLASH_NONE; Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); this->actor.velocity.y = 1.0f; this->actionFunc = EnVali_Stunned; @@ -462,7 +462,7 @@ void EnVali_Stunned(EnVali* this, PlayState* play) { } if (this->timer == 0) { - this->bodyCollider.elem.acDmgInfo.hitBacklash = HIT_BACKLASH_1; + this->bodyCollider.elem.acDmgInfo.hitBacklash = HIT_BACKLASH_ELECTRIC; EnVali_SetupFloatIdle(this); } } diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 6ddb51cdca..10fd868cb2 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -4798,7 +4798,7 @@ void func_8083821C(Player* this) { } void func_80838280(Player* this) { - if (this->actor.colChkInfo.acHitSpecialEffect == HIT_SPECIAL_EFFECT_1) { + if (this->actor.colChkInfo.acHitSpecialEffect == HIT_SPECIAL_EFFECT_FIRE) { func_8083821C(this); } Player_PlayVoiceSfx(this, NA_SE_VO_LI_FALL_L); @@ -4915,7 +4915,7 @@ s32 func_808382DC(Player* this, PlayState* play) { } } - if (sp64 && (this->shieldQuad.elem.acHitElem->atDmgInfo.hitSpecialEffect == HIT_SPECIAL_EFFECT_1)) { + if (sp64 && (this->shieldQuad.elem.acHitElem->atDmgInfo.hitSpecialEffect == HIT_SPECIAL_EFFECT_FIRE)) { func_8083819C(this, play); } @@ -4938,11 +4938,11 @@ s32 func_808382DC(Player* this, PlayState* play) { if (this->stateFlags1 & PLAYER_STATE1_27) { sp4C = PLAYER_HIT_RESPONSE_NONE; - } else if (this->actor.colChkInfo.acHitSpecialEffect == HIT_SPECIAL_EFFECT_2) { + } else if (this->actor.colChkInfo.acHitSpecialEffect == HIT_SPECIAL_EFFECT_ICE) { sp4C = PLAYER_HIT_RESPONSE_ICE_TRAP; - } else if (this->actor.colChkInfo.acHitSpecialEffect == HIT_SPECIAL_EFFECT_3) { + } else if (this->actor.colChkInfo.acHitSpecialEffect == HIT_SPECIAL_EFFECT_ELECTRIC) { sp4C = PLAYER_HIT_RESPONSE_ELECTRIC_SHOCK; - } else if (this->actor.colChkInfo.acHitSpecialEffect == HIT_SPECIAL_EFFECT_4) { + } else if (this->actor.colChkInfo.acHitSpecialEffect == HIT_SPECIAL_EFFECT_KNOCKBACK) { sp4C = PLAYER_HIT_RESPONSE_KNOCKBACK_LARGE; } else { func_80838280(this); @@ -9145,7 +9145,7 @@ s32 func_80842DF4(PlayState* play, Player* this) { if ((func_80842AC4(play, this) == 0) && (this->heldItemAction != PLAYER_IA_HAMMER)) { func_80842B7C(play, this); - if (this->actor.colChkInfo.atHitBacklash == HIT_BACKLASH_1) { + if (this->actor.colChkInfo.atHitBacklash == HIT_BACKLASH_ELECTRIC) { this->actor.colChkInfo.damage = 8; func_80837C0C(play, this, PLAYER_HIT_RESPONSE_ELECTRIC_SHOCK, 0.0f, 0.0f, this->actor.shape.rot.y, 20); From 13ec4f1359e530a908e4e29f26926b64a2db05fc Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sun, 22 Jun 2025 18:06:15 +0200 Subject: [PATCH 5/6] rename to uiOverlayVtx / UI_OVERLAY_QUAD_ --- include/pause.h | 2 +- .../misc/ovl_kaleido_scope/z_kaleido_scope.c | 279 ++++++++++-------- .../misc/ovl_kaleido_scope/z_kaleido_scope.h | 20 +- 3 files changed, 160 insertions(+), 141 deletions(-) diff --git a/include/pause.h b/include/pause.h index 26839e86fa..d5f348a03c 100644 --- a/include/pause.h +++ b/include/pause.h @@ -168,7 +168,7 @@ typedef struct PauseContext { /* 0x0148 */ Vtx* equipPageVtx; /* 0x014C */ Vtx* mapPageVtx; /* 0x0150 */ Vtx* questPageVtx; - /* 0x0154 */ Vtx* decorVtx; + /* 0x0154 */ Vtx* uiOverlayVtx; /* 0x0158 */ Vtx* itemVtx; /* 0x015C */ Vtx* equipVtx; /* 0x0160 */ char unk_160[0x04]; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c index d5c89b04d3..c7064c2be0 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c @@ -1747,87 +1747,94 @@ void KaleidoScope_DrawDecor(PlayState* play) { } temp = pauseCtx->infoPanelOffsetY - 76; - 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; + for (j = 0, i = 0; i < UI_OVERLAY_QUAD_MAX; i++, j += 4) { + pauseCtx->uiOverlayVtx[j + 0].v.ob[0] = pauseCtx->uiOverlayVtx[j + 2].v.ob[0] = -72; - pauseCtx->decorVtx[j + 1].v.ob[0] = pauseCtx->decorVtx[j + 3].v.ob[0] = 0; + pauseCtx->uiOverlayVtx[j + 1].v.ob[0] = pauseCtx->uiOverlayVtx[j + 3].v.ob[0] = 0; - pauseCtx->decorVtx[j + 0].v.ob[1] = pauseCtx->decorVtx[j + 1].v.ob[1] = temp; + pauseCtx->uiOverlayVtx[j + 0].v.ob[1] = pauseCtx->uiOverlayVtx[j + 1].v.ob[1] = temp; - pauseCtx->decorVtx[j + 2].v.ob[1] = pauseCtx->decorVtx[j + 3].v.ob[1] = temp - 24; + pauseCtx->uiOverlayVtx[j + 2].v.ob[1] = pauseCtx->uiOverlayVtx[j + 3].v.ob[1] = temp - 24; - 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->uiOverlayVtx[j + 0].v.ob[2] = pauseCtx->uiOverlayVtx[j + 1].v.ob[2] = + pauseCtx->uiOverlayVtx[j + 2].v.ob[2] = pauseCtx->uiOverlayVtx[j + 3].v.ob[2] = 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->uiOverlayVtx[j + 0].v.flag = pauseCtx->uiOverlayVtx[j + 1].v.flag = + pauseCtx->uiOverlayVtx[j + 2].v.flag = pauseCtx->uiOverlayVtx[j + 3].v.flag = 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->uiOverlayVtx[j + 0].v.tc[0] = pauseCtx->uiOverlayVtx[j + 0].v.tc[1] = + pauseCtx->uiOverlayVtx[j + 1].v.tc[1] = pauseCtx->uiOverlayVtx[j + 2].v.tc[0] = 0; - pauseCtx->decorVtx[j + 1].v.tc[0] = pauseCtx->decorVtx[j + 3].v.tc[0] = 0x900; + pauseCtx->uiOverlayVtx[j + 1].v.tc[0] = pauseCtx->uiOverlayVtx[j + 3].v.tc[0] = 0x900; - pauseCtx->decorVtx[j + 2].v.tc[1] = pauseCtx->decorVtx[j + 3].v.tc[1] = 0x300; + pauseCtx->uiOverlayVtx[j + 2].v.tc[1] = pauseCtx->uiOverlayVtx[j + 3].v.tc[1] = 0x300; - 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->uiOverlayVtx[j + 0].v.cn[0] = pauseCtx->uiOverlayVtx[j + 2].v.cn[0] = + pauseCtx->uiOverlayVtx[j + 0].v.cn[1] = pauseCtx->uiOverlayVtx[j + 2].v.cn[1] = + pauseCtx->uiOverlayVtx[j + 0].v.cn[2] = pauseCtx->uiOverlayVtx[j + 2].v.cn[2] = + pauseCtx->uiOverlayVtx[j + 1].v.cn[0] = pauseCtx->uiOverlayVtx[j + 3].v.cn[0] = + pauseCtx->uiOverlayVtx[j + 1].v.cn[1] = pauseCtx->uiOverlayVtx[j + 3].v.cn[1] = + pauseCtx->uiOverlayVtx[j + 1].v.cn[2] = pauseCtx->uiOverlayVtx[j + 3].v.cn[2] = 200; - 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; + pauseCtx->uiOverlayVtx[j + 0].v.cn[3] = pauseCtx->uiOverlayVtx[j + 2].v.cn[3] = + pauseCtx->uiOverlayVtx[j + 1].v.cn[3] = pauseCtx->uiOverlayVtx[j + 3].v.cn[3] = pauseCtx->alpha; } - // DECOR_QUAD_INFO_BG_RIGHT - pauseCtx->decorVtx[4].v.ob[0] = pauseCtx->decorVtx[6].v.ob[0] = pauseCtx->decorVtx[0].v.ob[0] + 72; + // UI_OVERLAY_QUAD_INFO_BG_RIGHT + pauseCtx->uiOverlayVtx[4].v.ob[0] = pauseCtx->uiOverlayVtx[6].v.ob[0] = pauseCtx->uiOverlayVtx[0].v.ob[0] + 72; - pauseCtx->decorVtx[5].v.ob[0] = pauseCtx->decorVtx[7].v.ob[0] = pauseCtx->decorVtx[4].v.ob[0] + 72; + pauseCtx->uiOverlayVtx[5].v.ob[0] = pauseCtx->uiOverlayVtx[7].v.ob[0] = pauseCtx->uiOverlayVtx[4].v.ob[0] + 72; - // DECOR_QUAD_BUTTON_LEFT + // UI_OVERLAY_QUAD_BUTTON_LEFT if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_LEFT) && (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE)) { - pauseCtx->decorVtx[8].v.ob[0] = pauseCtx->decorVtx[10].v.ob[0] = WREG(16); + pauseCtx->uiOverlayVtx[8].v.ob[0] = pauseCtx->uiOverlayVtx[10].v.ob[0] = WREG(16); - pauseCtx->decorVtx[9].v.ob[0] = pauseCtx->decorVtx[11].v.ob[0] = pauseCtx->decorVtx[8].v.ob[0] + 24; + pauseCtx->uiOverlayVtx[9].v.ob[0] = pauseCtx->uiOverlayVtx[11].v.ob[0] = pauseCtx->uiOverlayVtx[8].v.ob[0] + 24; - pauseCtx->decorVtx[8].v.ob[1] = pauseCtx->decorVtx[9].v.ob[1] = WREG(18); + pauseCtx->uiOverlayVtx[8].v.ob[1] = pauseCtx->uiOverlayVtx[9].v.ob[1] = WREG(18); - pauseCtx->decorVtx[10].v.ob[1] = pauseCtx->decorVtx[11].v.ob[1] = pauseCtx->decorVtx[8].v.ob[1] - 32; + pauseCtx->uiOverlayVtx[10].v.ob[1] = pauseCtx->uiOverlayVtx[11].v.ob[1] = + pauseCtx->uiOverlayVtx[8].v.ob[1] - 32; } else { - pauseCtx->decorVtx[8].v.ob[0] = pauseCtx->decorVtx[10].v.ob[0] = WREG(16) + 3; + pauseCtx->uiOverlayVtx[8].v.ob[0] = pauseCtx->uiOverlayVtx[10].v.ob[0] = WREG(16) + 3; - pauseCtx->decorVtx[9].v.ob[0] = pauseCtx->decorVtx[11].v.ob[0] = pauseCtx->decorVtx[8].v.ob[0] + 18; + pauseCtx->uiOverlayVtx[9].v.ob[0] = pauseCtx->uiOverlayVtx[11].v.ob[0] = pauseCtx->uiOverlayVtx[8].v.ob[0] + 18; - pauseCtx->decorVtx[8].v.ob[1] = pauseCtx->decorVtx[9].v.ob[1] = WREG(18) - 3; + pauseCtx->uiOverlayVtx[8].v.ob[1] = pauseCtx->uiOverlayVtx[9].v.ob[1] = WREG(18) - 3; - pauseCtx->decorVtx[10].v.ob[1] = pauseCtx->decorVtx[11].v.ob[1] = pauseCtx->decorVtx[8].v.ob[1] - 26; + pauseCtx->uiOverlayVtx[10].v.ob[1] = pauseCtx->uiOverlayVtx[11].v.ob[1] = + pauseCtx->uiOverlayVtx[8].v.ob[1] - 26; } - // DECOR_QUAD_BUTTON_RIGHT + // UI_OVERLAY_QUAD_BUTTON_RIGHT if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_RIGHT) && (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE)) { - pauseCtx->decorVtx[12].v.ob[0] = pauseCtx->decorVtx[14].v.ob[0] = WREG(17); + pauseCtx->uiOverlayVtx[12].v.ob[0] = pauseCtx->uiOverlayVtx[14].v.ob[0] = WREG(17); - pauseCtx->decorVtx[13].v.ob[0] = pauseCtx->decorVtx[15].v.ob[0] = pauseCtx->decorVtx[12].v.ob[0] + 24; + pauseCtx->uiOverlayVtx[13].v.ob[0] = pauseCtx->uiOverlayVtx[15].v.ob[0] = + pauseCtx->uiOverlayVtx[12].v.ob[0] + 24; - pauseCtx->decorVtx[12].v.ob[1] = pauseCtx->decorVtx[13].v.ob[1] = WREG(18); + pauseCtx->uiOverlayVtx[12].v.ob[1] = pauseCtx->uiOverlayVtx[13].v.ob[1] = WREG(18); - pauseCtx->decorVtx[14].v.ob[1] = pauseCtx->decorVtx[15].v.ob[1] = pauseCtx->decorVtx[12].v.ob[1] - 32; + pauseCtx->uiOverlayVtx[14].v.ob[1] = pauseCtx->uiOverlayVtx[15].v.ob[1] = + pauseCtx->uiOverlayVtx[12].v.ob[1] - 32; } else { - pauseCtx->decorVtx[12].v.ob[0] = pauseCtx->decorVtx[14].v.ob[0] = WREG(17) + 3; + pauseCtx->uiOverlayVtx[12].v.ob[0] = pauseCtx->uiOverlayVtx[14].v.ob[0] = WREG(17) + 3; - pauseCtx->decorVtx[13].v.ob[0] = pauseCtx->decorVtx[15].v.ob[0] = pauseCtx->decorVtx[12].v.ob[0] + 18; + pauseCtx->uiOverlayVtx[13].v.ob[0] = pauseCtx->uiOverlayVtx[15].v.ob[0] = + pauseCtx->uiOverlayVtx[12].v.ob[0] + 18; - pauseCtx->decorVtx[12].v.ob[1] = pauseCtx->decorVtx[13].v.ob[1] = WREG(18) - 3; + pauseCtx->uiOverlayVtx[12].v.ob[1] = pauseCtx->uiOverlayVtx[13].v.ob[1] = WREG(18) - 3; - pauseCtx->decorVtx[14].v.ob[1] = pauseCtx->decorVtx[15].v.ob[1] = pauseCtx->decorVtx[12].v.ob[1] - 26; + pauseCtx->uiOverlayVtx[14].v.ob[1] = pauseCtx->uiOverlayVtx[15].v.ob[1] = + pauseCtx->uiOverlayVtx[12].v.ob[1] - 26; } - // 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; + // UI_OVERLAY_QUAD_BUTTON_LEFT, UI_OVERLAY_QUAD_BUTTON_RIGHT + pauseCtx->uiOverlayVtx[9].v.tc[0] = pauseCtx->uiOverlayVtx[11].v.tc[0] = pauseCtx->uiOverlayVtx[13].v.tc[0] = + pauseCtx->uiOverlayVtx[15].v.tc[0] = 0x300; - 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; + pauseCtx->uiOverlayVtx[10].v.tc[1] = pauseCtx->uiOverlayVtx[11].v.tc[1] = pauseCtx->uiOverlayVtx[14].v.tc[1] = + pauseCtx->uiOverlayVtx[15].v.tc[1] = 0x400; gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); @@ -1837,16 +1844,16 @@ void KaleidoScope_DrawDecor(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->decorVtx[0], 16, 0); + gSPVertex(POLY_OPA_DISP++, &pauseCtx->uiOverlayVtx[0], 16, 0); - // Draw DECOR_QUAD_INFO_BG_LEFT, DECOR_QUAD_INFO_BG_RIGHT + // Draw UI_OVERLAY_QUAD_INFO_BG_LEFT, UI_OVERLAY_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 DECOR_QUAD_BUTTON_LEFT + // Draw UI_OVERLAY_QUAD_BUTTON_LEFT gSPDisplayList(POLY_OPA_DISP++, gLButtonIconDL); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 180, 210, 255, 220); @@ -1855,23 +1862,23 @@ void KaleidoScope_DrawDecor(PlayState* play) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, D_808321A0, D_808321A2, D_808321A4, D_808321A6); } - // Draw DECOR_QUAD_BUTTON_RIGHT + // Draw UI_OVERLAY_QUAD_BUTTON_RIGHT gSPDisplayList(POLY_OPA_DISP++, gRButtonIconDL); if (pauseCtx->cursorSpecialPos != 0) { j = (pauseCtx->cursorSpecialPos - 8) * 4; - pauseCtx->cursorVtx[0].v.ob[0] = pauseCtx->decorVtx[j].v.ob[0]; - pauseCtx->cursorVtx[0].v.ob[1] = pauseCtx->decorVtx[j].v.ob[1]; + pauseCtx->cursorVtx[0].v.ob[0] = pauseCtx->uiOverlayVtx[j].v.ob[0]; + pauseCtx->cursorVtx[0].v.ob[1] = pauseCtx->uiOverlayVtx[j].v.ob[1]; KaleidoScope_DrawCursor(play, pauseCtx->pageIndex); } - // DECOR_QUAD_INFO_ICON + // UI_OVERLAY_QUAD_INFO_ICON temp = pauseCtx->infoPanelOffsetY - 80; - pauseCtx->decorVtx[16].v.ob[1] = pauseCtx->decorVtx[17].v.ob[1] = temp; + pauseCtx->uiOverlayVtx[16].v.ob[1] = pauseCtx->uiOverlayVtx[17].v.ob[1] = temp; - pauseCtx->decorVtx[18].v.ob[1] = pauseCtx->decorVtx[19].v.ob[1] = pauseCtx->decorVtx[16].v.ob[1] - 16; + pauseCtx->uiOverlayVtx[18].v.ob[1] = pauseCtx->uiOverlayVtx[19].v.ob[1] = pauseCtx->uiOverlayVtx[16].v.ob[1] - 16; - pauseCtx->decorVtx[18].v.tc[1] = pauseCtx->decorVtx[19].v.tc[1] = 0x200; + pauseCtx->uiOverlayVtx[18].v.tc[1] = pauseCtx->uiOverlayVtx[19].v.tc[1] = 0x200; gDPPipeSync(POLY_OPA_DISP++); gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, @@ -1892,14 +1899,15 @@ void KaleidoScope_DrawDecor(PlayState* play) { (pauseCtx->mainState <= PAUSE_MAIN_STATE_EQUIP_CHANGED)) || (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) { - // DECOR_QUAD_INFO_ICON - pauseCtx->decorVtx[16].v.ob[0] = pauseCtx->decorVtx[18].v.ob[0] = -63; + // UI_OVERLAY_QUAD_INFO_ICON + pauseCtx->uiOverlayVtx[16].v.ob[0] = pauseCtx->uiOverlayVtx[18].v.ob[0] = -63; - pauseCtx->decorVtx[17].v.ob[0] = pauseCtx->decorVtx[19].v.ob[0] = pauseCtx->decorVtx[16].v.ob[0] + 128; + pauseCtx->uiOverlayVtx[17].v.ob[0] = pauseCtx->uiOverlayVtx[19].v.ob[0] = + pauseCtx->uiOverlayVtx[16].v.ob[0] + 128; - pauseCtx->decorVtx[17].v.tc[0] = pauseCtx->decorVtx[19].v.tc[0] = 0x1000; + pauseCtx->uiOverlayVtx[17].v.tc[0] = pauseCtx->uiOverlayVtx[19].v.tc[0] = 0x1000; - gSPVertex(POLY_OPA_DISP++, &pauseCtx->decorVtx[16], 4, 0); + gSPVertex(POLY_OPA_DISP++, &pauseCtx->uiOverlayVtx[16], 4, 0); if (pauseCtx->nameColorSet == 1) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 70, 70, 70, 255); @@ -1933,19 +1941,22 @@ void KaleidoScope_DrawDecor(PlayState* play) { if (GET_GS_FLAGS(D_8082AE30[pauseCtx->cursorPoint[PAUSE_WORLD_MAP]]) == gAreaGsFlags[D_8082AE30[pauseCtx->cursorPoint[PAUSE_WORLD_MAP]]]) { - // DECOR_QUAD_HAVE_ALL_GS - pauseCtx->decorVtx[24].v.ob[0] = pauseCtx->decorVtx[26].v.ob[0] = -74; + // UI_OVERLAY_QUAD_HAVE_ALL_GS + pauseCtx->uiOverlayVtx[24].v.ob[0] = pauseCtx->uiOverlayVtx[26].v.ob[0] = -74; - pauseCtx->decorVtx[25].v.ob[0] = pauseCtx->decorVtx[27].v.ob[0] = pauseCtx->decorVtx[24].v.ob[0] + 19; + pauseCtx->uiOverlayVtx[25].v.ob[0] = pauseCtx->uiOverlayVtx[27].v.ob[0] = + pauseCtx->uiOverlayVtx[24].v.ob[0] + 19; - pauseCtx->decorVtx[24].v.ob[1] = pauseCtx->decorVtx[25].v.ob[1] = pauseCtx->decorVtx[24].v.ob[1] - 2; + pauseCtx->uiOverlayVtx[24].v.ob[1] = pauseCtx->uiOverlayVtx[25].v.ob[1] = + pauseCtx->uiOverlayVtx[24].v.ob[1] - 2; - pauseCtx->decorVtx[26].v.ob[1] = pauseCtx->decorVtx[27].v.ob[1] = pauseCtx->decorVtx[24].v.ob[1] - 19; + pauseCtx->uiOverlayVtx[26].v.ob[1] = pauseCtx->uiOverlayVtx[27].v.ob[1] = + pauseCtx->uiOverlayVtx[24].v.ob[1] - 19; - pauseCtx->decorVtx[25].v.tc[0] = pauseCtx->decorVtx[27].v.tc[0] = 0x300; + pauseCtx->uiOverlayVtx[25].v.tc[0] = pauseCtx->uiOverlayVtx[27].v.tc[0] = 0x300; gDPPipeSync(POLY_OPA_DISP++); - gSPVertex(POLY_OPA_DISP++, &pauseCtx->decorVtx[24], 4, 0); + gSPVertex(POLY_OPA_DISP++, &pauseCtx->uiOverlayVtx[24], 4, 0); gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); @@ -1958,34 +1969,37 @@ void KaleidoScope_DrawDecor(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)) { - // DECOR_QUAD_INFO_TEXT - pauseCtx->decorVtx[20].v.ob[1] = pauseCtx->decorVtx[21].v.ob[1] = temp; + // UI_OVERLAY_QUAD_INFO_TEXT + pauseCtx->uiOverlayVtx[20].v.ob[1] = pauseCtx->uiOverlayVtx[21].v.ob[1] = temp; - pauseCtx->decorVtx[22].v.ob[1] = pauseCtx->decorVtx[23].v.ob[1] = pauseCtx->decorVtx[20].v.ob[1] - 16; + pauseCtx->uiOverlayVtx[22].v.ob[1] = pauseCtx->uiOverlayVtx[23].v.ob[1] = + pauseCtx->uiOverlayVtx[20].v.ob[1] - 16; - pauseCtx->decorVtx[22].v.tc[1] = pauseCtx->decorVtx[23].v.tc[1] = 0x200; + pauseCtx->uiOverlayVtx[22].v.tc[1] = pauseCtx->uiOverlayVtx[23].v.tc[1] = 0x200; - gSPVertex(POLY_OPA_DISP++, &pauseCtx->decorVtx[16], 8, 0); + gSPVertex(POLY_OPA_DISP++, &pauseCtx->uiOverlayVtx[16], 8, 0); if (pauseCtx->state == PAUSE_STATE_SAVE_PROMPT) { - // DECOR_QUAD_INFO_ICON - pauseCtx->decorVtx[16].v.ob[0] = pauseCtx->decorVtx[18].v.ob[0] = R_KALEIDO_UNK5(gSaveContext.language); + // UI_OVERLAY_QUAD_INFO_ICON + pauseCtx->uiOverlayVtx[16].v.ob[0] = pauseCtx->uiOverlayVtx[18].v.ob[0] = + R_KALEIDO_UNK5(gSaveContext.language); - pauseCtx->decorVtx[17].v.ob[0] = pauseCtx->decorVtx[19].v.ob[0] = pauseCtx->decorVtx[16].v.ob[0] + 24; + pauseCtx->uiOverlayVtx[17].v.ob[0] = pauseCtx->uiOverlayVtx[19].v.ob[0] = + pauseCtx->uiOverlayVtx[16].v.ob[0] + 24; - // 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); + // UI_OVERLAY_QUAD_INFO_TEXT + pauseCtx->uiOverlayVtx[20].v.ob[0] = pauseCtx->uiOverlayVtx[22].v.ob[0] = + pauseCtx->uiOverlayVtx[16].v.ob[0] + R_KALEIDO_UNK2(gSaveContext.language); - pauseCtx->decorVtx[21].v.ob[0] = pauseCtx->decorVtx[23].v.ob[0] = - pauseCtx->decorVtx[20].v.ob[0] + sToDecideTextWidths[gSaveContext.language]; + pauseCtx->uiOverlayVtx[21].v.ob[0] = pauseCtx->uiOverlayVtx[23].v.ob[0] = + pauseCtx->uiOverlayVtx[20].v.ob[0] + sToDecideTextWidths[gSaveContext.language]; - // DECOR_QUAD_INFO_ICON - pauseCtx->decorVtx[17].v.tc[0] = pauseCtx->decorVtx[19].v.tc[0] = 0x300; + // UI_OVERLAY_QUAD_INFO_ICON + pauseCtx->uiOverlayVtx[17].v.tc[0] = pauseCtx->uiOverlayVtx[19].v.tc[0] = 0x300; - // DECOR_QUAD_INFO_TEXT - pauseCtx->decorVtx[21].v.tc[0] = pauseCtx->decorVtx[23].v.tc[0] = sToDecideTextWidths[gSaveContext.language] - << 5; + // UI_OVERLAY_QUAD_INFO_TEXT + pauseCtx->uiOverlayVtx[21].v.tc[0] = pauseCtx->uiOverlayVtx[23].v.tc[0] = + sToDecideTextWidths[gSaveContext.language] << 5; gSPDisplayList(POLY_OPA_DISP++, gAButtonIconDL); @@ -1996,12 +2010,13 @@ void KaleidoScope_DrawDecor(PlayState* play) { sToDecideTextWidths[gSaveContext.language], 16, 4); } else if (pauseCtx->cursorSpecialPos != 0) { if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE)) { - // DECOR_QUAD_INFO_ICON - pauseCtx->decorVtx[16].v.ob[0] = pauseCtx->decorVtx[18].v.ob[0] = -63; + // UI_OVERLAY_QUAD_INFO_ICON + pauseCtx->uiOverlayVtx[16].v.ob[0] = pauseCtx->uiOverlayVtx[18].v.ob[0] = -63; - pauseCtx->decorVtx[17].v.ob[0] = pauseCtx->decorVtx[19].v.ob[0] = pauseCtx->decorVtx[16].v.ob[0] + 128; + pauseCtx->uiOverlayVtx[17].v.ob[0] = pauseCtx->uiOverlayVtx[19].v.ob[0] = + pauseCtx->uiOverlayVtx[16].v.ob[0] + 128; - pauseCtx->decorVtx[17].v.tc[0] = pauseCtx->decorVtx[19].v.tc[0] = 0x1000; + pauseCtx->uiOverlayVtx[17].v.tc[0] = pauseCtx->uiOverlayVtx[19].v.tc[0] = 0x1000; gDPPipeSync(POLY_OPA_DISP++); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 200, 0, 255); @@ -2018,23 +2033,25 @@ void KaleidoScope_DrawDecor(PlayState* play) { } } else { if ((u32)pauseCtx->pageIndex == PAUSE_ITEM) { - // DECOR_QUAD_INFO_ICON - pauseCtx->decorVtx[16].v.ob[0] = pauseCtx->decorVtx[18].v.ob[0] = R_KALEIDO_UNK1(gSaveContext.language); + // UI_OVERLAY_QUAD_INFO_ICON + pauseCtx->uiOverlayVtx[16].v.ob[0] = pauseCtx->uiOverlayVtx[18].v.ob[0] = + R_KALEIDO_UNK1(gSaveContext.language); - pauseCtx->decorVtx[17].v.ob[0] = pauseCtx->decorVtx[19].v.ob[0] = pauseCtx->decorVtx[16].v.ob[0] + 48; + pauseCtx->uiOverlayVtx[17].v.ob[0] = pauseCtx->uiOverlayVtx[19].v.ob[0] = + pauseCtx->uiOverlayVtx[16].v.ob[0] + 48; - // 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); + // UI_OVERLAY_QUAD_INFO_TEXT + pauseCtx->uiOverlayVtx[20].v.ob[0] = pauseCtx->uiOverlayVtx[22].v.ob[0] = + pauseCtx->uiOverlayVtx[16].v.ob[0] + R_KALEIDO_UNK4(gSaveContext.language); - pauseCtx->decorVtx[21].v.ob[0] = pauseCtx->decorVtx[23].v.ob[0] = - pauseCtx->decorVtx[20].v.ob[0] + sToEquipTextWidths[gSaveContext.language]; + pauseCtx->uiOverlayVtx[21].v.ob[0] = pauseCtx->uiOverlayVtx[23].v.ob[0] = + pauseCtx->uiOverlayVtx[20].v.ob[0] + sToEquipTextWidths[gSaveContext.language]; - // DECOR_QUAD_INFO_ICON - pauseCtx->decorVtx[17].v.tc[0] = pauseCtx->decorVtx[19].v.tc[0] = 0x600; + // UI_OVERLAY_QUAD_INFO_ICON + pauseCtx->uiOverlayVtx[17].v.tc[0] = pauseCtx->uiOverlayVtx[19].v.tc[0] = 0x600; - // DECOR_QUAD_INFO_TEXT - pauseCtx->decorVtx[21].v.tc[0] = pauseCtx->decorVtx[23].v.tc[0] = + // UI_OVERLAY_QUAD_INFO_TEXT + pauseCtx->uiOverlayVtx[21].v.tc[0] = pauseCtx->uiOverlayVtx[23].v.tc[0] = sToEquipTextWidths[gSaveContext.language] << 5; gSPDisplayList(POLY_OPA_DISP++, gCButtonIconsDL); @@ -2049,32 +2066,32 @@ void KaleidoScope_DrawDecor(PlayState* play) { } else if ((pauseCtx->pageIndex == PAUSE_QUEST) && ((pauseCtx->cursorSlot[PAUSE_QUEST] >= 6) && (pauseCtx->cursorSlot[PAUSE_QUEST] <= 0x11))) { if (pauseCtx->namedItem != PAUSE_ITEM_NONE) { - // DECOR_QUAD_INFO_ICON - pauseCtx->decorVtx[16].v.ob[0] = pauseCtx->decorVtx[18].v.ob[0] = + // UI_OVERLAY_QUAD_INFO_ICON + pauseCtx->uiOverlayVtx[16].v.ob[0] = pauseCtx->uiOverlayVtx[18].v.ob[0] = R_KALEIDO_UNK3(gSaveContext.language); - pauseCtx->decorVtx[17].v.ob[0] = pauseCtx->decorVtx[19].v.ob[0] = - pauseCtx->decorVtx[16].v.ob[0] + 24; + pauseCtx->uiOverlayVtx[17].v.ob[0] = pauseCtx->uiOverlayVtx[19].v.ob[0] = + pauseCtx->uiOverlayVtx[16].v.ob[0] + 24; - // 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); + // UI_OVERLAY_QUAD_INFO_TEXT + pauseCtx->uiOverlayVtx[20].v.ob[0] = pauseCtx->uiOverlayVtx[22].v.ob[0] = + pauseCtx->uiOverlayVtx[16].v.ob[0] + R_KALEIDO_UNK2(gSaveContext.language); #if OOT_PAL if (gSaveContext.language == LANGUAGE_GER) { - pauseCtx->decorVtx[20].v.ob[0] = pauseCtx->decorVtx[22].v.ob[0] = - pauseCtx->decorVtx[16].v.ob[0] - 99; + pauseCtx->uiOverlayVtx[20].v.ob[0] = pauseCtx->uiOverlayVtx[22].v.ob[0] = + pauseCtx->uiOverlayVtx[16].v.ob[0] - 99; } #endif - pauseCtx->decorVtx[21].v.ob[0] = pauseCtx->decorVtx[23].v.ob[0] = - pauseCtx->decorVtx[20].v.ob[0] + sToPlayMelodyTextWidths[gSaveContext.language]; + pauseCtx->uiOverlayVtx[21].v.ob[0] = pauseCtx->uiOverlayVtx[23].v.ob[0] = + pauseCtx->uiOverlayVtx[20].v.ob[0] + sToPlayMelodyTextWidths[gSaveContext.language]; - // DECOR_QUAD_INFO_ICON - pauseCtx->decorVtx[17].v.tc[0] = pauseCtx->decorVtx[19].v.tc[0] = 0x300; + // UI_OVERLAY_QUAD_INFO_ICON + pauseCtx->uiOverlayVtx[17].v.tc[0] = pauseCtx->uiOverlayVtx[19].v.tc[0] = 0x300; - // DECOR_QUAD_INFO_TEXT - pauseCtx->decorVtx[21].v.tc[0] = pauseCtx->decorVtx[23].v.tc[0] = + // UI_OVERLAY_QUAD_INFO_TEXT + pauseCtx->uiOverlayVtx[21].v.tc[0] = pauseCtx->uiOverlayVtx[23].v.tc[0] = sToPlayMelodyTextWidths[gSaveContext.language] << 5; gSPDisplayList(POLY_OPA_DISP++, gAButtonIconDL); @@ -2087,23 +2104,25 @@ void KaleidoScope_DrawDecor(PlayState* play) { sToPlayMelodyTextWidths[gSaveContext.language], 16, 4); } } else if (pauseCtx->pageIndex == PAUSE_EQUIP) { - // DECOR_QUAD_INFO_ICON - pauseCtx->decorVtx[16].v.ob[0] = pauseCtx->decorVtx[18].v.ob[0] = R_KALEIDO_UNK6(gSaveContext.language); + // UI_OVERLAY_QUAD_INFO_ICON + pauseCtx->uiOverlayVtx[16].v.ob[0] = pauseCtx->uiOverlayVtx[18].v.ob[0] = + R_KALEIDO_UNK6(gSaveContext.language); - pauseCtx->decorVtx[17].v.ob[0] = pauseCtx->decorVtx[19].v.ob[0] = pauseCtx->decorVtx[16].v.ob[0] + 24; + pauseCtx->uiOverlayVtx[17].v.ob[0] = pauseCtx->uiOverlayVtx[19].v.ob[0] = + pauseCtx->uiOverlayVtx[16].v.ob[0] + 24; - // 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); + // UI_OVERLAY_QUAD_INFO_TEXT + pauseCtx->uiOverlayVtx[20].v.ob[0] = pauseCtx->uiOverlayVtx[22].v.ob[0] = + pauseCtx->uiOverlayVtx[16].v.ob[0] + R_KALEIDO_UNK2(gSaveContext.language); - pauseCtx->decorVtx[21].v.ob[0] = pauseCtx->decorVtx[23].v.ob[0] = - pauseCtx->decorVtx[20].v.ob[0] + sToEquipTextWidths[gSaveContext.language]; + pauseCtx->uiOverlayVtx[21].v.ob[0] = pauseCtx->uiOverlayVtx[23].v.ob[0] = + pauseCtx->uiOverlayVtx[20].v.ob[0] + sToEquipTextWidths[gSaveContext.language]; - // DECOR_QUAD_INFO_ICON - pauseCtx->decorVtx[17].v.tc[0] = pauseCtx->decorVtx[19].v.tc[0] = 0x300; + // UI_OVERLAY_QUAD_INFO_ICON + pauseCtx->uiOverlayVtx[17].v.tc[0] = pauseCtx->uiOverlayVtx[19].v.tc[0] = 0x300; - // DECOR_QUAD_INFO_TEXT - pauseCtx->decorVtx[21].v.tc[0] = pauseCtx->decorVtx[23].v.tc[0] = + // UI_OVERLAY_QUAD_INFO_TEXT + pauseCtx->uiOverlayVtx[21].v.tc[0] = pauseCtx->uiOverlayVtx[23].v.tc[0] = sToEquipTextWidths[gSaveContext.language] << 5; gSPDisplayList(POLY_OPA_DISP++, gAButtonIconDL); @@ -3341,7 +3360,7 @@ void KaleidoScope_SetVertices(PlayState* play, GraphicsContext* gfxCtx) { pauseCtx->questVtx[k + 3].v.cn[3] = pauseCtx->alpha; } - pauseCtx->decorVtx = GRAPH_ALLOC(gfxCtx, (DECOR_QUAD_MAX * 4) * sizeof(Vtx)); + pauseCtx->uiOverlayVtx = GRAPH_ALLOC(gfxCtx, (UI_OVERLAY_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); diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h index 10ecdcdad8..3e0b112ae2 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h @@ -221,16 +221,16 @@ typedef enum ItemQuad { #define TO_PAGE_LABEL_TEX_WIDTH 128 #define TO_PAGE_LABEL_TEX_HEIGHT 16 -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; +typedef enum UIOverlayQuad { + /* 0 */ UI_OVERLAY_QUAD_INFO_BG_LEFT, // The left half of the info plate background + /* 1 */ UI_OVERLAY_QUAD_INFO_BG_RIGHT, // The right half of the info plate background + /* 2 */ UI_OVERLAY_QUAD_BUTTON_LEFT, // The button for scrolling to the left page + /* 3 */ UI_OVERLAY_QUAD_BUTTON_RIGHT, // The button for scrolling to the right page + /* 4 */ UI_OVERLAY_QUAD_INFO_ICON, // The icon in the info plate + /* 5 */ UI_OVERLAY_QUAD_INFO_TEXT, // The text in the info plate + /* 6 */ UI_OVERLAY_QUAD_HAVE_ALL_GS, // On the overworld map page, the indicator that the selected area has been cleared of gold skulltulas + /* 7 */ UI_OVERLAY_QUAD_MAX +} UIOverlayQuad; void KaleidoScope_DrawQuestStatus(struct PlayState* play, GraphicsContext* gfxCtx); s32 KaleidoScope_UpdateQuestStatusPoint(PauseContext* pauseCtx, s32 point); From 50ecba9040e5d5dac6e52342c780a286fe7a57a7 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sun, 22 Jun 2025 18:08:33 +0200 Subject: [PATCH 6/6] fixup --- src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c index c7064c2be0..d07457d690 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c @@ -1652,7 +1652,7 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) { /** * Draws the buttons for scrolling left/right, and the info plate. */ -void KaleidoScope_DrawDecor(PlayState* play) { +void KaleidoScope_DrawUIOverlay(PlayState* play) { static void* sToEquipTextTextures[] = LANGUAGE_ARRAY(gPauseToEquipJPNTex, gPauseToEquipENGTex, gPauseToEquipGERTex, gPauseToEquipFRATex); static void* sToDecideTextTextures[] = @@ -3443,7 +3443,7 @@ void KaleidoScope_Draw(PlayState* play) { KaleidoScope_SetView(pauseCtx, 0.0f, 0.0f, 64.0f); if (!IS_PAUSE_STATE_GAMEOVER(pauseCtx)) { - KaleidoScope_DrawDecor(play); + KaleidoScope_DrawUIOverlay(play); } }