From 7554c988c543292fd6835848efa6de8c16c67e33 Mon Sep 17 00:00:00 2001
From: RocketRobz <bobesh8@gmail.com>
Date: Sat, 6 Jun 2020 20:36:48 -0600
Subject: [PATCH] Cut logo length down

---
 {romfs/sounds => music_unused}/logos.wav | Bin
 source/main.cpp                          |  14 +++++++-------
 source/screens/rocketRobz.cpp            |   6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename {romfs/sounds => music_unused}/logos.wav (100%)

diff --git a/romfs/sounds/logos.wav b/music_unused/logos.wav
similarity index 100%
rename from romfs/sounds/logos.wav
rename to music_unused/logos.wav
diff --git a/source/main.cpp b/source/main.cpp
index c58bf06..40a649b 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -31,7 +31,7 @@ int iFps = 60;
 std::string currentMusicPack = "";
 
 //sound *music = NULL;
-sound *mus_logos = NULL;
+//sound *mus_logos = NULL;
 sound *sfx_select = NULL;
 sound *sfx_back = NULL;
 sound *sfx_highlight = NULL;
@@ -71,11 +71,11 @@ void saveSettings(void) {
 	}
 }*/
 
-void musLogos(void) {
+/*void musLogos(void) {
 	if (!dspfirmfound) return;
 	mus_logos->stop();
 	mus_logos->play();
-}
+}*/
 
 void sndSelect(void) {
 	if (!dspfirmfound) return;
@@ -248,7 +248,7 @@ int main()
 
 	// Load the sound effects if DSP is available.
 	if (dspfirmfound) {
-		mus_logos = new sound("romfs:/sounds/logos.wav", 0, false);
+		//mus_logos = new sound("romfs:/sounds/logos.wav", 0, false);
 		//music = new sound("romfs:/sounds/music.wav", 1, true);
 		sfx_select = new sound("romfs:/sounds/select.wav", 2, false);
 		sfx_back = new sound("romfs:/sounds/back.wav", 3, false);
@@ -328,7 +328,7 @@ int main()
 	svcCreateEvent(&threadRequest,(ResetType)0);
 	createThread((ThreadFunc)controlThread);
 	//Play_Music();
-	musLogos();
+	//musLogos();
 
 	// Loop as long as the status is not exit
 	while(aptMainLoop()) {
@@ -353,7 +353,7 @@ int main()
 
 		if (isInit) {
 			delay++;
-			if (delay > iFps*15) {
+			if (delay > iFps*10) {
 				Gui::setScreen(std::make_unique<GameSelect>(), true); // Set after delay to the GameSelect screen.
 				isInit = false;
 			}
@@ -430,7 +430,7 @@ int main()
 	archiveUnmountAll();
 
 	//delete music;
-	delete mus_logos;
+	//delete mus_logos;
 	delete sfx_select;
 	delete sfx_back;
 	delete sfx_highlight;
diff --git a/source/screens/rocketRobz.cpp b/source/screens/rocketRobz.cpp
index 75d05ca..1423adb 100644
--- a/source/screens/rocketRobz.cpp
+++ b/source/screens/rocketRobz.cpp
@@ -76,9 +76,9 @@ void RocketRobz::Draw(void) const {
 		if (rr_fadeAlpha > 255) rr_fadeAlpha = 255;
 	}
 
-	if (delay > iFps*13) {
+	/*if (delay > iFps*13) {
 		rr_fadeType = false;
-	} else if (delay > iFps*8) {
+	} else*/ if (delay > iFps*6) {
 		if (prevSubMode != 1) {
 			rr_fadeType = false;
 		}
@@ -87,7 +87,7 @@ void RocketRobz::Draw(void) const {
 			rr_fadeType = true;
 			prevSubMode++;
 		}
-	} else if (delay > iFps*4) {
+	} else if (delay > iFps*3) {
 		if (prevSubMode != 0) {
 			rr_fadeType = false;
 		}