Mercurial > vba-clojure

diff clojure/com/aurellem/gb/moves.clj @ 192:fd549c8f42ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed compilation problems, added more functionality to pokemon-info
author Robert McIntyre <rlm@mit.edu>
date Thu, 22 Mar 2012 22:35:57 -0500
parents 893c753f8088
children 659764a2ea40
line wrap: on
line diff
     1.1 --- a/clojure/com/aurellem/gb/moves.clj	Thu Mar 22 20:10:09 2012 -0500
     1.2 +++ b/clojure/com/aurellem/gb/moves.clj	Thu Mar 22 22:35:57 2012 -0500
     1.3 @@ -191,7 +191,7 @@
     1.4           (map
     1.5            move-code->move-name
     1.6            (subvec (vec (memory state))
     1.7 -                  start (+ start (num-moves state poke-num))))))))
     1.8 +                  start (+ start 4)))))))
     1.9    ([poke-num]
    1.10       (read-moves @current-state poke-num)))
    1.11               
    1.12 @@ -240,7 +240,7 @@
    1.13             (bit-and
    1.14              pp-raw
    1.15              (Integer/parseInt "00111111" 2))]
    1.16 -       [pp-up current-pp]))
    1.17 +       {:pp-ups pp-up :current-pp current-pp}))
    1.18    ([pokemon-num move-num]
    1.19       (read-pp @current-state pokemon-num move-num)))
    1.20