From fc90df98950619e20b899898c2bb28b4997df828 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Tue, 24 Sep 2013 10:46:53 -0500
Subject: [PATCH 1/2] bump pokemontools to v1.4.1

Note that gbz8disasm doesn't work at the moment.
---
 extras          | 2 +-
 preprocessor.py | 4 ++--
 prequeue.py     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extras b/extras
index 7bf5fcab9..82fb73edc 160000
--- a/extras
+++ b/extras
@@ -1 +1 @@
-Subproject commit 7bf5fcab90a2861b4a8f5b5c193838ff3470a69f
+Subproject commit 82fb73edc3850e3601f085d84f7bba03fe6d7076
diff --git a/preprocessor.py b/preprocessor.py
index 54fc4cbff..da553081a 100644
--- a/preprocessor.py
+++ b/preprocessor.py
@@ -3,7 +3,7 @@
 
 import sys
 
-import extras.pokemontools.config as conf
+import extras.pokemontools.configuration as configiguration
 import extras.pokemontools.preprocessor as preprocessor
 
 from extras.pokemontools.crystal import (
@@ -50,7 +50,7 @@ def preprocess(config, macros, lines=None):
     return processor.preprocess(lines=lines)
 
 def main():
-    config = conf.Config()
+    config = configuration.Config()
     macros = load_pokecrystal_macros()
     return preprocess(config, macros)
 
diff --git a/prequeue.py b/prequeue.py
index c8b12fd70..2adb03bfb 100644
--- a/prequeue.py
+++ b/prequeue.py
@@ -8,12 +8,12 @@ a single process.
 import os
 import sys
 
-import extras.pokemontools.config as conf
+import extras.pokemontools.configuration as configuration
 
 import preprocessor
 
 def main():
-    config = conf.Config()
+    config = configuration.Config()
     macros = preprocessor.load_pokecrystal_macros()
 
     stdout = sys.stdout

From 2917a28242cbd201f637302aa848f053307a15ff Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 26 Sep 2013 17:26:00 -0500
Subject: [PATCH 2/2] fix a typo related to configuration

---
 preprocessor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/preprocessor.py b/preprocessor.py
index da553081a..5c71fe226 100644
--- a/preprocessor.py
+++ b/preprocessor.py
@@ -3,7 +3,7 @@
 
 import sys
 
-import extras.pokemontools.configuration as configiguration
+import extras.pokemontools.configuration as configuration
 import extras.pokemontools.preprocessor as preprocessor
 
 from extras.pokemontools.crystal import (