1.1 --- a/clojure/com/aurellem/gb/pokemon.clj	Fri Mar 23 04:36:16 2012 -0500
     1.2 +++ b/clojure/com/aurellem/gb/pokemon.clj	Fri Mar 23 04:39:24 2012 -0500
     1.3 @@ -366,11 +366,11 @@
     1.4     :status :normal
     1.5     :experience
     1.6     {:main-exp 500
     1.7 -    :attack-exp 0xFF
     1.8 -    :defense-exp 0xFF
     1.9 -    :speed-exp 0xFF
    1.10 -    :special-exp 0xFF
    1.11 -    :hp-exp 0xFF}
    1.12 +    :attack-exp 0xFFFF
    1.13 +    :defense-exp 0xFFFF
    1.14 +    :speed-exp 0xFFFF
    1.15 +    :special-exp 0xFFFF
    1.16 +    :hp-exp 0xFFFF}
    1.17  
    1.18     :stats
    1.19     ;; TODO recalculate these from a real ditto
    1.20 @@ -381,9 +381,7 @@
    1.21      :defense 50
    1.22      :speed 50
    1.23      :special 50}
    1.24 -    
    1.25 -   
    1.26 -  :moves [[:transform {:pp-up 3 :pp 5}]]})
    1.27 +   :moves [[:transform {:pp-up 3 :pp 5}]]})
    1.28  
    1.29  (defn expand-pokemon
    1.30    "Given a map describing a pokemon, fill in any missing
    1.31 @@ -420,7 +418,7 @@
    1.32                        [move {:pp (max-pp move) :pp-up 0}]
    1.33                        (vector? move)
    1.34                        [(first move)
    1.35 -                       (merge {:pp (max-pp (first move))
    1.36 +                       (merge {:pp (max-pp (first move) 0)
    1.37                                 :pp-up 0} (second move))]))))))
    1.38        ;; The game stores the pokemon's type redundantly
    1.39        ;; along with the species.  If it's not specified
    1.40 @@ -429,9 +427,5 @@
    1.41           (if (nil? (:type pokemon))
    1.42             (assoc pokemon :type
    1.43                    (pokemon->type (:species pokemon)))
    1.44 -           pokemon)))
    1.45 -             
    1.46 -      
    1.47 -      
    1.48 -      ))
    1.49 -      
    1.50 \ No newline at end of file
    1.51 +           pokemon)))))
    1.52 +