From e84a5b2062ff5e9b010447e3a3c78dd67a653166 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sun, 1 Sep 2013 02:27:44 -0500 Subject: make extras/ a submodule Use pokemontools v1.3.0 and use the same preprocessor as the pokecrystal project. --- extras | 1 + extras/fix_labels.py | 82 ---------------------------------------------------- 2 files changed, 1 insertion(+), 82 deletions(-) create mode 160000 extras delete mode 100644 extras/fix_labels.py (limited to 'extras/fix_labels.py') diff --git a/extras b/extras new file mode 160000 index 00000000..795cd58a --- /dev/null +++ b/extras @@ -0,0 +1 @@ +Subproject commit 795cd58a70c80082003e40127241cfaefa0fae8b diff --git a/extras/fix_labels.py b/extras/fix_labels.py deleted file mode 100644 index 321a18ea..00000000 --- a/extras/fix_labels.py +++ /dev/null @@ -1,82 +0,0 @@ -#author: Bryan Bishop -#date: 2012-01-27 -#fix trainer header labels to not suck so much -import analyze_incbins - -def replace_trainer_header_labels(debug=False): - """trainer header labels could be better""" - asm = analyze_incbins.asm - if debug: print str(type(asm)) - single_asm = "\n".join(asm) - current_map_name = "asdjkl;" - line_id = 0 - trainer_header_counter = 1 - - for line in asm: - trainer_header_base = current_map_name + "TrainerHeader" - trainer_header_name = trainer_header_base + str(trainer_header_counter) - - #we've found a TrainerHeaders thing - if "TrainerHeaders:" in line: - current_map_name = line.split("TrainerHeaders")[0] - if line[0:len(current_map_name)] == current_map_name: - trainer_header_counter = 1 - - #replace a trainer header label - elif "TrainerHeader_" in line and line[0:14] == "TrainerHeader_": - temp = line.split("TrainerHeader_")[1] - temp = temp.split(": ;")[0] - - old_label = "TrainerHeader_" + temp - new_label = current_map_name + "TH" + str(trainer_header_counter) #trainer_header_name - single_asm = single_asm.replace(old_label + ":", new_label + ":") - single_asm = single_asm.replace(old_label + "\n", new_label + "\n") - if debug: print "old_label = " + old_label - if debug: print "new_label = " + new_label - - trainer_header_counter += 1 - - elif trainer_header_base in line and line[0:len(trainer_header_base)] == trainer_header_base and (line[len(trainer_header_base)+1:len(trainer_header_base)+2] == ":" or line[len(trainer_header_base)+2:len(trainer_header_base)+3] == ":"): - if line[len(trainer_header_base)+1:len(trainer_header_base)+2] == ":": - trainer_header_counter = int(line[len(trainer_header_base):len(trainer_header_base)+1]) - elif line[len(trainer_header_base)+2:len(trainer_header_base)+3] == ":": - trainer_header_counter = int(line[len(trainer_header_base):len(trainer_header_base)+2]) - trainer_header_name = trainer_header_base + str(trainer_header_counter) - - #replace a text label - elif " TextBeforeBattle" in line and not current_map_name in line: - old_label = line.split("dw ")[1].split(" ;")[0] - new_label = current_map_name + "B4BattleTxt" + str(trainer_header_counter) #trainer_header_name + "BeforeBattleText" - single_asm = single_asm.replace(old_label + ":", new_label + ":") - single_asm = single_asm.replace(old_label + "\n", new_label + "\n") - single_asm = single_asm.replace(old_label + " ;", new_label + " ;") - if debug: print "old_label = " + old_label - if debug: print "new_label = " + new_label - #replace a text label - elif " TextAfterBattle" in line and not current_map_name in line: - old_label = line.split("dw ")[1].split(" ;")[0] - new_label = current_map_name + "AfterBattleTxt" + str(trainer_header_counter) #trainer_header_name + "AfterBattleText" - single_asm = single_asm.replace(old_label + ":", new_label + ":") - single_asm = single_asm.replace(old_label + "\n", new_label + "\n") - single_asm = single_asm.replace(old_label + " ;", new_label + " ;") - if debug: print "old_label = " + old_label - if debug: print "new_label = " + new_label - #replace a text label - elif " TextEndBattle" in line and not current_map_name in line: - old_label = line.split("dw ")[1].split(" ;")[0] - new_label = current_map_name + "EndBattleTxt" + str(trainer_header_counter) #trainer_header_name + "EndBattleText" - single_asm = single_asm.replace(old_label + ":", new_label + ":") - single_asm = single_asm.replace(old_label + "\n", new_label + "\n") - single_asm = single_asm.replace(old_label + " ;", new_label + " ;") - if debug: print "old_label = " + old_label - if debug: print "new_label = " + new_label - - line_id += 1 - - print single_asm - -if __name__ == "__main__": - analyze_incbins.load_asm() - - replace_trainer_header_labels() - -- cgit v1.2.3 From 423c9ef70b49c2786b9f708b32364800cda45e79 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sun, 1 Sep 2013 16:26:26 -0500 Subject: bump submodule to get a gbz80disasm fix --- extras | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extras/fix_labels.py') diff --git a/extras b/extras index 795cd58a..7aa016fb 160000 --- a/extras +++ b/extras @@ -1 +1 @@ -Subproject commit 795cd58a70c80082003e40127241cfaefa0fae8b +Subproject commit 7aa016fb528bcc8dcb30c6a887957851623eccc0 -- cgit v1.2.3