From 91b24953f615569d5130cb1ccceffa8149cc42c0 Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 7 Mar 2013 23:27:55 -0500 Subject: [PATCH 1/2] vba - suppress joypad input message --- extras/vba.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras/vba.py b/extras/vba.py index 8ed0d7b5a..61265765d 100644 --- a/extras/vba.py +++ b/extras/vba.py @@ -166,7 +166,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): From a46a4b35a2fa3ceefb6a283480a4e6a9efe8424c Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 7 Mar 2013 23:39:21 -0500 Subject: [PATCH 2/2] vba - generalize project path in config --- extras/vba_config.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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?