core vdp, reset fix

irixxxx · May 18, 2024 · 96e5982 · 96e5982
1 parent 2531b6f
commit 96e5982
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/pico/pico.c b/pico/pico.c
@@ -75,13 +75,6 @@ void PicoPower(void)
   // my MD1 VA6 console has this in IO
   PicoMem.ioports[1] = PicoMem.ioports[2] = PicoMem.ioports[3] = 0xff;
 
-  // powerup default VDP register values from TMSS BIOS
-  Pico.video.reg[0] = Pico.video.reg[1] = 0x04;
-  Pico.video.reg[0xc] = 0x81;
-  Pico.video.reg[0xf] = 0x02;
-  SATaddr = 0x0000;
-  SATmask = ~0x3ff;
-
   Pico.video.hint_irq = (PicoIn.AHW & PAHW_PICO ? 5 : 4);
 
   if (PicoIn.AHW & PAHW_MCD)
@@ -91,6 +84,13 @@ void PicoPower(void)
     PicoPower32x();
 
   PicoReset();
+
+  // powerup default VDP register values from TMSS BIOS
+  Pico.video.reg[0] = Pico.video.reg[1] = 0x04;
+  Pico.video.reg[0xc] = 0x81;
+  Pico.video.reg[0xf] = 0x02;
+  SATaddr = 0x0000;
+  SATmask = ~0x3ff;
 }
 
 PICO_INTERNAL void PicoDetectRegion(void)

diff --git a/pico/videoport.c b/pico/videoport.c
@@ -1180,7 +1180,7 @@ void PicoVideoReset(void)
   Pico.m.dirtyPal = 1;
 
   PicoDrawBgcDMA(NULL, 0, 0, 0, 0);
-  PicoVideoFIFOMode(0, 1);
+  PicoVideoFIFOMode(Pico.video.reg[1]&0x40, Pico.video.reg[12]&1);
 }
 
 void PicoVideoCacheSAT(int load)