reverse mounting order, fix bug storing save/load method

This commit is contained in:
Daryl Borth 2021-01-31 09:45:26 -07:00
parent c85985bbb5
commit 60956e579a
7 changed files with 21 additions and 15 deletions

View File

@ -38,6 +38,11 @@ With it you can play GBA/Game Boy Color/Game Boy games on your Wii/GameCube.
## UPDATE HISTORY ## UPDATE HISTORY
[2.4.3 - January 31, 2021]
* Fixed SD2SP2 issues
* Changed max game image dimensions to 640x480 to support screenshots
[2.4.2 - January 18, 2021] [2.4.2 - January 18, 2021]
* Compiled with latest devkitPPC/libogc * Compiled with latest devkitPPC/libogc

View File

@ -2,8 +2,8 @@
<app version="1"> <app version="1">
<name>Visual Boy Advance GX</name> <name>Visual Boy Advance GX</name>
<coder>Tantric</coder> <coder>Tantric</coder>
<version>2.4.2</version> <version>2.4.3</version>
<release_date>20210118</release_date> <release_date>20210131</release_date>
<short_description>GBA/GBC/GB Emulator</short_description> <short_description>GBA/GBC/GB Emulator</short_description>
<long_description>A port of Visual Boy Advance - M to the Wii.</long_description> <long_description>A port of Visual Boy Advance - M to the Wii.</long_description>
<ahb_access /> <ahb_access />

View File

@ -62,12 +62,12 @@ int autoLoadMethod()
device = DEVICE_SD; device = DEVICE_SD;
else if(ChangeInterface(DEVICE_USB, SILENT)) else if(ChangeInterface(DEVICE_USB, SILENT))
device = DEVICE_USB; device = DEVICE_USB;
else if(ChangeInterface(DEVICE_SD_PORT2, SILENT))
device = DEVICE_SD_PORT2;
else if(ChangeInterface(DEVICE_SD_SLOTA, SILENT)) else if(ChangeInterface(DEVICE_SD_SLOTA, SILENT))
device = DEVICE_SD_SLOTA; device = DEVICE_SD_SLOTA;
else if(ChangeInterface(DEVICE_SD_SLOTB, SILENT)) else if(ChangeInterface(DEVICE_SD_SLOTB, SILENT))
device = DEVICE_SD_SLOTB; device = DEVICE_SD_SLOTB;
else if(ChangeInterface(DEVICE_SD_PORT2, SILENT))
device = DEVICE_SD_PORT2;
else if(ChangeInterface(DEVICE_DVD, SILENT)) else if(ChangeInterface(DEVICE_DVD, SILENT))
device = DEVICE_DVD; device = DEVICE_DVD;
else if(ChangeInterface(DEVICE_SMB, SILENT)) else if(ChangeInterface(DEVICE_SMB, SILENT))
@ -95,12 +95,12 @@ int autoSaveMethod(bool silent)
device = DEVICE_SD; device = DEVICE_SD;
else if(ChangeInterface(DEVICE_USB, SILENT)) else if(ChangeInterface(DEVICE_USB, SILENT))
device = DEVICE_USB; device = DEVICE_USB;
else if(ChangeInterface(DEVICE_SD_PORT2, SILENT))
device = DEVICE_SD_PORT2;
else if(ChangeInterface(DEVICE_SD_SLOTA, SILENT)) else if(ChangeInterface(DEVICE_SD_SLOTA, SILENT))
device = DEVICE_SD_SLOTA; device = DEVICE_SD_SLOTA;
else if(ChangeInterface(DEVICE_SD_SLOTB, SILENT)) else if(ChangeInterface(DEVICE_SD_SLOTB, SILENT))
device = DEVICE_SD_SLOTB; device = DEVICE_SD_SLOTB;
else if(ChangeInterface(DEVICE_SD_PORT2, SILENT))
device = DEVICE_SD_PORT2;
else if(ChangeInterface(DEVICE_SMB, SILENT)) else if(ChangeInterface(DEVICE_SMB, SILENT))
device = DEVICE_SMB; device = DEVICE_SMB;
else if(!silent) else if(!silent)

View File

@ -205,9 +205,9 @@ void UnmountAllFAT()
fatUnmount("sd:"); fatUnmount("sd:");
fatUnmount("usb:"); fatUnmount("usb:");
#else #else
fatUnmount("port2:");
fatUnmount("carda:"); fatUnmount("carda:");
fatUnmount("cardb:"); fatUnmount("cardb:");
fatUnmount("port2:");
#endif #endif
} }
@ -296,6 +296,7 @@ void MountAllFAT()
MountFAT(DEVICE_SD, SILENT); MountFAT(DEVICE_SD, SILENT);
MountFAT(DEVICE_USB, SILENT); MountFAT(DEVICE_USB, SILENT);
#else #else
MountFAT(DEVICE_SD_PORT2, SILENT);
MountFAT(DEVICE_SD_SLOTA, SILENT); MountFAT(DEVICE_SD_SLOTA, SILENT);
MountFAT(DEVICE_SD_SLOTB, SILENT); MountFAT(DEVICE_SD_SLOTB, SILENT);
#endif #endif

View File

@ -3782,9 +3782,9 @@ static int MenuSettingsFile()
#endif #endif
// correct load/save methods out of bounds // correct load/save methods out of bounds
if(GCSettings.LoadMethod > 6) if(GCSettings.LoadMethod > 7)
GCSettings.LoadMethod = 0; GCSettings.LoadMethod = 0;
if(GCSettings.SaveMethod > 6) if(GCSettings.SaveMethod > 7)
GCSettings.SaveMethod = 0; GCSettings.SaveMethod = 0;
if (GCSettings.LoadMethod == DEVICE_AUTO) sprintf (options.value[0],"Auto Detect"); if (GCSettings.LoadMethod == DEVICE_AUTO) sprintf (options.value[0],"Auto Detect");

View File

@ -589,9 +589,9 @@ decodePalsData ()
***************************************************************************/ ***************************************************************************/
void FixInvalidSettings() void FixInvalidSettings()
{ {
if(GCSettings.LoadMethod > 6) if(GCSettings.LoadMethod > 7)
GCSettings.LoadMethod = DEVICE_AUTO; GCSettings.LoadMethod = DEVICE_AUTO;
if(GCSettings.SaveMethod > 6) if(GCSettings.SaveMethod > 7)
GCSettings.SaveMethod = DEVICE_AUTO; GCSettings.SaveMethod = DEVICE_AUTO;
if(!(GCSettings.gbaZoomHor > 0.5 && GCSettings.gbaZoomHor < 1.5)) if(!(GCSettings.gbaZoomHor > 0.5 && GCSettings.gbaZoomHor < 1.5))
GCSettings.gbaZoomHor = 1.0; GCSettings.gbaZoomHor = 1.0;
@ -817,9 +817,9 @@ bool LoadPrefs()
sprintf(filepath[4], "usb:/%s", APPFOLDER); sprintf(filepath[4], "usb:/%s", APPFOLDER);
#else #else
numDevices = 3; numDevices = 3;
sprintf(filepath[0], "carda:/%s", APPFOLDER); sprintf(filepath[0], "port2:/%s", APPFOLDER);
sprintf(filepath[1], "cardb:/%s", APPFOLDER); sprintf(filepath[1], "carda:/%s", APPFOLDER);
sprintf(filepath[2], "port2:/%s", APPFOLDER); sprintf(filepath[2], "cardb:/%s", APPFOLDER);
#endif #endif
for(int i=0; i<numDevices; i++) for(int i=0; i<numDevices; i++)

View File

@ -17,7 +17,7 @@
#include "utils/FreeTypeGX.h" #include "utils/FreeTypeGX.h"
#define APPNAME "Visual Boy Advance GX" #define APPNAME "Visual Boy Advance GX"
#define APPVERSION "2.4.2" #define APPVERSION "2.4.3"
#define APPFOLDER "vbagx" #define APPFOLDER "vbagx"
#define PREF_FILE_NAME "settings.xml" #define PREF_FILE_NAME "settings.xml"
#define PAL_FILE_NAME "palettes.xml" #define PAL_FILE_NAME "palettes.xml"