# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1332495564 18000
# Node ID 45f1376b578c34e5a247e7e36c0094fdf1899ccb
# Parent  32ac21c9a30d9bd192dd287f3f15c1b34ba230bb
saving progress

diff -r 32ac21c9a30d -r 45f1376b578c clojure/com/aurellem/gb/pokemon.clj
--- a/clojure/com/aurellem/gb/pokemon.clj	Fri Mar 23 04:36:16 2012 -0500
+++ b/clojure/com/aurellem/gb/pokemon.clj	Fri Mar 23 04:39:24 2012 -0500
@@ -366,11 +366,11 @@
    :status :normal
    :experience
    {:main-exp 500
-    :attack-exp 0xFF
-    :defense-exp 0xFF
-    :speed-exp 0xFF
-    :special-exp 0xFF
-    :hp-exp 0xFF}
+    :attack-exp 0xFFFF
+    :defense-exp 0xFFFF
+    :speed-exp 0xFFFF
+    :special-exp 0xFFFF
+    :hp-exp 0xFFFF}
 
    :stats
    ;; TODO recalculate these from a real ditto
@@ -381,9 +381,7 @@
     :defense 50
     :speed 50
     :special 50}
-    
-   
-  :moves [[:transform {:pp-up 3 :pp 5}]]})
+   :moves [[:transform {:pp-up 3 :pp 5}]]})
 
 (defn expand-pokemon
   "Given a map describing a pokemon, fill in any missing
@@ -420,7 +418,7 @@
                       [move {:pp (max-pp move) :pp-up 0}]
                       (vector? move)
                       [(first move)
-                       (merge {:pp (max-pp (first move))
+                       (merge {:pp (max-pp (first move) 0)
                                :pp-up 0} (second move))]))))))
       ;; The game stores the pokemon's type redundantly
       ;; along with the species.  If it's not specified
@@ -429,9 +427,5 @@
          (if (nil? (:type pokemon))
            (assoc pokemon :type
                   (pokemon->type (:species pokemon)))
-           pokemon)))
-             
-      
-      
-      ))
-      
\ No newline at end of file
+           pokemon)))))
+