From 768046bfcd8f25955782caab82f7616c4303f3a4 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sun, 1 Sep 2013 13:04:05 -0500 Subject: use an explicit import in labels.py --- pokemontools/labels.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pokemontools/labels.py b/pokemontools/labels.py index d553bdc..ca411d1 100644 --- a/pokemontools/labels.py +++ b/pokemontools/labels.py @@ -3,10 +3,7 @@ Various label/line-related functions. """ -from pointers import ( - calculate_pointer, - calculate_bank, -) +import pointers def remove_quoted_text(line): """get rid of content inside quotes @@ -125,10 +122,10 @@ def line_has_comment_address(line, returnable={}, bank=None): if offset == None and bank == None: return False if bank == None: - bank = calculate_bank(offset) + bank = pointers.calculate_bank(offset) returnable["bank"] = bank returnable["offset"] = offset - returnable["address"] = calculate_pointer(offset, bank=bank) + returnable["address"] = pointers.calculate_pointer(offset, bank=bank) return True def get_address_from_line_comment(line, bank=None): -- cgit v1.2.3