1.1 --- a/clojure/com/aurellem/gb/moves.clj	Thu Mar 22 23:42:31 2012 -0500
     1.2 +++ b/clojure/com/aurellem/gb/moves.clj	Fri Mar 23 00:14:37 2012 -0500
     1.3 @@ -169,7 +169,7 @@
     1.4     0xA2   :super-fang
     1.5     0xA3   :slash
     1.6     0xA4   :substitute
     1.7 -   0xA5   :struggle})
     1.8 +   0xA5   :struggle       })
     1.9  
    1.10  (def move-name->move-code
    1.11    (zipmap (vals move-code->move-name)
    1.12 @@ -264,3 +264,171 @@
    1.13       (give-pp @current-state
    1.14               pokemon-num move-num pp-ups current-pp)))
    1.15  
    1.16 +
    1.17 +(def move-name->move-pp
    1.18 +  {
    1.19 +   :absorb        20
    1.20 +   :acid          30
    1.21 +   :acid-armor    40 ;; WTF happens with 3 PP-UPs??!
    1.22 +   :agility       30
    1.23 +   :amnesia       20
    1.24 +   :aurora-beam   20
    1.25 +   :barrage       20
    1.26 +   :barrier       30
    1.27 +   :bide          10
    1.28 +   :bind          20
    1.29 +   :bite          25
    1.30 +   :blizzard       5 
    1.31 +   :body-slam     15
    1.32 +   :bone-club     20
    1.33 +   :bonemerang    10
    1.34 +   :bubble        30
    1.35 +   :bubblebeam    20
    1.36 +   :clamp         10
    1.37 +   :comet-punch   15
    1.38 +   :confuse-ray   10
    1.39 +   :confusion     25
    1.40 +   :constrict     35
    1.41 +   :conversion    30
    1.42 +   :counter       20
    1.43 +   :crabhammer    10
    1.44 +   :cut           30
    1.45 +   :defense-curl  40
    1.46 +   :dig           10
    1.47 +   :disable       20
    1.48 +   :dizzy-punch   10
    1.49 +   :double-edge   15
    1.50 +   :double-kick   30
    1.51 +   :double-team   10
    1.52 +   :doubleslap    15
    1.53 +   :dragon-rage   10
    1.54 +   :dream-eater   15
    1.55 +   :drill-peck    20
    1.56 +   :earthquake    10
    1.57 +   :egg-bomb      10
    1.58 +   :ember         25
    1.59 +   :explosion      5
    1.60 +   :fire-blast     5
    1.61 +   :fire-punch    15
    1.62 +   :fire-spin     15
    1.63 +   :fissure        5
    1.64 +   :flamethrower  15
    1.65 +   :flash         20
    1.66 +   :fly           15
    1.67 +   :focus-energy  30
    1.68 +   :fury-attack   20
    1.69 +   :fury-swipes   15
    1.70 +   :glare         30
    1.71 +   :growl         40
    1.72 +   :growth        40
    1.73 +   :guillotine     5
    1.74 +   :gust          35
    1.75 +   :harden        30
    1.76 +   :haze          
    1.77 +   :headbutt      
    1.78 +   :hi-jump-kick  
    1.79 +   :horn-attack   
    1.80 +   :horn-drill    
    1.81 +   :hydro-pump    
    1.82 +   :hyper-beam    
    1.83 +   :hyper-fang    
    1.84 +   :hypnosis      
    1.85 +   :ice-beam      
    1.86 +   :ice-punch     
    1.87 +   :jump-kick     
    1.88 +   :karate-chop   
    1.89 +   :kinesis       
    1.90 +   :leech-life    
    1.91 +   :leech-seed    
    1.92 +   :leer          
    1.93 +   :lick          
    1.94 +   :light-screen  
    1.95 +   :lovely-kiss   
    1.96 +   :low-kick      
    1.97 +   :meditate      
    1.98 +   :mega-drain    
    1.99 +   :mega-kick     
   1.100 +   :mega-punch    
   1.101 +   :metronome     
   1.102 +   :mimic         
   1.103 +   :minimize      
   1.104 +   :mirror-move   
   1.105 +   :mist          
   1.106 +   :night-shade   
   1.107 +   :pay-day       
   1.108 +   :peck          
   1.109 +   :petal-dance   
   1.110 +   :pin-missle    
   1.111 +   :poison-gas    
   1.112 +   :poison-sting  
   1.113 +   :poisonpowder  
   1.114 +   :pound         
   1.115 +   :psybeam       
   1.116 +   :psychic       
   1.117 +   :psywave       
   1.118 +   :quick-attack  
   1.119 +   :rage          
   1.120 +   :razor-leaf    
   1.121 +   :razor-wind    
   1.122 +   :recover       
   1.123 +   :reflect       
   1.124 +   :rest          
   1.125 +   :roar          
   1.126 +   :rock-slide    
   1.127 +   :rock-throw    
   1.128 +   :rolling-kick  
   1.129 +   :sand-attack   
   1.130 +   :scratch       
   1.131 +   :screech       
   1.132 +   :seismic-toss  
   1.133 +   :selfdestruct  
   1.134 +   :sharpen       
   1.135 +   :sing          
   1.136 +   :skull-bash    
   1.137 +   :sky-attack    
   1.138 +   :slam          
   1.139 +   :slash         
   1.140 +   :sleep-powder  
   1.141 +   :sludge        
   1.142 +   :smog          
   1.143 +   :smokescreen   
   1.144 +   :softboiled    
   1.145 +   :solarbeam     
   1.146 +   :sonicboom     
   1.147 +   :spike-cannon  
   1.148 +   :splash        
   1.149 +   :spore         
   1.150 +   :stomp         
   1.151 +   :strength      
   1.152 +   :string-shot   
   1.153 +   :struggle      
   1.154 +   :stun-spore    
   1.155 +   :submission    
   1.156 +   :substitute    
   1.157 +   :super-fang    
   1.158 +   :supersonic    
   1.159 +   :surf          
   1.160 +   :swift         
   1.161 +   :swords-dance  
   1.162 +   :tackle        
   1.163 +   :tail-whip     
   1.164 +   :take-down     
   1.165 +   :teleport      
   1.166 +   :thrash        
   1.167 +   :thunder       
   1.168 +   :thunder-wave  
   1.169 +   :thunderbolt   
   1.170 +   :thunderpunch  
   1.171 +   :thundershock  
   1.172 +   :toxic         
   1.173 +   :transform     
   1.174 +   :tri-attack    
   1.175 +   :twinneedle    
   1.176 +   :vicegrip      
   1.177 +   :vine-whip     
   1.178 +   :water-gun     
   1.179 +   :waterfall     
   1.180 +   :whirlwind     
   1.181 +   :wing-attack   
   1.182 +   :withdraw      
   1.183 +   :wrap          
   1.184 \ No newline at end of file

     2.1 --- a/clojure/com/aurellem/gb/pokemon.clj	Thu Mar 22 23:42:31 2012 -0500
     2.2 +++ b/clojure/com/aurellem/gb/pokemon.clj	Fri Mar 23 00:14:37 2012 -0500
     2.3 @@ -85,7 +85,7 @@
     2.4    ([n new-name]
     2.5       (set-original-trainer @current-state n new-name)))
     2.6  
     2.7 -(def OT-ID-addresses [0xD176 0xD1A2 0xD1CE 0xD1FA 0xD228 0xD252])
     2.8 +(def OT-ID-addresses [0xD176 0xD1A2 0xD1CE 0xD1FA 0xD226 0xD252])
     2.9  
    2.10  (defn read-OT-id
    2.11    ([^SaveState state poke-num]
    2.12 @@ -301,7 +301,12 @@
    2.13         (println "|       Move       | PP | Max PP | PP UPs |")
    2.14         (println "+------------------+----+--------+--------+")
    2.15  
    2.16 -       
    2.17 +       (dorun
    2.18 +        (for [[name {:keys [pp-ups current-pp]}] (:moves info)]
    2.19 +          (printf
    2.20 +           "| %-17s| %2d |   %02d   |   %02d   |\n"
    2.21 +           (.substring (str name) 1)
    2.22 +           current-pp (max-pp name pp-ups) pp-ups)))
    2.23  
    2.24         (println "+------------------+----+--------+--------+")
    2.25         

     3.1 Binary file save-states/before-erika.sav has changed