diff options
| -rw-r--r-- | pokemontools/vba/vba.py | 9 | ||||
| -rw-r--r-- | pokemontools/vba/vba_config.py | 11 |
2 files changed, 7 insertions, 13 deletions
diff --git a/pokemontools/vba/vba.py b/pokemontools/vba/vba.py index b715ca8..76df8ce 100644 --- a/pokemontools/vba/vba.py +++ b/pokemontools/vba/vba.py @@ -106,10 +106,15 @@ import com.aurellem.gb.Gb as Gb # load the vba-clojure library Gb.loadVBA() -from vba_config import * - import keyboard +# just use a default config for now until the globals are removed completely +import pokemontools.config as conf +config = conf.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)) diff --git a/pokemontools/vba/vba_config.py b/pokemontools/vba/vba_config.py deleted file mode 100644 index 3eb5983..0000000 --- a/pokemontools/vba/vba_config.py +++ /dev/null @@ -1,11 +0,0 @@ -# -*- coding: utf-8 -*- -import os - -# by default we assume the user has vba in pokecrystal/extras -project_path = os.path.abspath(os.path.join(os.path.dirname( __file__ ), '..')) - -# save states are in pokecrystal/save-states/ -save_state_path = os.path.join(project_path, "save-states") - -# where is your rom? -rom_path = os.path.join(project_path, "baserom.gbc") |