From 2aa028c20f41184f44e1f3048c08571c0b676507 Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Thu, 13 Jul 2023 18:59:13 -0700 Subject: [PATCH] schedule_static docs (#1324) * Finish off schedule_static * gBombersNotebookBarSmallTex --- assets/xml/interface/schedule_static.xml | 29 ++++++++++++++++++++---- src/code/z_play_hireso.c | 8 +++---- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/assets/xml/interface/schedule_static.xml b/assets/xml/interface/schedule_static.xml index 68b097d51b..cf87038ce0 100644 --- a/assets/xml/interface/schedule_static.xml +++ b/assets/xml/interface/schedule_static.xml @@ -12,6 +12,7 @@ + @@ -30,9 +31,29 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/code/z_play_hireso.c b/src/code/z_play_hireso.c index 2a182411b3..18d4838892 100644 --- a/src/code/z_play_hireso.c +++ b/src/code/z_play_hireso.c @@ -252,9 +252,9 @@ u16 sBombersNotebookEntries[BOMBERS_NOTEBOOK_PERSON_MAX][BOMBERS_NOTEBOOK_ENTRY_ s16 sBombersNotebookDayRectRectLeft[] = { 120, 120, 270, 420 }; TexturePtr sBombersNotebookDayTextures[] = { - gBombersNotebookDay1stTex, - gBombersNotebookDay2ndTex, - gBombersNotebookDayFinalTex, + gBombersNotebookDay1stENGTex, + gBombersNotebookDay2ndENGTex, + gBombersNotebookDayFinalENGTex, }; #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); gDPPipeSync(gfx++); 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); BombersNotebook_DrawScisTexRect(&gfx, (timeOfDayRectLeft + 16) * 4, 47 * 4, (timeOfDayRectLeft + 112) * 4, 67 * 4,