diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-08-27 11:18:30 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-27 11:18:30 -0500 |
| commit | ddc4a929058ff103cac5743ca39bb8e4b520ee90 (patch) | |
| tree | 9d986f9685c4c898e80aab898d199f5b72f9977b /preprocessor.py | |
| parent | c61b3d42ad4e88b32e9c321b7fcc559ec0220e64 (diff) | |
| parent | 94f5f61265b9654925b66dca7c3256668435eeea (diff) | |
Merge pull request #161 from kanzure/remove-extras
This merges branch 'remove-extras' into master. The extras/ path is now
replaced by a git submodule that is independently version controlled and
separate from the pokecrystal project.
The git submodule is a reference to v1.1.0 of this repository:
https://github.com/kanzure/pokemon-reverse-engineering-tools
It's also available as a generic python module now:
https://pypi.python.org/pypi/pokemontools
https://github.com/kanzure/pokecrystal/pull/161
Diffstat (limited to 'preprocessor.py')
| -rw-r--r-- | preprocessor.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/preprocessor.py b/preprocessor.py index e8e959c06..3b49af835 100644 --- a/preprocessor.py +++ b/preprocessor.py @@ -3,7 +3,7 @@ import sys -from extras.crystal import ( +from extras.pokemontools.crystal import ( command_classes, Warp, XYTrigger, |