1.1 --- a/clojure/com/aurellem/exp/item_bridge.clj	Mon Apr 02 23:13:49 2012 -0500
     1.2 +++ b/clojure/com/aurellem/exp/item_bridge.clj	Tue Apr 03 04:16:20 2012 -0500
     1.3 @@ -1,6 +1,6 @@
     1.4  (ns com.aurellem.exp.item-bridge
     1.5    (:use (com.aurellem.gb saves util constants gb-driver vbm items assembly))
     1.6 -  (:use (com.aurellem.run title save-corruption))
     1.7 +  (:use (com.aurellem.run util title save-corruption))
     1.8    ;;(:use (com.aurellem.exp pokemon))
     1.9    (:import [com.aurellem.gb.gb_driver SaveState]))
    1.10  
    1.11 @@ -88,10 +88,11 @@
    1.12     (first
    1.13      (->>
    1.14       [[] (mid-game)]
    1.15 -     (advance [:b] [:b :start])
    1.16 -     (advance [] [:d])
    1.17 +     (first-difference [:b] [:b :start] AF)
    1.18 +     (first-difference [] [:d] AF)
    1.19       (play-moves [[] [] [] [:d] [] [] [] [:d] [] [] [:a]])
    1.20 -     scroll-text
    1.21 +     (do-nothing 200)
    1.22 +     (play-moves [[:a]])
    1.23       (play-moves
    1.24        ;; this section is copied from speedrun-2942
    1.25        ;; and corrupts the save so that the end-of-list marker
    1.26 @@ -100,9 +101,9 @@
    1.27        [[] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] []
    1.28         [] [] [] [] [] [] [] [] [] [] [:select] [:restart]])
    1.29       (title)
    1.30 -     (advance [] [:start])
    1.31 -     (advance [] [:a])
    1.32 -     (advance [:a] [:a :start])))
    1.33 +     (first-difference [] [:start] AF)
    1.34 +     (first-difference [] [:a] AF)
    1.35 +     (first-difference [:a] [:a :start] AF)))
    1.36     [[]]))
    1.37  
    1.38  (defn corrupt
    1.39 @@ -119,7 +120,7 @@
    1.40  
    1.41  (defn gen-start-game-corrupt []
    1.42    (->> (second (intro))
    1.43 -       (advance [:b] [:a :b :start])
    1.44 +       (first-difference [:b] [:a :b :start] AF)
    1.45         (play-moves (corrupt-moves))))
    1.46  
    1.47  (defn start-game-corrupt []