changeset 408:7116b3f51ba8

merge dylan's changes.
author Robert McIntyre <rlm@mit.edu>
date Fri, 13 Apr 2012 11:33:56 -0500
parents bca0abd39db5 (current diff) 03ade2a04458 (diff)
children 55a45f67e4a4 a2319e29205b
files
diffstat 1 files changed, 31 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/org/rom.org	Fri Apr 13 11:32:52 2012 -0500
     1.2 +++ b/org/rom.org	Fri Apr 13 11:33:56 2012 -0500
     1.3 @@ -716,6 +716,13 @@
     1.4  
     1.5  * Types
     1.6  ** Names of types
     1.7 +
     1.8 +*** COMMENT Pointers to type names
     1.9 +#+begin_src clojure :exports both :results output
    1.10 +(map (comp character-codes->str #(take-while (partial not= 80) (drop % (rom))) (partial + 0x20000) (partial apply low-high)) (partition 2 (take 54 (drop 0x27D63 (rom)))))
    1.11 +#+end_src
    1.12 +
    1.13 +
    1.14  ***
    1.15  #+begin_src clojure :exports both :results output 
    1.16  (ns com.aurellem.gb.hxc
    1.17 @@ -1066,7 +1073,7 @@
    1.18  |                   | <15>            | <15>            | <15>            |
    1.19  | 0233C-            | Shop inventories. |                 |                 |
    1.20  | 04495-            | Prices of items. | Each price is two bytes of binary-coded decimal. Prices are separated by zeroes. Priceless items[fn::Like the Pok\eacute{}dex and other unsellable items.] are given a price of zero. | The cost of lemonade is 0x03 0x50, which translates to a price of ₱350. |
    1.21 -| 045B7-0491E       | Names of the items in memory. | Variable-length item names (strings of character codes). Names are separated by a single 0x80 character. | MASTER BALL#ULTRA BALL#... |
    1.22 +| 045B7-0491E       | Names of the items in memory. | Variable-length item names (strings of character codes). Names are separated by a single 0x50 character. | MASTER BALL#ULTRA BALL#... |
    1.23  | 04D89-            | Lists of wild Pok\eacute{}mon to encounter in each region. | Each list contains ten Pokemon (ids) and their levels; twenty bytes in total. First, the level of the first Pokemon. Then the internal id of the first Pokemon. Next, the level of the second Pokemon, and so on. Since Pokemon cannot have level 0, the lists are separated by a pair 0 /X/, where /X/ is an apparently random Pokemon id. | The first list is (3 36 4 36 2 165 3 165 2 36 3 36 5 36 4 165 6 36 7 36 0 25), i.e. level 3 pidgey, level 4 pidgey, level 2 rattata, level 3 rattata, level 2 pidgey, level 3 pidgey, level 5 pidgey, level 4 rattata, level 6 pidgey, level 7 pidgey, \ldquo{}level 0 gastly\rdquo{} (i.e., end-of-list). |
    1.24  | 05EDB.            | Which Pok\eacute{}mon to show during Prof. Oak's introduction. | A single byte, the Pok\eacute{}mon's internal id. | In Pok\eacute{}mon Yellow, it shows Pikachu during the introduction; Pikachu's internal id is 0x54. |
    1.25  | 06698-            | ? Background music. |                 |                 |
    1.26 @@ -1081,8 +1088,11 @@
    1.27  | 1195C-1196A       | The two terms for being able/unable to learn a TM/HM. | Variable-length strings separated by 0x50. | ABLE#NOT ABLE#  |
    1.28  | 119C0-119CE       | The two terms for being able/unable to evolve using the current stone. | Variable-length strings separated by 0x50. | ABLE#NOT ABLE#  |
    1.29  | 1232D-12364       | Which moves are taught by the TMs and HMs | A list of 55 move ids (50 TMs, plus 5 HMs). First, the move that will be taught by TM01; second, the move that will be taught by TM02; and so on. The last five entries are the moves taught by HMs 1-5. (See also, BC000 below) | The first few entries are (5 13 14 18 ...) corresponding to Mega Punch (TM01), Razor Wind (TM02), Swords Dance (TM03), Whirlwind (TM04), ... |
    1.30 -| 27D99-27DFF       | Names of the Pok\eacute{}mon types. | Variable-length type names (strings of character codes). Names are separated by a single 0x80 character. | NORMAL#FIGHTING#... |
    1.31 -| 27E77-            | Trainer title names. | Variable-length names separated by 0x80. | YOUNGSTER#BUG CATCHER#LASS#... |
    1.32 +|-------------------+-----------------+-----------------+-----------------|
    1.33 +| 27D56 & 27D57.    | Pointer to the list of type pointers. |                 |                 |
    1.34 +| 27D63-27D99       | Pointers to type names. | Each point is a low-byte, high-byte pair. The names of types follows immediately after this section; see below. | The first pointer is [0x99 0x7D], corresponding to the location 0x2.7D.99, the NORMAL type. |
    1.35 +| 27D99-27DFF       | Names of the Pok\eacute{}mon types. | Variable-length type names (strings of character codes). Names are separated by a single 0x50 character. | NORMAL#FIGHTING#... |
    1.36 +| 27E77-            | Trainer title names. | Variable-length names separated by 0x50. | YOUNGSTER#BUG CATCHER#LASS#... |
    1.37  | 34000-            |                 |                 |                 |
    1.38  | 38000-383DE       | The basic properties and effects of moves. (165 moves total) | Fixed-length (6 byte) continguous descriptions (no separating character): move-index, move-effect, power, move-type, accuracy, pp. | The entry for Pound, the first attack in the list, is (1 0 40 0 255 35). See below for more explanation. |
    1.39  | 383DE-            | Species data for the Pokemon, listed in Pokedex order: Pokedex number; base moves; types; learnable TMs and HMs; base HP, attack, defense, speed, special; sprite data. |                 |                 |
    1.40 @@ -1096,7 +1106,7 @@
    1.41  | 7C249-7C2??       | Pointers to background music, pt II. |                 |                 |
    1.42  | 98000-            | Dialogue        |                 |                 |
    1.43  | B8000-            | The text of each Pokemon's Pok\eacute{}dex entry. |                 |                 |
    1.44 -| BC000-BC60E       | Move names.     | Variable-length move names, separated by 0x80. The moves are in internal order. | POUND#KARATE CHOP#DOUBLESLAP#COMET PUNCH#... |
    1.45 +| BC000-BC60E       | Move names.     | Variable-length move names, separated by 0x50. The moves are in internal order. | POUND#KARATE CHOP#DOUBLESLAP#COMET PUNCH#... |
    1.46  | E8000-E876C       | Names of the \ldquo{}190\rdquo{} species of Pok\eacute{}mon in memory. | Fixed length (10-letter) Pok\eacute{}mon names. Any extra space is padded with the character 0x80. The names are in \ldquo{}internal order\rdquo{}. | RHYDON####KANGASKHANNIDORAN♂#... |
    1.47  |                   |                 |                 |                 |
    1.48  |                   |                 |                 |                 |
    1.49 @@ -1585,6 +1595,23 @@
    1.50      (take 0xFFF (drop 0x8800 (memory state))))))
    1.51  
    1.52  
    1.53 +(defn test-2 []
    1.54 +  (loop [n 0
    1.55 +         pc-1 (pc-trail (-> state-defend (tick) (step [:a]) (step [:a]) (step []) (nstep 100)) 100000)
    1.56 +         pc-2 (pc-trail (-> state-speed (tick) (step [:a]) (step [:a])
    1.57 +  (step []) (nstep 100)) 100000)]
    1.58 +    (cond (empty? (drop n pc-1)) [pc-1 n]
    1.59 +          (not= (take 10 (drop n pc-1)) (take 10 pc-2))
    1.60 +          (recur  pc-1 pc-2 (inc n))
    1.61 +          :else
    1.62 +          [(take 1000 pc-2) n])))
    1.63 +
    1.64 +
    1.65 +
    1.66 +
    1.67 +
    1.68 +
    1.69 +
    1.70  (comment 
    1.71  
    1.72  (def hxc-later