Commit c78b24d4 authored by ds22x's avatar ds22x
Browse files

Merge branch 'master' of https://github.com/ekeeke/Genesis-Plus-GX

Sync to upstream.
parents 2a147fda 52c54c70
Pipeline #53129 passed with stages
in 19 minutes and 55 seconds
No preview for this file type
No preview for this file type
......@@ -625,6 +625,7 @@ int cdd_load(char *filename, char *header)
if (fd)
{
int mm, ss, bb, pregap = 0;
int index = 0;
/* DATA track already loaded ? */
if (cdd.toc.last)
......@@ -806,27 +807,30 @@ int cdd_load(char *filename, char *header)
cdd.toc.tracks[cdd.toc.last - 1].end = 0;
}
}
/* save current track index */
index = cdd.toc.last;
}
/* decode REM LOOP xxx command (MegaSD specific command) */
else if (sscanf(lptr, "REM LOOP %d", &bb) == 1)
{
cdd.toc.tracks[cdd.toc.last].loopEnabled = 1;
cdd.toc.tracks[cdd.toc.last].loopOffset = bb;
cdd.toc.tracks[index].loopEnabled = 1;
cdd.toc.tracks[index].loopOffset = bb;
isMSDfile = 1;
}
/* decode REM LOOP command (MegaSD specific command) */
else if (strstr(lptr,"REM LOOP"))
{
cdd.toc.tracks[cdd.toc.last].loopEnabled = 1;
cdd.toc.tracks[index].loopEnabled = 1;
isMSDfile = 1;
}
/* decode REM NOLOOP command (MegaSD specific command) */
else if (strstr(lptr,"REM NOLOOP"))
{
cdd.toc.tracks[cdd.toc.last].loopEnabled = -1;
cdd.toc.tracks[index].loopEnabled = -1;
isMSDfile = 1;
}
......
......@@ -1072,6 +1072,7 @@ void get_region(char *romheader)
(strstr(rominfo.product,"T-69046-50") != NULL) || /* Back to the Future III (Europe) */
(strstr(rominfo.product,"T-120106-00") != NULL) || /* Brian Lara Cricket (Europe) */
(strstr(rominfo.product,"T-97126 -50") != NULL) || /* Williams Arcade's Greatest Hits (Europe) */
(strstr(rominfo.product,"T-113026-50") != NULL) || /* Wiz'n'Liz - The Frantic Wabbit Wescue (Europe) */
(strstr(rominfo.product,"T-70096 -00") != NULL) || /* Muhammad Ali Heavyweight Boxing (Europe) */
((rominfo.checksum == 0x0000) && (rominfo.realchecksum == 0x1f7f))) /* Radica - Sensible Soccer Plus edition */
{
......
......@@ -154,6 +154,7 @@
<ClCompile Include="..\..\core\cart_hw\ggenie.c" />
<ClCompile Include="..\..\core\cart_hw\md_cart.c" />
<ClCompile Include="..\..\core\cart_hw\sms_cart.c" />
<ClCompile Include="..\..\core\cart_hw\megasd.c" />
<ClCompile Include="..\..\core\cart_hw\sram.c" />
<ClCompile Include="..\..\core\cart_hw\svp\ssp16.c" />
<ClCompile Include="..\..\core\cart_hw\svp\svp.c" />
......@@ -258,6 +259,7 @@
<ClInclude Include="..\..\core\cart_hw\ggenie.h" />
<ClInclude Include="..\..\core\cart_hw\md_cart.h" />
<ClInclude Include="..\..\core\cart_hw\sms_cart.h" />
<ClInclude Include="..\..\core\cart_hw\megasd.h" />
<ClInclude Include="..\..\core\cart_hw\sram.h" />
<ClInclude Include="..\..\core\cart_hw\svp\ssp16.h" />
<ClInclude Include="..\..\core\cart_hw\svp\svp.h" />
......
......@@ -294,6 +294,9 @@
<ClCompile Include="..\..\core\cart_hw\sms_cart.c">
<Filter>core\cart_hw</Filter>
</ClCompile>
<ClCompile Include="..\..\core\cart_hw\megasd.c">
<Filter>core\cart_hw</Filter>
</ClCompile>
<ClCompile Include="..\..\core\cart_hw\sram.c">
<Filter>core\cart_hw</Filter>
</ClCompile>
......@@ -668,6 +671,9 @@
<ClInclude Include="..\..\core\cart_hw\sms_cart.h">
<Filter>core\cart_hw</Filter>
</ClInclude>
<ClInclude Include="..\..\core\cart_hw\megasd.h">
<Filter>core\cart_hw</Filter>
</ClInclude>
<ClInclude Include="..\..\core\cart_hw\sram.h">
<Filter>core\cart_hw</Filter>
</ClInclude>
......
......@@ -159,6 +159,7 @@
<ClInclude Include="..\..\core\cart_hw\ggenie.h" />
<ClInclude Include="..\..\core\cart_hw\md_cart.h" />
<ClInclude Include="..\..\core\cart_hw\sms_cart.h" />
<ClInclude Include="..\..\core\cart_hw\megasd.h" />
<ClInclude Include="..\..\core\cart_hw\sram.h" />
<ClInclude Include="..\..\core\cart_hw\svp\ssp16.h" />
<ClInclude Include="..\..\core\cart_hw\svp\svp.h" />
......@@ -307,6 +308,7 @@
<ClCompile Include="..\..\core\cart_hw\ggenie.c" />
<ClCompile Include="..\..\core\cart_hw\md_cart.c" />
<ClCompile Include="..\..\core\cart_hw\sms_cart.c" />
<ClCompile Include="..\..\core\cart_hw\megasd.c" />
<ClCompile Include="..\..\core\cart_hw\sram.c" />
<ClCompile Include="..\..\core\cart_hw\svp\ssp16.c" />
<ClCompile Include="..\..\core\cart_hw\svp\svp.c" />
......
......@@ -168,6 +168,9 @@
<ClInclude Include="..\..\core\cart_hw\sms_cart.h">
<Filter>includes\core\cart_hw</Filter>
</ClInclude>
<ClInclude Include="..\..\core\cart_hw\megasd.h">
<Filter>includes\core\cart_hw</Filter>
</ClInclude>
<ClInclude Include="..\..\core\cart_hw\sram.h">
<Filter>includes\core\cart_hw</Filter>
</ClInclude>
......@@ -604,6 +607,9 @@
<ClCompile Include="..\..\core\cart_hw\sms_cart.c">
<Filter>src\core\cart_hw</Filter>
</ClCompile>
<ClCompile Include="..\..\core\cart_hw\megasd.c">
<Filter>src\core\cart_hw</Filter>
</ClCompile>
<ClCompile Include="..\..\core\cart_hw\sram.c">
<Filter>src\core\cart_hw</Filter>
</ClCompile>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment