Removed the "Remove Intros" option because it did not work. Removed the "e-Reader" option because the e-Reader is automatically detected. Removed the double emulator loop because it is not needed.

src/gba/GBA.cpp

@@ -3359,20 +3359,18 @@ void CPUReset()
         break;
       }
   }
-  if (eReaderEnabled) {
+	switch (CheckEReaderRegion())
-	  switch (CheckEReaderRegion())
+	{
-	  {
+	case 1: //US
-	  case 1: //US
+		EReaderWriteMemory(0x8009134, 0x46C0DFE0);
-		  EReaderWriteMemory(0x8009134, 0x46C0DFE0);
+		break;
-		  break;
+	case 2:
-	  case 2:
+		EReaderWriteMemory(0x8008A8C, 0x46C0DFE0);
-		  EReaderWriteMemory(0x8008A8C, 0x46C0DFE0);
+		break;
-		  break;
+	case 3:
-	  case 3:
+		EReaderWriteMemory(0x80091A8, 0x46C0DFE0);
-		  EReaderWriteMemory(0x80091A8, 0x46C0DFE0);
+		break;
-		  break;
+	}
-	  }
-  }
   rtcReset();
   // clean registers
   memset(&reg[0], 0, sizeof(reg));

src/gba/ereader.cpp

@@ -8,8 +8,6 @@
 #include "Globals.h"
 #include "ereader.h"
 
-int eReaderEnabled = 1;
-
 char US_Ereader[19] = "CARDE READERPSAE01";
 char JAP_Ereader[19] = "CARDE READERPEAJ01";
 char JAP_Ereader_plus[19] = "CARDEREADER+PSAJ01";

src/gba/ereader.h

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

src/win32/MainWnd.cpp

@@ -170,8 +170,6 @@ BEGIN_MESSAGE_MAP(MainWnd, CWnd)
   ON_UPDATE_COMMAND_UI(ID_OPTIONS_EMULATOR_AUTOMATICALLYAPPLYPATCHFILES, OnUpdateOptionsEmulatorAutomaticallyipspatch)
   ON_COMMAND(ID_OPTIONS_EMULATOR_AGBPRINT, OnOptionsEmulatorAgbprint)
   ON_UPDATE_COMMAND_UI(ID_OPTIONS_EMULATOR_AGBPRINT, OnUpdateOptionsEmulatorAgbprint)
-  ON_COMMAND(ID_OPTIONS_EMULATOR_EREADER, OnOptionsEmulatorEreader)
-  ON_UPDATE_COMMAND_UI(ID_OPTIONS_EMULATOR_EREADER, OnUpdateOptionsEmulatorEreader)
   ON_COMMAND(ID_OPTIONS_EMULATOR_REALTIMECLOCK, OnOptionsEmulatorRealtimeclock)
   ON_UPDATE_COMMAND_UI(ID_OPTIONS_EMULATOR_REALTIMECLOCK, OnUpdateOptionsEmulatorRealtimeclock)
   ON_COMMAND(ID_OPTIONS_EMULATOR_REWINDINTERVAL, OnOptionsEmulatorRewindinterval)
@@ -570,11 +568,6 @@ bool MainWnd::FileRun()
       doMirroring (i == 0 ? false : true);
 
     theApp.emulator = GBASystem;
-    /* disabled due to problems
-    if(theApp.removeIntros && rom != NULL) {
-      *((u32 *)rom)= 0xea00002e;
-    }
-    */
 
     if(theApp.autoPatch && !patchName.IsEmpty()) {
       int size = 0x2000000;

src/win32/MainWnd.h

@@ -174,8 +174,6 @@ protected:
 	afx_msg void OnUpdateOptionsEmulatorAutomaticallyipspatch(CCmdUI* pCmdUI);
 	afx_msg void OnOptionsEmulatorAgbprint();
 	afx_msg void OnUpdateOptionsEmulatorAgbprint(CCmdUI* pCmdUI);
-	afx_msg void OnOptionsEmulatorEreader();
-	afx_msg void OnUpdateOptionsEmulatorEreader(CCmdUI* pCmdUI);
 	afx_msg void OnOptionsEmulatorRealtimeclock();
 	afx_msg void OnUpdateOptionsEmulatorRealtimeclock(CCmdUI* pCmdUI);
 	afx_msg void OnOptionsEmulatorRewindinterval();

src/win32/MainWndOptions.cpp

@@ -22,7 +22,6 @@
 
 #include "../System.h"
 #include "../gba/agbprint.h"
-#include "../gba/ereader.h"
 #include "../gba/GBA.h"
 #include "../gba/Globals.h"
 #include "../gba/Sound.h"
@@ -634,16 +633,6 @@ void MainWnd::OnUpdateOptionsEmulatorAgbprint(CCmdUI* pCmdUI)
   pCmdUI->SetCheck(agbPrintIsEnabled());
 }
 
-void MainWnd::OnOptionsEmulatorEreader()
-{
-	eReaderEnabled = !eReaderEnabled;
-}
-
-void MainWnd::OnUpdateOptionsEmulatorEreader(CCmdUI* pCmdUI)
-{
-	pCmdUI->SetCheck(eReaderEnabled == 1);
-}
-
 void MainWnd::OnOptionsEmulatorRealtimeclock()
 {
   theApp.winRtcEnable = !theApp.winRtcEnable;

src/win32/VBA.cpp

@@ -25,7 +25,6 @@
 
 #include "../System.h"
 #include "../gba/agbprint.h"
-#include "../gba/ereader.h"
 #include "../gba/cheatSearch.h"
 #include "../gba/GBA.h"
 #include "../gba/Globals.h"
@@ -247,7 +246,6 @@ VBA::VBA()
   recentFreeze = false;
   autoSaveLoadCheatList = true;
   winout = NULL;
-  removeIntros = false;
   autoPatch = true;
   winGbBorderOn = 0;
   winFlashSize = 0x20000;
@@ -1339,8 +1337,6 @@ BOOL VBA::OnIdle(LONG lCount)
       return TRUE; // continue loop
     return !::PeekMessage(&msg, NULL, NULL, NULL, PM_NOREMOVE);
   } else if(emulating && active && !paused) {
-    for(int i = 0; i < 2; i++) { // Why is this loop here?
-	if (!debugger)
       emulator.emuMain(emulator.emuCount);
 
       if(rewindSaveNeeded && rewindMemory && emulator.emuWriteMemState) {
@@ -1356,7 +1352,6 @@ BOOL VBA::OnIdle(LONG lCount)
       }
 
       rewindSaveNeeded = false;
-    }
 
     if(mouseCounter) {
       if(--mouseCounter == 0) {
@@ -1410,10 +1405,6 @@ void VBA::loadSettings()
 {
   CString buffer;
 
-  eReaderEnabled = regQueryDwordValue("eReaderEnabled", 1);
-  if (eReaderEnabled < 0 || eReaderEnabled > 1)
-	  eReaderEnabled = 1;
-
   lastFullscreen = (VIDEO_SIZE)regQueryDwordValue("lastFullscreen", VIDEO_1024x768);
 
   languageOption = regQueryDwordValue("language", 1);
@@ -1596,8 +1587,6 @@ void VBA::loadSettings()
     true : false;
   captureFormat = regQueryDwordValue("captureFormat", 0);
 
-  removeIntros = regQueryDwordValue("removeIntros", false) ? true : false;
-
   recentFreeze = regQueryDwordValue("recentFreeze", false) ? true : false;
 
   autoPatch = regQueryDwordValue("autoPatch", 1) == 1 ? true : false;
@@ -2516,8 +2505,6 @@ void VBA::movieReadNext()
 
 void VBA::saveSettings()
 {
-  regSetDwordValue("eReaderEnabled", eReaderEnabled);
-
   regSetDwordValue("language", languageOption);
 
   regSetStringValue("languageName", languageName);
@@ -2605,8 +2592,6 @@ void VBA::saveSettings()
 
   regSetDwordValue("captureFormat", captureFormat);
 
-  regSetDwordValue("removeIntros", removeIntros);
-
   regSetDwordValue("recentFreeze", recentFreeze);
 
   regSetDwordValue("autoPatch", autoPatch ? 1 : 0);

src/win32/VBA.h

@@ -111,7 +111,6 @@ class VBA : public CWinApp
   bool recentFreeze;
   bool autoSaveLoadCheatList;
   FILE *winout;
-  bool removeIntros;
   bool autoPatch;
   int winGbBorderOn;
   int winFlashSize;

src/win32/VBA.rc

@@ -1846,11 +1846,9 @@ BEGIN
                 MENUITEM "&Normal",                     ID_OPTIONS_PRIORITY_NORMAL
                 MENUITEM "&Below Normal",               ID_OPTIONS_PRIORITY_BELOWNORMAL
             END
-            MENUITEM "&Remove intros (GBA)",        ID_OPTIONS_EMULATOR_REMOVEINTROSGBA
             MENUITEM "Auto-apply IPS/UPS/PPF",      ID_OPTIONS_EMULATOR_AUTOMATICALLYAPPLYPATCHFILES
             MENUITEM "Pause when inactive",         ID_OPTIONS_EMULATOR_PAUSEWHENINACTIVE
             MENUITEM "AGB Print",                   ID_OPTIONS_EMULATOR_AGBPRINT
-            MENUITEM "E-Reader",                    ID_OPTIONS_EMULATOR_EREADER
             MENUITEM "Real Time Clock",             ID_OPTIONS_EMULATOR_REALTIMECLOCK
             MENUITEM "&Game Overrides...",          ID_OPTIONS_EMULATOR_GAMEOVERRIDES
             POPUP "Show speed"

src/win32/resource.h

@@ -912,7 +912,6 @@
 #define ID_OPTIONS_VIDEO_RENDEROPTIONS_GLTRIANGLE 40239
 #define ID_OPTIONS_VIDEO_RENDEROPTIONS_GLQUADS 40240
 #define ID_OPTIONS_EMULATOR_AGBPRINT    40247
-#define ID_OPTIONS_EMULATOR_EREADER     40280
 #define ID_OPTIONS_EMULATOR_REALTIMECLOCK 40248
 #define ID_OPTIONS_GAMEBOY_SGB2         40249
 #define ID_SYSTEM_MINIMIZE              40250
@@ -974,7 +973,6 @@
 #define IDC_SERVERWAIT                  40323
 #define IDC_LINK3P                      40325
 #define IDC_LINK4P                      40326
-#define ID_OPTIONS_EMULATOR_REMOVEINTROSGBA 40331
 #define ID_Menu                         40332
 #define ID_OPTIONS_VIDEO_RENDEROPTIONS_GLANISOTROPIC 40333
 #define ID_OPTIONS_LINK_ENABLE          40335