Merge pull request #47 from kanzure/testing-fixups

Testing fixups
This commit is contained in:
Bryan Bishop
2013-11-09 13:23:04 -08:00
2 changed files with 6 additions and 3 deletions

View File

@@ -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

View File

@@ -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,