# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1333569343 18000
# Node ID 8484e6f6db2c0774d6e513c1cefe9b702e73eaf8
# Parent  a5cdb2f7630706db61653b88ff7a22864a85c272
saving progress before trip to Liberal.

diff -r a5cdb2f76307 -r 8484e6f6db2c clojure/com/aurellem/gb/gb_driver.clj
--- a/clojure/com/aurellem/gb/gb_driver.clj	Wed Apr 04 03:25:14 2012 -0500
+++ b/clojure/com/aurellem/gb/gb_driver.clj	Wed Apr 04 14:55:43 2012 -0500
@@ -142,7 +142,7 @@
   ([]
     (continue! @current-state)))
 
-(defn run-moves [moves state]
+(defn run-moves [state moves]
   (set-state! state)
   (dorun (map #(Gb/step (button-mask %))
               moves))
diff -r a5cdb2f76307 -r 8484e6f6db2c clojure/com/aurellem/gb/pokemon.clj
--- a/clojure/com/aurellem/gb/pokemon.clj	Wed Apr 04 03:25:14 2012 -0500
+++ b/clojure/com/aurellem/gb/pokemon.clj	Wed Apr 04 14:55:43 2012 -0500
@@ -1,7 +1,7 @@
 (ns com.aurellem.gb.pokemon
   (:use (com.aurellem.gb gb-driver util constants characters
                          moves types items status dv species
-                         experience stats
+                         experience stats pokemon-presets
                          ))
   (:import [com.aurellem.gb.gb_driver SaveState]))
 
@@ -356,32 +356,6 @@
   ([status]
      (give-status-all @current-state status)))
 
-
-(def pokemon-base
-  {:dv {:attack 15 :hp 15 :defense 15
-        :special 15 :speed 15}
-   :species :ditto
-   :original-trainer "RLM"
-   :ID 5195
-   :status :normal
-   :experience
-   {:main-exp 500
-    :attack-exp 0xFFFF
-    :defense-exp 0xFFFF
-    :speed-exp 0xFFFF
-    :special-exp 0xFFFF
-    :hp-exp 0xFFFF}
-
-   :stats
-   {:level 7
-    :current-hp 30
-    :hp 30
-    :attack 18
-    :defense 18
-    :speed 18
-    :special 18}
-   :moves [[:transform {:pp-ups 0 :current-pp 5}]]})
-
 (defn expand-pokemon
   "Given a map describing a pokemon, fill in any missing
    values based on the ones already present."
@@ -463,3 +437,16 @@
                           new-pokemon-data)))
   ([poke-num new-pokemon-data]
      (edit-pokemon @current-state poke-num new-pokemon-data)))
+
+(defn give-powerful-party
+  ([^SaveState state]
+     (-> state
+          (give-pokemon 0 tauros)
+          (give-pokemon 1 chansey)
+          (give-pokemon 2 alakazam)
+          (give-pokemon 3 golem)
+          (give-pokemon 4 exeggutor)
+          (give-pokemon 5 starmie)
+
+          ))
+  ([] (give-powerful-party @current-state)))
\ No newline at end of file
diff -r a5cdb2f76307 -r 8484e6f6db2c clojure/com/aurellem/gb/pokemon_presets.clj
--- a/clojure/com/aurellem/gb/pokemon_presets.clj	Wed Apr 04 03:25:14 2012 -0500
+++ b/clojure/com/aurellem/gb/pokemon_presets.clj	Wed Apr 04 14:55:43 2012 -0500
@@ -1,25 +1,19 @@
 (ns com.aurellem.gb.pokemon-presets)
 
-
-(def base-mew
-  {:species :mew
+(def pokemon-base
+  {:dv {:attack 15 :hp 15 :defense 15
+        :special 15 :speed 15}
+   :species :ditto
+   :original-trainer "RLM"
    :ID 5195
-   :original-trainer "RLM"
-
-   :dv
-   {:hp 15
-    :attack 15
-    :defense 15
-    :speed 15
-    :special 15}
-      
+   :status :normal
    :experience
-   {:main-exp 20
-    :hp-exp 0xFFFF
+   {:main-exp 500
     :attack-exp 0xFFFF
     :defense-exp 0xFFFF
     :speed-exp 0xFFFF
-    :special-exp 0xFFFF}
+    :special-exp 0xFFFF
+    :hp-exp 0xFFFF}
 
    :stats
    {:level 2
@@ -29,8 +23,14 @@
     :defense 10
     :speed 10
     :special 10}
-   
-   :moves [:pound]})
+      
+   :moves [[:transform {:pp-ups 0 :current-pp 5}]]})
+
+(def base-mew
+  (merge
+   pokemon-base
+   {:species :mew
+    :moves [:pound]}))
    
 (def HM-mew
   (merge
@@ -38,35 +38,10 @@
    {:moves [:fly :flash :cut :strength]}))
 
 (def ideal-pikachu
-  {:species :pikachu
-   :ID 5195
-   :original-trainer "RLM"
-
-   :dv
-   {:hp 15
-    :attack 15
-    :defense 15
-    :speed 15
-    :special 15}
-   
-   :experience
-   {:main-exp 20
-    :hp-exp 0xFFFF
-    :attack-exp 0xFFFF
-    :defense-exp 0xFFFF
-    :speed-exp 0xFFFF
-    :special-exp 0xFFFF}
-
-   :stats
-   {:level 2
-    :current-hp 15
-    :hp 15
-    :attack 9
-    :defense 8
-    :speed 10
-    :special 8}
-
-   :moves [:thundershock :growl :surf]})
+  (merge
+   pokemon-base
+   {:species :pikachu
+    :moves [:thundershock :growl :surf]}))
 
 
 (def young-jigglypuff
@@ -82,3 +57,64 @@
    :stats {:level 3, :current-hp 5, :hp 20, :attack 8, :defense 6,
            :speed 6, :special 7}, 
    :ID 5195})
+
+(def tauros
+  (merge
+   pokemon-base
+   {:species :tauros
+    :stats {:level 3, :current-hp 20, :hp 20,
+            :attack 13, :defense 13, :speed 14, :special 11}
+    :moves [:body-slam :hyper-beam
+            :earthquake :blizzard]}))
+
+(def chansey
+  (merge
+   pokemon-base
+   {:species :chansey
+    :stats {:level 3, :current-hp 30, :hp 30,
+            :attack 8, :defense 8, :speed 10, :special 14}
+    :moves [:ice-beam :thunderbolt
+            :softboiled :thunder-wave]}))
+
+(def starmie
+  (merge
+   pokemon-base
+   {:species :starmie
+    :stats {:level 3, :current-hp 19, :hp 19,
+            :attack 12, :defense 12, :speed 14, :special 13}
+    :moves [:thunderbolt :blizzard
+            :thunder-wave :recover]}))
+
+(def golem
+  (merge
+   pokemon-base
+   {:species :golem
+    :stats {:level 3, :current-hp 20, :hp 20,
+            :attack 14, :defense 15, :speed 10, :special 11}
+    :moves [:earthquake :body-slam
+            :rock-slide :explosion]}))
+
+(def exeggutor
+  (merge
+   pokemon-base
+   {:species :exeggutor
+    :stats {:level 3, :current-hp 21, :hp 21,
+            :attack 13, :defense 12, :speed 11, :special 15}
+    :moves [:psychic :sleep-powder
+            :mega-drain :explosion]}))
+
+(def alakazam
+  (merge
+   pokemon-base
+   {:species :alakazam
+    :stats {:level 3, :current-hp 19, :hp 19,
+            :attack 10, :defense 10, :speed 14, :special 15}
+    :moves [:psychic :thunder-wave
+            :recover :seismic-toss]}))
+            
+(def zapdos
+  (merge
+   pokemon-base
+   {:species :zapdos
+    :moves [:thunderbolt :drill-peck
+            :thunder-wave :agility]}))
\ No newline at end of file
diff -r a5cdb2f76307 -r 8484e6f6db2c save-states/good-team-cereulan.sav
Binary file save-states/good-team-cereulan.sav has changed