mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 09:45:02 +00:00
Code Issues Projects Releases Wiki Activity

[PAL N64] Rename file select assets (#2197)

Browse source
This commit is contained in:
cadmic 2024-09-16 13:40:20 -07:00 committed by GitHub
parent c91e62f000
commit dc9782b5b3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 43 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
assets/xml/overlays/ovl_file_choose.xml
View file

@ -1,6 +1,6 @@
<Root>
<File Name="ovl_file_choose">
<Array Name="D_80811BB0" Count="24" Offset="0x0" Static="Off">
<Array Name="gNameEntryVtx" Count="24" Offset="0x0" Static="Off">
<Vtx/>
</Array>
<Array Name="gCharPageHira" Count="65" Offset="0x180" Static="Off">
@ -15,19 +15,19 @@
<Array Name="gNextCharPage" Count="9" Offset="0x30C" Static="Off">
<Scalar Type="s16"/>
</Array>
<Array Name="D_80811D30" Count="16" Offset="0x320" Static="Off">
<Array Name="gOptionsMenuHeadersVtx" Count="16" Offset="0x320" Static="Off">
<Vtx/>
</Array>
<Array Name="D_80811F30" Count="32" Offset="0x420" Static="Off">
<Array Name="gOptionsMenuSettingsVtx" Count="32" Offset="0x420" Static="Off">
<Vtx/>
</Array>
<Array Name="gOptionsDividerTopVtx" Count="4" Offset="0x620" Static="Off">
<Array Name="gOptionsDividerSoundVtx" Count="4" Offset="0x620" Static="Off">
<Vtx/>
</Array>
<Array Name="gOptionsDividerMiddleVtx" Count="4" Offset="0x660" Static="Off">
<Array Name="gOptionsDividerZTargetVtx" Count="4" Offset="0x660" Static="Off">
<Vtx/>
</Array>
<Array Name="gOptionsDividerBottomVtx" Count="4" Offset="0x6A0" Static="Off">
<Array Name="gOptionsDividerBrightnessVtx" Count="4" Offset="0x6A0" Static="Off">
<Vtx/>
</Array>
</File>

16
assets/xml/overlays/ovl_file_choose_pal.xml
View file

@ -1,27 +1,27 @@
<Root>
<File Name="ovl_file_choose">
<Array Name="D_80811BB0" Count="24" Offset="0x0" Static="Off">
<Array Name="gNameEntryVtx" Count="24" Offset="0x0" Static="Off">
<Vtx/>
</Array>
<Array Name="D_80811D30" Count="16" Offset="0x180" Static="Off">
<Array Name="gOptionsMenuHeadersVtx" Count="16" Offset="0x180" Static="Off">
<Vtx/>
</Array>
<Array Name="D_80811E30" Count="16" Offset="0x280" Static="Off">
<Array Name="gOptionsMenuHeadersGERVtx" Count="16" Offset="0x280" Static="Off">
<Vtx/>
</Array>
<Array Name="D_80811F30" Count="32" Offset="0x380" Static="Off">
<Array Name="gOptionsMenuSettingsVtx" Count="32" Offset="0x380" Static="Off">
<Vtx/>
</Array>
<Array Name="D_80812130" Count="32" Offset="0x580" Static="Off">
<Array Name="gOptionsMenuSettingsGERVtx" Count="32" Offset="0x580" Static="Off">
<Vtx/>
</Array>
<Array Name="gOptionsDividerTopVtx" Count="4" Offset="0x780" Static="Off">
<Array Name="gOptionsDividerSoundVtx" Count="4" Offset="0x780" Static="Off">
<Vtx/>
</Array>
<Array Name="gOptionsDividerMiddleVtx" Count="4" Offset="0x7C0" Static="Off">
<Array Name="gOptionsDividerZTargetVtx" Count="4" Offset="0x7C0" Static="Off">
<Vtx/>
</Array>
<Array Name="gOptionsDividerBottomVtx" Count="4" Offset="0x800" Static="Off">
<Array Name="gOptionsDividerBrightnessVtx" Count="4" Offset="0x800" Static="Off">
<Vtx/>
</Array>
<Array Name="gCharPageEng" Count="65" Offset="0x840" Static="Off">

4
assets/xml/textures/title_static.xml
View file

@ -38,7 +38,7 @@
<Texture Name="gFileSelStereoJPNTex" OutName="stereo_jpn" Format="ia8" Width="48" Height="16" Offset="0x9000"/>
<Texture Name="gFileSelLTargetingJPNTex" OutName="l_targeting_jpn" Format="ia8" Width="64" Height="16" Offset="0x9300"/>
<Texture Name="gFileSelZTargetingJPNTex" OutName="z_targeting_jpn" Format="ia8" Width="64" Height="16" Offset="0x9300"/>
<Texture Name="gFileSelSwitchJPNTex" OutName="switch_jpn" Format="ia8" Width="48" Height="16" Offset="0x9700"/>
<Texture Name="gFileSelHoldJPNTex" OutName="hold_jpn" Format="ia8" Width="48" Height="16" Offset="0x9A00"/>
@ -138,7 +138,7 @@
<Texture Name="gFileSelMonoENGTex" OutName="mono_eng" Format="ia8" Width="48" Height="16" Offset="0x33080"/>
<Texture Name="gFileSelStereoENGTex" OutName="stereo_eng" Format="ia8" Width="48" Height="16" Offset="0x33380"/>
<Texture Name="gFileSelLTargetingENGTex" OutName="l_targeting_eng" Format="ia8" Width="64" Height="16" Offset="0x33680"/>
<Texture Name="gFileSelZTargetingENGTex" OutName="z_targeting_eng" Format="ia8" Width="64" Height="16" Offset="0x33680"/>
<Texture Name="gFileSelSwitchENGTex" OutName="switch_eng" Format="ia8" Width="48" Height="16" Offset="0x33A80"/>
<Texture Name="gFileSelHoldENGTex" OutName="hold_eng" Format="ia8" Width="48" Height="16" Offset="0x33D80"/>

10
assets/xml/textures/title_static_pal.xml
View file

@ -82,7 +82,7 @@
<Texture Name="gFileSelAreYouSureENGTex" OutName="are_you_sure_eng" Format="ia8" Width="128" Height="16" Offset="0x25C80"/>
<Texture Name="gFileSelFileCopiedENGTex" OutName="file_copied_eng" Format="ia8" Width="128" Height="16" Offset="0x26480"/>
<Texture Name="gFileSelWhichFile1GERTex" OutName="which_file_1_ger" Format="ia8" Width="128" Height="16" Offset="0x26C80"/>
<Texture Name="gFileSelCopyWhichFileGERTex" OutName="which_file_1_ger" Format="ia8" Width="128" Height="16" Offset="0x26C80"/>
<Texture Name="gFileSelCopyToWhichFileGERTex" OutName="copy_to_which_file_ger" Format="ia8" Width="128" Height="16" Offset="0x27480"/>
<Texture Name="gFileSelAreYouSureGERTex" OutName="are_you_sure_ger" Format="ia8" Width="128" Height="16" Offset="0x27C80"/>
<Texture Name="gFileSelFileCopiedGERTex" OutName="file_copied_ger" Format="ia8" Width="128" Height="16" Offset="0x28480"/>
@ -105,7 +105,7 @@
<Texture Name="gFileSelAreYouSure2ENGTex" OutName="are_you_sure_eng_2" Format="ia8" Width="128" Height="16" Offset="0x2E480"/>
<Texture Name="gFileSelFileErasedENGTex" OutName="file_erased_eng" Format="ia8" Width="128" Height="16" Offset="0x2EC80"/>
<Texture Name="gFileSelWhichFile2GERTex" OutName="which_file_2_ger" Format="ia8" Width="128" Height="16" Offset="0x2F480"/>
<Texture Name="gFileSelEraseWhichFileGERTex" OutName="which_file_2_ger" Format="ia8" Width="128" Height="16" Offset="0x2F480"/>
<Texture Name="gFileSelAreYouSure2GERTex" OutName="are_you_sure_ger_2" Format="ia8" Width="128" Height="16" Offset="0x2FC80"/>
<Texture Name="gFileSelFileErasedGERTex" OutName="file_erased_ger" Format="ia8" Width="128" Height="16" Offset="0x30480"/>
@ -166,9 +166,9 @@
<Texture Name="gFileSelStereoENGTex" OutName="stereo_eng" Format="ia8" Width="48" Height="16" Offset="0x41900"/>
<Texture Name="gFileSelStereoFRATex" OutName="stereo_fra" Format="ia8" Width="48" Height="16" Offset="0x41C00"/>
<Texture Name="gFileSelLTargetingENGTex" OutName="l_targeting_eng" Format="ia8" Width="64" Height="16" Offset="0x41F00"/>
<Texture Name="gFileSelLTargetingGERTex" OutName="l_targeting_ger" Format="ia8" Width="144" Height="16" Offset="0x42300"/>
<Texture Name="gFileSelLTargetingFRATex" OutName="l_targeting_fra" Format="ia8" Width="64" Height="16" Offset="0x42C00"/>
<Texture Name="gFileSelZTargetingENGTex" OutName="z_targeting_eng" Format="ia8" Width="64" Height="16" Offset="0x41F00"/>
<Texture Name="gFileSelZTargetingGERTex" OutName="z_targeting_ger" Format="ia8" Width="144" Height="16" Offset="0x42300"/>
<Texture Name="gFileSelZTargetingFRATex" OutName="z_targeting_fra" Format="ia8" Width="64" Height="16" Offset="0x42C00"/>
<Texture Name="gFileSelSwitchENGTex" OutName="switch_eng" Format="ia8" Width="48" Height="16" Offset="0x43000"/>
<Texture Name="gFileSelSwitchGERTex" OutName="switch_ger" Format="ia8" Width="80" Height="16" Offset="0x43300"/>

4
src/overlays/gamestates/ovl_file_choose/z_file_choose.c
View file

@ -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,

36
src/overlays/gamestates/ovl_file_choose/z_file_nameset.c
View file

@ -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();