# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1332479677 18000
# Node ID 659764a2ea403144be8c7a94019a5f379c84cc50
# Parent  8dd17081829f4451623ed2f550f861e1aef03bfb
break for eating!

diff -r 8dd17081829f -r 659764a2ea40 clojure/com/aurellem/gb/moves.clj
--- a/clojure/com/aurellem/gb/moves.clj	Thu Mar 22 23:42:31 2012 -0500
+++ b/clojure/com/aurellem/gb/moves.clj	Fri Mar 23 00:14:37 2012 -0500
@@ -169,7 +169,7 @@
    0xA2   :super-fang
    0xA3   :slash
    0xA4   :substitute
-   0xA5   :struggle})
+   0xA5   :struggle       })
 
 (def move-name->move-code
   (zipmap (vals move-code->move-name)
@@ -264,3 +264,171 @@
      (give-pp @current-state
              pokemon-num move-num pp-ups current-pp)))
 
+
+(def move-name->move-pp
+  {
+   :absorb        20
+   :acid          30
+   :acid-armor    40 ;; WTF happens with 3 PP-UPs??!
+   :agility       30
+   :amnesia       20
+   :aurora-beam   20
+   :barrage       20
+   :barrier       30
+   :bide          10
+   :bind          20
+   :bite          25
+   :blizzard       5 
+   :body-slam     15
+   :bone-club     20
+   :bonemerang    10
+   :bubble        30
+   :bubblebeam    20
+   :clamp         10
+   :comet-punch   15
+   :confuse-ray   10
+   :confusion     25
+   :constrict     35
+   :conversion    30
+   :counter       20
+   :crabhammer    10
+   :cut           30
+   :defense-curl  40
+   :dig           10
+   :disable       20
+   :dizzy-punch   10
+   :double-edge   15
+   :double-kick   30
+   :double-team   10
+   :doubleslap    15
+   :dragon-rage   10
+   :dream-eater   15
+   :drill-peck    20
+   :earthquake    10
+   :egg-bomb      10
+   :ember         25
+   :explosion      5
+   :fire-blast     5
+   :fire-punch    15
+   :fire-spin     15
+   :fissure        5
+   :flamethrower  15
+   :flash         20
+   :fly           15
+   :focus-energy  30
+   :fury-attack   20
+   :fury-swipes   15
+   :glare         30
+   :growl         40
+   :growth        40
+   :guillotine     5
+   :gust          35
+   :harden        30
+   :haze          
+   :headbutt      
+   :hi-jump-kick  
+   :horn-attack   
+   :horn-drill    
+   :hydro-pump    
+   :hyper-beam    
+   :hyper-fang    
+   :hypnosis      
+   :ice-beam      
+   :ice-punch     
+   :jump-kick     
+   :karate-chop   
+   :kinesis       
+   :leech-life    
+   :leech-seed    
+   :leer          
+   :lick          
+   :light-screen  
+   :lovely-kiss   
+   :low-kick      
+   :meditate      
+   :mega-drain    
+   :mega-kick     
+   :mega-punch    
+   :metronome     
+   :mimic         
+   :minimize      
+   :mirror-move   
+   :mist          
+   :night-shade   
+   :pay-day       
+   :peck          
+   :petal-dance   
+   :pin-missle    
+   :poison-gas    
+   :poison-sting  
+   :poisonpowder  
+   :pound         
+   :psybeam       
+   :psychic       
+   :psywave       
+   :quick-attack  
+   :rage          
+   :razor-leaf    
+   :razor-wind    
+   :recover       
+   :reflect       
+   :rest          
+   :roar          
+   :rock-slide    
+   :rock-throw    
+   :rolling-kick  
+   :sand-attack   
+   :scratch       
+   :screech       
+   :seismic-toss  
+   :selfdestruct  
+   :sharpen       
+   :sing          
+   :skull-bash    
+   :sky-attack    
+   :slam          
+   :slash         
+   :sleep-powder  
+   :sludge        
+   :smog          
+   :smokescreen   
+   :softboiled    
+   :solarbeam     
+   :sonicboom     
+   :spike-cannon  
+   :splash        
+   :spore         
+   :stomp         
+   :strength      
+   :string-shot   
+   :struggle      
+   :stun-spore    
+   :submission    
+   :substitute    
+   :super-fang    
+   :supersonic    
+   :surf          
+   :swift         
+   :swords-dance  
+   :tackle        
+   :tail-whip     
+   :take-down     
+   :teleport      
+   :thrash        
+   :thunder       
+   :thunder-wave  
+   :thunderbolt   
+   :thunderpunch  
+   :thundershock  
+   :toxic         
+   :transform     
+   :tri-attack    
+   :twinneedle    
+   :vicegrip      
+   :vine-whip     
+   :water-gun     
+   :waterfall     
+   :whirlwind     
+   :wing-attack   
+   :withdraw      
+   :wrap          
\ No newline at end of file
diff -r 8dd17081829f -r 659764a2ea40 clojure/com/aurellem/gb/pokemon.clj
--- a/clojure/com/aurellem/gb/pokemon.clj	Thu Mar 22 23:42:31 2012 -0500
+++ b/clojure/com/aurellem/gb/pokemon.clj	Fri Mar 23 00:14:37 2012 -0500
@@ -85,7 +85,7 @@
   ([n new-name]
      (set-original-trainer @current-state n new-name)))
 
-(def OT-ID-addresses [0xD176 0xD1A2 0xD1CE 0xD1FA 0xD228 0xD252])
+(def OT-ID-addresses [0xD176 0xD1A2 0xD1CE 0xD1FA 0xD226 0xD252])
 
 (defn read-OT-id
   ([^SaveState state poke-num]
@@ -301,7 +301,12 @@
        (println "|       Move       | PP | Max PP | PP UPs |")
        (println "+------------------+----+--------+--------+")
 
-       
+       (dorun
+        (for [[name {:keys [pp-ups current-pp]}] (:moves info)]
+          (printf
+           "| %-17s| %2d |   %02d   |   %02d   |\n"
+           (.substring (str name) 1)
+           current-pp (max-pp name pp-ups) pp-ups)))
 
        (println "+------------------+----+--------+--------+")
        
diff -r 8dd17081829f -r 659764a2ea40 save-states/before-erika.sav
Binary file save-states/before-erika.sav has changed