summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-11-17 11:21:47 -0800
committerBryan Bishop <kanzure@gmail.com>2013-11-17 11:21:47 -0800
commitb65d8a7833b16e78a9e4936f3a2140c04c2cf534 (patch)
tree488e0e176390cecac8e49ffe6cdca53b5f8b0d06
parent4a95f903601e328c5b007886714e564916c20957 (diff)
parent726d6f213470b09347326fb9dddb988de1e143b9 (diff)
Merge pull request #53 from kanzure/fix-audio-syntax-error
Fix audio syntax error
-rw-r--r--pokemontools/audio.py15
1 files changed, 10 insertions, 5 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