diff options
| -rw-r--r-- | extras/analyze_texts.py | 146 | ||||
| -rw-r--r-- | extras/extract_maps.py | 6 | ||||
| -rw-r--r-- | extras/gbz80disasm.py | 1075 | ||||
| -rw-r--r-- | extras/insert_texts.py | 47 | ||||
| -rw-r--r-- | pokered.asm | 1773 |
5 files changed, 2257 insertions, 790 deletions
diff --git a/extras/analyze_texts.py b/extras/analyze_texts.py index 4d089975..cf25e687 100644 --- a/extras/analyze_texts.py +++ b/extras/analyze_texts.py @@ -385,81 +385,91 @@ def find_missing_08s(all_texts): def text_pretty_printer_at(start_address, label="SomeLabel"): commands = parse_text_script(start_address, None, None) + needs_to_begin_with_0 = False wanted_command = None - for command_id in commands: - command = commands[command_id] - if command["type"] == 0: - wanted_command = command_id + if needs_to_begin_with_0: + wanted_command = None + for command_id in commands: + command = commands[command_id] + if command["type"] == 0: + wanted_command = command_id - if wanted_command == None: - raise "error: address did not start with a $0 text" - - lines = commands[wanted_command]["lines"] - - #add the ending byte to the last line- always seems $57 - lines[len(lines.keys())-1].append(commands[1]["type"]) - - output = "\n" - output += label + ": ; " + hex(start_address) + "\n" - first = True - for line_id in lines: - line = lines[line_id] - output += spacing + "db " - if first: - output += "$0, " - first = False - - quotes_open = False - first_byte = True - was_byte = False - byte_count = 0 - for byte in line: - if byte in txt_bytes: - if not quotes_open and not first_byte: #start text - output += ", \"" - quotes_open = True - first_byte = False - if not quotes_open and first_byte: #start text - output += "\"" - quotes_open = True - output += txt_bytes[byte] - elif byte in constant_abbreviation_bytes: - if quotes_open: - output += "\"" - quotes_open = False - if not first_byte: - output += ", " - output += constant_abbreviation_bytes[byte] - else: - if quotes_open: - output += "\"" - quotes_open = False - - #if you want the ending byte on the last line - #if not (byte == 0x57 or byte == 0x50 or byte == 0x58): - if not first_byte: - output += ", " - - output += "$" + hex(byte)[2:] - was_byte = True - - #add a comma unless it's the end of the line - #if byte_count+1 != len(line): - # output += ", " - - first_byte = False - byte_count += 1 - #close final quotes - if quotes_open: - output += "\"" - quotes_open = False + if wanted_command == None: + raise "error: address did not start with a $0 text" + + #start with zero please + byte_count = 0 - output += "\n" + first_line = True + for this_command in commands.keys(): + lines = commands[this_command]["lines"] + + #add the ending byte to the last line- always seems $57 + lines[len(lines.keys())-1].append(commands[1]["type"]) + + if first_line: + output = "\n" + output += label + ": ; " + hex(start_address) + "\n" + first_line = False + + first = True #first byte + for line_id in lines: + line = lines[line_id] + output += spacing + "db " + if first and needs_to_begin_with_0: + output += "$0, " + first = False + + quotes_open = False + first_byte = True + was_byte = False + for byte in line: + if byte in txt_bytes: + if not quotes_open and not first_byte: #start text + output += ", \"" + quotes_open = True + first_byte = False + if not quotes_open and first_byte: #start text + output += "\"" + quotes_open = True + output += txt_bytes[byte] + elif byte in constant_abbreviation_bytes: + if quotes_open: + output += "\"" + quotes_open = False + if not first_byte: + output += ", " + output += constant_abbreviation_bytes[byte] + else: + if quotes_open: + output += "\"" + quotes_open = False + + #if you want the ending byte on the last line + #if not (byte == 0x57 or byte == 0x50 or byte == 0x58): + if not first_byte: + output += ", " + + output += "$" + hex(byte)[2:] + was_byte = True + + #add a comma unless it's the end of the line + #if byte_count+1 != len(line): + # output += ", " + + first_byte = False + byte_count += 1 + #close final quotes + if quotes_open: + output += "\"" + quotes_open = False + + output += "\n" #output += "\n" print output - return output + return (output, byte_count) def is_label_in_asm(label): for line in analyze_incbins.asm: diff --git a/extras/extract_maps.py b/extras/extract_maps.py index a1394e97..9793cfdc 100644 --- a/extras/extract_maps.py +++ b/extras/extract_maps.py @@ -60,9 +60,9 @@ maps = { 0x22: "Route 23", 0x23: "Route 24", 0x24: "Route 25", - 0x25: "Ash's House F1", - 0x26: "Ash's House F2", - 0x27: "Gary's House", + 0x25: "Red's House 1F", + 0x26: "Red's House 2F", + 0x27: "Blue's House", 0x28: "Oak's Lab", 0x29: "Viridian Poke Center", 0x2A: "Viridian Mart", diff --git a/extras/gbz80disasm.py b/extras/gbz80disasm.py index dd927940..aa01691c 100644 --- a/extras/gbz80disasm.py +++ b/extras/gbz80disasm.py @@ -4,523 +4,524 @@ import extract_maps from copy import copy, deepcopy from pretty_map_headers import random_hash, map_name_cleaner +from ctypes import c_int8 import sys spacing = " " temp_opt_table = [ - [ "ADC A", 0x8f, 0 ], - [ "ADC B", 0x88, 0 ], - [ "ADC C", 0x89, 0 ], - [ "ADC D", 0x8a, 0 ], - [ "ADC E", 0x8b, 0 ], - [ "ADC H", 0x8c, 0 ], - [ "ADC [HL]", 0x8e, 0 ], - [ "ADC L", 0x8d, 0 ], - [ "ADC x", 0xce, 1 ], - [ "ADD A", 0x87, 0 ], - [ "ADD B", 0x80, 0 ], - [ "ADD C", 0x81, 0 ], - [ "ADD D", 0x82, 0 ], - [ "ADD E", 0x83, 0 ], - [ "ADD H", 0x84, 0 ], - [ "ADD [HL]", 0x86, 0 ], - [ "ADD HL, BC", 0x9, 0 ], - [ "ADD HL, DE", 0x19, 0 ], - [ "ADD HL, HL", 0x29, 0 ], - [ "ADD HL, SP", 0x39, 0 ], - [ "ADD L", 0x85, 0 ], - [ "ADD SP, x", 0xe8, 1 ], - [ "ADD x", 0xc6, 1 ], - [ "AND A", 0xa7, 0 ], - [ "AND B", 0xa0, 0 ], - [ "AND C", 0xa1, 0 ], - [ "AND D", 0xa2, 0 ], - [ "AND E", 0xa3, 0 ], - [ "AND H", 0xa4, 0 ], - [ "AND [HL]", 0xa6, 0 ], - [ "AND L", 0xa5, 0 ], - [ "AND x", 0xe6, 1 ], - [ "BIT 0, A", 0x47cb, 3 ], - [ "BIT 0, B", 0x40cb, 3 ], - [ "BIT 0, C", 0x41cb, 3 ], - [ "BIT 0, D", 0x42cb, 3 ], - [ "BIT 0, E", 0x43cb, 3 ], - [ "BIT 0, H", 0x44cb, 3 ], - [ "BIT 0, [HL]", 0x46cb, 3 ], - [ "BIT 0, L", 0x45cb, 3 ], - [ "BIT 1, A", 0x4fcb, 3 ], - [ "BIT 1, B", 0x48cb, 3 ], - [ "BIT 1, C", 0x49cb, 3 ], - [ "BIT 1, D", 0x4acb, 3 ], - [ "BIT 1, E", 0x4bcb, 3 ], - [ "BIT 1, H", 0x4ccb, 3 ], - [ "BIT 1, [HL]", 0x4ecb, 3 ], - [ "BIT 1, L", 0x4dcb, 3 ], - [ "BIT 2, A", 0x57cb, 3 ], - [ "BIT 2, B", 0x50cb, 3 ], - [ "BIT 2, C", 0x51cb, 3 ], - [ "BIT 2, D", 0x52cb, 3 ], - [ "BIT 2, E", 0x53cb, 3 ], - [ "BIT 2, H", 0x54cb, 3 ], - [ "BIT 2, [HL]", 0x56cb, 3 ], - [ "BIT 2, L", 0x55cb, 3 ], - [ "BIT 3, A", 0x5fcb, 3 ], - [ "BIT 3, B", 0x58cb, 3 ], - [ "BIT 3, C", 0x59cb, 3 ], - [ "BIT 3, D", 0x5acb, 3 ], - [ "BIT 3, E", 0x5bcb, 3 ], - [ "BIT 3, H", 0x5ccb, 3 ], - [ "BIT 3, [HL]", 0x5ecb, 3 ], - [ "BIT 3, L", 0x5dcb, 3 ], - [ "BIT 4, A", 0x67cb, 3 ], - [ "BIT 4, B", 0x60cb, 3 ], - [ "BIT 4, C", 0x61cb, 3 ], - [ "BIT 4, D", 0x62cb, 3 ], - [ "BIT 4, E", 0x63cb, 3 ], - [ "BIT 4, H", 0x64cb, 3 ], - [ "BIT 4, [HL]", 0x66cb, 3 ], - [ "BIT 4, L", 0x65cb, 3 ], - [ "BIT 5, A", 0x6fcb, 3 ], - [ "BIT 5, B", 0x68cb, 3 ], - [ "BIT 5, C", 0x69cb, 3 ], - [ "BIT 5, D", 0x6acb, 3 ], - [ "BIT 5, E", 0x6bcb, 3 ], - [ "BIT 5, H", 0x6ccb, 3 ], - [ "BIT 5, [HL]", 0x6ecb, 3 ], - [ "BIT 5, L", 0x6dcb, 3 ], - [ "BIT 6, A", 0x77cb, 3 ], - [ "BIT 6, B", 0x70cb, 3 ], - [ "BIT 6, C", 0x71cb, 3 ], - [ "BIT 6, D", 0x72cb, 3 ], - [ "BIT 6, E", 0x73cb, 3 ], - [ "BIT 6, H", 0x74cb, 3 ], - [ "BIT 6, [HL]", 0x76cb, 3 ], - [ "BIT 6, L", 0x75cb, 3 ], - [ "BIT 7, A", 0x7fcb, 3 ], - [ "BIT 7, B", 0x78cb, 3 ], - [ "BIT 7, C", 0x79cb, 3 ], - [ "BIT 7, D", 0x7acb, 3 ], - [ "BIT 7, E", 0x7bcb, 3 ], - [ "BIT 7, H", 0x7ccb, 3 ], - [ "BIT 7, [HL]", 0x7ecb, 3 ], - [ "BIT 7, L", 0x7dcb, 3 ], - [ "CALL C, ?", 0xdc, 2 ], - [ "CALL NC, ?", 0xd4, 2 ], - [ "CALL NZ, ?", 0xc4, 2 ], - [ "CALL Z, ?", 0xcc, 2 ], - [ "CALL ?", 0xcd, 2 ], - [ "CCF", 0x3f, 0 ], - [ "CP A", 0xbf, 0 ], - [ "CP B", 0xb8, 0 ], - [ "CP C", 0xb9, 0 ], - [ "CP D", 0xba, 0 ], - [ "CP E", 0xbb, 0 ], - [ "CP H", 0xbc, 0 ], - [ "CP [HL]", 0xbe, 0 ], - [ "CPL", 0x2f, 0 ], - [ "CP L", 0xbd, 0 ], - [ "CP x", 0xfe, 1 ], - [ "DAA", 0x27, 0 ], - [ "DEBUG", 0xed, 0 ], - [ "DEC A", 0x3d, 0 ], - [ "DEC B", 0x5, 0 ], - [ "DEC BC", 0xb, 0 ], - [ "DEC C", 0xd, 0 ], - [ "DEC D", 0x15, 0 ], - [ "DEC DE", 0x1b, 0 ], - [ "DEC E", 0x1d, 0 ], - [ "DEC H", 0x25, 0 ], - [ "DEC HL", 0x2b, 0 ], - [ "DEC [HL]", 0x35, 0 ], - [ "DEC L", 0x2d, 0 ], - [ "DEC SP", 0x3b, 0 ], - [ "DI", 0xf3, 0 ], - [ "EI", 0xfb, 0 ], - [ "HALT", 0x76, 0 ], - [ "INC A", 0x3c, 0 ], - [ "INC B", 0x4, 0 ], - [ "INC BC", 0x3, 0 ], - [ "INC C", 0xc, 0 ], - [ "INC D", 0x14, 0 ], - [ "INC DE", 0x13, 0 ], - [ "INC E", 0x1c, 0 ], - [ "INC H", 0x24, 0 ], - [ "INC HL", 0x23, 0 ], - [ "INC [HL]", 0x34, 0 ], - [ "INC L", 0x2c, 0 ], - [ "INC SP", 0x33, 0 ], - [ "JP C, ?", 0xda, 2 ], - [ "JP HL", 0xe9, 0 ], - [ "JP NC, ?", 0xd2, 2 ], - [ "JP NZ, ?", 0xc2, 2 ], - [ "JP Z, ?", 0xca, 2 ], - [ "JP ?", 0xc3, 2 ], - [ "JR C, x", 0x38, 1 ], - [ "JR NC, x", 0x30, 1 ], - [ "JR NZ, x", 0x20, 1 ], - [ "JR Z, x", 0x28, 1 ], - [ "JR x", 0x18, 1 ], - [ "LD A, A", 0x7f, 0 ], - [ "LD A, B", 0x78, 0 ], - [ "LD A, C", 0x79, 0 ], - [ "LD A, D", 0x7a, 0 ], - [ "LD A, E", 0x7b, 0 ], - [ "LD A, H", 0x7c, 0 ], - [ "LD A, L", 0x7d, 0 ], - [ "LD A, [$FF00+C]", 0xf2, 0 ], - [ "LD A, [$FF00+x]", 0xf0, 1 ], + [ "ADC A", 0x8f, 0 ], + [ "ADC B", 0x88, 0 ], + [ "ADC C", 0x89, 0 ], + [ "ADC D", 0x8a, 0 ], + [ "ADC E", 0x8b, 0 ], + [ "ADC H", 0x8c, 0 ], + [ "ADC [HL]", 0x8e, 0 ], + [ "ADC L", 0x8d, 0 ], + [ "ADC x", 0xce, 1 ], + [ "ADD A", 0x87, 0 ], + [ "ADD B", 0x80, 0 ], + [ "ADD C", 0x81, 0 ], + [ "ADD D", 0x82, 0 ], + [ "ADD E", 0x83, 0 ], + [ "ADD H", 0x84, 0 ], + [ "ADD [HL]", 0x86, 0 ], + [ "ADD HL, BC", 0x9, 0 ], + [ "ADD HL, DE", 0x19, 0 ], + [ "ADD HL, HL", 0x29, 0 ], + [ "ADD HL, SP", 0x39, 0 ], + [ "ADD L", 0x85, 0 ], + [ "ADD SP, x", 0xe8, 1 ], + [ "ADD x", 0xc6, 1 ], + [ "AND A", 0xa7, 0 ], + [ "AND B", 0xa0, 0 ], + [ "AND C", 0xa1, 0 ], + [ "AND D", 0xa2, 0 ], + [ "AND E", 0xa3, 0 ], + [ "AND H", 0xa4, 0 ], + [ "AND [HL]", 0xa6, 0 ], + [ "AND L", 0xa5, 0 ], + [ "AND x", 0xe6, 1 ], + [ "BIT 0, A", 0x47cb, 3 ], + [ "BIT 0, B", 0x40cb, 3 ], + [ "BIT 0, C", 0x41cb, 3 ], + [ "BIT 0, D", 0x42cb, 3 ], + [ "BIT 0, E", 0x43cb, 3 ], + [ "BIT 0, H", 0x44cb, 3 ], + [ "BIT 0, [HL]", 0x46cb, 3 ], + [ "BIT 0, L", 0x45cb, 3 ], + [ "BIT 1, A", 0x4fcb, 3 ], + [ "BIT 1, B", 0x48cb, 3 ], + [ "BIT 1, C", 0x49cb, 3 ], + [ "BIT 1, D", 0x4acb, 3 ], + [ "BIT 1, E", 0x4bcb, 3 ], + [ "BIT 1, H", 0x4ccb, 3 ], + [ "BIT 1, [HL]", 0x4ecb, 3 ], + [ "BIT 1, L", 0x4dcb, 3 ], + [ "BIT 2, A", 0x57cb, 3 ], + [ "BIT 2, B", 0x50cb, 3 ], + [ "BIT 2, C", 0x51cb, 3 ], + [ "BIT 2, D", 0x52cb, 3 ], + [ "BIT 2, E", 0x53cb, 3 ], + [ "BIT 2, H", 0x54cb, 3 ], + [ "BIT 2, [HL]", 0x56cb, 3 ], + [ "BIT 2, L", 0x55cb, 3 ], + [ "BIT 3, A", 0x5fcb, 3 ], + [ "BIT 3, B", 0x58cb, 3 ], + [ "BIT 3, C", 0x59cb, 3 ], + [ "BIT 3, D", 0x5acb, 3 ], + [ "BIT 3, E", 0x5bcb, 3 ], + [ "BIT 3, H", 0x5ccb, 3 ], + [ "BIT 3, [HL]", 0x5ecb, 3 ], + [ "BIT 3, L", 0x5dcb, 3 ], + [ "BIT 4, A", 0x67cb, 3 ], + [ "BIT 4, B", 0x60cb, 3 ], + [ "BIT 4, C", 0x61cb, 3 ], + [ "BIT 4, D", 0x62cb, 3 ], + [ "BIT 4, E", 0x63cb, 3 ], + [ "BIT 4, H", 0x64cb, 3 ], + [ "BIT 4, [HL]", 0x66cb, 3 ], + [ "BIT 4, L", 0x65cb, 3 ], + [ "BIT 5, A", 0x6fcb, 3 ], + [ "BIT 5, B", 0x68cb, 3 ], + [ "BIT 5, C", 0x69cb, 3 ], + [ "BIT 5, D", 0x6acb, 3 ], + [ "BIT 5, E", 0x6bcb, 3 ], + [ "BIT 5, H", 0x6ccb, 3 ], + [ "BIT 5, [HL]", 0x6ecb, 3 ], + [ "BIT 5, L", 0x6dcb, 3 ], + [ "BIT 6, A", 0x77cb, 3 ], + [ "BIT 6, B", 0x70cb, 3 ], + [ "BIT 6, C", 0x71cb, 3 ], + [ "BIT 6, D", 0x72cb, 3 ], + [ "BIT 6, E", 0x73cb, 3 ], + [ "BIT 6, H", 0x74cb, 3 ], + [ "BIT 6, [HL]", 0x76cb, 3 ], + [ "BIT 6, L", 0x75cb, 3 ], + [ "BIT 7, A", 0x7fcb, 3 ], + [ "BIT 7, B", 0x78cb, 3 ], + [ "BIT 7, C", 0x79cb, 3 ], + [ "BIT 7, D", 0x7acb, 3 ], + [ "BIT 7, E", 0x7bcb, 3 ], + [ "BIT 7, H", 0x7ccb, 3 ], + [ "BIT 7, [HL]", 0x7ecb, 3 ], + [ "BIT 7, L", 0x7dcb, 3 ], + [ "CALL C, ?", 0xdc, 2 ], + [ "CALL NC, ?", 0xd4, 2 ], + [ "CALL NZ, ?", 0xc4, 2 ], + [ "CALL Z, ?", 0xcc, 2 ], + [ "CALL ?", 0xcd, 2 ], + [ "CCF", 0x3f, 0 ], + [ "CP A", 0xbf, 0 ], + [ "CP B", 0xb8, 0 ], + [ "CP C", 0xb9, 0 ], + [ "CP D", 0xba, 0 ], + [ "CP E", 0xbb, 0 ], + [ "CP H", 0xbc, 0 ], + [ "CP [HL]", 0xbe, 0 ], + [ "CPL", 0x2f, 0 ], + [ "CP L", 0xbd, 0 ], + [ "CP x", 0xfe, 1 ], + [ "DAA", 0x27, 0 ], + [ "DEBUG", 0xed, 0 ], + [ "DEC A", 0x3d, 0 ], + [ "DEC B", 0x5, 0 ], + [ "DEC BC", 0xb, 0 ], + [ "DEC C", 0xd, 0 ], + [ "DEC D", 0x15, 0 ], + [ "DEC DE", 0x1b, 0 ], + [ "DEC E", 0x1d, 0 ], + [ "DEC H", 0x25, 0 ], + [ "DEC HL", 0x2b, 0 ], + [ "DEC [HL]", 0x35, 0 ], + [ "DEC L", 0x2d, 0 ], + [ "DEC SP", 0x3b, 0 ], + [ "DI", 0xf3, 0 ], + [ "EI", 0xfb, 0 ], + [ "HALT", 0x76, 0 ], + [ "INC A", 0x3c, 0 ], + [ "INC B", 0x4, 0 ], + [ "INC BC", 0x3, 0 ], + [ "INC C", 0xc, 0 ], + [ "INC D", 0x14, 0 ], + [ "INC DE", 0x13, 0 ], + [ "INC E", 0x1c, 0 ], + [ "INC H", 0x24, 0 ], + [ "INC HL", 0x23, 0 ], + [ "INC [HL]", 0x34, 0 ], + [ "INC L", 0x2c, 0 ], + [ "INC SP", 0x33, 0 ], + [ "JP C, ?", 0xda, 2 ], + [ "JP HL", 0xe9, 0 ], + [ "JP NC, ?", 0xd2, 2 ], + [ "JP NZ, ?", 0xc2, 2 ], + [ "JP Z, ?", 0xca, 2 ], + [ "JP ?", 0xc3, 2 ], + [ "JR C, x", 0x38, 1 ], + [ "JR NC, x", 0x30, 1 ], + [ "JR NZ, x", 0x20, 1 ], + [ "JR Z, x", 0x28, 1 ], + [ "JR x", 0x18, 1 ], + [ "LD A, A", 0x7f, 0 ], + [ "LD A, B", 0x78, 0 ], + [ "LD A, C", 0x79, 0 ], + [ "LD A, D", 0x7a, 0 ], + [ "LD A, E", 0x7b, 0 ], + [ "LD A, H", 0x7c, 0 ], + [ "LD A, L", 0x7d, 0 ], + [ "LD A, [$FF00+C]", 0xf2, 0 ], + [ "LD A, [$FF00+x]", 0xf0, 1 ], # [ "LDH A, [x]", 0xf0, 1 ], #rgbds has trouble with this one? - [ "LD A, [BC]", 0xa, 0 ], - [ "LD A, [DE]", 0x1a, 0 ], -# [ "LD A, [HL+]", 0x2a, 0 ], -# [ "LD A, [HL-]", 0x3a, 0 ], - [ "LD A, [HL]", 0x7e, 0 ], - [ "LD A, [HLD]", 0x3a, 0 ], - [ "LD A, [HLI]", 0x2a, 0 ], - [ "LD A, [?]", 0xfa, 2 ], - [ "LD A, x", 0x3e, 1 ], - [ "LD B, A", 0x47, 0 ], - [ "LD B, B", 0x40, 0 ], - [ "LD B, C", 0x41, 0 ], - [ "LD [BC], A", 0x2, 0 ], - [ "LD B, D", 0x42, 0 ], - [ "LD B, E", 0x43, 0 ], - [ "LD B, H", 0x44, 0 ], - [ "LD B, [HL]", 0x46, 0 ], - [ "LD B, L", 0x45, 0 ], - [ "LD B, x", 0x6, 1 ], - [ "LD C, A", 0x4f, 0 ], - [ "LD C, B", 0x48, 0 ], - [ "LD C, C", 0x49, 0 ], - [ "LD C, D", 0x4a, 0 ], - [ "LD C, E", 0x4b, 0 ], - [ "LD C, H", 0x4c, 0 ], - [ "LD C, [HL]", 0x4e, 0 ], - [ "LD C, L", 0x4d, 0 ], - [ "LD C, x", 0xe, 1 ], - [ "LD D, A", 0x57, 0 ], -# [ "LDD A, [HL]", 0x3a, 0 ], - [ "LD D, B", 0x50, 0 ], - [ "LD D, C", 0x51, 0 ], - [ "LD D, D", 0x52, 0 ], - [ "LD D, E", 0x53, 0 ], - [ "LD [DE], A", 0x12, 0 ], - [ "LD D, H", 0x54, 0 ], - [ "LD D, [HL]", 0x56, 0 ], -# [ "LDD [HL], A", 0x32, 0 ], - [ "LD D, L", 0x55, 0 ], - [ "LD D, x", 0x16, 1 ], - [ "LD E, A", 0x5f, 0 ], - [ "LD E, B", 0x58, 0 ], - [ "LD E, C", 0x59, 0 ], - [ "LD E, D", 0x5a, 0 ], - [ "LD E, E", 0x5b, 0 ], - [ "LD E, H", 0x5c, 0 ], - [ "LD E, [HL]", 0x5e, 0 ], - [ "LD E, L", 0x5d, 0 ], - [ "LD E, x", 0x1e, 1 ], - [ "LD [$FF00+C], A", 0xe2, 0 ], - [ "LD [$FF00+x], A", 0xe0, 1 ], -# [ "LDH [x], A", 0xe0, 1 ], - [ "LD H, A", 0x67, 0 ], - [ "LD H, B", 0x60, 0 ], - [ "LD H, C", 0x61, 0 ], - [ "LD H, D", 0x62, 0 ], - [ "LD H, E", 0x63, 0 ], - [ "LD H, H", 0x64, 0 ], - [ "LD H, [HL]", 0x66, 0 ], - [ "LD H, L", 0x65, 0 ], -# [ "LD [HL+], A", 0x22, 0 ], -# [ "LD [HL-], A", 0x32, 0 ], - [ "LD [HL], A", 0x77, 0 ], - [ "LD [HL], B", 0x70, 0 ], - [ "LD [HL], C", 0x71, 0 ], - [ "LD [HL], D", 0x72, 0 ], - [ "LD [HLD], A", 0x32, 0 ], - [ "LD [HL], E", 0x73, 0 ], - [ "LD [HL], H", 0x74, 0 ], - [ "LD [HLI], A", 0x22, 0 ], - [ "LD [HL], L", 0x75, 0 ], - [ "LD HL, SP+x", 0xf8, 1 ], - [ "LD [HL], x", 0x36, 1 ], - [ "LD H, x", 0x26, 1 ], -# [ "LDI A, [HL]", 0x2a, 0 ], -# [ "LDI [HL], A", 0x22, 0 ], - [ "LD L, A", 0x6f, 0 ], - [ "LD L, B", 0x68, 0 ], - [ "LD L, C", 0x69, 0 ], - [ "LD L, D", 0x6a, 0 ], - [ "LD L, E", 0x6b, 0 ], - [ "LD L, H", 0x6c, 0 ], - [ "LD L, [HL]", 0x6e, 0 ], - [ "LD L, L", 0x6d, 0 ], - [ "LD L, x", 0x2e, 1 ], + [ "LD A, [BC]", 0xa, 0 ], + [ "LD A, [DE]", 0x1a, 0 ], +# [ "LD A, [HL+]", 0x2a, 0 ], +# [ "LD A, [HL-]", 0x3a, 0 ], + [ "LD A, [HL]", 0x7e, 0 ], + [ "LD A, [HLD]", 0x3a, 0 ], + [ "LD A, [HLI]", 0x2a, 0 ], + [ "LD A, [?]", 0xfa, 2 ], + [ "LD A, x", 0x3e, 1 ], + [ "LD B, A", 0x47, 0 ], + [ "LD B, B", 0x40, 0 ], + [ "LD B, C", 0x41, 0 ], + [ "LD [BC], A", 0x2, 0 ], + [ "LD B, D", 0x42, 0 ], + [ "LD B, E", 0x43, 0 ], + [ "LD B, H", 0x44, 0 ], + [ "LD B, [HL]", 0x46, 0 ], + [ "LD B, L", 0x45, 0 ], + [ "LD B, x", 0x6, 1 ], + [ "LD C, A", 0x4f, 0 ], + [ "LD C, B", 0x48, 0 ], + [ "LD C, C", 0x49, 0 ], + [ "LD C, D", 0x4a, 0 ], + [ "LD C, E", 0x4b, 0 ], + [ "LD C, H", 0x4c, 0 ], + [ "LD C, [HL]", 0x4e, 0 ], + [ "LD C, L", 0x4d, 0 ], + [ "LD C, x", 0xe, 1 ], + [ "LD D, A", 0x57, 0 ], +# [ "LDD A, [HL]", 0x3a, 0 ], + [ "LD D, B", 0x50, 0 ], + [ "LD D, C", 0x51, 0 ], + [ "LD D, D", 0x52, 0 ], + [ "LD D, E", 0x53, 0 ], + [ "LD [DE], A", 0x12, 0 ], + [ "LD D, H", 0x54, 0 ], + [ "LD D, [HL]", 0x56, 0 ], +# [ "LDD [HL], A", 0x32, 0 ], + [ "LD D, L", 0x55, 0 ], + [ "LD D, x", 0x16, 1 ], + [ "LD E, A", 0x5f, 0 ], + [ "LD E, B", 0x58, 0 ], + [ "LD E, C", 0x59, 0 ], + [ "LD E, D", 0x5a, 0 ], + [ "LD E, E", 0x5b, 0 ], + [ "LD E, H", 0x5c, 0 ], + [ "LD E, [HL]", 0x5e, 0 ], + [ "LD E, L", 0x5d, 0 ], + [ "LD E, x", 0x1e, 1 ], + [ "LD [$FF00+C], A", 0xe2, 0 ], + [ "LD [$FF00+x], A", 0xe0, 1 ], +# [ "LDH [x], A", 0xe0, 1 ], + [ "LD H, A", 0x67, 0 ], + [ "LD H, B", 0x60, 0 ], + [ "LD H, C", 0x61, 0 ], + [ "LD H, D", 0x62, 0 ], + [ "LD H, E", 0x63, 0 ], + [ "LD H, H", 0x64, 0 ], + [ "LD H, [HL]", 0x66, 0 ], + [ "LD H, L", 0x65, 0 ], +# [ "LD [HL+], A", 0x22, 0 ], +# [ "LD [HL-], A", 0x32, 0 ], + [ "LD [HL], A", 0x77, 0 ], + [ "LD [HL], B", 0x70, 0 ], + [ "LD [HL], C", 0x71, 0 ], + [ "LD [HL], D", 0x72, 0 ], + [ "LD [HLD], A", 0x32, 0 ], + [ "LD [HL], E", 0x73, 0 ], + [ "LD [HL], H", 0x74, 0 ], + [ "LD [HLI], A", 0x22, 0 ], + [ "LD [HL], L", 0x75, 0 ], + [ "LD HL, SP+x", 0xf8, 1 ], + [ "LD [HL], x", 0x36, 1 ], + [ "LD H, x", 0x26, 1 ], +# [ "LDI A, [HL]", 0x2a, 0 ], +# [ "LDI [HL], A", 0x22, 0 ], + [ "LD L, A", 0x6f, 0 ], + [ "LD L, B", 0x68, 0 ], + [ "LD L, C", 0x69, 0 ], + [ "LD L, D", 0x6a, 0 ], + [ "LD L, E", 0x6b, 0 ], + [ "LD L, H", 0x6c, 0 ], + [ "LD L, [HL]", 0x6e, 0 ], + [ "LD L, L", 0x6d, 0 ], + [ "LD L, x", 0x2e, 1 ], # [ "LD PC, HL", 0xe9, 0 ], #prefer jp [hl] - [ "LD SP, HL", 0xf9, 0 ], - [ "LD BC, ?", 0x1, 2 ], - [ "LD DE, ?", 0x11, 2 ], - [ "LD HL, ?", 0x21, 2 ], - [ "LD SP, ?", 0x31, 2 ], -# [ "LD [?], SP", 0x8, 2 ], - [ "LD [?], A", 0xea, 2 ], - [ "NOP", 0x0, 0 ], - [ "OR A", 0xb7, 0 ], - [ "OR B", 0xb0, 0 ], - [ "OR C", 0xb1, 0 ], - [ "OR D", 0xb2, 0 ], - [ "OR E", 0xb3, 0 ], - [ "OR H", 0xb4, 0 ], - [ "OR [HL]", 0xb6, 0 ], - [ "OR L", 0xb5, 0 ], - [ "OR x", 0xf6, 1 ], - [ "POP AF", 0xf1, 0 ], - [ "POP BC", 0xc1, 0 ], - [ "POP DE", 0xd1, 0 ], - [ "POP HL", 0xe1, 0 ], - [ "PUSH AF", 0xf5, 0 ], - [ "PUSH BC", 0xc5, 0 ], - [ "PUSH DE", 0xd5, 0 ], - [ "PUSH HL", 0xe5, 0 ], - [ "RES 0, A", 0x87cb, 3 ], - [ "RES 0, B", 0x80cb, 3 ], - [ "RES 0, C", 0x81cb, 3 ], - [ "RES 0, D", 0x82cb, 3 ], - [ "RES 0, E", 0x83cb, 3 ], - [ "RES 0, H", 0x84cb, 3 ], - [ "RES 0, [HL]", 0x86cb, 3 ], - [ "RES 0, L", 0x85cb, 3 ], - [ "RES 1, A", 0x8fcb, 3 ], - [ "RES 1, B", 0x88cb, 3 ], - [ "RES 1, C", 0x89cb, 3 ], - [ "RES 1, D", 0x8acb, 3 ], - [ "RES 1, E", 0x8bcb, 3 ], - [ "RES 1, H", 0x8ccb, 3 ], - [ "RES 1, [HL]", 0x8ecb, 3 ], - [ "RES 1, L", 0x8dcb, 3 ], - [ "RES 2, A", 0x97cb, 3 ], - [ "RES 2, B", 0x90cb, 3 ], - [ "RES 2, C", 0x91cb, 3 ], - [ "RES 2, D", 0x92cb, 3 ], - [ "RES 2, E", 0x93cb, 3 ], - [ "RES 2, H", 0x94cb, 3 ], - [ "RES 2, [HL]", 0x96cb, 3 ], - [ "RES 2, L", 0x95cb, 3 ], - [ "RES 3, A", 0x9fcb, 3 ], - [ "RES 3, B", 0x98cb, 3 ], - [ "RES 3, C", 0x99cb, 3 ], - [ "RES 3, D", 0x9acb, 3 ], - [ "RES 3, E", 0x9bcb, 3 ], - [ "RES 3, H", 0x9ccb, 3 ], - [ "RES 3, [HL]", 0x9ecb, 3 ], - [ "RES 3, L", 0x9dcb, 3 ], - [ "RES 4, A", 0xa7cb, 3 ], - [ "RES 4, B", 0xa0cb, 3 ], - [ "RES 4, C", 0xa1cb, 3 ], - [ "RES 4, D", 0xa2cb, 3 ], - [ "RES 4, E", 0xa3cb, 3 ], - [ "RES 4, H", 0xa4cb, 3 ], - [ "RES 4, [HL]", 0xa6cb, 3 ], - [ "RES 4, L", 0xa5cb, 3 ], - [ "RES 5, A", 0xafcb, 3 ], - [ "RES 5, B", 0xa8cb, 3 ], - [ "RES 5, C", 0xa9cb, 3 ], - [ "RES 5, D", 0xaacb, 3 ], - [ "RES 5, E", 0xabcb, 3 ], - [ "RES 5, H", 0xaccb, 3 ], - [ "RES 5, [HL]", 0xaecb, 3 ], - [ "RES 5, L", 0xadcb, 3 ], - [ "RES 6, A", 0xb7cb, 3 ], - [ "RES 6, B", 0xb0cb, 3 ], - [ "RES 6, C", 0xb1cb, 3 ], - [ "RES 6, D", 0xb2cb, 3 ], - [ "RES 6, E", 0xb3cb, 3 ], - [ "RES 6, H", 0xb4cb, 3 ], - [ "RES 6, [HL]", 0xb6cb, 3 ], - [ "RES 6, L", 0xb5cb, 3 ], - [ "RES 7, A", 0xbfcb, 3 ], - [ "RES 7, B", 0xb8cb, 3 ], - [ "RES 7, C", 0xb9cb, 3 ], - [ "RES 7, D", 0xbacb, 3 ], - [ "RES 7, E", 0xbbcb, 3 ], - [ "RES 7, H", 0xbccb, 3 ], - [ "RES 7, [HL]", 0xbecb, 3 ], - [ "RES 7, L", 0xbdcb, 3 ], - [ "RETI", 0xd9, 0 ], - [ "RET C", 0xd8, 0 ], - [ "RET NC", 0xd0, 0 ], - [ "RET NZ", 0xc0, 0 ], - [ "RET Z", 0xc8, 0 ], - [ "RET", 0xc9, 0 ], - [ "RLA", 0x17, 0 ], - [ "RL A", 0x17cb, 3 ], - [ "RL B", 0x10cb, 3 ], - [ "RL C", 0x11cb, 3 ], - [ "RLCA", 0x7, 0 ], - [ "RLC A", 0x7cb, 3 ], - [ "RLC B", 0xcb, 3 ], - [ "RLC C", 0x1cb, 3 ], - [ "RLC D", 0x2cb, 3 ], - [ "RLC E", 0x3cb, 3 ], - [ "RLC H", 0x4cb, 3 ], - [ "RLC [HL]", 0x6cb, 3 ], - [ "RLC L", 0x5cb, 3 ], - [ "RL D", 0x12cb, 3 ], - [ "RL E", 0x13cb, 3 ], - [ "RL H", 0x14cb, 3 ], - [ "RL [HL]", 0x16cb, 3 ], - [ "RL L", 0x15cb, 3 ], - [ "RRA", 0x1f, 0 ], - [ "RR A", 0x1fcb, 3 ], - [ "RR B", 0x18cb, 3 ], - [ "RR C", 0x19cb, 3 ], - [ "RRCA", 0xf, 0 ], - [ "RRC A", 0xfcb, 3 ], - [ "RRC B", 0x8cb, 3 ], - [ "RRC C", 0x9cb, 3 ], - [ "RRC D", 0xacb, 3 ], - [ "RRC E", 0xbcb, 3 ], - [ "RRC H", 0xccb, 3 ], - [ "RRC [HL]", 0xecb, 3 ], - [ "RRC L", 0xdcb, 3 ], - [ "RR D", 0x1acb, 3 ], - [ "RR E", 0x1bcb, 3 ], - [ "RR H", 0x1ccb, 3 ], - [ "RR [HL]", 0x1ecb, 3 ], - [ "RR L", 0x1dcb, 3 ], - [ "RST $0", 0xc7, 0 ], - [ "RST $10", 0xd7, 0 ], - [ "RST $18", 0xdf, 0 ], - [ "RST $20", 0xe7, 0 ], - [ "RST $28", 0xef, 0 ], - [ "RST $30", 0xf7, 0 ], - [ "RST $38", 0xff, 0 ], - [ "RST $8", 0xcf, 0 ], - [ "SBC A", 0x9f, 0 ], - [ "SBC B", 0x98, 0 ], - [ "SBC C", 0x99, 0 ], - [ "SBC D", 0x9a, 0 ], - [ "SBC E", 0x9b, 0 ], - [ "SBC H", 0x9c, 0 ], - [ "SBC [HL]", 0x9e, 0 ], - [ "SBC L", 0x9d, 0 ], - [ "SBC x", 0xde, 1 ], - [ "SCF", 0x37, 0 ], - [ "SET 0, A", 0xc7cb, 3 ], - [ "SET 0, B", 0xc0cb, 3 ], - [ "SET 0, C", 0xc1cb, 3 ], - [ "SET 0, D", 0xc2cb, 3 ], - [ "SET 0, E", 0xc3cb, 3 ], - [ "SET 0, H", 0xc4cb, 3 ], - [ "SET 0, [HL]", 0xc6cb, 3 ], - [ "SET 0, L", 0xc5cb, 3 ], - [ "SET 1, A", 0xcfcb, 3 ], - [ "SET 1, B", 0xc8cb, 3 ], - [ "SET 1, C", 0xc9cb, 3 ], - [ "SET 1, D", 0xcacb, 3 ], - [ "SET 1, E", 0xcbcb, 3 ], - [ "SET 1, H", 0xcccb, 3 ], - [ "SET 1, [HL]", 0xcecb, 3 ], - [ "SET 1, L", 0xcdcb, 3 ], - [ "SET 2, A", 0xd7cb, 3 ], - [ "SET 2, B", 0xd0cb, 3 ], - [ "SET 2, C", 0xd1cb, 3 ], - [ "SET 2, D", 0xd2cb, 3 ], - [ "SET 2, E", 0xd3cb, 3 ], - [ "SET 2, H", 0xd4cb, 3 ], - [ "SET 2, [HL]", 0xd6cb, 3 ], - [ "SET 2, L", 0xd5cb, 3 ], - [ "SET 3, A", 0xdfcb, 3 ], - [ "SET 3, B", 0xd8cb, 3 ], - [ "SET 3, C", 0xd9cb, 3 ], - [ "SET 3, D", 0xdacb, 3 ], - [ "SET 3, E", 0xdbcb, 3 ], - [ "SET 3, H", 0xdccb, 3 ], - [ "SET 3, [HL]", 0xdecb, 3 ], - [ "SET 3, L", 0xddcb, 3 ], - [ "SET 4, A", 0xe7cb, 3 ], - [ "SET 4, B", 0xe0cb, 3 ], - [ "SET 4, C", 0xe1cb, 3 ], - [ "SET 4, D", 0xe2cb, 3 ], - [ "SET 4, E", 0xe3cb, 3 ], - [ "SET 4, H", 0xe4cb, 3 ], - [ "SET 4, [HL]", 0xe6cb, 3 ], - [ "SET 4, L", 0xe5cb, 3 ], - [ "SET 5, A", 0xefcb, 3 ], - [ "SET 5, B", 0xe8cb, 3 ], - [ "SET 5, C", 0xe9cb, 3 ], - [ "SET 5, D", 0xeacb, 3 ], - [ "SET 5, E", 0xebcb, 3 ], - [ "SET 5, H", 0xeccb, 3 ], - [ "SET 5, [HL]", 0xeecb, 3 ], - [ "SET 5, L", 0xedcb, 3 ], - [ "SET 6, A", 0xf7cb, 3 ], - [ "SET 6, B", 0xf0cb, 3 ], - [ "SET 6, C", 0xf1cb, 3 ], - [ "SET 6, D", 0xf2cb, 3 ], - [ "SET 6, E", 0xf3cb, 3 ], - [ "SET 6, H", 0xf4cb, 3 ], - [ "SET 6, [HL]", 0xf6cb, 3 ], - [ "SET 6, L", 0xf5cb, 3 ], - [ "SET 7, A", 0xffcb, 3 ], - [ "SET 7, B", 0xf8cb, 3 ], - [ "SET 7, C", 0xf9cb, 3 ], - [ "SET 7, D", 0xfacb, 3 ], - [ "SET 7, E", 0xfbcb, 3 ], - [ "SET 7, H", 0xfccb, 3 ], - [ "SET 7, [HL]", 0xfecb, 3 ], - [ "SET 7, L", 0xfdcb, 3 ], - [ "SLA A", 0x27cb, 3 ], - [ "SLA B", 0x20cb, 3 ], - [ "SLA C", 0x21cb, 3 ], - [ "SLA D", 0x22cb, 3 ], - [ "SLA E", 0x23cb, 3 ], - [ "SLA H", 0x24cb, 3 ], - [ "SLA [HL]", 0x26cb, 3 ], - [ "SLA L", 0x25cb, 3 ], - [ "SRA A", 0x2fcb, 3 ], - [ "SRA B", 0x28cb, 3 ], - [ "SRA C", 0x29cb, 3 ], - [ "SRA D", 0x2acb, 3 ], - [ "SRA E", 0x2bcb, 3 ], - [ "SRA H", 0x2ccb, 3 ], - [ "SRA [HL]", 0x2ecb, 3 ], - [ "SRA L", 0x2dcb, 3 ], - [ "SRL A", 0x3fcb, 3 ], - [ "SRL B", 0x38cb, 3 ], - [ "SRL C", 0x39cb, 3 ], - [ "SRL D", 0x3acb, 3 ], - [ "SRL E", 0x3bcb, 3 ], - [ "SRL H", 0x3ccb, 3 ], - [ "SRL [HL]", 0x3ecb, 3 ], - [ "SRL L", 0x3dcb, 3 ], - [ "STOP", 0x10, 0 ], - [ "SUB A", 0x97, 0 ], - [ "SUB B", 0x90, 0 ], - [ "SUB C", 0x91, 0 ], - [ "SUB D", 0x92, 0 ], - [ "SUB E", 0x93, 0 ], - [ "SUB H", 0x94, 0 ], - [ "SUB [HL]", 0x96, 0 ], - [ "SUB L", 0x95, 0 ], - [ "SUB x", 0xd6, 1 ], - [ "SWAP A", 0x37cb, 3 ], - [ "SWAP B", 0x30cb, 3 ], - [ "SWAP C", 0x31cb, 3 ], - [ "SWAP D", 0x32cb, 3 ], - [ "SWAP E", 0x33cb, 3 ], - [ "SWAP H", 0x34cb, 3 ], - [ "SWAP [HL]", 0x36cb, 3 ], - [ "SWAP L", 0x35cb, 3 ], - [ "XOR A", 0xaf, 0 ], - [ "XOR B", 0xa8, 0 ], - [ "XOR C", 0xa9, 0 ], - [ "XOR D", 0xaa, 0 ], - [ "XOR E", 0xab, 0 ], - [ "XOR H", 0xac, 0 ], - [ "XOR [HL]", 0xae, 0 ], - [ "XOR L", 0xad, 0 ], - [ "XOR x", 0xee, 1 ], - [ "E", 0x100, -1 ], + [ "LD SP, HL", 0xf9, 0 ], + [ "LD BC, ?", 0x1, 2 ], + [ "LD DE, ?", 0x11, 2 ], + [ "LD HL, ?", 0x21, 2 ], + [ "LD SP, ?", 0x31, 2 ], +# [ "LD [?], SP", 0x8, 2 ], + [ "LD [?], A", 0xea, 2 ], + [ "NOP", 0x0, 0 ], + [ "OR A", 0xb7, 0 ], + [ "OR B", 0xb0, 0 ], + [ "OR C", 0xb1, 0 ], + [ "OR D", 0xb2, 0 ], + [ "OR E", 0xb3, 0 ], + [ "OR H", 0xb4, 0 ], + [ "OR [HL]", 0xb6, 0 ], + [ "OR L", 0xb5, 0 ], + [ "OR x", 0xf6, 1 ], + [ "POP AF", 0xf1, 0 ], + [ "POP BC", 0xc1, 0 ], + [ "POP DE", 0xd1, 0 ], + [ "POP HL", 0xe1, 0 ], + [ "PUSH AF", 0xf5, 0 ], + [ "PUSH BC", 0xc5, 0 ], + [ "PUSH DE", 0xd5, 0 ], + [ "PUSH HL", 0xe5, 0 ], + [ "RES 0, A", 0x87cb, 3 ], + [ "RES 0, B", 0x80cb, 3 ], + [ "RES 0, C", 0x81cb, 3 ], + [ "RES 0, D", 0x82cb, 3 ], + [ "RES 0, E", 0x83cb, 3 ], + [ "RES 0, H", 0x84cb, 3 ], + [ "RES 0, [HL]", 0x86cb, 3 ], + [ "RES 0, L", 0x85cb, 3 ], + [ "RES 1, A", 0x8fcb, 3 ], + [ "RES 1, B", 0x88cb, 3 ], + [ "RES 1, C", 0x89cb, 3 ], + [ "RES 1, D", 0x8acb, 3 ], + [ "RES 1, E", 0x8bcb, 3 ], + [ "RES 1, H", 0x8ccb, 3 ], + [ "RES 1, [HL]", 0x8ecb, 3 ], + [ "RES 1, L", 0x8dcb, 3 ], + [ "RES 2, A", 0x97cb, 3 ], + [ "RES 2, B", 0x90cb, 3 ], + [ "RES 2, C", 0x91cb, 3 ], + [ "RES 2, D", 0x92cb, 3 ], + [ "RES 2, E", 0x93cb, 3 ], + [ "RES 2, H", 0x94cb, 3 ], + [ "RES 2, [HL]", 0x96cb, 3 ], + [ "RES 2, L", 0x95cb, 3 ], + [ "RES 3, A", 0x9fcb, 3 ], + [ "RES 3, B", 0x98cb, 3 ], + [ "RES 3, C", 0x99cb, 3 ], + [ "RES 3, D", 0x9acb, 3 ], + [ "RES 3, E", 0x9bcb, 3 ], + [ "RES 3, H", 0x9ccb, 3 ], + [ "RES 3, [HL]", 0x9ecb, 3 ], + [ "RES 3, L", 0x9dcb, 3 ], + [ "RES 4, A", 0xa7cb, 3 ], + [ "RES 4, B", 0xa0cb, 3 ], + [ "RES 4, C", 0xa1cb, 3 ], + [ "RES 4, D", 0xa2cb, 3 ], + [ "RES 4, E", 0xa3cb, 3 ], + [ "RES 4, H", 0xa4cb, 3 ], + [ "RES 4, [HL]", 0xa6cb, 3 ], + [ "RES 4, L", 0xa5cb, 3 ], + [ "RES 5, A", 0xafcb, 3 ], + [ "RES 5, B", 0xa8cb, 3 ], + [ "RES 5, C", 0xa9cb, 3 ], + [ "RES 5, D", 0xaacb, 3 ], + [ "RES 5, E", 0xabcb, 3 ], + [ "RES 5, H", 0xaccb, 3 ], + [ "RES 5, [HL]", 0xaecb, 3 ], + [ "RES 5, L", 0xadcb, 3 ], + [ "RES 6, A", 0xb7cb, 3 ], + [ "RES 6, B", 0xb0cb, 3 ], + [ "RES 6, C", 0xb1cb, 3 ], + [ "RES 6, D", 0xb2cb, 3 ], + [ "RES 6, E", 0xb3cb, 3 ], + [ "RES 6, H", 0xb4cb, 3 ], + [ "RES 6, [HL]", 0xb6cb, 3 ], + [ "RES 6, L", 0xb5cb, 3 ], + [ "RES 7, A", 0xbfcb, 3 ], + [ "RES 7, B", 0xb8cb, 3 ], + [ "RES 7, C", 0xb9cb, 3 ], + [ "RES 7, D", 0xbacb, 3 ], + [ "RES 7, E", 0xbbcb, 3 ], + [ "RES 7, H", 0xbccb, 3 ], + [ "RES 7, [HL]", 0xbecb, 3 ], + [ "RES 7, L", 0xbdcb, 3 ], + [ "RETI", 0xd9, 0 ], + [ "RET C", 0xd8, 0 ], + [ "RET NC", 0xd0, 0 ], + [ "RET NZ", 0xc0, 0 ], + [ "RET Z", 0xc8, 0 ], + [ "RET", 0xc9, 0 ], + [ "RLA", 0x17, 0 ], + [ "RL A", 0x17cb, 3 ], + [ "RL B", 0x10cb, 3 ], + [ "RL C", 0x11cb, 3 ], + [ "RLCA", 0x7, 0 ], + [ "RLC A", 0x7cb, 3 ], + [ "RLC B", 0xcb, 3 ], + [ "RLC C", 0x1cb, 3 ], + [ "RLC D", 0x2cb, 3 ], + [ "RLC E", 0x3cb, 3 ], + [ "RLC H", 0x4cb, 3 ], + [ "RLC [HL]", 0x6cb, 3 ], + [ "RLC L", 0x5cb, 3 ], + [ "RL D", 0x12cb, 3 ], + [ "RL E", 0x13cb, 3 ], + [ "RL H", 0x14cb, 3 ], + [ "RL [HL]", 0x16cb, 3 ], + [ "RL L", 0x15cb, 3 ], + [ "RRA", 0x1f, 0 ], + [ "RR A", 0x1fcb, 3 ], + [ "RR B", 0x18cb, 3 ], + [ "RR C", 0x19cb, 3 ], + [ "RRCA", 0xf, 0 ], + [ "RRC A", 0xfcb, 3 ], + [ "RRC B", 0x8cb, 3 ], + [ "RRC C", 0x9cb, 3 ], + [ "RRC D", 0xacb, 3 ], + [ "RRC E", 0xbcb, 3 ], + [ "RRC H", 0xccb, 3 ], + [ "RRC [HL]", 0xecb, 3 ], + [ "RRC L", 0xdcb, 3 ], + [ "RR D", 0x1acb, 3 ], + [ "RR E", 0x1bcb, 3 ], + [ "RR H", 0x1ccb, 3 ], + [ "RR [HL]", 0x1ecb, 3 ], + [ "RR L", 0x1dcb, 3 ], + [ "RST $0", 0xc7, 0 ], + [ "RST $10", 0xd7, 0 ], + [ "RST $18", 0xdf, 0 ], + [ "RST $20", 0xe7, 0 ], + [ "RST $28", 0xef, 0 ], + [ "RST $30", 0xf7, 0 ], + [ "RST $38", 0xff, 0 ], + [ "RST $8", 0xcf, 0 ], + [ "SBC A", 0x9f, 0 ], + [ "SBC B", 0x98, 0 ], + [ "SBC C", 0x99, 0 ], + [ "SBC D", 0x9a, 0 ], + [ "SBC E", 0x9b, 0 ], + [ "SBC H", 0x9c, 0 ], + [ "SBC [HL]", 0x9e, 0 ], + [ "SBC L", 0x9d, 0 ], + [ "SBC x", 0xde, 1 ], + [ "SCF", 0x37, 0 ], + [ "SET 0, A", 0xc7cb, 3 ], + [ "SET 0, B", 0xc0cb, 3 ], + [ "SET 0, C", 0xc1cb, 3 ], + [ "SET 0, D", 0xc2cb, 3 ], + [ "SET 0, E", 0xc3cb, 3 ], + [ "SET 0, H", 0xc4cb, 3 ], + [ "SET 0, [HL]", 0xc6cb, 3 ], + [ "SET 0, L", 0xc5cb, 3 ], + [ "SET 1, A", 0xcfcb, 3 ], + [ "SET 1, B", 0xc8cb, 3 ], + [ "SET 1, C", 0xc9cb, 3 ], + [ "SET 1, D", 0xcacb, 3 ], + [ "SET 1, E", 0xcbcb, 3 ], + [ "SET 1, H", 0xcccb, 3 ], + [ "SET 1, [HL]", 0xcecb, 3 ], + [ "SET 1, L", 0xcdcb, 3 ], + [ "SET 2, A", 0xd7cb, 3 ], + [ "SET 2, B", 0xd0cb, 3 ], + [ "SET 2, C", 0xd1cb, 3 ], + [ "SET 2, D", 0xd2cb, 3 ], + [ "SET 2, E", 0xd3cb, 3 ], + [ "SET 2, H", 0xd4cb, 3 ], + [ "SET 2, [HL]", 0xd6cb, 3 ], + [ "SET 2, L", 0xd5cb, 3 ], + [ "SET 3, A", 0xdfcb, 3 ], + [ "SET 3, B", 0xd8cb, 3 ], + [ "SET 3, C", 0xd9cb, 3 ], + [ "SET 3, D", 0xdacb, 3 ], + [ "SET 3, E", 0xdbcb, 3 ], + [ "SET 3, H", 0xdccb, 3 ], + [ "SET 3, [HL]", 0xdecb, 3 ], + [ "SET 3, L", 0xddcb, 3 ], + [ "SET 4, A", 0xe7cb, 3 ], + [ "SET 4, B", 0xe0cb, 3 ], + [ "SET 4, C", 0xe1cb, 3 ], + [ "SET 4, D", 0xe2cb, 3 ], + [ "SET 4, E", 0xe3cb, 3 ], + [ "SET 4, H", 0xe4cb, 3 ], + [ "SET 4, [HL]", 0xe6cb, 3 ], + [ "SET 4, L", 0xe5cb, 3 ], + [ "SET 5, A", 0xefcb, 3 ], + [ "SET 5, B", 0xe8cb, 3 ], + [ "SET 5, C", 0xe9cb, 3 ], + [ "SET 5, D", 0xeacb, 3 ], + [ "SET 5, E", 0xebcb, 3 ], + [ "SET 5, H", 0xeccb, 3 ], + [ "SET 5, [HL]", 0xeecb, 3 ], + [ "SET 5, L", 0xedcb, 3 ], + [ "SET 6, A", 0xf7cb, 3 ], + [ "SET 6, B", 0xf0cb, 3 ], + [ "SET 6, C", 0xf1cb, 3 ], + [ "SET 6, D", 0xf2cb, 3 ], + [ "SET 6, E", 0xf3cb, 3 ], + [ "SET 6, H", 0xf4cb, 3 ], + [ "SET 6, [HL]", 0xf6cb, 3 ], + [ "SET 6, L", 0xf5cb, 3 ], + [ "SET 7, A", 0xffcb, 3 ], + [ "SET 7, B", 0xf8cb, 3 ], + [ "SET 7, C", 0xf9cb, 3 ], + [ "SET 7, D", 0xfacb, 3 ], + [ "SET 7, E", 0xfbcb, 3 ], + [ "SET 7, H", 0xfccb, 3 ], + [ "SET 7, [HL]", 0xfecb, 3 ], + [ "SET 7, L", 0xfdcb, 3 ], + [ "SLA A", 0x27cb, 3 ], + [ "SLA B", 0x20cb, 3 ], + [ "SLA C", 0x21cb, 3 ], + [ "SLA D", 0x22cb, 3 ], + [ "SLA E", 0x23cb, 3 ], + [ "SLA H", 0x24cb, 3 ], + [ "SLA [HL]", 0x26cb, 3 ], + [ "SLA L", 0x25cb, 3 ], + [ "SRA A", 0x2fcb, 3 ], + [ "SRA B", 0x28cb, 3 ], + [ "SRA C", 0x29cb, 3 ], + [ "SRA D", 0x2acb, 3 ], + [ "SRA E", 0x2bcb, 3 ], + [ "SRA H", 0x2ccb, 3 ], + [ "SRA [HL]", 0x2ecb, 3 ], + [ "SRA L", 0x2dcb, 3 ], + [ "SRL A", 0x3fcb, 3 ], + [ "SRL B", 0x38cb, 3 ], + [ "SRL C", 0x39cb, 3 ], + [ "SRL D", 0x3acb, 3 ], + [ "SRL E", 0x3bcb, 3 ], + [ "SRL H", 0x3ccb, 3 ], + [ "SRL [HL]", 0x3ecb, 3 ], + [ "SRL L", 0x3dcb, 3 ], + [ "STOP", 0x10, 0 ], + [ "SUB A", 0x97, 0 ], + [ "SUB B", 0x90, 0 ], + [ "SUB C", 0x91, 0 ], + [ "SUB D", 0x92, 0 ], + [ "SUB E", 0x93, 0 ], + [ "SUB H", 0x94, 0 ], + [ "SUB [HL]", 0x96, 0 ], + [ "SUB L", 0x95, 0 ], + [ "SUB x", 0xd6, 1 ], + [ "SWAP A", 0x37cb, 3 ], + [ "SWAP B", 0x30cb, 3 ], + [ "SWAP C", 0x31cb, 3 ], + [ "SWAP D", 0x32cb, 3 ], + [ "SWAP E", 0x33cb, 3 ], + [ "SWAP H", 0x34cb, 3 ], + [ "SWAP [HL]", 0x36cb, 3 ], + [ "SWAP L", 0x35cb, 3 ], + [ "XOR A", 0xaf, 0 ], + [ "XOR B", 0xa8, 0 ], + [ "XOR C", 0xa9, 0 ], + [ "XOR D", 0xaa, 0 ], + [ "XOR E", 0xab, 0 ], + [ "XOR H", 0xac, 0 ], + [ "XOR [HL]", 0xae, 0 ], + [ "XOR L", 0xad, 0 ], + [ "XOR x", 0xee, 1 ], + [ "E", 0x100, -1 ], ] #find conflicts @@ -545,7 +546,7 @@ end_08_scripts_with = [ 0xc9, #ret ###0xda, 0xe9, 0xd2, 0xc2, 0xca, 0xc3, 0x38, 0x30, 0x20, 0x28, 0x18, 0xd8, 0xd0, 0xc0, 0xc8, 0xc9 ] -relative_jumps = [0x38, 0x30, 0x20, 0x28, 0x18] +relative_jumps = [0x38, 0x30, 0x20, 0x28, 0x18, 0xc3] relative_unconditional_jumps = [0xc3, 0x18] #TODO: replace call and a pointer with call and a label @@ -567,6 +568,10 @@ asm_commands = { def random_asm_label(): return ".ASM_" + random_hash() +def asm_label(address): + # why using a random value when you can use the eff. address? + return ".ASM_" + hex(address)[2:] + def output_bank_opcodes(original_offset, max_byte_count=0x4000): #fs = current_address #b = bank_byte @@ -579,12 +584,12 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000): rom = extract_maps.rom offset = original_offset current_byte_number = 0 #start from the beginning - + #we don't actually have an end address, but we'll just say $4000 end_address = original_offset + max_byte_count byte_labels = {} - + output = "" keep_reading = True while offset <= end_address and keep_reading: @@ -599,23 +604,24 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000): line_label = byte_labels[offset]["name"] byte_labels[offset]["usage"] += 1 else: - line_label = random_asm_label() + line_label = asm_label(offset) byte_labels[offset] = {} byte_labels[offset]["name"] = line_label byte_labels[offset]["usage"] = 0 - output += line_label.lower() + " ; " + hex(offset) + "\n" + byte_labels[offset]["definition"] = True + output += line_label.lower() + "\n" #" ; " + hex(offset) + "\n" #find out if there's a two byte key like this temp_maybe = maybe_byte temp_maybe += ( ord(rom[offset+1]) << 8) if temp_maybe in opt_table.keys() and ord(rom[offset+1])!=0: opstr = opt_table[temp_maybe][0].lower() - + if "x" in opstr: for x in range(0, opstr.count("x")): insertion = ord(rom[offset + 1]) insertion = "$" + hex(insertion)[2:] - + opstr = opstr[:opstr.find("x")].lower() + insertion + opstr[opstr.find("x")+1:].lower() current_byte += 1 @@ -624,12 +630,12 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000): for y in range(0, opstr.count("?")): byte1 = ord(rom[offset + 1]) byte2 = ord(rom[offset + 2]) - + number = byte1 number += byte2 << 8; insertion = "$%.4x" % (number) - + opstr = opstr[:opstr.find("?")].lower() + insertion + opstr[opstr.find("?")+1:].lower() current_byte_number += 2 @@ -644,7 +650,7 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000): op_code = opt_table[maybe_byte] op_code_type = op_code[1] op_code_byte = maybe_byte - + #type = -1 when it's the E op #if op_code_type != -1: if op_code_type == 0 and ord(rom[offset]) == op_code_byte: @@ -652,7 +658,7 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000): output += spacing + op_code[0].lower() #+ " ; " + hex(offset) output += "\n" - + offset += 1 current_byte_number += 1 elif op_code_type == 1 and ord(rom[offset]) == op_code_byte: @@ -666,28 +672,29 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000): if current_byte == 0x18 or current_byte==0x20 or current_byte in relative_jumps: #jr or jr nz #generate a label for the byte we're jumping to - target_address = offset + 2 + ord(rom[offset + 1]) + target_address = offset + 2 + c_int8(ord(rom[offset + 1])).value if target_address in byte_labels.keys(): byte_labels[target_address]["usage"] = 1 + byte_labels[target_address]["usage"] line_label2 = byte_labels[target_address]["name"] else: - line_label2 = random_asm_label() + line_label2 = asm_label(target_address) byte_labels[target_address] = {} byte_labels[target_address]["name"] = line_label2 byte_labels[target_address]["usage"] = 1 - + byte_labels[target_address]["definition"] = False + insertion = line_label2.lower() include_comment = True opstr = opstr[:opstr.find("x")].lower() + insertion + opstr[opstr.find("x")+1:].lower() - output += spacing + opstr + output += spacing + opstr if include_comment: output += " ; " + hex(offset) if current_byte in relative_jumps: output += " $" + hex(ord(rom[offset + 1]))[2:] output += "\n" - current_byte_number += 1 + current_byte_number += 1 offset += 1 insertion = "" @@ -701,7 +708,7 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000): for x in range(0, qes): byte1 = ord(rom[offset + 1]) byte2 = ord(rom[offset + 2]) - + number = byte1 number += byte2 << 8; @@ -709,7 +716,7 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000): if maybe_byte in call_commands: if insertion[1:] in asm_commands: insertion = asm_commands[insertion[1:]] - + opstr = opstr[:opstr.find("?")].lower() + insertion + opstr[opstr.find("?")+1:].lower() output += spacing + opstr #+ " ; " + hex(offset) output += "\n" @@ -731,12 +738,12 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000): is_data = True #stop reading at a jump, relative jump or return - if current_byte in end_08_scripts_with: - if not has_outstanding_labels(byte_labels): + if current_byte in end_08_scripts_with or (current_byte == 0x18 and target_address < offset): + if not has_outstanding_labels(byte_labels) or (current_byte == 0x18 and target_address < offset): keep_reading = False is_data = False #cleanup break - else: + else: # if is_data and keep_reading: output += spacing + "db $" + hex(ord(rom[offset]))[2:] #+ " ; " + hex(offset) output += "\n" @@ -753,7 +760,7 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000): address = label_line label_line = byte_labels[label_line] if label_line["usage"] == 0: - output = output.replace((label_line["name"] + " ; " + hex(address) + "\n").lower(), "") + output = output.replace((label_line["name"] + "\n").lower(), "") #add the offset of the final location output += "; " + hex(offset) @@ -766,7 +773,7 @@ def has_outstanding_labels(byte_labels): """ for label_line in byte_labels.keys(): real_line = byte_labels[label_line] - if real_line["usage"] == 1: return True + if real_line["definition"] == False: return True return False def text_asm_pretty_printer(label, address_of_08, include_08=True): diff --git a/extras/insert_texts.py b/extras/insert_texts.py index 3257c067..561e80f7 100644 --- a/extras/insert_texts.py +++ b/extras/insert_texts.py @@ -3,7 +3,7 @@ #date: 2012-01-07 #insert TX_FAR targets into pokered.asm import extract_maps -from analyze_texts import analyze_texts +from analyze_texts import analyze_texts, text_pretty_printer_at from pretty_map_headers import map_name_cleaner, make_text_label, map_constants, find_all_tx_fars, tx_far_pretty_printer, tx_far_label_maker import pretty_map_headers 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, reset_incbins, apply_diff @@ -106,7 +106,7 @@ def all_texts_are_tx_fars(map_id): def texts_label_pretty_printer(map_id): "output a texts label for map if all texts are TX_FARs and in the asm already" #extract_maps.map_headers[map_id]["texts"][text_id][0]["TX_FAR"] - if not all_texts_are_tx_fars(map_id): return None + #if not all_texts_are_tx_fars(map_id): return None map2 = extract_maps.map_headers[map_id] #pointer to the list of texts @@ -139,7 +139,7 @@ def texts_label_pretty_printer(map_id): return output def insert_texts_label(map_id): - if not all_texts_are_tx_fars(map_id): return None + #if not all_texts_are_tx_fars(map_id): return None map2 = extract_maps.map_headers[map_id] base_label = map_name_cleaner(map2["name"], None)[:-2] @@ -389,6 +389,39 @@ def insert_asm(start_address, label): print diff result = apply_diff(diff, try_fixing=False) +def insert_text(address, label): + "inserts a text script (but not $8s)" + start_address = address + + line_number = find_incbin_to_replace_for(start_address) + if line_number == None: + print "skipping text at " + hex(start_address) + " with address " + label + return + + text_asm, byte_count = text_pretty_printer_at(start_address, label) + end_address = start_address + byte_count + newlines = split_incbin_line_into_three(line_number, start_address, byte_count) + + 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] = text_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) + newlines = newlines.replace("$x", "$") #where does this keep coming from?? + + #Char52 doesn't work yet + newlines = newlines.replace("Char52", "$52") + + diff = generate_diff_insert(line_number, newlines) + print diff + #apply_diff(diff) + if __name__ == "__main__": #load map headers and object data extract_maps.load_rom() @@ -426,9 +459,9 @@ if __name__ == "__main__": #insert_08_asm(83, 1) #insert_all_08s() - #insert_asm(0x758df, "CinnabarGymText1") + insert_asm(0x1da56, "NameRaterText1") - #insert_text_label_tx_far(95, 1) + #insert_text_label_tx_far(91, 1) missed_17s = [] #[[95, 1], [95, 2], [96, 1], [97, 1], [99, 1], [99, 2], [99, 3], [100, 1], [100, 2], [100, 3], [100, 4], [100, 5], [100, 6], [124, 8], [124, 10], [124, 12], [124, 16], [124, 17], [133, 3], [139, 1], [139, 2], [139, 3], [141, 2], [141, 3], [154, 2], [154, 3], [169, 4], [171, 2], [171, 3], [174, 2], [174, 3], [176, 4], [176, 5], [182, 3], [215, 5], [91, 2], [91, 3], [124, 8], [124, 10], [124, 12], [124, 16], [124, 17], [139, 1], [139, 2], [139, 3], [141, 2], [169, 4], [171, 2], [174, 2], [176, 4], [176, 5]] for missed_17 in missed_17s: insert_text_label_tx_far(missed_17[0], missed_17[1]) @@ -444,6 +477,10 @@ if __name__ == "__main__": isolate_incbins() process_incbins() + #insert_text(0x44276, "ViridianPokeCenterText4") + #insert_texts_label(4) + #insert_all_texts_labels() + if len(failed_attempts) > 0: print "-- FAILED ATTEMPTS --" print str(failed_attempts) diff --git a/pokered.asm b/pokered.asm index f9cd9692..c7483281 100644 --- a/pokered.asm +++ b/pokered.asm @@ -959,46 +959,76 @@ INCBIN "baserom.gbc",$2125,$2442 - $2125 ; XXX where is the pointer to this data? MartInventories: ; 2442 ; first byte $FE, next byte # of items, last byte $FF + ; Viridian +ViridianMartText4: ; XXX confirm db $FE,4,POKE_BALL,ANTIDOTE,PARLYZ_HEAL,BURN_HEAL,$FF + ; Pewter +PewterMartText1: db $FE,7,POKE_BALL,POTION,ESCAPE_ROPE,ANTIDOTE,BURN_HEAL,AWAKENING db PARLYZ_HEAL,$FF + ; Cerulean +CeruleanMartText1: db $FE,7,POKE_BALL,POTION,REPEL,ANTIDOTE,BURN_HEAL,AWAKENING db PARLYZ_HEAL,$FF + ; Bike shop db $FE,1,BICYCLE,$FF + ; Vermilion +VermilionMartText1: db $FE,6,POKE_BALL,SUPER_POTION,ICE_HEAL,AWAKENING,PARLYZ_HEAL db REPEL,$FF + ; Lavender +LavenderMartText1: db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,ESCAPE_ROPE,SUPER_REPEL db ANTIDOTE,BURN_HEAL,ICE_HEAL,PARLYZ_HEAL,$FF + ; Celadon Dept. Store 2F (1) +CeladonMart2Text1: db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,SUPER_REPEL,ANTIDOTE db BURN_HEAL,ICE_HEAL,AWAKENING,PARLYZ_HEAL,$FF + ; Celadon Dept. Store 2F (2) +CeladonMart2Text2: db $FE,9,TM_32,TM_33,TM_02,TM_07,TM_37,TM_01,TM_05,TM_09,TM_17,$FF + ; Celadon Dept. Store 4F +CeladonMart4Text1: db $FE,5,POKE_DOLL,FIRE_STONE,THUNDER_STONE,WATER_STONE,LEAF_STONE,$FF + ; Celadon Dept. Store 5F (1) +CeladonMart5Text3: db $FE,7,X_ACCURACY,GUARD_SPEC_,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED db X_SPECIAL,$FF + ; Celadon Dept. Store 5F (2) +CeladonMart5Text4: db $FE,5,HP_UP,PROTEIN,IRON,CARBOS,CALCIUM,$FF + ; Fuchsia +FuchsiaMartText1: db $FE,6,ULTRA_BALL,GREAT_BALL,SUPER_POTION,REVIVE,FULL_HEAL db SUPER_REPEL,$FF + ; unused? db $FE,5,GREAT_BALL,HYPER_POTION,SUPER_POTION,FULL_HEAL,REVIVE,$FF + ; Cinnabar +CinnabarMartText1: db $FE,7,ULTRA_BALL,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE db FULL_HEAL,REVIVE,$FF + ; Saffron +SaffronMartText1: db $FE,6,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL db REVIVE,$FF + ; Indigo +IndigoPlateauLobbyText4: db $FE,7,ULTRA_BALL,GREAT_BALL,FULL_RESTORE,MAX_POTION,FULL_HEAL db REVIVE,MAX_REPEL,$FF @@ -1777,6 +1807,7 @@ Delay3: ; 3DD7 jp DelayFrames INCBIN "baserom.gbc",$3DDC,$3DED - $3DDC + GoPAL_SET_CF1C: ; 3ded ld b,$ff GoPAL_SET: ; 3def @@ -2428,6 +2459,7 @@ FirstMapSpec: db $04 ;Tileset_id INCBIN "baserom.gbc",$6428,$6448-$6428 + FlyWarpDataPtr: db $00,0 dw Map00FlyWarp @@ -2516,9 +2548,11 @@ PlayersPCMenuEntries: ; 7AF5 INCBIN "baserom.gbc",$7B22,$7C49 - $7B22 SECTION "bank2",DATA,BANK[$2] + INCBIN "baserom.gbc",$8000,$4000 SECTION "bank3",DATA,BANK[$3] + INCBIN "baserom.gbc",$C000,$C23D - $C000 ; see also MapHeaderPointers @@ -2775,6 +2809,7 @@ MapHeaderBanks: ; 423D INCBIN "baserom.gbc",$C335,$C766-$C335 ld hl,TilesetsHeadPtr INCBIN "baserom.gbc",$C769,$C7BE-$C769 + TilesetsHeadPtr: TSETHEAD Tset00_Block,Tset00_GFX,Tset00_Coll,$FF,$FF,$FF,$52,2 TSETHEAD Tset01_Block,Tset01_GFX,Tset01_Coll,$FF,$FF,$FF,$FF,0 @@ -5219,6 +5254,7 @@ FishingGroup10: INCBIN "baserom.gbc",$E9C5,$10000 - $E9C5 SECTION "bank4",DATA,BANK[$4] + INCBIN "baserom.gbc",$10000,$2EDE RedPicFront: @@ -5245,6 +5281,7 @@ GenRandom_: ; 7A8F ret SECTION "bank5",DATA,BANK[$5] + INCBIN "baserom.gbc",$14000,$4000 SECTION "bank6",DATA,BANK[$6] @@ -5470,6 +5507,7 @@ PewterCity_h: ; 0x18554 to 0x18576 (34 bytes) (bank=6) (id=2) dw $4577 ; objects INCBIN "baserom.gbc",$18576,$18577 - $18576 + PewterCityObject: ; 0x18577 (size=111) db $a ; border tile @@ -5765,6 +5803,7 @@ PalletTownScript: ld hl,PalletTownScriptPointers ld a,[$D5F1] jp $3D97 +; 0x18e73 PalletTownScriptPointers: dw PalletTownScript1,PalletTownScript2,PalletTownScript3,PalletTownScript4,PalletTownScript5,PalletTownScript6,PalletTownScript7 @@ -5971,7 +6010,10 @@ PalletTownText7: ; sign by Blue’s house TX_FAR _PalletTownText7 db "@" -INCBIN "baserom.gbc",$18ff1,$19102 - $18ff1 +INCBIN "baserom.gbc",$18ff1,$190e4 - $18ff1 + +ViridianCityTexts: ; 0x190e4 + dw ViridianCityText1, ViridianCityText2, ViridianCityText3, ViridianCityText4, ViridianCityText5, ViridianCityText6, ViridianCityText7, ViridianCityText8, ViridianCityText9, ViridianCityText10, ViridianCityText11, ViridianCityText12, ViridianCityText13, ViridianCityText14, ViridianCityText15 ViridianCityText1: ; 0x19102 TX_FAR _ViridianCityText1 @@ -5992,6 +6034,7 @@ ViridianCityText2: ; 0x19107 jp $24d7 INCBIN "baserom.gbc",$19122,$1912c - $19122 + ViridianCityText3: ; 0x1912c db $08 ; asm ld hl, $514d @@ -6010,6 +6053,7 @@ ViridianCityText3: ; 0x1912c jp $24d7 INCBIN "baserom.gbc",$1914d,$1915c - $1914d + ViridianCityText4: ; 0x1915c db $08 ; asm ld a, [$d74b] @@ -6025,6 +6069,7 @@ ViridianCityText4: ; 0x1915c jp $24d7 INCBIN "baserom.gbc",$19175,$1917f - $19175 + ViridianCityText5: ; 0x1917f db $08 ; asm ld hl, $5191 @@ -6035,6 +6080,7 @@ ViridianCityText5: ; 0x1917f jp $24d7 INCBIN "baserom.gbc",$19191,$19196 - $19191 + ViridianCityText6: ; 0x19196 db $08 ; asm ld a, [$d74c] @@ -6061,6 +6107,7 @@ ViridianCityText6: ; 0x19196 jp $24d7 INCBIN "baserom.gbc",$191ca,$191df - $191ca + ViridianCityText7: ; 0x191df db $08 ; asm ld hl, $520a @@ -6082,7 +6129,10 @@ ViridianCityText7: ; 0x191df .asm_2413a ; 0x19207 jp $24d7 -INCBIN "baserom.gbc",$1920a,$14 +INCBIN "baserom.gbc",$1920a,$19219 - $1920a + +ViridianCityText15: ; 0x19219 +INCBIN "baserom.gbc",$19219,$1921e - $19219 ViridianCityText8: ; 0x1921e TX_FAR _ViridianCityText8 @@ -6100,7 +6150,13 @@ ViridianCityText13: ; 0x1922d TX_FAR _ViridianCityText13 db $50 -INCBIN "baserom.gbc",$19232,$193a7 - $19232 +ViridianCityText14: +INCBIN "baserom.gbc",$19232,$19237 - $19232 + +INCBIN "baserom.gbc",$19237,$1938b - $19237 + +PewterCityTexts: ; 0x1938b + dw PewterCityText1, PewterCityText2, PewterCityText3, PewterCityText4, PewterCityText5, PewterCityText6, PewterCityText7, PewterCityText8, PewterCityText9, PewterCityText10, PewterCityText11, PewterCityText12, PewterCityText13, PewterCityText14 PewterCityText1: ; 0x193a7 TX_FAR _PewterCityText1 @@ -6140,7 +6196,10 @@ PewterCityText3: ; 0x193b1 .asm_ac429 ; 0x193ee jp $24d7 -INCBIN "baserom.gbc",$193f1,$19405 - $193f1 +INCBIN "baserom.gbc",$193f1,$19400 - $193f1 + +PewterCityText13: +INCBIN "baserom.gbc",$19400,$5 PewterCityText4: ; 0x19405 db $8 @@ -6161,6 +6220,7 @@ PewterCityText4: ; 0x19405 ; 0x19427 INCBIN "baserom.gbc",$19427,$f + PewterCityText5: ; 0x19436 db $08 ; asm ld hl, $545d @@ -6179,7 +6239,10 @@ PewterCityText5: ; 0x19436 ld [$d5f7], a jp $24d7 -INCBIN "baserom.gbc",$1945d,$a +INCBIN "baserom.gbc",$1945d,$19462 - $1945d + +PewterCityText14: ; 0x19462 +INCBIN "baserom.gbc",$19462,$5 PewterCityText6: ; 0x19467 TX_FAR _PewterCityText6 @@ -6201,7 +6264,11 @@ PewterCityText12: ; 0x1947b TX_FAR _PewterCityText12 db $50 -INCBIN "baserom.gbc",$19480,$1964f - $19480 +INCBIN "baserom.gbc",$19480,$1962d - $19480 + +CeruleanCityTexts: ; 0x1962d + dw CeruleanCityText1, CeruleanCityText2, CeruleanCityText3, CeruleanCityText4, CeruleanCityText5, CeruleanCityText6, CeruleanCityText7, CeruleanCityText8, CeruleanCityText9, CeruleanCityText10, CeruleanCityText11, CeruleanCityText12, CeruleanCityText13, CeruleanCityText14, CeruleanCityText15, CeruleanCityText16, CeruleanCityText17 + CeruleanCityText1: ; 0x1964f db $08 ; asm ld a, [$d75a] @@ -6217,6 +6284,7 @@ CeruleanCityText1: ; 0x1964f jp $24d7 INCBIN "baserom.gbc",$19668,$1967c - $19668 + CeruleanCityText2: ; 0x1967c db $8 ld a, [$d75b] @@ -6257,6 +6325,7 @@ CeruleanCityText2: ; 0x1967c .asm_e4e6f ; 0x196d6 jp $24d7 ; 0x196d9 + INCBIN "baserom.gbc",$196d9,$1f CeruleanCityText3: ; 0x196f8 @@ -6297,6 +6366,7 @@ CeruleanCityText7: ; 0x1970c jp $24d7 INCBIN "baserom.gbc",$19730,$1973f - $19730 + CeruleanCityText8: ; 0x1973f db $08 ; asm ldh a, [$d3] @@ -6349,7 +6419,10 @@ CeruleanCityText17: ; 0x1979c TX_FAR _CeruleanCityText17 db $50 -INCBIN "baserom.gbc",$197a1,$19889 - $197a1 +INCBIN "baserom.gbc",$197a1,$1986f - $197a1 + +VermilionCityTexts: ; 0x1986f + dw VermilionCityText1, VermilionCityText2, VermilionCityText3, VermilionCityText4, VermilionCityText5, VermilionCityText6, VermilionCityText7, VermilionCityText8, VermilionCityText9, VermilionCityText10, VermilionCityText11, VermilionCityText12, VermilionCityText13 VermilionCityText1: ; 0x19889 TX_FAR _VermilionCityText1 @@ -6370,6 +6443,7 @@ VermilionCityText2: ; 0x1988e jp $24d7 INCBIN "baserom.gbc",$198a7,$198b1 - $198a7 + VermilionCityText3: ; 0x198b1 db $08 ; asm ld a, [$d803] @@ -6451,7 +6525,10 @@ VermilionCityText13: ; 0x19951 TX_FAR _VermilionCityText13 db $50 -INCBIN "baserom.gbc",$19956,$1998a - $19956 +INCBIN "baserom.gbc",$19956,$19966 - $19956 + +CeladonCityTexts: ; 0x19966 + dw CeladonCityText1, CeladonCityText2, CeladonCityText3, CeladonCityText4, CeladonCityText5, CeladonCityText6, CeladonCityText7, CeladonCityText8, CeladonCityText9, CeladonCityText10, CeladonCityText11, CeladonCityText12, CeladonCityText13, CeladonCityText14, CeladonCityText15, CeladonCityText16, CeladonCityText17, CeladonCityText18 CeladonCityText1: ; 0x1998a TX_FAR _CeladonCityText1 @@ -6547,7 +6624,10 @@ CeladonCityText18: ; 0x19a26 TX_FAR _CeladonCityText18 db $50 -INCBIN "baserom.gbc",$19a2b,$19a5e - $19a2b +INCBIN "baserom.gbc",$19a2b,$19a2e - $19a2b + +FuchsiaCityTexts: ; 0x19a2e + dw FuchsiaCityText1, FuchsiaCityText2, FuchsiaCityText3, FuchsiaCityText4, FuchsiaCityText5, FuchsiaCityText6, FuchsiaCityText7, FuchsiaCityText8, FuchsiaCityText9, FuchsiaCityText10, FuchsiaCityText11, FuchsiaCityText12, FuchsiaCityText13, FuchsiaCityText14, FuchsiaCityText15, FuchsiaCityText16, FuchsiaCityText17, FuchsiaCityText18, FuchsiaCityText19, FuchsiaCityText20, FuchsiaCityText21, FuchsiaCityText22, FuchsiaCityText23, FuchsiaCityText24 FuchsiaCityText1: ; 0x19a5e TX_FAR _FuchsiaCityText1 @@ -6604,6 +6684,7 @@ FuchsiaCityText19: ; 0x19a90 jp $24d7 INCBIN "baserom.gbc",$19a9f,$19aa4 - $19a9f + FuchsiaCityText20: ; 0x19aa4 db $08 ; asm ld hl, $5ab3 @@ -6613,6 +6694,7 @@ FuchsiaCityText20: ; 0x19aa4 jp $24d7 INCBIN "baserom.gbc",$19ab3,$19ab8 - $19ab3 + FuchsiaCityText21: ; 0x19ab8 db $08 ; asm ld hl, $5ac7 @@ -6622,6 +6704,7 @@ FuchsiaCityText21: ; 0x19ab8 jp $24d7 INCBIN "baserom.gbc",$19ac7,$19acc - $19ac7 + FuchsiaCityText22: ; 0x19acc db $08 ; asm ld hl, $5adb @@ -6631,6 +6714,7 @@ FuchsiaCityText22: ; 0x19acc jp $24d7 INCBIN "baserom.gbc",$19adb,$19ae0 - $19adb + FuchsiaCityText23: ; 0x19ae0 db $08 ; asm ld hl, $5aef @@ -6640,6 +6724,7 @@ FuchsiaCityText23: ; 0x19ae0 jp $24d7 INCBIN "baserom.gbc",$19aef,$19af4 - $19aef + FuchsiaCityText24: ; 0x19af4 db $08 ; asm ld a, [$d7f6] @@ -6787,7 +6872,11 @@ VermilionHouse3_h: ; 0x19c06 to 0x19c12 (12 bytes) (bank=6) (id=196) dw $5c25 ; objects -INCBIN "baserom.gbc",$19c12,$19c17 - $19c12 +INCBIN "baserom.gbc",$19c12,$19c15 - $19c12 + +VermilionHouse3Texts: ; 0x19c15 + dw VermilionHouse3Text1 + VermilionHouse3Text1: ; 0x19c17 db $08 ; asm ld a, $4 @@ -6836,7 +6925,8 @@ IndigoPlateauLobbyText3: ; 0x19c8f TX_FAR _IndigoPlateauLobbyText3 db $50 -INCBIN "baserom.gbc",$19c94,$1 +IndigoPlateauLobbyText5: + db $f6 IndigoPlateauLobbyObject: ; 0x19c95 (size=58) db $0 ; border tile @@ -6871,7 +6961,13 @@ SilphCo4_h: ; 0x19cff to 0x19d0b (12 bytes) (bank=6) (id=209) dw $5e35 ; objects -INCBIN "baserom.gbc",$19d0b,$19dd3 - $19d0b +INCBIN "baserom.gbc",$19d0b,$19da0 - $19d0b + +SilphCo4Texts: ; 0x19da0 + dw SilphCo4Text1, SilphCo4Text2, SilphCo4Text3, SilphCo4Text4, SilphCo4Text5, SilphCo4Text6, SilphCo4Text7 + +INCBIN "baserom.gbc",$19dae,$25 + SilphCo4Text1: ; 0x19dd3 db $08 ; asm ld hl, $5de0 @@ -6880,6 +6976,7 @@ SilphCo4Text1: ; 0x19dd3 jp $24d7 INCBIN "baserom.gbc",$19de0,$19dea - $19de0 + SilphCo4Text2: ; 0x19dea db $08 ; asm ld hl, $5dae @@ -6887,6 +6984,7 @@ SilphCo4Text2: ; 0x19dea jp $24d7 INCBIN "baserom.gbc",$19df4,$19e03 - $19df4 + SilphCo4Text3: ; 0x19e03 db $08 ; asm ld hl, $5dba @@ -6894,6 +6992,7 @@ SilphCo4Text3: ; 0x19e03 jp $24d7 INCBIN "baserom.gbc",$19e0d,$19e1c - $19e0d + SilphCo4Text4: ; 0x19e1c db $08 ; asm ld hl, $5dc6 @@ -6901,6 +7000,7 @@ SilphCo4Text4: ; 0x19e1c jp $24d7 INCBIN "baserom.gbc",$19e26,$f + SilphCo4Object: ; 0x19e35 (size=111) db $2e ; border tile @@ -6944,7 +7044,13 @@ SilphCo5_h: ; 0x19f2b to 0x19f37 (12 bytes) (bank=6) (id=210) dw $608d ; objects -INCBIN "baserom.gbc",$19f37,$1a003 - $19f37 +INCBIN "baserom.gbc",$19f37,$19fbc - $19f37 + +SilphCo5Texts: ; 0x19fbc + dw SilphCo5Text1, SilphCo5Text2, SilphCo5Text3, SilphCo5Text4, SilphCo5Text5, SilphCo5Text6, SilphCo5Text7, SilphCo5Text8, SilphCo5Text9, SilphCo5Text10, SilphCo5Text11 + +INCBIN "baserom.gbc",$19fd2,$31 + SilphCo5Text1: ; 0x1a003 db $08 ; asm ld hl, $6010 @@ -6953,6 +7059,7 @@ SilphCo5Text1: ; 0x1a003 jp $24d7 INCBIN "baserom.gbc",$1a010,$1a01a - $1a010 + SilphCo5Text2: ; 0x1a01a db $08 ; asm ld hl, $5fd2 @@ -6960,6 +7067,7 @@ SilphCo5Text2: ; 0x1a01a jp $24d7 INCBIN "baserom.gbc",$1a024,$1a033 - $1a024 + SilphCo5Text3: ; 0x1a033 db $08 ; asm ld hl, $5fde @@ -6967,6 +7075,7 @@ SilphCo5Text3: ; 0x1a033 jp $24d7 INCBIN "baserom.gbc",$1a03d,$1a04c - $1a03d + SilphCo5Text4: ; 0x1a04c db $08 ; asm ld hl, $5fea @@ -6974,6 +7083,7 @@ SilphCo5Text4: ; 0x1a04c jp $24d7 INCBIN "baserom.gbc",$1a056,$1a065 - $1a056 + SilphCo5Text5: ; 0x1a065 db $08 ; asm ld hl, $5ff6 @@ -7041,7 +7151,13 @@ SilphCo6_h: ; 0x1a19d to 0x1a1a9 (12 bytes) (bank=6) (id=211) dw $62fb ; objects -INCBIN "baserom.gbc",$1a1a9,$1a23d - $1a1a9 +INCBIN "baserom.gbc",$1a1a9,$1a1f6 - $1a1a9 + +SilphCo6Texts: ; 0x1a1f6 + dw SilphCo6Text1, SilphCo6Text2, SilphCo6Text3, SilphCo6Text4, SilphCo6Text5, SilphCo6Text6, SilphCo6Text7, SilphCo6Text8, SilphCo6Text9, SilphCo6Text10 + +INCBIN "baserom.gbc",$1a20a,$33 + SilphCo6Text1: ; 0x1a23d db $08 ; asm ld hl, $624a @@ -7050,6 +7166,7 @@ SilphCo6Text1: ; 0x1a23d jp $24d7 INCBIN "baserom.gbc",$1a24a,$1a254 - $1a24a + SilphCo6Text2: ; 0x1a254 db $08 ; asm ld hl, $6261 @@ -7058,6 +7175,7 @@ SilphCo6Text2: ; 0x1a254 jp $24d7 INCBIN "baserom.gbc",$1a261,$1a26b - $1a261 + SilphCo6Text3: ; 0x1a26b db $08 ; asm ld hl, $6278 @@ -7066,6 +7184,7 @@ SilphCo6Text3: ; 0x1a26b jp $24d7 INCBIN "baserom.gbc",$1a278,$1a282 - $1a278 + SilphCo6Text4: ; 0x1a282 db $08 ; asm ld hl, $628f @@ -7074,6 +7193,7 @@ SilphCo6Text4: ; 0x1a282 jp $24d7 INCBIN "baserom.gbc",$1a28f,$1a299 - $1a28f + SilphCo6Text5: ; 0x1a299 db $08 ; asm ld hl, $62a6 @@ -7082,6 +7202,7 @@ SilphCo6Text5: ; 0x1a299 jp $24d7 INCBIN "baserom.gbc",$1a2a6,$1a2b0 - $1a2a6 + SilphCo6Text6: ; 0x1a2b0 db $08 ; asm ld hl, $620a @@ -7089,6 +7210,7 @@ SilphCo6Text6: ; 0x1a2b0 jp $24d7 INCBIN "baserom.gbc",$1a2ba,$1a2c9 - $1a2ba + SilphCo6Text7: ; 0x1a2c9 db $08 ; asm ld hl, $6216 @@ -7096,6 +7218,7 @@ SilphCo6Text7: ; 0x1a2c9 jp $24d7 INCBIN "baserom.gbc",$1a2d3,$1a2e2 - $1a2d3 + SilphCo6Text8: ; 0x1a2e2 db $08 ; asm ld hl, $6222 @@ -7103,6 +7226,7 @@ SilphCo6Text8: ; 0x1a2e2 jp $24d7 INCBIN "baserom.gbc",$1a2ec,$f + SilphCo6Object: ; 0x1a2fb (size=112) db $2e ; border tile @@ -7447,7 +7571,13 @@ MonsterNames: ; 421E db "WEEPINBELL" db "VICTREEBEL" -INCBIN "baserom.gbc",$1c98a,$1ca96 - $1c98a +INCBIN "baserom.gbc",$1c98a,$1ca81 - $1c98a + +CinnabarIslandTexts: ; 0x1ca81 + dw CinnabarIslandText1, CinnabarIslandText2, CinnabarIslandText3, CinnabarIslandText4, CinnabarIslandText5, CinnabarIslandText6, CinnabarIslandText7, CinnabarIslandText8 + +CinnabarIslandText8: +INCBIN "baserom.gbc",$1ca91,$5 CinnabarIslandText1: ; 0x1ca96 TX_FAR _CinnabarIslandText1 @@ -7469,7 +7599,11 @@ CinnabarIslandText7: ; 0x1caaa TX_FAR _CinnabarIslandText7 db $50 -INCBIN "baserom.gbc",$1caaf,$1cab8 - $1caaf +INCBIN "baserom.gbc",$1caaf,$1cab2 - $1caaf + +Route1Texts: ; 0x1cab2 + dw Route1Text1, Route1Text2, Route1Text3 + Route1Text1: ; 0x1cab8 db $08 ; asm ld hl, $d7bf @@ -7510,7 +7644,13 @@ OaksLab_h: ; 0x1cb02 to 0x1cb0e (12 bytes) (bank=7) (id=40) dw $540a ; objects -INCBIN "baserom.gbc",$1cb0e,$1d0ce - $1cb0e +INCBIN "baserom.gbc",$1cb0e,$1d082 - $1cb0e + +OaksLabTexts: ; 0x1d082 + dw OaksLabText1, OaksLabText2, OaksLabText3, OaksLabText4, OaksLabText5, OaksLabText6, OaksLabText7, OaksLabText8, OaksLabText9, OaksLabText10, OaksLabText11, OaksLabText12, OaksLabText13, OaksLabText14, OaksLabText15, OaksLabText16, OaksLabText17, OaksLabText18, OaksLabText19, OaksLabText20, OaksLabText21, OaksLabText22, OaksLabText23, OaksLabText24, OaksLabText25, OaksLabText26, OaksLabText27 + +INCBIN "baserom.gbc",$1d0b8,22 + OaksLabText1: ; 0x1d0ce db $08 ; asm ld a, [$d74b] @@ -7612,14 +7752,14 @@ asm_9eaa4: ; 0x1d157 asm_f6e3a: ; 0x1d195 ld hl, $519a jr asm_b5ddf ; 0x1d198 $19 - rla + rla ; probably a TX_FAR ld b, $4e dec h ld d, b asm_2391d: ; 0x1d19f ld hl, $51a4 jr asm_b5ddf ; 0x1d1a2 $f - rla + rla ; probably a TX_FAR cpl ld c, [hl] dec h @@ -7627,7 +7767,7 @@ asm_2391d: ; 0x1d19f asm_ddec1: ; 0x1d1a9 ld hl, $51ae jr asm_b5ddf ; 0x1d1ac $5 - rla + rla ; probably a TX_FAR ld d, a ld c, [hl] dec h @@ -7785,7 +7925,103 @@ OaksLabText9: ; 0x1d336 call PrintText jp $24d7 -INCBIN "baserom.gbc",$1d340,$1d3fb - $1d340 +INCBIN "baserom.gbc",$1d340,$1d345 - $1d340 + +OaksLabText17: ; 0x1d345 + db $8 + ld hl, $534f + call PrintText + jp $24d7 +; 0x1d34f + +INCBIN "baserom.gbc",$1d34f,$1d354 - $1d34f + +OaksLabText18: ; 0x1d354 + db $8 + ld hl, $535e + call PrintText + jp $24d7 +; 0x1d35e + +INCBIN "baserom.gbc",$1d35e,$1d363 - $1d35e + +OaksLabText19: ; 0x1d363 + db $8 + ld hl, $536d + call PrintText + jp $24d7 +; 0x1d36d + +INCBIN "baserom.gbc",$1d36d,$1d372 - $1d36d + +OaksLabText20: ; 0x1d372 + db $8 + ld hl, $537c + call PrintText + jp $24d7 +; 0x1d37c + +INCBIN "baserom.gbc",$1d37c,$1d381 - $1d37c + +OaksLabText12: ; 0x1d381 +INCBIN "baserom.gbc",$1d381,$5 + +INCBIN "baserom.gbc",$1d386,$1d390 - $1d386 + +OaksLabText13: ; 0x1d390 +INCBIN "baserom.gbc",$1d390,$5 + +INCBIN "baserom.gbc",$1d395,$1d39f - $1d395 + +OaksLabText14: ; 0x1d39f + db $8 + ld hl, $53a9 + call PrintText + jp $24d7 +; 0x1d3a9 + +INCBIN "baserom.gbc",$1d3a9,$1d3af - $1d3a9 + +OaksLabText15: ; 0x1d3af to 0x1d3b9 + db $8 + ld hl, $53b9 + call PrintText + jp $24d7 +; 0x1d3b9 + +INCBIN "baserom.gbc",$1d3b9,$1d3c8 - $1d3b9 + +OaksLabText16: ; 0x1d3c8 + db $8 + ld hl, $53d2 + call PrintText + jp $24d7 +; 0x1d3d2 + +INCBIN "baserom.gbc",$1d3d2,$1d3d7 - $1d3d2 + +OaksLabText21: ; 0x1d3d7 +INCBIN "baserom.gbc",$1d3d7,$5 + +OaksLabText22: ; 0x1d3dc +INCBIN "baserom.gbc",$1d3dc,$5 + +OaksLabText23: ; 0x1d3e1 +INCBIN "baserom.gbc",$1d3e1,$5 + +OaksLabText24: ; 0x1d3e6 +INCBIN "baserom.gbc",$1d3e6,$5 + +OaksLabText25: ; 0x1d3eb +INCBIN "baserom.gbc",$1d3eb,$4 + db $11 + db $50 + +OaksLabText26: ; 0x1d3f1 +INCBIN "baserom.gbc",$1d3f1,$1d3f6 - $1d3f1 + +OaksLabText27: ; 0x1d3f6 +INCBIN "baserom.gbc",$1d3f6,5 OaksLabText11: OaksLabText10: ; 0x1d3fb @@ -7831,8 +8067,10 @@ ViridianMart_h: ; 0x1d462 to 0x1d46e (12 bytes) (bank=7) (id=42) dw $550a ; objects INCBIN "baserom.gbc",$1d46e,$1d4e0 - $1d46e + ViridianMartTexts: ; 0x1d4e0 - dw ViridianMartText1, ViridianMartText2, ViridianMartText3 + dw ViridianMartText1, ViridianMartText2, ViridianMartText3 ;, ViridianMartText4 + INCBIN "baserom.gbc",$1d4e6,$a ViridianMartText1: ; 0x1d4f0 @@ -7879,6 +8117,7 @@ School_h: ; 0x1d540 to 0x1d54c (12 bytes) (bank=7) (id=43) dw $555d ; objects INCBIN "baserom.gbc",$1d54c,$1d54f - $1d54c + SchoolTexts: ; 0x1d54f dw SchoolText1, SchoolText2 @@ -7915,7 +8154,10 @@ ViridianHouse_h: ; 0x1d57d to 0x1d589 (12 bytes) (bank=7) (id=44) dw $55bb ; objects -INCBIN "baserom.gbc",$1d589,$1d595 - $1d589 +INCBIN "baserom.gbc",$1d589,$1d58d - $1d589 + +ViridianHouseTexts: ; 0x1d58d + dw ViridianHouseText1, ViridianHouseText2, ViridianHouseText3, ViridianHouseText4 ViridianHouseText1: ; 0x1d595 TX_FAR _ViridianHouseText1 @@ -7968,6 +8210,7 @@ PewterHouse1_h: ; 0x1d5e7 to 0x1d5f3 (12 bytes) (bank=7) (id=55) dw $5616 ; objects INCBIN "baserom.gbc",$1d5f3,$1d5f6 - $1d5f3 + PewterHouse1Texts: ; 0x1d5f6 dw PewterHouse1Text1, PewterHouse1Text2, PewterHouse1Text3 @@ -8014,6 +8257,7 @@ PewterHouse2_h: ; 0x1d63c to 0x1d648 (12 bytes) (bank=7) (id=57) dw $5659 ; objects INCBIN "baserom.gbc",$1d648,$1d64b - $1d648 + PewterHouse2Texts: ; 0x1d64b dw PewterHouse2Text1, PewterHouse2Text2 @@ -8050,7 +8294,11 @@ CeruleanHouseTrashed_h: ; 0x1d679 to 0x1d685 (12 bytes) (bank=7) (id=62) dw $56bf ; objects -INCBIN "baserom.gbc",$1d685,$1d68f - $1d685 +INCBIN "baserom.gbc",$1d685,$1d689 - $1d685 + +CeruleanHouseTrashedTexts: ; 0x1d689 + dw CeruleanHouseTrashedText1, CeruleanHouseTrashedText2, CeruleanHouseTrashedText3 + CeruleanHouseTrashedText1: ; 0x1d68f db $08 ; asm ld b, $e4 @@ -8105,7 +8353,10 @@ CeruleanHouse2_h: ; 0x1d6ea to 0x1d6f6 (12 bytes) (bank=7) (id=63) dw $5710 ; objects -INCBIN "baserom.gbc",$1d6f6,$1d6fd - $1d6f6 +INCBIN "baserom.gbc",$1d6f6,$1d6f9 - $1d6f6 + +CeruleanHouse2Texts: ; 0x1d6f9 + dw CeruleanHouse2Text1, CeruleanHouse2Text2 CeruleanHouse2Text1: ; 0x1d6fd TX_FAR _CeruleanHouse2Text1 @@ -8144,7 +8395,11 @@ BikeShop_h: ; 0x1d730 to 0x1d73c (12 bytes) (bank=7) (id=66) dw $5866 ; objects -INCBIN "baserom.gbc",$1d73c,$1d745 - $1d73c +INCBIN "baserom.gbc",$1d73c,$1d73f - $1d73c + +BikeShopTexts: ; 0x1d73f + dw BikeShopText1, BikeShopText2, BikeShopText3 + BikeShopText1: ; 0x1d745 db $08 ; asm ld a, [$d75f] @@ -8222,6 +8477,7 @@ BikeShopText1: ; 0x1d745 jp $24d7 INCBIN "baserom.gbc",$1d7f8,$1d839 - $1d7f8 + BikeShopText2: ; 0x1d839 db $08 ; asm ld hl, $5843 @@ -8229,6 +8485,7 @@ BikeShopText2: ; 0x1d839 jp $24d7 INCBIN "baserom.gbc",$1d843,$1d848 - $1d843 + BikeShopText3: ; 0x1d848 db $08 ; asm ld a, [$d75f] @@ -8241,6 +8498,7 @@ BikeShopText3: ; 0x1d848 jp $24d7 INCBIN "baserom.gbc",$1d85c,$a + BikeShopObject: ; 0x1d866 (size=38) db $e ; border tile @@ -8270,7 +8528,11 @@ LavenderHouse1_h: ; 0x1d89c to 0x1d8a8 (12 bytes) (bank=7) (id=149) dw $596a ; objects -INCBIN "baserom.gbc",$1d8a8,$1d8b8 - $1d8a8 +INCBIN "baserom.gbc",$1d8a8,$1d8ac - $1d8a8 + +LavenderHouse1Texts: ; 0x1d8ac + dw LavenderHouse1Text1, LavenderHouse1Text2, LavenderHouse1Text3, LavenderHouse1Text4, LavenderHouse1Text5, LavenderHouse1Text6 + LavenderHouse1Text1: ; 0x1d8b8 db $08 ; asm ld a, [$d7e0] @@ -8286,6 +8548,7 @@ LavenderHouse1Text1: ; 0x1d8b8 jp $24d7 INCBIN "baserom.gbc",$1d8d1,$1d8db - $1d8d1 + LavenderHouse1Text2: ; 0x1d8db db $08 ; asm ld a, [$d7e0] @@ -8377,7 +8640,10 @@ LavenderHouse2_h: ; 0x1d9a2 to 0x1d9ae (12 bytes) (bank=7) (id=151) dw $59e6 ; objects -INCBIN "baserom.gbc",$1d9ae,$1d9b6 - $1d9ae +INCBIN "baserom.gbc",$1d9ae,$1d9b2 - $1d9ae + +LavenderHouse2Texts: ; 0x1d9b2 + dw LavenderHouse2Text1, LavenderHouse2Text2 LavenderHouse2Text1: ; 0x1d9b6 TX_FAR _LavenderHouse2Text1 @@ -8402,6 +8668,7 @@ LavenderHouse2Text2: ; 0x1d9c3 jp $24d7 INCBIN "baserom.gbc",$1d9dc,$a + LavenderHouse2Object: ; 0x1d9e6 (size=32) db $a ; border tile @@ -8427,7 +8694,51 @@ NameRater_h: ; 0x1da06 to 0x1da12 (12 bytes) (bank=7) (id=229) dw $5ad6 ; objects -INCBIN "baserom.gbc",$1da12,$1dad6 - $1da12 +INCBIN "baserom.gbc",$1da12,$1da56 - $1da12 + +NameRaterText1: ; 0x1da56 + db $8 + call $36f4 + ld hl, $5ab3 + call $5a15 + jr nz, .asm_1daae ; 0x1da60 $4c + ld hl, $5ab8 + call PrintText + xor a + ld [$d07d], a + ld [$cfcb], a + ld [$cc35], a + call $13fc + push af + call $3dd4 + call $3dbe + call $20ba + pop af + jr c, .asm_1daae ; 0x1da80 $2c + call $15b4 + call $5a20 + ld hl, $5ad1 + jr c, .asm_1daa8 ; 0x1da8b $1b + ld hl, $5abd + call $5a15 + jr nz, .asm_1daae ; 0x1da93 $19 + ld hl, $5ac2 + call PrintText + ld b, $1 + ld hl, $655c + call Bankswitch + jr c, .asm_1daae ; 0x1daa3 $9 + ld hl, $5ac7 +.asm_1daa8 + call PrintText + jp $24d7 +.asm_1daae + ld hl, $5acc + jr .asm_1daa8 ; 0x1dab1 $f5 +; 0x1dab3 + +INCBIN "baserom.gbc",$1dab3,$23 + NameRaterObject: ; 0x1dad6 (size=26) db $a ; border tile @@ -8452,7 +8763,10 @@ VermilionHouse1_h: ; 0x1daf0 to 0x1dafc (12 bytes) (bank=7) (id=93) dw $5b20 ; objects -INCBIN "baserom.gbc",$1dafc,$1db06 - $1dafc +INCBIN "baserom.gbc",$1dafc,$1db00 - $1dafc + +VermilionHouse1Texts: ; 0x1db00 + dw VermilionHouse1Text1, VermilionHouse1Text2, VermilionHouse1Text3 VermilionHouse1Text1: ; 0x1db06 TX_FAR _VermilionHouse1Text1 @@ -8499,6 +8813,7 @@ VermilionDock_h: ; 0x1db46 to 0x1db52 (12 bytes) (bank=7) (id=94) dw $5cc6 ; objects INCBIN "baserom.gbc",$1db52,$1dcc6 - $1db52 + VermilionDockObject: ; 0x1dcc6 (size=20) db $f ; border tile @@ -8525,7 +8840,10 @@ CeladonMansion5_h: ; 0x1dd2e to 0x1dd3a (12 bytes) (bank=7) (id=132) dw $5d5c ; objects -INCBIN "baserom.gbc",$1dd3a,$1dd41 - $1dd3a +INCBIN "baserom.gbc",$1dd3a,$1dd3d - $1dd3a + +CeladonMansion5Texts: ; 0x1dd3d + dw CeladonMansion5Text1, CeladonMansion5Text2 CeladonMansion5Text1: ; 0x1dd41 TX_FAR _CeladonMansion5Text1 @@ -8568,7 +8886,10 @@ FuchsiaMart_h: ; 0x1dd7c to 0x1dd88 (12 bytes) (bank=7) (id=152) dw $5d9b ; objects -INCBIN "baserom.gbc",$1dd88,$1dd91 - $1dd88 +INCBIN "baserom.gbc",$1dd88,$1dd8b - $1dd88 + +FuchsiaMartTexts: ; 0x1dd8b + dw FuchsiaMartText1, FuchsiaMartText2, FuchsiaMartText3 FuchsiaMartText2: ; 0x1dd91 TX_FAR _FuchsiaMartText2 @@ -8608,6 +8929,7 @@ SaffronHouse1_h: ; 0x1ddd1 to 0x1dddd (12 bytes) (bank=7) (id=179) dw $5e04 ; objects INCBIN "baserom.gbc",$1dddd,$1dde0 - $1dddd + SaffronHouse1Texts: ; 0x1dde0 dw SaffronHouse1Text1, SaffronHouse1Text2, SaffronHouse1Text3, SaffronHouse1Text4 @@ -8658,7 +8980,11 @@ SaffronHouse2_h: ; 0x1de30 to 0x1de3c (12 bytes) (bank=7) (id=183) dw $5e8a ; objects -INCBIN "baserom.gbc",$1de3c,$1de41 - $1de3c +INCBIN "baserom.gbc",$1de3c,$1de3f - $1de3c + +SaffronHouse2Texts: ; 0x1de3f + dw SaffronHouse2Text1 + SaffronHouse2Text1: ; 0x1de41 db $08 ; asm ld a, [$d7bd] @@ -8685,6 +9011,7 @@ SaffronHouse2Text1: ; 0x1de41 jp $24d7 INCBIN "baserom.gbc",$1de75,$15 + SaffronHouse2Object: ; 0x1de8a (size=26) db $a ; border tile @@ -8710,6 +9037,7 @@ DiglettsCaveRoute2_h: ; 0x1dea4 to 0x1deb0 (12 bytes) (bank=7) (id=46) dw $5ebf ; objects INCBIN "baserom.gbc",$1deb0,$1deb8 - $1deb0 + DiglettsCaveRoute2Texts: ; 0x1deb8 dw DiglettsCaveRoute2Text1 @@ -8743,7 +9071,10 @@ Route2House_h: ; 0x1dee1 to 0x1deed (12 bytes) (bank=7) (id=48) dw $5f07 ; objects -INCBIN "baserom.gbc",$1deed,$1def4 - $1deed +INCBIN "baserom.gbc",$1deed,$1def0 - $1deed + +Route2HouseTexts: ; 0x1def0 + dw Route2HouseText1, Route2HouseText2 Route2HouseText1: ; 0x1def4 TX_FAR _Route2HouseText1 @@ -8782,7 +9113,10 @@ Route5Gate_h: ; 0x1df27 to 0x1df33 (12 bytes) (bank=7) (id=70) dw $5ffb ; objects -INCBIN "baserom.gbc",$1df33,$1dfaa - $1df33 +INCBIN "baserom.gbc",$1df33,$1dfa4 - $1df33 + +Route5GateTexts: ; 0x1dfa4 + dw Route5GateText1, Route5GateText2, Route5GateText3 Route8GateText1: Route7GateText1: @@ -8816,7 +9150,19 @@ Route5GateText1: ; 0x1dfaa jp $24d7 ; 0x1dfe7 -INCBIN "baserom.gbc",$1dfe7,$14 +Route8GateText2: +Route7GateText2: +Route6GateText2: +Route5GateText2: ; 0x1dfe7 +INCBIN "baserom.gbc",$1dfe7,$5 + +Route8GateText3: +Route7GateText3: +Route6GateText3: +Route5GateText3: ; 0x1dfec +INCBIN "baserom.gbc",$1dfec,$5 + +INCBIN "baserom.gbc",$1dff1,$1dffb - $1dff1 Route5GateObject: ; 0x1dffb (size=42) db $a ; border tile @@ -8849,7 +9195,11 @@ Route6Gate_h: ; 0x1e031 to 0x1e03d (12 bytes) (bank=7) (id=73) dw $60be ; objects -INCBIN "baserom.gbc",$1e03d,$1e0be - $1e03d +INCBIN "baserom.gbc",$1e03d,$1e0b8 - $1e03d + +Route6GateTexts: ; 0x1e0b8 + dw Route6GateText1, Route6GateText2, Route6GateText3 + Route6GateObject: ; 0x1e0be (size=42) db $a ; border tile @@ -8881,7 +9231,11 @@ Route7Gate_h: ; 0x1e0f4 to 0x1e100 (12 bytes) (bank=7) (id=76) dw $6185 ; objects -INCBIN "baserom.gbc",$1e100,$1e185 - $1e100 +INCBIN "baserom.gbc",$1e100,$1e17f - $1e100 + +Route7GateTexts: ; 0x1e17f + dw Route7GateText1, Route7GateText2, Route7GateText3 + Route7GateObject: ; 0x1e185 (size=42) db $a ; border tile @@ -8913,7 +9267,11 @@ Route8Gate_h: ; 0x1e1bb to 0x1e1c7 (12 bytes) (bank=7) (id=79) dw $6247 ; objects -INCBIN "baserom.gbc",$1e1c7,$1e247 - $1e1c7 +INCBIN "baserom.gbc",$1e1c7,$1e241 - $1e1c7 + +Route8GateTexts: ; 0x1e241 + dw Route8GateText1, Route8GateText2, Route8GateText3 + Route8GateObject: ; 0x1e247 (size=42) db $a ; border tile @@ -8982,7 +9340,12 @@ PowerPlant_h: ; 0x1e2ba to 0x1e2c6 (12 bytes) (bank=7) (id=83) dw $63bf ; objects -INCBIN "baserom.gbc",$1e2c6,$1e368 - $1e2c6 +INCBIN "baserom.gbc",$1e2c6,$1e2df - $1e2c6 + +PowerPlantTexts: ; 0x1e2df + dw PowerPlantText1, PowerPlantText2, PowerPlantText3, PowerPlantText4, PowerPlantText5, PowerPlantText6, PowerPlantText7, PowerPlantText8, PowerPlantText9, PowerPlantText10, PowerPlantText11, PowerPlantText12, PowerPlantText13, PowerPlantText14 + +INCBIN "baserom.gbc",$1e2fb,$6d asm_234cc: call $31cc @@ -9035,7 +9398,7 @@ PowerPlantText9: db $8 ; asm ld hl, $635b jr asm_234cc ; 0x1e3a8 $be - rla + rla ; probably a TX_FAR ld [$ff00+c], a ld b, l inc hl @@ -9092,6 +9455,7 @@ DiglettsCaveEntranceRoute11_h: ; 0x1e5ae to 0x1e5ba (12 bytes) (bank=7) (id=85) dw $65ca ; objects INCBIN "baserom.gbc",$1e5ba,$1e5c3 - $1e5ba + DiglettsCaveEntranceRoute11Texts: ; 0x1e5c3 dw DiglettsCaveEntranceRoute11Text1 @@ -9127,7 +9491,11 @@ Route16House_h: ; 0x1e5ec to 0x1e5f8 (12 bytes) (bank=7) (id=188) dw $6657 ; objects -INCBIN "baserom.gbc",$1e5f8,$1e5ff - $1e5f8 +INCBIN "baserom.gbc",$1e5f8,$1e5fb - $1e5f8 + +Route16HouseTexts: ; 0x1e5fb + dw Route16HouseText1, Route16HouseText2 + Route16HouseText1: ; 0x1e5ff db $08 ; asm ld a, [$d7e0] @@ -9150,6 +9518,7 @@ Route16HouseText1: ; 0x1e5ff jp $24d7 INCBIN "baserom.gbc",$1e62b,$1e640 - $1e62b + Route16HouseText2: ; 0x1e640 db $08 ; asm ld hl, $6652 @@ -9160,6 +9529,7 @@ Route16HouseText2: ; 0x1e640 jp $24d7 INCBIN "baserom.gbc",$1e652,$5 + Route16HouseObject: ; 0x1e657 (size=32) db $a ; border tile @@ -9185,7 +9555,11 @@ Route22Gate_h: ; 0x1e677 to 0x1e683 (12 bytes) (bank=7) (id=193) dw $6720 ; objects -INCBIN "baserom.gbc",$1e683,$1e6e1 - $1e683 +INCBIN "baserom.gbc",$1e683,$1e6df - $1e683 + +Route22GateTexts: ; 0x1e6df + dw Route22GateText1 + Route22GateText1: ; 0x1e6e1 db $8 ld a, [$d356] @@ -9204,7 +9578,9 @@ Route22GateText1: ; 0x1e6e1 ld [$d60e], a jp $24d7 ; 0x1e704 + INCBIN "baserom.gbc",$1e704,$1c + Route22GateObject: ; 0x1e720 (size=42) db $a ; border tile @@ -9236,10 +9612,15 @@ BillsHouse_h: ; 0x1e75e to 0x1e76a (12 bytes) (bank=7) (id=88) dw $68df ; objects -INCBIN "baserom.gbc",$1e76a,$1e83d - $1e76a +INCBIN "baserom.gbc",$1e76a,$1e834 - $1e76a -;0x1e83d -BillsHouseText1: +BillsHouseTexts: ; 0x1e834 + dw BillsHouseText1, BillsHouseText2, BillsHouseText3, BillsHouseText4 + +BillsHouseText4: + db $fd + +BillsHouseText1: ; 0x1e83d db $8 ld hl, $6865 call PrintText @@ -9260,7 +9641,7 @@ asm_6b196: ; 0x1e85a asm_fd4e2 ; 0x1e862 jp $24d7 -; dunno what this is +; dunno what this is (rla indicates $17 or TX_FAR) rla ld h, a ld d, d @@ -9316,6 +9697,7 @@ BillsHouseText3: ; 0x1e8d0 ld hl, $68da call PrintText jp $24d7 +; 0x1e8da INCBIN "baserom.gbc",$1e8da,$5 @@ -9344,6 +9726,7 @@ SECTION "bank8",DATA,BANK[$8] INCBIN "baserom.gbc",$20000,$4000 SECTION "bank9",DATA,BANK[$9] + RhydonPicFront: INCBIN "pic/bmon/rhydon.pic" RhydonPicBack: @@ -10533,6 +10916,7 @@ TrainerNames: ; 59FF db "LANCE@" INCBIN "baserom.gbc",$39B87,$39C53 - $39B87 + ReadTrainer: ; 5C53 ; don't change any moves in a link battle @@ -14083,6 +14467,7 @@ TrainerSentOutText: db "@" INCBIN "baserom.gbc",$3CA83,$3D6A9 - $3CA83 + ; in-battle stuff ld hl,$D062 res 4,[hl] @@ -14682,6 +15067,7 @@ PlayAttackAnimation: ; 6F07 INCBIN "baserom.gbc",$3EF12,$40000 - $3EF12 SECTION "bank10",DATA,BANK[$10] + INCBIN "baserom.gbc",$40000,$47E PokedexEntryPointers: ; 447E @@ -16304,7 +16690,11 @@ ViridianPokeCenterBlocks: ; 28 SafariZoneRestHouse1Blocks: ; 16 INCBIN "maps/safarizoneresthouse1.blk" -INCBIN "baserom.gbc",$4410b,$44120 - $4410b +INCBIN "baserom.gbc",$4410b,$4410e - $4410b + +LavenderTownTexts: ; 0x4410e + dw LavenderTownText1, LavenderTownText2, LavenderTownText3, LavenderTownText4, LavenderTownText5, LavenderTownText6, LavenderTownText7, LavenderTownText8, LavenderTownText9 + LavenderTownText1: ; 0x44120 db $08 ; asm ld hl, $413c @@ -16368,8 +16758,8 @@ ViridianPokeCenterText3: ; 0x44271 TX_FAR _ViridianPokeCenterText3 db $50 -;XXX wtf? -db $f6 +ViridianPokeCenterText4: + db $f6 ViridianPokeCenterObject: ; 0x44277 (size=44) db $0 ; border tile @@ -16399,6 +16789,7 @@ Mansion1_h: ; 0x442a3 to 0x442af (12 bytes) (bank=11) (id=165) dw $43a4 ; objects INCBIN "baserom.gbc",$442af,$44341 - $442af + Mansion1Text1: ; 0x44341 db $08 ; asm ld hl, $4334 @@ -16406,6 +16797,7 @@ Mansion1Text1: ; 0x44341 jp $24d7 INCBIN "baserom.gbc",$4434b,$59 + Mansion1Object: ; 0x443a4 (size=90) db $2e ; border tile @@ -16446,7 +16838,12 @@ RockTunnel1_h: ; 0x444d0 to 0x444dc (12 bytes) (bank=11) (id=82) dw $45f6 ; objects -INCBIN "baserom.gbc",$444dc,$4455a - $444dc +INCBIN "baserom.gbc",$444dc,$444f5 - $444dc + +RockTunnel1Texts: ; 0x444f5 + dw RockTunnel1Text1, RockTunnel1Text2, RockTunnel1Text3, RockTunnel1Text4, RockTunnel1Text5, RockTunnel1Text6, RockTunnel1Text7, RockTunnel1Text8 + +INCBIN "baserom.gbc",$44505,$55 RockTunnel1Text1: ; 0x4455a db $8 @@ -16538,8 +16935,10 @@ SeafoamIslands1_h: ; 0x447dd to 0x447e9 (12 bytes) (bank=11) (id=192) dw $484f ; objects INCBIN "baserom.gbc",$447e9,$4484b - $447e9 + SeafoamIslands1Texts: ; 0x4484b dw SeafoamIslands1Text1, SeafoamIslands1Text2 + SeafoamIslands1Object: ; 0x4484f (size=72) db $7d ; border tile @@ -16580,7 +16979,10 @@ SSAnne3_h: ; 0x44926 to 0x44932 (12 bytes) (bank=11) (id=97) dw $493c ; objects -INCBIN "baserom.gbc",$44932,$44937 - $44932 +INCBIN "baserom.gbc",$44932,$44935 - $44932 + +SSAnne3Texts: ; 0x44935 + dw SSAnne3Text1 SSAnne3Text1: ; 0x44937 TX_FAR _SSAnne3Text1 @@ -16613,7 +17015,13 @@ VictoryRoad3_h: ; 0x44974 to 0x44980 (12 bytes) (bank=11) (id=198) dw $4acd ; objects -INCBIN "baserom.gbc",$44980,$44a69 - $44980 +INCBIN "baserom.gbc",$44980,$44a24 - $44980 + +VictoryRoad3Texts: ; 0x44a24 + dw VictoryRoad3Text1, VictoryRoad3Text2, VictoryRoad3Text3, VictoryRoad3Text4, VictoryRoad3Text5, VictoryRoad3Text6, VictoryRoad3Text7, VictoryRoad3Text8, VictoryRoad3Text9, VictoryRoad3Text10 + +INCBIN "baserom.gbc",$44a38,$31 + VictoryRoad3Text1: ; 0x44a69 db $08 ; asm ld hl, $4a38 @@ -16639,6 +17047,7 @@ VictoryRoad3Text4: ; 0x44a87 jp $24d7 INCBIN "baserom.gbc",$44a91,$3c + VictoryRoad3Object: ; 0x44acd (size=106) db $7d ; border tile @@ -16679,7 +17088,13 @@ RocketHideout1_h: ; 0x44bbe to 0x44bca (12 bytes) (bank=11) (id=199) dw $4ce7 ; objects -INCBIN "baserom.gbc",$44bca,$44c5f - $44bca +INCBIN "baserom.gbc",$44bca,$44c14 - $44bca + +RocketHideout1Texts: ; 0x44c14 + dw RocketHideout1Text1, RocketHideout1Text2, RocketHideout1Text3, RocketHideout1Text4, RocketHideout1Text5, RocketHideout1Text6, RocketHideout1Text7 + +INCBIN "baserom.gbc",$44c22,$3d + RocketHideout1Text1: ; 0x44c5f db $08 ; asm ld hl, $4c22 @@ -16711,6 +17126,7 @@ RocketHideout1Text5: ; 0x44c87 jp $24d7 INCBIN "baserom.gbc",$44c91,$56 + RocketHideout1Object: ; 0x44ce7 (size=98) db $2e ; border tile @@ -16750,7 +17166,13 @@ RocketHideout2_h: ; 0x44e1b to 0x44e27 (12 bytes) (bank=11) (id=200) dw $50f7 ; objects -INCBIN "baserom.gbc",$44e27,$450de - $44e27 +INCBIN "baserom.gbc",$44e27,$450c7 - $44e27 + +RocketHideout2Texts: ; 0x450c7 + dw RocketHideout2Text1, RocketHideout2Text2, RocketHideout2Text3, RocketHideout2Text4, RocketHideout2Text5 + +INCBIN "baserom.gbc",$450d1,$d + RocketHideout2Text1: ; 0x450de db $08 ; asm ld hl, $50d1 @@ -16758,6 +17180,7 @@ RocketHideout2Text1: ; 0x450de jp $24d7 INCBIN "baserom.gbc",$450e8,$f + RocketHideout2Object: ; 0x450f7 (size=80) db $2e ; border tile @@ -16795,7 +17218,13 @@ RocketHideout3_h: ; 0x45219 to 0x45225 (12 bytes) (bank=11) (id=201) dw $534d ; objects -INCBIN "baserom.gbc",$45225,$4531b - $45225 +INCBIN "baserom.gbc",$45225,$452fa - $45225 + +RocketHideout3Texts: ; 0x452fa + dw RocketHideout3Text1, RocketHideout3Text2, RocketHideout3Text3, RocketHideout3Text4 + +INCBIN "baserom.gbc",$45302,$19 + RocketHideout3Text1: ; 0x4531b db $08 ; asm ld hl, $5302 @@ -16803,6 +17232,7 @@ RocketHideout3Text1: ; 0x4531b jp $24d7 INCBIN "baserom.gbc",$45325,$45334 - $45325 + RocketHideout3Text2: ; 0x45334 db $08 ; asm ld hl, $530e @@ -16810,6 +17240,7 @@ RocketHideout3Text2: ; 0x45334 jp $24d7 INCBIN "baserom.gbc",$4533e,$f + RocketHideout3Object: ; 0x4534d (size=50) db $2e ; border tile @@ -16840,7 +17271,13 @@ RocketHideout4_h: ; 0x45451 to 0x4545d (12 bytes) (bank=11) (id=202) dw $55f1 ; objects -INCBIN "baserom.gbc",$4545d,$4553a - $4545d +INCBIN "baserom.gbc",$4545d,$45501 - $4545d + +RocketHideout4Texts: ; 0x45501 + dw RocketHideout4Text1, RocketHideout4Text2, RocketHideout4Text3, RocketHideout4Text4, RocketHideout4Text5, RocketHideout4Text6, RocketHideout4Text7, RocketHideout4Text8, RocketHideout4Text9 + +INCBIN "baserom.gbc",$45513,$27 + RocketHideout4Text1: ; 0x4553a db $08 ; asm ld a, [$d81b] @@ -16870,6 +17307,7 @@ RocketHideout4Text1: ; 0x4553a jp $24d7 INCBIN "baserom.gbc",$4557a,$45589 - $4557a + RocketHideout4Text2: ; 0x45589 db $08 ; asm ld hl, $5515 @@ -16877,6 +17315,7 @@ RocketHideout4Text2: ; 0x45589 jp $24d7 INCBIN "baserom.gbc",$45593,$455a2 - $45593 + RocketHideout4Text3: ; 0x455a2 db $08 ; asm ld hl, $5521 @@ -16884,6 +17323,7 @@ RocketHideout4Text3: ; 0x455a2 jp $24d7 INCBIN "baserom.gbc",$455ac,$455bb - $455ac + RocketHideout4Text4: ; 0x455bb db $08 ; asm ld hl, $552d @@ -16891,6 +17331,7 @@ RocketHideout4Text4: ; 0x455bb jp $24d7 INCBIN "baserom.gbc",$455c5,$2c + RocketHideout4Object: ; 0x455f1 (size=95) db $2e ; border tile @@ -16928,7 +17369,11 @@ RocketHideoutElevator_h: ; 0x45704 to 0x45710 (12 bytes) (bank=11) (id=203) dw $5791 ; objects -INCBIN "baserom.gbc",$45710,$4576d - $45710 +INCBIN "baserom.gbc",$45710,$4576b - $45710 + +RocketHideoutElevatorTexts: ; 0x4576b + dw RocketHideoutElevatorText1 + RocketHideoutElevatorText1: ; 0x4576d db $08 ; asm ld b,LIFT_KEY @@ -16946,6 +17391,7 @@ RocketHideoutElevatorText1: ; 0x4576d jp $24d7 INCBIN "baserom.gbc",$4578b,$6 + RocketHideoutElevatorObject: ; 0x45791 (size=23) db $f ; border tile @@ -16973,7 +17419,11 @@ SilphCoElevator_h: ; 0x457b4 to 0x457c0 (12 bytes) (bank=11) (id=236) dw $5844 ; objects -INCBIN "baserom.gbc",$457c0,$45835 - $457c0 +INCBIN "baserom.gbc",$457c0,$45833 - $457c0 + +SilphCoElevatorTexts: ; 0x45833 + dw SilphCoElevatorText1 + SilphCoElevatorText1: ; 0x45835 db $08 ; asm call $57f1 @@ -17009,7 +17459,10 @@ SafariZoneEast_h: ; 0x4585f to 0x4586b (12 bytes) (bank=11) (id=217) dw $588b ; objects -INCBIN "baserom.gbc",$4586b,$4587c - $4586b +INCBIN "baserom.gbc",$4586b,$4586e - $4586b + +SafariZoneEastTexts: ; 0x4586e + dw SafariZoneEastText1, SafariZoneEastText2, SafariZoneEastText3, SafariZoneEastText4, SafariZoneEastText5, SafariZoneEastText6, SafariZoneEastText7 SafariZoneEastText5: ; 0x4587c TX_FAR _SafariZoneEastText5 @@ -17062,7 +17515,10 @@ SafariZoneNorth_h: ; 0x4599f to 0x459ab (12 bytes) (bank=11) (id=218) dw $59d5 ; objects -INCBIN "baserom.gbc",$459ab,$459bc - $459ab +INCBIN "baserom.gbc",$459ab,$459ae - $459ab + +SafariZoneNorthTexts: ; 0x459ae + dw SafariZoneNorthText1, SafariZoneNorthText2, SafariZoneNorthText3, SafariZoneNorthText4, SafariZoneNorthText5, SafariZoneNorthText6, SafariZoneNorthText7 SafariZoneNorthText3: ; 0x459bc TX_FAR _SafariZoneNorthText3 @@ -17131,7 +17587,10 @@ SafariZoneCenter_h: ; 0x45ba6 to 0x45bb2 (12 bytes) (bank=11) (id=220) dw $5bc5 ; objects -INCBIN "baserom.gbc",$45bb2,$45bbb - $45bb2 +INCBIN "baserom.gbc",$45bb2,$45bb5 - $45bb2 + +SafariZoneCenterTexts: ; 0x45bb5 + dw SafariZoneCenterText1, SafariZoneCenterText2, SafariZoneCenterText3 SafariZoneCenterText2: ; 0x45bbb TX_FAR _SafariZoneCenterText2 @@ -17185,6 +17644,7 @@ SafariZoneRestHouse1_h: ; 0x45ce1 to 0x45ced (12 bytes) (bank=11) (id=221) dw $5cfe ; objects INCBIN "baserom.gbc",$45ced,$45cf0 - $45ced + SafariZoneRestHouse1Texts: ; 0x45cf0 dw SafariZoneRestHouse1Text1, SafariZoneRestHouse1Text2 @@ -17222,6 +17682,7 @@ SafariZoneRestHouse2_h: ; 0x45d1e to 0x45d2a (12 bytes) (bank=11) (id=223) dw $5d43 ; objects INCBIN "baserom.gbc",$45d2a,$45d2e - $45d2a + SafariZoneRestHouse2Texts: ; 0x45d2e dw SafariZoneRestHouse2Text1, SafariZoneRestHouse2Text2, SafariZoneRestHouse2Text3 @@ -17264,6 +17725,7 @@ SafariZoneRestHouse3_h: ; 0x45d69 to 0x45d75 (12 bytes) (bank=11) (id=224) dw $5d8e ; objects INCBIN "baserom.gbc",$45d75,$45d79 - $45d75 + SafariZoneRestHouse3Texts: ; 0x45d79 dw SafariZoneRestHouse3Text1, SafariZoneRestHouse3Text2, SafariZoneRestHouse3Text3 @@ -17306,6 +17768,7 @@ SafariZoneRestHouse4_h: ; 0x45db4 to 0x45dc0 (12 bytes) (bank=11) (id=225) dw $5dd9 ; objects INCBIN "baserom.gbc",$45dc0,$45dc4 - $45dc0 + SafariZoneRestHouse4Texts: ; 0x45dc4 dw SafariZoneRestHouse4Text1, SafariZoneRestHouse4Text2, SafariZoneRestHouse4Text3 @@ -17347,7 +17810,11 @@ UnknownDungeon2_h: ; 0x45dff to 0x45e0b (12 bytes) (bank=11) (id=226) dw $5e14 ; objects -INCBIN "baserom.gbc",$45e0b,$45e14 - $45e0b +INCBIN "baserom.gbc",$45e0b,$45e0e - $45e0b + +UnknownDungeon2Texts: ; 0x45e0e + dw UnknownDungeon2Text1, UnknownDungeon2Text2, UnknownDungeon2Text3 + UnknownDungeon2Object: ; 0x45e14 (size=73) db $7d ; border tile @@ -17385,7 +17852,13 @@ UnknownDungeon3_h: ; 0x45ee4 to 0x45ef0 (12 bytes) (bank=11) (id=227) dw $5f36 ; objects -INCBIN "baserom.gbc",$45ef0,$45f1c - $45ef0 +INCBIN "baserom.gbc",$45ef0,$45f09 - $45ef0 + +UnknownDungeon3Texts: ; 0x45f09 + dw UnknownDungeon3Text1, UnknownDungeon3Text2, UnknownDungeon3Text3 + +INCBIN "baserom.gbc",$45f0f,$d + UnknownDungeon3Text1: ; 0x45f1c db $08 ; asm ld hl, $5f0f @@ -17393,6 +17866,7 @@ UnknownDungeon3Text1: ; 0x45f1c jp $24d7 INCBIN "baserom.gbc",$45f26,$10 + UnknownDungeon3Object: ; 0x45f36 (size=34) db $7d ; border tile @@ -17420,7 +17894,13 @@ RockTunnel2_h: ; 0x45fdf to 0x45feb (12 bytes) (bank=11) (id=232) dw $613d ; objects -INCBIN "baserom.gbc",$45feb,$46075 - $45feb +INCBIN "baserom.gbc",$45feb,$46004 - $45feb + +RockTunnel2Texts: ; 0x46004 + dw RockTunnel2Text1, RockTunnel2Text2, RockTunnel2Text3, RockTunnel2Text4, RockTunnel2Text5, RockTunnel2Text6, RockTunnel2Text7, RockTunnel2Text8 + +INCBIN "baserom.gbc",$46014,$61 + RockTunnel2Text1: ; 0x46075 db $08 ; asm ld hl, $6014 @@ -17470,6 +17950,7 @@ RockTunnel2Text8: ; 0x460bb jp $24d7 INCBIN "baserom.gbc",$460c5,$78 + RockTunnel2Object: ; 0x4613d (size=100) db $3 ; border tile @@ -17509,8 +17990,10 @@ SeafoamIslands2_h: ; 0x46309 to 0x46315 (12 bytes) (bank=11) (id=159) dw $6376 ; objects INCBIN "baserom.gbc",$46315,$46372 - $46315 + SeafoamIslands2Texts: ; 0x46372 dw SeafoamIslands2Text1, SeafoamIslands2Text2 + SeafoamIslands2Object: ; 0x46376 (size=72) db $7d ; border tile @@ -17550,8 +18033,10 @@ SeafoamIslands3_h: ; 0x46445 to 0x46451 (12 bytes) (bank=11) (id=160) dw $64b2 ; objects INCBIN "baserom.gbc",$46451,$464ae - $46451 + SeafoamIslands3Texts: ; 0x464ae dw SeafoamIslands3Text1, SeafoamIslands3Text2 + SeafoamIslands3Object: ; 0x464b2 (size=72) db $7d ; border tile @@ -17591,8 +18076,10 @@ SeafoamIslands4_h: ; 0x46581 to 0x4658d (12 bytes) (bank=11) (id=161) dw $66a6 ; objects INCBIN "baserom.gbc",$4658d,$4669a - $4658d + SeafoamIslands4Texts: ; 0x4669a dw SeafoamIslands4Text1, SeafoamIslands4Text2, SeafoamIslands4Text3, SeafoamIslands4Text4, SeafoamIslands4Text5, SeafoamIslands4Text6 + SeafoamIslands4Object: ; 0x466a6 (size=96) db $7d ; border tile @@ -17635,7 +18122,13 @@ SeafoamIslands5_h: ; 0x4678d to 0x46799 (12 bytes) (bank=11) (id=162) dw $68bc ; objects -INCBIN "baserom.gbc",$46799,$46893 - $46799 +INCBIN "baserom.gbc",$46799,$4687c - $46799 + +SeafoamIslands5Texts: ; 0x4687c + dw SeafoamIslands5Text1, SeafoamIslands5Text2, SeafoamIslands5Text3, SeafoamIslands5Text4, SeafoamIslands5Text5 + +INCBIN "baserom.gbc",$46886,$d + SeafoamIslands5Text3: ; 0x46893 db $08 ; asm ld hl, $6886 @@ -17680,6 +18173,7 @@ SeafoamIslands5Object: ; 0x468bc (size=62) SeafoamIslands5Blocks: ; 135 INCBIN "maps/seafoamislands5.blk" + INCBIN "baserom.gbc",$46981,$167f SECTION "bank12",DATA,BANK[$12] @@ -17862,7 +18356,11 @@ CeladonMart3_h: ; 0x48219 to 0x48225 (12 bytes) (bank=12) (id=124) dw $42c4 ; objects -INCBIN "baserom.gbc",$48225,$4824a - $48225 +INCBIN "baserom.gbc",$48225,$48228 - $48225 + +CeladonMart3Texts: ; 0x48228 + dw CeladonMart3Text1, CeladonMart3Text2, CeladonMart3Text3, CeladonMart3Text4, CeladonMart3Text5, CeladonMart3Text6, CeladonMart3Text7, CeladonMart3Text8, CeladonMart3Text9, CeladonMart3Text10, CeladonMart3Text11, CeladonMart3Text12, CeladonMart3Text13, CeladonMart3Text14, CeladonMart3Text15, CeladonMart3Text16, CeladonMart3Text17 + CeladonMart3Text1: ; 0x4824a db $08 ; asm ld a, [$d778] @@ -17982,7 +18480,10 @@ CeladonMart4_h: ; 0x4834a to 0x48356 (12 bytes) (bank=12) (id=125) dw $4370 ; objects -INCBIN "baserom.gbc",$48356,$48361 - $48356 +INCBIN "baserom.gbc",$48356,$48359 - $48356 + +CeladonMart4Texts: ; 0x48359 + dw CeladonMart4Text1, CeladonMart4Text2, CeladonMart4Text3, CeladonMart4Text4 CeladonMart4Text2: ; 0x48361 TX_FAR _CeladonMart4Text2 @@ -18092,7 +18593,11 @@ CeladonMartElevator_h: ; 0x485f4 to 0x48600 (12 bytes) (bank=12) (id=127) dw $466d ; objects -INCBIN "baserom.gbc",$48600,$4865e - $48600 +INCBIN "baserom.gbc",$48600,$4865c - $48600 + +CeladonMartElevatorTexts: ; 0x4865c + dw CeladonMartElevatorText1 + CeladonMartElevatorText1: ; 0x4865e db $08 ; asm call $4631 @@ -18129,8 +18634,10 @@ CeladonMansion1_h: ; 0x48688 to 0x48694 (12 bytes) (bank=12) (id=128) dw $46cf ; objects INCBIN "baserom.gbc",$48694,$48697 - $48694 + CeladonMansion1Texts: ; 0x48697 dw CeladonMansion1Text1, CeladonMansion1Text2, CeladonMansion1Text3, CeladonMansion1Text4, CeladonMansion1Text5 + INCBIN "baserom.gbc",$486a1,$6 CeladonMansion1Text1: ; 0x486a7 @@ -18199,6 +18706,7 @@ CeladonMansion2_h: ; 0x4872e to 0x4873a (12 bytes) (bank=12) (id=129) dw $4745 ; objects INCBIN "baserom.gbc",$4873a,$4873e - $4873a + CeladonMansion2Texts: ; 0x4873e dw CeladonMansion2Text1 @@ -18237,7 +18745,10 @@ CeladonMansion3_h: ; 0x48784 to 0x48790 (12 bytes) (bank=12) (id=130) dw $47ff ; objects -INCBIN "baserom.gbc",$48790,$487a3 - $48790 +INCBIN "baserom.gbc",$48790,$48793 - $48790 + +CeladonMansion3Texts: ; 0x48793 + dw CeladonMansion3Text1, CeladonMansion3Text2, CeladonMansion3Text3, CeladonMansion3Text4, CeladonMansion3Text5, CeladonMansion3Text6, CeladonMansion3Text7, CeladonMansion3Text8 CeladonMansion3Text1: ; 0x487a3 TX_FAR _CeladonMansion3Text1 @@ -18324,6 +18835,7 @@ CeladonMansion4_h: ; 0x4885f to 0x4886b (12 bytes) (bank=12) (id=131) dw $4875 ; objects INCBIN "baserom.gbc",$4886b,$4886e - $4886b + CeladonMansion4Texts: ; 0x4886e dw CeladonMansion4Text1 @@ -18360,7 +18872,10 @@ CeladonPokecenter_h: ; 0x488ac to 0x488b8 (12 bytes) (bank=12) (id=133) dw $48d2 ; objects -INCBIN "baserom.gbc",$488b8,$488c8 - $488b8 +INCBIN "baserom.gbc",$488b8,$488c6 - $488b8 + +CeladonPokecenterText4: + db $f6, $ff CeladonPokecenterText2: ; _CeladonPokecenterText2 CeladonPokecenterText1: ; 0x488c8 @@ -18372,7 +18887,6 @@ CeladonPokecenterText3: ; 0x488cd TX_FAR _CeladonPokecenterText3 db $50 - CeladonPokecenterObject: ; 0x488d2 (size=44) db $0 ; border tile @@ -18400,7 +18914,13 @@ CeladonGym_h: ; 0x488fe to 0x4890a (12 bytes) (bank=12) (id=134) dw $4b30 ; objects -INCBIN "baserom.gbc",$4890a,$48a11 - $4890a +INCBIN "baserom.gbc",$4890a,$489a6 - $4890a + +CeladonGymTexts: ; 0x489a6 + dw CeladonGymText1, CeladonGymText2, CeladonGymText3, CeladonGymText4, CeladonGymText5, CeladonGymText6, CeladonGymText7, CeladonGymText8 + +INCBIN "baserom.gbc",$489b6,$5b + CeladonGymText1: ; 0x48a11 db $08 ; asm ld a, [$d77c] @@ -18437,6 +18957,7 @@ CeladonGymText1: ; 0x48a11 jp $24d7 INCBIN "baserom.gbc",$48a5e,$48a81 - $48a5e + CeladonGymText2: ; 0x48a81 db $08 ; asm ld hl, $49bc @@ -18444,6 +18965,7 @@ CeladonGymText2: ; 0x48a81 jp $24d7 INCBIN "baserom.gbc",$48a8b,$48a9a - $48a8b + CeladonGymText3: ; 0x48a9a db $08 ; asm ld hl, $49c8 @@ -18451,6 +18973,7 @@ CeladonGymText3: ; 0x48a9a jp $24d7 INCBIN "baserom.gbc",$48aa4,$48ab3 - $48aa4 + CeladonGymText4: ; 0x48ab3 db $08 ; asm ld hl, $49d4 @@ -18458,6 +18981,7 @@ CeladonGymText4: ; 0x48ab3 jp $24d7 INCBIN "baserom.gbc",$48abd,$48acc - $48abd + CeladonGymText5: ; 0x48acc db $08 ; asm ld hl, $49e0 @@ -18465,6 +18989,7 @@ CeladonGymText5: ; 0x48acc jp $24d7 INCBIN "baserom.gbc",$48ad6,$48ae5 - $48ad6 + CeladonGymText6: ; 0x48ae5 db $08 ; asm ld hl, $49ec @@ -18472,6 +18997,7 @@ CeladonGymText6: ; 0x48ae5 jp $24d7 INCBIN "baserom.gbc",$48aef,$48afe - $48aef + CeladonGymText7: ; 0x48afe db $08 ; asm ld hl, $49f8 @@ -18479,6 +19005,7 @@ CeladonGymText7: ; 0x48afe jp $24d7 INCBIN "baserom.gbc",$48b08,$48b17 - $48b08 + CeladonGymText8: ; 0x48b17 db $08 ; asm ld hl, $4a04 @@ -18486,6 +19013,7 @@ CeladonGymText8: ; 0x48b17 jp $24d7 INCBIN "baserom.gbc",$48b21,$f + CeladonGymObject: ; 0x48b30 (size=84) db $3 ; border tile @@ -18520,7 +19048,12 @@ CeladonGameCorner_h: ; 0x48bb1 to 0x48bbd (12 bytes) (bank=12) (id=135) dw $4fa0 ; objects -INCBIN "baserom.gbc",$48bbd,$48ca4 - $48bbd +INCBIN "baserom.gbc",$48bbd,$48c8a - $48bbd + +CeladonGameCornerTexts: ; 0x48c8a + dw CeladonGameCornerText1, CeladonGameCornerText2, CeladonGameCornerText3, CeladonGameCornerText4, CeladonGameCornerText5, CeladonGameCornerText6, CeladonGameCornerText7, CeladonGameCornerText8, CeladonGameCornerText9, CeladonGameCornerText10, CeladonGameCornerText11, CeladonGameCornerText12 + +INCBIN "baserom.gbc",$48ca2,$2 CeladonGameCornerText1: ; 0x48ca4 TX_FAR _CeladonGameCornerText1 @@ -18697,6 +19230,7 @@ CeladonGameCornerText9: ; 0x48dd9 jp $24d7 INCBIN "baserom.gbc",$48e26,$48e3b - $48e26 + CeladonGameCornerText10: ; 0x48e3b db $08 ; asm ld a, [$d77e] @@ -18736,6 +19270,7 @@ CeladonGameCornerText10: ; 0x48e3b jp $24d7 INCBIN "baserom.gbc",$48e88,$48e9d - $48e88 + CeladonGameCornerText11: ; 0x48e9d db $08 ; asm ld hl, $4ece @@ -18759,6 +19294,7 @@ CeladonGameCornerText11: ; 0x48e9d jp $24d7 INCBIN "baserom.gbc",$48ece,$48edd - $48ece + CeladonGameCornerText12: ; 0x48edd db $08 ; asm ld a, $1 @@ -18779,6 +19315,7 @@ CeladonGameCornerText12: ; 0x48edd jp $24d7 INCBIN "baserom.gbc",$48f09,$97 + CeladonGameCornerObject: ; 0x48fa0 (size=99) db $f ; border tile @@ -18819,7 +19356,10 @@ CeladonMart5_h: ; 0x4905d to 0x49069 (12 bytes) (bank=12) (id=136) dw $5085 ; objects -INCBIN "baserom.gbc",$49069,$49076 - $49069 +INCBIN "baserom.gbc",$49069,$4906c - $49069 + +CeladonMart5Texts: ; 0x4906c + dw CeladonMart5Text1, CeladonMart5Text2, CeladonMart5Text3, CeladonMart5Text4, CeladonMart5Text5 CeladonMart5Text1: ; 0x49076 TX_FAR _CeladonMart5Text1 @@ -18909,7 +19449,10 @@ CeladonDiner_h: ; 0x49145 to 0x49151 (12 bytes) (bank=12) (id=138) dw $51bc ; objects -INCBIN "baserom.gbc",$49151,$4915f - $49151 +INCBIN "baserom.gbc",$49151,$49155 - $49151 + +CeladonDinerTexts: ; 0x49155 + dw CeladonDinerText1, CeladonDinerText2, CeladonDinerText3, CeladonDinerText4, CeladonDinerText5 CeladonDinerText1: ; 0x4915f TX_FAR _CeladonDinerText1 @@ -18986,6 +19529,7 @@ CeladonHouse_h: ; 0x49202 to 0x4920e (12 bytes) (bank=12) (id=139) dw $5227 ; objects INCBIN "baserom.gbc",$4920e,$49212 - $4920e + CeladonHouseTexts: ; 0x49212 dw CeladonHouseText1, CeladonHouseText2, CeladonHouseText3 @@ -19031,6 +19575,7 @@ CeladonHotel_h: ; 0x4925d to 0x49269 (12 bytes) (bank=12) (id=140) dw $5281 ; objects INCBIN "baserom.gbc",$49269,$4926c - $49269 + CeladonHotelTexts: ; 0x4926c dw CeladonHotelText1, CeladonHotelText2, CeladonHotelText3 @@ -19142,8 +19687,8 @@ MtMoonPokecenterText5: ; 0x49370 TX_FAR _MtMoonPokecenterText5 db $50 -;XXX wtf? -db $f6 +MtMoonPokecenterText6: + db $f6 MtMoonPokecenterObject: ; 0x49376 (size=56) db $0 ; border tile @@ -19186,9 +19731,8 @@ RockTunnelPokecenterText3: ; 0x493ce TX_FAR _RockTunnelPokecenterText3 db $50 -; RockTunnelPokecenterText4: ; 0x493d3 - -INCBIN "baserom.gbc",$493ce+5,$493d4-($493ce+5) +RockTunnelPokecenterText4: ; 0x493d3 + db $f6 RockTunnelPokecenterObject: ; 0x493d4 (size=44) db $0 ; border tile @@ -19218,6 +19762,7 @@ Route11Gate_h: ; 0x49400 to 0x4940c (12 bytes) (id=84) dw $5416 ; objects INCBIN "baserom.gbc",$4940c,$4940f - $4940c + Route11GateTexts: ; 0x4940f dw Route11GateText1 @@ -19256,15 +19801,48 @@ Route11GateUpstairs_h: ; 0x49448 to 0x49454 (12 bytes) (id=86) dw $54da ; objects INCBIN "baserom.gbc",$49454,$4945f - $49454 + Route11GateUpstairsText1: ; 0x4945f db $08 ; asm xor a ld [W_WHICHTRADE], a ld a, $54 call Predef +asm_49469: jp $24d7 -INCBIN "baserom.gbc",$4946c,$494a8 - $4946c +Route11GateUpstairsText2: ; 0x4946c + db $8 + ld a, [$d7d6] + add a + jr c, .asm_4949b ; 0x49471 $28 + ld a, $1e + ld [$ff00+$db], a + ld a, $47 + ld [$ff00+$dc], a + ld [$d11e], a + call $2fcf + ld h, d + ld l, e + ld de, $cc5b + ld bc, $000d + call CopyData + ld a, $62 + call Predef + ld a, [$ff00+$db] + dec a + jr nz, .asm_494a1 ; 0x49494 $b + ld hl, $d7d6 + set 7, [hl] +.asm_4949b + ld hl, $54a3 + call PrintText +.asm_494a1 + jr asm_49469 ; 0x494a1 $c6 +; 0x494a3 + +INCBIN "baserom.gbc",$494a3,$5 + Route11GateUpstairsText3: ; 0x494a8 db $08 ; asm ld a, [$c109] @@ -19279,7 +19857,15 @@ Route11GateUpstairsText3: ; 0x494a8 call PrintText jp $24d7 -INCBIN "baserom.gbc",$494c4,$16 +INCBIN "baserom.gbc",$494c4,$494ce - $494c4 + +Route11GateUpstairsText4: ; 0x494ce + db $8 + ld hl, $54d5 + jp $55c9 +; 0x494d5 + +INCBIN "baserom.gbc",$494d5,$5 Route11GateUpstairsObject: ; 0x494da (size=30) db $a ; border tile @@ -19307,6 +19893,7 @@ Route12Gate_h: ; 0x494f8 to 0x49504 (12 bytes) (id=87) dw $550e ; objects INCBIN "baserom.gbc",$49504,$49507 - $49504 + Route12GateTexts: ; 0x49507 dw Route12GateText1 @@ -19347,7 +19934,11 @@ Route12GateUpstairs_h: ; 0x49554 to 0x49560 (12 bytes) (id=195) dw $55de ; objects -INCBIN "baserom.gbc",$49560,$49569 - $49560 +INCBIN "baserom.gbc",$49560,$49563 - $49560 + +Route12GateUpstairsTexts: ; 0x49563 + dw Route12GateUpstairsText1, Route12GateUpstairsText2, Route12GateUpstairsText3 + Route12GateUpstairsText1: ; 0x49569 db $08 ; asm ld a, [$d7d7] @@ -19416,6 +20007,7 @@ Route15Gate_h: ; 0x495f6 to 0x49602 (12 bytes) (id=184) dw $560c ; objects INCBIN "baserom.gbc",$49602,$49605 - $49602 + Route15GateTexts: ; 0x49605 dw Route15GateText1 @@ -19455,7 +20047,13 @@ Route16GateMap_h: ; 0x496b2 to 0x496be (12 bytes) (id=186) dw $578b ; objects -INCBIN "baserom.gbc",$496be,$49760 - $496be +INCBIN "baserom.gbc",$496be,$4975a - $496be + +Route16GateMapTexts: ; 0x4975a + dw Route16GateMapText1, Route16GateMapText2 + +INCBIN "baserom.gbc",$4975e,$2 + Route16GateMapText1: ; 0x49760 db $08 ; asm call $5755 @@ -19517,7 +20115,11 @@ Route16GateUpstairs_h: ; 0x497ff to 0x4980b (12 bytes) (id=187) dw $584c ; objects -INCBIN "baserom.gbc",$4980b,$49816 - $4980b +INCBIN "baserom.gbc",$4980b,$4980e - $4980b + +Route16GateUpstairsTexts: ; 0x4980e + dw Route16GateUpstairsText1, Route16GateUpstairsText2, Route16GateUpstairsText3, Route16GateUpstairsText4 + Route16GateUpstairsText1: ; 0x49816 db $08 ; asm ld hl, $5820 @@ -19525,6 +20127,7 @@ Route16GateUpstairsText1: ; 0x49816 jp $24d7 INCBIN "baserom.gbc",$49820,$49825 - $49820 + Route16GateUpstairsText2: ; 0x49825 db $08 ; asm ld hl, $582f @@ -19532,17 +20135,21 @@ Route16GateUpstairsText2: ; 0x49825 jp $24d7 INCBIN "baserom.gbc",$4982f,$49834 - $4982f + Route16GateUpstairsText3: ; 0x49834 db $8 ld hl, $583b jp $55c9 ; 0x4983b + INCBIN "baserom.gbc",$4983b,$5 + Route16GateUpstairsText4: ; 0x49840 db $8 ld hl, $5847 jp $55c9 ; 0x49847 + INCBIN "baserom.gbc",$49847,$5 Route16GateUpstairsObject: ; 0x4984c (size=30) @@ -19570,7 +20177,13 @@ Route18Gate_h: ; 0x4986a to 0x49876 (12 bytes) (id=190) dw $5937 ; objects -INCBIN "baserom.gbc",$49876,$49911 - $49876 +INCBIN "baserom.gbc",$49876,$4990d - $49876 + +Route18GateTexts: ; 0x4990d + dw Route18GateText1 + +INCBIN "baserom.gbc",$4990f,$2 + Route18GateText1: ; 0x49911 db $08 ; asm call $5755 @@ -19616,7 +20229,11 @@ Route18GateHeader_h: ; 0x49969 to 0x49975 (12 bytes) (id=191) dw $59a4 ; objects -INCBIN "baserom.gbc",$49975,$4997e - $49975 +INCBIN "baserom.gbc",$49975,$49978 - $49975 + +Route18GateHeaderTexts: ; 0x49978 + dw Route18GateHeaderText1, Route18GateHeaderText2, Route18GateHeaderText3 + Route18GateHeaderText1: ; 0x4997e db $08 ; asm ld a, $5 @@ -19630,12 +20247,15 @@ Route18GateHeaderText2: ; 0x4998c ld hl, $5993 jp $55c9 ; 0x49993 + INCBIN "baserom.gbc",$49993,$5 + Route18GateHeaderText3: ; 0x49998 db $8 ld hl, $599f jp $55c9 ; 0x4999f + INCBIN "baserom.gbc",$4999f,$5 Route18GateHeaderObject: ; 0x499a4 (size=24) @@ -19662,7 +20282,13 @@ MtMoon1_h: ; 0x499bc to 0x499c8 (12 bytes) (id=59) dw $5b06 ; objects -INCBIN "baserom.gbc",$499c8,$49a52 - $499c8 +INCBIN "baserom.gbc",$499c8,$499e1 - $499c8 + +MtMoon1Texts: ; 0x499e1 + dw MtMoon1Text1, MtMoon1Text2, MtMoon1Text3, MtMoon1Text4, MtMoon1Text5, MtMoon1Text6, MtMoon1Text7, MtMoon1Text8, MtMoon1Text9, MtMoon1Text10, MtMoon1Text11, MtMoon1Text12, MtMoon1Text13, MtMoon1Text14 + +INCBIN "baserom.gbc",$499fd,$55 + MtMoon1Text1: ; 0x49a52 db $08 ; asm ld hl, $59fd @@ -19757,7 +20383,13 @@ MtMoon3_h: ; 0x49cff to 0x49d0b (12 bytes) (id=61) dw $5fdb ; objects -INCBIN "baserom.gbc",$49d0b,$49e79 - $49d0b +INCBIN "baserom.gbc",$49d0b,$49e34 - $49d0b + +MtMoon3Texts: ; 0x49e34 + dw MtMoon3Text1, MtMoon3Text2, MtMoon3Text3, MtMoon3Text4, MtMoon3Text5, MtMoon3Text6, MtMoon3Text7, MtMoon3Text8, MtMoon3Text9 + +INCBIN "baserom.gbc",$49e46,$33 + MtMoon3Text1: ; 0x49e79 db $08 ; asm ld a, [$d7f6] @@ -19842,6 +20474,7 @@ MtMoon3Text6: ; 0x49ee9 jp $24d7 INCBIN "baserom.gbc",$49f24,$49f29 - $49f24 + MtMoon3Text7: ; 0x49f29 db $08 ; asm ld a, $1 @@ -19909,7 +20542,10 @@ SafariZoneWest_h: ; 0x4a1a9 to 0x4a1b5 (12 bytes) (id=219) dw $61dc ; objects -INCBIN "baserom.gbc",$4a1b5,$4a1c8 - $4a1b5 +INCBIN "baserom.gbc",$4a1b5,$4a1b8 - $4a1b5 + +SafariZoneWestTexts: ; 0x4a1b8 + dw SafariZoneWestText1, SafariZoneWestText2, SafariZoneWestText3, SafariZoneWestText4, SafariZoneWestText5, SafariZoneWestText6, SafariZoneWestText7, SafariZoneWestText8 SafariZoneWestText5: ; 0x4a1c8 TX_FAR _SafariZoneWestText5 @@ -19973,7 +20609,11 @@ SafariZoneSecretHouse_h: ; 0x4a30b to 0x4a317 (12 bytes) (id=222) dw $6365 ; objects -INCBIN "baserom.gbc",$4a317,$4a31c - $4a317 +INCBIN "baserom.gbc",$4a317,$4a31a - $4a317 + +SafariZoneSecretHouseTexts: ; 0x4a31a + dw SafariZoneSecretHouseText1 + SafariZoneSecretHouseText1: ; 0x4a31c db $08 ; asm ld a, [$d857] @@ -20000,6 +20640,7 @@ SafariZoneSecretHouseText1: ; 0x4a31c jp $24d7 INCBIN "baserom.gbc",$4a350,$15 + SafariZoneSecretHouseObject: ; 0x4a365 (size=26) db $17 ; border tile @@ -20124,6 +20765,7 @@ BattleCenterM_h: ; 0x4fd04 to 0x4fd10 (12 bytes) (id=239) dw $7d53 ; objects INCBIN "baserom.gbc",$4fd10,$4fd4c - $4fd10 + BattleCenterMTexts: ; 0x4fd4c dw BattleCenterMText1 @@ -20153,6 +20795,7 @@ TradeCenterM_h: ; 0x4fd71 to 0x4fd7d (12 bytes) (id=240) dw $7d87 ; objects INCBIN "baserom.gbc",$4fd7d,$4fd80 - $4fd7d + TradeCenterMTexts: ; 0x4fd80 dw TradeCenterMText1 @@ -20595,6 +21238,7 @@ IndigoPlateau_h: ; 0x5091e to 0x50935 (23 bytes) (id=9) dw $4936 ; objects INCBIN "baserom.gbc",$50935,$50936 - $50935 + IndigoPlateauObject: ; 0x50936 (size=20) db $e ; border tile @@ -20704,7 +21348,10 @@ SaffronCityObject: ; 0x509dc (size=188) SaffronCityBlocks: ; 360 INCBIN "maps/saffroncity.blk" -INCBIN "baserom.gbc",$50c00,$50c35 - $50c00 +INCBIN "baserom.gbc",$50c00,$50c03 - $50c00 + +SaffronCityTexts: ; 0x50c03 + dw SaffronCityText1, SaffronCityText2, SaffronCityText3, SaffronCityText4, SaffronCityText5, SaffronCityText6, SaffronCityText7, SaffronCityText8, SaffronCityText9, SaffronCityText10, SaffronCityText11, SaffronCityText12, SaffronCityText13, SaffronCityText14, SaffronCityText15, SaffronCityText16, SaffronCityText17, SaffronCityText18, SaffronCityText19, SaffronCityText20, SaffronCityText21, SaffronCityText22, SaffronCityText23, SaffronCityText24, SaffronCityText25 SaffronCityText1: ; 0x50c35 TX_FAR _SaffronCityText1 @@ -20799,7 +21446,13 @@ SaffronCityText25: ; 0x50ca4 TX_FAR _SaffronCityText25 db $50 -INCBIN "baserom.gbc",$50ca9,$50db3 - $50ca9 +INCBIN "baserom.gbc",$50ca9,$50d22 - $50ca9 + +Route20Texts: ; 0x50d22 + dw Route20Text1, Route20Text2, Route20Text3, Route20Text4, Route20Text5, Route20Text6, Route20Text7, Route20Text8, Route20Text9, Route20Text10, Route20Text11, Route20Text12 + +INCBIN "baserom.gbc",$50d3a,$79 + Route20Text1: ; 0x50db3 db $08 ; asm ld hl, $4d3a @@ -20867,7 +21520,11 @@ Route20Text11: ; 0x50ead TX_FAR _Route20Text11 db $50 -INCBIN "baserom.gbc",$50eb2,$5117b - $50eb2 +INCBIN "baserom.gbc",$50eb2,$51175 - $50eb2 + +Route22Texts: ; 0x51175 + dw Route22Text1, Route22Text2, Route22Text3 + Route22Text1: ; 0x5117b db $08 ; asm ld a, [$d7eb] @@ -20902,7 +21559,11 @@ Route22Text3: ; 0x511d5 TX_FAR _Route22Text3 db $50 -INCBIN "baserom.gbc",$511da,$51307 - $511da +INCBIN "baserom.gbc",$511da,$512f7 - $511da + +Route23Texts: ; 0x512f7 + dw Route23Text1, Route23Text2, Route23Text3, Route23Text4, Route23Text5, Route23Text6, Route23Text7, Route23Text8 + Route23Text1: ; 0x51307 db $08 ; asm ld a, $6 @@ -20952,7 +21613,12 @@ Route23Text8: ; 0x513a8 TX_FAR _Route23Text8 db $50 -INCBIN "baserom.gbc",$513ad,$514a4 - $513ad +INCBIN "baserom.gbc",$513ad,$5144b - $513ad + +Route24Texts: ; 0x5144b + dw Route24Text1, Route24Text2, Route24Text3, Route24Text4, Route24Text5, Route24Text6, Route24Text7, Route24Text8 + +INCBIN "baserom.gbc",$5145b,$49 Route24Text1: ; 0x514a4 db $8 @@ -21038,7 +21704,13 @@ Route24Text7: ; 0x51567 call LoadTrainerHeader jp $24d7 -INCBIN "baserom.gbc",$51571,$516ab - $51571 +INCBIN "baserom.gbc",$51571,$51628 - $51571 + +Route25Texts: ; 0x51628 + dw Route25Text1, Route25Text2, Route25Text3, Route25Text4, Route25Text5, Route25Text6, Route25Text7, Route25Text8, Route25Text9, Route25Text10, Route25Text11 + +INCBIN "baserom.gbc",$5163e,$6d + Route25Text1: ; 0x516ab db $08 ; asm ld hl, $563e @@ -21107,7 +21779,13 @@ VictoryRoad2_h: ; 0x51791 to 0x5179d (12 bytes) (id=194) dw $5915 ; objects -INCBIN "baserom.gbc",$5179d,$5187e - $5179d +INCBIN "baserom.gbc",$5179d,$5181b - $5179d + +VictoryRoad2Texts: ; 0x5181b + dw VictoryRoad2Text1, VictoryRoad2Text2, VictoryRoad2Text3, VictoryRoad2Text4, VictoryRoad2Text5, VictoryRoad2Text6, VictoryRoad2Text7, VictoryRoad2Text8, VictoryRoad2Text9, VictoryRoad2Text10, VictoryRoad2Text11, VictoryRoad2Text12, VictoryRoad2Text13 + +INCBIN "baserom.gbc",$51835,$49 + VictoryRoad2Text1: ; 0x5187e db $08 ; asm ld hl, $5835 @@ -21145,6 +21823,7 @@ VictoryRoad2Text6: ; 0x518b0 jp $24d7 INCBIN "baserom.gbc",$518ba,$5b + VictoryRoad2Object: ; 0x51915 (size=154) db $7d ; border tile @@ -21195,6 +21874,7 @@ MtMoon2_h: ; 0x51a36 to 0x51a42 (12 bytes) (id=60) dw $5a4d ; objects INCBIN "baserom.gbc",$51a42,$51a4d - $51a42 + MtMoon2Object: ; 0x51a4d (size=68) db $3 ; border tile @@ -21233,7 +21913,13 @@ SilphCo7_h: ; 0x51b55 to 0x51b61 (12 bytes) (id=212) dw $5ed7 ; objects -INCBIN "baserom.gbc",$51b61,$51d8e - $51b61 +INCBIN "baserom.gbc",$51b61,$51d3f - $51b61 + +SilphCo7Texts: ; 0x51d3f + dw SilphCo7Text1, SilphCo7Text2, SilphCo7Text3, SilphCo7Text4, SilphCo7Text5, SilphCo7Text6, SilphCo7Text7, SilphCo7Text8, SilphCo7Text9, SilphCo7Text10, SilphCo7Text11 + +INCBIN "baserom.gbc",$51d55,$39 + SilphCo7Text1: ; 0x51d8e db $08 ; asm ld a, [$d72e] @@ -21267,6 +21953,7 @@ SilphCo7Text1: ; 0x51d8e jp $24d7 INCBIN "baserom.gbc",$51dd3,$51de7 - $51dd3 + SilphCo7Text2: ; 0x51de7 db $8 ld a, [$d838] @@ -21282,6 +21969,7 @@ SilphCo7Text2: ; 0x51de7 jp $24d7 ; 0x51e00 INCBIN "baserom.gbc",$51e00,$a + SilphCo7Text3: ; 0x51e0a db $08 ; asm ld a, [$d838] @@ -21297,6 +21985,7 @@ SilphCo7Text3: ; 0x51e0a jp $24d7 INCBIN "baserom.gbc",$51e23,$51e2d - $51e23 + SilphCo7Text4: ; 0x51e2d db $08 ; asm ld a, [$d838] @@ -21312,6 +22001,7 @@ SilphCo7Text4: ; 0x51e2d jp $24d7 INCBIN "baserom.gbc",$51e46,$51e50 - $51e46 + SilphCo7Text5: ; 0x51e50 db $08 ; asm ld hl, $5d5d @@ -21319,6 +22009,7 @@ SilphCo7Text5: ; 0x51e50 jp $24d7 INCBIN "baserom.gbc",$51e5a,$51e69 - $51e5a + SilphCo7Text6: ; 0x51e69 db $08 ; asm ld hl, $5d69 @@ -21326,6 +22017,7 @@ SilphCo7Text6: ; 0x51e69 jp $24d7 INCBIN "baserom.gbc",$51e73,$51e82 - $51e73 + SilphCo7Text7: ; 0x51e82 db $08 ; asm ld hl, $5d75 @@ -21333,6 +22025,7 @@ SilphCo7Text7: ; 0x51e82 jp $24d7 INCBIN "baserom.gbc",$51e8c,$51e9b - $51e8c + SilphCo7Text8: ; 0x51e9b db $08 ; asm ld hl, $5d81 @@ -21340,6 +22033,7 @@ SilphCo7Text8: ; 0x51e9b jp $24d7 INCBIN "baserom.gbc",$51ea5,$51eb4 - $51ea5 + SilphCo7Text9: ; 0x51eb4 db $08 ; asm ld hl, $5ebe @@ -21347,6 +22041,7 @@ SilphCo7Text9: ; 0x51eb4 jp $24d7 INCBIN "baserom.gbc",$51ebe,$19 + SilphCo7Object: ; 0x51ed7 (size=128) db $2e ; border tile @@ -21393,6 +22088,7 @@ Mansion2_h: ; 0x51fcc to 0x51fd8 (12 bytes) (id=214) dw $60d1 ; objects INCBIN "baserom.gbc",$51fd8,$52064 - $51fd8 + Mansion2Text1: ; 0x52064 db $08 ; asm ld hl, $6057 @@ -21410,6 +22106,7 @@ Mansion2Text4: ; 0x52082 db $50 INCBIN "baserom.gbc",$52087,$4a + Mansion2Object: ; 0x520d1 (size=63) db $1 ; border tile @@ -21444,6 +22141,7 @@ Mansion3_h: ; 0x521e2 to 0x521ee (12 bytes) (id=215) dw $62e6 ; objects INCBIN "baserom.gbc",$521ee,$522af - $521ee + Mansion3Text1: ; 0x522af db $08 ; asm ld hl, $6296 @@ -21495,6 +22193,7 @@ Mansion4_h: ; 0x523ad to 0x523b9 (12 bytes) (id=216) dw $6498 ; objects INCBIN "baserom.gbc",$523b9,$52461 - $523b9 + Mansion4Text1: ; 0x52461 db $08 ; asm ld hl, $6448 @@ -21909,6 +22608,7 @@ INCBIN "baserom.gbc",$52996,$54000 - $52996 SECTION "bank15",DATA,BANK[$15] INCBIN "baserom.gbc",$54000,$54022 - $54000 + Route2Object: ; 0x54022 (size=72) db $f ; border tile @@ -22389,7 +23089,12 @@ Route2Text4: ; 0x554f3 TX_FAR _Route2Text4 db $50 -INCBIN "baserom.gbc",$554f8,$55586 - $554f8 +INCBIN "baserom.gbc",$554f8,$55511 - $554f8 + +Route3Texts: ; 0x55511 + dw Route3Text1, Route3Text2, Route3Text3, Route3Text4, Route3Text5, Route3Text6, Route3Text7, Route3Text8, Route3Text9, Route3Text10 + +INCBIN "baserom.gbc",$55525,$61 Route3Text1: ; 0x55586 TX_FAR _Route3Text1 @@ -22402,6 +23107,7 @@ Route3Text2: ; 0x5558b jp $24d7 INCBIN "baserom.gbc",$55595,$555a4 - $55595 + Route3Text3: ; 0x555a4 db $08 ; asm ld hl, $5531 @@ -22409,6 +23115,7 @@ Route3Text3: ; 0x555a4 jp $24d7 INCBIN "baserom.gbc",$555ae,$555bd - $555ae + Route3Text4: ; 0x555bd db $08 ; asm ld hl, $553d @@ -22416,6 +23123,7 @@ Route3Text4: ; 0x555bd jp $24d7 INCBIN "baserom.gbc",$555c7,$555d6 - $555c7 + Route3Text5: ; 0x555d6 db $08 ; asm ld hl, $5549 @@ -22423,6 +23131,7 @@ Route3Text5: ; 0x555d6 jp $24d7 INCBIN "baserom.gbc",$555e0,$555ef - $555e0 + Route3Text6: ; 0x555ef db $08 ; asm ld hl, $5555 @@ -22430,6 +23139,7 @@ Route3Text6: ; 0x555ef jp $24d7 INCBIN "baserom.gbc",$555f9,$55608 - $555f9 + Route3Text7: ; 0x55608 db $08 ; asm ld hl, $5561 @@ -22437,6 +23147,7 @@ Route3Text7: ; 0x55608 jp $24d7 INCBIN "baserom.gbc",$55612,$55621 - $55612 + Route3Text8: ; 0x55621 db $08 ; asm ld hl, $556d @@ -22444,6 +23155,7 @@ Route3Text8: ; 0x55621 jp $24d7 INCBIN "baserom.gbc",$5562b,$5563a - $5562b + Route3Text9: ; 0x5563a db $08 ; asm ld hl, $5579 @@ -22456,7 +23168,12 @@ Route3Text10: ; 0x55653 TX_FAR _Route3Text10 db $50 -INCBIN "baserom.gbc",$55658,$5568a - $55658 +INCBIN "baserom.gbc",$55658,$55671 - $55658 + +Route4Texts: ; 0x55671 + dw Route4Text1, Route4Text2, Route4Text3, Route4Text4, Route4Text5, Route4Text6 + +INCBIN "baserom.gbc",$5567d,$d Route4Text1: ; 0x5568a TX_FAR _Route4Text1 @@ -22479,6 +23196,7 @@ Route4Text6: ; 0x556ad db $50 INCBIN "baserom.gbc",$556b2,$556b5 - $556b2 + Route5Texts: ; 0x556b5 dw Route5Text1 @@ -22486,7 +23204,13 @@ Route5Text1: ; 0x556b7 TX_FAR _Route5Text1 db $50 -INCBIN "baserom.gbc",$556bc,$55758 - $556bc +INCBIN "baserom.gbc",$556bc,$556d5 - $556bc + +Route9Texts: ; 0x556d5 + dw Route9Text1, Route9Text2, Route9Text3, Route9Text4, Route9Text5, Route9Text6, Route9Text7, Route9Text8, Route9Text9, Route9Text10, Route9Text11 + +INCBIN "baserom.gbc",$556eb,$6d + Route9Text1: ; 0x55758 db $8 ; asm ld hl, $56eb @@ -22541,7 +23265,13 @@ Route9Text11: ; 0x55819 TX_FAR _Route9Text11 db $50 -INCBIN "baserom.gbc",$5581e,$558ca - $5581e +INCBIN "baserom.gbc",$5581e,$55837 - $5581e + +Route13Texts: ; 0x55837 + dw Route13Text1, Route13Text2, Route13Text3, Route13Text4, Route13Text5, Route13Text6, Route13Text7, Route13Text8, Route13Text9, Route13Text10, Route13Text11, Route13Text12, Route13Text13 + +INCBIN "baserom.gbc",$55851,$79 + Route13Text1: ; 0x558ca db $08 ; asm ld hl, $5851 @@ -22549,6 +23279,7 @@ Route13Text1: ; 0x558ca jp $24d7 INCBIN "baserom.gbc",$558d4,$558e3 - $558d4 + Route13Text2: ; 0x558e3 db $08 ; asm ld hl, $585d @@ -22556,6 +23287,7 @@ Route13Text2: ; 0x558e3 jp $24d7 INCBIN "baserom.gbc",$558ed,$558fc - $558ed + Route13Text3: ; 0x558fc db $08 ; asm ld hl, $5869 @@ -22563,6 +23295,7 @@ Route13Text3: ; 0x558fc jp $24d7 INCBIN "baserom.gbc",$55906,$55915 - $55906 + Route13Text4: ; 0x55915 db $08 ; asm ld hl, $5875 @@ -22570,6 +23303,7 @@ Route13Text4: ; 0x55915 jp $24d7 INCBIN "baserom.gbc",$5591f,$5592e - $5591f + Route13Text5: ; 0x5592e db $08 ; asm ld hl, $5881 @@ -22577,6 +23311,7 @@ Route13Text5: ; 0x5592e jp $24d7 INCBIN "baserom.gbc",$55938,$55947 - $55938 + Route13Text6: ; 0x55947 db $08 ; asm ld hl, $588d @@ -22584,6 +23319,7 @@ Route13Text6: ; 0x55947 jp $24d7 INCBIN "baserom.gbc",$55951,$55960 - $55951 + Route13Text7: ; 0x55960 db $08 ; asm ld hl, $5899 @@ -22591,6 +23327,7 @@ Route13Text7: ; 0x55960 jp $24d7 INCBIN "baserom.gbc",$5596a,$55979 - $5596a + Route13Text8: ; 0x55979 db $08 ; asm ld hl, $58a5 @@ -22598,6 +23335,7 @@ Route13Text8: ; 0x55979 jp $24d7 INCBIN "baserom.gbc",$55983,$55992 - $55983 + Route13Text9: ; 0x55992 db $08 ; asm ld hl, $58b1 @@ -22605,6 +23343,7 @@ Route13Text9: ; 0x55992 jp $24d7 INCBIN "baserom.gbc",$5599c,$559ab - $5599c + Route13Text10: ; 0x559ab db $08 ; asm ld hl, $58bd @@ -22625,7 +23364,13 @@ Route13Text13: ; 0x559ce TX_FAR _Route13Text13 db $50 -INCBIN "baserom.gbc",$559d3,$55a7b - $559d3 +INCBIN "baserom.gbc",$559d3,$559ec - $559d3 + +Route14Texts: ; 0x559ec + dw Route14Text1, Route14Text2, Route14Text3, Route14Text4, Route14Text5, Route14Text6, Route14Text7, Route14Text8, Route14Text9, Route14Text10, Route14Text11 + +INCBIN "baserom.gbc",$55a02,$79 + Route14Text1: ; 0x55a7b db $08 ; asm ld hl, $5a02 @@ -22633,6 +23378,7 @@ Route14Text1: ; 0x55a7b jp $24d7 INCBIN "baserom.gbc",$55a85,$55a94 - $55a85 + Route14Text2: ; 0x55a94 db $08 ; asm ld hl, $5a0e @@ -22640,6 +23386,7 @@ Route14Text2: ; 0x55a94 jp $24d7 INCBIN "baserom.gbc",$55a9e,$55aad - $55a9e + Route14Text3: ; 0x55aad db $08 ; asm ld hl, $5a1a @@ -22647,6 +23394,7 @@ Route14Text3: ; 0x55aad jp $24d7 INCBIN "baserom.gbc",$55ab7,$55ac6 - $55ab7 + Route14Text4: ; 0x55ac6 db $08 ; asm ld hl, $5a26 @@ -22654,6 +23402,7 @@ Route14Text4: ; 0x55ac6 jp $24d7 INCBIN "baserom.gbc",$55ad0,$55adf - $55ad0 + Route14Text5: ; 0x55adf db $08 ; asm ld hl, $5a32 @@ -22661,6 +23410,7 @@ Route14Text5: ; 0x55adf jp $24d7 INCBIN "baserom.gbc",$55ae9,$55af8 - $55ae9 + Route14Text6: ; 0x55af8 db $08 ; asm ld hl, $5a3e @@ -22668,6 +23418,7 @@ Route14Text6: ; 0x55af8 jp $24d7 INCBIN "baserom.gbc",$55b02,$55b11 - $55b02 + Route14Text7: ; 0x55b11 db $08 ; asm ld hl, $5a4a @@ -22675,6 +23426,7 @@ Route14Text7: ; 0x55b11 jp $24d7 INCBIN "baserom.gbc",$55b1b,$55b2a - $55b1b + Route14Text8: ; 0x55b2a db $08 ; asm ld hl, $5a56 @@ -22682,6 +23434,7 @@ Route14Text8: ; 0x55b2a jp $24d7 INCBIN "baserom.gbc",$55b34,$55b43 - $55b34 + Route14Text9: ; 0x55b43 db $08 ; asm ld hl, $5a62 @@ -22689,6 +23442,7 @@ Route14Text9: ; 0x55b43 jp $24d7 INCBIN "baserom.gbc",$55b4d,$55b5c - $55b4d + Route14Text10: ; 0x55b5c db $08 ; asm ld hl, $5a6e @@ -22701,7 +23455,13 @@ Route14Text11: ; 0x55b75 TX_FAR _Route14Text11 db $50 -INCBIN "baserom.gbc",$55b7a,$55c2c - $55b7a +INCBIN "baserom.gbc",$55b7a,$55b93 - $55b7a + +Route17Texts: ; 0x55b93 + dw Route17Text1, Route17Text2, Route17Text3, Route17Text4, Route17Text5, Route17Text6, Route17Text7, Route17Text8, Route17Text9, Route17Text10, Route17Text11, Route17Text12, Route17Text13, Route17Text14, Route17Text15, Route17Text16 + +INCBIN "baserom.gbc",$55bb3,$79 + Route17Text1: ; 0x55c2c db $08 ; asm ld hl, $5bb3 @@ -22709,6 +23469,7 @@ Route17Text1: ; 0x55c2c jp $24d7 INCBIN "baserom.gbc",$55c36,$55c45 - $55c36 + Route17Text2: ; 0x55c45 db $08 ; asm ld hl, $5bbf @@ -22716,6 +23477,7 @@ Route17Text2: ; 0x55c45 jp $24d7 INCBIN "baserom.gbc",$55c4f,$55c5e - $55c4f + Route17Text3: ; 0x55c5e db $08 ; asm ld hl, $5bcb @@ -22723,6 +23485,7 @@ Route17Text3: ; 0x55c5e jp $24d7 INCBIN "baserom.gbc",$55c68,$55c77 - $55c68 + Route17Text4: ; 0x55c77 db $08 ; asm ld hl, $5bd7 @@ -22730,6 +23493,7 @@ Route17Text4: ; 0x55c77 jp $24d7 INCBIN "baserom.gbc",$55c81,$55c90 - $55c81 + Route17Text5: ; 0x55c90 db $08 ; asm ld hl, $5be3 @@ -22737,6 +23501,7 @@ Route17Text5: ; 0x55c90 jp $24d7 INCBIN "baserom.gbc",$55c9a,$55ca9 - $55c9a + Route17Text6: ; 0x55ca9 db $08 ; asm ld hl, $5bef @@ -22744,6 +23509,7 @@ Route17Text6: ; 0x55ca9 jp $24d7 INCBIN "baserom.gbc",$55cb3,$55cc2 - $55cb3 + Route17Text7: ; 0x55cc2 db $08 ; asm ld hl, $5bfb @@ -22751,6 +23517,7 @@ Route17Text7: ; 0x55cc2 jp $24d7 INCBIN "baserom.gbc",$55ccc,$55cdb - $55ccc + Route17Text8: ; 0x55cdb db $08 ; asm ld hl, $5c07 @@ -22758,6 +23525,7 @@ Route17Text8: ; 0x55cdb jp $24d7 INCBIN "baserom.gbc",$55ce5,$55cf4 - $55ce5 + Route17Text9: ; 0x55cf4 db $08 ; asm ld hl, $5c13 @@ -22765,6 +23533,7 @@ Route17Text9: ; 0x55cf4 jp $24d7 INCBIN "baserom.gbc",$55cfe,$55d0d - $55cfe + Route17Text10: ; 0x55d0d db $08 ; asm ld hl, $5c1f @@ -22797,7 +23566,13 @@ Route17Text16: ; 0x55d3f TX_FAR _Route17Text16 db $50 -INCBIN "baserom.gbc",$55d44,$55dec - $55d44 +INCBIN "baserom.gbc",$55d44,$55d5d - $55d44 + +Route19Texts: ; 0x55d5d + dw Route19Text1, Route19Text2, Route19Text3, Route19Text4, Route19Text5, Route19Text6, Route19Text7, Route19Text8, Route19Text9, Route19Text10, Route19Text11 + +INCBIN "baserom.gbc",$55d73,$79 + Route19Text1: ; 0x55dec db $08 ; asm ld hl, $5d73 @@ -22864,7 +23639,13 @@ Route19Text11: ; 0x55ee6 TX_FAR _Route19Text11 db $50 -INCBIN "baserom.gbc",$55eeb,$55f83 - $55eeb +INCBIN "baserom.gbc",$55eeb,$55f04 - $55eeb + +Route21Texts: ; 0x55f04 + dw Route21Text1, Route21Text2, Route21Text3, Route21Text4, Route21Text5, Route21Text6, Route21Text7, Route21Text8, Route21Text9 + +INCBIN "baserom.gbc",$55f16,$6d + Route21Text1: ; 0x55f83 db $08 ; asm ld hl, $5f16 @@ -22929,7 +23710,11 @@ VermilionHouse2_h: ; 0x56064 to 0x56070 (12 bytes) (id=163) dw $60cf ; objects -INCBIN "baserom.gbc",$56070,$56075 - $56070 +INCBIN "baserom.gbc",$56070,$56073 - $56070 + +VermilionHouse2Texts: ; 0x56073 + dw VermilionHouse2Text1 + VermilionHouse2Text1: ; 0x56075 db $08 ; asm ld a, [$d728] @@ -22961,6 +23746,7 @@ asm_5dd95 ; 0x560ab jp $24d7 INCBIN "baserom.gbc",$560b1,$1e + VermilionHouse2Object: ; 0x560cf (size=26) db $a ; border tile @@ -22985,7 +23771,10 @@ CeladonMart2_h: ; 0x560e9 to 0x560f5 (12 bytes) (id=123) dw $6111 ; objects -INCBIN "baserom.gbc",$560f5,$56102 - $560f5 +INCBIN "baserom.gbc",$560f5,$560f8 - $560f5 + +CeladonMart2Texts: ; 0x560f8 + dw CeladonMart2Text1, CeladonMart2Text2, CeladonMart2Text3, CeladonMart2Text4, CeladonMart2Text5 CeladonMart2Text3: ; 0x56102 TX_FAR _CeladonMart2Text3 @@ -23032,7 +23821,11 @@ FuchsiaHouse3_h: ; 0x56170 to 0x5617c (12 bytes) (id=164) dw $6221 ; objects -INCBIN "baserom.gbc",$5617c,$56181 - $5617c +INCBIN "baserom.gbc",$5617c,$5617f - $5617c + +FuchsiaHouse3Texts: ; 0x5617f + dw FuchsiaHouse3Text1 + FuchsiaHouse3Text1: ; 0x56181 db $08 ; asm ld a, [$d728] @@ -23064,6 +23857,7 @@ asm_1b09c ; 0x561b7 jp $24d7 INCBIN "baserom.gbc",$561bd,$64 + FuchsiaHouse3Object: ; 0x56221 (size=34) db $c ; border tile @@ -23090,7 +23884,11 @@ DayCareM_h: ; 0x56243 to 0x5624f (12 bytes) (id=72) dw $6459 ; objects -INCBIN "baserom.gbc",$5624f,$56254 - $5624f +INCBIN "baserom.gbc",$5624f,$56252 - $5624f + +DayCareMTexts: ; 0x56252 + dw DayCareMText1 + DayCareMText1: ; 0x56254 db $8 call $36f4 @@ -23148,6 +23946,7 @@ DayCareMText1: ; 0x56254 jp $6409 ; 0x562e1 INCBIN "baserom.gbc",$562e1,$178 + DayCareMObject: ; 0x56459 (size=26) db $a ; border tile @@ -23172,7 +23971,11 @@ Route12House_h: ; 0x56473 to 0x5647f (12 bytes) (id=189) dw $64de ; objects -INCBIN "baserom.gbc",$5647f,$56484 - $5647f +INCBIN "baserom.gbc",$5647f,$56482 - $5647f + +Route12HouseTexts: ; 0x56482 + dw Route12HouseText1 + Route12HouseText1: ; 0x56484 db $08 ; asm ld a, [$d728] @@ -23204,6 +24007,7 @@ asm_df984 ; 0x564ba jp $24d7 INCBIN "baserom.gbc",$564c0,$1e + Route12HouseObject: ; 0x564de (size=26) db $a ; border tile @@ -23228,7 +24032,13 @@ SilphCo8_h: ; 0x564f8 to 0x56504 (12 bytes) (id=213) dw $6613 ; objects -INCBIN "baserom.gbc",$56504,$565aa - $56504 +INCBIN "baserom.gbc",$56504,$5657d - $56504 + +SilphCo8Texts: ; 0x5657d + dw SilphCo8Text1, SilphCo8Text2, SilphCo8Text3, SilphCo8Text4 + +INCBIN "baserom.gbc",$56585,$25 + SilphCo8Text1: ; 0x565aa db $08 ; asm ld a, [$d838] @@ -23241,6 +24051,7 @@ asm_a468f ; 0x565b8 jp $24d7 INCBIN "baserom.gbc",$565be,$565c8 - $565be + SilphCo8Text2: ; 0x565c8 db $08 ; asm ld hl, $6585 @@ -23260,6 +24071,7 @@ SilphCo8Text4: ; 0x565dc jp $24d7 INCBIN "baserom.gbc",$565e6,$2d + SilphCo8Object: ; 0x56613 (size=90) db $2e ; border tile @@ -23295,6 +24107,7 @@ SilphCo8Blocks: ; 117 INCBIN "baserom.gbc",$566e2,$191e SECTION "bank16",DATA,BANK[$16] + Route6_h: ; 0x58000 to 0x58022 (34 bytes) (id=17) db $00 ; tileset db $12, $0a ; dimensions (y, x) @@ -23760,13 +24573,16 @@ Route18Blocks: ; 225 INCBIN "maps/route18.blk" INCBIN "baserom.gbc",$58d7d,$59120 - $58d7d + Route6Text1: ; 0x59120 db $8 ld hl, $50d7 call $31cc jp $24d7 ; 0x5912a + INCBIN "baserom.gbc",$5912a,$f + Route6Text2: ; 0x59139 db $08 ; asm ld hl, $50e3 @@ -23774,6 +24590,7 @@ Route6Text2: ; 0x59139 jp $24d7 INCBIN "baserom.gbc",$59143,$5914d - $59143 + Route6Text3: ; 0x5914d db $08 ; asm ld hl, $50ef @@ -23781,6 +24598,7 @@ Route6Text3: ; 0x5914d jp $24d7 INCBIN "baserom.gbc",$59157,$59166 - $59157 + Route6Text4: ; 0x59166 db $08 ; asm ld hl, $50fb @@ -23788,6 +24606,7 @@ Route6Text4: ; 0x59166 jp $24d7 INCBIN "baserom.gbc",$59170,$5917f - $59170 + Route6Text5: ; 0x5917f db $08 ; asm ld hl, $5107 @@ -23795,6 +24614,7 @@ Route6Text5: ; 0x5917f jp $24d7 INCBIN "baserom.gbc",$59189,$59198 - $59189 + Route6Text6: ; 0x59198 db $08 ; asm ld hl, $5113 @@ -23808,6 +24628,7 @@ Route6Text7: ; 0x591b1 db $50 INCBIN "baserom.gbc",$591b6,$59269 - $591b6 + Route8Text2: ; 0x59269 db $08 ; asm ld hl, $51ef @@ -23815,6 +24636,7 @@ Route8Text2: ; 0x59269 jp $24d7 INCBIN "baserom.gbc",$59273,$59282 - $59273 + Route8Text3: ; 0x59282 db $08 ; asm ld hl, $51fb @@ -23822,6 +24644,7 @@ Route8Text3: ; 0x59282 jp $24d7 INCBIN "baserom.gbc",$5928c,$5929b - $5928c + Route8Text4: ; 0x5929b db $08 ; asm ld hl, $5207 @@ -23829,6 +24652,7 @@ Route8Text4: ; 0x5929b jp $24d7 INCBIN "baserom.gbc",$592a5,$592b4 - $592a5 + Route8Text5: ; 0x592b4 db $08 ; asm ld hl, $5213 @@ -23836,6 +24660,7 @@ Route8Text5: ; 0x592b4 jp $24d7 INCBIN "baserom.gbc",$592be,$592cd - $592be + Route8Text6: ; 0x592cd db $08 ; asm ld hl, $521f @@ -23843,6 +24668,7 @@ Route8Text6: ; 0x592cd jp $24d7 INCBIN "baserom.gbc",$592d7,$592e6 - $592d7 + Route8Text7: ; 0x592e6 db $08 ; asm ld hl, $522b @@ -23850,6 +24676,7 @@ Route8Text7: ; 0x592e6 jp $24d7 INCBIN "baserom.gbc",$592f0,$592ff - $592f0 + Route8Text8: ; 0x592ff db $08 ; asm ld hl, $5237 @@ -23857,6 +24684,7 @@ Route8Text8: ; 0x592ff jp $24d7 INCBIN "baserom.gbc",$59309,$59318 - $59309 + Route8Text9: ; 0x59318 db $08 ; asm ld hl, $5243 @@ -23869,7 +24697,13 @@ Route8Text10: ; 0x59331 TX_FAR _Route8Text10 db $50 -INCBIN "baserom.gbc",$59336,$593ac - $59336 +INCBIN "baserom.gbc",$59336,$5934f - $59336 + +Route10Texts: ; 0x5934f + dw Route10Text1, Route10Text2, Route10Text3, Route10Text4, Route10Text5, Route10Text6, Route10Text7, Route10Text8, Route10Text9, Route10Text10 + +INCBIN "baserom.gbc",$59363,$49 + Route10Text1: ; 0x593ac db $08 ; asm ld hl, $5363 @@ -23877,6 +24711,7 @@ Route10Text1: ; 0x593ac jp $24d7 INCBIN "baserom.gbc",$593b6,$593c5 - $593b6 + Route10Text2: ; 0x593c5 db $08 ; asm ld hl, $536f @@ -23884,6 +24719,7 @@ Route10Text2: ; 0x593c5 jp $24d7 INCBIN "baserom.gbc",$593cf,$593de - $593cf + Route10Text3: ; 0x593de db $08 ; asm ld hl, $537b @@ -23891,6 +24727,7 @@ Route10Text3: ; 0x593de jp $24d7 INCBIN "baserom.gbc",$593e8,$593f7 - $593e8 + Route10Text4: ; 0x593f7 db $08 ; asm ld hl, $5387 @@ -23898,6 +24735,7 @@ Route10Text4: ; 0x593f7 jp $24d7 INCBIN "baserom.gbc",$59401,$59410 - $59401 + Route10Text5: ; 0x59410 db $08 ; asm ld hl, $5393 @@ -23905,6 +24743,7 @@ Route10Text5: ; 0x59410 jp $24d7 INCBIN "baserom.gbc",$5941a,$59429 - $5941a + Route10Text6: ; 0x59429 db $08 ; asm ld hl, $539f @@ -23923,6 +24762,7 @@ Route10Text10: ; 0x59447 db $50 INCBIN "baserom.gbc",$5944c,$5950d - $5944c + Route11Text2: ; 0x5950d db $08 ; asm ld hl, $5487 @@ -23930,6 +24770,7 @@ Route11Text2: ; 0x5950d jp $24d7 INCBIN "baserom.gbc",$59517,$59526 - $59517 + Route11Text3: ; 0x59526 db $08 ; asm ld hl, $5493 @@ -23937,6 +24778,7 @@ Route11Text3: ; 0x59526 jp $24d7 INCBIN "baserom.gbc",$59530,$5953f - $59530 + Route11Text4: ; 0x5953f db $08 ; asm ld hl, $549f @@ -23944,6 +24786,7 @@ Route11Text4: ; 0x5953f jp $24d7 INCBIN "baserom.gbc",$59549,$59558 - $59549 + Route11Text5: ; 0x59558 db $08 ; asm ld hl, $54ab @@ -23951,6 +24794,7 @@ Route11Text5: ; 0x59558 jp $24d7 INCBIN "baserom.gbc",$59562,$59571 - $59562 + Route11Text6: ; 0x59571 db $08 ; asm ld hl, $54b7 @@ -23958,6 +24802,7 @@ Route11Text6: ; 0x59571 jp $24d7 INCBIN "baserom.gbc",$5957b,$5958a - $5957b + Route11Text7: ; 0x5958a db $08 ; asm ld hl, $54c3 @@ -23965,6 +24810,7 @@ Route11Text7: ; 0x5958a jp $24d7 INCBIN "baserom.gbc",$59594,$595a3 - $59594 + Route11Text8: ; 0x595a3 db $08 ; asm ld hl, $54cf @@ -23972,6 +24818,7 @@ Route11Text8: ; 0x595a3 jp $24d7 INCBIN "baserom.gbc",$595ad,$595bc - $595ad + Route11Text9: ; 0x595bc db $08 ; asm ld hl, $54db @@ -23979,6 +24826,7 @@ Route11Text9: ; 0x595bc jp $24d7 INCBIN "baserom.gbc",$595c6,$595d5 - $595c6 + Route11Text10: ; 0x595d5 db $08 ; asm ld hl, $54e7 @@ -23991,13 +24839,19 @@ Route11Text11: ; 0x595ee TX_FAR _Route11Text11 db $50 -INCBIN "baserom.gbc",$595f3,$596e6 - $595f3 +INCBIN "baserom.gbc",$595f3,$59675 - $595f3 + +Route12Texts: ; 0x59675 + dw Route12Text1, Route12Text2, Route12Text3, Route12Text4, Route12Text5, Route12Text6, Route12Text7, Route12Text8, Route12Text9, Route12Text10, Route12Text11, Route12Text12 + +INCBIN "baserom.gbc",$5968d,$59 Route12Text1: ; 0x596e6 TX_FAR _Route12Text1 db $50 INCBIN "baserom.gbc",$596eb,$596f5 - $596eb + Route12Text2: ; 0x596f5 db $08 ; asm ld hl, $5691 @@ -24005,6 +24859,7 @@ Route12Text2: ; 0x596f5 jp $24d7 INCBIN "baserom.gbc",$596ff,$5970e - $596ff + Route12Text3: ; 0x5970e db $08 ; asm ld hl, $569d @@ -24012,6 +24867,7 @@ Route12Text3: ; 0x5970e jp $24d7 INCBIN "baserom.gbc",$59718,$59727 - $59718 + Route12Text4: ; 0x59727 db $08 ; asm ld hl, $56a9 @@ -24019,6 +24875,7 @@ Route12Text4: ; 0x59727 jp $24d7 INCBIN "baserom.gbc",$59731,$59740 - $59731 + Route12Text5: ; 0x59740 db $08 ; asm ld hl, $56b5 @@ -24026,6 +24883,7 @@ Route12Text5: ; 0x59740 jp $24d7 INCBIN "baserom.gbc",$5974a,$59759 - $5974a + Route12Text6: ; 0x59759 db $08 ; asm ld hl, $56c1 @@ -24033,6 +24891,7 @@ Route12Text6: ; 0x59759 jp $24d7 INCBIN "baserom.gbc",$59763,$59772 - $59763 + Route12Text7: ; 0x59772 db $08 ; asm ld hl, $56cd @@ -24040,6 +24899,7 @@ Route12Text7: ; 0x59772 jp $24d7 INCBIN "baserom.gbc",$5977c,$5978b - $5977c + Route12Text8: ; 0x5978b db $08 ; asm ld hl, $56d9 @@ -24056,7 +24916,12 @@ Route12Text12: ; 0x597a9 TX_FAR _Route12Text12 db $50 -INCBIN "baserom.gbc",$597ae,$59858 - $597ae +INCBIN "baserom.gbc",$597ae,$597c7 - $597ae + +Route15Texts: ; 0x597c7 + dw Route15Text1, Route15Text2, Route15Text3, Route15Text4, Route15Text5, Route15Text6, Route15Text7, Route15Text8, Route15Text9, Route15Text10, Route15Text11, Route15Text12 + +INCBIN "baserom.gbc",$597df,$79 Route15Text1: ; 0x59858 db $8 ; asm @@ -24117,7 +24982,13 @@ Route15Text12: ; 0x5992e TX_FAR _Route15Text12 db $50 -INCBIN "baserom.gbc",$59933,$59a18 - $59933 +INCBIN "baserom.gbc",$59933,$599b9 - $59933 + +Route16Texts: ; 0x599b9 + dw Route16Text1, Route16Text2, Route16Text3, Route16Text4, Route16Text5, Route16Text6, Route16Text7, Route16Text8, Route16Text9 + +INCBIN "baserom.gbc",$599cb,$4d + Route16Text1: ; 0x59a18 db $08 ; asm ld hl, $59cf @@ -24125,6 +24996,7 @@ Route16Text1: ; 0x59a18 jp $24d7 INCBIN "baserom.gbc",$59a22,$59a31 - $59a22 + Route16Text2: ; 0x59a31 db $08 ; asm ld hl, $59db @@ -24132,6 +25004,7 @@ Route16Text2: ; 0x59a31 jp $24d7 INCBIN "baserom.gbc",$59a3b,$59a4a - $59a3b + Route16Text3: ; 0x59a4a db $08 ; asm ld hl, $59e7 @@ -24139,6 +25012,7 @@ Route16Text3: ; 0x59a4a jp $24d7 INCBIN "baserom.gbc",$59a54,$59a63 - $59a54 + Route16Text4: ; 0x59a63 db $08 ; asm ld hl, $59f3 @@ -24146,6 +25020,7 @@ Route16Text4: ; 0x59a63 jp $24d7 INCBIN "baserom.gbc",$59a6d,$59a7c - $59a6d + Route16Text5: ; 0x59a7c db $08 ; asm ld hl, $59ff @@ -24153,6 +25028,7 @@ Route16Text5: ; 0x59a7c jp $24d7 INCBIN "baserom.gbc",$59a86,$59a95 - $59a86 + Route16Text6: ; 0x59a95 db $08 ; asm ld hl, $5a0b @@ -24175,7 +25051,13 @@ Route16Text9: ; 0x59ac2 TX_FAR _Route16Text9 db $50 -INCBIN "baserom.gbc",$59ac7,$59b0f - $59ac7 +INCBIN "baserom.gbc",$59ac7,$59ae0 - $59ac7 + +Route18Texts: ; 0x59ae0 + dw Route18Text1, Route18Text2, Route18Text3, Route18Text4, Route18Text5 + +INCBIN "baserom.gbc",$59aea,$25 + Route18Text1: ; 0x59b0f db $08 ; asm ld hl, $5aea @@ -24183,6 +25065,7 @@ Route18Text1: ; 0x59b0f jp $24d7 INCBIN "baserom.gbc",$59b19,$59b28 - $59b19 + Route18Text2: ; 0x59b28 db $08 ; asm ld hl, $5af6 @@ -24190,6 +25073,7 @@ Route18Text2: ; 0x59b28 jp $24d7 INCBIN "baserom.gbc",$59b32,$59b41 - $59b32 + Route18Text3: ; 0x59b41 db $08 ; asm ld hl, $5b02 @@ -24214,7 +25098,11 @@ FanClub_h: ; 0x59b64 to 0x59b70 (12 bytes) (id=90) dw $5c97 ; objects -INCBIN "baserom.gbc",$59b70,$59b94 - $59b70 +INCBIN "baserom.gbc",$59b70,$59b84 - $59b70 + +FanClubTexts: ; 0x59b84 + dw FanClubText1, FanClubText2, FanClubText3, FanClubText4, FanClubText5, FanClubText6, FanClubText7, FanClubText8 + FanClubText1: ; 0x59b94 db $08 ; asm ld a, [$d771] @@ -24234,6 +25122,7 @@ asm_64f01 ; 0x59bb4 jp $24d7 INCBIN "baserom.gbc",$59bb7,$59bc1 - $59bb7 + FanClubText2: ; 0x59bc1 db $08 ; asm ld a, [$d771] @@ -24359,7 +25248,13 @@ SilphCo2_h: ; 0x59ce5 to 0x59cf1 (12 bytes) (id=207) dw $5e66 ; objects -INCBIN "baserom.gbc",$59cf1,$59dc1 - $59cf1 +INCBIN "baserom.gbc",$59cf1,$59d86 - $59cf1 + +SilphCo2Texts: ; 0x59d86 + dw SilphCo2Text1, SilphCo2Text2, SilphCo2Text3, SilphCo2Text4, SilphCo2Text5 + +INCBIN "baserom.gbc",$59d90,$31 + SilphCo2Text1: ; 0x59dc1 db $08 ; asm ld a, [$d826] @@ -24382,6 +25277,7 @@ asm_2c1e0 ; 0x59de7 jp $24d7 INCBIN "baserom.gbc",$59ded,$59e02 - $59ded + SilphCo2Text2: ; 0x59e02 db $08 ; asm ld hl, $5d90 @@ -24407,6 +25303,7 @@ SilphCo2Text5: ; 0x59e20 jp $24d7 INCBIN "baserom.gbc",$59e2a,$3c + SilphCo2Object: ; 0x59e66 (size=98) db $2e ; border tile @@ -24448,7 +25345,13 @@ SilphCo3_h: ; 0x59f4f to 0x59f5b (12 bytes) (id=208) dw $6035 ; objects -INCBIN "baserom.gbc",$59f5b,$59fe5 - $59f5b +INCBIN "baserom.gbc",$59f5b,$59fc4 - $59f5b + +SilphCo3Texts: ; 0x59fc4 + dw SilphCo3Text1, SilphCo3Text2, SilphCo3Text3, SilphCo3Text4 + +INCBIN "baserom.gbc",$59fcc,$19 + SilphCo3Text1: ; 0x59fe5 db $08 ; asm ld a, [$d838] @@ -24461,6 +25364,7 @@ asm_8c56f ; 0x59ff3 jp $24d7 INCBIN "baserom.gbc",$59ff9,$5a003 - $59ff9 + SilphCo3Text2: ; 0x5a003 db $08 ; asm ld hl, $5fcc @@ -24468,6 +25372,7 @@ SilphCo3Text2: ; 0x5a003 jp $24d7 INCBIN "baserom.gbc",$5a00d,$5a01c - $5a00d + SilphCo3Text3: ; 0x5a01c db $08 ; asm ld hl, $5fd8 @@ -24475,6 +25380,7 @@ SilphCo3Text3: ; 0x5a01c jp $24d7 INCBIN "baserom.gbc",$5a026,$f + SilphCo3Object: ; 0x5a035 (size=113) db $2e ; border tile @@ -24521,7 +25427,13 @@ SilphCo10_h: ; 0x5a12d to 0x5a139 (12 bytes) (id=234) dw $61fb ; objects -INCBIN "baserom.gbc",$5a139,$5a1ab - $5a139 +INCBIN "baserom.gbc",$5a139,$5a186 - $5a139 + +SilphCo10Texts: ; 0x5a186 + dw SilphCo10Text1, SilphCo10Text2, SilphCo10Text3, SilphCo10Text4, SilphCo10Text5, SilphCo10Text6 + +INCBIN "baserom.gbc",$5a192,$19 + SilphCo10Text1: ; 0x5a1ab db $08 ; asm ld hl, $6192 @@ -24546,6 +25458,7 @@ asm_cf85f ; 0x5a1cd jp $24d7 INCBIN "baserom.gbc",$5a1d3,$28 + SilphCo10Object: ; 0x5a1fb (size=95) db $2e ; border tile @@ -24586,7 +25499,13 @@ Lance_h: ; 0x5a2a2 to 0x5a2ae (12 bytes) (id=113) dw $63c5 ; objects -INCBIN "baserom.gbc",$5a2ae,$5a3a4 - $5a2ae +INCBIN "baserom.gbc",$5a2ae,$5a395 - $5a2ae + +LanceTexts: ; 0x5a395 + dw LanceText1 + +INCBIN "baserom.gbc",$5a397,$d + LanceText1: ; 0x5a3a4 db $08 ; asm ld hl, $6397 @@ -24594,6 +25513,7 @@ LanceText1: ; 0x5a3a4 jp $24d7 INCBIN "baserom.gbc",$5a3ae,$17 + LanceObject: ; 0x5a3c5 (size=36) db $3 ; border tile @@ -24624,6 +25544,7 @@ HallofFameRoom_h: ; 0x5a492 to 0x5a49e (12 bytes) (id=118) dw $6571 ; objects INCBIN "baserom.gbc",$5a49e,$5a56a - $5a49e + HallofFameRoomTexts: ; 0x5a56a dw HallofFameRoomText1 @@ -24729,7 +25650,10 @@ MuseumF1_h: ; 0x5c0eb to 0x5c0f7 (12 bytes) (id=52) dw $42c1 ; objects -INCBIN "baserom.gbc",$5c0f7,$5c135 - $5c0f7 +INCBIN "baserom.gbc",$5c0f7,$5c12b - $5c0f7 + +MuseumF1Texts: ; 0x5c12b + dw MuseumF1Text1, MuseumF1Text2, MuseumF1Text3, MuseumF1Text4, MuseumF1Text5 MuseumF1Text1: ; 0x5c135 db $8 @@ -24874,6 +25798,7 @@ MuseumF1Text3: ; 0x5c256 jp $24d7 INCBIN "baserom.gbc",$5c28e,$5c2a3 - $5c28e + MuseumF1Text4: ; 0x5c2a3 db $08 ; asm ld hl, $42ad @@ -24881,6 +25806,7 @@ MuseumF1Text4: ; 0x5c2a3 jp $24d7 INCBIN "baserom.gbc",$5c2ad,$5c2b2 - $5c2ad + MuseumF1Text5: ; 0x5c2b2 db $08 ; asm ld hl, $42bc @@ -24888,6 +25814,7 @@ MuseumF1Text5: ; 0x5c2b2 jp $24d7 INCBIN "baserom.gbc",$5c2bc,$5 + MuseumF1Object: ; 0x5c2c1 (size=74) db $a ; border tile @@ -24923,6 +25850,7 @@ MuseumF2_h: ; 0x5c30b to 0x5c317 (12 bytes) (id=53) dw $434b ; objects INCBIN "baserom.gbc",$5c317,$5c31a - $5c317 + MuseumF2Texts: ; 0x5c31a dw MuseumF2Text1, MuseumF2Text2, MuseumF2Text3, MuseumF2Text4, MuseumF2Text5, MuseumF2Text6, MuseumF2Text7 @@ -24982,7 +25910,13 @@ PewterGym_h: ; 0x5c37b to 0x5c387 (12 bytes) (id=54) dw $452e ; objects -INCBIN "baserom.gbc",$5c387,$5c44e - $5c387 +INCBIN "baserom.gbc",$5c387,$5c435 - $5c387 + +PewterGymTexts: ; 0x5c435 + dw PewterGymText1, PewterGymText2, PewterGymText3 + +INCBIN "baserom.gbc",$5c43b,$13 + PewterGymText1: ; 0x5c44e db $08 ; asm ld a, [$d755] @@ -25021,6 +25955,7 @@ PewterGymText1: ; 0x5c44e jp $24d7 INCBIN "baserom.gbc",$5c49e,$5c4c6 - $5c49e + PewterGymText2: ; 0x5c4c6 db $08 ; asm ld hl, $4441 @@ -25028,6 +25963,7 @@ PewterGymText2: ; 0x5c4c6 jp $24d7 INCBIN "baserom.gbc",$5c4d0,$5c4df - $5c4d0 + PewterGymText3: ; 0x5c4df db $08 ; asm ld a, [$d72a] @@ -25056,6 +25992,7 @@ PewterGymText3: ; 0x5c4df jp $24d7 INCBIN "baserom.gbc",$5c515,$19 + PewterGymObject: ; 0x5c52e (size=42) db $3 ; border tile @@ -25092,14 +26029,66 @@ PewterPokecenterText1: ; 0x5c596 TX_FAR _PewterPokecenterText1 db $50 -INCBIN "baserom.gbc",$5c59b,$5c603 - $5c59b +PewterPokecenterText3: ; 0x5c59b + db $8 + ld a, $1 + ld [$cc3c], a + ld hl, $4603 + call PrintText + ld a, $ff + call $23b1 + ld c, $20 + call $3739 + ld hl, $4608 + ld de, $cd3f + ld bc, $0004 + call CopyData + ld a, [$c132] + ld hl, $cd3f +.asm_5c5c3 + cp [hl] + inc hl + jr nz, .asm_5c5c3 ; 0x5c5c5 $fc + dec hl + push hl + ld c, $1f + ld a, $d0 + call $23a1 + pop hl +.asm_5c5d1 + ld a, [hl] + ld [$c132], a + push hl + ld hl, $cd3f + ld de, $cd3e + ld bc, $0004 + call CopyData + ld a, [$cd3e] + ld [$cd42], a + pop hl + ld c, $18 + call $3739 + ld a, [$c026] + ld b, a + ld a, [$c027] + or b + jr nz, .asm_5c5d1 ; 0x5c5f6 $d9 + ld c, $30 + call $3739 + call $2307 + jp $24d7 +; 0x5c603 PewterPokecenterText4: ; broken TX_FAR to _PewterPokecenterText4 db $17, $44, $47, $26 db $50 ;XXX wtf? -db $30, $38, $34, $3c, $f6 +db $30, $38, $34, $3c + +PewterPokecenterText5: ; XXX confirm text_id number + db $f6 + PewterPokecenterObject: ; 0x5c60d (size=44) db $0 ; border tile @@ -25127,7 +26116,10 @@ CeruleanPokecenter_h: ; 0x5c639 to 0x5c645 (12 bytes) (id=64) dw $465f ; objects -INCBIN "baserom.gbc",$5c645,$5c655 - $5c645 +INCBIN "baserom.gbc",$5c645,$5c653 - $5c645 + +CeruleanPokecenterText4: + db $f6, $ff CeruleanPokecenterText2: CeruleanPokecenterText1: ; 0x5c655 @@ -25168,7 +26160,13 @@ CeruleanGym_h: ; 0x5c6a7 to 0x5c6b3 (12 bytes) (id=65) dw $4834 ; objects -INCBIN "baserom.gbc",$5c6b3,$5c771 - $5c6b3 +INCBIN "baserom.gbc",$5c6b3,$5c74a - $5c6b3 + +CeruleanGymTexts: ; 0x5c74a + dw CeruleanGymText1, CeruleanGymText2, CeruleanGymText3, CeruleanGymText4 + +INCBIN "baserom.gbc",$5c752,$1f + CeruleanGymText1: ; 0x5c771 db $08 ; asm ld a, [$d75e] @@ -25206,6 +26204,7 @@ CeruleanGymText1: ; 0x5c771 jp $24d7 INCBIN "baserom.gbc",$5c7be,$5c7df - $5c7be + CeruleanGymText2: ; 0x5c7df db $08 ; asm ld hl, $4758 @@ -25213,6 +26212,7 @@ CeruleanGymText2: ; 0x5c7df jp $24d7 INCBIN "baserom.gbc",$5c7e9,$5c7f8 - $5c7e9 + CeruleanGymText3: ; 0x5c7f8 db $08 ; asm ld hl, $4764 @@ -25220,6 +26220,7 @@ CeruleanGymText3: ; 0x5c7f8 jp $24d7 INCBIN "baserom.gbc",$5c802,$5c811 - $5c802 + CeruleanGymText4: ; 0x5c811 db $08 ; asm ld a, [$d75e] @@ -25235,6 +26236,7 @@ CeruleanGymText4: ; 0x5c811 jp $24d7 INCBIN "baserom.gbc",$5c82a,$a + CeruleanGymObject: ; 0x5c834 (size=50) db $3 ; border tile @@ -25265,7 +26267,10 @@ CeruleanMart_h: ; 0x5c889 to 0x5c895 (12 bytes) (id=67) dw $48a8 ; objects -INCBIN "baserom.gbc",$5c895,$5c89e - $5c895 +INCBIN "baserom.gbc",$5c895,$5c898 - $5c895 + +CeruleanMartTexts: ; 0x5c898 + dw CeruleanMartText1, CeruleanMartText2, CeruleanMartText3 CeruleanMartText2: ; 0x5c89e TX_FAR _CeruleanMartText2 @@ -25301,7 +26306,10 @@ LavenderPokecenter_h: ; 0x5c8ce to 0x5c8da (12 bytes) (id=141) dw $48f4 ; objects -INCBIN "baserom.gbc",$5c8da,$5c8ea - $5c8da +INCBIN "baserom.gbc",$5c8da,$5c8e8 - $5c8da + +LavenderPokecenterText4: + db $f6, $ff LavenderPokecenterText2: LavenderPokecenterText1: ; 0x5c8ea @@ -25341,7 +26349,10 @@ LavenderMart_h: ; 0x5c920 to 0x5c92c (12 bytes) (id=150) dw $495d ; objects -INCBIN "baserom.gbc",$5c92c,$5c935 - $5c92c +INCBIN "baserom.gbc",$5c92c,$5c92f - $5c92c + +LavenderMartTexts: ; 0x5c92f + dw LavenderMartText1, LavenderMartText2, LavenderMartText3 LavenderMartText2: ; 0x5c935 TX_FAR _LavenderMartText2 @@ -25362,6 +26373,7 @@ LavenderMartText3: ; 0x5c93a jp $24d7 INCBIN "baserom.gbc",$5c953,$a + LavenderMartObject: ; 0x5c95d (size=38) db $0 ; border tile @@ -25399,7 +26411,8 @@ VermilionPokecenterText3: ; 0x5c9a3 TX_FAR _VermilionPokecenterText3 db $50 -INCBIN "baserom.gbc",$5c9a8,$1 +VermilionPokecenterText4: ; 0x5c9a8 + db $f6 VermilionPokecenterObject: ; 0x5c9a9 (size=44) db $0 ; border tile @@ -25428,7 +26441,10 @@ VermilionMart_h: ; 0x5c9d5 to 0x5c9e1 (12 bytes) (id=91) dw $49f4 ; objects -INCBIN "baserom.gbc",$5c9e1,$5c9ea - $5c9e1 +INCBIN "baserom.gbc",$5c9e1,$5c9e4 - $5c9e1 + +VermilionMartTexts: ; 0x5c9e4 + dw VermilionMartText1, VermilionMartText2, VermilionMartText3 VermilionMartText2: ; 0x5c9ea TX_FAR _VermilionMartText2 @@ -25467,7 +26483,13 @@ VermilionGym_h: ; 0x5ca1a to 0x5ca26 (12 bytes) (id=92) dw $4bfe ; objects -INCBIN "baserom.gbc",$5ca26,$5cb1d - $5ca26 +INCBIN "baserom.gbc",$5ca26,$5cae8 - $5ca26 + +VermilionGymTexts: ; 0x5cae8 + dw VermilionGymText1, VermilionGymText2, VermilionGymText3, VermilionGymText4, VermilionGymText5 + +INCBIN "baserom.gbc",$5caf2,$2b + VermilionGymText1: ; 0x5cb1d db $08 ; asm ld a, [$d773] @@ -25506,6 +26528,7 @@ VermilionGymText1: ; 0x5cb1d jp $24d7 INCBIN "baserom.gbc",$5cb6d,$5cb90 - $5cb6d + VermilionGymText2: ; 0x5cb90 db $08 ; asm ld hl, $4af8 @@ -25513,6 +26536,7 @@ VermilionGymText2: ; 0x5cb90 jp $24d7 INCBIN "baserom.gbc",$5cb9a,$5cba9 - $5cb9a + VermilionGymText3: ; 0x5cba9 db $08 ; asm ld hl, $4b04 @@ -25520,6 +26544,7 @@ VermilionGymText3: ; 0x5cba9 jp $24d7 INCBIN "baserom.gbc",$5cbb3,$5cbc2 - $5cbb3 + VermilionGymText4: ; 0x5cbc2 db $08 ; asm ld hl, $4b10 @@ -25527,6 +26552,7 @@ VermilionGymText4: ; 0x5cbc2 jp $24d7 INCBIN "baserom.gbc",$5cbcc,$5cbdb - $5cbcc + VermilionGymText5: ; 0x5cbdb db $08 ; asm ld a, [$d72a] @@ -25542,6 +26568,7 @@ VermilionGymText5: ; 0x5cbdb jp $24d7 INCBIN "baserom.gbc",$5cbf4,$a + VermilionGymObject: ; 0x5cbfe (size=58) db $3 ; border tile @@ -25573,7 +26600,11 @@ CopycatsHouseF2_h: ; 0x5cc65 to 0x5cc71 (12 bytes) (id=176) dw $4d21 ; objects -INCBIN "baserom.gbc",$5cc71,$5cc82 - $5cc71 +INCBIN "baserom.gbc",$5cc71,$5cc74 - $5cc71 + +CopycatsHouseF2Texts: ; 0x5cc74 + dw CopycatsHouseF2Text1, CopycatsHouseF2Text2, CopycatsHouseF2Text3, CopycatsHouseF2Text4, CopycatsHouseF2Text5, CopycatsHouseF2Text6, CopycatsHouseF2Text7 + CopycatsHouseF2Text1: ; 0x5cc82 db $08 ; asm ld a, [$d7af] @@ -25639,6 +26670,7 @@ CopycatsHouseF2Text7: ; 0x5cd03 jp $24d7 INCBIN "baserom.gbc",$5cd17,$a + CopycatsHouseF2Object: ; 0x5cd21 (size=48) db $a ; border tile @@ -25667,7 +26699,13 @@ FightingDojo_h: ; 0x5cd51 to 0x5cd5d (12 bytes) (id=177) dw $4f9b ; objects -INCBIN "baserom.gbc",$5cd5d,$5ce44 - $5cd5d +INCBIN "baserom.gbc",$5cd5d,$5ce03 - $5cd5d + +FightingDojoTexts: ; 0x5ce03 + dw FightingDojoText1, FightingDojoText2, FightingDojoText3, FightingDojoText4, FightingDojoText5, FightingDojoText6, FightingDojoText7 + +INCBIN "baserom.gbc",$5ce11,$33 + FightingDojoText1: ; 0x5ce44 db $08 ; asm ld a, [$d7b1] @@ -25700,6 +26738,7 @@ FightingDojoText1: ; 0x5ce44 jp $24d7 INCBIN "baserom.gbc",$5ce8e,$5cea2 - $5ce8e + FightingDojoText2: ; 0x5cea2 db $08 ; asm ld hl, $4e13 @@ -25707,6 +26746,7 @@ FightingDojoText2: ; 0x5cea2 jp $24d7 INCBIN "baserom.gbc",$5ceac,$5cebb - $5ceac + FightingDojoText3: ; 0x5cebb db $08 ; asm ld hl, $4e1f @@ -25714,6 +26754,7 @@ FightingDojoText3: ; 0x5cebb jp $24d7 INCBIN "baserom.gbc",$5cec5,$5ced4 - $5cec5 + FightingDojoText4: ; 0x5ced4 db $08 ; asm ld hl, $4e2b @@ -25721,6 +26762,7 @@ FightingDojoText4: ; 0x5ced4 jp $24d7 INCBIN "baserom.gbc",$5cede,$5ceed - $5cede + FightingDojoText5: ; 0x5ceed db $08 ; asm ld hl, $4e37 @@ -25728,6 +26770,7 @@ FightingDojoText5: ; 0x5ceed jp $24d7 INCBIN "baserom.gbc",$5cef7,$5cf06 - $5cef7 + FightingDojoText6: ; 0x5cf06 db $08 ; asm ld a, [$d7b1] @@ -25761,6 +26804,7 @@ FightingDojoText6: ; 0x5cf06 jp $24d7 INCBIN "baserom.gbc",$5cf49,$5cf4e - $5cf49 + FightingDojoText7: ; 0x5cf4e db $08 ; asm ld a, [$d7b1] @@ -25794,6 +26838,7 @@ FightingDojoText7: ; 0x5cf4e jp $24d7 INCBIN "baserom.gbc",$5cf91,$a + FightingDojoObject: ; 0x5cf9b (size=72) db $3 ; border tile @@ -25827,7 +26872,13 @@ SaffronGym_h: ; 0x5d001 to 0x5d00d (12 bytes) (id=178) dw $5259 ; objects -INCBIN "baserom.gbc",$5d00d,$5d118 - $5d00d +INCBIN "baserom.gbc",$5d00d,$5d0ab - $5d00d + +SaffronGymTexts: ; 0x5d0ab + dw SaffronGymText1, SaffronGymText2, SaffronGymText3, SaffronGymText4, SaffronGymText5, SaffronGymText6, SaffronGymText7, SaffronGymText8, SaffronGymText9 + +INCBIN "baserom.gbc",$5d0bd,$5b + SaffronGymText1: ; 0x5d118 db $08 ; asm ld a, [$d7b3] @@ -25863,6 +26914,7 @@ SaffronGymText1: ; 0x5d118 jp $24d7 INCBIN "baserom.gbc",$5d162,$5d187 - $5d162 + SaffronGymText2: ; 0x5d187 db $08 ; asm ld hl, $50c3 @@ -25920,6 +26972,7 @@ SaffronGymText9: ; 0x5d1cd jp $24d7 INCBIN "baserom.gbc",$5d1e6,$73 + SaffronGymObject: ; 0x5d259 (size=330) db $2e ; border tile @@ -26015,7 +27068,10 @@ SaffronMart_h: ; 0x5d3fd to 0x5d409 (12 bytes) (id=180) dw $541c ; objects -INCBIN "baserom.gbc",$5d409,$5d412 - $5d409 +INCBIN "baserom.gbc",$5d409,$5d40c - $5d409 + +SaffronMartTexts: ; 0x5d40c + dw SaffronMartText1, SaffronMartText2, SaffronMartText3 SaffronMartText2: ; 0x5d412 TX_FAR _SaffronMartText2 @@ -26052,6 +27108,7 @@ SilphCo1_h: ; 0x5d442 to 0x5d44e (12 bytes) (id=181) dw $5470 ; objects INCBIN "baserom.gbc",$5d44e,$5d469 - $5d44e + SilphCo1Texts: ; 0x5d469 dw SilphCo1Text1 @@ -26104,7 +27161,8 @@ SaffronPokecenterText3: ; 0x5d549 TX_FAR _SaffronPokecenterText3 db $50 -INCBIN "baserom.gbc",$5d54e,$1 +SaffronPokecenterText4: + db $f6 SaffronPokecenterObject: ; 0x5d54f (size=44) db $0 ; border tile @@ -26134,6 +27192,7 @@ ViridianForestexit_h: ; 0x5d57b to 0x5d587 (12 bytes) (id=47) dw $5598 ; objects INCBIN "baserom.gbc",$5d587,$5d58a - $5d587 + ViridianForestexitTexts: ; 0x5d58a dw ViridianForestexitText1, ViridianForestexitText2 @@ -26174,7 +27233,11 @@ Route2Gate_h: ; 0x5d5c8 to 0x5d5d4 (12 bytes) (id=49) dw $5620 ; objects -INCBIN "baserom.gbc",$5d5d4,$5d5db - $5d5d4 +INCBIN "baserom.gbc",$5d5d4,$5d5d7 - $5d5d4 + +Route2GateTexts: ; 0x5d5d7 + dw Route2GateText1, Route2GateText2 + Route2GateText1: ; 0x5d5db db $08 ; asm ld a, [$d7c2] @@ -26239,6 +27302,7 @@ ViridianForestEntrance_h: ; 0x5d650 to 0x5d65c (12 bytes) (id=50) dw $566d ; objects INCBIN "baserom.gbc",$5d65c,$5d65f - $5d65c + ViridianForestEntranceTexts: ; 0x5d65f dw ViridianForestEntranceText1, ViridianForestEntranceText2 @@ -26279,7 +27343,11 @@ UndergroundTunnelEntranceRoute5_h: ; 0x5d69d to 0x5d6a9 (12 bytes) (id=71) dw $56c1 ; objects -INCBIN "baserom.gbc",$5d6a9,$5d6b2 - $5d6a9 +INCBIN "baserom.gbc",$5d6a9,$5d6b0 - $5d6a9 + +UndergroundTunnelEntranceRoute5Texts: ; 0x5d6b0 + dw UndergroundTunnelEntranceRoute5Text1 + UndergroundTunnelEntranceRoute5Text1: ; 0x5d6b2 db $08 ; asm ld a, $9 @@ -26316,6 +27384,7 @@ UndergroundTunnelEntranceRoute6_h: ; 0x5d6e3 to 0x5d6ef (12 bytes) (id=74) dw $56fe ; objects INCBIN "baserom.gbc",$5d6ef,$5d6f7 - $5d6ef + UndergroundTunnelEntranceRoute6Texts: ; 0x5d6f7 dw UndergroundTunnelEntranceRoute6Text1 @@ -26352,6 +27421,7 @@ UndergroundPathEntranceRoute7_h: ; 0x5d720 to 0x5d72c (12 bytes) (id=77) dw $573b ; objects INCBIN "baserom.gbc",$5d72c,$5d734 - $5d72c + UndergroundPathEntranceRoute7Texts: ; 0x5d734 dw UndergroundPathEntranceRoute7Text1 @@ -26388,7 +27458,13 @@ SilphCo9_h: ; 0x5d7af to 0x5d7bb (12 bytes) (id=233) dw $593f ; objects -INCBIN "baserom.gbc",$5d7bb,$5d8b8 - $5d7bb +INCBIN "baserom.gbc",$5d7bb,$5d88b - $5d7bb + +SilphCo9Texts: ; 0x5d88b + dw SilphCo9Text1, SilphCo9Text2, SilphCo9Text3, SilphCo9Text4 + +INCBIN "baserom.gbc",$5d893,$25 + SilphCo9Text1: ; 0x5d8b8 db $08 ; asm ld a, [$d838] @@ -26411,6 +27487,7 @@ SilphCo9Text1: ; 0x5d8b8 jp $24d7 INCBIN "baserom.gbc",$5d8e5,$5d8f4 - $5d8e5 + SilphCo9Text2: ; 0x5d8f4 db $08 ; asm ld hl, $5893 @@ -26430,6 +27507,7 @@ SilphCo9Text4: ; 0x5d908 jp $24d7 INCBIN "baserom.gbc",$5d912,$2d + SilphCo9Object: ; 0x5d93f (size=74) db $2e ; border tile @@ -26466,7 +27544,13 @@ VictoryRoad1_h: ; 0x5d9fe to 0x5da0a (12 bytes) (id=108) dw $5ab8 ; objects -INCBIN "baserom.gbc",$5da0a,$5da86 - $5da0a +INCBIN "baserom.gbc",$5da0a,$5da5f - $5da0a + +VictoryRoad1Texts: ; 0x5da5f + dw VictoryRoad1Text1, VictoryRoad1Text2, VictoryRoad1Text3, VictoryRoad1Text4, VictoryRoad1Text5, VictoryRoad1Text6, VictoryRoad1Text7 + +INCBIN "baserom.gbc",$5da6d,$19 + VictoryRoad1Text1: ; 0x5da86 db $08 ; asm ld hl, $5a6d @@ -26480,6 +27564,7 @@ VictoryRoad1Text2: ; 0x5da90 jp $24d7 INCBIN "baserom.gbc",$5da9a,$1e + VictoryRoad1Object: ; 0x5dab8 (size=76) db $7d ; border tile @@ -26530,6 +27615,7 @@ PokemonTower1_h: ; 0x60420 to 0x6042c (12 bytes) (id=142) dw $4452 ; objects INCBIN "baserom.gbc",$6042c,$6042f - $6042c + PokemonTower1Texts: ; 0x6042f dw PokemonTower1Text1, PokemonTower1Text2, PokemonTower1Text3, PokemonTower1Text4, PokemonTower1Text5 @@ -26586,7 +27672,11 @@ PokemonTower2_h: ; 0x604e6 to 0x604f2 (12 bytes) (id=143) dw $4646 ; objects -INCBIN "baserom.gbc",$604f2,$605df - $604f2 +INCBIN "baserom.gbc",$604f2,$605db - $604f2 + +PokemonTower2Texts: ; 0x605db + dw PokemonTower2Text1, PokemonTower2Text2 + PokemonTower2Text1: ; 0x605df db $08 ; asm ld a, [$d764] @@ -26660,7 +27750,13 @@ PokemonTower3_h: ; 0x606c0 to 0x606cc (12 bytes) (id=144) dw $475d ; objects -INCBIN "baserom.gbc",$606cc,$60712 - $606cc +INCBIN "baserom.gbc",$606cc,$606e5 - $606cc + +PokemonTower3Texts: ; 0x606e5 + dw PokemonTower3Text1, PokemonTower3Text2, PokemonTower3Text3, PokemonTower3Text4 + +INCBIN "baserom.gbc",$606ed,$25 + PokemonTower3Text1: ; 0x60712 db $08 ; asm ld hl, $46ed @@ -26680,6 +27776,7 @@ PokemonTower3Text3: ; 0x60726 jp $24d7 INCBIN "baserom.gbc",$60730,$2d + PokemonTower3Object: ; 0x6075d (size=51) db $1 ; border tile @@ -26710,7 +27807,13 @@ PokemonTower4_h: ; 0x607ea to 0x607f6 (12 bytes) (id=145) dw $488b ; objects -INCBIN "baserom.gbc",$607f6,$60840 - $607f6 +INCBIN "baserom.gbc",$607f6,$6080f - $607f6 + +PokemonTower4Texts: ; 0x6080f + dw PokemonTower4Text1, PokemonTower4Text2, PokemonTower4Text3, PokemonTower4Text4, PokemonTower4Text5, PokemonTower4Text6 + +INCBIN "baserom.gbc",$6081b,$25 + PokemonTower4Text1: ; 0x60840 db $08 ; asm ld hl, $481b @@ -26730,6 +27833,7 @@ PokemonTower4Text3: ; 0x60854 jp $24d7 INCBIN "baserom.gbc",$6085e,$2d + PokemonTower4Object: ; 0x6088b (size=65) db $1 ; border tile @@ -26762,7 +27866,12 @@ PokemonTower5_h: ; 0x60926 to 0x60932 (12 bytes) (id=146) dw $4a48 ; objects -INCBIN "baserom.gbc",$60932,$609da - $60932 +INCBIN "baserom.gbc",$60932,$6099b - $60932 + +PokemonTower5Texts: ; 0x6099b + dw PokemonTower5Text1, PokemonTower5Text2, PokemonTower5Text3, PokemonTower5Text4, PokemonTower5Text5, PokemonTower5Text6 + +INCBIN "baserom.gbc",$609a7,$33 PokemonTower5Text1: ; 0x609da TX_FAR _PokemonTower5Text1 @@ -26775,6 +27884,7 @@ PokemonTower5Text2: ; 0x609df jp $24d7 INCBIN "baserom.gbc",$609e9,$609f8 - $609e9 + PokemonTower5Text3: ; 0x609f8 db $08 ; asm ld hl, $49b5 @@ -26782,6 +27892,7 @@ PokemonTower5Text3: ; 0x609f8 jp $24d7 INCBIN "baserom.gbc",$60a02,$60a11 - $60a02 + PokemonTower5Text4: ; 0x60a11 db $08 ; asm ld hl, $49c1 @@ -26789,6 +27900,7 @@ PokemonTower5Text4: ; 0x60a11 jp $24d7 INCBIN "baserom.gbc",$60a1b,$60a2a - $60a1b + PokemonTower5Text5: ; 0x60a2a db $08 ; asm ld hl, $49cd @@ -26796,6 +27908,7 @@ PokemonTower5Text5: ; 0x60a2a jp $24d7 INCBIN "baserom.gbc",$60a34,$14 + PokemonTower5Object: ; 0x60a48 (size=65) db $1 ; border tile @@ -26828,7 +27941,13 @@ PokemonTower6_h: ; 0x60ae3 to 0x60aef (12 bytes) (id=147) dw $4c5b ; objects -INCBIN "baserom.gbc",$60aef,$60be4 - $60aef +INCBIN "baserom.gbc",$60aef,$60bb1 - $60aef + +PokemonTower6Texts: ; 0x60bb1 + dw PokemonTower6Text1, PokemonTower6Text2, PokemonTower6Text3, PokemonTower6Text4, PokemonTower6Text5 + +INCBIN "baserom.gbc",$60bbb,$29 + PokemonTower6Text1: ; 0x60be4 db $08 ; asm ld hl, $4bbf @@ -26848,6 +27967,7 @@ PokemonTower6Text3: ; 0x60bf8 jp $24d7 INCBIN "baserom.gbc",$60c02,$59 + PokemonTower6Object: ; 0x60c5b (size=58) db $1 ; border tile @@ -26881,7 +28001,13 @@ PokemonTower7_h: ; 0x60cf9 to 0x60d05 (12 bytes) (id=148) dw $4ef6 ; objects -INCBIN "baserom.gbc",$60d05,$60e6c - $60d05 +INCBIN "baserom.gbc",$60d05,$60e3f - $60d05 + +PokemonTower7Texts: ; 0x60e3f + dw PokemonTower7Text1, PokemonTower7Text2, PokemonTower7Text3, PokemonTower7Text4 + +INCBIN "baserom.gbc",$60e47,$25 + PokemonTower7Text1: ; 0x60e6c db $08 ; asm ld hl, $4e47 @@ -26926,6 +28052,7 @@ PokemonTower7Text4: ; 0x60e8a jp $24d7 INCBIN "baserom.gbc",$60ec4,$32 + PokemonTower7Object: ; 0x60ef6 (size=42) db $1 ; border tile @@ -26955,6 +28082,7 @@ CeladonMart1_h: ; 0x60f7a to 0x60f86 (12 bytes) (id=122) dw $4f9e ; objects INCBIN "baserom.gbc",$60f86,$60f89 - $60f86 + CeladonMart1Texts: ; 0x60f89 dw CeladonMart1Text1, CeladonMart1Text2, CeladonMart1Text3 @@ -27009,7 +28137,12 @@ ViridianForest_h: ; 0x61101 to 0x6110d (12 bytes) (id=51) dw $51da ; objects -INCBIN "baserom.gbc",$6110d,$61167 - $6110d +INCBIN "baserom.gbc",$6110d,$61126 - $6110d + +ViridianForestTexts: ; 0x61126 + dw ViridianForestText1, ViridianForestText2, ViridianForestText3, ViridianForestText4, ViridianForestText5, ViridianForestText6, ViridianForestText7, ViridianForestText8, ViridianForestText9, ViridianForestText10, ViridianForestText11, ViridianForestText12, ViridianForestText13, ViridianForestText14 + +INCBIN "baserom.gbc",$61142,$25 ViridianForestText1: ; 0x61167 TX_FAR _ViridianForestText1 @@ -27108,7 +28241,10 @@ SSAnne1_h: ; 0x61259 to 0x61265 (12 bytes) (id=95) dw $5277 ; objects -INCBIN "baserom.gbc",$61265,$6126d - $61265 +INCBIN "baserom.gbc",$61265,$61269 - $61265 + +SSAnne1Texts: ; 0x61269 + dw SSAnne1Text1, SSAnne1Text2 SSAnne1Text1: ; 0x6126d TX_FAR _SSAnne1Text1 @@ -27120,6 +28256,7 @@ SSAnne1Text2: ; 0x61272 db $50 INCBIN "baserom.gbc",$61277,$0 + SSAnne1Object: ; 0x61277 (size=104) db $c ; border tile @@ -27166,7 +28303,12 @@ SSAnne2_h: ; 0x61393 to 0x6139f (12 bytes) (id=96) dw $5514 ; objects -INCBIN "baserom.gbc",$6139f,$614e1 - $6139f +INCBIN "baserom.gbc",$6139f,$614db - $6139f + +SSAnne2Texts: ; 0x614db + dw SSAnne2Text1, SSAnne2Text2 + +INCBIN "baserom.gbc",$614df,$2 SSAnne2Text1: ; 0x614e1 TX_FAR _SSAnne2Text1 @@ -27184,7 +28326,9 @@ SSAnne2Text2: ; 0x614e6 call $3354 jp $24d7 ; 0x61500 + INCBIN "baserom.gbc",$61500,$14 + SSAnne2Object: ; 0x61514 (size=90) db $c ; border tile @@ -27228,6 +28372,7 @@ SSAnne4_h: ; 0x61622 to 0x6162e (12 bytes) (id=98) dw $5632 ; objects INCBIN "baserom.gbc",$6162e,$61632 - $6162e + SSAnne4Object: ; 0x61632 (size=52) db $c ; border tile @@ -27262,7 +28407,12 @@ SSAnne5_h: ; 0x616a2 to 0x616ae (12 bytes) (id=99) dw $572b ; objects -INCBIN "baserom.gbc",$616ae,$616ea - $616ae +INCBIN "baserom.gbc",$616ae,$616c7 - $616ae + +SSAnne5Texts: ; 0x616c7 + dw SSAnne5Text1, SSAnne5Text2, SSAnne5Text3, SSAnne5Text4, SSAnne5Text5 + +INCBIN "baserom.gbc",$616d1,$19 SSAnne5Text1: ; 0x616ea TX_FAR _SSAnne5Text1 @@ -27279,6 +28429,7 @@ SSAnne5Text3: ; 0x616f4 db $50 INCBIN "baserom.gbc",$616f9,$0 + SSAnne5Text4: ; 0x616f9 db $08 ; asm ld hl, $56d1 @@ -27286,6 +28437,7 @@ SSAnne5Text4: ; 0x616f9 jp $24d7 INCBIN "baserom.gbc",$61703,$61712 - $61703 + SSAnne5Text5: ; 0x61712 db $08 ; asm ld hl, $56dd @@ -27293,6 +28445,7 @@ SSAnne5Text5: ; 0x61712 jp $24d7 INCBIN "baserom.gbc",$6171c,$f + SSAnne5Object: ; 0x6172b (size=54) db $23 ; border tile @@ -27324,7 +28477,10 @@ SSAnne6_h: ; 0x617a7 to 0x617b3 (12 bytes) (id=100) dw $581b ; objects -INCBIN "baserom.gbc",$617b3,$617c5 - $617b3 +INCBIN "baserom.gbc",$617b3,$617b7 - $617b3 + +SSAnne6Texts: ; 0x617b7 + dw SSAnne6Text1, SSAnne6Text2, SSAnne6Text3, SSAnne6Text4, SSAnne6Text5, SSAnne6Text6, SSAnne6Text7 SSAnne6Text1: ; 0x617c5 TX_FAR _SSAnne6Text1 @@ -27356,6 +28512,7 @@ SSAnne6Text6: ; 0x617de db $50 INCBIN "baserom.gbc",$617e3,$0 + SSAnne6Text7: ; 0x617e3 db $08 ; asm ld hl, $5807 @@ -27377,6 +28534,7 @@ SSAnne6Text7: ; 0x617e3 jp $24d7 INCBIN "baserom.gbc",$61807,$14 + SSAnne6Object: ; 0x6181b (size=54) db $c ; border tile @@ -27408,7 +28566,11 @@ SSAnne7_h: ; 0x61889 to 0x61895 (12 bytes) (id=101) dw $5946 ; objects -INCBIN "baserom.gbc",$61895,$618ad - $61895 +INCBIN "baserom.gbc",$61895,$618a7 - $61895 + +SSAnne7Texts: ; 0x618a7 + dw SSAnne7Text1, SSAnne7Text2, SSAnne7Text3 + SSAnne7Text1: ; 0x618ad db $08 ; asm ld a, [$d803] @@ -27475,7 +28637,13 @@ SSAnne8_h: ; 0x6196a to 0x61976 (12 bytes) (id=102) dw $5a60 ; objects -INCBIN "baserom.gbc",$61976,$619d6 - $61976 +INCBIN "baserom.gbc",$61976,$6198f - $61976 + +SSAnne8Texts: ; 0x6198f + dw SSAnne8Text1, SSAnne8Text2, SSAnne8Text3, SSAnne8Text4, SSAnne8Text5, SSAnne8Text6, SSAnne8Text7, SSAnne8Text8, SSAnne8Text9, SSAnne8Text10, SSAnne8Text11 + +INCBIN "baserom.gbc",$619a5,$31 + SSAnne8Text1: ; 0x619d6 db $08 ; asm ld hl, $59a5 @@ -27574,7 +28742,13 @@ SSAnne9_h: ; 0x61b3f to 0x61b4b (12 bytes) (id=103) dw $5c8d ; objects -INCBIN "baserom.gbc",$61b4b,$61bb5 - $61b4b +INCBIN "baserom.gbc",$61b4b,$61b6a - $61b4b + +SSAnne9Texts: ; 0x61b6a + dw SSAnne9Text1, SSAnne9Text2, SSAnne9Text3, SSAnne9Text4, SSAnne9Text5, SSAnne9Text6, SSAnne9Text7, SSAnne9Text8, SSAnne9Text9, SSAnne9Text10, SSAnne9Text11, SSAnne9Text12, SSAnne9Text13 + +INCBIN "baserom.gbc",$61b84,$31 + SSAnne9Text1: ; 0x61bb5 db $08 ; asm ld hl, $5b84 @@ -27610,6 +28784,7 @@ SSAnne9Text5: ; 0x61bdd jp $24d7 INCBIN "baserom.gbc",$61bf2,$61bf7 - $61bf2 + SSAnne9Text7: ; 0x61bf7 db $08 ; asm ld hl, $5c01 @@ -27617,6 +28792,7 @@ SSAnne9Text7: ; 0x61bf7 jp $24d7 INCBIN "baserom.gbc",$61c01,$61c06 - $61c01 + SSAnne9Text8: ; 0x61c06 db $08 ; asm ld hl, $5c10 @@ -27624,6 +28800,7 @@ SSAnne9Text8: ; 0x61c06 jp $24d7 INCBIN "baserom.gbc",$61c10,$61c15 - $61c10 + SSAnne9Text10: ; 0x61c15 db $08 ; asm ld hl, $5c1f @@ -27631,6 +28808,7 @@ SSAnne9Text10: ; 0x61c15 jp $24d7 INCBIN "baserom.gbc",$61c1f,$61c24 - $61c1f + SSAnne9Text11: ; 0x61c24 db $08 ; asm ld hl, $5c2e @@ -27638,6 +28816,7 @@ SSAnne9Text11: ; 0x61c24 jp $24d7 INCBIN "baserom.gbc",$61c2e,$61c33 - $61c2e + SSAnne9Text12: ; 0x61c33 db $08 ; asm ld hl, $5c3d @@ -27645,6 +28824,7 @@ SSAnne9Text12: ; 0x61c33 jp $24d7 INCBIN "baserom.gbc",$61c3d,$61c42 - $61c3d + SSAnne9Text13: ; 0x61c42 db $08 ; asm ld hl, $5c4c @@ -27652,6 +28832,7 @@ SSAnne9Text13: ; 0x61c42 jp $24d7 INCBIN "baserom.gbc",$61c4c,$41 + SSAnne9Object: ; 0x61c8d (size=188) db $c ; border tile @@ -27708,7 +28889,13 @@ SSAnne10_h: ; 0x61d49 to 0x61d55 (12 bytes) (id=104) dw $5e75 ; objects -INCBIN "baserom.gbc",$61d55,$61dcd - $61d55 +INCBIN "baserom.gbc",$61d55,$61d6e - $61d55 + +SSAnne10Texts: ; 0x61d6e + dw SSAnne10Text1, SSAnne10Text2, SSAnne10Text3, SSAnne10Text4, SSAnne10Text5, SSAnne10Text6, SSAnne10Text7, SSAnne10Text8, SSAnne10Text9, SSAnne10Text10, SSAnne10Text11 + +INCBIN "baserom.gbc",$61d84,$49 + SSAnne10Text1: ; 0x61dcd db $08 ; asm ld hl, $5d84 @@ -27809,6 +28996,7 @@ UndergroundPathNS_h: ; 0x61f1a to 0x61f26 (12 bytes) (id=119) dw $5f2a ; objects INCBIN "baserom.gbc",$61f26,$61f2a - $61f26 + UndergroundPathNSObject: ; 0x61f2a (size=20) db $1 ; border tile @@ -27833,6 +29021,7 @@ UndergroundPathWE_h: ; 0x61f3e to 0x61f4a (12 bytes) (id=121) dw $5f4e ; objects INCBIN "baserom.gbc",$61f4a,$61f4e - $61f4a + UndergroundPathWEObject: ; 0x61f4e (size=20) db $1 ; border tile @@ -27857,6 +29046,7 @@ DiglettsCave_h: ; 0x61f62 to 0x61f6e (12 bytes) (id=197) dw $5f72 ; objects INCBIN "baserom.gbc",$61f6e,$61f72 - $61f6e + DiglettsCaveObject: ; 0x61f72 (size=20) db $19 ; border tile @@ -27883,7 +29073,13 @@ SilphCo11_h: ; 0x620ee to 0x620fa (12 bytes) (id=235) dw $6380 ; objects -INCBIN "baserom.gbc",$620fa,$622dc - $620fa +INCBIN "baserom.gbc",$620fa,$622b7 - $620fa + +SilphCo11Texts: ; 0x622b7 + dw SilphCo11Text1, SilphCo11Text2, SilphCo11Text3, SilphCo11Text4, SilphCo11Text5 + +INCBIN "baserom.gbc",$622c1,$1b + SilphCo11Text1: ; 0x622dc db $08 ; asm ld a, [$d838] @@ -27919,6 +29115,7 @@ SilphCo11Text3: ; 0x6232b db $50 INCBIN "baserom.gbc",$62330,$6233a - $62330 + SilphCo11Text4: ; 0x6233a db $08 ; asm ld hl, $62c3 @@ -27926,6 +29123,7 @@ SilphCo11Text4: ; 0x6233a jp $24d7 INCBIN "baserom.gbc",$62344,$62353 - $62344 + SilphCo11Text5: ; 0x62353 db $08 ; asm ld hl, $62cf @@ -27933,6 +29131,7 @@ SilphCo11Text5: ; 0x62353 jp $24d7 INCBIN "baserom.gbc",$6235d,$23 + SilphCo11Object: ; 0x62380 (size=72) db $d ; border tile @@ -28025,6 +29224,7 @@ DecrementPP: ret INCBIN "baserom.gbc",$6802F,$6807F-$6802F + Tset05_GFX: INCBIN "baserom.gbc",$6807F,$6867F-$6807F Tset05_Block: @@ -28077,6 +29277,7 @@ Tset0B_Block: INCBIN "baserom.gbc",$6FEF0,$70000-$6FEF0 SECTION "bank1C",DATA,BANK[$1C] + INCBIN "baserom.gbc",$70000,$1100 CompressedMap: ; 5100 @@ -28465,7 +29666,6 @@ Function71c07: ; 0x71c07 ld [$cd12],a ret - INCBIN "baserom.gbc",$71CA2,$725C8-$71CA2 MonsterPalettes: ; 65C8 @@ -29074,7 +30274,13 @@ ViridianGym_h: ; 0x74897 to 0x748a3 (12 bytes) (id=45) dw $4bde ; objects -INCBIN "baserom.gbc",$748a3,$74a69 - $748a3 +INCBIN "baserom.gbc",$748a3,$749ec - $748a3 + +ViridianGymTexts: ; 0x749ec + dw ViridianGymText1, ViridianGymText2, ViridianGymText3, ViridianGymText4, ViridianGymText5, ViridianGymText6, ViridianGymText7, ViridianGymText8, ViridianGymText9, ViridianGymText10, ViridianGymText11 + +INCBIN "baserom.gbc",$74a02,$67 + ViridianGymText1: ; 0x74a69 db $08 ; asm ld a, [$d751] @@ -29120,6 +30326,7 @@ ViridianGymText1: ; 0x74a69 jp $24d7 INCBIN "baserom.gbc",$74ace,$74af3 - $74ace + ViridianGymText2: ; 0x74af3 db $08 ; asm ld hl, $4a08 @@ -29127,6 +30334,7 @@ ViridianGymText2: ; 0x74af3 jp $24d7 INCBIN "baserom.gbc",$74afd,$74b0c - $74afd + ViridianGymText3: ; 0x74b0c db $08 ; asm ld hl, $4a14 @@ -29134,6 +30342,7 @@ ViridianGymText3: ; 0x74b0c jp $24d7 INCBIN "baserom.gbc",$74b16,$74b25 - $74b16 + ViridianGymText4: ; 0x74b25 db $08 ; asm ld hl, $4a20 @@ -29141,6 +30350,7 @@ ViridianGymText4: ; 0x74b25 jp $24d7 INCBIN "baserom.gbc",$74b2f,$74b3e - $74b2f + ViridianGymText5: ; 0x74b3e db $08 ; asm ld hl, $4a2c @@ -29148,6 +30358,7 @@ ViridianGymText5: ; 0x74b3e jp $24d7 INCBIN "baserom.gbc",$74b48,$74b57 - $74b48 + ViridianGymText6: ; 0x74b57 db $08 ; asm ld hl, $4a38 @@ -29155,6 +30366,7 @@ ViridianGymText6: ; 0x74b57 jp $24d7 INCBIN "baserom.gbc",$74b61,$74b70 - $74b61 + ViridianGymText7: ; 0x74b70 db $08 ; asm ld hl, $4a44 @@ -29162,6 +30374,7 @@ ViridianGymText7: ; 0x74b70 jp $24d7 INCBIN "baserom.gbc",$74b7a,$74b89 - $74b7a + ViridianGymText8: ; 0x74b89 db $08 ; asm ld hl, $4a50 @@ -29169,6 +30382,7 @@ ViridianGymText8: ; 0x74b89 jp $24d7 INCBIN "baserom.gbc",$74b93,$74ba2 - $74b93 + ViridianGymText9: ; 0x74ba2 db $08 ; asm ld hl, $4a5c @@ -29176,6 +30390,7 @@ ViridianGymText9: ; 0x74ba2 jp $24d7 INCBIN "baserom.gbc",$74bac,$74bbb - $74bac + ViridianGymText10: ; 0x74bbb db $08 ; asm ld a, [$d751] @@ -29191,6 +30406,7 @@ ViridianGymText10: ; 0x74bbb jp $24d7 INCBIN "baserom.gbc",$74bd4,$a + ViridianGymObject: ; 0x74bde (size=105) db $3 ; border tile @@ -29228,7 +30444,11 @@ PewterMart_h: ; 0x74ca1 to 0x74cad (12 bytes) (id=56) dw $4cda ; objects -INCBIN "baserom.gbc",$74cad,$74cbc - $74cad +INCBIN "baserom.gbc",$74cad,$74cb6 - $74cad + +PewterMartTexts: ; 0x74cb6 + dw PewterMartText1, PewterMartText2, PewterMartText3 + PewterMartText2: ; 0x74cbc db $08 ; asm ld hl, $4cc6 @@ -29236,6 +30456,7 @@ PewterMartText2: ; 0x74cbc jp $24d7 INCBIN "baserom.gbc",$74cc6,$74ccb - $74cc6 + PewterMartText3: ; 0x74ccb db $08 ; asm ld hl, $4cd5 @@ -29243,6 +30464,7 @@ PewterMartText3: ; 0x74ccb jp $24d7 INCBIN "baserom.gbc",$74cd5,$5 + PewterMartObject: ; 0x74cda (size=38) db $0 ; border tile @@ -29269,7 +30491,11 @@ UnknownDungeon1_h: ; 0x74d00 to 0x74d0c (12 bytes) (id=228) dw $4d15 ; objects -INCBIN "baserom.gbc",$74d0c,$74d15 - $74d0c +INCBIN "baserom.gbc",$74d0c,$74d0f - $74d0c + +UnknownDungeon1Texts: ; 0x74d0f + dw UnknownDungeon1Text1, UnknownDungeon1Text2, UnknownDungeon1Text3 + UnknownDungeon1Object: ; 0x74d15 (size=97) db $7d ; border tile @@ -29313,7 +30539,54 @@ CeruleanHouse3_h: ; 0x74dfd to 0x74e09 (12 bytes) (id=230) dw $4ebe ; objects -INCBIN "baserom.gbc",$74e09,$74ebe - $74e09 +INCBIN "baserom.gbc",$74e09,$74e15 - $74e09 + +CeruleanHouse3Text1: ; 0x74e15 + db $8 + ld hl, $4e77 + call PrintText + xor a + ld [$cc26], a + ld [$cc36], a +.asm_74e23 + ld hl, $4e7c + call PrintText + ld hl, $4e6d + call $2a5a + ld hl, $cf7b + ld a, l + ld [$cf8b], a + ld a, h + ld [$cf8c], a + xor a + ld [$cf93], a + ld [$cc35], a + ld a, $4 + ld [$cf94], a + call $2be6 + jr c, .asm_74e60 ; 0x74e49 $15 + ld hl, $4e86 + ld a, [$cf91] + sub $15 + add a + ld d, $0 + ld e, a + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a + call PrintText + jr .asm_74e23 ; 0x74e5e $c3 +.asm_74e60 + xor a + ld [$cc36], a + ld hl, $4e81 + call PrintText + jp $24d7 +; 0x74e6d + +INCBIN "baserom.gbc",$74e6d,$51 + CeruleanHouse3Object: ; 0x74ebe (size=34) db $c ; border tile @@ -29343,6 +30616,7 @@ FuchsiaHouse1_h: ; 0x7500c to 0x75018 (12 bytes) (id=153) dw $5031 ; objects INCBIN "baserom.gbc",$75018,$7501c - $75018 + FuchsiaHouse1Texts: ; 0x7501c dw FuchsiaHouse1Text1, FuchsiaHouse1Text2, FuchsiaHouse1Text3 @@ -29395,7 +30669,8 @@ FuchsiaPokecenterText3: ; 0x75077 TX_FAR _FuchsiaPokecenterText3 db $50 -INCBIN "baserom.gbc",$7507c,$1 +FuchsiaPokecenterText4: ; 0x7507c + db $f6 FuchsiaPokecenterObject: ; 0x7507d (size=44) db $0 ; border tile @@ -29424,7 +30699,11 @@ FuchsiaHouse2_h: ; 0x750a9 to 0x750b5 (12 bytes) (id=155) dw $5180 ; objects -INCBIN "baserom.gbc",$750b5,$750c2 - $750b5 +INCBIN "baserom.gbc",$750b5,$750b8 - $750b5 + +FuchsiaHouse2Texts: ; 0x750b8 + dw FuchsiaHouse2Text1, FuchsiaHouse2Text2, FuchsiaHouse2Text3, FuchsiaHouse2Text4, FuchsiaHouse2Text5 + FuchsiaHouse2Text1: ; 0x750c2 db $08 ; asm ld a, [$d78e] @@ -29525,13 +30804,19 @@ SafariZoneEntrance_h: ; 0x751c1 to 0x751cd (12 bytes) (id=156) dw $53f5 ; objects -INCBIN "baserom.gbc",$751cd,$752c5 - $751cd +INCBIN "baserom.gbc",$751cd,$752b9 - $751cd + +SafariZoneEntranceTexts: ; 0x752b9 + dw SafariZoneEntranceText1, SafariZoneEntranceText2 + +INCBIN "baserom.gbc",$752bd,$8 SafariZoneEntranceText1: ; 0x752c5 TX_FAR _SafariZoneEntranceText1 db $50 INCBIN "baserom.gbc",$752ca,$753ca - $752ca + SafariZoneEntranceText2: ; 0x753ca db $08 ; asm ld hl, $53e6 @@ -29547,6 +30832,7 @@ SafariZoneEntranceText2: ; 0x753ca jp $24d7 INCBIN "baserom.gbc",$753e6,$f + SafariZoneEntranceObject: ; 0x753f5 (size=48) db $a ; border tile @@ -29579,7 +30865,13 @@ FuchsiaGym_h: ; 0x75431 to 0x7543d (12 bytes) (id=157) dw $5658 ; objects -INCBIN "baserom.gbc",$7543d,$75534 - $7543d +INCBIN "baserom.gbc",$7543d,$754d5 - $7543d + +FuchsiaGymTexts: ; 0x754d5 + dw FuchsiaGymText1, FuchsiaGymText2, FuchsiaGymText3, FuchsiaGymText4, FuchsiaGymText5, FuchsiaGymText6, FuchsiaGymText7, FuchsiaGymText8 + +INCBIN "baserom.gbc",$754e5,$4f + FuchsiaGymText1: ; 0x75534 db $08 ; asm ld a, [$d792] @@ -29617,6 +30909,7 @@ FuchsiaGymText1: ; 0x75534 jp $24d7 INCBIN "baserom.gbc",$75581,$755a4 - $75581 + FuchsiaGymText2: ; 0x755a4 db $08 ; asm ld hl, $54eb @@ -29624,6 +30917,7 @@ FuchsiaGymText2: ; 0x755a4 jp $24d7 INCBIN "baserom.gbc",$755ae,$755bd - $755ae + FuchsiaGymText3: ; 0x755bd db $08 ; asm ld hl, $54f7 @@ -29631,6 +30925,7 @@ FuchsiaGymText3: ; 0x755bd jp $24d7 INCBIN "baserom.gbc",$755c7,$755d6 - $755c7 + FuchsiaGymText4: ; 0x755d6 db $08 ; asm ld hl, $5503 @@ -29638,6 +30933,7 @@ FuchsiaGymText4: ; 0x755d6 jp $24d7 INCBIN "baserom.gbc",$755e0,$755ef - $755e0 + FuchsiaGymText5: ; 0x755ef db $08 ; asm ld hl, $550f @@ -29645,6 +30941,7 @@ FuchsiaGymText5: ; 0x755ef jp $24d7 INCBIN "baserom.gbc",$755f9,$75608 - $755f9 + FuchsiaGymText6: ; 0x75608 db $08 ; asm ld hl, $551b @@ -29652,6 +30949,7 @@ FuchsiaGymText6: ; 0x75608 jp $24d7 INCBIN "baserom.gbc",$75612,$75621 - $75612 + FuchsiaGymText7: ; 0x75621 db $08 ; asm ld hl, $5527 @@ -29659,6 +30957,7 @@ FuchsiaGymText7: ; 0x75621 jp $24d7 INCBIN "baserom.gbc",$7562b,$7563a - $7562b + FuchsiaGymText8: ; 0x7563a db $08 ; asm ld a, [$d792] @@ -29671,6 +30970,7 @@ FuchsiaGymText8: ; 0x7563a jp $24d7 INCBIN "baserom.gbc",$7564e,$a + FuchsiaGymObject: ; 0x75658 (size=82) db $3 ; border tile @@ -29706,6 +31006,7 @@ FuchsiaMeetingRoom_h: ; 0x756d7 to 0x756e3 (12 bytes) (id=158) dw $56fc ; objects INCBIN "baserom.gbc",$756e3,$756e7 - $756e3 + FuchsiaMeetingRoomTexts: ; 0x756e7 dw FuchsiaMeetingRoomText1, FuchsiaMeetingRoomText2, FuchsiaMeetingRoomText3 @@ -29750,7 +31051,13 @@ CinnabarGym_h: ; 0x7573e to 0x7574a (12 bytes) (id=166) dw $5acc ; objects -INCBIN "baserom.gbc",$7574a,$758df - $7574a +INCBIN "baserom.gbc",$7574a,$7589f - $7574a + +CinnabarGymTexts: ; 0x7589f + dw CinnabarGymText1, CinnabarGymText2, CinnabarGymText3, CinnabarGymText4, CinnabarGymText5, CinnabarGymText6, CinnabarGymText7, CinnabarGymText8, CinnabarGymText9 + +INCBIN "baserom.gbc",$758b1,$2e + CinnabarGymText1: ; 0x758df db $8 ld a, [$d79a] @@ -29776,6 +31083,7 @@ CinnabarGymText1: ; 0x758df jp $58b7 ; 0x75914 INCBIN "baserom.gbc",$75914,$25 + CinnabarGymText2: ; 0x75939 db $08 ; asm call $57a0 @@ -29794,6 +31102,7 @@ CinnabarGymText2: ; 0x75939 jp $24d7 INCBIN "baserom.gbc",$7595f,$7596e - $7595f + CinnabarGymText3: ; 0x7596e db $08 ; asm call $57a0 @@ -29812,6 +31121,7 @@ CinnabarGymText3: ; 0x7596e jp $24d7 INCBIN "baserom.gbc",$75994,$759a3 - $75994 + CinnabarGymText4: ; 0x759a3 db $08 ; asm call $57a0 @@ -29830,6 +31140,7 @@ CinnabarGymText4: ; 0x759a3 jp $24d7 INCBIN "baserom.gbc",$759c9,$759d8 - $759c9 + CinnabarGymText5: ; 0x759d8 db $08 ; asm call $57a0 @@ -29848,6 +31159,7 @@ CinnabarGymText5: ; 0x759d8 jp $24d7 INCBIN "baserom.gbc",$759fe,$75a0d - $759fe + CinnabarGymText6: ; 0x75a0d db $08 ; asm call $57a0 @@ -29866,6 +31178,7 @@ CinnabarGymText6: ; 0x75a0d jp $24d7 INCBIN "baserom.gbc",$75a33,$75a42 - $75a33 + CinnabarGymText7: ; 0x75a42 db $08 ; asm call $57a0 @@ -29884,6 +31197,7 @@ CinnabarGymText7: ; 0x75a42 jp $24d7 INCBIN "baserom.gbc",$75a68,$75a77 - $75a68 + CinnabarGymText8: ; 0x75a77 db $08 ; asm call $57a0 @@ -29902,6 +31216,7 @@ CinnabarGymText8: ; 0x75a77 jp $24d7 INCBIN "baserom.gbc",$75a9d,$75aac - $75a9d + CinnabarGymText9: ; 0x75aac db $08 ; asm ld a, [$d79a] @@ -29916,6 +31231,7 @@ CinnabarGymText9: ; 0x75aac jp $24d7 INCBIN "baserom.gbc",$75ac2,$a + CinnabarGymObject: ; 0x75acc (size=90) db $2e ; border tile @@ -29952,6 +31268,7 @@ Lab1_h: ; 0x75b80 to 0x75b8c (12 bytes) (id=167) dw $5bb3 ; objects INCBIN "baserom.gbc",$75b8c,$75b90 - $75b8c + Lab1Texts: ; 0x75b90 dw Lab1Text1, Lab1Text2, Lab1Text3, Lab1Text4, Lab1Text5 @@ -30012,7 +31329,10 @@ Lab2_h: ; 0x75c15 to 0x75c21 (12 bytes) (id=168) dw $5c45 ; objects -INCBIN "baserom.gbc",$75c21,$75c2a - $75c21 +INCBIN "baserom.gbc",$75c21,$75c24 - $75c21 + +Lab2Texts: ; 0x75c24 + dw Lab2Text1, Lab2Text2, Lab2Text3 Lab2Text1: ; 0x75c2a TX_FAR _Lab2Text1 @@ -30062,7 +31382,11 @@ Lab3_h: ; 0x75c7b to 0x75c87 (12 bytes) (id=169) dw $5cec ; objects -INCBIN "baserom.gbc",$75c87,$75c94 - $75c87 +INCBIN "baserom.gbc",$75c87,$75c8a - $75c87 + +Lab3Texts: ; 0x75c8a + dw Lab3Text1, Lab3Text2, Lab3Text3, Lab3Text4, Lab3Text5 + Lab3Text1: ; 0x75c94 db $08 ; asm ld a, [$d7a1] @@ -30134,7 +31458,54 @@ Lab4_h: ; 0x75d25 to 0x75d31 (12 bytes) (id=170) dw $5df0 ; objects -INCBIN "baserom.gbc",$75d31,$75dda - $75d31 +INCBIN "baserom.gbc",$75d31,$75d6c - $75d31 + +Lab4Text1: ; 0x75d6c + db $8 + ld a, [$d7a3] + bit 0, a + jr nz, .asm_75d96 ; 0x75d72 $22 + ld hl, $5dc6 + call PrintText + call $5d38 + ld a, [$cd37] + and a + jr z, .asm_75d8d ; 0x75d81 $a + ld b, $18 + ld hl, $5006 + call Bankswitch + jr .asm_75d93 ; 0x75d8b $6 +.asm_75d8d + ld hl, $5dcb + call PrintText +.asm_75d93 + jp $24d7 +.asm_75d96 + bit 1, a + jr z, .asm_75da2 ; 0x75d98 $8 + ld hl, $5dd0 + call PrintText + jr .asm_75d93 ; 0x75da0 $f1 +.asm_75da2 + call $5de8 + ld hl, $5dd5 + call PrintText + ld hl, $d7a3 + set 2, [hl] + ld a, [$d710] + ld b, a + ld c, $1e + call GivePokemon + jr nc, .asm_75d93 ; 0x75db9 $d8 + ld hl, $d7a3 + res 0, [hl] + res 1, [hl] + res 2, [hl] + jr .asm_75d93 ; 0x75dc4 $cd +; 0x75dc6 + +INCBIN "baserom.gbc",$75dc6,$14 + Lab4Text2: ; 0x75dda db $08 ; asm ld a, $3 @@ -30144,6 +31515,7 @@ Lab4Text2: ; 0x75dda jp $24d7 INCBIN "baserom.gbc",$75de8,$8 + Lab4Object: ; 0x75df0 (size=32) db $17 ; border tile @@ -30183,7 +31555,8 @@ CinnabarPokecenterText3: ; 0x75e40 TX_FAR _CinnabarPokecenterText3 db $50 -INCBIN "baserom.gbc",$75e45,$1 +CinnabarPokecenterText4: + db $f6 CinnabarPokecenterObject: ; 0x75e46 (size=44) db $0 ; border tile @@ -30212,7 +31585,10 @@ CinnabarMart_h: ; 0x75e72 to 0x75e7e (12 bytes) (id=172) dw $5e91 ; objects -INCBIN "baserom.gbc",$75e7e,$75e87 - $75e7e +INCBIN "baserom.gbc",$75e7e,$75e81 - $75e7e + +CinnabarMartTexts: ; 0x75e81 + dw CinnabarMartText1, CinnabarMartText2, CinnabarMartText3 CinnabarMartText2: ; 0x75e87 TX_FAR _CinnabarMartText2 @@ -30249,6 +31625,7 @@ CopycatsHouseF1_h: ; 0x75eb7 to 0x75ec3 (12 bytes) (id=175) dw $5ee3 ; objects INCBIN "baserom.gbc",$75ec3,$75ec6 - $75ec3 + CopycatsHouseF1Texts: ; 0x75ec6 dw CopycatsHouseF1Text1, CopycatsHouseF1Text2, CopycatsHouseF1Text3 @@ -30287,7 +31664,13 @@ CopycatsHouseF1Object: ; 0x75ee3 (size=46) EVENT_DISP $4, $7, $3 EVENT_DISP $4, $1, $7 ; COPYCATS_HOUSE_2F -INCBIN "baserom.gbc",$75f11,$760e0 - $75f11 +INCBIN "baserom.gbc",$75f11,$760d6 - $75f11 + +GaryTexts: ; 0x760d6 + dw GaryText1, GaryText2 + +INCBIN "baserom.gbc",$760da,$6 + GaryText1: ; 0x760e0 db $08 ; asm ld a, [$d867] @@ -30306,6 +31689,7 @@ GaryText2: ; 0x76108 db $50 INCBIN "baserom.gbc",$7610d,$22 + GaryObject: ; 0x7612f (size=48) db $3 ; border tile @@ -30338,7 +31722,13 @@ Loreli_h: ; 0x7616f to 0x7617b (12 bytes) (id=245) dw $6280 ; objects -INCBIN "baserom.gbc",$7617b,$76262 - $7617b +INCBIN "baserom.gbc",$7617b,$76251 - $7617b + +LoreliTexts: ; 0x76251 + dw LoreliText1 + +INCBIN "baserom.gbc",$76253,$f + LoreliText1: ; 0x76262 db $08 ; asm ld hl, $6255 @@ -30346,6 +31736,7 @@ LoreliText1: ; 0x76262 jp $24d7 INCBIN "baserom.gbc",$7626c,$14 + LoreliObject: ; 0x76280 (size=44) db $3 ; border tile @@ -30377,7 +31768,13 @@ Bruno_h: ; 0x762ca to 0x762d6 (12 bytes) (id=246) dw $63d7 ; objects -INCBIN "baserom.gbc",$762d6,$763b9 - $762d6 +INCBIN "baserom.gbc",$762d6,$763a8 - $762d6 + +BrunoTexts: ; 0x763a8 + dw BrunoText1 + +INCBIN "baserom.gbc",$763aa,$f + BrunoText1: ; 0x763b9 db $08 ; asm ld hl, $63ac @@ -30385,6 +31782,7 @@ BrunoText1: ; 0x763b9 jp $24d7 INCBIN "baserom.gbc",$763c3,$14 + BrunoObject: ; 0x763d7 (size=44) db $3 ; border tile @@ -30416,7 +31814,13 @@ Agatha_h: ; 0x76421 to 0x7642d (12 bytes) (id=247) dw $6534 ; objects -INCBIN "baserom.gbc",$7642d,$76516 - $7642d +INCBIN "baserom.gbc",$7642d,$76505 - $7642d + +AgathaTexts: ; 0x76505 + dw AgathaText1 + +INCBIN "baserom.gbc",$76507,$f + AgathaText1: ; 0x76516 db $08 ; asm ld hl, $6509 @@ -30424,6 +31828,7 @@ AgathaText1: ; 0x76516 jp $24d7 INCBIN "baserom.gbc",$76520,$14 + AgathaObject: ; 0x76534 (size=44) db $0 ; border tile @@ -30446,9 +31851,11 @@ AgathaObject: ; 0x76534 (size=44) AgathaBlocks: ; 30 INCBIN "maps/agatha.blk" + INCBIN "baserom.gbc",$7657e,$1a82 SECTION "bank1E",DATA,BANK[$1E] + INCBIN "baserom.gbc",$78000,$F1 PlayAnimation: ; 40F1 @@ -30634,6 +32041,7 @@ Pointer4DCF: ; 4DCF dw $4DDB,$4DE3,$4DEB,$4DF0,$4DF6,$4DFE INCBIN "baserom.gbc",$78DDB,$78E53-$78DDB + RealPlayAnimation: ; 4E53 ld a,[$CF07] ; get animation # − 1 cp a,$FF @@ -31109,9 +32517,11 @@ PointerTable6F74: ; 6F74 INCBIN "baserom.gbc",$7B068,$7C000 - $7B068 SECTION "bank1F",DATA,BANK[$1F] + INCBIN "baserom.gbc",$7C000,$4000 SECTION "bank20",DATA,BANK[$20] + INCBIN "baserom.gbc",$80000,$800b1 - $80000 _VictoryRoad3Text10: @@ -32038,6 +33448,7 @@ _Route10Text10: ; 0x8e8e1 INCBIN "baserom.gbc",$8e8ee,$1712 SECTION "bank24",DATA,BANK[$24] + INCBIN "baserom.gbc",$90000,$9008f - $90000 _Route11Text11: ; 0x9008f @@ -32183,6 +33594,7 @@ _Route23Text8: ; 0x92700 INCBIN "baserom.gbc",$92721,$18df SECTION "bank25",DATA,BANK[$25] + INCBIN "baserom.gbc",$94000,$945d3 - $94000 _Route25Text11: ; 0x945d3 @@ -32999,6 +34411,7 @@ _SafariZoneEntranceText1: ; 0x9e6c7 INCBIN "baserom.gbc",$9e6e4,$191c SECTION "bank28",DATA,BANK[$28] + INCBIN "baserom.gbc",$a0000,$a05a1 - $a0000 _FuchsiaMeetingRoomText1: ; 0xa05a1 |