Merge pull request #221 from yenatch/more-objects

analyze the bytes

1 files changed, 13 insertions, 8 deletions

diff --git a/preprocessor.py b/preprocessor.py
index b5f2e3a4a..f5bc08637 100644
--- a/preprocessor.py
+++ b/preprocessor.py
@@ -25,6 +25,11 @@ from extras.pokemontools.audio import (
     Note,
 )
 
+from extras.pokemontools.battle_animations import (
+    BattleAnimWait,
+    battle_animation_classes,
+)
+
 def load_pokecrystal_macros():
     """
     Construct a list of macros that are needed for pokecrystal preprocessing.
@@ -48,20 +53,20 @@ def load_pokecrystal_macros():
     ourmacros += movement_command_classes
     ourmacros += music_classes
     ourmacros += effect_classes
+    ourmacros += battle_animation_classes + [BattleAnimWait]
 
     return ourmacros
 
-def preprocess(config, macros, lines=None):
-    """
-    Entry point for the preprocessor.
-    """
+def setup_processor():
+    config = configuration.Config()
+    macros = load_pokecrystal_macros()
     processor = preprocessor.Preprocessor(config, macros)
-    return processor.preprocess(lines=lines)
+    return processor
 
 def main():
-    config = configuration.Config()
-    macros = load_pokecrystal_macros()
-    return preprocess(config, macros)
+    processor = setup_processor()
+    processor.preprocess()
+    processor.update_globals
 
 # only run against stdin when not included as a module
 if __name__ == "__main__":