# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1332388965 18000
# Node ID d63886d63b2f28d37f428bb851c17346bb9414ac
# Parent  8d9e2804af9b99f7d5370835492438aa610e1c88
cleaned up code; added gb.saves

diff -r 8d9e2804af9b -r d63886d63b2f clojure/com/aurellem/exp/item_bridge.clj
--- a/clojure/com/aurellem/exp/item_bridge.clj	Wed Mar 21 22:17:06 2012 -0500
+++ b/clojure/com/aurellem/exp/item_bridge.clj	Wed Mar 21 23:02:45 2012 -0500
@@ -1,7 +1,7 @@
 (ns com.aurellem.exp.item-bridge
-  (:use (com.aurellem.gb util constants gb-driver vbm items assembly))
+  (:use (com.aurellem.gb saves util constants gb-driver vbm items assembly))
   (:use (com.aurellem.run title save-corruption))
-  (:use (com.aurellem.exp pokemon))
+  ;;(:use (com.aurellem.exp pokemon))
   (:import [com.aurellem.gb.gb_driver SaveState]))
 
 (defn corrupt-item-state []
@@ -56,7 +56,7 @@
   (loop [i 0
          pcs []]
     (if (= i ticks)
-      (set pcs)
+      (filter (partial < 0x2000)(sort (set pcs)))
       (do 
         (com.aurellem.gb.Gb/tick)
         (recur (inc i)
diff -r 8d9e2804af9b -r d63886d63b2f clojure/com/aurellem/exp/play.clj
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clojure/com/aurellem/exp/play.clj	Wed Mar 21 23:02:45 2012 -0500
@@ -0,0 +1,8 @@
+(ns com.aurellem.exp.play
+  "scratchpad namespace"
+  (:use (com.aurellem.gb gb-driver util constants
+                         assembly
+                         items pokemon status
+                         characters species moves))
+  (:import java.io.File)
+  (:import [com.aurellem.gb.gb_driver SaveState]))
diff -r 8d9e2804af9b -r d63886d63b2f clojure/com/aurellem/gb/pokemon.clj
--- a/clojure/com/aurellem/gb/pokemon.clj	Wed Mar 21 22:17:06 2012 -0500
+++ b/clojure/com/aurellem/gb/pokemon.clj	Wed Mar 21 23:02:45 2012 -0500
@@ -4,8 +4,11 @@
 
 (def pokemon-names-start 0xD2B4)
 
-(defn change-party-number [^SaveState state new-num]
-  (set-memory state 0xD162 new-num))
+(defn set-party-number
+  ([^SaveState state new-party-num]
+     (set-memory state 0xD162 new-party-num))
+  ([new-party-num]
+     (set-party-number @current-state new-party-num)))
 
 (def party-number-address 0xD162)
 
diff -r 8d9e2804af9b -r d63886d63b2f clojure/com/aurellem/gb/saves.clj
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clojure/com/aurellem/gb/saves.clj	Wed Mar 21 23:02:45 2012 -0500
@@ -0,0 +1,8 @@
+(ns com.aurellem.gb.saves
+  (:use (com.aurellem.gb gb-driver))
+  (:import [com.aurellem.gb.gb_driver SaveState]))
+
+(defn pre-wild-battle [] (read-state "prepare-for-battle"))
+
+(defn pre-trainer-battle []
+  (read-state "pre-trainer-battle"))
\ No newline at end of file
diff -r 8d9e2804af9b -r d63886d63b2f clojure/com/aurellem/gb/status.clj
--- a/clojure/com/aurellem/gb/status.clj	Wed Mar 21 22:17:06 2012 -0500
+++ b/clojure/com/aurellem/gb/status.clj	Wed Mar 21 23:02:45 2012 -0500
@@ -1,5 +1,5 @@
 (ns com.aurellem.gb.status
-  (:use (com.aurellem.gb gb-driver util constants))
+  (:use (com.aurellem.gb gb-driver util constants pokemon))
   (:import [com.aurellem.gb.gb_driver SaveState]))
 
 (def status-name->status-code
@@ -19,7 +19,6 @@
   (zipmap (vals status-name->status-code)
           (keys status-name->status-code)))
 
-
 (def pokemon-1-status-address 0xD16E)
 
 (defn pokemon-status-address [poke-num]
diff -r 8d9e2804af9b -r d63886d63b2f save-states/pre-trainer-battle.sav
Binary file save-states/pre-trainer-battle.sav has changed