# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1346407095 18000
# Node ID 91e99cc36bda660a4ce9e0e84a3b44ed1cfd1988
# Parent  6f8b15c2fb483d632954f36b7dda9b911222f26f
problem was improper value for starting position in memory for glyph-display-program.

diff -r 6f8b15c2fb48 -r 91e99cc36bda clojure/com/aurellem/run/adv_choreo.clj
--- a/clojure/com/aurellem/run/adv_choreo.clj	Fri Aug 31 04:22:08 2012 -0500
+++ b/clojure/com/aurellem/run/adv_choreo.clj	Fri Aug 31 04:58:15 2012 -0500
@@ -169,14 +169,6 @@
    delay-count
    total-glyph-count]
   (let [data-start (+ 2 start-address)
-        monitor-address-high (+ 0 data-start)
-        monitor-address-low  (+ 1 data-start)
-
-        glyph-count-high     (+ 2 data-start)
-        glyph-count-low      (+ 3 data-start)
-
-        delay-address        (+ 4 data-start)
-        
         load-data
         (flatten
          [;; data region
@@ -208,12 +200,9 @@
         ;; restore all registers
 
         (flatten
-         [;; HL points to delay currently,
-          ;; decrement HL and then restore everything
-          
-          0x03 ;; (inc monitor-address) -> monitor-address
+         [0x03 ;; (inc monitor-address) -> monitor-address
           0x1B ;; (dec glyph-count) -> glyph-count
-          
+                    
           ;; Reset HL to initial value
           0x21
           (reverse (disect-bytes-2 data-start))
@@ -221,8 +210,8 @@
           0x78 0x22 ;; B -> monitor-address-high
           0x79 0x22 ;; C -> monitor-address-low
 
-          ;;0x7A 0x22 ;; D -> glyph-count-high
-          ;;0x7B 0x22 ;; E -> glyph-count-low
+          0x7A 0x22 ;; D -> glyph-count-high
+          0x7B 0x22 ;; E -> glyph-count-low
           ])
          
         stack-cleanup
@@ -244,7 +233,8 @@
         header (concat  (frame-metronome) (read-user-input))
 
         glyph-display (glyph-display-program
-                       (+ (count init) (count header)
+                       (+ (count init)
+                          ;;(count header)
                           start-address)
                        main-program-base-address 100
                        200)