From 5a258fecd43e9931280fd6829015bb61c6729571 Mon Sep 17 00:00:00 2001 From: Archez Date: Fri, 5 Apr 2024 18:03:09 -0400 Subject: [PATCH] add 2ship/lus logo and build info printing (#164) --- mm/2s2h/BenGui/BenMenuBar.cpp | 3 + .../custom/misc/nintendo_rogo_static/SoHShiny | Bin 0 -> 4188 bytes .../nintendo_rogo_static/_2shipBetaLogoFLAT | Bin 0 -> 4188 bytes .../nintendo_rogo_static/gLUSLogoTextTex} | Bin .../misc/nintendo_rogo_static/gShipLogoDL | 18 + .../nintendo_rogo_static/gShipLogoDL_tri_0 | 259 ++++ .../nintendo_rogo_static/gShipLogoDL_tri_1 | 503 +++++++ .../nintendo_rogo_static/gShipLogoDL_tri_2 | 42 + .../nintendo_rogo_static/gShipLogoDL_tri_3 | 92 ++ .../nintendo_rogo_static/gShipLogoDL_tri_4 | 90 ++ .../nintendo_rogo_static/gShipLogoDL_vtx_0 | 315 +++++ .../nintendo_rogo_static/gShipLogoDL_vtx_1 | 1173 +++++++++++++++++ .../nintendo_rogo_static/gShipLogoDL_vtx_2 | 98 ++ .../nintendo_rogo_static/gShipLogoDL_vtx_3 | 223 ++++ .../nintendo_rogo_static/gShipLogoDL_vtx_4 | 194 +++ .../mat_gShipLogoDL__2shiplogoFLAT | 20 + .../mat_gShipLogoDL_shine1 | 20 + .../mat_gShipLogoDL_shine2} | 14 +- .../mat_gShipLogoDL_shine3 | 12 + .../mat_gShipLogoDL_shine4 | 20 + .../custom/misc/nintendo_rogo_static/metal2 | Bin 0 -> 4188 bytes .../misc/nintendo_rogo_static/metal2_copy | Bin 0 -> 1116 bytes .../textures/nintendo_rogo_static/SoHShiny | Bin 1116 -> 0 bytes .../textures/nintendo_rogo_static/gShipLogoDL | 21 - .../nintendo_rogo_static/gShipLogoDL_tri_0 | 241 ---- .../nintendo_rogo_static/gShipLogoDL_tri_1 | 80 -- .../nintendo_rogo_static/gShipLogoDL_tri_2 | 259 ---- .../nintendo_rogo_static/gShipLogoDL_tri_3 | 118 -- .../nintendo_rogo_static/gShipLogoDL_vtx_0 | 335 ----- .../nintendo_rogo_static/gShipLogoDL_vtx_1 | 98 -- .../nintendo_rogo_static/gShipLogoDL_vtx_2 | 323 ----- .../nintendo_rogo_static/gShipLogoDL_vtx_3 | 128 -- .../mat_gShipLogoDL_f3d_material | 20 - .../mat_gShipLogoDL_f3d_material_001 | 20 - .../mat_gShipLogoDL_f3d_material_002 | 20 - .../mat_revert_gShipLogoDL_f3d_material | 8 - .../mat_revert_gShipLogoDL_f3d_material_001 | 8 - .../mat_revert_gShipLogoDL_f3d_material_002 | 8 - .../mat_revert_gShipLogoDL_f3d_material_003 | 8 - .../title_static/gFileSelMQButtonTex.ia16.png | Bin 883 -> 0 bytes .../overlays/gamestates/ovl_title/z_title.c | 79 +- 41 files changed, 3159 insertions(+), 1711 deletions(-) create mode 100644 mm/assets/custom/misc/nintendo_rogo_static/SoHShiny create mode 100644 mm/assets/custom/misc/nintendo_rogo_static/_2shipBetaLogoFLAT rename mm/assets/custom/{textures/nintendo_rogo_static/nintendo_rogo_static_Tex_LUS_000000 => misc/nintendo_rogo_static/gLUSLogoTextTex} (100%) create mode 100644 mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL create mode 100644 mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_tri_0 create mode 100644 mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_tri_1 create mode 100644 mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_tri_2 create mode 100644 mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_tri_3 create mode 100644 mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_tri_4 create mode 100644 mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_vtx_0 create mode 100644 mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_vtx_1 create mode 100644 mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_vtx_2 create mode 100644 mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_vtx_3 create mode 100644 mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_vtx_4 create mode 100644 mm/assets/custom/misc/nintendo_rogo_static/mat_gShipLogoDL__2shiplogoFLAT create mode 100644 mm/assets/custom/misc/nintendo_rogo_static/mat_gShipLogoDL_shine1 rename mm/assets/custom/{textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_003 => misc/nintendo_rogo_static/mat_gShipLogoDL_shine2} (56%) create mode 100644 mm/assets/custom/misc/nintendo_rogo_static/mat_gShipLogoDL_shine3 create mode 100644 mm/assets/custom/misc/nintendo_rogo_static/mat_gShipLogoDL_shine4 create mode 100644 mm/assets/custom/misc/nintendo_rogo_static/metal2 create mode 100644 mm/assets/custom/misc/nintendo_rogo_static/metal2_copy delete mode 100644 mm/assets/custom/textures/nintendo_rogo_static/SoHShiny delete mode 100644 mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL delete mode 100644 mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_0 delete mode 100644 mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_1 delete mode 100644 mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_2 delete mode 100644 mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_3 delete mode 100644 mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_0 delete mode 100644 mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_1 delete mode 100644 mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_2 delete mode 100644 mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_3 delete mode 100644 mm/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material delete mode 100644 mm/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_001 delete mode 100644 mm/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_002 delete mode 100644 mm/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material delete mode 100644 mm/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_001 delete mode 100644 mm/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_002 delete mode 100644 mm/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_003 delete mode 100644 mm/assets/custom/textures/title_static/gFileSelMQButtonTex.ia16.png diff --git a/mm/2s2h/BenGui/BenMenuBar.cpp b/mm/2s2h/BenGui/BenMenuBar.cpp index 25e650c8d..dcc97a9f5 100644 --- a/mm/2s2h/BenGui/BenMenuBar.cpp +++ b/mm/2s2h/BenGui/BenMenuBar.cpp @@ -267,6 +267,9 @@ void DrawEnhancementsMenu() { UIWidgets::CVarCheckbox("Fast Text", "gEnhancements.TimeSavers.FastText", { .tooltip = "Speeds up text rendering, and enables holding of B progress to next message" }); + UIWidgets::CVarCheckbox("Authentic logo", "gEnhancements.General.AuthenticLogo", { + .tooltip = "Hide the game version and build details and display the authentic model and texture on the boot logo start screen" + }); if (mHudEditorWindow) { UIWidgets::WindowButton("Hud Editor", "gWindows.HudEditor", mHudEditorWindow, { diff --git a/mm/assets/custom/misc/nintendo_rogo_static/SoHShiny b/mm/assets/custom/misc/nintendo_rogo_static/SoHShiny new file mode 100644 index 0000000000000000000000000000000000000000..061e7a742b4fa6b800abce77f2132ee78dc64e96 GIT binary patch literal 4188 zcmZQzU|@)F4e@7WU|@K^Z|yx028j`iLHZOJ7#KhpqNl;0fuX^kL4bi_?b@~f7cXA? zf91-R|BoCw^8f19tN$N9eE9$A)2ILM-MjaH@7}%tYin!&J2^T14-F0dpO=^SKP4sQ ze^^-9|A>f){|pQa|JBvi|C^he|M&6n`5zk_`#&cq=YMKyDwv&~o(|?078d?5E-wDx z+S>Ym;lhRgH*MPVf7`Zg|Lf}Nz~+P8aP;WW|L4!2|9|1ah5si{o&?KJoH+4+baeE8 zcX#*yMMXvb>+9?Pmz9F9=|9X0Q|7~n+{=2%mg57Ip zXZPRP+4;YViwjsk$ehN;#{bi%P5VD<)~x^2r%wmVg@lCspEqwF*v>O&&ivoEZ{PpP zlPCXAOH2Fj;oAuFR)K+m zV0VDR282C5J^v>qCH=3gto&b7Qv(hoF)^|KR#sO3dwP2Q@7%fb|G|R?!SMkKXJcdI z{~{tH{}mM#!S2k+$oOASPyjZ=!NK9brlux149v{T{##mFg6#&m7Ze8|wNX(~VE-E$ z8iK<|M@Q#BNG&KVL2dz=4+=k7Sy^!0c6N4x!=$aP?SFD|GFUChebUm>|LyJV|HsG2 zgTn+AjvzA}9UZ}O9v&VJ)(`TpzrQ~?eUz4#{?E?N{tvPT{}vV&|3UF;WMl+RLm=}&{s&=DT!O+mGc)r)hz7}l;yx=Y>wkND`~U9l zZg749g%cm!R|n%Il!81^E}0CqQ{SCME`) zwn1qhWS+LRHaOfs{s!4QfByXcbLPwe=hx8C(ElKLkpDq$0AXbNVg8qrlKKxyBOrHx z;vAH}LH-5V2l7{Wc{w=WfYK)@Y(acbn1J#JC=BxR^TBz0_3G9CL3qZD8Q?Skibqgh z1^FEm&LI0i{$*xn28RI$2giSq+dy`L>;}03lx9Kx2bF0c|AXQi6wjdWoH}(XxcmT_ z4~ln?-JtLRBptuIbIVeAX;t)iG@?J?v$^S`{ zCjFl~cP==cgTfsY@1QV0eE9JHQ>RXW%TiDn^!4?D(;p}gX=rHt2c<22ef|F+4Du(a zj0TkvAoD?HgYrM9oCn1%tQ-L4DNwlrqCsu|*$0XPP?-%%YaqKp>0$Hc&HqoIJ`Juz zK=sF#EnEKg_V)e<`3Gh{D6T+x+}he2TxNp80OS@>8Ud9p6%`d=KY`*BRPTYxTTmGT z!XWp6;uDm=Ky?_%{0$p6{D-CW?c2BiKX>lj|7+K-f$K0(-3iKvAUA{RCXoL@`4|*m zAPn+9sQv`G0aTuY$~;iH3992j^%Tf{P`rZZ>gsB6JqfZKRCj^uPmuYbFkZKA9XP#% z_#nIQ-o5)DgfCva2o?v07pPnTVNh6r;ucg!fzlMHEK;YS{-(7304o0|slO?0KY;uX z${V0C0HqO7nF>m0p!5jJccAzJ#S;jF(kUoEAlKiZ`~p%BN{gU0M{4^4RK|hIaB}N! zP?-iQr^szTfXX*exdQVqD4&7yASfMz(mTk{pt2BDW+0bUu=*Pme;{#?eo&qPwW&bm z6DTi%`~`9!NG~YgfzlnQOaYappmG~j-hlEICG|I`?f|tPK<)v>70B%%cZ2d0C~iP? zDyZzm)qVh#r=W5jM1%4qC@w*H16HPh+y-(d$RD7x8LP~3v#LH-B%9oc?R`2~st9v&WW+Y01YP<8HgvKQumP<(*e%AoiGr8iKVgW>~J#^Gx}fZ`n#{-Cr8O25R`->~*0sOR~C2r9=w zX#kXOLH2^o29;x=Z~&!Akbgn>6V`qJ#W$#a0MX>s-=I83N&5km)~%t2O%jZKMOn0b_#L5bc``yu5aC1FU3-qG+M z4S!G?pd<}Zq8DU02vcGPC3-=2gD@p#P@)%PHwaT=1|@nyc7re_W>BIRWH$&?Vg@C8 zL3V>MC1y~f7i2dGQ(^`sdO>!BFePSCq8DU02vcGPC3-=2gD@p#P@)%PHwaT=1|@n4 l*$p!rqz)T~$>XER)rZeaa^+xdAy+@8`UZ>rFn7?M1^^9W`bGc% literal 0 HcmV?d00001 diff --git a/mm/assets/custom/textures/nintendo_rogo_static/nintendo_rogo_static_Tex_LUS_000000 b/mm/assets/custom/misc/nintendo_rogo_static/gLUSLogoTextTex similarity index 100% rename from mm/assets/custom/textures/nintendo_rogo_static/nintendo_rogo_static_Tex_LUS_000000 rename to mm/assets/custom/misc/nintendo_rogo_static/gLUSLogoTextTex diff --git a/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL new file mode 100644 index 000000000..c8b162c54 --- /dev/null +++ b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_tri_0 b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_tri_0 new file mode 100644 index 000000000..4affe7377 --- /dev/null +++ b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_tri_0 @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_tri_1 b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_tri_1 new file mode 100644 index 000000000..bd39524e2 --- /dev/null +++ b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_tri_1 @@ -0,0 +1,503 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_tri_2 b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_tri_2 new file mode 100644 index 000000000..fe0e80422 --- /dev/null +++ b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_tri_2 @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_tri_3 b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_tri_3 new file mode 100644 index 000000000..c740ec458 --- /dev/null +++ b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_tri_3 @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_tri_4 b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_tri_4 new file mode 100644 index 000000000..828b5ae06 --- /dev/null +++ b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_tri_4 @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_vtx_0 b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_vtx_0 new file mode 100644 index 000000000..9d62b2dc1 --- /dev/null +++ b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_vtx_0 @@ -0,0 +1,315 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_vtx_1 b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_vtx_1 new file mode 100644 index 000000000..7b0a9c698 --- /dev/null +++ b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_vtx_1 @@ -0,0 +1,1173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_vtx_2 b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_vtx_2 new file mode 100644 index 000000000..cffdd1e56 --- /dev/null +++ b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_vtx_2 @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_vtx_3 b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_vtx_3 new file mode 100644 index 000000000..b735d544e --- /dev/null +++ b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_vtx_3 @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_vtx_4 b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_vtx_4 new file mode 100644 index 000000000..b9516840a --- /dev/null +++ b/mm/assets/custom/misc/nintendo_rogo_static/gShipLogoDL_vtx_4 @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mm/assets/custom/misc/nintendo_rogo_static/mat_gShipLogoDL__2shiplogoFLAT b/mm/assets/custom/misc/nintendo_rogo_static/mat_gShipLogoDL__2shiplogoFLAT new file mode 100644 index 000000000..26aca628a --- /dev/null +++ b/mm/assets/custom/misc/nintendo_rogo_static/mat_gShipLogoDL__2shiplogoFLAT @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/mm/assets/custom/misc/nintendo_rogo_static/mat_gShipLogoDL_shine1 b/mm/assets/custom/misc/nintendo_rogo_static/mat_gShipLogoDL_shine1 new file mode 100644 index 000000000..e27cab8ce --- /dev/null +++ b/mm/assets/custom/misc/nintendo_rogo_static/mat_gShipLogoDL_shine1 @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/mm/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_003 b/mm/assets/custom/misc/nintendo_rogo_static/mat_gShipLogoDL_shine2 similarity index 56% rename from mm/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_003 rename to mm/assets/custom/misc/nintendo_rogo_static/mat_gShipLogoDL_shine2 index be60fd46b..e794a7509 100644 --- a/mm/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_003 +++ b/mm/assets/custom/misc/nintendo_rogo_static/mat_gShipLogoDL_shine2 @@ -1,20 +1,20 @@ - - - - + + + + + - + - + - diff --git a/mm/assets/custom/misc/nintendo_rogo_static/mat_gShipLogoDL_shine3 b/mm/assets/custom/misc/nintendo_rogo_static/mat_gShipLogoDL_shine3 new file mode 100644 index 000000000..8691239f2 --- /dev/null +++ b/mm/assets/custom/misc/nintendo_rogo_static/mat_gShipLogoDL_shine3 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/mm/assets/custom/misc/nintendo_rogo_static/mat_gShipLogoDL_shine4 b/mm/assets/custom/misc/nintendo_rogo_static/mat_gShipLogoDL_shine4 new file mode 100644 index 000000000..f375aa0b0 --- /dev/null +++ b/mm/assets/custom/misc/nintendo_rogo_static/mat_gShipLogoDL_shine4 @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/mm/assets/custom/misc/nintendo_rogo_static/metal2 b/mm/assets/custom/misc/nintendo_rogo_static/metal2 new file mode 100644 index 0000000000000000000000000000000000000000..d6d4a39c21ed664f051fcdc4675b06cd7956a9a3 GIT binary patch literal 4188 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 OJs^FccmvrF3IhP*AkU}( literal 0 HcmV?d00001 diff --git a/mm/assets/custom/misc/nintendo_rogo_static/metal2_copy b/mm/assets/custom/misc/nintendo_rogo_static/metal2_copy new file mode 100644 index 0000000000000000000000000000000000000000..1ac8a97b4314cdb30feeffe1e636d4b24f27d9ab GIT binary patch literal 1116 zcmZQzU|@)F4e@7WU|@K^Z|yx028j`i*%%lY6rdQQr@@|qp~0Skg@NJ!|DX4_PHj|&yN~Z*J%9P}%bOiZ5pxc_{P6$(*SG)weY>@#%Sp|3`IC3=K74rn^7Xs-FSf?| z_N;&U>Hq(4FaQ7hc5iFDlbY*-NAKQ#diUzZt5>g{Z;th>U3}xy|NlQ;{{Q#$;m!^R zCEMBe-n{+z{>8HwFJHde8|7Lw?ZmtP|Np%F|NqzHy%T)JEN0w(^XAisSI?e2dGYRe zj8kgo-Z%gM{|CuGJ3Kp7%wqcO*RMZ+d3E>3{l~8lhdRX8?R@qB|NmG2|NVM?YCc&0 z3G2_OIS6{!}IkaWxu~Tb&oubOt zKKS?h_pAT^f4@4rI84l9`n4yozP&%YxVB^Iw%JNiY31wg{r&po@!$V{UYuJ7GXK(p zH$PtO%+NBbSlnh2pIW);(eJl!?|%LM{rS0NVPY0DEUupBHBsiJ6MI+vLL1!o_YeNB19_d6Uwr)G!I3ZpWrWw|@Qq{^Zh;Q-^L` zzqa0&*LCg1r|%x_E{bYA`27Ca{fDo;{rm6j{S!M+AGmS#>c&7`*VR`Zy?=CQ@wBDq zUOzi^;Kajk|9`)}v3J|4eOE7C+8V~-u>9iV_fJpl-L&`G`;WISo`3o6-kwJyHDSK|MTgst1rL(e0}@$?lrqN9X)$|Qv`$4;*0m++&gvb zz^w>{kUP@R5gSxp-Y))!ydQM?+>%vXj>S`AsJ%8ckwu#a1MfGLAx{MNPdN!_3cFr#D z(T&q)O?L^Ick;}>$!Q)29)(T0zG{MU>RL7-p@B~3=AKEFHK}4&Jv$FB&NCKKbjc`4 za?sQ@v$XMu&4_X~RMRnY_cUgd4egxXmTV>_Z6BW&?e6Fk9vbMMQkw0lDJ`p@C@;vu zD(94vo#>(}X&ROs7Z#hImm43HQdJhIBPuQ~%FoHlE~4WV74B`JW#k?i9i5bsnGqS1 z)!v=wC?+f+$j!pY!l!EC=IiR>?BpKc=VD`K@9LY=I&F4Cu(E)d5E~N%6PJvhp|O=m zSbS1iYK)Vdkakr2?D=!*L$!qk1lX7uSoox5Wh8Y2Qgg~{+Pcf#747qzmto zhQ_57m1if0_=iO0Pn|cry?gWN^C!3T25D*7ds$n`=zAwuw0G7Pq^D;Wwl3VVVg8)$ z=dNAYJ1t62!znV-oI%DRv9!LiwyL(ewsqE~y}Q<}-h1ut-HWU9Ei8iKvjPOs;u}3Z zpvO0QdO(kF^z?up-{|Q9J-*S?1A2V3u*##P2bB00;AUgx64yme56JN?D#*di$SS02 zj+7oy;#-h|nSq5zT+0BF9#G<2kcWklm0LtY8j&7Qa{y(bEF}-K}!1 diff --git a/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL b/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL deleted file mode 100644 index 5e5435d84..000000000 --- a/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_0 b/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_0 deleted file mode 100644 index 2986de72b..000000000 --- a/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_0 +++ /dev/null @@ -1,241 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_1 b/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_1 deleted file mode 100644 index 2aa9bea6d..000000000 --- a/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_1 +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_2 b/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_2 deleted file mode 100644 index 2b8fe0d11..000000000 --- a/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_2 +++ /dev/null @@ -1,259 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_3 b/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_3 deleted file mode 100644 index 53edaf74f..000000000 --- a/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_3 +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_0 b/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_0 deleted file mode 100644 index 2c2ee793b..000000000 --- a/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_0 +++ /dev/null @@ -1,335 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_1 b/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_1 deleted file mode 100644 index ec462b114..000000000 --- a/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_1 +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_2 b/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_2 deleted file mode 100644 index cc906e23e..000000000 --- a/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_2 +++ /dev/null @@ -1,323 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_3 b/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_3 deleted file mode 100644 index 68e4babcf..000000000 --- a/mm/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_3 +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mm/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material b/mm/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material deleted file mode 100644 index e48b335c0..000000000 --- a/mm/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/mm/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_001 b/mm/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_001 deleted file mode 100644 index e98640319..000000000 --- a/mm/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_001 +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/mm/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_002 b/mm/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_002 deleted file mode 100644 index b2db72d79..000000000 --- a/mm/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_002 +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/mm/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material b/mm/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material deleted file mode 100644 index 3cda02a88..000000000 --- a/mm/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/mm/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_001 b/mm/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_001 deleted file mode 100644 index 3cda02a88..000000000 --- a/mm/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_001 +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/mm/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_002 b/mm/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_002 deleted file mode 100644 index 3cda02a88..000000000 --- a/mm/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_002 +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/mm/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_003 b/mm/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_003 deleted file mode 100644 index 3cda02a88..000000000 --- a/mm/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_003 +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/mm/assets/custom/textures/title_static/gFileSelMQButtonTex.ia16.png b/mm/assets/custom/textures/title_static/gFileSelMQButtonTex.ia16.png deleted file mode 100644 index 076b9365f2c790d9e9bac24124591ca71894fe29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 883 zcmeAS@N?(olHy`uVBq!ia0y~yV9;S;U=ZM7V_;y&wV8XJfq~h|)5S5w8Be#igJf#&PxB@`sSSGuI_D1F>_iog*~ zM@6k2!c2^g28PYM45Z%qo;Z7f+wjHa%-()B{+PVE@qy24LQ7Y9G0d1TL!#JfZvC^* zmHQUmy>rLF%IeqQw`KmC?QL!Q&YwU3e`$!;$)`o}LN{K2P1+h&FU-QID8nayHqCgG z&gKmp8lu)N+q7xZm%U%EW|f`{*P41_laJo?>d*f@elPvDX?=jkf{Pg!vbJVyjViH{ zZBqE~;lqKC9}PuMrU-dX`cPrBB4ic+`Kt8v_I2ylng6Kox0`n<=~`^ z60J^*lTW&2XJhoRS?kFs_J>@`Dexp zmoGOTeyA}2{NwMxZ{EJ0TwgCg`>dPMOdak0kJ1l5|NQW46(DAl_oMsL;X)rK>DzI^|_IA~>ui_-d2&n_S6bZN>k@lu=oGoWGWR8bQt-n{L< zr|O+HV&LWFbx{)RI;zCb>cqG=?*EjSg&NX7d_7lO&FXPe*45RW;j^rq`Oe+Dg55_g ztgWk;+B0j3beUgYs=zUS-=ljz7jw*lqocdy)<56do>EjK)X>|@%dl(r?#!$#rU$pT z=QG^7e}8d^*36kR6SJ~bmGCiaiF&)9xxB3G(#4C7e#;Lh82owuVBfQy>RMfGeKBLo%a@rdo=yt`F5I~B@Nc6RoTMIOGsXa9dQdHuDj z>!{L9pSG=AO?AY$nVFecm>SFHKf8K0R8C%genWJ0^#1Q(zy9SdsHiv*zU}qv*Yc-s z-@aWOIZgiZ%P;RIsnkZ^=efAsOkAN%5}9TOHj`ccWiz`)??>gTe~DWM4fjZ>kF diff --git a/mm/src/overlays/gamestates/ovl_title/z_title.c b/mm/src/overlays/gamestates/ovl_title/z_title.c index a6360ff3e..2c8ac7684 100644 --- a/mm/src/overlays/gamestates/ovl_title/z_title.c +++ b/mm/src/overlays/gamestates/ovl_title/z_title.c @@ -10,9 +10,56 @@ #include "CIC6105.h" #include "overlays/gamestates/ovl_opening/z_opening.h" #include "misc/nintendo_rogo_static/nintendo_rogo_static.h" + #include "overlays/gamestates/ovl_select/z_select.h" -#include +#include "build.h" #include "BenPort.h" +#include +#include + +#define dgShipLogoDL "__OTR__misc/nintendo_rogo_static/gShipLogoDL" +static const ALIGN_ASSET(2) char gShipLogoDL[] = dgShipLogoDL; + +#define dgLUSLogoTextTex "__OTR__misc/nintendo_rogo_static/gLUSLogoTextTex" +static const ALIGN_ASSET(2) char gLUSLogoTextTex[] = dgLUSLogoTextTex; + +const char* GetGameVersionString() { + uint32_t gameVersion = ResourceMgr_GetGameVersion(0); + switch (gameVersion) { + // BENTODO: Use enums from LUS once added and add rest of version names + case 0x5354631C: + case 0xDA6983E7: + return "MM-US 1.0"; + default: + return "UNKNOWN"; + } +} + +void ConsoleLogo_PrintBuildInfo(ConsoleLogoState* this) { + GraphicsContext* gfxCtx = this->state.gfxCtx; + GfxPrint printer; + + OPEN_DISPS(gfxCtx); + + Gfx_SetupDL28_Opa(gfxCtx); + + GfxPrint_Init(&printer); + GfxPrint_Open(&printer, POLY_OPA_DISP); + GfxPrint_SetColor(&printer, 131, 154, 255, 255); + + GfxPrint_SetPos(&printer, 1, 25); + GfxPrint_Printf(&printer, "%s", gBuildVersion); + GfxPrint_SetPos(&printer, 1, 26); + GfxPrint_Printf(&printer, "%s", gBuildDate); + + GfxPrint_SetPos(&printer, 29, 26); + GfxPrint_Printf(&printer, "%s", GetGameVersionString()); + + POLY_OPA_DISP = GfxPrint_Close(&printer); + GfxPrint_Destroy(&printer); + + CLOSE_DISPS(gfxCtx); +} void ConsoleLogo_UpdateCounters(ConsoleLogoState* this) { if ((this->coverAlpha == 0) && (this->visibleDuration != 0)) { @@ -66,6 +113,14 @@ void ConsoleLogo_Draw(GameState* thisx) { Vec3f eye; s32 pad[2]; + char* logoDL = gNintendo64LogoNDL; + char* logoText = gNintendo64LogoTextTex; + + if (!CVarGetInteger("gEnhancements.General.AuthenticLogo", 0)) { + logoDL = gShipLogoDL; + logoText = gLUSLogoTextTex; + } + OPEN_DISPS(this->state.gfxCtx); lightDir.x = 69.0f; @@ -79,8 +134,6 @@ void ConsoleLogo_Draw(GameState* thisx) { eye.x = -4949.148f; eye.y = 4002.5417f; eye.z = 1119.0837f; - void* shine = ResourceMgr_LoadTexOrDListByName(gNintendo64LogoTextShineTex); - char* logo = ResourceMgr_LoadTexOrDListByName(gNintendo64LogoTextTex); Hilite_DrawOpa(&object, &eye, &lightDir, this->state.gfxCtx); @@ -93,7 +146,7 @@ void ConsoleLogo_Draw(GameState* thisx) { Matrix_RotateZYX(0, sTitleRotation, 0, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(this->state.gfxCtx), G_MTX_LOAD); - gSPDisplayList(POLY_OPA_DISP++, gNintendo64LogoNDL); + gSPDisplayList(POLY_OPA_DISP++, logoDL); Gfx_SetupDL39_Opa(this->state.gfxCtx); @@ -104,19 +157,27 @@ void ConsoleLogo_Draw(GameState* thisx) { COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 170, 255, 255, 255); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 255, 128); - gDPLoadMultiBlock(POLY_OPA_DISP++, shine, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 2, 11); + gDPLoadMultiBlock(POLY_OPA_DISP++, gNintendo64LogoTextShineTex, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 2, 11); for (idx = 0, y = 94; idx < 16; idx++, y += 2) { - gDPLoadTextureBlock(POLY_OPA_DISP++, &((u8*)logo)[0x180 * idx], G_IM_FMT_I, G_IM_SIZ_8b, 192, 2, 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); + // #region 2S2H [Port] Use LoadMultiTile so we can pass the resource path and control which bytes are loaded + gDPLoadMultiTile(POLY_OPA_DISP++, logoText, 0, G_TX_RENDERTILE, G_IM_FMT_I, G_IM_SIZ_8b, 192, 32, + 0, idx * 2, 192 - 1, (idx + 1) * 2 - 1, 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); + gDPSetTileSize(POLY_OPA_DISP++, 0, 0, 0, (192 - 1) << G_TEXTURE_IMAGE_FRAC, + (2 - 1) << G_TEXTURE_IMAGE_FRAC); + // #endregion gDPSetTileSize(POLY_OPA_DISP++, 1, this->uls, (this->ult & 0x7F) - idx * 4, 0, 0); gSPTextureRectangle(POLY_OPA_DISP++, 97 << 2, y << 2, (97 + 192) << 2, (y + 2) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); } + if (!CVarGetInteger("gEnhancements.General.AuthenticLogo", 0)) { + ConsoleLogo_PrintBuildInfo(this); + } + Environment_FillScreen(this->state.gfxCtx, 0, 0, 0, this->coverAlpha, FILL_SCREEN_XLU); sTitleRotation += 300;