summaryrefslogtreecommitdiff
path: root/gbz80disasm.py
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
commitb9b764fc6557d8e3eb371878ca65a925476368bc (patch)
tree0532a464e17f48944822caa78e716007b17b7fd7 /gbz80disasm.py
parente2d3d6b409aebf5457986c875a5399a2e3e74be8 (diff)
remove redundant code from find_label in gbz80disasm
original-commit-id: 313e853e391e69f9bca875fa37f431c84fb32cbe
Diffstat (limited to 'gbz80disasm.py')
-rw-r--r--gbz80disasm.py13
1 files changed, 1 insertions, 12 deletions
diff --git a/gbz80disasm.py b/gbz80disasm.py
index b476654..32edf00 100644
--- a/gbz80disasm.py
+++ b/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: