1.1 --- a/clojure/com/aurellem/run/title.clj	Mon Apr 02 21:25:24 2012 -0500
     1.2 +++ b/clojure/com/aurellem/run/title.clj	Mon Apr 02 23:13:49 2012 -0500
     1.3 @@ -1,6 +1,6 @@
     1.4  (ns com.aurellem.run.title
     1.5 -  (:use (com.aurellem.gb gb-driver vbm)))
     1.6 -
     1.7 +  (:use (com.aurellem.gb gb-driver vbm))
     1.8 +  (:use (com.aurellem.run util)))
     1.9  
    1.10  (defn start [] [[] (root)])
    1.11  
    1.12 @@ -8,10 +8,10 @@
    1.13    ([] (title (start)))
    1.14    ([script]
    1.15       (->> script
    1.16 -          (advance [] [:a])
    1.17 -          (advance [] [:start])
    1.18 -          (advance [] [:a])
    1.19 -          (advance [] [:start]))))
    1.20 +          (first-difference [] [:a] AF)
    1.21 +          (first-difference [] [:start] AF)
    1.22 +          (first-difference [] [:a] AF)
    1.23 +          (first-difference [] [:start] AF))))
    1.24  
    1.25  (defn-memo oak
    1.26    ([] (oak (title)))
    1.27 @@ -23,8 +23,8 @@
    1.28    ([] (name-entry-rlm (oak)))
    1.29    ([script]
    1.30       (->> script
    1.31 -          (advance [] [:a])
    1.32 -          (advance [] [:r] DE)
    1.33 +          (first-difference [] [:a] AF)
    1.34 +          (first-difference [] [:r] DE)
    1.35            (play-moves
    1.36             [[]
    1.37              [:r] [] [:r] [] [:r] [] [:r] []
    1.38 @@ -38,26 +38,26 @@
    1.39    ([] (name-entry-ash (oak)))
    1.40    ([script]
    1.41       (->> script
    1.42 -          (advance [] [:d])
    1.43 -          (advance [] [:d])
    1.44 -          (advance [] [:a]))))
    1.45 +          (first-difference [] [:d] AF)
    1.46 +          (first-difference [] [:d] AF)
    1.47 +          (first-difference [] [:a] AF))))
    1.48         
    1.49  (defn-memo rival-name-entry-gary
    1.50    ([] (rival-name-entry-gary (name-entry-ash)))
    1.51    ([script]
    1.52       (->> script
    1.53            (scroll-text 5)
    1.54 -          (advance [] [:d])
    1.55 -          (advance [] [:d])
    1.56 -          (advance [] [:a]))))
    1.57 +          (first-difference [] [:d] AF)
    1.58 +          (first-difference [] [:d] AF)
    1.59 +          (first-difference [] [:a] AF))))
    1.60    
    1.61  (defn-memo rival-name-entry-blue
    1.62    ([] (rival-name-entry-blue (name-entry-ash)))
    1.63    ([script]
    1.64       (->> script
    1.65            (scroll-text 5)
    1.66 -          (advance [] [:d])
    1.67 -          (advance [] [:a]))))
    1.68 +          (first-difference [] [:d] AF)
    1.69 +          (first-difference [] [:a] AF))))
    1.70  
    1.71  (defn-memo finish-title
    1.72    ([] (finish-title (rival-name-entry-blue)))