Fixed SD2SP2 / SD gecko issues

This commit is contained in:
Daryl Borth 2021-02-06 16:06:33 -07:00
parent 64a9830678
commit ead882daf1
6 changed files with 25 additions and 17 deletions

View File

@ -38,6 +38,10 @@ With it you can play GBA/Game Boy Color/Game Boy games on your Wii/GameCube.
## UPDATE HISTORY ## UPDATE HISTORY
[2.4.4 - February 6, 2021]
* Fixed SD2SP2 / SD gecko issues (again)
[2.4.3 - January 31, 2021] [2.4.3 - January 31, 2021]
* Fixed SD2SP2 issues * Fixed SD2SP2 issues

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.3</version> <version>2.4.4</version>
<release_date>20210131</release_date> <release_date>20210206</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

@ -295,10 +295,6 @@ void MountAllFAT()
#ifdef HW_RVL #ifdef HW_RVL
MountFAT(DEVICE_SD, SILENT); MountFAT(DEVICE_SD, SILENT);
MountFAT(DEVICE_USB, SILENT); MountFAT(DEVICE_USB, SILENT);
#else
MountFAT(DEVICE_SD_PORT2, SILENT);
MountFAT(DEVICE_SD_SLOTA, SILENT);
MountFAT(DEVICE_SD_SLOTB, SILENT);
#endif #endif
} }

View File

@ -815,12 +815,6 @@ bool LoadPrefs()
sprintf(filepath[2], "usb:/apps/%s", APPFOLDER); sprintf(filepath[2], "usb:/apps/%s", APPFOLDER);
sprintf(filepath[3], "sd:/%s", APPFOLDER); sprintf(filepath[3], "sd:/%s", APPFOLDER);
sprintf(filepath[4], "usb:/%s", APPFOLDER); sprintf(filepath[4], "usb:/%s", APPFOLDER);
#else
numDevices = 3;
sprintf(filepath[0], "port2:/%s", APPFOLDER);
sprintf(filepath[1], "carda:/%s", APPFOLDER);
sprintf(filepath[2], "cardb:/%s", APPFOLDER);
#endif
for(int i=0; i<numDevices; i++) for(int i=0; i<numDevices; i++)
{ {
@ -829,6 +823,20 @@ bool LoadPrefs()
if(prefFound) if(prefFound)
break; break;
} }
#else
if(ChangeInterface(DEVICE_SD_SLOTA, SILENT)) {
sprintf(filepath[0], "carda:/%s", APPFOLDER);
prefFound = LoadPrefsFromMethod(filepath[0]);
}
else if(ChangeInterface(DEVICE_SD_SLOTB, SILENT)) {
sprintf(filepath[0], "cardb:/%s", APPFOLDER);
prefFound = LoadPrefsFromMethod(filepath[0]);
}
else if(ChangeInterface(DEVICE_SD_PORT2, SILENT)) {
sprintf(filepath[0], "port2:/%s", APPFOLDER);
prefFound = LoadPrefsFromMethod(filepath[0]);
}
#endif
prefLoaded = true; // attempted to load preferences prefLoaded = true; // attempted to load preferences

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.3" #define APPVERSION "2.4.4"
#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"