1.1 --- a/clojure/com/aurellem/gb/pokemon.clj	Fri Mar 23 05:58:41 2012 -0500
     1.2 +++ b/clojure/com/aurellem/gb/pokemon.clj	Fri Mar 23 18:06:37 2012 -0500
     1.3 @@ -447,6 +447,56 @@
     1.4             (give-moves-pps poke-num (:moves pokemon*))
     1.5             (give-status poke-num (:status pokemon*))
     1.6             (give-stats  poke-num (:stats  pokemon*))
     1.7 -           (give-experience poke-num (:experience pokemon*)))))
     1.8 +           (give-experience poke-num (:experience pokemon*))
     1.9 +
    1.10 +           ;; this was 11 dec
    1.11 +           (set-memory (+ 0xD16D
    1.12 +                          (* pokemon-record-width poke-num))
    1.13 +                          0x00))))
    1.14    ([poke-num pokemon]
    1.15 -     (give-pokemon @current-state poke-num pokemon)))
    1.16 \ No newline at end of file
    1.17 +     (give-pokemon @current-state poke-num pokemon)))
    1.18 +
    1.19 +(defn edit-pokemon
    1.20 +  ([^SaveState state poke-num new-pokemon-data]
    1.21 +     (give-pokemon state poke-num
    1.22 +                   (merge (pokemon state poke-num)
    1.23 +                          new-pokemon-data)))
    1.24 +  ([poke-num new-pokemon-data]
    1.25 +     (edit-pokemon @current-state poke-num new-pokemon-data)))
    1.26 +
    1.27 +
    1.28 +
    1.29 +(def jiggly-lvl-3 (read-state "jiggly-lvl-3"))
    1.30 +
    1.31 +(def jiggly-4-pp (read-state "jiggly-4-pp"))
    1.32 +
    1.33 +(def jiggly-3-pp (read-state "jiggly-3-pp"))
    1.34 +
    1.35 +(def jiggly-2-pp (read-state "jiggly-2-pp"))
    1.36 +
    1.37 +(def jiggly-1-pp (read-state "jiggly-1-pp"))
    1.38 +
    1.39 +(def jiggly-0-pp (read-state "jiggly-0-pp"))
    1.40 +
    1.41 +(def jiggly-struggle-once (read-state "jiggly-struggle-once"))
    1.42 +
    1.43 +
    1.44 +(def poke-syn-jiggly-4-pp
    1.45 +  {:name "JIGGLYPUFF", :species :jigglypuff, :species2 :jigglypuff,
    1.46 +   :status :normal,
    1.47 +   :moves [[:sing {:pp-ups 0, :current-pp 4}]],
    1.48 +   :dv {:attack 8, :defense 7, :speed 4, :special 12, :hp 4},
    1.49 +   :experience {:main-exp 21, :hp-exp 0, :attack-exp 0, :defense-exp
    1.50 +                0, :speed-exp 0, :special-exp 0}, 
    1.51 +   :type [:normal],
    1.52 +   :original-trainer "RLM",
    1.53 +   :stats {:level 3, :current-hp 5, :hp 20, :attack 8, :defense 6,
    1.54 +           :speed 6, :special 7}, 
    1.55 +   :ID 5195})
    1.56 +  
    1.57 +
    1.58 +(def syn-jiggly-4-pp (read-state "syn-jiggly-4-pp"))
    1.59 +(def syn-jiggly-3-pp (read-state "syn-jiggly-3-pp"))
    1.60 +(def syn-jiggly-2-pp (read-state "syn-jiggly-2-pp"))
    1.61 +(def syn-jiggly-1-pp (read-state "syn-jiggly-1-pp"))
    1.62 +(def syn-jiggly-0-pp (read-state "syn-jiggly-0-pp")) 
    1.63 \ No newline at end of file