diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-11-09 13:23:04 -0800 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-11-09 13:23:04 -0800 |
| commit | ff55a23ece3f74ad30ef2f10d81c54f464d5988b (patch) | |
| tree | 4613e29f5eb1c932f5fb079b4a6239e9a77085b6 | |
| parent | 1d2239e091e9cbf9026ec5afe7e86b718b9b8f38 (diff) | |
| parent | 8f0b06f22ec09ad7c7ffbd73e7ae54eb2bb2c03d (diff) | |
Merge pull request #47 from kanzure/testing-fixups
Testing fixups
| -rw-r--r-- | pokemontools/vba/vba.py | 4 | ||||
| -rw-r--r-- | tests/tests.py | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pokemontools/vba/vba.py b/pokemontools/vba/vba.py index d7fdf1d..4b0bbee 100644 --- a/pokemontools/vba/vba.py +++ b/pokemontools/vba/vba.py @@ -19,8 +19,8 @@ from pokemontools.map_names import map_names import keyboard # just use a default config for now until the globals are removed completely -import pokemontools.config as conf -config = conf.Config() +import pokemontools.configuration as configuration +config = configuration.Config() project_path = config.path save_state_path = config.save_state_path rom_path = config.rom_path 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, |