summaryrefslogtreecommitdiff
path: root/extras/analyze_incbins.py
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-01-10 01:18:18 -0600
committerBryan Bishop <kanzure@gmail.com>2012-01-10 01:18:18 -0600
commit4c59064f9f65eabbf72c247d78d5607ce1b5409f (patch)
treeac92fcadf5f0521ae851ffaca81b1b0875aed859 /extras/analyze_incbins.py
parent983b87069d1037bb4ad4eedb2ef769c398e0d084 (diff)
insert_asm in insert_texts for function asm
hg-commit-id: dc34a93f0f47
Diffstat (limited to 'extras/analyze_incbins.py')
-rw-r--r--extras/analyze_incbins.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/extras/analyze_incbins.py b/extras/analyze_incbins.py
index 7f748d47..4d0c3fce 100644
--- a/extras/analyze_incbins.py
+++ b/extras/analyze_incbins.py
@@ -214,7 +214,7 @@ def reset_incbins():
isolate_incbins()
process_incbins()
-def apply_diff(diff):
+def apply_diff(diff, try_fixing=True):
print "... Applying diff."
#write the diff to a file
@@ -233,7 +233,8 @@ def apply_diff(diff):
try:
subprocess.check_call("cd ../; make clean; LC_CTYPE=UTF-8 make", shell=True)
except Exception, exc:
- os.system("mv ../pokered1.asm ../pokered.asm")
+ if try_fixing:
+ os.system("mv ../pokered1.asm ../pokered.asm")
return False
if __name__ == "__main__":