From 583c91bc15d0ca76faa07dfa927a5e53ac22b416 Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Tue, 21 Jan 2025 21:43:54 -0500
Subject: [PATCH] ok now it's almost fully back to vanilla

---
 .../overlays/gamestates/ovl_title/z_title.c   | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/soh/src/overlays/gamestates/ovl_title/z_title.c b/soh/src/overlays/gamestates/ovl_title/z_title.c
index a60f24a04..24de4fcd2 100644
--- a/soh/src/overlays/gamestates/ovl_title/z_title.c
+++ b/soh/src/overlays/gamestates/ovl_title/z_title.c
@@ -4,8 +4,6 @@
  * Description: Displays the Nintendo Logo
  */
 
-#define NORMAL_GAMEPLAY
-
 #include "global.h"
 #include "alloca.h"
 #include "textures/nintendo_rogo_static/nintendo_rogo_static.h"
@@ -22,7 +20,6 @@
 // Note: In other rom versions this function also updates unk_1D4, coverAlpha, addAlpha, visibleDuration to calculate
 // the fade-in/fade-out + the duration of the n64 logo animation
 void Title_Calc(TitleContext* this) {
-#ifdef NORMAL_GAMEPLAY
     if ((this->coverAlpha == 0) && (this->visibleDuration != 0)) {
         this->visibleDuration--;
         this->unk_1D4--;
@@ -41,9 +38,6 @@ void Title_Calc(TitleContext* this) {
     }
     this->uls = this->ult & 0x7F;
     this->ult++;
-#else
-    this->exit = true;
-#endif
 }
 
 void Title_SetupView(TitleContext* this, f32 x, f32 y, f32 z) {
@@ -64,12 +58,6 @@ void Title_SetupView(TitleContext* this, f32 x, f32 y, f32 z) {
     func_800AAA50(view, 0xF);
 }
 
-#define dgShipLogoDL "__OTR__textures/nintendo_rogo_static/gShipLogoDL"
-static const ALIGN_ASSET(2) char gShipLogoDL[] = dgShipLogoDL;
-
-#define dnintendo_rogo_static_Tex_LUS_000000 "__OTR__textures/nintendo_rogo_static/nintendo_rogo_static_Tex_LUS_000000"
-static const ALIGN_ASSET(2) char nintendo_rogo_static_Tex_LUS_000000[] = dnintendo_rogo_static_Tex_LUS_000000;
-
 void Title_Draw(TitleContext* this) {
     static s16 sTitleRotY = 0;
     static Lights1 sTitleLights = gdSPDefLights1(0x64, 0x64, 0x64, 0xFF, 0xFF, 0xFF, 0x45, 0x45, 0x45);
@@ -111,12 +99,7 @@ void Title_Draw(TitleContext* this) {
     gDPSetCombineLERP(POLY_OPA_DISP++, TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, 0, 0, 0, TEXEL0, PRIMITIVE, ENVIRONMENT,
         COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0);
     gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255);
-    if (CVarGetInteger(CVAR_COSMETIC("Title.NintendoLogo.Changed"), 0)) {
-        Color_RGB8 nintendoLogoColor = CVarGetColor24(CVAR_COSMETIC("Title.NintendoLogo.Value"), (Color_RGB8){0, 0, 255});    
-        gDPSetEnvColor(POLY_OPA_DISP++, nintendoLogoColor.r, nintendoLogoColor.g, nintendoLogoColor.b, 128);
-    } else {
-        gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 255, 128);
-    }
+    gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 255, 128);
 
     gDPLoadMultiBlock(POLY_OPA_DISP++, nintendo_rogo_static_Tex_001800, 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);