summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-09-11 12:25:47 -0700
committerBryan Bishop <kanzure@gmail.com>2013-09-11 12:25:47 -0700
commit622534ca73b22b73d9a5c3e865502c9f874ee0bf (patch)
treea7aaa1d14a04ad5cab70c079f2d00616745e56a2
parent50341bae50b4318800dcea5694e95b239ed8fbb0 (diff)
parentef77506d94991b5909473eb8c8902ee1415d727c (diff)
Merge pull request #26 from kanzure/fix-pokered-paths
fix pokered paths in redtools Argh, these need to go away.
-rw-r--r--redtools/extract_maps.py5
-rw-r--r--redtools/pokered_dir.py6
2 files changed, 7 insertions, 4 deletions
diff --git a/redtools/extract_maps.py b/redtools/extract_maps.py
index bc0a193..d1f6b71 100644
--- a/redtools/extract_maps.py
+++ b/redtools/extract_maps.py
@@ -2,12 +2,13 @@
#date: 2012-01-02
#url: http://hax.iimarck.us/files/rbheaders.txt
import json
+import os
#parse hex values as base 16 (see calculate_pointer)
base = 16
-#where to load the rom from
-rom_filename = "../baserom.gbc"
+# TODO: load the rom based on config.rom_path
+rom_filename = os.path.join(os.getcwd(), "baserom.gbc")
rom = None #load the rom later
#map header pointers start at 0x1AE
diff --git a/redtools/pokered_dir.py b/redtools/pokered_dir.py
index 6913783..7d7056d 100644
--- a/redtools/pokered_dir.py
+++ b/redtools/pokered_dir.py
@@ -1,4 +1,6 @@
import os
-#main dir of repo (simply one level up than here)
-pokered_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+# TODO: use actual configuration
+# Assume that the main pokered project dir is the current working directory
+# (cwd).
+pokered_dir = os.getcwd()