diff options
author | yenatch <yenatch@gmail.com> | 2017-02-13 18:09:31 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-13 18:09:31 -0500 |
commit | 979c98a7c0f67ad6b9685b2d532c66a1f76ffb22 (patch) | |
tree | c67cc7b8500aac4e400d4e8bfdbef57a57b63eb1 /pokemontools/audio.py | |
parent | 74c620d01ad59bfb09cf4111ace549b925fcb9ab (diff) | |
parent | 766dea11bd63dee939db2b47198410e6c6e0fc7e (diff) |
Merge pull request #103 from eevee/py3
Python 3 compatibility, sort of, maybe
Diffstat (limited to 'pokemontools/audio.py')
-rw-r--r-- | pokemontools/audio.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/pokemontools/audio.py b/pokemontools/audio.py index 9e08113..e136545 100644 --- a/pokemontools/audio.py +++ b/pokemontools/audio.py @@ -1,17 +1,18 @@ # coding: utf-8 +from __future__ import absolute_import import os from math import ceil -from song_names import song_names -from sfx_names import sfx_names -from cry_names import cry_names +from .song_names import song_names +from .sfx_names import sfx_names +from .cry_names import cry_names -from gbz80disasm import get_global_address, get_local_address -from labels import line_has_label -from crystal import music_classes as sound_classes -from crystal import ( +from .gbz80disasm import get_global_address, get_local_address +from .labels import line_has_label +from .crystal import music_classes as sound_classes +from .crystal import ( Command, SingleByteParam, MultiByteParam, @@ -22,7 +23,7 @@ from crystal import ( rom = load_rom() rom = bytearray(rom) -import configuration +from . import configuration conf = configuration.Config() @@ -299,7 +300,7 @@ class Channel: self.address / 0x4000 != self.start_address / 0x4000 ) and not done: done = True - raise Exception, self.label + ': reached the end of the bank without finishing!' + raise Exception(self.label + ': reached the end of the bank without finishing!') self.output += [(self.address, '; %x\n' % self.address, self.address)] |