summaryrefslogtreecommitdiff
path: root/pokemontools/map_editor.py
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-11-17 17:39:02 -0600
committerBryan Bishop <kanzure@gmail.com>2013-11-17 17:39:02 -0600
commit2d59e4d3e07d3fe92c6463ce212a2c537f62160b (patch)
tree9fb3e013af33b22c7bedc6975bf2508facf70991 /pokemontools/map_editor.py
parent9e3105e5c043c87d22a934a89df9e7da4621220f (diff)
move import statements to top of map_editor.py
Diffstat (limited to 'pokemontools/map_editor.py')
-rw-r--r--pokemontools/map_editor.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pokemontools/map_editor.py b/pokemontools/map_editor.py
index 362a67f..52da243 100644
--- a/pokemontools/map_editor.py
+++ b/pokemontools/map_editor.py
@@ -9,6 +9,8 @@ from PIL import Image, ImageTk
import configuration
conf = configuration.Config()
+from preprocessor import separate_comment
+import gfx
#version = 'crystal'
version = 'red'
@@ -368,7 +370,6 @@ class Tileset:
def get_tiles(self):
filename = self.get_tileset_gfx_filename()
if not os.path.exists(filename):
- import gfx
gfx.to_png(filename.replace('.png','.2bpp'), filename)
self.img = Image.open(filename)
self.img.width, self.img.height = self.img.size
@@ -626,7 +627,6 @@ def db_values(line):
return macro_values(line, macro)
-from preprocessor import separate_comment
def asm_at_label(asm, label):
label_def = label + ':'