Merge branch 'master' of https://github.com/iimarckus/pokered

Conflicts:
	main.asm

1 files changed, 7 insertions, 1 deletions

diff --git a/textpre.py b/textpre.py
index c4e65398..294e9ccb 100644
--- a/textpre.py
+++ b/textpre.py
@@ -262,6 +262,12 @@ chars = {
 
 preprocessor.chars = chars
 
+from extras.pokemontools.crystal import (
+	callchannel,
+	loopchannel,
+)
+
 config = configuration.Config()
-processor = preprocessor.Preprocessor(config, [])
+macros = [callchannel, loopchannel]
+processor = preprocessor.Preprocessor(config, macros)
 processor.preprocess()