diff --git a/extras b/extras index 7aa016fb..2374a9ce 160000 --- a/extras +++ b/extras @@ -1 +1 @@ -Subproject commit 7aa016fb528bcc8dcb30c6a887957851623eccc0 +Subproject commit 2374a9ce905ccc4c701f81904b01019641e884b5 diff --git a/textpre.py b/textpre.py index 4a5fb116..c4e65398 100644 --- a/textpre.py +++ b/textpre.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import extras.pokemontools.preprocessor as preprocessor +import extras.pokemontools.configuration as configuration import sys @@ -261,6 +262,6 @@ chars = { preprocessor.chars = chars -macros = [] -macro_table = preprocessor.make_macro_table(macros) -preprocessor.preprocess(macro_table) +config = configuration.Config() +processor = preprocessor.Preprocessor(config, []) +processor.preprocess()