# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1331195120 21600
# Node ID ff6f1acae59ee1bf03f41febda3d2880865e081f
# Parent  063b78119835bd75673837a51169fbd5fa95198c
removed zero frame confusion

diff -r 063b78119835 -r ff6f1acae59e clojure/com/aurellem/gb_driver.clj
--- a/clojure/com/aurellem/gb_driver.clj	Thu Mar 08 02:12:49 2012 -0600
+++ b/clojure/com/aurellem/gb_driver.clj	Thu Mar 08 02:25:20 2012 -0600
@@ -13,8 +13,7 @@
 
 (defn vba-init []
   (.delete yellow-save-file)
-  (future
-    (Gb/startEmulator (.getCanonicalPath yellow-rom-image))))
+  (Gb/startEmulator (.getCanonicalPath yellow-rom-image)))
 
 (defn cpu-data [size arr-fn]
   (let [store (int-array size)]
diff -r 063b78119835 -r ff6f1acae59e clojure/com/aurellem/test_vba.clj
--- a/clojure/com/aurellem/test_vba.clj	Thu Mar 08 02:12:49 2012 -0600
+++ b/clojure/com/aurellem/test_vba.clj	Thu Mar 08 02:25:20 2012 -0600
@@ -10,5 +10,8 @@
   (dorun
    (map step (vbm-masks speedrun-2942))))
 
+(defn play-vbm [#^File vbm]
+  (shutdown)
+  (vba-init)
+  (dorun (map step (vbm-masks vbm))))
 
-
diff -r 063b78119835 -r ff6f1acae59e clojure/com/aurellem/vbm.clj
--- a/clojure/com/aurellem/vbm.clj	Thu Mar 08 02:12:49 2012 -0600
+++ b/clojure/com/aurellem/vbm.clj	Thu Mar 08 02:25:20 2012 -0600
@@ -43,11 +43,10 @@
 (def vbm-header-length 255)
 
 (defn repair-vbm
-  "Two 0's must be inserted after every reset, and the first
-   button must be dropped"
+  "Two 0's must be inserted after every reset."
   [vbm-seq]
   (loop [fixed []
-         pending (next vbm-seq)]
+         pending vbm-seq]
     (if (empty? pending) fixed
         (let [mask (first pending)]
           (if (not= 0x0000 (bit-and mask (button-mask :reset)))
diff -r 063b78119835 -r ff6f1acae59e src/sdl/SDL.cpp
--- a/src/sdl/SDL.cpp	Thu Mar 08 02:12:49 2012 -0600
+++ b/src/sdl/SDL.cpp	Thu Mar 08 02:25:20 2012 -0600
@@ -2714,7 +2714,7 @@
     fprintf (stderr, "I got a filename OMG!\nCalling VBAMovieOpen...\n");
     VBAMovieOpen(moviefile, true);
   }
-  step();
+  //step();
   return 0;
 }