changeset 215:aba78e52faba

merge
author Robert McIntyre <rlm@mit.edu>
date Fri, 23 Mar 2012 19:26:04 -0500
parents 62969eb07e04 (current diff) 57258c269bcb (diff)
children d7f2e0384d24
files clojure/com/aurellem/gb/species.clj
diffstat 2 files changed, 45 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/clojure/com/aurellem/gb/characters.clj	Fri Mar 23 19:25:21 2012 -0500
     1.2 +++ b/clojure/com/aurellem/gb/characters.clj	Fri Mar 23 19:26:04 2012 -0500
     1.3 @@ -2,17 +2,40 @@
     1.4    (:use (com.aurellem.gb gb-driver constants))
     1.5    (:import [com.aurellem.gb.gb_driver SaveState]))
     1.6  
     1.7 +
     1.8 +(def pronouns
     1.9 +  ;; Note: 0x0 seems to be the end-of-name sentinel
    1.10 +  {
    1.11 +   ;; what is 0x57? what is 0x0?
    1.12 +   :RED [0x52]
    1.13 +   :BLUE [0x53]
    1.14 +   :opponent [0x01 0x49 0xD0 0x0]
    1.15 +   :turn-pokemon [0x5A]
    1.16 +   :off-turn-pokemon [0x59]
    1.17 +   :your-pokemon [0x01 0x08 0xD0 0x0]
    1.18 +   :opponent-pokemon [0x50 0x01 0xD9 0xCF 0x0]
    1.19 +
    1.20 +   :n-times [0x50 0x09 0x05 0xCD 0x11 0x0]
    1.21 +   
    1.22 +   
    1.23 +   })
    1.24 +
    1.25 +
    1.26  (def character-code->character
    1.27    {
    1.28 -   0x00   "<";;"end-of-name-sentinel" ;; begin messsage
    1.29 -   0x4E   "[...]" ; ocsenave: scroll pokedex page
    1.30 +   0x0 "" ;; separator character?
    1.31 +   0x58 "\n"
    1.32 +   ;0x00   "<";;"end-of-name-sentinel" ;; begin messsage
    1.33 +   ;;0x49   "\n //" ;; ocsenave: pagebreak pokedex
    1.34 +   ;;0x4E   "\n..." ; ocsenave: clearscroll pokedex page
    1.35     0x4F   "\n" ; newline
    1.36 -   0x50   "#";;"end-of-pokemon-name-sentinel"
    1.37 +   ;;0x50   "#";;"end-of-pokemon-name-sentinel"
    1.38     0x51   "\n\n" ;; ocsenave: clear screen
    1.39 +   0x52 "[RED]" ;;ocsenave: placeholder for your name?
    1.40     0x54   "[POKE]"
    1.41     0x55   "_" ;; ocsenave: breaking space?
    1.42 -   0x57   ">" ;; ocsenave: end message
    1.43 -   0x5F   ">" ;; ocsenave: end pokedex entry??
    1.44 +   ;0x57   ">" ;; ocsenave: end message
    1.45 +   ;0x5F   ">" ;; ocsenave: end pokedex entry??
    1.46     0x60   "A-bold"
    1.47     0x61   "B-bold"
    1.48     0x62   "C-bold"
     2.1 --- a/clojure/com/aurellem/gb/species.clj	Fri Mar 23 19:25:21 2012 -0500
     2.2 +++ b/clojure/com/aurellem/gb/species.clj	Fri Mar 23 19:26:04 2012 -0500
     2.3 @@ -1,5 +1,7 @@
     2.4  (ns com.aurellem.gb.species
     2.5 -  (:use (com.aurellem.gb characters gb-driver util constants))
     2.6 +  (:use (com.aurellem.gb assembly characters gb-driver util
     2.7 +                         constants))
     2.8 +  (:use (com.aurellem.world practice))
     2.9    (:import [com.aurellem.gb.gb_driver SaveState]))
    2.10  
    2.11  
    2.12 @@ -11,7 +13,7 @@
    2.13           (partition name-length
    2.14                      (take (* count-species name-length)
    2.15                            (drop 0xE8000
    2.16 -                                (rom(root)))))))) 
    2.17 +                                (rom(root))))))))
    2.18  
    2.19  (def hxc-items
    2.20    "The hardcoded names of the items in memory. List begins at ROM@45B7 "
    2.21 @@ -61,9 +63,16 @@
    2.22                                       (drop 0x71500
    2.23                                             (rom (root))))))))
    2.24  
    2.25 +
    2.26 +(def hxc-dialog
    2.27 +  "The hardcoded dialogue in memory, including in-game alerts. List begins at ROM@98000."
    2.28 +(character-codes->str(take 0x0F728
    2.29 +                          (drop (+ 0x98000)
    2.30 +                                (rom (root)))))
    2.31 +
    2.32  (def hxc-later
    2.33    "Running this code produces, e.g. hardcoded names NPCs give
    2.34 -their pokemon"
    2.35 +their pokemon. Will sort through it later."
    2.36  (print (character-codes->str(take 10000
    2.37                            (drop 0x71597
    2.38                                  (rom (root)))))))
    2.39 @@ -71,6 +80,9 @@
    2.40  
    2.41  
    2.42  
    2.43 +
    2.44 +
    2.45 +
    2.46  (let [dex
    2.47        (partition-by #(= 0x50 %)
    2.48                      (take 2540
    2.49 @@ -154,7 +166,7 @@
    2.50     0x52  :vulpix
    2.51     0x53  :ninetails
    2.52     0x54  :pikachu
    2.53 -   0x55  :raichu
    2.54 +   0x55  :riachu
    2.55     0x58  :dratini
    2.56     0x59  :dragonair
    2.57     0x5A  :kabuto
    2.58 @@ -292,6 +304,4 @@
    2.59    ([poke-num new-species]
    2.60       (set-species2 @current-state poke-num new-species)))
    2.61  
    2.62 -
    2.63 -
    2.64 -
    2.65 +     
    2.66 \ No newline at end of file