# HG changeset patch # User Robert McIntyre # Date 1332494378 18000 # Node ID 43bb461a7419b485d426decc0f956eb5dcc40894 # Parent 85a2c2e2d318572ffdb4a2cf0bd1007401172bd0 constructing default types.... diff -r 85a2c2e2d318 -r 43bb461a7419 clojure/com/aurellem/gb/species.clj --- a/clojure/com/aurellem/gb/species.clj Fri Mar 23 04:00:42 2012 -0500 +++ b/clojure/com/aurellem/gb/species.clj Fri Mar 23 04:19:38 2012 -0500 @@ -73,7 +73,7 @@ 0x52 :vulpix 0x53 :ninetails 0x54 :pikachu - 0x55 :riachu + 0x55 :raichu 0x58 :dratini 0x59 :dragonair 0x5A :kabuto diff -r 85a2c2e2d318 -r 43bb461a7419 clojure/com/aurellem/gb/types.clj --- a/clojure/com/aurellem/gb/types.clj Fri Mar 23 04:00:42 2012 -0500 +++ b/clojure/com/aurellem/gb/types.clj Fri Mar 23 04:19:38 2012 -0500 @@ -17,7 +17,7 @@ 0x17 :electric 0x18 :psychic 0x19 :ice - 0x1A :dragon}) + 0x1A :dragon }) (def type-name->type-code (zipmap (vals type-code->type-name) @@ -57,155 +57,175 @@ (read-type @current-state poke-num))) + +:normal nor +:fighting fig +:flying fly +:poision poi +:ground gro +:rock roc +:bug bug +:ghost gho +:fire fir +:water wat +:grass gra +:electric ele +:psychic psy +:ice ice +:dragon dra + + + (def pokemon->type - {:rhydon - :kangaskhan - :nidoran-male - :clefairy - :spearow - :voltorb - :nidoking - :slowbro - :ivysaur - :exeggutor - :lickitung - :exeggcute - :grimer - :gengar - :nidoran-female - :nidoqueen - :cubone - :rhyhorn - :lapras - :arcanine - :mew - :gyarados - :shellder - :tentacool - :gastly - :scyther - :staryu - :blastoise - :pinsir - :tangela - :growlithe - :onix - :fearow - :pidgey - :slowpoke - :kadabra - :graveler - :chansey - :machoke - :mr-mime - :hitmonlee - :hitmonchan - :arbok - :parasect - :psyduck - :drowzee - :golem - :magmar - :electabuzz - :magneton - :koffing - :mankey - :seel - :diglett - :tauros - :farfetch'd - :venonat - :dragonite - :doduo - :poliwag - :jynx - :moltres - :articuno - :zapdos - :ditto - :meowth - :krabby - :vulpix - :ninetails - :pikachu - :riachu - :dratini - :dragonair - :kabuto - :kabutops - :horsea - :sedra - :sandshrew - :sandslash - :omanyte - :omastar - :jigglypuff - :wigglytuff - :eevee - :flareon - :jolteon - :vaporeon - :machop - :zubat - :ekans - :paras - :poliwhirl - :poliwrath - :weedle - :kakuna - :beedrill - :dodrio - :primeape - :dugtrio - :venomoth - :dewgong - :caterpie - :metapod - :butterfree - :machamp - :golduck - :hypno - :golbat - :mewtwo - :snorlax - :magikarp - :muk - :kingler - :cloyster - :electrode - :clefable - :wheezing - :persian - :marowak - :haunter - :abra - :alakazam - :pidgeotto - :pidgeot - :starmie - :bulbasaur - :venusaur - :tentacruel - :goldeen - :seaking - :ponyta - :rapidash - :rattata - :raticate - :nidorino - :nidorina - :geodude - :porygon - :aerodactyl - :magnemite - :charmander - :squirtle - :charmeleon - :wartortle - :charizard - :oddish - :gloom - :vileplume - :bellsprout - :weepenbell - :victreebel \ No newline at end of file + { + :abra psy + :aerodactyl rck fly + :alakazam psy + :arbok poi + :arcanine fir + :articuno ice fly + :beedrill bug poi + :bellsprout gra poi + :blastoise wat + :bulbasaur gra poi + :butterfree bug fly + :caterpie bug + :chansey nor + :charizard fir fly + :charmander fir + :charmeleon fir + :clefable nor + :clefairy nor + :cloyster wat ice + :cubone gro + :dewgong wat ice + :diglett gro + :ditto nor + :dodrio nor fly + :doduo nor fly + :dragonair drg + :dragonite drg fly + :dratini drg + :drowzee psy + :dugtrio gro + :eevee nor + :ekans poi + :electabuzz ele + :electrode ele + :exeggcute gra psy + :exeggutor gra psy + :farfetchd nor fly + :fearow nor fly + :flareon fir + :gastly gho poi + :gengar gho poi + :geodude rck gro + :gloom gra poi + :golbat poi fly + :goldeen wat + :golduck wat + :golem rck gro + :graveler rck gro + :grimer poi + :growlithe fir + :gyarados wat fly + :haunter gho poi + :hitmonchan fgt + :hitmonlee fgt + :horsea wat + :hypno psy + :ivysaur gra poi + :jigglypuff nor + :jolteon ele + :jynx ice psy + :kabuto rck wat + :kabutops rck wat + :kadabra psy + :kakuna bug poi + :kangaskhan nor + :kingler wat + :koffing poi + :krabby wat + :lapras wat ice + :lickitung nor + :machamp fgt + :machoke fgt + :machop fgt + :magikarp wat + :magmar fir + :magnemite ele + :magneton ele + :mankey fgt + :marowak gro + :meowth nor + :metapod bug + :mew psy + :mewtwo psy + :moltres fir fly + :mr-mime psy + :muk poi + :nidoking poi gro + :nidoqueen poi gro + :nidoran-female poi + :nidoran-male poi + :nidorina poi + :nidorino poi + :ninetails fir + :oddish gra poi + :omanyte rck wat + :omastar rck wat + :onix rck gro + :paras bug gra + :parasect bug gra + :persian nor + :pidgeot nor fly + :pidgeotto nor fly + :pidgey nor fly + :pikachu ele + :pinsir bug + :poliwag wat + :poliwhirl wat + :poliwrath wat fgt + :ponyta fir + :porygon nor + :primeape fgt + :psyduck wat + :raichu ele + :rapidash fir + :raticate nor + :rattata nor + :rhydon gro rck + :rhyhorn gro rck + :sandshrew gro + :sandslash gro + :scyther bug fly + :seaking wat + :sedra wat + :seel wat + :shellder wat + :slowbro wat psy + :slowpoke wat psy + :snorlax nor + :spearow nor fly + :squirtle wat + :starmie wat psy + :staryu wat + :tangela gra + :tauros nor + :tentacool wat poi + :tentacruel wat poi + :vaporeon wat + :venomoth bug poi + :venonat bug poi + :venusaur gra poi + :victreebel gra poi + :vileplume gra poi + :voltorb ele + :vulpix fir + :wartortle wat + :weedle bug poi + :weepenbell gra poi + :wheezing poi + :wigglytuff nor + :zapdos ele fly + :zubat poi fly \ No newline at end of file