# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1332205015 18000
# Node ID b12d2408fd9b47b8c946e85dbc273d91285917b9
# Parent  d125a294f9d8bde0816c8b194ed21109a8edf3cb
moved set-memory to proper position, added pokemon.clj

diff -r d125a294f9d8 -r b12d2408fd9b clojure/com/aurellem/gb_driver.clj
--- a/clojure/com/aurellem/gb_driver.clj	Mon Mar 19 19:45:32 2012 -0500
+++ b/clojure/com/aurellem/gb_driver.clj	Mon Mar 19 19:56:55 2012 -0500
@@ -249,7 +249,14 @@
 (gen-get-set-register HDMA5 26)
 (gen-get-set-register SVBK 27)
 (gen-get-set-register IE 28)
-                            
+
+(defn set-memory [state location value]
+  (set-state! state)
+  (let [mem (memory state)]
+    (aset mem location value)
+    (write-memory! mem)
+    (update-state)))
+
 ;;;;;;;;;;;;;;;
 
 (defmacro defn-memo
diff -r d125a294f9d8 -r b12d2408fd9b clojure/com/aurellem/item_bridge.clj
--- a/clojure/com/aurellem/item_bridge.clj	Mon Mar 19 19:45:32 2012 -0500
+++ b/clojure/com/aurellem/item_bridge.clj	Mon Mar 19 19:56:55 2012 -0500
@@ -18,13 +18,6 @@
         (range start end) (subvec (vec (memory state)) start end)))
   state)
 
-(defn set-memory [state location value]
-  (set-state! state)
-  (let [mem (memory state)]
-    (aset mem location value)
-    (write-memory! mem)
-    (update-state)))
-
 (defn almost-broken
   "if one more memory location is turned into 0x03, the game crashes."
   [n]
diff -r d125a294f9d8 -r b12d2408fd9b clojure/com/aurellem/pokemon.clj
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clojure/com/aurellem/pokemon.clj	Mon Mar 19 19:56:55 2012 -0500
@@ -0,0 +1,8 @@
+(ns com.aurellem.pokemon
+  (:use (com.aurellem gb-driver vbm
+                      title save-corruption items assembly))
+  (:import [com.aurellem.gb_driver SaveState]))
+
+
+
+