From f3bc2ccc9e94e814ed72bf7483acd9e7850654b9 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 16:05:00 -0600 Subject: remove debug print line hg-commit-id: 9eac2d93fe88 --- extras/analyze_incbins.py | 1 - 1 file changed, 1 deletion(-) diff --git a/extras/analyze_incbins.py b/extras/analyze_incbins.py index c47ac522..4f193d60 100644 --- a/extras/analyze_incbins.py +++ b/extras/analyze_incbins.py @@ -115,7 +115,6 @@ def split_incbin_line_into_three(line, start_address, byte_count): third = (start_address + byte_count, end - (start_address + byte_count)) output = "" - print "third end is: " + str(third[1]) if first: output += "INCBIN \"baserom.gbc\",$" + hex(first[0])[2:] + ",$" + hex(first[1])[2:] + " - $" + hex(first[2])[2:] + "\n" -- cgit v1.3.1-sl0p From e93230600f36516139d34bfc3b935c3f1fd6f368 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 16:09:16 -0600 Subject: remove bank id output in pretty_map_headers, it's wrong anyway hg-commit-id: d6a22efde56f --- extras/pretty_map_headers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras/pretty_map_headers.py b/extras/pretty_map_headers.py index 2c038fd4..867c65a5 100644 --- a/extras/pretty_map_headers.py +++ b/extras/pretty_map_headers.py @@ -159,7 +159,7 @@ def map_header_pretty_printer(map_header): #formatting: hex(y)[2:].zill(2) or "%02x" % (y,) - output = asm_name + ": ; " + address + " to " + hex(int(address, base) + byte_size) + " (" + str(byte_size) + " bytes) (bank=" + str(int(bank, base)) + ") (id=" + str(id) + ")\n" + output = asm_name + ": ; " + address + " to " + hex(int(address, base) + byte_size) + " (" + str(byte_size) + " bytes) (id=" + str(id) + ")\n" output += spacing + "db $" + str(tileset).zfill(2) + " ; tileset\n" output += spacing + "db $" + hex(y)[2:].zfill(2) + ", $" + hex(x)[2:].zfill(2) + " ; dimensions (y, x)\n" output += spacing + "dw $" + map_pointer + ", $" + texts_pointer + ", $" + script_pointer + " ; blocks, texts, scripts\n" -- cgit v1.3.1-sl0p From 36fb1f3ce01084ef505da576794c82ff1e72e8d7 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 16:46:26 -0600 Subject: don't print extra comments about connections for zero connections hg-commit-id: 1e41d5f9c62d --- extras/pretty_map_headers.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/extras/pretty_map_headers.py b/extras/pretty_map_headers.py index 867c65a5..819b665a 100644 --- a/extras/pretty_map_headers.py +++ b/extras/pretty_map_headers.py @@ -164,9 +164,12 @@ def map_header_pretty_printer(map_header): output += spacing + "db $" + hex(y)[2:].zfill(2) + ", $" + hex(x)[2:].zfill(2) + " ; dimensions (y, x)\n" output += spacing + "dw $" + map_pointer + ", $" + texts_pointer + ", $" + script_pointer + " ; blocks, texts, scripts\n" output += spacing + "db " + connection_line(connection_byte) + " ; connections\n\n" - output += spacing + "; connections data\n\n" - output += connection_pretty_printer(connections) - output += spacing + "; end connection data\n\n" + + if len(connections) > 0: + output += spacing + "; connections data\n\n" + output += connection_pretty_printer(connections) + output += spacing + "; end connection data\n\n" + output += spacing + "dw $" + object_data_pointer + " ; objects\n" return output -- cgit v1.3.1-sl0p From 7207000776c097d3aef086a9059b1867048bcba4 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:13:46 -0600 Subject: analyze_incbins now applies map header asm patches hg-commit-id: aec68677b92a --- extras/analyze_incbins.py | 81 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 71 insertions(+), 10 deletions(-) diff --git a/extras/analyze_incbins.py b/extras/analyze_incbins.py index 4f193d60..fcbf627d 100644 --- a/extras/analyze_incbins.py +++ b/extras/analyze_incbins.py @@ -5,7 +5,8 @@ import sys, os from copy import copy, deepcopy import subprocess -from extract_maps import rom, assert_rom, load_rom, calculate_pointer +from extract_maps import rom, assert_rom, load_rom, calculate_pointer, load_map_pointers, read_all_map_headers, map_headers +from pretty_map_headers import map_header_pretty_printer, map_name_cleaner #store each line of source code here asm = None @@ -57,9 +58,9 @@ def process_incbins(): partial_interval = incbin[21:].split(",")[1] partial_interval = partial_interval.replace(";", "#") - partial_interval = partial_interval.replace("$", "0x") + partial_interval = partial_interval.replace("$", "0x").replace("0xx", "0x") interval = eval(partial_interval) - interval_hex = hex(interval).replace("0x", "$") + interval_hex = hex(interval).replace("0x", "$").replace("x", "") end = start + interval end_hex = hex(end).replace("0x", "$") @@ -77,14 +78,19 @@ def process_incbins(): def find_incbin_to_replace_for(address): """returns a line number for which incbin to edit if you were to insert bytes into pokered.asm""" - if type(address) == str: int(address, 16) + if type(address) == str: address = int(address, 16) for incbin_key in processed_incbins.keys(): incbin = processed_incbins[incbin_key] start = incbin["start"] end = incbin["end"] - + + print "start is: " + str(start) + print "end is: " + str(end) + print "address is: " + str(type(address)) + print "checking.... " + hex(start) + " <= " + hex(address) + " <= " + hex(end) + if start <= address <= end: return incbin_key return None @@ -140,7 +146,7 @@ def generate_diff_insert(line_number, newline): newfile_fh.close() try: - diffcontent = subprocess.check_output("diff -u " + original_filename + " " + newfile_filename, shell=True) + diffcontent = subprocess.check_output("diff -u ../pokered.asm " + newfile_filename, shell=True) except Exception, exc: diffcontent = exc.output @@ -149,13 +155,68 @@ def generate_diff_insert(line_number, newline): return diffcontent +def insert_map_header_asm(map_id): + map = map_headers[map_id] + line_number = find_incbin_to_replace_for(map["address"]) + if line_number == None: # or map_name_cleaner(map["name"], 0) in "\n".join(line for line in asm): + print "i think map id=" + str(map_id) + " has previously been added." + return #this map has already been added i bet + newlines = split_incbin_line_into_three(line_number, map["address"], 12 + (11 * len(map["connections"]))) + + map_header_asm = map_header_pretty_printer(map_headers[map_id]) + + newlines = newlines.split("\n") + if len(newlines) == 2: index = 0 + elif len(newlines) == 3: + index = 1 + newlines[0] += "\n" #spacing is a nice thing to have + newlines[index] = map_header_asm + newlines = "\n".join(line for line in newlines) + + diff = generate_diff_insert(line_number, newlines) + + print diff + print "... Applying diff." + + #write the diff to a file + fh = open("temp.patch", "w") + fh.write(diff) + fh.close() + + #apply the patch + os.system("patch ../pokered.asm temp.patch") + + #remove the patch + os.system("rm temp.patch") + +def wrapper_insert_map_header_asm(map_id): + "reload the asm because it has changed (probably)" + load_asm() + isolate_incbins() + process_incbins() + insert_map_header_asm(map_id) + +def dump_all_remaining_maps(): + for map_id in map_headers: + print "Inserting map id=" + str(map_id) + wrapper_insert_map_header_asm(map_id) + if __name__ == "__main__": + #load map headers + load_rom() + load_map_pointers() + read_all_map_headers() + + #load incbins (mandatory) load_asm() isolate_incbins() process_incbins() #print processed_incbins - line_number = find_incbin_to_replace_for(0x492c3) - newlines = split_incbin_line_into_three(line_number, 0x492c3, 12) - diff = generate_diff_insert(line_number, newlines) - print diff + #line_number = find_incbin_to_replace_for(0x492c3) + #newlines = split_incbin_line_into_three(line_number, 0x492c3, 12) + #diff = generate_diff_insert(line_number, newlines) + #print diff + + insert_map_header_asm(81) + #dump_all_remaining_maps() -- cgit v1.3.1-sl0p From 96d1c03e36dbd30d889130593c97321bf88ad5c9 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:14:09 -0600 Subject: RockTunnelPokecenter_h map header asm This does not update the bank or pointer list. hg-commit-id: 60caa3561940 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index d855e3f1..f6690553 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13377,7 +13377,17 @@ MtMoonPokecenter_h: ; 0x492c3 to 0x492cf (12 bytes) (bank=12) (id=68) dw $5376 ; objects -INCBIN "baserom.gbc",$492CF,$4C000-$492CF +INCBIN "baserom.gbc",$492cf,$493ae - $492cf + +RockTunnelPokecenter_h: ; 0x493ae to 0x493ba (12 bytes) (id=81) + db $06 ; tileset + db $04, $07 ; dimensions (y, x) + dw $40ab, $53c0, $53ba ; blocks, texts, scripts + db $00 ; connections + + dw $53d4 ; objects + +INCBIN "baserom.gbc",$493ba,$2c46 SECTION "bank13",DATA,BANK[$13] -- cgit v1.3.1-sl0p From b945ae8fe6e8f9ceda025babc94b16a16b785a6c Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:15:14 -0600 Subject: Route11Gate_h map header asm hg-commit-id: 6c4ccdd3e56a --- extras/analyze_incbins.py | 2 +- pokered.asm | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/extras/analyze_incbins.py b/extras/analyze_incbins.py index fcbf627d..6e6e5007 100644 --- a/extras/analyze_incbins.py +++ b/extras/analyze_incbins.py @@ -217,6 +217,6 @@ if __name__ == "__main__": #diff = generate_diff_insert(line_number, newlines) #print diff - insert_map_header_asm(81) + insert_map_header_asm(84) #dump_all_remaining_maps() diff --git a/pokered.asm b/pokered.asm index f6690553..1c90e77c 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13387,7 +13387,17 @@ RockTunnelPokecenter_h: ; 0x493ae to 0x493ba (12 bytes) (id=81) dw $53d4 ; objects -INCBIN "baserom.gbc",$493ba,$2c46 +INCBIN "baserom.gbc",$493ba,$49400 - $493ba + +Route11Gate_h: ; 0x49400 to 0x4940c (12 bytes) (id=84) + db $0c ; tileset + db $05, $04 ; dimensions (y, x) + dw $40c7, $540f, $540c ; blocks, texts, scripts + db $00 ; connections + + dw $5416 ; objects + +INCBIN "baserom.gbc",$4940c,$2bf4 SECTION "bank13",DATA,BANK[$13] -- cgit v1.3.1-sl0p From be36119c58ff5ac360df0135446b9d7a6030acc6 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:15:42 -0600 Subject: Route11GateUpstairs_h map header asm hg-commit-id: 8638c4221e05 --- extras/analyze_incbins.py | 2 +- pokered.asm | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/extras/analyze_incbins.py b/extras/analyze_incbins.py index 6e6e5007..70842f48 100644 --- a/extras/analyze_incbins.py +++ b/extras/analyze_incbins.py @@ -217,6 +217,6 @@ if __name__ == "__main__": #diff = generate_diff_insert(line_number, newlines) #print diff - insert_map_header_asm(84) + insert_map_header_asm(86) #dump_all_remaining_maps() diff --git a/pokered.asm b/pokered.asm index 1c90e77c..90c79ea7 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13397,7 +13397,17 @@ Route11Gate_h: ; 0x49400 to 0x4940c (12 bytes) (id=84) dw $5416 ; objects -INCBIN "baserom.gbc",$4940c,$2bf4 +INCBIN "baserom.gbc",$4940c,$49448 - $4940c + +Route11GateUpstairs_h: ; 0x49448 to 0x49454 (12 bytes) (id=86) + db $0c ; tileset + db $04, $04 ; dimensions (y, x) + dw $40db, $5457, $5454 ; blocks, texts, scripts + db $00 ; connections + + dw $54da ; objects + +INCBIN "baserom.gbc",$49454,$2bac SECTION "bank13",DATA,BANK[$13] -- cgit v1.3.1-sl0p From 93d9f5add145b5418fbf840cd1f2b2a3466e8008 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:16:30 -0600 Subject: Route12Gate_h map header asm hg-commit-id: 53e500c814fd --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 90c79ea7..bc840734 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13407,7 +13407,17 @@ Route11GateUpstairs_h: ; 0x49448 to 0x49454 (12 bytes) (id=86) dw $54da ; objects -INCBIN "baserom.gbc",$49454,$2bac +INCBIN "baserom.gbc",$49454,$494f8 - $49454 + +Route12Gate_h: ; 0x494f8 to 0x49504 (12 bytes) (id=87) + db $0c ; tileset + db $04, $05 ; dimensions (y, x) + dw $5540, $5507, $5504 ; blocks, texts, scripts + db $00 ; connections + + dw $550e ; objects + +INCBIN "baserom.gbc",$49504,$2afc SECTION "bank13",DATA,BANK[$13] -- cgit v1.3.1-sl0p From c7f92f42fd8dfe74127d67a63e98d6a2242935c3 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:16:52 -0600 Subject: Route12GateUpstairs_h map header asm hg-commit-id: 859cc21fda06 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index bc840734..203219eb 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13417,7 +13417,17 @@ Route12Gate_h: ; 0x494f8 to 0x49504 (12 bytes) (id=87) dw $550e ; objects -INCBIN "baserom.gbc",$49504,$2afc +INCBIN "baserom.gbc",$49504,$49554 - $49504 + +Route12GateUpstairs_h: ; 0x49554 to 0x49560 (12 bytes) (id=195) + db $0c ; tileset + db $04, $04 ; dimensions (y, x) + dw $40db, $5563, $5560 ; blocks, texts, scripts + db $00 ; connections + + dw $55de ; objects + +INCBIN "baserom.gbc",$49560,$2aa0 SECTION "bank13",DATA,BANK[$13] -- cgit v1.3.1-sl0p From 43411c6c07c71fee0575bb56e1f4f72923b060c9 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:17:16 -0600 Subject: Route15Gate_h map header asm hg-commit-id: 70832d1c20b7 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 203219eb..99ebb4f1 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13427,7 +13427,17 @@ Route12GateUpstairs_h: ; 0x49554 to 0x49560 (12 bytes) (id=195) dw $55de ; objects -INCBIN "baserom.gbc",$49560,$2aa0 +INCBIN "baserom.gbc",$49560,$495f6 - $49560 + +Route15Gate_h: ; 0x495f6 to 0x49602 (12 bytes) (id=184) + db $0c ; tileset + db $05, $04 ; dimensions (y, x) + dw $40c7, $5605, $5602 ; blocks, texts, scripts + db $00 ; connections + + dw $560c ; objects + +INCBIN "baserom.gbc",$49602,$29fe SECTION "bank13",DATA,BANK[$13] -- cgit v1.3.1-sl0p From 488daffa8a6f737b559767c222fe0b422fb1a151 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:17:39 -0600 Subject: Route16GateMap_h map header asm hg-commit-id: 3dcbf6ff85ac --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 99ebb4f1..1aaaac1f 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13437,7 +13437,17 @@ Route15Gate_h: ; 0x495f6 to 0x49602 (12 bytes) (id=184) dw $560c ; objects -INCBIN "baserom.gbc",$49602,$29fe +INCBIN "baserom.gbc",$49602,$496b2 - $49602 + +Route16GateMap_h: ; 0x496b2 to 0x496be (12 bytes) (id=186) + db $0c ; tileset + db $07, $04 ; dimensions (y, x) + dw $57e3, $575a, $56be ; blocks, texts, scripts + db $00 ; connections + + dw $578b ; objects + +INCBIN "baserom.gbc",$496be,$2942 SECTION "bank13",DATA,BANK[$13] -- cgit v1.3.1-sl0p From 798d74ef069d4e8742936c5b5d80938044a66a5d Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:17:57 -0600 Subject: Route16GateUpstairs_h map header asm hg-commit-id: 0a2b33f94752 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 1aaaac1f..40f4dd91 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13447,7 +13447,17 @@ Route16GateMap_h: ; 0x496b2 to 0x496be (12 bytes) (id=186) dw $578b ; objects -INCBIN "baserom.gbc",$496be,$2942 +INCBIN "baserom.gbc",$496be,$497ff - $496be + +Route16GateUpstairs_h: ; 0x497ff to 0x4980b (12 bytes) (id=187) + db $0c ; tileset + db $04, $04 ; dimensions (y, x) + dw $40db, $580e, $580b ; blocks, texts, scripts + db $00 ; connections + + dw $584c ; objects + +INCBIN "baserom.gbc",$4980b,$27f5 SECTION "bank13",DATA,BANK[$13] -- cgit v1.3.1-sl0p From e537bfd93add0b97d5034b3c8321dbb2ee24420a Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:18:23 -0600 Subject: Route18Gate_h map header asm hg-commit-id: 05aea7ef3001 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 40f4dd91..1f6eb19b 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13457,7 +13457,17 @@ Route16GateUpstairs_h: ; 0x497ff to 0x4980b (12 bytes) (id=187) dw $584c ; objects -INCBIN "baserom.gbc",$4980b,$27f5 +INCBIN "baserom.gbc",$4980b,$4986a - $4980b + +Route18Gate_h: ; 0x4986a to 0x49876 (12 bytes) (id=190) + db $0c ; tileset + db $05, $04 ; dimensions (y, x) + dw $40c7, $590d, $5876 ; blocks, texts, scripts + db $00 ; connections + + dw $5937 ; objects + +INCBIN "baserom.gbc",$49876,$278a SECTION "bank13",DATA,BANK[$13] -- cgit v1.3.1-sl0p From b9f2708e080ab8714567893e39666ac3e5ac9719 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:18:41 -0600 Subject: Route18GateHeader_h map header asm hg-commit-id: c6a24977ba09 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 1f6eb19b..8f83d1fb 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13467,7 +13467,17 @@ Route18Gate_h: ; 0x4986a to 0x49876 (12 bytes) (id=190) dw $5937 ; objects -INCBIN "baserom.gbc",$49876,$278a +INCBIN "baserom.gbc",$49876,$49969 - $49876 + +Route18GateHeader_h: ; 0x49969 to 0x49975 (12 bytes) (id=191) + db $0c ; tileset + db $04, $04 ; dimensions (y, x) + dw $40db, $5978, $5975 ; blocks, texts, scripts + db $00 ; connections + + dw $59a4 ; objects + +INCBIN "baserom.gbc",$49975,$268b SECTION "bank13",DATA,BANK[$13] -- cgit v1.3.1-sl0p From 0e6e89f33a7a3f0aceff5eea7fff6ce5d37e3366 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:29:31 -0600 Subject: MtMoon1_h map header asm hg-commit-id: d9f65b9a7675 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 8f83d1fb..43673c20 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13477,7 +13477,17 @@ Route18GateHeader_h: ; 0x49969 to 0x49975 (12 bytes) (id=191) dw $59a4 ; objects -INCBIN "baserom.gbc",$49975,$268b +INCBIN "baserom.gbc",$49975,$499bc - $49975 + +MtMoon1_h: ; 0x499bc to 0x499c8 (12 bytes) (id=59) + db $11 ; tileset + db $12, $14 ; dimensions (y, x) + dw $5b97, $59e1, $59c8 ; blocks, texts, scripts + db $00 ; connections + + dw $5b06 ; objects + +INCBIN "baserom.gbc",$499c8,$2638 SECTION "bank13",DATA,BANK[$13] -- cgit v1.3.1-sl0p From 955bf8dafce1ea8fe49ad5a58ad942dfbef39156 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:31:29 -0600 Subject: MtMoon3_h map header asm hg-commit-id: 355f62360a3a --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 43673c20..d41a67ae 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13487,7 +13487,17 @@ MtMoon1_h: ; 0x499bc to 0x499c8 (12 bytes) (id=59) dw $5b06 ; objects -INCBIN "baserom.gbc",$499c8,$2638 +INCBIN "baserom.gbc",$499c8,$49cff - $499c8 + +MtMoon3_h: ; 0x49cff to 0x49d0b (12 bytes) (id=61) + db $11 ; tileset + db $12, $14 ; dimensions (y, x) + dw $6041, $5e34, $5d0b ; blocks, texts, scripts + db $00 ; connections + + dw $5fdb ; objects + +INCBIN "baserom.gbc",$49d0b,$22f5 SECTION "bank13",DATA,BANK[$13] -- cgit v1.3.1-sl0p From 2191a648eea48a11ce869f5fe250016683d490de Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:32:08 -0600 Subject: SafariZoneWest_h map header asm hg-commit-id: 9c92cd9afffb --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index d41a67ae..2878d38b 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13497,7 +13497,17 @@ MtMoon3_h: ; 0x49cff to 0x49d0b (12 bytes) (id=61) dw $5fdb ; objects -INCBIN "baserom.gbc",$49d0b,$22f5 +INCBIN "baserom.gbc",$49d0b,$4a1a9 - $49d0b + +SafariZoneWest_h: ; 0x4a1a9 to 0x4a1b5 (12 bytes) (id=219) + db $03 ; tileset + db $0d, $0f ; dimensions (y, x) + dw $6248, $61b8, $61b5 ; blocks, texts, scripts + db $00 ; connections + + dw $61dc ; objects + +INCBIN "baserom.gbc",$4a1b5,$1e4b SECTION "bank13",DATA,BANK[$13] -- cgit v1.3.1-sl0p From 5972824623f9f6a4ec392f76cf32c01b0281aa4b Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:32:33 -0600 Subject: SafariZoneSecretHouse_h map header asm hg-commit-id: 980b0189fd68 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 2878d38b..d985b01e 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13507,7 +13507,17 @@ SafariZoneWest_h: ; 0x4a1a9 to 0x4a1b5 (12 bytes) (id=219) dw $61dc ; objects -INCBIN "baserom.gbc",$4a1b5,$1e4b +INCBIN "baserom.gbc",$4a1b5,$4a30b - $4a1b5 + +SafariZoneSecretHouse_h: ; 0x4a30b to 0x4a317 (12 bytes) (id=222) + db $14 ; tileset + db $04, $04 ; dimensions (y, x) + dw $637f, $631a, $6317 ; blocks, texts, scripts + db $00 ; connections + + dw $6365 ; objects + +INCBIN "baserom.gbc",$4a317,$1ce9 SECTION "bank13",DATA,BANK[$13] -- cgit v1.3.1-sl0p From ca251eedc0631f9903d58d1e2a789715f7581d53 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:32:51 -0600 Subject: BattleCenterM_h map header asm hg-commit-id: be6202c67598 --- pokered.asm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index d985b01e..658e39a1 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13613,7 +13613,15 @@ AgathaPic: LancePic: INCBIN "pic/trainer/lance.pic" -INCBIN "baserom.gbc",$4FD04,$7E49-$7D04 +BattleCenterM_h: ; 0x4fd04 to 0x4fd10 (12 bytes) (id=239) + db $15 ; tileset + db $04, $05 ; dimensions (y, x) + dw $7d5d, $7d4c, $7d10 ; blocks, texts, scripts + db $00 ; connections + + dw $7d53 ; objects + +INCBIN "baserom.gbc",$4fd10,$139 GetPredefPointer: ; 7E49 ; stores hl in $CC4F,$CC50 -- cgit v1.3.1-sl0p From f1df3c071235f1f16a48b556bb5d88327b559234 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:33:07 -0600 Subject: TradeCenterM_h map header asm hg-commit-id: f9ed9be30a23 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 658e39a1..f03bcd7f 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13621,7 +13621,17 @@ BattleCenterM_h: ; 0x4fd04 to 0x4fd10 (12 bytes) (id=239) dw $7d53 ; objects -INCBIN "baserom.gbc",$4fd10,$139 +INCBIN "baserom.gbc",$4fd10,$4fd71 - $4fd10 + +TradeCenterM_h: ; 0x4fd71 to 0x4fd7d (12 bytes) (id=240) + db $15 ; tileset + db $04, $05 ; dimensions (y, x) + dw $7d91, $7d80, $7d7d ; blocks, texts, scripts + db $00 ; connections + + dw $7d87 ; objects + +INCBIN "baserom.gbc",$4fd7d,$cc GetPredefPointer: ; 7E49 ; stores hl in $CC4F,$CC50 -- cgit v1.3.1-sl0p From 882c9fc50ce9341f6704c506ec2749d411364858 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:33:30 -0600 Subject: Route22_h map header asm hg-commit-id: 5a77da5b1046 --- pokered.asm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index f03bcd7f..77c16d3d 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13794,7 +13794,31 @@ PredefPointers: ; 7E79 dbw $16,$5035 SECTION "bank14",DATA,BANK[$14] -INCBIN "baserom.gbc",$50000,$4000 +Route22_h: ; 0x50000 to 0x50022 (34 bytes) (id=33) + db $00 ; tileset + db $09, $14 ; dimensions (y, x) + dw $403d, $5175, $4eb2 ; blocks, texts, scripts + db NORTH | EAST ; connections + + ; connections data + + db $22 ; some map + dw $4664, $c6eb ; pointers (connected, current) (strip) + db $0a, $0a ; bigness, width + db $8f, $00 ; alignments (y, x) + dw $cb69 ; window + + db $01 ; some map + dw $4400, $c6ff ; pointers (connected, current) (strip) + db $0f, $14 ; bigness, width + db $08, $00 ; alignments (y, x) + dw $c703 ; window + + ; end connection data + + dw $4022 ; objects + +INCBIN "baserom.gbc",$50022,$3fde SECTION "bank15",DATA,BANK[$15] INCBIN "baserom.gbc",$54000,$4000 -- cgit v1.3.1-sl0p From 22ec9ef0efc02fa70e4e3f62821e8c2d3e626f86 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:33:45 -0600 Subject: Route20_h map header asm hg-commit-id: 7b915e7697cc --- pokered.asm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 77c16d3d..020d0c03 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13818,7 +13818,33 @@ Route22_h: ; 0x50000 to 0x50022 (34 bytes) (id=33) dw $4022 ; objects -INCBIN "baserom.gbc",$50022,$3fde +INCBIN "baserom.gbc",$50022,$500f1 - $50022 + +Route20_h: ; 0x500f1 to 0x50113 (34 bytes) (id=31) + db $00 ; tileset + db $09, $32 ; dimensions (y, x) + dw $417d, $4d22, $4ca9 ; blocks, texts, scripts + db WEST | EAST ; connections + + ; connections data + + db $08 ; some map + dw $4070, $c790 ; pointers (connected, current) (strip) + db $09, $0a ; bigness, width + db $00, $13 ; alignments (y, x) + dw $c702 ; window + + db $1e ; some map + dw $4f87, $c71d ; pointers (connected, current) (strip) + db $0c, $0a ; bigness, width + db $24, $00 ; alignments (y, x) + dw $c6f9 ; window + + ; end connection data + + dw $4113 ; objects + +INCBIN "baserom.gbc",$50113,$3eed SECTION "bank15",DATA,BANK[$15] INCBIN "baserom.gbc",$54000,$4000 -- cgit v1.3.1-sl0p From 29d3062eeb6cde2049341e824d8851983fbfba4f Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:34:01 -0600 Subject: Route23_h map header asm hg-commit-id: 164454be427b --- pokered.asm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 020d0c03..4e1ada39 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13844,7 +13844,33 @@ Route20_h: ; 0x500f1 to 0x50113 (34 bytes) (id=31) dw $4113 ; objects -INCBIN "baserom.gbc",$50113,$3eed +INCBIN "baserom.gbc",$50113,$5033f - $50113 + +Route23_h: ; 0x5033f to 0x50361 (34 bytes) (id=34) + db $17 ; tileset + db $48, $0a ; dimensions (y, x) + dw $43b2, $52f7, $51da ; blocks, texts, scripts + db NORTH | SOUTH ; connections + + ; connections data + + db $09 ; some map + dw $4986, $c6eb ; pointers (connected, current) (strip) + db $0a, $0a ; bigness, width + db $11, $00 ; alignments (y, x) + dw $c779 ; window + + db $21 ; some map + dw $403d, $cb9b ; pointers (connected, current) (strip) + db $0d, $14 ; bigness, width + db $00, $00 ; alignments (y, x) + dw $c703 ; window + + ; end connection data + + dw $4361 ; objects + +INCBIN "baserom.gbc",$50361,$3c9f SECTION "bank15",DATA,BANK[$15] INCBIN "baserom.gbc",$54000,$4000 -- cgit v1.3.1-sl0p From 3809cd33963ea854af7dc5b790157efcd7710868 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:34:13 -0600 Subject: Route24_h map header asm hg-commit-id: 0abf4b0edf6b --- pokered.asm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 4e1ada39..5c68f8b0 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13870,7 +13870,33 @@ Route23_h: ; 0x5033f to 0x50361 (34 bytes) (id=34) dw $4361 ; objects -INCBIN "baserom.gbc",$50361,$3c9f +INCBIN "baserom.gbc",$50361,$50682 - $50361 + +Route24_h: ; 0x50682 to 0x506a4 (34 bytes) (id=35) + db $00 ; tileset + db $12, $0a ; dimensions (y, x) + dw $46e7, $544b, $53ad ; blocks, texts, scripts + db SOUTH | EAST ; connections + + ; connections data + + db $03 ; some map + dw $4832, $c838 ; pointers (connected, current) (strip) + db $10, $14 ; bigness, width + db $00, $0a ; alignments (y, x) + dw $c703 ; window + + db $24 ; some map + dw $4810, $c725 ; pointers (connected, current) (strip) + db $09, $1e ; bigness, width + db $00, $00 ; alignments (y, x) + dw $c70d ; window + + ; end connection data + + dw $46a4 ; objects + +INCBIN "baserom.gbc",$506a4,$395c SECTION "bank15",DATA,BANK[$15] INCBIN "baserom.gbc",$54000,$4000 -- cgit v1.3.1-sl0p From 67e5e480ea88e820fa05600886f8c2368b93473f Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:34:32 -0600 Subject: Route25_h map header asm hg-commit-id: c71692814b72 --- pokered.asm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 5c68f8b0..eaa9e66f 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13896,7 +13896,27 @@ Route24_h: ; 0x50682 to 0x506a4 (34 bytes) (id=35) dw $46a4 ; objects -INCBIN "baserom.gbc",$506a4,$395c +INCBIN "baserom.gbc",$506a4,$5079b - $506a4 + +Route25_h: ; 0x5079b to 0x507b2 (23 bytes) (id=36) + db $00 ; tileset + db $09, $1e ; dimensions (y, x) + dw $4810, $5628, $55cb ; blocks, texts, scripts + db WEST ; connections + + ; connections data + + db $23 ; some map + dw $46ee, $c754 ; pointers (connected, current) (strip) + db $0c, $0a ; bigness, width + db $00, $13 ; alignments (y, x) + dw $c702 ; window + + ; end connection data + + dw $47b2 ; objects + +INCBIN "baserom.gbc",$507b2,$384e SECTION "bank15",DATA,BANK[$15] INCBIN "baserom.gbc",$54000,$4000 -- cgit v1.3.1-sl0p From 61eddd20194835cfb441a0a7b191fe54d9f4241f Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:35:02 -0600 Subject: IndigoPlateau_h map header asm hg-commit-id: 0152d9dd6897 --- pokered.asm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index eaa9e66f..3719f5f1 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13916,7 +13916,27 @@ Route25_h: ; 0x5079b to 0x507b2 (23 bytes) (id=36) dw $47b2 ; objects -INCBIN "baserom.gbc",$507b2,$384e +INCBIN "baserom.gbc",$507b2,$5091e - $507b2 + +IndigoPlateau_h: ; 0x5091e to 0x50935 (23 bytes) (id=9) + db $17 ; tileset + db $09, $0a ; dimensions (y, x) + dw $494a, $4936, $4935 ; blocks, texts, scripts + db SOUTH ; connections + + ; connections data + + db $22 ; some map + dw $43b2, $c7ab ; pointers (connected, current) (strip) + db $0a, $0a ; bigness, width + db $00, $00 ; alignments (y, x) + dw $c6f9 ; window + + ; end connection data + + dw $4936 ; objects + +INCBIN "baserom.gbc",$50935,$36cb SECTION "bank15",DATA,BANK[$15] INCBIN "baserom.gbc",$54000,$4000 -- cgit v1.3.1-sl0p From 9fddc533c2c1fbe9dc5132cbc084ed7ddfe5248f Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:35:32 -0600 Subject: SaffronCity_h map header asm hg-commit-id: de9e9f236834 --- pokered.asm | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 3719f5f1..08034a0b 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13936,7 +13936,45 @@ IndigoPlateau_h: ; 0x5091e to 0x50935 (23 bytes) (id=9) dw $4936 ; objects -INCBIN "baserom.gbc",$50935,$36cb +INCBIN "baserom.gbc",$50935,$509a4 - $50935 + +SaffronCity_h: ; 0x509a4 to 0x509dc (56 bytes) (id=10) + db $00 ; tileset + db $12, $14 ; dimensions (y, x) + dw $4a98, $4c03, $4c00 ; blocks, texts, scripts + db NORTH | SOUTH | WEST | EAST ; connections + + ; connections data + + db $10 ; some map + dw $4668, $c6f0 ; pointers (connected, current) (strip) + db $0a, $0a ; bigness, width + db $23, $f6 ; alignments (y, x) + dw $c809 ; window + + db $11 ; some map + dw $4079, $c912 ; pointers (connected, current) (strip) + db $0a, $0a ; bigness, width + db $00, $f6 ; alignments (y, x) + dw $c6f9 ; window + + db $12 ; some map + dw $4058, $c79e ; pointers (connected, current) (strip) + db $09, $0a ; bigness, width + db $f8, $13 ; alignments (y, x) + dw $c702 ; window + + db $13 ; some map + dw $41c6, $c7b5 ; pointers (connected, current) (strip) + db $09, $1e ; bigness, width + db $f8, $00 ; alignments (y, x) + dw $c70d ; window + + ; end connection data + + dw $49dc ; objects + +INCBIN "baserom.gbc",$509dc,$3624 SECTION "bank15",DATA,BANK[$15] INCBIN "baserom.gbc",$54000,$4000 -- cgit v1.3.1-sl0p From f088c3651e1f32addb1c1c778d8a6287543ee240 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:35:44 -0600 Subject: VictoryRoad2_h map header asm hg-commit-id: 690a5e820b4c --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 08034a0b..b01922db 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13974,7 +13974,17 @@ SaffronCity_h: ; 0x509a4 to 0x509dc (56 bytes) (id=10) dw $49dc ; objects -INCBIN "baserom.gbc",$509dc,$3624 +INCBIN "baserom.gbc",$509dc,$51791 - $509dc + +VictoryRoad2_h: ; 0x51791 to 0x5179d (12 bytes) (id=194) + db $11 ; tileset + db $09, $0f ; dimensions (y, x) + dw $59af, $581b, $579d ; blocks, texts, scripts + db $00 ; connections + + dw $5915 ; objects + +INCBIN "baserom.gbc",$5179d,$2863 SECTION "bank15",DATA,BANK[$15] INCBIN "baserom.gbc",$54000,$4000 -- cgit v1.3.1-sl0p From 61c52f5313d020e909649496821b81d6fd540629 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:35:56 -0600 Subject: MtMoon2_h map header asm hg-commit-id: 1c9814eb5d62 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index b01922db..0c23ef43 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13984,7 +13984,17 @@ VictoryRoad2_h: ; 0x51791 to 0x5179d (12 bytes) (id=194) dw $5915 ; objects -INCBIN "baserom.gbc",$5179d,$2863 +INCBIN "baserom.gbc",$5179d,$51a36 - $5179d + +MtMoon2_h: ; 0x51a36 to 0x51a42 (12 bytes) (id=60) + db $11 ; tileset + db $0e, $0e ; dimensions (y, x) + dw $5a91, $5a46, $5a42 ; blocks, texts, scripts + db $00 ; connections + + dw $5a4d ; objects + +INCBIN "baserom.gbc",$51a42,$25be SECTION "bank15",DATA,BANK[$15] INCBIN "baserom.gbc",$54000,$4000 -- cgit v1.3.1-sl0p From 327137322abb9a456fe1d4e6c23ab978cfd467b5 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:36:18 -0600 Subject: SilphCo7_h map header asm hg-commit-id: a354e4bb8782 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 0c23ef43..981bb492 100644 --- a/pokered.asm +++ b/pokered.asm @@ -13994,7 +13994,17 @@ MtMoon2_h: ; 0x51a36 to 0x51a42 (12 bytes) (id=60) dw $5a4d ; objects -INCBIN "baserom.gbc",$51a42,$25be +INCBIN "baserom.gbc",$51a42,$51b55 - $51a42 + +SilphCo7_h: ; 0x51b55 to 0x51b61 (12 bytes) (id=212) + db $16 ; tileset + db $09, $0d ; dimensions (y, x) + dw $5f57, $5d3f, $5b61 ; blocks, texts, scripts + db $00 ; connections + + dw $5ed7 ; objects + +INCBIN "baserom.gbc",$51b61,$249f SECTION "bank15",DATA,BANK[$15] INCBIN "baserom.gbc",$54000,$4000 -- cgit v1.3.1-sl0p From b4e4eb2e3bc9b01c8a149b10e6a8e78e544d2b65 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:36:36 -0600 Subject: Mansion2_h map header asm hg-commit-id: 9ef2adb44cfa --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 981bb492..e77012b7 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14004,7 +14004,17 @@ SilphCo7_h: ; 0x51b55 to 0x51b61 (12 bytes) (id=212) dw $5ed7 ; objects -INCBIN "baserom.gbc",$51b61,$249f +INCBIN "baserom.gbc",$51b61,$51fcc - $51b61 + +Mansion2_h: ; 0x51fcc to 0x51fd8 (12 bytes) (id=214) + db $16 ; tileset + db $0e, $0f ; dimensions (y, x) + dw $6110, $604d, $5fd8 ; blocks, texts, scripts + db $00 ; connections + + dw $60d1 ; objects + +INCBIN "baserom.gbc",$51fd8,$2028 SECTION "bank15",DATA,BANK[$15] INCBIN "baserom.gbc",$54000,$4000 -- cgit v1.3.1-sl0p From 97e1645c5bc73c0b8cc6fbbd1276ce0a6e70849f Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:36:48 -0600 Subject: Mansion3_h map header asm hg-commit-id: a8982dd55cfa --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index e77012b7..51074131 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14014,7 +14014,17 @@ Mansion2_h: ; 0x51fcc to 0x51fd8 (12 bytes) (id=214) dw $60d1 ; objects -INCBIN "baserom.gbc",$51fd8,$2028 +INCBIN "baserom.gbc",$51fd8,$521e2 - $51fd8 + +Mansion3_h: ; 0x521e2 to 0x521ee (12 bytes) (id=215) + db $16 ; tileset + db $09, $0f ; dimensions (y, x) + dw $6326, $628a, $61ee ; blocks, texts, scripts + db $00 ; connections + + dw $62e6 ; objects + +INCBIN "baserom.gbc",$521ee,$1e12 SECTION "bank15",DATA,BANK[$15] INCBIN "baserom.gbc",$54000,$4000 -- cgit v1.3.1-sl0p From a22300f099dd4cb792786c0793fdbc496abab822 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:37:00 -0600 Subject: Mansion4_h map header asm hg-commit-id: b154366f38c0 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 51074131..6d7ecd66 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14024,7 +14024,17 @@ Mansion3_h: ; 0x521e2 to 0x521ee (12 bytes) (id=215) dw $62e6 ; objects -INCBIN "baserom.gbc",$521ee,$1e12 +INCBIN "baserom.gbc",$521ee,$523ad - $521ee + +Mansion4_h: ; 0x523ad to 0x523b9 (12 bytes) (id=216) + db $16 ; tileset + db $0e, $0f ; dimensions (y, x) + dw $64dd, $6436, $63b9 ; blocks, texts, scripts + db $00 ; connections + + dw $6498 ; objects + +INCBIN "baserom.gbc",$523b9,$1c47 SECTION "bank15",DATA,BANK[$15] INCBIN "baserom.gbc",$54000,$4000 -- cgit v1.3.1-sl0p From d21e9e6ea6b4648cf7f7a1b705d965515794bd21 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:38:07 -0600 Subject: Route3_h map header asm hg-commit-id: bde13d6884f2 --- pokered.asm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 6d7ecd66..8d7b8e96 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14037,7 +14037,33 @@ Mansion4_h: ; 0x523ad to 0x523b9 (12 bytes) (id=216) INCBIN "baserom.gbc",$523b9,$1c47 SECTION "bank15",DATA,BANK[$15] -INCBIN "baserom.gbc",$54000,$4000 +INCBIN "baserom.gbc",$54000,$541e6 - $54000 + +Route3_h: ; 0x541e6 to 0x54208 (34 bytes) (id=14) + db $00 ; tileset + db $09, $23 ; dimensions (y, x) + dw $4255, $5511, $54f8 ; blocks, texts, scripts + db NORTH | WEST ; connections + + ; connections data + + db $0f ; some map + dw $44fa, $c704 ; pointers (connected, current) (strip) + db $0d, $2d ; bigness, width + db $11, $ce ; alignments (y, x) + dw $c8b4 ; window + + db $02 ; some map + dw $460b, $c6e8 ; pointers (connected, current) (strip) + db $0f, $14 ; bigness, width + db $08, $27 ; alignments (y, x) + dw $c716 ; window + + ; end connection data + + dw $4208 ; objects + +INCBIN "baserom.gbc",$54208,$3df8 SECTION "bank16",DATA,BANK[$16] INCBIN "baserom.gbc",$58000,$4000 -- cgit v1.3.1-sl0p From 3fb4c2040cc8720ac51147cc2ad62704b9cff87d Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:38:24 -0600 Subject: Route4_h map header asm hg-commit-id: dab48de0bc87 --- pokered.asm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 8d7b8e96..586577fb 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14063,7 +14063,33 @@ Route3_h: ; 0x541e6 to 0x54208 (34 bytes) (id=14) dw $4208 ; objects -INCBIN "baserom.gbc",$54208,$3df8 +INCBIN "baserom.gbc",$54208,$54390 - $54208 + +Route4_h: ; 0x54390 to 0x543b2 (34 bytes) (id=15) + db $00 ; tileset + db $09, $2d ; dimensions (y, x) + dw $43ec, $5671, $5658 ; blocks, texts, scripts + db SOUTH | EAST ; connections + + ; connections data + + db $0e ; some map + dw $426b, $c94c ; pointers (connected, current) (strip) + db $0d, $23 ; bigness, width + db $00, $32 ; alignments (y, x) + dw $c712 ; window + + db $03 ; some map + dw $4844, $c718 ; pointers (connected, current) (strip) + db $0f, $14 ; bigness, width + db $08, $00 ; alignments (y, x) + dw $c703 ; window + + ; end connection data + + dw $43b2 ; objects + +INCBIN "baserom.gbc",$543b2,$3c4e SECTION "bank16",DATA,BANK[$16] INCBIN "baserom.gbc",$58000,$4000 -- cgit v1.3.1-sl0p From 7b808facb54d87f81116e8d55acbd598733383ad Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:38:37 -0600 Subject: Route5_h map header asm hg-commit-id: 90e1b29b5087 --- pokered.asm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 586577fb..0d2d34d3 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14089,7 +14089,33 @@ Route4_h: ; 0x54390 to 0x543b2 (34 bytes) (id=15) dw $43b2 ; objects -INCBIN "baserom.gbc",$543b2,$3c4e +INCBIN "baserom.gbc",$543b2,$54581 - $543b2 + +Route5_h: ; 0x54581 to 0x545a3 (34 bytes) (id=16) + db $00 ; tileset + db $12, $0a ; dimensions (y, x) + dw $45d2, $56b5, $56b2 ; blocks, texts, scripts + db NORTH | SOUTH ; connections + + ; connections data + + db $03 ; some map + dw $495e, $c6e8 ; pointers (connected, current) (strip) + db $10, $14 ; bigness, width + db $23, $0a ; alignments (y, x) + dw $c8bd ; window + + db $0a ; some map + dw $4a9a, $c838 ; pointers (connected, current) (strip) + db $10, $14 ; bigness, width + db $00, $0a ; alignments (y, x) + dw $c703 ; window + + ; end connection data + + dw $45a3 ; objects + +INCBIN "baserom.gbc",$545a3,$3a5d SECTION "bank16",DATA,BANK[$16] INCBIN "baserom.gbc",$58000,$4000 -- cgit v1.3.1-sl0p From ec5132659bef0dc5a4216f94417d9f090f4a3819 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:38:52 -0600 Subject: Route9_h map header asm hg-commit-id: d48d63982d89 --- pokered.asm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 0d2d34d3..76bb5cab 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14115,7 +14115,33 @@ Route5_h: ; 0x54581 to 0x545a3 (34 bytes) (id=16) dw $45a3 ; objects -INCBIN "baserom.gbc",$545a3,$3a5d +INCBIN "baserom.gbc",$545a3,$54686 - $545a3 + +Route9_h: ; 0x54686 to 0x546a8 (34 bytes) (id=20) + db $00 ; tileset + db $09, $1e ; dimensions (y, x) + dw $46fe, $56d5, $56bc ; blocks, texts, scripts + db WEST | EAST ; connections + + ; connections data + + db $03 ; some map + dw $4855, $c6e8 ; pointers (connected, current) (strip) + db $0f, $14 ; bigness, width + db $08, $27 ; alignments (y, x) + dw $c716 ; window + + db $15 ; some map + dw $4356, $c775 ; pointers (connected, current) (strip) + db $0c, $0a ; bigness, width + db $00, $00 ; alignments (y, x) + dw $c6f9 ; window + + ; end connection data + + dw $46a8 ; objects + +INCBIN "baserom.gbc",$546a8,$3958 SECTION "bank16",DATA,BANK[$16] INCBIN "baserom.gbc",$58000,$4000 -- cgit v1.3.1-sl0p From 1903a382d215336e729b235ca1f2ce88eaae3358 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:39:05 -0600 Subject: Route13_h map header asm hg-commit-id: eba4c07f92c0 --- pokered.asm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 76bb5cab..36ca8f16 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14141,7 +14141,33 @@ Route9_h: ; 0x54686 to 0x546a8 (34 bytes) (id=20) dw $46a8 ; objects -INCBIN "baserom.gbc",$546a8,$3958 +INCBIN "baserom.gbc",$546a8,$5480c - $546a8 + +Route13_h: ; 0x5480c to 0x5482e (34 bytes) (id=24) + db $00 ; tileset + db $09, $1e ; dimensions (y, x) + dw $488b, $5837, $581e ; blocks, texts, scripts + db NORTH | WEST ; connections + + ; connections data + + db $17 ; some map + dw $490e, $c6ff ; pointers (connected, current) (strip) + db $0a, $0a ; bigness, width + db $6b, $d8 ; alignments (y, x) + dw $ca49 ; window + + db $19 ; some map + dw $4a19, $c754 ; pointers (connected, current) (strip) + db $0c, $0a ; bigness, width + db $00, $13 ; alignments (y, x) + dw $c702 ; window + + ; end connection data + + dw $482e ; objects + +INCBIN "baserom.gbc",$5482e,$37d2 SECTION "bank16",DATA,BANK[$16] INCBIN "baserom.gbc",$58000,$4000 -- cgit v1.3.1-sl0p From 06894d07a9f0276759f1aa82df828ca3ae27cbb2 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:39:18 -0600 Subject: Route14_h map header asm hg-commit-id: 08e4c4c4addf --- pokered.asm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 36ca8f16..dd0b82af 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14167,7 +14167,33 @@ Route13_h: ; 0x5480c to 0x5482e (34 bytes) (id=24) dw $482e ; objects -INCBIN "baserom.gbc",$5482e,$37d2 +INCBIN "baserom.gbc",$5482e,$54999 - $5482e + +Route14_h: ; 0x54999 to 0x549bb (34 bytes) (id=25) + db $00 ; tileset + db $1b, $0a ; dimensions (y, x) + dw $4a12, $59ec, $59d3 ; blocks, texts, scripts + db WEST | EAST ; connections + + ; connections data + + db $1a ; some map + dw $49e7, $c838 ; pointers (connected, current) (strip) + db $09, $1e ; bigness, width + db $dc, $3b ; alignments (y, x) + dw $c72a ; window + + db $18 ; some map + dw $488b, $c725 ; pointers (connected, current) (strip) + db $09, $1e ; bigness, width + db $00, $00 ; alignments (y, x) + dw $c70d ; window + + ; end connection data + + dw $49bb ; objects + +INCBIN "baserom.gbc",$549bb,$3645 SECTION "bank16",DATA,BANK[$16] INCBIN "baserom.gbc",$58000,$4000 -- cgit v1.3.1-sl0p From 6de52e9ecb073994291f5888eadd76c333bf499e Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:39:33 -0600 Subject: Route17_h map header asm hg-commit-id: 5fd4c45f2dd7 --- pokered.asm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index dd0b82af..1871fff6 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14193,7 +14193,33 @@ Route14_h: ; 0x54999 to 0x549bb (34 bytes) (id=25) dw $49bb ; objects -INCBIN "baserom.gbc",$549bb,$3645 +INCBIN "baserom.gbc",$549bb,$54b20 - $549bb + +Route17_h: ; 0x54b20 to 0x54b42 (34 bytes) (id=28) + db $00 ; tileset + db $48, $0a ; dimensions (y, x) + dw $4ba8, $5b93, $5b7a ; blocks, texts, scripts + db NORTH | SOUTH ; connections + + ; connections data + + db $1b ; some map + dw $4bfc, $c6eb ; pointers (connected, current) (strip) + db $0d, $14 ; bigness, width + db $11, $00 ; alignments (y, x) + dw $c7d3 ; window + + db $1d ; some map + dw $4c9c, $cb9b ; pointers (connected, current) (strip) + db $0d, $19 ; bigness, width + db $00, $00 ; alignments (y, x) + dw $c708 ; window + + ; end connection data + + dw $4b42 ; objects + +INCBIN "baserom.gbc",$54b42,$34be SECTION "bank16",DATA,BANK[$16] INCBIN "baserom.gbc",$58000,$4000 -- cgit v1.3.1-sl0p From 6681e6816f5c539ddcf8f029fcdd0988d7fd2b86 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:39:54 -0600 Subject: Route19_h map header asm hg-commit-id: 97a8360c187d --- pokered.asm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 1871fff6..251193d0 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14219,7 +14219,33 @@ Route17_h: ; 0x54b20 to 0x54b42 (34 bytes) (id=28) dw $4b42 ; objects -INCBIN "baserom.gbc",$54b42,$34be +INCBIN "baserom.gbc",$54b42,$54e78 - $54b42 + +Route19_h: ; 0x54e78 to 0x54e9a (34 bytes) (id=30) + db $00 ; tileset + db $1b, $0a ; dimensions (y, x) + dw $4ef1, $5d5d, $5d44 ; blocks, texts, scripts + db NORTH | WEST ; connections + + ; connections data + + db $07 ; some map + dw $4db4, $c6e8 ; pointers (connected, current) (strip) + db $10, $14 ; bigness, width + db $23, $0a ; alignments (y, x) + dw $c8bd ; window + + db $1f ; some map + dw $41ac, $c838 ; pointers (connected, current) (strip) + db $09, $32 ; bigness, width + db $dc, $63 ; alignments (y, x) + dw $c752 ; window + + ; end connection data + + dw $4e9a ; objects + +INCBIN "baserom.gbc",$54e9a,$3166 SECTION "bank16",DATA,BANK[$16] INCBIN "baserom.gbc",$58000,$4000 -- cgit v1.3.1-sl0p From e73f3ad27b6e8c6331dba20dd49006fcb8e5f462 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:40:08 -0600 Subject: Route21_h map header asm hg-commit-id: adf71591a4bf --- pokered.asm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 251193d0..2a2ad3c2 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14245,7 +14245,33 @@ Route19_h: ; 0x54e78 to 0x54e9a (34 bytes) (id=30) dw $4e9a ; objects -INCBIN "baserom.gbc",$54e9a,$3166 +INCBIN "baserom.gbc",$54e9a,$54fff - $54e9a + +Route21_h: ; 0x54fff to 0x55021 (34 bytes) (id=32) + db $00 ; tileset + db $2d, $0a ; dimensions (y, x) + dw $506d, $5f04, $5eeb ; blocks, texts, scripts + db NORTH | SOUTH ; connections + + ; connections data + + db $00 ; some map + dw $4339, $c6eb ; pointers (connected, current) (strip) + db $0a, $0a ; bigness, width + db $11, $00 ; alignments (y, x) + dw $c779 ; window + + db $08 ; some map + dw $4069, $c9eb ; pointers (connected, current) (strip) + db $0a, $0a ; bigness, width + db $00, $00 ; alignments (y, x) + dw $c6f9 ; window + + ; end connection data + + dw $5021 ; objects + +INCBIN "baserom.gbc",$55021,$2fdf SECTION "bank16",DATA,BANK[$16] INCBIN "baserom.gbc",$58000,$4000 -- cgit v1.3.1-sl0p From c7ce3745bc568e38b11fad9ab69793ca61747a35 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:40:36 -0600 Subject: VermilionHouse2_h map header asm hg-commit-id: 0d0ae11cc391 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 2a2ad3c2..bfcf9876 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14271,7 +14271,17 @@ Route21_h: ; 0x54fff to 0x55021 (34 bytes) (id=32) dw $5021 ; objects -INCBIN "baserom.gbc",$55021,$2fdf +INCBIN "baserom.gbc",$55021,$56064 - $55021 + +VermilionHouse2_h: ; 0x56064 to 0x56070 (12 bytes) (id=163) + db $08 ; tileset + db $04, $04 ; dimensions (y, x) + dw $522f, $6073, $6070 ; blocks, texts, scripts + db $00 ; connections + + dw $60cf ; objects + +INCBIN "baserom.gbc",$56070,$1f90 SECTION "bank16",DATA,BANK[$16] INCBIN "baserom.gbc",$58000,$4000 -- cgit v1.3.1-sl0p From d38155d1546e00ee95f31706122db5223faa9309 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:40:49 -0600 Subject: CeladonMart2_h map header asm hg-commit-id: c56c4a6d9c1b --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index bfcf9876..3c7ba663 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14281,7 +14281,17 @@ VermilionHouse2_h: ; 0x56064 to 0x56070 (12 bytes) (id=163) dw $60cf ; objects -INCBIN "baserom.gbc",$56070,$1f90 +INCBIN "baserom.gbc",$56070,$560e9 - $56070 + +CeladonMart2_h: ; 0x560e9 to 0x560f5 (12 bytes) (id=123) + db $12 ; tileset + db $04, $0a ; dimensions (y, x) + dw $6148, $60f8, $60f5 ; blocks, texts, scripts + db $00 ; connections + + dw $6111 ; objects + +INCBIN "baserom.gbc",$560f5,$1f0b SECTION "bank16",DATA,BANK[$16] INCBIN "baserom.gbc",$58000,$4000 -- cgit v1.3.1-sl0p From d08421069bbd108c9af46759e7a6a4326341b906 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:41:02 -0600 Subject: FuchsiaHouse3_h map header asm hg-commit-id: d530ea3f8d31 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 3c7ba663..0a5c19da 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14291,7 +14291,17 @@ CeladonMart2_h: ; 0x560e9 to 0x560f5 (12 bytes) (id=123) dw $6111 ; objects -INCBIN "baserom.gbc",$560f5,$1f0b +INCBIN "baserom.gbc",$560f5,$56170 - $560f5 + +FuchsiaHouse3_h: ; 0x56170 to 0x5617c (12 bytes) (id=164) + db $0d ; tileset + db $04, $04 ; dimensions (y, x) + dw $523f, $617f, $617c ; blocks, texts, scripts + db $00 ; connections + + dw $6221 ; objects + +INCBIN "baserom.gbc",$5617c,$1e84 SECTION "bank16",DATA,BANK[$16] INCBIN "baserom.gbc",$58000,$4000 -- cgit v1.3.1-sl0p From eb136db9128e4f7a3901c77b57ba265eccd0939f Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:41:22 -0600 Subject: DayCareM_h map header asm hg-commit-id: b4df17b2d559 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 0a5c19da..c8431f6e 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14301,7 +14301,17 @@ FuchsiaHouse3_h: ; 0x56170 to 0x5617c (12 bytes) (id=164) dw $6221 ; objects -INCBIN "baserom.gbc",$5617c,$1e84 +INCBIN "baserom.gbc",$5617c,$56243 - $5617c + +DayCareM_h: ; 0x56243 to 0x5624f (12 bytes) (id=72) + db $08 ; tileset + db $04, $04 ; dimensions (y, x) + dw $522f, $6252, $624f ; blocks, texts, scripts + db $00 ; connections + + dw $6459 ; objects + +INCBIN "baserom.gbc",$5624f,$1db1 SECTION "bank16",DATA,BANK[$16] INCBIN "baserom.gbc",$58000,$4000 -- cgit v1.3.1-sl0p From bf1904c6219cdfcf2dff452875cc880c265660c6 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:41:35 -0600 Subject: Route12House_h map header asm hg-commit-id: 7672dbd59973 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index c8431f6e..d88280f6 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14311,7 +14311,17 @@ DayCareM_h: ; 0x56243 to 0x5624f (12 bytes) (id=72) dw $6459 ; objects -INCBIN "baserom.gbc",$5624f,$1db1 +INCBIN "baserom.gbc",$5624f,$56473 - $5624f + +Route12House_h: ; 0x56473 to 0x5647f (12 bytes) (id=189) + db $08 ; tileset + db $04, $04 ; dimensions (y, x) + dw $522f, $6482, $647f ; blocks, texts, scripts + db $00 ; connections + + dw $64de ; objects + +INCBIN "baserom.gbc",$5647f,$1b81 SECTION "bank16",DATA,BANK[$16] INCBIN "baserom.gbc",$58000,$4000 -- cgit v1.3.1-sl0p From 1c8ab91381e66cf682469bc242a3f68286c5ddd7 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:41:48 -0600 Subject: SilphCo8_h map header asm hg-commit-id: 76e3009ea769 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index d88280f6..463558ad 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14321,7 +14321,17 @@ Route12House_h: ; 0x56473 to 0x5647f (12 bytes) (id=189) dw $64de ; objects -INCBIN "baserom.gbc",$5647f,$1b81 +INCBIN "baserom.gbc",$5647f,$564f8 - $5647f + +SilphCo8_h: ; 0x564f8 to 0x56504 (12 bytes) (id=213) + db $16 ; tileset + db $09, $0d ; dimensions (y, x) + dw $666d, $657d, $6504 ; blocks, texts, scripts + db $00 ; connections + + dw $6613 ; objects + +INCBIN "baserom.gbc",$56504,$1afc SECTION "bank16",DATA,BANK[$16] INCBIN "baserom.gbc",$58000,$4000 -- cgit v1.3.1-sl0p From d72c0580e8af0696f872f9ff90a3c502ed5113a5 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:42:00 -0600 Subject: Route6_h map header asm hg-commit-id: e2bff47bab46 --- pokered.asm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 463558ad..a8ab4df1 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14334,7 +14334,31 @@ SilphCo8_h: ; 0x564f8 to 0x56504 (12 bytes) (id=213) INCBIN "baserom.gbc",$56504,$1afc SECTION "bank16",DATA,BANK[$16] -INCBIN "baserom.gbc",$58000,$4000 +Route6_h: ; 0x58000 to 0x58022 (34 bytes) (id=17) + db $00 ; tileset + db $12, $0a ; dimensions (y, x) + dw $4079, $50c9, $50b0 ; blocks, texts, scripts + db NORTH | SOUTH ; connections + + ; connections data + + db $0a ; some map + dw $4bc6, $c6e8 ; pointers (connected, current) (strip) + db $10, $14 ; bigness, width + db $23, $0a ; alignments (y, x) + dw $c8bd ; window + + db $05 ; some map + dw $4a41, $c838 ; pointers (connected, current) (strip) + db $10, $14 ; bigness, width + db $00, $0a ; alignments (y, x) + dw $c703 ; window + + ; end connection data + + dw $4022 ; objects + +INCBIN "baserom.gbc",$58022,$3fde SECTION "bank17",DATA,BANK[$17] -- cgit v1.3.1-sl0p From 685032a6c68903df04d4e0a7ec284f7a5582d542 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:42:11 -0600 Subject: Route8_h map header asm hg-commit-id: f3c067d277c6 --- pokered.asm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index a8ab4df1..b7576497 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14358,7 +14358,33 @@ Route6_h: ; 0x58000 to 0x58022 (34 bytes) (id=17) dw $4022 ; objects -INCBIN "baserom.gbc",$58022,$3fde +INCBIN "baserom.gbc",$58022,$5812d - $58022 + +Route8_h: ; 0x5812d to 0x5814f (34 bytes) (id=19) + db $00 ; tileset + db $09, $1e ; dimensions (y, x) + dw $41c6, $51cf, $51b6 ; blocks, texts, scripts + db WEST | EAST ; connections + + ; connections data + + db $0a ; some map + dw $4abd, $c6e8 ; pointers (connected, current) (strip) + db $0f, $14 ; bigness, width + db $08, $27 ; alignments (y, x) + dw $c716 ; window + + db $04 ; some map + dw $4085, $c775 ; pointers (connected, current) (strip) + db $09, $0a ; bigness, width + db $00, $00 ; alignments (y, x) + dw $c6f9 ; window + + ; end connection data + + dw $414f ; objects + +INCBIN "baserom.gbc",$5814f,$3eb1 SECTION "bank17",DATA,BANK[$17] -- cgit v1.3.1-sl0p From 713df76608ecc98137b069cc580f3951808db123 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:42:30 -0600 Subject: Route10_h map header asm hg-commit-id: 9d78c4dcd443 --- pokered.asm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index b7576497..a6a853c5 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14384,7 +14384,33 @@ Route8_h: ; 0x5812d to 0x5814f (34 bytes) (id=19) dw $414f ; objects -INCBIN "baserom.gbc",$5814f,$3eb1 +INCBIN "baserom.gbc",$5814f,$582d4 - $5814f + +Route10_h: ; 0x582d4 to 0x582f6 (34 bytes) (id=21) + db $00 ; tileset + db $24, $0a ; dimensions (y, x) + dw $4356, $534f, $5336 ; blocks, texts, scripts + db SOUTH | WEST ; connections + + ; connections data + + db $04 ; some map + dw $4085, $c95b ; pointers (connected, current) (strip) + db $0a, $0a ; bigness, width + db $00, $00 ; alignments (y, x) + dw $c6f9 ; window + + db $14 ; some map + dw $4719, $c718 ; pointers (connected, current) (strip) + db $09, $1e ; bigness, width + db $00, $3b ; alignments (y, x) + dw $c72a ; window + + ; end connection data + + dw $42f6 ; objects + +INCBIN "baserom.gbc",$582f6,$3d0a SECTION "bank17",DATA,BANK[$17] -- cgit v1.3.1-sl0p From 87303d24319220e059ffc21ada2c54829b5103dd Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:42:49 -0600 Subject: Route11_h map header asm hg-commit-id: ca60ba33d184 --- pokered.asm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index a6a853c5..37c1e139 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14410,7 +14410,33 @@ Route10_h: ; 0x582d4 to 0x582f6 (34 bytes) (id=21) dw $42f6 ; objects -INCBIN "baserom.gbc",$582f6,$3d0a +INCBIN "baserom.gbc",$582f6,$584be - $582f6 + +Route11_h: ; 0x584be to 0x584e0 (34 bytes) (id=22) + db $00 ; tileset + db $09, $1e ; dimensions (y, x) + dw $455f, $5465, $544c ; blocks, texts, scripts + db WEST | EAST ; connections + + ; connections data + + db $05 ; some map + dw $4a64, $c6e8 ; pointers (connected, current) (strip) + db $0f, $14 ; bigness, width + db $08, $27 ; alignments (y, x) + dw $c716 ; window + + db $17 ; some map + dw $4800, $c709 ; pointers (connected, current) (strip) + db $0f, $0a ; bigness, width + db $36, $00 ; alignments (y, x) + dw $c6f9 ; window + + ; end connection data + + dw $44e0 ; objects + +INCBIN "baserom.gbc",$584e0,$3b20 SECTION "bank17",DATA,BANK[$17] -- cgit v1.3.1-sl0p From 59042213a6bb81f7f34672c5d56ea33360a8060e Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:43:02 -0600 Subject: Route12_h map header asm hg-commit-id: 638284765aaf --- pokered.asm | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 37c1e139..3cff870e 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14436,7 +14436,39 @@ Route11_h: ; 0x584be to 0x584e0 (34 bytes) (id=22) dw $44e0 ; objects -INCBIN "baserom.gbc",$584e0,$3b20 +INCBIN "baserom.gbc",$584e0,$5866d - $584e0 + +Route12_h: ; 0x5866d to 0x5869a (45 bytes) (id=23) + db $00 ; tileset + db $36, $0a ; dimensions (y, x) + dw $4710, $5675, $55f3 ; blocks, texts, scripts + db NORTH | SOUTH | WEST ; connections + + ; connections data + + db $04 ; some map + dw $40c1, $c6eb ; pointers (connected, current) (strip) + db $0a, $0a ; bigness, width + db $11, $00 ; alignments (y, x) + dw $c779 ; window + + db $18 ; some map + dw $489c, $ca78 ; pointers (connected, current) (strip) + db $0d, $1e ; bigness, width + db $00, $28 ; alignments (y, x) + dw $c70d ; window + + db $16 ; some map + dw $457a, $c8c8 ; pointers (connected, current) (strip) + db $09, $1e ; bigness, width + db $ca, $3b ; alignments (y, x) + dw $c72a ; window + + ; end connection data + + dw $469a ; objects + +INCBIN "baserom.gbc",$5869a,$3966 SECTION "bank17",DATA,BANK[$17] -- cgit v1.3.1-sl0p From 1ada9c423e50c083d3c71704627f6091cad5fcdc Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:43:18 -0600 Subject: Route15_h map header asm hg-commit-id: 31ced8b1f80d --- pokered.asm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 3cff870e..550e2648 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14468,7 +14468,33 @@ Route12_h: ; 0x5866d to 0x5869a (45 bytes) (id=23) dw $469a ; objects -INCBIN "baserom.gbc",$5869a,$3966 +INCBIN "baserom.gbc",$5869a,$5892c - $5869a + +Route15_h: ; 0x5892c to 0x5894e (34 bytes) (id=26) + db $00 ; tileset + db $09, $1e ; dimensions (y, x) + dw $49cc, $57c7, $57ae ; blocks, texts, scripts + db WEST | EAST ; connections + + ; connections data + + db $07 ; some map + dw $4cab, $c6e8 ; pointers (connected, current) (strip) + db $0f, $14 ; bigness, width + db $08, $27 ; alignments (y, x) + dw $c716 ; window + + db $19 ; some map + dw $4aa8, $c709 ; pointers (connected, current) (strip) + db $0c, $0a ; bigness, width + db $24, $00 ; alignments (y, x) + dw $c6f9 ; window + + ; end connection data + + dw $494e ; objects + +INCBIN "baserom.gbc",$5894e,$36b2 SECTION "bank17",DATA,BANK[$17] -- cgit v1.3.1-sl0p From 65ab8b5f27279915f028ed0816bdeeb90d3f9252 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:43:32 -0600 Subject: Route16_h map header asm hg-commit-id: 0541575da0f2 --- pokered.asm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 550e2648..3cb0d20f 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14494,7 +14494,33 @@ Route15_h: ; 0x5892c to 0x5894e (34 bytes) (id=26) dw $494e ; objects -INCBIN "baserom.gbc",$5894e,$36b2 +INCBIN "baserom.gbc",$5894e,$58ada - $5894e + +Route16_h: ; 0x58ada to 0x58afc (34 bytes) (id=27) + db $00 ; tileset + db $09, $14 ; dimensions (y, x) + dw $4b84, $59b9, $5933 ; blocks, texts, scripts + db SOUTH | EAST ; connections + + ; connections data + + db $1c ; some map + dw $4ba8, $c823 ; pointers (connected, current) (strip) + db $0a, $0a ; bigness, width + db $00, $00 ; alignments (y, x) + dw $c6f9 ; window + + db $06 ; some map + dw $40f8, $c6ff ; pointers (connected, current) (strip) + db $0f, $19 ; bigness, width + db $08, $00 ; alignments (y, x) + dw $c708 ; window + + ; end connection data + + dw $4afc ; objects + +INCBIN "baserom.gbc",$58afc,$3504 SECTION "bank17",DATA,BANK[$17] -- cgit v1.3.1-sl0p From 4a2a1b1c44fa0ded3d47b62ebc76f78609fd4d34 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:43:47 -0600 Subject: Route18_h map header asm hg-commit-id: e64b2245b81f --- pokered.asm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 3cb0d20f..4bbbe892 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14520,7 +14520,33 @@ Route16_h: ; 0x58ada to 0x58afc (34 bytes) (id=27) dw $4afc ; objects -INCBIN "baserom.gbc",$58afc,$3504 +INCBIN "baserom.gbc",$58afc,$58c38 - $58afc + +Route18_h: ; 0x58c38 to 0x58c5a (34 bytes) (id=29) + db $00 ; tileset + db $09, $19 ; dimensions (y, x) + dw $4c9c, $5ae0, $5ac7 ; blocks, texts, scripts + db NORTH | EAST ; connections + + ; connections data + + db $1c ; some map + dw $4e5a, $c6eb ; pointers (connected, current) (strip) + db $0a, $0a ; bigness, width + db $8f, $00 ; alignments (y, x) + dw $cb69 ; window + + db $07 ; some map + dw $4c9a, $c704 ; pointers (connected, current) (strip) + db $0f, $14 ; bigness, width + db $08, $00 ; alignments (y, x) + dw $c703 ; window + + ; end connection data + + dw $4c5a ; objects + +INCBIN "baserom.gbc",$58c5a,$33a6 SECTION "bank17",DATA,BANK[$17] -- cgit v1.3.1-sl0p From 830858d5f1992b0aceb172cb7233d1d213cf3650 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:44:00 -0600 Subject: FanClub_h map header asm hg-commit-id: 00085416e0b6 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 4bbbe892..782f0d9e 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14546,7 +14546,17 @@ Route18_h: ; 0x58c38 to 0x58c5a (34 bytes) (id=29) dw $4c5a ; objects -INCBIN "baserom.gbc",$58c5a,$33a6 +INCBIN "baserom.gbc",$58c5a,$59b64 - $58c5a + +FanClub_h: ; 0x59b64 to 0x59b70 (12 bytes) (id=90) + db $10 ; tileset + db $04, $04 ; dimensions (y, x) + dw $5cd5, $5b84, $5b70 ; blocks, texts, scripts + db $00 ; connections + + dw $5c97 ; objects + +INCBIN "baserom.gbc",$59b70,$2490 SECTION "bank17",DATA,BANK[$17] -- cgit v1.3.1-sl0p From e0cf4846fa7d5213cb333aeb94b42688f72633a0 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:44:20 -0600 Subject: SilphCo2_h map header asm hg-commit-id: 8a6fc721e409 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 782f0d9e..2417d50e 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14556,7 +14556,17 @@ FanClub_h: ; 0x59b64 to 0x59b70 (12 bytes) (id=90) dw $5c97 ; objects -INCBIN "baserom.gbc",$59b70,$2490 +INCBIN "baserom.gbc",$59b70,$59ce5 - $59b70 + +SilphCo2_h: ; 0x59ce5 to 0x59cf1 (12 bytes) (id=207) + db $16 ; tileset + db $09, $0f ; dimensions (y, x) + dw $5ec8, $5d86, $5cf1 ; blocks, texts, scripts + db $00 ; connections + + dw $5e66 ; objects + +INCBIN "baserom.gbc",$59cf1,$230f SECTION "bank17",DATA,BANK[$17] -- cgit v1.3.1-sl0p From a31fd9a864b5037c6121efed94bcce9b8a7a3d77 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:44:33 -0600 Subject: SilphCo3_h map header asm hg-commit-id: 3fc04c4e613c --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 2417d50e..695a1d79 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14566,7 +14566,17 @@ SilphCo2_h: ; 0x59ce5 to 0x59cf1 (12 bytes) (id=207) dw $5e66 ; objects -INCBIN "baserom.gbc",$59cf1,$230f +INCBIN "baserom.gbc",$59cf1,$59f4f - $59cf1 + +SilphCo3_h: ; 0x59f4f to 0x59f5b (12 bytes) (id=208) + db $16 ; tileset + db $09, $0f ; dimensions (y, x) + dw $60a6, $5fc4, $5f5b ; blocks, texts, scripts + db $00 ; connections + + dw $6035 ; objects + +INCBIN "baserom.gbc",$59f5b,$20a5 SECTION "bank17",DATA,BANK[$17] -- cgit v1.3.1-sl0p From bf11d84c52b5cc234f941a058bb8feab842b579c Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:44:52 -0600 Subject: SilphCo10_h map header asm hg-commit-id: 367cc7d43d34 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 695a1d79..3b9f68e3 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14576,7 +14576,17 @@ SilphCo3_h: ; 0x59f4f to 0x59f5b (12 bytes) (id=208) dw $6035 ; objects -INCBIN "baserom.gbc",$59f5b,$20a5 +INCBIN "baserom.gbc",$59f5b,$5a12d - $59f5b + +SilphCo10_h: ; 0x5a12d to 0x5a139 (12 bytes) (id=234) + db $16 ; tileset + db $09, $08 ; dimensions (y, x) + dw $625a, $6186, $6139 ; blocks, texts, scripts + db $00 ; connections + + dw $61fb ; objects + +INCBIN "baserom.gbc",$5a139,$1ec7 SECTION "bank17",DATA,BANK[$17] -- cgit v1.3.1-sl0p From 728854ef7978c074d1f0cb83bc2df372a77eaff9 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:45:06 -0600 Subject: Lance_h map header asm hg-commit-id: 5b12291d3ac0 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 3b9f68e3..2f93545a 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14586,7 +14586,17 @@ SilphCo10_h: ; 0x5a12d to 0x5a139 (12 bytes) (id=234) dw $61fb ; objects -INCBIN "baserom.gbc",$5a139,$1ec7 +INCBIN "baserom.gbc",$5a139,$5a2a2 - $5a139 + +Lance_h: ; 0x5a2a2 to 0x5a2ae (12 bytes) (id=113) + db $05 ; tileset + db $0d, $0d ; dimensions (y, x) + dw $63e9, $6395, $62ae ; blocks, texts, scripts + db $00 ; connections + + dw $63c5 ; objects + +INCBIN "baserom.gbc",$5a2ae,$1d52 SECTION "bank17",DATA,BANK[$17] -- cgit v1.3.1-sl0p From 264445d4a2d26d03685fcd7ecc9d4d9bbf5c1da4 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:45:17 -0600 Subject: HallofFameRoom_h map header asm hg-commit-id: 7f4c6f1b5a10 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 2f93545a..9516e1ec 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14596,7 +14596,17 @@ Lance_h: ; 0x5a2a2 to 0x5a2ae (12 bytes) (id=113) dw $63c5 ; objects -INCBIN "baserom.gbc",$5a2ae,$1d52 +INCBIN "baserom.gbc",$5a2ae,$5a492 - $5a2ae + +HallofFameRoom_h: ; 0x5a492 to 0x5a49e (12 bytes) (id=118) + db $07 ; tileset + db $04, $05 ; dimensions (y, x) + dw $658b, $656a, $649e ; blocks, texts, scripts + db $00 ; connections + + dw $6571 ; objects + +INCBIN "baserom.gbc",$5a49e,$1b62 SECTION "bank17",DATA,BANK[$17] -- cgit v1.3.1-sl0p From 4f772b5ad95d333957bf415d81a852de2879ba9e Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:45:35 -0600 Subject: MuseumF1_h map header asm hg-commit-id: 17f5c5ba0a40 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 9516e1ec..b041349a 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14661,7 +14661,17 @@ RedsHouse2FObject: dw $C6EF + 4 + (4 + 6) * 0 + 3 db 1,7 -INCBIN "baserom.gbc",$5C0DC,$4000-$DC +INCBIN "baserom.gbc",$5c0dc,$5c0eb - $5c0dc + +MuseumF1_h: ; 0x5c0eb to 0x5c0f7 (12 bytes) (id=52) + db $0a ; tileset + db $04, $0a ; dimensions (y, x) + dw $4020, $412b, $40f7 ; blocks, texts, scripts + db $00 ; connections + + dw $42c1 ; objects + +INCBIN "baserom.gbc",$5c0f7,$3f09 SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From 06b69a3c7f85f7b2ce4d47c9b23cc9c9644984d2 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:45:47 -0600 Subject: MuseumF2_h map header asm hg-commit-id: 68cdf9b2dcd7 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index b041349a..88232409 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14671,7 +14671,17 @@ MuseumF1_h: ; 0x5c0eb to 0x5c0f7 (12 bytes) (id=52) dw $42c1 ; objects -INCBIN "baserom.gbc",$5c0f7,$3f09 +INCBIN "baserom.gbc",$5c0f7,$5c30b - $5c0f7 + +MuseumF2_h: ; 0x5c30b to 0x5c317 (12 bytes) (id=53) + db $0a ; tileset + db $04, $07 ; dimensions (y, x) + dw $4048, $431a, $4317 ; blocks, texts, scripts + db $00 ; connections + + dw $434b ; objects + +INCBIN "baserom.gbc",$5c317,$3ce9 SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From 9bd1fd050edf0d789f898cb6aabf9b30ef9d6c09 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:46:00 -0600 Subject: PewterGym_h map header asm hg-commit-id: a60c10819b51 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 88232409..8eed61a7 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14681,7 +14681,17 @@ MuseumF2_h: ; 0x5c30b to 0x5c317 (12 bytes) (id=53) dw $434b ; objects -INCBIN "baserom.gbc",$5c317,$3ce9 +INCBIN "baserom.gbc",$5c317,$5c37b - $5c317 + +PewterGym_h: ; 0x5c37b to 0x5c387 (12 bytes) (id=54) + db $07 ; tileset + db $07, $05 ; dimensions (y, x) + dw $4558, $4435, $4387 ; blocks, texts, scripts + db $00 ; connections + + dw $452e ; objects + +INCBIN "baserom.gbc",$5c387,$3c79 SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From ca3523ddb30c36409b464c9cced1af95426345a3 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:46:26 -0600 Subject: PewterPokeCenter_h map header asm hg-commit-id: 4908ec8f2531 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 8eed61a7..f8d1c9b4 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14691,7 +14691,17 @@ PewterGym_h: ; 0x5c37b to 0x5c387 (12 bytes) (id=54) dw $452e ; objects -INCBIN "baserom.gbc",$5c387,$3c79 +INCBIN "baserom.gbc",$5c387,$5c57b - $5c387 + +PewterPokeCenter_h: ; 0x5c57b to 0x5c587 (12 bytes) (id=58) + db $06 ; tileset + db $04, $07 ; dimensions (y, x) + dw $4064, $458d, $4587 ; blocks, texts, scripts + db $00 ; connections + + dw $460d ; objects + +INCBIN "baserom.gbc",$5c587,$3a79 SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From 6ee17bd6f8be5332eb41c9d6aa7c8989647fd86a Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:46:37 -0600 Subject: CeruleanPokecenter_h map header asm hg-commit-id: fc299f39e3bd --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index f8d1c9b4..12af79f8 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14701,7 +14701,17 @@ PewterPokeCenter_h: ; 0x5c57b to 0x5c587 (12 bytes) (id=58) dw $460d ; objects -INCBIN "baserom.gbc",$5c587,$3a79 +INCBIN "baserom.gbc",$5c587,$5c639 - $5c587 + +CeruleanPokecenter_h: ; 0x5c639 to 0x5c645 (12 bytes) (id=64) + db $06 ; tileset + db $04, $07 ; dimensions (y, x) + dw $468b, $464b, $4645 ; blocks, texts, scripts + db $00 ; connections + + dw $465f ; objects + +INCBIN "baserom.gbc",$5c645,$39bb SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From 2f8279a3323c27edc68da18edc08a384d95eecd3 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:46:47 -0600 Subject: CeruleanGym_h map header asm hg-commit-id: 947938a5f720 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 12af79f8..d7ee7345 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14711,7 +14711,17 @@ CeruleanPokecenter_h: ; 0x5c639 to 0x5c645 (12 bytes) (id=64) dw $465f ; objects -INCBIN "baserom.gbc",$5c645,$39bb +INCBIN "baserom.gbc",$5c645,$5c6a7 - $5c645 + +CeruleanGym_h: ; 0x5c6a7 to 0x5c6b3 (12 bytes) (id=65) + db $07 ; tileset + db $07, $05 ; dimensions (y, x) + dw $4866, $474a, $46b3 ; blocks, texts, scripts + db $00 ; connections + + dw $4834 ; objects + +INCBIN "baserom.gbc",$5c6b3,$394d SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From 2e9229ae1b220d13d95267ba36802b4a80bae85c Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:47:01 -0600 Subject: CeruleanMart_h map header asm hg-commit-id: 29556b8d2d0d --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index d7ee7345..df34b3e1 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14721,7 +14721,17 @@ CeruleanGym_h: ; 0x5c6a7 to 0x5c6b3 (12 bytes) (id=65) dw $4834 ; objects -INCBIN "baserom.gbc",$5c6b3,$394d +INCBIN "baserom.gbc",$5c6b3,$5c889 - $5c6b3 + +CeruleanMart_h: ; 0x5c889 to 0x5c895 (12 bytes) (id=67) + db $02 ; tileset + db $04, $04 ; dimensions (y, x) + dw $4000, $4898, $4895 ; blocks, texts, scripts + db $00 ; connections + + dw $48a8 ; objects + +INCBIN "baserom.gbc",$5c895,$376b SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From b87e3c6a70b4e5d9a3ab20dfc7cf72bbc0d5bbc6 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:47:17 -0600 Subject: LavenderPokecenter_h map header asm hg-commit-id: 6a031ab9a962 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index df34b3e1..b52b3e5f 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14731,7 +14731,17 @@ CeruleanMart_h: ; 0x5c889 to 0x5c895 (12 bytes) (id=67) dw $48a8 ; objects -INCBIN "baserom.gbc",$5c895,$376b +INCBIN "baserom.gbc",$5c895,$5c8ce - $5c895 + +LavenderPokecenter_h: ; 0x5c8ce to 0x5c8da (12 bytes) (id=141) + db $06 ; tileset + db $04, $07 ; dimensions (y, x) + dw $4064, $48e0, $48da ; blocks, texts, scripts + db $00 ; connections + + dw $48f4 ; objects + +INCBIN "baserom.gbc",$5c8da,$3726 SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From 35fa96ea5cefc512a5f1afb02395814cf9ff379c Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:47:35 -0600 Subject: LavenderMart_h map header asm hg-commit-id: 8a67d08a7610 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index b52b3e5f..12e0acc3 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14741,7 +14741,17 @@ LavenderPokecenter_h: ; 0x5c8ce to 0x5c8da (12 bytes) (id=141) dw $48f4 ; objects -INCBIN "baserom.gbc",$5c8da,$3726 +INCBIN "baserom.gbc",$5c8da,$5c920 - $5c8da + +LavenderMart_h: ; 0x5c920 to 0x5c92c (12 bytes) (id=150) + db $02 ; tileset + db $04, $04 ; dimensions (y, x) + dw $4000, $492f, $492c ; blocks, texts, scripts + db $00 ; connections + + dw $495d ; objects + +INCBIN "baserom.gbc",$5c92c,$36d4 SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From b1ddb6d69652bd5ee74c0a1756115c738d8abe9c Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:47:48 -0600 Subject: VermilionPokeCenter_h map header asm hg-commit-id: 6e3b2f7fe8b0 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 12e0acc3..18147204 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14751,7 +14751,17 @@ LavenderMart_h: ; 0x5c920 to 0x5c92c (12 bytes) (id=150) dw $495d ; objects -INCBIN "baserom.gbc",$5c92c,$36d4 +INCBIN "baserom.gbc",$5c92c,$5c983 - $5c92c + +VermilionPokeCenter_h: ; 0x5c983 to 0x5c98f (12 bytes) (id=89) + db $06 ; tileset + db $04, $07 ; dimensions (y, x) + dw $4064, $4995, $498f ; blocks, texts, scripts + db $00 ; connections + + dw $49a9 ; objects + +INCBIN "baserom.gbc",$5c98f,$3671 SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From 8a2cc92d39450ddd5f72ab03b6f41de52e00b4a8 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:48:01 -0600 Subject: VermilionMart_h map header asm hg-commit-id: dcfd37241e9c --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 18147204..cad5bd31 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14761,7 +14761,17 @@ VermilionPokeCenter_h: ; 0x5c983 to 0x5c98f (12 bytes) (id=89) dw $49a9 ; objects -INCBIN "baserom.gbc",$5c98f,$3671 +INCBIN "baserom.gbc",$5c98f,$5c9d5 - $5c98f + +VermilionMart_h: ; 0x5c9d5 to 0x5c9e1 (12 bytes) (id=91) + db $02 ; tileset + db $04, $04 ; dimensions (y, x) + dw $4000, $49e4, $49e1 ; blocks, texts, scripts + db $00 ; connections + + dw $49f4 ; objects + +INCBIN "baserom.gbc",$5c9e1,$361f SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From fe3bcc742be1374360b9a64dc7537fc171ab1166 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:48:23 -0600 Subject: VermilionGym_h map header asm hg-commit-id: 2f86902aa40a --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index cad5bd31..1ea85ac2 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14771,7 +14771,17 @@ VermilionMart_h: ; 0x5c9d5 to 0x5c9e1 (12 bytes) (id=91) dw $49f4 ; objects -INCBIN "baserom.gbc",$5c9e1,$361f +INCBIN "baserom.gbc",$5c9e1,$5ca1a - $5c9e1 + +VermilionGym_h: ; 0x5ca1a to 0x5ca26 (12 bytes) (id=92) + db $07 ; tileset + db $09, $05 ; dimensions (y, x) + dw $4c38, $4ae8, $4a26 ; blocks, texts, scripts + db $00 ; connections + + dw $4bfe ; objects + +INCBIN "baserom.gbc",$5ca26,$35da SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From 50419d4be1db63c1c26a2dcc5c80feb890c15bac Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:48:37 -0600 Subject: CopycatsHouseF2_h map header asm hg-commit-id: bf9d786b4cc9 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 1ea85ac2..2410dc08 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14781,7 +14781,17 @@ VermilionGym_h: ; 0x5ca1a to 0x5ca26 (12 bytes) (id=92) dw $4bfe ; objects -INCBIN "baserom.gbc",$5ca26,$35da +INCBIN "baserom.gbc",$5ca26,$5cc65 - $5ca26 + +CopycatsHouseF2_h: ; 0x5cc65 to 0x5cc71 (12 bytes) (id=176) + db $04 ; tileset + db $04, $04 ; dimensions (y, x) + dw $4010, $4c74, $4c71 ; blocks, texts, scripts + db $00 ; connections + + dw $4d21 ; objects + +INCBIN "baserom.gbc",$5cc71,$338f SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From 1bd802bbb3a1fb288d040d10944fb7c5daf9a66d Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:48:50 -0600 Subject: FightingDojo_h map header asm hg-commit-id: 0e68d2055f04 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 2410dc08..679bc59f 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14791,7 +14791,17 @@ CopycatsHouseF2_h: ; 0x5cc65 to 0x5cc71 (12 bytes) (id=176) dw $4d21 ; objects -INCBIN "baserom.gbc",$5cc71,$338f +INCBIN "baserom.gbc",$5cc71,$5cd51 - $5cc71 + +FightingDojo_h: ; 0x5cd51 to 0x5cd5d (12 bytes) (id=177) + db $05 ; tileset + db $06, $05 ; dimensions (y, x) + dw $4fe3, $4e03, $4d5d ; blocks, texts, scripts + db $00 ; connections + + dw $4f9b ; objects + +INCBIN "baserom.gbc",$5cd5d,$32a3 SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From 2465aebc74f5995ee76a9de05019bba4f377cc78 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:49:03 -0600 Subject: SaffronGym_h map header asm hg-commit-id: a4c160e9767c --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 679bc59f..fc0b3348 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14801,7 +14801,17 @@ FightingDojo_h: ; 0x5cd51 to 0x5cd5d (12 bytes) (id=177) dw $4f9b ; objects -INCBIN "baserom.gbc",$5cd5d,$32a3 +INCBIN "baserom.gbc",$5cd5d,$5d001 - $5cd5d + +SaffronGym_h: ; 0x5d001 to 0x5d00d (12 bytes) (id=178) + db $16 ; tileset + db $09, $0a ; dimensions (y, x) + dw $53a3, $50ab, $500d ; blocks, texts, scripts + db $00 ; connections + + dw $5259 ; objects + +INCBIN "baserom.gbc",$5d00d,$2ff3 SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From 874939d4d05d02cf52c5b74edd22d639879f7fdc Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:49:44 -0600 Subject: SaffronMart_h map header asm hg-commit-id: 17d2b4209f82 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index fc0b3348..9c3d0840 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14811,7 +14811,17 @@ SaffronGym_h: ; 0x5d001 to 0x5d00d (12 bytes) (id=178) dw $5259 ; objects -INCBIN "baserom.gbc",$5d00d,$2ff3 +INCBIN "baserom.gbc",$5d00d,$5d3fd - $5d00d + +SaffronMart_h: ; 0x5d3fd to 0x5d409 (12 bytes) (id=180) + db $02 ; tileset + db $04, $04 ; dimensions (y, x) + dw $4000, $540c, $5409 ; blocks, texts, scripts + db $00 ; connections + + dw $541c ; objects + +INCBIN "baserom.gbc",$5d409,$2bf7 SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From 37cacc9757f1f8f484a2fb19817b05a545e71e14 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:49:57 -0600 Subject: SilphCo1_h map header asm hg-commit-id: 54e466035fe5 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 9c3d0840..e67e506c 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14821,7 +14821,17 @@ SaffronMart_h: ; 0x5d3fd to 0x5d409 (12 bytes) (id=180) dw $541c ; objects -INCBIN "baserom.gbc",$5d409,$2bf7 +INCBIN "baserom.gbc",$5d409,$5d442 - $5d409 + +SilphCo1_h: ; 0x5d442 to 0x5d44e (12 bytes) (id=181) + db $16 ; tileset + db $09, $0f ; dimensions (y, x) + dw $54a2, $5469, $544e ; blocks, texts, scripts + db $00 ; connections + + dw $5470 ; objects + +INCBIN "baserom.gbc",$5d44e,$2bb2 SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From d97b9028f21148125e0fd01642cbff0003bed5a0 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:50:08 -0600 Subject: SaffronPokecenter_h map header asm hg-commit-id: df1717b60017 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index e67e506c..90a4c7c5 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14831,7 +14831,17 @@ SilphCo1_h: ; 0x5d442 to 0x5d44e (12 bytes) (id=181) dw $5470 ; objects -INCBIN "baserom.gbc",$5d44e,$2bb2 +INCBIN "baserom.gbc",$5d44e,$5d529 - $5d44e + +SaffronPokecenter_h: ; 0x5d529 to 0x5d535 (12 bytes) (id=182) + db $06 ; tileset + db $04, $07 ; dimensions (y, x) + dw $4064, $553b, $5535 ; blocks, texts, scripts + db $00 ; connections + + dw $554f ; objects + +INCBIN "baserom.gbc",$5d535,$2acb SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From a58b7f7f58e79216e89f1691b04f6a622b6eec13 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:50:22 -0600 Subject: ViridianForestexit_h map header asm hg-commit-id: e6d749d80f1a --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 90a4c7c5..5417f650 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14841,7 +14841,17 @@ SaffronPokecenter_h: ; 0x5d529 to 0x5d535 (12 bytes) (id=182) dw $554f ; objects -INCBIN "baserom.gbc",$5d535,$2acb +INCBIN "baserom.gbc",$5d535,$5d57b - $5d535 + +ViridianForestexit_h: ; 0x5d57b to 0x5d587 (12 bytes) (id=47) + db $09 ; tileset + db $04, $05 ; dimensions (y, x) + dw $4090, $558a, $5587 ; blocks, texts, scripts + db $00 ; connections + + dw $5598 ; objects + +INCBIN "baserom.gbc",$5d587,$2a79 SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From 63b50b782aab9a7e99b02035917a83d2cb79cdcc Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:50:40 -0600 Subject: Route2Gate_h map header asm hg-commit-id: 31b1967f8f90 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 5417f650..ab6edab5 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14851,7 +14851,17 @@ ViridianForestexit_h: ; 0x5d57b to 0x5d587 (12 bytes) (id=47) dw $5598 ; objects -INCBIN "baserom.gbc",$5d587,$2a79 +INCBIN "baserom.gbc",$5d587,$5d5c8 - $5d587 + +Route2Gate_h: ; 0x5d5c8 to 0x5d5d4 (12 bytes) (id=49) + db $0c ; tileset + db $04, $05 ; dimensions (y, x) + dw $4090, $55d7, $55d4 ; blocks, texts, scripts + db $00 ; connections + + dw $5620 ; objects + +INCBIN "baserom.gbc",$5d5d4,$2a2c SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From 8c2e931e2bb84955eac22c914fa4b1988d4e096a Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:50:53 -0600 Subject: ViridianForestEntrance_h map header asm hg-commit-id: 87c652782bd4 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index ab6edab5..e6d5ed11 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14861,7 +14861,17 @@ Route2Gate_h: ; 0x5d5c8 to 0x5d5d4 (12 bytes) (id=49) dw $5620 ; objects -INCBIN "baserom.gbc",$5d5d4,$2a2c +INCBIN "baserom.gbc",$5d5d4,$5d650 - $5d5d4 + +ViridianForestEntrance_h: ; 0x5d650 to 0x5d65c (12 bytes) (id=50) + db $09 ; tileset + db $04, $05 ; dimensions (y, x) + dw $4090, $565f, $565c ; blocks, texts, scripts + db $00 ; connections + + dw $566d ; objects + +INCBIN "baserom.gbc",$5d65c,$29a4 SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From 28e5cfe547a18b81b8209cb60cd991ba4eabf591 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:51:10 -0600 Subject: UndergroundTunnelEntranceRoute5_h map header asm hg-commit-id: 50d8e0a96221 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index e6d5ed11..328c3c7e 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14871,7 +14871,17 @@ ViridianForestEntrance_h: ; 0x5d650 to 0x5d65c (12 bytes) (id=50) dw $566d ; objects -INCBIN "baserom.gbc",$5d65c,$29a4 +INCBIN "baserom.gbc",$5d65c,$5d69d - $5d65c + +UndergroundTunnelEntranceRoute5_h: ; 0x5d69d to 0x5d6a9 (12 bytes) (id=71) + db $0c ; tileset + db $04, $04 ; dimensions (y, x) + dw $4080, $56b0, $56a9 ; blocks, texts, scripts + db $00 ; connections + + dw $56c1 ; objects + +INCBIN "baserom.gbc",$5d6a9,$2957 SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From 87c0bf26bd524e830e7d8322b106cd563a5914bb Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:51:22 -0600 Subject: UndergroundTunnelEntranceRoute6_h map header asm hg-commit-id: 629ff7afa754 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 328c3c7e..c52846cc 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14881,7 +14881,17 @@ UndergroundTunnelEntranceRoute5_h: ; 0x5d69d to 0x5d6a9 (12 bytes) (id=71) dw $56c1 ; objects -INCBIN "baserom.gbc",$5d6a9,$2957 +INCBIN "baserom.gbc",$5d6a9,$5d6e3 - $5d6a9 + +UndergroundTunnelEntranceRoute6_h: ; 0x5d6e3 to 0x5d6ef (12 bytes) (id=74) + db $0c ; tileset + db $04, $04 ; dimensions (y, x) + dw $4080, $56f7, $56ef ; blocks, texts, scripts + db $00 ; connections + + dw $56fe ; objects + +INCBIN "baserom.gbc",$5d6ef,$2911 SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From 0be9ec6e2e344fadb6e65e73526b9e54308e782e Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:51:37 -0600 Subject: UndergroundPathEntranceRoute7_h map header asm hg-commit-id: 13baf34ac07e --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index c52846cc..c0875d1e 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14891,7 +14891,17 @@ UndergroundTunnelEntranceRoute6_h: ; 0x5d6e3 to 0x5d6ef (12 bytes) (id=74) dw $56fe ; objects -INCBIN "baserom.gbc",$5d6ef,$2911 +INCBIN "baserom.gbc",$5d6ef,$5d720 - $5d6ef + +UndergroundPathEntranceRoute7_h: ; 0x5d720 to 0x5d72c (12 bytes) (id=77) + db $0c ; tileset + db $04, $04 ; dimensions (y, x) + dw $4080, $5734, $572c ; blocks, texts, scripts + db $00 ; connections + + dw $573b ; objects + +INCBIN "baserom.gbc",$5d72c,$28d4 SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From 7362790819157595f773b08f525d9229a783c27d Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:51:53 -0600 Subject: SilphCo9_h map header asm hg-commit-id: b37620d0eefd --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index c0875d1e..fb82b75b 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14901,7 +14901,17 @@ UndergroundPathEntranceRoute7_h: ; 0x5d720 to 0x5d72c (12 bytes) (id=77) dw $573b ; objects -INCBIN "baserom.gbc",$5d72c,$28d4 +INCBIN "baserom.gbc",$5d72c,$5d7af - $5d72c + +SilphCo9_h: ; 0x5d7af to 0x5d7bb (12 bytes) (id=233) + db $16 ; tileset + db $09, $0d ; dimensions (y, x) + dw $5989, $588b, $57bb ; blocks, texts, scripts + db $00 ; connections + + dw $593f ; objects + +INCBIN "baserom.gbc",$5d7bb,$2845 SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From 3f02ba41593615d5b7e2ec2224d2e000dd6bf184 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:52:05 -0600 Subject: VictoryRoad1_h map header asm hg-commit-id: 0ed64b125763 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index fb82b75b..87516f25 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14911,7 +14911,17 @@ SilphCo9_h: ; 0x5d7af to 0x5d7bb (12 bytes) (id=233) dw $593f ; objects -INCBIN "baserom.gbc",$5d7bb,$2845 +INCBIN "baserom.gbc",$5d7bb,$5d9fe - $5d7bb + +VictoryRoad1_h: ; 0x5d9fe to 0x5da0a (12 bytes) (id=108) + db $11 ; tileset + db $09, $0a ; dimensions (y, x) + dw $5b04, $5a5f, $5a0a ; blocks, texts, scripts + db $00 ; connections + + dw $5ab8 ; objects + +INCBIN "baserom.gbc",$5da0a,$25f6 SECTION "bank18",DATA,BANK[$18] INCBIN "baserom.gbc",$60000,$4000 -- cgit v1.3.1-sl0p From b80fd69c7ac84966451e09318ef22df70ea2802f Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:52:17 -0600 Subject: PokemonTower1_h map header asm hg-commit-id: e8781a8290f0 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 87516f25..ef9c102b 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14924,7 +14924,17 @@ VictoryRoad1_h: ; 0x5d9fe to 0x5da0a (12 bytes) (id=108) INCBIN "baserom.gbc",$5da0a,$25f6 SECTION "bank18",DATA,BANK[$18] -INCBIN "baserom.gbc",$60000,$4000 +INCBIN "baserom.gbc",$60000,$60420 - $60000 + +PokemonTower1_h: ; 0x60420 to 0x6042c (12 bytes) (id=142) + db $0f ; tileset + db $09, $0a ; dimensions (y, x) + dw $448c, $442f, $442c ; blocks, texts, scripts + db $00 ; connections + + dw $4452 ; objects + +INCBIN "baserom.gbc",$6042c,$3bd4 SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From 4c38c267213e0e9974f75d54e5e6201905ab5c30 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:52:29 -0600 Subject: PokemonTower2_h map header asm hg-commit-id: f067a53f4efe --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index ef9c102b..bd4e237d 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14934,7 +14934,17 @@ PokemonTower1_h: ; 0x60420 to 0x6042c (12 bytes) (id=142) dw $4452 ; objects -INCBIN "baserom.gbc",$6042c,$3bd4 +INCBIN "baserom.gbc",$6042c,$604e6 - $6042c + +PokemonTower2_h: ; 0x604e6 to 0x604f2 (12 bytes) (id=143) + db $0f ; tileset + db $09, $0a ; dimensions (y, x) + dw $4666, $45db, $44f2 ; blocks, texts, scripts + db $00 ; connections + + dw $4646 ; objects + +INCBIN "baserom.gbc",$604f2,$3b0e SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From 5761a404ce835af4ae88dc91ffc0b644d60a0f5e Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:52:41 -0600 Subject: PokemonTower3_h map header asm hg-commit-id: fefe81fdef4b --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index bd4e237d..342b0a34 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14944,7 +14944,17 @@ PokemonTower2_h: ; 0x604e6 to 0x604f2 (12 bytes) (id=143) dw $4646 ; objects -INCBIN "baserom.gbc",$604f2,$3b0e +INCBIN "baserom.gbc",$604f2,$606c0 - $604f2 + +PokemonTower3_h: ; 0x606c0 to 0x606cc (12 bytes) (id=144) + db $0f ; tileset + db $09, $0a ; dimensions (y, x) + dw $4790, $46e5, $46cc ; blocks, texts, scripts + db $00 ; connections + + dw $475d ; objects + +INCBIN "baserom.gbc",$606cc,$3934 SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From 05216f1fcc0057b6e9a95852a4194cbfd41bbd3a Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:52:52 -0600 Subject: PokemonTower4_h map header asm hg-commit-id: 898e7ac55712 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 342b0a34..24d32dda 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14954,7 +14954,17 @@ PokemonTower3_h: ; 0x606c0 to 0x606cc (12 bytes) (id=144) dw $475d ; objects -INCBIN "baserom.gbc",$606cc,$3934 +INCBIN "baserom.gbc",$606cc,$607ea - $606cc + +PokemonTower4_h: ; 0x607ea to 0x607f6 (12 bytes) (id=145) + db $0f ; tileset + db $09, $0a ; dimensions (y, x) + dw $48cc, $480f, $47f6 ; blocks, texts, scripts + db $00 ; connections + + dw $488b ; objects + +INCBIN "baserom.gbc",$607f6,$380a SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From fe7bb3cd19e93ad20afdadf12834f166bb525679 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:53:03 -0600 Subject: PokemonTower5_h map header asm hg-commit-id: ed85fe55189f --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 24d32dda..5eb9f7d1 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14964,7 +14964,17 @@ PokemonTower4_h: ; 0x607ea to 0x607f6 (12 bytes) (id=145) dw $488b ; objects -INCBIN "baserom.gbc",$607f6,$380a +INCBIN "baserom.gbc",$607f6,$60926 - $607f6 + +PokemonTower5_h: ; 0x60926 to 0x60932 (12 bytes) (id=146) + db $0f ; tileset + db $09, $0a ; dimensions (y, x) + dw $4a89, $499b, $4932 ; blocks, texts, scripts + db $00 ; connections + + dw $4a48 ; objects + +INCBIN "baserom.gbc",$60932,$36ce SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From ef0e37a9b263f8b897740c5147d2afad27ae32b0 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:53:15 -0600 Subject: PokemonTower6_h map header asm hg-commit-id: 85a4e6085a5c --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 5eb9f7d1..9485b2a9 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14974,7 +14974,17 @@ PokemonTower5_h: ; 0x60926 to 0x60932 (12 bytes) (id=146) dw $4a48 ; objects -INCBIN "baserom.gbc",$60932,$36ce +INCBIN "baserom.gbc",$60932,$60ae3 - $60932 + +PokemonTower6_h: ; 0x60ae3 to 0x60aef (12 bytes) (id=147) + db $0f ; tileset + db $09, $0a ; dimensions (y, x) + dw $4c95, $4bb1, $4aef ; blocks, texts, scripts + db $00 ; connections + + dw $4c5b ; objects + +INCBIN "baserom.gbc",$60aef,$3511 SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From 2c358919da17910c9617e8ef39169c605033d17c Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:53:26 -0600 Subject: PokemonTower7_h map header asm hg-commit-id: ac6bf1129f84 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 9485b2a9..b0470448 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14984,7 +14984,17 @@ PokemonTower6_h: ; 0x60ae3 to 0x60aef (12 bytes) (id=147) dw $4c5b ; objects -INCBIN "baserom.gbc",$60aef,$3511 +INCBIN "baserom.gbc",$60aef,$60cf9 - $60aef + +PokemonTower7_h: ; 0x60cf9 to 0x60d05 (12 bytes) (id=148) + db $0f ; tileset + db $09, $0a ; dimensions (y, x) + dw $4f20, $4e3f, $4d05 ; blocks, texts, scripts + db $00 ; connections + + dw $4ef6 ; objects + +INCBIN "baserom.gbc",$60d05,$32fb SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From 57d9b89ffbc13cf71eed8b640981902f9f43c3e0 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:53:39 -0600 Subject: CeladonMart1_h map header asm hg-commit-id: 0df1494a2038 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index b0470448..d21a2c02 100644 --- a/pokered.asm +++ b/pokered.asm @@ -14994,7 +14994,17 @@ PokemonTower7_h: ; 0x60cf9 to 0x60d05 (12 bytes) (id=148) dw $4ef6 ; objects -INCBIN "baserom.gbc",$60d05,$32fb +INCBIN "baserom.gbc",$60d05,$60f7a - $60d05 + +CeladonMart1_h: ; 0x60f7a to 0x60f86 (12 bytes) (id=122) + db $12 ; tileset + db $04, $0a ; dimensions (y, x) + dw $4fde, $4f89, $4f86 ; blocks, texts, scripts + db $00 ; connections + + dw $4f9e ; objects + +INCBIN "baserom.gbc",$60f86,$307a SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From 87cf792561aa0f41cbbcf2dd557a083fcc42bafc Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:53:52 -0600 Subject: ViridianForest_h map header asm hg-commit-id: cf7fe1a73da9 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index d21a2c02..4c02a0b8 100644 --- a/pokered.asm +++ b/pokered.asm @@ -15004,7 +15004,17 @@ CeladonMart1_h: ; 0x60f7a to 0x60f86 (12 bytes) (id=122) dw $4f9e ; objects -INCBIN "baserom.gbc",$60f86,$307a +INCBIN "baserom.gbc",$60f86,$61101 - $60f86 + +ViridianForest_h: ; 0x61101 to 0x6110d (12 bytes) (id=51) + db $03 ; tileset + db $18, $11 ; dimensions (y, x) + dw $4000, $5126, $510d ; blocks, texts, scripts + db $00 ; connections + + dw $51da ; objects + +INCBIN "baserom.gbc",$6110d,$2ef3 SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From 05fdc07c1e9a666b4b59164e9d902b967914cfb6 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:54:03 -0600 Subject: SSAnne1_h map header asm hg-commit-id: d668c38089ce --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 4c02a0b8..7e59a49d 100644 --- a/pokered.asm +++ b/pokered.asm @@ -15014,7 +15014,17 @@ ViridianForest_h: ; 0x61101 to 0x6110d (12 bytes) (id=51) dw $51da ; objects -INCBIN "baserom.gbc",$6110d,$2ef3 +INCBIN "baserom.gbc",$6110d,$61259 - $6110d + +SSAnne1_h: ; 0x61259 to 0x61265 (12 bytes) (id=95) + db $0d ; tileset + db $09, $14 ; dimensions (y, x) + dw $52df, $5269, $5265 ; blocks, texts, scripts + db $00 ; connections + + dw $5277 ; objects + +INCBIN "baserom.gbc",$61265,$2d9b SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From 7ef45d1d46fd1178e01a92cc691b6bba5ab1b731 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:54:14 -0600 Subject: SSAnne2_h map header asm hg-commit-id: f1db809e10a6 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 7e59a49d..e37222a6 100644 --- a/pokered.asm +++ b/pokered.asm @@ -15024,7 +15024,17 @@ SSAnne1_h: ; 0x61259 to 0x61265 (12 bytes) (id=95) dw $5277 ; objects -INCBIN "baserom.gbc",$61265,$2d9b +INCBIN "baserom.gbc",$61265,$61393 - $61265 + +SSAnne2_h: ; 0x61393 to 0x6139f (12 bytes) (id=96) + db $0d ; tileset + db $09, $14 ; dimensions (y, x) + dw $556e, $54db, $539f ; blocks, texts, scripts + db $00 ; connections + + dw $5514 ; objects + +INCBIN "baserom.gbc",$6139f,$2c61 SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From 070cdb93c10f6b9fb05f455c1b7374003cb6a63d Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:54:24 -0600 Subject: SSAnne4_h map header asm hg-commit-id: 3b31cb73e565 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index e37222a6..646aaa70 100644 --- a/pokered.asm +++ b/pokered.asm @@ -15034,7 +15034,17 @@ SSAnne2_h: ; 0x61393 to 0x6139f (12 bytes) (id=96) dw $5514 ; objects -INCBIN "baserom.gbc",$6139f,$2c61 +INCBIN "baserom.gbc",$6139f,$61622 - $6139f + +SSAnne4_h: ; 0x61622 to 0x6162e (12 bytes) (id=98) + db $0d ; tileset + db $04, $0f ; dimensions (y, x) + dw $5666, $5631, $562e ; blocks, texts, scripts + db $00 ; connections + + dw $5632 ; objects + +INCBIN "baserom.gbc",$6162e,$29d2 SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From bf2baed5d6506beb24e3134ce52a1a2c0149eacb Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:54:36 -0600 Subject: SSAnne5_h map header asm hg-commit-id: a4059b6f0894 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 646aaa70..e50ecae8 100644 --- a/pokered.asm +++ b/pokered.asm @@ -15044,7 +15044,17 @@ SSAnne4_h: ; 0x61622 to 0x6162e (12 bytes) (id=98) dw $5632 ; objects -INCBIN "baserom.gbc",$6162e,$29d2 +INCBIN "baserom.gbc",$6162e,$616a2 - $6162e + +SSAnne5_h: ; 0x616a2 to 0x616ae (12 bytes) (id=99) + db $0d ; tileset + db $07, $0a ; dimensions (y, x) + dw $5761, $56c7, $56ae ; blocks, texts, scripts + db $00 ; connections + + dw $572b ; objects + +INCBIN "baserom.gbc",$616ae,$2952 SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From 2020fe28b15b548163e44c5f5f9a5de98387d9c9 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:54:49 -0600 Subject: SSAnne6_h map header asm hg-commit-id: 50a289735660 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index e50ecae8..b192c976 100644 --- a/pokered.asm +++ b/pokered.asm @@ -15054,7 +15054,17 @@ SSAnne5_h: ; 0x616a2 to 0x616ae (12 bytes) (id=99) dw $572b ; objects -INCBIN "baserom.gbc",$616ae,$2952 +INCBIN "baserom.gbc",$616ae,$617a7 - $616ae + +SSAnne6_h: ; 0x617a7 to 0x617b3 (12 bytes) (id=100) + db $0d ; tileset + db $08, $07 ; dimensions (y, x) + dw $5851, $57b7, $57b3 ; blocks, texts, scripts + db $00 ; connections + + dw $581b ; objects + +INCBIN "baserom.gbc",$617b3,$284d SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From a1cd1f8545d730c15453874f29a6b1abc406079a Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:54:58 -0600 Subject: SAnne7_h map header asm hg-commit-id: b5f1e918c0bd --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index b192c976..e20260d2 100644 --- a/pokered.asm +++ b/pokered.asm @@ -15064,7 +15064,17 @@ SSAnne6_h: ; 0x617a7 to 0x617b3 (12 bytes) (id=100) dw $581b ; objects -INCBIN "baserom.gbc",$617b3,$284d +INCBIN "baserom.gbc",$617b3,$61889 - $617b3 + +SSAnne7_h: ; 0x61889 to 0x61895 (12 bytes) (id=101) + db $0d ; tileset + db $04, $03 ; dimensions (y, x) + dw $595e, $58a7, $5895 ; blocks, texts, scripts + db $00 ; connections + + dw $5946 ; objects + +INCBIN "baserom.gbc",$61895,$276b SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From 44ae6a50c57c814c032c73d659c56f59adbf5f51 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:55:13 -0600 Subject: SSAnne8_h map header asm hg-commit-id: 5456d475905c --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index e20260d2..98c62b43 100644 --- a/pokered.asm +++ b/pokered.asm @@ -15074,7 +15074,17 @@ SSAnne7_h: ; 0x61889 to 0x61895 (12 bytes) (id=101) dw $5946 ; objects -INCBIN "baserom.gbc",$61895,$276b +INCBIN "baserom.gbc",$61895,$6196a - $61895 + +SSAnne8_h: ; 0x6196a to 0x61976 (12 bytes) (id=102) + db $0d ; tileset + db $08, $0c ; dimensions (y, x) + dw $5adf, $598f, $5976 ; blocks, texts, scripts + db $00 ; connections + + dw $5a60 ; objects + +INCBIN "baserom.gbc",$61976,$268a SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From aade7efe09f77a0d7f3555fa2186f4974b3d458c Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:55:24 -0600 Subject: SSAnne9_h map header asm hg-commit-id: d421f5cc92db --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 98c62b43..7c5bac3b 100644 --- a/pokered.asm +++ b/pokered.asm @@ -15084,7 +15084,17 @@ SSAnne8_h: ; 0x6196a to 0x61976 (12 bytes) (id=102) dw $5a60 ; objects -INCBIN "baserom.gbc",$61976,$268a +INCBIN "baserom.gbc",$61976,$61b3f - $61976 + +SSAnne9_h: ; 0x61b3f to 0x61b4b (12 bytes) (id=103) + db $0d ; tileset + db $08, $0c ; dimensions (y, x) + dw $43c0, $5b6a, $5b4b ; blocks, texts, scripts + db $00 ; connections + + dw $5c8d ; objects + +INCBIN "baserom.gbc",$61b4b,$24b5 SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From 98bb53cea3c799a717c7d04ba53bd1d0156d31e2 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:55:38 -0600 Subject: SSAnne10_h map header asm hg-commit-id: 5cb94204a8f4 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 7c5bac3b..fae3b990 100644 --- a/pokered.asm +++ b/pokered.asm @@ -15094,7 +15094,17 @@ SSAnne9_h: ; 0x61b3f to 0x61b4b (12 bytes) (id=103) dw $5c8d ; objects -INCBIN "baserom.gbc",$61b4b,$24b5 +INCBIN "baserom.gbc",$61b4b,$61d49 - $61b4b + +SSAnne10_h: ; 0x61d49 to 0x61d55 (12 bytes) (id=104) + db $0d ; tileset + db $08, $0c ; dimensions (y, x) + dw $43c0, $5d6e, $5d55 ; blocks, texts, scripts + db $00 ; connections + + dw $5e75 ; objects + +INCBIN "baserom.gbc",$61d55,$22ab SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From d3ba945563c6eec52fe791fb52d806f350badb06 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:55:54 -0600 Subject: UndergroundPathNS_h map header asm hg-commit-id: fc460f3c82b7 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index fae3b990..404bef59 100644 --- a/pokered.asm +++ b/pokered.asm @@ -15104,7 +15104,17 @@ SSAnne10_h: ; 0x61d49 to 0x61d55 (12 bytes) (id=104) dw $5e75 ; objects -INCBIN "baserom.gbc",$61d55,$22ab +INCBIN "baserom.gbc",$61d55,$61f1a - $61d55 + +UndergroundPathNS_h: ; 0x61f1a to 0x61f26 (12 bytes) (id=119) + db $0b ; tileset + db $18, $04 ; dimensions (y, x) + dw $4198, $5f29, $5f26 ; blocks, texts, scripts + db $00 ; connections + + dw $5f2a ; objects + +INCBIN "baserom.gbc",$61f26,$20da SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From 725f2429108b4bcdb27f3297b9d70d2c9564f081 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:56:05 -0600 Subject: UndergroundPathWE_h map header asm hg-commit-id: d1d6793d7ee6 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 404bef59..8a8d1022 100644 --- a/pokered.asm +++ b/pokered.asm @@ -15114,7 +15114,17 @@ UndergroundPathNS_h: ; 0x61f1a to 0x61f26 (12 bytes) (id=119) dw $5f2a ; objects -INCBIN "baserom.gbc",$61f26,$20da +INCBIN "baserom.gbc",$61f26,$61f3e - $61f26 + +UndergroundPathWE_h: ; 0x61f3e to 0x61f4a (12 bytes) (id=121) + db $0b ; tileset + db $04, $19 ; dimensions (y, x) + dw $41f4, $5f4d, $5f4a ; blocks, texts, scripts + db $00 ; connections + + dw $5f4e ; objects + +INCBIN "baserom.gbc",$61f4a,$20b6 SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From 52dc6cf9a64d84295b1fd7363150c6d1253c1257 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:56:38 -0600 Subject: DiglettsCave_h map header asm hg-commit-id: cc759a627757 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 8a8d1022..b6a39e7f 100644 --- a/pokered.asm +++ b/pokered.asm @@ -15124,7 +15124,17 @@ UndergroundPathWE_h: ; 0x61f3e to 0x61f4a (12 bytes) (id=121) dw $5f4e ; objects -INCBIN "baserom.gbc",$61f4a,$20b6 +INCBIN "baserom.gbc",$61f4a,$61f62 - $61f4a + +DiglettsCave_h: ; 0x61f62 to 0x61f6e (12 bytes) (id=197) + db $11 ; tileset + db $12, $14 ; dimensions (y, x) + dw $5f86, $5f71, $5f6e ; blocks, texts, scripts + db $00 ; connections + + dw $5f72 ; objects + +INCBIN "baserom.gbc",$61f6e,$2092 SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From a4a98bc220af342404d57bfce3af6161b4771ffa Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:56:58 -0600 Subject: SilphCo11_h map header asm hg-commit-id: 9c2e8ec87c8f --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index b6a39e7f..aee064f5 100644 --- a/pokered.asm +++ b/pokered.asm @@ -15134,7 +15134,17 @@ DiglettsCave_h: ; 0x61f62 to 0x61f6e (12 bytes) (id=197) dw $5f72 ; objects -INCBIN "baserom.gbc",$61f6e,$2092 +INCBIN "baserom.gbc",$61f6e,$620ee - $61f6e + +SilphCo11_h: ; 0x620ee to 0x620fa (12 bytes) (id=235) + db $10 ; tileset + db $09, $09 ; dimensions (y, x) + dw $63c8, $62b7, $60fa ; blocks, texts, scripts + db $00 ; connections + + dw $6380 ; objects + +INCBIN "baserom.gbc",$620fa,$1f06 SECTION "bank19",DATA,BANK[$19] Tset00_GFX: -- cgit v1.3.1-sl0p From 9fc9ccb0da8620383f2d5ca049b4a5ca24b025fe Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:57:13 -0600 Subject: ViridianGym_h map header asm hg-commit-id: d3c9f7e86126 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index aee064f5..64ef92b7 100644 --- a/pokered.asm +++ b/pokered.asm @@ -16077,7 +16077,17 @@ CredPAAD: TheEndGfx: ; 473E INCBIN "gfx/theend.2bpp" -INCBIN "baserom.gbc",$747DE,$4000 - $7DE +INCBIN "baserom.gbc",$747de,$74897 - $747de + +ViridianGym_h: ; 0x74897 to 0x748a3 (12 bytes) (id=45) + db $07 ; tileset + db $09, $0a ; dimensions (y, x) + dw $4c47, $49ec, $48a3 ; blocks, texts, scripts + db $00 ; connections + + dw $4bde ; objects + +INCBIN "baserom.gbc",$748a3,$375d SECTION "bank1E",DATA,BANK[$1E] INCBIN "baserom.gbc",$78000,$F1 -- cgit v1.3.1-sl0p From d1667322a72525649f84c7a31f90333158732b08 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 17:57:29 -0600 Subject: PewterMart_h map header asm hg-commit-id: 29eca234ff35 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 64ef92b7..0ab7650e 100644 --- a/pokered.asm +++ b/pokered.asm @@ -16087,7 +16087,17 @@ ViridianGym_h: ; 0x74897 to 0x748a3 (12 bytes) (id=45) dw $4bde ; objects -INCBIN "baserom.gbc",$748a3,$375d +INCBIN "baserom.gbc",$748a3,$74ca1 - $748a3 + +PewterMart_h: ; 0x74ca1 to 0x74cad (12 bytes) (id=56) + db $02 ; tileset + db $04, $04 ; dimensions (y, x) + dw $4010, $4cb6, $4cad ; blocks, texts, scripts + db $00 ; connections + + dw $4cda ; objects + +INCBIN "baserom.gbc",$74cad,$3353 SECTION "bank1E",DATA,BANK[$1E] INCBIN "baserom.gbc",$78000,$F1 -- cgit v1.3.1-sl0p From 7c0b5118f46782b10ec9180b2f54195fced0770d Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 18:00:00 -0600 Subject: UnknownDungeon1_h map header asm hg-commit-id: a6434b4b2892 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 0ab7650e..54129260 100644 --- a/pokered.asm +++ b/pokered.asm @@ -16097,7 +16097,17 @@ PewterMart_h: ; 0x74ca1 to 0x74cad (12 bytes) (id=56) dw $4cda ; objects -INCBIN "baserom.gbc",$74cad,$3353 +INCBIN "baserom.gbc",$74cad,$74d00 - $74cad + +UnknownDungeon1_h: ; 0x74d00 to 0x74d0c (12 bytes) (id=228) + db $11 ; tileset + db $09, $0f ; dimensions (y, x) + dw $4d76, $4d0f, $4d0c ; blocks, texts, scripts + db $00 ; connections + + dw $4d15 ; objects + +INCBIN "baserom.gbc",$74d0c,$32f4 SECTION "bank1E",DATA,BANK[$1E] INCBIN "baserom.gbc",$78000,$F1 -- cgit v1.3.1-sl0p From 2308421700a78abdef9c37bb7b3850794821eb10 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 18:00:13 -0600 Subject: CeruleanHouse3_h map header asm hg-commit-id: 5cd79b6a7367 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 54129260..13a49cfb 100644 --- a/pokered.asm +++ b/pokered.asm @@ -16107,7 +16107,17 @@ UnknownDungeon1_h: ; 0x74d00 to 0x74d0c (12 bytes) (id=228) dw $4d15 ; objects -INCBIN "baserom.gbc",$74d0c,$32f4 +INCBIN "baserom.gbc",$74d0c,$74dfd - $74d0c + +CeruleanHouse3_h: ; 0x74dfd to 0x74e09 (12 bytes) (id=230) + db $0d ; tileset + db $04, $04 ; dimensions (y, x) + dw $404c, $4e13, $4e09 ; blocks, texts, scripts + db $00 ; connections + + dw $4ebe ; objects + +INCBIN "baserom.gbc",$74e09,$31f7 SECTION "bank1E",DATA,BANK[$1E] INCBIN "baserom.gbc",$78000,$F1 -- cgit v1.3.1-sl0p From d598f0699574863a0aa270d487e0802d51877364 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 18:00:28 -0600 Subject: FuchsiaHouse1_h map header asm hg-commit-id: 13c77564712c --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 13a49cfb..51ddf954 100644 --- a/pokered.asm +++ b/pokered.asm @@ -16117,7 +16117,17 @@ CeruleanHouse3_h: ; 0x74dfd to 0x74e09 (12 bytes) (id=230) dw $4ebe ; objects -INCBIN "baserom.gbc",$74e09,$31f7 +INCBIN "baserom.gbc",$74e09,$7500c - $74e09 + +FuchsiaHouse1_h: ; 0x7500c to 0x75018 (12 bytes) (id=153) + db $08 ; tileset + db $04, $04 ; dimensions (y, x) + dw $4020, $501c, $5018 ; blocks, texts, scripts + db $00 ; connections + + dw $5031 ; objects + +INCBIN "baserom.gbc",$75018,$2fe8 SECTION "bank1E",DATA,BANK[$1E] INCBIN "baserom.gbc",$78000,$F1 -- cgit v1.3.1-sl0p From 13db6606f908c4dc7e3a25a8e97f8b6e98b53af5 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 18:00:40 -0600 Subject: FuchsiaPokecenter_h map header asm hg-commit-id: 7127d4713006 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 51ddf954..d3684d6c 100644 --- a/pokered.asm +++ b/pokered.asm @@ -16127,7 +16127,17 @@ FuchsiaHouse1_h: ; 0x7500c to 0x75018 (12 bytes) (id=153) dw $5031 ; objects -INCBIN "baserom.gbc",$75018,$2fe8 +INCBIN "baserom.gbc",$75018,$75057 - $75018 + +FuchsiaPokecenter_h: ; 0x75057 to 0x75063 (12 bytes) (id=154) + db $06 ; tileset + db $04, $07 ; dimensions (y, x) + dw $4030, $5069, $5063 ; blocks, texts, scripts + db $00 ; connections + + dw $507d ; objects + +INCBIN "baserom.gbc",$75063,$2f9d SECTION "bank1E",DATA,BANK[$1E] INCBIN "baserom.gbc",$78000,$F1 -- cgit v1.3.1-sl0p From 2bb99cc0a5dc97498e7b42e8f2dbeeac46a270ea Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 18:00:58 -0600 Subject: FuchsiaHouse2_h map header asm hg-commit-id: e8b96603579a --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index d3684d6c..834fb770 100644 --- a/pokered.asm +++ b/pokered.asm @@ -16137,7 +16137,17 @@ FuchsiaPokecenter_h: ; 0x75057 to 0x75063 (12 bytes) (id=154) dw $507d ; objects -INCBIN "baserom.gbc",$75063,$2f9d +INCBIN "baserom.gbc",$75063,$750a9 - $75063 + +FuchsiaHouse2_h: ; 0x750a9 to 0x750b5 (12 bytes) (id=155) + db $14 ; tileset + db $04, $05 ; dimensions (y, x) + dw $51ad, $50b8, $50b5 ; blocks, texts, scripts + db $00 ; connections + + dw $5180 ; objects + +INCBIN "baserom.gbc",$750b5,$2f4b SECTION "bank1E",DATA,BANK[$1E] INCBIN "baserom.gbc",$78000,$F1 -- cgit v1.3.1-sl0p From cfc7c7607a6564af7f56b7d5a2f4ea697e84389f Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 18:03:06 -0600 Subject: SafariZoneEntrance_h map header asm hg-commit-id: 57435711287a --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 834fb770..53896005 100644 --- a/pokered.asm +++ b/pokered.asm @@ -16147,7 +16147,17 @@ FuchsiaHouse2_h: ; 0x750a9 to 0x750b5 (12 bytes) (id=155) dw $5180 ; objects -INCBIN "baserom.gbc",$750b5,$2f4b +INCBIN "baserom.gbc",$750b5,$751c1 - $750b5 + +SafariZoneEntrance_h: ; 0x751c1 to 0x751cd (12 bytes) (id=156) + db $0c ; tileset + db $03, $04 ; dimensions (y, x) + dw $5425, $52b9, $51cd ; blocks, texts, scripts + db $00 ; connections + + dw $53f5 ; objects + +INCBIN "baserom.gbc",$751cd,$2e33 SECTION "bank1E",DATA,BANK[$1E] INCBIN "baserom.gbc",$78000,$F1 -- cgit v1.3.1-sl0p From 49299e799ff6f031bfff326374ee3b34b68d255a Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 18:03:19 -0600 Subject: FuchsiaGYM_h map header asm hg-commit-id: 2f892e5efc63 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 53896005..09de9e03 100644 --- a/pokered.asm +++ b/pokered.asm @@ -16157,7 +16157,17 @@ SafariZoneEntrance_h: ; 0x751c1 to 0x751cd (12 bytes) (id=156) dw $53f5 ; objects -INCBIN "baserom.gbc",$751cd,$2e33 +INCBIN "baserom.gbc",$751cd,$75431 - $751cd + +FuchsiaGYM_h: ; 0x75431 to 0x7543d (12 bytes) (id=157) + db $07 ; tileset + db $09, $05 ; dimensions (y, x) + dw $56aa, $54d5, $543d ; blocks, texts, scripts + db $00 ; connections + + dw $5658 ; objects + +INCBIN "baserom.gbc",$7543d,$2bc3 SECTION "bank1E",DATA,BANK[$1E] INCBIN "baserom.gbc",$78000,$F1 -- cgit v1.3.1-sl0p From 4f10b26ae468a2eef0a237c6557cc367e641f159 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 18:03:30 -0600 Subject: FuchsiaMeetingRoom_h map header asm hg-commit-id: dd8f340c232c --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 09de9e03..2178a85e 100644 --- a/pokered.asm +++ b/pokered.asm @@ -16167,7 +16167,17 @@ FuchsiaGYM_h: ; 0x75431 to 0x7543d (12 bytes) (id=157) dw $5658 ; objects -INCBIN "baserom.gbc",$7543d,$2bc3 +INCBIN "baserom.gbc",$7543d,$756d7 - $7543d + +FuchsiaMeetingRoom_h: ; 0x756d7 to 0x756e3 (12 bytes) (id=158) + db $14 ; tileset + db $04, $07 ; dimensions (y, x) + dw $5722, $56e7, $56e3 ; blocks, texts, scripts + db $00 ; connections + + dw $56fc ; objects + +INCBIN "baserom.gbc",$756e3,$291d SECTION "bank1E",DATA,BANK[$1E] INCBIN "baserom.gbc",$78000,$F1 -- cgit v1.3.1-sl0p From 3213b1ffff0fee0ffb0f3ab083bfa3574897eace Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 18:03:44 -0600 Subject: CinnibarGym_h map header asm hg-commit-id: 374ef5b4e790 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 2178a85e..fc027717 100644 --- a/pokered.asm +++ b/pokered.asm @@ -16177,7 +16177,17 @@ FuchsiaMeetingRoom_h: ; 0x756d7 to 0x756e3 (12 bytes) (id=158) dw $56fc ; objects -INCBIN "baserom.gbc",$756e3,$291d +INCBIN "baserom.gbc",$756e3,$7573e - $756e3 + +CinnibarGym_h: ; 0x7573e to 0x7574a (12 bytes) (id=166) + db $16 ; tileset + db $09, $0a ; dimensions (y, x) + dw $5b26, $589f, $574a ; blocks, texts, scripts + db $00 ; connections + + dw $5acc ; objects + +INCBIN "baserom.gbc",$7574a,$28b6 SECTION "bank1E",DATA,BANK[$1E] INCBIN "baserom.gbc",$78000,$F1 -- cgit v1.3.1-sl0p From 5c7fa2adefb58205cdba1d2617054f7a737f6d41 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 18:04:58 -0600 Subject: Lab1_h map header asm hg-commit-id: 30e76cbfd9e7 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index fc027717..d06755a6 100644 --- a/pokered.asm +++ b/pokered.asm @@ -16187,7 +16187,17 @@ CinnibarGym_h: ; 0x7573e to 0x7574a (12 bytes) (id=166) dw $5acc ; objects -INCBIN "baserom.gbc",$7574a,$28b6 +INCBIN "baserom.gbc",$7574a,$75b80 - $7574a + +Lab1_h: ; 0x75b80 to 0x75b8c (12 bytes) (id=167) + db $14 ; tileset + db $04, $09 ; dimensions (y, x) + dw $5bf1, $5b90, $5b8c ; blocks, texts, scripts + db $00 ; connections + + dw $5bb3 ; objects + +INCBIN "baserom.gbc",$75b8c,$2474 SECTION "bank1E",DATA,BANK[$1E] INCBIN "baserom.gbc",$78000,$F1 -- cgit v1.3.1-sl0p From ec360c7164043f214dfb093e53c9da57e456ee19 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 18:05:09 -0600 Subject: Lab2_h map header asm hg-commit-id: f4739a7893e8 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index d06755a6..d4e5563d 100644 --- a/pokered.asm +++ b/pokered.asm @@ -16197,7 +16197,17 @@ Lab1_h: ; 0x75b80 to 0x75b8c (12 bytes) (id=167) dw $5bb3 ; objects -INCBIN "baserom.gbc",$75b8c,$2474 +INCBIN "baserom.gbc",$75b8c,$75c15 - $75b8c + +Lab2_h: ; 0x75c15 to 0x75c21 (12 bytes) (id=168) + db $14 ; tileset + db $04, $04 ; dimensions (y, x) + dw $5c6b, $5c24, $5c21 ; blocks, texts, scripts + db $00 ; connections + + dw $5c45 ; objects + +INCBIN "baserom.gbc",$75c21,$23df SECTION "bank1E",DATA,BANK[$1E] INCBIN "baserom.gbc",$78000,$F1 -- cgit v1.3.1-sl0p From f942384a40ffdc5c11e1b59df40fcd1e89ff2b1b Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 18:05:19 -0600 Subject: Lab3_h map header asm hg-commit-id: 76be28006281 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index d4e5563d..757b792c 100644 --- a/pokered.asm +++ b/pokered.asm @@ -16207,7 +16207,17 @@ Lab2_h: ; 0x75c15 to 0x75c21 (12 bytes) (id=168) dw $5c45 ; objects -INCBIN "baserom.gbc",$75c21,$23df +INCBIN "baserom.gbc",$75c21,$75c7b - $75c21 + +Lab3_h: ; 0x75c7b to 0x75c87 (12 bytes) (id=169) + db $14 ; tileset + db $04, $04 ; dimensions (y, x) + dw $5d15, $5c8a, $5c87 ; blocks, texts, scripts + db $00 ; connections + + dw $5cec ; objects + +INCBIN "baserom.gbc",$75c87,$2379 SECTION "bank1E",DATA,BANK[$1E] INCBIN "baserom.gbc",$78000,$F1 -- cgit v1.3.1-sl0p From a4a24081f6edca1383951c8e43d92c3c55103c01 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 18:05:32 -0600 Subject: Lab4_h map header asm hg-commit-id: 70ccb152f714 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 757b792c..22025757 100644 --- a/pokered.asm +++ b/pokered.asm @@ -16217,7 +16217,17 @@ Lab3_h: ; 0x75c7b to 0x75c87 (12 bytes) (id=169) dw $5cec ; objects -INCBIN "baserom.gbc",$75c87,$2379 +INCBIN "baserom.gbc",$75c87,$75d25 - $75c87 + +Lab4_h: ; 0x75d25 to 0x75d31 (12 bytes) (id=170) + db $14 ; tileset + db $04, $04 ; dimensions (y, x) + dw $5e10, $5d34, $5d31 ; blocks, texts, scripts + db $00 ; connections + + dw $5df0 ; objects + +INCBIN "baserom.gbc",$75d31,$22cf SECTION "bank1E",DATA,BANK[$1E] INCBIN "baserom.gbc",$78000,$F1 -- cgit v1.3.1-sl0p From 71a8ed8a30a8ac40d540225a816716bc3b698bcf Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 18:05:58 -0600 Subject: CinnibarPokecenter_h map header asm Someone should fix all these typos. hg-commit-id: 34e75fbee1e8 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 22025757..29b57019 100644 --- a/pokered.asm +++ b/pokered.asm @@ -16227,7 +16227,17 @@ Lab4_h: ; 0x75d25 to 0x75d31 (12 bytes) (id=170) dw $5df0 ; objects -INCBIN "baserom.gbc",$75d31,$22cf +INCBIN "baserom.gbc",$75d31,$75e20 - $75d31 + +CinnibarPokecenter_h: ; 0x75e20 to 0x75e2c (12 bytes) (id=171) + db $06 ; tileset + db $04, $07 ; dimensions (y, x) + dw $4030, $5e32, $5e2c ; blocks, texts, scripts + db $00 ; connections + + dw $5e46 ; objects + +INCBIN "baserom.gbc",$75e2c,$21d4 SECTION "bank1E",DATA,BANK[$1E] INCBIN "baserom.gbc",$78000,$F1 -- cgit v1.3.1-sl0p From 3605666a516554f0f28012be971897318c1225e2 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 18:06:14 -0600 Subject: CinnibarMart_h map header asm hg-commit-id: a4db807a1782 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 29b57019..838688b6 100644 --- a/pokered.asm +++ b/pokered.asm @@ -16237,7 +16237,17 @@ CinnibarPokecenter_h: ; 0x75e20 to 0x75e2c (12 bytes) (id=171) dw $5e46 ; objects -INCBIN "baserom.gbc",$75e2c,$21d4 +INCBIN "baserom.gbc",$75e2c,$75e72 - $75e2c + +CinnibarMart_h: ; 0x75e72 to 0x75e7e (12 bytes) (id=172) + db $02 ; tileset + db $04, $04 ; dimensions (y, x) + dw $4010, $5e81, $5e7e ; blocks, texts, scripts + db $00 ; connections + + dw $5e91 ; objects + +INCBIN "baserom.gbc",$75e7e,$2182 SECTION "bank1E",DATA,BANK[$1E] INCBIN "baserom.gbc",$78000,$F1 -- cgit v1.3.1-sl0p From c6ea921af06b30719eefad55bc7f93afad5e5434 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 18:06:28 -0600 Subject: CopycatsHouseF1_h map header asm hg-commit-id: 150985995e8c --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 838688b6..ada04c60 100644 --- a/pokered.asm +++ b/pokered.asm @@ -16247,7 +16247,17 @@ CinnibarMart_h: ; 0x75e72 to 0x75e7e (12 bytes) (id=172) dw $5e91 ; objects -INCBIN "baserom.gbc",$75e7e,$2182 +INCBIN "baserom.gbc",$75e7e,$75eb7 - $75e7e + +CopycatsHouseF1_h: ; 0x75eb7 to 0x75ec3 (12 bytes) (id=175) + db $01 ; tileset + db $04, $04 ; dimensions (y, x) + dw $4000, $5ec6, $5ec3 ; blocks, texts, scripts + db $00 ; connections + + dw $5ee3 ; objects + +INCBIN "baserom.gbc",$75ec3,$213d SECTION "bank1E",DATA,BANK[$1E] INCBIN "baserom.gbc",$78000,$F1 -- cgit v1.3.1-sl0p From 14eaa3af91adb89537c035cbe79e6ed409c96b2f Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 18:06:41 -0600 Subject: Loreli_h map header asm hg-commit-id: fa9d04e0d350 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index ada04c60..8120d527 100644 --- a/pokered.asm +++ b/pokered.asm @@ -16257,7 +16257,17 @@ CopycatsHouseF1_h: ; 0x75eb7 to 0x75ec3 (12 bytes) (id=175) dw $5ee3 ; objects -INCBIN "baserom.gbc",$75ec3,$213d +INCBIN "baserom.gbc",$75ec3,$7616f - $75ec3 + +Loreli_h: ; 0x7616f to 0x7617b (12 bytes) (id=245) + db $07 ; tileset + db $06, $05 ; dimensions (y, x) + dw $62ac, $6251, $617b ; blocks, texts, scripts + db $00 ; connections + + dw $6280 ; objects + +INCBIN "baserom.gbc",$7617b,$1e85 SECTION "bank1E",DATA,BANK[$1E] INCBIN "baserom.gbc",$78000,$F1 -- cgit v1.3.1-sl0p From 1995b33450decb3b11fd6692aaab2e9b33ee1a34 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 18:06:51 -0600 Subject: Bruno_h map header asm hg-commit-id: 0945271a7a2d --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 8120d527..119d5c41 100644 --- a/pokered.asm +++ b/pokered.asm @@ -16267,7 +16267,17 @@ Loreli_h: ; 0x7616f to 0x7617b (12 bytes) (id=245) dw $6280 ; objects -INCBIN "baserom.gbc",$7617b,$1e85 +INCBIN "baserom.gbc",$7617b,$762ca - $7617b + +Bruno_h: ; 0x762ca to 0x762d6 (12 bytes) (id=246) + db $07 ; tileset + db $06, $05 ; dimensions (y, x) + dw $6403, $63a8, $62d6 ; blocks, texts, scripts + db $00 ; connections + + dw $63d7 ; objects + +INCBIN "baserom.gbc",$762d6,$1d2a SECTION "bank1E",DATA,BANK[$1E] INCBIN "baserom.gbc",$78000,$F1 -- cgit v1.3.1-sl0p From 638cf29252b912d47b0c4b90179723dda97a2127 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 3 Jan 2012 18:07:02 -0600 Subject: Agatha_h map header asm hg-commit-id: 7ccf3950d450 --- pokered.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokered.asm b/pokered.asm index 119d5c41..3d92eb89 100644 --- a/pokered.asm +++ b/pokered.asm @@ -16277,7 +16277,17 @@ Bruno_h: ; 0x762ca to 0x762d6 (12 bytes) (id=246) dw $63d7 ; objects -INCBIN "baserom.gbc",$762d6,$1d2a +INCBIN "baserom.gbc",$762d6,$76421 - $762d6 + +Agatha_h: ; 0x76421 to 0x7642d (12 bytes) (id=247) + db $0f ; tileset + db $06, $05 ; dimensions (y, x) + dw $6560, $6505, $642d ; blocks, texts, scripts + db $00 ; connections + + dw $6534 ; objects + +INCBIN "baserom.gbc",$7642d,$1bd3 SECTION "bank1E",DATA,BANK[$1E] INCBIN "baserom.gbc",$78000,$F1 -- cgit v1.3.1-sl0p