# HG changeset patch # User Robert McIntyre # Date 1332548949 18000 # Node ID d7f2e0384d2426a13dc661f53e3016b9345be680 # Parent aba78e52faba7309a3701f4568920a59ee1c8532 remove debug stuff from pokemon.clj diff -r aba78e52faba -r d7f2e0384d24 clojure/com/aurellem/exp/struggle.txt --- a/clojure/com/aurellem/exp/struggle.txt Fri Mar 23 19:26:04 2012 -0500 +++ b/clojure/com/aurellem/exp/struggle.txt Fri Mar 23 19:29:09 2012 -0500 @@ -29,3 +29,32 @@ syn-jiggly-3-pp syn-jiggly-2-pp syn-jiggly-1-pp syn-jiggly-0-pp)) to generate the above, then filtered manually + + + + +(def jiggly-lvl-3 (read-state "jiggly-lvl-3")) + +(def jiggly-4-pp (read-state "jiggly-4-pp")) + +(def jiggly-3-pp (read-state "jiggly-3-pp")) + +(def jiggly-2-pp (read-state "jiggly-2-pp")) + +(def jiggly-1-pp (read-state "jiggly-1-pp")) + +(def jiggly-0-pp (read-state "jiggly-0-pp")) + +(def jiggly-struggle-once (read-state "jiggly-struggle-once")) + + +(def syn-jiggly-4-pp (read-state "syn-jiggly-4-pp")) +(def syn-jiggly-3-pp (read-state "syn-jiggly-3-pp")) +(def syn-jiggly-2-pp (read-state "syn-jiggly-2-pp")) +(def syn-jiggly-1-pp (read-state "syn-jiggly-1-pp")) +(def syn-jiggly-0-pp (read-state "syn-jiggly-0-pp")) + +Turns out that the pp for the non-existent moves +for the synthetic jigglypuff were not zeroed, causing +struggle to fail. Not really an exciting conclusion, but +there it is. diff -r aba78e52faba -r d7f2e0384d24 clojure/com/aurellem/gb/pokemon.clj --- a/clojure/com/aurellem/gb/pokemon.clj Fri Mar 23 19:26:04 2012 -0500 +++ b/clojure/com/aurellem/gb/pokemon.clj Fri Mar 23 19:29:09 2012 -0500 @@ -464,24 +464,7 @@ ([poke-num new-pokemon-data] (edit-pokemon @current-state poke-num new-pokemon-data))) - - -(def jiggly-lvl-3 (read-state "jiggly-lvl-3")) - -(def jiggly-4-pp (read-state "jiggly-4-pp")) - -(def jiggly-3-pp (read-state "jiggly-3-pp")) - -(def jiggly-2-pp (read-state "jiggly-2-pp")) - -(def jiggly-1-pp (read-state "jiggly-1-pp")) - -(def jiggly-0-pp (read-state "jiggly-0-pp")) - -(def jiggly-struggle-once (read-state "jiggly-struggle-once")) - - -(def poke-syn-jiggly-4-pp +(def young-jigglypuff {:name "JIGGLYPUFF", :species :jigglypuff, :species2 :jigglypuff, :status :normal, :moves [[:sing {:pp-ups 0, :current-pp 4}]], @@ -493,10 +476,3 @@ :stats {:level 3, :current-hp 5, :hp 20, :attack 8, :defense 6, :speed 6, :special 7}, :ID 5195}) - - -(def syn-jiggly-4-pp (read-state "syn-jiggly-4-pp")) -(def syn-jiggly-3-pp (read-state "syn-jiggly-3-pp")) -(def syn-jiggly-2-pp (read-state "syn-jiggly-2-pp")) -(def syn-jiggly-1-pp (read-state "syn-jiggly-1-pp")) -(def syn-jiggly-0-pp (read-state "syn-jiggly-0-pp")) \ No newline at end of file