From 9af7ee1010cd8ae6714223772f40e0ffe6d338f0 Mon Sep 17 00:00:00 2001
From: cyan06 <cyan06@users.noreply.github.com>
Date: Sun, 10 May 2015 14:03:32 +0000
Subject: [PATCH] * Added support for wbfs/GameID6/ path * Updated custom
 banner URL (Thanks Abz) * Set default Wii disc dump mode to "Remove update
 partition" * Set default Nintendont MaxPad to 4 * Remove "shutdown to
 standby" choice on WiiU vWii.

---
 HBC/META.XML                       |  4 +--
 source/prompts/GameWindow.cpp      | 18 +++++++++--
 source/prompts/PromptWindows.cpp   |  6 +++-
 source/settings/CSettings.cpp      | 11 ++++---
 source/usbloader/GameBooter.cpp    |  7 +++++
 source/usbloader/wbfs/wbfs_fat.cpp | 50 +++++++++++++++++++-----------
 6 files changed, 68 insertions(+), 28 deletions(-)

diff --git a/HBC/META.XML b/HBC/META.XML
index 29d8c71f..c2e30661 100644
--- a/HBC/META.XML
+++ b/HBC/META.XML
@@ -2,8 +2,8 @@
 	<app version="1">
 		<name> USB Loader GX</name>
 		<coder>USB Loader GX Team</coder>
-		<version>3.0 r1244</version>
-		<release_date>20150404152023</release_date>
+		<version>3.0 r1246</version>
+		<release_date>20150510135131</release_date>
 		<!--   // remove this line to enable arguments
 		<arguments>
 				<arg>--ios=250</arg>
diff --git a/source/prompts/GameWindow.cpp b/source/prompts/GameWindow.cpp
index b2abbc3e..62e3f90a 100644
--- a/source/prompts/GameWindow.cpp
+++ b/source/prompts/GameWindow.cpp
@@ -482,9 +482,23 @@ void GameWindow::ChangeGame(int EffectDirection)
 	{
 		float size = GCGames::Instance()->GetGameSize((const char *) header->id);
 		sizeTxt->SetTextf("%.2fGB", size); //set size text;
-		// TODO: Add GC disc size check
+		// TODO: Add GC multi disc size check
 	}
-
+	
+	// Rescale the disc if the picture is bigger (HighRes Disc art from gametdb)
+	/*
+	if(diskImgData->GetWidth() > 160)
+	{
+		diskImg->SetScale(160.0f / diskImgData->GetWidth());
+		diskImg->SetPosition( -(diskImgData->GetWidth() - 160)/2 , -(diskImgData->GetHeight() - 160)/2 );  
+	}
+	else
+	{
+		diskImg->SetScale(1.0f);
+		diskImg->SetPosition( 0, 0);
+	}
+	*/
+	
 	diskImg->SetImage(diskImgData);
 	nameTxt->SetText(GameTitles.GetTitle(header));
 	playcntTxt->SetTextf("%s: %i", tr( "Play Count" ), GameStatistics.GetPlayCount(header));
diff --git a/source/prompts/PromptWindows.cpp b/source/prompts/PromptWindows.cpp
index 6be4a7af..c5da0829 100644
--- a/source/prompts/PromptWindows.cpp
+++ b/source/prompts/PromptWindows.cpp
@@ -978,7 +978,11 @@ int WindowExitPrompt()
 				Sys_LoadMenu();
 			else if (Settings.HomeMenu == HOME_MENU_FULL)
 			{
-				ret = WindowPrompt(tr( "How to Shutdown?" ), 0, tr( "Full shutdown" ), tr( "Standby" ), tr("Cancel"));
+				if(isWiiU())
+					ret = WindowPrompt(tr( "How to Shutdown?" ), 0, tr( "Full shutdown" ), tr("Cancel"));
+				else
+					ret = WindowPrompt(tr( "How to Shutdown?" ), 0, tr( "Full shutdown" ), tr( "Standby" ), tr("Cancel"));
+
 				if (ret == 1)
 					Sys_ShutdownToStandby();
 				else if(ret == 2)
diff --git a/source/settings/CSettings.cpp b/source/settings/CSettings.cpp
index 5693d23d..d2e7c16a 100644
--- a/source/settings/CSettings.cpp
+++ b/source/settings/CSettings.cpp
@@ -78,7 +78,7 @@ void CSettings::SetDefault()
 	strlcpy(NandEmuChanPath, NandEmuPath, sizeof(NandEmuChanPath));
 	strlcpy(GameCubePath, "usb1:/games/", sizeof(GameCubePath));
 	strlcpy(GameCubeSDPath, "sd:/games/", sizeof(GameCubeSDPath));
-	strlcpy(CustomBannersURL, "http://copy.com/vRN3HgFVyk9u7YuB/Public/", sizeof(CustomBannersURL));
+	strlcpy(CustomBannersURL, "http://nintendont.gxarena.com/banners/", sizeof(CustomBannersURL));
 	theme[0] = 0;
 	language_path[0] = 0;
 	ogg_path[0] = 0;
@@ -127,7 +127,7 @@ void CSettings::SetDefault()
 	ParentalBlocks = BLOCK_ALL;
 	InstallToDir = INSTALL_TO_NAME_GAMEID;
 	GameSplit = GAMESPLIT_4GB;
-	InstallPartitions = ONLY_GAME_PARTITION;
+	InstallPartitions = REMOVE_UPDATE_PARTITION;
 	HomeMenu = HOME_MENU_DEFAULT;
 	MultiplePartitions = OFF;
 	BlockIOSReload = AUTO;
@@ -190,7 +190,7 @@ void CSettings::SetDefault()
 	NINAutoboot = ON;
 	NINSettings = AUTO;
 	NINUSBHID = OFF;
-	NINMaxPads = 1;
+	NINMaxPads = 4;
 	NINNativeSI = OFF;
 	NINWiiUWide = widescreen;
 	NINOSReport = OFF;
@@ -1170,8 +1170,9 @@ bool CSettings::SetSetting(char *name, char *value)
 	else if (strcmp(name, "CustomBannersURL") == 0)
 	{
 		if( strcmp(value, "http://dl.dropbox.com/u/101209384/") == 0 ||
-			strcmp(value, "http://dl.dropboxusercontent.com/u/101209384/") == 0)
-			strlcpy(CustomBannersURL, "http://copy.com/vRN3HgFVyk9u7YuB/Public/", sizeof(CustomBannersURL)); // update banner URL
+			strcmp(value, "http://dl.dropboxusercontent.com/u/101209384/") == 0 ||
+			strcmp(value, "http://copy.com/vRN3HgFVyk9u7YuB/Public/") == 0)
+			strlcpy(CustomBannersURL, "http://nintendont.gxarena.com/banners/", sizeof(CustomBannersURL)); // update banner URL
 		else
 			strlcpy(CustomBannersURL, value, sizeof(CustomBannersURL));
 		return true;
diff --git a/source/usbloader/GameBooter.cpp b/source/usbloader/GameBooter.cpp
index dbaf1282..a3fe1a9f 100644
--- a/source/usbloader/GameBooter.cpp
+++ b/source/usbloader/GameBooter.cpp
@@ -1205,9 +1205,16 @@ int GameBooter::BootNintendont(struct discHdr *gameHdr)
 							return 0;
 					}
 				}
+				else
+				{
+					gprintf("kenobiwii source path = %s Not found.\n", kenobiwii_srcpath);
+					if(WindowPrompt(tr("Warning:"), fmt(tr("To use ocarina with %s you need the %s file."), LoaderName, kenobiwii_path), tr("Continue"), tr("Cancel")) == 0)
+						return 0;
+				}
 			}
 			else
 			{
+				gprintf("kenobiwii path = %s Not found.\n", kenobiwii_path);
 				if(WindowPrompt(tr("Warning:"), fmt(tr("To use ocarina with %s you need the %s file."), LoaderName, kenobiwii_path), tr("Continue"), tr("Cancel")) == 0)
 				return 0;
 			}
diff --git a/source/usbloader/wbfs/wbfs_fat.cpp b/source/usbloader/wbfs/wbfs_fat.cpp
index f37eae17..00d7cb9a 100644
--- a/source/usbloader/wbfs/wbfs_fat.cpp
+++ b/source/usbloader/wbfs/wbfs_fat.cpp
@@ -451,29 +451,43 @@ s32 Wbfs_Fat::GetHeadersCount()
 			snprintf(fname, sizeof(fname), "%s", dirent->d_name);
 
 			len = strlen(fname);
-			if (len < 8) continue; // "GAMEID_x"
+			if (len < 6) continue; // less than "GAMEID"
 
-			int lay_a = 0;
-			int lay_b = 0;
-			if (CheckLayoutB(fname, len, id, fname_title))
+			if(len == 6)
 			{
-				// usb:/wbfs/TITLE[GAMEID]/GAMEID.wbfs
-				lay_b = 1;
-			}
-			else if (fname[6] == '_')
-			{
-				// usb:/wbfs/GAMEID_TITLE/GAMEID.wbfs
+				// usb:/wbfs/GAMEID/GAMEID.wbfs
+				if(!isGameID(fname))
+					continue;
+				
 				memcpy(id, fname, 6);
-
-				if(isGameID((char*) id))
-				{
-					lay_a = 1;
-					snprintf(fname_title, sizeof(fname_title), &fname[7]);
-				}
 			}
+			else if(len >= 8 ) // GAMEID_Title or Title_[GameID]
+			{
+				int lay_a = 0;
+				int lay_b = 0;
+				if (CheckLayoutB(fname, len, id, fname_title))
+				{
+					// usb:/wbfs/TITLE[GAMEID]/GAMEID.wbfs
+					lay_b = 1;
+				}
+				else if (fname[6] == '_')
+				{
+					// usb:/wbfs/GAMEID_TITLE/GAMEID.wbfs
+					memcpy(id, fname, 6);
 
-			if (!lay_a && !lay_b) continue;
+					if(isGameID((char*) id))
+					{
+						lay_a = 1;
+						snprintf(fname_title, sizeof(fname_title), &fname[7]);
+					}
+				}
 
+				if (!lay_a && !lay_b) continue;
+			}
+			else // Todo : Add usb:/wbfs/Title/GAMEID.wbfs
+				continue;
+
+			
 			// check ahead, make sure it succeeds
 			snprintf(fpath, sizeof(fpath), "%s/%s/%.6s.wbfs", path, dirent->d_name, (char *) id);
 		}
@@ -624,7 +638,7 @@ int Wbfs_Fat::FindFilename(u8 *id, char *fname, int len)
 
 		if (dirent->d_name[0] == '.') continue;
 		int n = strlen(dirent->d_name);
-		if (n < 8) continue;
+		if (n < 6) continue;
 
 		const char *fileext = strrchr(dirent->d_name, '.');
 		if(fileext && (strcasecmp(fileext, ".wbfs") == 0 ||