From 4d020be95ee7da99b99e1c580949d62ffdd0dbc2 Mon Sep 17 00:00:00 2001 From: Extrems Date: Tue, 15 Mar 2022 21:27:46 -0400 Subject: [PATCH] - Force TGC files to use our reload stub. --- cube/swiss/source/devices/dvd/deviceHandler-DVD.c | 2 +- cube/swiss/source/devices/fat/deviceHandler-FAT.c | 2 +- cube/swiss/source/devices/fsp/deviceHandler-FSP.c | 2 +- cube/swiss/source/devices/gcloader/deviceHandler-gcloader.c | 2 +- cube/swiss/source/devices/usbgecko/deviceHandler-usbgecko.c | 2 +- .../source/devices/wiikeyfusion/deviceHandler-wiikeyfusion.c | 2 +- cube/swiss/source/devices/wode/deviceHandler-WODE.c | 2 +- cube/swiss/source/swiss.c | 3 ++- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/cube/swiss/source/devices/dvd/deviceHandler-DVD.c b/cube/swiss/source/devices/dvd/deviceHandler-DVD.c index bcd3a37d..2276e70e 100644 --- a/cube/swiss/source/devices/dvd/deviceHandler-DVD.c +++ b/cube/swiss/source/devices/dvd/deviceHandler-DVD.c @@ -458,7 +458,7 @@ s32 deviceHandler_DVD_setupFile(file_handle* file, file_handle* file2, int numTo } } - if(swissSettings.igrType == IGR_BOOTBIN) { + if(swissSettings.igrType == IGR_BOOTBIN || endsWith(file->name,".tgc")) { memset(&patchFile, 0, sizeof(file_handle)); concat_path(patchFile.name, devices[DEVICE_PATCHES]->initial->name, "swiss/patches/apploader.img"); diff --git a/cube/swiss/source/devices/fat/deviceHandler-FAT.c b/cube/swiss/source/devices/fat/deviceHandler-FAT.c index 5bfec38b..9a80b3ee 100644 --- a/cube/swiss/source/devices/fat/deviceHandler-FAT.c +++ b/cube/swiss/source/devices/fat/deviceHandler-FAT.c @@ -269,7 +269,7 @@ s32 deviceHandler_FAT_setupFile(file_handle* file, file_handle* file2, int numTo } } - if(swissSettings.igrType == IGR_BOOTBIN) { + if(swissSettings.igrType == IGR_BOOTBIN || endsWith(file->name,".tgc")) { memset(&patchFile, 0, sizeof(file_handle)); concat_path(patchFile.name, devices[DEVICE_CUR]->initial->name, "swiss/patches/apploader.img"); diff --git a/cube/swiss/source/devices/fsp/deviceHandler-FSP.c b/cube/swiss/source/devices/fsp/deviceHandler-FSP.c index 65529915..86650207 100644 --- a/cube/swiss/source/devices/fsp/deviceHandler-FSP.c +++ b/cube/swiss/source/devices/fsp/deviceHandler-FSP.c @@ -159,7 +159,7 @@ s32 deviceHandler_FSP_setupFile(file_handle* file, file_handle* file2, int numTo } } - if(swissSettings.igrType == IGR_BOOTBIN) { + if(swissSettings.igrType == IGR_BOOTBIN || endsWith(file->name,".tgc")) { memset(&patchFile, 0, sizeof(file_handle)); concat_path(patchFile.name, devices[DEVICE_PATCHES]->initial->name, "swiss/patches/apploader.img"); diff --git a/cube/swiss/source/devices/gcloader/deviceHandler-gcloader.c b/cube/swiss/source/devices/gcloader/deviceHandler-gcloader.c index a341adec..ceba3172 100644 --- a/cube/swiss/source/devices/gcloader/deviceHandler-gcloader.c +++ b/cube/swiss/source/devices/gcloader/deviceHandler-gcloader.c @@ -170,7 +170,7 @@ s32 deviceHandler_GCLOADER_setupFile(file_handle* file, file_handle* file2, int } } - if(swissSettings.igrType == IGR_BOOTBIN) { + if(swissSettings.igrType == IGR_BOOTBIN || endsWith(file->name,".tgc")) { memset(&patchFile, 0, sizeof(file_handle)); concat_path(patchFile.name, devices[DEVICE_PATCHES]->initial->name, "swiss/patches/apploader.img"); diff --git a/cube/swiss/source/devices/usbgecko/deviceHandler-usbgecko.c b/cube/swiss/source/devices/usbgecko/deviceHandler-usbgecko.c index eed40a3f..552fcea7 100644 --- a/cube/swiss/source/devices/usbgecko/deviceHandler-usbgecko.c +++ b/cube/swiss/source/devices/usbgecko/deviceHandler-usbgecko.c @@ -138,7 +138,7 @@ s32 deviceHandler_USBGecko_setupFile(file_handle* file, file_handle* file2, int } } - if(swissSettings.igrType == IGR_BOOTBIN) { + if(swissSettings.igrType == IGR_BOOTBIN || endsWith(file->name,".tgc")) { memset(&patchFile, 0, sizeof(file_handle)); concat_path(patchFile.name, devices[DEVICE_PATCHES]->initial->name, "swiss/patches/apploader.img"); diff --git a/cube/swiss/source/devices/wiikeyfusion/deviceHandler-wiikeyfusion.c b/cube/swiss/source/devices/wiikeyfusion/deviceHandler-wiikeyfusion.c index f0b5d17a..788e72e5 100644 --- a/cube/swiss/source/devices/wiikeyfusion/deviceHandler-wiikeyfusion.c +++ b/cube/swiss/source/devices/wiikeyfusion/deviceHandler-wiikeyfusion.c @@ -91,7 +91,7 @@ s32 deviceHandler_WKF_setupFile(file_handle* file, file_handle* file2, int numTo } } - if(swissSettings.igrType == IGR_BOOTBIN) { + if(swissSettings.igrType == IGR_BOOTBIN || endsWith(file->name,".tgc")) { memset(&patchFile, 0, sizeof(file_handle)); concat_path(patchFile.name, devices[DEVICE_PATCHES]->initial->name, "swiss/patches/apploader.img"); diff --git a/cube/swiss/source/devices/wode/deviceHandler-WODE.c b/cube/swiss/source/devices/wode/deviceHandler-WODE.c index 25c35690..4585ce8e 100644 --- a/cube/swiss/source/devices/wode/deviceHandler-WODE.c +++ b/cube/swiss/source/devices/wode/deviceHandler-WODE.c @@ -168,7 +168,7 @@ s32 deviceHandler_WODE_setupFile(file_handle* file, file_handle* file2, int numT } } - if(swissSettings.igrType == IGR_BOOTBIN) { + if(swissSettings.igrType == IGR_BOOTBIN || endsWith(file->name,".tgc")) { memset(&patchFile, 0, sizeof(file_handle)); concat_path(patchFile.name, devices[DEVICE_PATCHES]->initial->name, "swiss/patches/apploader.img"); diff --git a/cube/swiss/source/swiss.c b/cube/swiss/source/swiss.c index a8983ba1..c3fb4383 100644 --- a/cube/swiss/source/swiss.c +++ b/cube/swiss/source/swiss.c @@ -1873,7 +1873,7 @@ void load_game() { *(vu8*)VAR_EXI_SLOT = EXI_CHANNEL_MAX; *(vu8*)VAR_EXI_FREQ = EXI_SPEED1MHZ; *(vu8*)VAR_SD_SHIFT = 0; - *(vu8*)VAR_IGR_TYPE = swissSettings.igrType; + *(vu8*)VAR_IGR_TYPE = swissSettings.igrType | (tgcFile.magic == TGC_MAGIC ? 0x80:0x00); *(vu32**)VAR_FRAG_LIST = NULL; *(vu8*)VAR_TRIGGER_LEVEL = swissSettings.triggerLevel; *(vu8*)VAR_CARD_A_ID = 0x00; @@ -1890,6 +1890,7 @@ void load_game() { } load_app(filesToPatch, numToPatch); + free(filesToPatch); config_unload_current(); }