vba-clojure: clojure/com/aurellem/gb/hxc.clj comparison

comparison clojure/com/aurellem/gb/hxc.clj @ 288:eec3e69500d9

Made hxc-pokenames and hxc-items return keywords instead of strings by default; added hxc-pokenames-raw and hxc-items-raw for the string version.

author	Dylan Holmes <ocsenave@gmail.com>
date	Thu, 29 Mar 2012 13:31:31 -0500
parents	33c546273619
children	c31cb3043087

comparison

equal deleted inserted replaced

-:7918c0dcc0bd
+:eec3e69500d9
 (ns com.aurellem.gb.hxc
 (:use (com.aurellem.gb assembly characters gb-driver util
 constants species))
-(:use (com.aurellem.world practice))
+;; (:use (com.aurellem.world practice))
 (:import [com.aurellem.gb.gb_driver SaveState]))
 ; ************* HANDWRITTEN CONSTANTS
-(defn low-high
-[low high]
-(+ low (* 256 high)))
-(defn format-name
-"Convert the string of alphabetic/space characters into a keyword by
-replacing spaces with hyphens and converting to lowercase."
-[s]
-(if (nil? s) nil
-(keyword (.toLowerCase
-(apply str
-(map #(if (= % \space) "-" %) s))))))
-;; used to decode item prices
-(defn decode-bcd
-"Take a sequence of binary-coded digits (in written order) and return the number they represent."
-[digits]
-((fn self [coll]
-(if (empty? coll) 0
-(+ (first coll) (* 100 (self (rest coll))))))
-(map
-#(+ (* 10 (int (/ % 16)))
-(rem % 16))
-(reverse digits))))
 (def pkmn-types
 [:normal    ;;0
 :fighting  ;;1
 :flying    ;;2
 hxc-thunk))
 ;; --------------------------------------------------
-(def hxc-items
+(defn hxc-pokenames-raw
+"The hardcoded names of the 190 species in memory. List begins at
+ROM@E8000. Although names in memory are padded with 0x50 to be 10 characters
+long, these names are stripped of padding. See also, hxc-pokedex-names"
+([]
+(hxc-pokenames-raw com.aurellem.gb.gb-driver/original-rom))
+([rom]
+(let [count-species 190
+name-length 10]
+(map character-codes->str
+(partition name-length
+(map #(if (= 0x50 %) 0x00 %)
+(take (* count-species name-length)
+(drop 0xE8000
+rom))))))))
+(def hxc-pokenames
+(comp
+(partial map format-name)
+hxc-pokenames-raw))
+(defn hxc-pokedex-names
+"The names of the pokemon in hardcoded pokedex order. List begins at
+ROM@410B1. See also, hxc-pokenames."
+([] (hxc-pokedex-names
+com.aurellem.gb.gb-driver/original-rom))
+([rom]
+(let [names (hxc-pokenames rom)]
+(#(mapv %
+((comp range count keys) %))
+(zipmap
+(take (count names)
+(drop 0x410b1 rom))
+names)))))
+(def hxc-items-raw
 "The hardcoded names of the items in memory. List begins at
 ROM@045B7"
 (hxc-thunk-words 0x45B7 870))
 (def hxc-types
 "The hardcoded names of the trainer titles in memory. List begins at
 ROM@27E77"
 (hxc-thunk-words 0x27E77 196))
-(def hxc-pokedex-text*
+(def hxc-pokedex-text-raw
 "The hardcoded pokedex entries in memory. List begins at
 ROM@B8000, shortly before move names."
 (hxc-thunk-words 0xB8000 14754))
+(def hxc-items
+"The hardcoded names of the items in memory, presented as
+keywords. List begins at ROM@045B7. See also, hxc-items-raw."
+(comp (partial map format-name) hxc-items-raw))
 (defn hxc-pokedex-text
 "The hardcoded pokedex entries in memory, presented as an
 associative hash map. List begins at ROM@B8000."
 ([] (hxc-pokedex-text com.aurellem.gb.gb-driver/original-rom))
 ([rom]
 (zipmap
 (hxc-pokedex-names rom)
 (cons nil ;; for missingno.
-(hxc-pokedex-text* rom)))))
+(hxc-pokedex-text-raw rom)))))
 ;; In red/blue, pokedex stats are in internal order.
 ;; In yellow, pokedex stats are in pokedex order.
 (defn hxc-pokedex-stats
 "The hardcoded pokedex stats (species height weight) in memory. List
 begins at ROM@40687"
-;; uses hxc-pokedex-text to count pokemon
-;; since hxc-pokenames includes several missingno"
 ([] (hxc-pokedex-stats com.aurellem.gb.gb-driver/original-rom))
 ([rom]
-(let [poketext (hxc-pokedex-text rom)
+(let [pokedex-names (zipmap (range) (hxc-pokedex-names rom))
-pkmn-count (count poketext)
+pkmn-count (count pokedex-names)
-pokedex-names (zipmap (range) (hxc-pokedex-names rom))
 ]
 ((fn capture-stats
 [n stats data]
 (if (zero? n) stats
 (let [[species
 (range)
 moves)
 dec)
 (take 100
 (drop 0x1232D rom))))))))
-(defn hxc-pokenames
-"The hardcoded names of the 190 species in memory. List begins at
-ROM@E8000. Although names in memory are padded with 0x50 to be 10 characters
-long, these names are stripped of padding. See also, hxc-pokedex-names"
-([]
-(hxc-pokenames com.aurellem.gb.gb-driver/original-rom))
-([rom]
-(let [count-species 190
-name-length 10]
-(map character-codes->str
-(partition name-length
-(map #(if (= 0x50 %) 0x00 %)
-(take (* count-species name-length)
-(drop 0xE8000
-rom))))))))
-(defn hxc-pokedex-names
-"The names of the pokemon in hardcoded pokedex order. List begins at
-ROM@410B1. See also, hxc-pokenames."
-([] (hxc-pokedex-names
-com.aurellem.gb.gb-driver/original-rom))
-([rom]
-(let [names (hxc-pokenames rom)]
-(#(mapv %
-((comp range count keys) %))
-(zipmap
-(take (count names)
-(drop 0x410b1 rom))
-(map format-name names))))))
 (defn internal-id
 ([rom]
 (zipmap
-(map format-name (hxc-pokenames rom))
+(hxc-pokenames rom)
 (range)))
 ([]
 (internal-id com.aurellem.gb.gb-driver/original-rom)))
 "A hardcoded collection of 190 pointers to alternating evolution/learnset data,
 in internal order."
 ([]
 (hxc-ptrs-evolve com.aurellem.gb.gb-driver/original-rom))
 ([rom]
-(let [names (hxc-pokenames rom)
+(let [
-pkmn-count (count names)
+pkmn-count (count (hxc-pokenames-raw)) ;; 190
 ptrs
 (map (fn [[a b]] (low-high a b))
 (partition 2
 (take (* 2 pkmn-count)
 (drop 0x3b1e5 rom))))]
 ([] (hxc-learnsets com.aurellem.gb.gb-driver/original-rom))
 ([rom]
 (apply assoc
 {}
 (interleave
-(map format-name (hxc-pokenames rom))
+(hxc-pokenames rom)
 (map (comp
 (partial map
 (fn [[lvl mv]] [lvl (dec mv)]))
 (partial partition 2)
 ;; keep the learnset data
 sorted by internal order. Pointers to the data exist at ROM@3B1E5; see also, hxc-ptrs-evolve."
 ([] (hxc-evolution com.aurellem.gb.gb-driver/original-rom))
 ([rom]
 (apply assoc {}
 (interleave
-(map format-name (hxc-pokenames rom))
+(hxc-pokenames rom)
 (map
 (comp
 format-evo
 (partial take-while (comp not zero?))
 #(drop % rom))
 "Like hxc-evolution, except it uses the names of items and pokemon
 --- grabbed from ROM --- rather than their numerical identifiers."
 ([] (hxc-evolution-pretty com.aurellem.gb.gb-driver/original-rom))
 ([rom]
 (let
-[poke-names (vec (map format-name (hxc-pokenames rom)))
+[poke-names (vec (hxc-pokenames rom))
-item-names (vec (map format-name (hxc-items rom)))
+item-names (vec (hxc-items rom))
 use-names
 (fn [m]
 (loop [ks (keys m) new-map m]
 (let [k (first ks)]
 (cond (nil? ks) new-map
 (into {}
 (map (fn [[pkmn evo-coll]]
 [pkmn (map use-names evo-coll)])
 (hxc-evolution rom))))))
 (defn hxc-pokemon-base
 ([] (hxc-pokemon-base com.aurellem.gb.gb-driver/original-rom))
 ([rom]
 moves (apply assoc {}
 (interleave
 (range)
 (map format-name
 (hxc-move-names rom))))
+machines (hxc-machines)
 ]
 (zipmap
 pokemon
 (map
 (fn [[n
 (defn hxc-item-prices
 "The hardcoded list of item prices in memory. List begins at ROM@4495"
 ([] (hxc-item-prices com.aurellem.gb.gb-driver/original-rom))
 ([rom]
-(let [items (map format-name (hxc-items rom))
+(let [items (hxc-items rom)
 price-size 3]
 (zipmap items
 (map (comp
 ;; zero-cost items are "priceless"
 #(if (zero? %) :priceless %)
 (drop 0x4495 rom))))))))
 (defn hxc-shops
 ([] (hxc-shops com.aurellem.gb.gb-driver/original-rom))
 ([rom]
-(let [items (zipmap (range) (map format-name (hxc-items rom)))
+(let [items (zipmap (range) (hxc-items rom))
 ;; temporarily softcode the TM items
 items (into
 items
 (map (juxt identity
 ;; ********************** MANIPULATION FNS
 (defn same-type
 ([pkmn move]
-(same-type?
+(same-type
 com.aurellem.gb.gb-driver/original-rom pkmn move))
 ([rom pkmn move]
 (((comp :types (hxc-pokemon-base rom)) pkmn)
 ((comp :type (hxc-move-data rom)) move))))

Mercurial > vba-clojure

comparison clojure/com/aurellem/gb/hxc.clj @ 288:eec3e69500d9