Merge branch 'master' into path-finding

2 files changed, 15 insertions, 7 deletions

diff --git a/pokemontools/audio.py b/pokemontools/audio.py
index 1cce1fe..38fd65f 100644
--- a/pokemontools/audio.py
+++ b/pokemontools/audio.py
@@ -8,14 +8,19 @@ from gbz80disasm import get_global_address, get_local_address
 
 import crystal
 from crystal import music_classes as sound_classes
-from crystal import Command
 
-from crystal import load_rom
+from crystal import (
+    Command,
+    SingleByteParam,
+    MultiByteParam,
+    load_rom,
+)
+
 rom = load_rom()
 rom = bytearray(rom)
 
-import config
-conf = config.Config()
+import configuration
+conf = configuration.Config()
 
 
 def sort_asms(asms):
@@ -209,7 +214,7 @@ class Channel:
 		for class_ in sound_classes:
 			if class_.id == i:
 				return class_
-		if self.channel in [4. 8]: return Noise
+		if self.channel in [4, 8]: return Noise
 		return Note
 
 
diff --git a/pokemontools/gfx.py b/pokemontools/gfx.py
index c7c6bec..d830259 100644
--- a/pokemontools/gfx.py
+++ b/pokemontools/gfx.py
@@ -5,12 +5,15 @@ import sys
 import png
 from math import sqrt, floor, ceil
 
-import crystal
+import configuration
+config = configuration.Config()
+
 import pokemon_constants
 import trainers
+import romstr
 
 if __name__ != "__main__":
-    rom = crystal.load_rom()
+    rom = romstr.RomStr(filename=config.rom_path)
 
 def hex_dump(input, debug=True):
     """