diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-11-09 15:25:34 -0600 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-11-09 15:25:34 -0600 |
| commit | 54e2b189b8b9765d17d4c0d05675ac70c2bec2ac (patch) | |
| tree | a3173186236a8e730977c3cba6dbb241daf84878 /tests/tests.py | |
| parent | b363e6cca00c05687c34d735abb93d5117f7b209 (diff) | |
| parent | ff55a23ece3f74ad30ef2f10d81c54f464d5988b (diff) | |
Merge branch 'master' into vba-automation
Conflicts:
pokemontools/vba/vba.py
Diffstat (limited to 'tests/tests.py')
| -rw-r--r-- | tests/tests.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/tests.py b/tests/tests.py index 7919a66..4398f03 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -38,6 +38,10 @@ from pokemontools.labels import ( find_labels_without_addresses, ) +from pokemontools.crystalparts.old_parsers import ( + old_parse_map_header_at, +) + from pokemontools.helpers import ( grouper, index, @@ -66,7 +70,6 @@ from pokemontools.crystal import ( all_labels, write_all_labels, parse_map_header_at, - old_parse_map_header_at, process_00_subcommands, parse_all_map_headers, translate_command_byte, |