summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2013-05-14 13:56:34 -0400
committeryenatch <yenatch@gmail.com>2013-05-14 13:56:34 -0400
commit313e853e391e69f9bca875fa37f431c84fb32cbe (patch)
tree392dbff3685b5eddf5c179b578ff62eca4b56597
parentb9bd11e34def340afdc7befc29fcca15e3bf71cb (diff)
remove redundant code from find_label in gbz80disasm
-rw-r--r--extras/gbz80disasm.py13
1 files changed, 1 insertions, 12 deletions
diff --git a/extras/gbz80disasm.py b/extras/gbz80disasm.py
index b476654b7..32edf0096 100644
--- a/extras/gbz80disasm.py
+++ b/extras/gbz80disasm.py
@@ -569,18 +569,7 @@ def find_label(local_address, bank_id=0):
# keep an integer
if type(local_address) == str:
- local_address1 = int(local_address.replace("$", "0x"), 16)
- else: local_address1 = local_address
-
- # turn local_address into an integer
- if type(local_address) == str:
- if "0x" in local_address:
- local_address = local_address.replace("0x", "$")
- elif "$" in local_address:
- local_address = local_address.replace("$", "")
-
- if type(local_address) == str:
- local_address = int(local_address, 16)
+ local_address = int(local_address.replace("$", "0x"), 16)
for label_entry in all_labels:
if label_entry["address"] == local_address: