# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1331850589 18000
# Node ID 6fe33bb5ea221df8f8a485ac32373206a0dd3e96
# Parent  8be7ce890184f8e1f12d9a3dab0c88e2104bec35
saving progress

diff -r 8be7ce890184 -r 6fe33bb5ea22 clojure/com/aurellem/assembly.clj
--- a/clojure/com/aurellem/assembly.clj	Thu Mar 15 17:20:55 2012 -0500
+++ b/clojure/com/aurellem/assembly.clj	Thu Mar 15 17:29:49 2012 -0500
@@ -19,15 +19,7 @@
     (-> state
         (write-memory! scratch-memory)
         (write-registers! registers)
-        (PC! program-counter))))
-  ;;([program-counter]
-  ;;   (fn [^SaveState state registers assembly-code]
-  ;;     (inject-assembly state program-counter registers assembly-code)))
-  )
-
-
-;;(def inject-assembly-item
-;;  (inject-assembly (inc item-list-start)))
+        (PC! program-counter)))))
 
 (defn inject-item-assembly
   ([^SaveState state assembly-code]
@@ -61,10 +53,8 @@
   ([assembly n]
      (run-assembly info assembly n)))
 
-
 (def buttons-port 0xFF00)
 
-
 (defn A [state]
   (bit-shift-right (bit-and 0x0000FF00 (AF state)) 8))
 
@@ -133,7 +123,6 @@
         
         []))))
 
-
 (defn run-a-bit []
   (-> (read-buttons)
       (info)
@@ -160,13 +149,9 @@
       (tick)
       (print-inventory)))
 
-
-(comment
-  (view-memory (step (step (read-buttons) [:d])) 0xD328)
-  ;;mem 0xD328 = 11100111
-  (view-memory (step (step (read-buttons))) 0xD328)
-  ;;mem 0xD328 = 00000000
-  )
+(defn test-read-pad []
+  (= (view-memory (step (step (read-buttons) [:d])) 0xD328)
+     (view-memory (step (step (read-buttons))) 0xD328)))
   
 (defn trace [state]
   (loop [program-counters []
@@ -182,10 +167,9 @@
          (conj opcodes
                (aget (memory @current-state)
                      (PC @current-state))))))))
-        
   
 (defn good-trace []
   (-> (mid-game) (tick) (IE! 0)
       (set-inv-mem [0x00 0x00 0X00 0x00])
       (PC! item-list-start)(print-interrupt)
-      (info) (tick) (info) (tick) (info)))
\ No newline at end of file
+      (info) (tick) (info) (tick) (info)))