From e7e87f42159c6668144b1d9fb5518b7037f324a6 Mon Sep 17 00:00:00 2001 From: louist103 <35883445+louist103@users.noreply.github.com> Date: Sun, 19 May 2024 21:07:03 -0400 Subject: [PATCH] Add extra days to file choose owl saves (#431) * Add extra days * New textures from purple Co-authored-by: PurpleHato <47987542+PurpleHato@users.noreply.github.com> * Move strings to header. * More new textures from purple Co-authored-by: PurpleHato <47987542+PurpleHato@users.noreply.github.com> --------- Co-authored-by: PurpleHato <47987542+PurpleHato@users.noreply.github.com> --- mm/assets/2s2h_assets.h | 6 ++++++ .../title_static/gFileSelCheatingDayTex.i4.png | Bin 0 -> 1454 bytes .../title_static/gFileSelFourthDayTex.i4.png | Bin 0 -> 1560 bytes .../ovl_file_choose/z_file_choose_NES.c | 13 ++++++++++++- 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 mm/assets/custom/misc/title_static/gFileSelCheatingDayTex.i4.png create mode 100644 mm/assets/custom/misc/title_static/gFileSelFourthDayTex.i4.png diff --git a/mm/assets/2s2h_assets.h b/mm/assets/2s2h_assets.h index e71ebb8f4..e51647c4e 100644 --- a/mm/assets/2s2h_assets.h +++ b/mm/assets/2s2h_assets.h @@ -73,3 +73,9 @@ static const ALIGN_ASSET(2) char gPauseSaveConfirmationENGTex[] = dgPauseSaveCon #define dgContinuePlayingENGTex "__OTR__textures/icon_item_static/gContinuePlayingENGTex" static const ALIGN_ASSET(2) char gContinuePlayingENGTex[] = dgContinuePlayingENGTex; + +#define dgFileSelFourthDayTex "__OTR__misc/title_static/gFileSelFourthDayTex" +static const ALIGN_ASSET(2) char gFileSelFourthDayTex[] = dgFileSelFourthDayTex; + +#define dgFileSelCheatingDayTex "__OTR__misc/title_static/gFileSelCheatingDayTex" +static const ALIGN_ASSET(2) char gFileSelCheatingDayTex[] = dgFileSelCheatingDayTex; diff --git a/mm/assets/custom/misc/title_static/gFileSelCheatingDayTex.i4.png b/mm/assets/custom/misc/title_static/gFileSelCheatingDayTex.i4.png new file mode 100644 index 0000000000000000000000000000000000000000..4d5f21c70dbd08d631263370e2c9784d00abddfc GIT binary patch literal 1454 zcmeAS@N?(olHy`uVBq!ia0y~yU@%}{V36QoVqjn}p8v9&fq}6h)7d$oILO^e!PC{* z%+S)zOxH-ykbyyCV(G;5+Ae`2$L)=Mj&vAtbH7wwllH{jH%G^ptLp~`L++Ny;5-}E1cQ?=z}+43iEnDp=H$@n#? zI?fSse(e)uuhqSKyzj{R=V?how~t0|>@;#?Y2|d2Q1j7mHfra*=)Qf;iV62W&$aiB zD>9ww8@4e*$+wNkF>w0QU3!M9yY!S#ue$wzf9=-bzqLzW{p0vCPv-ej;jC>BiZ2)5 ze^&^sp}8lY+9pQ{-B0AO3vqM(Eg=bh51^n=hZJv zXn2;rVz&O*H|g^qS9h#G86JD^om|PupT}DDW6aVYiV96pW?*38EbxddW?}uvXaaKqR>!d3|i^Q4~wshW^A#y{lX+da8 z%U_*e3)coraB_U>btq?{NtWmFEDm2NbNbN6na`qm=5NogeX>_~m-xQT zR`1Ug&$E1ADc>gk!2F-&k)%Rr=fmZ@85kHuTyxE&eJ{T(x%IH%#M7e9H|KaQ-Lc(m z@x;`~tx;$H$!^`cl_9}sX2i7EhzN#;ojZ5Vk>WXgPcPSO_W9?JEnEXF`pV18({n}A zZvObO!)@`$3L6&37bUw~lqQx=X5M~VmapCN-ox7(%o}87lV1bstrl>J_SW z_1CW|tGUxWR8FQ8B_}seo-=0-4wuXr~Orw(Z+Fn<}(F{;Y9#cbB<; z^Jb@u(oRlA4yB16IcCz^Wh5jR7&hNL^ZawHo;U+X>!CGn>#vuWl`$Q-dNs7Zet+0% z)`pWOPu{&7JJ-+L*!Z*El~boqH8(T&>Fet=JCv4w{qtv!gF;4r{`acAJKJ281pAM7 zAAfAw%f-c&VkF5hWy+Kk`LNK?LhrUj28X3Vtj&%*hYvm65ViK-1%dwKt5>gnToD;5 z$>6axXz@i32EFO06AboDchH)8$e`!(;lqb(YiobX%#6_STYj0JpWmX--p;N_n7LBs z=Esj4gI4w&fBgLUbB(TlqK?y8nHsNMyS8ncS*MGUp`oFP$(P30A67oJR+bTTD4I9NX9%a<=HMv{5EbxvoQ%!*fane=47{lkwH zi!N$}H!FDPh!yX?`(Aiarj>S~h0M)`ZUQPIT&hBxdf^N|l(RJ?cph2A#l`hK{_*C` znyXoB*RM~PIF_}Qslh`Z4~Z z%g@Vmb9etQ+!mvE{no8pM~}LyO%Bu$xu2hrlET6e6&0n?wJAb}tvRu{__KB{x4r&J z=DPj%QoYx%ToDlyD=R6f*{{g3K*LKxAY<#TMT-`#|DyS0kBU79OH+i-w?BV;CO!Es zed+aAr-dKhyz$Wxsk{BRPdaOo%KP{4i7GEktQZ@X zWy%~E7Z>-O^yT+o8@cz|ZFP^0|1hu=_^$J3_Yh=YVBkxQ@J#ddWzb?^VBlbYfJ?!X OK@3kHJtVU literal 0 HcmV?d00001 diff --git a/mm/assets/custom/misc/title_static/gFileSelFourthDayTex.i4.png b/mm/assets/custom/misc/title_static/gFileSelFourthDayTex.i4.png new file mode 100644 index 0000000000000000000000000000000000000000..20080ee276ec8331ac67ea9469e14a293b3d82d8 GIT binary patch literal 1560 zcmeAS@N?(olHy`uVBq!ia0y~yU@%}{V36QoVqjn}p8v9&fq}6h)7d$oILO^e!PC{* z%+S)zOxH-ykbyyCV(G;5+Ae`2$L)=Mj&vAtbH7wwllH{jH%G^ptLp~`L++Ny;5-}E1cQ?=z}+43iEnDp=H$@n#? zI?fSse(e)uuhqSKyzj{R=V?how~t0|>@;#?Y2|d2Q1j7mHfra*=)Qf;iV62W&$aiB zD>9ww8@4e*$+wNkF>w0QU3!M9yY!S#ue$wzf9=-bzqLzW{p0vCPv-ej;jC>BiZ2)5 ze^&^sp}8lY+9pQ{-B0AO3vqM(Eg=bh51^n=hZJv zXn2;rVz&O*H|g^qS9h#G86JD^om|PupT}DDW6aVYiV96pW?*38EbxddW?#x=Ko9};r zQMc~(uJyl*{l9O9Pg-1@+~kvg_^*}ijCr9Sxi*YJLQ1O0LWW~udwY9d zA0LB-l~vH{t0jA!7Vg-$@7=q1%a#X-JT0(TwtTs|n%af?Teoj7FDr99Kgnw;U;E>~ zuM!<+mRQYoTfFdLR#w)oUAyw~@|G=MzIxTFBS{&WxZj1C$i zN-eWy&t^}hhd*(@#CWUB;GJL4mvp}+mdFj%ng*#&y3}*Ti78WjFzMN6qQNW^a z_uY35tp^hVL|pr$qoWxgeEYU-<;s&eX8X^}2ntS|IFXUz;>C;l`ugvg|8a1sO!YG4 zIc(sgA|%K%app|V+lD;e{{H)S?=IdMV_*M|N5XT`lH*K`38kf`W@gvke`i0NVUWv@?e1u!W4@f&>-M zZCkhQy!-CozdD}7cD{047e0L0aQdl~wDjhiIZ6{xq;2l)>su9~#dFxt-``hFc>3wP zH*RnoiC!Dl=`v}~93S(J^{(#@)M5Cv5~dfsap0TKa6-=D79c zR&x^*6aAJKr=_{+h^ecnxVX8UdRjF7^wO(Yl{Rut9xFpO-F)-m!-u6yRT&nB{sIUCsQ^FEckzX*Z%#>t2f@wn?Gw7*BzCttx}31QBhnB(b3Uy>!;hX^YZd? zEZnzmUp~vFmnEAwZ@s`gs+9Y1nJL{wB( zPVUn4rMq@XG4S#8PxVsmdpvpaWPgAE{Tv-flLT1;V`F*?dikHZ`5UK{`A6#wql%u=vxDgy%pUuuMBny)W|76StV V2Ll9L3Z4vNc)I$ztaD0e0sxT`$d3R3 literal 0 HcmV?d00001 diff --git a/mm/src/overlays/gamestates/ovl_file_choose/z_file_choose_NES.c b/mm/src/overlays/gamestates/ovl_file_choose/z_file_choose_NES.c index e7928b75a..8db81594d 100644 --- a/mm/src/overlays/gamestates/ovl_file_choose/z_file_choose_NES.c +++ b/mm/src/overlays/gamestates/ovl_file_choose/z_file_choose_NES.c @@ -13,6 +13,7 @@ #include "interface/parameter_static/parameter_static.h" #include "misc/title_static/title_static.h" #include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" +#include "2s2h_assets.h" #include s32 D_808144F10 = 100; @@ -1314,18 +1315,26 @@ u16 D_80814654[] = { 0x194, 0x2A0, }; + TexturePtr sFileSelRemainsTextures[] = { gFileSelOdolwasRemainsTex, gFileSelGohtsRemainsTex, gFileSelGyorgsRemainsTex, gFileSelTwinmoldsRemainsTex, }; + +// 2S2H [Port] When making an owl save on day 4 the texture was currupt. We also decided to add a texture for going past +// day 4. + TexturePtr sFileSelDayENGTextures[] = { gFileSelFirstDayENGTex, gFileSelFirstDayENGTex, gFileSelSecondDayENGTex, gFileSelFinalDayENGTex, + gFileSelFourthDayTex, + gFileSelCheatingDayTex, }; + TexturePtr sFileSelHeartPieceTextures[] = { gFileSel0QuarterHeartENGTex, gFileSel1QuarterHeartENGTex, @@ -1573,8 +1582,10 @@ void FileSelect_DrawFileInfo(GameState* thisx, s16 fileIndex) { gSPVertex(POLY_OPA_DISP++, &this->windowContentVtx[D_80814654[fileIndex] + 0xDC], 8, 0); gDPSetPrimColor(POLY_OPA_DISP++, 0x00, 0x00, 0, 0, 0, this->fileInfoAlpha[fileIndex]); + // 2S2H [Port] When making an owl save on day 4 the texture was currupt. We also decided to add a texture for going past day 4. + uint32_t dayIndex = CLAMP_MAX(this->day[sp20C], 5); - gDPLoadTextureBlock_4b(POLY_OPA_DISP++, sFileSelDayENGTextures[this->day[sp20C]], G_IM_FMT_I, 48, 24, 0, + gDPLoadTextureBlock_4b(POLY_OPA_DISP++, sFileSelDayENGTextures[dayIndex], G_IM_FMT_I, 48, 24, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gSP1Quadrangle(POLY_OPA_DISP++, 4, 6, 7, 5, 0);