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 000000000..061e7a742
Binary files /dev/null and b/mm/assets/custom/misc/nintendo_rogo_static/SoHShiny differ
diff --git a/mm/assets/custom/misc/nintendo_rogo_static/_2shipBetaLogoFLAT b/mm/assets/custom/misc/nintendo_rogo_static/_2shipBetaLogoFLAT
new file mode 100644
index 000000000..6e66345b7
Binary files /dev/null and b/mm/assets/custom/misc/nintendo_rogo_static/_2shipBetaLogoFLAT differ
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 000000000..d6d4a39c2
Binary files /dev/null and b/mm/assets/custom/misc/nintendo_rogo_static/metal2 differ
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 000000000..1ac8a97b4
Binary files /dev/null and b/mm/assets/custom/misc/nintendo_rogo_static/metal2_copy differ
diff --git a/mm/assets/custom/textures/nintendo_rogo_static/SoHShiny b/mm/assets/custom/textures/nintendo_rogo_static/SoHShiny
deleted file mode 100644
index 5e5c7b52b..000000000
Binary files a/mm/assets/custom/textures/nintendo_rogo_static/SoHShiny and /dev/null differ
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 076b9365f..000000000
Binary files a/mm/assets/custom/textures/title_static/gFileSelMQButtonTex.ia16.png and /dev/null differ
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;