Mirrors/cartreader
2
0
Fork 0
mirror of https://github.com/sanni/cartreader.git synced 2024-11-14 17:05:08 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #257 from scrap-a/lock-on

Browse Source 
bugfix about Sonic & Knuckles Lock-on games
This commit is contained in:
sanni 2021-09-21 18:33:05 +02:00 committed by GitHub
commit 12b6fd29d5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cart_Reader/MD.ino
View File

@ -89,8 +89,8 @@ boolean realtec = 0;
#define DEFAULT_VALUE_segaSram16bit 0 #define DEFAULT_VALUE_segaSram16bit 0
int segaSram16bit = DEFAULT_VALUE_segaSram16bit; int segaSram16bit = DEFAULT_VALUE_segaSram16bit;
/****************************************** //*****************************************
SONIC & KNUCKLES LOCK-ON MODE VARIABLES // SONIC & KNUCKLES LOCK-ON MODE VARIABLES
// SnKmode : // SnKmode :
// 0 = Not Sonic & Knuckles // 0 = Not Sonic & Knuckles
// 1 = Only Sonic & Knucles // 1 = Only Sonic & Knucles
@ -98,7 +98,7 @@ int segaSram16bit = DEFAULT_VALUE_segaSram16bit;
// 3 = Sonic & Knucles + Sonic2 // 3 = Sonic & Knucles + Sonic2
// 4 = Sonic & Knucles + Sonic3 // 4 = Sonic & Knucles + Sonic3
// 5 = Sonic & Knucles + Other game // 5 = Sonic & Knucles + Other game
*****************************************/ //*****************************************
static byte SnKmode = 0; static byte SnKmode = 0;
static unsigned long cartSizeLockon; static unsigned long cartSizeLockon;
static unsigned long cartSizeSonic2 = 262144; static unsigned long cartSizeSonic2 = 262144;
@ -719,7 +719,7 @@ void getCartInfo_MD() {
writeSSF2Map(0x509878, 1); // 0xA130F1 writeSSF2Map(0x509878, 1); // 0xA130F1
}else if (!strcmp("GM MK-1079 -00", idLockon)) { }else if (!strcmp("GM MK-1079 -00", idLockon)) {
//Sonic1 ID:GM MK-1079 -00 //Sonic3 ID:GM MK-1079 -00
SnKmode = 4; SnKmode = 4;
}else{ }else{
//Other game //Other game
@ -1128,8 +1128,8 @@ void readROM_MD() {
//Initialize progress bar //Initialize progress bar
uint32_t processedProgressBar = 0; uint32_t processedProgressBar = 0;
uint32_t totalProgressBar = (uint32_t)(cartSize); uint32_t totalProgressBar = (uint32_t)(cartSize);
if(SnKmode>=2) totalProgressBar += (uin32_t) cartSizeLockon; if(SnKmode>=2) totalProgressBar += (uint32_t) cartSizeLockon;
if(SnKmode==3) totalProgressBar += (uin32_t) cartSizeSonic2; if(SnKmode==3) totalProgressBar += (uint32_t) cartSizeSonic2;
draw_progressbar(0, totalProgressBar); draw_progressbar(0, totalProgressBar);
for (unsigned long currBuffer = 0; currBuffer < cartSize / 2; currBuffer += 512) { for (unsigned long currBuffer = 0; currBuffer < cartSize / 2; currBuffer += 512) {