Merge pull request #205 from kanzure/attempt-pokemontools-bump

Bump pokemontools to v1.4.1
This commit is contained in:
Bryan Bishop 2013-09-26 15:27:52 -07:00
commit 4b88052208
3 changed files with 5 additions and 5 deletions

2
extras

@ -1 +1 @@
Subproject commit 7bf5fcab90a2861b4a8f5b5c193838ff3470a69f
Subproject commit 82fb73edc3850e3601f085d84f7bba03fe6d7076

View File

@ -3,7 +3,7 @@
import sys
import extras.pokemontools.config as conf
import extras.pokemontools.configuration as configuration
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)

View File

@ -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