From d893d11212e06d79410e31e4543a467f7ec051a0 Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 6 Feb 2014 05:31:17 -0500 Subject: audio: Use generate_label_asm instead of manually creating label asm --- pokemontools/audio.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pokemontools/audio.py b/pokemontools/audio.py index a314368..db1b891 100644 --- a/pokemontools/audio.py +++ b/pokemontools/audio.py @@ -247,12 +247,7 @@ class Channel: self.base_label, label_address ) - label_output = ( - label_address, - '%s: ; %x' % (label, label_address), - label_address - ) - self.labels += [label_output] + self.labels += [generate_label_asm(label, label_address)] asm = asm.replace( '$%x' % (get_local_address(label_address)), label @@ -343,18 +338,12 @@ class Sound: self.labels += channel.labels - label_text = '%s_Ch%d: ; %x' % ( - self.base_label, - current_channel, - channel.start_address - ) - label_output = (channel.start_address, label_text, channel.start_address) - self.labels += [label_output] + label = '%s_Ch%d' % (self.base_label, current_channel) + self.labels += [generate_label_asm(label, channel.start_address)] asms = [] - label_text = '%s: ; %x' % (self.base_label, self.start_address) - asms += [(self.start_address, label_text, self.start_address)] + asms += [generate_label_asm(self.base_label, self.start_address)] for i, (num, channel) in enumerate(self.channels): channel_id = num - 1 -- cgit v1.2.3