summaryrefslogtreecommitdiff
path: root/pokemontools/audio.py
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2013-11-18 21:03:31 -0500
committeryenatch <yenatch@gmail.com>2013-11-18 21:03:31 -0500
commitdfc88b9ac0369632bfa93a3859bf26dc2828ae9e (patch)
tree6243ede1e0a5a0bc2a76abf8c5027e21f1a72471 /pokemontools/audio.py
parent9d01c85d3bac2a6a7b5826dc2139f69731a901ab (diff)
parent3027746bd69db504f8d0e311d9f81593337ff236 (diff)
Merge branch 'master' of github.com:kanzure/pokemon-reverse-engineering-tools
Diffstat (limited to 'pokemontools/audio.py')
-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