diff --git a/assets/xml/overlays/ovl_file_choose.xml b/assets/xml/overlays/ovl_file_choose.xml index a97188b446..8808ab4281 100644 --- a/assets/xml/overlays/ovl_file_choose.xml +++ b/assets/xml/overlays/ovl_file_choose.xml @@ -1,6 +1,6 @@ - + @@ -15,19 +15,19 @@ - + - + - + - + - + diff --git a/assets/xml/overlays/ovl_file_choose_pal.xml b/assets/xml/overlays/ovl_file_choose_pal.xml index 9721f7e0de..3c4c24cdab 100644 --- a/assets/xml/overlays/ovl_file_choose_pal.xml +++ b/assets/xml/overlays/ovl_file_choose_pal.xml @@ -1,27 +1,27 @@ - + - + - + - + - + - + - + - + diff --git a/assets/xml/textures/title_static.xml b/assets/xml/textures/title_static.xml index 4a72016fc8..c0f3f2908d 100644 --- a/assets/xml/textures/title_static.xml +++ b/assets/xml/textures/title_static.xml @@ -38,7 +38,7 @@ - + @@ -138,7 +138,7 @@ - + diff --git a/assets/xml/textures/title_static_pal.xml b/assets/xml/textures/title_static_pal.xml index 422b60cdc9..5f26d7f8de 100644 --- a/assets/xml/textures/title_static_pal.xml +++ b/assets/xml/textures/title_static_pal.xml @@ -82,7 +82,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -166,9 +166,9 @@ - - - + + + diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index 0d8115921b..ac727a2970 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -937,8 +937,8 @@ static void* sTitleLabels[][9] = { { gFileSelPleaseSelectAFileENGTex, gFileSelOpenThisFileENGTex, gFileSelCopyWhichFileENGTex, gFileSelCopyToWhichFileENGTex, gFileSelAreYouSureENGTex, gFileSelFileCopiedENGTex, gFileSelEraseWhichFileENGTex, gFileSelAreYouSure2ENGTex, gFileSelFileErasedENGTex }, - { gFileSelPleaseSelectAFileGERTex, gFileSelOpenThisFileGERTex, gFileSelWhichFile1GERTex, - gFileSelCopyToWhichFileGERTex, gFileSelAreYouSureGERTex, gFileSelFileCopiedGERTex, gFileSelWhichFile2GERTex, + { gFileSelPleaseSelectAFileGERTex, gFileSelOpenThisFileGERTex, gFileSelCopyWhichFileGERTex, + gFileSelCopyToWhichFileGERTex, gFileSelAreYouSureGERTex, gFileSelFileCopiedGERTex, gFileSelEraseWhichFileGERTex, gFileSelAreYouSure2GERTex, gFileSelFileErasedGERTex }, { gFileSelPleaseSelectAFileFRATex, gFileSelOpenThisFileFRATex, gFileSelCopyWhichFileFRATex, gFileSelCopyToWhichFileFRATex, gFileSelAreYouSureFRATex, gFileSelFileCopiedFRATex, gFileSelEraseWhichFileFRATex, diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c index 634c0e3679..35f7684a1e 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c @@ -188,7 +188,7 @@ void FileSelect_SetNameEntryVtx(GameState* thisx) { ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, this->titleAlpha[0]); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0); - gSPVertex(POLY_OPA_DISP++, D_80811BB0, 24, 0); + gSPVertex(POLY_OPA_DISP++, gNameEntryVtx, 24, 0); gDPLoadTextureBlock(POLY_OPA_DISP++, sNameLabelTextures[gSaveContext.language], G_IM_FMT_IA, G_IM_SIZ_8b, 56, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); @@ -555,17 +555,21 @@ void FileSelect_DrawNameEntry(GameState* thisx) { if (this->kbdX != this->kbdButton) { PRINTF("014 xpos=%d contents=%d\n", this->kbdX, this->kbdButton); } - this->nameEntryVtx[40].v.ob[0] = this->nameEntryVtx[42].v.ob[0] = D_80811BB0[(this->kbdX + 1) * 4].v.ob[0] - 4; + this->nameEntryVtx[40].v.ob[0] = this->nameEntryVtx[42].v.ob[0] = + gNameEntryVtx[(this->kbdX + 1) * 4].v.ob[0] - 4; this->nameEntryVtx[41].v.ob[0] = this->nameEntryVtx[43].v.ob[0] = this->nameEntryVtx[40].v.ob[0] + 52; - this->nameEntryVtx[40].v.ob[1] = this->nameEntryVtx[41].v.ob[1] = D_80811BB0[(this->kbdX + 1) * 4].v.ob[1] + 4; + this->nameEntryVtx[40].v.ob[1] = this->nameEntryVtx[41].v.ob[1] = + gNameEntryVtx[(this->kbdX + 1) * 4].v.ob[1] + 4; } else if ((this->kbdButton == FS_KBD_BTN_ENG) || (this->kbdButton == FS_KBD_BTN_BACKSPACE)) { if (this->kbdX != this->kbdButton) { PRINTF("23 xpos=%d contents=%d\n", this->kbdX, this->kbdButton); } - this->nameEntryVtx[40].v.ob[0] = this->nameEntryVtx[42].v.ob[0] = D_80811BB0[(this->kbdX + 1) * 4].v.ob[0] - 4; + this->nameEntryVtx[40].v.ob[0] = this->nameEntryVtx[42].v.ob[0] = + gNameEntryVtx[(this->kbdX + 1) * 4].v.ob[0] - 4; this->nameEntryVtx[41].v.ob[0] = this->nameEntryVtx[43].v.ob[0] = this->nameEntryVtx[40].v.ob[0] + 40; - this->nameEntryVtx[40].v.ob[1] = this->nameEntryVtx[41].v.ob[1] = D_80811BB0[(this->kbdX + 1) * 4].v.ob[1] + 4; + this->nameEntryVtx[40].v.ob[1] = this->nameEntryVtx[41].v.ob[1] = + gNameEntryVtx[(this->kbdX + 1) * 4].v.ob[1] + 4; } else { if (this->charIndex >= 65) { PRINTF("mjp=%d xpos=%d ypos=%d name_contents=%d\n", this->charIndex, this->kbdX, this->kbdY, @@ -1417,8 +1421,8 @@ static OptionsMenuTextureInfo sOptionsMenuHeaders[] = { 16, }, { - LANGUAGE_ARRAY(gFileSelLTargetingJPNTex, gFileSelLTargetingENGTex, gFileSelLTargetingGERTex, - gFileSelLTargetingFRATex), + LANGUAGE_ARRAY(gFileSelZTargetingJPNTex, gFileSelZTargetingENGTex, gFileSelZTargetingGERTex, + gFileSelZTargetingFRATex), OPTIONS_MENU_TEXTURE_WIDTHS(64, 64, 144, 64), 16, }, @@ -1551,12 +1555,12 @@ void FileSelect_DrawOptionsImpl(GameState* thisx) { } #if OOT_NTSC - gSPVertex(POLY_OPA_DISP++, D_80811D30, 32, 0); + gSPVertex(POLY_OPA_DISP++, gOptionsMenuHeadersVtx, 32, 0); #else if (gSaveContext.language == LANGUAGE_GER) { - gSPVertex(POLY_OPA_DISP++, D_80811E30, 32, 0); + gSPVertex(POLY_OPA_DISP++, gOptionsMenuHeadersGERVtx, 32, 0); } else { - gSPVertex(POLY_OPA_DISP++, D_80811D30, 32, 0); + gSPVertex(POLY_OPA_DISP++, gOptionsMenuHeadersVtx, 32, 0); } #endif @@ -1575,12 +1579,12 @@ void FileSelect_DrawOptionsImpl(GameState* thisx) { } #if OOT_NTSC - gSPVertex(POLY_OPA_DISP++, D_80811F30, 32, 0); + gSPVertex(POLY_OPA_DISP++, gOptionsMenuSettingsVtx, 32, 0); #else if (gSaveContext.language == LANGUAGE_GER) { - gSPVertex(POLY_OPA_DISP++, D_80812130, 32, 0); + gSPVertex(POLY_OPA_DISP++, gOptionsMenuSettingsGERVtx, 32, 0); } else { - gSPVertex(POLY_OPA_DISP++, D_80811F30, 32, 0); + gSPVertex(POLY_OPA_DISP++, gOptionsMenuSettingsVtx, 32, 0); } #endif @@ -1667,7 +1671,7 @@ void FileSelect_DrawOptionsImpl(GameState* thisx) { Matrix_Push(); Matrix_Translate(0.0f, 0.1f, 0.0f, MTXMODE_APPLY); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, this->state.gfxCtx, "../z_file_nameset_PAL.c", 1009); - gSPVertex(POLY_OPA_DISP++, gOptionsDividerTopVtx, 4, 0); + gSPVertex(POLY_OPA_DISP++, gOptionsDividerSoundVtx, 4, 0); gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0); Matrix_Pop(); @@ -1675,14 +1679,14 @@ void FileSelect_DrawOptionsImpl(GameState* thisx) { Matrix_Translate(0.0f, 0.2f, 0.0f, MTXMODE_APPLY); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, this->state.gfxCtx, "../z_file_nameset_PAL.c", 1021); - gSPVertex(POLY_OPA_DISP++, gOptionsDividerMiddleVtx, 4, 0); + gSPVertex(POLY_OPA_DISP++, gOptionsDividerZTargetVtx, 4, 0); gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0); Matrix_Pop(); Matrix_Push(); Matrix_Translate(0.0f, 0.4f, 0.0f, MTXMODE_APPLY); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, this->state.gfxCtx, "../z_file_nameset_PAL.c", 1033); - gSPVertex(POLY_OPA_DISP++, gOptionsDividerBottomVtx, 4, 0); + gSPVertex(POLY_OPA_DISP++, gOptionsDividerBrightnessVtx, 4, 0); gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0); Matrix_Pop();