sms wip: random tweaks, refactoring (palette, sound stuff, etc)

[picodrive.git] / pico / pico.c

diff --git a/pico/pico.c b/pico/pico.c
index f900dfe..9b390c7 100644 (file)
--- a/pico/pico.c
+++ b/pico/pico.c
@@ -141,14 +141,23 @@ int PicoReset(void)
 {\r
   unsigned char sram_reg=Pico.m.sram_reg; // must be preserved\r
 \r
-  if (Pico.romsize<=0) return 1;\r
+  if (Pico.romsize <= 0)\r
+    return 1;\r
 \r
   /* must call now, so that banking is reset, and correct vectors get fetched */\r
-  if (PicoResetHook) PicoResetHook();\r
+  if (PicoResetHook)\r
+    PicoResetHook();\r
 \r
   PicoMemReset();\r
-  SekReset();\r
   memset(&PicoPadInt,0,sizeof(PicoPadInt));\r
+  emustatus = 0;\r
+\r
+  if (PicoAHW & PAHW_SMS) {\r
+    PicoResetMS();\r
+    return 0;\r
+  }\r
+\r
+  SekReset();\r
   // s68k doesn't have the TAS quirk, so we just globally set normal TAS handler in MCD mode (used by Batman games).\r
   SekSetRealTAS(PicoAHW & PAHW_MCD);\r
   SekCycleCntT=0;\r
@@ -156,7 +165,6 @@ int PicoReset(void)
   if (PicoAHW & PAHW_MCD)\r
     // needed for MCD to reset properly, probably some bug hides behind this..\r
     memset(Pico.ioports,0,sizeof(Pico.ioports));\r
-  emustatus = 0;\r
 \r
   Pico.m.dirtyPal = 1;\r
 \r
@@ -169,7 +177,7 @@ int PicoReset(void)
   PsndReset(); // pal must be known here\r
 \r
   // create an empty "dma" to cause 68k exec start at random frame location\r
-  if (Pico.m.dma_xfers == 0 && !(PicoOpt&POPT_DIS_VDP_FIFO))\r
+  if (Pico.m.dma_xfers == 0 && !(PicoOpt & POPT_DIS_VDP_FIFO))\r
     Pico.m.dma_xfers = rand() & 0x1fff;\r
 \r
   SekFinishIdleDet();\r
@@ -285,27 +293,30 @@ void PicoFrame(void)
 {\r
   Pico.m.frame_count++;\r
 \r
-  if (PicoAHW & PAHW_MCD) {\r
-    PicoFrameMCD();\r
+  if (PicoAHW & PAHW_SMS) {\r
+    PicoFrameMS();\r
     return;\r
   }\r
-  else if (PicoAHW & PAHW_SMS) {\r
-    PicoFrameMS();\r
+\r
+  if (PicoAHW & PAHW_MCD) {\r
+    PicoFrameMCD();\r
     return;\r
   }\r
 \r
   //if(Pico.video.reg[12]&0x2) Pico.video.status ^= 0x10; // change odd bit in interlace mode\r
 \r
-  if (!(PicoOpt&POPT_ALT_RENDERER))\r
-    PicoFrameStart();\r
-\r
+  PicoFrameStart();\r
   PicoFrameHints();\r
 }\r
 \r
 void PicoFrameDrawOnly(void)\r
 {\r
-  PicoFrameStart();\r
-  PicoDrawSync(223, 0);\r
+  if (!(PicoAHW & PAHW_SMS)) {\r
+    PicoFrameStart();\r
+    PicoDrawSync(223, 0);\r
+  } else {\r
+    PicoFrameDrawOnlyMS();\r
+  }\r
 }\r
 \r
 void PicoGetInternal(pint_t which, pint_ret_t *r)\r