# HG changeset patch
# User Dylan Holmes <ocsenave@gmail.com>
# Date 1333046980 18000
# Node ID df9cad9909d27410d76858caac79b08bf2ec7ea2
# Parent  eec3e69500d9200449b297cfac046a7a5cb368c8
Fixed missing delimiter in gb.moves; preparing to play with type effectiveness.

diff -r eec3e69500d9 -r df9cad9909d2 clojure/com/aurellem/gb/moves.clj
--- a/clojure/com/aurellem/gb/moves.clj	Thu Mar 29 13:31:31 2012 -0500
+++ b/clojure/com/aurellem/gb/moves.clj	Thu Mar 29 13:49:40 2012 -0500
@@ -7,11 +7,11 @@
 (def move-code->move-name ;; alternate name: moves
   ((comp vec cons)
    :end-of-moves
-   (map format-name (hxc-move-names)))))
+   (map format-name (hxc-move-names))))
 
 (def move-name->move-code ;; alternate name: move-id
   (zipmap
-   move-names
+   move-code->move-name
    (range)))
 
 (def move-name->move-pp
diff -r eec3e69500d9 -r df9cad9909d2 clojure/com/aurellem/world/new_types.clj
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clojure/com/aurellem/world/new_types.clj	Thu Mar 29 13:49:40 2012 -0500
@@ -0,0 +1,5 @@
+(ns com.aurellem.world.new-types
+  (:import (com.aurelem.gb.gb_driver))
+  (:use (com.aurellem.gb hxc))
+  )
+  
diff -r eec3e69500d9 -r df9cad9909d2 clojure/com/aurellem/world/practice.clj
--- a/clojure/com/aurellem/world/practice.clj	Thu Mar 29 13:31:31 2012 -0500
+++ b/clojure/com/aurellem/world/practice.clj	Thu Mar 29 13:49:40 2012 -0500
@@ -1,6 +1,5 @@
 (ns com.aurellem.world.practice
  (:use (com.aurellem.gb saves util constants gb-driver vbm items assembly characters))
- (:use (com.aurellem.run title))
  (:use (com.aurellem.exp pokemon))
  (:use (com.aurellem.exp item-bridge))
  (:import [com.aurellem.gb.gb_driver SaveState]))
@@ -39,6 +38,7 @@
    ;(step [:r])
    ;(step [:r])
    ))
+
 (defn state-inject
   "I have replaced the letter e with e-acute @ 0xC4E8."
   []
@@ -80,8 +80,7 @@
        (range)
        (vec (memory state-1))
        (vec (memory state-2)))
-   )
-  )
+   ))