Merge https://github.com/kanzure/pokecrystal

Conflicts:
	constants.asm
	extras/crystal.py
	main.asm

original-commit-id: 7df002c3e20f1b728b1d29a877c3731d4867f502

1 files changed, 7 insertions, 6 deletions

diff --git a/graph.py b/graph.py
index 98f871a..b545083 100644
--- a/graph.py
+++ b/graph.py
@@ -1,12 +1,13 @@
-#!/usr/bin/python
-# author: Bryan Bishop <kanzure@gmail.com>
-# date: 2012-06-20
+# -*- coding: utf-8 -*-
 
 import networkx as nx
 
-from romstr import RomStr, DisAsm, \
-    relative_jumps, call_commands, \
-    relative_unconditional_jumps
+from romstr import (
+    RomStr,
+    relative_jumps,
+    call_commands,
+    relative_unconditional_jumps,
+)
 
 class RomGraph(nx.DiGraph):
     """ Graphs various functions pointing to each other.