1.1 --- a/clojure/com/aurellem/gb/hxc.clj	Sat Mar 31 03:54:21 2012 -0500
     1.2 +++ b/clojure/com/aurellem/gb/hxc.clj	Sat Mar 31 04:25:49 2012 -0500
     1.3 @@ -1,7 +1,6 @@
     1.4  (ns com.aurellem.gb.hxc
     1.5 -  (:use (com.aurellem.gb assembly characters gb-driver util
     1.6 +  (:use (com.aurellem.gb assembly characters gb-driver util mem-util
     1.7                           constants species))
     1.8 -  (:use (com.aurellem.world practice))
     1.9    (:import [com.aurellem.gb.gb_driver SaveState]))
    1.10  
    1.11  
    1.12 @@ -211,7 +210,7 @@
    1.13  ;; http://hax.iimarck.us/topic/581/
    1.14  (defn hxc-cry
    1.15    "The pokemon cry data in internal order. List begins at ROM@39462"
    1.16 -  ([](hxc-cry com.aurellem.gb.gb-driver/original-rom)
    1.17 +  ([](hxc-cry com.aurellem.gb.gb-driver/original-rom))
    1.18    ([rom]
    1.19       (zipmap
    1.20        (hxc-pokenames rom)
    1.21 @@ -222,16 +221,16 @@
    1.22            :length length}
    1.23           )
    1.24         (partition 3
    1.25 -                  (drop 0x39462 rom)))))))
    1.26 +                  (drop 0x39462 rom))))))
    1.27  
    1.28  (defn hxc-cry-groups
    1.29 -  ([] (hxc-cry-ids com.aurellem.gb.gb-driver/original-rom))
    1.30 +  ([] (hxc-cry-groups com.aurellem.gb.gb-driver/original-rom))
    1.31    ([rom]
    1.32       (map #(mapv first
    1.33                  (filter
    1.34                   (fn [[k v]]
    1.35                     (= % (:cry-id v)))
    1.36 -                 (hxc-cry rom)))
    1.37 +                 (hxc-cry)))
    1.38            ((comp
    1.39              range
    1.40              count