# HG changeset patch
# User rlm <rlm@aurellem.org>
# Date 1454915764 28800
# Node ID 1b52b14868d31db16c2b707d77e75557be07d1bc
# Parent  90575d3a64d16bbccc91f589aac534b4a13e68dd# Parent  a79e5a85234753987af761e0bbf8b2d0b40cdbe7
merge.

diff -r 90575d3a64d1 -r 1b52b14868d3 org/total-control.org
--- a/org/total-control.org	Sun Feb 07 23:15:40 2016 -0800
+++ b/org/total-control.org	Sun Feb 07 23:16:04 2016 -0800
@@ -204,7 +204,7 @@
 
 The entire video was completely produced by bots --- I didn't manually
 play the game at all to produce this speedrun. Here is a brief account
-of the infrastructure I build to make the video.  The entire source of
+of the infrastructure I built to make the video.  The entire source of
 the project is available at http://hg.bortreb.com/vba-clojure
 
 The first step was to build a programmatic interface to pokemon
@@ -450,7 +450,7 @@
 sells for almost half of maximum money --- I use just 3 of them to
 finance the purchase of all the other items I need. 0x00 is also a
 NO-OP in the gameboy's machine language, which means that I can stick
-them anywhere where I need to break up an other wise illegal pair of
+them anywhere where I need to break up an otherwise illegal pair of
 opcodes. 0xFF is also extremely useful because it is the end-of-list
 sentinel. Normally, the game will "compact" your items whenever you
 make a purchase or deposit. For example, if you deposit a pokeball,