# HG changeset patch # User Robert McIntyre # Date 1332293160 18000 # Node ID 04dfda91db9c609f0b5767931a8c3e3fd8d75335 # Parent bfd06de5a934ff690b47652bd532c386566808fe discovered locations of Stat experience and lost location of DV values diff -r bfd06de5a934 -r 04dfda91db9c clojure/com/aurellem/exp/pokemon-layout --- a/clojure/com/aurellem/exp/pokemon-layout Tue Mar 20 19:17:14 2012 -0500 +++ b/clojure/com/aurellem/exp/pokemon-layout Tue Mar 20 20:26:00 2012 -0500 @@ -18,21 +18,21 @@ D173 Move 2 ID D174 Move 3 ID D175 Move 4 ID -D176 / Pokemon 1 OT ID -D177 \ +D176 /h Pokemon 1 OT ID +D177 \l D178 /h D179 |m Pokemon 1 Experience Points D17A \l -D17B HP DV -D17C -D17D Attack DV -D17E -D17F Defense DV -D180 -D181 Speed DV -D182 -D183 Special DV -D184 +D17B /h HP Stat Expeience +D17C \l +D17D /h Attack Stat Experience +D17E \l +D17F /h Defense Stat Experience +D180 \l +D181 /h Speed Stat Experience +D182 \l +D183 /h Special Stat Experience +D184 \l D185 D186 D187 Current/Maximum PP Move 1 @@ -67,16 +67,16 @@ D1A4 /h D1A5 |m Pokemon 2 Experience Points D1A6 \l -D1A7 HP DV -D1A8 -D1A9 Attack DV -D1AA -D1AB Defense DV -D1AC -D1AD Speed DV -D1AE -D1AF Special DV -D1B0 +D1A7 /h HP Stat Expeience +D1A8 \l +D1A9 /h Attack Stat Experience +D1AA \l +D1AB /h Defense Stat Experience +D1AC \l +D1AD /h Speed Stat Experience +D1AE \l +D1AF /h Special Stat Experience +D1B0 \l D1B1 D1B2 D1B3 Current/Maximum PP Move 1 @@ -106,21 +106,21 @@ D1CB Move 2 ID D1CC Move 3 ID D1CD Move 4 ID -D1CE / Pokemon 3 OT ID -D1CF \ +D1CE /h Pokemon 3 OT ID +D1CF \l D1D0 /h D1D1 |m Pokemon 3 Experience Points D1D2 \l -D1D3 HP DV -D1D4 -D1D5 Attack DV -D1D6 -D1D7 Defense DV -D1D8 -D1D9 Speed DV -D1DA -D1DB Special DV -D1DC +D1D3 /h HP Stat Expeience +D1D4 \l +D1D5 /h Attack Stat Experience +D1D6 \l +D1D7 /h Defense Stat Experience +D1D8 \l +D1D9 /h Speed Stat Experience +D1DA \l +D1DB /h Special Stat Experience +D1DC \l D1DD D1DE D1DF Current/Maximum PP Move 1 @@ -150,21 +150,21 @@ D1F7 Move 2 ID D1F8 Move 3 ID D1F9 Move 4 ID -D1FA / Pokemon 4 OT ID -D1FB \ +D1FA /h Pokemon 4 OT ID +D1FB \l D1FC /h D1FD |m Pokemon 4 Experience Points D1FE \l -D1FF HP DV -D200 -D201 Attack DV -D202 -D203 Defense DV -D204 -D205 Speed DV -D206 -D207 Special DV -D208 +D1FF /h HP Stat Expeience +D200 \l +D201 /h Attack Stat Experience +D202 \l +D203 /h Defense Stat Experience +D204 \l +D205 /h Speed Stat Experience +D206 \l +D207 /h Special Stat Experience +D208 \l D209 D20A D20B Current/Maximum PP Move 1 @@ -194,21 +194,21 @@ D223 Move 2 ID D224 Move 3 ID D225 Move 4 ID -D226 / Pokemon 5 OT ID -D227 \ +D226 /h Pokemon 5 OT ID +D227 \l D228 /h D229 |m Pokemon 5 Experience Points D22A \l -D22B HP DV -D22C -D22D Attack DV -D22E -D22F Defense DV -D230 -D231 Speed DV -D232 -D233 Special DV -D234 +D22B /h HP Stat Expeience +D22C \l +D22D /h Attack Stat Experience +D22E \l +D22F /h Defense Stat Experience +D230 \l +D231 /h Speed Stat Experience +D232 \l +D233 /h Special Stat Experience +D234 \l D235 D236 D237 Current/Maximum PP Move 1 @@ -243,16 +243,16 @@ D254 /h D255 |m Pokemon 6 Experience Points D256 \l -D257 HP DV -D258 -D259 Attack DV -D25A -D25B Defense DV -D25C -D25D Speed DV -D25E -D25F Special DV -D260 +D257 /h HP Stat Expeience +D258 \l +D259 /h Attack Stat Experience +D25A \l +D25B /h Defense Stat Experience +D25C \l +D25D /h Speed Stat Experience +D25E \l +D25F /h Special Stat Experience +D260 \l D261 D262 D263 Current/Maximum PP Move 1 diff -r bfd06de5a934 -r 04dfda91db9c clojure/com/aurellem/exp/pokemon.clj --- a/clojure/com/aurellem/exp/pokemon.clj Tue Mar 20 19:17:14 2012 -0500 +++ b/clojure/com/aurellem/exp/pokemon.clj Tue Mar 20 20:26:00 2012 -0500 @@ -554,6 +554,8 @@ (defn crazy-pid [] (read-state "crazy-pidgeot")) +(def unknown "[[[UNKNOWN]]]") + (def unknown "") (def pokemon-1-info @@ -574,16 +576,16 @@ 0xD178 "Exp. Points (h)" ;; 14 0xD179 "Exp. Points (m)" ;; 15 0xD17A "Exp. Points (l)" ;; 16 - 0xD17B "HP DV" ;; 17 - 0xD17C unknown ;; 18 - 0xD17D "Attack DV" ;; 19 - 0xD17E unknown ;; 20 - 0xD17F "Defense DV" ;; 21 - 0xD180 unknown ;; 22 - 0xD181 "Speed DV" ;; 23 - 0xD182 unknown ;; 24 - 0xD183 "Special DV" ;; 25 - 0xD184 unknown ;; 26 + 0xD17B "HP Exp. (h)" ;; 17 + 0xD17C "HP Exp. (l)" ;; 18 + 0xD17D "Attack Exp. (h)" ;; 19 + 0xD17E "Attack Exp. (l)" ;; 20 + 0xD17F "Defense Exp. (h)" ;; 21 + 0xD180 "Defense Exp. (l)" ;; 22 + 0xD181 "Speed Exp. (h)" ;; 23 + 0xD182 "Speed Exp. (l)" ;; 24 + 0xD183 "Special Exp. (h)" ;; 25 + 0xD184 "Special Exp. (l)" ;; 26 0xD185 unknown ;; 27 0xD186 unknown ;; 28 0xD187 "PP Move 1" ;; 29 @@ -600,7 +602,7 @@ 0xD192 "Speed (h)" ;; 40 0xD193 "Speed (l)" ;; 41 0xD194 "Special (h)" ;; 42 - 0xD195 "Special (h)" ;; 43 + 0xD195 "Special (l)" ;; 43 }) (defn pokemon-data @@ -624,13 +626,26 @@ (assert (<= 0 pokemon-num 5)) (let [poke-data (pokemon-data state pokemon-num) backbone (sort (keys pokemon-1-info))] - (println "Pokemon " pokemon-num - "------------------------") + (println "Pokemon " pokemon-num " -- " + (nth (party-names state) + pokemon-num) \newline) + + (println " Desc. | Hex | Dec | Binary |") + (println "-------------------+------+-----+----------+") (dorun (map (comp println (fn [desc data] - (format "%-16s : 0x%02X" desc data))) + (format "%-16s | 0x%02X | %3d | %s |" + desc data data + (let [s (Integer/toBinaryString data)] + (apply + str + (concat (repeat (- 8 (count s)) "0" ) + s))) + + + ))) (map pokemon-1-info backbone) poke-data)))) @@ -641,3 +656,7 @@ (defn pre-battle [] (read-state "prepare-for-battle")) + + + +