From 0b5e4e49db59311acf62b25737c0593a190278bf Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Tue, 24 Jan 2012 02:21:00 -0600
Subject: python for printing trainer headers

hg-commit-id: c04285b83047
---
 extras/pretty_map_headers.py     |  6 +--
 extras/pretty_trainer_headers.py | 91 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 extras/pretty_trainer_headers.py

(limited to 'extras')

diff --git a/extras/pretty_map_headers.py b/extras/pretty_map_headers.py
index b76e6cf4..729209ff 100644
--- a/extras/pretty_map_headers.py
+++ b/extras/pretty_map_headers.py
@@ -751,6 +751,6 @@ if __name__ == "__main__":
 
     #prepare to pretty print tx_fars
     #first you must load all_texts
-    tx_fars = find_all_tx_fars()
-    for entry in tx_fars:
-        print tx_far_pretty_printer(entry)
+    #tx_fars = find_all_tx_fars()
+    #for entry in tx_fars:
+    #    print tx_far_pretty_printer(entry)
diff --git a/extras/pretty_trainer_headers.py b/extras/pretty_trainer_headers.py
new file mode 100644
index 00000000..b932cae0
--- /dev/null
+++ b/extras/pretty_trainer_headers.py
@@ -0,0 +1,91 @@
+#!/usr/bin/python
+#author: Bryan Bishop <kanzure@gmail.com>
+#date: 2012-01-24
+from optparse import OptionParser
+from gbz80disasm import load_labels, find_label
+spacing = "\t"
+
+def pretty_print_trainer_header(address, label=None):
+    """make pretty text for a trainer header"""
+    output = ""
+    bank_id = 0
+    if address > 0x4000:
+        bank_id = address / 0x4000
+    
+    rom = open("../baserom.gbc", "r").read()
+    
+    #convert address to an integer if necessary
+    if type(address) == str:
+        if "$" in address: address = address.replace("$", "0x")
+        address = int(address, 16)
+
+    #label this section of asm
+    if label == None:
+        output += "TrainerHeader_" + hex(address)[2:] + ": ; 0x" + hex(address)[2:] + "\n"
+    else:
+        output += label + ": ; 0x" + hex(address)[2:] + "\n"
+    
+    #flag's bit
+    output += spacing + "db $" + hex(ord(rom[address]))[2:] + " ; flag's bit\n"
+    
+    #trainer's view range
+    view_range = ord(rom[address+1]) >> 4
+    output += spacing + "db ($" + hex(view_range)[2:] + " << 4) ; trainer's view range\n"
+
+    #flag's byte
+    pointer_byte1 = ord(rom[address+2])
+    pointer_byte2 = ord(rom[address+3])
+    partial_pointer = (pointer_byte1 + (pointer_byte2 << 8))
+    partial_pointer = "$%.2x" % partial_pointer
+    output += spacing + "dw " + partial_pointer + " ; flag's byte\n"
+
+    #TextBeforeBattle
+    pointer_byte1 = ord(rom[address+4])
+    pointer_byte2 = ord(rom[address+5])
+    partial_pointer = (pointer_byte1 + (pointer_byte2 << 8))
+    label = find_label(partial_pointer, bank_id)
+    output += spacing + "dw " + label + " ; " + hex(partial_pointer) + " TextBeforeBattle\n"
+
+    #TextAfterBattle
+    pointer_byte1 = ord(rom[address+6])
+    pointer_byte2 = ord(rom[address+7])
+    partial_pointer = (pointer_byte1 + (pointer_byte2 << 8))
+    label = find_label(partial_pointer, bank_id)
+    output += spacing + "dw " + label + " ; " + hex(partial_pointer) + " TextAfterBattle\n"
+
+    #TextEndBattle
+    pointer_byte1 = ord(rom[address+8])
+    pointer_byte2 = ord(rom[address+9])
+    partial_pointer = (pointer_byte1 + (pointer_byte2 << 8))
+    label = find_label(partial_pointer, bank_id)
+    output += spacing + "dw " + label + " ; " + hex(partial_pointer) + " TextEndBattle\n"
+
+    #TextEndBattle
+    pointer_byte1 = ord(rom[address+10])
+    pointer_byte2 = ord(rom[address+11])
+    partial_pointer = (pointer_byte1 + (pointer_byte2 << 8))
+    label = find_label(partial_pointer, bank_id)
+    output += spacing + "dw " + label + " ; " + hex(partial_pointer) + " TextEndBattle\n"
+
+    output += "; " + hex(address+10) + "\n"
+
+    return output
+
+def main():
+    load_labels()
+
+    usage = "usage: %prog address"
+    parser = OptionParser(usage)
+    (options, args) = parser.parse_args()
+    if len(args) == 1:
+        print "usage: python pretty_trainer_headers.py address label\n"
+        args.append("TrainerHeader_" + (args[0].replace("0x", "")))
+    elif len(args) != 2:
+        parser.error("we need both an address and a label")
+    address = int(args[0], 16)
+    label = args[1]
+
+    print pretty_print_trainer_header(address, label)
+
+if __name__ == "__main__":
+    main()
-- 
cgit v1.3.1-sl0p


From e74e33a4f340d2301470a5c5b260532574250f88 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Tue, 24 Jan 2012 02:38:18 -0600
Subject: some error reporting for trainer headers

hg-commit-id: 63846843dfc2
---
 extras/pretty_trainer_headers.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'extras')

diff --git a/extras/pretty_trainer_headers.py b/extras/pretty_trainer_headers.py
index b932cae0..69e06d81 100644
--- a/extras/pretty_trainer_headers.py
+++ b/extras/pretty_trainer_headers.py
@@ -3,6 +3,8 @@
 #date: 2012-01-24
 from optparse import OptionParser
 from gbz80disasm import load_labels, find_label
+from extract_maps import calculate_pointer
+import sys
 spacing = "\t"
 
 def pretty_print_trainer_header(address, label=None):
@@ -44,6 +46,12 @@ def pretty_print_trainer_header(address, label=None):
     pointer_byte2 = ord(rom[address+5])
     partial_pointer = (pointer_byte1 + (pointer_byte2 << 8))
     label = find_label(partial_pointer, bank_id)
+    if label == None:
+        print "label not found for (TextBeforeBattle) " + hex(calculate_pointer(partial_pointer, bank_id))
+        print ""
+        label = "$" + hex(partial_pointer)[2:]
+        #sys.exit(0)
+
     output += spacing + "dw " + label + " ; " + hex(partial_pointer) + " TextBeforeBattle\n"
 
     #TextAfterBattle
@@ -51,6 +59,12 @@ def pretty_print_trainer_header(address, label=None):
     pointer_byte2 = ord(rom[address+7])
     partial_pointer = (pointer_byte1 + (pointer_byte2 << 8))
     label = find_label(partial_pointer, bank_id)
+    if label == None:
+        print "label not found for (TextAfterBattle) " + hex(calculate_pointer(partial_pointer, bank_id))
+        print ""
+        label = "$" + hex(partial_pointer)[2:]
+        #sys.exit(0)
+
     output += spacing + "dw " + label + " ; " + hex(partial_pointer) + " TextAfterBattle\n"
 
     #TextEndBattle
@@ -58,6 +72,12 @@ def pretty_print_trainer_header(address, label=None):
     pointer_byte2 = ord(rom[address+9])
     partial_pointer = (pointer_byte1 + (pointer_byte2 << 8))
     label = find_label(partial_pointer, bank_id)
+    if label == None:
+        print "label not found for (TextEndBattle) " + hex(calculate_pointer(partial_pointer, bank_id))
+        print ""
+        label = "$" + hex(partial_pointer)[2:]
+        #sys.exit(0)
+
     output += spacing + "dw " + label + " ; " + hex(partial_pointer) + " TextEndBattle\n"
 
     #TextEndBattle
@@ -65,6 +85,12 @@ def pretty_print_trainer_header(address, label=None):
     pointer_byte2 = ord(rom[address+11])
     partial_pointer = (pointer_byte1 + (pointer_byte2 << 8))
     label = find_label(partial_pointer, bank_id)
+    if label == None:
+        print "label not found for (TextEndBattle) " + hex(calculate_pointer(partial_pointer, bank_id))
+        print ""
+        label = "$" + hex(partial_pointer)[2:]
+        #sys.exit(0)
+
     output += spacing + "dw " + label + " ; " + hex(partial_pointer) + " TextEndBattle\n"
 
     output += "; " + hex(address+10) + "\n"
-- 
cgit v1.3.1-sl0p


From 52b72f0012fe7a5f73b81c8ef6fdc36fa76872e2 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Tue, 24 Jan 2012 02:47:39 -0600
Subject: TextEndBattle is only used once

hg-commit-id: c038c49301fc
---
 common.asm                       | 15 +++++++++++++--
 extras/pretty_trainer_headers.py |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'extras')

diff --git a/common.asm b/common.asm
index 78688c1e..273ada57 100644
--- a/common.asm
+++ b/common.asm
@@ -14407,7 +14407,18 @@ INCBIN "baserom.gbc",$19d21,$7f
 SilphCo4Texts: ; 0x19da0
 	dw SilphCo4Text1, SilphCo4Text2, SilphCo4Text3, SilphCo4Text4, SilphCo4Text5, SilphCo4Text6, SilphCo4Text7
 
-INCBIN "baserom.gbc",$19dae,$25
+INCBIN "baserom.gbc",$19dae,$19dc6 - $19dae
+
+TrainerHeader_19dc6: ; 0x19dc6
+	db $4 ; flag's bit
+	db ($4 << 4) ; trainer's view range
+	dw $d829 ; flag's byte
+	dw UnnamedText_19e26 ; 0x5e26 TextBeforeBattle
+	dw UnnamedText_19e30 ; 0x5e30 TextAfterBattle
+	dw UnnamedText_19e2b ; 0x5e2b TextEndBattle
+; 0x19dd0
+
+INCBIN "baserom.gbc",$19dd0,$19dd3 - $19dd0
 
 SilphCo4Text1: ; 0x19dd3
 	db $08 ; asm
@@ -14470,7 +14481,7 @@ UnnamedText_19e17: ; 0x19e17
 
 SilphCo4Text4: ; 0x19e1c
 	db $08 ; asm
-	ld hl, $5dc6
+	ld hl, TrainerHeader_19dc6
 	call LoadTrainerHeader
 	jp TextScriptEnd
 
diff --git a/extras/pretty_trainer_headers.py b/extras/pretty_trainer_headers.py
index 69e06d81..5d0f56a9 100644
--- a/extras/pretty_trainer_headers.py
+++ b/extras/pretty_trainer_headers.py
@@ -91,7 +91,7 @@ def pretty_print_trainer_header(address, label=None):
         label = "$" + hex(partial_pointer)[2:]
         #sys.exit(0)
 
-    output += spacing + "dw " + label + " ; " + hex(partial_pointer) + " TextEndBattle\n"
+    #output += spacing + "dw " + label + " ; " + hex(partial_pointer) + " TextEndBattle\n"
 
     output += "; " + hex(address+10) + "\n"
 
-- 
cgit v1.3.1-sl0p