# HG changeset patch
# User Dylan Holmes <ocsenave@gmail.com>
# Date 1332732797 18000
# Node ID 27ca947084cfa83f6c1602770836b98f5305f089
# Parent  5b59c6f17cd5a5cbe6564aaa47ba42b54e8501e2
minor fixes

diff -r 5b59c6f17cd5 -r 27ca947084cf clojure/com/aurellem/gb/hxc.clj
--- a/clojure/com/aurellem/gb/hxc.clj	Sun Mar 25 22:29:12 2012 -0500
+++ b/clojure/com/aurellem/gb/hxc.clj	Sun Mar 25 22:33:17 2012 -0500
@@ -22,6 +22,17 @@
                  (partition-by #(= % 0x50)
                                (take 1200
                                      (drop 0x45B7 (rom (root))))))))
+
+(def hxc-types
+  "The hardcoded type names in memory. List begins at ROM@27D99,
+  shortly before hxc-titles."
+  (map character-codes->str
+       (take-nth 2
+                 (partition-by #(= 0x50 %)
+                               (take 102
+                                     (drop 0x27D99
+                                           (rom (root))))))))
+
 (def hxc-titles
   "The hardcoded names of the trainer titles in memory. List begins at
 ROM@27E77"
@@ -74,23 +85,33 @@
 
 
 (def pkmn-types
-  {0 :normal
-   1 :fighting
-   2 :flying
-   3 :poison
-   4 :ground
-   5 :rock
-   7 :bug
-   8 :ghost
-
-   20 :fire
-   21 :water
-   22 :grass
-   23 :electric
-   24 :psychic
-   25 :ice
-   26 :dragon
-   })
+  [:normal
+   :fighting
+   :flying
+   :poison
+   :ground
+   :rock
+   :bug
+   :ghost
+   :A
+   :B
+   :C
+   :D
+   :E
+   :F
+   :G
+   :H
+   :I
+   :J
+   :K
+   :fire
+   :water
+   :grass
+   :electric
+   :psychic
+   :ice
+   :dragon
+   ])
 
 
 (def hxc-advantage
@@ -104,30 +125,6 @@
   
 
 
-;; (def pkmn-types
-;;   [:normal
-;;    :fighting
-;;    :flying
-;;    :poison
-;;    :ground
-;;    :rock
-;;    :bird ;;?
-;;    :bug
-;;    :ghost
-;;    :A
-;;    :B
-;;    :C
-;;    :D
-;;    :E
-;;    :fire
-;;    :water
-;;    :grass
-;;    :electric
-;;    :psychic
-;;    :ice
-;;    :poision?])
-
-