Less stupidity and more testcode removal makes state-less power-on movies a reality.

zsnes/src/cpu/execute.asm

@@ -718,12 +718,8 @@ NEWSYM start65816
 ;    rep stosd
     cmp byte[romloadskip],1
     je near StartGUI
-    cmp byte[MovieProcessing],0
-    je continueprog
-    ret
     
 NEWSYM continueprog
-
     ; clear keyboard presses
     mov esi,pressed
     mov ecx,256+128+64

zsnes/src/gui/gui.asm

@@ -166,7 +166,7 @@ EXTSYM GUIHQ3X
 EXTSYM GUIHQ4X
 EXTSYM firstsaveinc
 EXTSYM nssdip1,nssdip2,nssdip3,nssdip4,nssdip5,nssdip6
-EXTSYM SkipMovie,MovieStop,MoviePlay,MovieRecord,MovieInsertChapter,init
+EXTSYM SkipMovie,MovieStop,MoviePlay,MovieRecord,MovieInsertChapter
 EXTSYM MovieSeekAhead,MovieSeekBehind
 
 %ifdef __LINUX__

zsnes/src/init.asm

@@ -57,7 +57,7 @@ EXTSYM NumComboLocl,ComboBlHeader,ComboHeader,CombinDataLocl
 EXTSYM CombinDataGlob,NumCombo,GUIComboGameSpec
 EXTSYM mousexloc,mouseyloc
 EXTSYM extlatch
-EXTSYM BackState,clearmem2,NextLineCache,sramsavedis
+EXTSYM BackState
 EXTSYM FIRTAPVal0,FIRTAPVal1,FIRTAPVal2,FIRTAPVal3,FIRTAPVal4
 EXTSYM FIRTAPVal5,FIRTAPVal6,FIRTAPVal7,INTEnab,JoyAPos,JoyBPos
 EXTSYM NMIEnab,SPCROM,VIRQLoc,coladdb,coladdg,coladdr,doirqnext

zsnes/src/zmovie.c

@@ -719,6 +719,7 @@ static bool zmv_open(char *filename)
     switch (MovieStartMethod)
     {
       case 0: // from zst
+        zst_load(zmv_vars.fp);
         break;
       case 1: // from power-on
         powercycle();
@@ -728,11 +729,11 @@ static bool zmv_open(char *filename)
         break;
     }
 
-    zst_load(zmv_vars.fp);
-
-    if (zmv_vars.header.zsnes_version != (versionNumber & 0xFFFF))
+    if (MovieStartMethod)
     {
-
+      if (zmv_vars.header.zsnes_version != (versionNumber & 0xFFFF))
+	{ zst_load(zmv_vars.fp); }
+      else	{ fseek(zmv_vars.fp, zmv_vars.header.zst_size, SEEK_CUR); }
     }
 
     firstloop = true;