return 0;\r
}\r
\r
-// Insert/remove a cartridge:\r
+// Insert a cartridge:\r
int PicoCartInsert(unsigned char *rom,unsigned int romsize)\r
{\r
// notaz: add a 68k "jump one op back" opcode to the end of ROM.\r
Pico.rom=rom;\r
Pico.romsize=romsize;\r
\r
+ PicoMemResetHooks();\r
+ PicoDmaHook = NULL;\r
+ PicoResetHook = NULL;\r
+ PicoLineHook = NULL;\r
+\r
+ PicoMemReset();\r
+\r
+ if (!(PicoMCD & 1))\r
+ PicoCartDetect();\r
+\r
// setup correct memory map for loaded ROM\r
+ // call PicoMemReset again due to possible memmap change\r
if (PicoMCD & 1)\r
PicoMemSetupCD();\r
else PicoMemSetup();\r
PicoMemReset();\r
\r
- if (!(PicoMCD & 1))\r
- PicoCartDetect();\r
-\r
return PicoReset(1);\r
}\r
\r
*(int *) (Pico.rom+0x1f0) = 0x20204520;\r
\r
// SVP detection\r
- if (name_cmp("Virtua Racing") == 0)\r
+ if (name_cmp("Virtua Racing") == 0 ||\r
+ name_cmp("VIRTUA RACING") == 0)\r
{\r
PicoSVPInit();\r
- PicoRead16Hook = PicoSVPRead16;\r
- PicoWrite8Hook = PicoSVPWrite8;\r
}\r
}\r
\r