X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FCart.c;h=b641130bae12370068860461c09f0b30ec7af77b;hb=689fb2c0898deb6f87006dc5755516eb0ff6e647;hp=34a497ea9cd9577fea3df20351da72d357cba3e7;hpb=f53f286a8b48d19c65e83f90d00aa47e8e87c889;p=picodrive.git

diff --git a/Pico/Cart.c b/Pico/Cart.c
index 34a497e..b641130 100644
--- a/Pico/Cart.c
+++ b/Pico/Cart.c
@@ -481,7 +481,7 @@ int PicoCartLoad(pm_file *f,unsigned char **prom,unsigned int *psize)
   return 0;
 }
 
-// Insert/remove a cartridge:
+// Insert a cartridge:
 int PicoCartInsert(unsigned char *rom,unsigned int romsize)
 {
   // notaz: add a 68k "jump one op back" opcode to the end of ROM.
@@ -493,15 +493,20 @@ int PicoCartInsert(unsigned char *rom,unsigned int romsize)
   Pico.rom=rom;
   Pico.romsize=romsize;
 
+  PicoMemResetHooks();
+  PicoDmaHook = NULL;
+  PicoResetHook = NULL;
+  PicoLineHook = NULL;
+
+  if (!(PicoMCD & 1))
+    PicoCartDetect();
+
   // setup correct memory map for loaded ROM
   if (PicoMCD & 1)
        PicoMemSetupCD();
   else PicoMemSetup();
   PicoMemReset();
 
-  if (!(PicoMCD & 1))
-    PicoCartDetect();
-
   return PicoReset(1);
 }
 
@@ -634,11 +639,10 @@ void PicoCartDetect(void)
     *(int *) (Pico.rom+0x1f0) = 0x20204520;
 
   // SVP detection
-  if (name_cmp("Virtua Racing") == 0)
+  if (name_cmp("Virtua Racing") == 0 ||
+      name_cmp("VIRTUA RACING") == 0)
   {
     PicoSVPInit();
-    PicoRead16Hook = PicoSVPRead16;
-    PicoWrite8Hook = PicoSVPWrite8;
   }
 }