diff options
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/crystal.py | 10 | ||||
| -rw-r--r-- | extras/labels.py | 2 | ||||
| -rw-r--r-- | extras/pointers.py | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/extras/crystal.py b/extras/crystal.py index 22bd6ecda..97ca30c2e 100644 --- a/extras/crystal.py +++ b/extras/crystal.py @@ -302,15 +302,7 @@ def load_map_group_offsets(): map_group_offsets.append(offset) return map_group_offsets -def calculate_bank(address): - """you are too lazy to divide on your own?""" - if type(address) == str: - address = int(address, 16) - if 0x4000 <= address <= 0x7FFF: - raise Exception, "bank 1 does not exist" - return int(address) / 0x4000 - -from pointers import calculate_pointer +from pointers import calculate_bank, calculate_pointer def calculate_pointer_from_bytes_at(address, bank=False): """calculates a pointer from 2 bytes at a location diff --git a/extras/labels.py b/extras/labels.py index 193ca24cb..a25fa3fd8 100644 --- a/extras/labels.py +++ b/extras/labels.py @@ -1,7 +1,7 @@ """ Various label/line-related functions. """ -from pointers import calculate_pointer +from pointers import calculate_pointer, calculate_bank def remove_quoted_text(line): """get rid of content inside quotes diff --git a/extras/pointers.py b/extras/pointers.py index d7b3cb877..f3922417b 100644 --- a/extras/pointers.py +++ b/extras/pointers.py @@ -2,6 +2,14 @@ depedency loops. """ +def calculate_bank(address): + """you are too lazy to divide on your own?""" + if type(address) == str: + address = int(address, 16) + #if 0x4000 <= address <= 0x7FFF: + # raise Exception, "bank 1 does not exist" + return int(address) / 0x4000 + def calculate_pointer(short_pointer, bank=None): """calculates the full address given a 4-byte pointer and bank byte""" short_pointer = int(short_pointer) |