From abd8936460262e2e6fe34ce7d17e9182fd948852 Mon Sep 17 00:00:00 2001
From: grinvader <>
Date: Wed, 23 Mar 2005 22:06:31 +0000
Subject: [PATCH] Less stupidity and more testcode removal makes state-less
 power-on movies a reality.

---
 zsnes/src/cpu/execute.asm | 4 ----
 zsnes/src/gui/gui.asm     | 2 +-
 zsnes/src/init.asm        | 2 +-
 zsnes/src/zmovie.c        | 9 +++++----
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/zsnes/src/cpu/execute.asm b/zsnes/src/cpu/execute.asm
index 0b3cd963..7f21281b 100644
--- a/zsnes/src/cpu/execute.asm
+++ b/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
diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm
index 37a0eab7..21a2a195 100644
--- a/zsnes/src/gui/gui.asm
+++ b/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__
diff --git a/zsnes/src/init.asm b/zsnes/src/init.asm
index 4ee5aafc..ea731eed 100644
--- a/zsnes/src/init.asm
+++ b/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
diff --git a/zsnes/src/zmovie.c b/zsnes/src/zmovie.c
index 876ee31f..c4983066 100644
--- a/zsnes/src/zmovie.c
+++ b/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;