# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1340063809 18000
# Node ID 81e43f0350dbcddea99b51722659487d969b6d85
# Parent  4703b74f1fb1a8840758455f1cc87cd6fbf49452
resolved conflict.

diff -r 4703b74f1fb1 -r 81e43f0350db clojure/com/aurellem/run/image.clj
--- a/clojure/com/aurellem/run/image.clj	Thu Jun 14 00:47:15 2012 -0500
+++ b/clojure/com/aurellem/run/image.clj	Mon Jun 18 18:56:49 2012 -0500
@@ -126,6 +126,23 @@
 (defn display-one-color
   "Displayes a single color onto the gameboy screen. input rgb in
    gameboy rgb."
+<<<<<<< local
+  [[r g b]]
+  ;; construct a kernel that displays a single color
+  (let
+      [palettes (repeat 8 [r g b])
+       kernel-address 0xC000
+       kernel
+       [0xF3 ;; disable interrupts
+        (clear-music-registers)
+        (frame-metronome)
+        (set-palettes obj-palette-select obj-palette-data palettes)
+        (set-palettes bg-palette-select bg-palette-data palettes)
+        (infinite-loop)]]
+    (-> (set-memory-range (second (music-base))
+                          kernel-address (flatten kernel))
+        (PC! kernel-address))))
+=======
   ([state [r g b]]
      ;; construct a kernel that displays a single color
      (let
@@ -325,6 +342,7 @@
    (sort-by (comp - count) objs)))
 
 (defn absorb-combine-4 [objs]
+
   
 
   )