summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-01-10 00:59:02 -0600
committerBryan Bishop <kanzure@gmail.com>2012-01-10 00:59:02 -0600
commita1eebadc371ddc9d201cf119a303cb4a435fec64 (patch)
tree02db52a12b48d928612fb76544eff03641eb1be2
parenta036d99f28e433b5930bf338d9d43f30a39e544b (diff)
fix gbz80disasm to optionally load a module in analyze_texts
hg-commit-id: 0504f841a9d5
-rw-r--r--extras/analyze_texts.py4
-rw-r--r--extras/gbz80disasm.py4
2 files changed, 5 insertions, 3 deletions
diff --git a/extras/analyze_texts.py b/extras/analyze_texts.py
index a834267f..539209e5 100644
--- a/extras/analyze_texts.py
+++ b/extras/analyze_texts.py
@@ -3,7 +3,9 @@
#date: 2012-01-06
#analyze texts, how many commands are unknown?
import extract_maps
-from pretty_map_headers import map_name_cleaner
+try:
+ from pretty_map_headers import map_name_cleaner
+except Exception, exc: pass
from operator import itemgetter
import sys
debug = False #set to True to increase logging output
diff --git a/extras/gbz80disasm.py b/extras/gbz80disasm.py
index e237441d..307905ef 100644
--- a/extras/gbz80disasm.py
+++ b/extras/gbz80disasm.py
@@ -3,7 +3,7 @@
#date: 2012-01-09
import extract_maps
from copy import copy, deepcopy
-from pretty_map_headers import random_hash
+from pretty_map_headers import random_hash, map_name_cleaner
spacing = " "
temp_opt_table = [
@@ -712,4 +712,4 @@ if __name__ == "__main__":
#0x18f96 is PalletTownText1
#0x19B5D is BluesHouseText1
- print output_bank_opcodes(0x1e374 + 1)
+ print output_bank_opcodes(0x1b40)[0]