import lots of block labels

map_block_dumper is very buggy, so not all labels are included yet.

hg-commit-id: 1880e2dfbf9e

extras/analyze_incbins.py

@@ -1,7 +1,8 @@
-#!/usr/bin/python
+#!/usr/bin/python2.7
 #author: Bryan Bishop <kanzure@gmail.com>
 #date: 2012-01-03
 #purpose: map which addresses are left
+#note: using python2.7 because of subprocess
 import sys, os
 from copy import copy, deepcopy
 import subprocess
@@ -86,10 +87,10 @@ def find_incbin_to_replace_for(address):
         start = incbin["start"]
         end = incbin["end"]
         
-        print "start is: " + str(start)
-        print "end is: " + str(end)
-        print "address is: " + str(type(address))
-        print "checking.... " + hex(start) + " <= " + hex(address) + " <= " + hex(end)
+        #print "start is: " + str(start)
+        #print "end is: " + str(end)
+        #print "address is: " + str(type(address))
+        #print "checking.... " + hex(start) + " <= " + hex(address) + " <= " + hex(end)
         
         if start <= address <= end:
             return incbin_key
@@ -147,6 +148,8 @@ def generate_diff_insert(line_number, newline):
 
     try:
         diffcontent = subprocess.check_output("diff -u ../pokered.asm " + newfile_filename, shell=True)
+    except AttributeError, exc:
+        raise exc
     except Exception, exc:
         diffcontent = exc.output
 

extras/map_block_dumper.py

@@ -1,13 +1,19 @@
-#!/usr/bin/python
+#!/usr/bin/python2.7
 #author: Bryan Bishop <kanzure@gmail.com>
 #date: 2012-01-03
 #purpose: extract .blk files from baserom.gbc
+#note: using python2.7 because of subprocess in analyze_incbins
 import extract_maps #rom, assert_rom, load_rom, calculate_pointer, load_map_pointers, read_all_map_headers, map_headers
 from pretty_map_headers import map_name_cleaner
-from analyze_incbins import offset_to_pointer
-import sys
+from analyze_incbins import asm, offset_to_pointer, find_incbin_to_replace_for, split_incbin_line_into_three, generate_diff_insert, load_asm, isolate_incbins, process_incbins
+import analyze_incbins
+import os, sys
+spacing = "    "
 
-def extract_map_block_data(map_id, savefile=True):
+all_maps = range(0,248)
+bad_maps = []
+
+def extract_map_block_data(map_id, savefile=False):
     map = extract_maps.map_headers[map_id]
     if map["name"] == "FREEZE": return #skip this one
 
@@ -24,6 +30,7 @@ def extract_map_block_data(map_id, savefile=True):
     cleaned_name = map_name_cleaner(map["name"], None)
     label_text = cleaned_name.replace("_h", "Blocks")
     filename = cleaned_name.replace("_h", "").lower()
+    full_filepath = "maps/" + filename + ".blk"
 
     if savefile:
         print "Saving ../maps/" + filename + ".blk for map id=" + str(map_id)
@@ -31,16 +38,120 @@ def extract_map_block_data(map_id, savefile=True):
         fh.write(blocksdata)
         fh.close()
 
+def make_labels(name):
+    cleaned_name = map_name_cleaner(name, None)
+    label_text = cleaned_name.replace("_h", "Blocks")
+    filename = cleaned_name.replace("_h", "").lower()
+    full_filepath = "maps/" + filename + ".blk"
+    return cleaned_name, label_text, filename, full_filepath
+
+def generate_label_asm(name,size=None):
+    cleaned_name, label_text, filename, full_filepath = make_labels(name)
+
+    output = label_text + ":"
+    if size: output += " ; " + str(size) + "\n"
+    else: output += "\n"
+    output += spacing + "INCBIN \"" + full_filepath + "\""
+
+    return output
+
+def insert_map_block_label(map_id):
+    map = extract_maps.map_headers[map_id]
+    address = int(map["map_pointer"], 16)
+    y = int(map["y"], 16)
+    x = int(map["x"], 16)
+    size = x*y
+
+    print "map name: " + map["name"]
+    print "map address: " + map["map_pointer"]
+
+    line_number = find_incbin_to_replace_for(address)
+    if line_number == None:
+        print "skipping map id=" + str(map_id) + " probably because it was already done."
+        return
+
+    newlines = split_incbin_line_into_three(line_number, address, size)
+
+    label_asm = generate_label_asm(map["name"], size)
+
+    newlines = newlines.split("\n")
+    if len(newlines) == 2: index = 0 #replace the 1st line with new content
+    elif len(newlines) == 3: index = 1 #replace the 2nd line with new content
+    
+    newlines[index] = label_asm
+    
+    if len(newlines) == 3 and newlines[2][-2:] == "$0":
+        #get rid of the last incbin line if it is only including 0 bytes
+        del newlines[2]
+        #note that this has to be done after adding in the new asm
+    newlines = "\n".join(line for line in newlines)
+
+    diff = generate_diff_insert(line_number, newlines)
+    print diff
+    print "... Applying diff."
+
+    #write the diff to a file
+    fh = open("temp.patch", "w")
+    fh.write(diff)
+    fh.close()
+
+    #apply the patch
+    os.system("patch ../pokered.asm temp.patch")
+    
+    #remove the patch
+    os.system("rm temp.patch")
+
 def get_all_map_blockdata():
     for map in extract_maps.map_headers.keys():
         extract_map_block_data(map)
 
+def insert_all_labels():
+    "this is very buggy, don't use it"
+    limit = 50 #0:50
+    for map in extract_maps.map_headers.keys()[0:limit]:
+        mapmap = extract_maps.map_headers[map]
+        if mapmap["name"] == "FREEZE": continue #skip this one
+        if "Ash's" in mapmap["name"]: continue
+        if "Gary's" in mapmap["name"]: continue
+        if not ("cat" in mapmap["name"]) and "copy" in mapmap["name"].lower(): continue #skip this one
+
+        #Route 2 Gate breaks things, for some reason
+        if mapmap["name"] == "Route 2 Gate": continue
+        if mapmap["name"] == "Bill's House": continue
+    
+        #reset asm
+        analyze_incbins.asm = None
+        analyze_incbins.incbin_lines = []
+        analyze_incbins.processed_incbins = {}
+
+        #reload asm each time
+        load_asm()
+
+        #check if this label is already in there
+        cleaned_name, label_text, filename, full_filepath = make_labels(mapmap["name"])
+        if label_text in analyze_incbins.asm:
+            print "skipping (found label text in asm already)"
+            continue #skip this one
+
+        isolate_incbins()
+        process_incbins()
+        
+        print "XYZ|" + mapmap["name"]
+        insert_map_block_label(map)
+
 if __name__ == "__main__":
     #load map headers
     extract_maps.load_rom()
     extract_maps.load_map_pointers()
     extract_maps.read_all_map_headers()
 
-    #extract_map_block_data(0)
-    get_all_map_blockdata()
+    #load incbins
+    load_asm()
+    isolate_incbins()
+    process_incbins()
 
+    #extract_map_block_data(2)
+    #get_all_map_blockdata()
+
+    #insert_map_block_label(7)
+    insert_all_labels()