diff clojure/com/aurellem/gb/types.clj @ 294:9f466a332448

merge
author Robert McIntyre <rlm@mit.edu>
date Fri, 30 Mar 2012 18:15:28 -0500
parents c31cb3043087
children
line wrap: on
line diff
     1.1 --- a/clojure/com/aurellem/gb/types.clj	Fri Mar 30 18:14:14 2012 -0500
     1.2 +++ b/clojure/com/aurellem/gb/types.clj	Fri Mar 30 18:15:28 2012 -0500
     1.3 @@ -6,7 +6,7 @@
     1.4    {0x00 :normal
     1.5     0x01 :fighting
     1.6     0x02 :flying
     1.7 -   0x03 :poision
     1.8 +   0x03 :poison
     1.9     0x04 :ground
    1.10     0x05 :rock
    1.11     0x07 :bug