- Fix possible hard stall when returning to the menu

- Add GCLoader (FAT32) load support for GameCube
- Bump version to 4.1

Gamecube/fileBrowser/fileBrowser-libfat.c

@@ -44,12 +44,12 @@ const DISC_INTERFACE* usb = &__io_usbstorage;
 const DISC_INTERFACE* dvd = &__io_wiidvd;
 const DISC_INTERFACE* carda = &__io_gcsda;
 const DISC_INTERFACE* cardb = &__io_gcsdb;
-
 #else
 const DISC_INTERFACE* dvd = &__io_gcdvd;
 const DISC_INTERFACE* carda = &__io_gcsda;
 const DISC_INTERFACE* cardb = &__io_gcsdb;
 const DISC_INTERFACE* sd2sp2 = &__io_gcsd2;
+const DISC_INTERFACE* gcloader = &__io_gcode;
 #endif
 
 fileBrowser_file topLevel_libfat_Default =
@@ -231,7 +231,10 @@ int fileBrowser_libfat_init(fileBrowser_file* f){
 	return res;
 #else
 	if(f->name[0] == 's') {
-		if(sd2sp2->startup()) {
+		if(gcloader->startup()) {
+			res = fatMountSimple ("sd", gcloader);
+		}
+		if(!res && sd2sp2->startup()) {
 			res = fatMountSimple ("sd", sd2sp2);
 		}
 		if(!res && carda->startup()) {

Gamecube/gc_plugin.c

@@ -679,7 +679,7 @@ static void gc_vout_flip(const void *vram, int stride, int bgr24,
 		if (menuActive) return;
 
 		// clear the screen, and flush it
-		DEBUG_print("gc_vout_flip_null_vram",DBG_GPU1);
+		//DEBUG_print("gc_vout_flip_null_vram",DBG_GPU1);
 
 		//Write menu/debug text on screen
 		GXColor fontColor = {150,255,150,255};
@@ -848,6 +848,9 @@ void go(void) {
 
 	plugin_call_rearmed_cbs();
 	psxCpu->Execute();
+
+	// remove this callback to avoid any issues when returning to the menu.
+	GX_SetDrawDoneCallback(NULL);
 }
 
 int OpenPlugins() {

Gamecube/menu/MainFrame.cpp

@@ -165,9 +165,9 @@ void Func_Credits()
 	char CreditsInfo[512] = "";
 #ifdef HW_RVL
 	int iosversion = IOS_GetVersion();
-	sprintf(CreditsInfo,"WiiSX Beta 4.0 - IOS %i\n", iosversion);
+	sprintf(CreditsInfo,"WiiSX Beta 4.1 - IOS %i\n", iosversion);
 #else
-	sprintf(CreditsInfo,"CubeSX Beta 4.0\n");
+	sprintf(CreditsInfo,"CubeSX Beta 4.1\n");
 #endif
 	strcat(CreditsInfo,"\n");
 	strcat(CreditsInfo,"Wii64 Team:\n");

Gamecube/release/apps/wiiSX/meta.xml

@@ -2,8 +2,8 @@
  <app version="2">
    <name>WiiSX</name>
    <coder>Wii64 Team</coder>
-   <version>Beta 4.0</version>
-   <release_date>202310060000</release_date>
+   <version>Beta 4.1</version>
+   <release_date>202311080000</release_date>
    <short_description>PSX Emulator for Wii</short_description>
    <long_description>
 
@@ -12,7 +12,7 @@ General Coder - emu_kidid
 Graphics &amp; Menu Coder - sepp256  
 Audio &amp; Core Coder - tehpola  
 
-The Wii64Team proudly presents WiiSX Beta 4.0
+The Wii64Team proudly presents WiiSX Beta 4.1
 WiiSX is a port of PCSX to the Wii which uses the following:
 * pcsx-ReARMed
 * lightrec for dynamic recompilation

README

@@ -1,5 +1,5 @@
 README : WiiSX / CubeSX
-Beta 3.0
+Beta 4.1
 
 LICENSE:
     This software is licensed under the GNU General Public License v2
@@ -13,9 +13,14 @@ LICENSE:
 QUICK USAGE:
  * ISOs can be .bin/.cue (Make sure .cue contains _relative_ directory!), .img, or .iso format
  * To install: Extract the contents of wiiSX-<version>.zip to the root of your SD card
+ * SD Card detection order is as follows: 
+	GameCube: GCLoader, SD2SP2, Slot A, Slot B.
+	Wii: Front SD, Slot A, Slot B.
  * For SD/USB: Put ISOs (.bin/.cue or other formats) in the directory named /wiisx/isos,
     All save types will automatically be placed in /wiisx/saves
- * For DVD: ISOs may be anywhere on the disc
+ * For DVD: ISOs may be anywhere on the disc, in ISO9660 format.
+	GameCube: Currently broken due to libOGC issues with backups, XenoGC might still work.
+	Wii: Requires a disc drive capable of reading DVD-R.
  * For actual BIOS: Put SCPH1001.BIN in the directory on SD/USB named /wiisx/bios
  * Load the executable from the HBC or in the loader of your choice
     Once loaded, select 'Load ISO' and choose the source and select the ISO to load
@@ -80,6 +85,7 @@ CREDITS:
  * Visit us on IRC. EFNet #gc-forever or www.gc-forever.com or https://github.com/emukidid/pcsxgc/
 
 CHANGE LOG:
+	* See releases on github for these now, this section here is no longer maintained.
 Beta 4.0:
 	* libpsxcore properly integrated, no more hacky mess to receive fixes from upstream
 	* switch to upstream unai gpu plugin for a huge performance boost