1.1 --- a/clojure/com/aurellem/run/image.clj	Thu Jun 14 00:47:15 2012 -0500
     1.2 +++ b/clojure/com/aurellem/run/image.clj	Mon Jun 18 18:56:49 2012 -0500
     1.3 @@ -126,6 +126,23 @@
     1.4  (defn display-one-color
     1.5    "Displayes a single color onto the gameboy screen. input rgb in
     1.6     gameboy rgb."
     1.7 +<<<<<<< local
     1.8 +  [[r g b]]
     1.9 +  ;; construct a kernel that displays a single color
    1.10 +  (let
    1.11 +      [palettes (repeat 8 [r g b])
    1.12 +       kernel-address 0xC000
    1.13 +       kernel
    1.14 +       [0xF3 ;; disable interrupts
    1.15 +        (clear-music-registers)
    1.16 +        (frame-metronome)
    1.17 +        (set-palettes obj-palette-select obj-palette-data palettes)
    1.18 +        (set-palettes bg-palette-select bg-palette-data palettes)
    1.19 +        (infinite-loop)]]
    1.20 +    (-> (set-memory-range (second (music-base))
    1.21 +                          kernel-address (flatten kernel))
    1.22 +        (PC! kernel-address))))
    1.23 +=======
    1.24    ([state [r g b]]
    1.25       ;; construct a kernel that displays a single color
    1.26       (let
    1.27 @@ -325,6 +342,7 @@
    1.28     (sort-by (comp - count) objs)))
    1.29  
    1.30  (defn absorb-combine-4 [objs]
    1.31 +
    1.32    
    1.33  
    1.34    )