# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1332612915 18000
# Node ID edce489c3c21643f2d2b2a666b32e19743c9f878
# Parent  d5dddf33543c76774ea1d2859144efba424b5c52
fixed badge order, added HM-mew, mapped out some more memory

diff -r d5dddf33543c -r edce489c3c21 clojure/com/aurellem/exp/cartography
--- a/clojure/com/aurellem/exp/cartography	Sat Mar 24 05:45:06 2012 -0500
+++ b/clojure/com/aurellem/exp/cartography	Sat Mar 24 13:15:15 2012 -0500
@@ -509,8 +509,8 @@
 D35E                   
 D35F                   
 D360                   
-D361                   
-D362                   
+D361                   Player Offset X
+D362                   Player Offset Y
 D363                   
 D364                   
 D365                   
diff -r d5dddf33543c -r edce489c3c21 clojure/com/aurellem/exp/play.clj
--- a/clojure/com/aurellem/exp/play.clj	Sat Mar 24 05:45:06 2012 -0500
+++ b/clojure/com/aurellem/exp/play.clj	Sat Mar 24 13:15:15 2012 -0500
@@ -5,7 +5,9 @@
                          items pokemon status types
                          characters species moves
                          pokedex money rival-name
-                         text-speed))
+                         text-speed badges
+                         pokemon-presets
+                         ))
   
   (:import java.io.File)
   (:import [com.aurellem.gb.gb_driver SaveState]))
diff -r d5dddf33543c -r edce489c3c21 clojure/com/aurellem/gb/badges.clj
--- a/clojure/com/aurellem/gb/badges.clj	Sat Mar 24 05:45:06 2012 -0500
+++ b/clojure/com/aurellem/gb/badges.clj	Sat Mar 24 13:15:15 2012 -0500
@@ -1,10 +1,10 @@
 (ns com.aurellem.gb.badges
   (:use (com.aurellem.gb gb-driver util constants))
-  (:use (com.aurellem.world practice))
   (:import [com.aurellem.gb.gb_driver SaveState]))
 
-(def badges '(:boulder :cascade :thunder :marsh :rainbow :soul :volcano
-     :earth))
+(def badges
+  '(:boulder :cascade :thunder :rainbow
+             :soul :marsh :volcano :earth))
 
 (defn get-badges
   "Returns a list of the current badges held by the player."
@@ -12,16 +12,16 @@
     ((fn this [coll n]
       (cond (zero? n) '()
             (zero? (rem n 2)) (recur (pop coll) (int (/ n 2)))
-            :else (cons (peek coll) (this (pop coll) (int (/ n
-                                                             2))))))
+            :else (cons
+                   (peek coll)
+                   (this (pop coll) (int (/ n 2))))))
      badges
-     (aget (memory state) 0xD355)
-     ))
+     (aget (memory state) 0xD355)))
   ([] (get-badges @current-state)))
 
 (defn set-badges
-  "Sets the badges held by the player. badge-list may contain :boulder
-:cascade :thunder :marsh :rainbow :soul :volcano."
+  "Sets the badges held by the player. badge-list may contain
+   :boulder :cascade :thunder :marsh :rainbow :soul :volcano."
   ([state badge-list]
      (let [has-badge (set badge-list)]
        (->>
@@ -30,27 +30,13 @@
              (empty? coll) n
              (has-badge (peek coll)) (recur (inc(* 2 n)) (pop coll))
              :else (recur (* 2 n) (pop coll))))
-      
          0
          (vec badges))
         (set-memory state 0xD355))))
-     
-    
   ([badge-list] (set-badges @current-state badge-list)))
 
-
-  
-
-    
-
-  
-  ;; (let [mem (aget (memory state) 0xD354)]
-  ;;   ((fn this [coll n]
-  ;;     (cond (zero? n) '()
-  ;;           (zero? (rem n 2)) (recur (pop coll) (int (/ n 2)))
-  ;;           :else (cons (peek coll) (this (pop coll) (int (/ n
-  ;;                                                            2))))))
-  ;;    badges
-  ;;    (aget (memory state) 0xD354)
-  ;;    )))
-  
\ No newline at end of file
+(defn give-all-badges
+  ([^SaveState state]
+     (set-badges state badges))
+  ([] (give-all-badges @current-state)))
+    
\ No newline at end of file
diff -r d5dddf33543c -r edce489c3c21 clojure/com/aurellem/gb/pokemon_presets.clj
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clojure/com/aurellem/gb/pokemon_presets.clj	Sat Mar 24 13:15:15 2012 -0500
@@ -0,0 +1,16 @@
+(ns com.aurellem.gb.pokemon-presets)
+
+
+(def HM-mew
+  {:species :mew
+   :ID 5195
+   :original-trainer "RLM"
+   :experience
+   {:main-exp 200
+    :hp-exp 0xFFFF
+    :attack-exp 0xFFFF
+    :defense-exp 0xFFFF
+    :speed-exp 0xFFFF
+    :special-exp 0xFFFF}
+   :moves [:fly :surf :cut :strength]})
+   
\ No newline at end of file