CDrom and GTE updates. Cleanups.

Gamecube/GamecubeMain.cpp

@@ -218,7 +218,7 @@ void loadSettings(int argc, char *argv[])
 	Config.PsxOut = 1;
 	Config.HLE = 1;
 	Config.Xa = 0;  //XA enabled
-	Config.Cdda = 1; //CDDA disabled
+	Config.Cdda = 0; //CDDA enabled
 	iVolume = volume; //Volume="medium" in PEOPSspu
 	Config.PsxAuto = 1; //Autodetect
 	LoadCdBios = BOOTTHRUBIOS_NO;

Gamecube/menu/MainFrame.cpp

@@ -164,9 +164,9 @@ void Func_Credits()
 {
 	char CreditsInfo[512] = "";
 #ifdef HW_RVL
-	sprintf(CreditsInfo,"WiiSX RX Beta 3.0\n");
+	sprintf(CreditsInfo,"WiiSX RX Beta 3.1\n");
 #else
-	sprintf(CreditsInfo,"CubeSX RX Beta 3.0\n");
+	sprintf(CreditsInfo,"CubeSX RX Beta 3.1\n");
 #endif
 	strcat(CreditsInfo,"www.github.com/niuus/WiiSXRX\n");
 	strcat(CreditsInfo,"WiiSX RX & logo: NiuuS\n");

Gamecube/menu/SettingsFrame.cpp

@@ -506,10 +506,6 @@ void SettingsFrame::activateSubmenu(int submenu)
 				FRAME_BUTTONS[i].button->setVisible(true);
 				FRAME_BUTTONS[i].button->setActive(true);
 			}
-			for (int i = 43; i <= 44; i++)	//disable CDDA buttons
-			{
-				FRAME_BUTTONS[i].button->setActive(false);
-			}
 			break;
 		case SUBMENU_SAVES:
 			setDefaultFocus(FRAME_BUTTONS[4].button);
@@ -1268,6 +1264,7 @@ void Func_DisableCddaYes()
 //	menu::MessageBox::getInstance().setMessage(txtbuffer);
 //	DEBUG_print(txtbuffer, DBG_CORE2);
 //	#endif // SHOW_DEBUG
+	menu::MessageBox::getInstance().setMessage("CDDA audio is not yet implemented");
 }
 
 void Func_DisableCddaNo()
@@ -1282,7 +1279,7 @@ void Func_DisableCddaNo()
 //	menu::MessageBox::getInstance().setMessage(txtbuffer);
 //	DEBUG_print(txtbuffer, DBG_CORE2);
 //	#endif // SHOW_DEBUG
-	//menu::MessageBox::getInstance().setMessage("CDDA audio is not implemented");
+	menu::MessageBox::getInstance().setMessage("CDDA audio is not yet implemented");
 }
 
 extern "C" void SetVolume(void);

Gamecube/release/apps/README

@@ -1,5 +1,5 @@
 README : WiiSX RX / CubeSX RX
-Beta 2.6
+Beta 3.1
 
 LICENSE:
     This software is licensed under the GNU General Public License v2
@@ -96,6 +96,57 @@ CREDITS:
  * www.emulatemii.com and https://code.google.com/archive/p/pcsxgc/downloads
 
 RX CHANGE LOG:
+++ Beta 3.1 - 20221016:
+
+* Updates to CDrom plugin, compatibility raised.
+* CDrom speedup.
+* GTE updates.
+
+Thanks goes to the PCSX / PCSX-df / PCSX-r / PCSX-Revolution / PCSX-ReARMed teams, and xjsxjs197 code adaptations.
+
+3rd party Wii Classic Controller and Pro extended support from RX 2.7 is retained, as well as PS1 / PS2 controller support through the 3rd party Wiimote adapter.
+
+Experimental builds with PSX Multitap support also available. Compatible titles tested are included on a TXT inside the respective .zip
+
+Find a growing list of new playable and tested games on the second post of the official WiiSXRX thread, here:
+https://gbatemp.net/threads/wiisx-rx-a-new-fork.570252/
+
+
+++ Beta 3.0 - 20220912:
+
+Evo branch, lots of updates.
+
+* Slow, progressive merge and update to xjsxjs197's WiiSXRX fork. Code updated until commit a03f618a895fb526bef35808a698dc52e0dbb4e1 (Aug 26, 2022).
+
+* For now, discarded the "Languages" option, which tends to cause some minor random crashes on the UI, with certain actions.
+* When you open a directory with CUE+BIN, only the CUE will be shown. This condition is only true if the CUE and BIN tracks contain the same name, i.e.: "Mortal Kombat Trilogy (USA)"
+* CD-ROM plugin changed from CDR Mooby to CDR ISO (PCSX-df). Highly improved game compatibility, and Swap CD fix for many games.
+* Keeping FranSPU sound plugin (psx4all) over the dfsound plugin (pcsxr), for the moment. This will give different compatibility/results on some titles when compared to the fork, and a tiny speedup.
+* BIOS, MDEC decoder (FMV), R3000 CPU updates and fixes.
+
+Thanks goes to the PCSX / PCSX-df / PCSX-r / PCSX-Revolution / PCSX-ReARMed teams, and xjsxjs197 code adaptations.
+
+3rd party Wii Classic Controller and Pro extended support from RX 2.7 is retained, as well as PS1 / PS2 controller support through the 3rd party Wiimote adapter.
+
+Experimental builds with PSX Multitap support also available. Compatible titles tested are included on a TXT inside the respective .zip
+
+Find a growing list of new playable and tested games on the second post of the official WiiSXRX thread, here:
+https://gbatemp.net/threads/wiisx-rx-a-new-fork.570252/
+
+
+Beta 2.7 - 20220722:
+* Update CDrom
+Last minor update before changing around the compatibility.
+Makes some extra games boot with BIOS without the need to use HLE exclusively.
+(Resident Evil 2 - Dual Shock Ver., Pocket Fighter, etc.)
+* The settings file is now named settingsRX.cfg, so other forks don't overwrite it.
+* You can rename you current settings.cfg or just quickly create a new one inside WiiSXRX.
+* Readme updates
+
+Experimental builds with auto-enabled PS1 Multitap support added.
+Tested compatible games are listed on a TXT inside the zipped file.
+If it is not listed, then it's untested.
+
 Beta 2.6:
 * V-Sync is now activated. (thanks xjsxjs197!)
 * Adjust some button shortcuts for entering the Menu.

Gamecube/release/apps/WiiSXRX/meta.xml

@@ -2,17 +2,15 @@
  <app version="2">
    <name>WiiSXRX</name>
    <coder>NiuuS</coder>
-   <version>3.0 Beta</version>
-   <release_date>202209071402</release_date>
+   <version>3.1 Beta</version>
+   <release_date>202210161552</release_date>
    <short_description>PSX Emulator for Wii</short_description>
    <long_description>
 Featuring:
-- PS1 / PS2 controller support through Wiimote adapter.
 - Gamecube controller support.
 - Wii U Pro controller support.
 - Wii U Gamepad controller support through VC injects.
 - Wii Classic Controller and Pro support.
-- 3rd party Wii Classic Controller and Pro support.
 - Classic Controllers support. (NES / SNES)
 
 * WiiSX/CubeSX is a PCSX port. The original team was:

Makefile

@@ -4,7 +4,7 @@ ifndef ECHO
 ECHO = echo
 endif
 
-VERSION = beta2.6
+VERSION = beta3.1
 
 .PHONY:  all
 

PeopsSoftGPU/changelog.txt

@@ -1,5 +1,5 @@
 #########################################################################
-
+ 
 Version 1.18
 ------------
 

PeopsSoftGPU/externals.h

@@ -16,13 +16,13 @@
  *                                                                         *
  ***************************************************************************/
 
-//*************************************************************************// 
+//*************************************************************************//
 // History of changes:
 //
 // 2005/04/15 - Pete
 // - Changed user frame limit to floating point value
 //
-// 2004/01/31 - Pete  
+// 2004/01/31 - Pete
 // - added zn stuff
 //
 // 2002/04/20 - linuzappz
@@ -37,10 +37,10 @@
 // 2001/12/05 - syo
 // - added iSysMemory and iStopSaver
 //
-// 2001/10/28 - Pete  
+// 2001/10/28 - Pete
 // - generic cleanup for the Peops release
 //
-//*************************************************************************// 
+//*************************************************************************//
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -127,7 +127,7 @@ typedef struct PSXRECTTAG
 #define max(a,b)            (((a) > (b)) ? (a) : (b))
 #define min(a,b)            (((a) < (b)) ? (a) : (b))
 #define DWORD unsigned long
-#define __int64 long long int 
+#define __int64 long long int
 
 typedef struct RECTTAG
 {
@@ -152,7 +152,7 @@ typedef struct PSXDISPLAYTAG
  PSXPoint_t  DisplayMode;
  PSXPoint_t  DisplayPosition;
  PSXPoint_t  DisplayEnd;
- 
+
  long        Double;
  long        Height;
  long        PAL;
@@ -165,7 +165,7 @@ typedef struct PSXDISPLAYTAG
  PSXRect_t   Range;
 
 } PSXDisplay_t;
-                                
+
 /////////////////////////////////////////////////////////////////////////////
 
 // draw.c