1.1 --- a/clojure/com/aurellem/gb/types.clj	Fri Mar 23 04:00:42 2012 -0500
     1.2 +++ b/clojure/com/aurellem/gb/types.clj	Fri Mar 23 04:19:38 2012 -0500
     1.3 @@ -17,7 +17,7 @@
     1.4     0x17 :electric
     1.5     0x18 :psychic
     1.6     0x19 :ice
     1.7 -   0x1A :dragon})
     1.8 +   0x1A :dragon    })
     1.9  
    1.10  (def type-name->type-code
    1.11    (zipmap (vals type-code->type-name)
    1.12 @@ -57,155 +57,175 @@
    1.13       (read-type @current-state poke-num)))
    1.14  
    1.15  
    1.16 +
    1.17 +:normal   nor
    1.18 +:fighting fig
    1.19 +:flying   fly
    1.20 +:poision  poi
    1.21 +:ground   gro
    1.22 +:rock     roc
    1.23 +:bug      bug
    1.24 +:ghost    gho
    1.25 +:fire     fir
    1.26 +:water    wat
    1.27 +:grass    gra
    1.28 +:electric ele
    1.29 +:psychic  psy
    1.30 +:ice      ice
    1.31 +:dragon   dra
    1.32 +
    1.33 +
    1.34 +
    1.35  (def pokemon->type
    1.36 -  {:rhydon          
    1.37 -   :kangaskhan      
    1.38 -   :nidoran-male    
    1.39 -   :clefairy        
    1.40 -   :spearow         
    1.41 -   :voltorb         
    1.42 -   :nidoking        
    1.43 -   :slowbro         
    1.44 -   :ivysaur         
    1.45 -   :exeggutor       
    1.46 -   :lickitung       
    1.47 -   :exeggcute       
    1.48 -   :grimer          
    1.49 -   :gengar          
    1.50 -   :nidoran-female  
    1.51 -   :nidoqueen       
    1.52 -   :cubone          
    1.53 -   :rhyhorn         
    1.54 -   :lapras          
    1.55 -   :arcanine        
    1.56 -   :mew             
    1.57 -   :gyarados        
    1.58 -   :shellder        
    1.59 -   :tentacool       
    1.60 -   :gastly          
    1.61 -   :scyther         
    1.62 -   :staryu          
    1.63 -   :blastoise       
    1.64 -   :pinsir          
    1.65 -   :tangela         
    1.66 -   :growlithe       
    1.67 -   :onix            
    1.68 -   :fearow          
    1.69 -   :pidgey          
    1.70 -   :slowpoke        
    1.71 -   :kadabra         
    1.72 -   :graveler        
    1.73 -   :chansey         
    1.74 -   :machoke         
    1.75 -   :mr-mime         
    1.76 -   :hitmonlee       
    1.77 -   :hitmonchan      
    1.78 -   :arbok           
    1.79 -   :parasect        
    1.80 -   :psyduck         
    1.81 -   :drowzee         
    1.82 -   :golem           
    1.83 -   :magmar          
    1.84 -   :electabuzz      
    1.85 -   :magneton        
    1.86 -   :koffing         
    1.87 -   :mankey          
    1.88 -   :seel            
    1.89 -   :diglett         
    1.90 -   :tauros          
    1.91 -   :farfetch'd      
    1.92 -   :venonat         
    1.93 -   :dragonite       
    1.94 -   :doduo           
    1.95 -   :poliwag         
    1.96 -   :jynx            
    1.97 -   :moltres         
    1.98 -   :articuno        
    1.99 -   :zapdos          
   1.100 -   :ditto           
   1.101 -   :meowth          
   1.102 -   :krabby          
   1.103 -   :vulpix          
   1.104 -   :ninetails       
   1.105 -   :pikachu         
   1.106 -   :riachu          
   1.107 -   :dratini         
   1.108 -   :dragonair       
   1.109 -   :kabuto          
   1.110 -   :kabutops        
   1.111 -   :horsea          
   1.112 -   :sedra           
   1.113 -   :sandshrew       
   1.114 -   :sandslash       
   1.115 -   :omanyte         
   1.116 -   :omastar         
   1.117 -   :jigglypuff      
   1.118 -   :wigglytuff      
   1.119 -   :eevee           
   1.120 -   :flareon         
   1.121 -   :jolteon         
   1.122 -   :vaporeon        
   1.123 -   :machop          
   1.124 -   :zubat           
   1.125 -   :ekans           
   1.126 -   :paras           
   1.127 -   :poliwhirl       
   1.128 -   :poliwrath       
   1.129 -   :weedle          
   1.130 -   :kakuna          
   1.131 -   :beedrill        
   1.132 -   :dodrio          
   1.133 -   :primeape        
   1.134 -   :dugtrio         
   1.135 -   :venomoth        
   1.136 -   :dewgong         
   1.137 -   :caterpie        
   1.138 -   :metapod         
   1.139 -   :butterfree      
   1.140 -   :machamp         
   1.141 -   :golduck         
   1.142 -   :hypno           
   1.143 -   :golbat          
   1.144 -   :mewtwo          
   1.145 -   :snorlax         
   1.146 -   :magikarp        
   1.147 -   :muk             
   1.148 -   :kingler         
   1.149 -   :cloyster        
   1.150 -   :electrode       
   1.151 -   :clefable        
   1.152 -   :wheezing        
   1.153 -   :persian         
   1.154 -   :marowak         
   1.155 -   :haunter         
   1.156 -   :abra            
   1.157 -   :alakazam        
   1.158 -   :pidgeotto       
   1.159 -   :pidgeot         
   1.160 -   :starmie         
   1.161 -   :bulbasaur       
   1.162 -   :venusaur        
   1.163 -   :tentacruel      
   1.164 -   :goldeen         
   1.165 -   :seaking         
   1.166 -   :ponyta          
   1.167 -   :rapidash        
   1.168 -   :rattata         
   1.169 -   :raticate        
   1.170 -   :nidorino        
   1.171 -   :nidorina        
   1.172 -   :geodude         
   1.173 -   :porygon         
   1.174 -   :aerodactyl      
   1.175 -   :magnemite       
   1.176 -   :charmander      
   1.177 -   :squirtle        
   1.178 -   :charmeleon      
   1.179 -   :wartortle       
   1.180 -   :charizard       
   1.181 -   :oddish          
   1.182 -   :gloom           
   1.183 -   :vileplume       
   1.184 -   :bellsprout      
   1.185 -   :weepenbell      
   1.186 -   :victreebel      
   1.187 \ No newline at end of file
   1.188 +  {
   1.189 +   :abra            psy
   1.190 +   :aerodactyl      rck fly
   1.191 +   :alakazam        psy
   1.192 +   :arbok           poi
   1.193 +   :arcanine        fir
   1.194 +   :articuno        ice fly
   1.195 +   :beedrill        bug poi
   1.196 +   :bellsprout      gra poi
   1.197 +   :blastoise       wat
   1.198 +   :bulbasaur       gra poi
   1.199 +   :butterfree      bug fly
   1.200 +   :caterpie        bug
   1.201 +   :chansey         nor
   1.202 +   :charizard       fir fly
   1.203 +   :charmander      fir
   1.204 +   :charmeleon      fir
   1.205 +   :clefable        nor
   1.206 +   :clefairy        nor
   1.207 +   :cloyster        wat ice
   1.208 +   :cubone          gro
   1.209 +   :dewgong         wat ice
   1.210 +   :diglett         gro
   1.211 +   :ditto           nor
   1.212 +   :dodrio          nor fly
   1.213 +   :doduo           nor fly
   1.214 +   :dragonair       drg
   1.215 +   :dragonite       drg fly
   1.216 +   :dratini         drg
   1.217 +   :drowzee         psy
   1.218 +   :dugtrio         gro
   1.219 +   :eevee           nor
   1.220 +   :ekans           poi
   1.221 +   :electabuzz      ele
   1.222 +   :electrode       ele
   1.223 +   :exeggcute       gra psy
   1.224 +   :exeggutor       gra psy
   1.225 +   :farfetchd       nor fly
   1.226 +   :fearow          nor fly
   1.227 +   :flareon         fir
   1.228 +   :gastly          gho poi
   1.229 +   :gengar          gho poi
   1.230 +   :geodude         rck gro
   1.231 +   :gloom           gra poi
   1.232 +   :golbat          poi fly
   1.233 +   :goldeen         wat
   1.234 +   :golduck         wat
   1.235 +   :golem           rck gro
   1.236 +   :graveler        rck gro
   1.237 +   :grimer          poi
   1.238 +   :growlithe       fir
   1.239 +   :gyarados        wat fly
   1.240 +   :haunter         gho poi
   1.241 +   :hitmonchan      fgt
   1.242 +   :hitmonlee       fgt
   1.243 +   :horsea          wat
   1.244 +   :hypno           psy
   1.245 +   :ivysaur         gra poi
   1.246 +   :jigglypuff      nor
   1.247 +   :jolteon         ele
   1.248 +   :jynx            ice psy
   1.249 +   :kabuto          rck wat
   1.250 +   :kabutops        rck wat
   1.251 +   :kadabra         psy
   1.252 +   :kakuna          bug poi
   1.253 +   :kangaskhan      nor
   1.254 +   :kingler         wat
   1.255 +   :koffing         poi
   1.256 +   :krabby          wat
   1.257 +   :lapras          wat ice
   1.258 +   :lickitung       nor
   1.259 +   :machamp         fgt
   1.260 +   :machoke         fgt
   1.261 +   :machop          fgt
   1.262 +   :magikarp        wat
   1.263 +   :magmar          fir
   1.264 +   :magnemite       ele
   1.265 +   :magneton        ele
   1.266 +   :mankey          fgt
   1.267 +   :marowak         gro
   1.268 +   :meowth          nor
   1.269 +   :metapod         bug
   1.270 +   :mew             psy
   1.271 +   :mewtwo          psy
   1.272 +   :moltres         fir fly
   1.273 +   :mr-mime         psy
   1.274 +   :muk             poi
   1.275 +   :nidoking        poi gro
   1.276 +   :nidoqueen       poi gro
   1.277 +   :nidoran-female  poi
   1.278 +   :nidoran-male    poi
   1.279 +   :nidorina        poi
   1.280 +   :nidorino        poi
   1.281 +   :ninetails       fir
   1.282 +   :oddish          gra poi
   1.283 +   :omanyte         rck wat
   1.284 +   :omastar         rck wat
   1.285 +   :onix            rck gro
   1.286 +   :paras           bug gra
   1.287 +   :parasect        bug gra
   1.288 +   :persian         nor
   1.289 +   :pidgeot         nor fly
   1.290 +   :pidgeotto       nor fly
   1.291 +   :pidgey          nor fly
   1.292 +   :pikachu         ele
   1.293 +   :pinsir          bug
   1.294 +   :poliwag         wat
   1.295 +   :poliwhirl       wat
   1.296 +   :poliwrath       wat fgt
   1.297 +   :ponyta          fir
   1.298 +   :porygon         nor
   1.299 +   :primeape        fgt
   1.300 +   :psyduck         wat
   1.301 +   :raichu          ele
   1.302 +   :rapidash        fir
   1.303 +   :raticate        nor
   1.304 +   :rattata         nor
   1.305 +   :rhydon          gro rck
   1.306 +   :rhyhorn         gro rck
   1.307 +   :sandshrew       gro
   1.308 +   :sandslash       gro
   1.309 +   :scyther         bug fly
   1.310 +   :seaking         wat
   1.311 +   :sedra           wat
   1.312 +   :seel            wat
   1.313 +   :shellder        wat
   1.314 +   :slowbro         wat psy
   1.315 +   :slowpoke        wat psy
   1.316 +   :snorlax         nor
   1.317 +   :spearow         nor fly
   1.318 +   :squirtle        wat
   1.319 +   :starmie         wat psy
   1.320 +   :staryu          wat
   1.321 +   :tangela         gra
   1.322 +   :tauros          nor
   1.323 +   :tentacool       wat poi
   1.324 +   :tentacruel      wat poi
   1.325 +   :vaporeon        wat
   1.326 +   :venomoth        bug poi
   1.327 +   :venonat         bug poi
   1.328 +   :venusaur        gra poi
   1.329 +   :victreebel      gra poi
   1.330 +   :vileplume       gra poi
   1.331 +   :voltorb         ele
   1.332 +   :vulpix          fir
   1.333 +   :wartortle       wat
   1.334 +   :weedle          bug poi
   1.335 +   :weepenbell      gra poi
   1.336 +   :wheezing        poi
   1.337 +   :wigglytuff      nor
   1.338 +   :zapdos          ele fly
   1.339 +   :zubat           poi fly
   1.340 \ No newline at end of file