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

schedule_static docs (#1324) 

* Finish off schedule_static

* gBombersNotebookBarSmallTex
This commit is contained in:
Derek Hensley 2023-07-13 18:59:13 -07:00 committed by GitHub
parent 4727253718
commit 2aa028c20f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
assets/xml/interface/schedule_static.xml
View File

@ -12,6 +12,7 @@
<Texture Name="gBombersNotebookBackgroundTex" OutName="bombers_notebook_background" Format="i8" Width="32" Height="32" Offset="0x13D8"/> <Texture Name="gBombersNotebookBackgroundTex" OutName="bombers_notebook_background" Format="i8" Width="32" Height="32" Offset="0x13D8"/>
<Texture Name="gBombersNotebookHeaderBoxTex" OutName="bombers_notebook_header_box" Format="i8" Width="8" Height="24" Offset="0x17D8"/> <Texture Name="gBombersNotebookHeaderBoxTex" OutName="bombers_notebook_header_box" Format="i8" Width="8" Height="24" Offset="0x17D8"/>
<Texture Name="gBombersNotebookLineTex" OutName="bombers_notebook_line" Format="i8" Width="8" Height="1" Offset="0x1898"/> <Texture Name="gBombersNotebookLineTex" OutName="bombers_notebook_line" Format="i8" Width="8" Height="1" Offset="0x1898"/>
<Texture Name="gBombersNotebookBarSmallTex" OutName="bombers_notebook_bar_small" Format="i8" Width="8" Height="2" Offset="0x18A0"/> <!-- Unused -->
<Texture Name="gBombersNotebookBarTex" OutName="bombers_notebook_bar" Format="i8" Width="8" Height="4" Offset="0x18B0"/> <Texture Name="gBombersNotebookBarTex" OutName="bombers_notebook_bar" Format="i8" Width="8" Height="4" Offset="0x18B0"/>
<Texture Name="gBombersNotebookCursorTex" OutName="bombers_notebook_cursor" Format="ia4" Width="16" Height="16" Offset="0x18D0"/> <Texture Name="gBombersNotebookCursorTex" OutName="bombers_notebook_cursor" Format="ia4" Width="16" Height="16" Offset="0x18D0"/>
<Texture Name="gBombersNoteoobkTimeOfDayBoxTex" OutName="bombers_notebook_time_of_day_box" Format="ia4" Width="64" Height="28" Offset="0x1950"/> <Texture Name="gBombersNoteoobkTimeOfDayBoxTex" OutName="bombers_notebook_time_of_day_box" Format="ia4" Width="64" Height="28" Offset="0x1950"/>
@ -30,9 +31,29 @@
<Texture Name="gBombersNotebookDigit8Tex" OutName="bombers_notebook_digit_8" Format="i4" Width="16" Height="17" Offset="0x24B8"/> <Texture Name="gBombersNotebookDigit8Tex" OutName="bombers_notebook_digit_8" Format="i4" Width="16" Height="17" Offset="0x24B8"/>
<Texture Name="gBombersNotebookDigit9Tex" OutName="bombers_notebook_digit_9" Format="i4" Width="16" Height="17" Offset="0x2540"/> <Texture Name="gBombersNotebookDigit9Tex" OutName="bombers_notebook_digit_9" Format="i4" Width="16" Height="17" Offset="0x2540"/>
<Texture Name="gBombersNotebookColonTex" OutName="bombers_notebook_colon" Format="i4" Width="16" Height="17" Offset="0x25C8"/> <Texture Name="gBombersNotebookColonTex" OutName="bombers_notebook_colon" Format="i4" Width="16" Height="17" Offset="0x25C8"/>
<Texture Name="gBombersNotebookDay1stTex" OutName="bombers_notebook_day_1st" Format="ia8" Width="48" Height="22" Offset="0x2650"/>
<Texture Name="gBombersNotebookDay2ndTex" OutName="bombers_notebook_day_2nd" Format="ia8" Width="48" Height="22" Offset="0x2A70"/> <!-- English -->
<Texture Name="gBombersNotebookDayFinalTex" OutName="bombers_notebook_day_final" Format="ia8" Width="48" Height="22" Offset="0x2E90"/> <Texture Name="gBombersNotebookDay1stENGTex" OutName="bombers_notebook_day_1st_eng" Format="ia8" Width="48" Height="22" Offset="0x2650"/>
<Texture Name="gBombersNotebookTimeOfDayTex" OutName="bombers_notebook_time_of_day" Format="i4" Width="96" Height="20" Offset="0x32B0"/> <Texture Name="gBombersNotebookDay2ndENGTex" OutName="bombers_notebook_day_2nd_eng" Format="ia8" Width="48" Height="22" Offset="0x2A70"/>
<Texture Name="gBombersNotebookDayFinalENGTex" OutName="bombers_notebook_day_final_eng" Format="ia8" Width="48" Height="22" Offset="0x2E90"/>
<Texture Name="gBombersNotebookTimeOfDayENGTex" OutName="bombers_notebook_time_of_day_eng" Format="i4" Width="96" Height="20" Offset="0x32B0"/>
<!-- German -->
<Texture Name="gBombersNotebookDay1stGERTex" OutName="bombers_notebook_day_1st_ger" Format="ia8" Width="48" Height="22" Offset="0x3670"/>
<Texture Name="gBombersNotebookDay2ndGERTex" OutName="bombers_notebook_day_2nd_ger" Format="ia8" Width="48" Height="22" Offset="0x3A90"/>
<Texture Name="gBombersNotebookDayFinalGERTex" OutName="bombers_notebook_day_final_ger" Format="ia8" Width="48" Height="22" Offset="0x3EB0"/>
<Texture Name="gBombersNotebookTimeOfDayGERTex" OutName="bombers_notebook_time_of_day_ger" Format="i4" Width="96" Height="20" Offset="0x42D0"/>
<!-- French -->
<Texture Name="gBombersNotebookDay1stFRATex" OutName="bombers_notebook_day_1st_fra" Format="ia8" Width="48" Height="22" Offset="0x4690"/>
<Texture Name="gBombersNotebookDay2ndFRATex" OutName="bombers_notebook_day_2nd_fra" Format="ia8" Width="48" Height="22" Offset="0x4AB0"/>
<Texture Name="gBombersNotebookDayFinalFRATex" OutName="bombers_notebook_day_final_fra" Format="ia8" Width="48" Height="22" Offset="0x4ED0"/>
<Texture Name="gBombersNotebookTimeOfDayFRATex" OutName="bombers_notebook_time_of_day_fra" Format="i4" Width="96" Height="20" Offset="0x52F0"/>
<!-- Spanish -->
<Texture Name="gBombersNotebookDay1stSPATex" OutName="bombers_notebook_day_1st_spa" Format="ia8" Width="48" Height="22" Offset="0x56B0"/>
<Texture Name="gBombersNotebookDay2ndSPATex" OutName="bombers_notebook_day_2nd_spa" Format="ia8" Width="48" Height="22" Offset="0x5AD0"/>
<Texture Name="gBombersNotebookDayFinalSPATex" OutName="bombers_notebook_day_final_spa" Format="ia8" Width="48" Height="22" Offset="0x5EF0"/>
<Texture Name="gBombersNotebookTimeOfDaySPATex" OutName="bombers_notebook_time_of_day_spa" Format="i4" Width="96" Height="20" Offset="0x6310"/>
</File> </File>
</Root> </Root>

8
src/code/z_play_hireso.c
View File

@ -252,9 +252,9 @@ u16 sBombersNotebookEntries[BOMBERS_NOTEBOOK_PERSON_MAX][BOMBERS_NOTEBOOK_ENTRY_
s16 sBombersNotebookDayRectRectLeft[] = { 120, 120, 270, 420 }; s16 sBombersNotebookDayRectRectLeft[] = { 120, 120, 270, 420 };
TexturePtr sBombersNotebookDayTextures[] = { TexturePtr sBombersNotebookDayTextures[] = {
gBombersNotebookDay1stTex, gBombersNotebookDay1stENGTex,
gBombersNotebookDay2ndTex, gBombersNotebookDay2ndENGTex,
gBombersNotebookDayFinalTex, gBombersNotebookDayFinalENGTex,
}; };
#define DEFINE_EVENT(_enum, icon, _colorFlag, _description, _completedMessage, _completedFlag) icon, #define DEFINE_EVENT(_enum, icon, _colorFlag, _description, _completedMessage, _completedFlag) icon,
@ -721,7 +721,7 @@ void BombersNotebook_DrawTimeOfDay(Gfx** gfxP) {
gDPSetPrimColor(gfx++, 0, 0, 0, 0, 0, 255); gDPSetPrimColor(gfx++, 0, 0, 0, 0, 0, 255);
gDPPipeSync(gfx++); gDPPipeSync(gfx++);
gDPSetCombineLERP(gfx++, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0); gDPSetCombineLERP(gfx++, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0);
gDPLoadTextureBlock_4b(gfx++, gBombersNotebookTimeOfDayTex, G_IM_FMT_I, 96, 20, 0, G_TX_MIRROR | G_TX_WRAP, gDPLoadTextureBlock_4b(gfx++, gBombersNotebookTimeOfDayENGTex, G_IM_FMT_I, 96, 20, 0, G_TX_MIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
BombersNotebook_DrawScisTexRect(&gfx, (timeOfDayRectLeft + 16) * 4, 47 * 4, (timeOfDayRectLeft + 112) * 4, 67 * 4, BombersNotebook_DrawScisTexRect(&gfx, (timeOfDayRectLeft + 16) * 4, 47 * 4, (timeOfDayRectLeft + 112) * 4, 67 * 4,