summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-11-17 11:22:27 -0800
committerBryan Bishop <kanzure@gmail.com>2013-11-17 11:22:27 -0800
commit59fd9978d90c91fedecd23cc175d1e6eb40026da (patch)
tree7acf487b71b45cf6d18224cff608927264de4d47
parentb65d8a7833b16e78a9e4936f3a2140c04c2cf534 (diff)
parent9f55db88039fd7020508ab9a28c8740ef053967d (diff)
Merge pull request #54 from kanzure/fix-gfx-config
Make gfx.py not depend on crystal.py
-rw-r--r--pokemontools/gfx.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/pokemontools/gfx.py b/pokemontools/gfx.py
index c7c6bec..1113b1a 100644
--- a/pokemontools/gfx.py
+++ b/pokemontools/gfx.py
@@ -5,12 +5,14 @@ import sys
import png
from math import sqrt, floor, ceil
-import crystal
+import configuration
+config = configuration.Config()
+
import pokemon_constants
import trainers
if __name__ != "__main__":
- rom = crystal.load_rom()
+ rom = romstr.RomStr(filename=config.rom_path)
def hex_dump(input, debug=True):
"""