X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FArea.c;h=4f4fa5682d5861e6a7190c11acb318e84e7ee7e3;hb=4936aac1cac5db9c8a0bec2d743d05be5c799f1f;hp=0ec25ecc49b85415e2ec0ee3e4b0968ef84a7fa1;hpb=fad248933b6676d30ccf419858b4ee10cc123fc5;p=picodrive.git

diff --git a/Pico/Area.c b/Pico/Area.c
index 0ec25ec..4f4fa56 100644
--- a/Pico/Area.c
+++ b/Pico/Area.c
@@ -138,7 +138,6 @@ static int PicoAreaScan(int PmovAction,unsigned int ver, void *PmovFile)
 
     // Pack, scan and unpack the cpu data:
     if((PmovAction&3)==1) PicoAreaPackCpu(cpu, 0);
-    //SekInit();     // notaz: do we really have to do this here?
     //PicoMemInit();
     SCAN_VAR(cpu,"cpu")
     if((PmovAction&3)==2) PicoAreaUnpackCpu(cpu, 0);
@@ -160,7 +159,7 @@ static int PicoAreaScan(int PmovAction,unsigned int ver, void *PmovFile)
       ScanVar(sn76496_regs,28*4,"SN76496state", PmovFile, PmovAction); // regs and other stuff
     if(PicoOpt&1) {
       ScanVar(ym2612_regs, 0x200+4, "YM2612state", PmovFile, PmovAction); // regs + addr line
-      if((PmovAction&3)==2) YM2612PicoStateLoad(); // reload YM2612 state from it's regs
+      if((PmovAction&3)==2) ym2612_unpack_state(); // reload YM2612 state from it's regs
     }
   }
 
@@ -176,7 +175,7 @@ int PmovState(int PmovAction, void *PmovFile)
   int minimum=0;
   unsigned char head[32];
 
-  if ((PicoMCD & 1) || carthw_chunks != NULL)
+  if ((PicoAHW & PAHW_MCD) || carthw_chunks != NULL)
   {
     if (PmovAction&1) return PicoCdSaveState(PmovFile);
     if (PmovAction&2) {