1.1 --- a/clojure/com/aurellem/gb/pokemon_presets.clj	Sat Mar 24 20:06:25 2012 -0500
     1.2 +++ b/clojure/com/aurellem/gb/pokemon_presets.clj	Sat Mar 24 23:38:21 2012 -0500
     1.3 @@ -1,18 +1,41 @@
     1.4  (ns com.aurellem.gb.pokemon-presets)
     1.5  
     1.6  
     1.7 -(def HM-mew
     1.8 +(def base-mew
     1.9    {:species :mew
    1.10     :ID 5195
    1.11     :original-trainer "RLM"
    1.12 +
    1.13 +   :dv
    1.14 +   {:hp 15
    1.15 +    :attack 15
    1.16 +    :defense 15
    1.17 +    :speed 15
    1.18 +    :special 15}
    1.19 +      
    1.20     :experience
    1.21 -   {:main-exp 200
    1.22 +   {:main-exp 20
    1.23      :hp-exp 0xFFFF
    1.24      :attack-exp 0xFFFF
    1.25      :defense-exp 0xFFFF
    1.26      :speed-exp 0xFFFF
    1.27      :special-exp 0xFFFF}
    1.28 -   :moves [:fly :surf :cut :strength]})
    1.29 +
    1.30 +   :stats
    1.31 +   {:level 2
    1.32 +    :current-hp 17
    1.33 +    :hp 17
    1.34 +    :attack 10
    1.35 +    :defense 10
    1.36 +    :speed 10
    1.37 +    :special 10}
    1.38 +   
    1.39 +   :moves [:pound]})
    1.40 +   
    1.41 +(def HM-mew
    1.42 +  (merge
    1.43 +   base-mew
    1.44 +   {:moves [:fly :flash :cut :strength]}))
    1.45  
    1.46  (def ideal-pikachu
    1.47    {:species :pikachu
    1.48 @@ -44,3 +67,18 @@
    1.49      :special 8}
    1.50  
    1.51     :moves [:thundershock :growl :surf]})
    1.52 +
    1.53 +
    1.54 +(def young-jigglypuff
    1.55 +  {:name "JIGGLYPUFF", :species :jigglypuff, :species2 :jigglypuff,
    1.56 +   :status :normal,
    1.57 +   :moves [[:sing {:pp-ups 0, :current-pp 4}]],
    1.58 +   :dv {:attack 15, :defense 15, :speed 15, :special 15, :hp 15},
    1.59 +   :experience
    1.60 +   {:main-exp 21, :hp-exp 0xFF, :attack-exp 0xFF,
    1.61 +    :defense-exp 0xFF, :speed-exp 0xFF, :special-exp 0xFF}, 
    1.62 +   :type [:normal],
    1.63 +   :original-trainer "RLM",
    1.64 +   :stats {:level 3, :current-hp 5, :hp 20, :attack 8, :defense 6,
    1.65 +           :speed 6, :special 7}, 
    1.66 +   :ID 5195})