X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPico.c;h=2ebe9c9b9cf60380bee79b76b453c2fe221e9641;hb=65ca3034d455b9934e7ff82813e3df49cf56cf87;hp=b07af08d508c635c82bc742f147a7c4d30430080;hpb=e807ac752b4653487ec5bdf516205e24a1c657eb;p=picodrive.git

diff --git a/Pico/Pico.c b/Pico/Pico.c
index b07af08..2ebe9c9 100644
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -64,6 +64,9 @@ int PicoReset(int hard)
 
   if (Pico.romsize<=0) return 1;
 
+  /* must call now, so that banking is reset, and correct vectors get fetched */
+  if (PicoResetHook) PicoResetHook();
+
   PicoMemReset();
   SekReset();
   // s68k doesn't have the TAS quirk, so we just globally set normal TAS handler in MCD mode (used by Batman games).
@@ -79,7 +82,7 @@ int PicoReset(int hard)
   Pico.video.pending_ints=0;
   emustatus = 0;
 
-  if(hard) {
+  if (hard) {
     // clear all memory of the emulated machine
     memset(&Pico.ram,0,(unsigned int)&Pico.rom-(unsigned int)&Pico.ram);
   }
@@ -142,8 +145,6 @@ int PicoReset(int hard)
 
   PsndReset(); // pal must be known here
 
-  if (PicoResetHook) PicoResetHook();
-
   if (PicoMCD & 1) {
     PicoResetMCD(hard);
     return 0;
@@ -162,15 +163,16 @@ int PicoReset(int hard)
 
 // dma2vram settings are just hacks to unglitch Legend of Galahad (needs <= 104 to work)
 // same for Outrunners (92-121, when active is set to 24)
+// 96 is VR hack
 static const int dma_timings[] = {
-83,  167, 166,  83, // vblank: 32cell: dma2vram dma2[vs|c]ram vram_fill vram_copy
+96,  167, 166,  83, // vblank: 32cell: dma2vram dma2[vs|c]ram vram_fill vram_copy
 102, 205, 204, 102, // vblank: 40cell:
 16,   16,  15,   8, // active: 32cell:
 24,   18,  17,   9  // ...
 };
 
 static const int dma_bsycles[] = {
-(488<<8)/82,  (488<<8)/167, (488<<8)/166, (488<<8)/83,
+(488<<8)/96,  (488<<8)/167, (488<<8)/166, (488<<8)/83,
 (488<<8)/102, (488<<8)/205, (488<<8)/204, (488<<8)/102,
 (488<<8)/16,  (488<<8)/16,  (488<<8)/15,  (488<<8)/8,
 (488<<8)/24,  (488<<8)/18,  (488<<8)/17,  (488<<8)/9
@@ -242,12 +244,12 @@ static __inline void SekStep(void)
 
 static int CheckIdle(void)
 {
-  int i, state[0x22];
+  int i, state[0x24];
 
   // See if the state is the same after 2 steps:
-  SekState(state); SekStep(); SekStep(); SekState(state+0x11);
-  for (i = 0x10; i >= 0; i--)
-    if (state[i] != state[i+0x11]) return 0;
+  SekState(state); SekStep(); SekStep(); SekState(state+0x12);
+  for (i = 0x11; i >= 0; i--)
+    if (state[i] != state[i+0x12]) return 0;
 
   return 1;
 }
@@ -342,6 +344,10 @@ static int PicoFrameSimple(void)
     lines_step = 14;
   }
 
+  // a hack for VR, to get it running in fast mode
+  if (PicoRead16Hook == PicoSVPRead16)
+    Pico.ram[0xd864^1] = 0x1a;
+
   // we don't emulate DMA timing in this mode
   if (Pico.m.dma_xfers) {
     Pico.m.dma_xfers=0;
@@ -389,10 +395,19 @@ static int PicoFrameSimple(void)
     if (PicoLineHook) PicoLineHook(sects*lines_step);
   }
 
+  // another hack for VR (it needs hints to work)
+  if (PicoRead16Hook == PicoSVPRead16) {
+    Pico.ram[0xd864^1] = 1;
+    pv->pending_ints|=0x10;
+    if (pv->reg[0]&0x10) SekInterrupt(4);
+    SekRunM68k(160);
+  }
+
   // render screen
   if (!PicoSkipFrame)
   {
     if (!(PicoOpt&0x10))
+    {
       // Draw the screen
 #if CAN_HANDLE_240_LINES
       if (pv->reg[1]&8) {
@@ -403,6 +418,7 @@ static int PicoFrameSimple(void)
 #else
       for (y=0;y<224;y++) PicoLine(y);
 #endif
+    }
     else PicoFrameFull();
 #ifdef DRAW_FINISH_FUNC
     DRAW_FINISH_FUNC();