From: kub <derkub@gmail.com>
Date: Wed, 19 Jan 2022 22:00:23 +0000 (+0000)
Subject: core, improve save/load
X-Git-Tag: v2.00~373
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96baa875a01ab419dec6ae4724ca6284a647129d;p=picodrive.git

core, improve save/load
---

diff --git a/pico/32x/32x.c b/pico/32x/32x.c
index d1e08aa1..c99f5b35 100644
--- a/pico/32x/32x.c
+++ b/pico/32x/32x.c
@@ -616,7 +616,8 @@ void Pico32xStateLoaded(int is_early)
     return;
   }
 
-  sh2s[0].m68krcycles_done = sh2s[1].m68krcycles_done = SekCyclesDone();
+  if (sh2s[0].m68krcycles_done == 0 && sh2s[1].m68krcycles_done == 0)
+    sh2s[0].m68krcycles_done = sh2s[1].m68krcycles_done = SekCyclesDone();
   p32x_update_irls(NULL, SekCyclesDone());
   p32x_timers_recalc();
   p32x_pwm_state_loaded();
diff --git a/pico/pico.c b/pico/pico.c
index b5ac2641..e924cc10 100644
--- a/pico/pico.c
+++ b/pico/pico.c
@@ -187,6 +187,7 @@ int PicoReset(void)
   PsndReset(); // pal must be known here
 
   // create an empty "dma" to cause 68k exec start at random frame location
+  Pico.t.m68c_line_start = Pico.t.m68c_cnt;
   PicoVideoFIFOWrite(rand() & 0x1fff, 0, 0, PVS_CPURD);
 
   SekFinishIdleDet();