diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-09-01 19:34:50 -0700 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-09-01 19:34:50 -0700 |
| commit | 2e6d805aea27741bc0e6097bd52c6f2b6d176b74 (patch) | |
| tree | bb91bace929310f2787b80424fdada70bba94e81 /pokemontools/labels.py | |
| parent | 7aa016fb528bcc8dcb30c6a887957851623eccc0 (diff) | |
| parent | 52d4978974263f4f19985632442291c2d30c4b67 (diff) | |
Merge pull request #7 from kanzure/september-cleanup
python cleanup
Diffstat (limited to 'pokemontools/labels.py')
| -rw-r--r-- | pokemontools/labels.py | 9 |
1 files 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): |