changeset 620:1b52b14868d3 tip

merge.
author rlm <rlm@aurellem.org>
date Sun, 07 Feb 2016 23:16:04 -0800
parents 90575d3a64d1 (current diff) a79e5a852347 (diff)
children
files org/total-control.org
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/org/total-control.org	Sun Feb 07 23:15:40 2016 -0800
     1.2 +++ b/org/total-control.org	Sun Feb 07 23:16:04 2016 -0800
     1.3 @@ -204,7 +204,7 @@
     1.4  
     1.5  The entire video was completely produced by bots --- I didn't manually
     1.6  play the game at all to produce this speedrun. Here is a brief account
     1.7 -of the infrastructure I build to make the video.  The entire source of
     1.8 +of the infrastructure I built to make the video.  The entire source of
     1.9  the project is available at http://hg.bortreb.com/vba-clojure
    1.10  
    1.11  The first step was to build a programmatic interface to pokemon
    1.12 @@ -450,7 +450,7 @@
    1.13  sells for almost half of maximum money --- I use just 3 of them to
    1.14  finance the purchase of all the other items I need. 0x00 is also a
    1.15  NO-OP in the gameboy's machine language, which means that I can stick
    1.16 -them anywhere where I need to break up an other wise illegal pair of
    1.17 +them anywhere where I need to break up an otherwise illegal pair of
    1.18  opcodes. 0xFF is also extremely useful because it is the end-of-list
    1.19  sentinel. Normally, the game will "compact" your items whenever you
    1.20  make a purchase or deposit. For example, if you deposit a pokeball,