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

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

original-commit-id: 7df002c3e20f1b728b1d29a877c3731d4867f502

1 files changed, 7 insertions, 2 deletions

diff --git a/labels.py b/labels.py
index a25fa3f..e57c6e2 100644
--- a/labels.py
+++ b/labels.py
@@ -1,7 +1,12 @@
-""" Various label/line-related functions.
+# -*- coding: utf-8 -*-
+"""
+Various label/line-related functions.
 """
 
-from pointers import calculate_pointer, calculate_bank
+from pointers import (
+    calculate_pointer,
+    calculate_bank,
+)
 
 def remove_quoted_text(line):
     """get rid of content inside quotes