1.1 --- a/clojure/com/aurellem/run/adv_choreo.clj	Sat Sep 01 10:11:18 2012 -0500
     1.2 +++ b/clojure/com/aurellem/run/adv_choreo.clj	Sat Sep 01 10:15:04 2012 -0500
     1.3 @@ -43,9 +43,8 @@
     1.4          (display-image-kernel
     1.5           base-address
     1.6  
     1.7 -         ;;pinkie-pie-mark
     1.8 -         test-image-color
     1.9 -
    1.10 +         pinkie-pie-mark
    1.11 +         ;;test-image-color
    1.12           )
    1.13           
    1.14  
    1.15 @@ -74,14 +73,7 @@
    1.16  
    1.17      (concat
    1.18       image-program ;; image program falls through to music program
    1.19 -
    1.20 -     (infinite-loop) 
    1.21 -     ;;music-program
    1.22 -
    1.23 -     )))
    1.24 -
    1.25 -
    1.26 -
    1.27 +     music-program)))
    1.28  
    1.29  (def glyphs
    1.30    "The sixteen 8x8 glyphs which make up the \"terminal\" font."
    1.31 @@ -301,7 +293,6 @@
    1.32                         (+ (count init)
    1.33                            (count header)
    1.34                            start-address))
    1.35 -                       ;;(- (count (program-data 0)) 100))
    1.36  
    1.37          state-machine-start-address
    1.38          (+ start-address (count init) (count header) (count glyph-display))
    1.39 @@ -315,8 +306,6 @@
    1.40                       (+ (count init) start-address)))])]
    1.41      (concat init header glyph-display state-machine return-to-header)))
    1.42  
    1.43 -
    1.44 -
    1.45  (defn-memo begin-glyph-bootstrap
    1.46    ([] (begin-glyph-bootstrap (launch-main-bootstrap-program)))
    1.47    ([script]
    1.48 @@ -334,9 +323,7 @@
    1.49               relocated-bootstrap-start
    1.50               (concat glyph-init glyph-program))
    1.51              (transfer-control relocated-bootstrap-start)
    1.52 -            (do-nothing 1)
    1.53 -
    1.54 -            ))))
    1.55 +            (do-nothing 1)))))
    1.56  
    1.57  (defn write-all-program-data
    1.58    ([] (write-all-program-data (begin-glyph-bootstrap)))
    1.59 @@ -350,9 +337,7 @@
    1.60    ([script]
    1.61       (->> script
    1.62            (transfer-control main-program-base-address)
    1.63 -          ;;(do-nothing 1800)
    1.64 -          (do-nothing 50)
    1.65 -          )))
    1.66 +          (do-nothing 1800))))
    1.67  
    1.68  
    1.69  ;; possible screen writing programs