Remove XBOX menu item

hbc/meta.xml

@@ -1,10 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <app version="1">
-  <name>Snes9x GX</name>
-  <coder>Tantric, Zopenko, Askot</coder>
-  <version>4.4.4</version>
-  <release_date>20191013</release_date>
-  <short_description>Super Nintendo Emulator</short_description> 
-  <long_description>A port of Snes9x to the Wii.</long_description> 
+  <name>Snes9x GX Retrode</name>
+  <coder>REHvolution</coder>
+  <version>0.9</version>
+  <release_date>20191227</release_date>
+  <short_description>Super Nintendo Emulator with Retrode/XBOX360 support</short_description> 
+  <long_description>
+Snes9x GX with Retrode/XBOX360 support.
+
+To make sure the controller was correctly detected click on the logo, which opens the credits screen.
+
+Disclaimer
+--------------------
+Retrode and the Retrode logo are trademarks of Retrode.org.
+The author of the Retrode USB Wii driver is not afflicted with Retrode.org, but is a huge fan ;-)
+This software comes without any warranty. I am not responsible for any damage to your devices.
+  </long_description> 
   <ahb_access />
 </app>

source/input.cpp

@@ -337,10 +337,7 @@ UpdatePads()
 	#ifdef HW_RVL
 	WiiDRC_ScanPads();
 	Retrode_ScanPads();
-    if (GCSettings.XBox)
-    {
-        XBOX360_ScanPads();
-    }
+    XBOX360_ScanPads();
     Hornet_ScanPads();
 	WPAD_ScanPads();
 	#endif
@@ -543,10 +540,7 @@ static void decodepad (int chan)
 	u32 wiidrcp = userInput[chan].wiidrcdata.btns_h;
 
 	jp |= Retrode_ButtonsHeld(chan);
-    if (GCSettings.XBox)
-    {
-        jp |= XBOX360_ButtonsHeld(chan);
-    }
+    jp |= XBOX360_ButtonsHeld(chan);
 	jp |= Hornet_ButtonsHeld(chan);
 #endif
 
@@ -912,16 +906,8 @@ void SetDefaultButtonMap ()
 #ifdef HW_RVL
 char* GetUSBControllerInfo()
 {
-    static char info[50];
-    if (GCSettings.XBox)
-    {
-        snprintf(info, 50, "Retrode: %s, XBOX360: %s", Retrode_Status(), XBOX360_Status());
-    }
-    else
-    {
-        snprintf(info, 50, "Retrode: %s, XBOX360: disabled", Retrode_Status());
-    }
-    Hornet_Status(); // Hornet support as undocumented feature ;-)
+    static char info[70];
+    snprintf(info, 70, "Retrode: %s, XBOX360: %s, Hornet: %s", Retrode_Status(), XBOX360_Status(), Hornet_Status());
     return info;
 }
 #endif

source/menu.cpp

@@ -870,11 +870,11 @@ static void WindowCredits(void * ptr)
 	txt[i]->SetPosition(0,y); i++; y+=20;
 
 	//char iosVersion[20];
-	char iosVersion[70]; // added 50 for Retrode info
+	char iosVersion[90]; // added 70 for USB info
 
 #ifdef HW_RVL
 	//sprintf(iosVersion, "IOS: %ld", IOS_GetVersion());
-	snprintf(iosVersion, 70, "IOS: %ld / %s", IOS_GetVersion(), GetUSBControllerInfo());
+	snprintf(iosVersion, 90, "IOS: %ld / %s", IOS_GetVersion(), GetUSBControllerInfo());
 #endif
 
 	txt[i] = new GuiText(iosVersion, 18, (GXColor){0, 0, 0, 255});
@@ -3930,7 +3930,6 @@ static int MenuSettingsMenu()
 	sprintf(options.name[i++], "Rumble");
 	sprintf(options.name[i++], "Language");
 	sprintf(options.name[i++], "Preview Image");
-	sprintf(options.name[i++], "XBOX 360 controller");
 	options.length = i;
 
 	for(i=0; i < options.length; i++)
@@ -4019,20 +4018,6 @@ static int MenuSettingsMenu()
 				if(GCSettings.PreviewImage > 2)
 					GCSettings.PreviewImage = 0;
 				break;
-
-			#ifdef HW_RVL
-            case 7:
-                GCSettings.XBox ^= 1;
-                if (GCSettings.XBox == 1)
-                {
-                    static char info[200];
-                    snprintf(info, 200, "XBOX360 controller enabled. "
-                                        "Please enable again after restart. "
-                                        "Check status in credits dialog: %s", GetUSBControllerInfo());
-                    InfoPrompt(info);
-                }
-                break;
-            #endif
 		}
 
 		if(ret >= 0 || firstRun)
@@ -4060,7 +4045,6 @@ static int MenuSettingsMenu()
 			options.name[2][0] = 0; // Music
 			options.name[3][0] = 0; // Sound Effects
 			options.name[4][0] = 0; // Rumble
-			options.name[7][0] = 0; // XBox
 			#endif
 
 			if (GCSettings.WiimoteOrientation == 0)
@@ -4113,11 +4097,6 @@ static int MenuSettingsMenu()
 					sprintf(options.value[6], "Artwork");
 					break; 
 			}
-
-            if (GCSettings.XBox == 1)
-                sprintf (options.value[7], "Enabled");
-            else
-                sprintf (options.value[7], "Disabled");
 
 			optionBrowser.TriggerUpdate();
 		}

source/snes9xgx.h

@@ -20,7 +20,7 @@
 #include "filelist.h"
 
 #define APPNAME 			"Snes9x GX Retrode"
-#define APPVERSION 			"0.9" // based on Snes9x GX 4.4.4 + latest 2019-12-27
+#define APPVERSION 			"0.9"
 #define APPFOLDER 			"snes9xgx"
 #define PREF_FILE_NAME		"settings.xml"
 
@@ -118,7 +118,6 @@ struct SGCSettings{
 	int		Rumble;
 	int		language;
 	int		PreviewImage;
-	int     XBox;
 
 	int		sfxOverclock;