1.1 --- a/clojure/com/aurellem/run/adv_choreo.clj	Sat Sep 01 10:05:55 2012 -0500
     1.2 +++ b/clojure/com/aurellem/run/adv_choreo.clj	Sat Sep 01 10:08:26 2012 -0500
     1.3 @@ -206,40 +206,22 @@
     1.4                 0x3E 20 0xBB ;; compare E to 20
     1.5                 0x20
     1.6                 3
     1.7 -               0x14
     1.8 -               0x1E 0
     1.9 +               0x14 ;; increment row
    1.10 +               0x1E 0 ;; set column to 0
    1.11                 
    1.12  
    1.13 +               ;; if row==18, set row to 0
    1.14                 0x3E 18
    1.15                 0xBA
    1.16                 0x20
    1.17                 2
    1.18 -               0x16 0
    1.19 -
    1.20 -               ;; 0x00 ;;0x1C ;; inc E
    1.21 -               ;; 0x3E 20 0xBB ;; compare E to 20
    1.22 -               ;; 0x20 ;; if E is 20
    1.23 -               ;;   3
    1.24 -               ;;   0x1E 0 ;; set E to zero
    1.25 -               ;;   0x00; 0x14   ;; (inc D) -> D
    1.26 -
    1.27 -               ;; ;; every time row (D) reaches 18, set row to 0                
    1.28 -               ;; 0x3E 18 0xBA ;; compare D to 18
    1.29 -               ;; 0x20 ;; if D is 18
    1.30 -               ;;   2
    1.31 -               ;;   0x16 0
    1.32 -               ;; set D to zero
    1.33 -               ] 
    1.34 +               0x16 0] 
    1.35                 
    1.36                set-HL-from-row-and-column
    1.37                (flatten
    1.38                [;; formula for memory offset is:
    1.39                 ;; (+ 0x9800 (* 32 row) column) == 
    1.40 -               ;; (+ 0x97E0 (* 32 (+ 1 row)) column)
    1.41 -               0xD5 ;; push DE
    1.42 -
    1.43 -               ;; RLM: this should be 0x9800, investigate
    1.44 -               0x21 0x00 0x98 ;; load HL with something
    1.45 +               0x21 0x00 0x98 ;; load HL with 0x9800
    1.46                 
    1.47                 0x06 0
    1.48                 0x4B  ;; columns (E) -> BC
    1.49 @@ -254,24 +236,11 @@
    1.50                 0xBA ;; CP A D
    1.51                 0x28 ;; skip this next section if A == D
    1.52                 4
    1.53 -               ;;(+ 32 3)
    1.54                 0x09 ;; HL += 32
    1.55 -               ;;(repeat 32 0x23)
    1.56                 0x3C
    1.57                 0x18
    1.58 -               ;;(->signed-8-bit (+ -6 -32))
    1.59 +
    1.60                 (->signed-8-bit -7)
    1.61 -               ;; 0x14 ;; inc D to handle case where D == 0
    1.62 -               ;; ;; D will never be > 20, so this will never overflow.
    1.63 -
    1.64 -               ;; ;; do 
    1.65 -               ;;   0x09 ;; HL += 32
    1.66 -               ;;   0x15 ;; dec D
    1.67 -               ;; ;; while D != 0
    1.68 -               ;; 0x20 
    1.69 -               ;; (->signed-8-bit -4)
    1.70 -               
    1.71 -               0xD1 ;; pop DE
    1.72                 ])
    1.73                
    1.74                render-glyph