ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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. 

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1294 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
skidau 2015-04-04 09:39:39 +00:00
parent 7014fff1d9
commit 78e8225cf0
5 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/gba/GBA.cpp
View File

@ -3359,17 +3359,19 @@ void CPUReset()
break; break;
} }
} }
switch (CheckEReaderRegion()) if (eReaderEnabled) {
{ switch (CheckEReaderRegion())
case 1: //US {
EReaderWriteMemory(0x8009134, 0x46C0DFE0); case 1: //US
break; EReaderWriteMemory(0x8009134, 0x46C0DFE0);
case 2: break;
EReaderWriteMemory(0x8008A8C, 0x46C0DFE0); case 2:
break; EReaderWriteMemory(0x8008A8C, 0x46C0DFE0);
case 3: break;
EReaderWriteMemory(0x80091A8, 0x46C0DFE0); case 3:
break; EReaderWriteMemory(0x80091A8, 0x46C0DFE0);
break;
}
} }
rtcReset(); rtcReset();
// clean registers // clean registers

2
src/gba/ereader.cpp
View File

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

2
src/gba/ereader.h
View File

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

4
src/win32/MainWndOptions.cpp
View File

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

8
src/win32/VBA.cpp
View File

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