diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-03-07 21:05:14 -0800 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-03-07 21:05:14 -0800 |
| commit | 36a0acbde17ede24152840257e8f12918cd9c6b6 (patch) | |
| tree | d206f64907b5f6bfcccbeb5624040efe161c0ad8 | |
| parent | 6a3cf4e39391560ec978432ec797ce77d13cd76b (diff) | |
| parent | a46a4b35a2fa3ceefb6a283480a4e6a9efe8424c (diff) | |
Merge pull request #122 from yenatch/master
vba config shouldn't need fiddling out of the box
| -rw-r--r-- | extras/vba.py | 2 | ||||
| -rw-r--r-- | extras/vba_config.py | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/extras/vba.py b/extras/vba.py index b57e8e699..317f70540 100644 --- a/extras/vba.py +++ b/extras/vba.py @@ -175,7 +175,7 @@ def button_combiner(buttons): for each in buttons: result |= button_masks[each] - print "button: " + str(result) + #print "button: " + str(result) return result def load_rom(path=None): diff --git a/extras/vba_config.py b/extras/vba_config.py index 8377c8818..4433f16c0 100644 --- a/extras/vba_config.py +++ b/extras/vba_config.py @@ -2,13 +2,10 @@ # -*- encoding: utf-8 -*- import os -# by default we assume the user has things in their $HOME -home = os.path.expanduser("~") # or System.getProperty("user.home") +# by default we assume the user has vba in pokecrystal/extras +project_path = os.path.abspath(os.path.join(os.path.dirname( __file__ ), '..')) -# and that the pokecrystal project folder is in there somewhere -project_path = os.path.join(home, os.path.join("code", "pokecrystal")) - -# save states are in ~/code/pokecrystal/save-states/ +# save states are in pokecrystal/save-states/ save_state_path = os.path.join(project_path, "save-states") # where is your rom? |