diff clojure/com/aurellem/gb/species.clj @ 215:aba78e52faba

merge
author Robert McIntyre <rlm@mit.edu>
date Fri, 23 Mar 2012 19:26:04 -0500
parents 62969eb07e04 57258c269bcb
children ca9d2897435b
line wrap: on
line diff
     1.1 --- a/clojure/com/aurellem/gb/species.clj	Fri Mar 23 19:25:21 2012 -0500
     1.2 +++ b/clojure/com/aurellem/gb/species.clj	Fri Mar 23 19:26:04 2012 -0500
     1.3 @@ -1,5 +1,7 @@
     1.4  (ns com.aurellem.gb.species
     1.5 -  (:use (com.aurellem.gb characters gb-driver util constants))
     1.6 +  (:use (com.aurellem.gb assembly characters gb-driver util
     1.7 +                         constants))
     1.8 +  (:use (com.aurellem.world practice))
     1.9    (:import [com.aurellem.gb.gb_driver SaveState]))
    1.10  
    1.11  
    1.12 @@ -11,7 +13,7 @@
    1.13           (partition name-length
    1.14                      (take (* count-species name-length)
    1.15                            (drop 0xE8000
    1.16 -                                (rom(root)))))))) 
    1.17 +                                (rom(root))))))))
    1.18  
    1.19  (def hxc-items
    1.20    "The hardcoded names of the items in memory. List begins at ROM@45B7 "
    1.21 @@ -61,9 +63,16 @@
    1.22                                       (drop 0x71500
    1.23                                             (rom (root))))))))
    1.24  
    1.25 +
    1.26 +(def hxc-dialog
    1.27 +  "The hardcoded dialogue in memory, including in-game alerts. List begins at ROM@98000."
    1.28 +(character-codes->str(take 0x0F728
    1.29 +                          (drop (+ 0x98000)
    1.30 +                                (rom (root)))))
    1.31 +
    1.32  (def hxc-later
    1.33    "Running this code produces, e.g. hardcoded names NPCs give
    1.34 -their pokemon"
    1.35 +their pokemon. Will sort through it later."
    1.36  (print (character-codes->str(take 10000
    1.37                            (drop 0x71597
    1.38                                  (rom (root)))))))
    1.39 @@ -71,6 +80,9 @@
    1.40  
    1.41  
    1.42  
    1.43 +
    1.44 +
    1.45 +
    1.46  (let [dex
    1.47        (partition-by #(= 0x50 %)
    1.48                      (take 2540
    1.49 @@ -154,7 +166,7 @@
    1.50     0x52  :vulpix
    1.51     0x53  :ninetails
    1.52     0x54  :pikachu
    1.53 -   0x55  :raichu
    1.54 +   0x55  :riachu
    1.55     0x58  :dratini
    1.56     0x59  :dragonair
    1.57     0x5A  :kabuto
    1.58 @@ -292,6 +304,4 @@
    1.59    ([poke-num new-species]
    1.60       (set-species2 @current-state poke-num new-species)))
    1.61  
    1.62 -
    1.63 -
    1.64 -
    1.65 +     
    1.66 \ No newline at end of file