1.1 --- a/clojure/com/aurellem/gb/species.clj	Fri Mar 23 04:00:42 2012 -0500
     1.2 +++ b/clojure/com/aurellem/gb/species.clj	Fri Mar 23 04:19:38 2012 -0500
     1.3 @@ -73,7 +73,7 @@
     1.4     0x52  :vulpix
     1.5     0x53  :ninetails
     1.6     0x54  :pikachu
     1.7 -   0x55  :riachu
     1.8 +   0x55  :raichu
     1.9     0x58  :dratini
    1.10     0x59  :dragonair
    1.11     0x5A  :kabuto

     2.1 --- a/clojure/com/aurellem/gb/types.clj	Fri Mar 23 04:00:42 2012 -0500
     2.2 +++ b/clojure/com/aurellem/gb/types.clj	Fri Mar 23 04:19:38 2012 -0500
     2.3 @@ -17,7 +17,7 @@
     2.4     0x17 :electric
     2.5     0x18 :psychic
     2.6     0x19 :ice
     2.7 -   0x1A :dragon})
     2.8 +   0x1A :dragon    })
     2.9  
    2.10  (def type-name->type-code
    2.11    (zipmap (vals type-code->type-name)
    2.12 @@ -57,155 +57,175 @@
    2.13       (read-type @current-state poke-num)))
    2.14  
    2.15  
    2.16 +
    2.17 +:normal   nor
    2.18 +:fighting fig
    2.19 +:flying   fly
    2.20 +:poision  poi
    2.21 +:ground   gro
    2.22 +:rock     roc
    2.23 +:bug      bug
    2.24 +:ghost    gho
    2.25 +:fire     fir
    2.26 +:water    wat
    2.27 +:grass    gra
    2.28 +:electric ele
    2.29 +:psychic  psy
    2.30 +:ice      ice
    2.31 +:dragon   dra
    2.32 +
    2.33 +
    2.34 +
    2.35  (def pokemon->type
    2.36 -  {:rhydon          
    2.37 -   :kangaskhan      
    2.38 -   :nidoran-male    
    2.39 -   :clefairy        
    2.40 -   :spearow         
    2.41 -   :voltorb         
    2.42 -   :nidoking        
    2.43 -   :slowbro         
    2.44 -   :ivysaur         
    2.45 -   :exeggutor       
    2.46 -   :lickitung       
    2.47 -   :exeggcute       
    2.48 -   :grimer          
    2.49 -   :gengar          
    2.50 -   :nidoran-female  
    2.51 -   :nidoqueen       
    2.52 -   :cubone          
    2.53 -   :rhyhorn         
    2.54 -   :lapras          
    2.55 -   :arcanine        
    2.56 -   :mew             
    2.57 -   :gyarados        
    2.58 -   :shellder        
    2.59 -   :tentacool       
    2.60 -   :gastly          
    2.61 -   :scyther         
    2.62 -   :staryu          
    2.63 -   :blastoise       
    2.64 -   :pinsir          
    2.65 -   :tangela         
    2.66 -   :growlithe       
    2.67 -   :onix            
    2.68 -   :fearow          
    2.69 -   :pidgey          
    2.70 -   :slowpoke        
    2.71 -   :kadabra         
    2.72 -   :graveler        
    2.73 -   :chansey         
    2.74 -   :machoke         
    2.75 -   :mr-mime         
    2.76 -   :hitmonlee       
    2.77 -   :hitmonchan      
    2.78 -   :arbok           
    2.79 -   :parasect        
    2.80 -   :psyduck         
    2.81 -   :drowzee         
    2.82 -   :golem           
    2.83 -   :magmar          
    2.84 -   :electabuzz      
    2.85 -   :magneton        
    2.86 -   :koffing         
    2.87 -   :mankey          
    2.88 -   :seel            
    2.89 -   :diglett         
    2.90 -   :tauros          
    2.91 -   :farfetch'd      
    2.92 -   :venonat         
    2.93 -   :dragonite       
    2.94 -   :doduo           
    2.95 -   :poliwag         
    2.96 -   :jynx            
    2.97 -   :moltres         
    2.98 -   :articuno        
    2.99 -   :zapdos          
   2.100 -   :ditto           
   2.101 -   :meowth          
   2.102 -   :krabby          
   2.103 -   :vulpix          
   2.104 -   :ninetails       
   2.105 -   :pikachu         
   2.106 -   :riachu          
   2.107 -   :dratini         
   2.108 -   :dragonair       
   2.109 -   :kabuto          
   2.110 -   :kabutops        
   2.111 -   :horsea          
   2.112 -   :sedra           
   2.113 -   :sandshrew       
   2.114 -   :sandslash       
   2.115 -   :omanyte         
   2.116 -   :omastar         
   2.117 -   :jigglypuff      
   2.118 -   :wigglytuff      
   2.119 -   :eevee           
   2.120 -   :flareon         
   2.121 -   :jolteon         
   2.122 -   :vaporeon        
   2.123 -   :machop          
   2.124 -   :zubat           
   2.125 -   :ekans           
   2.126 -   :paras           
   2.127 -   :poliwhirl       
   2.128 -   :poliwrath       
   2.129 -   :weedle          
   2.130 -   :kakuna          
   2.131 -   :beedrill        
   2.132 -   :dodrio          
   2.133 -   :primeape        
   2.134 -   :dugtrio         
   2.135 -   :venomoth        
   2.136 -   :dewgong         
   2.137 -   :caterpie        
   2.138 -   :metapod         
   2.139 -   :butterfree      
   2.140 -   :machamp         
   2.141 -   :golduck         
   2.142 -   :hypno           
   2.143 -   :golbat          
   2.144 -   :mewtwo          
   2.145 -   :snorlax         
   2.146 -   :magikarp        
   2.147 -   :muk             
   2.148 -   :kingler         
   2.149 -   :cloyster        
   2.150 -   :electrode       
   2.151 -   :clefable        
   2.152 -   :wheezing        
   2.153 -   :persian         
   2.154 -   :marowak         
   2.155 -   :haunter         
   2.156 -   :abra            
   2.157 -   :alakazam        
   2.158 -   :pidgeotto       
   2.159 -   :pidgeot         
   2.160 -   :starmie         
   2.161 -   :bulbasaur       
   2.162 -   :venusaur        
   2.163 -   :tentacruel      
   2.164 -   :goldeen         
   2.165 -   :seaking         
   2.166 -   :ponyta          
   2.167 -   :rapidash        
   2.168 -   :rattata         
   2.169 -   :raticate        
   2.170 -   :nidorino        
   2.171 -   :nidorina        
   2.172 -   :geodude         
   2.173 -   :porygon         
   2.174 -   :aerodactyl      
   2.175 -   :magnemite       
   2.176 -   :charmander      
   2.177 -   :squirtle        
   2.178 -   :charmeleon      
   2.179 -   :wartortle       
   2.180 -   :charizard       
   2.181 -   :oddish          
   2.182 -   :gloom           
   2.183 -   :vileplume       
   2.184 -   :bellsprout      
   2.185 -   :weepenbell      
   2.186 -   :victreebel      
   2.187 \ No newline at end of file
   2.188 +  {
   2.189 +   :abra            psy
   2.190 +   :aerodactyl      rck fly
   2.191 +   :alakazam        psy
   2.192 +   :arbok           poi
   2.193 +   :arcanine        fir
   2.194 +   :articuno        ice fly
   2.195 +   :beedrill        bug poi
   2.196 +   :bellsprout      gra poi
   2.197 +   :blastoise       wat
   2.198 +   :bulbasaur       gra poi
   2.199 +   :butterfree      bug fly
   2.200 +   :caterpie        bug
   2.201 +   :chansey         nor
   2.202 +   :charizard       fir fly
   2.203 +   :charmander      fir
   2.204 +   :charmeleon      fir
   2.205 +   :clefable        nor
   2.206 +   :clefairy        nor
   2.207 +   :cloyster        wat ice
   2.208 +   :cubone          gro
   2.209 +   :dewgong         wat ice
   2.210 +   :diglett         gro
   2.211 +   :ditto           nor
   2.212 +   :dodrio          nor fly
   2.213 +   :doduo           nor fly
   2.214 +   :dragonair       drg
   2.215 +   :dragonite       drg fly
   2.216 +   :dratini         drg
   2.217 +   :drowzee         psy
   2.218 +   :dugtrio         gro
   2.219 +   :eevee           nor
   2.220 +   :ekans           poi
   2.221 +   :electabuzz      ele
   2.222 +   :electrode       ele
   2.223 +   :exeggcute       gra psy
   2.224 +   :exeggutor       gra psy
   2.225 +   :farfetchd       nor fly
   2.226 +   :fearow          nor fly
   2.227 +   :flareon         fir
   2.228 +   :gastly          gho poi
   2.229 +   :gengar          gho poi
   2.230 +   :geodude         rck gro
   2.231 +   :gloom           gra poi
   2.232 +   :golbat          poi fly
   2.233 +   :goldeen         wat
   2.234 +   :golduck         wat
   2.235 +   :golem           rck gro
   2.236 +   :graveler        rck gro
   2.237 +   :grimer          poi
   2.238 +   :growlithe       fir
   2.239 +   :gyarados        wat fly
   2.240 +   :haunter         gho poi
   2.241 +   :hitmonchan      fgt
   2.242 +   :hitmonlee       fgt
   2.243 +   :horsea          wat
   2.244 +   :hypno           psy
   2.245 +   :ivysaur         gra poi
   2.246 +   :jigglypuff      nor
   2.247 +   :jolteon         ele
   2.248 +   :jynx            ice psy
   2.249 +   :kabuto          rck wat
   2.250 +   :kabutops        rck wat
   2.251 +   :kadabra         psy
   2.252 +   :kakuna          bug poi
   2.253 +   :kangaskhan      nor
   2.254 +   :kingler         wat
   2.255 +   :koffing         poi
   2.256 +   :krabby          wat
   2.257 +   :lapras          wat ice
   2.258 +   :lickitung       nor
   2.259 +   :machamp         fgt
   2.260 +   :machoke         fgt
   2.261 +   :machop          fgt
   2.262 +   :magikarp        wat
   2.263 +   :magmar          fir
   2.264 +   :magnemite       ele
   2.265 +   :magneton        ele
   2.266 +   :mankey          fgt
   2.267 +   :marowak         gro
   2.268 +   :meowth          nor
   2.269 +   :metapod         bug
   2.270 +   :mew             psy
   2.271 +   :mewtwo          psy
   2.272 +   :moltres         fir fly
   2.273 +   :mr-mime         psy
   2.274 +   :muk             poi
   2.275 +   :nidoking        poi gro
   2.276 +   :nidoqueen       poi gro
   2.277 +   :nidoran-female  poi
   2.278 +   :nidoran-male    poi
   2.279 +   :nidorina        poi
   2.280 +   :nidorino        poi
   2.281 +   :ninetails       fir
   2.282 +   :oddish          gra poi
   2.283 +   :omanyte         rck wat
   2.284 +   :omastar         rck wat
   2.285 +   :onix            rck gro
   2.286 +   :paras           bug gra
   2.287 +   :parasect        bug gra
   2.288 +   :persian         nor
   2.289 +   :pidgeot         nor fly
   2.290 +   :pidgeotto       nor fly
   2.291 +   :pidgey          nor fly
   2.292 +   :pikachu         ele
   2.293 +   :pinsir          bug
   2.294 +   :poliwag         wat
   2.295 +   :poliwhirl       wat
   2.296 +   :poliwrath       wat fgt
   2.297 +   :ponyta          fir
   2.298 +   :porygon         nor
   2.299 +   :primeape        fgt
   2.300 +   :psyduck         wat
   2.301 +   :raichu          ele
   2.302 +   :rapidash        fir
   2.303 +   :raticate        nor
   2.304 +   :rattata         nor
   2.305 +   :rhydon          gro rck
   2.306 +   :rhyhorn         gro rck
   2.307 +   :sandshrew       gro
   2.308 +   :sandslash       gro
   2.309 +   :scyther         bug fly
   2.310 +   :seaking         wat
   2.311 +   :sedra           wat
   2.312 +   :seel            wat
   2.313 +   :shellder        wat
   2.314 +   :slowbro         wat psy
   2.315 +   :slowpoke        wat psy
   2.316 +   :snorlax         nor
   2.317 +   :spearow         nor fly
   2.318 +   :squirtle        wat
   2.319 +   :starmie         wat psy
   2.320 +   :staryu          wat
   2.321 +   :tangela         gra
   2.322 +   :tauros          nor
   2.323 +   :tentacool       wat poi
   2.324 +   :tentacruel      wat poi
   2.325 +   :vaporeon        wat
   2.326 +   :venomoth        bug poi
   2.327 +   :venonat         bug poi
   2.328 +   :venusaur        gra poi
   2.329 +   :victreebel      gra poi
   2.330 +   :vileplume       gra poi
   2.331 +   :voltorb         ele
   2.332 +   :vulpix          fir
   2.333 +   :wartortle       wat
   2.334 +   :weedle          bug poi
   2.335 +   :weepenbell      gra poi
   2.336 +   :wheezing        poi
   2.337 +   :wigglytuff      nor
   2.338 +   :zapdos          ele fly
   2.339 +   :zubat           poi fly
   2.340 \ No newline at end of file