Merge branch 'master' into vba-automation

Conflicts:
	pokemontools/vba/vba.py

2 files changed, 11 insertions, 1 deletions

diff --git a/pokemontools/vba/vba.py b/pokemontools/vba/vba.py
index 3367dee..cb0070d 100644
--- a/pokemontools/vba/vba.py
+++ b/pokemontools/vba/vba.py
@@ -22,6 +22,13 @@ import keyboard
 
 # just use a default config for now until the globals are removed completely
 import pokemontools.configuration as configuration
+config = configuration.Config()
+project_path = config.path
+save_state_path = config.save_state_path
+rom_path = config.rom_path
+
+if not os.path.exists(rom_path):
+    raise Exception("rom_path is not configured properly; edit vba_config.py? " + str(rom_path))
 
 import vba_wrapper
 
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,