Enabled the e-Reader kill-switch under the Emulators menu. Fixes the freeze in "Crash Bandicoot - The Huge Adventure" by disabling the e-Reader reset patch.

This commit is contained in:
skidau 2015-04-04 09:39:39 +00:00
parent f8edf8b760
commit ca1f5f54ae
5 changed files with 21 additions and 19 deletions

View File

@ -3359,6 +3359,7 @@ void CPUReset()
break;
}
}
if (eReaderEnabled) {
switch (CheckEReaderRegion())
{
case 1: //US
@ -3371,6 +3372,7 @@ void CPUReset()
EReaderWriteMemory(0x80091A8, 0x46C0DFE0);
break;
}
}
rtcReset();
// clean registers
memset(&reg[0], 0, sizeof(reg));

View File

@ -17,7 +17,7 @@
//#include "win32/MainWnd.h"
int eReaderSaveRAW = 1;
int eReaderEnabled = 1;
char US_Ereader[19] = "CARDE READERPSAE01";
char JAP_Ereader[19] = "CARDE READERPEAJ01";

View File

@ -1,6 +1,6 @@
extern unsigned char *DotCodeData;
extern char filebuffer[];
extern int eReaderSaveRAW;
extern int eReaderEnabled;
int OpenDotCodeFile(void);
int CheckEReaderRegion(void);

View File

@ -636,12 +636,12 @@ void MainWnd::OnUpdateOptionsEmulatorAgbprint(CCmdUI* pCmdUI)
void MainWnd::OnOptionsEmulatorEreader()
{
eReaderSaveRAW = !eReaderSaveRAW;
eReaderEnabled = !eReaderEnabled;
}
void MainWnd::OnUpdateOptionsEmulatorEreader(CCmdUI* pCmdUI)
{
pCmdUI->SetCheck(eReaderSaveRAW == 1);
pCmdUI->SetCheck(eReaderEnabled == 1);
}
void MainWnd::OnOptionsEmulatorRealtimeclock()

View File

@ -1415,9 +1415,9 @@ void VBA::loadSettings()
{
CString buffer;
eReaderSaveRAW = regQueryDwordValue("eReaderSaveRAW", 1);
if (eReaderSaveRAW < 0 || eReaderSaveRAW > 1)
eReaderSaveRAW = 1;
eReaderEnabled = regQueryDwordValue("eReaderEnabled", 1);
if (eReaderEnabled < 0 || eReaderEnabled > 1)
eReaderEnabled = 1;
lastFullscreen = (VIDEO_SIZE)regQueryDwordValue("lastFullscreen", VIDEO_1024x768);
@ -2521,7 +2521,7 @@ void VBA::movieReadNext()
void VBA::saveSettings()
{
regSetDwordValue("eReaderSaveRAW", eReaderSaveRAW);
regSetDwordValue("eReaderEnabled", eReaderEnabled);
regSetDwordValue("language", languageOption);