# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1340418108 18000
# Node ID f68d600b089c34728ef62bfdd7393e3a26e27233
# Parent  a00981db92dad1f008e0f1f2f92aeded0949c35d
colors now work properly.

diff -r a00981db92da -r f68d600b089c clojure/com/aurellem/run/image.clj
--- a/clojure/com/aurellem/run/image.clj	Fri Jun 22 21:03:04 2012 -0500
+++ b/clojure/com/aurellem/run/image.clj	Fri Jun 22 21:21:48 2012 -0500
@@ -233,7 +233,8 @@
                      
                       (seq (set (vals gb-color-map)))))))))
         ;;view (cortex.sense/view-image)
-        target (File. user-home "proj/vba-clojure/gb-color-map-unique.png")]
+        target
+        (File. user-home "proj/vba-clojure/gb-color-map-unique.png")]
     (dorun (for [x (range 68) y (range 69)]
              (let [[r g b] (get pix (+ x (* 68 y)) [0 0 0])
                    rgb (+ (bit-shift-left r 16)
@@ -288,6 +289,11 @@
   (ImageIO/read
    (File. user-home "/proj/vba-clojure/images/test-gb-image-2.png")))
 
+(def test-image-color
+  (ImageIO/read
+   (File. user-home "/proj/vba-clojure/images/colors-test.png")))
+
+
 
 
 (defn rgb->triplet [rgb]
@@ -601,7 +607,8 @@
             (+ base-address (count A))
             character-data-address
             (flatten
-             (map gb-tile->bytes (:tiles gb-image))))]
+             (map gb-tile->bytes (:tiles gb-image))))
+           (select-LCD-bank 1)]
         B (flatten B)
 
         
@@ -609,17 +616,18 @@
            (write-image
             (+ base-address (+ (count A) (count B)))
             BG-1-address
-            (map first (:data gb-image)))]
+            (map second (:data gb-image)))
+           (select-LCD-bank 0)]
 
         C (flatten C)
 
         D [;; [ ] specifiy pallets for each character
-           (select-LCD-bank 1)
-           ;;(write-image
-           ;; (+ base-address (+ (count A) (count B) (count C)))
-           ;; BG-1-address
-           ;;(map second (:data gb-image)))
 
+           (write-image
+            (+ base-address (+ (count A) (count B) (count C)))
+            BG-1-address
+            (map first (:data gb-image)))
+           
 
            ;; [X] reactivate the LCD display
            ;; we're using only BG images, located at
diff -r a00981db92da -r f68d600b089c images/colors-test.png
Binary file images/colors-test.png has changed
diff -r a00981db92da -r f68d600b089c images/colors-test.xcf
Binary file images/colors-test.xcf has changed
diff -r a00981db92da -r f68d600b089c images/test-gb-image-2.png
Binary file images/test-gb-image-2.png has changed