# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1332548764 18000
# Node ID aba78e52faba7309a3701f4568920a59ee1c8532
# Parent  62969eb07e046dcc41d7921f973629746720d479# Parent  57258c269bcb5b7ec9c839379bec776d1f1cfa96
merge

diff -r 57258c269bcb -r aba78e52faba clojure/com/aurellem/exp/struggle.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clojure/com/aurellem/exp/struggle.txt	Fri Mar 23 19:26:04 2012 -0500
@@ -0,0 +1,31 @@
+;; struggle works
+
+ [ccd5 (4 5 6 7 8)]
+ [cfe8 (5 4 3 2 1)]
+ [d02c (4 3 2 1 0)]
+ [d187 (4 3 2 1 0)]
+
+;; struggle doesn't work
+
+ [ccd5 (0 1 2 3 4)]
+ [cfe8 (0 4 3 2 1)]
+ [d02c (32 3 2 1 0)]
+ [d187 (4 3 2 1 0)]
+
+
+
+
+
+
+
+ran:
+
+(clojure.pprint/pprint (temporal-compare jiggly-4-pp jiggly-3-pp
+jiggly-2-pp jiggly-1-pp jiggly-0-pp))
+
+and:
+
+(clojure.pprint/pprint (temporal-compare syn-jiggly-4-pp
+syn-jiggly-3-pp syn-jiggly-2-pp syn-jiggly-1-pp syn-jiggly-0-pp))
+
+to generate the above, then filtered manually
diff -r 57258c269bcb -r aba78e52faba clojure/com/aurellem/gb/constants.clj
--- a/clojure/com/aurellem/gb/constants.clj	Fri Mar 23 19:05:08 2012 -0500
+++ b/clojure/com/aurellem/gb/constants.clj	Fri Mar 23 19:26:04 2012 -0500
@@ -5,3 +5,6 @@
 (def end-of-name-marker 0x50)
 (def max-name-length 10)
 (def name-width 11)
+
+(def pokemon-record-begin 0xD162)
+(def pokemon-record-end 0xD2F5)
\ No newline at end of file
diff -r 57258c269bcb -r aba78e52faba clojure/com/aurellem/gb/moves.clj
--- a/clojure/com/aurellem/gb/moves.clj	Fri Mar 23 19:05:08 2012 -0500
+++ b/clojure/com/aurellem/gb/moves.clj	Fri Mar 23 19:26:04 2012 -0500
@@ -268,6 +268,11 @@
   ([^SaveState state poke-num moves-pps]
      (let [new-moves
            (-> state
+               ;; zero out the pp of the pokemon's moves
+               (give-pp poke-num 0 0 0)
+               (give-pp poke-num 1 0 0)
+               (give-pp poke-num 2 0 0)
+               (give-pp poke-num 3 0 0)
                (give-moves poke-num (map first moves-pps)))]
        (reduce (fn [state move-num]
                  (let [pp (second (nth moves-pps move-num))]
diff -r 57258c269bcb -r aba78e52faba clojure/com/aurellem/gb/species.clj
--- a/clojure/com/aurellem/gb/species.clj	Fri Mar 23 19:05:08 2012 -0500
+++ b/clojure/com/aurellem/gb/species.clj	Fri Mar 23 19:26:04 2012 -0500
@@ -151,7 +151,7 @@
    0x3A  :seel
    0x3B  :diglett
    0x3C  :tauros
-   0x40  :farfetch'd
+   0x40  :farfetch
    0x41  :venonat
    0x42  :dragonite
    0x46  :doduo
diff -r 57258c269bcb -r aba78e52faba save-states/bad-jiggly.sav
Binary file save-states/bad-jiggly.sav has changed
diff -r 57258c269bcb -r aba78e52faba save-states/good-jiggly.sav
Binary file save-states/good-jiggly.sav has changed