From 3075fabe2622b1107debc2e28239de6d785d8ba5 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Wed, 11 Jan 2012 23:08:46 -0600
Subject: more automation to assist in text insertion

hg-commit-id: e631a0e3c275
---
 extras/analyze_texts.py | 146 ++++++++++++++++++++++++++----------------------
 extras/insert_texts.py  |  40 ++++++++++++-
 2 files changed, 116 insertions(+), 70 deletions(-)

diff --git a/extras/analyze_texts.py b/extras/analyze_texts.py
index 4d089975..cf25e687 100644
--- a/extras/analyze_texts.py
+++ b/extras/analyze_texts.py
@@ -385,81 +385,91 @@ def find_missing_08s(all_texts):
 
 def text_pretty_printer_at(start_address, label="SomeLabel"):
     commands = parse_text_script(start_address, None, None)
+    needs_to_begin_with_0 = False
     
     wanted_command = None
-    for command_id in commands:
-        command = commands[command_id]
-        if command["type"] == 0:
-            wanted_command = command_id
+    if needs_to_begin_with_0:
+        wanted_command = None
+        for command_id in commands:
+            command = commands[command_id]
+            if command["type"] == 0:
+                wanted_command = command_id
     
-    if wanted_command == None:
-        raise "error: address did not start with a $0 text"
-
-    lines = commands[wanted_command]["lines"]
-
-    #add the ending byte to the last line- always seems $57
-    lines[len(lines.keys())-1].append(commands[1]["type"])
-
-    output  = "\n"
-    output += label + ": ; " + hex(start_address) + "\n"
-    first = True
-    for line_id in lines:
-        line = lines[line_id]
-        output += spacing + "db "
-        if first:
-            output += "$0, "
-            first = False
-     
-        quotes_open = False
-        first_byte = True
-        was_byte = False
-        byte_count = 0
-        for byte in line:
-            if byte in txt_bytes:
-                if not quotes_open and not first_byte: #start text
-                    output += ", \""
-                    quotes_open = True
-                    first_byte = False
-                if not quotes_open and first_byte: #start text
-                    output += "\""
-                    quotes_open = True
-                output += txt_bytes[byte]
-            elif byte in constant_abbreviation_bytes:
-                if quotes_open:
-                    output += "\""
-                    quotes_open = False
-                if not first_byte:
-                    output += ", "
-                output += constant_abbreviation_bytes[byte]
-            else:
-                if quotes_open:
-                    output += "\""
-                    quotes_open = False
-
-                #if you want the ending byte on the last line
-                #if not (byte == 0x57 or byte == 0x50 or byte == 0x58):
-                if not first_byte:
-                    output += ", "
-
-                output += "$" + hex(byte)[2:]
-                was_byte = True
-
-                #add a comma unless it's the end of the line
-                #if byte_count+1 != len(line):
-                #    output += ", "
-
-            first_byte = False
-            byte_count += 1
-        #close final quotes
-        if quotes_open:
-            output += "\""
-            quotes_open = False
+        if wanted_command == None:
+            raise "error: address did not start with a $0 text"
+    
+    #start with zero please
+    byte_count = 0
 
-        output += "\n"
+    first_line = True
+    for this_command in commands.keys():
+        lines = commands[this_command]["lines"]
+    
+        #add the ending byte to the last line- always seems $57
+        lines[len(lines.keys())-1].append(commands[1]["type"])
+    
+        if first_line:
+            output  = "\n"
+            output += label + ": ; " + hex(start_address) + "\n"
+            first_line = False
+
+        first = True #first byte
+        for line_id in lines:
+            line = lines[line_id]
+            output += spacing + "db "
+            if first and needs_to_begin_with_0:
+                output += "$0, "
+                first = False
+         
+            quotes_open = False
+            first_byte = True
+            was_byte = False
+            for byte in line:
+                if byte in txt_bytes:
+                    if not quotes_open and not first_byte: #start text
+                        output += ", \""
+                        quotes_open = True
+                        first_byte = False
+                    if not quotes_open and first_byte: #start text
+                        output += "\""
+                        quotes_open = True
+                    output += txt_bytes[byte]
+                elif byte in constant_abbreviation_bytes:
+                    if quotes_open:
+                        output += "\""
+                        quotes_open = False
+                    if not first_byte:
+                        output += ", "
+                    output += constant_abbreviation_bytes[byte]
+                else:
+                    if quotes_open:
+                        output += "\""
+                        quotes_open = False
+    
+                    #if you want the ending byte on the last line
+                    #if not (byte == 0x57 or byte == 0x50 or byte == 0x58):
+                    if not first_byte:
+                        output += ", "
+    
+                    output += "$" + hex(byte)[2:]
+                    was_byte = True
+    
+                    #add a comma unless it's the end of the line
+                    #if byte_count+1 != len(line):
+                    #    output += ", "
+    
+                first_byte = False
+                byte_count += 1
+            #close final quotes
+            if quotes_open:
+                output += "\""
+                quotes_open = False
+    
+            output += "\n"
 
     #output += "\n"
     print output
-    return output
+    return (output, byte_count)
 
 def is_label_in_asm(label):
     for line in analyze_incbins.asm:
diff --git a/extras/insert_texts.py b/extras/insert_texts.py
index 3257c067..f397a135 100644
--- a/extras/insert_texts.py
+++ b/extras/insert_texts.py
@@ -3,7 +3,7 @@
 #date: 2012-01-07
 #insert TX_FAR targets into pokered.asm
 import extract_maps
-from analyze_texts import analyze_texts
+from analyze_texts import analyze_texts, text_pretty_printer_at
 from pretty_map_headers import map_name_cleaner, make_text_label, map_constants, find_all_tx_fars, tx_far_pretty_printer, tx_far_label_maker
 import pretty_map_headers
 from analyze_incbins import asm, offset_to_pointer, find_incbin_to_replace_for, split_incbin_line_into_three, generate_diff_insert, load_asm, isolate_incbins, process_incbins, reset_incbins, apply_diff
@@ -389,6 +389,39 @@ def insert_asm(start_address, label):
     print diff
     result = apply_diff(diff, try_fixing=False)
 
+def insert_text(address, label):
+    "inserts a text script (but not $8s)"
+    start_address = address
+
+    line_number = find_incbin_to_replace_for(start_address)
+    if line_number == None:
+        print "skipping text at " + hex(start_address) + " with address " + label
+        return
+
+    text_asm, byte_count = text_pretty_printer_at(start_address, label)
+    end_address = start_address + byte_count
+    newlines = split_incbin_line_into_three(line_number, start_address, byte_count)
+
+    newlines = newlines.split("\n")
+    if len(newlines) == 2: index = 0 #replace the 1st line with new content
+    elif len(newlines) == 3: index = 1 #replace the 2nd line with new content
+    
+    newlines[index] = text_asm
+
+    if len(newlines) == 3 and newlines[2][-2:] == "$0":
+        #get rid of the last incbin line if it is only including 0 bytes
+        del newlines[2]
+        #note that this has to be done after adding in the new asm
+    newlines = "\n".join(line for line in newlines)
+    newlines = newlines.replace("$x", "$") #where does this keep coming from??
+
+    #Char52 doesn't work yet
+    newlines = newlines.replace("Char52", "$52")
+
+    diff = generate_diff_insert(line_number, newlines)
+    print diff
+    #apply_diff(diff)
+
 if __name__ == "__main__":
     #load map headers and object data
     extract_maps.load_rom()
@@ -428,7 +461,7 @@ if __name__ == "__main__":
 
     #insert_asm(0x758df, "CinnabarGymText1")
 
-    #insert_text_label_tx_far(95, 1)
+    #insert_text_label_tx_far(91, 1)
     missed_17s = [] #[[95, 1], [95, 2], [96, 1], [97, 1], [99, 1], [99, 2], [99, 3], [100, 1], [100, 2], [100, 3], [100, 4], [100, 5], [100, 6], [124, 8], [124, 10], [124, 12], [124, 16], [124, 17], [133, 3], [139, 1], [139, 2], [139, 3], [141, 2], [141, 3], [154, 2], [154, 3], [169, 4], [171, 2], [171, 3], [174, 2], [174, 3], [176, 4], [176, 5], [182, 3], [215, 5], [91, 2], [91, 3], [124, 8], [124, 10], [124, 12], [124, 16], [124, 17], [139, 1], [139, 2], [139, 3], [141, 2], [169, 4], [171, 2], [174, 2], [176, 4], [176, 5]]
     for missed_17 in missed_17s:
         insert_text_label_tx_far(missed_17[0], missed_17[1])
@@ -444,6 +477,9 @@ if __name__ == "__main__":
         isolate_incbins()
         process_incbins()
 
+    #insert_text(0x44276, "ViridianPokeCenterText4")
+    insert_text(0x2461, "VermilionMartText1")
+
     if len(failed_attempts) > 0:
         print "-- FAILED ATTEMPTS --"
         print str(failed_attempts)
-- 
cgit v1.2.3


From 244b30b760fe1c9ac931f3e92d6a127d1239e8e3 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Wed, 11 Jan 2012 23:09:03 -0600
Subject: text labels for MartInventories on various marts

hg-commit-id: f0b79b11f8ed
---
 pokered.asm | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 10 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index 82011dd5..cbf879bf 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -959,46 +959,76 @@ INCBIN "baserom.gbc",$2125,$2442 - $2125
 ; XXX where is the pointer to this data?
 MartInventories: ; 2442
 	; first byte $FE, next byte # of items, last byte $FF
+
 ; Viridian
+ViridianMartText4: ; XXX confirm
 	db $FE,4,POKE_BALL,ANTIDOTE,PARLYZ_HEAL,BURN_HEAL,$FF
+
 ; Pewter
+PewterMartText1:
 	db $FE,7,POKE_BALL,POTION,ESCAPE_ROPE,ANTIDOTE,BURN_HEAL,AWAKENING
 	db PARLYZ_HEAL,$FF
+
 ; Cerulean
+CeruleanMartText1:
 	db $FE,7,POKE_BALL,POTION,REPEL,ANTIDOTE,BURN_HEAL,AWAKENING
 	db PARLYZ_HEAL,$FF
+
 ; Bike shop
 	db $FE,1,BICYCLE,$FF
+
 ; Vermilion
+VermilionMartText1:
 	db $FE,6,POKE_BALL,SUPER_POTION,ICE_HEAL,AWAKENING,PARLYZ_HEAL
 	db REPEL,$FF
+
 ; Lavender
+LavenderMartText1:
 	db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,ESCAPE_ROPE,SUPER_REPEL
 	db ANTIDOTE,BURN_HEAL,ICE_HEAL,PARLYZ_HEAL,$FF
+
 ; Celadon Dept. Store 2F (1)
+CeladonMart2Text1:
 	db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,SUPER_REPEL,ANTIDOTE
 	db BURN_HEAL,ICE_HEAL,AWAKENING,PARLYZ_HEAL,$FF
+
 ; Celadon Dept. Store 2F (2)
+CeladonMart2Text2:
 	db $FE,9,TM_32,TM_33,TM_02,TM_07,TM_37,TM_01,TM_05,TM_09,TM_17,$FF
+
 ; Celadon Dept. Store 4F
+CeladonMart4Text1:
 	db $FE,5,POKE_DOLL,FIRE_STONE,THUNDER_STONE,WATER_STONE,LEAF_STONE,$FF
+
 ; Celadon Dept. Store 5F (1)
+CeladonMart5Text3:
 	db $FE,7,X_ACCURACY,GUARD_SPEC_,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED
 	db X_SPECIAL,$FF
+
 ; Celadon Dept. Store 5F (2)
+CeladonMart5Text4:
 	db $FE,5,HP_UP,PROTEIN,IRON,CARBOS,CALCIUM,$FF
+
 ; Fuchsia
+FuchsiaMartText1:
 	db $FE,6,ULTRA_BALL,GREAT_BALL,SUPER_POTION,REVIVE,FULL_HEAL
 	db SUPER_REPEL,$FF
+
 ; unused?
 	db $FE,5,GREAT_BALL,HYPER_POTION,SUPER_POTION,FULL_HEAL,REVIVE,$FF
+
 ; Cinnabar
+CinnabarMartText1:
 	db $FE,7,ULTRA_BALL,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE
 	db FULL_HEAL,REVIVE,$FF
+
 ; Saffron
+SaffronMartText1:
 	db $FE,6,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL
 	db REVIVE,$FF
+
 ; Indigo
+IndigoPlateauLobbyText4:
 	db $FE,7,ULTRA_BALL,GREAT_BALL,FULL_RESTORE,MAX_POTION,FULL_HEAL
 	db REVIVE,MAX_REPEL,$FF
 
@@ -7824,8 +7854,10 @@ ViridianMart_h: ; 0x1d462 to 0x1d46e (12 bytes) (bank=7) (id=42)
     dw $550a ; objects
 
 INCBIN "baserom.gbc",$1d46e,$1d4e0 - $1d46e
+
 ViridianMartTexts: ; 0x1d4e0
-    dw ViridianMartText1, ViridianMartText2, ViridianMartText3
+    dw ViridianMartText1, ViridianMartText2, ViridianMartText3 ;, ViridianMartText4
+
 INCBIN "baserom.gbc",$1d4e6,$a
 
 ViridianMartText1: ; 0x1d4f0
@@ -16361,8 +16393,8 @@ ViridianPokeCenterText3: ; 0x44271
     TX_FAR _ViridianPokeCenterText3
     db $50
 
-;XXX wtf?
-db $f6
+ViridianPokeCenterText4:
+    db $f6
 
 ViridianPokeCenterObject: ; 0x44277 (size=44)
     db $0 ; border tile
@@ -19135,8 +19167,8 @@ MtMoonPokecenterText5: ; 0x49370
     TX_FAR _MtMoonPokecenterText5
     db $50
 
-;XXX wtf?
-db $f6
+MtMoonPokecenterText6:
+    db $f6
 
 MtMoonPokecenterObject: ; 0x49376 (size=56)
     db $0 ; border tile
@@ -19179,9 +19211,8 @@ RockTunnelPokecenterText3: ; 0x493ce
     TX_FAR _RockTunnelPokecenterText3
     db $50
 
-; RockTunnelPokecenterText4: ; 0x493d3
-
-INCBIN "baserom.gbc",$493ce+5,$493d4-($493ce+5)
+RockTunnelPokecenterText4: ; 0x493d3
+    db $f6
 
 RockTunnelPokecenterObject: ; 0x493d4 (size=44)
     db $0 ; border tile
@@ -19211,6 +19242,7 @@ Route11Gate_h: ; 0x49400 to 0x4940c (12 bytes) (id=84)
     dw $5416 ; objects
 
 INCBIN "baserom.gbc",$4940c,$4940f - $4940c
+
 Route11GateTexts: ; 0x4940f
     dw Route11GateText1
 
@@ -19249,6 +19281,7 @@ Route11GateUpstairs_h: ; 0x49448 to 0x49454 (12 bytes) (id=86)
     dw $54da ; objects
 
 INCBIN "baserom.gbc",$49454,$4945f - $49454
+
 Route11GateUpstairsText1: ; 0x4945f
     db $08 ; asm
     xor a
@@ -19258,6 +19291,7 @@ Route11GateUpstairsText1: ; 0x4945f
     jp $24d7
 
 INCBIN "baserom.gbc",$4946c,$494a8 - $4946c
+
 Route11GateUpstairsText3: ; 0x494a8
     db $08 ; asm
     ld a, [$c109]
@@ -19272,7 +19306,7 @@ Route11GateUpstairsText3: ; 0x494a8
     call PrintText
     jp $24d7
 
-INCBIN "baserom.gbc",$494c4,$16
+INCBIN "baserom.gbc",$494c4,$494da - $494c4
 
 Route11GateUpstairsObject: ; 0x494da (size=30)
     db $a ; border tile
@@ -25392,7 +25426,8 @@ VermilionPokecenterText3: ; 0x5c9a3
     TX_FAR _VermilionPokecenterText3
     db $50
 
-INCBIN "baserom.gbc",$5c9a8,$1
+VermilionPokecenterText4: ; 0x5c9a8
+    db $f6
 
 VermilionPokecenterObject: ; 0x5c9a9 (size=44)
     db $0 ; border tile
-- 
cgit v1.2.3


From 101defa567894f71ce9f3b82d4e86fb29e4b0927 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Wed, 11 Jan 2012 23:19:31 -0600
Subject: texts for marts and pokecenters

hg-commit-id: 7f2bd9622f0e
---
 pokered.asm | 43 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index cbf879bf..f43e8c92 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -6859,7 +6859,8 @@ IndigoPlateauLobbyText3: ; 0x19c8f
     TX_FAR _IndigoPlateauLobbyText3
     db $50
 
-INCBIN "baserom.gbc",$19c94,$1
+IndigoPlateauLobbyText5:
+    db $f6
 
 IndigoPlateauLobbyObject: ; 0x19c95 (size=58)
     db $0 ; border tile
@@ -18385,7 +18386,10 @@ CeladonPokecenter_h: ; 0x488ac to 0x488b8 (12 bytes) (bank=12) (id=133)
 
     dw $48d2 ; objects
 
-INCBIN "baserom.gbc",$488b8,$488c8 - $488b8
+INCBIN "baserom.gbc",$488b8,$488c6 - $488b8
+
+CeladonPokecenterText4:
+    db $f6, $ff
 
 CeladonPokecenterText2: ; _CeladonPokecenterText2
 CeladonPokecenterText1: ; 0x488c8
@@ -18397,7 +18401,6 @@ CeladonPokecenterText3: ; 0x488cd
     TX_FAR _CeladonPokecenterText3
     db $50
 
-
 CeladonPokecenterObject: ; 0x488d2 (size=44)
     db $0 ; border tile
 
@@ -18462,6 +18465,7 @@ CeladonGymText1: ; 0x48a11
     jp $24d7
 
 INCBIN "baserom.gbc",$48a5e,$48a81 - $48a5e
+
 CeladonGymText2: ; 0x48a81
     db $08 ; asm
     ld hl, $49bc
@@ -18469,6 +18473,7 @@ CeladonGymText2: ; 0x48a81
     jp $24d7
 
 INCBIN "baserom.gbc",$48a8b,$48a9a - $48a8b
+
 CeladonGymText3: ; 0x48a9a
     db $08 ; asm
     ld hl, $49c8
@@ -18476,6 +18481,7 @@ CeladonGymText3: ; 0x48a9a
     jp $24d7
 
 INCBIN "baserom.gbc",$48aa4,$48ab3 - $48aa4
+
 CeladonGymText4: ; 0x48ab3
     db $08 ; asm
     ld hl, $49d4
@@ -18483,6 +18489,7 @@ CeladonGymText4: ; 0x48ab3
     jp $24d7
 
 INCBIN "baserom.gbc",$48abd,$48acc - $48abd
+
 CeladonGymText5: ; 0x48acc
     db $08 ; asm
     ld hl, $49e0
@@ -18490,6 +18497,7 @@ CeladonGymText5: ; 0x48acc
     jp $24d7
 
 INCBIN "baserom.gbc",$48ad6,$48ae5 - $48ad6
+
 CeladonGymText6: ; 0x48ae5
     db $08 ; asm
     ld hl, $49ec
@@ -18497,6 +18505,7 @@ CeladonGymText6: ; 0x48ae5
     jp $24d7
 
 INCBIN "baserom.gbc",$48aef,$48afe - $48aef
+
 CeladonGymText7: ; 0x48afe
     db $08 ; asm
     ld hl, $49f8
@@ -18504,6 +18513,7 @@ CeladonGymText7: ; 0x48afe
     jp $24d7
 
 INCBIN "baserom.gbc",$48b08,$48b17 - $48b08
+
 CeladonGymText8: ; 0x48b17
     db $08 ; asm
     ld hl, $4a04
@@ -18511,6 +18521,7 @@ CeladonGymText8: ; 0x48b17
     jp $24d7
 
 INCBIN "baserom.gbc",$48b21,$f
+
 CeladonGymObject: ; 0x48b30 (size=84)
     db $3 ; border tile
 
@@ -18761,6 +18772,7 @@ CeladonGameCornerText10: ; 0x48e3b
     jp $24d7
 
 INCBIN "baserom.gbc",$48e88,$48e9d - $48e88
+
 CeladonGameCornerText11: ; 0x48e9d
     db $08 ; asm
     ld hl, $4ece
@@ -18784,6 +18796,7 @@ CeladonGameCornerText11: ; 0x48e9d
     jp $24d7
 
 INCBIN "baserom.gbc",$48ece,$48edd - $48ece
+
 CeladonGameCornerText12: ; 0x48edd
     db $08 ; asm
     ld a, $1
@@ -18804,6 +18817,7 @@ CeladonGameCornerText12: ; 0x48edd
     jp $24d7
 
 INCBIN "baserom.gbc",$48f09,$97
+
 CeladonGameCornerObject: ; 0x48fa0 (size=99)
     db $f ; border tile
 
@@ -19011,6 +19025,7 @@ CeladonHouse_h: ; 0x49202 to 0x4920e (12 bytes) (bank=12) (id=139)
     dw $5227 ; objects
 
 INCBIN "baserom.gbc",$4920e,$49212 - $4920e
+
 CeladonHouseTexts: ; 0x49212
     dw CeladonHouseText1, CeladonHouseText2, CeladonHouseText3
 
@@ -19056,6 +19071,7 @@ CeladonHotel_h: ; 0x4925d to 0x49269 (12 bytes) (bank=12) (id=140)
     dw $5281 ; objects
 
 INCBIN "baserom.gbc",$49269,$4926c - $49269
+
 CeladonHotelTexts: ; 0x4926c
     dw CeladonHotelText1, CeladonHotelText2, CeladonHotelText3
 
@@ -25126,7 +25142,11 @@ PewterPokecenterText4: ; broken TX_FAR to _PewterPokecenterText4
     db $50
 
 ;XXX wtf?
-db $30, $38, $34, $3c, $f6
+db $30, $38, $34, $3c
+
+PewterPokecenterText5: ; XXX confirm text_id number
+    db $f6
+
 PewterPokecenterObject: ; 0x5c60d (size=44)
     db $0 ; border tile
 
@@ -25196,6 +25216,7 @@ CeruleanGym_h: ; 0x5c6a7 to 0x5c6b3 (12 bytes) (id=65)
     dw $4834 ; objects
 
 INCBIN "baserom.gbc",$5c6b3,$5c771 - $5c6b3
+
 CeruleanGymText1: ; 0x5c771
     db $08 ; asm
     ld a, [$d75e]
@@ -25328,7 +25349,10 @@ LavenderPokecenter_h: ; 0x5c8ce to 0x5c8da (12 bytes) (id=141)
 
     dw $48f4 ; objects
 
-INCBIN "baserom.gbc",$5c8da,$5c8ea - $5c8da
+INCBIN "baserom.gbc",$5c8da,$5c8e8 - $5c8da
+
+LavenderPokecenterText4:
+    db $f6, $ff
 
 LavenderPokecenterText2:
 LavenderPokecenterText1: ; 0x5c8ea
@@ -26132,7 +26156,8 @@ SaffronPokecenterText3: ; 0x5d549
     TX_FAR _SaffronPokecenterText3
     db $50
 
-INCBIN "baserom.gbc",$5d54e,$1
+SaffronPokecenterText4:
+    db $f6
 
 SaffronPokecenterObject: ; 0x5d54f (size=44)
     db $0 ; border tile
@@ -29423,7 +29448,8 @@ FuchsiaPokecenterText3: ; 0x75077
     TX_FAR _FuchsiaPokecenterText3
     db $50
 
-INCBIN "baserom.gbc",$7507c,$1
+FuchsiaPokecenterText4: ; 0x7507c
+    db $f6
 
 FuchsiaPokecenterObject: ; 0x7507d (size=44)
     db $0 ; border tile
@@ -30211,7 +30237,8 @@ CinnabarPokecenterText3: ; 0x75e40
     TX_FAR _CinnabarPokecenterText3
     db $50
 
-INCBIN "baserom.gbc",$75e45,$1
+CinnabarPokecenterText4:
+    db $f6
 
 CinnabarPokecenterObject: ; 0x75e46 (size=44)
     db $0 ; border tile
-- 
cgit v1.2.3


From 9984d22d5bd4b8fea3b35d497c79eec873a885a5 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Wed, 11 Jan 2012 23:20:16 -0600
Subject: switch ash and gary to red and blue in extract_maps.py

hg-commit-id: 4306f4d5a885
---
 extras/extract_maps.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extras/extract_maps.py b/extras/extract_maps.py
index a1394e97..8e29158a 100644
--- a/extras/extract_maps.py
+++ b/extras/extract_maps.py
@@ -60,9 +60,9 @@ maps = {
          0x22: "Route 23",
          0x23: "Route 24",
          0x24: "Route 25",
-         0x25: "Ash's House F1",
-         0x26: "Ash's House F2",
-         0x27: "Gary's House",
+         0x25: "Red's House F1",
+         0x26: "Red's House F2",
+         0x27: "Blue's House",
          0x28: "Oak's Lab",
          0x29: "Viridian Poke Center",
          0x2A: "Viridian Mart",
-- 
cgit v1.2.3


From 418dc214d8346828cfac03ef0af0a2d298d5d318 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 01:31:14 -0600
Subject: insert texts pointer labels

hg-commit-id: 18cc3e2ec33b
---
 extras/insert_texts.py |    7 +-
 pokered.asm            | 1023 +++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 884 insertions(+), 146 deletions(-)

diff --git a/extras/insert_texts.py b/extras/insert_texts.py
index f397a135..f850f001 100644
--- a/extras/insert_texts.py
+++ b/extras/insert_texts.py
@@ -106,7 +106,7 @@ def all_texts_are_tx_fars(map_id):
 def texts_label_pretty_printer(map_id):
     "output a texts label for map if all texts are TX_FARs and in the asm already"
     #extract_maps.map_headers[map_id]["texts"][text_id][0]["TX_FAR"]
-    if not all_texts_are_tx_fars(map_id): return None
+    #if not all_texts_are_tx_fars(map_id): return None
     map2 = extract_maps.map_headers[map_id]
 
     #pointer to the list of texts
@@ -139,7 +139,7 @@ def texts_label_pretty_printer(map_id):
     return output
 
 def insert_texts_label(map_id):
-    if not all_texts_are_tx_fars(map_id): return None
+    #if not all_texts_are_tx_fars(map_id): return None
     map2 = extract_maps.map_headers[map_id]
     
     base_label = map_name_cleaner(map2["name"], None)[:-2]
@@ -478,7 +478,8 @@ if __name__ == "__main__":
         process_incbins()
 
     #insert_text(0x44276, "ViridianPokeCenterText4")
-    insert_text(0x2461, "VermilionMartText1")
+    #insert_texts_label(4)
+    insert_all_texts_labels()
 
     if len(failed_attempts) > 0:
         print "-- FAILED ATTEMPTS --"
diff --git a/pokered.asm b/pokered.asm
index f43e8c92..adbf43be 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -5994,7 +5994,12 @@ PalletTownText7: ; sign by Blue’s house
 	TX_FAR _PalletTownText7
 	db "@"
 
-INCBIN "baserom.gbc",$18ff1,$19102 - $18ff1
+INCBIN "baserom.gbc",$18ff1,$190e4 - $18ff1
+
+ViridianCityTexts: ; 0x190e4
+    dw ViridianCityText1, ViridianCityText2, ViridianCityText3, ViridianCityText4, ViridianCityText5, ViridianCityText6, ViridianCityText7, ViridianCityText8, ViridianCityText9, ViridianCityText10, ViridianCityText11, ViridianCityText12, ViridianCityText13
+
+INCBIN "baserom.gbc",$190fe,$4
 
 ViridianCityText1: ; 0x19102
     TX_FAR _ViridianCityText1
@@ -6123,7 +6128,12 @@ ViridianCityText13: ; 0x1922d
     TX_FAR _ViridianCityText13
     db $50
 
-INCBIN "baserom.gbc",$19232,$193a7 - $19232
+INCBIN "baserom.gbc",$19232,$1938b - $19232
+
+PewterCityTexts: ; 0x1938b
+    dw PewterCityText1, PewterCityText2, PewterCityText3, PewterCityText4, PewterCityText5, PewterCityText6, PewterCityText7, PewterCityText8, PewterCityText9, PewterCityText10, PewterCityText11, PewterCityText12
+
+INCBIN "baserom.gbc",$193a3,$4
 
 PewterCityText1: ; 0x193a7
     TX_FAR _PewterCityText1
@@ -6224,7 +6234,11 @@ PewterCityText12: ; 0x1947b
     TX_FAR _PewterCityText12
     db $50
 
-INCBIN "baserom.gbc",$19480,$1964f - $19480
+INCBIN "baserom.gbc",$19480,$1962d - $19480
+
+CeruleanCityTexts: ; 0x1962d
+    dw CeruleanCityText1, CeruleanCityText2, CeruleanCityText3, CeruleanCityText4, CeruleanCityText5, CeruleanCityText6, CeruleanCityText7, CeruleanCityText8, CeruleanCityText9, CeruleanCityText10, CeruleanCityText11, CeruleanCityText12, CeruleanCityText13, CeruleanCityText14, CeruleanCityText15, CeruleanCityText16, CeruleanCityText17
+
 CeruleanCityText1: ; 0x1964f
     db $08 ; asm
     ld a, [$d75a]
@@ -6372,7 +6386,10 @@ CeruleanCityText17: ; 0x1979c
     TX_FAR _CeruleanCityText17
     db $50
 
-INCBIN "baserom.gbc",$197a1,$19889 - $197a1
+INCBIN "baserom.gbc",$197a1,$1986f - $197a1
+
+VermilionCityTexts: ; 0x1986f
+    dw VermilionCityText1, VermilionCityText2, VermilionCityText3, VermilionCityText4, VermilionCityText5, VermilionCityText6, VermilionCityText7, VermilionCityText8, VermilionCityText9, VermilionCityText10, VermilionCityText11, VermilionCityText12, VermilionCityText13
 
 VermilionCityText1: ; 0x19889
     TX_FAR _VermilionCityText1
@@ -6474,7 +6491,10 @@ VermilionCityText13: ; 0x19951
     TX_FAR _VermilionCityText13
     db $50
 
-INCBIN "baserom.gbc",$19956,$1998a - $19956
+INCBIN "baserom.gbc",$19956,$19966 - $19956
+
+CeladonCityTexts: ; 0x19966
+    dw CeladonCityText1, CeladonCityText2, CeladonCityText3, CeladonCityText4, CeladonCityText5, CeladonCityText6, CeladonCityText7, CeladonCityText8, CeladonCityText9, CeladonCityText10, CeladonCityText11, CeladonCityText12, CeladonCityText13, CeladonCityText14, CeladonCityText15, CeladonCityText16, CeladonCityText17, CeladonCityText18
 
 CeladonCityText1: ; 0x1998a
     TX_FAR _CeladonCityText1
@@ -6570,7 +6590,10 @@ CeladonCityText18: ; 0x19a26
     TX_FAR _CeladonCityText18
     db $50
 
-INCBIN "baserom.gbc",$19a2b,$19a5e - $19a2b
+INCBIN "baserom.gbc",$19a2b,$19a2e - $19a2b
+
+FuchsiaCityTexts: ; 0x19a2e
+    dw FuchsiaCityText1, FuchsiaCityText2, FuchsiaCityText3, FuchsiaCityText4, FuchsiaCityText5, FuchsiaCityText6, FuchsiaCityText7, FuchsiaCityText8, FuchsiaCityText9, FuchsiaCityText10, FuchsiaCityText11, FuchsiaCityText12, FuchsiaCityText13, FuchsiaCityText14, FuchsiaCityText15, FuchsiaCityText16, FuchsiaCityText17, FuchsiaCityText18, FuchsiaCityText19, FuchsiaCityText20, FuchsiaCityText21, FuchsiaCityText22, FuchsiaCityText23, FuchsiaCityText24
 
 FuchsiaCityText1: ; 0x19a5e
     TX_FAR _FuchsiaCityText1
@@ -6810,7 +6833,11 @@ VermilionHouse3_h: ; 0x19c06 to 0x19c12 (12 bytes) (bank=6) (id=196)
 
     dw $5c25 ; objects
 
-INCBIN "baserom.gbc",$19c12,$19c17 - $19c12
+INCBIN "baserom.gbc",$19c12,$19c15 - $19c12
+
+VermilionHouse3Texts: ; 0x19c15
+    dw VermilionHouse3Text1
+
 VermilionHouse3Text1: ; 0x19c17
     db $08 ; asm
     ld a, $4
@@ -6895,7 +6922,13 @@ SilphCo4_h: ; 0x19cff to 0x19d0b (12 bytes) (bank=6) (id=209)
 
     dw $5e35 ; objects
 
-INCBIN "baserom.gbc",$19d0b,$19dd3 - $19d0b
+INCBIN "baserom.gbc",$19d0b,$19da0 - $19d0b
+
+SilphCo4Texts: ; 0x19da0
+    dw SilphCo4Text1, SilphCo4Text2, SilphCo4Text3, SilphCo4Text4, SilphCo4Text5, SilphCo4Text6, SilphCo4Text7
+
+INCBIN "baserom.gbc",$19dae,$25
+
 SilphCo4Text1: ; 0x19dd3
     db $08 ; asm
     ld hl, $5de0
@@ -6968,7 +7001,13 @@ SilphCo5_h: ; 0x19f2b to 0x19f37 (12 bytes) (bank=6) (id=210)
 
     dw $608d ; objects
 
-INCBIN "baserom.gbc",$19f37,$1a003 - $19f37
+INCBIN "baserom.gbc",$19f37,$19fbc - $19f37
+
+SilphCo5Texts: ; 0x19fbc
+    dw SilphCo5Text1, SilphCo5Text2, SilphCo5Text3, SilphCo5Text4, SilphCo5Text5, SilphCo5Text6, SilphCo5Text7, SilphCo5Text8, SilphCo5Text9, SilphCo5Text10, SilphCo5Text11
+
+INCBIN "baserom.gbc",$19fd2,$31
+
 SilphCo5Text1: ; 0x1a003
     db $08 ; asm
     ld hl, $6010
@@ -7065,7 +7104,13 @@ SilphCo6_h: ; 0x1a19d to 0x1a1a9 (12 bytes) (bank=6) (id=211)
 
     dw $62fb ; objects
 
-INCBIN "baserom.gbc",$1a1a9,$1a23d - $1a1a9
+INCBIN "baserom.gbc",$1a1a9,$1a1f6 - $1a1a9
+
+SilphCo6Texts: ; 0x1a1f6
+    dw SilphCo6Text1, SilphCo6Text2, SilphCo6Text3, SilphCo6Text4, SilphCo6Text5, SilphCo6Text6, SilphCo6Text7, SilphCo6Text8, SilphCo6Text9, SilphCo6Text10
+
+INCBIN "baserom.gbc",$1a20a,$33
+
 SilphCo6Text1: ; 0x1a23d
     db $08 ; asm
     ld hl, $624a
@@ -7074,6 +7119,7 @@ SilphCo6Text1: ; 0x1a23d
     jp $24d7
 
 INCBIN "baserom.gbc",$1a24a,$1a254 - $1a24a
+
 SilphCo6Text2: ; 0x1a254
     db $08 ; asm
     ld hl, $6261
@@ -7082,6 +7128,7 @@ SilphCo6Text2: ; 0x1a254
     jp $24d7
 
 INCBIN "baserom.gbc",$1a261,$1a26b - $1a261
+
 SilphCo6Text3: ; 0x1a26b
     db $08 ; asm
     ld hl, $6278
@@ -7090,6 +7137,7 @@ SilphCo6Text3: ; 0x1a26b
     jp $24d7
 
 INCBIN "baserom.gbc",$1a278,$1a282 - $1a278
+
 SilphCo6Text4: ; 0x1a282
     db $08 ; asm
     ld hl, $628f
@@ -7098,6 +7146,7 @@ SilphCo6Text4: ; 0x1a282
     jp $24d7
 
 INCBIN "baserom.gbc",$1a28f,$1a299 - $1a28f
+
 SilphCo6Text5: ; 0x1a299
     db $08 ; asm
     ld hl, $62a6
@@ -7106,6 +7155,7 @@ SilphCo6Text5: ; 0x1a299
     jp $24d7
 
 INCBIN "baserom.gbc",$1a2a6,$1a2b0 - $1a2a6
+
 SilphCo6Text6: ; 0x1a2b0
     db $08 ; asm
     ld hl, $620a
@@ -7113,6 +7163,7 @@ SilphCo6Text6: ; 0x1a2b0
     jp $24d7
 
 INCBIN "baserom.gbc",$1a2ba,$1a2c9 - $1a2ba
+
 SilphCo6Text7: ; 0x1a2c9
     db $08 ; asm
     ld hl, $6216
@@ -7120,6 +7171,7 @@ SilphCo6Text7: ; 0x1a2c9
     jp $24d7
 
 INCBIN "baserom.gbc",$1a2d3,$1a2e2 - $1a2d3
+
 SilphCo6Text8: ; 0x1a2e2
     db $08 ; asm
     ld hl, $6222
@@ -7127,6 +7179,7 @@ SilphCo6Text8: ; 0x1a2e2
     jp $24d7
 
 INCBIN "baserom.gbc",$1a2ec,$f
+
 SilphCo6Object: ; 0x1a2fb (size=112)
     db $2e ; border tile
 
@@ -7471,7 +7524,12 @@ MonsterNames: ; 421E
 	db "WEEPINBELL"
 	db "VICTREEBEL"
 
-INCBIN "baserom.gbc",$1c98a,$1ca96 - $1c98a
+INCBIN "baserom.gbc",$1c98a,$1ca81 - $1c98a
+
+CinnabarIslandTexts: ; 0x1ca81
+    dw CinnabarIslandText1, CinnabarIslandText2, CinnabarIslandText3, CinnabarIslandText4, CinnabarIslandText5, CinnabarIslandText6, CinnabarIslandText7
+
+INCBIN "baserom.gbc",$1ca8f,$7
 
 CinnabarIslandText1: ; 0x1ca96
     TX_FAR _CinnabarIslandText1
@@ -7493,7 +7551,11 @@ CinnabarIslandText7: ; 0x1caaa
     TX_FAR _CinnabarIslandText7
     db $50
 
-INCBIN "baserom.gbc",$1caaf,$1cab8 - $1caaf
+INCBIN "baserom.gbc",$1caaf,$1cab2 - $1caaf
+
+Route1Texts: ; 0x1cab2
+    dw Route1Text1, Route1Text2, Route1Text3
+
 Route1Text1: ; 0x1cab8
     db $08 ; asm
     ld hl, $d7bf
@@ -7534,7 +7596,13 @@ OaksLab_h: ; 0x1cb02 to 0x1cb0e (12 bytes) (bank=7) (id=40)
 
     dw $540a ; objects
 
-INCBIN "baserom.gbc",$1cb0e,$1d0ce - $1cb0e
+INCBIN "baserom.gbc",$1cb0e,$1d082 - $1cb0e
+
+OaksLabTexts: ; 0x1d082
+    dw OaksLabText1, OaksLabText2, OaksLabText3, OaksLabText4, OaksLabText5, OaksLabText6, OaksLabText7, OaksLabText8, OaksLabText9, OaksLabText10, OaksLabText11
+
+INCBIN "baserom.gbc",$1d098,$36
+
 OaksLabText1: ; 0x1d0ce
     db $08 ; asm
     ld a, [$d74b]
@@ -7905,6 +7973,7 @@ School_h: ; 0x1d540 to 0x1d54c (12 bytes) (bank=7) (id=43)
     dw $555d ; objects
 
 INCBIN "baserom.gbc",$1d54c,$1d54f - $1d54c
+
 SchoolTexts: ; 0x1d54f
     dw SchoolText1, SchoolText2
 
@@ -7941,7 +8010,10 @@ ViridianHouse_h: ; 0x1d57d to 0x1d589 (12 bytes) (bank=7) (id=44)
 
     dw $55bb ; objects
 
-INCBIN "baserom.gbc",$1d589,$1d595 - $1d589
+INCBIN "baserom.gbc",$1d589,$1d58d - $1d589
+
+ViridianHouseTexts: ; 0x1d58d
+    dw ViridianHouseText1, ViridianHouseText2, ViridianHouseText3, ViridianHouseText4
 
 ViridianHouseText1: ; 0x1d595
     TX_FAR _ViridianHouseText1
@@ -7994,6 +8066,7 @@ PewterHouse1_h: ; 0x1d5e7 to 0x1d5f3 (12 bytes) (bank=7) (id=55)
     dw $5616 ; objects
 
 INCBIN "baserom.gbc",$1d5f3,$1d5f6 - $1d5f3
+
 PewterHouse1Texts: ; 0x1d5f6
     dw PewterHouse1Text1, PewterHouse1Text2, PewterHouse1Text3
 
@@ -8040,6 +8113,7 @@ PewterHouse2_h: ; 0x1d63c to 0x1d648 (12 bytes) (bank=7) (id=57)
     dw $5659 ; objects
 
 INCBIN "baserom.gbc",$1d648,$1d64b - $1d648
+
 PewterHouse2Texts: ; 0x1d64b
     dw PewterHouse2Text1, PewterHouse2Text2
 
@@ -8076,7 +8150,11 @@ CeruleanHouseTrashed_h: ; 0x1d679 to 0x1d685 (12 bytes) (bank=7) (id=62)
 
     dw $56bf ; objects
 
-INCBIN "baserom.gbc",$1d685,$1d68f - $1d685
+INCBIN "baserom.gbc",$1d685,$1d689 - $1d685
+
+CeruleanHouseTrashedTexts: ; 0x1d689
+    dw CeruleanHouseTrashedText1, CeruleanHouseTrashedText2, CeruleanHouseTrashedText3
+
 CeruleanHouseTrashedText1: ; 0x1d68f
     db $08 ; asm
     ld b, $e4
@@ -8131,7 +8209,10 @@ CeruleanHouse2_h: ; 0x1d6ea to 0x1d6f6 (12 bytes) (bank=7) (id=63)
 
     dw $5710 ; objects
 
-INCBIN "baserom.gbc",$1d6f6,$1d6fd - $1d6f6
+INCBIN "baserom.gbc",$1d6f6,$1d6f9 - $1d6f6
+
+CeruleanHouse2Texts: ; 0x1d6f9
+    dw CeruleanHouse2Text1, CeruleanHouse2Text2
 
 CeruleanHouse2Text1: ; 0x1d6fd
     TX_FAR _CeruleanHouse2Text1
@@ -8170,7 +8251,11 @@ BikeShop_h: ; 0x1d730 to 0x1d73c (12 bytes) (bank=7) (id=66)
 
     dw $5866 ; objects
 
-INCBIN "baserom.gbc",$1d73c,$1d745 - $1d73c
+INCBIN "baserom.gbc",$1d73c,$1d73f - $1d73c
+
+BikeShopTexts: ; 0x1d73f
+    dw BikeShopText1, BikeShopText2, BikeShopText3
+
 BikeShopText1: ; 0x1d745
     db $08 ; asm
     ld a, [$d75f]
@@ -8296,7 +8381,11 @@ LavenderHouse1_h: ; 0x1d89c to 0x1d8a8 (12 bytes) (bank=7) (id=149)
 
     dw $596a ; objects
 
-INCBIN "baserom.gbc",$1d8a8,$1d8b8 - $1d8a8
+INCBIN "baserom.gbc",$1d8a8,$1d8ac - $1d8a8
+
+LavenderHouse1Texts: ; 0x1d8ac
+    dw LavenderHouse1Text1, LavenderHouse1Text2, LavenderHouse1Text3, LavenderHouse1Text4, LavenderHouse1Text5, LavenderHouse1Text6
+
 LavenderHouse1Text1: ; 0x1d8b8
     db $08 ; asm
     ld a, [$d7e0]
@@ -8403,7 +8492,10 @@ LavenderHouse2_h: ; 0x1d9a2 to 0x1d9ae (12 bytes) (bank=7) (id=151)
 
     dw $59e6 ; objects
 
-INCBIN "baserom.gbc",$1d9ae,$1d9b6 - $1d9ae
+INCBIN "baserom.gbc",$1d9ae,$1d9b2 - $1d9ae
+
+LavenderHouse2Texts: ; 0x1d9b2
+    dw LavenderHouse2Text1, LavenderHouse2Text2
 
 LavenderHouse2Text1: ; 0x1d9b6
     TX_FAR _LavenderHouse2Text1
@@ -8478,7 +8570,10 @@ VermilionHouse1_h: ; 0x1daf0 to 0x1dafc (12 bytes) (bank=7) (id=93)
 
     dw $5b20 ; objects
 
-INCBIN "baserom.gbc",$1dafc,$1db06 - $1dafc
+INCBIN "baserom.gbc",$1dafc,$1db00 - $1dafc
+
+VermilionHouse1Texts: ; 0x1db00
+    dw VermilionHouse1Text1, VermilionHouse1Text2, VermilionHouse1Text3
 
 VermilionHouse1Text1: ; 0x1db06
     TX_FAR _VermilionHouse1Text1
@@ -8551,7 +8646,10 @@ CeladonMansion5_h: ; 0x1dd2e to 0x1dd3a (12 bytes) (bank=7) (id=132)
 
     dw $5d5c ; objects
 
-INCBIN "baserom.gbc",$1dd3a,$1dd41 - $1dd3a
+INCBIN "baserom.gbc",$1dd3a,$1dd3d - $1dd3a
+
+CeladonMansion5Texts: ; 0x1dd3d
+    dw CeladonMansion5Text1, CeladonMansion5Text2
 
 CeladonMansion5Text1: ; 0x1dd41
     TX_FAR _CeladonMansion5Text1
@@ -8594,7 +8692,10 @@ FuchsiaMart_h: ; 0x1dd7c to 0x1dd88 (12 bytes) (bank=7) (id=152)
 
     dw $5d9b ; objects
 
-INCBIN "baserom.gbc",$1dd88,$1dd91 - $1dd88
+INCBIN "baserom.gbc",$1dd88,$1dd8b - $1dd88
+
+FuchsiaMartTexts: ; 0x1dd8b
+    dw FuchsiaMartText1, FuchsiaMartText2, FuchsiaMartText3
 
 FuchsiaMartText2: ; 0x1dd91
     TX_FAR _FuchsiaMartText2
@@ -8634,6 +8735,7 @@ SaffronHouse1_h: ; 0x1ddd1 to 0x1dddd (12 bytes) (bank=7) (id=179)
     dw $5e04 ; objects
 
 INCBIN "baserom.gbc",$1dddd,$1dde0 - $1dddd
+
 SaffronHouse1Texts: ; 0x1dde0
     dw SaffronHouse1Text1, SaffronHouse1Text2, SaffronHouse1Text3, SaffronHouse1Text4
 
@@ -8684,7 +8786,11 @@ SaffronHouse2_h: ; 0x1de30 to 0x1de3c (12 bytes) (bank=7) (id=183)
 
     dw $5e8a ; objects
 
-INCBIN "baserom.gbc",$1de3c,$1de41 - $1de3c
+INCBIN "baserom.gbc",$1de3c,$1de3f - $1de3c
+
+SaffronHouse2Texts: ; 0x1de3f
+    dw SaffronHouse2Text1
+
 SaffronHouse2Text1: ; 0x1de41
     db $08 ; asm
     ld a, [$d7bd]
@@ -8736,6 +8842,7 @@ DiglettsCaveRoute2_h: ; 0x1dea4 to 0x1deb0 (12 bytes) (bank=7) (id=46)
     dw $5ebf ; objects
 
 INCBIN "baserom.gbc",$1deb0,$1deb8 - $1deb0
+
 DiglettsCaveRoute2Texts: ; 0x1deb8
     dw DiglettsCaveRoute2Text1
 
@@ -8769,7 +8876,10 @@ Route2House_h: ; 0x1dee1 to 0x1deed (12 bytes) (bank=7) (id=48)
 
     dw $5f07 ; objects
 
-INCBIN "baserom.gbc",$1deed,$1def4 - $1deed
+INCBIN "baserom.gbc",$1deed,$1def0 - $1deed
+
+Route2HouseTexts: ; 0x1def0
+    dw Route2HouseText1, Route2HouseText2
 
 Route2HouseText1: ; 0x1def4
     TX_FAR _Route2HouseText1
@@ -8808,7 +8918,12 @@ Route5Gate_h: ; 0x1df27 to 0x1df33 (12 bytes) (bank=7) (id=70)
 
     dw $5ffb ; objects
 
-INCBIN "baserom.gbc",$1df33,$1dfaa - $1df33
+INCBIN "baserom.gbc",$1df33,$1dfa4 - $1df33
+
+Route5GateTexts: ; 0x1dfa4
+    dw Route5GateText1
+
+INCBIN "baserom.gbc",$1dfa6,$4
 
 Route8GateText1:
 Route7GateText1:
@@ -8875,7 +8990,13 @@ Route6Gate_h: ; 0x1e031 to 0x1e03d (12 bytes) (bank=7) (id=73)
 
     dw $60be ; objects
 
-INCBIN "baserom.gbc",$1e03d,$1e0be - $1e03d
+INCBIN "baserom.gbc",$1e03d,$1e0b8 - $1e03d
+
+Route6GateTexts: ; 0x1e0b8
+    dw Route6GateText1
+
+INCBIN "baserom.gbc",$1e0ba,$4
+
 Route6GateObject: ; 0x1e0be (size=42)
     db $a ; border tile
 
@@ -8907,7 +9028,13 @@ Route7Gate_h: ; 0x1e0f4 to 0x1e100 (12 bytes) (bank=7) (id=76)
 
     dw $6185 ; objects
 
-INCBIN "baserom.gbc",$1e100,$1e185 - $1e100
+INCBIN "baserom.gbc",$1e100,$1e17f - $1e100
+
+Route7GateTexts: ; 0x1e17f
+    dw Route7GateText1
+
+INCBIN "baserom.gbc",$1e181,$4
+
 Route7GateObject: ; 0x1e185 (size=42)
     db $a ; border tile
 
@@ -8939,7 +9066,13 @@ Route8Gate_h: ; 0x1e1bb to 0x1e1c7 (12 bytes) (bank=7) (id=79)
 
     dw $6247 ; objects
 
-INCBIN "baserom.gbc",$1e1c7,$1e247 - $1e1c7
+INCBIN "baserom.gbc",$1e1c7,$1e241 - $1e1c7
+
+Route8GateTexts: ; 0x1e241
+    dw Route8GateText1
+
+INCBIN "baserom.gbc",$1e243,$4
+
 Route8GateObject: ; 0x1e247 (size=42)
     db $a ; border tile
 
@@ -9008,7 +9141,12 @@ PowerPlant_h: ; 0x1e2ba to 0x1e2c6 (12 bytes) (bank=7) (id=83)
 
     dw $63bf ; objects
 
-INCBIN "baserom.gbc",$1e2c6,$1e368 - $1e2c6
+INCBIN "baserom.gbc",$1e2c6,$1e2df - $1e2c6
+
+PowerPlantTexts: ; 0x1e2df
+    dw PowerPlantText1, PowerPlantText2, PowerPlantText3, PowerPlantText4, PowerPlantText5, PowerPlantText6, PowerPlantText7, PowerPlantText8, PowerPlantText9, PowerPlantText10, PowerPlantText11, PowerPlantText12, PowerPlantText13, PowerPlantText14
+
+INCBIN "baserom.gbc",$1e2fb,$6d
 
 asm_234cc:
     call $31cc
@@ -9118,6 +9256,7 @@ DiglettsCaveEntranceRoute11_h: ; 0x1e5ae to 0x1e5ba (12 bytes) (bank=7) (id=85)
     dw $65ca ; objects
 
 INCBIN "baserom.gbc",$1e5ba,$1e5c3 - $1e5ba
+
 DiglettsCaveEntranceRoute11Texts: ; 0x1e5c3
     dw DiglettsCaveEntranceRoute11Text1
 
@@ -9153,7 +9292,11 @@ Route16House_h: ; 0x1e5ec to 0x1e5f8 (12 bytes) (bank=7) (id=188)
 
     dw $6657 ; objects
 
-INCBIN "baserom.gbc",$1e5f8,$1e5ff - $1e5f8
+INCBIN "baserom.gbc",$1e5f8,$1e5fb - $1e5f8
+
+Route16HouseTexts: ; 0x1e5fb
+    dw Route16HouseText1, Route16HouseText2
+
 Route16HouseText1: ; 0x1e5ff
     db $08 ; asm
     ld a, [$d7e0]
@@ -9211,7 +9354,11 @@ Route22Gate_h: ; 0x1e677 to 0x1e683 (12 bytes) (bank=7) (id=193)
 
     dw $6720 ; objects
 
-INCBIN "baserom.gbc",$1e683,$1e6e1 - $1e683
+INCBIN "baserom.gbc",$1e683,$1e6df - $1e683
+
+Route22GateTexts: ; 0x1e6df
+    dw Route22GateText1
+
 Route22GateText1: ; 0x1e6e1
     db $8
     ld a, [$d356]
@@ -9262,7 +9409,12 @@ BillsHouse_h: ; 0x1e75e to 0x1e76a (12 bytes) (bank=7) (id=88)
 
     dw $68df ; objects
 
-INCBIN "baserom.gbc",$1e76a,$1e83d - $1e76a
+INCBIN "baserom.gbc",$1e76a,$1e834 - $1e76a
+
+BillsHouseTexts: ; 0x1e834
+    dw BillsHouseText1, BillsHouseText2, BillsHouseText3
+
+INCBIN "baserom.gbc",$1e83a,$3
 
 ;0x1e83d
 BillsHouseText1:
@@ -16330,7 +16482,11 @@ ViridianPokeCenterBlocks: ; 28
 SafariZoneRestHouse1Blocks: ; 16
     INCBIN "maps/safarizoneresthouse1.blk"
 
-INCBIN "baserom.gbc",$4410b,$44120 - $4410b
+INCBIN "baserom.gbc",$4410b,$4410e - $4410b
+
+LavenderTownTexts: ; 0x4410e
+    dw LavenderTownText1, LavenderTownText2, LavenderTownText3, LavenderTownText4, LavenderTownText5, LavenderTownText6, LavenderTownText7, LavenderTownText8, LavenderTownText9
+
 LavenderTownText1: ; 0x44120
     db $08 ; asm
     ld hl, $413c
@@ -16472,7 +16628,12 @@ RockTunnel1_h: ; 0x444d0 to 0x444dc (12 bytes) (bank=11) (id=82)
 
     dw $45f6 ; objects
 
-INCBIN "baserom.gbc",$444dc,$4455a - $444dc
+INCBIN "baserom.gbc",$444dc,$444f5 - $444dc
+
+RockTunnel1Texts: ; 0x444f5
+    dw RockTunnel1Text1, RockTunnel1Text2, RockTunnel1Text3, RockTunnel1Text4, RockTunnel1Text5, RockTunnel1Text6, RockTunnel1Text7, RockTunnel1Text8
+
+INCBIN "baserom.gbc",$44505,$55
 
 RockTunnel1Text1: ; 0x4455a
     db $8
@@ -16564,8 +16725,10 @@ SeafoamIslands1_h: ; 0x447dd to 0x447e9 (12 bytes) (bank=11) (id=192)
     dw $484f ; objects
 
 INCBIN "baserom.gbc",$447e9,$4484b - $447e9
+
 SeafoamIslands1Texts: ; 0x4484b
     dw SeafoamIslands1Text1, SeafoamIslands1Text2
+
 SeafoamIslands1Object: ; 0x4484f (size=72)
     db $7d ; border tile
 
@@ -16606,7 +16769,10 @@ SSAnne3_h: ; 0x44926 to 0x44932 (12 bytes) (bank=11) (id=97)
 
     dw $493c ; objects
 
-INCBIN "baserom.gbc",$44932,$44937 - $44932
+INCBIN "baserom.gbc",$44932,$44935 - $44932
+
+SSAnne3Texts: ; 0x44935
+    dw SSAnne3Text1
 
 SSAnne3Text1: ; 0x44937
     TX_FAR _SSAnne3Text1
@@ -16639,7 +16805,13 @@ VictoryRoad3_h: ; 0x44974 to 0x44980 (12 bytes) (bank=11) (id=198)
 
     dw $4acd ; objects
 
-INCBIN "baserom.gbc",$44980,$44a69 - $44980
+INCBIN "baserom.gbc",$44980,$44a24 - $44980
+
+VictoryRoad3Texts: ; 0x44a24
+    dw VictoryRoad3Text1, VictoryRoad3Text2, VictoryRoad3Text3, VictoryRoad3Text4, VictoryRoad3Text5, VictoryRoad3Text6, VictoryRoad3Text7, VictoryRoad3Text8, VictoryRoad3Text9, VictoryRoad3Text10
+
+INCBIN "baserom.gbc",$44a38,$31
+
 VictoryRoad3Text1: ; 0x44a69
     db $08 ; asm
     ld hl, $4a38
@@ -16705,7 +16877,13 @@ RocketHideout1_h: ; 0x44bbe to 0x44bca (12 bytes) (bank=11) (id=199)
 
     dw $4ce7 ; objects
 
-INCBIN "baserom.gbc",$44bca,$44c5f - $44bca
+INCBIN "baserom.gbc",$44bca,$44c14 - $44bca
+
+RocketHideout1Texts: ; 0x44c14
+    dw RocketHideout1Text1, RocketHideout1Text2, RocketHideout1Text3, RocketHideout1Text4, RocketHideout1Text5, RocketHideout1Text6, RocketHideout1Text7
+
+INCBIN "baserom.gbc",$44c22,$3d
+
 RocketHideout1Text1: ; 0x44c5f
     db $08 ; asm
     ld hl, $4c22
@@ -16776,7 +16954,13 @@ RocketHideout2_h: ; 0x44e1b to 0x44e27 (12 bytes) (bank=11) (id=200)
 
     dw $50f7 ; objects
 
-INCBIN "baserom.gbc",$44e27,$450de - $44e27
+INCBIN "baserom.gbc",$44e27,$450c7 - $44e27
+
+RocketHideout2Texts: ; 0x450c7
+    dw RocketHideout2Text1, RocketHideout2Text2, RocketHideout2Text3, RocketHideout2Text4, RocketHideout2Text5
+
+INCBIN "baserom.gbc",$450d1,$d
+
 RocketHideout2Text1: ; 0x450de
     db $08 ; asm
     ld hl, $50d1
@@ -16821,7 +17005,13 @@ RocketHideout3_h: ; 0x45219 to 0x45225 (12 bytes) (bank=11) (id=201)
 
     dw $534d ; objects
 
-INCBIN "baserom.gbc",$45225,$4531b - $45225
+INCBIN "baserom.gbc",$45225,$452fa - $45225
+
+RocketHideout3Texts: ; 0x452fa
+    dw RocketHideout3Text1, RocketHideout3Text2, RocketHideout3Text3, RocketHideout3Text4
+
+INCBIN "baserom.gbc",$45302,$19
+
 RocketHideout3Text1: ; 0x4531b
     db $08 ; asm
     ld hl, $5302
@@ -16866,7 +17056,13 @@ RocketHideout4_h: ; 0x45451 to 0x4545d (12 bytes) (bank=11) (id=202)
 
     dw $55f1 ; objects
 
-INCBIN "baserom.gbc",$4545d,$4553a - $4545d
+INCBIN "baserom.gbc",$4545d,$45501 - $4545d
+
+RocketHideout4Texts: ; 0x45501
+    dw RocketHideout4Text1, RocketHideout4Text2, RocketHideout4Text3, RocketHideout4Text4, RocketHideout4Text5, RocketHideout4Text6, RocketHideout4Text7, RocketHideout4Text8, RocketHideout4Text9
+
+INCBIN "baserom.gbc",$45513,$27
+
 RocketHideout4Text1: ; 0x4553a
     db $08 ; asm
     ld a, [$d81b]
@@ -16954,7 +17150,11 @@ RocketHideoutElevator_h: ; 0x45704 to 0x45710 (12 bytes) (bank=11) (id=203)
 
     dw $5791 ; objects
 
-INCBIN "baserom.gbc",$45710,$4576d - $45710
+INCBIN "baserom.gbc",$45710,$4576b - $45710
+
+RocketHideoutElevatorTexts: ; 0x4576b
+    dw RocketHideoutElevatorText1
+
 RocketHideoutElevatorText1: ; 0x4576d
     db $08 ; asm
 	ld b,LIFT_KEY
@@ -16999,7 +17199,11 @@ SilphCoElevator_h: ; 0x457b4 to 0x457c0 (12 bytes) (bank=11) (id=236)
 
     dw $5844 ; objects
 
-INCBIN "baserom.gbc",$457c0,$45835 - $457c0
+INCBIN "baserom.gbc",$457c0,$45833 - $457c0
+
+SilphCoElevatorTexts: ; 0x45833
+    dw SilphCoElevatorText1
+
 SilphCoElevatorText1: ; 0x45835
     db $08 ; asm
     call $57f1
@@ -17035,7 +17239,10 @@ SafariZoneEast_h: ; 0x4585f to 0x4586b (12 bytes) (bank=11) (id=217)
 
     dw $588b ; objects
 
-INCBIN "baserom.gbc",$4586b,$4587c - $4586b
+INCBIN "baserom.gbc",$4586b,$4586e - $4586b
+
+SafariZoneEastTexts: ; 0x4586e
+    dw SafariZoneEastText1, SafariZoneEastText2, SafariZoneEastText3, SafariZoneEastText4, SafariZoneEastText5, SafariZoneEastText6, SafariZoneEastText7
 
 SafariZoneEastText5: ; 0x4587c
     TX_FAR _SafariZoneEastText5
@@ -17088,7 +17295,10 @@ SafariZoneNorth_h: ; 0x4599f to 0x459ab (12 bytes) (bank=11) (id=218)
 
     dw $59d5 ; objects
 
-INCBIN "baserom.gbc",$459ab,$459bc - $459ab
+INCBIN "baserom.gbc",$459ab,$459ae - $459ab
+
+SafariZoneNorthTexts: ; 0x459ae
+    dw SafariZoneNorthText1, SafariZoneNorthText2, SafariZoneNorthText3, SafariZoneNorthText4, SafariZoneNorthText5, SafariZoneNorthText6, SafariZoneNorthText7
 
 SafariZoneNorthText3: ; 0x459bc
     TX_FAR _SafariZoneNorthText3
@@ -17157,7 +17367,10 @@ SafariZoneCenter_h: ; 0x45ba6 to 0x45bb2 (12 bytes) (bank=11) (id=220)
 
     dw $5bc5 ; objects
 
-INCBIN "baserom.gbc",$45bb2,$45bbb - $45bb2
+INCBIN "baserom.gbc",$45bb2,$45bb5 - $45bb2
+
+SafariZoneCenterTexts: ; 0x45bb5
+    dw SafariZoneCenterText1, SafariZoneCenterText2, SafariZoneCenterText3
 
 SafariZoneCenterText2: ; 0x45bbb
     TX_FAR _SafariZoneCenterText2
@@ -17211,6 +17424,7 @@ SafariZoneRestHouse1_h: ; 0x45ce1 to 0x45ced (12 bytes) (bank=11) (id=221)
     dw $5cfe ; objects
 
 INCBIN "baserom.gbc",$45ced,$45cf0 - $45ced
+
 SafariZoneRestHouse1Texts: ; 0x45cf0
     dw SafariZoneRestHouse1Text1, SafariZoneRestHouse1Text2
 
@@ -17248,6 +17462,7 @@ SafariZoneRestHouse2_h: ; 0x45d1e to 0x45d2a (12 bytes) (bank=11) (id=223)
     dw $5d43 ; objects
 
 INCBIN "baserom.gbc",$45d2a,$45d2e - $45d2a
+
 SafariZoneRestHouse2Texts: ; 0x45d2e
     dw SafariZoneRestHouse2Text1, SafariZoneRestHouse2Text2, SafariZoneRestHouse2Text3
 
@@ -17290,6 +17505,7 @@ SafariZoneRestHouse3_h: ; 0x45d69 to 0x45d75 (12 bytes) (bank=11) (id=224)
     dw $5d8e ; objects
 
 INCBIN "baserom.gbc",$45d75,$45d79 - $45d75
+
 SafariZoneRestHouse3Texts: ; 0x45d79
     dw SafariZoneRestHouse3Text1, SafariZoneRestHouse3Text2, SafariZoneRestHouse3Text3
 
@@ -17332,6 +17548,7 @@ SafariZoneRestHouse4_h: ; 0x45db4 to 0x45dc0 (12 bytes) (bank=11) (id=225)
     dw $5dd9 ; objects
 
 INCBIN "baserom.gbc",$45dc0,$45dc4 - $45dc0
+
 SafariZoneRestHouse4Texts: ; 0x45dc4
     dw SafariZoneRestHouse4Text1, SafariZoneRestHouse4Text2, SafariZoneRestHouse4Text3
 
@@ -17373,7 +17590,11 @@ UnknownDungeon2_h: ; 0x45dff to 0x45e0b (12 bytes) (bank=11) (id=226)
 
     dw $5e14 ; objects
 
-INCBIN "baserom.gbc",$45e0b,$45e14 - $45e0b
+INCBIN "baserom.gbc",$45e0b,$45e0e - $45e0b
+
+UnknownDungeon2Texts: ; 0x45e0e
+    dw UnknownDungeon2Text1, UnknownDungeon2Text2, UnknownDungeon2Text3
+
 UnknownDungeon2Object: ; 0x45e14 (size=73)
     db $7d ; border tile
 
@@ -17411,7 +17632,13 @@ UnknownDungeon3_h: ; 0x45ee4 to 0x45ef0 (12 bytes) (bank=11) (id=227)
 
     dw $5f36 ; objects
 
-INCBIN "baserom.gbc",$45ef0,$45f1c - $45ef0
+INCBIN "baserom.gbc",$45ef0,$45f09 - $45ef0
+
+UnknownDungeon3Texts: ; 0x45f09
+    dw UnknownDungeon3Text1, UnknownDungeon3Text2, UnknownDungeon3Text3
+
+INCBIN "baserom.gbc",$45f0f,$d
+
 UnknownDungeon3Text1: ; 0x45f1c
     db $08 ; asm
     ld hl, $5f0f
@@ -17446,7 +17673,13 @@ RockTunnel2_h: ; 0x45fdf to 0x45feb (12 bytes) (bank=11) (id=232)
 
     dw $613d ; objects
 
-INCBIN "baserom.gbc",$45feb,$46075 - $45feb
+INCBIN "baserom.gbc",$45feb,$46004 - $45feb
+
+RockTunnel2Texts: ; 0x46004
+    dw RockTunnel2Text1, RockTunnel2Text2, RockTunnel2Text3, RockTunnel2Text4, RockTunnel2Text5, RockTunnel2Text6, RockTunnel2Text7, RockTunnel2Text8
+
+INCBIN "baserom.gbc",$46014,$61
+
 RockTunnel2Text1: ; 0x46075
     db $08 ; asm
     ld hl, $6014
@@ -17535,8 +17768,10 @@ SeafoamIslands2_h: ; 0x46309 to 0x46315 (12 bytes) (bank=11) (id=159)
     dw $6376 ; objects
 
 INCBIN "baserom.gbc",$46315,$46372 - $46315
+
 SeafoamIslands2Texts: ; 0x46372
     dw SeafoamIslands2Text1, SeafoamIslands2Text2
+
 SeafoamIslands2Object: ; 0x46376 (size=72)
     db $7d ; border tile
 
@@ -17576,8 +17811,10 @@ SeafoamIslands3_h: ; 0x46445 to 0x46451 (12 bytes) (bank=11) (id=160)
     dw $64b2 ; objects
 
 INCBIN "baserom.gbc",$46451,$464ae - $46451
+
 SeafoamIslands3Texts: ; 0x464ae
     dw SeafoamIslands3Text1, SeafoamIslands3Text2
+
 SeafoamIslands3Object: ; 0x464b2 (size=72)
     db $7d ; border tile
 
@@ -17617,8 +17854,10 @@ SeafoamIslands4_h: ; 0x46581 to 0x4658d (12 bytes) (bank=11) (id=161)
     dw $66a6 ; objects
 
 INCBIN "baserom.gbc",$4658d,$4669a - $4658d
+
 SeafoamIslands4Texts: ; 0x4669a
     dw SeafoamIslands4Text1, SeafoamIslands4Text2, SeafoamIslands4Text3, SeafoamIslands4Text4, SeafoamIslands4Text5, SeafoamIslands4Text6
+
 SeafoamIslands4Object: ; 0x466a6 (size=96)
     db $7d ; border tile
 
@@ -17661,7 +17900,13 @@ SeafoamIslands5_h: ; 0x4678d to 0x46799 (12 bytes) (bank=11) (id=162)
 
     dw $68bc ; objects
 
-INCBIN "baserom.gbc",$46799,$46893 - $46799
+INCBIN "baserom.gbc",$46799,$4687c - $46799
+
+SeafoamIslands5Texts: ; 0x4687c
+    dw SeafoamIslands5Text1, SeafoamIslands5Text2, SeafoamIslands5Text3, SeafoamIslands5Text4, SeafoamIslands5Text5
+
+INCBIN "baserom.gbc",$46886,$d
+
 SeafoamIslands5Text3: ; 0x46893
     db $08 ; asm
     ld hl, $6886
@@ -17888,7 +18133,11 @@ CeladonMart3_h: ; 0x48219 to 0x48225 (12 bytes) (bank=12) (id=124)
 
     dw $42c4 ; objects
 
-INCBIN "baserom.gbc",$48225,$4824a - $48225
+INCBIN "baserom.gbc",$48225,$48228 - $48225
+
+CeladonMart3Texts: ; 0x48228
+    dw CeladonMart3Text1, CeladonMart3Text2, CeladonMart3Text3, CeladonMart3Text4, CeladonMart3Text5, CeladonMart3Text6, CeladonMart3Text7, CeladonMart3Text8, CeladonMart3Text9, CeladonMart3Text10, CeladonMart3Text11, CeladonMart3Text12, CeladonMart3Text13, CeladonMart3Text14, CeladonMart3Text15, CeladonMart3Text16, CeladonMart3Text17
+
 CeladonMart3Text1: ; 0x4824a
     db $08 ; asm
     ld a, [$d778]
@@ -18008,7 +18257,10 @@ CeladonMart4_h: ; 0x4834a to 0x48356 (12 bytes) (bank=12) (id=125)
 
     dw $4370 ; objects
 
-INCBIN "baserom.gbc",$48356,$48361 - $48356
+INCBIN "baserom.gbc",$48356,$48359 - $48356
+
+CeladonMart4Texts: ; 0x48359
+    dw CeladonMart4Text1, CeladonMart4Text2, CeladonMart4Text3, CeladonMart4Text4
 
 CeladonMart4Text2: ; 0x48361
     TX_FAR _CeladonMart4Text2
@@ -18118,7 +18370,11 @@ CeladonMartElevator_h: ; 0x485f4 to 0x48600 (12 bytes) (bank=12) (id=127)
 
     dw $466d ; objects
 
-INCBIN "baserom.gbc",$48600,$4865e - $48600
+INCBIN "baserom.gbc",$48600,$4865c - $48600
+
+CeladonMartElevatorTexts: ; 0x4865c
+    dw CeladonMartElevatorText1
+
 CeladonMartElevatorText1: ; 0x4865e
     db $08 ; asm
     call $4631
@@ -18155,8 +18411,10 @@ CeladonMansion1_h: ; 0x48688 to 0x48694 (12 bytes) (bank=12) (id=128)
     dw $46cf ; objects
 
 INCBIN "baserom.gbc",$48694,$48697 - $48694
+
 CeladonMansion1Texts: ; 0x48697
     dw CeladonMansion1Text1, CeladonMansion1Text2, CeladonMansion1Text3, CeladonMansion1Text4, CeladonMansion1Text5
+
 INCBIN "baserom.gbc",$486a1,$6
 
 CeladonMansion1Text1: ; 0x486a7
@@ -18225,6 +18483,7 @@ CeladonMansion2_h: ; 0x4872e to 0x4873a (12 bytes) (bank=12) (id=129)
     dw $4745 ; objects
 
 INCBIN "baserom.gbc",$4873a,$4873e - $4873a
+
 CeladonMansion2Texts: ; 0x4873e
     dw CeladonMansion2Text1
 
@@ -18263,7 +18522,10 @@ CeladonMansion3_h: ; 0x48784 to 0x48790 (12 bytes) (bank=12) (id=130)
 
     dw $47ff ; objects
 
-INCBIN "baserom.gbc",$48790,$487a3 - $48790
+INCBIN "baserom.gbc",$48790,$48793 - $48790
+
+CeladonMansion3Texts: ; 0x48793
+    dw CeladonMansion3Text1, CeladonMansion3Text2, CeladonMansion3Text3, CeladonMansion3Text4, CeladonMansion3Text5, CeladonMansion3Text6, CeladonMansion3Text7, CeladonMansion3Text8
 
 CeladonMansion3Text1: ; 0x487a3
     TX_FAR _CeladonMansion3Text1
@@ -18350,6 +18612,7 @@ CeladonMansion4_h: ; 0x4885f to 0x4886b (12 bytes) (bank=12) (id=131)
     dw $4875 ; objects
 
 INCBIN "baserom.gbc",$4886b,$4886e - $4886b
+
 CeladonMansion4Texts: ; 0x4886e
     dw CeladonMansion4Text1
 
@@ -18428,7 +18691,13 @@ CeladonGym_h: ; 0x488fe to 0x4890a (12 bytes) (bank=12) (id=134)
 
     dw $4b30 ; objects
 
-INCBIN "baserom.gbc",$4890a,$48a11 - $4890a
+INCBIN "baserom.gbc",$4890a,$489a6 - $4890a
+
+CeladonGymTexts: ; 0x489a6
+    dw CeladonGymText1, CeladonGymText2, CeladonGymText3, CeladonGymText4, CeladonGymText5, CeladonGymText6, CeladonGymText7, CeladonGymText8
+
+INCBIN "baserom.gbc",$489b6,$5b
+
 CeladonGymText1: ; 0x48a11
     db $08 ; asm
     ld a, [$d77c]
@@ -18556,7 +18825,12 @@ CeladonGameCorner_h: ; 0x48bb1 to 0x48bbd (12 bytes) (bank=12) (id=135)
 
     dw $4fa0 ; objects
 
-INCBIN "baserom.gbc",$48bbd,$48ca4 - $48bbd
+INCBIN "baserom.gbc",$48bbd,$48c8a - $48bbd
+
+CeladonGameCornerTexts: ; 0x48c8a
+    dw CeladonGameCornerText1, CeladonGameCornerText2, CeladonGameCornerText3, CeladonGameCornerText4, CeladonGameCornerText5, CeladonGameCornerText6, CeladonGameCornerText7, CeladonGameCornerText8, CeladonGameCornerText9, CeladonGameCornerText10, CeladonGameCornerText11, CeladonGameCornerText12
+
+INCBIN "baserom.gbc",$48ca2,$2
 
 CeladonGameCornerText1: ; 0x48ca4
     TX_FAR _CeladonGameCornerText1
@@ -18858,7 +19132,10 @@ CeladonMart5_h: ; 0x4905d to 0x49069 (12 bytes) (bank=12) (id=136)
 
     dw $5085 ; objects
 
-INCBIN "baserom.gbc",$49069,$49076 - $49069
+INCBIN "baserom.gbc",$49069,$4906c - $49069
+
+CeladonMart5Texts: ; 0x4906c
+    dw CeladonMart5Text1, CeladonMart5Text2, CeladonMart5Text3, CeladonMart5Text4, CeladonMart5Text5
 
 CeladonMart5Text1: ; 0x49076
     TX_FAR _CeladonMart5Text1
@@ -18948,7 +19225,10 @@ CeladonDiner_h: ; 0x49145 to 0x49151 (12 bytes) (bank=12) (id=138)
 
     dw $51bc ; objects
 
-INCBIN "baserom.gbc",$49151,$4915f - $49151
+INCBIN "baserom.gbc",$49151,$49155 - $49151
+
+CeladonDinerTexts: ; 0x49155
+    dw CeladonDinerText1, CeladonDinerText2, CeladonDinerText3, CeladonDinerText4, CeladonDinerText5
 
 CeladonDinerText1: ; 0x4915f
     TX_FAR _CeladonDinerText1
@@ -19350,6 +19630,7 @@ Route12Gate_h: ; 0x494f8 to 0x49504 (12 bytes) (id=87)
     dw $550e ; objects
 
 INCBIN "baserom.gbc",$49504,$49507 - $49504
+
 Route12GateTexts: ; 0x49507
     dw Route12GateText1
 
@@ -19390,7 +19671,11 @@ Route12GateUpstairs_h: ; 0x49554 to 0x49560 (12 bytes) (id=195)
 
     dw $55de ; objects
 
-INCBIN "baserom.gbc",$49560,$49569 - $49560
+INCBIN "baserom.gbc",$49560,$49563 - $49560
+
+Route12GateUpstairsTexts: ; 0x49563
+    dw Route12GateUpstairsText1, Route12GateUpstairsText2, Route12GateUpstairsText3
+
 Route12GateUpstairsText1: ; 0x49569
     db $08 ; asm
     ld a, [$d7d7]
@@ -19459,6 +19744,7 @@ Route15Gate_h: ; 0x495f6 to 0x49602 (12 bytes) (id=184)
     dw $560c ; objects
 
 INCBIN "baserom.gbc",$49602,$49605 - $49602
+
 Route15GateTexts: ; 0x49605
     dw Route15GateText1
 
@@ -19498,7 +19784,13 @@ Route16GateMap_h: ; 0x496b2 to 0x496be (12 bytes) (id=186)
 
     dw $578b ; objects
 
-INCBIN "baserom.gbc",$496be,$49760 - $496be
+INCBIN "baserom.gbc",$496be,$4975a - $496be
+
+Route16GateMapTexts: ; 0x4975a
+    dw Route16GateMapText1, Route16GateMapText2
+
+INCBIN "baserom.gbc",$4975e,$2
+
 Route16GateMapText1: ; 0x49760
     db $08 ; asm
     call $5755
@@ -19560,7 +19852,11 @@ Route16GateUpstairs_h: ; 0x497ff to 0x4980b (12 bytes) (id=187)
 
     dw $584c ; objects
 
-INCBIN "baserom.gbc",$4980b,$49816 - $4980b
+INCBIN "baserom.gbc",$4980b,$4980e - $4980b
+
+Route16GateUpstairsTexts: ; 0x4980e
+    dw Route16GateUpstairsText1, Route16GateUpstairsText2, Route16GateUpstairsText3, Route16GateUpstairsText4
+
 Route16GateUpstairsText1: ; 0x49816
     db $08 ; asm
     ld hl, $5820
@@ -19613,7 +19909,13 @@ Route18Gate_h: ; 0x4986a to 0x49876 (12 bytes) (id=190)
 
     dw $5937 ; objects
 
-INCBIN "baserom.gbc",$49876,$49911 - $49876
+INCBIN "baserom.gbc",$49876,$4990d - $49876
+
+Route18GateTexts: ; 0x4990d
+    dw Route18GateText1
+
+INCBIN "baserom.gbc",$4990f,$2
+
 Route18GateText1: ; 0x49911
     db $08 ; asm
     call $5755
@@ -19659,7 +19961,11 @@ Route18GateHeader_h: ; 0x49969 to 0x49975 (12 bytes) (id=191)
 
     dw $59a4 ; objects
 
-INCBIN "baserom.gbc",$49975,$4997e - $49975
+INCBIN "baserom.gbc",$49975,$49978 - $49975
+
+Route18GateHeaderTexts: ; 0x49978
+    dw Route18GateHeaderText1, Route18GateHeaderText2, Route18GateHeaderText3
+
 Route18GateHeaderText1: ; 0x4997e
     db $08 ; asm
     ld a, $5
@@ -19705,7 +20011,13 @@ MtMoon1_h: ; 0x499bc to 0x499c8 (12 bytes) (id=59)
 
     dw $5b06 ; objects
 
-INCBIN "baserom.gbc",$499c8,$49a52 - $499c8
+INCBIN "baserom.gbc",$499c8,$499e1 - $499c8
+
+MtMoon1Texts: ; 0x499e1
+    dw MtMoon1Text1, MtMoon1Text2, MtMoon1Text3, MtMoon1Text4, MtMoon1Text5, MtMoon1Text6, MtMoon1Text7, MtMoon1Text8, MtMoon1Text9, MtMoon1Text10, MtMoon1Text11, MtMoon1Text12, MtMoon1Text13, MtMoon1Text14
+
+INCBIN "baserom.gbc",$499fd,$55
+
 MtMoon1Text1: ; 0x49a52
     db $08 ; asm
     ld hl, $59fd
@@ -19800,7 +20112,13 @@ MtMoon3_h: ; 0x49cff to 0x49d0b (12 bytes) (id=61)
 
     dw $5fdb ; objects
 
-INCBIN "baserom.gbc",$49d0b,$49e79 - $49d0b
+INCBIN "baserom.gbc",$49d0b,$49e34 - $49d0b
+
+MtMoon3Texts: ; 0x49e34
+    dw MtMoon3Text1, MtMoon3Text2, MtMoon3Text3, MtMoon3Text4, MtMoon3Text5, MtMoon3Text6, MtMoon3Text7, MtMoon3Text8, MtMoon3Text9
+
+INCBIN "baserom.gbc",$49e46,$33
+
 MtMoon3Text1: ; 0x49e79
     db $08 ; asm
     ld a, [$d7f6]
@@ -19952,7 +20270,10 @@ SafariZoneWest_h: ; 0x4a1a9 to 0x4a1b5 (12 bytes) (id=219)
 
     dw $61dc ; objects
 
-INCBIN "baserom.gbc",$4a1b5,$4a1c8 - $4a1b5
+INCBIN "baserom.gbc",$4a1b5,$4a1b8 - $4a1b5
+
+SafariZoneWestTexts: ; 0x4a1b8
+    dw SafariZoneWestText1, SafariZoneWestText2, SafariZoneWestText3, SafariZoneWestText4, SafariZoneWestText5, SafariZoneWestText6, SafariZoneWestText7, SafariZoneWestText8
 
 SafariZoneWestText5: ; 0x4a1c8
     TX_FAR _SafariZoneWestText5
@@ -20016,7 +20337,11 @@ SafariZoneSecretHouse_h: ; 0x4a30b to 0x4a317 (12 bytes) (id=222)
 
     dw $6365 ; objects
 
-INCBIN "baserom.gbc",$4a317,$4a31c - $4a317
+INCBIN "baserom.gbc",$4a317,$4a31a - $4a317
+
+SafariZoneSecretHouseTexts: ; 0x4a31a
+    dw SafariZoneSecretHouseText1
+
 SafariZoneSecretHouseText1: ; 0x4a31c
     db $08 ; asm
     ld a, [$d857]
@@ -20167,6 +20492,7 @@ BattleCenterM_h: ; 0x4fd04 to 0x4fd10 (12 bytes) (id=239)
     dw $7d53 ; objects
 
 INCBIN "baserom.gbc",$4fd10,$4fd4c - $4fd10
+
 BattleCenterMTexts: ; 0x4fd4c
     dw BattleCenterMText1
 
@@ -20196,6 +20522,7 @@ TradeCenterM_h: ; 0x4fd71 to 0x4fd7d (12 bytes) (id=240)
     dw $7d87 ; objects
 
 INCBIN "baserom.gbc",$4fd7d,$4fd80 - $4fd7d
+
 TradeCenterMTexts: ; 0x4fd80
     dw TradeCenterMText1
 
@@ -20747,7 +21074,10 @@ SaffronCityObject: ; 0x509dc (size=188)
 SaffronCityBlocks: ; 360
     INCBIN "maps/saffroncity.blk"
 
-INCBIN "baserom.gbc",$50c00,$50c35 - $50c00
+INCBIN "baserom.gbc",$50c00,$50c03 - $50c00
+
+SaffronCityTexts: ; 0x50c03
+    dw SaffronCityText1, SaffronCityText2, SaffronCityText3, SaffronCityText4, SaffronCityText5, SaffronCityText6, SaffronCityText7, SaffronCityText8, SaffronCityText9, SaffronCityText10, SaffronCityText11, SaffronCityText12, SaffronCityText13, SaffronCityText14, SaffronCityText15, SaffronCityText16, SaffronCityText17, SaffronCityText18, SaffronCityText19, SaffronCityText20, SaffronCityText21, SaffronCityText22, SaffronCityText23, SaffronCityText24, SaffronCityText25
 
 SaffronCityText1: ; 0x50c35
     TX_FAR _SaffronCityText1
@@ -20842,7 +21172,13 @@ SaffronCityText25: ; 0x50ca4
     TX_FAR _SaffronCityText25
     db $50
 
-INCBIN "baserom.gbc",$50ca9,$50db3 - $50ca9
+INCBIN "baserom.gbc",$50ca9,$50d22 - $50ca9
+
+Route20Texts: ; 0x50d22
+    dw Route20Text1, Route20Text2, Route20Text3, Route20Text4, Route20Text5, Route20Text6, Route20Text7, Route20Text8, Route20Text9, Route20Text10, Route20Text11, Route20Text12
+
+INCBIN "baserom.gbc",$50d3a,$79
+
 Route20Text1: ; 0x50db3
     db $08 ; asm
     ld hl, $4d3a
@@ -20910,7 +21246,11 @@ Route20Text11: ; 0x50ead
     TX_FAR _Route20Text11
     db $50
 
-INCBIN "baserom.gbc",$50eb2,$5117b - $50eb2
+INCBIN "baserom.gbc",$50eb2,$51175 - $50eb2
+
+Route22Texts: ; 0x51175
+    dw Route22Text1, Route22Text2, Route22Text3
+
 Route22Text1: ; 0x5117b
     db $08 ; asm
     ld a, [$d7eb]
@@ -20945,7 +21285,11 @@ Route22Text3: ; 0x511d5
     TX_FAR _Route22Text3
     db $50
 
-INCBIN "baserom.gbc",$511da,$51307 - $511da
+INCBIN "baserom.gbc",$511da,$512f7 - $511da
+
+Route23Texts: ; 0x512f7
+    dw Route23Text1, Route23Text2, Route23Text3, Route23Text4, Route23Text5, Route23Text6, Route23Text7, Route23Text8
+
 Route23Text1: ; 0x51307
     db $08 ; asm
     ld a, $6
@@ -20995,7 +21339,12 @@ Route23Text8: ; 0x513a8
     TX_FAR _Route23Text8
     db $50
 
-INCBIN "baserom.gbc",$513ad,$514a4 - $513ad
+INCBIN "baserom.gbc",$513ad,$5144b - $513ad
+
+Route24Texts: ; 0x5144b
+    dw Route24Text1, Route24Text2, Route24Text3, Route24Text4, Route24Text5, Route24Text6, Route24Text7, Route24Text8
+
+INCBIN "baserom.gbc",$5145b,$49
 
 Route24Text1: ; 0x514a4
     db $8
@@ -21081,7 +21430,13 @@ Route24Text7: ; 0x51567
     call LoadTrainerHeader
     jp $24d7
 
-INCBIN "baserom.gbc",$51571,$516ab - $51571
+INCBIN "baserom.gbc",$51571,$51628 - $51571
+
+Route25Texts: ; 0x51628
+    dw Route25Text1, Route25Text2, Route25Text3, Route25Text4, Route25Text5, Route25Text6, Route25Text7, Route25Text8, Route25Text9, Route25Text10, Route25Text11
+
+INCBIN "baserom.gbc",$5163e,$6d
+
 Route25Text1: ; 0x516ab
     db $08 ; asm
     ld hl, $563e
@@ -21150,7 +21505,13 @@ VictoryRoad2_h: ; 0x51791 to 0x5179d (12 bytes) (id=194)
 
     dw $5915 ; objects
 
-INCBIN "baserom.gbc",$5179d,$5187e - $5179d
+INCBIN "baserom.gbc",$5179d,$5181b - $5179d
+
+VictoryRoad2Texts: ; 0x5181b
+    dw VictoryRoad2Text1, VictoryRoad2Text2, VictoryRoad2Text3, VictoryRoad2Text4, VictoryRoad2Text5, VictoryRoad2Text6, VictoryRoad2Text7, VictoryRoad2Text8, VictoryRoad2Text9, VictoryRoad2Text10, VictoryRoad2Text11, VictoryRoad2Text12, VictoryRoad2Text13
+
+INCBIN "baserom.gbc",$51835,$49
+
 VictoryRoad2Text1: ; 0x5187e
     db $08 ; asm
     ld hl, $5835
@@ -21276,7 +21637,13 @@ SilphCo7_h: ; 0x51b55 to 0x51b61 (12 bytes) (id=212)
 
     dw $5ed7 ; objects
 
-INCBIN "baserom.gbc",$51b61,$51d8e - $51b61
+INCBIN "baserom.gbc",$51b61,$51d3f - $51b61
+
+SilphCo7Texts: ; 0x51d3f
+    dw SilphCo7Text1, SilphCo7Text2, SilphCo7Text3, SilphCo7Text4, SilphCo7Text5, SilphCo7Text6, SilphCo7Text7, SilphCo7Text8, SilphCo7Text9, SilphCo7Text10, SilphCo7Text11
+
+INCBIN "baserom.gbc",$51d55,$39
+
 SilphCo7Text1: ; 0x51d8e
     db $08 ; asm
     ld a, [$d72e]
@@ -22432,7 +22799,12 @@ Route2Text4: ; 0x554f3
     TX_FAR _Route2Text4
     db $50
 
-INCBIN "baserom.gbc",$554f8,$55586 - $554f8
+INCBIN "baserom.gbc",$554f8,$55511 - $554f8
+
+Route3Texts: ; 0x55511
+    dw Route3Text1, Route3Text2, Route3Text3, Route3Text4, Route3Text5, Route3Text6, Route3Text7, Route3Text8, Route3Text9, Route3Text10
+
+INCBIN "baserom.gbc",$55525,$61
 
 Route3Text1: ; 0x55586
     TX_FAR _Route3Text1
@@ -22499,7 +22871,12 @@ Route3Text10: ; 0x55653
     TX_FAR _Route3Text10
     db $50
 
-INCBIN "baserom.gbc",$55658,$5568a - $55658
+INCBIN "baserom.gbc",$55658,$55671 - $55658
+
+Route4Texts: ; 0x55671
+    dw Route4Text1, Route4Text2, Route4Text3, Route4Text4, Route4Text5, Route4Text6
+
+INCBIN "baserom.gbc",$5567d,$d
 
 Route4Text1: ; 0x5568a
     TX_FAR _Route4Text1
@@ -22522,6 +22899,7 @@ Route4Text6: ; 0x556ad
     db $50
 
 INCBIN "baserom.gbc",$556b2,$556b5 - $556b2
+
 Route5Texts: ; 0x556b5
     dw Route5Text1
 
@@ -22529,7 +22907,13 @@ Route5Text1: ; 0x556b7
     TX_FAR _Route5Text1
     db $50
 
-INCBIN "baserom.gbc",$556bc,$55758 - $556bc
+INCBIN "baserom.gbc",$556bc,$556d5 - $556bc
+
+Route9Texts: ; 0x556d5
+    dw Route9Text1, Route9Text2, Route9Text3, Route9Text4, Route9Text5, Route9Text6, Route9Text7, Route9Text8, Route9Text9, Route9Text10, Route9Text11
+
+INCBIN "baserom.gbc",$556eb,$6d
+
 Route9Text1: ; 0x55758
     db $8 ; asm
     ld hl, $56eb
@@ -22584,7 +22968,13 @@ Route9Text11: ; 0x55819
     TX_FAR _Route9Text11
     db $50
 
-INCBIN "baserom.gbc",$5581e,$558ca - $5581e
+INCBIN "baserom.gbc",$5581e,$55837 - $5581e
+
+Route13Texts: ; 0x55837
+    dw Route13Text1, Route13Text2, Route13Text3, Route13Text4, Route13Text5, Route13Text6, Route13Text7, Route13Text8, Route13Text9, Route13Text10, Route13Text11, Route13Text12, Route13Text13
+
+INCBIN "baserom.gbc",$55851,$79
+
 Route13Text1: ; 0x558ca
     db $08 ; asm
     ld hl, $5851
@@ -22592,6 +22982,7 @@ Route13Text1: ; 0x558ca
     jp $24d7
 
 INCBIN "baserom.gbc",$558d4,$558e3 - $558d4
+
 Route13Text2: ; 0x558e3
     db $08 ; asm
     ld hl, $585d
@@ -22668,7 +23059,13 @@ Route13Text13: ; 0x559ce
     TX_FAR _Route13Text13
     db $50
 
-INCBIN "baserom.gbc",$559d3,$55a7b - $559d3
+INCBIN "baserom.gbc",$559d3,$559ec - $559d3
+
+Route14Texts: ; 0x559ec
+    dw Route14Text1, Route14Text2, Route14Text3, Route14Text4, Route14Text5, Route14Text6, Route14Text7, Route14Text8, Route14Text9, Route14Text10, Route14Text11
+
+INCBIN "baserom.gbc",$55a02,$79
+
 Route14Text1: ; 0x55a7b
     db $08 ; asm
     ld hl, $5a02
@@ -22676,6 +23073,7 @@ Route14Text1: ; 0x55a7b
     jp $24d7
 
 INCBIN "baserom.gbc",$55a85,$55a94 - $55a85
+
 Route14Text2: ; 0x55a94
     db $08 ; asm
     ld hl, $5a0e
@@ -22744,7 +23142,13 @@ Route14Text11: ; 0x55b75
     TX_FAR _Route14Text11
     db $50
 
-INCBIN "baserom.gbc",$55b7a,$55c2c - $55b7a
+INCBIN "baserom.gbc",$55b7a,$55b93 - $55b7a
+
+Route17Texts: ; 0x55b93
+    dw Route17Text1, Route17Text2, Route17Text3, Route17Text4, Route17Text5, Route17Text6, Route17Text7, Route17Text8, Route17Text9, Route17Text10, Route17Text11, Route17Text12, Route17Text13, Route17Text14, Route17Text15, Route17Text16
+
+INCBIN "baserom.gbc",$55bb3,$79
+
 Route17Text1: ; 0x55c2c
     db $08 ; asm
     ld hl, $5bb3
@@ -22752,6 +23156,7 @@ Route17Text1: ; 0x55c2c
     jp $24d7
 
 INCBIN "baserom.gbc",$55c36,$55c45 - $55c36
+
 Route17Text2: ; 0x55c45
     db $08 ; asm
     ld hl, $5bbf
@@ -22840,7 +23245,13 @@ Route17Text16: ; 0x55d3f
     TX_FAR _Route17Text16
     db $50
 
-INCBIN "baserom.gbc",$55d44,$55dec - $55d44
+INCBIN "baserom.gbc",$55d44,$55d5d - $55d44
+
+Route19Texts: ; 0x55d5d
+    dw Route19Text1, Route19Text2, Route19Text3, Route19Text4, Route19Text5, Route19Text6, Route19Text7, Route19Text8, Route19Text9, Route19Text10, Route19Text11
+
+INCBIN "baserom.gbc",$55d73,$79
+
 Route19Text1: ; 0x55dec
     db $08 ; asm
     ld hl, $5d73
@@ -22907,7 +23318,13 @@ Route19Text11: ; 0x55ee6
     TX_FAR _Route19Text11
     db $50
 
-INCBIN "baserom.gbc",$55eeb,$55f83 - $55eeb
+INCBIN "baserom.gbc",$55eeb,$55f04 - $55eeb
+
+Route21Texts: ; 0x55f04
+    dw Route21Text1, Route21Text2, Route21Text3, Route21Text4, Route21Text5, Route21Text6, Route21Text7, Route21Text8, Route21Text9
+
+INCBIN "baserom.gbc",$55f16,$6d
+
 Route21Text1: ; 0x55f83
     db $08 ; asm
     ld hl, $5f16
@@ -22972,7 +23389,11 @@ VermilionHouse2_h: ; 0x56064 to 0x56070 (12 bytes) (id=163)
 
     dw $60cf ; objects
 
-INCBIN "baserom.gbc",$56070,$56075 - $56070
+INCBIN "baserom.gbc",$56070,$56073 - $56070
+
+VermilionHouse2Texts: ; 0x56073
+    dw VermilionHouse2Text1
+
 VermilionHouse2Text1: ; 0x56075
     db $08 ; asm
     ld a, [$d728]
@@ -23028,7 +23449,10 @@ CeladonMart2_h: ; 0x560e9 to 0x560f5 (12 bytes) (id=123)
 
     dw $6111 ; objects
 
-INCBIN "baserom.gbc",$560f5,$56102 - $560f5
+INCBIN "baserom.gbc",$560f5,$560f8 - $560f5
+
+CeladonMart2Texts: ; 0x560f8
+    dw CeladonMart2Text1, CeladonMart2Text2, CeladonMart2Text3, CeladonMart2Text4, CeladonMart2Text5
 
 CeladonMart2Text3: ; 0x56102
     TX_FAR _CeladonMart2Text3
@@ -23075,7 +23499,11 @@ FuchsiaHouse3_h: ; 0x56170 to 0x5617c (12 bytes) (id=164)
 
     dw $6221 ; objects
 
-INCBIN "baserom.gbc",$5617c,$56181 - $5617c
+INCBIN "baserom.gbc",$5617c,$5617f - $5617c
+
+FuchsiaHouse3Texts: ; 0x5617f
+    dw FuchsiaHouse3Text1
+
 FuchsiaHouse3Text1: ; 0x56181
     db $08 ; asm
     ld a, [$d728]
@@ -23133,7 +23561,11 @@ DayCareM_h: ; 0x56243 to 0x5624f (12 bytes) (id=72)
 
     dw $6459 ; objects
 
-INCBIN "baserom.gbc",$5624f,$56254 - $5624f
+INCBIN "baserom.gbc",$5624f,$56252 - $5624f
+
+DayCareMTexts: ; 0x56252
+    dw DayCareMText1
+
 DayCareMText1: ; 0x56254
     db $8
     call $36f4
@@ -23215,7 +23647,11 @@ Route12House_h: ; 0x56473 to 0x5647f (12 bytes) (id=189)
 
     dw $64de ; objects
 
-INCBIN "baserom.gbc",$5647f,$56484 - $5647f
+INCBIN "baserom.gbc",$5647f,$56482 - $5647f
+
+Route12HouseTexts: ; 0x56482
+    dw Route12HouseText1
+
 Route12HouseText1: ; 0x56484
     db $08 ; asm
     ld a, [$d728]
@@ -23271,7 +23707,13 @@ SilphCo8_h: ; 0x564f8 to 0x56504 (12 bytes) (id=213)
 
     dw $6613 ; objects
 
-INCBIN "baserom.gbc",$56504,$565aa - $56504
+INCBIN "baserom.gbc",$56504,$5657d - $56504
+
+SilphCo8Texts: ; 0x5657d
+    dw SilphCo8Text1, SilphCo8Text2, SilphCo8Text3, SilphCo8Text4
+
+INCBIN "baserom.gbc",$56585,$25
+
 SilphCo8Text1: ; 0x565aa
     db $08 ; asm
     ld a, [$d838]
@@ -23912,7 +24354,13 @@ Route8Text10: ; 0x59331
     TX_FAR _Route8Text10
     db $50
 
-INCBIN "baserom.gbc",$59336,$593ac - $59336
+INCBIN "baserom.gbc",$59336,$5934f - $59336
+
+Route10Texts: ; 0x5934f
+    dw Route10Text1, Route10Text2, Route10Text3, Route10Text4, Route10Text5, Route10Text6, Route10Text7, Route10Text8, Route10Text9, Route10Text10
+
+INCBIN "baserom.gbc",$59363,$49
+
 Route10Text1: ; 0x593ac
     db $08 ; asm
     ld hl, $5363
@@ -24034,7 +24482,12 @@ Route11Text11: ; 0x595ee
     TX_FAR _Route11Text11
     db $50
 
-INCBIN "baserom.gbc",$595f3,$596e6 - $595f3
+INCBIN "baserom.gbc",$595f3,$59675 - $595f3
+
+Route12Texts: ; 0x59675
+    dw Route12Text1, Route12Text2, Route12Text3, Route12Text4, Route12Text5, Route12Text6, Route12Text7, Route12Text8, Route12Text9, Route12Text10, Route12Text11, Route12Text12
+
+INCBIN "baserom.gbc",$5968d,$59
 
 Route12Text1: ; 0x596e6
     TX_FAR _Route12Text1
@@ -24099,7 +24552,12 @@ Route12Text12: ; 0x597a9
     TX_FAR _Route12Text12
     db $50
 
-INCBIN "baserom.gbc",$597ae,$59858 - $597ae
+INCBIN "baserom.gbc",$597ae,$597c7 - $597ae
+
+Route15Texts: ; 0x597c7
+    dw Route15Text1, Route15Text2, Route15Text3, Route15Text4, Route15Text5, Route15Text6, Route15Text7, Route15Text8, Route15Text9, Route15Text10, Route15Text11, Route15Text12
+
+INCBIN "baserom.gbc",$597df,$79
 
 Route15Text1: ; 0x59858
     db $8 ; asm
@@ -24160,7 +24618,13 @@ Route15Text12: ; 0x5992e
     TX_FAR _Route15Text12
     db $50
 
-INCBIN "baserom.gbc",$59933,$59a18 - $59933
+INCBIN "baserom.gbc",$59933,$599b9 - $59933
+
+Route16Texts: ; 0x599b9
+    dw Route16Text1, Route16Text2, Route16Text3, Route16Text4, Route16Text5, Route16Text6, Route16Text7, Route16Text8, Route16Text9
+
+INCBIN "baserom.gbc",$599cb,$4d
+
 Route16Text1: ; 0x59a18
     db $08 ; asm
     ld hl, $59cf
@@ -24168,6 +24632,7 @@ Route16Text1: ; 0x59a18
     jp $24d7
 
 INCBIN "baserom.gbc",$59a22,$59a31 - $59a22
+
 Route16Text2: ; 0x59a31
     db $08 ; asm
     ld hl, $59db
@@ -24218,7 +24683,13 @@ Route16Text9: ; 0x59ac2
     TX_FAR _Route16Text9
     db $50
 
-INCBIN "baserom.gbc",$59ac7,$59b0f - $59ac7
+INCBIN "baserom.gbc",$59ac7,$59ae0 - $59ac7
+
+Route18Texts: ; 0x59ae0
+    dw Route18Text1, Route18Text2, Route18Text3, Route18Text4, Route18Text5
+
+INCBIN "baserom.gbc",$59aea,$25
+
 Route18Text1: ; 0x59b0f
     db $08 ; asm
     ld hl, $5aea
@@ -24226,6 +24697,7 @@ Route18Text1: ; 0x59b0f
     jp $24d7
 
 INCBIN "baserom.gbc",$59b19,$59b28 - $59b19
+
 Route18Text2: ; 0x59b28
     db $08 ; asm
     ld hl, $5af6
@@ -24257,7 +24729,11 @@ FanClub_h: ; 0x59b64 to 0x59b70 (12 bytes) (id=90)
 
     dw $5c97 ; objects
 
-INCBIN "baserom.gbc",$59b70,$59b94 - $59b70
+INCBIN "baserom.gbc",$59b70,$59b84 - $59b70
+
+FanClubTexts: ; 0x59b84
+    dw FanClubText1, FanClubText2, FanClubText3, FanClubText4, FanClubText5, FanClubText6, FanClubText7, FanClubText8
+
 FanClubText1: ; 0x59b94
     db $08 ; asm
     ld a, [$d771]
@@ -24402,7 +24878,13 @@ SilphCo2_h: ; 0x59ce5 to 0x59cf1 (12 bytes) (id=207)
 
     dw $5e66 ; objects
 
-INCBIN "baserom.gbc",$59cf1,$59dc1 - $59cf1
+INCBIN "baserom.gbc",$59cf1,$59d86 - $59cf1
+
+SilphCo2Texts: ; 0x59d86
+    dw SilphCo2Text1, SilphCo2Text2, SilphCo2Text3, SilphCo2Text4, SilphCo2Text5
+
+INCBIN "baserom.gbc",$59d90,$31
+
 SilphCo2Text1: ; 0x59dc1
     db $08 ; asm
     ld a, [$d826]
@@ -24491,7 +24973,13 @@ SilphCo3_h: ; 0x59f4f to 0x59f5b (12 bytes) (id=208)
 
     dw $6035 ; objects
 
-INCBIN "baserom.gbc",$59f5b,$59fe5 - $59f5b
+INCBIN "baserom.gbc",$59f5b,$59fc4 - $59f5b
+
+SilphCo3Texts: ; 0x59fc4
+    dw SilphCo3Text1, SilphCo3Text2, SilphCo3Text3, SilphCo3Text4
+
+INCBIN "baserom.gbc",$59fcc,$19
+
 SilphCo3Text1: ; 0x59fe5
     db $08 ; asm
     ld a, [$d838]
@@ -24504,6 +24992,7 @@ asm_8c56f ; 0x59ff3
     jp $24d7
 
 INCBIN "baserom.gbc",$59ff9,$5a003 - $59ff9
+
 SilphCo3Text2: ; 0x5a003
     db $08 ; asm
     ld hl, $5fcc
@@ -24564,7 +25053,13 @@ SilphCo10_h: ; 0x5a12d to 0x5a139 (12 bytes) (id=234)
 
     dw $61fb ; objects
 
-INCBIN "baserom.gbc",$5a139,$5a1ab - $5a139
+INCBIN "baserom.gbc",$5a139,$5a186 - $5a139
+
+SilphCo10Texts: ; 0x5a186
+    dw SilphCo10Text1, SilphCo10Text2, SilphCo10Text3, SilphCo10Text4, SilphCo10Text5, SilphCo10Text6
+
+INCBIN "baserom.gbc",$5a192,$19
+
 SilphCo10Text1: ; 0x5a1ab
     db $08 ; asm
     ld hl, $6192
@@ -24629,7 +25124,13 @@ Lance_h: ; 0x5a2a2 to 0x5a2ae (12 bytes) (id=113)
 
     dw $63c5 ; objects
 
-INCBIN "baserom.gbc",$5a2ae,$5a3a4 - $5a2ae
+INCBIN "baserom.gbc",$5a2ae,$5a395 - $5a2ae
+
+LanceTexts: ; 0x5a395
+    dw LanceText1
+
+INCBIN "baserom.gbc",$5a397,$d
+
 LanceText1: ; 0x5a3a4
     db $08 ; asm
     ld hl, $6397
@@ -24667,6 +25168,7 @@ HallofFameRoom_h: ; 0x5a492 to 0x5a49e (12 bytes) (id=118)
     dw $6571 ; objects
 
 INCBIN "baserom.gbc",$5a49e,$5a56a - $5a49e
+
 HallofFameRoomTexts: ; 0x5a56a
     dw HallofFameRoomText1
 
@@ -24772,7 +25274,10 @@ MuseumF1_h: ; 0x5c0eb to 0x5c0f7 (12 bytes) (id=52)
 
     dw $42c1 ; objects
 
-INCBIN "baserom.gbc",$5c0f7,$5c135 - $5c0f7
+INCBIN "baserom.gbc",$5c0f7,$5c12b - $5c0f7
+
+MuseumF1Texts: ; 0x5c12b
+    dw MuseumF1Text1, MuseumF1Text2, MuseumF1Text3, MuseumF1Text4, MuseumF1Text5
 
 MuseumF1Text1: ; 0x5c135
     db $8
@@ -24966,6 +25471,7 @@ MuseumF2_h: ; 0x5c30b to 0x5c317 (12 bytes) (id=53)
     dw $434b ; objects
 
 INCBIN "baserom.gbc",$5c317,$5c31a - $5c317
+
 MuseumF2Texts: ; 0x5c31a
     dw MuseumF2Text1, MuseumF2Text2, MuseumF2Text3, MuseumF2Text4, MuseumF2Text5, MuseumF2Text6, MuseumF2Text7
 
@@ -25025,7 +25531,13 @@ PewterGym_h: ; 0x5c37b to 0x5c387 (12 bytes) (id=54)
 
     dw $452e ; objects
 
-INCBIN "baserom.gbc",$5c387,$5c44e - $5c387
+INCBIN "baserom.gbc",$5c387,$5c435 - $5c387
+
+PewterGymTexts: ; 0x5c435
+    dw PewterGymText1, PewterGymText2, PewterGymText3
+
+INCBIN "baserom.gbc",$5c43b,$13
+
 PewterGymText1: ; 0x5c44e
     db $08 ; asm
     ld a, [$d755]
@@ -25215,7 +25727,12 @@ CeruleanGym_h: ; 0x5c6a7 to 0x5c6b3 (12 bytes) (id=65)
 
     dw $4834 ; objects
 
-INCBIN "baserom.gbc",$5c6b3,$5c771 - $5c6b3
+INCBIN "baserom.gbc",$5c6b3,$5c74a - $5c6b3
+
+CeruleanGymTexts: ; 0x5c74a
+    dw CeruleanGymText1, CeruleanGymText2, CeruleanGymText3, CeruleanGymText4
+
+INCBIN "baserom.gbc",$5c752,$1f
 
 CeruleanGymText1: ; 0x5c771
     db $08 ; asm
@@ -25313,7 +25830,10 @@ CeruleanMart_h: ; 0x5c889 to 0x5c895 (12 bytes) (id=67)
 
     dw $48a8 ; objects
 
-INCBIN "baserom.gbc",$5c895,$5c89e - $5c895
+INCBIN "baserom.gbc",$5c895,$5c898 - $5c895
+
+CeruleanMartTexts: ; 0x5c898
+    dw CeruleanMartText1, CeruleanMartText2, CeruleanMartText3
 
 CeruleanMartText2: ; 0x5c89e
     TX_FAR _CeruleanMartText2
@@ -25392,7 +25912,10 @@ LavenderMart_h: ; 0x5c920 to 0x5c92c (12 bytes) (id=150)
 
     dw $495d ; objects
 
-INCBIN "baserom.gbc",$5c92c,$5c935 - $5c92c
+INCBIN "baserom.gbc",$5c92c,$5c92f - $5c92c
+
+LavenderMartTexts: ; 0x5c92f
+    dw LavenderMartText1, LavenderMartText2, LavenderMartText3
 
 LavenderMartText2: ; 0x5c935
     TX_FAR _LavenderMartText2
@@ -25480,7 +26003,10 @@ VermilionMart_h: ; 0x5c9d5 to 0x5c9e1 (12 bytes) (id=91)
 
     dw $49f4 ; objects
 
-INCBIN "baserom.gbc",$5c9e1,$5c9ea - $5c9e1
+INCBIN "baserom.gbc",$5c9e1,$5c9e4 - $5c9e1
+
+VermilionMartTexts: ; 0x5c9e4
+    dw VermilionMartText1, VermilionMartText2, VermilionMartText3
 
 VermilionMartText2: ; 0x5c9ea
     TX_FAR _VermilionMartText2
@@ -25519,7 +26045,13 @@ VermilionGym_h: ; 0x5ca1a to 0x5ca26 (12 bytes) (id=92)
 
     dw $4bfe ; objects
 
-INCBIN "baserom.gbc",$5ca26,$5cb1d - $5ca26
+INCBIN "baserom.gbc",$5ca26,$5cae8 - $5ca26
+
+VermilionGymTexts: ; 0x5cae8
+    dw VermilionGymText1, VermilionGymText2, VermilionGymText3, VermilionGymText4, VermilionGymText5
+
+INCBIN "baserom.gbc",$5caf2,$2b
+
 VermilionGymText1: ; 0x5cb1d
     db $08 ; asm
     ld a, [$d773]
@@ -25625,7 +26157,11 @@ CopycatsHouseF2_h: ; 0x5cc65 to 0x5cc71 (12 bytes) (id=176)
 
     dw $4d21 ; objects
 
-INCBIN "baserom.gbc",$5cc71,$5cc82 - $5cc71
+INCBIN "baserom.gbc",$5cc71,$5cc74 - $5cc71
+
+CopycatsHouseF2Texts: ; 0x5cc74
+    dw CopycatsHouseF2Text1, CopycatsHouseF2Text2, CopycatsHouseF2Text3, CopycatsHouseF2Text4, CopycatsHouseF2Text5, CopycatsHouseF2Text6, CopycatsHouseF2Text7
+
 CopycatsHouseF2Text1: ; 0x5cc82
     db $08 ; asm
     ld a, [$d7af]
@@ -25719,7 +26255,13 @@ FightingDojo_h: ; 0x5cd51 to 0x5cd5d (12 bytes) (id=177)
 
     dw $4f9b ; objects
 
-INCBIN "baserom.gbc",$5cd5d,$5ce44 - $5cd5d
+INCBIN "baserom.gbc",$5cd5d,$5ce03 - $5cd5d
+
+FightingDojoTexts: ; 0x5ce03
+    dw FightingDojoText1, FightingDojoText2, FightingDojoText3, FightingDojoText4, FightingDojoText5, FightingDojoText6, FightingDojoText7
+
+INCBIN "baserom.gbc",$5ce11,$33
+
 FightingDojoText1: ; 0x5ce44
     db $08 ; asm
     ld a, [$d7b1]
@@ -25879,7 +26421,13 @@ SaffronGym_h: ; 0x5d001 to 0x5d00d (12 bytes) (id=178)
 
     dw $5259 ; objects
 
-INCBIN "baserom.gbc",$5d00d,$5d118 - $5d00d
+INCBIN "baserom.gbc",$5d00d,$5d0ab - $5d00d
+
+SaffronGymTexts: ; 0x5d0ab
+    dw SaffronGymText1, SaffronGymText2, SaffronGymText3, SaffronGymText4, SaffronGymText5, SaffronGymText6, SaffronGymText7, SaffronGymText8, SaffronGymText9
+
+INCBIN "baserom.gbc",$5d0bd,$5b
+
 SaffronGymText1: ; 0x5d118
     db $08 ; asm
     ld a, [$d7b3]
@@ -26067,7 +26615,10 @@ SaffronMart_h: ; 0x5d3fd to 0x5d409 (12 bytes) (id=180)
 
     dw $541c ; objects
 
-INCBIN "baserom.gbc",$5d409,$5d412 - $5d409
+INCBIN "baserom.gbc",$5d409,$5d40c - $5d409
+
+SaffronMartTexts: ; 0x5d40c
+    dw SaffronMartText1, SaffronMartText2, SaffronMartText3
 
 SaffronMartText2: ; 0x5d412
     TX_FAR _SaffronMartText2
@@ -26104,6 +26655,7 @@ SilphCo1_h: ; 0x5d442 to 0x5d44e (12 bytes) (id=181)
     dw $5470 ; objects
 
 INCBIN "baserom.gbc",$5d44e,$5d469 - $5d44e
+
 SilphCo1Texts: ; 0x5d469
     dw SilphCo1Text1
 
@@ -26187,6 +26739,7 @@ ViridianForestexit_h: ; 0x5d57b to 0x5d587 (12 bytes) (id=47)
     dw $5598 ; objects
 
 INCBIN "baserom.gbc",$5d587,$5d58a - $5d587
+
 ViridianForestexitTexts: ; 0x5d58a
     dw ViridianForestexitText1, ViridianForestexitText2
 
@@ -26227,7 +26780,11 @@ Route2Gate_h: ; 0x5d5c8 to 0x5d5d4 (12 bytes) (id=49)
 
     dw $5620 ; objects
 
-INCBIN "baserom.gbc",$5d5d4,$5d5db - $5d5d4
+INCBIN "baserom.gbc",$5d5d4,$5d5d7 - $5d5d4
+
+Route2GateTexts: ; 0x5d5d7
+    dw Route2GateText1, Route2GateText2
+
 Route2GateText1: ; 0x5d5db
     db $08 ; asm
     ld a, [$d7c2]
@@ -26292,6 +26849,7 @@ ViridianForestEntrance_h: ; 0x5d650 to 0x5d65c (12 bytes) (id=50)
     dw $566d ; objects
 
 INCBIN "baserom.gbc",$5d65c,$5d65f - $5d65c
+
 ViridianForestEntranceTexts: ; 0x5d65f
     dw ViridianForestEntranceText1, ViridianForestEntranceText2
 
@@ -26332,7 +26890,11 @@ UndergroundTunnelEntranceRoute5_h: ; 0x5d69d to 0x5d6a9 (12 bytes) (id=71)
 
     dw $56c1 ; objects
 
-INCBIN "baserom.gbc",$5d6a9,$5d6b2 - $5d6a9
+INCBIN "baserom.gbc",$5d6a9,$5d6b0 - $5d6a9
+
+UndergroundTunnelEntranceRoute5Texts: ; 0x5d6b0
+    dw UndergroundTunnelEntranceRoute5Text1
+
 UndergroundTunnelEntranceRoute5Text1: ; 0x5d6b2
     db $08 ; asm
     ld a, $9
@@ -26369,6 +26931,7 @@ UndergroundTunnelEntranceRoute6_h: ; 0x5d6e3 to 0x5d6ef (12 bytes) (id=74)
     dw $56fe ; objects
 
 INCBIN "baserom.gbc",$5d6ef,$5d6f7 - $5d6ef
+
 UndergroundTunnelEntranceRoute6Texts: ; 0x5d6f7
     dw UndergroundTunnelEntranceRoute6Text1
 
@@ -26405,6 +26968,7 @@ UndergroundPathEntranceRoute7_h: ; 0x5d720 to 0x5d72c (12 bytes) (id=77)
     dw $573b ; objects
 
 INCBIN "baserom.gbc",$5d72c,$5d734 - $5d72c
+
 UndergroundPathEntranceRoute7Texts: ; 0x5d734
     dw UndergroundPathEntranceRoute7Text1
 
@@ -26441,7 +27005,13 @@ SilphCo9_h: ; 0x5d7af to 0x5d7bb (12 bytes) (id=233)
 
     dw $593f ; objects
 
-INCBIN "baserom.gbc",$5d7bb,$5d8b8 - $5d7bb
+INCBIN "baserom.gbc",$5d7bb,$5d88b - $5d7bb
+
+SilphCo9Texts: ; 0x5d88b
+    dw SilphCo9Text1, SilphCo9Text2, SilphCo9Text3, SilphCo9Text4
+
+INCBIN "baserom.gbc",$5d893,$25
+
 SilphCo9Text1: ; 0x5d8b8
     db $08 ; asm
     ld a, [$d838]
@@ -26519,7 +27089,13 @@ VictoryRoad1_h: ; 0x5d9fe to 0x5da0a (12 bytes) (id=108)
 
     dw $5ab8 ; objects
 
-INCBIN "baserom.gbc",$5da0a,$5da86 - $5da0a
+INCBIN "baserom.gbc",$5da0a,$5da5f - $5da0a
+
+VictoryRoad1Texts: ; 0x5da5f
+    dw VictoryRoad1Text1, VictoryRoad1Text2, VictoryRoad1Text3, VictoryRoad1Text4, VictoryRoad1Text5, VictoryRoad1Text6, VictoryRoad1Text7
+
+INCBIN "baserom.gbc",$5da6d,$19
+
 VictoryRoad1Text1: ; 0x5da86
     db $08 ; asm
     ld hl, $5a6d
@@ -26583,6 +27159,7 @@ PokemonTower1_h: ; 0x60420 to 0x6042c (12 bytes) (id=142)
     dw $4452 ; objects
 
 INCBIN "baserom.gbc",$6042c,$6042f - $6042c
+
 PokemonTower1Texts: ; 0x6042f
     dw PokemonTower1Text1, PokemonTower1Text2, PokemonTower1Text3, PokemonTower1Text4, PokemonTower1Text5
 
@@ -26639,7 +27216,11 @@ PokemonTower2_h: ; 0x604e6 to 0x604f2 (12 bytes) (id=143)
 
     dw $4646 ; objects
 
-INCBIN "baserom.gbc",$604f2,$605df - $604f2
+INCBIN "baserom.gbc",$604f2,$605db - $604f2
+
+PokemonTower2Texts: ; 0x605db
+    dw PokemonTower2Text1, PokemonTower2Text2
+
 PokemonTower2Text1: ; 0x605df
     db $08 ; asm
     ld a, [$d764]
@@ -26713,7 +27294,13 @@ PokemonTower3_h: ; 0x606c0 to 0x606cc (12 bytes) (id=144)
 
     dw $475d ; objects
 
-INCBIN "baserom.gbc",$606cc,$60712 - $606cc
+INCBIN "baserom.gbc",$606cc,$606e5 - $606cc
+
+PokemonTower3Texts: ; 0x606e5
+    dw PokemonTower3Text1, PokemonTower3Text2, PokemonTower3Text3, PokemonTower3Text4
+
+INCBIN "baserom.gbc",$606ed,$25
+
 PokemonTower3Text1: ; 0x60712
     db $08 ; asm
     ld hl, $46ed
@@ -26763,7 +27350,13 @@ PokemonTower4_h: ; 0x607ea to 0x607f6 (12 bytes) (id=145)
 
     dw $488b ; objects
 
-INCBIN "baserom.gbc",$607f6,$60840 - $607f6
+INCBIN "baserom.gbc",$607f6,$6080f - $607f6
+
+PokemonTower4Texts: ; 0x6080f
+    dw PokemonTower4Text1, PokemonTower4Text2, PokemonTower4Text3, PokemonTower4Text4, PokemonTower4Text5, PokemonTower4Text6
+
+INCBIN "baserom.gbc",$6081b,$25
+
 PokemonTower4Text1: ; 0x60840
     db $08 ; asm
     ld hl, $481b
@@ -26815,7 +27408,12 @@ PokemonTower5_h: ; 0x60926 to 0x60932 (12 bytes) (id=146)
 
     dw $4a48 ; objects
 
-INCBIN "baserom.gbc",$60932,$609da - $60932
+INCBIN "baserom.gbc",$60932,$6099b - $60932
+
+PokemonTower5Texts: ; 0x6099b
+    dw PokemonTower5Text1, PokemonTower5Text2, PokemonTower5Text3, PokemonTower5Text4, PokemonTower5Text5, PokemonTower5Text6
+
+INCBIN "baserom.gbc",$609a7,$33
 
 PokemonTower5Text1: ; 0x609da
     TX_FAR _PokemonTower5Text1
@@ -26881,7 +27479,13 @@ PokemonTower6_h: ; 0x60ae3 to 0x60aef (12 bytes) (id=147)
 
     dw $4c5b ; objects
 
-INCBIN "baserom.gbc",$60aef,$60be4 - $60aef
+INCBIN "baserom.gbc",$60aef,$60bb1 - $60aef
+
+PokemonTower6Texts: ; 0x60bb1
+    dw PokemonTower6Text1, PokemonTower6Text2, PokemonTower6Text3, PokemonTower6Text4, PokemonTower6Text5
+
+INCBIN "baserom.gbc",$60bbb,$29
+
 PokemonTower6Text1: ; 0x60be4
     db $08 ; asm
     ld hl, $4bbf
@@ -26934,7 +27538,13 @@ PokemonTower7_h: ; 0x60cf9 to 0x60d05 (12 bytes) (id=148)
 
     dw $4ef6 ; objects
 
-INCBIN "baserom.gbc",$60d05,$60e6c - $60d05
+INCBIN "baserom.gbc",$60d05,$60e3f - $60d05
+
+PokemonTower7Texts: ; 0x60e3f
+    dw PokemonTower7Text1, PokemonTower7Text2, PokemonTower7Text3, PokemonTower7Text4
+
+INCBIN "baserom.gbc",$60e47,$25
+
 PokemonTower7Text1: ; 0x60e6c
     db $08 ; asm
     ld hl, $4e47
@@ -27008,6 +27618,7 @@ CeladonMart1_h: ; 0x60f7a to 0x60f86 (12 bytes) (id=122)
     dw $4f9e ; objects
 
 INCBIN "baserom.gbc",$60f86,$60f89 - $60f86
+
 CeladonMart1Texts: ; 0x60f89
     dw CeladonMart1Text1, CeladonMart1Text2, CeladonMart1Text3
 
@@ -27062,7 +27673,12 @@ ViridianForest_h: ; 0x61101 to 0x6110d (12 bytes) (id=51)
 
     dw $51da ; objects
 
-INCBIN "baserom.gbc",$6110d,$61167 - $6110d
+INCBIN "baserom.gbc",$6110d,$61126 - $6110d
+
+ViridianForestTexts: ; 0x61126
+    dw ViridianForestText1, ViridianForestText2, ViridianForestText3, ViridianForestText4, ViridianForestText5, ViridianForestText6, ViridianForestText7, ViridianForestText8, ViridianForestText9, ViridianForestText10, ViridianForestText11, ViridianForestText12, ViridianForestText13, ViridianForestText14
+
+INCBIN "baserom.gbc",$61142,$25
 
 ViridianForestText1: ; 0x61167
     TX_FAR _ViridianForestText1
@@ -27161,7 +27777,10 @@ SSAnne1_h: ; 0x61259 to 0x61265 (12 bytes) (id=95)
 
     dw $5277 ; objects
 
-INCBIN "baserom.gbc",$61265,$6126d - $61265
+INCBIN "baserom.gbc",$61265,$61269 - $61265
+
+SSAnne1Texts: ; 0x61269
+    dw SSAnne1Text1, SSAnne1Text2
 
 SSAnne1Text1: ; 0x6126d
     TX_FAR _SSAnne1Text1
@@ -27219,7 +27838,12 @@ SSAnne2_h: ; 0x61393 to 0x6139f (12 bytes) (id=96)
 
     dw $5514 ; objects
 
-INCBIN "baserom.gbc",$6139f,$614e1 - $6139f
+INCBIN "baserom.gbc",$6139f,$614db - $6139f
+
+SSAnne2Texts: ; 0x614db
+    dw SSAnne2Text1, SSAnne2Text2
+
+INCBIN "baserom.gbc",$614df,$2
 
 SSAnne2Text1: ; 0x614e1
     TX_FAR _SSAnne2Text1
@@ -27315,7 +27939,12 @@ SSAnne5_h: ; 0x616a2 to 0x616ae (12 bytes) (id=99)
 
     dw $572b ; objects
 
-INCBIN "baserom.gbc",$616ae,$616ea - $616ae
+INCBIN "baserom.gbc",$616ae,$616c7 - $616ae
+
+SSAnne5Texts: ; 0x616c7
+    dw SSAnne5Text1, SSAnne5Text2, SSAnne5Text3, SSAnne5Text4, SSAnne5Text5
+
+INCBIN "baserom.gbc",$616d1,$19
 
 SSAnne5Text1: ; 0x616ea
     TX_FAR _SSAnne5Text1
@@ -27377,7 +28006,10 @@ SSAnne6_h: ; 0x617a7 to 0x617b3 (12 bytes) (id=100)
 
     dw $581b ; objects
 
-INCBIN "baserom.gbc",$617b3,$617c5 - $617b3
+INCBIN "baserom.gbc",$617b3,$617b7 - $617b3
+
+SSAnne6Texts: ; 0x617b7
+    dw SSAnne6Text1, SSAnne6Text2, SSAnne6Text3, SSAnne6Text4, SSAnne6Text5, SSAnne6Text6, SSAnne6Text7
 
 SSAnne6Text1: ; 0x617c5
     TX_FAR _SSAnne6Text1
@@ -27461,7 +28093,11 @@ SSAnne7_h: ; 0x61889 to 0x61895 (12 bytes) (id=101)
 
     dw $5946 ; objects
 
-INCBIN "baserom.gbc",$61895,$618ad - $61895
+INCBIN "baserom.gbc",$61895,$618a7 - $61895
+
+SSAnne7Texts: ; 0x618a7
+    dw SSAnne7Text1, SSAnne7Text2, SSAnne7Text3
+
 SSAnne7Text1: ; 0x618ad
     db $08 ; asm
     ld a, [$d803]
@@ -27528,7 +28164,13 @@ SSAnne8_h: ; 0x6196a to 0x61976 (12 bytes) (id=102)
 
     dw $5a60 ; objects
 
-INCBIN "baserom.gbc",$61976,$619d6 - $61976
+INCBIN "baserom.gbc",$61976,$6198f - $61976
+
+SSAnne8Texts: ; 0x6198f
+    dw SSAnne8Text1, SSAnne8Text2, SSAnne8Text3, SSAnne8Text4, SSAnne8Text5, SSAnne8Text6, SSAnne8Text7, SSAnne8Text8, SSAnne8Text9, SSAnne8Text10, SSAnne8Text11
+
+INCBIN "baserom.gbc",$619a5,$31
+
 SSAnne8Text1: ; 0x619d6
     db $08 ; asm
     ld hl, $59a5
@@ -27627,7 +28269,13 @@ SSAnne9_h: ; 0x61b3f to 0x61b4b (12 bytes) (id=103)
 
     dw $5c8d ; objects
 
-INCBIN "baserom.gbc",$61b4b,$61bb5 - $61b4b
+INCBIN "baserom.gbc",$61b4b,$61b6a - $61b4b
+
+SSAnne9Texts: ; 0x61b6a
+    dw SSAnne9Text1, SSAnne9Text2, SSAnne9Text3, SSAnne9Text4, SSAnne9Text5, SSAnne9Text6, SSAnne9Text7, SSAnne9Text8, SSAnne9Text9, SSAnne9Text10, SSAnne9Text11, SSAnne9Text12, SSAnne9Text13
+
+INCBIN "baserom.gbc",$61b84,$31
+
 SSAnne9Text1: ; 0x61bb5
     db $08 ; asm
     ld hl, $5b84
@@ -27761,7 +28409,13 @@ SSAnne10_h: ; 0x61d49 to 0x61d55 (12 bytes) (id=104)
 
     dw $5e75 ; objects
 
-INCBIN "baserom.gbc",$61d55,$61dcd - $61d55
+INCBIN "baserom.gbc",$61d55,$61d6e - $61d55
+
+SSAnne10Texts: ; 0x61d6e
+    dw SSAnne10Text1, SSAnne10Text2, SSAnne10Text3, SSAnne10Text4, SSAnne10Text5, SSAnne10Text6, SSAnne10Text7, SSAnne10Text8, SSAnne10Text9, SSAnne10Text10, SSAnne10Text11
+
+INCBIN "baserom.gbc",$61d84,$49
+
 SSAnne10Text1: ; 0x61dcd
     db $08 ; asm
     ld hl, $5d84
@@ -27936,7 +28590,13 @@ SilphCo11_h: ; 0x620ee to 0x620fa (12 bytes) (id=235)
 
     dw $6380 ; objects
 
-INCBIN "baserom.gbc",$620fa,$622dc - $620fa
+INCBIN "baserom.gbc",$620fa,$622b7 - $620fa
+
+SilphCo11Texts: ; 0x622b7
+    dw SilphCo11Text1, SilphCo11Text2, SilphCo11Text3, SilphCo11Text4, SilphCo11Text5
+
+INCBIN "baserom.gbc",$622c1,$1b
+
 SilphCo11Text1: ; 0x622dc
     db $08 ; asm
     ld a, [$d838]
@@ -29127,7 +29787,13 @@ ViridianGym_h: ; 0x74897 to 0x748a3 (12 bytes) (id=45)
 
     dw $4bde ; objects
 
-INCBIN "baserom.gbc",$748a3,$74a69 - $748a3
+INCBIN "baserom.gbc",$748a3,$749ec - $748a3
+
+ViridianGymTexts: ; 0x749ec
+    dw ViridianGymText1, ViridianGymText2, ViridianGymText3, ViridianGymText4, ViridianGymText5, ViridianGymText6, ViridianGymText7, ViridianGymText8, ViridianGymText9, ViridianGymText10, ViridianGymText11
+
+INCBIN "baserom.gbc",$74a02,$67
+
 ViridianGymText1: ; 0x74a69
     db $08 ; asm
     ld a, [$d751]
@@ -29281,7 +29947,11 @@ PewterMart_h: ; 0x74ca1 to 0x74cad (12 bytes) (id=56)
 
     dw $4cda ; objects
 
-INCBIN "baserom.gbc",$74cad,$74cbc - $74cad
+INCBIN "baserom.gbc",$74cad,$74cb6 - $74cad
+
+PewterMartTexts: ; 0x74cb6
+    dw PewterMartText1, PewterMartText2, PewterMartText3
+
 PewterMartText2: ; 0x74cbc
     db $08 ; asm
     ld hl, $4cc6
@@ -29322,7 +29992,11 @@ UnknownDungeon1_h: ; 0x74d00 to 0x74d0c (12 bytes) (id=228)
 
     dw $4d15 ; objects
 
-INCBIN "baserom.gbc",$74d0c,$74d15 - $74d0c
+INCBIN "baserom.gbc",$74d0c,$74d0f - $74d0c
+
+UnknownDungeon1Texts: ; 0x74d0f
+    dw UnknownDungeon1Text1, UnknownDungeon1Text2, UnknownDungeon1Text3
+
 UnknownDungeon1Object: ; 0x74d15 (size=97)
     db $7d ; border tile
 
@@ -29396,6 +30070,7 @@ FuchsiaHouse1_h: ; 0x7500c to 0x75018 (12 bytes) (id=153)
     dw $5031 ; objects
 
 INCBIN "baserom.gbc",$75018,$7501c - $75018
+
 FuchsiaHouse1Texts: ; 0x7501c
     dw FuchsiaHouse1Text1, FuchsiaHouse1Text2, FuchsiaHouse1Text3
 
@@ -29478,7 +30153,11 @@ FuchsiaHouse2_h: ; 0x750a9 to 0x750b5 (12 bytes) (id=155)
 
     dw $5180 ; objects
 
-INCBIN "baserom.gbc",$750b5,$750c2 - $750b5
+INCBIN "baserom.gbc",$750b5,$750b8 - $750b5
+
+FuchsiaHouse2Texts: ; 0x750b8
+    dw FuchsiaHouse2Text1, FuchsiaHouse2Text2, FuchsiaHouse2Text3, FuchsiaHouse2Text4, FuchsiaHouse2Text5
+
 FuchsiaHouse2Text1: ; 0x750c2
     db $08 ; asm
     ld a, [$d78e]
@@ -29579,13 +30258,19 @@ SafariZoneEntrance_h: ; 0x751c1 to 0x751cd (12 bytes) (id=156)
 
     dw $53f5 ; objects
 
-INCBIN "baserom.gbc",$751cd,$752c5 - $751cd
+INCBIN "baserom.gbc",$751cd,$752b9 - $751cd
+
+SafariZoneEntranceTexts: ; 0x752b9
+    dw SafariZoneEntranceText1, SafariZoneEntranceText2
+
+INCBIN "baserom.gbc",$752bd,$8
 
 SafariZoneEntranceText1: ; 0x752c5
     TX_FAR _SafariZoneEntranceText1
     db $50
 
 INCBIN "baserom.gbc",$752ca,$753ca - $752ca
+
 SafariZoneEntranceText2: ; 0x753ca
     db $08 ; asm
     ld hl, $53e6
@@ -29633,7 +30318,13 @@ FuchsiaGym_h: ; 0x75431 to 0x7543d (12 bytes) (id=157)
 
     dw $5658 ; objects
 
-INCBIN "baserom.gbc",$7543d,$75534 - $7543d
+INCBIN "baserom.gbc",$7543d,$754d5 - $7543d
+
+FuchsiaGymTexts: ; 0x754d5
+    dw FuchsiaGymText1, FuchsiaGymText2, FuchsiaGymText3, FuchsiaGymText4, FuchsiaGymText5, FuchsiaGymText6, FuchsiaGymText7, FuchsiaGymText8
+
+INCBIN "baserom.gbc",$754e5,$4f
+
 FuchsiaGymText1: ; 0x75534
     db $08 ; asm
     ld a, [$d792]
@@ -29760,6 +30451,7 @@ FuchsiaMeetingRoom_h: ; 0x756d7 to 0x756e3 (12 bytes) (id=158)
     dw $56fc ; objects
 
 INCBIN "baserom.gbc",$756e3,$756e7 - $756e3
+
 FuchsiaMeetingRoomTexts: ; 0x756e7
     dw FuchsiaMeetingRoomText1, FuchsiaMeetingRoomText2, FuchsiaMeetingRoomText3
 
@@ -29804,7 +30496,13 @@ CinnabarGym_h: ; 0x7573e to 0x7574a (12 bytes) (id=166)
 
     dw $5acc ; objects
 
-INCBIN "baserom.gbc",$7574a,$758df - $7574a
+INCBIN "baserom.gbc",$7574a,$7589f - $7574a
+
+CinnabarGymTexts: ; 0x7589f
+    dw CinnabarGymText1, CinnabarGymText2, CinnabarGymText3, CinnabarGymText4, CinnabarGymText5, CinnabarGymText6, CinnabarGymText7, CinnabarGymText8, CinnabarGymText9
+
+INCBIN "baserom.gbc",$758b1,$2e
+
 CinnabarGymText1: ; 0x758df
     db $8
     ld a, [$d79a]
@@ -30006,6 +30704,7 @@ Lab1_h: ; 0x75b80 to 0x75b8c (12 bytes) (id=167)
     dw $5bb3 ; objects
 
 INCBIN "baserom.gbc",$75b8c,$75b90 - $75b8c
+
 Lab1Texts: ; 0x75b90
     dw Lab1Text1, Lab1Text2, Lab1Text3, Lab1Text4, Lab1Text5
 
@@ -30066,7 +30765,10 @@ Lab2_h: ; 0x75c15 to 0x75c21 (12 bytes) (id=168)
 
     dw $5c45 ; objects
 
-INCBIN "baserom.gbc",$75c21,$75c2a - $75c21
+INCBIN "baserom.gbc",$75c21,$75c24 - $75c21
+
+Lab2Texts: ; 0x75c24
+    dw Lab2Text1, Lab2Text2, Lab2Text3
 
 Lab2Text1: ; 0x75c2a
     TX_FAR _Lab2Text1
@@ -30116,7 +30818,11 @@ Lab3_h: ; 0x75c7b to 0x75c87 (12 bytes) (id=169)
 
     dw $5cec ; objects
 
-INCBIN "baserom.gbc",$75c87,$75c94 - $75c87
+INCBIN "baserom.gbc",$75c87,$75c8a - $75c87
+
+Lab3Texts: ; 0x75c8a
+    dw Lab3Text1, Lab3Text2, Lab3Text3, Lab3Text4, Lab3Text5
+
 Lab3Text1: ; 0x75c94
     db $08 ; asm
     ld a, [$d7a1]
@@ -30267,7 +30973,10 @@ CinnabarMart_h: ; 0x75e72 to 0x75e7e (12 bytes) (id=172)
 
     dw $5e91 ; objects
 
-INCBIN "baserom.gbc",$75e7e,$75e87 - $75e7e
+INCBIN "baserom.gbc",$75e7e,$75e81 - $75e7e
+
+CinnabarMartTexts: ; 0x75e81
+    dw CinnabarMartText1, CinnabarMartText2, CinnabarMartText3
 
 CinnabarMartText2: ; 0x75e87
     TX_FAR _CinnabarMartText2
@@ -30304,6 +31013,7 @@ CopycatsHouseF1_h: ; 0x75eb7 to 0x75ec3 (12 bytes) (id=175)
     dw $5ee3 ; objects
 
 INCBIN "baserom.gbc",$75ec3,$75ec6 - $75ec3
+
 CopycatsHouseF1Texts: ; 0x75ec6
     dw CopycatsHouseF1Text1, CopycatsHouseF1Text2, CopycatsHouseF1Text3
 
@@ -30342,7 +31052,13 @@ CopycatsHouseF1Object: ; 0x75ee3 (size=46)
     EVENT_DISP $4, $7, $3
     EVENT_DISP $4, $1, $7 ; COPYCATS_HOUSE_2F
 
-INCBIN "baserom.gbc",$75f11,$760e0 - $75f11
+INCBIN "baserom.gbc",$75f11,$760d6 - $75f11
+
+GaryTexts: ; 0x760d6
+    dw GaryText1, GaryText2
+
+INCBIN "baserom.gbc",$760da,$6
+
 GaryText1: ; 0x760e0
     db $08 ; asm
     ld a, [$d867]
@@ -30393,7 +31109,13 @@ Loreli_h: ; 0x7616f to 0x7617b (12 bytes) (id=245)
 
     dw $6280 ; objects
 
-INCBIN "baserom.gbc",$7617b,$76262 - $7617b
+INCBIN "baserom.gbc",$7617b,$76251 - $7617b
+
+LoreliTexts: ; 0x76251
+    dw LoreliText1
+
+INCBIN "baserom.gbc",$76253,$f
+
 LoreliText1: ; 0x76262
     db $08 ; asm
     ld hl, $6255
@@ -30401,6 +31123,7 @@ LoreliText1: ; 0x76262
     jp $24d7
 
 INCBIN "baserom.gbc",$7626c,$14
+
 LoreliObject: ; 0x76280 (size=44)
     db $3 ; border tile
 
@@ -30432,7 +31155,13 @@ Bruno_h: ; 0x762ca to 0x762d6 (12 bytes) (id=246)
 
     dw $63d7 ; objects
 
-INCBIN "baserom.gbc",$762d6,$763b9 - $762d6
+INCBIN "baserom.gbc",$762d6,$763a8 - $762d6
+
+BrunoTexts: ; 0x763a8
+    dw BrunoText1
+
+INCBIN "baserom.gbc",$763aa,$f
+
 BrunoText1: ; 0x763b9
     db $08 ; asm
     ld hl, $63ac
@@ -30440,6 +31169,7 @@ BrunoText1: ; 0x763b9
     jp $24d7
 
 INCBIN "baserom.gbc",$763c3,$14
+
 BrunoObject: ; 0x763d7 (size=44)
     db $3 ; border tile
 
@@ -30471,7 +31201,13 @@ Agatha_h: ; 0x76421 to 0x7642d (12 bytes) (id=247)
 
     dw $6534 ; objects
 
-INCBIN "baserom.gbc",$7642d,$76516 - $7642d
+INCBIN "baserom.gbc",$7642d,$76505 - $7642d
+
+AgathaTexts: ; 0x76505
+    dw AgathaText1
+
+INCBIN "baserom.gbc",$76507,$f
+
 AgathaText1: ; 0x76516
     db $08 ; asm
     ld hl, $6509
@@ -30479,6 +31215,7 @@ AgathaText1: ; 0x76516
     jp $24d7
 
 INCBIN "baserom.gbc",$76520,$14
+
 AgathaObject: ; 0x76534 (size=44)
     db $0 ; border tile
 
-- 
cgit v1.2.3


From e86e0962c6d93b43270b191389b74ad2df0ce30e Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 01:53:00 -0600
Subject: minor formatting

hg-commit-id: 6901fd7898c8
---
 pokered.asm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/pokered.asm b/pokered.asm
index adbf43be..6ef48a40 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -6020,6 +6020,7 @@ ViridianCityText2: ; 0x19107
     jp $24d7
 
 INCBIN "baserom.gbc",$19122,$1912c - $19122
+
 ViridianCityText3: ; 0x1912c
     db $08 ; asm
     ld hl, $514d
@@ -6038,6 +6039,7 @@ ViridianCityText3: ; 0x1912c
     jp $24d7
 
 INCBIN "baserom.gbc",$1914d,$1915c - $1914d
+
 ViridianCityText4: ; 0x1915c
     db $08 ; asm
     ld a, [$d74b]
@@ -6053,6 +6055,7 @@ ViridianCityText4: ; 0x1915c
     jp $24d7
 
 INCBIN "baserom.gbc",$19175,$1917f - $19175
+
 ViridianCityText5: ; 0x1917f
     db $08 ; asm
     ld hl, $5191
@@ -6063,6 +6066,7 @@ ViridianCityText5: ; 0x1917f
     jp $24d7
 
 INCBIN "baserom.gbc",$19191,$19196 - $19191
+
 ViridianCityText6: ; 0x19196
     db $08 ; asm
     ld a, [$d74c]
@@ -6089,6 +6093,7 @@ ViridianCityText6: ; 0x19196
     jp $24d7
 
 INCBIN "baserom.gbc",$191ca,$191df - $191ca
+
 ViridianCityText7: ; 0x191df
     db $08 ; asm
     ld hl, $520a
@@ -6254,6 +6259,7 @@ CeruleanCityText1: ; 0x1964f
     jp $24d7
 
 INCBIN "baserom.gbc",$19668,$1967c - $19668
+
 CeruleanCityText2: ; 0x1967c
     db $8
     ld a, [$d75b]
@@ -6294,6 +6300,7 @@ CeruleanCityText2: ; 0x1967c
 .asm_e4e6f ; 0x196d6
     jp $24d7
 ; 0x196d9
+
 INCBIN "baserom.gbc",$196d9,$1f
 
 CeruleanCityText3: ; 0x196f8
@@ -6334,6 +6341,7 @@ CeruleanCityText7: ; 0x1970c
     jp $24d7
 
 INCBIN "baserom.gbc",$19730,$1973f - $19730
+
 CeruleanCityText8: ; 0x1973f
     db $08 ; asm
     ldh a, [$d3]
@@ -6410,6 +6418,7 @@ VermilionCityText2: ; 0x1988e
     jp $24d7
 
 INCBIN "baserom.gbc",$198a7,$198b1 - $198a7
+
 VermilionCityText3: ; 0x198b1
     db $08 ; asm
     ld a, [$d803]
@@ -6650,6 +6659,7 @@ FuchsiaCityText19: ; 0x19a90
     jp $24d7
 
 INCBIN "baserom.gbc",$19a9f,$19aa4 - $19a9f
+
 FuchsiaCityText20: ; 0x19aa4
     db $08 ; asm
     ld hl, $5ab3
@@ -6659,6 +6669,7 @@ FuchsiaCityText20: ; 0x19aa4
     jp $24d7
 
 INCBIN "baserom.gbc",$19ab3,$19ab8 - $19ab3
+
 FuchsiaCityText21: ; 0x19ab8
     db $08 ; asm
     ld hl, $5ac7
@@ -6668,6 +6679,7 @@ FuchsiaCityText21: ; 0x19ab8
     jp $24d7
 
 INCBIN "baserom.gbc",$19ac7,$19acc - $19ac7
+
 FuchsiaCityText22: ; 0x19acc
     db $08 ; asm
     ld hl, $5adb
@@ -6677,6 +6689,7 @@ FuchsiaCityText22: ; 0x19acc
     jp $24d7
 
 INCBIN "baserom.gbc",$19adb,$19ae0 - $19adb
+
 FuchsiaCityText23: ; 0x19ae0
     db $08 ; asm
     ld hl, $5aef
@@ -6686,6 +6699,7 @@ FuchsiaCityText23: ; 0x19ae0
     jp $24d7
 
 INCBIN "baserom.gbc",$19aef,$19af4 - $19aef
+
 FuchsiaCityText24: ; 0x19af4
     db $08 ; asm
     ld a, [$d7f6]
@@ -6937,6 +6951,7 @@ SilphCo4Text1: ; 0x19dd3
     jp $24d7
 
 INCBIN "baserom.gbc",$19de0,$19dea - $19de0
+
 SilphCo4Text2: ; 0x19dea
     db $08 ; asm
     ld hl, $5dae
@@ -6944,6 +6959,7 @@ SilphCo4Text2: ; 0x19dea
     jp $24d7
 
 INCBIN "baserom.gbc",$19df4,$19e03 - $19df4
+
 SilphCo4Text3: ; 0x19e03
     db $08 ; asm
     ld hl, $5dba
@@ -6951,6 +6967,7 @@ SilphCo4Text3: ; 0x19e03
     jp $24d7
 
 INCBIN "baserom.gbc",$19e0d,$19e1c - $19e0d
+
 SilphCo4Text4: ; 0x19e1c
     db $08 ; asm
     ld hl, $5dc6
@@ -6958,6 +6975,7 @@ SilphCo4Text4: ; 0x19e1c
     jp $24d7
 
 INCBIN "baserom.gbc",$19e26,$f
+
 SilphCo4Object: ; 0x19e35 (size=111)
     db $2e ; border tile
 
@@ -7016,6 +7034,7 @@ SilphCo5Text1: ; 0x1a003
     jp $24d7
 
 INCBIN "baserom.gbc",$1a010,$1a01a - $1a010
+
 SilphCo5Text2: ; 0x1a01a
     db $08 ; asm
     ld hl, $5fd2
@@ -7023,6 +7042,7 @@ SilphCo5Text2: ; 0x1a01a
     jp $24d7
 
 INCBIN "baserom.gbc",$1a024,$1a033 - $1a024
+
 SilphCo5Text3: ; 0x1a033
     db $08 ; asm
     ld hl, $5fde
@@ -7030,6 +7050,7 @@ SilphCo5Text3: ; 0x1a033
     jp $24d7
 
 INCBIN "baserom.gbc",$1a03d,$1a04c - $1a03d
+
 SilphCo5Text4: ; 0x1a04c
     db $08 ; asm
     ld hl, $5fea
@@ -7037,6 +7058,7 @@ SilphCo5Text4: ; 0x1a04c
     jp $24d7
 
 INCBIN "baserom.gbc",$1a056,$1a065 - $1a056
+
 SilphCo5Text5: ; 0x1a065
     db $08 ; asm
     ld hl, $5ff6
-- 
cgit v1.2.3


From ccd18da9012a99f1ddc9fdf6da687232db834986 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 10:16:20 -0600
Subject: minor formatting and some hidden $17s

hg-commit-id: fc40b8c56a2f
---
 pokered.asm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index 6ef48a40..809e63b1 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -7726,14 +7726,14 @@ asm_9eaa4: ; 0x1d157
 asm_f6e3a: ; 0x1d195
     ld hl, $519a
     jr asm_b5ddf ; 0x1d198 $19
-    rla
+    rla ; probably a TX_FAR
     ld b, $4e
     dec h
     ld d, b
 asm_2391d: ; 0x1d19f
     ld hl, $51a4
     jr asm_b5ddf ; 0x1d1a2 $f
-    rla
+    rla ; probably a TX_FAR
     cpl
     ld c, [hl]
     dec h
@@ -7741,7 +7741,7 @@ asm_2391d: ; 0x1d19f
 asm_ddec1: ; 0x1d1a9
     ld hl, $51ae
     jr asm_b5ddf ; 0x1d1ac $5
-    rla
+    rla ; probably a TX_FAR
     ld d, a
     ld c, [hl]
     dec h
@@ -8839,6 +8839,7 @@ SaffronHouse2Text1: ; 0x1de41
     jp $24d7
 
 INCBIN "baserom.gbc",$1de75,$15
+
 SaffronHouse2Object: ; 0x1de8a (size=26)
     db $a ; border tile
 
@@ -9221,7 +9222,7 @@ PowerPlantText9:
     db $8 ; asm
     ld hl, $635b
     jr asm_234cc ; 0x1e3a8 $be
-    rla
+    rla ; probably a TX_FAR
     ld [$ff00+c], a
     ld b, l
     inc hl
@@ -9460,7 +9461,7 @@ asm_6b196: ; 0x1e85a
 asm_fd4e2 ; 0x1e862
     jp $24d7
 
-; dunno what this is
+; dunno what this is (rla indicates $17 or TX_FAR)
     rla
     ld h, a
     ld d, d
-- 
cgit v1.2.3


From 41085fdac1695f0e4931d80b9123875052970db0 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 11:43:39 -0600
Subject: improve newlines around INCBINs

hg-commit-id: 0fc00a2e33a5
---
 pokered.asm | 256 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 255 insertions(+), 1 deletion(-)

diff --git a/pokered.asm b/pokered.asm
index 809e63b1..b8d2844e 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -1800,6 +1800,7 @@ Delay3: ; 3DD7
 	jp DelayFrames
 
 INCBIN "baserom.gbc",$3DDC,$3DED - $3DDC
+
 GoPAL_SET_CF1C:	; 3ded
 	ld b,$ff
 GoPAL_SET: 	; 3def
@@ -2451,6 +2452,7 @@ FirstMapSpec:
 	db $04		;Tileset_id
 
 INCBIN "baserom.gbc",$6428,$6448-$6428
+
 FlyWarpDataPtr:
 	db $00,0
         dw Map00FlyWarp
@@ -2539,9 +2541,11 @@ PlayersPCMenuEntries: ; 7AF5
 INCBIN "baserom.gbc",$7B22,$7C49 - $7B22
 
 SECTION "bank2",DATA,BANK[$2]
+
 INCBIN "baserom.gbc",$8000,$4000
 
 SECTION "bank3",DATA,BANK[$3]
+
 INCBIN "baserom.gbc",$C000,$C23D - $C000
 
 ; see also MapHeaderPointers
@@ -2798,6 +2802,7 @@ MapHeaderBanks: ; 423D
 INCBIN "baserom.gbc",$C335,$C766-$C335
 	ld hl,TilesetsHeadPtr
 INCBIN "baserom.gbc",$C769,$C7BE-$C769
+
 TilesetsHeadPtr:
 	TSETHEAD Tset00_Block,Tset00_GFX,Tset00_Coll,$FF,$FF,$FF,$52,2
 	TSETHEAD Tset01_Block,Tset01_GFX,Tset01_Coll,$FF,$FF,$FF,$FF,0
@@ -5242,6 +5247,7 @@ FishingGroup10:
 INCBIN "baserom.gbc",$E9C5,$10000 - $E9C5
 
 SECTION "bank4",DATA,BANK[$4]
+
 INCBIN "baserom.gbc",$10000,$2EDE
 
 RedPicFront:
@@ -5268,6 +5274,7 @@ GenRandom_: ; 7A8F
 	ret
 
 SECTION "bank5",DATA,BANK[$5]
+
 INCBIN "baserom.gbc",$14000,$4000
 
 SECTION "bank6",DATA,BANK[$6]
@@ -5493,6 +5500,7 @@ PewterCity_h: ; 0x18554 to 0x18576 (34 bytes) (bank=6) (id=2)
     dw $4577 ; objects
 
 INCBIN "baserom.gbc",$18576,$18577 - $18576
+
 PewterCityObject: ; 0x18577 (size=111)
     db $a ; border tile
 
@@ -6199,6 +6207,7 @@ PewterCityText4: ; 0x19405
 ; 0x19427
 
 INCBIN "baserom.gbc",$19427,$f
+
 PewterCityText5: ; 0x19436
     db $08 ; asm
     ld hl, $545d
@@ -8355,6 +8364,7 @@ BikeShopText1: ; 0x1d745
     jp $24d7
 
 INCBIN "baserom.gbc",$1d7f8,$1d839 - $1d7f8
+
 BikeShopText2: ; 0x1d839
     db $08 ; asm
     ld hl, $5843
@@ -8362,6 +8372,7 @@ BikeShopText2: ; 0x1d839
     jp $24d7
 
 INCBIN "baserom.gbc",$1d843,$1d848 - $1d843
+
 BikeShopText3: ; 0x1d848
     db $08 ; asm
     ld a, [$d75f]
@@ -8374,6 +8385,7 @@ BikeShopText3: ; 0x1d848
     jp $24d7
 
 INCBIN "baserom.gbc",$1d85c,$a
+
 BikeShopObject: ; 0x1d866 (size=38)
     db $e ; border tile
 
@@ -8423,6 +8435,7 @@ LavenderHouse1Text1: ; 0x1d8b8
     jp $24d7
 
 INCBIN "baserom.gbc",$1d8d1,$1d8db - $1d8d1
+
 LavenderHouse1Text2: ; 0x1d8db
     db $08 ; asm
     ld a, [$d7e0]
@@ -8542,6 +8555,7 @@ LavenderHouse2Text2: ; 0x1d9c3
     jp $24d7
 
 INCBIN "baserom.gbc",$1d9dc,$a
+
 LavenderHouse2Object: ; 0x1d9e6 (size=32)
     db $a ; border tile
 
@@ -8568,6 +8582,7 @@ NameRater_h: ; 0x1da06 to 0x1da12 (12 bytes) (bank=7) (id=229)
     dw $5ad6 ; objects
 
 INCBIN "baserom.gbc",$1da12,$1dad6 - $1da12
+
 NameRaterObject: ; 0x1dad6 (size=26)
     db $a ; border tile
 
@@ -8642,6 +8657,7 @@ VermilionDock_h: ; 0x1db46 to 0x1db52 (12 bytes) (bank=7) (id=94)
     dw $5cc6 ; objects
 
 INCBIN "baserom.gbc",$1db52,$1dcc6 - $1db52
+
 VermilionDockObject: ; 0x1dcc6 (size=20)
     db $f ; border tile
 
@@ -9342,6 +9358,7 @@ Route16HouseText1: ; 0x1e5ff
     jp $24d7
 
 INCBIN "baserom.gbc",$1e62b,$1e640 - $1e62b
+
 Route16HouseText2: ; 0x1e640
     db $08 ; asm
     ld hl, $6652
@@ -9352,6 +9369,7 @@ Route16HouseText2: ; 0x1e640
     jp $24d7
 
 INCBIN "baserom.gbc",$1e652,$5
+
 Route16HouseObject: ; 0x1e657 (size=32)
     db $a ; border tile
 
@@ -9400,7 +9418,9 @@ Route22GateText1: ; 0x1e6e1
     ld [$d60e], a
     jp $24d7
 ; 0x1e704
+
 INCBIN "baserom.gbc",$1e704,$1c
+
 Route22GateObject: ; 0x1e720 (size=42)
     db $a ; border tile
 
@@ -9545,6 +9565,7 @@ SECTION "bank8",DATA,BANK[$8]
 INCBIN "baserom.gbc",$20000,$4000
 
 SECTION "bank9",DATA,BANK[$9]
+
 RhydonPicFront:
 	INCBIN "pic/bmon/rhydon.pic"
 RhydonPicBack:
@@ -10734,6 +10755,7 @@ TrainerNames: ; 59FF
 	db "LANCE@"
 
 INCBIN "baserom.gbc",$39B87,$39C53 - $39B87
+
 ReadTrainer: ; 5C53
 
 ; don't change any moves in a link battle
@@ -14284,6 +14306,7 @@ TrainerSentOutText:
 	db "@"
 
 INCBIN "baserom.gbc",$3CA83,$3D6A9 - $3CA83
+
 ; in-battle stuff
 	ld hl,$D062
 	res 4,[hl]
@@ -14883,6 +14906,7 @@ PlayAttackAnimation: ; 6F07
 INCBIN "baserom.gbc",$3EF12,$40000 - $3EF12
 
 SECTION "bank10",DATA,BANK[$10]
+
 INCBIN "baserom.gbc",$40000,$47E
 
 PokedexEntryPointers: ; 447E
@@ -16604,6 +16628,7 @@ Mansion1_h: ; 0x442a3 to 0x442af (12 bytes) (bank=11) (id=165)
     dw $43a4 ; objects
 
 INCBIN "baserom.gbc",$442af,$44341 - $442af
+
 Mansion1Text1: ; 0x44341
     db $08 ; asm
     ld hl, $4334
@@ -16611,6 +16636,7 @@ Mansion1Text1: ; 0x44341
     jp $24d7
 
 INCBIN "baserom.gbc",$4434b,$59
+
 Mansion1Object: ; 0x443a4 (size=90)
     db $2e ; border tile
 
@@ -16860,6 +16886,7 @@ VictoryRoad3Text4: ; 0x44a87
     jp $24d7
 
 INCBIN "baserom.gbc",$44a91,$3c
+
 VictoryRoad3Object: ; 0x44acd (size=106)
     db $7d ; border tile
 
@@ -16938,6 +16965,7 @@ RocketHideout1Text5: ; 0x44c87
     jp $24d7
 
 INCBIN "baserom.gbc",$44c91,$56
+
 RocketHideout1Object: ; 0x44ce7 (size=98)
     db $2e ; border tile
 
@@ -16991,6 +17019,7 @@ RocketHideout2Text1: ; 0x450de
     jp $24d7
 
 INCBIN "baserom.gbc",$450e8,$f
+
 RocketHideout2Object: ; 0x450f7 (size=80)
     db $2e ; border tile
 
@@ -17042,6 +17071,7 @@ RocketHideout3Text1: ; 0x4531b
     jp $24d7
 
 INCBIN "baserom.gbc",$45325,$45334 - $45325
+
 RocketHideout3Text2: ; 0x45334
     db $08 ; asm
     ld hl, $530e
@@ -17049,6 +17079,7 @@ RocketHideout3Text2: ; 0x45334
     jp $24d7
 
 INCBIN "baserom.gbc",$4533e,$f
+
 RocketHideout3Object: ; 0x4534d (size=50)
     db $2e ; border tile
 
@@ -17115,6 +17146,7 @@ RocketHideout4Text1: ; 0x4553a
     jp $24d7
 
 INCBIN "baserom.gbc",$4557a,$45589 - $4557a
+
 RocketHideout4Text2: ; 0x45589
     db $08 ; asm
     ld hl, $5515
@@ -17122,6 +17154,7 @@ RocketHideout4Text2: ; 0x45589
     jp $24d7
 
 INCBIN "baserom.gbc",$45593,$455a2 - $45593
+
 RocketHideout4Text3: ; 0x455a2
     db $08 ; asm
     ld hl, $5521
@@ -17129,6 +17162,7 @@ RocketHideout4Text3: ; 0x455a2
     jp $24d7
 
 INCBIN "baserom.gbc",$455ac,$455bb - $455ac
+
 RocketHideout4Text4: ; 0x455bb
     db $08 ; asm
     ld hl, $552d
@@ -17136,6 +17170,7 @@ RocketHideout4Text4: ; 0x455bb
     jp $24d7
 
 INCBIN "baserom.gbc",$455c5,$2c
+
 RocketHideout4Object: ; 0x455f1 (size=95)
     db $2e ; border tile
 
@@ -17195,6 +17230,7 @@ RocketHideoutElevatorText1: ; 0x4576d
     jp $24d7
 
 INCBIN "baserom.gbc",$4578b,$6
+
 RocketHideoutElevatorObject: ; 0x45791 (size=23)
     db $f ; border tile
 
@@ -17669,6 +17705,7 @@ UnknownDungeon3Text1: ; 0x45f1c
     jp $24d7
 
 INCBIN "baserom.gbc",$45f26,$10
+
 UnknownDungeon3Object: ; 0x45f36 (size=34)
     db $7d ; border tile
 
@@ -17752,6 +17789,7 @@ RockTunnel2Text8: ; 0x460bb
     jp $24d7
 
 INCBIN "baserom.gbc",$460c5,$78
+
 RockTunnel2Object: ; 0x4613d (size=100)
     db $3 ; border tile
 
@@ -17974,6 +18012,7 @@ SeafoamIslands5Object: ; 0x468bc (size=62)
 
 SeafoamIslands5Blocks: ; 135
     INCBIN "maps/seafoamislands5.blk"
+
 INCBIN "baserom.gbc",$46981,$167f
 
 SECTION "bank12",DATA,BANK[$12]
@@ -19030,6 +19069,7 @@ CeladonGameCornerText9: ; 0x48dd9
     jp $24d7
 
 INCBIN "baserom.gbc",$48e26,$48e3b - $48e26
+
 CeladonGameCornerText10: ; 0x48e3b
     db $08 ; asm
     ld a, [$d77e]
@@ -19887,6 +19927,7 @@ Route16GateUpstairsText1: ; 0x49816
     jp $24d7
 
 INCBIN "baserom.gbc",$49820,$49825 - $49820
+
 Route16GateUpstairsText2: ; 0x49825
     db $08 ; asm
     ld hl, $582f
@@ -19894,17 +19935,21 @@ Route16GateUpstairsText2: ; 0x49825
     jp $24d7
 
 INCBIN "baserom.gbc",$4982f,$49834 - $4982f
+
 Route16GateUpstairsText3: ; 0x49834
     db $8
     ld hl, $583b
     jp $55c9
 ; 0x4983b
+
 INCBIN "baserom.gbc",$4983b,$5
+
 Route16GateUpstairsText4: ; 0x49840
     db $8
     ld hl, $5847
     jp $55c9
 ; 0x49847
+
 INCBIN "baserom.gbc",$49847,$5
 
 Route16GateUpstairsObject: ; 0x4984c (size=30)
@@ -20003,11 +20048,13 @@ Route18GateHeaderText2: ; 0x4998c
     jp $55c9
 ; 0x49993
 INCBIN "baserom.gbc",$49993,$5
+
 Route18GateHeaderText3: ; 0x49998
     db $8
     ld hl, $599f
     jp $55c9
 ; 0x4999f
+
 INCBIN "baserom.gbc",$4999f,$5
 
 Route18GateHeaderObject: ; 0x499a4 (size=24)
@@ -20226,6 +20273,7 @@ MtMoon3Text6: ; 0x49ee9
     jp $24d7
 
 INCBIN "baserom.gbc",$49f24,$49f29 - $49f24
+
 MtMoon3Text7: ; 0x49f29
     db $08 ; asm
     ld a, $1
@@ -20391,6 +20439,7 @@ SafariZoneSecretHouseText1: ; 0x4a31c
     jp $24d7
 
 INCBIN "baserom.gbc",$4a350,$15
+
 SafariZoneSecretHouseObject: ; 0x4a365 (size=26)
     db $17 ; border tile
 
@@ -20988,6 +21037,7 @@ IndigoPlateau_h: ; 0x5091e to 0x50935 (23 bytes) (id=9)
     dw $4936 ; objects
 
 INCBIN "baserom.gbc",$50935,$50936 - $50935
+
 IndigoPlateauObject: ; 0x50936 (size=20)
     db $e ; border tile
 
@@ -21572,6 +21622,7 @@ VictoryRoad2Text6: ; 0x518b0
     jp $24d7
 
 INCBIN "baserom.gbc",$518ba,$5b
+
 VictoryRoad2Object: ; 0x51915 (size=154)
     db $7d ; border tile
 
@@ -21622,6 +21673,7 @@ MtMoon2_h: ; 0x51a36 to 0x51a42 (12 bytes) (id=60)
     dw $5a4d ; objects
 
 INCBIN "baserom.gbc",$51a42,$51a4d - $51a42
+
 MtMoon2Object: ; 0x51a4d (size=68)
     db $3 ; border tile
 
@@ -21700,6 +21752,7 @@ SilphCo7Text1: ; 0x51d8e
     jp $24d7
 
 INCBIN "baserom.gbc",$51dd3,$51de7 - $51dd3
+
 SilphCo7Text2: ; 0x51de7
     db $8
     ld a, [$d838]
@@ -21715,6 +21768,7 @@ SilphCo7Text2: ; 0x51de7
     jp $24d7
 ; 0x51e00
 INCBIN "baserom.gbc",$51e00,$a
+
 SilphCo7Text3: ; 0x51e0a
     db $08 ; asm
     ld a, [$d838]
@@ -21730,6 +21784,7 @@ SilphCo7Text3: ; 0x51e0a
     jp $24d7
 
 INCBIN "baserom.gbc",$51e23,$51e2d - $51e23
+
 SilphCo7Text4: ; 0x51e2d
     db $08 ; asm
     ld a, [$d838]
@@ -21745,6 +21800,7 @@ SilphCo7Text4: ; 0x51e2d
     jp $24d7
 
 INCBIN "baserom.gbc",$51e46,$51e50 - $51e46
+
 SilphCo7Text5: ; 0x51e50
     db $08 ; asm
     ld hl, $5d5d
@@ -21752,6 +21808,7 @@ SilphCo7Text5: ; 0x51e50
     jp $24d7
 
 INCBIN "baserom.gbc",$51e5a,$51e69 - $51e5a
+
 SilphCo7Text6: ; 0x51e69
     db $08 ; asm
     ld hl, $5d69
@@ -21759,6 +21816,7 @@ SilphCo7Text6: ; 0x51e69
     jp $24d7
 
 INCBIN "baserom.gbc",$51e73,$51e82 - $51e73
+
 SilphCo7Text7: ; 0x51e82
     db $08 ; asm
     ld hl, $5d75
@@ -21766,6 +21824,7 @@ SilphCo7Text7: ; 0x51e82
     jp $24d7
 
 INCBIN "baserom.gbc",$51e8c,$51e9b - $51e8c
+
 SilphCo7Text8: ; 0x51e9b
     db $08 ; asm
     ld hl, $5d81
@@ -21773,6 +21832,7 @@ SilphCo7Text8: ; 0x51e9b
     jp $24d7
 
 INCBIN "baserom.gbc",$51ea5,$51eb4 - $51ea5
+
 SilphCo7Text9: ; 0x51eb4
     db $08 ; asm
     ld hl, $5ebe
@@ -21780,6 +21840,7 @@ SilphCo7Text9: ; 0x51eb4
     jp $24d7
 
 INCBIN "baserom.gbc",$51ebe,$19
+
 SilphCo7Object: ; 0x51ed7 (size=128)
     db $2e ; border tile
 
@@ -21826,6 +21887,7 @@ Mansion2_h: ; 0x51fcc to 0x51fd8 (12 bytes) (id=214)
     dw $60d1 ; objects
 
 INCBIN "baserom.gbc",$51fd8,$52064 - $51fd8
+
 Mansion2Text1: ; 0x52064
     db $08 ; asm
     ld hl, $6057
@@ -21843,6 +21905,7 @@ Mansion2Text4: ; 0x52082
     db $50
 
 INCBIN "baserom.gbc",$52087,$4a
+
 Mansion2Object: ; 0x520d1 (size=63)
     db $1 ; border tile
 
@@ -21877,6 +21940,7 @@ Mansion3_h: ; 0x521e2 to 0x521ee (12 bytes) (id=215)
     dw $62e6 ; objects
 
 INCBIN "baserom.gbc",$521ee,$522af - $521ee
+
 Mansion3Text1: ; 0x522af
     db $08 ; asm
     ld hl, $6296
@@ -21928,6 +21992,7 @@ Mansion4_h: ; 0x523ad to 0x523b9 (12 bytes) (id=216)
     dw $6498 ; objects
 
 INCBIN "baserom.gbc",$523b9,$52461 - $523b9
+
 Mansion4Text1: ; 0x52461
     db $08 ; asm
     ld hl, $6448
@@ -22342,6 +22407,7 @@ INCBIN "baserom.gbc",$52996,$54000 - $52996
 SECTION "bank15",DATA,BANK[$15]
 
 INCBIN "baserom.gbc",$54000,$54022 - $54000
+
 Route2Object: ; 0x54022 (size=72)
     db $f ; border tile
 
@@ -22840,6 +22906,7 @@ Route3Text2: ; 0x5558b
     jp $24d7
 
 INCBIN "baserom.gbc",$55595,$555a4 - $55595
+
 Route3Text3: ; 0x555a4
     db $08 ; asm
     ld hl, $5531
@@ -22847,6 +22914,7 @@ Route3Text3: ; 0x555a4
     jp $24d7
 
 INCBIN "baserom.gbc",$555ae,$555bd - $555ae
+
 Route3Text4: ; 0x555bd
     db $08 ; asm
     ld hl, $553d
@@ -22854,6 +22922,7 @@ Route3Text4: ; 0x555bd
     jp $24d7
 
 INCBIN "baserom.gbc",$555c7,$555d6 - $555c7
+
 Route3Text5: ; 0x555d6
     db $08 ; asm
     ld hl, $5549
@@ -22861,6 +22930,7 @@ Route3Text5: ; 0x555d6
     jp $24d7
 
 INCBIN "baserom.gbc",$555e0,$555ef - $555e0
+
 Route3Text6: ; 0x555ef
     db $08 ; asm
     ld hl, $5555
@@ -22868,6 +22938,7 @@ Route3Text6: ; 0x555ef
     jp $24d7
 
 INCBIN "baserom.gbc",$555f9,$55608 - $555f9
+
 Route3Text7: ; 0x55608
     db $08 ; asm
     ld hl, $5561
@@ -22875,6 +22946,7 @@ Route3Text7: ; 0x55608
     jp $24d7
 
 INCBIN "baserom.gbc",$55612,$55621 - $55612
+
 Route3Text8: ; 0x55621
     db $08 ; asm
     ld hl, $556d
@@ -22882,6 +22954,7 @@ Route3Text8: ; 0x55621
     jp $24d7
 
 INCBIN "baserom.gbc",$5562b,$5563a - $5562b
+
 Route3Text9: ; 0x5563a
     db $08 ; asm
     ld hl, $5579
@@ -23013,6 +23086,7 @@ Route13Text2: ; 0x558e3
     jp $24d7
 
 INCBIN "baserom.gbc",$558ed,$558fc - $558ed
+
 Route13Text3: ; 0x558fc
     db $08 ; asm
     ld hl, $5869
@@ -23020,6 +23094,7 @@ Route13Text3: ; 0x558fc
     jp $24d7
 
 INCBIN "baserom.gbc",$55906,$55915 - $55906
+
 Route13Text4: ; 0x55915
     db $08 ; asm
     ld hl, $5875
@@ -23027,6 +23102,7 @@ Route13Text4: ; 0x55915
     jp $24d7
 
 INCBIN "baserom.gbc",$5591f,$5592e - $5591f
+
 Route13Text5: ; 0x5592e
     db $08 ; asm
     ld hl, $5881
@@ -23034,6 +23110,7 @@ Route13Text5: ; 0x5592e
     jp $24d7
 
 INCBIN "baserom.gbc",$55938,$55947 - $55938
+
 Route13Text6: ; 0x55947
     db $08 ; asm
     ld hl, $588d
@@ -23041,6 +23118,7 @@ Route13Text6: ; 0x55947
     jp $24d7
 
 INCBIN "baserom.gbc",$55951,$55960 - $55951
+
 Route13Text7: ; 0x55960
     db $08 ; asm
     ld hl, $5899
@@ -23048,6 +23126,7 @@ Route13Text7: ; 0x55960
     jp $24d7
 
 INCBIN "baserom.gbc",$5596a,$55979 - $5596a
+
 Route13Text8: ; 0x55979
     db $08 ; asm
     ld hl, $58a5
@@ -23055,6 +23134,7 @@ Route13Text8: ; 0x55979
     jp $24d7
 
 INCBIN "baserom.gbc",$55983,$55992 - $55983
+
 Route13Text9: ; 0x55992
     db $08 ; asm
     ld hl, $58b1
@@ -23062,6 +23142,7 @@ Route13Text9: ; 0x55992
     jp $24d7
 
 INCBIN "baserom.gbc",$5599c,$559ab - $5599c
+
 Route13Text10: ; 0x559ab
     db $08 ; asm
     ld hl, $58bd
@@ -23104,6 +23185,7 @@ Route14Text2: ; 0x55a94
     jp $24d7
 
 INCBIN "baserom.gbc",$55a9e,$55aad - $55a9e
+
 Route14Text3: ; 0x55aad
     db $08 ; asm
     ld hl, $5a1a
@@ -23111,6 +23193,7 @@ Route14Text3: ; 0x55aad
     jp $24d7
 
 INCBIN "baserom.gbc",$55ab7,$55ac6 - $55ab7
+
 Route14Text4: ; 0x55ac6
     db $08 ; asm
     ld hl, $5a26
@@ -23118,6 +23201,7 @@ Route14Text4: ; 0x55ac6
     jp $24d7
 
 INCBIN "baserom.gbc",$55ad0,$55adf - $55ad0
+
 Route14Text5: ; 0x55adf
     db $08 ; asm
     ld hl, $5a32
@@ -23125,6 +23209,7 @@ Route14Text5: ; 0x55adf
     jp $24d7
 
 INCBIN "baserom.gbc",$55ae9,$55af8 - $55ae9
+
 Route14Text6: ; 0x55af8
     db $08 ; asm
     ld hl, $5a3e
@@ -23132,6 +23217,7 @@ Route14Text6: ; 0x55af8
     jp $24d7
 
 INCBIN "baserom.gbc",$55b02,$55b11 - $55b02
+
 Route14Text7: ; 0x55b11
     db $08 ; asm
     ld hl, $5a4a
@@ -23139,6 +23225,7 @@ Route14Text7: ; 0x55b11
     jp $24d7
 
 INCBIN "baserom.gbc",$55b1b,$55b2a - $55b1b
+
 Route14Text8: ; 0x55b2a
     db $08 ; asm
     ld hl, $5a56
@@ -23146,6 +23233,7 @@ Route14Text8: ; 0x55b2a
     jp $24d7
 
 INCBIN "baserom.gbc",$55b34,$55b43 - $55b34
+
 Route14Text9: ; 0x55b43
     db $08 ; asm
     ld hl, $5a62
@@ -23153,6 +23241,7 @@ Route14Text9: ; 0x55b43
     jp $24d7
 
 INCBIN "baserom.gbc",$55b4d,$55b5c - $55b4d
+
 Route14Text10: ; 0x55b5c
     db $08 ; asm
     ld hl, $5a6e
@@ -23187,6 +23276,7 @@ Route17Text2: ; 0x55c45
     jp $24d7
 
 INCBIN "baserom.gbc",$55c4f,$55c5e - $55c4f
+
 Route17Text3: ; 0x55c5e
     db $08 ; asm
     ld hl, $5bcb
@@ -23194,6 +23284,7 @@ Route17Text3: ; 0x55c5e
     jp $24d7
 
 INCBIN "baserom.gbc",$55c68,$55c77 - $55c68
+
 Route17Text4: ; 0x55c77
     db $08 ; asm
     ld hl, $5bd7
@@ -23201,6 +23292,7 @@ Route17Text4: ; 0x55c77
     jp $24d7
 
 INCBIN "baserom.gbc",$55c81,$55c90 - $55c81
+
 Route17Text5: ; 0x55c90
     db $08 ; asm
     ld hl, $5be3
@@ -23208,6 +23300,7 @@ Route17Text5: ; 0x55c90
     jp $24d7
 
 INCBIN "baserom.gbc",$55c9a,$55ca9 - $55c9a
+
 Route17Text6: ; 0x55ca9
     db $08 ; asm
     ld hl, $5bef
@@ -23215,6 +23308,7 @@ Route17Text6: ; 0x55ca9
     jp $24d7
 
 INCBIN "baserom.gbc",$55cb3,$55cc2 - $55cb3
+
 Route17Text7: ; 0x55cc2
     db $08 ; asm
     ld hl, $5bfb
@@ -23222,6 +23316,7 @@ Route17Text7: ; 0x55cc2
     jp $24d7
 
 INCBIN "baserom.gbc",$55ccc,$55cdb - $55ccc
+
 Route17Text8: ; 0x55cdb
     db $08 ; asm
     ld hl, $5c07
@@ -23229,6 +23324,7 @@ Route17Text8: ; 0x55cdb
     jp $24d7
 
 INCBIN "baserom.gbc",$55ce5,$55cf4 - $55ce5
+
 Route17Text9: ; 0x55cf4
     db $08 ; asm
     ld hl, $5c13
@@ -23236,6 +23332,7 @@ Route17Text9: ; 0x55cf4
     jp $24d7
 
 INCBIN "baserom.gbc",$55cfe,$55d0d - $55cfe
+
 Route17Text10: ; 0x55d0d
     db $08 ; asm
     ld hl, $5c1f
@@ -23448,6 +23545,7 @@ asm_5dd95 ; 0x560ab
     jp $24d7
 
 INCBIN "baserom.gbc",$560b1,$1e
+
 VermilionHouse2Object: ; 0x560cf (size=26)
     db $a ; border tile
 
@@ -23558,6 +23656,7 @@ asm_1b09c ; 0x561b7
     jp $24d7
 
 INCBIN "baserom.gbc",$561bd,$64
+
 FuchsiaHouse3Object: ; 0x56221 (size=34)
     db $c ; border tile
 
@@ -23646,6 +23745,7 @@ DayCareMText1: ; 0x56254
     jp $6409
 ; 0x562e1
 INCBIN "baserom.gbc",$562e1,$178
+
 DayCareMObject: ; 0x56459 (size=26)
     db $a ; border tile
 
@@ -23706,6 +23806,7 @@ asm_df984 ; 0x564ba
     jp $24d7
 
 INCBIN "baserom.gbc",$564c0,$1e
+
 Route12HouseObject: ; 0x564de (size=26)
     db $a ; border tile
 
@@ -23749,6 +23850,7 @@ asm_a468f ; 0x565b8
     jp $24d7
 
 INCBIN "baserom.gbc",$565be,$565c8 - $565be
+
 SilphCo8Text2: ; 0x565c8
     db $08 ; asm
     ld hl, $6585
@@ -23768,6 +23870,7 @@ SilphCo8Text4: ; 0x565dc
     jp $24d7
 
 INCBIN "baserom.gbc",$565e6,$2d
+
 SilphCo8Object: ; 0x56613 (size=90)
     db $2e ; border tile
 
@@ -23803,6 +23906,7 @@ SilphCo8Blocks: ; 117
 INCBIN "baserom.gbc",$566e2,$191e
 
 SECTION "bank16",DATA,BANK[$16]
+
 Route6_h: ; 0x58000 to 0x58022 (34 bytes) (id=17)
     db $00 ; tileset
     db $12, $0a ; dimensions (y, x)
@@ -24268,13 +24372,16 @@ Route18Blocks: ; 225
     INCBIN "maps/route18.blk"
 
 INCBIN "baserom.gbc",$58d7d,$59120 - $58d7d
+
 Route6Text1: ; 0x59120
     db $8
     ld hl, $50d7
     call $31cc
     jp $24d7
 ; 0x5912a
+
 INCBIN "baserom.gbc",$5912a,$f
+
 Route6Text2: ; 0x59139
     db $08 ; asm
     ld hl, $50e3
@@ -24282,6 +24389,7 @@ Route6Text2: ; 0x59139
     jp $24d7
 
 INCBIN "baserom.gbc",$59143,$5914d - $59143
+
 Route6Text3: ; 0x5914d
     db $08 ; asm
     ld hl, $50ef
@@ -24289,6 +24397,7 @@ Route6Text3: ; 0x5914d
     jp $24d7
 
 INCBIN "baserom.gbc",$59157,$59166 - $59157
+
 Route6Text4: ; 0x59166
     db $08 ; asm
     ld hl, $50fb
@@ -24296,6 +24405,7 @@ Route6Text4: ; 0x59166
     jp $24d7
 
 INCBIN "baserom.gbc",$59170,$5917f - $59170
+
 Route6Text5: ; 0x5917f
     db $08 ; asm
     ld hl, $5107
@@ -24303,6 +24413,7 @@ Route6Text5: ; 0x5917f
     jp $24d7
 
 INCBIN "baserom.gbc",$59189,$59198 - $59189
+
 Route6Text6: ; 0x59198
     db $08 ; asm
     ld hl, $5113
@@ -24316,6 +24427,7 @@ Route6Text7: ; 0x591b1
     db $50
 
 INCBIN "baserom.gbc",$591b6,$59269 - $591b6
+
 Route8Text2: ; 0x59269
     db $08 ; asm
     ld hl, $51ef
@@ -24323,6 +24435,7 @@ Route8Text2: ; 0x59269
     jp $24d7
 
 INCBIN "baserom.gbc",$59273,$59282 - $59273
+
 Route8Text3: ; 0x59282
     db $08 ; asm
     ld hl, $51fb
@@ -24330,6 +24443,7 @@ Route8Text3: ; 0x59282
     jp $24d7
 
 INCBIN "baserom.gbc",$5928c,$5929b - $5928c
+
 Route8Text4: ; 0x5929b
     db $08 ; asm
     ld hl, $5207
@@ -24337,6 +24451,7 @@ Route8Text4: ; 0x5929b
     jp $24d7
 
 INCBIN "baserom.gbc",$592a5,$592b4 - $592a5
+
 Route8Text5: ; 0x592b4
     db $08 ; asm
     ld hl, $5213
@@ -24344,6 +24459,7 @@ Route8Text5: ; 0x592b4
     jp $24d7
 
 INCBIN "baserom.gbc",$592be,$592cd - $592be
+
 Route8Text6: ; 0x592cd
     db $08 ; asm
     ld hl, $521f
@@ -24351,6 +24467,7 @@ Route8Text6: ; 0x592cd
     jp $24d7
 
 INCBIN "baserom.gbc",$592d7,$592e6 - $592d7
+
 Route8Text7: ; 0x592e6
     db $08 ; asm
     ld hl, $522b
@@ -24358,6 +24475,7 @@ Route8Text7: ; 0x592e6
     jp $24d7
 
 INCBIN "baserom.gbc",$592f0,$592ff - $592f0
+
 Route8Text8: ; 0x592ff
     db $08 ; asm
     ld hl, $5237
@@ -24365,6 +24483,7 @@ Route8Text8: ; 0x592ff
     jp $24d7
 
 INCBIN "baserom.gbc",$59309,$59318 - $59309
+
 Route8Text9: ; 0x59318
     db $08 ; asm
     ld hl, $5243
@@ -24391,6 +24510,7 @@ Route10Text1: ; 0x593ac
     jp $24d7
 
 INCBIN "baserom.gbc",$593b6,$593c5 - $593b6
+
 Route10Text2: ; 0x593c5
     db $08 ; asm
     ld hl, $536f
@@ -24398,6 +24518,7 @@ Route10Text2: ; 0x593c5
     jp $24d7
 
 INCBIN "baserom.gbc",$593cf,$593de - $593cf
+
 Route10Text3: ; 0x593de
     db $08 ; asm
     ld hl, $537b
@@ -24405,6 +24526,7 @@ Route10Text3: ; 0x593de
     jp $24d7
 
 INCBIN "baserom.gbc",$593e8,$593f7 - $593e8
+
 Route10Text4: ; 0x593f7
     db $08 ; asm
     ld hl, $5387
@@ -24412,6 +24534,7 @@ Route10Text4: ; 0x593f7
     jp $24d7
 
 INCBIN "baserom.gbc",$59401,$59410 - $59401
+
 Route10Text5: ; 0x59410
     db $08 ; asm
     ld hl, $5393
@@ -24419,6 +24542,7 @@ Route10Text5: ; 0x59410
     jp $24d7
 
 INCBIN "baserom.gbc",$5941a,$59429 - $5941a
+
 Route10Text6: ; 0x59429
     db $08 ; asm
     ld hl, $539f
@@ -24437,6 +24561,7 @@ Route10Text10: ; 0x59447
     db $50
 
 INCBIN "baserom.gbc",$5944c,$5950d - $5944c
+
 Route11Text2: ; 0x5950d
     db $08 ; asm
     ld hl, $5487
@@ -24444,6 +24569,7 @@ Route11Text2: ; 0x5950d
     jp $24d7
 
 INCBIN "baserom.gbc",$59517,$59526 - $59517
+
 Route11Text3: ; 0x59526
     db $08 ; asm
     ld hl, $5493
@@ -24451,6 +24577,7 @@ Route11Text3: ; 0x59526
     jp $24d7
 
 INCBIN "baserom.gbc",$59530,$5953f - $59530
+
 Route11Text4: ; 0x5953f
     db $08 ; asm
     ld hl, $549f
@@ -24458,6 +24585,7 @@ Route11Text4: ; 0x5953f
     jp $24d7
 
 INCBIN "baserom.gbc",$59549,$59558 - $59549
+
 Route11Text5: ; 0x59558
     db $08 ; asm
     ld hl, $54ab
@@ -24465,6 +24593,7 @@ Route11Text5: ; 0x59558
     jp $24d7
 
 INCBIN "baserom.gbc",$59562,$59571 - $59562
+
 Route11Text6: ; 0x59571
     db $08 ; asm
     ld hl, $54b7
@@ -24472,6 +24601,7 @@ Route11Text6: ; 0x59571
     jp $24d7
 
 INCBIN "baserom.gbc",$5957b,$5958a - $5957b
+
 Route11Text7: ; 0x5958a
     db $08 ; asm
     ld hl, $54c3
@@ -24479,6 +24609,7 @@ Route11Text7: ; 0x5958a
     jp $24d7
 
 INCBIN "baserom.gbc",$59594,$595a3 - $59594
+
 Route11Text8: ; 0x595a3
     db $08 ; asm
     ld hl, $54cf
@@ -24486,6 +24617,7 @@ Route11Text8: ; 0x595a3
     jp $24d7
 
 INCBIN "baserom.gbc",$595ad,$595bc - $595ad
+
 Route11Text9: ; 0x595bc
     db $08 ; asm
     ld hl, $54db
@@ -24493,6 +24625,7 @@ Route11Text9: ; 0x595bc
     jp $24d7
 
 INCBIN "baserom.gbc",$595c6,$595d5 - $595c6
+
 Route11Text10: ; 0x595d5
     db $08 ; asm
     ld hl, $54e7
@@ -24517,6 +24650,7 @@ Route12Text1: ; 0x596e6
     db $50
 
 INCBIN "baserom.gbc",$596eb,$596f5 - $596eb
+
 Route12Text2: ; 0x596f5
     db $08 ; asm
     ld hl, $5691
@@ -24524,6 +24658,7 @@ Route12Text2: ; 0x596f5
     jp $24d7
 
 INCBIN "baserom.gbc",$596ff,$5970e - $596ff
+
 Route12Text3: ; 0x5970e
     db $08 ; asm
     ld hl, $569d
@@ -24531,6 +24666,7 @@ Route12Text3: ; 0x5970e
     jp $24d7
 
 INCBIN "baserom.gbc",$59718,$59727 - $59718
+
 Route12Text4: ; 0x59727
     db $08 ; asm
     ld hl, $56a9
@@ -24538,6 +24674,7 @@ Route12Text4: ; 0x59727
     jp $24d7
 
 INCBIN "baserom.gbc",$59731,$59740 - $59731
+
 Route12Text5: ; 0x59740
     db $08 ; asm
     ld hl, $56b5
@@ -24545,6 +24682,7 @@ Route12Text5: ; 0x59740
     jp $24d7
 
 INCBIN "baserom.gbc",$5974a,$59759 - $5974a
+
 Route12Text6: ; 0x59759
     db $08 ; asm
     ld hl, $56c1
@@ -24552,6 +24690,7 @@ Route12Text6: ; 0x59759
     jp $24d7
 
 INCBIN "baserom.gbc",$59763,$59772 - $59763
+
 Route12Text7: ; 0x59772
     db $08 ; asm
     ld hl, $56cd
@@ -24559,6 +24698,7 @@ Route12Text7: ; 0x59772
     jp $24d7
 
 INCBIN "baserom.gbc",$5977c,$5978b - $5977c
+
 Route12Text8: ; 0x5978b
     db $08 ; asm
     ld hl, $56d9
@@ -24663,6 +24803,7 @@ Route16Text2: ; 0x59a31
     jp $24d7
 
 INCBIN "baserom.gbc",$59a3b,$59a4a - $59a3b
+
 Route16Text3: ; 0x59a4a
     db $08 ; asm
     ld hl, $59e7
@@ -24670,6 +24811,7 @@ Route16Text3: ; 0x59a4a
     jp $24d7
 
 INCBIN "baserom.gbc",$59a54,$59a63 - $59a54
+
 Route16Text4: ; 0x59a63
     db $08 ; asm
     ld hl, $59f3
@@ -24677,6 +24819,7 @@ Route16Text4: ; 0x59a63
     jp $24d7
 
 INCBIN "baserom.gbc",$59a6d,$59a7c - $59a6d
+
 Route16Text5: ; 0x59a7c
     db $08 ; asm
     ld hl, $59ff
@@ -24684,6 +24827,7 @@ Route16Text5: ; 0x59a7c
     jp $24d7
 
 INCBIN "baserom.gbc",$59a86,$59a95 - $59a86
+
 Route16Text6: ; 0x59a95
     db $08 ; asm
     ld hl, $5a0b
@@ -24728,6 +24872,7 @@ Route18Text2: ; 0x59b28
     jp $24d7
 
 INCBIN "baserom.gbc",$59b32,$59b41 - $59b32
+
 Route18Text3: ; 0x59b41
     db $08 ; asm
     ld hl, $5b02
@@ -24776,6 +24921,7 @@ asm_64f01 ; 0x59bb4
     jp $24d7
 
 INCBIN "baserom.gbc",$59bb7,$59bc1 - $59bb7
+
 FanClubText2: ; 0x59bc1
     db $08 ; asm
     ld a, [$d771]
@@ -24930,6 +25076,7 @@ asm_2c1e0 ; 0x59de7
     jp $24d7
 
 INCBIN "baserom.gbc",$59ded,$59e02 - $59ded
+
 SilphCo2Text2: ; 0x59e02
     db $08 ; asm
     ld hl, $5d90
@@ -24955,6 +25102,7 @@ SilphCo2Text5: ; 0x59e20
     jp $24d7
 
 INCBIN "baserom.gbc",$59e2a,$3c
+
 SilphCo2Object: ; 0x59e66 (size=98)
     db $2e ; border tile
 
@@ -25023,6 +25171,7 @@ SilphCo3Text2: ; 0x5a003
     jp $24d7
 
 INCBIN "baserom.gbc",$5a00d,$5a01c - $5a00d
+
 SilphCo3Text3: ; 0x5a01c
     db $08 ; asm
     ld hl, $5fd8
@@ -25030,6 +25179,7 @@ SilphCo3Text3: ; 0x5a01c
     jp $24d7
 
 INCBIN "baserom.gbc",$5a026,$f
+
 SilphCo3Object: ; 0x5a035 (size=113)
     db $2e ; border tile
 
@@ -25107,6 +25257,7 @@ asm_cf85f ; 0x5a1cd
     jp $24d7
 
 INCBIN "baserom.gbc",$5a1d3,$28
+
 SilphCo10Object: ; 0x5a1fb (size=95)
     db $2e ; border tile
 
@@ -25161,6 +25312,7 @@ LanceText1: ; 0x5a3a4
     jp $24d7
 
 INCBIN "baserom.gbc",$5a3ae,$17
+
 LanceObject: ; 0x5a3c5 (size=36)
     db $3 ; border tile
 
@@ -25445,6 +25597,7 @@ MuseumF1Text3: ; 0x5c256
     jp $24d7
 
 INCBIN "baserom.gbc",$5c28e,$5c2a3 - $5c28e
+
 MuseumF1Text4: ; 0x5c2a3
     db $08 ; asm
     ld hl, $42ad
@@ -25452,6 +25605,7 @@ MuseumF1Text4: ; 0x5c2a3
     jp $24d7
 
 INCBIN "baserom.gbc",$5c2ad,$5c2b2 - $5c2ad
+
 MuseumF1Text5: ; 0x5c2b2
     db $08 ; asm
     ld hl, $42bc
@@ -25459,6 +25613,7 @@ MuseumF1Text5: ; 0x5c2b2
     jp $24d7
 
 INCBIN "baserom.gbc",$5c2bc,$5
+
 MuseumF1Object: ; 0x5c2c1 (size=74)
     db $a ; border tile
 
@@ -25599,6 +25754,7 @@ PewterGymText1: ; 0x5c44e
     jp $24d7
 
 INCBIN "baserom.gbc",$5c49e,$5c4c6 - $5c49e
+
 PewterGymText2: ; 0x5c4c6
     db $08 ; asm
     ld hl, $4441
@@ -25606,6 +25762,7 @@ PewterGymText2: ; 0x5c4c6
     jp $24d7
 
 INCBIN "baserom.gbc",$5c4d0,$5c4df - $5c4d0
+
 PewterGymText3: ; 0x5c4df
     db $08 ; asm
     ld a, [$d72a]
@@ -25634,6 +25791,7 @@ PewterGymText3: ; 0x5c4df
     jp $24d7
 
 INCBIN "baserom.gbc",$5c515,$19
+
 PewterGymObject: ; 0x5c52e (size=42)
     db $3 ; border tile
 
@@ -25794,6 +25952,7 @@ CeruleanGymText1: ; 0x5c771
     jp $24d7
 
 INCBIN "baserom.gbc",$5c7be,$5c7df - $5c7be
+
 CeruleanGymText2: ; 0x5c7df
     db $08 ; asm
     ld hl, $4758
@@ -25801,6 +25960,7 @@ CeruleanGymText2: ; 0x5c7df
     jp $24d7
 
 INCBIN "baserom.gbc",$5c7e9,$5c7f8 - $5c7e9
+
 CeruleanGymText3: ; 0x5c7f8
     db $08 ; asm
     ld hl, $4764
@@ -25808,6 +25968,7 @@ CeruleanGymText3: ; 0x5c7f8
     jp $24d7
 
 INCBIN "baserom.gbc",$5c802,$5c811 - $5c802
+
 CeruleanGymText4: ; 0x5c811
     db $08 ; asm
     ld a, [$d75e]
@@ -25823,6 +25984,7 @@ CeruleanGymText4: ; 0x5c811
     jp $24d7
 
 INCBIN "baserom.gbc",$5c82a,$a
+
 CeruleanGymObject: ; 0x5c834 (size=50)
     db $3 ; border tile
 
@@ -25959,6 +26121,7 @@ LavenderMartText3: ; 0x5c93a
     jp $24d7
 
 INCBIN "baserom.gbc",$5c953,$a
+
 LavenderMartObject: ; 0x5c95d (size=38)
     db $0 ; border tile
 
@@ -26113,6 +26276,7 @@ VermilionGymText1: ; 0x5cb1d
     jp $24d7
 
 INCBIN "baserom.gbc",$5cb6d,$5cb90 - $5cb6d
+
 VermilionGymText2: ; 0x5cb90
     db $08 ; asm
     ld hl, $4af8
@@ -26120,6 +26284,7 @@ VermilionGymText2: ; 0x5cb90
     jp $24d7
 
 INCBIN "baserom.gbc",$5cb9a,$5cba9 - $5cb9a
+
 VermilionGymText3: ; 0x5cba9
     db $08 ; asm
     ld hl, $4b04
@@ -26127,6 +26292,7 @@ VermilionGymText3: ; 0x5cba9
     jp $24d7
 
 INCBIN "baserom.gbc",$5cbb3,$5cbc2 - $5cbb3
+
 VermilionGymText4: ; 0x5cbc2
     db $08 ; asm
     ld hl, $4b10
@@ -26134,6 +26300,7 @@ VermilionGymText4: ; 0x5cbc2
     jp $24d7
 
 INCBIN "baserom.gbc",$5cbcc,$5cbdb - $5cbcc
+
 VermilionGymText5: ; 0x5cbdb
     db $08 ; asm
     ld a, [$d72a]
@@ -26149,6 +26316,7 @@ VermilionGymText5: ; 0x5cbdb
     jp $24d7
 
 INCBIN "baserom.gbc",$5cbf4,$a
+
 VermilionGymObject: ; 0x5cbfe (size=58)
     db $3 ; border tile
 
@@ -26250,6 +26418,7 @@ CopycatsHouseF2Text7: ; 0x5cd03
     jp $24d7
 
 INCBIN "baserom.gbc",$5cd17,$a
+
 CopycatsHouseF2Object: ; 0x5cd21 (size=48)
     db $a ; border tile
 
@@ -26317,6 +26486,7 @@ FightingDojoText1: ; 0x5ce44
     jp $24d7
 
 INCBIN "baserom.gbc",$5ce8e,$5cea2 - $5ce8e
+
 FightingDojoText2: ; 0x5cea2
     db $08 ; asm
     ld hl, $4e13
@@ -26324,6 +26494,7 @@ FightingDojoText2: ; 0x5cea2
     jp $24d7
 
 INCBIN "baserom.gbc",$5ceac,$5cebb - $5ceac
+
 FightingDojoText3: ; 0x5cebb
     db $08 ; asm
     ld hl, $4e1f
@@ -26331,6 +26502,7 @@ FightingDojoText3: ; 0x5cebb
     jp $24d7
 
 INCBIN "baserom.gbc",$5cec5,$5ced4 - $5cec5
+
 FightingDojoText4: ; 0x5ced4
     db $08 ; asm
     ld hl, $4e2b
@@ -26338,6 +26510,7 @@ FightingDojoText4: ; 0x5ced4
     jp $24d7
 
 INCBIN "baserom.gbc",$5cede,$5ceed - $5cede
+
 FightingDojoText5: ; 0x5ceed
     db $08 ; asm
     ld hl, $4e37
@@ -26345,6 +26518,7 @@ FightingDojoText5: ; 0x5ceed
     jp $24d7
 
 INCBIN "baserom.gbc",$5cef7,$5cf06 - $5cef7
+
 FightingDojoText6: ; 0x5cf06
     db $08 ; asm
     ld a, [$d7b1]
@@ -26378,6 +26552,7 @@ FightingDojoText6: ; 0x5cf06
     jp $24d7
 
 INCBIN "baserom.gbc",$5cf49,$5cf4e - $5cf49
+
 FightingDojoText7: ; 0x5cf4e
     db $08 ; asm
     ld a, [$d7b1]
@@ -26411,6 +26586,7 @@ FightingDojoText7: ; 0x5cf4e
     jp $24d7
 
 INCBIN "baserom.gbc",$5cf91,$a
+
 FightingDojoObject: ; 0x5cf9b (size=72)
     db $3 ; border tile
 
@@ -26486,6 +26662,7 @@ SaffronGymText1: ; 0x5d118
     jp $24d7
 
 INCBIN "baserom.gbc",$5d162,$5d187 - $5d162
+
 SaffronGymText2: ; 0x5d187
     db $08 ; asm
     ld hl, $50c3
@@ -26543,6 +26720,7 @@ SaffronGymText9: ; 0x5d1cd
     jp $24d7
 
 INCBIN "baserom.gbc",$5d1e6,$73
+
 SaffronGymObject: ; 0x5d259 (size=330)
     db $2e ; border tile
 
@@ -27057,6 +27235,7 @@ SilphCo9Text1: ; 0x5d8b8
     jp $24d7
 
 INCBIN "baserom.gbc",$5d8e5,$5d8f4 - $5d8e5
+
 SilphCo9Text2: ; 0x5d8f4
     db $08 ; asm
     ld hl, $5893
@@ -27076,6 +27255,7 @@ SilphCo9Text4: ; 0x5d908
     jp $24d7
 
 INCBIN "baserom.gbc",$5d912,$2d
+
 SilphCo9Object: ; 0x5d93f (size=74)
     db $2e ; border tile
 
@@ -27132,6 +27312,7 @@ VictoryRoad1Text2: ; 0x5da90
     jp $24d7
 
 INCBIN "baserom.gbc",$5da9a,$1e
+
 VictoryRoad1Object: ; 0x5dab8 (size=76)
     db $7d ; border tile
 
@@ -27343,6 +27524,7 @@ PokemonTower3Text3: ; 0x60726
     jp $24d7
 
 INCBIN "baserom.gbc",$60730,$2d
+
 PokemonTower3Object: ; 0x6075d (size=51)
     db $1 ; border tile
 
@@ -27399,6 +27581,7 @@ PokemonTower4Text3: ; 0x60854
     jp $24d7
 
 INCBIN "baserom.gbc",$6085e,$2d
+
 PokemonTower4Object: ; 0x6088b (size=65)
     db $1 ; border tile
 
@@ -27449,6 +27632,7 @@ PokemonTower5Text2: ; 0x609df
     jp $24d7
 
 INCBIN "baserom.gbc",$609e9,$609f8 - $609e9
+
 PokemonTower5Text3: ; 0x609f8
     db $08 ; asm
     ld hl, $49b5
@@ -27456,6 +27640,7 @@ PokemonTower5Text3: ; 0x609f8
     jp $24d7
 
 INCBIN "baserom.gbc",$60a02,$60a11 - $60a02
+
 PokemonTower5Text4: ; 0x60a11
     db $08 ; asm
     ld hl, $49c1
@@ -27463,6 +27648,7 @@ PokemonTower5Text4: ; 0x60a11
     jp $24d7
 
 INCBIN "baserom.gbc",$60a1b,$60a2a - $60a1b
+
 PokemonTower5Text5: ; 0x60a2a
     db $08 ; asm
     ld hl, $49cd
@@ -27470,6 +27656,7 @@ PokemonTower5Text5: ; 0x60a2a
     jp $24d7
 
 INCBIN "baserom.gbc",$60a34,$14
+
 PokemonTower5Object: ; 0x60a48 (size=65)
     db $1 ; border tile
 
@@ -27528,6 +27715,7 @@ PokemonTower6Text3: ; 0x60bf8
     jp $24d7
 
 INCBIN "baserom.gbc",$60c02,$59
+
 PokemonTower6Object: ; 0x60c5b (size=58)
     db $1 ; border tile
 
@@ -27612,6 +27800,7 @@ PokemonTower7Text4: ; 0x60e8a
     jp $24d7
 
 INCBIN "baserom.gbc",$60ec4,$32
+
 PokemonTower7Object: ; 0x60ef6 (size=42)
     db $1 ; border tile
 
@@ -27815,6 +28004,7 @@ SSAnne1Text2: ; 0x61272
     db $50
 
 INCBIN "baserom.gbc",$61277,$0
+
 SSAnne1Object: ; 0x61277 (size=104)
     db $c ; border tile
 
@@ -27884,7 +28074,9 @@ SSAnne2Text2: ; 0x614e6
     call $3354
     jp $24d7
 ; 0x61500
+
 INCBIN "baserom.gbc",$61500,$14
+
 SSAnne2Object: ; 0x61514 (size=90)
     db $c ; border tile
 
@@ -27928,6 +28120,7 @@ SSAnne4_h: ; 0x61622 to 0x6162e (12 bytes) (id=98)
     dw $5632 ; objects
 
 INCBIN "baserom.gbc",$6162e,$61632 - $6162e
+
 SSAnne4Object: ; 0x61632 (size=52)
     db $c ; border tile
 
@@ -27984,6 +28177,7 @@ SSAnne5Text3: ; 0x616f4
     db $50
 
 INCBIN "baserom.gbc",$616f9,$0
+
 SSAnne5Text4: ; 0x616f9
     db $08 ; asm
     ld hl, $56d1
@@ -27991,6 +28185,7 @@ SSAnne5Text4: ; 0x616f9
     jp $24d7
 
 INCBIN "baserom.gbc",$61703,$61712 - $61703
+
 SSAnne5Text5: ; 0x61712
     db $08 ; asm
     ld hl, $56dd
@@ -27998,6 +28193,7 @@ SSAnne5Text5: ; 0x61712
     jp $24d7
 
 INCBIN "baserom.gbc",$6171c,$f
+
 SSAnne5Object: ; 0x6172b (size=54)
     db $23 ; border tile
 
@@ -28064,6 +28260,7 @@ SSAnne6Text6: ; 0x617de
     db $50
 
 INCBIN "baserom.gbc",$617e3,$0
+
 SSAnne6Text7: ; 0x617e3
     db $08 ; asm
     ld hl, $5807
@@ -28085,6 +28282,7 @@ SSAnne6Text7: ; 0x617e3
     jp $24d7
 
 INCBIN "baserom.gbc",$61807,$14
+
 SSAnne6Object: ; 0x6181b (size=54)
     db $c ; border tile
 
@@ -28334,6 +28532,7 @@ SSAnne9Text5: ; 0x61bdd
     jp $24d7
 
 INCBIN "baserom.gbc",$61bf2,$61bf7 - $61bf2
+
 SSAnne9Text7: ; 0x61bf7
     db $08 ; asm
     ld hl, $5c01
@@ -28341,6 +28540,7 @@ SSAnne9Text7: ; 0x61bf7
     jp $24d7
 
 INCBIN "baserom.gbc",$61c01,$61c06 - $61c01
+
 SSAnne9Text8: ; 0x61c06
     db $08 ; asm
     ld hl, $5c10
@@ -28348,6 +28548,7 @@ SSAnne9Text8: ; 0x61c06
     jp $24d7
 
 INCBIN "baserom.gbc",$61c10,$61c15 - $61c10
+
 SSAnne9Text10: ; 0x61c15
     db $08 ; asm
     ld hl, $5c1f
@@ -28355,6 +28556,7 @@ SSAnne9Text10: ; 0x61c15
     jp $24d7
 
 INCBIN "baserom.gbc",$61c1f,$61c24 - $61c1f
+
 SSAnne9Text11: ; 0x61c24
     db $08 ; asm
     ld hl, $5c2e
@@ -28362,6 +28564,7 @@ SSAnne9Text11: ; 0x61c24
     jp $24d7
 
 INCBIN "baserom.gbc",$61c2e,$61c33 - $61c2e
+
 SSAnne9Text12: ; 0x61c33
     db $08 ; asm
     ld hl, $5c3d
@@ -28369,6 +28572,7 @@ SSAnne9Text12: ; 0x61c33
     jp $24d7
 
 INCBIN "baserom.gbc",$61c3d,$61c42 - $61c3d
+
 SSAnne9Text13: ; 0x61c42
     db $08 ; asm
     ld hl, $5c4c
@@ -28376,6 +28580,7 @@ SSAnne9Text13: ; 0x61c42
     jp $24d7
 
 INCBIN "baserom.gbc",$61c4c,$41
+
 SSAnne9Object: ; 0x61c8d (size=188)
     db $c ; border tile
 
@@ -28539,6 +28744,7 @@ UndergroundPathNS_h: ; 0x61f1a to 0x61f26 (12 bytes) (id=119)
     dw $5f2a ; objects
 
 INCBIN "baserom.gbc",$61f26,$61f2a - $61f26
+
 UndergroundPathNSObject: ; 0x61f2a (size=20)
     db $1 ; border tile
 
@@ -28563,6 +28769,7 @@ UndergroundPathWE_h: ; 0x61f3e to 0x61f4a (12 bytes) (id=121)
     dw $5f4e ; objects
 
 INCBIN "baserom.gbc",$61f4a,$61f4e - $61f4a
+
 UndergroundPathWEObject: ; 0x61f4e (size=20)
     db $1 ; border tile
 
@@ -28587,6 +28794,7 @@ DiglettsCave_h: ; 0x61f62 to 0x61f6e (12 bytes) (id=197)
     dw $5f72 ; objects
 
 INCBIN "baserom.gbc",$61f6e,$61f72 - $61f6e
+
 DiglettsCaveObject: ; 0x61f72 (size=20)
     db $19 ; border tile
 
@@ -28655,6 +28863,7 @@ SilphCo11Text3: ; 0x6232b
     db $50
 
 INCBIN "baserom.gbc",$62330,$6233a - $62330
+
 SilphCo11Text4: ; 0x6233a
     db $08 ; asm
     ld hl, $62c3
@@ -28662,6 +28871,7 @@ SilphCo11Text4: ; 0x6233a
     jp $24d7
 
 INCBIN "baserom.gbc",$62344,$62353 - $62344
+
 SilphCo11Text5: ; 0x62353
     db $08 ; asm
     ld hl, $62cf
@@ -28669,6 +28879,7 @@ SilphCo11Text5: ; 0x62353
     jp $24d7
 
 INCBIN "baserom.gbc",$6235d,$23
+
 SilphCo11Object: ; 0x62380 (size=72)
     db $d ; border tile
 
@@ -28761,6 +28972,7 @@ DecrementPP:
 	ret
 
 INCBIN "baserom.gbc",$6802F,$6807F-$6802F
+
 Tset05_GFX:
 	INCBIN "baserom.gbc",$6807F,$6867F-$6807F
 Tset05_Block:
@@ -28813,6 +29025,7 @@ Tset0B_Block:
 	INCBIN "baserom.gbc",$6FEF0,$70000-$6FEF0
 
 SECTION "bank1C",DATA,BANK[$1C]
+
 INCBIN "baserom.gbc",$70000,$1100
 
 CompressedMap: ; 5100
@@ -29201,7 +29414,6 @@ Function71c07: ; 0x71c07
 	ld [$cd12],a
 	ret
 
-
 INCBIN "baserom.gbc",$71CA2,$725C8-$71CA2
 
 MonsterPalettes: ; 65C8
@@ -29862,6 +30074,7 @@ ViridianGymText1: ; 0x74a69
     jp $24d7
 
 INCBIN "baserom.gbc",$74ace,$74af3 - $74ace
+
 ViridianGymText2: ; 0x74af3
     db $08 ; asm
     ld hl, $4a08
@@ -29869,6 +30082,7 @@ ViridianGymText2: ; 0x74af3
     jp $24d7
 
 INCBIN "baserom.gbc",$74afd,$74b0c - $74afd
+
 ViridianGymText3: ; 0x74b0c
     db $08 ; asm
     ld hl, $4a14
@@ -29876,6 +30090,7 @@ ViridianGymText3: ; 0x74b0c
     jp $24d7
 
 INCBIN "baserom.gbc",$74b16,$74b25 - $74b16
+
 ViridianGymText4: ; 0x74b25
     db $08 ; asm
     ld hl, $4a20
@@ -29883,6 +30098,7 @@ ViridianGymText4: ; 0x74b25
     jp $24d7
 
 INCBIN "baserom.gbc",$74b2f,$74b3e - $74b2f
+
 ViridianGymText5: ; 0x74b3e
     db $08 ; asm
     ld hl, $4a2c
@@ -29890,6 +30106,7 @@ ViridianGymText5: ; 0x74b3e
     jp $24d7
 
 INCBIN "baserom.gbc",$74b48,$74b57 - $74b48
+
 ViridianGymText6: ; 0x74b57
     db $08 ; asm
     ld hl, $4a38
@@ -29897,6 +30114,7 @@ ViridianGymText6: ; 0x74b57
     jp $24d7
 
 INCBIN "baserom.gbc",$74b61,$74b70 - $74b61
+
 ViridianGymText7: ; 0x74b70
     db $08 ; asm
     ld hl, $4a44
@@ -29904,6 +30122,7 @@ ViridianGymText7: ; 0x74b70
     jp $24d7
 
 INCBIN "baserom.gbc",$74b7a,$74b89 - $74b7a
+
 ViridianGymText8: ; 0x74b89
     db $08 ; asm
     ld hl, $4a50
@@ -29911,6 +30130,7 @@ ViridianGymText8: ; 0x74b89
     jp $24d7
 
 INCBIN "baserom.gbc",$74b93,$74ba2 - $74b93
+
 ViridianGymText9: ; 0x74ba2
     db $08 ; asm
     ld hl, $4a5c
@@ -29918,6 +30138,7 @@ ViridianGymText9: ; 0x74ba2
     jp $24d7
 
 INCBIN "baserom.gbc",$74bac,$74bbb - $74bac
+
 ViridianGymText10: ; 0x74bbb
     db $08 ; asm
     ld a, [$d751]
@@ -29933,6 +30154,7 @@ ViridianGymText10: ; 0x74bbb
     jp $24d7
 
 INCBIN "baserom.gbc",$74bd4,$a
+
 ViridianGymObject: ; 0x74bde (size=105)
     db $3 ; border tile
 
@@ -29982,6 +30204,7 @@ PewterMartText2: ; 0x74cbc
     jp $24d7
 
 INCBIN "baserom.gbc",$74cc6,$74ccb - $74cc6
+
 PewterMartText3: ; 0x74ccb
     db $08 ; asm
     ld hl, $4cd5
@@ -29989,6 +30212,7 @@ PewterMartText3: ; 0x74ccb
     jp $24d7
 
 INCBIN "baserom.gbc",$74cd5,$5
+
 PewterMartObject: ; 0x74cda (size=38)
     db $0 ; border tile
 
@@ -30064,6 +30288,7 @@ CeruleanHouse3_h: ; 0x74dfd to 0x74e09 (12 bytes) (id=230)
     dw $4ebe ; objects
 
 INCBIN "baserom.gbc",$74e09,$74ebe - $74e09
+
 CeruleanHouse3Object: ; 0x74ebe (size=34)
     db $c ; border tile
 
@@ -30309,6 +30534,7 @@ SafariZoneEntranceText2: ; 0x753ca
     jp $24d7
 
 INCBIN "baserom.gbc",$753e6,$f
+
 SafariZoneEntranceObject: ; 0x753f5 (size=48)
     db $a ; border tile
 
@@ -30385,6 +30611,7 @@ FuchsiaGymText1: ; 0x75534
     jp $24d7
 
 INCBIN "baserom.gbc",$75581,$755a4 - $75581
+
 FuchsiaGymText2: ; 0x755a4
     db $08 ; asm
     ld hl, $54eb
@@ -30392,6 +30619,7 @@ FuchsiaGymText2: ; 0x755a4
     jp $24d7
 
 INCBIN "baserom.gbc",$755ae,$755bd - $755ae
+
 FuchsiaGymText3: ; 0x755bd
     db $08 ; asm
     ld hl, $54f7
@@ -30399,6 +30627,7 @@ FuchsiaGymText3: ; 0x755bd
     jp $24d7
 
 INCBIN "baserom.gbc",$755c7,$755d6 - $755c7
+
 FuchsiaGymText4: ; 0x755d6
     db $08 ; asm
     ld hl, $5503
@@ -30406,6 +30635,7 @@ FuchsiaGymText4: ; 0x755d6
     jp $24d7
 
 INCBIN "baserom.gbc",$755e0,$755ef - $755e0
+
 FuchsiaGymText5: ; 0x755ef
     db $08 ; asm
     ld hl, $550f
@@ -30413,6 +30643,7 @@ FuchsiaGymText5: ; 0x755ef
     jp $24d7
 
 INCBIN "baserom.gbc",$755f9,$75608 - $755f9
+
 FuchsiaGymText6: ; 0x75608
     db $08 ; asm
     ld hl, $551b
@@ -30420,6 +30651,7 @@ FuchsiaGymText6: ; 0x75608
     jp $24d7
 
 INCBIN "baserom.gbc",$75612,$75621 - $75612
+
 FuchsiaGymText7: ; 0x75621
     db $08 ; asm
     ld hl, $5527
@@ -30427,6 +30659,7 @@ FuchsiaGymText7: ; 0x75621
     jp $24d7
 
 INCBIN "baserom.gbc",$7562b,$7563a - $7562b
+
 FuchsiaGymText8: ; 0x7563a
     db $08 ; asm
     ld a, [$d792]
@@ -30439,6 +30672,7 @@ FuchsiaGymText8: ; 0x7563a
     jp $24d7
 
 INCBIN "baserom.gbc",$7564e,$a
+
 FuchsiaGymObject: ; 0x75658 (size=82)
     db $3 ; border tile
 
@@ -30551,6 +30785,7 @@ CinnabarGymText1: ; 0x758df
     jp $58b7
 ; 0x75914
 INCBIN "baserom.gbc",$75914,$25
+
 CinnabarGymText2: ; 0x75939
     db $08 ; asm
     call $57a0
@@ -30569,6 +30804,7 @@ CinnabarGymText2: ; 0x75939
     jp $24d7
 
 INCBIN "baserom.gbc",$7595f,$7596e - $7595f
+
 CinnabarGymText3: ; 0x7596e
     db $08 ; asm
     call $57a0
@@ -30587,6 +30823,7 @@ CinnabarGymText3: ; 0x7596e
     jp $24d7
 
 INCBIN "baserom.gbc",$75994,$759a3 - $75994
+
 CinnabarGymText4: ; 0x759a3
     db $08 ; asm
     call $57a0
@@ -30605,6 +30842,7 @@ CinnabarGymText4: ; 0x759a3
     jp $24d7
 
 INCBIN "baserom.gbc",$759c9,$759d8 - $759c9
+
 CinnabarGymText5: ; 0x759d8
     db $08 ; asm
     call $57a0
@@ -30623,6 +30861,7 @@ CinnabarGymText5: ; 0x759d8
     jp $24d7
 
 INCBIN "baserom.gbc",$759fe,$75a0d - $759fe
+
 CinnabarGymText6: ; 0x75a0d
     db $08 ; asm
     call $57a0
@@ -30641,6 +30880,7 @@ CinnabarGymText6: ; 0x75a0d
     jp $24d7
 
 INCBIN "baserom.gbc",$75a33,$75a42 - $75a33
+
 CinnabarGymText7: ; 0x75a42
     db $08 ; asm
     call $57a0
@@ -30659,6 +30899,7 @@ CinnabarGymText7: ; 0x75a42
     jp $24d7
 
 INCBIN "baserom.gbc",$75a68,$75a77 - $75a68
+
 CinnabarGymText8: ; 0x75a77
     db $08 ; asm
     call $57a0
@@ -30677,6 +30918,7 @@ CinnabarGymText8: ; 0x75a77
     jp $24d7
 
 INCBIN "baserom.gbc",$75a9d,$75aac - $75a9d
+
 CinnabarGymText9: ; 0x75aac
     db $08 ; asm
     ld a, [$d79a]
@@ -30691,6 +30933,7 @@ CinnabarGymText9: ; 0x75aac
     jp $24d7
 
 INCBIN "baserom.gbc",$75ac2,$a
+
 CinnabarGymObject: ; 0x75acc (size=90)
     db $2e ; border tile
 
@@ -30918,6 +31161,7 @@ Lab4_h: ; 0x75d25 to 0x75d31 (12 bytes) (id=170)
     dw $5df0 ; objects
 
 INCBIN "baserom.gbc",$75d31,$75dda - $75d31
+
 Lab4Text2: ; 0x75dda
     db $08 ; asm
     ld a, $3
@@ -30927,6 +31171,7 @@ Lab4Text2: ; 0x75dda
     jp $24d7
 
 INCBIN "baserom.gbc",$75de8,$8
+
 Lab4Object: ; 0x75df0 (size=32)
     db $17 ; border tile
 
@@ -31100,6 +31345,7 @@ GaryText2: ; 0x76108
     db $50
 
 INCBIN "baserom.gbc",$7610d,$22
+
 GaryObject: ; 0x7612f (size=48)
     db $3 ; border tile
 
@@ -31261,9 +31507,11 @@ AgathaObject: ; 0x76534 (size=44)
 
 AgathaBlocks: ; 30
     INCBIN "maps/agatha.blk"
+
 INCBIN "baserom.gbc",$7657e,$1a82
 
 SECTION "bank1E",DATA,BANK[$1E]
+
 INCBIN "baserom.gbc",$78000,$F1
 
 PlayAnimation: ; 40F1
@@ -31449,6 +31697,7 @@ Pointer4DCF: ; 4DCF
 	dw $4DDB,$4DE3,$4DEB,$4DF0,$4DF6,$4DFE
 
 INCBIN "baserom.gbc",$78DDB,$78E53-$78DDB
+
 RealPlayAnimation: ; 4E53
 	ld a,[$CF07] ; get animation # − 1
 	cp a,$FF
@@ -31924,9 +32173,11 @@ PointerTable6F74: ; 6F74
 INCBIN "baserom.gbc",$7B068,$7C000 - $7B068
 
 SECTION "bank1F",DATA,BANK[$1F]
+
 INCBIN "baserom.gbc",$7C000,$4000
 
 SECTION "bank20",DATA,BANK[$20]
+
 INCBIN "baserom.gbc",$80000,$800b1 - $80000
 
 _VictoryRoad3Text10:
@@ -32853,6 +33104,7 @@ _Route10Text10: ; 0x8e8e1
 INCBIN "baserom.gbc",$8e8ee,$1712
 
 SECTION "bank24",DATA,BANK[$24]
+
 INCBIN "baserom.gbc",$90000,$9008f - $90000
 
 _Route11Text11: ; 0x9008f
@@ -32998,6 +33250,7 @@ _Route23Text8: ; 0x92700
 INCBIN "baserom.gbc",$92721,$18df
 
 SECTION "bank25",DATA,BANK[$25]
+
 INCBIN "baserom.gbc",$94000,$945d3 - $94000
 
 _Route25Text11: ; 0x945d3
@@ -33814,6 +34067,7 @@ _SafariZoneEntranceText1: ; 0x9e6c7
 INCBIN "baserom.gbc",$9e6e4,$191c
 
 SECTION "bank28",DATA,BANK[$28]
+
 INCBIN "baserom.gbc",$a0000,$a05a1 - $a0000
 
 _FuchsiaMeetingRoomText1: ; 0xa05a1
-- 
cgit v1.2.3


From 7e35470fb18cb4d0ab144bb0b336294da53ba9ea Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 12:35:03 -0600
Subject: update gbz80disasm based on sawakita's changes

Changes include:

* .ASM_ labels now include their offset in the label

* byte_labels keeps better track of when a label is defined versus used

* reverse relative jumps now work

* reverse unconditional relative jumps can end a script

hg-commit-id: 8afc93fce17a
---
 extras/gbz80disasm.py | 23 +++++++++++++++--------
 pokered.asm           |  1 +
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/extras/gbz80disasm.py b/extras/gbz80disasm.py
index dd927940..aa90c787 100644
--- a/extras/gbz80disasm.py
+++ b/extras/gbz80disasm.py
@@ -4,6 +4,7 @@
 import extract_maps
 from copy import copy, deepcopy
 from pretty_map_headers import random_hash, map_name_cleaner
+from ctypes import c_int8
 import sys
 spacing = "    "
 
@@ -545,7 +546,7 @@ end_08_scripts_with = [
 0xc9, #ret
 ###0xda, 0xe9, 0xd2, 0xc2, 0xca, 0xc3, 0x38, 0x30, 0x20, 0x28, 0x18, 0xd8, 0xd0, 0xc0, 0xc8, 0xc9
 ]
-relative_jumps = [0x38, 0x30, 0x20, 0x28, 0x18]
+relative_jumps = [0x38, 0x30, 0x20, 0x28, 0x18, 0xc3]
 relative_unconditional_jumps = [0xc3, 0x18]
 
 #TODO: replace call and a pointer with call and a label
@@ -567,6 +568,10 @@ asm_commands = {
 def random_asm_label():
     return ".ASM_" + random_hash()
 
+def asm_label(address):
+    # why using a random value when you can use the eff. address?
+    return ".ASM_" + hex(address)[2:]
+
 def output_bank_opcodes(original_offset, max_byte_count=0x4000):
     #fs = current_address
     #b = bank_byte
@@ -599,11 +604,12 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
             line_label = byte_labels[offset]["name"]
             byte_labels[offset]["usage"] += 1
         else:
-            line_label = random_asm_label()
+            line_label = asm_label(offset)
             byte_labels[offset] = {}
             byte_labels[offset]["name"] = line_label
             byte_labels[offset]["usage"] = 0
-        output += line_label.lower() + " ; " + hex(offset) + "\n"
+        byte_labels[offset]["definition"] = True
+        output += line_label.lower() + "\n" #" ; " + hex(offset) + "\n"
 
         #find out if there's a two byte key like this
         temp_maybe = maybe_byte
@@ -666,15 +672,16 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
 
                     if current_byte == 0x18 or current_byte==0x20 or current_byte in relative_jumps: #jr or jr nz
                         #generate a label for the byte we're jumping to
-                        target_address = offset + 2 + ord(rom[offset + 1])
+                        target_address = offset + 2 + c_int8(ord(rom[offset + 1])).value
                         if target_address in byte_labels.keys():
                             byte_labels[target_address]["usage"] = 1 + byte_labels[target_address]["usage"]
                             line_label2 = byte_labels[target_address]["name"]
                         else:
-                            line_label2 = random_asm_label()
+                            line_label2 = asm_label(target_address)
                             byte_labels[target_address] = {}
                             byte_labels[target_address]["name"] = line_label2
                             byte_labels[target_address]["usage"] = 1
+                            byte_labels[target_address]["definition"] = False
                         
                         insertion = line_label2.lower()
                         include_comment = True
@@ -731,7 +738,7 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
                 is_data = True
 
             #stop reading at a jump, relative jump or return
-            if current_byte in end_08_scripts_with:
+            if current_byte in end_08_scripts_with or (current_byte == 0x18 and target_address < offset):
                 if not has_outstanding_labels(byte_labels):
                     keep_reading = False
                     is_data = False #cleanup
@@ -753,7 +760,7 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
         address = label_line
         label_line = byte_labels[label_line]
         if label_line["usage"] == 0:
-            output = output.replace((label_line["name"] + " ; " + hex(address) + "\n").lower(), "")
+            output = output.replace((label_line["name"] + "\n").lower(), "")
 
     #add the offset of the final location
     output += "; " + hex(offset)
@@ -766,7 +773,7 @@ def has_outstanding_labels(byte_labels):
     """
     for label_line in byte_labels.keys():
         real_line = byte_labels[label_line]
-        if real_line["usage"] == 1: return True
+        if real_line["definition"] == False: return True
     return False
 
 def text_asm_pretty_printer(label, address_of_08, include_08=True):
diff --git a/pokered.asm b/pokered.asm
index b8d2844e..c6f5fd0d 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -5796,6 +5796,7 @@ PalletTownScript:
 	ld hl,PalletTownScriptPointers
 	ld a,[$D5F1]
 	jp $3D97
+; 0x18e73
 
 PalletTownScriptPointers:
 	dw PalletTownScript1,PalletTownScript2,PalletTownScript3,PalletTownScript4,PalletTownScript5,PalletTownScript6,PalletTownScript7
-- 
cgit v1.2.3


From 1ae8e7e41e5fa184ec30498defb6ebc873178da8 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 12:55:54 -0600
Subject: insert $8 asm for NameRaterText1

hg-commit-id: dd9f5126d4a5
---
 extras/insert_texts.py |  4 ++--
 pokered.asm            | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/extras/insert_texts.py b/extras/insert_texts.py
index f850f001..561e80f7 100644
--- a/extras/insert_texts.py
+++ b/extras/insert_texts.py
@@ -459,7 +459,7 @@ if __name__ == "__main__":
     #insert_08_asm(83, 1)
     #insert_all_08s()
 
-    #insert_asm(0x758df, "CinnabarGymText1")
+    insert_asm(0x1da56, "NameRaterText1")
 
     #insert_text_label_tx_far(91, 1)
     missed_17s = [] #[[95, 1], [95, 2], [96, 1], [97, 1], [99, 1], [99, 2], [99, 3], [100, 1], [100, 2], [100, 3], [100, 4], [100, 5], [100, 6], [124, 8], [124, 10], [124, 12], [124, 16], [124, 17], [133, 3], [139, 1], [139, 2], [139, 3], [141, 2], [141, 3], [154, 2], [154, 3], [169, 4], [171, 2], [171, 3], [174, 2], [174, 3], [176, 4], [176, 5], [182, 3], [215, 5], [91, 2], [91, 3], [124, 8], [124, 10], [124, 12], [124, 16], [124, 17], [139, 1], [139, 2], [139, 3], [141, 2], [169, 4], [171, 2], [174, 2], [176, 4], [176, 5]]
@@ -479,7 +479,7 @@ if __name__ == "__main__":
 
     #insert_text(0x44276, "ViridianPokeCenterText4")
     #insert_texts_label(4)
-    insert_all_texts_labels()
+    #insert_all_texts_labels()
 
     if len(failed_attempts) > 0:
         print "-- FAILED ATTEMPTS --"
diff --git a/pokered.asm b/pokered.asm
index c6f5fd0d..281745fa 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -8582,7 +8582,50 @@ NameRater_h: ; 0x1da06 to 0x1da12 (12 bytes) (bank=7) (id=229)
 
     dw $5ad6 ; objects
 
-INCBIN "baserom.gbc",$1da12,$1dad6 - $1da12
+INCBIN "baserom.gbc",$1da12,$1da56 - $1da12
+
+NameRaterText1: ; 0x1da56
+    db $8
+    call $36f4
+    ld hl, $5ab3
+    call $5a15
+    jr nz, .asm_1daae ; 0x1da60 $4c
+    ld hl, $5ab8
+    call PrintText
+    xor a
+    ld [$d07d], a
+    ld [$cfcb], a
+    ld [$cc35], a
+    call $13fc
+    push af
+    call $3dd4
+    call $3dbe
+    call $20ba
+    pop af
+    jr c, .asm_1daae ; 0x1da80 $2c
+    call $15b4
+    call $5a20
+    ld hl, $5ad1
+    jr c, .asm_1daa8 ; 0x1da8b $1b
+    ld hl, $5abd
+    call $5a15
+    jr nz, .asm_1daae ; 0x1da93 $19
+    ld hl, $5ac2
+    call PrintText
+    ld b, $1
+    ld hl, $655c
+    call Bankswitch
+    jr c, .asm_1daae ; 0x1daa3 $9
+    ld hl, $5ac7
+.asm_1daa8
+    call PrintText
+    jp $24d7
+.asm_1daae
+    ld hl, $5acc
+    jr .asm_1daa8 ; 0x1dab1 $f5
+; 0x1dab3
+
+INCBIN "baserom.gbc",$1dab3,$23
 
 NameRaterObject: ; 0x1dad6 (size=26)
     db $a ; border tile
@@ -9538,6 +9581,7 @@ BillsHouseText3: ; 0x1e8d0
     ld hl, $68da
     call PrintText
     jp $24d7
+; 0x1e8da
 
 INCBIN "baserom.gbc",$1e8da,$5
 
-- 
cgit v1.2.3


From 808a1d909ab885e2372991e0ffa44ea1fff8f3a8 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 12:57:32 -0600
Subject: insert $8 asm for Lab4Text1

hg-commit-id: 6f50551b0d5d
---
 pokered.asm | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/pokered.asm b/pokered.asm
index 281745fa..990041a9 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -31205,7 +31205,53 @@ Lab4_h: ; 0x75d25 to 0x75d31 (12 bytes) (id=170)
 
     dw $5df0 ; objects
 
-INCBIN "baserom.gbc",$75d31,$75dda - $75d31
+INCBIN "baserom.gbc",$75d31,$75d6c - $75d31
+
+Lab4Text1: ; 0x75d6c
+    db $8
+    ld a, [$d7a3]
+    bit 0, a
+    jr nz, .asm_75d96 ; 0x75d72 $22
+    ld hl, $5dc6
+    call PrintText
+    call $5d38
+    ld a, [$cd37]
+    and a
+    jr z, .asm_75d8d ; 0x75d81 $a
+    ld b, $18
+    ld hl, $5006
+    call Bankswitch
+    jr .asm_75d93 ; 0x75d8b $6
+.asm_75d8d
+    ld hl, $5dcb
+    call PrintText
+.asm_75d93
+    jp $24d7
+.asm_75d96
+    bit 1, a
+    jr z, .asm_75da2 ; 0x75d98 $8
+    ld hl, $5dd0
+    call PrintText
+    jr .asm_75d93 ; 0x75da0 $f1
+.asm_75da2
+    call $5de8
+    ld hl, $5dd5
+    call PrintText
+    ld hl, $d7a3
+    set 2, [hl]
+    ld a, [$d710]
+    ld b, a
+    ld c, $1e
+    call GivePokemon
+    jr nc, .asm_75d93 ; 0x75db9 $d8
+    ld hl, $d7a3
+    res 0, [hl]
+    res 1, [hl]
+    res 2, [hl]
+    jr .asm_75d93 ; 0x75dc4 $cd
+; 0x75dc6
+
+INCBIN "baserom.gbc",$75dc6,$14
 
 Lab4Text2: ; 0x75dda
     db $08 ; asm
-- 
cgit v1.2.3


From 969360c42f3e66737049f5e491cf181d42f5f693 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 12:59:23 -0600
Subject: insert $8 asm for PewterPokecenterText3

hg-commit-id: 69196d26d8a0
---
 pokered.asm | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/pokered.asm b/pokered.asm
index 990041a9..03bc6144 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -25873,7 +25873,55 @@ PewterPokecenterText1: ; 0x5c596
     TX_FAR _PewterPokecenterText1
     db $50
 
-INCBIN "baserom.gbc",$5c59b,$5c603 - $5c59b
+PewterPokecenterText3: ; 0x5c59b
+    db $8
+    ld a, $1
+    ld [$cc3c], a
+    ld hl, $4603
+    call PrintText
+    ld a, $ff
+    call $23b1
+    ld c, $20
+    call $3739
+    ld hl, $4608
+    ld de, $cd3f
+    ld bc, $0004
+    call CopyData
+    ld a, [$c132]
+    ld hl, $cd3f
+.asm_5c5c3
+    cp [hl]
+    inc hl
+    jr nz, .asm_5c5c3 ; 0x5c5c5 $fc
+    dec hl
+    push hl
+    ld c, $1f
+    ld a, $d0
+    call $23a1
+    pop hl
+.asm_5c5d1
+    ld a, [hl]
+    ld [$c132], a
+    push hl
+    ld hl, $cd3f
+    ld de, $cd3e
+    ld bc, $0004
+    call CopyData
+    ld a, [$cd3e]
+    ld [$cd42], a
+    pop hl
+    ld c, $18
+    call $3739
+    ld a, [$c026]
+    ld b, a
+    ld a, [$c027]
+    or b
+    jr nz, .asm_5c5d1 ; 0x5c5f6 $d9
+    ld c, $30
+    call $3739
+    call $2307
+    jp $24d7
+; 0x5c603
 
 PewterPokecenterText4: ; broken TX_FAR to _PewterPokecenterText4
     db $17, $44, $47, $26
-- 
cgit v1.2.3


From 0e9c4d7922f648b26055c82919a35ba66bdcad55 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 13:04:00 -0600
Subject: insert $8 asm for Route11GateUpstairsText4

hg-commit-id: 8254a228899c
---
 pokered.asm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pokered.asm b/pokered.asm
index 03bc6144..0764619d 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -19710,7 +19710,15 @@ Route11GateUpstairsText3: ; 0x494a8
     call PrintText
     jp $24d7
 
-INCBIN "baserom.gbc",$494c4,$494da - $494c4
+INCBIN "baserom.gbc",$494c4,$494ce - $494c4
+
+Route11GateUpstairsText4: ; 0x494ce
+    db $8
+    ld hl, $54d5
+    jp $55c9
+; 0x494d5
+
+INCBIN "baserom.gbc",$494d5,$5
 
 Route11GateUpstairsObject: ; 0x494da (size=30)
     db $a ; border tile
-- 
cgit v1.2.3


From 0acee287eca93a7fe33f0a90b2688160a11cbe2c Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 13:06:32 -0600
Subject: update name; reds house f1 -> reds house 1f in extract_maps

hg-commit-id: a7675930313a
---
 extras/extract_maps.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extras/extract_maps.py b/extras/extract_maps.py
index 8e29158a..9793cfdc 100644
--- a/extras/extract_maps.py
+++ b/extras/extract_maps.py
@@ -60,8 +60,8 @@ maps = {
          0x22: "Route 23",
          0x23: "Route 24",
          0x24: "Route 25",
-         0x25: "Red's House F1",
-         0x26: "Red's House F2",
+         0x25: "Red's House 1F",
+         0x26: "Red's House 2F",
          0x27: "Blue's House",
          0x28: "Oak's Lab",
          0x29: "Viridian Poke Center",
-- 
cgit v1.2.3


From dba77d1afabba018c387e493384456d3ebd9c660 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 13:07:58 -0600
Subject: insert text script for CeruleanPokecenterText4

hg-commit-id: b9dcdcbb2839
---
 pokered.asm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pokered.asm b/pokered.asm
index 0764619d..fda3b52b 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -25968,7 +25968,10 @@ CeruleanPokecenter_h: ; 0x5c639 to 0x5c645 (12 bytes) (id=64)
 
     dw $465f ; objects
 
-INCBIN "baserom.gbc",$5c645,$5c655 - $5c645
+INCBIN "baserom.gbc",$5c645,$5c653 - $5c645
+
+CeruleanPokecenterText4:
+    db $f6, $ff
 
 CeruleanPokecenterText2:
 CeruleanPokecenterText1: ; 0x5c655
-- 
cgit v1.2.3


From 2e22ddb2b6ad4841c0620995a1cceedec2b6b86f Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 13:10:31 -0600
Subject: insert $8 asm for CeruleanHouse3Text1

hg-commit-id: 37862fe18a17
---
 pokered.asm | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/pokered.asm b/pokered.asm
index fda3b52b..1046f13c 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -30391,7 +30391,53 @@ CeruleanHouse3_h: ; 0x74dfd to 0x74e09 (12 bytes) (id=230)
 
     dw $4ebe ; objects
 
-INCBIN "baserom.gbc",$74e09,$74ebe - $74e09
+INCBIN "baserom.gbc",$74e09,$74e15 - $74e09
+
+CeruleanHouse3Text1: ; 0x74e15
+    db $8
+    ld hl, $4e77
+    call PrintText
+    xor a
+    ld [$cc26], a
+    ld [$cc36], a
+.asm_74e23
+    ld hl, $4e7c
+    call PrintText
+    ld hl, $4e6d
+    call $2a5a
+    ld hl, $cf7b
+    ld a, l
+    ld [$cf8b], a
+    ld a, h
+    ld [$cf8c], a
+    xor a
+    ld [$cf93], a
+    ld [$cc35], a
+    ld a, $4
+    ld [$cf94], a
+    call $2be6
+    jr c, .asm_74e60 ; 0x74e49 $15
+    ld hl, $4e86
+    ld a, [$cf91]
+    sub $15
+    add a
+    ld d, $0
+    ld e, a
+    add hl, de
+    ld a, [hli]
+    ld h, [hl]
+    ld l, a
+    call PrintText
+    jr .asm_74e23 ; 0x74e5e $c3
+.asm_74e60
+    xor a
+    ld [$cc36], a
+    ld hl, $4e81
+    call PrintText
+    jp $24d7
+; 0x74e6d
+
+INCBIN "baserom.gbc",$74e6d,$51
 
 CeruleanHouse3Object: ; 0x74ebe (size=34)
     db $c ; border tile
-- 
cgit v1.2.3


From 2c24aa3510d833f6d4bec31f8da50aac2d825e72 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 13:21:05 -0600
Subject: stop disassembling when unconditional relative jumps go back

This adds the condition that it should stop disassembling even if there are
unsatisfied labels (example: from before the text script began).

hg-commit-id: 0b6ebcb02348
---
 extras/gbz80disasm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/gbz80disasm.py b/extras/gbz80disasm.py
index aa90c787..7c2079e0 100644
--- a/extras/gbz80disasm.py
+++ b/extras/gbz80disasm.py
@@ -739,7 +739,7 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
 
             #stop reading at a jump, relative jump or return
             if current_byte in end_08_scripts_with or (current_byte == 0x18 and target_address < offset):
-                if not has_outstanding_labels(byte_labels):
+                if not has_outstanding_labels(byte_labels) or (current_byte == 0x18 and target_address < offset):
                     keep_reading = False
                     is_data = False #cleanup
                     break
-- 
cgit v1.2.3


From c1ad3c081e0654c2e567bcbcdae45ff9d8ada41a Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 13:22:41 -0600
Subject: insert $8 asm for Route11GateUpstairsText2

hg-commit-id: 152301ccc043
---
 pokered.asm | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/pokered.asm b/pokered.asm
index 1046f13c..bea6e23e 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -19692,9 +19692,40 @@ Route11GateUpstairsText1: ; 0x4945f
     ld [W_WHICHTRADE], a
     ld a, $54
     call Predef
+asm_49469:
     jp $24d7
 
-INCBIN "baserom.gbc",$4946c,$494a8 - $4946c
+Route11GateUpstairsText2: ; 0x4946c
+    db $8
+    ld a, [$d7d6]
+    add a
+    jr c, .asm_4949b ; 0x49471 $28
+    ld a, $1e
+    ld [$ff00+$db], a
+    ld a, $47
+    ld [$ff00+$dc], a
+    ld [$d11e], a
+    call $2fcf
+    ld h, d
+    ld l, e
+    ld de, $cc5b
+    ld bc, $000d
+    call CopyData
+    ld a, $62
+    call Predef
+    ld a, [$ff00+$db]
+    dec a
+    jr nz, .asm_494a1 ; 0x49494 $b
+    ld hl, $d7d6
+    set 7, [hl]
+.asm_4949b
+    ld hl, $54a3
+    call PrintText
+.asm_494a1
+    jr asm_49469 ; 0x494a1 $c6
+; 0x494a3
+
+INCBIN "baserom.gbc",$494a3,$5
 
 Route11GateUpstairsText3: ; 0x494a8
     db $08 ; asm
-- 
cgit v1.2.3


From 34e8c311534ca6cd3945571974265c07cd3ddf1f Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 13:50:08 -0600
Subject: labels for ViridianCityText14 and ViridianCityText15

hg-commit-id: f35e40e60a17
---
 pokered.asm | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index bea6e23e..3afde8f1 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -6006,9 +6006,7 @@ PalletTownText7: ; sign by Blue’s house
 INCBIN "baserom.gbc",$18ff1,$190e4 - $18ff1
 
 ViridianCityTexts: ; 0x190e4
-    dw ViridianCityText1, ViridianCityText2, ViridianCityText3, ViridianCityText4, ViridianCityText5, ViridianCityText6, ViridianCityText7, ViridianCityText8, ViridianCityText9, ViridianCityText10, ViridianCityText11, ViridianCityText12, ViridianCityText13
-
-INCBIN "baserom.gbc",$190fe,$4
+    dw ViridianCityText1, ViridianCityText2, ViridianCityText3, ViridianCityText4, ViridianCityText5, ViridianCityText6, ViridianCityText7, ViridianCityText8, ViridianCityText9, ViridianCityText10, ViridianCityText11, ViridianCityText12, ViridianCityText13, ViridianCityText14, ViridianCityText15
 
 ViridianCityText1: ; 0x19102
     TX_FAR _ViridianCityText1
@@ -6124,7 +6122,10 @@ ViridianCityText7: ; 0x191df
 .asm_2413a ; 0x19207
     jp $24d7
 
-INCBIN "baserom.gbc",$1920a,$14
+INCBIN "baserom.gbc",$1920a,$19219 - $1920a
+
+ViridianCityText15: ; 0x19219
+INCBIN "baserom.gbc",$19219,$1921e - $19219
 
 ViridianCityText8: ; 0x1921e
     TX_FAR _ViridianCityText8
@@ -6142,7 +6143,10 @@ ViridianCityText13: ; 0x1922d
     TX_FAR _ViridianCityText13
     db $50
 
-INCBIN "baserom.gbc",$19232,$1938b - $19232
+ViridianCityText14:
+INCBIN "baserom.gbc",$19232,$19237 - $19232
+
+INCBIN "baserom.gbc",$19237,$1938b - $19237
 
 PewterCityTexts: ; 0x1938b
     dw PewterCityText1, PewterCityText2, PewterCityText3, PewterCityText4, PewterCityText5, PewterCityText6, PewterCityText7, PewterCityText8, PewterCityText9, PewterCityText10, PewterCityText11, PewterCityText12
@@ -20131,6 +20135,7 @@ Route18GateHeaderText2: ; 0x4998c
     ld hl, $5993
     jp $55c9
 ; 0x49993
+
 INCBIN "baserom.gbc",$49993,$5
 
 Route18GateHeaderText3: ; 0x49998
-- 
cgit v1.2.3


From dab1920405ec868bf7300d92016aa6d64e6ef8df Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 13:55:18 -0600
Subject: more labels for PewterCityTexts

hg-commit-id: 54b85a52f3bf
---
 pokered.asm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index 3afde8f1..3905960b 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -6149,9 +6149,7 @@ INCBIN "baserom.gbc",$19232,$19237 - $19232
 INCBIN "baserom.gbc",$19237,$1938b - $19237
 
 PewterCityTexts: ; 0x1938b
-    dw PewterCityText1, PewterCityText2, PewterCityText3, PewterCityText4, PewterCityText5, PewterCityText6, PewterCityText7, PewterCityText8, PewterCityText9, PewterCityText10, PewterCityText11, PewterCityText12
-
-INCBIN "baserom.gbc",$193a3,$4
+    dw PewterCityText1, PewterCityText2, PewterCityText3, PewterCityText4, PewterCityText5, PewterCityText6, PewterCityText7, PewterCityText8, PewterCityText9, PewterCityText10, PewterCityText11, PewterCityText12, PewterCityText13, PewterCityText14
 
 PewterCityText1: ; 0x193a7
     TX_FAR _PewterCityText1
@@ -6191,7 +6189,10 @@ PewterCityText3: ; 0x193b1
 .asm_ac429 ; 0x193ee
     jp $24d7
 
-INCBIN "baserom.gbc",$193f1,$19405 - $193f1
+INCBIN "baserom.gbc",$193f1,$19400 - $193f1
+
+PewterCityText13:
+INCBIN "baserom.gbc",$19400,$5
 
 PewterCityText4: ; 0x19405
     db $8
@@ -6231,7 +6232,10 @@ PewterCityText5: ; 0x19436
     ld [$d5f7], a
     jp $24d7
 
-INCBIN "baserom.gbc",$1945d,$a
+INCBIN "baserom.gbc",$1945d,$19462 - $1945d
+
+PewterCityText14: ; 0x19462
+INCBIN "baserom.gbc",$19462,$5
 
 PewterCityText6: ; 0x19467
     TX_FAR _PewterCityText6
-- 
cgit v1.2.3


From 445ed88a3cc3a81d6645fca169aebedc41ce21fa Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 13:59:41 -0600
Subject: label for CinnabarIslandText8

hg-commit-id: 37c5373f85f7
---
 pokered.asm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index 3905960b..c337c039 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -7567,9 +7567,10 @@ MonsterNames: ; 421E
 INCBIN "baserom.gbc",$1c98a,$1ca81 - $1c98a
 
 CinnabarIslandTexts: ; 0x1ca81
-    dw CinnabarIslandText1, CinnabarIslandText2, CinnabarIslandText3, CinnabarIslandText4, CinnabarIslandText5, CinnabarIslandText6, CinnabarIslandText7
+    dw CinnabarIslandText1, CinnabarIslandText2, CinnabarIslandText3, CinnabarIslandText4, CinnabarIslandText5, CinnabarIslandText6, CinnabarIslandText7, CinnabarIslandText8
 
-INCBIN "baserom.gbc",$1ca8f,$7
+CinnabarIslandText8:
+INCBIN "baserom.gbc",$1ca91,$5
 
 CinnabarIslandText1: ; 0x1ca96
     TX_FAR _CinnabarIslandText1
-- 
cgit v1.2.3


From 488e92cfbe48226b2c6aeb74e920fa510650bd50 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 15:04:01 -0600
Subject: +16 texts for OaksLabTexts

hg-commit-id: 83ebe48742b2
---
 pokered.asm | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 99 insertions(+), 3 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index c337c039..618612d0 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -7640,9 +7640,9 @@ OaksLab_h: ; 0x1cb02 to 0x1cb0e (12 bytes) (bank=7) (id=40)
 INCBIN "baserom.gbc",$1cb0e,$1d082 - $1cb0e
 
 OaksLabTexts: ; 0x1d082
-    dw OaksLabText1, OaksLabText2, OaksLabText3, OaksLabText4, OaksLabText5, OaksLabText6, OaksLabText7, OaksLabText8, OaksLabText9, OaksLabText10, OaksLabText11
+    dw OaksLabText1, OaksLabText2, OaksLabText3, OaksLabText4, OaksLabText5, OaksLabText6, OaksLabText7, OaksLabText8, OaksLabText9, OaksLabText10, OaksLabText11, OaksLabText12, OaksLabText13, OaksLabText14, OaksLabText15, OaksLabText16, OaksLabText17, OaksLabText18, OaksLabText19, OaksLabText20, OaksLabText21, OaksLabText22, OaksLabText23, OaksLabText24, OaksLabText25, OaksLabText26, OaksLabText27
 
-INCBIN "baserom.gbc",$1d098,$36
+INCBIN "baserom.gbc",$1d098+32,22
 
 OaksLabText1: ; 0x1d0ce
     db $08 ; asm
@@ -7918,7 +7918,103 @@ OaksLabText9: ; 0x1d336
     call PrintText
     jp $24d7
 
-INCBIN "baserom.gbc",$1d340,$1d3fb - $1d340
+INCBIN "baserom.gbc",$1d340,$1d345 - $1d340
+
+OaksLabText17: ; 0x1d345
+    db $8
+    ld hl, $534f
+    call PrintText
+    jp $24d7
+; 0x1d34f
+
+INCBIN "baserom.gbc",$1d34f,$1d354 - $1d34f
+
+OaksLabText18: ; 0x1d354
+    db $8
+    ld hl, $535e
+    call PrintText
+    jp $24d7
+; 0x1d35e
+
+INCBIN "baserom.gbc",$1d35e,$1d363 - $1d35e
+
+OaksLabText19: ; 0x1d363
+    db $8
+    ld hl, $536d
+    call PrintText
+    jp $24d7
+; 0x1d36d
+
+INCBIN "baserom.gbc",$1d36d,$1d372 - $1d36d
+
+OaksLabText20: ; 0x1d372
+    db $8
+    ld hl, $537c
+    call PrintText
+    jp $24d7
+; 0x1d37c
+
+INCBIN "baserom.gbc",$1d37c,$1d381 - $1d37c
+
+OaksLabText12: ; 0x1d381
+INCBIN "baserom.gbc",$1d381,$5
+
+INCBIN "baserom.gbc",$1d386,$1d390 - $1d386
+
+OaksLabText13: ; 0x1d390
+INCBIN "baserom.gbc",$1d390,$5
+
+INCBIN "baserom.gbc",$1d395,$1d39f - $1d395
+
+OaksLabText14: ; 0x1d39f
+    db $8
+    ld hl, $53a9
+    call PrintText
+    jp $24d7
+; 0x1d3a9
+
+INCBIN "baserom.gbc",$1d3a9,$1d3af - $1d3a9
+
+OaksLabText15: ; 0x1d3af to 0x1d3b9
+    db $8
+    ld hl, $53b9
+    call PrintText
+    jp $24d7
+; 0x1d3b9
+
+INCBIN "baserom.gbc",$1d3b9,$1d3c8 - $1d3b9
+
+OaksLabText16: ; 0x1d3c8
+    db $8
+    ld hl, $53d2
+    call PrintText
+    jp $24d7
+; 0x1d3d2
+
+INCBIN "baserom.gbc",$1d3d2,$1d3d7 - $1d3d2
+
+OaksLabText21: ; 0x1d3d7
+INCBIN "baserom.gbc",$1d3d7,$5
+
+OaksLabText22: ; 0x1d3dc
+INCBIN "baserom.gbc",$1d3dc,$5
+
+OaksLabText23: ; 0x1d3e1
+INCBIN "baserom.gbc",$1d3e1,$5
+
+OaksLabText24: ; 0x1d3e6
+INCBIN "baserom.gbc",$1d3e6,$5
+
+OaksLabText25: ; 0x1d3eb
+INCBIN "baserom.gbc",$1d3eb,$4
+    db $11
+    db $50
+
+OaksLabText26: ; 0x1d3f1
+INCBIN "baserom.gbc",$1d3f1,$1d3f6 - $1d3f1
+
+OaksLabText27: ; 0x1d3f6
+INCBIN "baserom.gbc",$1d3f6,5
 
 OaksLabText11:
 OaksLabText10: ; 0x1d3fb
-- 
cgit v1.2.3


From 5602dc1e7f039e3e5f02baf13436ed50dc2b1b09 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 15:06:24 -0600
Subject: clean up trailing whitespace in gbz80disasm

hg-commit-id: 1ef910ea7bbf
---
 extras/gbz80disasm.py | 1050 ++++++++++++++++++++++++-------------------------
 pokered.asm           |    2 +-
 2 files changed, 526 insertions(+), 526 deletions(-)

diff --git a/extras/gbz80disasm.py b/extras/gbz80disasm.py
index 7c2079e0..aa01691c 100644
--- a/extras/gbz80disasm.py
+++ b/extras/gbz80disasm.py
@@ -9,519 +9,519 @@ import sys
 spacing = "    "
 
 temp_opt_table = [
-  [ "ADC A", 0x8f, 0 ], 
-  [ "ADC B", 0x88, 0 ], 
-  [ "ADC C", 0x89, 0 ], 
-  [ "ADC D", 0x8a, 0 ], 
-  [ "ADC E", 0x8b, 0 ], 
-  [ "ADC H", 0x8c, 0 ], 
-  [ "ADC [HL]", 0x8e, 0 ], 
-  [ "ADC L", 0x8d, 0 ], 
-  [ "ADC x", 0xce, 1 ], 
-  [ "ADD A", 0x87, 0 ], 
-  [ "ADD B", 0x80, 0 ], 
-  [ "ADD C", 0x81, 0 ], 
-  [ "ADD D", 0x82, 0 ], 
-  [ "ADD E", 0x83, 0 ], 
-  [ "ADD H", 0x84, 0 ], 
-  [ "ADD [HL]", 0x86, 0 ], 
-  [ "ADD HL, BC", 0x9, 0 ], 
-  [ "ADD HL, DE", 0x19, 0 ], 
-  [ "ADD HL, HL", 0x29, 0 ], 
-  [ "ADD HL, SP", 0x39, 0 ], 
-  [ "ADD L", 0x85, 0 ], 
-  [ "ADD SP, x", 0xe8, 1 ], 
-  [ "ADD x", 0xc6, 1 ], 
-  [ "AND A", 0xa7, 0 ], 
-  [ "AND B", 0xa0, 0 ], 
-  [ "AND C", 0xa1, 0 ], 
-  [ "AND D", 0xa2, 0 ], 
-  [ "AND E", 0xa3, 0 ], 
-  [ "AND H", 0xa4, 0 ], 
-  [ "AND [HL]", 0xa6, 0 ], 
-  [ "AND L", 0xa5, 0 ], 
-  [ "AND x", 0xe6, 1 ], 
-  [ "BIT 0, A", 0x47cb, 3 ], 
-  [ "BIT 0, B", 0x40cb, 3 ], 
-  [ "BIT 0, C", 0x41cb, 3 ], 
-  [ "BIT 0, D", 0x42cb, 3 ], 
-  [ "BIT 0, E", 0x43cb, 3 ], 
-  [ "BIT 0, H", 0x44cb, 3 ], 
-  [ "BIT 0, [HL]", 0x46cb, 3 ], 
-  [ "BIT 0, L", 0x45cb, 3 ], 
-  [ "BIT 1, A", 0x4fcb, 3 ], 
-  [ "BIT 1, B", 0x48cb, 3 ], 
-  [ "BIT 1, C", 0x49cb, 3 ], 
-  [ "BIT 1, D", 0x4acb, 3 ], 
-  [ "BIT 1, E", 0x4bcb, 3 ], 
-  [ "BIT 1, H", 0x4ccb, 3 ], 
-  [ "BIT 1, [HL]", 0x4ecb, 3 ], 
-  [ "BIT 1, L", 0x4dcb, 3 ], 
-  [ "BIT 2, A", 0x57cb, 3 ], 
-  [ "BIT 2, B", 0x50cb, 3 ], 
-  [ "BIT 2, C", 0x51cb, 3 ], 
-  [ "BIT 2, D", 0x52cb, 3 ], 
-  [ "BIT 2, E", 0x53cb, 3 ], 
-  [ "BIT 2, H", 0x54cb, 3 ], 
-  [ "BIT 2, [HL]", 0x56cb, 3 ], 
-  [ "BIT 2, L", 0x55cb, 3 ], 
-  [ "BIT 3, A", 0x5fcb, 3 ], 
-  [ "BIT 3, B", 0x58cb, 3 ], 
-  [ "BIT 3, C", 0x59cb, 3 ], 
-  [ "BIT 3, D", 0x5acb, 3 ], 
-  [ "BIT 3, E", 0x5bcb, 3 ], 
-  [ "BIT 3, H", 0x5ccb, 3 ], 
-  [ "BIT 3, [HL]", 0x5ecb, 3 ], 
-  [ "BIT 3, L", 0x5dcb, 3 ], 
-  [ "BIT 4, A", 0x67cb, 3 ], 
-  [ "BIT 4, B", 0x60cb, 3 ], 
-  [ "BIT 4, C", 0x61cb, 3 ], 
-  [ "BIT 4, D", 0x62cb, 3 ], 
-  [ "BIT 4, E", 0x63cb, 3 ], 
-  [ "BIT 4, H", 0x64cb, 3 ], 
-  [ "BIT 4, [HL]", 0x66cb, 3 ], 
-  [ "BIT 4, L", 0x65cb, 3 ], 
-  [ "BIT 5, A", 0x6fcb, 3 ], 
-  [ "BIT 5, B", 0x68cb, 3 ], 
-  [ "BIT 5, C", 0x69cb, 3 ], 
-  [ "BIT 5, D", 0x6acb, 3 ], 
-  [ "BIT 5, E", 0x6bcb, 3 ], 
-  [ "BIT 5, H", 0x6ccb, 3 ], 
-  [ "BIT 5, [HL]", 0x6ecb, 3 ], 
-  [ "BIT 5, L", 0x6dcb, 3 ], 
-  [ "BIT 6, A", 0x77cb, 3 ], 
-  [ "BIT 6, B", 0x70cb, 3 ], 
-  [ "BIT 6, C", 0x71cb, 3 ], 
-  [ "BIT 6, D", 0x72cb, 3 ], 
-  [ "BIT 6, E", 0x73cb, 3 ], 
-  [ "BIT 6, H", 0x74cb, 3 ], 
-  [ "BIT 6, [HL]", 0x76cb, 3 ], 
-  [ "BIT 6, L", 0x75cb, 3 ], 
-  [ "BIT 7, A", 0x7fcb, 3 ], 
-  [ "BIT 7, B", 0x78cb, 3 ], 
-  [ "BIT 7, C", 0x79cb, 3 ], 
-  [ "BIT 7, D", 0x7acb, 3 ], 
-  [ "BIT 7, E", 0x7bcb, 3 ], 
-  [ "BIT 7, H", 0x7ccb, 3 ], 
-  [ "BIT 7, [HL]", 0x7ecb, 3 ], 
-  [ "BIT 7, L", 0x7dcb, 3 ], 
-  [ "CALL C, ?", 0xdc, 2 ], 
-  [ "CALL NC, ?", 0xd4, 2 ], 
-  [ "CALL NZ, ?", 0xc4, 2 ], 
-  [ "CALL Z, ?", 0xcc, 2 ], 
-  [ "CALL ?", 0xcd, 2 ], 
-  [ "CCF", 0x3f, 0 ], 
-  [ "CP A", 0xbf, 0 ], 
-  [ "CP B", 0xb8, 0 ], 
-  [ "CP C", 0xb9, 0 ], 
-  [ "CP D", 0xba, 0 ], 
-  [ "CP E", 0xbb, 0 ], 
-  [ "CP H", 0xbc, 0 ], 
-  [ "CP [HL]", 0xbe, 0 ], 
-  [ "CPL", 0x2f, 0 ], 
-  [ "CP L", 0xbd, 0 ], 
-  [ "CP x", 0xfe, 1 ], 
-  [ "DAA", 0x27, 0 ], 
-  [ "DEBUG", 0xed, 0 ], 
-  [ "DEC A", 0x3d, 0 ], 
-  [ "DEC B", 0x5, 0 ], 
-  [ "DEC BC", 0xb, 0 ], 
-  [ "DEC C", 0xd, 0 ], 
-  [ "DEC D", 0x15, 0 ], 
-  [ "DEC DE", 0x1b, 0 ], 
-  [ "DEC E", 0x1d, 0 ], 
-  [ "DEC H", 0x25, 0 ], 
-  [ "DEC HL", 0x2b, 0 ], 
-  [ "DEC [HL]", 0x35, 0 ], 
-  [ "DEC L", 0x2d, 0 ], 
-  [ "DEC SP", 0x3b, 0 ], 
-  [ "DI", 0xf3, 0 ], 
-  [ "EI", 0xfb, 0 ], 
-  [ "HALT", 0x76, 0 ], 
-  [ "INC A", 0x3c, 0 ], 
-  [ "INC B", 0x4, 0 ], 
-  [ "INC BC", 0x3, 0 ], 
-  [ "INC C", 0xc, 0 ], 
-  [ "INC D", 0x14, 0 ], 
-  [ "INC DE", 0x13, 0 ], 
-  [ "INC E", 0x1c, 0 ], 
-  [ "INC H", 0x24, 0 ], 
-  [ "INC HL", 0x23, 0 ], 
-  [ "INC [HL]", 0x34, 0 ], 
-  [ "INC L", 0x2c, 0 ], 
-  [ "INC SP", 0x33, 0 ], 
-  [ "JP C, ?", 0xda, 2 ], 
-  [ "JP HL", 0xe9, 0 ], 
-  [ "JP NC, ?", 0xd2, 2 ], 
-  [ "JP NZ, ?", 0xc2, 2 ], 
-  [ "JP Z, ?", 0xca, 2 ], 
-  [ "JP ?", 0xc3, 2 ], 
-  [ "JR C, x", 0x38, 1 ], 
-  [ "JR NC, x", 0x30, 1 ], 
-  [ "JR NZ, x", 0x20, 1 ], 
-  [ "JR Z, x", 0x28, 1 ], 
-  [ "JR x", 0x18, 1 ], 
-  [ "LD A, A", 0x7f, 0 ], 
-  [ "LD A, B", 0x78, 0 ], 
-  [ "LD A, C", 0x79, 0 ], 
-  [ "LD A, D", 0x7a, 0 ], 
-  [ "LD A, E", 0x7b, 0 ], 
-  [ "LD A, H", 0x7c, 0 ], 
-  [ "LD A, L", 0x7d, 0 ], 
-  [ "LD A, [$FF00+C]", 0xf2, 0 ], 
-  [ "LD A, [$FF00+x]", 0xf0, 1 ], 
+  [ "ADC A", 0x8f, 0 ],
+  [ "ADC B", 0x88, 0 ],
+  [ "ADC C", 0x89, 0 ],
+  [ "ADC D", 0x8a, 0 ],
+  [ "ADC E", 0x8b, 0 ],
+  [ "ADC H", 0x8c, 0 ],
+  [ "ADC [HL]", 0x8e, 0 ],
+  [ "ADC L", 0x8d, 0 ],
+  [ "ADC x", 0xce, 1 ],
+  [ "ADD A", 0x87, 0 ],
+  [ "ADD B", 0x80, 0 ],
+  [ "ADD C", 0x81, 0 ],
+  [ "ADD D", 0x82, 0 ],
+  [ "ADD E", 0x83, 0 ],
+  [ "ADD H", 0x84, 0 ],
+  [ "ADD [HL]", 0x86, 0 ],
+  [ "ADD HL, BC", 0x9, 0 ],
+  [ "ADD HL, DE", 0x19, 0 ],
+  [ "ADD HL, HL", 0x29, 0 ],
+  [ "ADD HL, SP", 0x39, 0 ],
+  [ "ADD L", 0x85, 0 ],
+  [ "ADD SP, x", 0xe8, 1 ],
+  [ "ADD x", 0xc6, 1 ],
+  [ "AND A", 0xa7, 0 ],
+  [ "AND B", 0xa0, 0 ],
+  [ "AND C", 0xa1, 0 ],
+  [ "AND D", 0xa2, 0 ],
+  [ "AND E", 0xa3, 0 ],
+  [ "AND H", 0xa4, 0 ],
+  [ "AND [HL]", 0xa6, 0 ],
+  [ "AND L", 0xa5, 0 ],
+  [ "AND x", 0xe6, 1 ],
+  [ "BIT 0, A", 0x47cb, 3 ],
+  [ "BIT 0, B", 0x40cb, 3 ],
+  [ "BIT 0, C", 0x41cb, 3 ],
+  [ "BIT 0, D", 0x42cb, 3 ],
+  [ "BIT 0, E", 0x43cb, 3 ],
+  [ "BIT 0, H", 0x44cb, 3 ],
+  [ "BIT 0, [HL]", 0x46cb, 3 ],
+  [ "BIT 0, L", 0x45cb, 3 ],
+  [ "BIT 1, A", 0x4fcb, 3 ],
+  [ "BIT 1, B", 0x48cb, 3 ],
+  [ "BIT 1, C", 0x49cb, 3 ],
+  [ "BIT 1, D", 0x4acb, 3 ],
+  [ "BIT 1, E", 0x4bcb, 3 ],
+  [ "BIT 1, H", 0x4ccb, 3 ],
+  [ "BIT 1, [HL]", 0x4ecb, 3 ],
+  [ "BIT 1, L", 0x4dcb, 3 ],
+  [ "BIT 2, A", 0x57cb, 3 ],
+  [ "BIT 2, B", 0x50cb, 3 ],
+  [ "BIT 2, C", 0x51cb, 3 ],
+  [ "BIT 2, D", 0x52cb, 3 ],
+  [ "BIT 2, E", 0x53cb, 3 ],
+  [ "BIT 2, H", 0x54cb, 3 ],
+  [ "BIT 2, [HL]", 0x56cb, 3 ],
+  [ "BIT 2, L", 0x55cb, 3 ],
+  [ "BIT 3, A", 0x5fcb, 3 ],
+  [ "BIT 3, B", 0x58cb, 3 ],
+  [ "BIT 3, C", 0x59cb, 3 ],
+  [ "BIT 3, D", 0x5acb, 3 ],
+  [ "BIT 3, E", 0x5bcb, 3 ],
+  [ "BIT 3, H", 0x5ccb, 3 ],
+  [ "BIT 3, [HL]", 0x5ecb, 3 ],
+  [ "BIT 3, L", 0x5dcb, 3 ],
+  [ "BIT 4, A", 0x67cb, 3 ],
+  [ "BIT 4, B", 0x60cb, 3 ],
+  [ "BIT 4, C", 0x61cb, 3 ],
+  [ "BIT 4, D", 0x62cb, 3 ],
+  [ "BIT 4, E", 0x63cb, 3 ],
+  [ "BIT 4, H", 0x64cb, 3 ],
+  [ "BIT 4, [HL]", 0x66cb, 3 ],
+  [ "BIT 4, L", 0x65cb, 3 ],
+  [ "BIT 5, A", 0x6fcb, 3 ],
+  [ "BIT 5, B", 0x68cb, 3 ],
+  [ "BIT 5, C", 0x69cb, 3 ],
+  [ "BIT 5, D", 0x6acb, 3 ],
+  [ "BIT 5, E", 0x6bcb, 3 ],
+  [ "BIT 5, H", 0x6ccb, 3 ],
+  [ "BIT 5, [HL]", 0x6ecb, 3 ],
+  [ "BIT 5, L", 0x6dcb, 3 ],
+  [ "BIT 6, A", 0x77cb, 3 ],
+  [ "BIT 6, B", 0x70cb, 3 ],
+  [ "BIT 6, C", 0x71cb, 3 ],
+  [ "BIT 6, D", 0x72cb, 3 ],
+  [ "BIT 6, E", 0x73cb, 3 ],
+  [ "BIT 6, H", 0x74cb, 3 ],
+  [ "BIT 6, [HL]", 0x76cb, 3 ],
+  [ "BIT 6, L", 0x75cb, 3 ],
+  [ "BIT 7, A", 0x7fcb, 3 ],
+  [ "BIT 7, B", 0x78cb, 3 ],
+  [ "BIT 7, C", 0x79cb, 3 ],
+  [ "BIT 7, D", 0x7acb, 3 ],
+  [ "BIT 7, E", 0x7bcb, 3 ],
+  [ "BIT 7, H", 0x7ccb, 3 ],
+  [ "BIT 7, [HL]", 0x7ecb, 3 ],
+  [ "BIT 7, L", 0x7dcb, 3 ],
+  [ "CALL C, ?", 0xdc, 2 ],
+  [ "CALL NC, ?", 0xd4, 2 ],
+  [ "CALL NZ, ?", 0xc4, 2 ],
+  [ "CALL Z, ?", 0xcc, 2 ],
+  [ "CALL ?", 0xcd, 2 ],
+  [ "CCF", 0x3f, 0 ],
+  [ "CP A", 0xbf, 0 ],
+  [ "CP B", 0xb8, 0 ],
+  [ "CP C", 0xb9, 0 ],
+  [ "CP D", 0xba, 0 ],
+  [ "CP E", 0xbb, 0 ],
+  [ "CP H", 0xbc, 0 ],
+  [ "CP [HL]", 0xbe, 0 ],
+  [ "CPL", 0x2f, 0 ],
+  [ "CP L", 0xbd, 0 ],
+  [ "CP x", 0xfe, 1 ],
+  [ "DAA", 0x27, 0 ],
+  [ "DEBUG", 0xed, 0 ],
+  [ "DEC A", 0x3d, 0 ],
+  [ "DEC B", 0x5, 0 ],
+  [ "DEC BC", 0xb, 0 ],
+  [ "DEC C", 0xd, 0 ],
+  [ "DEC D", 0x15, 0 ],
+  [ "DEC DE", 0x1b, 0 ],
+  [ "DEC E", 0x1d, 0 ],
+  [ "DEC H", 0x25, 0 ],
+  [ "DEC HL", 0x2b, 0 ],
+  [ "DEC [HL]", 0x35, 0 ],
+  [ "DEC L", 0x2d, 0 ],
+  [ "DEC SP", 0x3b, 0 ],
+  [ "DI", 0xf3, 0 ],
+  [ "EI", 0xfb, 0 ],
+  [ "HALT", 0x76, 0 ],
+  [ "INC A", 0x3c, 0 ],
+  [ "INC B", 0x4, 0 ],
+  [ "INC BC", 0x3, 0 ],
+  [ "INC C", 0xc, 0 ],
+  [ "INC D", 0x14, 0 ],
+  [ "INC DE", 0x13, 0 ],
+  [ "INC E", 0x1c, 0 ],
+  [ "INC H", 0x24, 0 ],
+  [ "INC HL", 0x23, 0 ],
+  [ "INC [HL]", 0x34, 0 ],
+  [ "INC L", 0x2c, 0 ],
+  [ "INC SP", 0x33, 0 ],
+  [ "JP C, ?", 0xda, 2 ],
+  [ "JP HL", 0xe9, 0 ],
+  [ "JP NC, ?", 0xd2, 2 ],
+  [ "JP NZ, ?", 0xc2, 2 ],
+  [ "JP Z, ?", 0xca, 2 ],
+  [ "JP ?", 0xc3, 2 ],
+  [ "JR C, x", 0x38, 1 ],
+  [ "JR NC, x", 0x30, 1 ],
+  [ "JR NZ, x", 0x20, 1 ],
+  [ "JR Z, x", 0x28, 1 ],
+  [ "JR x", 0x18, 1 ],
+  [ "LD A, A", 0x7f, 0 ],
+  [ "LD A, B", 0x78, 0 ],
+  [ "LD A, C", 0x79, 0 ],
+  [ "LD A, D", 0x7a, 0 ],
+  [ "LD A, E", 0x7b, 0 ],
+  [ "LD A, H", 0x7c, 0 ],
+  [ "LD A, L", 0x7d, 0 ],
+  [ "LD A, [$FF00+C]", 0xf2, 0 ],
+  [ "LD A, [$FF00+x]", 0xf0, 1 ],
 #  [ "LDH A, [x]", 0xf0, 1 ], #rgbds has trouble with this one?
-  [ "LD A, [BC]", 0xa, 0 ], 
-  [ "LD A, [DE]", 0x1a, 0 ], 
-#  [ "LD A, [HL+]", 0x2a, 0 ], 
-#  [ "LD A, [HL-]", 0x3a, 0 ], 
-  [ "LD A, [HL]", 0x7e, 0 ], 
-  [ "LD A, [HLD]", 0x3a, 0 ], 
-  [ "LD A, [HLI]", 0x2a, 0 ], 
-  [ "LD A, [?]", 0xfa, 2 ], 
-  [ "LD A, x", 0x3e, 1 ], 
-  [ "LD B, A", 0x47, 0 ], 
-  [ "LD B, B", 0x40, 0 ], 
-  [ "LD B, C", 0x41, 0 ], 
-  [ "LD [BC], A", 0x2, 0 ], 
-  [ "LD B, D", 0x42, 0 ], 
-  [ "LD B, E", 0x43, 0 ], 
-  [ "LD B, H", 0x44, 0 ], 
-  [ "LD B, [HL]", 0x46, 0 ], 
-  [ "LD B, L", 0x45, 0 ], 
-  [ "LD B, x", 0x6, 1 ], 
-  [ "LD C, A", 0x4f, 0 ], 
-  [ "LD C, B", 0x48, 0 ], 
-  [ "LD C, C", 0x49, 0 ], 
-  [ "LD C, D", 0x4a, 0 ], 
-  [ "LD C, E", 0x4b, 0 ], 
-  [ "LD C, H", 0x4c, 0 ], 
-  [ "LD C, [HL]", 0x4e, 0 ], 
-  [ "LD C, L", 0x4d, 0 ], 
-  [ "LD C, x", 0xe, 1 ], 
-  [ "LD D, A", 0x57, 0 ], 
-#  [ "LDD A, [HL]", 0x3a, 0 ], 
-  [ "LD D, B", 0x50, 0 ], 
-  [ "LD D, C", 0x51, 0 ], 
-  [ "LD D, D", 0x52, 0 ], 
-  [ "LD D, E", 0x53, 0 ], 
-  [ "LD [DE], A", 0x12, 0 ], 
-  [ "LD D, H", 0x54, 0 ], 
-  [ "LD D, [HL]", 0x56, 0 ], 
-#  [ "LDD [HL], A", 0x32, 0 ], 
-  [ "LD D, L", 0x55, 0 ], 
-  [ "LD D, x", 0x16, 1 ], 
-  [ "LD E, A", 0x5f, 0 ], 
-  [ "LD E, B", 0x58, 0 ], 
-  [ "LD E, C", 0x59, 0 ], 
-  [ "LD E, D", 0x5a, 0 ], 
-  [ "LD E, E", 0x5b, 0 ], 
-  [ "LD E, H", 0x5c, 0 ], 
-  [ "LD E, [HL]", 0x5e, 0 ], 
-  [ "LD E, L", 0x5d, 0 ], 
-  [ "LD E, x", 0x1e, 1 ], 
-  [ "LD [$FF00+C], A", 0xe2, 0 ], 
-  [ "LD [$FF00+x], A", 0xe0, 1 ], 
-#  [ "LDH [x], A", 0xe0, 1 ], 
-  [ "LD H, A", 0x67, 0 ], 
-  [ "LD H, B", 0x60, 0 ], 
-  [ "LD H, C", 0x61, 0 ], 
-  [ "LD H, D", 0x62, 0 ], 
-  [ "LD H, E", 0x63, 0 ], 
-  [ "LD H, H", 0x64, 0 ], 
-  [ "LD H, [HL]", 0x66, 0 ], 
-  [ "LD H, L", 0x65, 0 ], 
-#  [ "LD [HL+], A", 0x22, 0 ], 
-#  [ "LD [HL-], A", 0x32, 0 ], 
-  [ "LD [HL], A", 0x77, 0 ], 
-  [ "LD [HL], B", 0x70, 0 ], 
-  [ "LD [HL], C", 0x71, 0 ], 
-  [ "LD [HL], D", 0x72, 0 ], 
-  [ "LD [HLD], A", 0x32, 0 ], 
-  [ "LD [HL], E", 0x73, 0 ], 
-  [ "LD [HL], H", 0x74, 0 ], 
-  [ "LD [HLI], A", 0x22, 0 ], 
-  [ "LD [HL], L", 0x75, 0 ], 
-  [ "LD HL, SP+x", 0xf8, 1 ], 
-  [ "LD [HL], x", 0x36, 1 ], 
-  [ "LD H, x", 0x26, 1 ], 
-#  [ "LDI A, [HL]", 0x2a, 0 ], 
-#  [ "LDI [HL], A", 0x22, 0 ], 
-  [ "LD L, A", 0x6f, 0 ], 
-  [ "LD L, B", 0x68, 0 ], 
-  [ "LD L, C", 0x69, 0 ], 
-  [ "LD L, D", 0x6a, 0 ], 
-  [ "LD L, E", 0x6b, 0 ], 
-  [ "LD L, H", 0x6c, 0 ], 
-  [ "LD L, [HL]", 0x6e, 0 ], 
-  [ "LD L, L", 0x6d, 0 ], 
-  [ "LD L, x", 0x2e, 1 ], 
+  [ "LD A, [BC]", 0xa, 0 ],
+  [ "LD A, [DE]", 0x1a, 0 ],
+#  [ "LD A, [HL+]", 0x2a, 0 ],
+#  [ "LD A, [HL-]", 0x3a, 0 ],
+  [ "LD A, [HL]", 0x7e, 0 ],
+  [ "LD A, [HLD]", 0x3a, 0 ],
+  [ "LD A, [HLI]", 0x2a, 0 ],
+  [ "LD A, [?]", 0xfa, 2 ],
+  [ "LD A, x", 0x3e, 1 ],
+  [ "LD B, A", 0x47, 0 ],
+  [ "LD B, B", 0x40, 0 ],
+  [ "LD B, C", 0x41, 0 ],
+  [ "LD [BC], A", 0x2, 0 ],
+  [ "LD B, D", 0x42, 0 ],
+  [ "LD B, E", 0x43, 0 ],
+  [ "LD B, H", 0x44, 0 ],
+  [ "LD B, [HL]", 0x46, 0 ],
+  [ "LD B, L", 0x45, 0 ],
+  [ "LD B, x", 0x6, 1 ],
+  [ "LD C, A", 0x4f, 0 ],
+  [ "LD C, B", 0x48, 0 ],
+  [ "LD C, C", 0x49, 0 ],
+  [ "LD C, D", 0x4a, 0 ],
+  [ "LD C, E", 0x4b, 0 ],
+  [ "LD C, H", 0x4c, 0 ],
+  [ "LD C, [HL]", 0x4e, 0 ],
+  [ "LD C, L", 0x4d, 0 ],
+  [ "LD C, x", 0xe, 1 ],
+  [ "LD D, A", 0x57, 0 ],
+#  [ "LDD A, [HL]", 0x3a, 0 ],
+  [ "LD D, B", 0x50, 0 ],
+  [ "LD D, C", 0x51, 0 ],
+  [ "LD D, D", 0x52, 0 ],
+  [ "LD D, E", 0x53, 0 ],
+  [ "LD [DE], A", 0x12, 0 ],
+  [ "LD D, H", 0x54, 0 ],
+  [ "LD D, [HL]", 0x56, 0 ],
+#  [ "LDD [HL], A", 0x32, 0 ],
+  [ "LD D, L", 0x55, 0 ],
+  [ "LD D, x", 0x16, 1 ],
+  [ "LD E, A", 0x5f, 0 ],
+  [ "LD E, B", 0x58, 0 ],
+  [ "LD E, C", 0x59, 0 ],
+  [ "LD E, D", 0x5a, 0 ],
+  [ "LD E, E", 0x5b, 0 ],
+  [ "LD E, H", 0x5c, 0 ],
+  [ "LD E, [HL]", 0x5e, 0 ],
+  [ "LD E, L", 0x5d, 0 ],
+  [ "LD E, x", 0x1e, 1 ],
+  [ "LD [$FF00+C], A", 0xe2, 0 ],
+  [ "LD [$FF00+x], A", 0xe0, 1 ],
+#  [ "LDH [x], A", 0xe0, 1 ],
+  [ "LD H, A", 0x67, 0 ],
+  [ "LD H, B", 0x60, 0 ],
+  [ "LD H, C", 0x61, 0 ],
+  [ "LD H, D", 0x62, 0 ],
+  [ "LD H, E", 0x63, 0 ],
+  [ "LD H, H", 0x64, 0 ],
+  [ "LD H, [HL]", 0x66, 0 ],
+  [ "LD H, L", 0x65, 0 ],
+#  [ "LD [HL+], A", 0x22, 0 ],
+#  [ "LD [HL-], A", 0x32, 0 ],
+  [ "LD [HL], A", 0x77, 0 ],
+  [ "LD [HL], B", 0x70, 0 ],
+  [ "LD [HL], C", 0x71, 0 ],
+  [ "LD [HL], D", 0x72, 0 ],
+  [ "LD [HLD], A", 0x32, 0 ],
+  [ "LD [HL], E", 0x73, 0 ],
+  [ "LD [HL], H", 0x74, 0 ],
+  [ "LD [HLI], A", 0x22, 0 ],
+  [ "LD [HL], L", 0x75, 0 ],
+  [ "LD HL, SP+x", 0xf8, 1 ],
+  [ "LD [HL], x", 0x36, 1 ],
+  [ "LD H, x", 0x26, 1 ],
+#  [ "LDI A, [HL]", 0x2a, 0 ],
+#  [ "LDI [HL], A", 0x22, 0 ],
+  [ "LD L, A", 0x6f, 0 ],
+  [ "LD L, B", 0x68, 0 ],
+  [ "LD L, C", 0x69, 0 ],
+  [ "LD L, D", 0x6a, 0 ],
+  [ "LD L, E", 0x6b, 0 ],
+  [ "LD L, H", 0x6c, 0 ],
+  [ "LD L, [HL]", 0x6e, 0 ],
+  [ "LD L, L", 0x6d, 0 ],
+  [ "LD L, x", 0x2e, 1 ],
 #  [ "LD PC, HL", 0xe9, 0 ], #prefer jp [hl]
-  [ "LD SP, HL", 0xf9, 0 ], 
-  [ "LD BC, ?", 0x1, 2 ], 
-  [ "LD DE, ?", 0x11, 2 ], 
-  [ "LD HL, ?", 0x21, 2 ], 
-  [ "LD SP, ?", 0x31, 2 ], 
-#  [ "LD [?], SP", 0x8, 2 ], 
-  [ "LD [?], A", 0xea, 2 ], 
-  [ "NOP", 0x0, 0 ], 
-  [ "OR A", 0xb7, 0 ], 
-  [ "OR B", 0xb0, 0 ], 
-  [ "OR C", 0xb1, 0 ], 
-  [ "OR D", 0xb2, 0 ], 
-  [ "OR E", 0xb3, 0 ], 
-  [ "OR H", 0xb4, 0 ], 
-  [ "OR [HL]", 0xb6, 0 ], 
-  [ "OR L", 0xb5, 0 ], 
-  [ "OR x", 0xf6, 1 ], 
-  [ "POP AF", 0xf1, 0 ], 
-  [ "POP BC", 0xc1, 0 ], 
-  [ "POP DE", 0xd1, 0 ], 
-  [ "POP HL", 0xe1, 0 ], 
-  [ "PUSH AF", 0xf5, 0 ], 
-  [ "PUSH BC", 0xc5, 0 ], 
-  [ "PUSH DE", 0xd5, 0 ], 
-  [ "PUSH HL", 0xe5, 0 ], 
-  [ "RES 0, A", 0x87cb, 3 ], 
-  [ "RES 0, B", 0x80cb, 3 ], 
-  [ "RES 0, C", 0x81cb, 3 ], 
-  [ "RES 0, D", 0x82cb, 3 ], 
-  [ "RES 0, E", 0x83cb, 3 ], 
-  [ "RES 0, H", 0x84cb, 3 ], 
-  [ "RES 0, [HL]", 0x86cb, 3 ], 
-  [ "RES 0, L", 0x85cb, 3 ], 
-  [ "RES 1, A", 0x8fcb, 3 ], 
-  [ "RES 1, B", 0x88cb, 3 ], 
-  [ "RES 1, C", 0x89cb, 3 ], 
-  [ "RES 1, D", 0x8acb, 3 ], 
-  [ "RES 1, E", 0x8bcb, 3 ], 
-  [ "RES 1, H", 0x8ccb, 3 ], 
-  [ "RES 1, [HL]", 0x8ecb, 3 ], 
-  [ "RES 1, L", 0x8dcb, 3 ], 
-  [ "RES 2, A", 0x97cb, 3 ], 
-  [ "RES 2, B", 0x90cb, 3 ], 
-  [ "RES 2, C", 0x91cb, 3 ], 
-  [ "RES 2, D", 0x92cb, 3 ], 
-  [ "RES 2, E", 0x93cb, 3 ], 
-  [ "RES 2, H", 0x94cb, 3 ], 
-  [ "RES 2, [HL]", 0x96cb, 3 ], 
-  [ "RES 2, L", 0x95cb, 3 ], 
-  [ "RES 3, A", 0x9fcb, 3 ], 
-  [ "RES 3, B", 0x98cb, 3 ], 
-  [ "RES 3, C", 0x99cb, 3 ], 
-  [ "RES 3, D", 0x9acb, 3 ], 
-  [ "RES 3, E", 0x9bcb, 3 ], 
-  [ "RES 3, H", 0x9ccb, 3 ], 
-  [ "RES 3, [HL]", 0x9ecb, 3 ], 
-  [ "RES 3, L", 0x9dcb, 3 ], 
-  [ "RES 4, A", 0xa7cb, 3 ], 
-  [ "RES 4, B", 0xa0cb, 3 ], 
-  [ "RES 4, C", 0xa1cb, 3 ], 
-  [ "RES 4, D", 0xa2cb, 3 ], 
-  [ "RES 4, E", 0xa3cb, 3 ], 
-  [ "RES 4, H", 0xa4cb, 3 ], 
-  [ "RES 4, [HL]", 0xa6cb, 3 ], 
-  [ "RES 4, L", 0xa5cb, 3 ], 
-  [ "RES 5, A", 0xafcb, 3 ], 
-  [ "RES 5, B", 0xa8cb, 3 ], 
-  [ "RES 5, C", 0xa9cb, 3 ], 
-  [ "RES 5, D", 0xaacb, 3 ], 
-  [ "RES 5, E", 0xabcb, 3 ], 
-  [ "RES 5, H", 0xaccb, 3 ], 
-  [ "RES 5, [HL]", 0xaecb, 3 ], 
-  [ "RES 5, L", 0xadcb, 3 ], 
-  [ "RES 6, A", 0xb7cb, 3 ], 
-  [ "RES 6, B", 0xb0cb, 3 ], 
-  [ "RES 6, C", 0xb1cb, 3 ], 
-  [ "RES 6, D", 0xb2cb, 3 ], 
-  [ "RES 6, E", 0xb3cb, 3 ], 
-  [ "RES 6, H", 0xb4cb, 3 ], 
-  [ "RES 6, [HL]", 0xb6cb, 3 ], 
-  [ "RES 6, L", 0xb5cb, 3 ], 
-  [ "RES 7, A", 0xbfcb, 3 ], 
-  [ "RES 7, B", 0xb8cb, 3 ], 
-  [ "RES 7, C", 0xb9cb, 3 ], 
-  [ "RES 7, D", 0xbacb, 3 ], 
-  [ "RES 7, E", 0xbbcb, 3 ], 
-  [ "RES 7, H", 0xbccb, 3 ], 
-  [ "RES 7, [HL]", 0xbecb, 3 ], 
-  [ "RES 7, L", 0xbdcb, 3 ], 
-  [ "RETI", 0xd9, 0 ], 
-  [ "RET C", 0xd8, 0 ], 
-  [ "RET NC", 0xd0, 0 ], 
-  [ "RET NZ", 0xc0, 0 ], 
-  [ "RET Z", 0xc8, 0 ], 
-  [ "RET", 0xc9, 0 ], 
-  [ "RLA", 0x17, 0 ], 
-  [ "RL A", 0x17cb, 3 ], 
-  [ "RL B", 0x10cb, 3 ], 
-  [ "RL C", 0x11cb, 3 ], 
-  [ "RLCA", 0x7, 0 ], 
-  [ "RLC A", 0x7cb, 3 ], 
-  [ "RLC B", 0xcb, 3 ], 
-  [ "RLC C", 0x1cb, 3 ], 
-  [ "RLC D", 0x2cb, 3 ], 
-  [ "RLC E", 0x3cb, 3 ], 
-  [ "RLC H", 0x4cb, 3 ], 
-  [ "RLC [HL]", 0x6cb, 3 ], 
-  [ "RLC L", 0x5cb, 3 ], 
-  [ "RL D", 0x12cb, 3 ], 
-  [ "RL E", 0x13cb, 3 ], 
-  [ "RL H", 0x14cb, 3 ], 
-  [ "RL [HL]", 0x16cb, 3 ], 
-  [ "RL L", 0x15cb, 3 ], 
-  [ "RRA", 0x1f, 0 ], 
-  [ "RR A", 0x1fcb, 3 ], 
-  [ "RR B", 0x18cb, 3 ], 
-  [ "RR C", 0x19cb, 3 ], 
-  [ "RRCA", 0xf, 0 ], 
-  [ "RRC A", 0xfcb, 3 ], 
-  [ "RRC B", 0x8cb, 3 ], 
-  [ "RRC C", 0x9cb, 3 ], 
-  [ "RRC D", 0xacb, 3 ], 
-  [ "RRC E", 0xbcb, 3 ], 
-  [ "RRC H", 0xccb, 3 ], 
-  [ "RRC [HL]", 0xecb, 3 ], 
-  [ "RRC L", 0xdcb, 3 ], 
-  [ "RR D", 0x1acb, 3 ], 
-  [ "RR E", 0x1bcb, 3 ], 
-  [ "RR H", 0x1ccb, 3 ], 
-  [ "RR [HL]", 0x1ecb, 3 ], 
-  [ "RR L", 0x1dcb, 3 ], 
-  [ "RST $0", 0xc7, 0 ], 
-  [ "RST $10", 0xd7, 0 ], 
-  [ "RST $18", 0xdf, 0 ], 
-  [ "RST $20", 0xe7, 0 ], 
-  [ "RST $28", 0xef, 0 ], 
-  [ "RST $30", 0xf7, 0 ], 
-  [ "RST $38", 0xff, 0 ], 
-  [ "RST $8", 0xcf, 0 ], 
-  [ "SBC A", 0x9f, 0 ], 
-  [ "SBC B", 0x98, 0 ], 
-  [ "SBC C", 0x99, 0 ], 
-  [ "SBC D", 0x9a, 0 ], 
-  [ "SBC E", 0x9b, 0 ], 
-  [ "SBC H", 0x9c, 0 ], 
-  [ "SBC [HL]", 0x9e, 0 ], 
-  [ "SBC L", 0x9d, 0 ], 
-  [ "SBC x", 0xde, 1 ], 
-  [ "SCF", 0x37, 0 ], 
-  [ "SET 0, A", 0xc7cb, 3 ], 
-  [ "SET 0, B", 0xc0cb, 3 ], 
-  [ "SET 0, C", 0xc1cb, 3 ], 
-  [ "SET 0, D", 0xc2cb, 3 ], 
-  [ "SET 0, E", 0xc3cb, 3 ], 
-  [ "SET 0, H", 0xc4cb, 3 ], 
-  [ "SET 0, [HL]", 0xc6cb, 3 ], 
-  [ "SET 0, L", 0xc5cb, 3 ], 
-  [ "SET 1, A", 0xcfcb, 3 ], 
-  [ "SET 1, B", 0xc8cb, 3 ], 
-  [ "SET 1, C", 0xc9cb, 3 ], 
-  [ "SET 1, D", 0xcacb, 3 ], 
-  [ "SET 1, E", 0xcbcb, 3 ], 
-  [ "SET 1, H", 0xcccb, 3 ], 
-  [ "SET 1, [HL]", 0xcecb, 3 ], 
-  [ "SET 1, L", 0xcdcb, 3 ], 
-  [ "SET 2, A", 0xd7cb, 3 ], 
-  [ "SET 2, B", 0xd0cb, 3 ], 
-  [ "SET 2, C", 0xd1cb, 3 ], 
-  [ "SET 2, D", 0xd2cb, 3 ], 
-  [ "SET 2, E", 0xd3cb, 3 ], 
-  [ "SET 2, H", 0xd4cb, 3 ], 
-  [ "SET 2, [HL]", 0xd6cb, 3 ], 
-  [ "SET 2, L", 0xd5cb, 3 ], 
-  [ "SET 3, A", 0xdfcb, 3 ], 
-  [ "SET 3, B", 0xd8cb, 3 ], 
-  [ "SET 3, C", 0xd9cb, 3 ], 
-  [ "SET 3, D", 0xdacb, 3 ], 
-  [ "SET 3, E", 0xdbcb, 3 ], 
-  [ "SET 3, H", 0xdccb, 3 ], 
-  [ "SET 3, [HL]", 0xdecb, 3 ], 
-  [ "SET 3, L", 0xddcb, 3 ], 
-  [ "SET 4, A", 0xe7cb, 3 ], 
-  [ "SET 4, B", 0xe0cb, 3 ], 
-  [ "SET 4, C", 0xe1cb, 3 ], 
-  [ "SET 4, D", 0xe2cb, 3 ], 
-  [ "SET 4, E", 0xe3cb, 3 ], 
-  [ "SET 4, H", 0xe4cb, 3 ], 
-  [ "SET 4, [HL]", 0xe6cb, 3 ], 
-  [ "SET 4, L", 0xe5cb, 3 ], 
-  [ "SET 5, A", 0xefcb, 3 ], 
-  [ "SET 5, B", 0xe8cb, 3 ], 
-  [ "SET 5, C", 0xe9cb, 3 ], 
-  [ "SET 5, D", 0xeacb, 3 ], 
-  [ "SET 5, E", 0xebcb, 3 ], 
-  [ "SET 5, H", 0xeccb, 3 ], 
-  [ "SET 5, [HL]", 0xeecb, 3 ], 
-  [ "SET 5, L", 0xedcb, 3 ], 
-  [ "SET 6, A", 0xf7cb, 3 ], 
-  [ "SET 6, B", 0xf0cb, 3 ], 
-  [ "SET 6, C", 0xf1cb, 3 ], 
-  [ "SET 6, D", 0xf2cb, 3 ], 
-  [ "SET 6, E", 0xf3cb, 3 ], 
-  [ "SET 6, H", 0xf4cb, 3 ], 
-  [ "SET 6, [HL]", 0xf6cb, 3 ], 
-  [ "SET 6, L", 0xf5cb, 3 ], 
-  [ "SET 7, A", 0xffcb, 3 ], 
-  [ "SET 7, B", 0xf8cb, 3 ], 
-  [ "SET 7, C", 0xf9cb, 3 ], 
-  [ "SET 7, D", 0xfacb, 3 ], 
-  [ "SET 7, E", 0xfbcb, 3 ], 
-  [ "SET 7, H", 0xfccb, 3 ], 
-  [ "SET 7, [HL]", 0xfecb, 3 ], 
-  [ "SET 7, L", 0xfdcb, 3 ], 
-  [ "SLA A", 0x27cb, 3 ], 
-  [ "SLA B", 0x20cb, 3 ], 
-  [ "SLA C", 0x21cb, 3 ], 
-  [ "SLA D", 0x22cb, 3 ], 
-  [ "SLA E", 0x23cb, 3 ], 
-  [ "SLA H", 0x24cb, 3 ], 
-  [ "SLA [HL]", 0x26cb, 3 ], 
-  [ "SLA L", 0x25cb, 3 ], 
-  [ "SRA A", 0x2fcb, 3 ], 
-  [ "SRA B", 0x28cb, 3 ], 
-  [ "SRA C", 0x29cb, 3 ], 
-  [ "SRA D", 0x2acb, 3 ], 
-  [ "SRA E", 0x2bcb, 3 ], 
-  [ "SRA H", 0x2ccb, 3 ], 
-  [ "SRA [HL]", 0x2ecb, 3 ], 
-  [ "SRA L", 0x2dcb, 3 ], 
-  [ "SRL A", 0x3fcb, 3 ], 
-  [ "SRL B", 0x38cb, 3 ], 
-  [ "SRL C", 0x39cb, 3 ], 
-  [ "SRL D", 0x3acb, 3 ], 
-  [ "SRL E", 0x3bcb, 3 ], 
-  [ "SRL H", 0x3ccb, 3 ], 
-  [ "SRL [HL]", 0x3ecb, 3 ], 
-  [ "SRL L", 0x3dcb, 3 ], 
-  [ "STOP", 0x10, 0 ], 
-  [ "SUB A", 0x97, 0 ], 
-  [ "SUB B", 0x90, 0 ], 
-  [ "SUB C", 0x91, 0 ], 
-  [ "SUB D", 0x92, 0 ], 
-  [ "SUB E", 0x93, 0 ], 
-  [ "SUB H", 0x94, 0 ], 
-  [ "SUB [HL]", 0x96, 0 ], 
-  [ "SUB L", 0x95, 0 ], 
-  [ "SUB x", 0xd6, 1 ], 
-  [ "SWAP A", 0x37cb, 3 ], 
-  [ "SWAP B", 0x30cb, 3 ], 
-  [ "SWAP C", 0x31cb, 3 ], 
-  [ "SWAP D", 0x32cb, 3 ], 
-  [ "SWAP E", 0x33cb, 3 ], 
-  [ "SWAP H", 0x34cb, 3 ], 
-  [ "SWAP [HL]", 0x36cb, 3 ], 
-  [ "SWAP L", 0x35cb, 3 ], 
-  [ "XOR A", 0xaf, 0 ], 
-  [ "XOR B", 0xa8, 0 ], 
-  [ "XOR C", 0xa9, 0 ], 
-  [ "XOR D", 0xaa, 0 ], 
-  [ "XOR E", 0xab, 0 ], 
-  [ "XOR H", 0xac, 0 ], 
-  [ "XOR [HL]", 0xae, 0 ], 
-  [ "XOR L", 0xad, 0 ], 
-  [ "XOR x", 0xee, 1 ], 
-  [ "E", 0x100, -1 ], 
+  [ "LD SP, HL", 0xf9, 0 ],
+  [ "LD BC, ?", 0x1, 2 ],
+  [ "LD DE, ?", 0x11, 2 ],
+  [ "LD HL, ?", 0x21, 2 ],
+  [ "LD SP, ?", 0x31, 2 ],
+#  [ "LD [?], SP", 0x8, 2 ],
+  [ "LD [?], A", 0xea, 2 ],
+  [ "NOP", 0x0, 0 ],
+  [ "OR A", 0xb7, 0 ],
+  [ "OR B", 0xb0, 0 ],
+  [ "OR C", 0xb1, 0 ],
+  [ "OR D", 0xb2, 0 ],
+  [ "OR E", 0xb3, 0 ],
+  [ "OR H", 0xb4, 0 ],
+  [ "OR [HL]", 0xb6, 0 ],
+  [ "OR L", 0xb5, 0 ],
+  [ "OR x", 0xf6, 1 ],
+  [ "POP AF", 0xf1, 0 ],
+  [ "POP BC", 0xc1, 0 ],
+  [ "POP DE", 0xd1, 0 ],
+  [ "POP HL", 0xe1, 0 ],
+  [ "PUSH AF", 0xf5, 0 ],
+  [ "PUSH BC", 0xc5, 0 ],
+  [ "PUSH DE", 0xd5, 0 ],
+  [ "PUSH HL", 0xe5, 0 ],
+  [ "RES 0, A", 0x87cb, 3 ],
+  [ "RES 0, B", 0x80cb, 3 ],
+  [ "RES 0, C", 0x81cb, 3 ],
+  [ "RES 0, D", 0x82cb, 3 ],
+  [ "RES 0, E", 0x83cb, 3 ],
+  [ "RES 0, H", 0x84cb, 3 ],
+  [ "RES 0, [HL]", 0x86cb, 3 ],
+  [ "RES 0, L", 0x85cb, 3 ],
+  [ "RES 1, A", 0x8fcb, 3 ],
+  [ "RES 1, B", 0x88cb, 3 ],
+  [ "RES 1, C", 0x89cb, 3 ],
+  [ "RES 1, D", 0x8acb, 3 ],
+  [ "RES 1, E", 0x8bcb, 3 ],
+  [ "RES 1, H", 0x8ccb, 3 ],
+  [ "RES 1, [HL]", 0x8ecb, 3 ],
+  [ "RES 1, L", 0x8dcb, 3 ],
+  [ "RES 2, A", 0x97cb, 3 ],
+  [ "RES 2, B", 0x90cb, 3 ],
+  [ "RES 2, C", 0x91cb, 3 ],
+  [ "RES 2, D", 0x92cb, 3 ],
+  [ "RES 2, E", 0x93cb, 3 ],
+  [ "RES 2, H", 0x94cb, 3 ],
+  [ "RES 2, [HL]", 0x96cb, 3 ],
+  [ "RES 2, L", 0x95cb, 3 ],
+  [ "RES 3, A", 0x9fcb, 3 ],
+  [ "RES 3, B", 0x98cb, 3 ],
+  [ "RES 3, C", 0x99cb, 3 ],
+  [ "RES 3, D", 0x9acb, 3 ],
+  [ "RES 3, E", 0x9bcb, 3 ],
+  [ "RES 3, H", 0x9ccb, 3 ],
+  [ "RES 3, [HL]", 0x9ecb, 3 ],
+  [ "RES 3, L", 0x9dcb, 3 ],
+  [ "RES 4, A", 0xa7cb, 3 ],
+  [ "RES 4, B", 0xa0cb, 3 ],
+  [ "RES 4, C", 0xa1cb, 3 ],
+  [ "RES 4, D", 0xa2cb, 3 ],
+  [ "RES 4, E", 0xa3cb, 3 ],
+  [ "RES 4, H", 0xa4cb, 3 ],
+  [ "RES 4, [HL]", 0xa6cb, 3 ],
+  [ "RES 4, L", 0xa5cb, 3 ],
+  [ "RES 5, A", 0xafcb, 3 ],
+  [ "RES 5, B", 0xa8cb, 3 ],
+  [ "RES 5, C", 0xa9cb, 3 ],
+  [ "RES 5, D", 0xaacb, 3 ],
+  [ "RES 5, E", 0xabcb, 3 ],
+  [ "RES 5, H", 0xaccb, 3 ],
+  [ "RES 5, [HL]", 0xaecb, 3 ],
+  [ "RES 5, L", 0xadcb, 3 ],
+  [ "RES 6, A", 0xb7cb, 3 ],
+  [ "RES 6, B", 0xb0cb, 3 ],
+  [ "RES 6, C", 0xb1cb, 3 ],
+  [ "RES 6, D", 0xb2cb, 3 ],
+  [ "RES 6, E", 0xb3cb, 3 ],
+  [ "RES 6, H", 0xb4cb, 3 ],
+  [ "RES 6, [HL]", 0xb6cb, 3 ],
+  [ "RES 6, L", 0xb5cb, 3 ],
+  [ "RES 7, A", 0xbfcb, 3 ],
+  [ "RES 7, B", 0xb8cb, 3 ],
+  [ "RES 7, C", 0xb9cb, 3 ],
+  [ "RES 7, D", 0xbacb, 3 ],
+  [ "RES 7, E", 0xbbcb, 3 ],
+  [ "RES 7, H", 0xbccb, 3 ],
+  [ "RES 7, [HL]", 0xbecb, 3 ],
+  [ "RES 7, L", 0xbdcb, 3 ],
+  [ "RETI", 0xd9, 0 ],
+  [ "RET C", 0xd8, 0 ],
+  [ "RET NC", 0xd0, 0 ],
+  [ "RET NZ", 0xc0, 0 ],
+  [ "RET Z", 0xc8, 0 ],
+  [ "RET", 0xc9, 0 ],
+  [ "RLA", 0x17, 0 ],
+  [ "RL A", 0x17cb, 3 ],
+  [ "RL B", 0x10cb, 3 ],
+  [ "RL C", 0x11cb, 3 ],
+  [ "RLCA", 0x7, 0 ],
+  [ "RLC A", 0x7cb, 3 ],
+  [ "RLC B", 0xcb, 3 ],
+  [ "RLC C", 0x1cb, 3 ],
+  [ "RLC D", 0x2cb, 3 ],
+  [ "RLC E", 0x3cb, 3 ],
+  [ "RLC H", 0x4cb, 3 ],
+  [ "RLC [HL]", 0x6cb, 3 ],
+  [ "RLC L", 0x5cb, 3 ],
+  [ "RL D", 0x12cb, 3 ],
+  [ "RL E", 0x13cb, 3 ],
+  [ "RL H", 0x14cb, 3 ],
+  [ "RL [HL]", 0x16cb, 3 ],
+  [ "RL L", 0x15cb, 3 ],
+  [ "RRA", 0x1f, 0 ],
+  [ "RR A", 0x1fcb, 3 ],
+  [ "RR B", 0x18cb, 3 ],
+  [ "RR C", 0x19cb, 3 ],
+  [ "RRCA", 0xf, 0 ],
+  [ "RRC A", 0xfcb, 3 ],
+  [ "RRC B", 0x8cb, 3 ],
+  [ "RRC C", 0x9cb, 3 ],
+  [ "RRC D", 0xacb, 3 ],
+  [ "RRC E", 0xbcb, 3 ],
+  [ "RRC H", 0xccb, 3 ],
+  [ "RRC [HL]", 0xecb, 3 ],
+  [ "RRC L", 0xdcb, 3 ],
+  [ "RR D", 0x1acb, 3 ],
+  [ "RR E", 0x1bcb, 3 ],
+  [ "RR H", 0x1ccb, 3 ],
+  [ "RR [HL]", 0x1ecb, 3 ],
+  [ "RR L", 0x1dcb, 3 ],
+  [ "RST $0", 0xc7, 0 ],
+  [ "RST $10", 0xd7, 0 ],
+  [ "RST $18", 0xdf, 0 ],
+  [ "RST $20", 0xe7, 0 ],
+  [ "RST $28", 0xef, 0 ],
+  [ "RST $30", 0xf7, 0 ],
+  [ "RST $38", 0xff, 0 ],
+  [ "RST $8", 0xcf, 0 ],
+  [ "SBC A", 0x9f, 0 ],
+  [ "SBC B", 0x98, 0 ],
+  [ "SBC C", 0x99, 0 ],
+  [ "SBC D", 0x9a, 0 ],
+  [ "SBC E", 0x9b, 0 ],
+  [ "SBC H", 0x9c, 0 ],
+  [ "SBC [HL]", 0x9e, 0 ],
+  [ "SBC L", 0x9d, 0 ],
+  [ "SBC x", 0xde, 1 ],
+  [ "SCF", 0x37, 0 ],
+  [ "SET 0, A", 0xc7cb, 3 ],
+  [ "SET 0, B", 0xc0cb, 3 ],
+  [ "SET 0, C", 0xc1cb, 3 ],
+  [ "SET 0, D", 0xc2cb, 3 ],
+  [ "SET 0, E", 0xc3cb, 3 ],
+  [ "SET 0, H", 0xc4cb, 3 ],
+  [ "SET 0, [HL]", 0xc6cb, 3 ],
+  [ "SET 0, L", 0xc5cb, 3 ],
+  [ "SET 1, A", 0xcfcb, 3 ],
+  [ "SET 1, B", 0xc8cb, 3 ],
+  [ "SET 1, C", 0xc9cb, 3 ],
+  [ "SET 1, D", 0xcacb, 3 ],
+  [ "SET 1, E", 0xcbcb, 3 ],
+  [ "SET 1, H", 0xcccb, 3 ],
+  [ "SET 1, [HL]", 0xcecb, 3 ],
+  [ "SET 1, L", 0xcdcb, 3 ],
+  [ "SET 2, A", 0xd7cb, 3 ],
+  [ "SET 2, B", 0xd0cb, 3 ],
+  [ "SET 2, C", 0xd1cb, 3 ],
+  [ "SET 2, D", 0xd2cb, 3 ],
+  [ "SET 2, E", 0xd3cb, 3 ],
+  [ "SET 2, H", 0xd4cb, 3 ],
+  [ "SET 2, [HL]", 0xd6cb, 3 ],
+  [ "SET 2, L", 0xd5cb, 3 ],
+  [ "SET 3, A", 0xdfcb, 3 ],
+  [ "SET 3, B", 0xd8cb, 3 ],
+  [ "SET 3, C", 0xd9cb, 3 ],
+  [ "SET 3, D", 0xdacb, 3 ],
+  [ "SET 3, E", 0xdbcb, 3 ],
+  [ "SET 3, H", 0xdccb, 3 ],
+  [ "SET 3, [HL]", 0xdecb, 3 ],
+  [ "SET 3, L", 0xddcb, 3 ],
+  [ "SET 4, A", 0xe7cb, 3 ],
+  [ "SET 4, B", 0xe0cb, 3 ],
+  [ "SET 4, C", 0xe1cb, 3 ],
+  [ "SET 4, D", 0xe2cb, 3 ],
+  [ "SET 4, E", 0xe3cb, 3 ],
+  [ "SET 4, H", 0xe4cb, 3 ],
+  [ "SET 4, [HL]", 0xe6cb, 3 ],
+  [ "SET 4, L", 0xe5cb, 3 ],
+  [ "SET 5, A", 0xefcb, 3 ],
+  [ "SET 5, B", 0xe8cb, 3 ],
+  [ "SET 5, C", 0xe9cb, 3 ],
+  [ "SET 5, D", 0xeacb, 3 ],
+  [ "SET 5, E", 0xebcb, 3 ],
+  [ "SET 5, H", 0xeccb, 3 ],
+  [ "SET 5, [HL]", 0xeecb, 3 ],
+  [ "SET 5, L", 0xedcb, 3 ],
+  [ "SET 6, A", 0xf7cb, 3 ],
+  [ "SET 6, B", 0xf0cb, 3 ],
+  [ "SET 6, C", 0xf1cb, 3 ],
+  [ "SET 6, D", 0xf2cb, 3 ],
+  [ "SET 6, E", 0xf3cb, 3 ],
+  [ "SET 6, H", 0xf4cb, 3 ],
+  [ "SET 6, [HL]", 0xf6cb, 3 ],
+  [ "SET 6, L", 0xf5cb, 3 ],
+  [ "SET 7, A", 0xffcb, 3 ],
+  [ "SET 7, B", 0xf8cb, 3 ],
+  [ "SET 7, C", 0xf9cb, 3 ],
+  [ "SET 7, D", 0xfacb, 3 ],
+  [ "SET 7, E", 0xfbcb, 3 ],
+  [ "SET 7, H", 0xfccb, 3 ],
+  [ "SET 7, [HL]", 0xfecb, 3 ],
+  [ "SET 7, L", 0xfdcb, 3 ],
+  [ "SLA A", 0x27cb, 3 ],
+  [ "SLA B", 0x20cb, 3 ],
+  [ "SLA C", 0x21cb, 3 ],
+  [ "SLA D", 0x22cb, 3 ],
+  [ "SLA E", 0x23cb, 3 ],
+  [ "SLA H", 0x24cb, 3 ],
+  [ "SLA [HL]", 0x26cb, 3 ],
+  [ "SLA L", 0x25cb, 3 ],
+  [ "SRA A", 0x2fcb, 3 ],
+  [ "SRA B", 0x28cb, 3 ],
+  [ "SRA C", 0x29cb, 3 ],
+  [ "SRA D", 0x2acb, 3 ],
+  [ "SRA E", 0x2bcb, 3 ],
+  [ "SRA H", 0x2ccb, 3 ],
+  [ "SRA [HL]", 0x2ecb, 3 ],
+  [ "SRA L", 0x2dcb, 3 ],
+  [ "SRL A", 0x3fcb, 3 ],
+  [ "SRL B", 0x38cb, 3 ],
+  [ "SRL C", 0x39cb, 3 ],
+  [ "SRL D", 0x3acb, 3 ],
+  [ "SRL E", 0x3bcb, 3 ],
+  [ "SRL H", 0x3ccb, 3 ],
+  [ "SRL [HL]", 0x3ecb, 3 ],
+  [ "SRL L", 0x3dcb, 3 ],
+  [ "STOP", 0x10, 0 ],
+  [ "SUB A", 0x97, 0 ],
+  [ "SUB B", 0x90, 0 ],
+  [ "SUB C", 0x91, 0 ],
+  [ "SUB D", 0x92, 0 ],
+  [ "SUB E", 0x93, 0 ],
+  [ "SUB H", 0x94, 0 ],
+  [ "SUB [HL]", 0x96, 0 ],
+  [ "SUB L", 0x95, 0 ],
+  [ "SUB x", 0xd6, 1 ],
+  [ "SWAP A", 0x37cb, 3 ],
+  [ "SWAP B", 0x30cb, 3 ],
+  [ "SWAP C", 0x31cb, 3 ],
+  [ "SWAP D", 0x32cb, 3 ],
+  [ "SWAP E", 0x33cb, 3 ],
+  [ "SWAP H", 0x34cb, 3 ],
+  [ "SWAP [HL]", 0x36cb, 3 ],
+  [ "SWAP L", 0x35cb, 3 ],
+  [ "XOR A", 0xaf, 0 ],
+  [ "XOR B", 0xa8, 0 ],
+  [ "XOR C", 0xa9, 0 ],
+  [ "XOR D", 0xaa, 0 ],
+  [ "XOR E", 0xab, 0 ],
+  [ "XOR H", 0xac, 0 ],
+  [ "XOR [HL]", 0xae, 0 ],
+  [ "XOR L", 0xad, 0 ],
+  [ "XOR x", 0xee, 1 ],
+  [ "E", 0x100, -1 ],
 ]
 
 #find conflicts
@@ -584,12 +584,12 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
     rom = extract_maps.rom
     offset = original_offset
     current_byte_number = 0 #start from the beginning
-    
+
     #we don't actually have an end address, but we'll just say $4000
     end_address = original_offset + max_byte_count
 
     byte_labels = {}
-    
+
     output = ""
     keep_reading = True
     while offset <= end_address and keep_reading:
@@ -616,12 +616,12 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
         temp_maybe += ( ord(rom[offset+1]) << 8)
         if temp_maybe in opt_table.keys() and ord(rom[offset+1])!=0:
             opstr = opt_table[temp_maybe][0].lower()
-            
+
             if "x" in opstr:
                 for x in range(0, opstr.count("x")):
                     insertion = ord(rom[offset + 1])
                     insertion = "$" + hex(insertion)[2:]
-            
+
                     opstr = opstr[:opstr.find("x")].lower() + insertion + opstr[opstr.find("x")+1:].lower()
 
                     current_byte += 1
@@ -630,12 +630,12 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
                 for y in range(0, opstr.count("?")):
                     byte1 = ord(rom[offset + 1])
                     byte2 = ord(rom[offset + 2])
-                    
+
                     number = byte1
                     number += byte2 << 8;
 
                     insertion = "$%.4x" % (number)
-                    
+
                     opstr = opstr[:opstr.find("?")].lower() + insertion + opstr[opstr.find("?")+1:].lower()
 
                     current_byte_number += 2
@@ -650,7 +650,7 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
             op_code = opt_table[maybe_byte]
             op_code_type = op_code[1]
             op_code_byte = maybe_byte
-            
+
             #type = -1 when it's the E op
             #if op_code_type != -1:
             if   op_code_type == 0 and ord(rom[offset]) == op_code_byte:
@@ -658,7 +658,7 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
 
                 output += spacing + op_code[0].lower() #+ " ; " + hex(offset)
                 output += "\n"
-                
+
                 offset += 1
                 current_byte_number += 1
             elif op_code_type == 1 and ord(rom[offset]) == op_code_byte:
@@ -682,19 +682,19 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
                             byte_labels[target_address]["name"] = line_label2
                             byte_labels[target_address]["usage"] = 1
                             byte_labels[target_address]["definition"] = False
-                        
+
                         insertion = line_label2.lower()
                         include_comment = True
 
                     opstr = opstr[:opstr.find("x")].lower() + insertion + opstr[opstr.find("x")+1:].lower()
-                    output += spacing + opstr 
+                    output += spacing + opstr
                     if include_comment:
                         output += " ; " + hex(offset)
                         if current_byte in relative_jumps:
                             output += " $" + hex(ord(rom[offset + 1]))[2:]
                     output += "\n"
 
-                    current_byte_number += 1 
+                    current_byte_number += 1
                     offset += 1
                     insertion = ""
 
@@ -708,7 +708,7 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
                 for x in range(0, qes):
                     byte1 = ord(rom[offset + 1])
                     byte2 = ord(rom[offset + 2])
-                    
+
                     number = byte1
                     number += byte2 << 8;
 
@@ -716,7 +716,7 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
                     if maybe_byte in call_commands:
                         if insertion[1:] in asm_commands:
                             insertion = asm_commands[insertion[1:]]
-                    
+
                     opstr = opstr[:opstr.find("?")].lower() + insertion + opstr[opstr.find("?")+1:].lower()
                     output += spacing + opstr #+ " ; " + hex(offset)
                     output += "\n"
@@ -743,7 +743,7 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
                     keep_reading = False
                     is_data = False #cleanup
                     break
-        else:                
+        else:
 #        if is_data and keep_reading:
             output += spacing + "db $" + hex(ord(rom[offset]))[2:] #+ " ; " + hex(offset)
             output += "\n"
diff --git a/pokered.asm b/pokered.asm
index 618612d0..203e5e85 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -7642,7 +7642,7 @@ INCBIN "baserom.gbc",$1cb0e,$1d082 - $1cb0e
 OaksLabTexts: ; 0x1d082
     dw OaksLabText1, OaksLabText2, OaksLabText3, OaksLabText4, OaksLabText5, OaksLabText6, OaksLabText7, OaksLabText8, OaksLabText9, OaksLabText10, OaksLabText11, OaksLabText12, OaksLabText13, OaksLabText14, OaksLabText15, OaksLabText16, OaksLabText17, OaksLabText18, OaksLabText19, OaksLabText20, OaksLabText21, OaksLabText22, OaksLabText23, OaksLabText24, OaksLabText25, OaksLabText26, OaksLabText27
 
-INCBIN "baserom.gbc",$1d098+32,22
+INCBIN "baserom.gbc",$1d0b8,22
 
 OaksLabText1: ; 0x1d0ce
     db $08 ; asm
-- 
cgit v1.2.3


From a192724bf8dfb24269e8512ec65babb47ff13098 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 15:19:03 -0600
Subject: map out texts for Route5GateTexts

hg-commit-id: d7a9fb760972
---
 pokered.asm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index 203e5e85..d89b8d92 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -9109,9 +9109,7 @@ Route5Gate_h: ; 0x1df27 to 0x1df33 (12 bytes) (bank=7) (id=70)
 INCBIN "baserom.gbc",$1df33,$1dfa4 - $1df33
 
 Route5GateTexts: ; 0x1dfa4
-    dw Route5GateText1
-
-INCBIN "baserom.gbc",$1dfa6,$4
+    dw Route5GateText1, Route5GateText2, Route5GateText3
 
 Route8GateText1:
 Route7GateText1:
@@ -9145,7 +9143,13 @@ Route5GateText1: ; 0x1dfaa
     jp $24d7
 ; 0x1dfe7
 
-INCBIN "baserom.gbc",$1dfe7,$14
+Route5GateText2: ; 0x1dfe7
+INCBIN "baserom.gbc",$1dfe7,$5
+
+Route5GateText3: ; 0x1dfec
+INCBIN "baserom.gbc",$1dfec,$5
+
+INCBIN "baserom.gbc",$1dff1,$1dffb - $1dff1
 
 Route5GateObject: ; 0x1dffb (size=42)
     db $a ; border tile
-- 
cgit v1.2.3


From b66c0304bdfa888c7e37d8ebc9813cafa32bdb24 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 15:23:11 -0600
Subject: more for Route6GateTexts

hg-commit-id: 3dd2207b6caa
---
 pokered.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index d89b8d92..d5e8bbba 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -9143,9 +9143,11 @@ Route5GateText1: ; 0x1dfaa
     jp $24d7
 ; 0x1dfe7
 
+Route6GateText2:
 Route5GateText2: ; 0x1dfe7
 INCBIN "baserom.gbc",$1dfe7,$5
 
+Route6GateText3:
 Route5GateText3: ; 0x1dfec
 INCBIN "baserom.gbc",$1dfec,$5
 
@@ -9185,9 +9187,7 @@ Route6Gate_h: ; 0x1e031 to 0x1e03d (12 bytes) (bank=7) (id=73)
 INCBIN "baserom.gbc",$1e03d,$1e0b8 - $1e03d
 
 Route6GateTexts: ; 0x1e0b8
-    dw Route6GateText1
-
-INCBIN "baserom.gbc",$1e0ba,$4
+    dw Route6GateText1, Route6GateText2, Route6GateText3
 
 Route6GateObject: ; 0x1e0be (size=42)
     db $a ; border tile
-- 
cgit v1.2.3


From c6ce213b6770027b20e75a568a34f0fe09d6809d Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 15:25:32 -0600
Subject: fill out Route7GateTexts

hg-commit-id: ae4d52a4548c
---
 pokered.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index d5e8bbba..a45869df 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -9143,10 +9143,12 @@ Route5GateText1: ; 0x1dfaa
     jp $24d7
 ; 0x1dfe7
 
+Route7GateText2:
 Route6GateText2:
 Route5GateText2: ; 0x1dfe7
 INCBIN "baserom.gbc",$1dfe7,$5
 
+Route7GateText3:
 Route6GateText3:
 Route5GateText3: ; 0x1dfec
 INCBIN "baserom.gbc",$1dfec,$5
@@ -9223,9 +9225,7 @@ Route7Gate_h: ; 0x1e0f4 to 0x1e100 (12 bytes) (bank=7) (id=76)
 INCBIN "baserom.gbc",$1e100,$1e17f - $1e100
 
 Route7GateTexts: ; 0x1e17f
-    dw Route7GateText1
-
-INCBIN "baserom.gbc",$1e181,$4
+    dw Route7GateText1, Route7GateText2, Route7GateText3
 
 Route7GateObject: ; 0x1e185 (size=42)
     db $a ; border tile
-- 
cgit v1.2.3


From fd2a88bbf797645bf21d0add131f5b7badcfeed5 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 15:32:48 -0600
Subject: BillsHouseText4 is just $fd

hg-commit-id: f84c6e31c130
---
 pokered.asm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index a45869df..c6c3fae0 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -9143,11 +9143,13 @@ Route5GateText1: ; 0x1dfaa
     jp $24d7
 ; 0x1dfe7
 
+Route8GateText2:
 Route7GateText2:
 Route6GateText2:
 Route5GateText2: ; 0x1dfe7
 INCBIN "baserom.gbc",$1dfe7,$5
 
+Route8GateText3:
 Route7GateText3:
 Route6GateText3:
 Route5GateText3: ; 0x1dfec
@@ -9261,9 +9263,7 @@ Route8Gate_h: ; 0x1e1bb to 0x1e1c7 (12 bytes) (bank=7) (id=79)
 INCBIN "baserom.gbc",$1e1c7,$1e241 - $1e1c7
 
 Route8GateTexts: ; 0x1e241
-    dw Route8GateText1
-
-INCBIN "baserom.gbc",$1e243,$4
+    dw Route8GateText1, Route8GateText2, Route8GateText3
 
 Route8GateObject: ; 0x1e247 (size=42)
     db $a ; border tile
@@ -9608,12 +9608,12 @@ BillsHouse_h: ; 0x1e75e to 0x1e76a (12 bytes) (bank=7) (id=88)
 INCBIN "baserom.gbc",$1e76a,$1e834 - $1e76a
 
 BillsHouseTexts: ; 0x1e834
-    dw BillsHouseText1, BillsHouseText2, BillsHouseText3
+    dw BillsHouseText1, BillsHouseText2, BillsHouseText3, BillsHouseText4
 
-INCBIN "baserom.gbc",$1e83a,$3
+BillsHouseText4:
+    db $fd
 
-;0x1e83d
-BillsHouseText1:
+BillsHouseText1: ; 0x1e83d
     db $8
     ld hl, $6865
     call PrintText
-- 
cgit v1.2.3


From a8126e077b59168c054f4b4510850a1612a43752 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 15:48:28 -0600
Subject: update gbz80disasm for TextScriptEnd

hg-commit-id: f519c306bc00
---
 extras/gbz80disasm.py |  1 +
 pokered.asm           | 10 +---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/extras/gbz80disasm.py b/extras/gbz80disasm.py
index aa01691c..496e46f1 100644
--- a/extras/gbz80disasm.py
+++ b/extras/gbz80disasm.py
@@ -563,6 +563,7 @@ asm_commands = {
     "3e6d": "Predef", #library of pre-defined asm routines
     "00b5": "CopyData",
     "2ff3": "GetMachineName",
+    "24d7": "TextScriptEnd",
 }
 
 def random_asm_label():
diff --git a/pokered.asm b/pokered.asm
index c7483281..267cc3a9 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -1034,7 +1034,7 @@ IndigoPlateauLobbyText4:
 
 TextScriptEndingChar:
         db "@"
-TextScriptEnd:
+TextScriptEnd: ; 24D7
         ld hl,TextScriptEndingChar
         ret
 
@@ -28250,7 +28250,6 @@ SSAnne1Text1: ; 0x6126d
     TX_FAR _SSAnne1Text1
     db $50
 
-
 SSAnne1Text2: ; 0x61272
     TX_FAR _SSAnne1Text2
     db $50
@@ -28418,12 +28417,10 @@ SSAnne5Text1: ; 0x616ea
     TX_FAR _SSAnne5Text1
     db $50
 
-
 SSAnne5Text2: ; 0x616ef
     TX_FAR _SSAnne5Text2
     db $50
 
-
 SSAnne5Text3: ; 0x616f4
     TX_FAR _SSAnne5Text3
     db $50
@@ -28486,27 +28483,22 @@ SSAnne6Text1: ; 0x617c5
     TX_FAR _SSAnne6Text1
     db $50
 
-
 SSAnne6Text2: ; 0x617ca
     TX_FAR _SSAnne6Text2
     db $50
 
-
 SSAnne6Text3: ; 0x617cf
     TX_FAR _SSAnne6Text3
     db $50
 
-
 SSAnne6Text4: ; 0x617d4
     TX_FAR _SSAnne6Text4
     db $50
 
-
 SSAnne6Text5: ; 0x617d9
     TX_FAR _SSAnne6Text5
     db $50
 
-
 SSAnne6Text6: ; 0x617de
     TX_FAR _SSAnne6Text6
     db $50
-- 
cgit v1.2.3


From ed3525a03f4cdc100dd9578620386bacf63539d6 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 16:18:13 -0600
Subject: more texts in RocketHideout4Texts

hg-commit-id: 89537c356665
---
 pokered.asm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index 267cc3a9..adac514a 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -17274,9 +17274,9 @@ RocketHideout4_h: ; 0x45451 to 0x4545d (12 bytes) (bank=11) (id=202)
 INCBIN "baserom.gbc",$4545d,$45501 - $4545d
 
 RocketHideout4Texts: ; 0x45501
-    dw RocketHideout4Text1, RocketHideout4Text2, RocketHideout4Text3, RocketHideout4Text4, RocketHideout4Text5, RocketHideout4Text6, RocketHideout4Text7, RocketHideout4Text8, RocketHideout4Text9
+    dw RocketHideout4Text1, RocketHideout4Text2, RocketHideout4Text3, RocketHideout4Text4, RocketHideout4Text5, RocketHideout4Text6, RocketHideout4Text7, RocketHideout4Text8, RocketHideout4Text9, RocketHideout4Text10
 
-INCBIN "baserom.gbc",$45513,$27
+INCBIN "baserom.gbc",$45515,$25
 
 RocketHideout4Text1: ; 0x4553a
     db $08 ; asm
@@ -17306,7 +17306,10 @@ RocketHideout4Text1: ; 0x4553a
 .asm_209f0 ; 0x45577
     jp $24d7
 
-INCBIN "baserom.gbc",$4557a,$45589 - $4557a
+INCBIN "baserom.gbc",$4557a,$45584 - $4557a
+
+RocketHideout4Text10: ; 0x45584
+INCBIN "baserom.gbc",$45584,5
 
 RocketHideout4Text2: ; 0x45589
     db $08 ; asm
-- 
cgit v1.2.3


From af7add4e624cda348acabd20f9f1eedcd2449d35 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 16:25:24 -0600
Subject: extract some text scripts near SeafoamIslands5Texts

hg-commit-id: 9d603109b16e
---
 pokered.asm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index adac514a..6a870bc0 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -1034,7 +1034,7 @@ IndigoPlateauLobbyText4:
 
 TextScriptEndingChar:
         db "@"
-TextScriptEnd: ; 24D7
+TextScriptEnd: ; 24D7 24d7
         ld hl,TextScriptEndingChar
         ret
 
@@ -1196,7 +1196,7 @@ UnknownDungeon1Text3:
 SilphCo10Text4:
 SilphCo10Text5:
 SilphCo10Text6:
-Route2Text2: ; 0x24f4
+Route2Text2: ; 24f4 0x424f4
     db $08 ; asm
     ld a, $5c
     call Predef
@@ -18140,7 +18140,15 @@ SeafoamIslands5Text3: ; 0x46893
     ld [$d668], a
     jp $24d7
 
-INCBIN "baserom.gbc",$468a2,$10
+; 0x468a2 TX_FAR
+db $17, $75, $40, $22
+; 0x468a6
+    db $8
+    ld a, $4a
+    call $13d0
+    call $3748
+    jp TextScriptEnd
+; 0x468b2
 
 SeafoamIslands5Text4: ; 0x468b2
     TX_FAR _SeafoamIslands5Text4
-- 
cgit v1.2.3


From 9e3a61333d8a58fd39692f586bf69920b3e20ac8 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 16:29:30 -0600
Subject: add two opcodes after CeladonMansion1Texts

hg-commit-id: 06a506394786
---
 pokered.asm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pokered.asm b/pokered.asm
index 6a870bc0..760b90e7 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -18649,7 +18649,10 @@ INCBIN "baserom.gbc",$48694,$48697 - $48694
 CeladonMansion1Texts: ; 0x48697
     dw CeladonMansion1Text1, CeladonMansion1Text2, CeladonMansion1Text3, CeladonMansion1Text4, CeladonMansion1Text5
 
-INCBIN "baserom.gbc",$486a1,$6
+;0x486a1
+    call $13d0
+    jp TextScriptEnd
+; 0x486a7
 
 CeladonMansion1Text1: ; 0x486a7
     TX_FAR _CeladonMansion1Text1
-- 
cgit v1.2.3


From 2a7e6539ac51f442a48d9c601e0f55a1b3d89391 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 16:37:47 -0600
Subject: some more texts for CeladonGymTexts

hg-commit-id: 308b15f20bb8
---
 pokered.asm | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index 760b90e7..7dd91571 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -18931,9 +18931,9 @@ CeladonGym_h: ; 0x488fe to 0x4890a (12 bytes) (bank=12) (id=134)
 INCBIN "baserom.gbc",$4890a,$489a6 - $4890a
 
 CeladonGymTexts: ; 0x489a6
-    dw CeladonGymText1, CeladonGymText2, CeladonGymText3, CeladonGymText4, CeladonGymText5, CeladonGymText6, CeladonGymText7, CeladonGymText8
+    dw CeladonGymText1, CeladonGymText2, CeladonGymText3, CeladonGymText4, CeladonGymText5, CeladonGymText6, CeladonGymText7, CeladonGymText8, CeladonGymText9, CeladonGymText10, CeladonGymText11
 
-INCBIN "baserom.gbc",$489b6,$5b
+INCBIN "baserom.gbc",$489bc,$55
 
 CeladonGymText1: ; 0x48a11
     db $08 ; asm
@@ -18970,7 +18970,19 @@ CeladonGymText1: ; 0x48a11
 .asm_96252 ; 0x48a5b
     jp $24d7
 
-INCBIN "baserom.gbc",$48a5e,$48a81 - $48a5e
+INCBIN "baserom.gbc",$48a5e,$48a6d - $48a5e
+
+CeladonGymText9: ; 0x48a6d
+INCBIN "baserom.gbc",$48a6d,$5
+
+CeladonGymText10: ; 0x48a72
+INCBIN "baserom.gbc",$48a72,$4
+db $0b
+
+INCBIN "baserom.gbc",$48a77,$48a7c - $48a77
+
+CeladonGymText11: ; 0x48a7c
+INCBIN "baserom.gbc",$48a7c,$5
 
 CeladonGymText2: ; 0x48a81
     db $08 ; asm
-- 
cgit v1.2.3


From 1d8b2c6055a65052a3ab139133b9db4dd795debb Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 16:46:52 -0600
Subject: one more text in CeladonGameCorner (CeladonGameCornerText13)

hg-commit-id: f9623520feac
---
 pokered.asm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index 7dd91571..0e222c57 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -19077,9 +19077,7 @@ CeladonGameCorner_h: ; 0x48bb1 to 0x48bbd (12 bytes) (bank=12) (id=135)
 INCBIN "baserom.gbc",$48bbd,$48c8a - $48bbd
 
 CeladonGameCornerTexts: ; 0x48c8a
-    dw CeladonGameCornerText1, CeladonGameCornerText2, CeladonGameCornerText3, CeladonGameCornerText4, CeladonGameCornerText5, CeladonGameCornerText6, CeladonGameCornerText7, CeladonGameCornerText8, CeladonGameCornerText9, CeladonGameCornerText10, CeladonGameCornerText11, CeladonGameCornerText12
-
-INCBIN "baserom.gbc",$48ca2,$2
+    dw CeladonGameCornerText1, CeladonGameCornerText2, CeladonGameCornerText3, CeladonGameCornerText4, CeladonGameCornerText5, CeladonGameCornerText6, CeladonGameCornerText7, CeladonGameCornerText8, CeladonGameCornerText9, CeladonGameCornerText10, CeladonGameCornerText11, CeladonGameCornerText12, CeladonGameCornerText13
 
 CeladonGameCornerText1: ; 0x48ca4
     TX_FAR _CeladonGameCornerText1
@@ -19319,7 +19317,10 @@ CeladonGameCornerText11: ; 0x48e9d
     ld [$d65f], a
     jp $24d7
 
-INCBIN "baserom.gbc",$48ece,$48edd - $48ece
+INCBIN "baserom.gbc",$48ece,$48ed8 - $48ece
+
+CeladonGameCornerText13: ; 0x48ed8
+INCBIN "baserom.gbc",$48ed8,5
 
 CeladonGameCornerText12: ; 0x48edd
     db $08 ; asm
-- 
cgit v1.2.3


From 232da2751f811a180f2ee217f4b8714be6b9f547 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 16:48:54 -0600
Subject: add Route16GateMapText3 to Route16GateMapTexts

hg-commit-id: 46a075f21ddc
---
 pokered.asm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index 0e222c57..822054b0 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -20077,9 +20077,7 @@ Route16GateMap_h: ; 0x496b2 to 0x496be (12 bytes) (id=186)
 INCBIN "baserom.gbc",$496be,$4975a - $496be
 
 Route16GateMapTexts: ; 0x4975a
-    dw Route16GateMapText1, Route16GateMapText2
-
-INCBIN "baserom.gbc",$4975e,$2
+    dw Route16GateMapText1, Route16GateMapText2, Route16GateMapText3
 
 Route16GateMapText1: ; 0x49760
     db $08 ; asm
@@ -20094,7 +20092,10 @@ Route16GateMapText1: ; 0x49760
 .asm_56c9d ; 0x49774
     jp $24d7
 
-INCBIN "baserom.gbc",$49777,$f
+INCBIN "baserom.gbc",$49777,$49781 - $49777
+
+Route16GateMapText3: ; 0x49781
+INCBIN "baserom.gbc",$49781,5
 
 Route16GateMapText2: ; 0x49786
     TX_FAR _Route16GateMapText2
-- 
cgit v1.2.3


From 49d9f5110ad6057b2537c2206cf5cd0bc3dc489d Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 16:51:18 -0600
Subject: insert Route18GateText2 into Route18GateTexts

hg-commit-id: eb75dcf9b789
---
 pokered.asm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index 822054b0..18157537 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -20208,9 +20208,7 @@ Route18Gate_h: ; 0x4986a to 0x49876 (12 bytes) (id=190)
 INCBIN "baserom.gbc",$49876,$4990d - $49876
 
 Route18GateTexts: ; 0x4990d
-    dw Route18GateText1
-
-INCBIN "baserom.gbc",$4990f,$2
+    dw Route18GateText1, Route18GateText2
 
 Route18GateText1: ; 0x49911
     db $08 ; asm
@@ -20225,7 +20223,10 @@ Route18GateText1: ; 0x49911
 .asm_a8410 ; 0x49925
     jp $24d7
 
-INCBIN "baserom.gbc",$49928,$f
+INCBIN "baserom.gbc",$49928,$49932 - $49928
+
+Route18GateText2: ; 0x49932
+INCBIN "baserom.gbc",$49932,5
 
 Route18GateObject: ; 0x49937 (size=50)
     db $a ; border tile
-- 
cgit v1.2.3


From 05c386747b3a6aaae62f96e40b313989ca445f23 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 17:25:27 -0600
Subject: add more "unreferenced" texts

hg-commit-id: 9dee3aedb9d0
---
 pokered.asm | 39 ++++++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index 18157537..c4dd39d9 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -1164,6 +1164,7 @@ SilphCo6Text9:
 SilphCo6Text10:
 SilphCo7Text10:
 SilphCo7Text11:
+SilphCo7Text12:
 Mansion1Text2:
 Mansion1Text3:
 Mansion2Text2:
@@ -21008,6 +21009,7 @@ PredefPointers: ; 7E79
         dbw $16,$5035
 
 SECTION "bank14",DATA,BANK[$14]
+
 Route22_h: ; 0x50000 to 0x50022 (34 bytes) (id=33)
     db $00 ; tileset
     db $09, $14 ; dimensions (y, x)
@@ -21945,9 +21947,9 @@ SilphCo7_h: ; 0x51b55 to 0x51b61 (12 bytes) (id=212)
 INCBIN "baserom.gbc",$51b61,$51d3f - $51b61
 
 SilphCo7Texts: ; 0x51d3f
-    dw SilphCo7Text1, SilphCo7Text2, SilphCo7Text3, SilphCo7Text4, SilphCo7Text5, SilphCo7Text6, SilphCo7Text7, SilphCo7Text8, SilphCo7Text9, SilphCo7Text10, SilphCo7Text11
+    dw SilphCo7Text1, SilphCo7Text2, SilphCo7Text3, SilphCo7Text4, SilphCo7Text5, SilphCo7Text6, SilphCo7Text7, SilphCo7Text8, SilphCo7Text9, SilphCo7Text10, SilphCo7Text11, SilphCo7Text12, SilphCo7Text13, SilphCo7Text14, SilphCo7Text15
 
-INCBIN "baserom.gbc",$51d55,$39
+INCBIN "baserom.gbc",$51d55 + 8,$39 - 8
 
 SilphCo7Text1: ; 0x51d8e
     db $08 ; asm
@@ -22069,7 +22071,18 @@ SilphCo7Text9: ; 0x51eb4
     call PrintText
     jp $24d7
 
-INCBIN "baserom.gbc",$51ebe,$19
+INCBIN "baserom.gbc",$51ebe,$51ec3 - $51ebe
+
+SilphCo7Text13: ; 0x51ec3
+INCBIN "baserom.gbc",$51ec3,5
+
+SilphCo7Text14: ; 0x51ec8
+INCBIN "baserom.gbc",$51ec8,5
+
+INCBIN "baserom.gbc",$51ecd,$51ed2 - $51ecd
+
+SilphCo7Text15: ; 0x51ed2
+INCBIN "baserom.gbc",$51ed2,5
 
 SilphCo7Object: ; 0x51ed7 (size=128)
     db $2e ; border tile
@@ -23238,7 +23251,11 @@ INCBIN "baserom.gbc",$556bc,$556d5 - $556bc
 Route9Texts: ; 0x556d5
     dw Route9Text1, Route9Text2, Route9Text3, Route9Text4, Route9Text5, Route9Text6, Route9Text7, Route9Text8, Route9Text9, Route9Text10, Route9Text11
 
-INCBIN "baserom.gbc",$556eb,$6d
+Route12Text13: ; 0x556eb
+INCBIN "baserom.gbc",$556eb,$556f0 - $556eb
+
+Route12Text14: ; 0x556f0
+INCBIN "baserom.gbc",$556f0,$55758 - $556f0
 
 Route9Text1: ; 0x55758
     db $8 ; asm
@@ -24871,9 +24888,9 @@ Route11Text11: ; 0x595ee
 INCBIN "baserom.gbc",$595f3,$59675 - $595f3
 
 Route12Texts: ; 0x59675
-    dw Route12Text1, Route12Text2, Route12Text3, Route12Text4, Route12Text5, Route12Text6, Route12Text7, Route12Text8, Route12Text9, Route12Text10, Route12Text11, Route12Text12
+    dw Route12Text1, Route12Text2, Route12Text3, Route12Text4, Route12Text5, Route12Text6, Route12Text7, Route12Text8, Route12Text9, Route12Text10, Route12Text11, Route12Text12, Route12Text13, Route12Text14
 
-INCBIN "baserom.gbc",$5968d,$59
+INCBIN "baserom.gbc",$59691,$55
 
 Route12Text1: ; 0x596e6
     TX_FAR _Route12Text1
@@ -25014,9 +25031,9 @@ Route15Text12: ; 0x5992e
 INCBIN "baserom.gbc",$59933,$599b9 - $59933
 
 Route16Texts: ; 0x599b9
-    dw Route16Text1, Route16Text2, Route16Text3, Route16Text4, Route16Text5, Route16Text6, Route16Text7, Route16Text8, Route16Text9
+    dw Route16Text1, Route16Text2, Route16Text3, Route16Text4, Route16Text5, Route16Text6, Route16Text7, Route16Text8, Route16Text9, Route16Text10, Route16Text11
 
-INCBIN "baserom.gbc",$599cb,$4d
+INCBIN "baserom.gbc",$599cb + 4,$4d - 4
 
 Route16Text1: ; 0x59a18
     db $08 ; asm
@@ -25070,7 +25087,11 @@ Route16Text7: ; 0x59aae
     TX_FAR _Route16Text7
     db $50
 
-INCBIN "baserom.gbc",$59ab3,$59abd - $59ab3
+Route16Text10: ; 0x59ab3
+INCBIN "baserom.gbc",$59ab3,5
+
+Route16Text11: ; 0x59ab8
+INCBIN "baserom.gbc",$59ab8,5
 
 Route16Text8: ; 0x59abd
     TX_FAR _Route16Text8
-- 
cgit v1.2.3


From c0f74f9923720616cc15644c6a37f6c0136ddfb1 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 18:48:09 -0600
Subject: even more "unreferenced" texts

hg-commit-id: cb366d1b1eae
---
 pokered.asm | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 70 insertions(+), 15 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index c4dd39d9..fee711eb 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -25963,9 +25963,9 @@ PewterGym_h: ; 0x5c37b to 0x5c387 (12 bytes) (id=54)
 INCBIN "baserom.gbc",$5c387,$5c435 - $5c387
 
 PewterGymTexts: ; 0x5c435
-    dw PewterGymText1, PewterGymText2, PewterGymText3
+    dw PewterGymText1, PewterGymText2, PewterGymText3, PewterGymText4, PewterGymText5, PewterGymText6
 
-INCBIN "baserom.gbc",$5c43b,$13
+INCBIN "baserom.gbc",$5c43b + 6,$13 - 6
 
 PewterGymText1: ; 0x5c44e
     db $08 ; asm
@@ -26004,7 +26004,20 @@ PewterGymText1: ; 0x5c44e
 .asm_e0ffb ; 0x5c49b
     jp $24d7
 
-INCBIN "baserom.gbc",$5c49e,$5c4c6 - $5c49e
+INCBIN "baserom.gbc",$5c49e,$5c4a8 - $5c49e
+
+PewterGymText4: ; 0x5c4a8
+INCBIN "baserom.gbc",$5c4a8,5
+
+PewterGymText5: ; 0x5c4ad
+INCBIN "baserom.gbc",$5c4ad,6
+
+INCBIN "baserom.gbc",$5c4b3,$5c4b7 - $5c4b3
+
+PewterGymText6: ; 0x5c4b7
+INCBIN "baserom.gbc",$5c4b7,5
+
+INCBIN "baserom.gbc",$5c4bc,$5c4c6 - $5c4bc
 
 PewterGymText2: ; 0x5c4c6
     db $08 ; asm
@@ -26213,9 +26226,9 @@ CeruleanGym_h: ; 0x5c6a7 to 0x5c6b3 (12 bytes) (id=65)
 INCBIN "baserom.gbc",$5c6b3,$5c74a - $5c6b3
 
 CeruleanGymTexts: ; 0x5c74a
-    dw CeruleanGymText1, CeruleanGymText2, CeruleanGymText3, CeruleanGymText4
+    dw CeruleanGymText1, CeruleanGymText2, CeruleanGymText3, CeruleanGymText4, CeruleanGymText5, CeruleanGymText6, CeruleanGymText7
 
-INCBIN "baserom.gbc",$5c752,$1f
+INCBIN "baserom.gbc",$5c752 + 6,$1f - 6
 
 CeruleanGymText1: ; 0x5c771
     db $08 ; asm
@@ -26253,7 +26266,20 @@ CeruleanGymText1: ; 0x5c771
 .asm_95b04 ; 0x5c7bb
     jp $24d7
 
-INCBIN "baserom.gbc",$5c7be,$5c7df - $5c7be
+INCBIN "baserom.gbc",$5c7be,$5c7c8 - $5c7be
+
+CeruleanGymText5: ; 0x5c7c8
+INCBIN "baserom.gbc",$5c7c8,5
+
+CeruleanGymText6: ; 0x5c7cd
+INCBIN "baserom.gbc",$5c7cd,4
+db $0b
+db $50
+
+CeruleanGymText7: ; 0x5c7d3
+INCBIN "baserom.gbc",$5c7d3,5
+
+INCBIN "baserom.gbc",$5c7d8,$5c7df - $5c7d8
 
 CeruleanGymText2: ; 0x5c7df
     db $08 ; asm
@@ -26536,9 +26562,9 @@ VermilionGym_h: ; 0x5ca1a to 0x5ca26 (12 bytes) (id=92)
 INCBIN "baserom.gbc",$5ca26,$5cae8 - $5ca26
 
 VermilionGymTexts: ; 0x5cae8
-    dw VermilionGymText1, VermilionGymText2, VermilionGymText3, VermilionGymText4, VermilionGymText5
+    dw VermilionGymText1, VermilionGymText2, VermilionGymText3, VermilionGymText4, VermilionGymText5, VermilionGymText6, VermilionGymText7, VermilionGymText8
 
-INCBIN "baserom.gbc",$5caf2,$2b
+INCBIN "baserom.gbc",$5caf8,37
 
 VermilionGymText1: ; 0x5cb1d
     db $08 ; asm
@@ -26577,7 +26603,20 @@ VermilionGymText1: ; 0x5cb1d
 .asm_23621 ; 0x5cb6a
     jp $24d7
 
-INCBIN "baserom.gbc",$5cb6d,$5cb90 - $5cb6d
+INCBIN "baserom.gbc",$5cb6d,$5cb77 - $5cb6d
+
+VermilionGymText6: ; 0x5cb77
+INCBIN "baserom.gbc",$5cb77,5
+
+VermilionGymText7: ; 0x5cb7c
+INCBIN "baserom.gbc",$5cb7c,5
+
+INCBIN "baserom.gbc",$5cb81,5
+
+VermilionGymText8: ; 0x5cb86
+INCBIN "baserom.gbc",$5cb86,5
+
+INCBIN "baserom.gbc",$5cb8b,5
 
 VermilionGymText2: ; 0x5cb90
     db $08 ; asm
@@ -26752,9 +26791,9 @@ FightingDojo_h: ; 0x5cd51 to 0x5cd5d (12 bytes) (id=177)
 INCBIN "baserom.gbc",$5cd5d,$5ce03 - $5cd5d
 
 FightingDojoTexts: ; 0x5ce03
-    dw FightingDojoText1, FightingDojoText2, FightingDojoText3, FightingDojoText4, FightingDojoText5, FightingDojoText6, FightingDojoText7
+    dw FightingDojoText1, FightingDojoText2, FightingDojoText3, FightingDojoText4, FightingDojoText5, FightingDojoText6, FightingDojoText7, FightingDojoText8
 
-INCBIN "baserom.gbc",$5ce11,$33
+INCBIN "baserom.gbc",$5ce13,$31
 
 FightingDojoText1: ; 0x5ce44
     db $08 ; asm
@@ -26787,7 +26826,12 @@ FightingDojoText1: ; 0x5ce44
 .asm_9dba4 ; 0x5ce8b
     jp $24d7
 
-INCBIN "baserom.gbc",$5ce8e,$5cea2 - $5ce8e
+INCBIN "baserom.gbc",$5ce8e,$5ce98 - $5ce8e
+
+FightingDojoText8: ; 0x5ce98
+INCBIN "baserom.gbc",$5ce98,5
+
+INCBIN "baserom.gbc",$5ce9d,5
 
 FightingDojoText2: ; 0x5cea2
     db $08 ; asm
@@ -26925,9 +26969,9 @@ SaffronGym_h: ; 0x5d001 to 0x5d00d (12 bytes) (id=178)
 INCBIN "baserom.gbc",$5d00d,$5d0ab - $5d00d
 
 SaffronGymTexts: ; 0x5d0ab
-    dw SaffronGymText1, SaffronGymText2, SaffronGymText3, SaffronGymText4, SaffronGymText5, SaffronGymText6, SaffronGymText7, SaffronGymText8, SaffronGymText9
+    dw SaffronGymText1, SaffronGymText2, SaffronGymText3, SaffronGymText4, SaffronGymText5, SaffronGymText6, SaffronGymText7, SaffronGymText8, SaffronGymText9, SaffronGymText10, SaffronGymText11, SaffronGymText12
 
-INCBIN "baserom.gbc",$5d0bd,$5b
+INCBIN "baserom.gbc",$5d0bd + 6,$5b - 6
 
 SaffronGymText1: ; 0x5d118
     db $08 ; asm
@@ -26963,7 +27007,18 @@ SaffronGymText1: ; 0x5d118
 .asm_34c2c ; 0x5d15f
     jp $24d7
 
-INCBIN "baserom.gbc",$5d162,$5d187 - $5d162
+INCBIN "baserom.gbc",$5d162,$5d173 - $5d162
+
+SaffronGymText10: ; 0x5d173
+INCBIN "baserom.gbc",$5d173,5
+
+SaffronGymText11: ; 0x5d178
+INCBIN "baserom.gbc",$5d178,5
+
+INCBIN "baserom.gbc",$5d17d,$5d182 - $5d17d
+
+SaffronGymText12: ; 0x5d182
+INCBIN "baserom.gbc",$5d182,5
 
 SaffronGymText2: ; 0x5d187
     db $08 ; asm
-- 
cgit v1.2.3


From 91104ff20c46dd8d299eb95e4f6c33ae55a5f92f Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Jan 2012 20:03:36 -0600
Subject: insert more "unreferenced" text labels

hg-commit-id: 8c31a254671e
---
 pokered.asm | 128 +++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 92 insertions(+), 36 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index fee711eb..7e07633c 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -27974,9 +27974,9 @@ PokemonTower5_h: ; 0x60926 to 0x60932 (12 bytes) (id=146)
 INCBIN "baserom.gbc",$60932,$6099b - $60932
 
 PokemonTower5Texts: ; 0x6099b
-    dw PokemonTower5Text1, PokemonTower5Text2, PokemonTower5Text3, PokemonTower5Text4, PokemonTower5Text5, PokemonTower5Text6
+    dw PokemonTower5Text1, PokemonTower5Text2, PokemonTower5Text3, PokemonTower5Text4, PokemonTower5Text5, PokemonTower5Text6, PokemonTower5Text7
 
-INCBIN "baserom.gbc",$609a7,$33
+INCBIN "baserom.gbc",$609a9,$31
 
 PokemonTower5Text1: ; 0x609da
     TX_FAR _PokemonTower5Text1
@@ -28012,7 +28012,10 @@ PokemonTower5Text5: ; 0x60a2a
     call LoadTrainerHeader
     jp $24d7
 
-INCBIN "baserom.gbc",$60a34,$14
+INCBIN "baserom.gbc",$60a34,$f
+
+PokemonTower5Text7: ; 0x60a43
+INCBIN "baserom.gbc",$60a43,5
 
 PokemonTower5Object: ; 0x60a48 (size=65)
     db $1 ; border tile
@@ -28049,9 +28052,9 @@ PokemonTower6_h: ; 0x60ae3 to 0x60aef (12 bytes) (id=147)
 INCBIN "baserom.gbc",$60aef,$60bb1 - $60aef
 
 PokemonTower6Texts: ; 0x60bb1
-    dw PokemonTower6Text1, PokemonTower6Text2, PokemonTower6Text3, PokemonTower6Text4, PokemonTower6Text5
+    dw PokemonTower6Text1, PokemonTower6Text2, PokemonTower6Text3, PokemonTower6Text4, PokemonTower6Text5, PokemonTower6Text6, PokemonTower6Text7
 
-INCBIN "baserom.gbc",$60bbb,$29
+INCBIN "baserom.gbc",$60bbb + 4,$29 - 4
 
 PokemonTower6Text1: ; 0x60be4
     db $08 ; asm
@@ -28071,7 +28074,11 @@ PokemonTower6Text3: ; 0x60bf8
     call LoadTrainerHeader
     jp $24d7
 
-INCBIN "baserom.gbc",$60c02,$59
+PokemonTower6Text7: ; 0x60c02
+INCBIN "baserom.gbc",$60c02,$60c56 - $60c02
+
+PokemonTower6Text6: ; 0x60c56
+INCBIN "baserom.gbc",$60c56,$60c5b - $60c56
 
 PokemonTower6Object: ; 0x60c5b (size=58)
     db $1 ; border tile
@@ -28410,9 +28417,7 @@ SSAnne2_h: ; 0x61393 to 0x6139f (12 bytes) (id=96)
 INCBIN "baserom.gbc",$6139f,$614db - $6139f
 
 SSAnne2Texts: ; 0x614db
-    dw SSAnne2Text1, SSAnne2Text2
-
-INCBIN "baserom.gbc",$614df,$2
+    dw SSAnne2Text1, SSAnne2Text2, SSAnne2Text3
 
 SSAnne2Text1: ; 0x614e1
     TX_FAR _SSAnne2Text1
@@ -28431,7 +28436,10 @@ SSAnne2Text2: ; 0x614e6
     jp $24d7
 ; 0x61500
 
-INCBIN "baserom.gbc",$61500,$14
+INCBIN "baserom.gbc",$61500,$f
+
+SSAnne2Text3: ; 0x6150f
+INCBIN "baserom.gbc",$6150f,5
 
 SSAnne2Object: ; 0x61514 (size=90)
     db $c ; border tile
@@ -29173,9 +29181,9 @@ SilphCo11_h: ; 0x620ee to 0x620fa (12 bytes) (id=235)
 INCBIN "baserom.gbc",$620fa,$622b7 - $620fa
 
 SilphCo11Texts: ; 0x622b7
-    dw SilphCo11Text1, SilphCo11Text2, SilphCo11Text3, SilphCo11Text4, SilphCo11Text5
+    dw SilphCo11Text1, SilphCo11Text2, SilphCo11Text3, SilphCo11Text4, SilphCo11Text5, SilphCo11Text6
 
-INCBIN "baserom.gbc",$622c1,$1b
+INCBIN "baserom.gbc",$622c3,$19
 
 SilphCo11Text1: ; 0x622dc
     db $08 ; asm
@@ -29211,7 +29219,10 @@ SilphCo11Text3: ; 0x6232b
     TX_FAR _SilphCo11Text3
     db $50
 
-INCBIN "baserom.gbc",$62330,$6233a - $62330
+INCBIN "baserom.gbc",$62330,5
+
+SilphCo11Text6: ; 0x62335
+INCBIN "baserom.gbc",$62335,5
 
 SilphCo11Text4: ; 0x6233a
     db $08 ; asm
@@ -30374,9 +30385,9 @@ ViridianGym_h: ; 0x74897 to 0x748a3 (12 bytes) (id=45)
 INCBIN "baserom.gbc",$748a3,$749ec - $748a3
 
 ViridianGymTexts: ; 0x749ec
-    dw ViridianGymText1, ViridianGymText2, ViridianGymText3, ViridianGymText4, ViridianGymText5, ViridianGymText6, ViridianGymText7, ViridianGymText8, ViridianGymText9, ViridianGymText10, ViridianGymText11
+    dw ViridianGymText1, ViridianGymText2, ViridianGymText3, ViridianGymText4, ViridianGymText5, ViridianGymText6, ViridianGymText7, ViridianGymText8, ViridianGymText9, ViridianGymText10, ViridianGymText11, ViridianGymText12, ViridianGymText13, ViridianGymText14
 
-INCBIN "baserom.gbc",$74a02,$67
+INCBIN "baserom.gbc",$74a02 + 6,$67 - 6
 
 ViridianGymText1: ; 0x74a69
     db $08 ; asm
@@ -30422,7 +30433,18 @@ ViridianGymText1: ; 0x74a69
 .asm_6dff7 ; 0x74acb
     jp $24d7
 
-INCBIN "baserom.gbc",$74ace,$74af3 - $74ace
+INCBIN "baserom.gbc",$74ace,$74adf - $74ace
+
+ViridianGymText12: ; 0x74adf
+INCBIN "baserom.gbc",$74adf,5
+
+ViridianGymText13: ; 0x74ae4
+INCBIN "baserom.gbc",$74ae4, 5
+
+INCBIN "baserom.gbc",$74ae9,$74aee - $74ae9
+
+ViridianGymText14: ; 0x74aee
+INCBIN "baserom.gbc",$74aee,5
 
 ViridianGymText2: ; 0x74af3
     db $08 ; asm
@@ -30904,15 +30926,23 @@ SafariZoneEntrance_h: ; 0x751c1 to 0x751cd (12 bytes) (id=156)
 INCBIN "baserom.gbc",$751cd,$752b9 - $751cd
 
 SafariZoneEntranceTexts: ; 0x752b9
-    dw SafariZoneEntranceText1, SafariZoneEntranceText2
-
-INCBIN "baserom.gbc",$752bd,$8
+    dw SafariZoneEntranceText1, SafariZoneEntranceText2, SafariZoneEntranceText3, SafariZoneEntranceText4, SafariZoneEntranceText5, SafariZoneEntranceText6
 
+SafariZoneEntranceText3:
 SafariZoneEntranceText1: ; 0x752c5
     TX_FAR _SafariZoneEntranceText1
     db $50
 
-INCBIN "baserom.gbc",$752ca,$753ca - $752ca
+SafariZoneEntranceText4:
+INCBIN "baserom.gbc",$752ca,$7536f - $752ca
+
+SafariZoneEntranceText5: ; 0x7536f
+INCBIN "baserom.gbc",$7536f,6
+
+INCBIN "baserom.gbc",$75375,$753c5 - $75375
+
+SafariZoneEntranceText6: ; 0x753c5
+INCBIN "baserom.gbc",$753c5,5
 
 SafariZoneEntranceText2: ; 0x753ca
     db $08 ; asm
@@ -30965,9 +30995,9 @@ FuchsiaGym_h: ; 0x75431 to 0x7543d (12 bytes) (id=157)
 INCBIN "baserom.gbc",$7543d,$754d5 - $7543d
 
 FuchsiaGymTexts: ; 0x754d5
-    dw FuchsiaGymText1, FuchsiaGymText2, FuchsiaGymText3, FuchsiaGymText4, FuchsiaGymText5, FuchsiaGymText6, FuchsiaGymText7, FuchsiaGymText8
+    dw FuchsiaGymText1, FuchsiaGymText2, FuchsiaGymText3, FuchsiaGymText4, FuchsiaGymText5, FuchsiaGymText6, FuchsiaGymText7, FuchsiaGymText8, FuchsiaGymText9, FuchsiaGymText10, FuchsiaGymText11
 
-INCBIN "baserom.gbc",$754e5,$4f
+INCBIN "baserom.gbc",$754eb,$49
 
 FuchsiaGymText1: ; 0x75534
     db $08 ; asm
@@ -31005,7 +31035,16 @@ FuchsiaGymText1: ; 0x75534
 .asm_e84c6 ; 0x7557e
     jp $24d7
 
-INCBIN "baserom.gbc",$75581,$755a4 - $75581
+INCBIN "baserom.gbc",$75581,$75590 - $75581
+
+FuchsiaGymText9: ; 0x75590
+INCBIN "baserom.gbc",$75590,5
+
+FuchsiaGymText10: ; 0x75595
+INCBIN "baserom.gbc",$75595,$7559f - $75595
+
+FuchsiaGymText11: ; 0x7559f
+INCBIN "baserom.gbc",$7559f,5
 
 FuchsiaGymText2: ; 0x755a4
     db $08 ; asm
@@ -31152,6 +31191,9 @@ INCBIN "baserom.gbc",$7574a,$7589f - $7574a
 
 CinnabarGymTexts: ; 0x7589f
     dw CinnabarGymText1, CinnabarGymText2, CinnabarGymText3, CinnabarGymText4, CinnabarGymText5, CinnabarGymText6, CinnabarGymText7, CinnabarGymText8, CinnabarGymText9
+;CinnabarGymText 10: ; 0x75925
+;CinnabarGymText 11: ; 0x7592a
+;CinnabarGymText 12: ; 0x75934
 
 INCBIN "baserom.gbc",$758b1,$2e
 
@@ -31764,9 +31806,7 @@ CopycatsHouseF1Object: ; 0x75ee3 (size=46)
 INCBIN "baserom.gbc",$75f11,$760d6 - $75f11
 
 GaryTexts: ; 0x760d6
-    dw GaryText1, GaryText2
-
-INCBIN "baserom.gbc",$760da,$6
+    dw GaryText1, GaryText2, GaryText3, GaryText4, GaryText5
 
 GaryText1: ; 0x760e0
     db $08 ; asm
@@ -31785,7 +31825,14 @@ GaryText2: ; 0x76108
     TX_FAR _GaryText2
     db $50
 
-INCBIN "baserom.gbc",$7610d,$22
+GaryText3: ; 0x7610d
+INCBIN "baserom.gbc",$7610d,$76125 - $7610d
+
+GaryText4: ; 0x76125
+INCBIN "baserom.gbc",$76125,$7612a - $76125
+
+GaryText5: ; 0x7612a
+INCBIN "baserom.gbc",$7612a,$7612f - $7612a
 
 GaryObject: ; 0x7612f (size=48)
     db $3 ; border tile
@@ -31822,9 +31869,9 @@ Loreli_h: ; 0x7616f to 0x7617b (12 bytes) (id=245)
 INCBIN "baserom.gbc",$7617b,$76251 - $7617b
 
 LoreliTexts: ; 0x76251
-    dw LoreliText1
+    dw LoreliText1, LoreliText2
 
-INCBIN "baserom.gbc",$76253,$f
+INCBIN "baserom.gbc",$76255,$d
 
 LoreliText1: ; 0x76262
     db $08 ; asm
@@ -31832,7 +31879,10 @@ LoreliText1: ; 0x76262
     call LoadTrainerHeader
     jp $24d7
 
-INCBIN "baserom.gbc",$7626c,$14
+INCBIN "baserom.gbc",$7626c,$7627b - $7626c
+
+LoreliText2: ; 0x7627b
+INCBIN "baserom.gbc",$7627b,$76280 - $7627b
 
 LoreliObject: ; 0x76280 (size=44)
     db $3 ; border tile
@@ -31868,9 +31918,9 @@ Bruno_h: ; 0x762ca to 0x762d6 (12 bytes) (id=246)
 INCBIN "baserom.gbc",$762d6,$763a8 - $762d6
 
 BrunoTexts: ; 0x763a8
-    dw BrunoText1
+    dw BrunoText1, BrunoText2
 
-INCBIN "baserom.gbc",$763aa,$f
+INCBIN "baserom.gbc",$763ac,$d
 
 BrunoText1: ; 0x763b9
     db $08 ; asm
@@ -31878,7 +31928,10 @@ BrunoText1: ; 0x763b9
     call LoadTrainerHeader
     jp $24d7
 
-INCBIN "baserom.gbc",$763c3,$14
+INCBIN "baserom.gbc",$763c3,$763d2 - $763c3
+
+BrunoText2: ; 0x763d2
+INCBIN "baserom.gbc",$763d2,5
 
 BrunoObject: ; 0x763d7 (size=44)
     db $3 ; border tile
@@ -31914,9 +31967,9 @@ Agatha_h: ; 0x76421 to 0x7642d (12 bytes) (id=247)
 INCBIN "baserom.gbc",$7642d,$76505 - $7642d
 
 AgathaTexts: ; 0x76505
-    dw AgathaText1
+    dw AgathaText1, AgathaText2
 
-INCBIN "baserom.gbc",$76507,$f
+INCBIN "baserom.gbc",$76509,$d
 
 AgathaText1: ; 0x76516
     db $08 ; asm
@@ -31924,7 +31977,10 @@ AgathaText1: ; 0x76516
     call LoadTrainerHeader
     jp $24d7
 
-INCBIN "baserom.gbc",$76520,$14
+INCBIN "baserom.gbc",$76520,$f
+
+AgathaText2: ; 0x7652f
+INCBIN "baserom.gbc",$7652f,5
 
 AgathaObject: ; 0x76534 (size=44)
     db $0 ; border tile
-- 
cgit v1.2.3


From 9d4f5a459f79357dcb0046560b067b4a1fb73cef Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Fri, 13 Jan 2012 01:05:10 -0600
Subject: a very slow tool to find script pointers for each map

hg-commit-id: a61a85fd7577
---
 extras/gbz80disasm.py  | 10 +++++++-
 extras/insert_texts.py | 69 +++++++++++++++++++++++++++++++++++---------------
 2 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/extras/gbz80disasm.py b/extras/gbz80disasm.py
index 496e46f1..6dc512a5 100644
--- a/extras/gbz80disasm.py
+++ b/extras/gbz80disasm.py
@@ -582,6 +582,9 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
     #ad = end_address
     #a, oa = current_byte_number
 
+    last_hl_address = None #for when we're scanning the main map script
+    last_a_address = None
+
     rom = extract_maps.rom
     offset = original_offset
     current_byte_number = 0 #start from the beginning
@@ -686,6 +689,8 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
 
                         insertion = line_label2.lower()
                         include_comment = True
+                    elif current_byte == 0x3e:
+                        last_a_address = ord(rom[offset + 1])
 
                     opstr = opstr[:opstr.find("x")].lower() + insertion + opstr[opstr.find("x")+1:].lower()
                     output += spacing + opstr
@@ -728,6 +733,9 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
                 current_byte_number += 1
                 offset += 1
 
+                if current_byte == 0x21:
+                    last_hl_address = byte1 + (byte2 << 8) 
+
                 #duck out if this is jp $24d7
                 if current_byte == 0xc3 or current_byte in relative_unconditional_jumps:
                     #if number == 0x24d7: #jp
@@ -766,7 +774,7 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
     #add the offset of the final location
     output += "; " + hex(offset)
 
-    return (output, offset)
+    return (output, offset, last_hl_address, last_a_address)
 
 def has_outstanding_labels(byte_labels):
     """
diff --git a/extras/insert_texts.py b/extras/insert_texts.py
index 561e80f7..b683d400 100644
--- a/extras/insert_texts.py
+++ b/extras/insert_texts.py
@@ -8,7 +8,7 @@ from pretty_map_headers import map_name_cleaner, make_text_label, map_constants,
 import pretty_map_headers
 from analyze_incbins import asm, offset_to_pointer, find_incbin_to_replace_for, split_incbin_line_into_three, generate_diff_insert, load_asm, isolate_incbins, process_incbins, reset_incbins, apply_diff
 import analyze_incbins
-from gbz80disasm import text_asm_pretty_printer
+from gbz80disasm import text_asm_pretty_printer, output_bank_opcodes
 import os, sys
 import subprocess
 spacing = "    "
@@ -422,6 +422,51 @@ def insert_text(address, label):
     print diff
     #apply_diff(diff)
 
+def scan_for_map_scripts_pointer():
+    for map_id in extract_maps.map_headers.keys():
+        map2 = extract_maps.map_headers[map_id]
+        script_pointer = int(map2["script_pointer"], 16)
+
+        asm_output, offset, last_hl_address, last_a_address = output_bank_opcodes(script_pointer)
+        
+        first_script_text = ""
+        if last_hl_address != None and last_hl_address != "None":
+            hl_pointer = extract_maps.calculate_pointer(last_hl_address, int(map2["bank"], 16))
+            byte1 = ord(extract_maps.rom[hl_pointer])
+            byte2 = ord(extract_maps.rom[hl_pointer+1])
+            address = byte1 + (byte2 << 8)
+            first_script_pointer = extract_maps.calculate_pointer(address, int(map2["bank"], 16))
+
+            first_script_text = " first_script=" + hex(first_script_pointer)
+
+            a_numbers = [0]
+            script_pointers = [hex(first_script_pointer)]
+            last_a_id = 0
+            latest_script_pointer = first_script_pointer
+            while last_a_id == (max(a_numbers)) or last_a_id==0:
+                asm_output, offset, last_hl_address2, last_a_id, byte1, byte2, address = None, None, None, None, None, None, None
+                asm_output, offset, last_hl_address2, last_a_id = output_bank_opcodes(latest_script_pointer)
+                
+                if last_a_id == (max(a_numbers) + 1):
+                    a_numbers.append(last_a_id)
+                else:
+                    break
+                
+                byte1 = ord(extract_maps.rom[hl_pointer + (2*last_a_id)])
+                byte2 = ord(extract_maps.rom[hl_pointer + (2*last_a_id) + 1])
+                address2 = byte1 + (byte2 << 8)
+                latest_script_pointer = extract_maps.calculate_pointer(address2, int(map2["bank"], 16))
+                script_pointers.append(hex(latest_script_pointer))
+                #print "latest script pointer (part 1): " + hex(address2)
+                #print "latest script pointer: " + hex(latest_script_pointer)
+            print "map_id=" + str(map_id) + " scripts are: " + str(script_pointers)
+        
+        if last_hl_address == None: last_hl_address = "None"
+        else: last_hl_address = hex(last_hl_address)
+
+        print "map_id=" + str(map_id) + " script_pointer=" + hex(script_pointer) + " script_pointers=" + last_hl_address + first_script_text
+        print "\n"
+
 if __name__ == "__main__":
     #load map headers and object data
     extract_maps.load_rom()
@@ -436,6 +481,8 @@ if __name__ == "__main__":
     #load incbins
     reset_incbins()
 
+    scan_for_map_scripts_pointer()
+
     #insert _ViridianCityText10
     #insert_tx_far(1, 10)
 
@@ -459,28 +506,10 @@ if __name__ == "__main__":
     #insert_08_asm(83, 1)
     #insert_all_08s()
 
-    insert_asm(0x1da56, "NameRaterText1")
-
+    #insert_asm(0x1da56, "NameRaterText1")
     #insert_text_label_tx_far(91, 1)
-    missed_17s = [] #[[95, 1], [95, 2], [96, 1], [97, 1], [99, 1], [99, 2], [99, 3], [100, 1], [100, 2], [100, 3], [100, 4], [100, 5], [100, 6], [124, 8], [124, 10], [124, 12], [124, 16], [124, 17], [133, 3], [139, 1], [139, 2], [139, 3], [141, 2], [141, 3], [154, 2], [154, 3], [169, 4], [171, 2], [171, 3], [174, 2], [174, 3], [176, 4], [176, 5], [182, 3], [215, 5], [91, 2], [91, 3], [124, 8], [124, 10], [124, 12], [124, 16], [124, 17], [139, 1], [139, 2], [139, 3], [141, 2], [169, 4], [171, 2], [174, 2], [176, 4], [176, 5]]
-    for missed_17 in missed_17s:
-        insert_text_label_tx_far(missed_17[0], missed_17[1])
-        
-        asm = None
-        incbin_lines = []
-        processed_incbins = {}
-        analyze_incbins.asm = None
-        analyze_incbins.incbin_lines = []
-        analyze_incbins.processed_incbins = {}
-
-        load_asm()
-        isolate_incbins()
-        process_incbins()
 
     #insert_text(0x44276, "ViridianPokeCenterText4")
     #insert_texts_label(4)
     #insert_all_texts_labels()
 
-    if len(failed_attempts) > 0:
-        print "-- FAILED ATTEMPTS --"
-        print str(failed_attempts)
-- 
cgit v1.2.3


From bc3bf29219a5f3d89faa0ba82c3cb4a7d76c38c1 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Fri, 13 Jan 2012 12:10:53 -0600
Subject: update insert_texts: $0000 to $3fff don't need banks

hg-commit-id: 10327274b8f8
---
 extras/insert_texts.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/extras/insert_texts.py b/extras/insert_texts.py
index b683d400..27ba8696 100644
--- a/extras/insert_texts.py
+++ b/extras/insert_texts.py
@@ -425,6 +425,7 @@ def insert_text(address, label):
 def scan_for_map_scripts_pointer():
     for map_id in extract_maps.map_headers.keys():
         map2 = extract_maps.map_headers[map_id]
+        if map_id in extract_maps.bad_maps: continue #skip
         script_pointer = int(map2["script_pointer"], 16)
 
         asm_output, offset, last_hl_address, last_a_address = output_bank_opcodes(script_pointer)
@@ -435,7 +436,10 @@ def scan_for_map_scripts_pointer():
             byte1 = ord(extract_maps.rom[hl_pointer])
             byte2 = ord(extract_maps.rom[hl_pointer+1])
             address = byte1 + (byte2 << 8)
-            first_script_pointer = extract_maps.calculate_pointer(address, int(map2["bank"], 16))
+            if address > 0x3fff:
+                first_script_pointer = extract_maps.calculate_pointer(address, int(map2["bank"], 16))
+            else:
+                first_script_pointer = address
 
             first_script_text = " first_script=" + hex(first_script_pointer)
 
@@ -455,7 +459,10 @@ def scan_for_map_scripts_pointer():
                 byte1 = ord(extract_maps.rom[hl_pointer + (2*last_a_id)])
                 byte2 = ord(extract_maps.rom[hl_pointer + (2*last_a_id) + 1])
                 address2 = byte1 + (byte2 << 8)
-                latest_script_pointer = extract_maps.calculate_pointer(address2, int(map2["bank"], 16))
+                if address2 > 0x3fff:
+                    latest_script_pointer = extract_maps.calculate_pointer(address2, int(map2["bank"], 16))
+                else:
+                    latest_script_pointer = address2
                 script_pointers.append(hex(latest_script_pointer))
                 #print "latest script pointer (part 1): " + hex(address2)
                 #print "latest script pointer: " + hex(latest_script_pointer)
@@ -464,7 +471,7 @@ def scan_for_map_scripts_pointer():
         if last_hl_address == None: last_hl_address = "None"
         else: last_hl_address = hex(last_hl_address)
 
-        print "map_id=" + str(map_id) + " script_pointer=" + hex(script_pointer) + " script_pointers=" + last_hl_address + first_script_text
+        print "map_id=" + str(map_id) + " " + map2["name"] + " script_pointer=" + hex(script_pointer) + " script_pointers=" + last_hl_address + first_script_text
         print "\n"
 
 if __name__ == "__main__":
-- 
cgit v1.2.3


From 71ebf0b95e9d5f31c8021910f70d0b8b9b79043c Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Fri, 13 Jan 2012 14:31:22 -0600
Subject: code to insert main scripts and subscripts

hg-commit-id: 807e8743e682
---
 extras/gbz80disasm.py  |  9 ++++--
 extras/insert_texts.py | 88 ++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 85 insertions(+), 12 deletions(-)

diff --git a/extras/gbz80disasm.py b/extras/gbz80disasm.py
index 6dc512a5..2150611c 100644
--- a/extras/gbz80disasm.py
+++ b/extras/gbz80disasm.py
@@ -584,6 +584,7 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
 
     last_hl_address = None #for when we're scanning the main map script
     last_a_address = None
+    used_3d97 = False
 
     rom = extract_maps.rom
     offset = original_offset
@@ -734,10 +735,14 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
                 offset += 1
 
                 if current_byte == 0x21:
-                    last_hl_address = byte1 + (byte2 << 8) 
+                    last_hl_address = byte1 + (byte2 << 8)
+                if current_byte == 0xcd:
+                    if number == 0x3d97: used_3d97 = True
 
                 #duck out if this is jp $24d7
                 if current_byte == 0xc3 or current_byte in relative_unconditional_jumps:
+                    if current_byte == 0xc3:
+                        if number == 0x3d97: used_3d97 = True
                     #if number == 0x24d7: #jp
                     if not has_outstanding_labels(byte_labels):
                         keep_reading = False
@@ -774,7 +779,7 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
     #add the offset of the final location
     output += "; " + hex(offset)
 
-    return (output, offset, last_hl_address, last_a_address)
+    return (output, offset, last_hl_address, last_a_address, used_3d97)
 
 def has_outstanding_labels(byte_labels):
     """
diff --git a/extras/insert_texts.py b/extras/insert_texts.py
index 27ba8696..24b55899 100644
--- a/extras/insert_texts.py
+++ b/extras/insert_texts.py
@@ -369,6 +369,11 @@ def insert_asm(start_address, label):
         print "skipping asm because the address is taken"
         return
 
+    #name check
+    if (label + ":") in "\n".join(analyze_incbins.asm):
+        print "skipping asm because the label is taken"
+        return
+
     newlines = split_incbin_line_into_three(line_number, start_address, end_address - start_address )
     
     newlines = newlines.split("\n")
@@ -387,7 +392,7 @@ def insert_asm(start_address, label):
 
     diff = generate_diff_insert(line_number, newlines)
     print diff
-    result = apply_diff(diff, try_fixing=False)
+    result = apply_diff(diff, try_fixing=True)
 
 def insert_text(address, label):
     "inserts a text script (but not $8s)"
@@ -422,34 +427,58 @@ def insert_text(address, label):
     print diff
     #apply_diff(diff)
 
+#move this into another file?
 def scan_for_map_scripts_pointer():
-    for map_id in extract_maps.map_headers.keys():
+    for map_id in extract_maps.map_headers.keys(): #skip id=0 (Pallet Town) because the naming conventions are wonky
         map2 = extract_maps.map_headers[map_id]
-        if map_id in extract_maps.bad_maps: continue #skip
+        if map_id in extract_maps.bad_maps or map_id in [0, 39, 37, 38]: continue #skip
         script_pointer = int(map2["script_pointer"], 16)
 
-        asm_output, offset, last_hl_address, last_a_address = output_bank_opcodes(script_pointer)
+        main_asm_output, offset, last_hl_address, last_a_address, used_3d97 = output_bank_opcodes(script_pointer)
+        hl_pointer = "None"
         
         first_script_text = ""
-        if last_hl_address != None and last_hl_address != "None":
-            hl_pointer = extract_maps.calculate_pointer(last_hl_address, int(map2["bank"], 16))
+        if last_hl_address != None and last_hl_address != "None" and used_3d97==True:
+            if last_hl_address > 0x3fff:
+                hl_pointer = extract_maps.calculate_pointer(last_hl_address, int(map2["bank"], 16))
+            else:
+                hl_pointer = last_hl_address
             byte1 = ord(extract_maps.rom[hl_pointer])
             byte2 = ord(extract_maps.rom[hl_pointer+1])
             address = byte1 + (byte2 << 8)
+
             if address > 0x3fff:
                 first_script_pointer = extract_maps.calculate_pointer(address, int(map2["bank"], 16))
             else:
                 first_script_pointer = address
 
+            #for later output
             first_script_text = " first_script=" + hex(first_script_pointer)
 
+            #go ahead and insert this script pointer
+            insert_asm(first_script_pointer, map_name_cleaner(map2["name"], None)[:-2] + "Script0")
+            
+            #reset everything
+            #analyze_incbins.reset_incbins()
+            asm = None
+            incbin_lines = []
+            processed_incbins = {}
+            analyze_incbins.asm = None
+            analyze_incbins.incbin_lines = []
+            analyze_incbins.processed_incbins = {}
+    
+            #reload
+            load_asm()
+            isolate_incbins()
+            process_incbins()
+
             a_numbers = [0]
-            script_pointers = [hex(first_script_pointer)]
             last_a_id = 0
+            script_pointers = [hex(first_script_pointer)]
             latest_script_pointer = first_script_pointer
             while last_a_id == (max(a_numbers)) or last_a_id==0:
                 asm_output, offset, last_hl_address2, last_a_id, byte1, byte2, address = None, None, None, None, None, None, None
-                asm_output, offset, last_hl_address2, last_a_id = output_bank_opcodes(latest_script_pointer)
+                asm_output, offset, last_hl_address2, last_a_id, used_3d97 = output_bank_opcodes(latest_script_pointer)
                 
                 if last_a_id == (max(a_numbers) + 1):
                     a_numbers.append(last_a_id)
@@ -463,16 +492,55 @@ def scan_for_map_scripts_pointer():
                     latest_script_pointer = extract_maps.calculate_pointer(address2, int(map2["bank"], 16))
                 else:
                     latest_script_pointer = address2
+
                 script_pointers.append(hex(latest_script_pointer))
                 #print "latest script pointer (part 1): " + hex(address2)
                 #print "latest script pointer: " + hex(latest_script_pointer)
+
+                #go ahead and insert the asm for this script
+                insert_asm(latest_script_pointer, map_name_cleaner(map2["name"], None)[:-2] + "Script" + str(len(script_pointers) - 1))
+                
+                #reset everything
+                #analyze_incbins.reset_incbins()
+                asm = None
+                incbin_lines = []
+                processed_incbins = {}
+                analyze_incbins.asm = None
+                analyze_incbins.incbin_lines = []
+                analyze_incbins.processed_incbins = {}
+        
+                #reload
+                load_asm()
+                isolate_incbins()
+                process_incbins()
+
             print "map_id=" + str(map_id) + " scripts are: " + str(script_pointers)
         
         if last_hl_address == None: last_hl_address = "None"
         else: last_hl_address = hex(last_hl_address)
 
-        print "map_id=" + str(map_id) + " " + map2["name"] + " script_pointer=" + hex(script_pointer) + " script_pointers=" + last_hl_address + first_script_text
-        print "\n"
+        if hl_pointer != None and hl_pointer != "None": hl_pointer = hex(hl_pointer)
+
+        print "map_id=" + str(map_id) + " " + map2["name"] + " script_pointer=" + hex(script_pointer) + " script_pointers=" + hl_pointer + first_script_text
+        print main_asm_output
+        print "\n\n"
+
+        #insert asm for the main script
+        insert_asm(script_pointer, map_name_cleaner(map2["name"], None)[:-2] + "Script")
+        
+        #reset everything
+        #analyze_incbins.reset_incbins()
+        asm = None
+        incbin_lines = []
+        processed_incbins = {}
+        analyze_incbins.asm = None
+        analyze_incbins.incbin_lines = []
+        analyze_incbins.processed_incbins = {}
+
+        #reload
+        load_asm()
+        isolate_incbins()
+        process_incbins()
 
 if __name__ == "__main__":
     #load map headers and object data
-- 
cgit v1.2.3


From 4ef63f8389d7bba16d1f6122f1b7278447de6908 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Fri, 13 Jan 2012 14:45:57 -0600
Subject: insert main scripts and subscripts

hg-commit-id: 241a277dd8e8
---
 pokered.asm | 3319 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 3106 insertions(+), 213 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index 7e07633c..ba5d87bd 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -6011,7 +6011,18 @@ PalletTownText7: ; sign by Blue’s house
 	TX_FAR _PalletTownText7
 	db "@"
 
-INCBIN "baserom.gbc",$18ff1,$190e4 - $18ff1
+ViridianCityScript: ; 0x18ff1
+    call $3c3c
+    ld hl, $4ffd
+    ld a, [$d5f4]
+    jp $3d97
+; 0x18ffd
+INCBIN "baserom.gbc",$18ffd,$8
+ViridianCityScript0: ; 0x19005
+    call $500b
+    jp $503d
+; 0x1900b
+INCBIN "baserom.gbc",$1900b,$d9
 
 ViridianCityTexts: ; 0x190e4
     dw ViridianCityText1, ViridianCityText2, ViridianCityText3, ViridianCityText4, ViridianCityText5, ViridianCityText6, ViridianCityText7, ViridianCityText8, ViridianCityText9, ViridianCityText10, ViridianCityText11, ViridianCityText12, ViridianCityText13, ViridianCityText14, ViridianCityText15
@@ -6154,7 +6165,16 @@ ViridianCityText13: ; 0x1922d
 ViridianCityText14:
 INCBIN "baserom.gbc",$19232,$19237 - $19232
 
-INCBIN "baserom.gbc",$19237,$1938b - $19237
+INCBIN "baserom.gbc",$19237,$19251 - $19237
+PewterCityScript0: ; 0x19251
+    xor a
+    ld [$d619], a
+    ld hl, $d754
+    res 0, [hl]
+    call $525e
+    ret
+; 0x1925e
+INCBIN "baserom.gbc",$1925e,$12d
 
 PewterCityTexts: ; 0x1938b
     dw PewterCityText1, PewterCityText2, PewterCityText3, PewterCityText4, PewterCityText5, PewterCityText6, PewterCityText7, PewterCityText8, PewterCityText9, PewterCityText10, PewterCityText11, PewterCityText12, PewterCityText13, PewterCityText14
@@ -6265,7 +6285,169 @@ PewterCityText12: ; 0x1947b
     TX_FAR _PewterCityText12
     db $50
 
-INCBIN "baserom.gbc",$19480,$1962d - $19480
+CeruleanCityScript: ; 0x19480
+    call $3c3c
+    ld hl, $549d
+    ld a, [$d60f]
+    jp $3d97
+; 0x1948c
+INCBIN "baserom.gbc",$1948c,$3c
+CeruleanCityScript0: ; 0x194c8
+    ld a, [$d75b]
+    bit 7, a
+    jr nz, .asm_194f7 ; 0x194cd $28
+    ld hl, $554f
+    call $34bf
+    jr nc, .asm_194f7 ; 0x194d5 $20
+    ld a, [$cd3d]
+    cp $1
+    ld a, $8
+    ld b, $0
+    jr nz, .asm_194e6 ; 0x194e0 $4
+    ld a, $4
+    ld b, $4
+.asm_194e6
+    ld [$d528], a
+    ld a, b
+    ld [$c129], a
+    call Delay3
+    ld a, $2
+    ld [$ff00+$8c], a
+    jp $2920
+.asm_194f7
+    ld a, [$d75a]
+    bit 0, a
+    ret nz
+    ld hl, $5554
+    call $34bf
+    ret nc
+    ld a, [$d700]
+    and a
+    jr z, .asm_19512 ; 0x19508 $8
+    ld a, $ff
+    ld [$c0ee], a
+    call $23b1
+.asm_19512
+    ld c, $2
+    ld a, $de
+    call $23a1
+    xor a
+    ld [$ff00+$b4], a
+    ld a, $f0
+    ld [$cd6b], a
+    ld a, [$d362]
+    cp $14
+    jr z, .asm_19535 ; 0x19526 $d
+    ld a, $1
+    ld [$ff00+$8c], a
+    ld a, $5
+    ld [$ff00+$8b], a
+    call $3500
+    ld [hl], $19
+.asm_19535
+    ld a, $5
+    ld [$cc4d], a
+    ld a, $15
+    call Predef
+    ld de, $5559
+    ld a, $1
+    ld [$ff00+$8c], a
+    call $363a
+    ld a, $1
+    ld [$d60f], a
+    ret
+; 0x1954f
+INCBIN "baserom.gbc",$1954f,$19567 - $1954f
+CeruleanCityScript1: ; 0x19567
+    ld a, [$d730]
+    bit 0, a
+    ret nz
+    xor a
+    ld [$cd6b], a
+    ld a, $1
+    ld [$ff00+$8c], a
+    call $2920
+    ld hl, $d72d
+    set 6, [hl]
+    set 7, [hl]
+    ld hl, $566d
+    ld de, $5672
+    call $3354
+    ld a, $e1
+    ld [$d059], a
+    ld a, [$d715]
+    cp $b1
+    jr nz, .asm_19598 ; 0x19592 $4
+    ld a, $7
+    jr .asm_195a2 ; 0x19596 $a
+.asm_19598
+    cp $99
+    jr nz, .asm_195a0 ; 0x1959a $4
+    ld a, $8
+    jr .asm_195a2 ; 0x1959e $2
+.asm_195a0
+    ld a, $9
+.asm_195a2
+    ld [$d05d], a
+    xor a
+    ld [$ff00+$b4], a
+    call $555d
+    ld a, $2
+    ld [$d60f], a
+    ret
+; 0x195b1
+CeruleanCityScript2: ; 0x195b1
+    ld a, [$d057]
+    cp $ff
+    jp z, $548c
+    call $555d
+    ld a, $f0
+    ld [$cd6b], a
+    ld hl, $d75a
+    set 0, [hl]
+    ld a, $1
+    ld [$ff00+$8c], a
+    call $2920
+    ld a, $ff
+    ld [$c0ee], a
+    call $23b1
+    ld b, $2
+    ld hl, $5b47
+    call Bankswitch
+    ld a, $1
+    ld [$ff00+$8c], a
+    call $3541
+    ld a, [$d362]
+    cp $14
+    jr nz, .asm_195f0 ; 0x195e9 $5
+    ld de, $5608
+    jr .asm_195f3 ; 0x195ee $3
+.asm_195f0
+    ld de, $5600
+.asm_195f3
+    ld a, $1
+    ld [$ff00+$8c], a
+    call $363a
+    ld a, $3
+    ld [$d60f], a
+    ret
+; 0x19600
+INCBIN "baserom.gbc",$19600,$19610 - $19600
+CeruleanCityScript3: ; 0x19610
+    ld a, [$d730]
+    bit 0, a
+    ret nz
+    ld a, $5
+    ld [$cc4d], a
+    ld a, $11
+    call Predef
+    xor a
+    ld [$cd6b], a
+    call $2307
+    ld a, $0
+    ld [$d60f], a
+    ret
+; 0x1962d
 
 CeruleanCityTexts: ; 0x1962d
     dw CeruleanCityText1, CeruleanCityText2, CeruleanCityText3, CeruleanCityText4, CeruleanCityText5, CeruleanCityText6, CeruleanCityText7, CeruleanCityText8, CeruleanCityText9, CeruleanCityText10, CeruleanCityText11, CeruleanCityText12, CeruleanCityText13, CeruleanCityText14, CeruleanCityText15, CeruleanCityText16, CeruleanCityText17
@@ -6420,7 +6602,65 @@ CeruleanCityText17: ; 0x1979c
     TX_FAR _CeruleanCityText17
     db $50
 
-INCBIN "baserom.gbc",$197a1,$1986f - $197a1
+VermilionCityScript: ; 0x197a1
+    call $3c3c
+    ld hl, $d126
+    bit 6, [hl]
+    res 6, [hl]
+    push hl
+    call nz, $57cb
+    pop hl
+    bit 5, [hl]
+    res 5, [hl]
+    call nz, $57c0
+    ld hl, $57dc
+    ld a, [$d62a]
+    jp $3d97
+; 0x197c0
+INCBIN "baserom.gbc",$197c0,$26
+VermilionCityScript0: ; 0x197e6
+    ld a, [$c109]
+    and a
+    ret nz
+    ld hl, $5823
+    call $34bf
+    ret nc
+    xor a
+    ld [$ff00+$b4], a
+    ld [$cf0d], a
+    ld a, $3
+    ld [$ff00+$8c], a
+    call $2920
+    ld a, [$d803]
+    bit 2, a
+    jr nz, .asm_19810 ; 0x19804 $a
+    ld b, $3f
+    ld a, $1c
+    call Predef
+    ld a, b
+    and a
+    ret nz
+.asm_19810
+    ld a, $40
+    ld [$ccd3], a
+    ld a, $1
+    ld [$cd38], a
+    call $3486
+    ld a, $1
+    ld [$d62a], a
+    ret
+; 0x19823
+INCBIN "baserom.gbc",$19823,$1985f - $19823
+VermilionCityScript1: ; 0x1985f
+    ld a, [$cd38]
+    and a
+    ret nz
+    ld c, $a
+    call $3739
+    ld a, $0
+    ld [$d62a], a
+    ret
+; 0x1986f
 
 VermilionCityTexts: ; 0x1986f
     dw VermilionCityText1, VermilionCityText2, VermilionCityText3, VermilionCityText4, VermilionCityText5, VermilionCityText6, VermilionCityText7, VermilionCityText8, VermilionCityText9, VermilionCityText10, VermilionCityText11, VermilionCityText12, VermilionCityText13
@@ -6526,7 +6766,16 @@ VermilionCityText13: ; 0x19951
     TX_FAR _VermilionCityText13
     db $50
 
-INCBIN "baserom.gbc",$19956,$19966 - $19956
+CeladonCityScript: ; 0x19956
+    call $3c3c
+    ld hl, $d77e
+    res 0, [hl]
+    res 7, [hl]
+    ld hl, $d816
+    res 7, [hl]
+    ret
+; 0x19966
+INCBIN "baserom.gbc",$19966,$0
 
 CeladonCityTexts: ; 0x19966
     dw CeladonCityText1, CeladonCityText2, CeladonCityText3, CeladonCityText4, CeladonCityText5, CeladonCityText6, CeladonCityText7, CeladonCityText8, CeladonCityText9, CeladonCityText10, CeladonCityText11, CeladonCityText12, CeladonCityText13, CeladonCityText14, CeladonCityText15, CeladonCityText16, CeladonCityText17, CeladonCityText18
@@ -6625,7 +6874,10 @@ CeladonCityText18: ; 0x19a26
     TX_FAR _CeladonCityText18
     db $50
 
-INCBIN "baserom.gbc",$19a2b,$19a2e - $19a2b
+FuchsiaCityScript: ; 0x19a2b
+    jp $3c3c
+; 0x19a2e
+INCBIN "baserom.gbc",$19a2e,$0
 
 FuchsiaCityTexts: ; 0x19a2e
     dw FuchsiaCityText1, FuchsiaCityText2, FuchsiaCityText3, FuchsiaCityText4, FuchsiaCityText5, FuchsiaCityText6, FuchsiaCityText7, FuchsiaCityText8, FuchsiaCityText9, FuchsiaCityText10, FuchsiaCityText11, FuchsiaCityText12, FuchsiaCityText13, FuchsiaCityText14, FuchsiaCityText15, FuchsiaCityText16, FuchsiaCityText17, FuchsiaCityText18, FuchsiaCityText19, FuchsiaCityText20, FuchsiaCityText21, FuchsiaCityText22, FuchsiaCityText23, FuchsiaCityText24
@@ -6873,7 +7125,10 @@ VermilionHouse3_h: ; 0x19c06 to 0x19c12 (12 bytes) (bank=6) (id=196)
 
     dw $5c25 ; objects
 
-INCBIN "baserom.gbc",$19c12,$19c15 - $19c12
+VermilionHouse3Script: ; 0x19c12
+    jp $3c3c
+; 0x19c15
+INCBIN "baserom.gbc",$19c15,$0
 
 VermilionHouse3Texts: ; 0x19c15
     dw VermilionHouse3Text1
@@ -6913,7 +7168,28 @@ IndigoPlateauLobby_h: ; 0x19c4f to 0x19c5b (12 bytes) (bank=6) (id=174)
 
     dw $5c95 ; objects
 
-INCBIN "baserom.gbc",$19c5b,$19c8a - $19c5b
+IndigoPlateauLobbyScript: ; 0x19c5b
+    call $22fa
+    call $3c3c
+    ld hl, $d126
+    bit 6, [hl]
+    res 6, [hl]
+    ret z
+    ld hl, $d869
+    res 7, [hl]
+    ld hl, $d734
+    bit 1, [hl]
+    res 1, [hl]
+    ret z
+    ld hl, $d863
+    xor a
+    ld [hli], a
+    ld [hli], a
+    ld [hli], a
+    ld [hl], a
+    ret
+; 0x19c7f
+INCBIN "baserom.gbc",$19c7f,$b
 
 IndigoPlateauLobbyText2:
 IndigoPlateauLobbyText1: ; 0x19c8a
@@ -6962,7 +7238,17 @@ SilphCo4_h: ; 0x19cff to 0x19d0b (12 bytes) (bank=6) (id=209)
 
     dw $5e35 ; objects
 
-INCBIN "baserom.gbc",$19d0b,$19da0 - $19d0b
+SilphCo4Script: ; 0x19d0b
+    call $5d21
+    call $3c3c
+    ld hl, $5dae
+    ld de, $5d9a
+    ld a, [$d645]
+    call $3160
+    ld [$d645], a
+    ret
+; 0x19d21
+INCBIN "baserom.gbc",$19d21,$7f
 
 SilphCo4Texts: ; 0x19da0
     dw SilphCo4Text1, SilphCo4Text2, SilphCo4Text3, SilphCo4Text4, SilphCo4Text5, SilphCo4Text6, SilphCo4Text7
@@ -7045,7 +7331,17 @@ SilphCo5_h: ; 0x19f2b to 0x19f37 (12 bytes) (bank=6) (id=210)
 
     dw $608d ; objects
 
-INCBIN "baserom.gbc",$19f37,$19fbc - $19f37
+SilphCo5Script: ; 0x19f37
+    call $5f4d
+    call $3c3c
+    ld hl, $5fd2
+    ld de, $5fb6
+    ld a, [$d646]
+    call $3160
+    ld [$d646], a
+    ret
+; 0x19f4d
+INCBIN "baserom.gbc",$19f4d,$6f
 
 SilphCo5Texts: ; 0x19fbc
     dw SilphCo5Text1, SilphCo5Text2, SilphCo5Text3, SilphCo5Text4, SilphCo5Text5, SilphCo5Text6, SilphCo5Text7, SilphCo5Text8, SilphCo5Text9, SilphCo5Text10, SilphCo5Text11
@@ -7152,7 +7448,17 @@ SilphCo6_h: ; 0x1a19d to 0x1a1a9 (12 bytes) (bank=6) (id=211)
 
     dw $62fb ; objects
 
-INCBIN "baserom.gbc",$1a1a9,$1a1f6 - $1a1a9
+SilphCo6Script: ; 0x1a1a9
+    call $61bf
+    call $3c3c
+    ld hl, $620a
+    ld de, $61f0
+    ld a, [$d647]
+    call $3160
+    ld [$d647], a
+    ret
+; 0x1a1bf
+INCBIN "baserom.gbc",$1a1bf,$37
 
 SilphCo6Texts: ; 0x1a1f6
     dw SilphCo6Text1, SilphCo6Text2, SilphCo6Text3, SilphCo6Text4, SilphCo6Text5, SilphCo6Text6, SilphCo6Text7, SilphCo6Text8, SilphCo6Text9, SilphCo6Text10
@@ -7572,7 +7878,59 @@ MonsterNames: ; 421E
 	db "WEEPINBELL"
 	db "VICTREEBEL"
 
-INCBIN "baserom.gbc",$1c98a,$1ca81 - $1c98a
+INCBIN "baserom.gbc",$1c98a,$1ca19 - $1c98a
+CinnabarIslandScript: ; 0x1ca19
+    call $3c3c
+    ld hl, $d126
+    set 5, [hl]
+    ld hl, $d796
+    res 0, [hl]
+    ld hl, $d7a3
+    res 1, [hl]
+    ld hl, $4a34
+    ld a, [$d639]
+    jp $3d97
+; 0x1ca34
+INCBIN "baserom.gbc",$1ca34,$4
+CinnabarIslandScript0: ; 0x1ca38
+    ld b, $2b
+    call $3493
+    ret nz
+    ld a, [$d361]
+    cp $4
+    ret nz
+    ld a, [$d362]
+    cp $12
+    ret nz
+    ld a, $8
+    ld [$d528], a
+    ld a, $8
+    ld [$ff00+$8c], a
+    call $2920
+    xor a
+    ld [$ff00+$b4], a
+    ld a, $1
+    ld [$cd38], a
+    ld a, $80
+    ld [$ccd3], a
+    call $3486
+    xor a
+    ld [$c109], a
+    ld [$cd6b], a
+    ld a, $1
+    ld [$d639], a
+    ret
+; 0x1ca73
+CinnabarIslandScript1: ; 0x1ca73
+    ld a, [$cd38]
+    and a
+    ret nz
+    call Delay3
+    ld a, $0
+    ld [$d639], a
+    ret
+; 0x1ca81
+INCBIN "baserom.gbc",$1ca81,$0
 
 CinnabarIslandTexts: ; 0x1ca81
     dw CinnabarIslandText1, CinnabarIslandText2, CinnabarIslandText3, CinnabarIslandText4, CinnabarIslandText5, CinnabarIslandText6, CinnabarIslandText7, CinnabarIslandText8
@@ -7600,7 +7958,10 @@ CinnabarIslandText7: ; 0x1caaa
     TX_FAR _CinnabarIslandText7
     db $50
 
-INCBIN "baserom.gbc",$1caaf,$1cab2 - $1caaf
+Route1Script: ; 0x1caaf
+    jp $3c3c
+; 0x1cab2
+INCBIN "baserom.gbc",$1cab2,$0
 
 Route1Texts: ; 0x1cab2
     dw Route1Text1, Route1Text2, Route1Text3
@@ -7645,7 +8006,171 @@ OaksLab_h: ; 0x1cb02 to 0x1cb0e (12 bytes) (bank=7) (id=40)
 
     dw $540a ; objects
 
-INCBIN "baserom.gbc",$1cb0e,$1d082 - $1cb0e
+OaksLabScript: ; 0x1cb0e
+    ld a, [$d74b]
+    bit 6, a
+    call nz, $5076
+    ld a, $1
+    ld [$cf0c], a
+    xor a
+    ld [$cc3c], a
+    ld hl, $4b28
+    ld a, [$d5f0]
+    jp $3d97
+; 0x1cb28
+INCBIN "baserom.gbc",$1cb28,$26
+OaksLabScript0: ; 0x1cb4e
+    ld a, [$d74b]
+    bit 7, a
+    ret z
+    ld a, [$cf10]
+    and a
+    ret nz
+    ld a, $31
+    ld [$cc4d], a
+    ld a, $15
+    call Predef
+    ld hl, $d72e
+    res 4, [hl]
+    ld a, $1
+    ld [$d5f0], a
+    ret
+; 0x1cb6e
+OaksLabScript1: ; 0x1cb6e
+    ld a, $8
+    ld [$ff00+$8c], a
+    ld de, $4b7e
+    call $363a
+    ld a, $2
+    ld [$d5f0], a
+    ret
+; 0x1cb7e
+INCBIN "baserom.gbc",$1cb7e,$1cb82 - $1cb7e
+OaksLabScript2: ; 0x1cb82
+    ld a, [$d730]
+    bit 0, a
+    ret nz
+    ld a, $31
+    ld [$cc4d], a
+    ld a, $11
+    call Predef
+    ld a, $2e
+    ld [$cc4d], a
+    ld a, $15
+    call Predef
+    ld a, $3
+    ld [$d5f0], a
+    ret
+; 0x1cba2
+OaksLabScript3: ; 0x1cba2
+    call Delay3
+    ld hl, $ccd3
+    ld de, $4bcf
+    call $350c
+    dec a
+    ld [$cd38], a
+    call $3486
+    ld a, $1
+    ld [$ff00+$8c], a
+    xor a
+    ld [$ff00+$8d], a
+    call $34a6
+    ld a, $5
+    ld [$ff00+$8c], a
+    xor a
+    ld [$ff00+$8d], a
+    call $34a6
+    ld a, $4
+    ld [$d5f0], a
+    ret
+; 0x1cbcf
+INCBIN "baserom.gbc",$1cbcf,$1cbd2 - $1cbcf
+OaksLabScript4: ; 0x1cbd2
+    ld a, [$cd38]
+    and a
+    ret nz
+    ld hl, $d747
+    set 0, [hl]
+    ld hl, $d74b
+    set 0, [hl]
+    ld a, $1
+    ld [$ff00+$8c], a
+    ld a, $4
+    ld [$ff00+$8d], a
+    call $34a6
+    call $2429
+    ld hl, $d733
+    res 1, [hl]
+    call $2307
+    ld a, $5
+    ld [$d5f0], a
+    ret
+; 0x1cbfd
+OaksLabScript5: ; 0x1cbfd
+    ld a, $fc
+    ld [$cd6b], a
+    ld a, $11
+    ld [$ff00+$8c], a
+    call $2920
+    call Delay3
+    ld a, $12
+    ld [$ff00+$8c], a
+    call $2920
+    call Delay3
+    ld a, $13
+    ld [$ff00+$8c], a
+    call $2920
+    call Delay3
+    ld a, $14
+    ld [$ff00+$8c], a
+    call $2920
+    ld hl, $d74b
+    set 1, [hl]
+    xor a
+    ld [$cd6b], a
+    ld a, $6
+    ld [$d5f0], a
+    ret
+; 0x1cc36
+OaksLabScript6: ; 0x1cc36
+    ld a, [$d361]
+    cp $6
+    ret nz
+    ld a, $5
+    ld [$ff00+$8c], a
+    xor a
+    ld [$ff00+$8d], a
+    call $34a6
+    ld a, $1
+    ld [$ff00+$8c], a
+    xor a
+    ld [$ff00+$8d], a
+    call $34a6
+    call $2429
+    ld a, $c
+    ld [$ff00+$8c], a
+    call $2920
+    ld a, $1
+    ld [$cd38], a
+    ld a, $40
+    ld [$ccd3], a
+    call $3486
+    ld a, $8
+    ld [$d528], a
+    ld a, $7
+    ld [$d5f0], a
+    ret
+; 0x1cc72
+OaksLabScript7: ; 0x1cc72
+    ld a, [$cd38]
+    and a
+    ret nz
+    call Delay3
+    ld a, $6
+    ld [$d5f0], a
+    ret
+; 0x1cc80
+INCBIN "baserom.gbc",$1cc80,$402
 
 OaksLabTexts: ; 0x1d082
     dw OaksLabText1, OaksLabText2, OaksLabText3, OaksLabText4, OaksLabText5, OaksLabText6, OaksLabText7, OaksLabText8, OaksLabText9, OaksLabText10, OaksLabText11, OaksLabText12, OaksLabText13, OaksLabText14, OaksLabText15, OaksLabText16, OaksLabText17, OaksLabText18, OaksLabText19, OaksLabText20, OaksLabText21, OaksLabText22, OaksLabText23, OaksLabText24, OaksLabText25, OaksLabText26, OaksLabText27
@@ -8067,7 +8592,46 @@ ViridianMart_h: ; 0x1d462 to 0x1d46e (12 bytes) (bank=7) (id=42)
 
     dw $550a ; objects
 
-INCBIN "baserom.gbc",$1d46e,$1d4e0 - $1d46e
+ViridianMartScript: ; 0x1d46e
+    call $547d
+    call $3c3c
+    ld hl, $5495
+    ld a, [$d60d]
+    jp $3d97
+; 0x1d47d
+INCBIN "baserom.gbc",$1d47d,$1e
+ViridianMartScript0: ; 0x1d49b
+    call $2429
+    ld a, $4
+    ld [$ff00+$8c], a
+    call $2920
+    ld hl, $ccd3
+    ld de, $54bb
+    call $350c
+    dec a
+    ld [$cd38], a
+    call $3486
+    ld a, $1
+    ld [$d60d], a
+    ret
+; 0x1d4bb
+INCBIN "baserom.gbc",$1d4bb,$1d4c0 - $1d4bb
+ViridianMartScript1: ; 0x1d4c0
+    ld a, [$cd38]
+    and a
+    ret nz
+    call Delay3
+    ld a, $5
+    ld [$ff00+$8c], a
+    call $2920
+    ld bc, $4601
+    call GiveItem
+    ld hl, $d74e
+    set 1, [hl]
+    ld a, $2
+    ld [$d60d], a
+    ret
+; 0x1d4e0
 
 ViridianMartTexts: ; 0x1d4e0
     dw ViridianMartText1, ViridianMartText2, ViridianMartText3 ;, ViridianMartText4
@@ -8117,7 +8681,10 @@ School_h: ; 0x1d540 to 0x1d54c (12 bytes) (bank=7) (id=43)
 
     dw $555d ; objects
 
-INCBIN "baserom.gbc",$1d54c,$1d54f - $1d54c
+SchoolScript: ; 0x1d54c
+    jp $3c3c
+; 0x1d54f
+INCBIN "baserom.gbc",$1d54f,$0
 
 SchoolTexts: ; 0x1d54f
     dw SchoolText1, SchoolText2
@@ -8155,7 +8722,10 @@ ViridianHouse_h: ; 0x1d57d to 0x1d589 (12 bytes) (bank=7) (id=44)
 
     dw $55bb ; objects
 
-INCBIN "baserom.gbc",$1d589,$1d58d - $1d589
+INCBIN "baserom.gbc",$1d589,$1d58a - $1d589
+ViridianHouseScript: ; 0x1d58a
+    jp $3c3c
+; 0x1d58d
 
 ViridianHouseTexts: ; 0x1d58d
     dw ViridianHouseText1, ViridianHouseText2, ViridianHouseText3, ViridianHouseText4
@@ -8210,7 +8780,10 @@ PewterHouse1_h: ; 0x1d5e7 to 0x1d5f3 (12 bytes) (bank=7) (id=55)
 
     dw $5616 ; objects
 
-INCBIN "baserom.gbc",$1d5f3,$1d5f6 - $1d5f3
+PewterHouse1Script: ; 0x1d5f3
+    jp $3c3c
+; 0x1d5f6
+INCBIN "baserom.gbc",$1d5f6,$0
 
 PewterHouse1Texts: ; 0x1d5f6
     dw PewterHouse1Text1, PewterHouse1Text2, PewterHouse1Text3
@@ -8257,7 +8830,10 @@ PewterHouse2_h: ; 0x1d63c to 0x1d648 (12 bytes) (bank=7) (id=57)
 
     dw $5659 ; objects
 
-INCBIN "baserom.gbc",$1d648,$1d64b - $1d648
+PewterHouse2Script: ; 0x1d648
+    jp $3c3c
+; 0x1d64b
+INCBIN "baserom.gbc",$1d64b,$0
 
 PewterHouse2Texts: ; 0x1d64b
     dw PewterHouse2Text1, PewterHouse2Text2
@@ -8295,7 +8871,11 @@ CeruleanHouseTrashed_h: ; 0x1d679 to 0x1d685 (12 bytes) (bank=7) (id=62)
 
     dw $56bf ; objects
 
-INCBIN "baserom.gbc",$1d685,$1d689 - $1d685
+CeruleanHouseTrashedScript: ; 0x1d685
+    call $3c3c
+    ret
+; 0x1d689
+INCBIN "baserom.gbc",$1d689,$0
 
 CeruleanHouseTrashedTexts: ; 0x1d689
     dw CeruleanHouseTrashedText1, CeruleanHouseTrashedText2, CeruleanHouseTrashedText3
@@ -8354,7 +8934,10 @@ CeruleanHouse2_h: ; 0x1d6ea to 0x1d6f6 (12 bytes) (bank=7) (id=63)
 
     dw $5710 ; objects
 
-INCBIN "baserom.gbc",$1d6f6,$1d6f9 - $1d6f6
+CeruleanHouse2Script: ; 0x1d6f6
+    jp $3c3c
+; 0x1d6f9
+INCBIN "baserom.gbc",$1d6f9,$0
 
 CeruleanHouse2Texts: ; 0x1d6f9
     dw CeruleanHouse2Text1, CeruleanHouse2Text2
@@ -8396,7 +8979,10 @@ BikeShop_h: ; 0x1d730 to 0x1d73c (12 bytes) (bank=7) (id=66)
 
     dw $5866 ; objects
 
-INCBIN "baserom.gbc",$1d73c,$1d73f - $1d73c
+BikeShopScript: ; 0x1d73c
+    jp $3c3c
+; 0x1d73f
+INCBIN "baserom.gbc",$1d73f,$0
 
 BikeShopTexts: ; 0x1d73f
     dw BikeShopText1, BikeShopText2, BikeShopText3
@@ -8529,7 +9115,11 @@ LavenderHouse1_h: ; 0x1d89c to 0x1d8a8 (12 bytes) (bank=7) (id=149)
 
     dw $596a ; objects
 
-INCBIN "baserom.gbc",$1d8a8,$1d8ac - $1d8a8
+LavenderHouse1Script: ; 0x1d8a8
+    call $3c3c
+    ret
+; 0x1d8ac
+INCBIN "baserom.gbc",$1d8ac,$0
 
 LavenderHouse1Texts: ; 0x1d8ac
     dw LavenderHouse1Text1, LavenderHouse1Text2, LavenderHouse1Text3, LavenderHouse1Text4, LavenderHouse1Text5, LavenderHouse1Text6
@@ -8641,7 +9231,11 @@ LavenderHouse2_h: ; 0x1d9a2 to 0x1d9ae (12 bytes) (bank=7) (id=151)
 
     dw $59e6 ; objects
 
-INCBIN "baserom.gbc",$1d9ae,$1d9b2 - $1d9ae
+LavenderHouse2Script: ; 0x1d9ae
+    call $3c3c
+    ret
+; 0x1d9b2
+INCBIN "baserom.gbc",$1d9b2,$0
 
 LavenderHouse2Texts: ; 0x1d9b2
     dw LavenderHouse2Text1, LavenderHouse2Text2
@@ -8695,7 +9289,10 @@ NameRater_h: ; 0x1da06 to 0x1da12 (12 bytes) (bank=7) (id=229)
 
     dw $5ad6 ; objects
 
-INCBIN "baserom.gbc",$1da12,$1da56 - $1da12
+NameRaterScript: ; 0x1da12
+    jp $3c3c
+; 0x1da15
+INCBIN "baserom.gbc",$1da15,$41
 
 NameRaterText1: ; 0x1da56
     db $8
@@ -8764,7 +9361,11 @@ VermilionHouse1_h: ; 0x1daf0 to 0x1dafc (12 bytes) (bank=7) (id=93)
 
     dw $5b20 ; objects
 
-INCBIN "baserom.gbc",$1dafc,$1db00 - $1dafc
+VermilionHouse1Script: ; 0x1dafc
+    call $3c3c
+    ret
+; 0x1db00
+INCBIN "baserom.gbc",$1db00,$0
 
 VermilionHouse1Texts: ; 0x1db00
     dw VermilionHouse1Text1, VermilionHouse1Text2, VermilionHouse1Text3
@@ -8813,7 +9414,46 @@ VermilionDock_h: ; 0x1db46 to 0x1db52 (12 bytes) (bank=7) (id=94)
 
     dw $5cc6 ; objects
 
-INCBIN "baserom.gbc",$1db52,$1dcc6 - $1db52
+VermilionDockScript: ; 0x1db52
+    call $3c3c
+    ld hl, $d803
+    bit 4, [hl]
+    jr nz, .asm_1db8d ; 0x1db5a $31
+    bit 0, [hl]
+    ret z
+    ld a, [$d42f]
+    cp $1
+    ret nz
+    bit 2, [hl]
+    jp z, $5b9b
+    set 4, [hl]
+    call Delay3
+    ld hl, $d730
+    set 7, [hl]
+    ld hl, $ccd3
+    ld a, $40
+    ld [hli], a
+    ld [hli], a
+    ld [hl], a
+    ld a, $3
+    ld [$cd38], a
+    xor a
+    ld [$c206], a
+    ld [$cd3b], a
+    dec a
+    ld [$cd6b], a
+    ret
+.asm_1db8d
+    bit 5, [hl]
+    ret nz
+    ld a, [$cd38]
+    and a
+    ret nz
+    ld [$cd6b], a
+    set 5, [hl]
+    ret
+; 0x1db9b
+INCBIN "baserom.gbc",$1db9b,$12b
 
 VermilionDockObject: ; 0x1dcc6 (size=20)
     db $f ; border tile
@@ -8841,7 +9481,10 @@ CeladonMansion5_h: ; 0x1dd2e to 0x1dd3a (12 bytes) (bank=7) (id=132)
 
     dw $5d5c ; objects
 
-INCBIN "baserom.gbc",$1dd3a,$1dd3d - $1dd3a
+CeladonMansion5Script: ; 0x1dd3a
+    jp $3c3c
+; 0x1dd3d
+INCBIN "baserom.gbc",$1dd3d,$0
 
 CeladonMansion5Texts: ; 0x1dd3d
     dw CeladonMansion5Text1, CeladonMansion5Text2
@@ -8887,7 +9530,10 @@ FuchsiaMart_h: ; 0x1dd7c to 0x1dd88 (12 bytes) (bank=7) (id=152)
 
     dw $5d9b ; objects
 
-INCBIN "baserom.gbc",$1dd88,$1dd8b - $1dd88
+FuchsiaMartScript: ; 0x1dd88
+    jp $3c3c
+; 0x1dd8b
+INCBIN "baserom.gbc",$1dd8b,$0
 
 FuchsiaMartTexts: ; 0x1dd8b
     dw FuchsiaMartText1, FuchsiaMartText2, FuchsiaMartText3
@@ -8929,7 +9575,10 @@ SaffronHouse1_h: ; 0x1ddd1 to 0x1dddd (12 bytes) (bank=7) (id=179)
 
     dw $5e04 ; objects
 
-INCBIN "baserom.gbc",$1dddd,$1dde0 - $1dddd
+SaffronHouse1Script: ; 0x1dddd
+    jp $3c3c
+; 0x1dde0
+INCBIN "baserom.gbc",$1dde0,$0
 
 SaffronHouse1Texts: ; 0x1dde0
     dw SaffronHouse1Text1, SaffronHouse1Text2, SaffronHouse1Text3, SaffronHouse1Text4
@@ -8981,7 +9630,10 @@ SaffronHouse2_h: ; 0x1de30 to 0x1de3c (12 bytes) (bank=7) (id=183)
 
     dw $5e8a ; objects
 
-INCBIN "baserom.gbc",$1de3c,$1de3f - $1de3c
+SaffronHouse2Script: ; 0x1de3c
+    jp $3c3c
+; 0x1de3f
+INCBIN "baserom.gbc",$1de3f,$0
 
 SaffronHouse2Texts: ; 0x1de3f
     dw SaffronHouse2Text1
@@ -9037,7 +9689,12 @@ DiglettsCaveRoute2_h: ; 0x1dea4 to 0x1deb0 (12 bytes) (bank=7) (id=46)
 
     dw $5ebf ; objects
 
-INCBIN "baserom.gbc",$1deb0,$1deb8 - $1deb0
+DiglettsCaveRoute2Script: ; 0x1deb0
+    ld a, $d
+    ld [$d365], a
+    jp $3c3c
+; 0x1deb8
+INCBIN "baserom.gbc",$1deb8,$0
 
 DiglettsCaveRoute2Texts: ; 0x1deb8
     dw DiglettsCaveRoute2Text1
@@ -9072,7 +9729,10 @@ Route2House_h: ; 0x1dee1 to 0x1deed (12 bytes) (bank=7) (id=48)
 
     dw $5f07 ; objects
 
-INCBIN "baserom.gbc",$1deed,$1def0 - $1deed
+Route2HouseScript: ; 0x1deed
+    jp $3c3c
+; 0x1def0
+INCBIN "baserom.gbc",$1def0,$0
 
 Route2HouseTexts: ; 0x1def0
     dw Route2HouseText1, Route2HouseText2
@@ -9114,7 +9774,46 @@ Route5Gate_h: ; 0x1df27 to 0x1df33 (12 bytes) (bank=7) (id=70)
 
     dw $5ffb ; objects
 
-INCBIN "baserom.gbc",$1df33,$1dfa4 - $1df33
+Route5GateScript: ; 0x1df33
+    call $3c3c
+    ld a, [$d662]
+    ld hl, $5f3f
+    jp $3d97
+; 0x1df3f
+INCBIN "baserom.gbc",$1df3f,$11
+Route5GateScript0: ; 0x1df50
+    ld a, [$d728]
+    bit 6, a
+    ret nz
+    ld hl, $5f8f
+    call $34bf
+    ret nc
+    ld a, $2
+    ld [$d528], a
+    xor a
+    ld [$ff00+$b4], a
+    ld b, $16
+    ld hl, $659f
+    call Bankswitch
+    ld a, [$ff00+$db]
+    and a
+    jr nz, .asm_1df82 ; 0x1df70 $10
+    ld a, $2
+    ld [$ff00+$8c], a
+    call $2920
+    call $5f43
+    ld a, $1
+    ld [$d662], a
+    ret
+.asm_1df82
+    ld a, $3
+    ld [$ff00+$8c], a
+    call $2920
+    ld hl, $d728
+    set 6, [hl]
+    ret
+; 0x1df8f
+INCBIN "baserom.gbc",$1df8f,$15
 
 Route5GateTexts: ; 0x1dfa4
     dw Route5GateText1, Route5GateText2, Route5GateText3
@@ -9196,7 +9895,46 @@ Route6Gate_h: ; 0x1e031 to 0x1e03d (12 bytes) (bank=7) (id=73)
 
     dw $60be ; objects
 
-INCBIN "baserom.gbc",$1e03d,$1e0b8 - $1e03d
+Route6GateScript: ; 0x1e03d
+    call $3c3c
+    ld hl, $604a
+    ld a, [$d636]
+    call $3d97
+    ret
+; 0x1e04a
+INCBIN "baserom.gbc",$1e04a,$4
+Route6GateScript0: ; 0x1e04e
+    ld a, [$d728]
+    bit 6, a
+    ret nz
+    ld hl, $608c
+    call $34bf
+    ret nc
+    ld a, $1
+    ld [$d528], a
+    xor a
+    ld [$ff00+$b4], a
+    ld b, $16
+    ld hl, $659f
+    call Bankswitch
+    ld a, [$ff00+$db]
+    and a
+    jr nz, .asm_1e080 ; 0x1e06e $10
+    ld a, $2
+    ld [$ff00+$8c], a
+    call $2920
+    call $60a1
+    ld a, $1
+    ld [$d636], a
+    ret
+.asm_1e080
+    ld hl, $d728
+    set 6, [hl]
+    ld a, $3
+    ld [$ff00+$8c], a
+    jp $2920
+; 0x1e08c
+INCBIN "baserom.gbc",$1e08c,$2c
 
 Route6GateTexts: ; 0x1e0b8
     dw Route6GateText1, Route6GateText2, Route6GateText3
@@ -9232,7 +9970,47 @@ Route7Gate_h: ; 0x1e0f4 to 0x1e100 (12 bytes) (bank=7) (id=76)
 
     dw $6185 ; objects
 
-INCBIN "baserom.gbc",$1e100,$1e17f - $1e100
+Route7GateScript: ; 0x1e100
+    call $3c3c
+    ld a, [$d663]
+    ld hl, $610d
+    call $3d97
+    ret
+; 0x1e10d
+INCBIN "baserom.gbc",$1e10d,$1b
+Route7GateScript0: ; 0x1e128
+    ld a, [$d728]
+    bit 6, a
+    ret nz
+    ld hl, $6167
+    call $34bf
+    ret nc
+    ld a, $8
+    ld [$d528], a
+    xor a
+    ld [$ff00+$b4], a
+    ld b, $16
+    ld hl, $659f
+    call Bankswitch
+    ld a, [$ff00+$db]
+    and a
+    jr nz, .asm_1e15a ; 0x1e148 $10
+    ld a, $2
+    ld [$ff00+$8c], a
+    call $2920
+    call $6111
+    ld a, $1
+    ld [$d663], a
+    ret
+.asm_1e15a
+    ld a, $3
+    ld [$ff00+$8c], a
+    call $2920
+    ld hl, $d728
+    set 6, [hl]
+    ret
+; 0x1e167
+INCBIN "baserom.gbc",$1e167,$18
 
 Route7GateTexts: ; 0x1e17f
     dw Route7GateText1, Route7GateText2, Route7GateText3
@@ -9268,7 +10046,45 @@ Route8Gate_h: ; 0x1e1bb to 0x1e1c7 (12 bytes) (bank=7) (id=79)
 
     dw $6247 ; objects
 
-INCBIN "baserom.gbc",$1e1c7,$1e241 - $1e1c7
+Route8GateScript: ; 0x1e1c7
+    call $3c3c
+    ld hl, $61d3
+    ld a, [$d637]
+    jp $3d97
+; 0x1e1d3
+INCBIN "baserom.gbc",$1e1d3,$1b
+Route8GateScript0: ; 0x1e1ee
+    ld a, [$d728]
+    bit 6, a
+    ret nz
+    ld hl, $622c
+    call $34bf
+    ret nc
+    ld a, $2
+    ld [$d528], a
+    xor a
+    ld [$ff00+$b4], a
+    ld b, $16
+    ld hl, $659f
+    call Bankswitch
+    ld a, [$ff00+$db]
+    and a
+    jr nz, .asm_1e220 ; 0x1e20e $10
+    ld a, $2
+    ld [$ff00+$8c], a
+    call $2920
+    call $61d7
+    ld a, $1
+    ld [$d637], a
+    ret
+.asm_1e220
+    ld hl, $d728
+    set 6, [hl]
+    ld a, $3
+    ld [$ff00+$8c], a
+    jp $2920
+; 0x1e22c
+INCBIN "baserom.gbc",$1e22c,$15
 
 Route8GateTexts: ; 0x1e241
     dw Route8GateText1, Route8GateText2, Route8GateText3
@@ -9304,7 +10120,12 @@ UndergroundPathEntranceRoute8_h: ; 0x1e27d to 0x1e289 (12 bytes) (bank=7) (id=80
 
     dw $6298 ; objects
 
-INCBIN "baserom.gbc",$1e289,$1e291 - $1e289
+UndergroundPathEntranceRoute8Script: ; 0x1e289
+    ld a, $13
+    ld [$d365], a
+    jp $3c3c
+; 0x1e291
+INCBIN "baserom.gbc",$1e291,$0
 
 UndergroundPathEntranceRoute8Texts: ; 0x1e291
     dw UndergroundPathEntranceRoute8Text1
@@ -9341,7 +10162,16 @@ PowerPlant_h: ; 0x1e2ba to 0x1e2c6 (12 bytes) (bank=7) (id=83)
 
     dw $63bf ; objects
 
-INCBIN "baserom.gbc",$1e2c6,$1e2df - $1e2c6
+PowerPlantScript: ; 0x1e2c6
+    call $3c3c
+    ld hl, $62fb
+    ld de, $62d9
+    ld a, [$d663]
+    call $3160
+    ld [$d663], a
+    ret
+; 0x1e2d9
+INCBIN "baserom.gbc",$1e2d9,$6
 
 PowerPlantTexts: ; 0x1e2df
     dw PowerPlantText1, PowerPlantText2, PowerPlantText3, PowerPlantText4, PowerPlantText5, PowerPlantText6, PowerPlantText7, PowerPlantText8, PowerPlantText9, PowerPlantText10, PowerPlantText11, PowerPlantText12, PowerPlantText13, PowerPlantText14
@@ -9455,7 +10285,13 @@ DiglettsCaveEntranceRoute11_h: ; 0x1e5ae to 0x1e5ba (12 bytes) (bank=7) (id=85)
 
     dw $65ca ; objects
 
-INCBIN "baserom.gbc",$1e5ba,$1e5c3 - $1e5ba
+DiglettsCaveEntranceRoute11Script: ; 0x1e5ba
+    call $3c3c
+    ld a, $16
+    ld [$d365], a
+    ret
+; 0x1e5c3
+INCBIN "baserom.gbc",$1e5c3,$0
 
 DiglettsCaveEntranceRoute11Texts: ; 0x1e5c3
     dw DiglettsCaveEntranceRoute11Text1
@@ -9492,7 +10328,10 @@ Route16House_h: ; 0x1e5ec to 0x1e5f8 (12 bytes) (bank=7) (id=188)
 
     dw $6657 ; objects
 
-INCBIN "baserom.gbc",$1e5f8,$1e5fb - $1e5f8
+Route16HouseScript: ; 0x1e5f8
+    jp $3c3c
+; 0x1e5fb
+INCBIN "baserom.gbc",$1e5fb,$0
 
 Route16HouseTexts: ; 0x1e5fb
     dw Route16HouseText1, Route16HouseText2
@@ -9556,7 +10395,43 @@ Route22Gate_h: ; 0x1e677 to 0x1e683 (12 bytes) (bank=7) (id=193)
 
     dw $6720 ; objects
 
-INCBIN "baserom.gbc",$1e683,$1e6df - $1e683
+Route22GateScript: ; 0x1e683
+    call $3c3c
+    ld hl, $669e
+    ld a, [$d60e]
+    call $3d97
+    ld a, [$d361]
+    cp $4
+    ld a, $22
+    jr c, .asm_1e69a ; 0x1e696 $2
+    ld a, $21
+.asm_1e69a
+    ld [$d365], a
+    ret
+; 0x1e69e
+INCBIN "baserom.gbc",$1e69e,$6
+Route22GateScript0: ; 0x1e6a4
+    ld hl, $66b5
+    call $34bf
+    ret nc
+    xor a
+    ld [$ff00+$b4], a
+    ld a, $1
+    ld [$ff00+$8c], a
+    jp $2920
+; 0x1e6b5
+INCBIN "baserom.gbc",$1e6b5,$1e6cd - $1e6b5
+Route22GateScript1: ; 0x1e6cd
+    ld a, [$cd38]
+    and a
+    ret nz
+    xor a
+    ld [$cd6b], a
+    call Delay3
+    ld a, $0
+    ld [$d60e], a
+    ret
+; 0x1e6df
 
 Route22GateTexts: ; 0x1e6df
     dw Route22GateText1
@@ -9613,7 +10488,17 @@ BillsHouse_h: ; 0x1e75e to 0x1e76a (12 bytes) (bank=7) (id=88)
 
     dw $68df ; objects
 
-INCBIN "baserom.gbc",$1e76a,$1e834 - $1e76a
+BillsHouseScript: ; 0x1e76a
+    call $3c3c
+    ld a, [$d661]
+    ld hl, $6776
+    jp $3d97
+; 0x1e776
+INCBIN "baserom.gbc",$1e776,$c
+BillsHouseScript0: ; 0x1e782
+    ret
+; 0x1e783
+INCBIN "baserom.gbc",$1e783,$b1
 
 BillsHouseTexts: ; 0x1e834
     dw BillsHouseText1, BillsHouseText2, BillsHouseText3, BillsHouseText4
@@ -16691,7 +17576,10 @@ ViridianPokeCenterBlocks: ; 28
 SafariZoneRestHouse1Blocks: ; 16
     INCBIN "maps/safarizoneresthouse1.blk"
 
-INCBIN "baserom.gbc",$4410b,$4410e - $4410b
+LavenderTownScript: ; 0x4410b
+    jp $3c3c
+; 0x4410e
+INCBIN "baserom.gbc",$4410e,$0
 
 LavenderTownTexts: ; 0x4410e
     dw LavenderTownText1, LavenderTownText2, LavenderTownText3, LavenderTownText4, LavenderTownText5, LavenderTownText6, LavenderTownText7, LavenderTownText8, LavenderTownText9
@@ -16746,7 +17634,11 @@ ViridianPokecenter_h: ; 0x44251 to 0x4425d (12 bytes) (bank=11) (id=41)
 
     dw $4277 ; objects
 
-INCBIN "baserom.gbc",$4425d,$4426c - $4425d
+ViridianPokeCenterScript: ; 0x4425d
+    call $22fa
+    jp $3c3c
+; 0x44263
+INCBIN "baserom.gbc",$44263,$9
 
 ViridianPokeCenterText2:
 ViridianPokeCenterText1: ; 0x4426c
@@ -16839,7 +17731,16 @@ RockTunnel1_h: ; 0x444d0 to 0x444dc (12 bytes) (bank=11) (id=82)
 
     dw $45f6 ; objects
 
-INCBIN "baserom.gbc",$444dc,$444f5 - $444dc
+RockTunnel1Script: ; 0x444dc
+    call $3c3c
+    ld hl, $4505
+    ld de, $44ef
+    ld a, [$d621]
+    call $3160
+    ld [$d621], a
+    ret
+; 0x444ef
+INCBIN "baserom.gbc",$444ef,$6
 
 RockTunnel1Texts: ; 0x444f5
     dw RockTunnel1Text1, RockTunnel1Text2, RockTunnel1Text3, RockTunnel1Text4, RockTunnel1Text5, RockTunnel1Text6, RockTunnel1Text7, RockTunnel1Text8
@@ -16935,7 +17836,49 @@ SeafoamIslands1_h: ; 0x447dd to 0x447e9 (12 bytes) (bank=11) (id=192)
 
     dw $484f ; objects
 
-INCBIN "baserom.gbc",$447e9,$4484b - $447e9
+SeafoamIslands1Script: ; 0x447e9
+    call $3c3c
+    ld hl, $d7e7
+    set 0, [hl]
+    ld hl, $cd60
+    bit 7, [hl]
+    res 7, [hl]
+    jr z, .asm_4483b ; 0x447f8 $41
+    ld hl, $4846
+    call $34e4
+    ret nc
+    ld hl, $d7e8
+    ld a, [$cd3d]
+    cp $1
+    jr nz, .asm_44819 ; 0x44809 $e
+    set 6, [hl]
+    ld a, $d7
+    ld [$d079], a
+    ld a, $d9
+    ld [$d07a], a
+    jr .asm_44825 ; 0x44817 $c
+.asm_44819
+    set 7, [hl]
+    ld a, $d8
+    ld [$d079], a
+    ld a, $da
+    ld [$d07a], a
+.asm_44825
+    ld a, [$d079]
+    ld [$cc4d], a
+    ld a, $11
+    call Predef
+    ld a, [$d07a]
+    ld [$cc4d], a
+    ld a, $15
+    jp $3e6d
+.asm_4483b
+    ld a, $9f
+    ld [$d71d], a
+    ld hl, $4846
+    jp $6981
+; 0x44846
+INCBIN "baserom.gbc",$44846,$5
 
 SeafoamIslands1Texts: ; 0x4484b
     dw SeafoamIslands1Text1, SeafoamIslands1Text2
@@ -16980,7 +17923,10 @@ SSAnne3_h: ; 0x44926 to 0x44932 (12 bytes) (bank=11) (id=97)
 
     dw $493c ; objects
 
-INCBIN "baserom.gbc",$44932,$44935 - $44932
+SSAnne3Script: ; 0x44932
+    jp $3c3c
+; 0x44935
+INCBIN "baserom.gbc",$44935,$0
 
 SSAnne3Texts: ; 0x44935
     dw SSAnne3Text1
@@ -17016,7 +17962,17 @@ VictoryRoad3_h: ; 0x44974 to 0x44980 (12 bytes) (bank=11) (id=198)
 
     dw $4acd ; objects
 
-INCBIN "baserom.gbc",$44980,$44a24 - $44980
+VictoryRoad3Script: ; 0x44980
+    call $4996
+    call $3c3c
+    ld hl, $4a38
+    ld de, $49b1
+    ld a, [$d640]
+    call $3160
+    ld [$d640], a
+    ret
+; 0x44996
+INCBIN "baserom.gbc",$44996,$8e
 
 VictoryRoad3Texts: ; 0x44a24
     dw VictoryRoad3Text1, VictoryRoad3Text2, VictoryRoad3Text3, VictoryRoad3Text4, VictoryRoad3Text5, VictoryRoad3Text6, VictoryRoad3Text7, VictoryRoad3Text8, VictoryRoad3Text9, VictoryRoad3Text10
@@ -17089,7 +18045,17 @@ RocketHideout1_h: ; 0x44bbe to 0x44bca (12 bytes) (bank=11) (id=199)
 
     dw $4ce7 ; objects
 
-INCBIN "baserom.gbc",$44bca,$44c14 - $44bca
+RocketHideout1Script: ; 0x44bca
+    call $4be0
+    call $3c3c
+    ld hl, $4c22
+    ld de, $4c0e
+    ld a, [$d631]
+    call $3160
+    ld [$d631], a
+    ret
+; 0x44be0
+INCBIN "baserom.gbc",$44be0,$34
 
 RocketHideout1Texts: ; 0x44c14
     dw RocketHideout1Text1, RocketHideout1Text2, RocketHideout1Text3, RocketHideout1Text4, RocketHideout1Text5, RocketHideout1Text6, RocketHideout1Text7
@@ -17167,7 +18133,16 @@ RocketHideout2_h: ; 0x44e1b to 0x44e27 (12 bytes) (bank=11) (id=200)
 
     dw $50f7 ; objects
 
-INCBIN "baserom.gbc",$44e27,$450c7 - $44e27
+RocketHideout2Script: ; 0x44e27
+    call $3c3c
+    ld hl, $50d1
+    ld de, $4e3a
+    ld a, [$d632]
+    call $3160
+    ld [$d632], a
+    ret
+; 0x44e3a
+INCBIN "baserom.gbc",$44e3a,$28d
 
 RocketHideout2Texts: ; 0x450c7
     dw RocketHideout2Text1, RocketHideout2Text2, RocketHideout2Text3, RocketHideout2Text4, RocketHideout2Text5
@@ -17219,7 +18194,16 @@ RocketHideout3_h: ; 0x45219 to 0x45225 (12 bytes) (bank=11) (id=201)
 
     dw $534d ; objects
 
-INCBIN "baserom.gbc",$45225,$452fa - $45225
+RocketHideout3Script: ; 0x45225
+    call $3c3c
+    ld hl, $5302
+    ld de, $5238
+    ld a, [$d633]
+    call $3160
+    ld [$d633], a
+    ret
+; 0x45238
+INCBIN "baserom.gbc",$45238,$c2
 
 RocketHideout3Texts: ; 0x452fa
     dw RocketHideout3Text1, RocketHideout3Text2, RocketHideout3Text3, RocketHideout3Text4
@@ -17272,7 +18256,17 @@ RocketHideout4_h: ; 0x45451 to 0x4545d (12 bytes) (bank=11) (id=202)
 
     dw $55f1 ; objects
 
-INCBIN "baserom.gbc",$4545d,$45501 - $4545d
+RocketHideout4Script: ; 0x4545d
+    call $5473
+    call $3c3c
+    ld hl, $5515
+    ld de, $54ae
+    ld a, [$d634]
+    call $3160
+    ld [$d634], a
+    ret
+; 0x45473
+INCBIN "baserom.gbc",$45473,$8e
 
 RocketHideout4Texts: ; 0x45501
     dw RocketHideout4Text1, RocketHideout4Text2, RocketHideout4Text3, RocketHideout4Text4, RocketHideout4Text5, RocketHideout4Text6, RocketHideout4Text7, RocketHideout4Text8, RocketHideout4Text9, RocketHideout4Text10
@@ -17373,7 +18367,23 @@ RocketHideoutElevator_h: ; 0x45704 to 0x45710 (12 bytes) (bank=11) (id=203)
 
     dw $5791 ; objects
 
-INCBIN "baserom.gbc",$45710,$4576b - $45710
+RocketHideoutElevatorScript: ; 0x45710
+    ld hl, $d126
+    bit 5, [hl]
+    res 5, [hl]
+    push hl
+    call nz, $572c
+    pop hl
+    bit 7, [hl]
+    res 7, [hl]
+    call nz, $575f
+    xor a
+    ld [$cf0c], a
+    inc a
+    ld [$cc3c], a
+    ret
+; 0x4572c
+INCBIN "baserom.gbc",$4572c,$3f
 
 RocketHideoutElevatorTexts: ; 0x4576b
     dw RocketHideoutElevatorText1
@@ -17423,7 +18433,23 @@ SilphCoElevator_h: ; 0x457b4 to 0x457c0 (12 bytes) (bank=11) (id=236)
 
     dw $5844 ; objects
 
-INCBIN "baserom.gbc",$457c0,$45833 - $457c0
+SilphCoElevatorScript: ; 0x457c0
+    ld hl, $d126
+    bit 5, [hl]
+    res 5, [hl]
+    push hl
+    call nz, $57dc
+    pop hl
+    bit 7, [hl]
+    res 7, [hl]
+    call nz, $5827
+    xor a
+    ld [$cf0c], a
+    inc a
+    ld [$cc3c], a
+    ret
+; 0x457dc
+INCBIN "baserom.gbc",$457dc,$57
 
 SilphCoElevatorTexts: ; 0x45833
     dw SilphCoElevatorText1
@@ -17463,7 +18489,10 @@ SafariZoneEast_h: ; 0x4585f to 0x4586b (12 bytes) (bank=11) (id=217)
 
     dw $588b ; objects
 
-INCBIN "baserom.gbc",$4586b,$4586e - $4586b
+SafariZoneEastScript: ; 0x4586b
+    jp $3c3c
+; 0x4586e
+INCBIN "baserom.gbc",$4586e,$0
 
 SafariZoneEastTexts: ; 0x4586e
     dw SafariZoneEastText1, SafariZoneEastText2, SafariZoneEastText3, SafariZoneEastText4, SafariZoneEastText5, SafariZoneEastText6, SafariZoneEastText7
@@ -17519,7 +18548,10 @@ SafariZoneNorth_h: ; 0x4599f to 0x459ab (12 bytes) (bank=11) (id=218)
 
     dw $59d5 ; objects
 
-INCBIN "baserom.gbc",$459ab,$459ae - $459ab
+SafariZoneNorthScript: ; 0x459ab
+    jp $3c3c
+; 0x459ae
+INCBIN "baserom.gbc",$459ae,$0
 
 SafariZoneNorthTexts: ; 0x459ae
     dw SafariZoneNorthText1, SafariZoneNorthText2, SafariZoneNorthText3, SafariZoneNorthText4, SafariZoneNorthText5, SafariZoneNorthText6, SafariZoneNorthText7
@@ -17591,7 +18623,10 @@ SafariZoneCenter_h: ; 0x45ba6 to 0x45bb2 (12 bytes) (bank=11) (id=220)
 
     dw $5bc5 ; objects
 
-INCBIN "baserom.gbc",$45bb2,$45bb5 - $45bb2
+SafariZoneCenterScript: ; 0x45bb2
+    jp $3c3c
+; 0x45bb5
+INCBIN "baserom.gbc",$45bb5,$0
 
 SafariZoneCenterTexts: ; 0x45bb5
     dw SafariZoneCenterText1, SafariZoneCenterText2, SafariZoneCenterText3
@@ -17647,7 +18682,10 @@ SafariZoneRestHouse1_h: ; 0x45ce1 to 0x45ced (12 bytes) (bank=11) (id=221)
 
     dw $5cfe ; objects
 
-INCBIN "baserom.gbc",$45ced,$45cf0 - $45ced
+SafariZoneRestHouse1Script: ; 0x45ced
+    jp $3c3c
+; 0x45cf0
+INCBIN "baserom.gbc",$45cf0,$0
 
 SafariZoneRestHouse1Texts: ; 0x45cf0
     dw SafariZoneRestHouse1Text1, SafariZoneRestHouse1Text2
@@ -17685,7 +18723,11 @@ SafariZoneRestHouse2_h: ; 0x45d1e to 0x45d2a (12 bytes) (bank=11) (id=223)
 
     dw $5d43 ; objects
 
-INCBIN "baserom.gbc",$45d2a,$45d2e - $45d2a
+SafariZoneRestHouse2Script: ; 0x45d2a
+    call $3c3c
+    ret
+; 0x45d2e
+INCBIN "baserom.gbc",$45d2e,$0
 
 SafariZoneRestHouse2Texts: ; 0x45d2e
     dw SafariZoneRestHouse2Text1, SafariZoneRestHouse2Text2, SafariZoneRestHouse2Text3
@@ -17728,7 +18770,11 @@ SafariZoneRestHouse3_h: ; 0x45d69 to 0x45d75 (12 bytes) (bank=11) (id=224)
 
     dw $5d8e ; objects
 
-INCBIN "baserom.gbc",$45d75,$45d79 - $45d75
+SafariZoneRestHouse3Script: ; 0x45d75
+    call $3c3c
+    ret
+; 0x45d79
+INCBIN "baserom.gbc",$45d79,$0
 
 SafariZoneRestHouse3Texts: ; 0x45d79
     dw SafariZoneRestHouse3Text1, SafariZoneRestHouse3Text2, SafariZoneRestHouse3Text3
@@ -17771,7 +18817,11 @@ SafariZoneRestHouse4_h: ; 0x45db4 to 0x45dc0 (12 bytes) (bank=11) (id=225)
 
     dw $5dd9 ; objects
 
-INCBIN "baserom.gbc",$45dc0,$45dc4 - $45dc0
+SafariZoneRestHouse4Script: ; 0x45dc0
+    call $3c3c
+    ret
+; 0x45dc4
+INCBIN "baserom.gbc",$45dc4,$0
 
 SafariZoneRestHouse4Texts: ; 0x45dc4
     dw SafariZoneRestHouse4Text1, SafariZoneRestHouse4Text2, SafariZoneRestHouse4Text3
@@ -17814,7 +18864,10 @@ UnknownDungeon2_h: ; 0x45dff to 0x45e0b (12 bytes) (bank=11) (id=226)
 
     dw $5e14 ; objects
 
-INCBIN "baserom.gbc",$45e0b,$45e0e - $45e0b
+UnknownDungeon2Script: ; 0x45e0b
+    jp $3c3c
+; 0x45e0e
+INCBIN "baserom.gbc",$45e0e,$0
 
 UnknownDungeon2Texts: ; 0x45e0e
     dw UnknownDungeon2Text1, UnknownDungeon2Text2, UnknownDungeon2Text3
@@ -17856,7 +18909,16 @@ UnknownDungeon3_h: ; 0x45ee4 to 0x45ef0 (12 bytes) (bank=11) (id=227)
 
     dw $5f36 ; objects
 
-INCBIN "baserom.gbc",$45ef0,$45f09 - $45ef0
+UnknownDungeon3Script: ; 0x45ef0
+    call $3c3c
+    ld hl, $5f0f
+    ld de, $5f03
+    ld a, [$d650]
+    call $3160
+    ld [$d650], a
+    ret
+; 0x45f03
+INCBIN "baserom.gbc",$45f03,$6
 
 UnknownDungeon3Texts: ; 0x45f09
     dw UnknownDungeon3Text1, UnknownDungeon3Text2, UnknownDungeon3Text3
@@ -17898,7 +18960,16 @@ RockTunnel2_h: ; 0x45fdf to 0x45feb (12 bytes) (bank=11) (id=232)
 
     dw $613d ; objects
 
-INCBIN "baserom.gbc",$45feb,$46004 - $45feb
+RockTunnel2Script: ; 0x45feb
+    call $3c3c
+    ld hl, $6014
+    ld de, $5ffe
+    ld a, [$d620]
+    call $3160
+    ld [$d620], a
+    ret
+; 0x45ffe
+INCBIN "baserom.gbc",$45ffe,$6
 
 RockTunnel2Texts: ; 0x46004
     dw RockTunnel2Text1, RockTunnel2Text2, RockTunnel2Text3, RockTunnel2Text4, RockTunnel2Text5, RockTunnel2Text6, RockTunnel2Text7, RockTunnel2Text8
@@ -17993,7 +19064,47 @@ SeafoamIslands2_h: ; 0x46309 to 0x46315 (12 bytes) (bank=11) (id=159)
 
     dw $6376 ; objects
 
-INCBIN "baserom.gbc",$46315,$46372 - $46315
+SeafoamIslands2Script: ; 0x46315
+    call $3c3c
+    ld hl, $cd60
+    bit 7, [hl]
+    res 7, [hl]
+    jr z, .asm_46362 ; 0x4631f $41
+    ld hl, $636d
+    call $34e4
+    ret nc
+    ld hl, $d87f
+    ld a, [$cd3d]
+    cp $1
+    jr nz, .asm_46340 ; 0x46330 $e
+    set 0, [hl]
+    ld a, $d9
+    ld [$d079], a
+    ld a, $db
+    ld [$d07a], a
+    jr .asm_4634c ; 0x4633e $c
+.asm_46340
+    set 1, [hl]
+    ld a, $da
+    ld [$d079], a
+    ld a, $dc
+    ld [$d07a], a
+.asm_4634c
+    ld a, [$d079]
+    ld [$cc4d], a
+    ld a, $11
+    call Predef
+    ld a, [$d07a]
+    ld [$cc4d], a
+    ld a, $15
+    jp $3e6d
+.asm_46362
+    ld a, $a0
+    ld [$d71d], a
+    ld hl, $636d
+    jp $6981
+; 0x4636d
+INCBIN "baserom.gbc",$4636d,$5
 
 SeafoamIslands2Texts: ; 0x46372
     dw SeafoamIslands2Text1, SeafoamIslands2Text2
@@ -18036,7 +19147,47 @@ SeafoamIslands3_h: ; 0x46445 to 0x46451 (12 bytes) (bank=11) (id=160)
 
     dw $64b2 ; objects
 
-INCBIN "baserom.gbc",$46451,$464ae - $46451
+SeafoamIslands3Script: ; 0x46451
+    call $3c3c
+    ld hl, $cd60
+    bit 7, [hl]
+    res 7, [hl]
+    jr z, .asm_4649e ; 0x4645b $41
+    ld hl, $64a9
+    call $34e4
+    ret nc
+    ld hl, $d880
+    ld a, [$cd3d]
+    cp $1
+    jr nz, .asm_4647c ; 0x4646c $e
+    set 0, [hl]
+    ld a, $db
+    ld [$d079], a
+    ld a, $df
+    ld [$d07a], a
+    jr .asm_46488 ; 0x4647a $c
+.asm_4647c
+    set 1, [hl]
+    ld a, $dc
+    ld [$d079], a
+    ld a, $e0
+    ld [$d07a], a
+.asm_46488
+    ld a, [$d079]
+    ld [$cc4d], a
+    ld a, $11
+    call Predef
+    ld a, [$d07a]
+    ld [$cc4d], a
+    ld a, $15
+    jp $3e6d
+.asm_4649e
+    ld a, $a1
+    ld [$d71d], a
+    ld hl, $64a9
+    jp $6981
+; 0x464a9
+INCBIN "baserom.gbc",$464a9,$5
 
 SeafoamIslands3Texts: ; 0x464ae
     dw SeafoamIslands3Text1, SeafoamIslands3Text2
@@ -18079,7 +19230,88 @@ SeafoamIslands4_h: ; 0x46581 to 0x4658d (12 bytes) (bank=11) (id=161)
 
     dw $66a6 ; objects
 
-INCBIN "baserom.gbc",$4658d,$4669a - $4658d
+SeafoamIslands4Script: ; 0x4658d
+    call $3c3c
+    ld hl, $cd60
+    bit 7, [hl]
+    res 7, [hl]
+    jr z, .asm_465dc ; 0x46597 $43
+    ld hl, $65f6
+    call $34e4
+    ret nc
+    ld hl, $d881
+    ld a, [$cd3d]
+    cp $1
+    jr nz, .asm_465b8 ; 0x465a8 $e
+    set 0, [hl]
+    ld a, $dd
+    ld [$d079], a
+    ld a, $e1
+    ld [$d07a], a
+    jr .asm_465c4 ; 0x465b6 $c
+.asm_465b8
+    set 1, [hl]
+    ld a, $de
+    ld [$d079], a
+    ld a, $e2
+    ld [$d07a], a
+.asm_465c4
+    ld a, [$d079]
+    ld [$cc4d], a
+    ld a, $11
+    call Predef
+    ld a, [$d07a]
+    ld [$cc4d], a
+    ld a, $15
+    call Predef
+    jr .asm_465ed ; 0x465da $11
+.asm_465dc
+    ld a, $a2
+    ld [$d71d], a
+    ld hl, $65f6
+    call $6981
+    ld a, [$d732]
+    bit 4, a
+    ret nz
+.asm_465ed
+    ld hl, $65fb
+    ld a, [$d666]
+    jp $3d97
+; 0x465f6
+INCBIN "baserom.gbc",$465f6,$d
+SeafoamIslands4Script0: ; 0x46603
+    ld a, [$d880]
+    and $3
+    cp $3
+    ret z
+    ld a, [$d361]
+    cp $8
+    ret nz
+    ld a, [$d362]
+    cp $f
+    ret nz
+    ld hl, $ccd3
+    ld de, $6632
+    call $350c
+    dec a
+    ld [$cd38], a
+    call $3486
+    ld hl, $d733
+    set 2, [hl]
+    ld a, $1
+    ld [$d666], a
+    ret
+; 0x46632
+INCBIN "baserom.gbc",$46632,$46639 - $46632
+SeafoamIslands4Script1: ; 0x46639
+    ld a, [$cd38]
+    and a
+    ret nz
+    ld a, $0
+    ld [$d666], a
+    ret
+; 0x46644
+INCBIN "baserom.gbc",$46644,$56
 
 SeafoamIslands4Texts: ; 0x4669a
     dw SeafoamIslands4Text1, SeafoamIslands4Text2, SeafoamIslands4Text3, SeafoamIslands4Text4, SeafoamIslands4Text5, SeafoamIslands4Text6
@@ -18126,7 +19358,53 @@ SeafoamIslands5_h: ; 0x4678d to 0x46799 (12 bytes) (bank=11) (id=162)
 
     dw $68bc ; objects
 
-INCBIN "baserom.gbc",$46799,$4687c - $46799
+SeafoamIslands5Script: ; 0x46799
+    call $3c3c
+    ld a, [$d668]
+    ld hl, $67ad
+    jp $3d97
+; 0x467a5
+INCBIN "baserom.gbc",$467a5,$22
+SeafoamIslands5Script0: ; 0x467c7
+    ld a, [$d880]
+    and $3
+    cp $3
+    ret z
+    ld hl, $67fe
+    call $34bf
+    ret nc
+    ld a, [$cd3d]
+    cp $3
+    jr nc, .asm_467e6 ; 0x467db $9
+    ld a, $40
+    ld [$ccd4], a
+    ld a, $2
+    jr .asm_467e8 ; 0x467e4 $2
+.asm_467e6
+    ld a, $1
+.asm_467e8
+    ld [$cd38], a
+    ld a, $40
+    ld [$ccd3], a
+    call $3486
+    ld hl, $d733
+    res 2, [hl]
+    ld a, $1
+    ld [$d668], a
+    ret
+; 0x467fe
+INCBIN "baserom.gbc",$467fe,$46807 - $467fe
+SeafoamIslands5Script1: ; 0x46807
+    ld a, [$cd38]
+    and a
+    ret nz
+    xor a
+    ld [$cd6b], a
+    ld a, $0
+    ld [$d668], a
+    ret
+; 0x46816
+INCBIN "baserom.gbc",$46816,$66
 
 SeafoamIslands5Texts: ; 0x4687c
     dw SeafoamIslands5Text1, SeafoamIslands5Text2, SeafoamIslands5Text3, SeafoamIslands5Text4, SeafoamIslands5Text5
@@ -18248,7 +19526,11 @@ Route11GateBlocks: ; 20
 Route11GateUpstairsBlocks: ; 16
     INCBIN "maps/route11gateupstairs.blk"
 
-INCBIN "baserom.gbc",$480eb,$48157 - $480eb
+INCBIN "baserom.gbc",$480eb,$48152 - $480eb
+Route7Script: ; 0x48152
+    jp $3c3c
+; 0x48155
+INCBIN "baserom.gbc",$48155,$2
 
 Route7Text1: ; 0x48157
     TX_FAR _Route7Text1
@@ -18368,7 +19650,10 @@ CeladonMart3_h: ; 0x48219 to 0x48225 (12 bytes) (bank=12) (id=124)
 
     dw $42c4 ; objects
 
-INCBIN "baserom.gbc",$48225,$48228 - $48225
+CeladonMart3Script: ; 0x48225
+    jp $3c3c
+; 0x48228
+INCBIN "baserom.gbc",$48228,$0
 
 CeladonMart3Texts: ; 0x48228
     dw CeladonMart3Text1, CeladonMart3Text2, CeladonMart3Text3, CeladonMart3Text4, CeladonMart3Text5, CeladonMart3Text6, CeladonMart3Text7, CeladonMart3Text8, CeladonMart3Text9, CeladonMart3Text10, CeladonMart3Text11, CeladonMart3Text12, CeladonMart3Text13, CeladonMart3Text14, CeladonMart3Text15, CeladonMart3Text16, CeladonMart3Text17
@@ -18492,7 +19777,10 @@ CeladonMart4_h: ; 0x4834a to 0x48356 (12 bytes) (bank=12) (id=125)
 
     dw $4370 ; objects
 
-INCBIN "baserom.gbc",$48356,$48359 - $48356
+CeladonMart4Script: ; 0x48356
+    jp $3c3c
+; 0x48359
+INCBIN "baserom.gbc",$48359,$0
 
 CeladonMart4Texts: ; 0x48359
     dw CeladonMart4Text1, CeladonMart4Text2, CeladonMart4Text3, CeladonMart4Text4
@@ -18541,7 +19829,10 @@ CeladonMartRoof_h: ; 0x483c9 to 0x483d5 (12 bytes) (bank=12) (id=126)
 
     dw $45a8 ; objects
 
-INCBIN "baserom.gbc",$483d5,$48567 - $483d5
+CeladonMartRoofScript: ; 0x483d5
+    jp $3c3c
+; 0x483d8
+INCBIN "baserom.gbc",$483d8,$18f
 
 CeladonMartRoofText1: ; 0x48567
     TX_FAR _CeladonMartRoofText1
@@ -18605,7 +19896,23 @@ CeladonMartElevator_h: ; 0x485f4 to 0x48600 (12 bytes) (bank=12) (id=127)
 
     dw $466d ; objects
 
-INCBIN "baserom.gbc",$48600,$4865c - $48600
+CeladonMartElevatorScript: ; 0x48600
+    ld hl, $d126
+    bit 5, [hl]
+    res 5, [hl]
+    push hl
+    call nz, $461c
+    pop hl
+    bit 7, [hl]
+    res 7, [hl]
+    call nz, $4654
+    xor a
+    ld [$cf0c], a
+    inc a
+    ld [$cc3c], a
+    ret
+; 0x4861c
+INCBIN "baserom.gbc",$4861c,$40
 
 CeladonMartElevatorTexts: ; 0x4865c
     dw CeladonMartElevatorText1
@@ -18645,7 +19952,10 @@ CeladonMansion1_h: ; 0x48688 to 0x48694 (12 bytes) (bank=12) (id=128)
 
     dw $46cf ; objects
 
-INCBIN "baserom.gbc",$48694,$48697 - $48694
+CeladonMansion1Script: ; 0x48694
+    jp $3c3c
+; 0x48697
+INCBIN "baserom.gbc",$48697,$0
 
 CeladonMansion1Texts: ; 0x48697
     dw CeladonMansion1Text1, CeladonMansion1Text2, CeladonMansion1Text3, CeladonMansion1Text4, CeladonMansion1Text5
@@ -18720,7 +20030,11 @@ CeladonMansion2_h: ; 0x4872e to 0x4873a (12 bytes) (bank=12) (id=129)
 
     dw $4745 ; objects
 
-INCBIN "baserom.gbc",$4873a,$4873e - $4873a
+CeladonMansion2Script: ; 0x4873a
+    call $3c3c
+    ret
+; 0x4873e
+INCBIN "baserom.gbc",$4873e,$0
 
 CeladonMansion2Texts: ; 0x4873e
     dw CeladonMansion2Text1
@@ -18760,7 +20074,10 @@ CeladonMansion3_h: ; 0x48784 to 0x48790 (12 bytes) (bank=12) (id=130)
 
     dw $47ff ; objects
 
-INCBIN "baserom.gbc",$48790,$48793 - $48790
+CeladonMansion3Script: ; 0x48790
+    jp $3c3c
+; 0x48793
+INCBIN "baserom.gbc",$48793,$0
 
 CeladonMansion3Texts: ; 0x48793
     dw CeladonMansion3Text1, CeladonMansion3Text2, CeladonMansion3Text3, CeladonMansion3Text4, CeladonMansion3Text5, CeladonMansion3Text6, CeladonMansion3Text7, CeladonMansion3Text8
@@ -18849,7 +20166,10 @@ CeladonMansion4_h: ; 0x4885f to 0x4886b (12 bytes) (bank=12) (id=131)
 
     dw $4875 ; objects
 
-INCBIN "baserom.gbc",$4886b,$4886e - $4886b
+CeladonMansion4Script: ; 0x4886b
+    jp $3c3c
+; 0x4886e
+INCBIN "baserom.gbc",$4886e,$0
 
 CeladonMansion4Texts: ; 0x4886e
     dw CeladonMansion4Text1
@@ -18887,7 +20207,11 @@ CeladonPokecenter_h: ; 0x488ac to 0x488b8 (12 bytes) (bank=12) (id=133)
 
     dw $48d2 ; objects
 
-INCBIN "baserom.gbc",$488b8,$488c6 - $488b8
+CeladonPokecenterScript: ; 0x488b8
+    call $22fa
+    jp $3c3c
+; 0x488be
+INCBIN "baserom.gbc",$488be,$8
 
 CeladonPokecenterText4:
     db $f6, $ff
@@ -18929,7 +20253,20 @@ CeladonGym_h: ; 0x488fe to 0x4890a (12 bytes) (bank=12) (id=134)
 
     dw $4b30 ; objects
 
-INCBIN "baserom.gbc",$4890a,$489a6 - $4890a
+CeladonGymScript: ; 0x4890a
+    ld hl, $d126
+    bit 6, [hl]
+    res 6, [hl]
+    call nz, $4927
+    call $3c3c
+    ld hl, $49bc
+    ld de, $494e
+    ld a, [$d5ff]
+    call $3160
+    ld [$d5ff], a
+    ret
+; 0x48927
+INCBIN "baserom.gbc",$48927,$7f
 
 CeladonGymTexts: ; 0x489a6
     dw CeladonGymText1, CeladonGymText2, CeladonGymText3, CeladonGymText4, CeladonGymText5, CeladonGymText6, CeladonGymText7, CeladonGymText8, CeladonGymText9, CeladonGymText10, CeladonGymText11
@@ -19075,7 +20412,19 @@ CeladonGameCorner_h: ; 0x48bb1 to 0x48bbd (12 bytes) (bank=12) (id=135)
 
     dw $4fa0 ; objects
 
-INCBIN "baserom.gbc",$48bbd,$48c8a - $48bbd
+CeladonGameCornerScript: ; 0x48bbd
+    call $4bcf
+    call $4bec
+    call $3c3c
+    ld hl, $4c12
+    ld a, [$d65f]
+    jp $3d97
+; 0x48bcf
+INCBIN "baserom.gbc",$48bcf,$49
+CeladonGameCornerScript0: ; 0x48c18
+    ret
+; 0x48c19
+INCBIN "baserom.gbc",$48c19,$71
 
 CeladonGameCornerTexts: ; 0x48c8a
     dw CeladonGameCornerText1, CeladonGameCornerText2, CeladonGameCornerText3, CeladonGameCornerText4, CeladonGameCornerText5, CeladonGameCornerText6, CeladonGameCornerText7, CeladonGameCornerText8, CeladonGameCornerText9, CeladonGameCornerText10, CeladonGameCornerText11, CeladonGameCornerText12, CeladonGameCornerText13
@@ -19384,7 +20733,10 @@ CeladonMart5_h: ; 0x4905d to 0x49069 (12 bytes) (bank=12) (id=136)
 
     dw $5085 ; objects
 
-INCBIN "baserom.gbc",$49069,$4906c - $49069
+CeladonMart5Script: ; 0x49069
+    jp $3c3c
+; 0x4906c
+INCBIN "baserom.gbc",$4906c,$0
 
 CeladonMart5Texts: ; 0x4906c
     dw CeladonMart5Text1, CeladonMart5Text2, CeladonMart5Text3, CeladonMart5Text4, CeladonMart5Text5
@@ -19434,7 +20786,10 @@ CeladonPrizeRoom_h: ; 0x490e4 to 0x490f0 (12 bytes) (bank=12) (id=137)
 
     dw $5108 ; objects
 
-INCBIN "baserom.gbc",$490f0,$490fd - $490f0
+CeladonPrizeRoomScript: ; 0x490f0
+    jp $3c3c
+; 0x490f3
+INCBIN "baserom.gbc",$490f3,$a
 
 CeladonPrizeRoomText1: ; 0x490fd
     TX_FAR _CeladonPrizeRoomText1
@@ -19477,7 +20832,11 @@ CeladonDiner_h: ; 0x49145 to 0x49151 (12 bytes) (bank=12) (id=138)
 
     dw $51bc ; objects
 
-INCBIN "baserom.gbc",$49151,$49155 - $49151
+CeladonDinerScript: ; 0x49151
+    call $3c3c
+    ret
+; 0x49155
+INCBIN "baserom.gbc",$49155,$0
 
 CeladonDinerTexts: ; 0x49155
     dw CeladonDinerText1, CeladonDinerText2, CeladonDinerText3, CeladonDinerText4, CeladonDinerText5
@@ -19556,7 +20915,11 @@ CeladonHouse_h: ; 0x49202 to 0x4920e (12 bytes) (bank=12) (id=139)
 
     dw $5227 ; objects
 
-INCBIN "baserom.gbc",$4920e,$49212 - $4920e
+CeladonHouseScript: ; 0x4920e
+    call $3c3c
+    ret
+; 0x49212
+INCBIN "baserom.gbc",$49212,$0
 
 CeladonHouseTexts: ; 0x49212
     dw CeladonHouseText1, CeladonHouseText2, CeladonHouseText3
@@ -19602,7 +20965,10 @@ CeladonHotel_h: ; 0x4925d to 0x49269 (12 bytes) (bank=12) (id=140)
 
     dw $5281 ; objects
 
-INCBIN "baserom.gbc",$49269,$4926c - $49269
+CeladonHotelScript: ; 0x49269
+    jp $3c3c
+; 0x4926c
+INCBIN "baserom.gbc",$4926c,$0
 
 CeladonHotelTexts: ; 0x4926c
     dw CeladonHotelText1, CeladonHotelText2, CeladonHotelText3
@@ -19648,7 +21014,11 @@ MtMoonPokecenter_h: ; 0x492c3 to 0x492cf (12 bytes) (bank=12) (id=68)
 
     dw $5376 ; objects
 
-INCBIN "baserom.gbc",$492cf,$492e2 - $492cf
+MtMoonPokecenterScript: ; 0x492cf
+    call $22fa
+    jp $3c3c
+; 0x492d5
+INCBIN "baserom.gbc",$492d5,$d
 
 MtMoonPokecenterText2:
 MtMoonPokecenterText1: ; 0x492e2
@@ -19747,7 +21117,11 @@ RockTunnelPokecenter_h: ; 0x493ae to 0x493ba (12 bytes) (id=81)
 
     dw $53d4 ; objects
 
-INCBIN "baserom.gbc",$493ba,$493c9 - $493ba
+RockTunnelPokecenterScript: ; 0x493ba
+    call $22fa
+    jp $3c3c
+; 0x493c0
+INCBIN "baserom.gbc",$493c0,$9
 
 RockTunnelPokecenterText2:
 RockTunnelPokecenterText1: ; 0x493c9
@@ -19789,7 +21163,10 @@ Route11Gate_h: ; 0x49400 to 0x4940c (12 bytes) (id=84)
 
     dw $5416 ; objects
 
-INCBIN "baserom.gbc",$4940c,$4940f - $4940c
+Route11GateScript: ; 0x4940c
+    jp $3c3c
+; 0x4940f
+INCBIN "baserom.gbc",$4940f,$0
 
 Route11GateTexts: ; 0x4940f
     dw Route11GateText1
@@ -19828,7 +21205,10 @@ Route11GateUpstairs_h: ; 0x49448 to 0x49454 (12 bytes) (id=86)
 
     dw $54da ; objects
 
-INCBIN "baserom.gbc",$49454,$4945f - $49454
+Route11GateUpstairsScript: ; 0x49454
+    jp $3c3f
+; 0x49457
+INCBIN "baserom.gbc",$49457,$8
 
 Route11GateUpstairsText1: ; 0x4945f
     db $08 ; asm
@@ -19920,7 +21300,10 @@ Route12Gate_h: ; 0x494f8 to 0x49504 (12 bytes) (id=87)
 
     dw $550e ; objects
 
-INCBIN "baserom.gbc",$49504,$49507 - $49504
+Route12GateScript: ; 0x49504
+    jp $3c3c
+; 0x49507
+INCBIN "baserom.gbc",$49507,$0
 
 Route12GateTexts: ; 0x49507
     dw Route12GateText1
@@ -19962,7 +21345,10 @@ Route12GateUpstairs_h: ; 0x49554 to 0x49560 (12 bytes) (id=195)
 
     dw $55de ; objects
 
-INCBIN "baserom.gbc",$49560,$49563 - $49560
+Route12GateUpstairsScript: ; 0x49560
+    jp $3c3f
+; 0x49563
+INCBIN "baserom.gbc",$49563,$0
 
 Route12GateUpstairsTexts: ; 0x49563
     dw Route12GateUpstairsText1, Route12GateUpstairsText2, Route12GateUpstairsText3
@@ -20034,7 +21420,10 @@ Route15Gate_h: ; 0x495f6 to 0x49602 (12 bytes) (id=184)
 
     dw $560c ; objects
 
-INCBIN "baserom.gbc",$49602,$49605 - $49602
+Route15GateScript: ; 0x49602
+    jp $3c3c
+; 0x49605
+INCBIN "baserom.gbc",$49605,$0
 
 Route15GateTexts: ; 0x49605
     dw Route15GateText1
@@ -20075,7 +21464,47 @@ Route16GateMap_h: ; 0x496b2 to 0x496be (12 bytes) (id=186)
 
     dw $578b ; objects
 
-INCBIN "baserom.gbc",$496be,$4975a - $496be
+Route16GateMapScript: ; 0x496be
+    ld hl, $d732
+    res 5, [hl]
+    call $3c3c
+    ld a, [$d660]
+    ld hl, $56cf
+    jp $3d97
+; 0x496cf
+INCBIN "baserom.gbc",$496cf,$8
+Route16GateMapScript0: ; 0x496d7
+    call $5755
+    ret nz
+    ld hl, $5714
+    call $34bf
+    ret nc
+    ld a, $3
+    ld [$ff00+$8c], a
+    call $2920
+    xor a
+    ld [$ff00+$b4], a
+    ld a, [$cd3d]
+    cp $1
+    jr z, .asm_4970e ; 0x496f1 $1b
+    ld a, [$cd3d]
+    dec a
+    ld [$cd38], a
+    ld b, $0
+    ld c, a
+    ld a, $40
+    ld hl, $ccd3
+    call $36e0
+    call $3486
+    ld a, $1
+    ld [$d660], a
+    ret
+.asm_4970e
+    ld a, $2
+    ld [$d660], a
+    ret
+; 0x49714
+INCBIN "baserom.gbc",$49714,$46
 
 Route16GateMapTexts: ; 0x4975a
     dw Route16GateMapText1, Route16GateMapText2, Route16GateMapText3
@@ -20144,7 +21573,10 @@ Route16GateUpstairs_h: ; 0x497ff to 0x4980b (12 bytes) (id=187)
 
     dw $584c ; objects
 
-INCBIN "baserom.gbc",$4980b,$4980e - $4980b
+Route16GateUpstairsScript: ; 0x4980b
+    jp $3c3f
+; 0x4980e
+INCBIN "baserom.gbc",$4980e,$0
 
 Route16GateUpstairsTexts: ; 0x4980e
     dw Route16GateUpstairsText1, Route16GateUpstairsText2, Route16GateUpstairsText3, Route16GateUpstairsText4
@@ -20206,7 +21638,47 @@ Route18Gate_h: ; 0x4986a to 0x49876 (12 bytes) (id=190)
 
     dw $5937 ; objects
 
-INCBIN "baserom.gbc",$49876,$4990d - $49876
+Route18GateScript: ; 0x49876
+    ld hl, $d732
+    res 5, [hl]
+    call $3c3c
+    ld a, [$d669]
+    ld hl, $5887
+    jp $3d97
+; 0x49887
+INCBIN "baserom.gbc",$49887,$8
+Route18GateScript0: ; 0x4988f
+    call $5755
+    ret nz
+    ld hl, $58cc
+    call $34bf
+    ret nc
+    ld a, $2
+    ld [$ff00+$8c], a
+    call $2920
+    xor a
+    ld [$ff00+$b4], a
+    ld a, [$cd3d]
+    cp $1
+    jr z, .asm_498c6 ; 0x498a9 $1b
+    ld a, [$cd3d]
+    dec a
+    ld [$cd38], a
+    ld b, $0
+    ld c, a
+    ld a, $40
+    ld hl, $ccd3
+    call $36e0
+    call $3486
+    ld a, $1
+    ld [$d669], a
+    ret
+.asm_498c6
+    ld a, $2
+    ld [$d669], a
+    ret
+; 0x498cc
+INCBIN "baserom.gbc",$498cc,$41
 
 Route18GateTexts: ; 0x4990d
     dw Route18GateText1, Route18GateText2
@@ -20259,7 +21731,10 @@ Route18GateHeader_h: ; 0x49969 to 0x49975 (12 bytes) (id=191)
 
     dw $59a4 ; objects
 
-INCBIN "baserom.gbc",$49975,$49978 - $49975
+Route18GateHeaderScript: ; 0x49975
+    jp $3c3f
+; 0x49978
+INCBIN "baserom.gbc",$49978,$0
 
 Route18GateHeaderTexts: ; 0x49978
     dw Route18GateHeaderText1, Route18GateHeaderText2, Route18GateHeaderText3
@@ -20312,7 +21787,16 @@ MtMoon1_h: ; 0x499bc to 0x499c8 (12 bytes) (id=59)
 
     dw $5b06 ; objects
 
-INCBIN "baserom.gbc",$499c8,$499e1 - $499c8
+MtMoon1Script: ; 0x499c8
+    call $3c3c
+    ld hl, $59fd
+    ld de, $59db
+    ld a, [$d606]
+    call $3160
+    ld [$d606], a
+    ret
+; 0x499db
+INCBIN "baserom.gbc",$499db,$6
 
 MtMoon1Texts: ; 0x499e1
     dw MtMoon1Text1, MtMoon1Text2, MtMoon1Text3, MtMoon1Text4, MtMoon1Text5, MtMoon1Text6, MtMoon1Text7, MtMoon1Text8, MtMoon1Text9, MtMoon1Text10, MtMoon1Text11, MtMoon1Text12, MtMoon1Text13, MtMoon1Text14
@@ -20413,7 +21897,28 @@ MtMoon3_h: ; 0x49cff to 0x49d0b (12 bytes) (id=61)
 
     dw $5fdb ; objects
 
-INCBIN "baserom.gbc",$49d0b,$49e34 - $49d0b
+MtMoon3Script: ; 0x49d0b
+    call $3c3c
+    ld hl, $5e48
+    ld de, $5d63
+    ld a, [$d607]
+    call $3160
+    ld [$d607], a
+    ld a, [$d7f6]
+    bit 1, a
+    ret z
+    ld hl, $5d37
+    call $34bf
+    jr nc, .asm_49d31 ; 0x49d29 $6
+    ld hl, $d72e
+    set 4, [hl]
+    ret
+.asm_49d31
+    ld hl, $d72e
+    res 4, [hl]
+    ret
+; 0x49d37
+INCBIN "baserom.gbc",$49d37,$fd
 
 MtMoon3Texts: ; 0x49e34
     dw MtMoon3Text1, MtMoon3Text2, MtMoon3Text3, MtMoon3Text4, MtMoon3Text5, MtMoon3Text6, MtMoon3Text7, MtMoon3Text8, MtMoon3Text9
@@ -20572,7 +22077,10 @@ SafariZoneWest_h: ; 0x4a1a9 to 0x4a1b5 (12 bytes) (id=219)
 
     dw $61dc ; objects
 
-INCBIN "baserom.gbc",$4a1b5,$4a1b8 - $4a1b5
+SafariZoneWestScript: ; 0x4a1b5
+    jp $3c3c
+; 0x4a1b8
+INCBIN "baserom.gbc",$4a1b8,$0
 
 SafariZoneWestTexts: ; 0x4a1b8
     dw SafariZoneWestText1, SafariZoneWestText2, SafariZoneWestText3, SafariZoneWestText4, SafariZoneWestText5, SafariZoneWestText6, SafariZoneWestText7, SafariZoneWestText8
@@ -20639,7 +22147,10 @@ SafariZoneSecretHouse_h: ; 0x4a30b to 0x4a317 (12 bytes) (id=222)
 
     dw $6365 ; objects
 
-INCBIN "baserom.gbc",$4a317,$4a31a - $4a317
+SafariZoneSecretHouseScript: ; 0x4a317
+    jp $3c3c
+; 0x4a31a
+INCBIN "baserom.gbc",$4a31a,$0
 
 SafariZoneSecretHouseTexts: ; 0x4a31a
     dw SafariZoneSecretHouseText1
@@ -20794,7 +22305,39 @@ BattleCenterM_h: ; 0x4fd04 to 0x4fd10 (12 bytes) (id=239)
 
     dw $7d53 ; objects
 
-INCBIN "baserom.gbc",$4fd10,$4fd4c - $4fd10
+BattleCenterMScript: ; 0x4fd10
+    call $3c3c
+    ld a, [$ff00+$aa]
+    cp $2
+    ld a, $8
+    jr z, .asm_4fd1d ; 0x4fd19 $2
+    ld a, $c
+.asm_4fd1d
+    ld [$ff00+$8d], a
+    ld a, $1
+    ld [$ff00+$8c], a
+    call $34ae
+    ld hl, $d72d
+    bit 0, [hl]
+    set 0, [hl]
+    ret nz
+    ld hl, $c214
+    ld a, $8
+    ld [hli], a
+    ld a, $a
+    ld [hl], a
+    ld a, $8
+    ld [$c119], a
+    ld a, [$ff00+$aa]
+    cp $2
+    ret z
+    ld a, $7
+    ld [$c215], a
+    ld a, $c
+    ld [$c119], a
+    ret
+; 0x4fd4c
+INCBIN "baserom.gbc",$4fd4c,$0
 
 BattleCenterMTexts: ; 0x4fd4c
     dw BattleCenterMText1
@@ -20824,7 +22367,10 @@ TradeCenterM_h: ; 0x4fd71 to 0x4fd7d (12 bytes) (id=240)
 
     dw $7d87 ; objects
 
-INCBIN "baserom.gbc",$4fd7d,$4fd80 - $4fd7d
+TradeCenterMScript: ; 0x4fd7d
+    jp $7d10
+; 0x4fd80
+INCBIN "baserom.gbc",$4fd80,$0
 
 TradeCenterMTexts: ; 0x4fd80
     dw TradeCenterMText1
@@ -21268,7 +22814,10 @@ IndigoPlateau_h: ; 0x5091e to 0x50935 (23 bytes) (id=9)
 
     dw $4936 ; objects
 
-INCBIN "baserom.gbc",$50935,$50936 - $50935
+IndigoPlateauScript: ; 0x50935
+    ret
+; 0x50936
+INCBIN "baserom.gbc",$50936,$0
 
 IndigoPlateauObject: ; 0x50936 (size=20)
     db $e ; border tile
@@ -21379,7 +22928,10 @@ SaffronCityObject: ; 0x509dc (size=188)
 SaffronCityBlocks: ; 360
     INCBIN "maps/saffroncity.blk"
 
-INCBIN "baserom.gbc",$50c00,$50c03 - $50c00
+SaffronCityScript: ; 0x50c00
+    jp $3c3c
+; 0x50c03
+INCBIN "baserom.gbc",$50c03,$0
 
 SaffronCityTexts: ; 0x50c03
     dw SaffronCityText1, SaffronCityText2, SaffronCityText3, SaffronCityText4, SaffronCityText5, SaffronCityText6, SaffronCityText7, SaffronCityText8, SaffronCityText9, SaffronCityText10, SaffronCityText11, SaffronCityText12, SaffronCityText13, SaffronCityText14, SaffronCityText15, SaffronCityText16, SaffronCityText17, SaffronCityText18, SaffronCityText19, SaffronCityText20, SaffronCityText21, SaffronCityText22, SaffronCityText23, SaffronCityText24, SaffronCityText25
@@ -21477,7 +23029,20 @@ SaffronCityText25: ; 0x50ca4
     TX_FAR _SaffronCityText25
     db $50
 
-INCBIN "baserom.gbc",$50ca9,$50d22 - $50ca9
+Route20Script: ; 0x50ca9
+    ld hl, $d7e7
+    bit 0, [hl]
+    res 0, [hl]
+    call nz, $4cc6
+    call $3c3c
+    ld hl, $4d3a
+    ld de, $4d1c
+    ld a, [$d628]
+    call $3160
+    ld [$d628], a
+    ret
+; 0x50cc6
+INCBIN "baserom.gbc",$50cc6,$5c
 
 Route20Texts: ; 0x50d22
     dw Route20Text1, Route20Text2, Route20Text3, Route20Text4, Route20Text5, Route20Text6, Route20Text7, Route20Text8, Route20Text9, Route20Text10, Route20Text11, Route20Text12
@@ -21551,7 +23116,162 @@ Route20Text11: ; 0x50ead
     TX_FAR _Route20Text11
     db $50
 
-INCBIN "baserom.gbc",$50eb2,$51175 - $50eb2
+Route22Script: ; 0x50eb2
+    call $3c3c
+    ld hl, $4ebe
+    ld a, [$d60a]
+    jp $3d97
+; 0x50ebe
+INCBIN "baserom.gbc",$50ebe,$42
+Route22Script0: ; 0x50f00
+    ld a, [$d7eb]
+    bit 7, a
+    ret z
+    ld hl, $4f2d
+    call $34bf
+    ret nc
+    ld a, [$cd3d]
+    ld [$cf0d], a
+    xor a
+    ld [$ff00+$b4], a
+    ld a, $f0
+    ld [$cd6b], a
+    ld a, $2
+    ld [$d528], a
+    ld a, [$d7eb]
+    bit 0, a
+    jr nz, .asm_50f32 ; 0x50f25 $b
+    bit 1, a
+    jp nz, $504e
+    ret
+    inc b
+    dec e
+    dec b
+    dec e
+    rst $38
+.asm_50f32
+    ld a, $1
+    ld [$cd4f], a
+    xor a
+    ld [$cd50], a
+    ld a, $4c
+    call Predef
+    ld a, [$d700]
+    and a
+    jr z, .asm_50f4e ; 0x50f44 $8
+    ld a, $ff
+    ld [$c0ee], a
+    call $23b1
+.asm_50f4e
+    ld c, $2
+    ld a, $de
+    call $23a1
+    ld a, $1
+    ld [$ff00+$8c], a
+    call $4ee6
+    ld a, $1
+    ld [$d60a], a
+    ret
+; 0x50f62
+Route22Script1: ; 0x50f62
+    ld a, [$d730]
+    bit 0, a
+    ret nz
+    ld a, [$cf0d]
+    cp $1
+    jr nz, .asm_50f78 ; 0x50f6d $9
+    ld a, $4
+    ld [$d528], a
+    ld a, $4
+    jr .asm_50f7a ; 0x50f76 $2
+.asm_50f78
+    ld a, $c
+.asm_50f7a
+    ld [$ff00+$8d], a
+    ld a, $1
+    ld [$ff00+$8c], a
+    call $34a6
+    xor a
+    ld [$cd6b], a
+    ld a, $1
+    ld [$ff00+$8c], a
+    call $2920
+    ld hl, $d72d
+    set 6, [hl]
+    set 7, [hl]
+    ld hl, $51b7
+    ld de, $51bc
+    call $3354
+    ld a, $e1
+    ld [$d059], a
+    ld hl, $4faf
+    call $4ed6
+    ld a, $2
+    ld [$d60a], a
+    ret
+; 0x50faf
+INCBIN "baserom.gbc",$50faf,$50fb5 - $50faf
+Route22Script2: ; 0x50fb5
+    ld a, [$d057]
+    cp $ff
+    jp z, $4ece
+    ld a, [$c109]
+    and a
+    jr nz, .asm_50fc7 ; 0x50fc1 $4
+    ld a, $4
+    jr .asm_50fc9 ; 0x50fc5 $2
+.asm_50fc7
+    ld a, $c
+.asm_50fc9
+    ld [$ff00+$8d], a
+    ld a, $1
+    ld [$ff00+$8c], a
+    call $34a6
+    ld a, $f0
+    ld [$cd6b], a
+    ld hl, $d7eb
+    set 5, [hl]
+    ld a, $1
+    ld [$ff00+$8c], a
+    call $2920
+    ld a, $ff
+    ld [$c0ee], a
+    call $23b1
+    ld b, $2
+    ld hl, $5b47
+    call Bankswitch
+    ld a, [$cf0d]
+    cp $1
+    jr nz, .asm_50fff ; 0x50ff8 $5
+    call $5008
+    jr .asm_51002 ; 0x50ffd $3
+.asm_50fff
+    call $500d
+.asm_51002
+    ld a, $3
+    ld [$d60a], a
+    ret
+; 0x51008
+INCBIN "baserom.gbc",$51008,$5102a - $51008
+Route22Script3: ; 0x5102a
+    ld a, [$d730]
+    bit 0, a
+    ret nz
+    xor a
+    ld [$cd6b], a
+    ld a, $22
+    ld [$cc4d], a
+    ld a, $11
+    call Predef
+    call $2307
+    ld hl, $d7eb
+    res 0, [hl]
+    res 7, [hl]
+    ld a, $0
+    ld [$d60a], a
+    ret
+; 0x5104e
+INCBIN "baserom.gbc",$5104e,$127
 
 Route22Texts: ; 0x51175
     dw Route22Text1, Route22Text2, Route22Text3
@@ -21590,7 +23310,52 @@ Route22Text3: ; 0x511d5
     TX_FAR _Route22Text3
     db $50
 
-INCBIN "baserom.gbc",$511da,$512f7 - $511da
+Route23Script: ; 0x511da
+    call $51e9
+    call $3c3c
+    ld hl, $5213
+    ld a, [$d667]
+    jp $3d97
+; 0x511e9
+INCBIN "baserom.gbc",$511e9,$30
+Route23Script0: ; 0x51219
+    ld hl, $5255
+    ld a, [$d361]
+    ld b, a
+    ld e, $0
+    ld c, $7
+.asm_51224
+    ld a, [hli]
+    cp $ff
+    ret z
+    inc e
+    dec c
+    cp b
+    jr nz, .asm_51224 ; 0x5122b $f7
+    cp $23
+    jr nz, .asm_51237 ; 0x5122f $6
+    ld a, [$d362]
+    cp $e
+    ret nc
+.asm_51237
+    ld a, e
+    ld [$ff00+$8c], a
+    ld a, c
+    ld [$cd3d], a
+    ld b, $2
+    ld hl, $d7ed
+    ld a, $10
+    call Predef
+    ld a, c
+    and a
+    ret nz
+    call $525d
+    call $2920
+    xor a
+    ld [$ff00+$b4], a
+    ret
+; 0x51255
+INCBIN "baserom.gbc",$51255,$a2
 
 Route23Texts: ; 0x512f7
     dw Route23Text1, Route23Text2, Route23Text3, Route23Text4, Route23Text5, Route23Text6, Route23Text7, Route23Text8
@@ -21644,7 +23409,16 @@ Route23Text8: ; 0x513a8
     TX_FAR _Route23Text8
     db $50
 
-INCBIN "baserom.gbc",$513ad,$5144b - $513ad
+Route24Script: ; 0x513ad
+    call $3c3c
+    ld hl, $545b
+    ld de, $53cb
+    ld a, [$d602]
+    call $3160
+    ld [$d602], a
+    ret
+; 0x513c0
+INCBIN "baserom.gbc",$513c0,$8b
 
 Route24Texts: ; 0x5144b
     dw Route24Text1, Route24Text2, Route24Text3, Route24Text4, Route24Text5, Route24Text6, Route24Text7, Route24Text8
@@ -21735,7 +23509,18 @@ Route24Text7: ; 0x51567
     call LoadTrainerHeader
     jp $24d7
 
-INCBIN "baserom.gbc",$51571,$51628 - $51571
+INCBIN "baserom.gbc",$51571,$515cb - $51571
+Route25Script: ; 0x515cb
+    call $55e1
+    call $3c3c
+    ld hl, $563e
+    ld de, $5622
+    ld a, [$d603]
+    call $3160
+    ld [$d603], a
+    ret
+; 0x515e1
+INCBIN "baserom.gbc",$515e1,$47
 
 Route25Texts: ; 0x51628
     dw Route25Text1, Route25Text2, Route25Text3, Route25Text4, Route25Text5, Route25Text6, Route25Text7, Route25Text8, Route25Text9, Route25Text10, Route25Text11
@@ -21810,7 +23595,24 @@ VictoryRoad2_h: ; 0x51791 to 0x5179d (12 bytes) (id=194)
 
     dw $5915 ; objects
 
-INCBIN "baserom.gbc",$5179d,$5181b - $5179d
+VictoryRoad2Script: ; 0x5179d
+    ld hl, $d126
+    bit 6, [hl]
+    res 6, [hl]
+    call nz, $57c4
+    ld hl, $d126
+    bit 5, [hl]
+    res 5, [hl]
+    call nz, $57c9
+    call $3c3c
+    ld hl, $5835
+    ld de, $57eb
+    ld a, [$d63f]
+    call $3160
+    ld [$d63f], a
+    ret
+; 0x517c4
+INCBIN "baserom.gbc",$517c4,$57
 
 VictoryRoad2Texts: ; 0x5181b
     dw VictoryRoad2Text1, VictoryRoad2Text2, VictoryRoad2Text3, VictoryRoad2Text4, VictoryRoad2Text5, VictoryRoad2Text6, VictoryRoad2Text7, VictoryRoad2Text8, VictoryRoad2Text9, VictoryRoad2Text10, VictoryRoad2Text11, VictoryRoad2Text12, VictoryRoad2Text13
@@ -21904,7 +23706,11 @@ MtMoon2_h: ; 0x51a36 to 0x51a42 (12 bytes) (id=60)
 
     dw $5a4d ; objects
 
-INCBIN "baserom.gbc",$51a42,$51a4d - $51a42
+MtMoon2Script: ; 0x51a42
+    call $3c3c
+    ret
+; 0x51a46
+INCBIN "baserom.gbc",$51a46,$7
 
 MtMoon2Object: ; 0x51a4d (size=68)
     db $3 ; border tile
@@ -21944,7 +23750,17 @@ SilphCo7_h: ; 0x51b55 to 0x51b61 (12 bytes) (id=212)
 
     dw $5ed7 ; objects
 
-INCBIN "baserom.gbc",$51b61,$51d3f - $51b61
+SilphCo7Script: ; 0x51b61
+    call $5b77
+    call $3c3c
+    ld hl, $5d5d
+    ld de, $5c17
+    ld a, [$d648]
+    call $3160
+    ld [$d648], a
+    ret
+; 0x51b77
+INCBIN "baserom.gbc",$51b77,$1c8
 
 SilphCo7Texts: ; 0x51d3f
     dw SilphCo7Text1, SilphCo7Text2, SilphCo7Text3, SilphCo7Text4, SilphCo7Text5, SilphCo7Text6, SilphCo7Text7, SilphCo7Text8, SilphCo7Text9, SilphCo7Text10, SilphCo7Text11, SilphCo7Text12, SilphCo7Text13, SilphCo7Text14, SilphCo7Text15
@@ -23121,7 +24937,11 @@ DayCareMBlocks: ; 16
 FuchsiaHouse3Blocks: ; 16
     INCBIN "maps/fuchsiahouse3.blk"
 
-INCBIN "baserom.gbc",$5524f,$554ee - $5524f
+INCBIN "baserom.gbc",$5524f,$554e3 - $5524f
+Route2Script: ; 0x554e3
+    jp $3c3c
+; 0x554e6
+INCBIN "baserom.gbc",$554e6,$8
 
 Route2Text3: ; 0x554ee
     TX_FAR _Route2Text3
@@ -23131,7 +24951,16 @@ Route2Text4: ; 0x554f3
     TX_FAR _Route2Text4
     db $50
 
-INCBIN "baserom.gbc",$554f8,$55511 - $554f8
+Route3Script: ; 0x554f8
+    call $3c3c
+    ld hl, $5525
+    ld de, $550b
+    ld a, [$d5f8]
+    call $3160
+    ld [$d5f8], a
+    ret
+; 0x5550b
+INCBIN "baserom.gbc",$5550b,$6
 
 Route3Texts: ; 0x55511
     dw Route3Text1, Route3Text2, Route3Text3, Route3Text4, Route3Text5, Route3Text6, Route3Text7, Route3Text8, Route3Text9, Route3Text10
@@ -23210,7 +25039,16 @@ Route3Text10: ; 0x55653
     TX_FAR _Route3Text10
     db $50
 
-INCBIN "baserom.gbc",$55658,$55671 - $55658
+Route4Script: ; 0x55658
+    call $3c3c
+    ld hl, $567d
+    ld de, $566b
+    ld a, [$d5f9]
+    call $3160
+    ld [$d5f9], a
+    ret
+; 0x5566b
+INCBIN "baserom.gbc",$5566b,$6
 
 Route4Texts: ; 0x55671
     dw Route4Text1, Route4Text2, Route4Text3, Route4Text4, Route4Text5, Route4Text6
@@ -23237,7 +25075,10 @@ Route4Text6: ; 0x556ad
     TX_FAR _Route4Text6
     db $50
 
-INCBIN "baserom.gbc",$556b2,$556b5 - $556b2
+Route5Script: ; 0x556b2
+    jp $3c3c
+; 0x556b5
+INCBIN "baserom.gbc",$556b5,$0
 
 Route5Texts: ; 0x556b5
     dw Route5Text1
@@ -23246,7 +25087,16 @@ Route5Text1: ; 0x556b7
     TX_FAR _Route5Text1
     db $50
 
-INCBIN "baserom.gbc",$556bc,$556d5 - $556bc
+Route9Script: ; 0x556bc
+    call $3c3c
+    ld hl, $56eb
+    ld de, $56cf
+    ld a, [$d604]
+    call $3160
+    ld [$d604], a
+    ret
+; 0x556cf
+INCBIN "baserom.gbc",$556cf,$6
 
 Route9Texts: ; 0x556d5
     dw Route9Text1, Route9Text2, Route9Text3, Route9Text4, Route9Text5, Route9Text6, Route9Text7, Route9Text8, Route9Text9, Route9Text10, Route9Text11
@@ -23311,7 +25161,16 @@ Route9Text11: ; 0x55819
     TX_FAR _Route9Text11
     db $50
 
-INCBIN "baserom.gbc",$5581e,$55837 - $5581e
+Route13Script: ; 0x5581e
+    call $3c3c
+    ld hl, $5851
+    ld de, $5831
+    ld a, [$d61a]
+    call $3160
+    ld [$d61a], a
+    ret
+; 0x55831
+INCBIN "baserom.gbc",$55831,$6
 
 Route13Texts: ; 0x55837
     dw Route13Text1, Route13Text2, Route13Text3, Route13Text4, Route13Text5, Route13Text6, Route13Text7, Route13Text8, Route13Text9, Route13Text10, Route13Text11, Route13Text12, Route13Text13
@@ -23410,7 +25269,16 @@ Route13Text13: ; 0x559ce
     TX_FAR _Route13Text13
     db $50
 
-INCBIN "baserom.gbc",$559d3,$559ec - $559d3
+Route14Script: ; 0x559d3
+    call $3c3c
+    ld hl, $5a02
+    ld de, $59e6
+    ld a, [$d61b]
+    call $3160
+    ld [$d61b], a
+    ret
+; 0x559e6
+INCBIN "baserom.gbc",$559e6,$6
 
 Route14Texts: ; 0x559ec
     dw Route14Text1, Route14Text2, Route14Text3, Route14Text4, Route14Text5, Route14Text6, Route14Text7, Route14Text8, Route14Text9, Route14Text10, Route14Text11
@@ -23501,7 +25369,16 @@ Route14Text11: ; 0x55b75
     TX_FAR _Route14Text11
     db $50
 
-INCBIN "baserom.gbc",$55b7a,$55b93 - $55b7a
+Route17Script: ; 0x55b7a
+    call $3c3c
+    ld hl, $5bb3
+    ld de, $5b8d
+    ld a, [$d61c]
+    call $3160
+    ld [$d61c], a
+    ret
+; 0x55b8d
+INCBIN "baserom.gbc",$55b8d,$6
 
 Route17Texts: ; 0x55b93
     dw Route17Text1, Route17Text2, Route17Text3, Route17Text4, Route17Text5, Route17Text6, Route17Text7, Route17Text8, Route17Text9, Route17Text10, Route17Text11, Route17Text12, Route17Text13, Route17Text14, Route17Text15, Route17Text16
@@ -23612,7 +25489,16 @@ Route17Text16: ; 0x55d3f
     TX_FAR _Route17Text16
     db $50
 
-INCBIN "baserom.gbc",$55d44,$55d5d - $55d44
+Route19Script: ; 0x55d44
+    call $3c3c
+    ld hl, $5d73
+    ld de, $5d57
+    ld a, [$d61d]
+    call $3160
+    ld [$d61d], a
+    ret
+; 0x55d57
+INCBIN "baserom.gbc",$55d57,$6
 
 Route19Texts: ; 0x55d5d
     dw Route19Text1, Route19Text2, Route19Text3, Route19Text4, Route19Text5, Route19Text6, Route19Text7, Route19Text8, Route19Text9, Route19Text10, Route19Text11
@@ -23685,7 +25571,16 @@ Route19Text11: ; 0x55ee6
     TX_FAR _Route19Text11
     db $50
 
-INCBIN "baserom.gbc",$55eeb,$55f04 - $55eeb
+Route21Script: ; 0x55eeb
+    call $3c3c
+    ld hl, $5f16
+    ld de, $5efe
+    ld a, [$d61e]
+    call $3160
+    ld [$d61e], a
+    ret
+; 0x55efe
+INCBIN "baserom.gbc",$55efe,$6
 
 Route21Texts: ; 0x55f04
     dw Route21Text1, Route21Text2, Route21Text3, Route21Text4, Route21Text5, Route21Text6, Route21Text7, Route21Text8, Route21Text9
@@ -23756,7 +25651,10 @@ VermilionHouse2_h: ; 0x56064 to 0x56070 (12 bytes) (id=163)
 
     dw $60cf ; objects
 
-INCBIN "baserom.gbc",$56070,$56073 - $56070
+VermilionHouse2Script: ; 0x56070
+    jp $3c3c
+; 0x56073
+INCBIN "baserom.gbc",$56073,$0
 
 VermilionHouse2Texts: ; 0x56073
     dw VermilionHouse2Text1
@@ -23817,7 +25715,10 @@ CeladonMart2_h: ; 0x560e9 to 0x560f5 (12 bytes) (id=123)
 
     dw $6111 ; objects
 
-INCBIN "baserom.gbc",$560f5,$560f8 - $560f5
+CeladonMart2Script: ; 0x560f5
+    jp $3c3c
+; 0x560f8
+INCBIN "baserom.gbc",$560f8,$0
 
 CeladonMart2Texts: ; 0x560f8
     dw CeladonMart2Text1, CeladonMart2Text2, CeladonMart2Text3, CeladonMart2Text4, CeladonMart2Text5
@@ -23867,7 +25768,10 @@ FuchsiaHouse3_h: ; 0x56170 to 0x5617c (12 bytes) (id=164)
 
     dw $6221 ; objects
 
-INCBIN "baserom.gbc",$5617c,$5617f - $5617c
+FuchsiaHouse3Script: ; 0x5617c
+    jp $3c3c
+; 0x5617f
+INCBIN "baserom.gbc",$5617f,$0
 
 FuchsiaHouse3Texts: ; 0x5617f
     dw FuchsiaHouse3Text1
@@ -23930,7 +25834,10 @@ DayCareM_h: ; 0x56243 to 0x5624f (12 bytes) (id=72)
 
     dw $6459 ; objects
 
-INCBIN "baserom.gbc",$5624f,$56252 - $5624f
+DayCareMScript: ; 0x5624f
+    jp $3c3c
+; 0x56252
+INCBIN "baserom.gbc",$56252,$0
 
 DayCareMTexts: ; 0x56252
     dw DayCareMText1
@@ -24017,7 +25924,10 @@ Route12House_h: ; 0x56473 to 0x5647f (12 bytes) (id=189)
 
     dw $64de ; objects
 
-INCBIN "baserom.gbc",$5647f,$56482 - $5647f
+Route12HouseScript: ; 0x5647f
+    jp $3c3c
+; 0x56482
+INCBIN "baserom.gbc",$56482,$0
 
 Route12HouseTexts: ; 0x56482
     dw Route12HouseText1
@@ -24078,7 +25988,17 @@ SilphCo8_h: ; 0x564f8 to 0x56504 (12 bytes) (id=213)
 
     dw $6613 ; objects
 
-INCBIN "baserom.gbc",$56504,$5657d - $56504
+SilphCo8Script: ; 0x56504
+    call $651a
+    call $3c3c
+    ld hl, $6585
+    ld de, $6577
+    ld a, [$d649]
+    call $3160
+    ld [$d649], a
+    ret
+; 0x5651a
+INCBIN "baserom.gbc",$5651a,$63
 
 SilphCo8Texts: ; 0x5657d
     dw SilphCo8Text1, SilphCo8Text2, SilphCo8Text3, SilphCo8Text4
@@ -24618,7 +26538,17 @@ Route18Object: ; 0x58c5a (size=66)
 Route18Blocks: ; 225
     INCBIN "maps/route18.blk"
 
-INCBIN "baserom.gbc",$58d7d,$59120 - $58d7d
+INCBIN "baserom.gbc",$58d7d,$590b0 - $58d7d
+Route6Script: ; 0x590b0
+    call $3c3c
+    ld hl, $50d7
+    ld de, $50c3
+    ld a, [$d600]
+    call $3160
+    ld [$d600], a
+    ret
+; 0x590c3
+INCBIN "baserom.gbc",$590c3,$5d
 
 Route6Text1: ; 0x59120
     db $8
@@ -24673,7 +26603,16 @@ Route6Text7: ; 0x591b1
     TX_FAR _Route6Text7
     db $50
 
-INCBIN "baserom.gbc",$591b6,$59269 - $591b6
+Route8Script: ; 0x591b6
+    call $3c3c
+    ld hl, $51e3
+    ld de, $51c9
+    ld a, [$d601]
+    call $3160
+    ld [$d601], a
+    ret
+; 0x591c9
+INCBIN "baserom.gbc",$591c9,$a0
 
 Route8Text2: ; 0x59269
     db $08 ; asm
@@ -24743,7 +26682,16 @@ Route8Text10: ; 0x59331
     TX_FAR _Route8Text10
     db $50
 
-INCBIN "baserom.gbc",$59336,$5934f - $59336
+Route10Script: ; 0x59336
+    call $3c3c
+    ld hl, $5363
+    ld de, $5349
+    ld a, [$d605]
+    call $3160
+    ld [$d605], a
+    ret
+; 0x59349
+INCBIN "baserom.gbc",$59349,$6
 
 Route10Texts: ; 0x5934f
     dw Route10Text1, Route10Text2, Route10Text3, Route10Text4, Route10Text5, Route10Text6, Route10Text7, Route10Text8, Route10Text9, Route10Text10
@@ -24807,7 +26755,16 @@ Route10Text10: ; 0x59447
     TX_FAR _Route10Text10
     db $50
 
-INCBIN "baserom.gbc",$5944c,$5950d - $5944c
+Route11Script: ; 0x5944c
+    call $3c3c
+    ld hl, $547b
+    ld de, $545f
+    ld a, [$d623]
+    call $3160
+    ld [$d623], a
+    ret
+; 0x5945f
+INCBIN "baserom.gbc",$5945f,$ae
 
 Route11Text2: ; 0x5950d
     db $08 ; asm
@@ -24885,7 +26842,16 @@ Route11Text11: ; 0x595ee
     TX_FAR _Route11Text11
     db $50
 
-INCBIN "baserom.gbc",$595f3,$59675 - $595f3
+Route12Script: ; 0x595f3
+    call $3c3c
+    ld hl, $5691
+    ld de, $5611
+    ld a, [$d624]
+    call $3160
+    ld [$d624], a
+    ret
+; 0x59606
+INCBIN "baserom.gbc",$59606,$6f
 
 Route12Texts: ; 0x59675
     dw Route12Text1, Route12Text2, Route12Text3, Route12Text4, Route12Text5, Route12Text6, Route12Text7, Route12Text8, Route12Text9, Route12Text10, Route12Text11, Route12Text12, Route12Text13, Route12Text14
@@ -24962,7 +26928,16 @@ Route12Text12: ; 0x597a9
     TX_FAR _Route12Text12
     db $50
 
-INCBIN "baserom.gbc",$597ae,$597c7 - $597ae
+Route15Script: ; 0x597ae
+    call $3c3c
+    ld hl, $57df
+    ld de, $57c1
+    ld a, [$d625]
+    call $3160
+    ld [$d625], a
+    ret
+; 0x597c1
+INCBIN "baserom.gbc",$597c1,$6
 
 Route15Texts: ; 0x597c7
     dw Route15Text1, Route15Text2, Route15Text3, Route15Text4, Route15Text5, Route15Text6, Route15Text7, Route15Text8, Route15Text9, Route15Text10, Route15Text11, Route15Text12
@@ -25028,7 +27003,16 @@ Route15Text12: ; 0x5992e
     TX_FAR _Route15Text12
     db $50
 
-INCBIN "baserom.gbc",$59933,$599b9 - $59933
+Route16Script: ; 0x59933
+    call $3c3c
+    ld hl, $59cf
+    ld de, $5951
+    ld a, [$d626]
+    call $3160
+    ld [$d626], a
+    ret
+; 0x59946
+INCBIN "baserom.gbc",$59946,$73
 
 Route16Texts: ; 0x599b9
     dw Route16Text1, Route16Text2, Route16Text3, Route16Text4, Route16Text5, Route16Text6, Route16Text7, Route16Text8, Route16Text9, Route16Text10, Route16Text11
@@ -25101,7 +27085,16 @@ Route16Text9: ; 0x59ac2
     TX_FAR _Route16Text9
     db $50
 
-INCBIN "baserom.gbc",$59ac7,$59ae0 - $59ac7
+Route18Script: ; 0x59ac7
+    call $3c3c
+    ld hl, $5aea
+    ld de, $5ada
+    ld a, [$d627]
+    call $3160
+    ld [$d627], a
+    ret
+; 0x59ada
+INCBIN "baserom.gbc",$59ada,$6
 
 Route18Texts: ; 0x59ae0
     dw Route18Text1, Route18Text2, Route18Text3, Route18Text4, Route18Text5
@@ -25148,7 +27141,10 @@ FanClub_h: ; 0x59b64 to 0x59b70 (12 bytes) (id=90)
 
     dw $5c97 ; objects
 
-INCBIN "baserom.gbc",$59b70,$59b84 - $59b70
+FanClubScript: ; 0x59b70
+    jp $3c3c
+; 0x59b73
+INCBIN "baserom.gbc",$59b73,$11
 
 FanClubTexts: ; 0x59b84
     dw FanClubText1, FanClubText2, FanClubText3, FanClubText4, FanClubText5, FanClubText6, FanClubText7, FanClubText8
@@ -25298,7 +27294,17 @@ SilphCo2_h: ; 0x59ce5 to 0x59cf1 (12 bytes) (id=207)
 
     dw $5e66 ; objects
 
-INCBIN "baserom.gbc",$59cf1,$59d86 - $59cf1
+SilphCo2Script: ; 0x59cf1
+    call $5d07
+    call $3c3c
+    ld hl, $5d90
+    ld de, $5d80
+    ld a, [$d643]
+    call $3160
+    ld [$d643], a
+    ret
+; 0x59d07
+INCBIN "baserom.gbc",$59d07,$7f
 
 SilphCo2Texts: ; 0x59d86
     dw SilphCo2Text1, SilphCo2Text2, SilphCo2Text3, SilphCo2Text4, SilphCo2Text5
@@ -25395,7 +27401,17 @@ SilphCo3_h: ; 0x59f4f to 0x59f5b (12 bytes) (id=208)
 
     dw $6035 ; objects
 
-INCBIN "baserom.gbc",$59f5b,$59fc4 - $59f5b
+SilphCo3Script: ; 0x59f5b
+    call $5f71
+    call $3c3c
+    ld hl, $5fcc
+    ld de, $5fbe
+    ld a, [$d644]
+    call $3160
+    ld [$d644], a
+    ret
+; 0x59f71
+INCBIN "baserom.gbc",$59f71,$53
 
 SilphCo3Texts: ; 0x59fc4
     dw SilphCo3Text1, SilphCo3Text2, SilphCo3Text3, SilphCo3Text4
@@ -25477,7 +27493,17 @@ SilphCo10_h: ; 0x5a12d to 0x5a139 (12 bytes) (id=234)
 
     dw $61fb ; objects
 
-INCBIN "baserom.gbc",$5a139,$5a186 - $5a139
+SilphCo10Script: ; 0x5a139
+    call $614f
+    call $3c3c
+    ld hl, $6192
+    ld de, $6180
+    ld a, [$d658]
+    call $3160
+    ld [$d658], a
+    ret
+; 0x5a14f
+INCBIN "baserom.gbc",$5a14f,$37
 
 SilphCo10Texts: ; 0x5a186
     dw SilphCo10Text1, SilphCo10Text2, SilphCo10Text3, SilphCo10Text4, SilphCo10Text5, SilphCo10Text6
@@ -25549,7 +27575,17 @@ Lance_h: ; 0x5a2a2 to 0x5a2ae (12 bytes) (id=113)
 
     dw $63c5 ; objects
 
-INCBIN "baserom.gbc",$5a2ae,$5a395 - $5a2ae
+LanceScript: ; 0x5a2ae
+    call $62c4
+    call $3c3c
+    ld hl, $6397
+    ld de, $62fa
+    ld a, [$d653]
+    call $3160
+    ld [$d653], a
+    ret
+; 0x5a2c4
+INCBIN "baserom.gbc",$5a2c4,$d1
 
 LanceTexts: ; 0x5a395
     dw LanceText1
@@ -25593,7 +27629,100 @@ HallofFameRoom_h: ; 0x5a492 to 0x5a49e (12 bytes) (id=118)
 
     dw $6571 ; objects
 
-INCBIN "baserom.gbc",$5a49e,$5a56a - $5a49e
+HallofFameRoomScript: ; 0x5a49e
+    call $3c3c
+    ld hl, $64b2
+    ld a, [$d64b]
+    jp $3d97
+; 0x5a4aa
+INCBIN "baserom.gbc",$5a4aa,$11
+HallofFameRoomScript2: ; 0x5a4bb
+    call Delay3
+    ld a, [$d358]
+    push af
+    xor a
+    ld [$cd6b], a
+    ld a, $55
+    call Predef
+    pop af
+    ld [$d358], a
+    ld hl, $d733
+    res 1, [hl]
+    inc hl
+    set 0, [hl]
+    xor a
+    ld hl, $d64d
+    ld [hli], a
+    ld [hli], a
+    ld [hl], a
+    ld [$d653], a
+    ld [$d64b], a
+    ld hl, $d863
+    ld [hli], a
+    ld [hli], a
+    ld [hli], a
+    ld [hli], a
+    ld [hl], a
+    xor a
+    ld [$d64b], a
+    ld a, $0
+    ld [$d719], a
+    ld b, $1c
+    ld hl, $7848
+    call Bankswitch
+    ld b, $5
+.asm_5a4ff
+    ld c, $78
+    call $3739
+    dec b
+    jr nz, .asm_5a4ff ; 0x5a505 $f8
+    call $3865
+    jp $1f54
+; 0x5a50d
+HallofFameRoomScript0: ; 0x5a50d
+    ld a, $ff
+    ld [$cd6b], a
+    ld hl, $ccd3
+    ld de, $6528
+    call $350c
+    dec a
+    ld [$cd38], a
+    call $3486
+    ld a, $1
+    ld [$d64b], a
+    ret
+; 0x5a528
+INCBIN "baserom.gbc",$5a528,$5a52b - $5a528
+HallofFameRoomScript1: ; 0x5a52b
+    ld a, [$cd38]
+    and a
+    ret nz
+    ld a, $1
+    ld [$d528], a
+    ld a, $1
+    ld [$ff00+$8c], a
+    call $3541
+    ld a, $8
+    ld [$ff00+$8d], a
+    call $34a6
+    call Delay3
+    xor a
+    ld [$cd6b], a
+    inc a
+    ld [$d528], a
+    ld a, $1
+    ld [$ff00+$8c], a
+    call $2920
+    ld a, $ff
+    ld [$cd6b], a
+    ld a, $8
+    ld [$cc4d], a
+    ld a, $11
+    call Predef
+    ld a, $2
+    ld [$d64b], a
+    ret
+; 0x5a56a
 
 HallofFameRoomTexts: ; 0x5a56a
     dw HallofFameRoomText1
@@ -25700,7 +27829,37 @@ MuseumF1_h: ; 0x5c0eb to 0x5c0f7 (12 bytes) (id=52)
 
     dw $42c1 ; objects
 
-INCBIN "baserom.gbc",$5c0f7,$5c12b - $5c0f7
+MuseumF1Script: ; 0x5c0f7
+    ld a, $1
+    ld [$cf0c], a
+    xor a
+    ld [$cc3c], a
+    ld hl, $4109
+    ld a, [$d619]
+    jp $3d97
+; 0x5c109
+INCBIN "baserom.gbc",$5c109,$4
+MuseumF1Script0: ; 0x5c10d
+    ld a, [$d361]
+    cp $4
+    ret nz
+    ld a, [$d362]
+    cp $9
+    jr z, .asm_5c120 ; 0x5c118 $6
+    ld a, [$d362]
+    cp $a
+    ret nz
+.asm_5c120
+    xor a
+    ld [$ff00+$b4], a
+    ld a, $1
+    ld [$ff00+$8c], a
+    jp $2920
+; 0x5c12a
+MuseumF1Script1: ; 0x5c12a
+    ret
+; 0x5c12b
+INCBIN "baserom.gbc",$5c12b,$0
 
 MuseumF1Texts: ; 0x5c12b
     dw MuseumF1Text1, MuseumF1Text2, MuseumF1Text3, MuseumF1Text4, MuseumF1Text5
@@ -25899,7 +28058,10 @@ MuseumF2_h: ; 0x5c30b to 0x5c317 (12 bytes) (id=53)
 
     dw $434b ; objects
 
-INCBIN "baserom.gbc",$5c317,$5c31a - $5c317
+MuseumF2Script: ; 0x5c317
+    jp $3c3c
+; 0x5c31a
+INCBIN "baserom.gbc",$5c31a,$0
 
 MuseumF2Texts: ; 0x5c31a
     dw MuseumF2Text1, MuseumF2Text2, MuseumF2Text3, MuseumF2Text4, MuseumF2Text5, MuseumF2Text6, MuseumF2Text7
@@ -25960,7 +28122,20 @@ PewterGym_h: ; 0x5c37b to 0x5c387 (12 bytes) (id=54)
 
     dw $452e ; objects
 
-INCBIN "baserom.gbc",$5c387,$5c435 - $5c387
+PewterGymScript: ; 0x5c387
+    ld hl, $d126
+    bit 6, [hl]
+    res 6, [hl]
+    call nz, $43a4
+    call $3c3c
+    ld hl, $4441
+    ld de, $43ca
+    ld a, [$d5fc]
+    call $3160
+    ld [$d5fc], a
+    ret
+; 0x5c3a4
+INCBIN "baserom.gbc",$5c3a4,$91
 
 PewterGymTexts: ; 0x5c435
     dw PewterGymText1, PewterGymText2, PewterGymText3, PewterGymText4, PewterGymText5, PewterGymText6
@@ -26085,7 +28260,11 @@ PewterPokecenter_h: ; 0x5c57b to 0x5c587 (12 bytes) (id=58)
 
     dw $460d ; objects
 
-INCBIN "baserom.gbc",$5c587,$5c596 - $5c587
+PewterPokecenterScript: ; 0x5c587
+    call $22fa
+    jp $3c3c
+; 0x5c58d
+INCBIN "baserom.gbc",$5c58d,$9
 
 PewterPokecenterText2:
 PewterPokecenterText1: ; 0x5c596
@@ -26179,7 +28358,11 @@ CeruleanPokecenter_h: ; 0x5c639 to 0x5c645 (12 bytes) (id=64)
 
     dw $465f ; objects
 
-INCBIN "baserom.gbc",$5c645,$5c653 - $5c645
+CeruleanPokecenterScript: ; 0x5c645
+    call $22fa
+    jp $3c3c
+; 0x5c64b
+INCBIN "baserom.gbc",$5c64b,$8
 
 CeruleanPokecenterText4:
     db $f6, $ff
@@ -26223,7 +28406,20 @@ CeruleanGym_h: ; 0x5c6a7 to 0x5c6b3 (12 bytes) (id=65)
 
     dw $4834 ; objects
 
-INCBIN "baserom.gbc",$5c6b3,$5c74a - $5c6b3
+CeruleanGymScript: ; 0x5c6b3
+    ld hl, $d126
+    bit 6, [hl]
+    res 6, [hl]
+    call nz, $46d0
+    call $3c3c
+    ld hl, $4758
+    ld de, $46f8
+    ld a, [$d5fd]
+    call $3160
+    ld [$d5fd], a
+    ret
+; 0x5c6d0
+INCBIN "baserom.gbc",$5c6d0,$7a
 
 CeruleanGymTexts: ; 0x5c74a
     dw CeruleanGymText1, CeruleanGymText2, CeruleanGymText3, CeruleanGymText4, CeruleanGymText5, CeruleanGymText6, CeruleanGymText7
@@ -26343,7 +28539,10 @@ CeruleanMart_h: ; 0x5c889 to 0x5c895 (12 bytes) (id=67)
 
     dw $48a8 ; objects
 
-INCBIN "baserom.gbc",$5c895,$5c898 - $5c895
+CeruleanMartScript: ; 0x5c895
+    jp $3c3c
+; 0x5c898
+INCBIN "baserom.gbc",$5c898,$0
 
 CeruleanMartTexts: ; 0x5c898
     dw CeruleanMartText1, CeruleanMartText2, CeruleanMartText3
@@ -26382,7 +28581,11 @@ LavenderPokecenter_h: ; 0x5c8ce to 0x5c8da (12 bytes) (id=141)
 
     dw $48f4 ; objects
 
-INCBIN "baserom.gbc",$5c8da,$5c8e8 - $5c8da
+LavenderPokecenterScript: ; 0x5c8da
+    call $22fa
+    jp $3c3c
+; 0x5c8e0
+INCBIN "baserom.gbc",$5c8e0,$8
 
 LavenderPokecenterText4:
     db $f6, $ff
@@ -26425,7 +28628,10 @@ LavenderMart_h: ; 0x5c920 to 0x5c92c (12 bytes) (id=150)
 
     dw $495d ; objects
 
-INCBIN "baserom.gbc",$5c92c,$5c92f - $5c92c
+LavenderMartScript: ; 0x5c92c
+    jp $3c3c
+; 0x5c92f
+INCBIN "baserom.gbc",$5c92f,$0
 
 LavenderMartTexts: ; 0x5c92f
     dw LavenderMartText1, LavenderMartText2, LavenderMartText3
@@ -26476,7 +28682,11 @@ VermilionPokecenter_h: ; 0x5c983 to 0x5c98f (12 bytes) (id=89)
 
     dw $49a9 ; objects
 
-INCBIN "baserom.gbc",$5c98f,$5c99e - $5c98f
+VermilionPokecenterScript: ; 0x5c98f
+    call $22fa
+    jp $3c3c
+; 0x5c995
+INCBIN "baserom.gbc",$5c995,$9
 
 VermilionPokecenterText2:
 VermilionPokecenterText1: ; 0x5c99e
@@ -26517,7 +28727,10 @@ VermilionMart_h: ; 0x5c9d5 to 0x5c9e1 (12 bytes) (id=91)
 
     dw $49f4 ; objects
 
-INCBIN "baserom.gbc",$5c9e1,$5c9e4 - $5c9e1
+VermilionMartScript: ; 0x5c9e1
+    jp $3c3c
+; 0x5c9e4
+INCBIN "baserom.gbc",$5c9e4,$0
 
 VermilionMartTexts: ; 0x5c9e4
     dw VermilionMartText1, VermilionMartText2, VermilionMartText3
@@ -26559,7 +28772,25 @@ VermilionGym_h: ; 0x5ca1a to 0x5ca26 (12 bytes) (id=92)
 
     dw $4bfe ; objects
 
-INCBIN "baserom.gbc",$5ca26,$5cae8 - $5ca26
+VermilionGymScript: ; 0x5ca26
+    ld hl, $d126
+    bit 5, [hl]
+    res 5, [hl]
+    push hl
+    call nz, $4a4c
+    pop hl
+    bit 6, [hl]
+    res 6, [hl]
+    call nz, $4a6d
+    call $3c3c
+    ld hl, $4af8
+    ld de, $4a95
+    ld a, [$d5fe]
+    call $3160
+    ld [$d5fe], a
+    ret
+; 0x5ca4c
+INCBIN "baserom.gbc",$5ca4c,$9c
 
 VermilionGymTexts: ; 0x5cae8
     dw VermilionGymText1, VermilionGymText2, VermilionGymText3, VermilionGymText4, VermilionGymText5, VermilionGymText6, VermilionGymText7, VermilionGymText8
@@ -26689,7 +28920,10 @@ CopycatsHouseF2_h: ; 0x5cc65 to 0x5cc71 (12 bytes) (id=176)
 
     dw $4d21 ; objects
 
-INCBIN "baserom.gbc",$5cc71,$5cc74 - $5cc71
+CopycatsHouseF2Script: ; 0x5cc71
+    jp $3c3c
+; 0x5cc74
+INCBIN "baserom.gbc",$5cc74,$0
 
 CopycatsHouseF2Texts: ; 0x5cc74
     dw CopycatsHouseF2Text1, CopycatsHouseF2Text2, CopycatsHouseF2Text3, CopycatsHouseF2Text4, CopycatsHouseF2Text5, CopycatsHouseF2Text6, CopycatsHouseF2Text7
@@ -26788,7 +29022,16 @@ FightingDojo_h: ; 0x5cd51 to 0x5cd5d (12 bytes) (id=177)
 
     dw $4f9b ; objects
 
-INCBIN "baserom.gbc",$5cd5d,$5ce03 - $5cd5d
+FightingDojoScript: ; 0x5cd5d
+    call $3c3c
+    ld hl, $4e13
+    ld de, $4d7b
+    ld a, [$d642]
+    call $3160
+    ld [$d642], a
+    ret
+; 0x5cd70
+INCBIN "baserom.gbc",$5cd70,$93
 
 FightingDojoTexts: ; 0x5ce03
     dw FightingDojoText1, FightingDojoText2, FightingDojoText3, FightingDojoText4, FightingDojoText5, FightingDojoText6, FightingDojoText7, FightingDojoText8
@@ -26966,7 +29209,20 @@ SaffronGym_h: ; 0x5d001 to 0x5d00d (12 bytes) (id=178)
 
     dw $5259 ; objects
 
-INCBIN "baserom.gbc",$5d00d,$5d0ab - $5d00d
+SaffronGymScript: ; 0x5d00d
+    ld hl, $d126
+    bit 6, [hl]
+    res 6, [hl]
+    call nz, $502a
+    call $3c3c
+    ld hl, $50c3
+    ld de, $5053
+    ld a, [$d65c]
+    call $3160
+    ld [$d65c], a
+    ret
+; 0x5d02a
+INCBIN "baserom.gbc",$5d02a,$81
 
 SaffronGymTexts: ; 0x5d0ab
     dw SaffronGymText1, SaffronGymText2, SaffronGymText3, SaffronGymText4, SaffronGymText5, SaffronGymText6, SaffronGymText7, SaffronGymText8, SaffronGymText9, SaffronGymText10, SaffronGymText11, SaffronGymText12
@@ -27173,7 +29429,10 @@ SaffronMart_h: ; 0x5d3fd to 0x5d409 (12 bytes) (id=180)
 
     dw $541c ; objects
 
-INCBIN "baserom.gbc",$5d409,$5d40c - $5d409
+SaffronMartScript: ; 0x5d409
+    jp $3c3c
+; 0x5d40c
+INCBIN "baserom.gbc",$5d40c,$0
 
 SaffronMartTexts: ; 0x5d40c
     dw SaffronMartText1, SaffronMartText2, SaffronMartText3
@@ -27212,7 +29471,21 @@ SilphCo1_h: ; 0x5d442 to 0x5d44e (12 bytes) (id=181)
 
     dw $5470 ; objects
 
-INCBIN "baserom.gbc",$5d44e,$5d469 - $5d44e
+SilphCo1Script: ; 0x5d44e
+    call $3c3c
+    ld a, [$d838]
+    bit 7, a
+    ret z
+    ld hl, $d7b9
+    bit 7, [hl]
+    set 7, [hl]
+    ret nz
+    ld a, $4c
+    ld [$cc4d], a
+    ld a, $15
+    jp $3e6d
+; 0x5d469
+INCBIN "baserom.gbc",$5d469,$0
 
 SilphCo1Texts: ; 0x5d469
     dw SilphCo1Text1
@@ -27254,7 +29527,11 @@ SaffronPokecenter_h: ; 0x5d529 to 0x5d535 (12 bytes) (id=182)
 
     dw $554f ; objects
 
-INCBIN "baserom.gbc",$5d535,$5d544 - $5d535
+SaffronPokecenterScript: ; 0x5d535
+    call $22fa
+    jp $3c3c
+; 0x5d53b
+INCBIN "baserom.gbc",$5d53b,$9
 
 SaffronPokecenterText2: ; maybe
 SaffronPokecenterText1: ; 0x5d543
@@ -27296,7 +29573,10 @@ ViridianForestexit_h: ; 0x5d57b to 0x5d587 (12 bytes) (id=47)
 
     dw $5598 ; objects
 
-INCBIN "baserom.gbc",$5d587,$5d58a - $5d587
+ViridianForestexitScript: ; 0x5d587
+    jp $3c3c
+; 0x5d58a
+INCBIN "baserom.gbc",$5d58a,$0
 
 ViridianForestexitTexts: ; 0x5d58a
     dw ViridianForestexitText1, ViridianForestexitText2
@@ -27338,7 +29618,10 @@ Route2Gate_h: ; 0x5d5c8 to 0x5d5d4 (12 bytes) (id=49)
 
     dw $5620 ; objects
 
-INCBIN "baserom.gbc",$5d5d4,$5d5d7 - $5d5d4
+Route2GateScript: ; 0x5d5d4
+    jp $3c3c
+; 0x5d5d7
+INCBIN "baserom.gbc",$5d5d7,$0
 
 Route2GateTexts: ; 0x5d5d7
     dw Route2GateText1, Route2GateText2
@@ -27406,7 +29689,10 @@ ViridianForestEntrance_h: ; 0x5d650 to 0x5d65c (12 bytes) (id=50)
 
     dw $566d ; objects
 
-INCBIN "baserom.gbc",$5d65c,$5d65f - $5d65c
+ViridianForestEntranceScript: ; 0x5d65c
+    jp $3c3c
+; 0x5d65f
+INCBIN "baserom.gbc",$5d65f,$0
 
 ViridianForestEntranceTexts: ; 0x5d65f
     dw ViridianForestEntranceText1, ViridianForestEntranceText2
@@ -27448,7 +29734,12 @@ UndergroundTunnelEntranceRoute5_h: ; 0x5d69d to 0x5d6a9 (12 bytes) (id=71)
 
     dw $56c1 ; objects
 
-INCBIN "baserom.gbc",$5d6a9,$5d6b0 - $5d6a9
+UndergroundTunnelEntranceRoute5Script: ; 0x5d6a9
+    ld a, $10
+    ld [$d365], a
+    ret
+; 0x5d6af
+INCBIN "baserom.gbc",$5d6af,$1
 
 UndergroundTunnelEntranceRoute5Texts: ; 0x5d6b0
     dw UndergroundTunnelEntranceRoute5Text1
@@ -27488,7 +29779,12 @@ UndergroundTunnelEntranceRoute6_h: ; 0x5d6e3 to 0x5d6ef (12 bytes) (id=74)
 
     dw $56fe ; objects
 
-INCBIN "baserom.gbc",$5d6ef,$5d6f7 - $5d6ef
+UndergroundTunnelEntranceRoute6Script: ; 0x5d6ef
+    ld a, $11
+    ld [$d365], a
+    jp $3c3c
+; 0x5d6f7
+INCBIN "baserom.gbc",$5d6f7,$0
 
 UndergroundTunnelEntranceRoute6Texts: ; 0x5d6f7
     dw UndergroundTunnelEntranceRoute6Text1
@@ -27525,7 +29821,12 @@ UndergroundPathEntranceRoute7_h: ; 0x5d720 to 0x5d72c (12 bytes) (id=77)
 
     dw $573b ; objects
 
-INCBIN "baserom.gbc",$5d72c,$5d734 - $5d72c
+UndergroundPathEntranceRoute7Script: ; 0x5d72c
+    ld a, $12
+    ld [$d365], a
+    jp $3c3c
+; 0x5d734
+INCBIN "baserom.gbc",$5d734,$0
 
 UndergroundPathEntranceRoute7Texts: ; 0x5d734
     dw UndergroundPathEntranceRoute7Text1
@@ -27563,7 +29864,17 @@ SilphCo9_h: ; 0x5d7af to 0x5d7bb (12 bytes) (id=233)
 
     dw $593f ; objects
 
-INCBIN "baserom.gbc",$5d7bb,$5d88b - $5d7bb
+SilphCo9Script: ; 0x5d7bb
+    call $57d1
+    call $3c3c
+    ld hl, $5893
+    ld de, $5885
+    ld a, [$d64a]
+    call $3160
+    ld [$d64a], a
+    ret
+; 0x5d7d1
+INCBIN "baserom.gbc",$5d7d1,$ba
 
 SilphCo9Texts: ; 0x5d88b
     dw SilphCo9Text1, SilphCo9Text2, SilphCo9Text3, SilphCo9Text4
@@ -27649,7 +29960,20 @@ VictoryRoad1_h: ; 0x5d9fe to 0x5da0a (12 bytes) (id=108)
 
     dw $5ab8 ; objects
 
-INCBIN "baserom.gbc",$5da0a,$5da5f - $5da0a
+VictoryRoad1Script: ; 0x5da0a
+    ld hl, $d126
+    bit 5, [hl]
+    res 5, [hl]
+    call nz, $5a27
+    call $3c3c
+    ld hl, $5a6d
+    ld de, $5a3a
+    ld a, [$d651]
+    call $3160
+    ld [$d651], a
+    ret
+; 0x5da27
+INCBIN "baserom.gbc",$5da27,$38
 
 VictoryRoad1Texts: ; 0x5da5f
     dw VictoryRoad1Text1, VictoryRoad1Text2, VictoryRoad1Text3, VictoryRoad1Text4, VictoryRoad1Text5, VictoryRoad1Text6, VictoryRoad1Text7
@@ -27719,7 +30043,10 @@ PokemonTower1_h: ; 0x60420 to 0x6042c (12 bytes) (id=142)
 
     dw $4452 ; objects
 
-INCBIN "baserom.gbc",$6042c,$6042f - $6042c
+PokemonTower1Script: ; 0x6042c
+    jp $3c3c
+; 0x6042f
+INCBIN "baserom.gbc",$6042f,$0
 
 PokemonTower1Texts: ; 0x6042f
     dw PokemonTower1Text1, PokemonTower1Text2, PokemonTower1Text3, PokemonTower1Text4, PokemonTower1Text5
@@ -27777,7 +30104,101 @@ PokemonTower2_h: ; 0x604e6 to 0x604f2 (12 bytes) (id=143)
 
     dw $4646 ; objects
 
-INCBIN "baserom.gbc",$604f2,$605db - $604f2
+PokemonTower2Script: ; 0x604f2
+    call $3c3c
+    ld hl, $4509
+    ld a, [$d62b]
+    jp $3d97
+; 0x604fe
+INCBIN "baserom.gbc",$604fe,$11
+PokemonTower2Script0: ; 0x6050f
+    ld a, [$d764]
+    bit 7, a
+    ret nz
+    ld hl, $455e
+    call $34bf
+    ret nc
+    ld a, $ff
+    ld [$c0ee], a
+    call $23b1
+    ld c, $2
+    ld a, $de
+    call $23a1
+    ld hl, $d764
+    res 6, [hl]
+    ld a, [$cd3d]
+    cp $1
+    ld a, $8
+    ld b, $0
+    jr nz, .asm_60544 ; 0x60539 $9
+    ld hl, $d764
+    set 6, [hl]
+    ld a, $2
+    ld b, $c
+.asm_60544
+    ld [$d528], a
+    ld a, $1
+    ld [$ff00+$8c], a
+    ld a, b
+    ld [$ff00+$8d], a
+    call $34a6
+    ld a, $1
+    ld [$ff00+$8c], a
+    call $2920
+    xor a
+    ld [$ff00+$b4], a
+    ld [$ff00+$b3], a
+    ret
+; 0x6055e
+INCBIN "baserom.gbc",$6055e,$60563 - $6055e
+PokemonTower2Script1: ; 0x60563
+    ld a, [$d057]
+    cp $ff
+    jp z, $44fe
+    ld a, $f0
+    ld [$cd6b], a
+    ld hl, $d764
+    set 7, [hl]
+    ld a, $1
+    ld [$ff00+$8c], a
+    call $2920
+    ld de, $45b2
+    ld a, [$d764]
+    bit 6, a
+    jr nz, .asm_60589 ; 0x60584 $3
+    ld de, $45a9
+.asm_60589
+    ld a, $1
+    ld [$ff00+$8c], a
+    call $363a
+    ld a, $ff
+    ld [$c0ee], a
+    call $23b1
+    ld b, $2
+    ld hl, $5b47
+    call Bankswitch
+    ld a, $2
+    ld [$d62b], a
+    ld [$da39], a
+    ret
+; 0x605a9
+INCBIN "baserom.gbc",$605a9,$605bb - $605a9
+PokemonTower2Script2: ; 0x605bb
+    ld a, [$d730]
+    bit 0, a
+    ret nz
+    ld a, $38
+    ld [$cc4d], a
+    ld a, $11
+    call Predef
+    xor a
+    ld [$cd6b], a
+    call $2307
+    ld a, $0
+    ld [$d62b], a
+    ld [$da39], a
+    ret
+; 0x605db
 
 PokemonTower2Texts: ; 0x605db
     dw PokemonTower2Text1, PokemonTower2Text2
@@ -27855,7 +30276,16 @@ PokemonTower3_h: ; 0x606c0 to 0x606cc (12 bytes) (id=144)
 
     dw $475d ; objects
 
-INCBIN "baserom.gbc",$606cc,$606e5 - $606cc
+PokemonTower3Script: ; 0x606cc
+    call $3c3c
+    ld hl, $46ed
+    ld de, $46df
+    ld a, [$d62c]
+    call $3160
+    ld [$d62c], a
+    ret
+; 0x606df
+INCBIN "baserom.gbc",$606df,$6
 
 PokemonTower3Texts: ; 0x606e5
     dw PokemonTower3Text1, PokemonTower3Text2, PokemonTower3Text3, PokemonTower3Text4
@@ -27912,7 +30342,16 @@ PokemonTower4_h: ; 0x607ea to 0x607f6 (12 bytes) (id=145)
 
     dw $488b ; objects
 
-INCBIN "baserom.gbc",$607f6,$6080f - $607f6
+PokemonTower4Script: ; 0x607f6
+    call $3c3c
+    ld hl, $481b
+    ld de, $4809
+    ld a, [$d62d]
+    call $3160
+    ld [$d62d], a
+    ret
+; 0x60809
+INCBIN "baserom.gbc",$60809,$6
 
 PokemonTower4Texts: ; 0x6080f
     dw PokemonTower4Text1, PokemonTower4Text2, PokemonTower4Text3, PokemonTower4Text4, PokemonTower4Text5, PokemonTower4Text6
@@ -27971,7 +30410,16 @@ PokemonTower5_h: ; 0x60926 to 0x60932 (12 bytes) (id=146)
 
     dw $4a48 ; objects
 
-INCBIN "baserom.gbc",$60932,$6099b - $60932
+PokemonTower5Script: ; 0x60932
+    call $3c3c
+    ld hl, $49a9
+    ld de, $4945
+    ld a, [$d62e]
+    call $3160
+    ld [$d62e], a
+    ret
+; 0x60945
+INCBIN "baserom.gbc",$60945,$56
 
 PokemonTower5Texts: ; 0x6099b
     dw PokemonTower5Text1, PokemonTower5Text2, PokemonTower5Text3, PokemonTower5Text4, PokemonTower5Text5, PokemonTower5Text6, PokemonTower5Text7
@@ -28049,7 +30497,16 @@ PokemonTower6_h: ; 0x60ae3 to 0x60aef (12 bytes) (id=147)
 
     dw $4c5b ; objects
 
-INCBIN "baserom.gbc",$60aef,$60bb1 - $60aef
+PokemonTower6Script: ; 0x60aef
+    call $3c3c
+    ld hl, $4bbf
+    ld de, $4b0d
+    ld a, [$d62f]
+    call $3160
+    ld [$d62f], a
+    ret
+; 0x60b02
+INCBIN "baserom.gbc",$60b02,$af
 
 PokemonTower6Texts: ; 0x60bb1
     dw PokemonTower6Text1, PokemonTower6Text2, PokemonTower6Text3, PokemonTower6Text4, PokemonTower6Text5, PokemonTower6Text6, PokemonTower6Text7
@@ -28113,7 +30570,16 @@ PokemonTower7_h: ; 0x60cf9 to 0x60d05 (12 bytes) (id=148)
 
     dw $4ef6 ; objects
 
-INCBIN "baserom.gbc",$60d05,$60e3f - $60d05
+PokemonTower7Script: ; 0x60d05
+    call $3c3c
+    ld hl, $4e47
+    ld de, $4d23
+    ld a, [$d630]
+    call $3160
+    ld [$d630], a
+    ret
+; 0x60d18
+INCBIN "baserom.gbc",$60d18,$127
 
 PokemonTower7Texts: ; 0x60e3f
     dw PokemonTower7Text1, PokemonTower7Text2, PokemonTower7Text3, PokemonTower7Text4
@@ -28193,7 +30659,10 @@ CeladonMart1_h: ; 0x60f7a to 0x60f86 (12 bytes) (id=122)
 
     dw $4f9e ; objects
 
-INCBIN "baserom.gbc",$60f86,$60f89 - $60f86
+CeladonMart1Script: ; 0x60f86
+    jp $3c3c
+; 0x60f89
+INCBIN "baserom.gbc",$60f89,$0
 
 CeladonMart1Texts: ; 0x60f89
     dw CeladonMart1Text1, CeladonMart1Text2, CeladonMart1Text3
@@ -28249,7 +30718,16 @@ ViridianForest_h: ; 0x61101 to 0x6110d (12 bytes) (id=51)
 
     dw $51da ; objects
 
-INCBIN "baserom.gbc",$6110d,$61126 - $6110d
+ViridianForestScript: ; 0x6110d
+    call $3c3c
+    ld hl, $5142
+    ld de, $5120
+    ld a, [$d618]
+    call $3160
+    ld [$d618], a
+    ret
+; 0x61120
+INCBIN "baserom.gbc",$61120,$6
 
 ViridianForestTexts: ; 0x61126
     dw ViridianForestText1, ViridianForestText2, ViridianForestText3, ViridianForestText4, ViridianForestText5, ViridianForestText6, ViridianForestText7, ViridianForestText8, ViridianForestText9, ViridianForestText10, ViridianForestText11, ViridianForestText12, ViridianForestText13, ViridianForestText14
@@ -28353,7 +30831,11 @@ SSAnne1_h: ; 0x61259 to 0x61265 (12 bytes) (id=95)
 
     dw $5277 ; objects
 
-INCBIN "baserom.gbc",$61265,$61269 - $61265
+SSAnne1Script: ; 0x61265
+    call $3c3c
+    ret
+; 0x61269
+INCBIN "baserom.gbc",$61269,$0
 
 SSAnne1Texts: ; 0x61269
     dw SSAnne1Text1, SSAnne1Text2
@@ -28414,7 +30896,136 @@ SSAnne2_h: ; 0x61393 to 0x6139f (12 bytes) (id=96)
 
     dw $5514 ; objects
 
-INCBIN "baserom.gbc",$6139f,$614db - $6139f
+SSAnne2Script: ; 0x6139f
+    call $3c3c
+    ld hl, $53b3
+    ld a, [$d665]
+    jp $3d97
+; 0x613ab
+INCBIN "baserom.gbc",$613ab,$12
+SSAnne2Script4: ; 0x613bd
+    ret
+; 0x613be
+SSAnne2Script0: ; 0x613be
+    ld hl, $5411
+    call $34bf
+    ret nc
+    ld a, $ff
+    ld [$c0ee], a
+    call $23b1
+    ld c, $2
+    ld a, $de
+    call $23a1
+    ld a, [$cd3d]
+    ld [$ff00+$db], a
+    ld a, $71
+    ld [$cc4d], a
+    ld a, $15
+    call Predef
+    call Delay3
+    ld a, $2
+    ld [$ff00+$8c], a
+    call $3541
+    xor a
+    ld [$ff00+$b4], a
+    ld a, $f0
+    ld [$cd6b], a
+    ld a, [$ff00+$db]
+    cp $2
+    jr nz, .asm_61400 ; 0x613f9 $5
+    ld de, $540c
+    jr .asm_61403 ; 0x613fe $3
+.asm_61400
+    ld de, $540d
+.asm_61403
+    call $363a
+    ld a, $1
+    ld [$d665], a
+    ret
+; 0x6140c
+INCBIN "baserom.gbc",$6140c,$61430 - $6140c
+SSAnne2Script1: ; 0x61430
+    ld a, [$d730]
+    bit 0, a
+    ret nz
+    call $5416
+    xor a
+    ld [$cd6b], a
+    ld a, $2
+    ld [$ff00+$8c], a
+    call $2920
+    call Delay3
+    ld a, $f2
+    ld [$d059], a
+    ld a, [$d715]
+    cp $b1
+    jr nz, .asm_61457 ; 0x61451 $4
+    ld a, $1
+    jr .asm_61461 ; 0x61455 $a
+.asm_61457
+    cp $99
+    jr nz, .asm_6145f ; 0x61459 $4
+    ld a, $2
+    jr .asm_61461 ; 0x6145d $2
+.asm_6145f
+    ld a, $3
+.asm_61461
+    ld [$d05d], a
+    call $5416
+    ld a, $2
+    ld [$d665], a
+    ret
+; 0x6146d
+SSAnne2Script2: ; 0x6146d
+    ld a, [$d057]
+    cp $ff
+    jp z, $53ab
+    call $5416
+    ld a, $f0
+    ld [$cd6b], a
+    ld a, $3
+    ld [$ff00+$8c], a
+    call $2920
+    ld a, $2
+    ld [$ff00+$8c], a
+    call $3541
+    ld a, [$d362]
+    cp $25
+    jr nz, .asm_61497 ; 0x61490 $5
+    ld de, $54b9
+    jr .asm_6149a ; 0x61495 $3
+.asm_61497
+    ld de, $54b7
+.asm_6149a
+    ld a, $2
+    ld [$ff00+$8c], a
+    call $363a
+    ld a, $ff
+    ld [$c0ee], a
+    call $23b1
+    ld b, $2
+    ld hl, $5b47
+    call Bankswitch
+    ld a, $3
+    ld [$d665], a
+    ret
+; 0x614b7
+INCBIN "baserom.gbc",$614b7,$614be - $614b7
+SSAnne2Script3: ; 0x614be
+    ld a, [$d730]
+    bit 0, a
+    ret nz
+    xor a
+    ld [$cd6b], a
+    ld a, $71
+    ld [$cc4d], a
+    ld a, $11
+    call Predef
+    call $2307
+    ld a, $4
+    ld [$d665], a
+    ret
+; 0x614db
 
 SSAnne2Texts: ; 0x614db
     dw SSAnne2Text1, SSAnne2Text2, SSAnne2Text3
@@ -28483,7 +31094,10 @@ SSAnne4_h: ; 0x61622 to 0x6162e (12 bytes) (id=98)
 
     dw $5632 ; objects
 
-INCBIN "baserom.gbc",$6162e,$61632 - $6162e
+SSAnne4Script: ; 0x6162e
+    jp $3c3c
+; 0x61631
+INCBIN "baserom.gbc",$61631,$1
 
 SSAnne4Object: ; 0x61632 (size=52)
     db $c ; border tile
@@ -28519,7 +31133,16 @@ SSAnne5_h: ; 0x616a2 to 0x616ae (12 bytes) (id=99)
 
     dw $572b ; objects
 
-INCBIN "baserom.gbc",$616ae,$616c7 - $616ae
+SSAnne5Script: ; 0x616ae
+    call $3c3c
+    ld hl, $56d1
+    ld de, $56c1
+    ld a, [$d617]
+    call $3160
+    ld [$d617], a
+    ret
+; 0x616c1
+INCBIN "baserom.gbc",$616c1,$6
 
 SSAnne5Texts: ; 0x616c7
     dw SSAnne5Text1, SSAnne5Text2, SSAnne5Text3, SSAnne5Text4, SSAnne5Text5
@@ -28587,7 +31210,11 @@ SSAnne6_h: ; 0x617a7 to 0x617b3 (12 bytes) (id=100)
 
     dw $581b ; objects
 
-INCBIN "baserom.gbc",$617b3,$617b7 - $617b3
+SSAnne6Script: ; 0x617b3
+    call $3c3c
+    ret
+; 0x617b7
+INCBIN "baserom.gbc",$617b7,$0
 
 SSAnne6Texts: ; 0x617b7
     dw SSAnne6Text1, SSAnne6Text2, SSAnne6Text3, SSAnne6Text4, SSAnne6Text5, SSAnne6Text6, SSAnne6Text7
@@ -28671,7 +31298,11 @@ SSAnne7_h: ; 0x61889 to 0x61895 (12 bytes) (id=101)
 
     dw $5946 ; objects
 
-INCBIN "baserom.gbc",$61895,$618a7 - $61895
+SSAnne7Script: ; 0x61895
+    call $589b
+    jp $3c3c
+; 0x6189b
+INCBIN "baserom.gbc",$6189b,$c
 
 SSAnne7Texts: ; 0x618a7
     dw SSAnne7Text1, SSAnne7Text2, SSAnne7Text3
@@ -28742,7 +31373,16 @@ SSAnne8_h: ; 0x6196a to 0x61976 (12 bytes) (id=102)
 
     dw $5a60 ; objects
 
-INCBIN "baserom.gbc",$61976,$6198f - $61976
+SSAnne8Script: ; 0x61976
+    call $3c3c
+    ld hl, $59a5
+    ld de, $5989
+    ld a, [$d608]
+    call $3160
+    ld [$d608], a
+    ret
+; 0x61989
+INCBIN "baserom.gbc",$61989,$6
 
 SSAnne8Texts: ; 0x6198f
     dw SSAnne8Text1, SSAnne8Text2, SSAnne8Text3, SSAnne8Text4, SSAnne8Text5, SSAnne8Text6, SSAnne8Text7, SSAnne8Text8, SSAnne8Text9, SSAnne8Text10, SSAnne8Text11
@@ -28847,7 +31487,19 @@ SSAnne9_h: ; 0x61b3f to 0x61b4b (12 bytes) (id=103)
 
     dw $5c8d ; objects
 
-INCBIN "baserom.gbc",$61b4b,$61b6a - $61b4b
+SSAnne9Script: ; 0x61b4b
+    ld a, $1
+    ld [$cf0c], a
+    xor a
+    ld [$cc3c], a
+    ld hl, $5b84
+    ld de, $5b64
+    ld a, [$d609]
+    call $3160
+    ld [$d609], a
+    ret
+; 0x61b64
+INCBIN "baserom.gbc",$61b64,$6
 
 SSAnne9Texts: ; 0x61b6a
     dw SSAnne9Text1, SSAnne9Text2, SSAnne9Text3, SSAnne9Text4, SSAnne9Text5, SSAnne9Text6, SSAnne9Text7, SSAnne9Text8, SSAnne9Text9, SSAnne9Text10, SSAnne9Text11, SSAnne9Text12, SSAnne9Text13
@@ -28994,7 +31646,16 @@ SSAnne10_h: ; 0x61d49 to 0x61d55 (12 bytes) (id=104)
 
     dw $5e75 ; objects
 
-INCBIN "baserom.gbc",$61d55,$61d6e - $61d55
+SSAnne10Script: ; 0x61d55
+    call $3c3c
+    ld hl, $5d84
+    ld de, $5d68
+    ld a, [$d629]
+    call $3160
+    ld [$d629], a
+    ret
+; 0x61d68
+INCBIN "baserom.gbc",$61d68,$6
 
 SSAnne10Texts: ; 0x61d6e
     dw SSAnne10Text1, SSAnne10Text2, SSAnne10Text3, SSAnne10Text4, SSAnne10Text5, SSAnne10Text6, SSAnne10Text7, SSAnne10Text8, SSAnne10Text9, SSAnne10Text10, SSAnne10Text11
@@ -29100,7 +31761,10 @@ UndergroundPathNS_h: ; 0x61f1a to 0x61f26 (12 bytes) (id=119)
 
     dw $5f2a ; objects
 
-INCBIN "baserom.gbc",$61f26,$61f2a - $61f26
+UndergroundPathNSScript: ; 0x61f26
+    jp $3c3c
+; 0x61f29
+INCBIN "baserom.gbc",$61f29,$1
 
 UndergroundPathNSObject: ; 0x61f2a (size=20)
     db $1 ; border tile
@@ -29125,7 +31789,10 @@ UndergroundPathWE_h: ; 0x61f3e to 0x61f4a (12 bytes) (id=121)
 
     dw $5f4e ; objects
 
-INCBIN "baserom.gbc",$61f4a,$61f4e - $61f4a
+UndergroundPathWEScript: ; 0x61f4a
+    jp $3c3c
+; 0x61f4d
+INCBIN "baserom.gbc",$61f4d,$1
 
 UndergroundPathWEObject: ; 0x61f4e (size=20)
     db $1 ; border tile
@@ -29150,7 +31817,10 @@ DiglettsCave_h: ; 0x61f62 to 0x61f6e (12 bytes) (id=197)
 
     dw $5f72 ; objects
 
-INCBIN "baserom.gbc",$61f6e,$61f72 - $61f6e
+DiglettsCaveScript: ; 0x61f6e
+    jp $3c3c
+; 0x61f71
+INCBIN "baserom.gbc",$61f71,$1
 
 DiglettsCaveObject: ; 0x61f72 (size=20)
     db $19 ; border tile
@@ -29178,7 +31848,17 @@ SilphCo11_h: ; 0x620ee to 0x620fa (12 bytes) (id=235)
 
     dw $6380 ; objects
 
-INCBIN "baserom.gbc",$620fa,$622b7 - $620fa
+SilphCo11Script: ; 0x620fa
+    call $6110
+    call $3c3c
+    ld hl, $62c3
+    ld de, $61cf
+    ld a, [$d659]
+    call $3160
+    ld [$d659], a
+    ret
+; 0x62110
+INCBIN "baserom.gbc",$62110,$1a7
 
 SilphCo11Texts: ; 0x622b7
     dw SilphCo11Text1, SilphCo11Text2, SilphCo11Text3, SilphCo11Text4, SilphCo11Text5, SilphCo11Text6
@@ -30382,7 +33062,19 @@ ViridianGym_h: ; 0x74897 to 0x748a3 (12 bytes) (id=45)
 
     dw $4bde ; objects
 
-INCBIN "baserom.gbc",$748a3,$749ec - $748a3
+ViridianGymScript: ; 0x748a3
+    ld hl, $48bf
+    ld de, $48cd
+    call $317f
+    call $3c3c
+    ld hl, $4a08
+    ld de, $48e1
+    ld a, [$d5fb]
+    call $3160
+    ld [$d5fb], a
+    ret
+; 0x748bf
+INCBIN "baserom.gbc",$748bf,$12d
 
 ViridianGymTexts: ; 0x749ec
     dw ViridianGymText1, ViridianGymText2, ViridianGymText3, ViridianGymText4, ViridianGymText5, ViridianGymText6, ViridianGymText7, ViridianGymText8, ViridianGymText9, ViridianGymText10, ViridianGymText11, ViridianGymText12, ViridianGymText13, ViridianGymText14
@@ -30563,7 +33255,13 @@ PewterMart_h: ; 0x74ca1 to 0x74cad (12 bytes) (id=56)
 
     dw $4cda ; objects
 
-INCBIN "baserom.gbc",$74cad,$74cb6 - $74cad
+PewterMartScript: ; 0x74cad
+    call $3c3c
+    ld a, $1
+    ld [$cf0c], a
+    ret
+; 0x74cb6
+INCBIN "baserom.gbc",$74cb6,$0
 
 PewterMartTexts: ; 0x74cb6
     dw PewterMartText1, PewterMartText2, PewterMartText3
@@ -30610,7 +33308,10 @@ UnknownDungeon1_h: ; 0x74d00 to 0x74d0c (12 bytes) (id=228)
 
     dw $4d15 ; objects
 
-INCBIN "baserom.gbc",$74d0c,$74d0f - $74d0c
+UnknownDungeon1Script: ; 0x74d0c
+    jp $3c3c
+; 0x74d0f
+INCBIN "baserom.gbc",$74d0f,$0
 
 UnknownDungeon1Texts: ; 0x74d0f
     dw UnknownDungeon1Text1, UnknownDungeon1Text2, UnknownDungeon1Text3
@@ -30658,7 +33359,14 @@ CeruleanHouse3_h: ; 0x74dfd to 0x74e09 (12 bytes) (id=230)
 
     dw $4ebe ; objects
 
-INCBIN "baserom.gbc",$74e09,$74e15 - $74e09
+CeruleanHouse3Script: ; 0x74e09
+    ld a, $1
+    ld [$cf0c], a
+    dec a
+    ld [$cc3c], a
+    ret
+; 0x74e13
+INCBIN "baserom.gbc",$74e13,$2
 
 CeruleanHouse3Text1: ; 0x74e15
     db $8
@@ -30734,7 +33442,11 @@ FuchsiaHouse1_h: ; 0x7500c to 0x75018 (12 bytes) (id=153)
 
     dw $5031 ; objects
 
-INCBIN "baserom.gbc",$75018,$7501c - $75018
+FuchsiaHouse1Script: ; 0x75018
+    call $3c3c
+    ret
+; 0x7501c
+INCBIN "baserom.gbc",$7501c,$0
 
 FuchsiaHouse1Texts: ; 0x7501c
     dw FuchsiaHouse1Text1, FuchsiaHouse1Text2, FuchsiaHouse1Text3
@@ -30777,7 +33489,11 @@ FuchsiaPokecenter_h: ; 0x75057 to 0x75063 (12 bytes) (id=154)
 
     dw $507d ; objects
 
-INCBIN "baserom.gbc",$75063,$75072 - $75063
+FuchsiaPokecenterScript: ; 0x75063
+    call $22fa
+    jp $3c3c
+; 0x75069
+INCBIN "baserom.gbc",$75069,$9
 
 FuchsiaPokecenterText2:
 FuchsiaPokecenterText1: ; 0x75071 or 0x75072
@@ -30818,7 +33534,10 @@ FuchsiaHouse2_h: ; 0x750a9 to 0x750b5 (12 bytes) (id=155)
 
     dw $5180 ; objects
 
-INCBIN "baserom.gbc",$750b5,$750b8 - $750b5
+FuchsiaHouse2Script: ; 0x750b5
+    jp $3c3c
+; 0x750b8
+INCBIN "baserom.gbc",$750b8,$0
 
 FuchsiaHouse2Texts: ; 0x750b8
     dw FuchsiaHouse2Text1, FuchsiaHouse2Text2, FuchsiaHouse2Text3, FuchsiaHouse2Text4, FuchsiaHouse2Text5
@@ -30923,7 +33642,58 @@ SafariZoneEntrance_h: ; 0x751c1 to 0x751cd (12 bytes) (id=156)
 
     dw $53f5 ; objects
 
-INCBIN "baserom.gbc",$751cd,$752b9 - $751cd
+SafariZoneEntranceScript: ; 0x751cd
+    call $3c3c
+    ld hl, $51d9
+    ld a, [$d61f]
+    jp $3d97
+; 0x751d9
+INCBIN "baserom.gbc",$751d9,$e
+SafariZoneEntranceScript0: ; 0x751e7
+    ld hl, $5221
+    call $34bf
+    ret nc
+    ld a, $3
+    ld [$ff00+$8c], a
+    call $2920
+    ld a, $ff
+    ld [$cd6b], a
+    xor a
+    ld [$ff00+$b4], a
+    ld a, $c
+    ld [$c109], a
+    ld a, [$cd3d]
+    cp $1
+    jr z, .asm_7520f ; 0x75207 $6
+    ld a, $2
+    ld [$d61f], a
+    ret
+.asm_7520f
+    ld a, $10
+    ld c, $1
+    call $52a3
+    ld a, $f0
+    ld [$cd6b], a
+    ld a, $1
+    ld [$d61f], a
+    ret
+; 0x75221
+INCBIN "baserom.gbc",$75221,$75226 - $75221
+SafariZoneEntranceScript1: ; 0x75226
+    call $52b4
+    ret nz
+    xor a
+    ld [$ff00+$b4], a
+    ld [$cd6b], a
+    call $2429
+    ld a, $4
+    ld [$ff00+$8c], a
+    call $2920
+    ld a, $ff
+    ld [$cd6b], a
+    ret
+; 0x75240
+INCBIN "baserom.gbc",$75240,$79
 
 SafariZoneEntranceTexts: ; 0x752b9
     dw SafariZoneEntranceText1, SafariZoneEntranceText2, SafariZoneEntranceText3, SafariZoneEntranceText4, SafariZoneEntranceText5, SafariZoneEntranceText6
@@ -30992,7 +33762,17 @@ FuchsiaGym_h: ; 0x75431 to 0x7543d (12 bytes) (id=157)
 
     dw $5658 ; objects
 
-INCBIN "baserom.gbc",$7543d,$754d5 - $7543d
+FuchsiaGymScript: ; 0x7543d
+    call $5453
+    call $3c3c
+    ld hl, $54eb
+    ld de, $5482
+    ld a, [$d65b]
+    call $3160
+    ld [$d65b], a
+    ret
+; 0x75453
+INCBIN "baserom.gbc",$75453,$82
 
 FuchsiaGymTexts: ; 0x754d5
     dw FuchsiaGymText1, FuchsiaGymText2, FuchsiaGymText3, FuchsiaGymText4, FuchsiaGymText5, FuchsiaGymText6, FuchsiaGymText7, FuchsiaGymText8, FuchsiaGymText9, FuchsiaGymText10, FuchsiaGymText11
@@ -31141,7 +33921,11 @@ FuchsiaMeetingRoom_h: ; 0x756d7 to 0x756e3 (12 bytes) (id=158)
 
     dw $56fc ; objects
 
-INCBIN "baserom.gbc",$756e3,$756e7 - $756e3
+FuchsiaMeetingRoomScript: ; 0x756e3
+    call $3c3c
+    ret
+; 0x756e7
+INCBIN "baserom.gbc",$756e7,$0
 
 FuchsiaMeetingRoomTexts: ; 0x756e7
     dw FuchsiaMeetingRoomText1, FuchsiaMeetingRoomText2, FuchsiaMeetingRoomText3
@@ -31187,7 +33971,49 @@ CinnabarGym_h: ; 0x7573e to 0x7574a (12 bytes) (id=166)
 
     dw $5acc ; objects
 
-INCBIN "baserom.gbc",$7574a,$7589f - $7574a
+CinnabarGymScript: ; 0x7574a
+    call $5759
+    call $3c3c
+    ld hl, $57a6
+    ld a, [$d65e]
+    jp $3d97
+; 0x75759
+INCBIN "baserom.gbc",$75759,$55
+CinnabarGymScript0: ; 0x757ae
+    ld a, [$da38]
+    and a
+    ret z
+    ld [$ff00+$8c], a
+    cp $4
+    jr nz, .asm_757c3 ; 0x757b7 $a
+    ld a, $4
+    ld [$d528], a
+    ld de, $57d7
+    jr .asm_757cb ; 0x757c1 $8
+.asm_757c3
+    ld de, $57da
+    ld a, $1
+    ld [$d528], a
+.asm_757cb
+    call $363a
+    ld a, $1
+    ld [$d65e], a
+    ld [$da39], a
+    ret
+; 0x757d7
+INCBIN "baserom.gbc",$757d7,$757dc - $757d7
+CinnabarGymScript1: ; 0x757dc
+    ld a, [$d730]
+    bit 0, a
+    ret nz
+    xor a
+    ld [$cd6b], a
+    ld a, [$da38]
+    ld [$cc55], a
+    ld [$ff00+$8c], a
+    jp $2920
+; 0x757f1
+INCBIN "baserom.gbc",$757f1,$ae
 
 CinnabarGymTexts: ; 0x7589f
     dw CinnabarGymText1, CinnabarGymText2, CinnabarGymText3, CinnabarGymText4, CinnabarGymText5, CinnabarGymText6, CinnabarGymText7, CinnabarGymText8, CinnabarGymText9
@@ -31406,7 +34232,11 @@ Lab1_h: ; 0x75b80 to 0x75b8c (12 bytes) (id=167)
 
     dw $5bb3 ; objects
 
-INCBIN "baserom.gbc",$75b8c,$75b90 - $75b8c
+Lab1Script: ; 0x75b8c
+    call $3c3c
+    ret
+; 0x75b90
+INCBIN "baserom.gbc",$75b90,$0
 
 Lab1Texts: ; 0x75b90
     dw Lab1Text1, Lab1Text2, Lab1Text3, Lab1Text4, Lab1Text5
@@ -31468,7 +34298,10 @@ Lab2_h: ; 0x75c15 to 0x75c21 (12 bytes) (id=168)
 
     dw $5c45 ; objects
 
-INCBIN "baserom.gbc",$75c21,$75c24 - $75c21
+Lab2Script: ; 0x75c21
+    jp $3c3c
+; 0x75c24
+INCBIN "baserom.gbc",$75c24,$0
 
 Lab2Texts: ; 0x75c24
     dw Lab2Text1, Lab2Text2, Lab2Text3
@@ -31521,7 +34354,10 @@ Lab3_h: ; 0x75c7b to 0x75c87 (12 bytes) (id=169)
 
     dw $5cec ; objects
 
-INCBIN "baserom.gbc",$75c87,$75c8a - $75c87
+Lab3Script: ; 0x75c87
+    jp $3c3c
+; 0x75c8a
+INCBIN "baserom.gbc",$75c8a,$0
 
 Lab3Texts: ; 0x75c8a
     dw Lab3Text1, Lab3Text2, Lab3Text3, Lab3Text4, Lab3Text5
@@ -31597,7 +34433,10 @@ Lab4_h: ; 0x75d25 to 0x75d31 (12 bytes) (id=170)
 
     dw $5df0 ; objects
 
-INCBIN "baserom.gbc",$75d31,$75d6c - $75d31
+Lab4Script: ; 0x75d31
+    jp $3c3c
+; 0x75d34
+INCBIN "baserom.gbc",$75d34,$38
 
 Lab4Text1: ; 0x75d6c
     db $8
@@ -31683,7 +34522,11 @@ CinnabarPokecenter_h: ; 0x75e20 to 0x75e2c (12 bytes) (id=171)
 
     dw $5e46 ; objects
 
-INCBIN "baserom.gbc",$75e2c,$75e3b - $75e2c
+CinnabarPokecenterScript: ; 0x75e2c
+    call $22fa
+    jp $3c3c
+; 0x75e32
+INCBIN "baserom.gbc",$75e32,$9
 
 CinnabarPokecenterText2:
 CinnabarPokecenterText1: ; 0x75e3b
@@ -31724,7 +34567,10 @@ CinnabarMart_h: ; 0x75e72 to 0x75e7e (12 bytes) (id=172)
 
     dw $5e91 ; objects
 
-INCBIN "baserom.gbc",$75e7e,$75e81 - $75e7e
+CinnabarMartScript: ; 0x75e7e
+    jp $3c3c
+; 0x75e81
+INCBIN "baserom.gbc",$75e81,$0
 
 CinnabarMartTexts: ; 0x75e81
     dw CinnabarMartText1, CinnabarMartText2, CinnabarMartText3
@@ -31763,7 +34609,10 @@ CopycatsHouseF1_h: ; 0x75eb7 to 0x75ec3 (12 bytes) (id=175)
 
     dw $5ee3 ; objects
 
-INCBIN "baserom.gbc",$75ec3,$75ec6 - $75ec3
+CopycatsHouseF1Script: ; 0x75ec3
+    jp $3c3c
+; 0x75ec6
+INCBIN "baserom.gbc",$75ec6,$0
 
 CopycatsHouseF1Texts: ; 0x75ec6
     dw CopycatsHouseF1Text1, CopycatsHouseF1Text2, CopycatsHouseF1Text3
@@ -31803,7 +34652,18 @@ CopycatsHouseF1Object: ; 0x75ee3 (size=46)
     EVENT_DISP $4, $7, $3
     EVENT_DISP $4, $1, $7 ; COPYCATS_HOUSE_2F
 
-INCBIN "baserom.gbc",$75f11,$760d6 - $75f11
+INCBIN "baserom.gbc",$75f11,$75f1d - $75f11
+GaryScript: ; 0x75f1d
+    call $3c3c
+    ld hl, $5f31
+    ld a, [$d64c]
+    jp $3d97
+; 0x75f29
+INCBIN "baserom.gbc",$75f29,$1e
+GaryScript0: ; 0x75f47
+    ret
+; 0x75f48
+INCBIN "baserom.gbc",$75f48,$18e
 
 GaryTexts: ; 0x760d6
     dw GaryText1, GaryText2, GaryText3, GaryText4, GaryText5
@@ -31866,7 +34726,18 @@ Loreli_h: ; 0x7616f to 0x7617b (12 bytes) (id=245)
 
     dw $6280 ; objects
 
-INCBIN "baserom.gbc",$7617b,$76251 - $7617b
+LoreliScript: ; 0x7617b
+    call $6191
+    call $3c3c
+    ld hl, $6255
+    ld de, $61bb
+    ld a, [$d64d]
+    call $3160
+    ld [$d64d], a
+    ret
+; 0x76191
+
+INCBIN "baserom.gbc",$76191,$c0
 
 LoreliTexts: ; 0x76251
     dw LoreliText1, LoreliText2
@@ -31915,7 +34786,18 @@ Bruno_h: ; 0x762ca to 0x762d6 (12 bytes) (id=246)
 
     dw $63d7 ; objects
 
-INCBIN "baserom.gbc",$762d6,$763a8 - $762d6
+BrunoScript: ; 0x762d6
+    call $62ec
+    call $3c3c
+    ld hl, $63ac
+    ld de, $6312
+    ld a, [$d64e]
+    call $3160
+    ld [$d64e], a
+    ret
+; 0x762ec
+
+INCBIN "baserom.gbc",$762ec,$bc
 
 BrunoTexts: ; 0x763a8
     dw BrunoText1, BrunoText2
@@ -31964,7 +34846,18 @@ Agatha_h: ; 0x76421 to 0x7642d (12 bytes) (id=247)
 
     dw $6534 ; objects
 
-INCBIN "baserom.gbc",$7642d,$76505 - $7642d
+AgathaScript: ; 0x7642d
+    call $6443
+    call $3c3c
+    ld hl, $6509
+    ld de, $6469
+    ld a, [$d64f]
+    call $3160
+    ld [$d64f], a
+    ret
+; 0x76443
+
+INCBIN "baserom.gbc",$76443,$c2
 
 AgathaTexts: ; 0x76505
     dw AgathaText1, AgathaText2
-- 
cgit v1.2.3


From 843663c1b56245481d17aa53906cb596b5789fe6 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Fri, 13 Jan 2012 14:50:31 -0600
Subject: remove empty INCBINs

hg-commit-id: d867e20aed4a
---
 pokered.asm | 119 ++++++++++++++----------------------------------------------
 1 file changed, 27 insertions(+), 92 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index ba5d87bd..4b79f23a 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -6017,11 +6017,14 @@ ViridianCityScript: ; 0x18ff1
     ld a, [$d5f4]
     jp $3d97
 ; 0x18ffd
+
 INCBIN "baserom.gbc",$18ffd,$8
+
 ViridianCityScript0: ; 0x19005
     call $500b
     jp $503d
 ; 0x1900b
+
 INCBIN "baserom.gbc",$1900b,$d9
 
 ViridianCityTexts: ; 0x190e4
@@ -6291,7 +6294,9 @@ CeruleanCityScript: ; 0x19480
     ld a, [$d60f]
     jp $3d97
 ; 0x1948c
+
 INCBIN "baserom.gbc",$1948c,$3c
+
 CeruleanCityScript0: ; 0x194c8
     ld a, [$d75b]
     bit 7, a
@@ -6357,7 +6362,9 @@ CeruleanCityScript0: ; 0x194c8
     ld [$d60f], a
     ret
 ; 0x1954f
+
 INCBIN "baserom.gbc",$1954f,$19567 - $1954f
+
 CeruleanCityScript1: ; 0x19567
     ld a, [$d730]
     bit 0, a
@@ -6396,6 +6403,7 @@ CeruleanCityScript1: ; 0x19567
     ld [$d60f], a
     ret
 ; 0x195b1
+
 CeruleanCityScript2: ; 0x195b1
     ld a, [$d057]
     cp $ff
@@ -6432,7 +6440,9 @@ CeruleanCityScript2: ; 0x195b1
     ld [$d60f], a
     ret
 ; 0x19600
+
 INCBIN "baserom.gbc",$19600,$19610 - $19600
+
 CeruleanCityScript3: ; 0x19610
     ld a, [$d730]
     bit 0, a
@@ -6617,7 +6627,9 @@ VermilionCityScript: ; 0x197a1
     ld a, [$d62a]
     jp $3d97
 ; 0x197c0
+
 INCBIN "baserom.gbc",$197c0,$26
+
 VermilionCityScript0: ; 0x197e6
     ld a, [$c109]
     and a
@@ -6650,7 +6662,9 @@ VermilionCityScript0: ; 0x197e6
     ld [$d62a], a
     ret
 ; 0x19823
+
 INCBIN "baserom.gbc",$19823,$1985f - $19823
+
 VermilionCityScript1: ; 0x1985f
     ld a, [$cd38]
     and a
@@ -6775,7 +6789,7 @@ CeladonCityScript: ; 0x19956
     res 7, [hl]
     ret
 ; 0x19966
-INCBIN "baserom.gbc",$19966,$0
+
 
 CeladonCityTexts: ; 0x19966
     dw CeladonCityText1, CeladonCityText2, CeladonCityText3, CeladonCityText4, CeladonCityText5, CeladonCityText6, CeladonCityText7, CeladonCityText8, CeladonCityText9, CeladonCityText10, CeladonCityText11, CeladonCityText12, CeladonCityText13, CeladonCityText14, CeladonCityText15, CeladonCityText16, CeladonCityText17, CeladonCityText18
@@ -6877,7 +6891,6 @@ CeladonCityText18: ; 0x19a26
 FuchsiaCityScript: ; 0x19a2b
     jp $3c3c
 ; 0x19a2e
-INCBIN "baserom.gbc",$19a2e,$0
 
 FuchsiaCityTexts: ; 0x19a2e
     dw FuchsiaCityText1, FuchsiaCityText2, FuchsiaCityText3, FuchsiaCityText4, FuchsiaCityText5, FuchsiaCityText6, FuchsiaCityText7, FuchsiaCityText8, FuchsiaCityText9, FuchsiaCityText10, FuchsiaCityText11, FuchsiaCityText12, FuchsiaCityText13, FuchsiaCityText14, FuchsiaCityText15, FuchsiaCityText16, FuchsiaCityText17, FuchsiaCityText18, FuchsiaCityText19, FuchsiaCityText20, FuchsiaCityText21, FuchsiaCityText22, FuchsiaCityText23, FuchsiaCityText24
@@ -7128,7 +7141,7 @@ VermilionHouse3_h: ; 0x19c06 to 0x19c12 (12 bytes) (bank=6) (id=196)
 VermilionHouse3Script: ; 0x19c12
     jp $3c3c
 ; 0x19c15
-INCBIN "baserom.gbc",$19c15,$0
+
 
 VermilionHouse3Texts: ; 0x19c15
     dw VermilionHouse3Text1
@@ -7248,6 +7261,7 @@ SilphCo4Script: ; 0x19d0b
     ld [$d645], a
     ret
 ; 0x19d21
+
 INCBIN "baserom.gbc",$19d21,$7f
 
 SilphCo4Texts: ; 0x19da0
@@ -7341,6 +7355,7 @@ SilphCo5Script: ; 0x19f37
     ld [$d646], a
     ret
 ; 0x19f4d
+
 INCBIN "baserom.gbc",$19f4d,$6f
 
 SilphCo5Texts: ; 0x19fbc
@@ -7458,6 +7473,7 @@ SilphCo6Script: ; 0x1a1a9
     ld [$d647], a
     ret
 ; 0x1a1bf
+
 INCBIN "baserom.gbc",$1a1bf,$37
 
 SilphCo6Texts: ; 0x1a1f6
@@ -7879,6 +7895,7 @@ MonsterNames: ; 421E
 	db "VICTREEBEL"
 
 INCBIN "baserom.gbc",$1c98a,$1ca19 - $1c98a
+
 CinnabarIslandScript: ; 0x1ca19
     call $3c3c
     ld hl, $d126
@@ -7891,7 +7908,9 @@ CinnabarIslandScript: ; 0x1ca19
     ld a, [$d639]
     jp $3d97
 ; 0x1ca34
+
 INCBIN "baserom.gbc",$1ca34,$4
+
 CinnabarIslandScript0: ; 0x1ca38
     ld b, $2b
     call $3493
@@ -7921,6 +7940,7 @@ CinnabarIslandScript0: ; 0x1ca38
     ld [$d639], a
     ret
 ; 0x1ca73
+
 CinnabarIslandScript1: ; 0x1ca73
     ld a, [$cd38]
     and a
@@ -7930,7 +7950,6 @@ CinnabarIslandScript1: ; 0x1ca73
     ld [$d639], a
     ret
 ; 0x1ca81
-INCBIN "baserom.gbc",$1ca81,$0
 
 CinnabarIslandTexts: ; 0x1ca81
     dw CinnabarIslandText1, CinnabarIslandText2, CinnabarIslandText3, CinnabarIslandText4, CinnabarIslandText5, CinnabarIslandText6, CinnabarIslandText7, CinnabarIslandText8
@@ -7961,7 +7980,6 @@ CinnabarIslandText7: ; 0x1caaa
 Route1Script: ; 0x1caaf
     jp $3c3c
 ; 0x1cab2
-INCBIN "baserom.gbc",$1cab2,$0
 
 Route1Texts: ; 0x1cab2
     dw Route1Text1, Route1Text2, Route1Text3
@@ -8684,7 +8702,6 @@ School_h: ; 0x1d540 to 0x1d54c (12 bytes) (bank=7) (id=43)
 SchoolScript: ; 0x1d54c
     jp $3c3c
 ; 0x1d54f
-INCBIN "baserom.gbc",$1d54f,$0
 
 SchoolTexts: ; 0x1d54f
     dw SchoolText1, SchoolText2
@@ -8783,7 +8800,6 @@ PewterHouse1_h: ; 0x1d5e7 to 0x1d5f3 (12 bytes) (bank=7) (id=55)
 PewterHouse1Script: ; 0x1d5f3
     jp $3c3c
 ; 0x1d5f6
-INCBIN "baserom.gbc",$1d5f6,$0
 
 PewterHouse1Texts: ; 0x1d5f6
     dw PewterHouse1Text1, PewterHouse1Text2, PewterHouse1Text3
@@ -8833,7 +8849,6 @@ PewterHouse2_h: ; 0x1d63c to 0x1d648 (12 bytes) (bank=7) (id=57)
 PewterHouse2Script: ; 0x1d648
     jp $3c3c
 ; 0x1d64b
-INCBIN "baserom.gbc",$1d64b,$0
 
 PewterHouse2Texts: ; 0x1d64b
     dw PewterHouse2Text1, PewterHouse2Text2
@@ -8875,7 +8890,6 @@ CeruleanHouseTrashedScript: ; 0x1d685
     call $3c3c
     ret
 ; 0x1d689
-INCBIN "baserom.gbc",$1d689,$0
 
 CeruleanHouseTrashedTexts: ; 0x1d689
     dw CeruleanHouseTrashedText1, CeruleanHouseTrashedText2, CeruleanHouseTrashedText3
@@ -8937,7 +8951,6 @@ CeruleanHouse2_h: ; 0x1d6ea to 0x1d6f6 (12 bytes) (bank=7) (id=63)
 CeruleanHouse2Script: ; 0x1d6f6
     jp $3c3c
 ; 0x1d6f9
-INCBIN "baserom.gbc",$1d6f9,$0
 
 CeruleanHouse2Texts: ; 0x1d6f9
     dw CeruleanHouse2Text1, CeruleanHouse2Text2
@@ -8982,7 +8995,6 @@ BikeShop_h: ; 0x1d730 to 0x1d73c (12 bytes) (bank=7) (id=66)
 BikeShopScript: ; 0x1d73c
     jp $3c3c
 ; 0x1d73f
-INCBIN "baserom.gbc",$1d73f,$0
 
 BikeShopTexts: ; 0x1d73f
     dw BikeShopText1, BikeShopText2, BikeShopText3
@@ -9119,7 +9131,6 @@ LavenderHouse1Script: ; 0x1d8a8
     call $3c3c
     ret
 ; 0x1d8ac
-INCBIN "baserom.gbc",$1d8ac,$0
 
 LavenderHouse1Texts: ; 0x1d8ac
     dw LavenderHouse1Text1, LavenderHouse1Text2, LavenderHouse1Text3, LavenderHouse1Text4, LavenderHouse1Text5, LavenderHouse1Text6
@@ -9235,7 +9246,6 @@ LavenderHouse2Script: ; 0x1d9ae
     call $3c3c
     ret
 ; 0x1d9b2
-INCBIN "baserom.gbc",$1d9b2,$0
 
 LavenderHouse2Texts: ; 0x1d9b2
     dw LavenderHouse2Text1, LavenderHouse2Text2
@@ -9365,7 +9375,6 @@ VermilionHouse1Script: ; 0x1dafc
     call $3c3c
     ret
 ; 0x1db00
-INCBIN "baserom.gbc",$1db00,$0
 
 VermilionHouse1Texts: ; 0x1db00
     dw VermilionHouse1Text1, VermilionHouse1Text2, VermilionHouse1Text3
@@ -9484,7 +9493,6 @@ CeladonMansion5_h: ; 0x1dd2e to 0x1dd3a (12 bytes) (bank=7) (id=132)
 CeladonMansion5Script: ; 0x1dd3a
     jp $3c3c
 ; 0x1dd3d
-INCBIN "baserom.gbc",$1dd3d,$0
 
 CeladonMansion5Texts: ; 0x1dd3d
     dw CeladonMansion5Text1, CeladonMansion5Text2
@@ -9533,7 +9541,6 @@ FuchsiaMart_h: ; 0x1dd7c to 0x1dd88 (12 bytes) (bank=7) (id=152)
 FuchsiaMartScript: ; 0x1dd88
     jp $3c3c
 ; 0x1dd8b
-INCBIN "baserom.gbc",$1dd8b,$0
 
 FuchsiaMartTexts: ; 0x1dd8b
     dw FuchsiaMartText1, FuchsiaMartText2, FuchsiaMartText3
@@ -9578,7 +9585,6 @@ SaffronHouse1_h: ; 0x1ddd1 to 0x1dddd (12 bytes) (bank=7) (id=179)
 SaffronHouse1Script: ; 0x1dddd
     jp $3c3c
 ; 0x1dde0
-INCBIN "baserom.gbc",$1dde0,$0
 
 SaffronHouse1Texts: ; 0x1dde0
     dw SaffronHouse1Text1, SaffronHouse1Text2, SaffronHouse1Text3, SaffronHouse1Text4
@@ -9633,7 +9639,6 @@ SaffronHouse2_h: ; 0x1de30 to 0x1de3c (12 bytes) (bank=7) (id=183)
 SaffronHouse2Script: ; 0x1de3c
     jp $3c3c
 ; 0x1de3f
-INCBIN "baserom.gbc",$1de3f,$0
 
 SaffronHouse2Texts: ; 0x1de3f
     dw SaffronHouse2Text1
@@ -9694,7 +9699,6 @@ DiglettsCaveRoute2Script: ; 0x1deb0
     ld [$d365], a
     jp $3c3c
 ; 0x1deb8
-INCBIN "baserom.gbc",$1deb8,$0
 
 DiglettsCaveRoute2Texts: ; 0x1deb8
     dw DiglettsCaveRoute2Text1
@@ -9732,7 +9736,6 @@ Route2House_h: ; 0x1dee1 to 0x1deed (12 bytes) (bank=7) (id=48)
 Route2HouseScript: ; 0x1deed
     jp $3c3c
 ; 0x1def0
-INCBIN "baserom.gbc",$1def0,$0
 
 Route2HouseTexts: ; 0x1def0
     dw Route2HouseText1, Route2HouseText2
@@ -10125,7 +10128,6 @@ UndergroundPathEntranceRoute8Script: ; 0x1e289
     ld [$d365], a
     jp $3c3c
 ; 0x1e291
-INCBIN "baserom.gbc",$1e291,$0
 
 UndergroundPathEntranceRoute8Texts: ; 0x1e291
     dw UndergroundPathEntranceRoute8Text1
@@ -10291,7 +10293,6 @@ DiglettsCaveEntranceRoute11Script: ; 0x1e5ba
     ld [$d365], a
     ret
 ; 0x1e5c3
-INCBIN "baserom.gbc",$1e5c3,$0
 
 DiglettsCaveEntranceRoute11Texts: ; 0x1e5c3
     dw DiglettsCaveEntranceRoute11Text1
@@ -10331,7 +10332,6 @@ Route16House_h: ; 0x1e5ec to 0x1e5f8 (12 bytes) (bank=7) (id=188)
 Route16HouseScript: ; 0x1e5f8
     jp $3c3c
 ; 0x1e5fb
-INCBIN "baserom.gbc",$1e5fb,$0
 
 Route16HouseTexts: ; 0x1e5fb
     dw Route16HouseText1, Route16HouseText2
@@ -17579,7 +17579,6 @@ SafariZoneRestHouse1Blocks: ; 16
 LavenderTownScript: ; 0x4410b
     jp $3c3c
 ; 0x4410e
-INCBIN "baserom.gbc",$4410e,$0
 
 LavenderTownTexts: ; 0x4410e
     dw LavenderTownText1, LavenderTownText2, LavenderTownText3, LavenderTownText4, LavenderTownText5, LavenderTownText6, LavenderTownText7, LavenderTownText8, LavenderTownText9
@@ -17926,7 +17925,6 @@ SSAnne3_h: ; 0x44926 to 0x44932 (12 bytes) (bank=11) (id=97)
 SSAnne3Script: ; 0x44932
     jp $3c3c
 ; 0x44935
-INCBIN "baserom.gbc",$44935,$0
 
 SSAnne3Texts: ; 0x44935
     dw SSAnne3Text1
@@ -18492,7 +18490,6 @@ SafariZoneEast_h: ; 0x4585f to 0x4586b (12 bytes) (bank=11) (id=217)
 SafariZoneEastScript: ; 0x4586b
     jp $3c3c
 ; 0x4586e
-INCBIN "baserom.gbc",$4586e,$0
 
 SafariZoneEastTexts: ; 0x4586e
     dw SafariZoneEastText1, SafariZoneEastText2, SafariZoneEastText3, SafariZoneEastText4, SafariZoneEastText5, SafariZoneEastText6, SafariZoneEastText7
@@ -18551,7 +18548,6 @@ SafariZoneNorth_h: ; 0x4599f to 0x459ab (12 bytes) (bank=11) (id=218)
 SafariZoneNorthScript: ; 0x459ab
     jp $3c3c
 ; 0x459ae
-INCBIN "baserom.gbc",$459ae,$0
 
 SafariZoneNorthTexts: ; 0x459ae
     dw SafariZoneNorthText1, SafariZoneNorthText2, SafariZoneNorthText3, SafariZoneNorthText4, SafariZoneNorthText5, SafariZoneNorthText6, SafariZoneNorthText7
@@ -18626,7 +18622,6 @@ SafariZoneCenter_h: ; 0x45ba6 to 0x45bb2 (12 bytes) (bank=11) (id=220)
 SafariZoneCenterScript: ; 0x45bb2
     jp $3c3c
 ; 0x45bb5
-INCBIN "baserom.gbc",$45bb5,$0
 
 SafariZoneCenterTexts: ; 0x45bb5
     dw SafariZoneCenterText1, SafariZoneCenterText2, SafariZoneCenterText3
@@ -18685,7 +18680,6 @@ SafariZoneRestHouse1_h: ; 0x45ce1 to 0x45ced (12 bytes) (bank=11) (id=221)
 SafariZoneRestHouse1Script: ; 0x45ced
     jp $3c3c
 ; 0x45cf0
-INCBIN "baserom.gbc",$45cf0,$0
 
 SafariZoneRestHouse1Texts: ; 0x45cf0
     dw SafariZoneRestHouse1Text1, SafariZoneRestHouse1Text2
@@ -18727,7 +18721,6 @@ SafariZoneRestHouse2Script: ; 0x45d2a
     call $3c3c
     ret
 ; 0x45d2e
-INCBIN "baserom.gbc",$45d2e,$0
 
 SafariZoneRestHouse2Texts: ; 0x45d2e
     dw SafariZoneRestHouse2Text1, SafariZoneRestHouse2Text2, SafariZoneRestHouse2Text3
@@ -18774,7 +18767,6 @@ SafariZoneRestHouse3Script: ; 0x45d75
     call $3c3c
     ret
 ; 0x45d79
-INCBIN "baserom.gbc",$45d79,$0
 
 SafariZoneRestHouse3Texts: ; 0x45d79
     dw SafariZoneRestHouse3Text1, SafariZoneRestHouse3Text2, SafariZoneRestHouse3Text3
@@ -18821,7 +18813,6 @@ SafariZoneRestHouse4Script: ; 0x45dc0
     call $3c3c
     ret
 ; 0x45dc4
-INCBIN "baserom.gbc",$45dc4,$0
 
 SafariZoneRestHouse4Texts: ; 0x45dc4
     dw SafariZoneRestHouse4Text1, SafariZoneRestHouse4Text2, SafariZoneRestHouse4Text3
@@ -18867,7 +18858,6 @@ UnknownDungeon2_h: ; 0x45dff to 0x45e0b (12 bytes) (bank=11) (id=226)
 UnknownDungeon2Script: ; 0x45e0b
     jp $3c3c
 ; 0x45e0e
-INCBIN "baserom.gbc",$45e0e,$0
 
 UnknownDungeon2Texts: ; 0x45e0e
     dw UnknownDungeon2Text1, UnknownDungeon2Text2, UnknownDungeon2Text3
@@ -19653,7 +19643,6 @@ CeladonMart3_h: ; 0x48219 to 0x48225 (12 bytes) (bank=12) (id=124)
 CeladonMart3Script: ; 0x48225
     jp $3c3c
 ; 0x48228
-INCBIN "baserom.gbc",$48228,$0
 
 CeladonMart3Texts: ; 0x48228
     dw CeladonMart3Text1, CeladonMart3Text2, CeladonMart3Text3, CeladonMart3Text4, CeladonMart3Text5, CeladonMart3Text6, CeladonMart3Text7, CeladonMart3Text8, CeladonMart3Text9, CeladonMart3Text10, CeladonMart3Text11, CeladonMart3Text12, CeladonMart3Text13, CeladonMart3Text14, CeladonMart3Text15, CeladonMart3Text16, CeladonMart3Text17
@@ -19780,7 +19769,6 @@ CeladonMart4_h: ; 0x4834a to 0x48356 (12 bytes) (bank=12) (id=125)
 CeladonMart4Script: ; 0x48356
     jp $3c3c
 ; 0x48359
-INCBIN "baserom.gbc",$48359,$0
 
 CeladonMart4Texts: ; 0x48359
     dw CeladonMart4Text1, CeladonMart4Text2, CeladonMart4Text3, CeladonMart4Text4
@@ -19955,7 +19943,6 @@ CeladonMansion1_h: ; 0x48688 to 0x48694 (12 bytes) (bank=12) (id=128)
 CeladonMansion1Script: ; 0x48694
     jp $3c3c
 ; 0x48697
-INCBIN "baserom.gbc",$48697,$0
 
 CeladonMansion1Texts: ; 0x48697
     dw CeladonMansion1Text1, CeladonMansion1Text2, CeladonMansion1Text3, CeladonMansion1Text4, CeladonMansion1Text5
@@ -20034,7 +20021,6 @@ CeladonMansion2Script: ; 0x4873a
     call $3c3c
     ret
 ; 0x4873e
-INCBIN "baserom.gbc",$4873e,$0
 
 CeladonMansion2Texts: ; 0x4873e
     dw CeladonMansion2Text1
@@ -20077,7 +20063,6 @@ CeladonMansion3_h: ; 0x48784 to 0x48790 (12 bytes) (bank=12) (id=130)
 CeladonMansion3Script: ; 0x48790
     jp $3c3c
 ; 0x48793
-INCBIN "baserom.gbc",$48793,$0
 
 CeladonMansion3Texts: ; 0x48793
     dw CeladonMansion3Text1, CeladonMansion3Text2, CeladonMansion3Text3, CeladonMansion3Text4, CeladonMansion3Text5, CeladonMansion3Text6, CeladonMansion3Text7, CeladonMansion3Text8
@@ -20169,7 +20154,6 @@ CeladonMansion4_h: ; 0x4885f to 0x4886b (12 bytes) (bank=12) (id=131)
 CeladonMansion4Script: ; 0x4886b
     jp $3c3c
 ; 0x4886e
-INCBIN "baserom.gbc",$4886e,$0
 
 CeladonMansion4Texts: ; 0x4886e
     dw CeladonMansion4Text1
@@ -20736,7 +20720,6 @@ CeladonMart5_h: ; 0x4905d to 0x49069 (12 bytes) (bank=12) (id=136)
 CeladonMart5Script: ; 0x49069
     jp $3c3c
 ; 0x4906c
-INCBIN "baserom.gbc",$4906c,$0
 
 CeladonMart5Texts: ; 0x4906c
     dw CeladonMart5Text1, CeladonMart5Text2, CeladonMart5Text3, CeladonMart5Text4, CeladonMart5Text5
@@ -20836,7 +20819,6 @@ CeladonDinerScript: ; 0x49151
     call $3c3c
     ret
 ; 0x49155
-INCBIN "baserom.gbc",$49155,$0
 
 CeladonDinerTexts: ; 0x49155
     dw CeladonDinerText1, CeladonDinerText2, CeladonDinerText3, CeladonDinerText4, CeladonDinerText5
@@ -20919,7 +20901,6 @@ CeladonHouseScript: ; 0x4920e
     call $3c3c
     ret
 ; 0x49212
-INCBIN "baserom.gbc",$49212,$0
 
 CeladonHouseTexts: ; 0x49212
     dw CeladonHouseText1, CeladonHouseText2, CeladonHouseText3
@@ -20968,7 +20949,6 @@ CeladonHotel_h: ; 0x4925d to 0x49269 (12 bytes) (bank=12) (id=140)
 CeladonHotelScript: ; 0x49269
     jp $3c3c
 ; 0x4926c
-INCBIN "baserom.gbc",$4926c,$0
 
 CeladonHotelTexts: ; 0x4926c
     dw CeladonHotelText1, CeladonHotelText2, CeladonHotelText3
@@ -21166,7 +21146,6 @@ Route11Gate_h: ; 0x49400 to 0x4940c (12 bytes) (id=84)
 Route11GateScript: ; 0x4940c
     jp $3c3c
 ; 0x4940f
-INCBIN "baserom.gbc",$4940f,$0
 
 Route11GateTexts: ; 0x4940f
     dw Route11GateText1
@@ -21303,7 +21282,6 @@ Route12Gate_h: ; 0x494f8 to 0x49504 (12 bytes) (id=87)
 Route12GateScript: ; 0x49504
     jp $3c3c
 ; 0x49507
-INCBIN "baserom.gbc",$49507,$0
 
 Route12GateTexts: ; 0x49507
     dw Route12GateText1
@@ -21348,7 +21326,6 @@ Route12GateUpstairs_h: ; 0x49554 to 0x49560 (12 bytes) (id=195)
 Route12GateUpstairsScript: ; 0x49560
     jp $3c3f
 ; 0x49563
-INCBIN "baserom.gbc",$49563,$0
 
 Route12GateUpstairsTexts: ; 0x49563
     dw Route12GateUpstairsText1, Route12GateUpstairsText2, Route12GateUpstairsText3
@@ -21423,7 +21400,6 @@ Route15Gate_h: ; 0x495f6 to 0x49602 (12 bytes) (id=184)
 Route15GateScript: ; 0x49602
     jp $3c3c
 ; 0x49605
-INCBIN "baserom.gbc",$49605,$0
 
 Route15GateTexts: ; 0x49605
     dw Route15GateText1
@@ -21576,7 +21552,6 @@ Route16GateUpstairs_h: ; 0x497ff to 0x4980b (12 bytes) (id=187)
 Route16GateUpstairsScript: ; 0x4980b
     jp $3c3f
 ; 0x4980e
-INCBIN "baserom.gbc",$4980e,$0
 
 Route16GateUpstairsTexts: ; 0x4980e
     dw Route16GateUpstairsText1, Route16GateUpstairsText2, Route16GateUpstairsText3, Route16GateUpstairsText4
@@ -21734,7 +21709,6 @@ Route18GateHeader_h: ; 0x49969 to 0x49975 (12 bytes) (id=191)
 Route18GateHeaderScript: ; 0x49975
     jp $3c3f
 ; 0x49978
-INCBIN "baserom.gbc",$49978,$0
 
 Route18GateHeaderTexts: ; 0x49978
     dw Route18GateHeaderText1, Route18GateHeaderText2, Route18GateHeaderText3
@@ -22080,7 +22054,6 @@ SafariZoneWest_h: ; 0x4a1a9 to 0x4a1b5 (12 bytes) (id=219)
 SafariZoneWestScript: ; 0x4a1b5
     jp $3c3c
 ; 0x4a1b8
-INCBIN "baserom.gbc",$4a1b8,$0
 
 SafariZoneWestTexts: ; 0x4a1b8
     dw SafariZoneWestText1, SafariZoneWestText2, SafariZoneWestText3, SafariZoneWestText4, SafariZoneWestText5, SafariZoneWestText6, SafariZoneWestText7, SafariZoneWestText8
@@ -22150,7 +22123,6 @@ SafariZoneSecretHouse_h: ; 0x4a30b to 0x4a317 (12 bytes) (id=222)
 SafariZoneSecretHouseScript: ; 0x4a317
     jp $3c3c
 ; 0x4a31a
-INCBIN "baserom.gbc",$4a31a,$0
 
 SafariZoneSecretHouseTexts: ; 0x4a31a
     dw SafariZoneSecretHouseText1
@@ -22337,7 +22309,6 @@ BattleCenterMScript: ; 0x4fd10
     ld [$c119], a
     ret
 ; 0x4fd4c
-INCBIN "baserom.gbc",$4fd4c,$0
 
 BattleCenterMTexts: ; 0x4fd4c
     dw BattleCenterMText1
@@ -22370,7 +22341,6 @@ TradeCenterM_h: ; 0x4fd71 to 0x4fd7d (12 bytes) (id=240)
 TradeCenterMScript: ; 0x4fd7d
     jp $7d10
 ; 0x4fd80
-INCBIN "baserom.gbc",$4fd80,$0
 
 TradeCenterMTexts: ; 0x4fd80
     dw TradeCenterMText1
@@ -22817,7 +22787,6 @@ IndigoPlateau_h: ; 0x5091e to 0x50935 (23 bytes) (id=9)
 IndigoPlateauScript: ; 0x50935
     ret
 ; 0x50936
-INCBIN "baserom.gbc",$50936,$0
 
 IndigoPlateauObject: ; 0x50936 (size=20)
     db $e ; border tile
@@ -22931,7 +22900,6 @@ SaffronCityBlocks: ; 360
 SaffronCityScript: ; 0x50c00
     jp $3c3c
 ; 0x50c03
-INCBIN "baserom.gbc",$50c03,$0
 
 SaffronCityTexts: ; 0x50c03
     dw SaffronCityText1, SaffronCityText2, SaffronCityText3, SaffronCityText4, SaffronCityText5, SaffronCityText6, SaffronCityText7, SaffronCityText8, SaffronCityText9, SaffronCityText10, SaffronCityText11, SaffronCityText12, SaffronCityText13, SaffronCityText14, SaffronCityText15, SaffronCityText16, SaffronCityText17, SaffronCityText18, SaffronCityText19, SaffronCityText20, SaffronCityText21, SaffronCityText22, SaffronCityText23, SaffronCityText24, SaffronCityText25
@@ -25078,7 +25046,6 @@ Route4Text6: ; 0x556ad
 Route5Script: ; 0x556b2
     jp $3c3c
 ; 0x556b5
-INCBIN "baserom.gbc",$556b5,$0
 
 Route5Texts: ; 0x556b5
     dw Route5Text1
@@ -25654,7 +25621,6 @@ VermilionHouse2_h: ; 0x56064 to 0x56070 (12 bytes) (id=163)
 VermilionHouse2Script: ; 0x56070
     jp $3c3c
 ; 0x56073
-INCBIN "baserom.gbc",$56073,$0
 
 VermilionHouse2Texts: ; 0x56073
     dw VermilionHouse2Text1
@@ -25718,7 +25684,6 @@ CeladonMart2_h: ; 0x560e9 to 0x560f5 (12 bytes) (id=123)
 CeladonMart2Script: ; 0x560f5
     jp $3c3c
 ; 0x560f8
-INCBIN "baserom.gbc",$560f8,$0
 
 CeladonMart2Texts: ; 0x560f8
     dw CeladonMart2Text1, CeladonMart2Text2, CeladonMart2Text3, CeladonMart2Text4, CeladonMart2Text5
@@ -25771,7 +25736,6 @@ FuchsiaHouse3_h: ; 0x56170 to 0x5617c (12 bytes) (id=164)
 FuchsiaHouse3Script: ; 0x5617c
     jp $3c3c
 ; 0x5617f
-INCBIN "baserom.gbc",$5617f,$0
 
 FuchsiaHouse3Texts: ; 0x5617f
     dw FuchsiaHouse3Text1
@@ -25837,7 +25801,6 @@ DayCareM_h: ; 0x56243 to 0x5624f (12 bytes) (id=72)
 DayCareMScript: ; 0x5624f
     jp $3c3c
 ; 0x56252
-INCBIN "baserom.gbc",$56252,$0
 
 DayCareMTexts: ; 0x56252
     dw DayCareMText1
@@ -25927,7 +25890,6 @@ Route12House_h: ; 0x56473 to 0x5647f (12 bytes) (id=189)
 Route12HouseScript: ; 0x5647f
     jp $3c3c
 ; 0x56482
-INCBIN "baserom.gbc",$56482,$0
 
 Route12HouseTexts: ; 0x56482
     dw Route12HouseText1
@@ -27859,7 +27821,6 @@ MuseumF1Script0: ; 0x5c10d
 MuseumF1Script1: ; 0x5c12a
     ret
 ; 0x5c12b
-INCBIN "baserom.gbc",$5c12b,$0
 
 MuseumF1Texts: ; 0x5c12b
     dw MuseumF1Text1, MuseumF1Text2, MuseumF1Text3, MuseumF1Text4, MuseumF1Text5
@@ -28061,7 +28022,6 @@ MuseumF2_h: ; 0x5c30b to 0x5c317 (12 bytes) (id=53)
 MuseumF2Script: ; 0x5c317
     jp $3c3c
 ; 0x5c31a
-INCBIN "baserom.gbc",$5c31a,$0
 
 MuseumF2Texts: ; 0x5c31a
     dw MuseumF2Text1, MuseumF2Text2, MuseumF2Text3, MuseumF2Text4, MuseumF2Text5, MuseumF2Text6, MuseumF2Text7
@@ -28542,7 +28502,6 @@ CeruleanMart_h: ; 0x5c889 to 0x5c895 (12 bytes) (id=67)
 CeruleanMartScript: ; 0x5c895
     jp $3c3c
 ; 0x5c898
-INCBIN "baserom.gbc",$5c898,$0
 
 CeruleanMartTexts: ; 0x5c898
     dw CeruleanMartText1, CeruleanMartText2, CeruleanMartText3
@@ -28631,7 +28590,6 @@ LavenderMart_h: ; 0x5c920 to 0x5c92c (12 bytes) (id=150)
 LavenderMartScript: ; 0x5c92c
     jp $3c3c
 ; 0x5c92f
-INCBIN "baserom.gbc",$5c92f,$0
 
 LavenderMartTexts: ; 0x5c92f
     dw LavenderMartText1, LavenderMartText2, LavenderMartText3
@@ -28730,7 +28688,6 @@ VermilionMart_h: ; 0x5c9d5 to 0x5c9e1 (12 bytes) (id=91)
 VermilionMartScript: ; 0x5c9e1
     jp $3c3c
 ; 0x5c9e4
-INCBIN "baserom.gbc",$5c9e4,$0
 
 VermilionMartTexts: ; 0x5c9e4
     dw VermilionMartText1, VermilionMartText2, VermilionMartText3
@@ -28744,7 +28701,6 @@ VermilionMartText3: ; 0x5c9ef
     TX_FAR _VermilionMartText3
     db $50
 
-INCBIN "baserom.gbc",$5c9f4,$0
 
 VermilionMartObject: ; 0x5c9f4 (size=38)
     db $0 ; border tile
@@ -28923,7 +28879,6 @@ CopycatsHouseF2_h: ; 0x5cc65 to 0x5cc71 (12 bytes) (id=176)
 CopycatsHouseF2Script: ; 0x5cc71
     jp $3c3c
 ; 0x5cc74
-INCBIN "baserom.gbc",$5cc74,$0
 
 CopycatsHouseF2Texts: ; 0x5cc74
     dw CopycatsHouseF2Text1, CopycatsHouseF2Text2, CopycatsHouseF2Text3, CopycatsHouseF2Text4, CopycatsHouseF2Text5, CopycatsHouseF2Text6, CopycatsHouseF2Text7
@@ -29432,7 +29387,6 @@ SaffronMart_h: ; 0x5d3fd to 0x5d409 (12 bytes) (id=180)
 SaffronMartScript: ; 0x5d409
     jp $3c3c
 ; 0x5d40c
-INCBIN "baserom.gbc",$5d40c,$0
 
 SaffronMartTexts: ; 0x5d40c
     dw SaffronMartText1, SaffronMartText2, SaffronMartText3
@@ -29485,7 +29439,6 @@ SilphCo1Script: ; 0x5d44e
     ld a, $15
     jp $3e6d
 ; 0x5d469
-INCBIN "baserom.gbc",$5d469,$0
 
 SilphCo1Texts: ; 0x5d469
     dw SilphCo1Text1
@@ -29576,7 +29529,6 @@ ViridianForestexit_h: ; 0x5d57b to 0x5d587 (12 bytes) (id=47)
 ViridianForestexitScript: ; 0x5d587
     jp $3c3c
 ; 0x5d58a
-INCBIN "baserom.gbc",$5d58a,$0
 
 ViridianForestexitTexts: ; 0x5d58a
     dw ViridianForestexitText1, ViridianForestexitText2
@@ -29621,7 +29573,6 @@ Route2Gate_h: ; 0x5d5c8 to 0x5d5d4 (12 bytes) (id=49)
 Route2GateScript: ; 0x5d5d4
     jp $3c3c
 ; 0x5d5d7
-INCBIN "baserom.gbc",$5d5d7,$0
 
 Route2GateTexts: ; 0x5d5d7
     dw Route2GateText1, Route2GateText2
@@ -29692,7 +29643,6 @@ ViridianForestEntrance_h: ; 0x5d650 to 0x5d65c (12 bytes) (id=50)
 ViridianForestEntranceScript: ; 0x5d65c
     jp $3c3c
 ; 0x5d65f
-INCBIN "baserom.gbc",$5d65f,$0
 
 ViridianForestEntranceTexts: ; 0x5d65f
     dw ViridianForestEntranceText1, ViridianForestEntranceText2
@@ -29784,7 +29734,6 @@ UndergroundTunnelEntranceRoute6Script: ; 0x5d6ef
     ld [$d365], a
     jp $3c3c
 ; 0x5d6f7
-INCBIN "baserom.gbc",$5d6f7,$0
 
 UndergroundTunnelEntranceRoute6Texts: ; 0x5d6f7
     dw UndergroundTunnelEntranceRoute6Text1
@@ -29826,7 +29775,6 @@ UndergroundPathEntranceRoute7Script: ; 0x5d72c
     ld [$d365], a
     jp $3c3c
 ; 0x5d734
-INCBIN "baserom.gbc",$5d734,$0
 
 UndergroundPathEntranceRoute7Texts: ; 0x5d734
     dw UndergroundPathEntranceRoute7Text1
@@ -30046,7 +29994,6 @@ PokemonTower1_h: ; 0x60420 to 0x6042c (12 bytes) (id=142)
 PokemonTower1Script: ; 0x6042c
     jp $3c3c
 ; 0x6042f
-INCBIN "baserom.gbc",$6042f,$0
 
 PokemonTower1Texts: ; 0x6042f
     dw PokemonTower1Text1, PokemonTower1Text2, PokemonTower1Text3, PokemonTower1Text4, PokemonTower1Text5
@@ -30662,7 +30609,6 @@ CeladonMart1_h: ; 0x60f7a to 0x60f86 (12 bytes) (id=122)
 CeladonMart1Script: ; 0x60f86
     jp $3c3c
 ; 0x60f89
-INCBIN "baserom.gbc",$60f89,$0
 
 CeladonMart1Texts: ; 0x60f89
     dw CeladonMart1Text1, CeladonMart1Text2, CeladonMart1Text3
@@ -30835,7 +30781,6 @@ SSAnne1Script: ; 0x61265
     call $3c3c
     ret
 ; 0x61269
-INCBIN "baserom.gbc",$61269,$0
 
 SSAnne1Texts: ; 0x61269
     dw SSAnne1Text1, SSAnne1Text2
@@ -30848,7 +30793,6 @@ SSAnne1Text2: ; 0x61272
     TX_FAR _SSAnne1Text2
     db $50
 
-INCBIN "baserom.gbc",$61277,$0
 
 SSAnne1Object: ; 0x61277 (size=104)
     db $c ; border tile
@@ -31161,7 +31105,6 @@ SSAnne5Text3: ; 0x616f4
     TX_FAR _SSAnne5Text3
     db $50
 
-INCBIN "baserom.gbc",$616f9,$0
 
 SSAnne5Text4: ; 0x616f9
     db $08 ; asm
@@ -31214,7 +31157,6 @@ SSAnne6Script: ; 0x617b3
     call $3c3c
     ret
 ; 0x617b7
-INCBIN "baserom.gbc",$617b7,$0
 
 SSAnne6Texts: ; 0x617b7
     dw SSAnne6Text1, SSAnne6Text2, SSAnne6Text3, SSAnne6Text4, SSAnne6Text5, SSAnne6Text6, SSAnne6Text7
@@ -31243,7 +31185,6 @@ SSAnne6Text6: ; 0x617de
     TX_FAR _SSAnne6Text6
     db $50
 
-INCBIN "baserom.gbc",$617e3,$0
 
 SSAnne6Text7: ; 0x617e3
     db $08 ; asm
@@ -33261,7 +33202,6 @@ PewterMartScript: ; 0x74cad
     ld [$cf0c], a
     ret
 ; 0x74cb6
-INCBIN "baserom.gbc",$74cb6,$0
 
 PewterMartTexts: ; 0x74cb6
     dw PewterMartText1, PewterMartText2, PewterMartText3
@@ -33311,7 +33251,6 @@ UnknownDungeon1_h: ; 0x74d00 to 0x74d0c (12 bytes) (id=228)
 UnknownDungeon1Script: ; 0x74d0c
     jp $3c3c
 ; 0x74d0f
-INCBIN "baserom.gbc",$74d0f,$0
 
 UnknownDungeon1Texts: ; 0x74d0f
     dw UnknownDungeon1Text1, UnknownDungeon1Text2, UnknownDungeon1Text3
@@ -33446,7 +33385,6 @@ FuchsiaHouse1Script: ; 0x75018
     call $3c3c
     ret
 ; 0x7501c
-INCBIN "baserom.gbc",$7501c,$0
 
 FuchsiaHouse1Texts: ; 0x7501c
     dw FuchsiaHouse1Text1, FuchsiaHouse1Text2, FuchsiaHouse1Text3
@@ -33537,7 +33475,6 @@ FuchsiaHouse2_h: ; 0x750a9 to 0x750b5 (12 bytes) (id=155)
 FuchsiaHouse2Script: ; 0x750b5
     jp $3c3c
 ; 0x750b8
-INCBIN "baserom.gbc",$750b8,$0
 
 FuchsiaHouse2Texts: ; 0x750b8
     dw FuchsiaHouse2Text1, FuchsiaHouse2Text2, FuchsiaHouse2Text3, FuchsiaHouse2Text4, FuchsiaHouse2Text5
@@ -33925,7 +33862,6 @@ FuchsiaMeetingRoomScript: ; 0x756e3
     call $3c3c
     ret
 ; 0x756e7
-INCBIN "baserom.gbc",$756e7,$0
 
 FuchsiaMeetingRoomTexts: ; 0x756e7
     dw FuchsiaMeetingRoomText1, FuchsiaMeetingRoomText2, FuchsiaMeetingRoomText3
@@ -34236,7 +34172,6 @@ Lab1Script: ; 0x75b8c
     call $3c3c
     ret
 ; 0x75b90
-INCBIN "baserom.gbc",$75b90,$0
 
 Lab1Texts: ; 0x75b90
     dw Lab1Text1, Lab1Text2, Lab1Text3, Lab1Text4, Lab1Text5
@@ -34301,7 +34236,6 @@ Lab2_h: ; 0x75c15 to 0x75c21 (12 bytes) (id=168)
 Lab2Script: ; 0x75c21
     jp $3c3c
 ; 0x75c24
-INCBIN "baserom.gbc",$75c24,$0
 
 Lab2Texts: ; 0x75c24
     dw Lab2Text1, Lab2Text2, Lab2Text3
@@ -34357,7 +34291,6 @@ Lab3_h: ; 0x75c7b to 0x75c87 (12 bytes) (id=169)
 Lab3Script: ; 0x75c87
     jp $3c3c
 ; 0x75c8a
-INCBIN "baserom.gbc",$75c8a,$0
 
 Lab3Texts: ; 0x75c8a
     dw Lab3Text1, Lab3Text2, Lab3Text3, Lab3Text4, Lab3Text5
@@ -34570,7 +34503,6 @@ CinnabarMart_h: ; 0x75e72 to 0x75e7e (12 bytes) (id=172)
 CinnabarMartScript: ; 0x75e7e
     jp $3c3c
 ; 0x75e81
-INCBIN "baserom.gbc",$75e81,$0
 
 CinnabarMartTexts: ; 0x75e81
     dw CinnabarMartText1, CinnabarMartText2, CinnabarMartText3
@@ -34612,7 +34544,6 @@ CopycatsHouseF1_h: ; 0x75eb7 to 0x75ec3 (12 bytes) (id=175)
 CopycatsHouseF1Script: ; 0x75ec3
     jp $3c3c
 ; 0x75ec6
-INCBIN "baserom.gbc",$75ec6,$0
 
 CopycatsHouseF1Texts: ; 0x75ec6
     dw CopycatsHouseF1Text1, CopycatsHouseF1Text2, CopycatsHouseF1Text3
@@ -34653,16 +34584,20 @@ CopycatsHouseF1Object: ; 0x75ee3 (size=46)
     EVENT_DISP $4, $1, $7 ; COPYCATS_HOUSE_2F
 
 INCBIN "baserom.gbc",$75f11,$75f1d - $75f11
+
 GaryScript: ; 0x75f1d
     call $3c3c
     ld hl, $5f31
     ld a, [$d64c]
     jp $3d97
 ; 0x75f29
+
 INCBIN "baserom.gbc",$75f29,$1e
+
 GaryScript0: ; 0x75f47
     ret
 ; 0x75f48
+
 INCBIN "baserom.gbc",$75f48,$18e
 
 GaryTexts: ; 0x760d6
-- 
cgit v1.2.3


From 1ecbd92a72ab5b18e6ae1ceb66bc211e1d33f840 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Fri, 13 Jan 2012 14:51:14 -0600
Subject: remove extra newlines

hg-commit-id: 4f3352aac87f
---
 pokered.asm | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index 4b79f23a..b0d8a92e 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -6790,7 +6790,6 @@ CeladonCityScript: ; 0x19956
     ret
 ; 0x19966
 
-
 CeladonCityTexts: ; 0x19966
     dw CeladonCityText1, CeladonCityText2, CeladonCityText3, CeladonCityText4, CeladonCityText5, CeladonCityText6, CeladonCityText7, CeladonCityText8, CeladonCityText9, CeladonCityText10, CeladonCityText11, CeladonCityText12, CeladonCityText13, CeladonCityText14, CeladonCityText15, CeladonCityText16, CeladonCityText17, CeladonCityText18
 
@@ -7142,7 +7141,6 @@ VermilionHouse3Script: ; 0x19c12
     jp $3c3c
 ; 0x19c15
 
-
 VermilionHouse3Texts: ; 0x19c15
     dw VermilionHouse3Text1
 
@@ -19526,7 +19524,6 @@ Route7Text1: ; 0x48157
     TX_FAR _Route7Text1
     db $50
 
-
 RedsHouse1F_h: ; 415C
 	db $01 ; tileset
 	db $04,$04 ; dimensions
@@ -28559,7 +28556,6 @@ LavenderPokecenterText3: ; 0x5c8ef
     TX_FAR _LavenderPokecenterText3
     db $50
 
-
 LavenderPokecenterObject: ; 0x5c8f4 (size=44)
     db $0 ; border tile
 
@@ -28696,12 +28692,10 @@ VermilionMartText2: ; 0x5c9ea
     TX_FAR _VermilionMartText2
     db $50
 
-
 VermilionMartText3: ; 0x5c9ef
     TX_FAR _VermilionMartText3
     db $50
 
-
 VermilionMartObject: ; 0x5c9f4 (size=38)
     db $0 ; border tile
 
@@ -30793,7 +30787,6 @@ SSAnne1Text2: ; 0x61272
     TX_FAR _SSAnne1Text2
     db $50
 
-
 SSAnne1Object: ; 0x61277 (size=104)
     db $c ; border tile
 
@@ -31105,7 +31098,6 @@ SSAnne5Text3: ; 0x616f4
     TX_FAR _SSAnne5Text3
     db $50
 
-
 SSAnne5Text4: ; 0x616f9
     db $08 ; asm
     ld hl, $56d1
@@ -31185,7 +31177,6 @@ SSAnne6Text6: ; 0x617de
     TX_FAR _SSAnne6Text6
     db $50
 
-
 SSAnne6Text7: ; 0x617e3
     db $08 ; asm
     ld hl, $5807
-- 
cgit v1.2.3


From bb070f8ddda63f35bdb1c5549a57f7a4a9883162 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Fri, 13 Jan 2012 15:08:55 -0600
Subject: generous newlines around INCBINs

hg-commit-id: e4779096e488
---
 pokered.asm | 195 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 195 insertions(+)

diff --git a/pokered.asm b/pokered.asm
index b0d8a92e..3b073196 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -6169,6 +6169,7 @@ ViridianCityText14:
 INCBIN "baserom.gbc",$19232,$19237 - $19232
 
 INCBIN "baserom.gbc",$19237,$19251 - $19237
+
 PewterCityScript0: ; 0x19251
     xor a
     ld [$d619], a
@@ -6177,6 +6178,7 @@ PewterCityScript0: ; 0x19251
     call $525e
     ret
 ; 0x1925e
+
 INCBIN "baserom.gbc",$1925e,$12d
 
 PewterCityTexts: ; 0x1938b
@@ -8034,7 +8036,9 @@ OaksLabScript: ; 0x1cb0e
     ld a, [$d5f0]
     jp $3d97
 ; 0x1cb28
+
 INCBIN "baserom.gbc",$1cb28,$26
+
 OaksLabScript0: ; 0x1cb4e
     ld a, [$d74b]
     bit 7, a
@@ -8052,6 +8056,7 @@ OaksLabScript0: ; 0x1cb4e
     ld [$d5f0], a
     ret
 ; 0x1cb6e
+
 OaksLabScript1: ; 0x1cb6e
     ld a, $8
     ld [$ff00+$8c], a
@@ -8061,7 +8066,9 @@ OaksLabScript1: ; 0x1cb6e
     ld [$d5f0], a
     ret
 ; 0x1cb7e
+
 INCBIN "baserom.gbc",$1cb7e,$1cb82 - $1cb7e
+
 OaksLabScript2: ; 0x1cb82
     ld a, [$d730]
     bit 0, a
@@ -8078,6 +8085,7 @@ OaksLabScript2: ; 0x1cb82
     ld [$d5f0], a
     ret
 ; 0x1cba2
+
 OaksLabScript3: ; 0x1cba2
     call Delay3
     ld hl, $ccd3
@@ -8100,7 +8108,9 @@ OaksLabScript3: ; 0x1cba2
     ld [$d5f0], a
     ret
 ; 0x1cbcf
+
 INCBIN "baserom.gbc",$1cbcf,$1cbd2 - $1cbcf
+
 OaksLabScript4: ; 0x1cbd2
     ld a, [$cd38]
     and a
@@ -8122,6 +8132,7 @@ OaksLabScript4: ; 0x1cbd2
     ld [$d5f0], a
     ret
 ; 0x1cbfd
+
 OaksLabScript5: ; 0x1cbfd
     ld a, $fc
     ld [$cd6b], a
@@ -8148,6 +8159,7 @@ OaksLabScript5: ; 0x1cbfd
     ld [$d5f0], a
     ret
 ; 0x1cc36
+
 OaksLabScript6: ; 0x1cc36
     ld a, [$d361]
     cp $6
@@ -8177,6 +8189,7 @@ OaksLabScript6: ; 0x1cc36
     ld [$d5f0], a
     ret
 ; 0x1cc72
+
 OaksLabScript7: ; 0x1cc72
     ld a, [$cd38]
     and a
@@ -8186,6 +8199,7 @@ OaksLabScript7: ; 0x1cc72
     ld [$d5f0], a
     ret
 ; 0x1cc80
+
 INCBIN "baserom.gbc",$1cc80,$402
 
 OaksLabTexts: ; 0x1d082
@@ -8615,7 +8629,9 @@ ViridianMartScript: ; 0x1d46e
     ld a, [$d60d]
     jp $3d97
 ; 0x1d47d
+
 INCBIN "baserom.gbc",$1d47d,$1e
+
 ViridianMartScript0: ; 0x1d49b
     call $2429
     ld a, $4
@@ -8631,7 +8647,9 @@ ViridianMartScript0: ; 0x1d49b
     ld [$d60d], a
     ret
 ; 0x1d4bb
+
 INCBIN "baserom.gbc",$1d4bb,$1d4c0 - $1d4bb
+
 ViridianMartScript1: ; 0x1d4c0
     ld a, [$cd38]
     and a
@@ -8738,6 +8756,7 @@ ViridianHouse_h: ; 0x1d57d to 0x1d589 (12 bytes) (bank=7) (id=44)
     dw $55bb ; objects
 
 INCBIN "baserom.gbc",$1d589,$1d58a - $1d589
+
 ViridianHouseScript: ; 0x1d58a
     jp $3c3c
 ; 0x1d58d
@@ -9300,6 +9319,7 @@ NameRater_h: ; 0x1da06 to 0x1da12 (12 bytes) (bank=7) (id=229)
 NameRaterScript: ; 0x1da12
     jp $3c3c
 ; 0x1da15
+
 INCBIN "baserom.gbc",$1da15,$41
 
 NameRaterText1: ; 0x1da56
@@ -9781,7 +9801,9 @@ Route5GateScript: ; 0x1df33
     ld hl, $5f3f
     jp $3d97
 ; 0x1df3f
+
 INCBIN "baserom.gbc",$1df3f,$11
+
 Route5GateScript0: ; 0x1df50
     ld a, [$d728]
     bit 6, a
@@ -9814,6 +9836,7 @@ Route5GateScript0: ; 0x1df50
     set 6, [hl]
     ret
 ; 0x1df8f
+
 INCBIN "baserom.gbc",$1df8f,$15
 
 Route5GateTexts: ; 0x1dfa4
@@ -9903,7 +9926,9 @@ Route6GateScript: ; 0x1e03d
     call $3d97
     ret
 ; 0x1e04a
+
 INCBIN "baserom.gbc",$1e04a,$4
+
 Route6GateScript0: ; 0x1e04e
     ld a, [$d728]
     bit 6, a
@@ -9935,6 +9960,7 @@ Route6GateScript0: ; 0x1e04e
     ld [$ff00+$8c], a
     jp $2920
 ; 0x1e08c
+
 INCBIN "baserom.gbc",$1e08c,$2c
 
 Route6GateTexts: ; 0x1e0b8
@@ -9978,7 +10004,9 @@ Route7GateScript: ; 0x1e100
     call $3d97
     ret
 ; 0x1e10d
+
 INCBIN "baserom.gbc",$1e10d,$1b
+
 Route7GateScript0: ; 0x1e128
     ld a, [$d728]
     bit 6, a
@@ -10011,6 +10039,7 @@ Route7GateScript0: ; 0x1e128
     set 6, [hl]
     ret
 ; 0x1e167
+
 INCBIN "baserom.gbc",$1e167,$18
 
 Route7GateTexts: ; 0x1e17f
@@ -10053,7 +10082,9 @@ Route8GateScript: ; 0x1e1c7
     ld a, [$d637]
     jp $3d97
 ; 0x1e1d3
+
 INCBIN "baserom.gbc",$1e1d3,$1b
+
 Route8GateScript0: ; 0x1e1ee
     ld a, [$d728]
     bit 6, a
@@ -10171,6 +10202,7 @@ PowerPlantScript: ; 0x1e2c6
     ld [$d663], a
     ret
 ; 0x1e2d9
+
 INCBIN "baserom.gbc",$1e2d9,$6
 
 PowerPlantTexts: ; 0x1e2df
@@ -10407,7 +10439,9 @@ Route22GateScript: ; 0x1e683
     ld [$d365], a
     ret
 ; 0x1e69e
+
 INCBIN "baserom.gbc",$1e69e,$6
+
 Route22GateScript0: ; 0x1e6a4
     ld hl, $66b5
     call $34bf
@@ -10418,7 +10452,9 @@ Route22GateScript0: ; 0x1e6a4
     ld [$ff00+$8c], a
     jp $2920
 ; 0x1e6b5
+
 INCBIN "baserom.gbc",$1e6b5,$1e6cd - $1e6b5
+
 Route22GateScript1: ; 0x1e6cd
     ld a, [$cd38]
     and a
@@ -10492,10 +10528,13 @@ BillsHouseScript: ; 0x1e76a
     ld hl, $6776
     jp $3d97
 ; 0x1e776
+
 INCBIN "baserom.gbc",$1e776,$c
+
 BillsHouseScript0: ; 0x1e782
     ret
 ; 0x1e783
+
 INCBIN "baserom.gbc",$1e783,$b1
 
 BillsHouseTexts: ; 0x1e834
@@ -17635,6 +17674,7 @@ ViridianPokeCenterScript: ; 0x4425d
     call $22fa
     jp $3c3c
 ; 0x44263
+
 INCBIN "baserom.gbc",$44263,$9
 
 ViridianPokeCenterText2:
@@ -17737,6 +17777,7 @@ RockTunnel1Script: ; 0x444dc
     ld [$d621], a
     ret
 ; 0x444ef
+
 INCBIN "baserom.gbc",$444ef,$6
 
 RockTunnel1Texts: ; 0x444f5
@@ -17875,6 +17916,7 @@ SeafoamIslands1Script: ; 0x447e9
     ld hl, $4846
     jp $6981
 ; 0x44846
+
 INCBIN "baserom.gbc",$44846,$5
 
 SeafoamIslands1Texts: ; 0x4484b
@@ -17968,6 +18010,7 @@ VictoryRoad3Script: ; 0x44980
     ld [$d640], a
     ret
 ; 0x44996
+
 INCBIN "baserom.gbc",$44996,$8e
 
 VictoryRoad3Texts: ; 0x44a24
@@ -18051,6 +18094,7 @@ RocketHideout1Script: ; 0x44bca
     ld [$d631], a
     ret
 ; 0x44be0
+
 INCBIN "baserom.gbc",$44be0,$34
 
 RocketHideout1Texts: ; 0x44c14
@@ -18138,6 +18182,7 @@ RocketHideout2Script: ; 0x44e27
     ld [$d632], a
     ret
 ; 0x44e3a
+
 INCBIN "baserom.gbc",$44e3a,$28d
 
 RocketHideout2Texts: ; 0x450c7
@@ -18199,6 +18244,7 @@ RocketHideout3Script: ; 0x45225
     ld [$d633], a
     ret
 ; 0x45238
+
 INCBIN "baserom.gbc",$45238,$c2
 
 RocketHideout3Texts: ; 0x452fa
@@ -18262,6 +18308,7 @@ RocketHideout4Script: ; 0x4545d
     ld [$d634], a
     ret
 ; 0x45473
+
 INCBIN "baserom.gbc",$45473,$8e
 
 RocketHideout4Texts: ; 0x45501
@@ -18379,6 +18426,7 @@ RocketHideoutElevatorScript: ; 0x45710
     ld [$cc3c], a
     ret
 ; 0x4572c
+
 INCBIN "baserom.gbc",$4572c,$3f
 
 RocketHideoutElevatorTexts: ; 0x4576b
@@ -18445,6 +18493,7 @@ SilphCoElevatorScript: ; 0x457c0
     ld [$cc3c], a
     ret
 ; 0x457dc
+
 INCBIN "baserom.gbc",$457dc,$57
 
 SilphCoElevatorTexts: ; 0x45833
@@ -18906,6 +18955,7 @@ UnknownDungeon3Script: ; 0x45ef0
     ld [$d650], a
     ret
 ; 0x45f03
+
 INCBIN "baserom.gbc",$45f03,$6
 
 UnknownDungeon3Texts: ; 0x45f09
@@ -18957,6 +19007,7 @@ RockTunnel2Script: ; 0x45feb
     ld [$d620], a
     ret
 ; 0x45ffe
+
 INCBIN "baserom.gbc",$45ffe,$6
 
 RockTunnel2Texts: ; 0x46004
@@ -19092,6 +19143,7 @@ SeafoamIslands2Script: ; 0x46315
     ld hl, $636d
     jp $6981
 ; 0x4636d
+
 INCBIN "baserom.gbc",$4636d,$5
 
 SeafoamIslands2Texts: ; 0x46372
@@ -19175,6 +19227,7 @@ SeafoamIslands3Script: ; 0x46451
     ld hl, $64a9
     jp $6981
 ; 0x464a9
+
 INCBIN "baserom.gbc",$464a9,$5
 
 SeafoamIslands3Texts: ; 0x464ae
@@ -19266,7 +19319,9 @@ SeafoamIslands4Script: ; 0x4658d
     ld a, [$d666]
     jp $3d97
 ; 0x465f6
+
 INCBIN "baserom.gbc",$465f6,$d
+
 SeafoamIslands4Script0: ; 0x46603
     ld a, [$d880]
     and $3
@@ -19290,7 +19345,9 @@ SeafoamIslands4Script0: ; 0x46603
     ld [$d666], a
     ret
 ; 0x46632
+
 INCBIN "baserom.gbc",$46632,$46639 - $46632
+
 SeafoamIslands4Script1: ; 0x46639
     ld a, [$cd38]
     and a
@@ -19299,6 +19356,7 @@ SeafoamIslands4Script1: ; 0x46639
     ld [$d666], a
     ret
 ; 0x46644
+
 INCBIN "baserom.gbc",$46644,$56
 
 SeafoamIslands4Texts: ; 0x4669a
@@ -19352,7 +19410,9 @@ SeafoamIslands5Script: ; 0x46799
     ld hl, $67ad
     jp $3d97
 ; 0x467a5
+
 INCBIN "baserom.gbc",$467a5,$22
+
 SeafoamIslands5Script0: ; 0x467c7
     ld a, [$d880]
     and $3
@@ -19381,7 +19441,9 @@ SeafoamIslands5Script0: ; 0x467c7
     ld [$d668], a
     ret
 ; 0x467fe
+
 INCBIN "baserom.gbc",$467fe,$46807 - $467fe
+
 SeafoamIslands5Script1: ; 0x46807
     ld a, [$cd38]
     and a
@@ -19392,6 +19454,7 @@ SeafoamIslands5Script1: ; 0x46807
     ld [$d668], a
     ret
 ; 0x46816
+
 INCBIN "baserom.gbc",$46816,$66
 
 SeafoamIslands5Texts: ; 0x4687c
@@ -19515,9 +19578,11 @@ Route11GateUpstairsBlocks: ; 16
     INCBIN "maps/route11gateupstairs.blk"
 
 INCBIN "baserom.gbc",$480eb,$48152 - $480eb
+
 Route7Script: ; 0x48152
     jp $3c3c
 ; 0x48155
+
 INCBIN "baserom.gbc",$48155,$2
 
 Route7Text1: ; 0x48157
@@ -19817,6 +19882,7 @@ CeladonMartRoof_h: ; 0x483c9 to 0x483d5 (12 bytes) (bank=12) (id=126)
 CeladonMartRoofScript: ; 0x483d5
     jp $3c3c
 ; 0x483d8
+
 INCBIN "baserom.gbc",$483d8,$18f
 
 CeladonMartRoofText1: ; 0x48567
@@ -19897,6 +19963,7 @@ CeladonMartElevatorScript: ; 0x48600
     ld [$cc3c], a
     ret
 ; 0x4861c
+
 INCBIN "baserom.gbc",$4861c,$40
 
 CeladonMartElevatorTexts: ; 0x4865c
@@ -20192,6 +20259,7 @@ CeladonPokecenterScript: ; 0x488b8
     call $22fa
     jp $3c3c
 ; 0x488be
+
 INCBIN "baserom.gbc",$488be,$8
 
 CeladonPokecenterText4:
@@ -20247,6 +20315,7 @@ CeladonGymScript: ; 0x4890a
     ld [$d5ff], a
     ret
 ; 0x48927
+
 INCBIN "baserom.gbc",$48927,$7f
 
 CeladonGymTexts: ; 0x489a6
@@ -20401,10 +20470,13 @@ CeladonGameCornerScript: ; 0x48bbd
     ld a, [$d65f]
     jp $3d97
 ; 0x48bcf
+
 INCBIN "baserom.gbc",$48bcf,$49
+
 CeladonGameCornerScript0: ; 0x48c18
     ret
 ; 0x48c19
+
 INCBIN "baserom.gbc",$48c19,$71
 
 CeladonGameCornerTexts: ; 0x48c8a
@@ -20769,6 +20841,7 @@ CeladonPrizeRoom_h: ; 0x490e4 to 0x490f0 (12 bytes) (bank=12) (id=137)
 CeladonPrizeRoomScript: ; 0x490f0
     jp $3c3c
 ; 0x490f3
+
 INCBIN "baserom.gbc",$490f3,$a
 
 CeladonPrizeRoomText1: ; 0x490fd
@@ -20995,6 +21068,7 @@ MtMoonPokecenterScript: ; 0x492cf
     call $22fa
     jp $3c3c
 ; 0x492d5
+
 INCBIN "baserom.gbc",$492d5,$d
 
 MtMoonPokecenterText2:
@@ -21098,6 +21172,7 @@ RockTunnelPokecenterScript: ; 0x493ba
     call $22fa
     jp $3c3c
 ; 0x493c0
+
 INCBIN "baserom.gbc",$493c0,$9
 
 RockTunnelPokecenterText2:
@@ -21184,6 +21259,7 @@ Route11GateUpstairs_h: ; 0x49448 to 0x49454 (12 bytes) (id=86)
 Route11GateUpstairsScript: ; 0x49454
     jp $3c3f
 ; 0x49457
+
 INCBIN "baserom.gbc",$49457,$8
 
 Route11GateUpstairsText1: ; 0x4945f
@@ -21445,7 +21521,9 @@ Route16GateMapScript: ; 0x496be
     ld hl, $56cf
     jp $3d97
 ; 0x496cf
+
 INCBIN "baserom.gbc",$496cf,$8
+
 Route16GateMapScript0: ; 0x496d7
     call $5755
     ret nz
@@ -21477,6 +21555,7 @@ Route16GateMapScript0: ; 0x496d7
     ld [$d660], a
     ret
 ; 0x49714
+
 INCBIN "baserom.gbc",$49714,$46
 
 Route16GateMapTexts: ; 0x4975a
@@ -21618,7 +21697,9 @@ Route18GateScript: ; 0x49876
     ld hl, $5887
     jp $3d97
 ; 0x49887
+
 INCBIN "baserom.gbc",$49887,$8
+
 Route18GateScript0: ; 0x4988f
     call $5755
     ret nz
@@ -21650,6 +21731,7 @@ Route18GateScript0: ; 0x4988f
     ld [$d669], a
     ret
 ; 0x498cc
+
 INCBIN "baserom.gbc",$498cc,$41
 
 Route18GateTexts: ; 0x4990d
@@ -21767,6 +21849,7 @@ MtMoon1Script: ; 0x499c8
     ld [$d606], a
     ret
 ; 0x499db
+
 INCBIN "baserom.gbc",$499db,$6
 
 MtMoon1Texts: ; 0x499e1
@@ -21889,6 +21972,7 @@ MtMoon3Script: ; 0x49d0b
     res 4, [hl]
     ret
 ; 0x49d37
+
 INCBIN "baserom.gbc",$49d37,$fd
 
 MtMoon3Texts: ; 0x49e34
@@ -23007,6 +23091,7 @@ Route20Script: ; 0x50ca9
     ld [$d628], a
     ret
 ; 0x50cc6
+
 INCBIN "baserom.gbc",$50cc6,$5c
 
 Route20Texts: ; 0x50d22
@@ -23087,7 +23172,9 @@ Route22Script: ; 0x50eb2
     ld a, [$d60a]
     jp $3d97
 ; 0x50ebe
+
 INCBIN "baserom.gbc",$50ebe,$42
+
 Route22Script0: ; 0x50f00
     ld a, [$d7eb]
     bit 7, a
@@ -23138,6 +23225,7 @@ Route22Script0: ; 0x50f00
     ld [$d60a], a
     ret
 ; 0x50f62
+
 Route22Script1: ; 0x50f62
     ld a, [$d730]
     bit 0, a
@@ -23175,7 +23263,9 @@ Route22Script1: ; 0x50f62
     ld [$d60a], a
     ret
 ; 0x50faf
+
 INCBIN "baserom.gbc",$50faf,$50fb5 - $50faf
+
 Route22Script2: ; 0x50fb5
     ld a, [$d057]
     cp $ff
@@ -23217,7 +23307,9 @@ Route22Script2: ; 0x50fb5
     ld [$d60a], a
     ret
 ; 0x51008
+
 INCBIN "baserom.gbc",$51008,$5102a - $51008
+
 Route22Script3: ; 0x5102a
     ld a, [$d730]
     bit 0, a
@@ -23236,6 +23328,7 @@ Route22Script3: ; 0x5102a
     ld [$d60a], a
     ret
 ; 0x5104e
+
 INCBIN "baserom.gbc",$5104e,$127
 
 Route22Texts: ; 0x51175
@@ -23282,7 +23375,9 @@ Route23Script: ; 0x511da
     ld a, [$d667]
     jp $3d97
 ; 0x511e9
+
 INCBIN "baserom.gbc",$511e9,$30
+
 Route23Script0: ; 0x51219
     ld hl, $5255
     ld a, [$d361]
@@ -23320,6 +23415,7 @@ Route23Script0: ; 0x51219
     ld [$ff00+$b4], a
     ret
 ; 0x51255
+
 INCBIN "baserom.gbc",$51255,$a2
 
 Route23Texts: ; 0x512f7
@@ -23383,6 +23479,7 @@ Route24Script: ; 0x513ad
     ld [$d602], a
     ret
 ; 0x513c0
+
 INCBIN "baserom.gbc",$513c0,$8b
 
 Route24Texts: ; 0x5144b
@@ -23475,6 +23572,7 @@ Route24Text7: ; 0x51567
     jp $24d7
 
 INCBIN "baserom.gbc",$51571,$515cb - $51571
+
 Route25Script: ; 0x515cb
     call $55e1
     call $3c3c
@@ -23485,6 +23583,7 @@ Route25Script: ; 0x515cb
     ld [$d603], a
     ret
 ; 0x515e1
+
 INCBIN "baserom.gbc",$515e1,$47
 
 Route25Texts: ; 0x51628
@@ -23577,6 +23676,7 @@ VictoryRoad2Script: ; 0x5179d
     ld [$d63f], a
     ret
 ; 0x517c4
+
 INCBIN "baserom.gbc",$517c4,$57
 
 VictoryRoad2Texts: ; 0x5181b
@@ -23675,6 +23775,7 @@ MtMoon2Script: ; 0x51a42
     call $3c3c
     ret
 ; 0x51a46
+
 INCBIN "baserom.gbc",$51a46,$7
 
 MtMoon2Object: ; 0x51a4d (size=68)
@@ -23725,6 +23826,7 @@ SilphCo7Script: ; 0x51b61
     ld [$d648], a
     ret
 ; 0x51b77
+
 INCBIN "baserom.gbc",$51b77,$1c8
 
 SilphCo7Texts: ; 0x51d3f
@@ -24903,9 +25005,11 @@ FuchsiaHouse3Blocks: ; 16
     INCBIN "maps/fuchsiahouse3.blk"
 
 INCBIN "baserom.gbc",$5524f,$554e3 - $5524f
+
 Route2Script: ; 0x554e3
     jp $3c3c
 ; 0x554e6
+
 INCBIN "baserom.gbc",$554e6,$8
 
 Route2Text3: ; 0x554ee
@@ -24925,6 +25029,7 @@ Route3Script: ; 0x554f8
     ld [$d5f8], a
     ret
 ; 0x5550b
+
 INCBIN "baserom.gbc",$5550b,$6
 
 Route3Texts: ; 0x55511
@@ -25013,6 +25118,7 @@ Route4Script: ; 0x55658
     ld [$d5f9], a
     ret
 ; 0x5566b
+
 INCBIN "baserom.gbc",$5566b,$6
 
 Route4Texts: ; 0x55671
@@ -25060,6 +25166,7 @@ Route9Script: ; 0x556bc
     ld [$d604], a
     ret
 ; 0x556cf
+
 INCBIN "baserom.gbc",$556cf,$6
 
 Route9Texts: ; 0x556d5
@@ -25134,6 +25241,7 @@ Route13Script: ; 0x5581e
     ld [$d61a], a
     ret
 ; 0x55831
+
 INCBIN "baserom.gbc",$55831,$6
 
 Route13Texts: ; 0x55837
@@ -25242,6 +25350,7 @@ Route14Script: ; 0x559d3
     ld [$d61b], a
     ret
 ; 0x559e6
+
 INCBIN "baserom.gbc",$559e6,$6
 
 Route14Texts: ; 0x559ec
@@ -25342,6 +25451,7 @@ Route17Script: ; 0x55b7a
     ld [$d61c], a
     ret
 ; 0x55b8d
+
 INCBIN "baserom.gbc",$55b8d,$6
 
 Route17Texts: ; 0x55b93
@@ -25462,6 +25572,7 @@ Route19Script: ; 0x55d44
     ld [$d61d], a
     ret
 ; 0x55d57
+
 INCBIN "baserom.gbc",$55d57,$6
 
 Route19Texts: ; 0x55d5d
@@ -25544,6 +25655,7 @@ Route21Script: ; 0x55eeb
     ld [$d61e], a
     ret
 ; 0x55efe
+
 INCBIN "baserom.gbc",$55efe,$6
 
 Route21Texts: ; 0x55f04
@@ -25957,6 +26069,7 @@ SilphCo8Script: ; 0x56504
     ld [$d649], a
     ret
 ; 0x5651a
+
 INCBIN "baserom.gbc",$5651a,$63
 
 SilphCo8Texts: ; 0x5657d
@@ -26498,6 +26611,7 @@ Route18Blocks: ; 225
     INCBIN "maps/route18.blk"
 
 INCBIN "baserom.gbc",$58d7d,$590b0 - $58d7d
+
 Route6Script: ; 0x590b0
     call $3c3c
     ld hl, $50d7
@@ -26507,6 +26621,7 @@ Route6Script: ; 0x590b0
     ld [$d600], a
     ret
 ; 0x590c3
+
 INCBIN "baserom.gbc",$590c3,$5d
 
 Route6Text1: ; 0x59120
@@ -26571,6 +26686,7 @@ Route8Script: ; 0x591b6
     ld [$d601], a
     ret
 ; 0x591c9
+
 INCBIN "baserom.gbc",$591c9,$a0
 
 Route8Text2: ; 0x59269
@@ -26650,6 +26766,7 @@ Route10Script: ; 0x59336
     ld [$d605], a
     ret
 ; 0x59349
+
 INCBIN "baserom.gbc",$59349,$6
 
 Route10Texts: ; 0x5934f
@@ -26723,6 +26840,7 @@ Route11Script: ; 0x5944c
     ld [$d623], a
     ret
 ; 0x5945f
+
 INCBIN "baserom.gbc",$5945f,$ae
 
 Route11Text2: ; 0x5950d
@@ -26810,6 +26928,7 @@ Route12Script: ; 0x595f3
     ld [$d624], a
     ret
 ; 0x59606
+
 INCBIN "baserom.gbc",$59606,$6f
 
 Route12Texts: ; 0x59675
@@ -26896,6 +27015,7 @@ Route15Script: ; 0x597ae
     ld [$d625], a
     ret
 ; 0x597c1
+
 INCBIN "baserom.gbc",$597c1,$6
 
 Route15Texts: ; 0x597c7
@@ -26971,6 +27091,7 @@ Route16Script: ; 0x59933
     ld [$d626], a
     ret
 ; 0x59946
+
 INCBIN "baserom.gbc",$59946,$73
 
 Route16Texts: ; 0x599b9
@@ -27053,6 +27174,7 @@ Route18Script: ; 0x59ac7
     ld [$d627], a
     ret
 ; 0x59ada
+
 INCBIN "baserom.gbc",$59ada,$6
 
 Route18Texts: ; 0x59ae0
@@ -27103,6 +27225,7 @@ FanClub_h: ; 0x59b64 to 0x59b70 (12 bytes) (id=90)
 FanClubScript: ; 0x59b70
     jp $3c3c
 ; 0x59b73
+
 INCBIN "baserom.gbc",$59b73,$11
 
 FanClubTexts: ; 0x59b84
@@ -27263,6 +27386,7 @@ SilphCo2Script: ; 0x59cf1
     ld [$d643], a
     ret
 ; 0x59d07
+
 INCBIN "baserom.gbc",$59d07,$7f
 
 SilphCo2Texts: ; 0x59d86
@@ -27370,6 +27494,7 @@ SilphCo3Script: ; 0x59f5b
     ld [$d644], a
     ret
 ; 0x59f71
+
 INCBIN "baserom.gbc",$59f71,$53
 
 SilphCo3Texts: ; 0x59fc4
@@ -27462,6 +27587,7 @@ SilphCo10Script: ; 0x5a139
     ld [$d658], a
     ret
 ; 0x5a14f
+
 INCBIN "baserom.gbc",$5a14f,$37
 
 SilphCo10Texts: ; 0x5a186
@@ -27544,6 +27670,7 @@ LanceScript: ; 0x5a2ae
     ld [$d653], a
     ret
 ; 0x5a2c4
+
 INCBIN "baserom.gbc",$5a2c4,$d1
 
 LanceTexts: ; 0x5a395
@@ -27594,7 +27721,9 @@ HallofFameRoomScript: ; 0x5a49e
     ld a, [$d64b]
     jp $3d97
 ; 0x5a4aa
+
 INCBIN "baserom.gbc",$5a4aa,$11
+
 HallofFameRoomScript2: ; 0x5a4bb
     call Delay3
     ld a, [$d358]
@@ -27638,6 +27767,7 @@ HallofFameRoomScript2: ; 0x5a4bb
     call $3865
     jp $1f54
 ; 0x5a50d
+
 HallofFameRoomScript0: ; 0x5a50d
     ld a, $ff
     ld [$cd6b], a
@@ -27651,7 +27781,9 @@ HallofFameRoomScript0: ; 0x5a50d
     ld [$d64b], a
     ret
 ; 0x5a528
+
 INCBIN "baserom.gbc",$5a528,$5a52b - $5a528
+
 HallofFameRoomScript1: ; 0x5a52b
     ld a, [$cd38]
     and a
@@ -27797,7 +27929,9 @@ MuseumF1Script: ; 0x5c0f7
     ld a, [$d619]
     jp $3d97
 ; 0x5c109
+
 INCBIN "baserom.gbc",$5c109,$4
+
 MuseumF1Script0: ; 0x5c10d
     ld a, [$d361]
     cp $4
@@ -27815,6 +27949,7 @@ MuseumF1Script0: ; 0x5c10d
     ld [$ff00+$8c], a
     jp $2920
 ; 0x5c12a
+
 MuseumF1Script1: ; 0x5c12a
     ret
 ; 0x5c12b
@@ -28092,6 +28227,7 @@ PewterGymScript: ; 0x5c387
     ld [$d5fc], a
     ret
 ; 0x5c3a4
+
 INCBIN "baserom.gbc",$5c3a4,$91
 
 PewterGymTexts: ; 0x5c435
@@ -28221,6 +28357,7 @@ PewterPokecenterScript: ; 0x5c587
     call $22fa
     jp $3c3c
 ; 0x5c58d
+
 INCBIN "baserom.gbc",$5c58d,$9
 
 PewterPokecenterText2:
@@ -28319,6 +28456,7 @@ CeruleanPokecenterScript: ; 0x5c645
     call $22fa
     jp $3c3c
 ; 0x5c64b
+
 INCBIN "baserom.gbc",$5c64b,$8
 
 CeruleanPokecenterText4:
@@ -28376,6 +28514,7 @@ CeruleanGymScript: ; 0x5c6b3
     ld [$d5fd], a
     ret
 ; 0x5c6d0
+
 INCBIN "baserom.gbc",$5c6d0,$7a
 
 CeruleanGymTexts: ; 0x5c74a
@@ -28541,6 +28680,7 @@ LavenderPokecenterScript: ; 0x5c8da
     call $22fa
     jp $3c3c
 ; 0x5c8e0
+
 INCBIN "baserom.gbc",$5c8e0,$8
 
 LavenderPokecenterText4:
@@ -28640,6 +28780,7 @@ VermilionPokecenterScript: ; 0x5c98f
     call $22fa
     jp $3c3c
 ; 0x5c995
+
 INCBIN "baserom.gbc",$5c995,$9
 
 VermilionPokecenterText2:
@@ -28740,6 +28881,7 @@ VermilionGymScript: ; 0x5ca26
     ld [$d5fe], a
     ret
 ; 0x5ca4c
+
 INCBIN "baserom.gbc",$5ca4c,$9c
 
 VermilionGymTexts: ; 0x5cae8
@@ -28980,6 +29122,7 @@ FightingDojoScript: ; 0x5cd5d
     ld [$d642], a
     ret
 ; 0x5cd70
+
 INCBIN "baserom.gbc",$5cd70,$93
 
 FightingDojoTexts: ; 0x5ce03
@@ -29171,6 +29314,7 @@ SaffronGymScript: ; 0x5d00d
     ld [$d65c], a
     ret
 ; 0x5d02a
+
 INCBIN "baserom.gbc",$5d02a,$81
 
 SaffronGymTexts: ; 0x5d0ab
@@ -29478,6 +29622,7 @@ SaffronPokecenterScript: ; 0x5d535
     call $22fa
     jp $3c3c
 ; 0x5d53b
+
 INCBIN "baserom.gbc",$5d53b,$9
 
 SaffronPokecenterText2: ; maybe
@@ -29683,6 +29828,7 @@ UndergroundTunnelEntranceRoute5Script: ; 0x5d6a9
     ld [$d365], a
     ret
 ; 0x5d6af
+
 INCBIN "baserom.gbc",$5d6af,$1
 
 UndergroundTunnelEntranceRoute5Texts: ; 0x5d6b0
@@ -29816,6 +29962,7 @@ SilphCo9Script: ; 0x5d7bb
     ld [$d64a], a
     ret
 ; 0x5d7d1
+
 INCBIN "baserom.gbc",$5d7d1,$ba
 
 SilphCo9Texts: ; 0x5d88b
@@ -29915,6 +30062,7 @@ VictoryRoad1Script: ; 0x5da0a
     ld [$d651], a
     ret
 ; 0x5da27
+
 INCBIN "baserom.gbc",$5da27,$38
 
 VictoryRoad1Texts: ; 0x5da5f
@@ -30051,7 +30199,9 @@ PokemonTower2Script: ; 0x604f2
     ld a, [$d62b]
     jp $3d97
 ; 0x604fe
+
 INCBIN "baserom.gbc",$604fe,$11
+
 PokemonTower2Script0: ; 0x6050f
     ld a, [$d764]
     bit 7, a
@@ -30091,7 +30241,9 @@ PokemonTower2Script0: ; 0x6050f
     ld [$ff00+$b3], a
     ret
 ; 0x6055e
+
 INCBIN "baserom.gbc",$6055e,$60563 - $6055e
+
 PokemonTower2Script1: ; 0x60563
     ld a, [$d057]
     cp $ff
@@ -30123,7 +30275,9 @@ PokemonTower2Script1: ; 0x60563
     ld [$da39], a
     ret
 ; 0x605a9
+
 INCBIN "baserom.gbc",$605a9,$605bb - $605a9
+
 PokemonTower2Script2: ; 0x605bb
     ld a, [$d730]
     bit 0, a
@@ -30226,6 +30380,7 @@ PokemonTower3Script: ; 0x606cc
     ld [$d62c], a
     ret
 ; 0x606df
+
 INCBIN "baserom.gbc",$606df,$6
 
 PokemonTower3Texts: ; 0x606e5
@@ -30292,6 +30447,7 @@ PokemonTower4Script: ; 0x607f6
     ld [$d62d], a
     ret
 ; 0x60809
+
 INCBIN "baserom.gbc",$60809,$6
 
 PokemonTower4Texts: ; 0x6080f
@@ -30360,6 +30516,7 @@ PokemonTower5Script: ; 0x60932
     ld [$d62e], a
     ret
 ; 0x60945
+
 INCBIN "baserom.gbc",$60945,$56
 
 PokemonTower5Texts: ; 0x6099b
@@ -30447,6 +30604,7 @@ PokemonTower6Script: ; 0x60aef
     ld [$d62f], a
     ret
 ; 0x60b02
+
 INCBIN "baserom.gbc",$60b02,$af
 
 PokemonTower6Texts: ; 0x60bb1
@@ -30520,6 +30678,7 @@ PokemonTower7Script: ; 0x60d05
     ld [$d630], a
     ret
 ; 0x60d18
+
 INCBIN "baserom.gbc",$60d18,$127
 
 PokemonTower7Texts: ; 0x60e3f
@@ -30667,6 +30826,7 @@ ViridianForestScript: ; 0x6110d
     ld [$d618], a
     ret
 ; 0x61120
+
 INCBIN "baserom.gbc",$61120,$6
 
 ViridianForestTexts: ; 0x61126
@@ -30839,10 +30999,13 @@ SSAnne2Script: ; 0x6139f
     ld a, [$d665]
     jp $3d97
 ; 0x613ab
+
 INCBIN "baserom.gbc",$613ab,$12
+
 SSAnne2Script4: ; 0x613bd
     ret
 ; 0x613be
+
 SSAnne2Script0: ; 0x613be
     ld hl, $5411
     call $34bf
@@ -30880,7 +31043,9 @@ SSAnne2Script0: ; 0x613be
     ld [$d665], a
     ret
 ; 0x6140c
+
 INCBIN "baserom.gbc",$6140c,$61430 - $6140c
+
 SSAnne2Script1: ; 0x61430
     ld a, [$d730]
     bit 0, a
@@ -30913,6 +31078,7 @@ SSAnne2Script1: ; 0x61430
     ld [$d665], a
     ret
 ; 0x6146d
+
 SSAnne2Script2: ; 0x6146d
     ld a, [$d057]
     cp $ff
@@ -30947,7 +31113,9 @@ SSAnne2Script2: ; 0x6146d
     ld [$d665], a
     ret
 ; 0x614b7
+
 INCBIN "baserom.gbc",$614b7,$614be - $614b7
+
 SSAnne2Script3: ; 0x614be
     ld a, [$d730]
     bit 0, a
@@ -31034,6 +31202,7 @@ SSAnne4_h: ; 0x61622 to 0x6162e (12 bytes) (id=98)
 SSAnne4Script: ; 0x6162e
     jp $3c3c
 ; 0x61631
+
 INCBIN "baserom.gbc",$61631,$1
 
 SSAnne4Object: ; 0x61632 (size=52)
@@ -31079,6 +31248,7 @@ SSAnne5Script: ; 0x616ae
     ld [$d617], a
     ret
 ; 0x616c1
+
 INCBIN "baserom.gbc",$616c1,$6
 
 SSAnne5Texts: ; 0x616c7
@@ -31234,6 +31404,7 @@ SSAnne7Script: ; 0x61895
     call $589b
     jp $3c3c
 ; 0x6189b
+
 INCBIN "baserom.gbc",$6189b,$c
 
 SSAnne7Texts: ; 0x618a7
@@ -31314,6 +31485,7 @@ SSAnne8Script: ; 0x61976
     ld [$d608], a
     ret
 ; 0x61989
+
 INCBIN "baserom.gbc",$61989,$6
 
 SSAnne8Texts: ; 0x6198f
@@ -31431,6 +31603,7 @@ SSAnne9Script: ; 0x61b4b
     ld [$d609], a
     ret
 ; 0x61b64
+
 INCBIN "baserom.gbc",$61b64,$6
 
 SSAnne9Texts: ; 0x61b6a
@@ -31587,6 +31760,7 @@ SSAnne10Script: ; 0x61d55
     ld [$d629], a
     ret
 ; 0x61d68
+
 INCBIN "baserom.gbc",$61d68,$6
 
 SSAnne10Texts: ; 0x61d6e
@@ -31696,6 +31870,7 @@ UndergroundPathNS_h: ; 0x61f1a to 0x61f26 (12 bytes) (id=119)
 UndergroundPathNSScript: ; 0x61f26
     jp $3c3c
 ; 0x61f29
+
 INCBIN "baserom.gbc",$61f29,$1
 
 UndergroundPathNSObject: ; 0x61f2a (size=20)
@@ -31724,6 +31899,7 @@ UndergroundPathWE_h: ; 0x61f3e to 0x61f4a (12 bytes) (id=121)
 UndergroundPathWEScript: ; 0x61f4a
     jp $3c3c
 ; 0x61f4d
+
 INCBIN "baserom.gbc",$61f4d,$1
 
 UndergroundPathWEObject: ; 0x61f4e (size=20)
@@ -31752,6 +31928,7 @@ DiglettsCave_h: ; 0x61f62 to 0x61f6e (12 bytes) (id=197)
 DiglettsCaveScript: ; 0x61f6e
     jp $3c3c
 ; 0x61f71
+
 INCBIN "baserom.gbc",$61f71,$1
 
 DiglettsCaveObject: ; 0x61f72 (size=20)
@@ -31790,6 +31967,7 @@ SilphCo11Script: ; 0x620fa
     ld [$d659], a
     ret
 ; 0x62110
+
 INCBIN "baserom.gbc",$62110,$1a7
 
 SilphCo11Texts: ; 0x622b7
@@ -33006,6 +33184,7 @@ ViridianGymScript: ; 0x748a3
     ld [$d5fb], a
     ret
 ; 0x748bf
+
 INCBIN "baserom.gbc",$748bf,$12d
 
 ViridianGymTexts: ; 0x749ec
@@ -33296,6 +33475,7 @@ CeruleanHouse3Script: ; 0x74e09
     ld [$cc3c], a
     ret
 ; 0x74e13
+
 INCBIN "baserom.gbc",$74e13,$2
 
 CeruleanHouse3Text1: ; 0x74e15
@@ -33422,6 +33602,7 @@ FuchsiaPokecenterScript: ; 0x75063
     call $22fa
     jp $3c3c
 ; 0x75069
+
 INCBIN "baserom.gbc",$75069,$9
 
 FuchsiaPokecenterText2:
@@ -33576,7 +33757,9 @@ SafariZoneEntranceScript: ; 0x751cd
     ld a, [$d61f]
     jp $3d97
 ; 0x751d9
+
 INCBIN "baserom.gbc",$751d9,$e
+
 SafariZoneEntranceScript0: ; 0x751e7
     ld hl, $5221
     call $34bf
@@ -33606,7 +33789,9 @@ SafariZoneEntranceScript0: ; 0x751e7
     ld [$d61f], a
     ret
 ; 0x75221
+
 INCBIN "baserom.gbc",$75221,$75226 - $75221
+
 SafariZoneEntranceScript1: ; 0x75226
     call $52b4
     ret nz
@@ -33621,6 +33806,7 @@ SafariZoneEntranceScript1: ; 0x75226
     ld [$cd6b], a
     ret
 ; 0x75240
+
 INCBIN "baserom.gbc",$75240,$79
 
 SafariZoneEntranceTexts: ; 0x752b9
@@ -33700,6 +33886,7 @@ FuchsiaGymScript: ; 0x7543d
     ld [$d65b], a
     ret
 ; 0x75453
+
 INCBIN "baserom.gbc",$75453,$82
 
 FuchsiaGymTexts: ; 0x754d5
@@ -33905,7 +34092,9 @@ CinnabarGymScript: ; 0x7574a
     ld a, [$d65e]
     jp $3d97
 ; 0x75759
+
 INCBIN "baserom.gbc",$75759,$55
+
 CinnabarGymScript0: ; 0x757ae
     ld a, [$da38]
     and a
@@ -33928,7 +34117,9 @@ CinnabarGymScript0: ; 0x757ae
     ld [$da39], a
     ret
 ; 0x757d7
+
 INCBIN "baserom.gbc",$757d7,$757dc - $757d7
+
 CinnabarGymScript1: ; 0x757dc
     ld a, [$d730]
     bit 0, a
@@ -33940,6 +34131,7 @@ CinnabarGymScript1: ; 0x757dc
     ld [$ff00+$8c], a
     jp $2920
 ; 0x757f1
+
 INCBIN "baserom.gbc",$757f1,$ae
 
 CinnabarGymTexts: ; 0x7589f
@@ -33974,6 +34166,7 @@ CinnabarGymText1: ; 0x758df
     ld [$d05c], a
     jp $58b7
 ; 0x75914
+
 INCBIN "baserom.gbc",$75914,$25
 
 CinnabarGymText2: ; 0x75939
@@ -34360,6 +34553,7 @@ Lab4_h: ; 0x75d25 to 0x75d31 (12 bytes) (id=170)
 Lab4Script: ; 0x75d31
     jp $3c3c
 ; 0x75d34
+
 INCBIN "baserom.gbc",$75d34,$38
 
 Lab4Text1: ; 0x75d6c
@@ -34450,6 +34644,7 @@ CinnabarPokecenterScript: ; 0x75e2c
     call $22fa
     jp $3c3c
 ; 0x75e32
+
 INCBIN "baserom.gbc",$75e32,$9
 
 CinnabarPokecenterText2:
-- 
cgit v1.2.3


From dd2d259911107999d4833d2bb079091fc934f149 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Fri, 13 Jan 2012 15:27:22 -0600
Subject: insert_texts now inserts map script pointer lists

hg-commit-id: a63f010e5cdc
---
 extras/insert_texts.py | 104 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 72 insertions(+), 32 deletions(-)

diff --git a/extras/insert_texts.py b/extras/insert_texts.py
index 24b55899..75392b5c 100644
--- a/extras/insert_texts.py
+++ b/extras/insert_texts.py
@@ -359,20 +359,21 @@ def insert_all_08s():
         isolate_incbins()
         process_incbins()
 
-def insert_asm(start_address, label):
-    (text_asm, end_address) = text_asm_pretty_printer(label, start_address, include_08=False)
-    print "end address is: " + hex(end_address)
+def insert_asm(start_address, label, text_asm=None, end_address=None):
+    if text_asm == None and end_address == None:
+        (text_asm, end_address) = text_asm_pretty_printer(label, start_address, include_08=False)
+        print "end address is: " + hex(end_address)
 
     #find where to insert the assembly
     line_number = find_incbin_to_replace_for(start_address)
     if line_number == None:
         print "skipping asm because the address is taken"
-        return
+        return False
 
     #name check
     if (label + ":") in "\n".join(analyze_incbins.asm):
         print "skipping asm because the label is taken"
-        return
+        return False
 
     newlines = split_incbin_line_into_three(line_number, start_address, end_address - start_address )
     
@@ -393,6 +394,7 @@ def insert_asm(start_address, label):
     diff = generate_diff_insert(line_number, newlines)
     print diff
     result = apply_diff(diff, try_fixing=True)
+    return True
 
 def insert_text(address, label):
     "inserts a text script (but not $8s)"
@@ -498,21 +500,22 @@ def scan_for_map_scripts_pointer():
                 #print "latest script pointer: " + hex(latest_script_pointer)
 
                 #go ahead and insert the asm for this script
-                insert_asm(latest_script_pointer, map_name_cleaner(map2["name"], None)[:-2] + "Script" + str(len(script_pointers) - 1))
+                result = insert_asm(latest_script_pointer, map_name_cleaner(map2["name"], None)[:-2] + "Script" + str(len(script_pointers) - 1))
                 
-                #reset everything
-                #analyze_incbins.reset_incbins()
-                asm = None
-                incbin_lines = []
-                processed_incbins = {}
-                analyze_incbins.asm = None
-                analyze_incbins.incbin_lines = []
-                analyze_incbins.processed_incbins = {}
-        
-                #reload
-                load_asm()
-                isolate_incbins()
-                process_incbins()
+                if result:
+                    #reset everything
+                    #analyze_incbins.reset_incbins()
+                    asm = None
+                    incbin_lines = []
+                    processed_incbins = {}
+                    analyze_incbins.asm = None
+                    analyze_incbins.incbin_lines = []
+                    analyze_incbins.processed_incbins = {}
+            
+                    #reload
+                    load_asm()
+                    isolate_incbins()
+                    process_incbins()
 
             print "map_id=" + str(map_id) + " scripts are: " + str(script_pointers)
         
@@ -526,21 +529,58 @@ def scan_for_map_scripts_pointer():
         print "\n\n"
 
         #insert asm for the main script
-        insert_asm(script_pointer, map_name_cleaner(map2["name"], None)[:-2] + "Script")
+        result = insert_asm(script_pointer, map_name_cleaner(map2["name"], None)[:-2] + "Script")
         
-        #reset everything
-        #analyze_incbins.reset_incbins()
-        asm = None
-        incbin_lines = []
-        processed_incbins = {}
-        analyze_incbins.asm = None
-        analyze_incbins.incbin_lines = []
-        analyze_incbins.processed_incbins = {}
+        if result:
+            #reset everything
+            #analyze_incbins.reset_incbins()
+            asm = None
+            incbin_lines = []
+            processed_incbins = {}
+            analyze_incbins.asm = None
+            analyze_incbins.incbin_lines = []
+            analyze_incbins.processed_incbins = {}
+    
+            #reload
+            load_asm()
+            isolate_incbins()
+            process_incbins()
 
-        #reload
-        load_asm()
-        isolate_incbins()
-        process_incbins()
+        #insert script pointer list asm if there's anything of value
+        if hl_pointer != None and hl_pointer != "None" and used_3d97==True:
+            start_address = int(hl_pointer, 16) #where to insert this list
+            total_size = len(a_numbers) * 2
+            
+            script_label = map_name_cleaner(map2["name"], None)[:-2] + "Script"
+            scripts_label = script_label  + "s"
+            scripts_asm = scripts_label + ": ; " + hex(start_address) + "\n"
+            script_asm += spacing + "dw"
+
+            first = True
+            for id in a_numbers:
+                if first:
+                    script_asm += " "
+                    first = False
+                else:
+                    script_asm += ", "
+                script_asm += script_label + str(id)
+            script_asm += "\n" #extra newline?
+
+            result = insert_asm(start_address, scripts_label, text_asm=script_asm, end_address=start_address + total_size)
+            if result:
+                #reset everything
+                #analyze_incbins.reset_incbins()
+                asm = None
+                incbin_lines = []
+                processed_incbins = {}
+                analyze_incbins.asm = None
+                analyze_incbins.incbin_lines = []
+                analyze_incbins.processed_incbins = {}
+        
+                #reload
+                load_asm()
+                isolate_incbins()
+                process_incbins()
 
 if __name__ == "__main__":
     #load map headers and object data
-- 
cgit v1.2.3


From 7157ac7cf6ccceb747010c6bf14e227ba89e9e8c Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Fri, 13 Jan 2012 15:31:17 -0600
Subject: asm for PewterCityScript

hg-commit-id: b6e888ea6a6f
---
 pokered.asm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pokered.asm b/pokered.asm
index 3b073196..07220970 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -6168,7 +6168,14 @@ ViridianCityText13: ; 0x1922d
 ViridianCityText14:
 INCBIN "baserom.gbc",$19232,$19237 - $19232
 
-INCBIN "baserom.gbc",$19237,$19251 - $19237
+PewterCityScript: ; 0x19237
+    call $3c3c
+    ld hl, $5243
+    ld a, [$d5f7]
+    jp $3d97
+; 0x19243
+
+INCBIN "baserom.gbc",$19243,$19251 - $19243
 
 PewterCityScript0: ; 0x19251
     xor a
-- 
cgit v1.2.3


From 4aabc95f6385c7fce81731a9553a4a4a2bf2487b Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Fri, 13 Jan 2012 15:40:32 -0600
Subject: some map subscript pointer lists

hg-commit-id: b36e9b279197
---
 extras/insert_texts.py |   8 ++-
 pokered.asm            | 148 ++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 128 insertions(+), 28 deletions(-)

diff --git a/extras/insert_texts.py b/extras/insert_texts.py
index 75392b5c..b3ec4062 100644
--- a/extras/insert_texts.py
+++ b/extras/insert_texts.py
@@ -480,7 +480,7 @@ def scan_for_map_scripts_pointer():
             latest_script_pointer = first_script_pointer
             while last_a_id == (max(a_numbers)) or last_a_id==0:
                 asm_output, offset, last_hl_address2, last_a_id, byte1, byte2, address = None, None, None, None, None, None, None
-                asm_output, offset, last_hl_address2, last_a_id, used_3d97 = output_bank_opcodes(latest_script_pointer)
+                asm_output, offset, last_hl_address2, last_a_id, used_3d97_2 = output_bank_opcodes(latest_script_pointer)
                 
                 if last_a_id == (max(a_numbers) + 1):
                     a_numbers.append(last_a_id)
@@ -553,7 +553,7 @@ def scan_for_map_scripts_pointer():
             
             script_label = map_name_cleaner(map2["name"], None)[:-2] + "Script"
             scripts_label = script_label  + "s"
-            scripts_asm = scripts_label + ": ; " + hex(start_address) + "\n"
+            script_asm = scripts_label + ": ; " + hex(start_address) + "\n"
             script_asm += spacing + "dw"
 
             first = True
@@ -581,6 +581,10 @@ def scan_for_map_scripts_pointer():
                 load_asm()
                 isolate_incbins()
                 process_incbins()
+            else:
+                print "trouble inserting map script pointer list"
+                print script_asm
+                sys.exit(0)
 
 if __name__ == "__main__":
     #load map headers and object data
diff --git a/pokered.asm b/pokered.asm
index 07220970..b3e396d3 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -6018,7 +6018,10 @@ ViridianCityScript: ; 0x18ff1
     jp $3d97
 ; 0x18ffd
 
-INCBIN "baserom.gbc",$18ffd,$8
+ViridianCityScripts: ; 0x18ffd
+    dw ViridianCityScript0
+
+INCBIN "baserom.gbc",$18fff,$6
 
 ViridianCityScript0: ; 0x19005
     call $500b
@@ -6175,7 +6178,10 @@ PewterCityScript: ; 0x19237
     jp $3d97
 ; 0x19243
 
-INCBIN "baserom.gbc",$19243,$19251 - $19243
+PewterCityScripts: ; 0x19243
+    dw PewterCityScript0
+
+INCBIN "baserom.gbc",$19245,$c
 
 PewterCityScript0: ; 0x19251
     xor a
@@ -6304,7 +6310,12 @@ CeruleanCityScript: ; 0x19480
     jp $3d97
 ; 0x1948c
 
-INCBIN "baserom.gbc",$1948c,$3c
+INCBIN "baserom.gbc",$1948c,$1949d - $1948c
+
+CeruleanCityScripts: ; 0x1949d
+    dw CeruleanCityScript0, CeruleanCityScript1, CeruleanCityScript2, CeruleanCityScript3
+
+INCBIN "baserom.gbc",$194a5,$23
 
 CeruleanCityScript0: ; 0x194c8
     ld a, [$d75b]
@@ -6637,7 +6648,12 @@ VermilionCityScript: ; 0x197a1
     jp $3d97
 ; 0x197c0
 
-INCBIN "baserom.gbc",$197c0,$26
+INCBIN "baserom.gbc",$197c0,$197dc - $197c0
+
+VermilionCityScripts: ; 0x197dc
+    dw VermilionCityScript0, VermilionCityScript1
+
+INCBIN "baserom.gbc",$197e0,$6
 
 VermilionCityScript0: ; 0x197e6
     ld a, [$c109]
@@ -7916,7 +7932,10 @@ CinnabarIslandScript: ; 0x1ca19
     jp $3d97
 ; 0x1ca34
 
-INCBIN "baserom.gbc",$1ca34,$4
+CinnabarIslandScripts: ; 0x1ca34
+    dw CinnabarIslandScript0, CinnabarIslandScript1
+
+INCBIN "baserom.gbc",$1ca38,$0
 
 CinnabarIslandScript0: ; 0x1ca38
     ld b, $2b
@@ -8044,7 +8063,10 @@ OaksLabScript: ; 0x1cb0e
     jp $3d97
 ; 0x1cb28
 
-INCBIN "baserom.gbc",$1cb28,$26
+OaksLabScripts: ; 0x1cb28
+    dw OaksLabScript0, OaksLabScript1, OaksLabScript2, OaksLabScript3, OaksLabScript4, OaksLabScript5, OaksLabScript6, OaksLabScript7
+
+INCBIN "baserom.gbc",$1cb38,$16
 
 OaksLabScript0: ; 0x1cb4e
     ld a, [$d74b]
@@ -9809,7 +9831,10 @@ Route5GateScript: ; 0x1df33
     jp $3d97
 ; 0x1df3f
 
-INCBIN "baserom.gbc",$1df3f,$11
+Route5GateScripts: ; 0x1df3f
+    dw Route5GateScript0
+
+INCBIN "baserom.gbc",$1df41,$f
 
 Route5GateScript0: ; 0x1df50
     ld a, [$d728]
@@ -9934,7 +9959,10 @@ Route6GateScript: ; 0x1e03d
     ret
 ; 0x1e04a
 
-INCBIN "baserom.gbc",$1e04a,$4
+Route6GateScripts: ; 0x1e04a
+    dw Route6GateScript0
+
+INCBIN "baserom.gbc",$1e04c,$2
 
 Route6GateScript0: ; 0x1e04e
     ld a, [$d728]
@@ -10012,7 +10040,10 @@ Route7GateScript: ; 0x1e100
     ret
 ; 0x1e10d
 
-INCBIN "baserom.gbc",$1e10d,$1b
+Route7GateScripts: ; 0x1e10d
+    dw Route7GateScript0
+
+INCBIN "baserom.gbc",$1e10f,$19
 
 Route7GateScript0: ; 0x1e128
     ld a, [$d728]
@@ -10090,7 +10121,10 @@ Route8GateScript: ; 0x1e1c7
     jp $3d97
 ; 0x1e1d3
 
-INCBIN "baserom.gbc",$1e1d3,$1b
+Route8GateScripts: ; 0x1e1d3
+    dw Route8GateScript0
+
+INCBIN "baserom.gbc",$1e1d5,$19
 
 Route8GateScript0: ; 0x1e1ee
     ld a, [$d728]
@@ -10447,7 +10481,10 @@ Route22GateScript: ; 0x1e683
     ret
 ; 0x1e69e
 
-INCBIN "baserom.gbc",$1e69e,$6
+Route22GateScripts: ; 0x1e69e
+    dw Route22GateScript0, Route22GateScript1
+
+INCBIN "baserom.gbc",$1e6a2,$2
 
 Route22GateScript0: ; 0x1e6a4
     ld hl, $66b5
@@ -10536,7 +10573,10 @@ BillsHouseScript: ; 0x1e76a
     jp $3d97
 ; 0x1e776
 
-INCBIN "baserom.gbc",$1e776,$c
+BillsHouseScripts: ; 0x1e776
+    dw BillsHouseScript0
+
+INCBIN "baserom.gbc",$1e778,$a
 
 BillsHouseScript0: ; 0x1e782
     ret
@@ -19327,7 +19367,12 @@ SeafoamIslands4Script: ; 0x4658d
     jp $3d97
 ; 0x465f6
 
-INCBIN "baserom.gbc",$465f6,$d
+INCBIN "baserom.gbc",$465f6,$465fb - $465f6
+
+SeafoamIslands4Scripts: ; 0x465fb
+    dw SeafoamIslands4Script0, SeafoamIslands4Script1
+
+INCBIN "baserom.gbc",$465ff,$4
 
 SeafoamIslands4Script0: ; 0x46603
     ld a, [$d880]
@@ -19418,7 +19463,12 @@ SeafoamIslands5Script: ; 0x46799
     jp $3d97
 ; 0x467a5
 
-INCBIN "baserom.gbc",$467a5,$22
+INCBIN "baserom.gbc",$467a5,$467ad - $467a5
+
+SeafoamIslands5Scripts: ; 0x467ad
+    dw SeafoamIslands5Script0, SeafoamIslands5Script1
+
+INCBIN "baserom.gbc",$467b1,$16
 
 SeafoamIslands5Script0: ; 0x467c7
     ld a, [$d880]
@@ -20478,7 +20528,12 @@ CeladonGameCornerScript: ; 0x48bbd
     jp $3d97
 ; 0x48bcf
 
-INCBIN "baserom.gbc",$48bcf,$49
+INCBIN "baserom.gbc",$48bcf,$48c12 - $48bcf
+
+CeladonGameCornerScripts: ; 0x48c12
+    dw CeladonGameCornerScript0
+
+INCBIN "baserom.gbc",$48c14,$4
 
 CeladonGameCornerScript0: ; 0x48c18
     ret
@@ -21529,7 +21584,10 @@ Route16GateMapScript: ; 0x496be
     jp $3d97
 ; 0x496cf
 
-INCBIN "baserom.gbc",$496cf,$8
+Route16GateMapScripts: ; 0x496cf
+    dw Route16GateMapScript0
+
+INCBIN "baserom.gbc",$496d1,$6
 
 Route16GateMapScript0: ; 0x496d7
     call $5755
@@ -21705,7 +21763,10 @@ Route18GateScript: ; 0x49876
     jp $3d97
 ; 0x49887
 
-INCBIN "baserom.gbc",$49887,$8
+Route18GateScripts: ; 0x49887
+    dw Route18GateScript0
+
+INCBIN "baserom.gbc",$49889,$6
 
 Route18GateScript0: ; 0x4988f
     call $5755
@@ -23180,7 +23241,10 @@ Route22Script: ; 0x50eb2
     jp $3d97
 ; 0x50ebe
 
-INCBIN "baserom.gbc",$50ebe,$42
+Route22Scripts: ; 0x50ebe
+    dw Route22Script0, Route22Script1, Route22Script2, Route22Script3
+
+INCBIN "baserom.gbc",$50ec6,$3a
 
 Route22Script0: ; 0x50f00
     ld a, [$d7eb]
@@ -23383,7 +23447,12 @@ Route23Script: ; 0x511da
     jp $3d97
 ; 0x511e9
 
-INCBIN "baserom.gbc",$511e9,$30
+INCBIN "baserom.gbc",$511e9,$51213 - $511e9
+
+Route23Scripts: ; 0x51213
+    dw Route23Script0
+
+INCBIN "baserom.gbc",$51215,$4
 
 Route23Script0: ; 0x51219
     ld hl, $5255
@@ -27729,7 +27798,12 @@ HallofFameRoomScript: ; 0x5a49e
     jp $3d97
 ; 0x5a4aa
 
-INCBIN "baserom.gbc",$5a4aa,$11
+INCBIN "baserom.gbc",$5a4aa,$5a4b2 - $5a4aa
+
+HallofFameRoomScripts: ; 0x5a4b2
+    dw HallofFameRoomScript0, HallofFameRoomScript1, HallofFameRoomScript2
+
+INCBIN "baserom.gbc",$5a4b8,$3
 
 HallofFameRoomScript2: ; 0x5a4bb
     call Delay3
@@ -27937,7 +28011,10 @@ MuseumF1Script: ; 0x5c0f7
     jp $3d97
 ; 0x5c109
 
-INCBIN "baserom.gbc",$5c109,$4
+MuseumF1Scripts: ; 0x5c109
+    dw MuseumF1Script0, MuseumF1Script1
+
+INCBIN "baserom.gbc",$5c10d,$0
 
 MuseumF1Script0: ; 0x5c10d
     ld a, [$d361]
@@ -30207,7 +30284,10 @@ PokemonTower2Script: ; 0x604f2
     jp $3d97
 ; 0x604fe
 
-INCBIN "baserom.gbc",$604fe,$11
+INCBIN "baserom.gbc",$604fe,$60509 - $604fe
+
+PokemonTower2Scripts: ; 0x60509
+    dw PokemonTower2Script0, PokemonTower2Script1, PokemonTower2Script2
 
 PokemonTower2Script0: ; 0x6050f
     ld a, [$d764]
@@ -31007,7 +31087,10 @@ SSAnne2Script: ; 0x6139f
     jp $3d97
 ; 0x613ab
 
-INCBIN "baserom.gbc",$613ab,$12
+INCBIN "baserom.gbc",$613ab,$613b3 - $613ab
+
+SSAnne2Scripts: ; 0x613b3
+    dw SSAnne2Script0, SSAnne2Script1, SSAnne2Script2, SSAnne2Script3, SSAnne2Script4
 
 SSAnne2Script4: ; 0x613bd
     ret
@@ -33765,7 +33848,10 @@ SafariZoneEntranceScript: ; 0x751cd
     jp $3d97
 ; 0x751d9
 
-INCBIN "baserom.gbc",$751d9,$e
+SafariZoneEntranceScripts: ; 0x751d9
+    dw SafariZoneEntranceScript0, SafariZoneEntranceScript1
+
+INCBIN "baserom.gbc",$751dd,$a
 
 SafariZoneEntranceScript0: ; 0x751e7
     ld hl, $5221
@@ -34100,7 +34186,12 @@ CinnabarGymScript: ; 0x7574a
     jp $3d97
 ; 0x75759
 
-INCBIN "baserom.gbc",$75759,$55
+INCBIN "baserom.gbc",$75759,$757a6 - $75759
+
+CinnabarGymScripts: ; 0x757a6
+    dw CinnabarGymScript0, CinnabarGymScript1
+
+INCBIN "baserom.gbc",$757aa,$4
 
 CinnabarGymScript0: ; 0x757ae
     ld a, [$da38]
@@ -34785,7 +34876,12 @@ GaryScript: ; 0x75f1d
     jp $3d97
 ; 0x75f29
 
-INCBIN "baserom.gbc",$75f29,$1e
+INCBIN "baserom.gbc",$75f29,$75f31 - $75f29
+
+GaryScripts: ; 0x75f31
+    dw GaryScript0
+
+INCBIN "baserom.gbc",$75f33,$14
 
 GaryScript0: ; 0x75f47
     ret
-- 
cgit v1.2.3


From f0b1dfca618b9b382b0be42c666fd570ffc86a05 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Fri, 13 Jan 2012 15:55:18 -0600
Subject: get rid of more empty incbins

hg-commit-id: baca2a858c5c
---
 pokered.asm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index b3e396d3..9bdd18ef 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -7935,8 +7935,6 @@ CinnabarIslandScript: ; 0x1ca19
 CinnabarIslandScripts: ; 0x1ca34
     dw CinnabarIslandScript0, CinnabarIslandScript1
 
-INCBIN "baserom.gbc",$1ca38,$0
-
 CinnabarIslandScript0: ; 0x1ca38
     ld b, $2b
     call $3493
@@ -28014,8 +28012,6 @@ MuseumF1Script: ; 0x5c0f7
 MuseumF1Scripts: ; 0x5c109
     dw MuseumF1Script0, MuseumF1Script1
 
-INCBIN "baserom.gbc",$5c10d,$0
-
 MuseumF1Script0: ; 0x5c10d
     ld a, [$d361]
     cp $4
-- 
cgit v1.2.3


From ffae079c96b7c89351d7aa237e4c5f0b7a842d5b Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Fri, 13 Jan 2012 17:13:30 -0600
Subject: fill out map headers with labels

hg-commit-id: a8366fd47048
---
 pokered.asm | 153 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 78 insertions(+), 75 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index 9bdd18ef..b4bfafe4 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -5290,7 +5290,7 @@ SECTION "bank6",DATA,BANK[$6]
 CeladonCity_h: ; 0x18000
     db $00 ; tileset
     db $12,$19 ; dimensions
-    dw CeladonCityBlocks, $5966, $5956 ; blocks, texts, scripts
+    dw CeladonCityBlocks, CeladonCityTexts, CeladonCityScript ; blocks, texts, scripts
     db WEST | EAST ; connections
 
     ; connection data
@@ -5372,7 +5372,7 @@ CeladonCityBlocks: ; 450
 PalletTown_h:
 	db $00 ; tileset
 	db $09,$0A ; dimensions
-	dw PalletTownBlocks,PalletTownTexts,PalletTownScript
+	dw PalletTownBlocks, PalletTownTexts, PalletTownScript
 	db NORTH | SOUTH ; connections
 
 	db $0C ; Route 1
@@ -5419,7 +5419,7 @@ PalletTownBlocks: ; 0x182fd
 ViridianCity_h: ; 0x18357 to 0x18384 (45 bytes) (bank=6) (id=1)
     db $00 ; tileset
     db $12, $14 ; dimensions (y, x)
-    dw ViridianCityBlocks, $50e4, $4ff1 ; blocks, texts, scripts
+    dw ViridianCityBlocks, ViridianCityTexts, ViridianCityScript ; blocks, texts, scripts
     db NORTH | SOUTH | WEST ; connections
 
     ; connections data
@@ -5486,7 +5486,7 @@ ViridianCityBlocks: ; 360
 PewterCity_h: ; 0x18554 to 0x18576 (34 bytes) (bank=6) (id=2)
     db $00 ; tileset
     db $12, $14 ; dimensions (y, x)
-    dw PewterCityBlocks, $538b, $5237 ; blocks, texts, scripts
+    dw PewterCityBlocks, PewterCityTexts, PewterCityScript ; blocks, texts, scripts
     db SOUTH | EAST ; connections
 
     ; connections data
@@ -5552,7 +5552,7 @@ PewterCityBlocks: ; 360
 CeruleanCity_h: ; 0x1874e to 0x18786 (56 bytes) (bank=6) (id=3)
     db $00 ; tileset
     db $12, $14 ; dimensions (y, x)
-    dw CeruleanCityBlocks, $562d, $5480 ; blocks, texts, scripts
+    dw CeruleanCityBlocks, CeruleanCityTexts, CeruleanCityScript ; blocks, texts, scripts
     db NORTH | SOUTH | WEST | EAST ; connections
 
     ; connections data
@@ -5639,7 +5639,7 @@ CeruleanCityBlocks: ; 360
 VermilionCity_h: ; 0x18998 to 0x189ba (34 bytes) (bank=6) (id=5)
     db $00 ; tileset
     db $12, $14 ; dimensions (y, x)
-    dw VermilionCityBlocks, $586f, $57a1 ; blocks, texts, scripts
+    dw VermilionCityBlocks, VermilionCityTexts, VermilionCityScript ; blocks, texts, scripts
     db NORTH | EAST ; connections
 
     ; connections data
@@ -5708,7 +5708,7 @@ VermilionCityBlocks: ; 360
 FuchsiaCity_h: ; 0x18ba7 to 0x18bd4 (45 bytes) (bank=6) (id=7)
     db $00 ; tileset
     db $12, $14 ; dimensions (y, x)
-    dw FuchsiaCityBlocks, $5a2e, $5a2b ; blocks, texts, scripts
+    dw FuchsiaCityBlocks, FuchsiaCityTexts, FuchsiaCityScript ; blocks, texts, scripts
     db SOUTH | WEST | EAST ; connections
 
     ; connections data
@@ -7044,7 +7044,7 @@ INCBIN "baserom.gbc",$19b20,$f
 BluesHouse_h: ; 0x19b2f
 	db $08 ; tileset
 	db $04,$04 ; dimensions
-	dw BluesHouseBlocks,BluesHouseTexts,BluesHouseScript
+	dw BluesHouseBlocks, BluesHouseTexts, BluesHouseScript
 	db 0
 	dw BluesHouseObject
 
@@ -7157,7 +7157,7 @@ BluesHouseBlocks:
 VermilionHouse3_h: ; 0x19c06 to 0x19c12 (12 bytes) (bank=6) (id=196)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw VermilionHouse3Blocks, $5c15, $5c12 ; blocks, texts, scripts
+    dw VermilionHouse3Blocks, VermilionHouse3Texts, VermilionHouse3Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5c25 ; objects
@@ -7199,7 +7199,7 @@ VermilionHouse3Blocks: ; 16
 IndigoPlateauLobby_h: ; 0x19c4f to 0x19c5b (12 bytes) (bank=6) (id=174)
     db $02 ; tileset
     db $06, $08 ; dimensions (y, x)
-    dw IndigoPlateauLobbyBlocks, $5c7f, $5c5b ; blocks, texts, scripts
+    dw IndigoPlateauLobbyBlocks, IndigoPlateauLobbyTexts, IndigoPlateauLobbyScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5c95 ; objects
@@ -7225,6 +7225,8 @@ IndigoPlateauLobbyScript: ; 0x19c5b
     ld [hl], a
     ret
 ; 0x19c7f
+
+IndigoPlateauLobbyTexts:
 INCBIN "baserom.gbc",$19c7f,$b
 
 IndigoPlateauLobbyText2:
@@ -7269,7 +7271,7 @@ IndigoPlateauLobbyBlocks: ; 48
 SilphCo4_h: ; 0x19cff to 0x19d0b (12 bytes) (bank=6) (id=209)
     db $16 ; tileset
     db $09, $0f ; dimensions (y, x)
-    dw SilphCo4Blocks, $5da0, $5d0b ; blocks, texts, scripts
+    dw SilphCo4Blocks, SilphCo4Texts, SilphCo4Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5e35 ; objects
@@ -7363,7 +7365,7 @@ SilphCo4Blocks: ; 135
 SilphCo5_h: ; 0x19f2b to 0x19f37 (12 bytes) (bank=6) (id=210)
     db $16 ; tileset
     db $09, $0f ; dimensions (y, x)
-    dw SilphCo5Blocks, $5fbc, $5f37 ; blocks, texts, scripts
+    dw SilphCo5Blocks, SilphCo5Texts, SilphCo5Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $608d ; objects
@@ -7481,7 +7483,7 @@ SilphCo5Blocks: ; 135
 SilphCo6_h: ; 0x1a19d to 0x1a1a9 (12 bytes) (bank=6) (id=211)
     db $16 ; tileset
     db $09, $0d ; dimensions (y, x)
-    dw SilphCo6Blocks, $61f6, $61a9 ; blocks, texts, scripts
+    dw SilphCo6Blocks, SilphCo6Texts, SilphCo6Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $62fb ; objects
@@ -7614,7 +7616,7 @@ SECTION "bank7",DATA,BANK[$7]
 CinnabarIsland_h: ; 0x1c000 to 0x1c022 (34 bytes) (bank=7) (id=8)
     db $00 ; tileset
     db $09, $0a ; dimensions (y, x)
-    dw CinnabarIslandBlocks, $4a81, $4a19 ; blocks, texts, scripts
+    dw CinnabarIslandBlocks, CinnabarIslandTexts, CinnabarIslandScript ; blocks, texts, scripts
     db NORTH | EAST ; connections
 
     ; connections data
@@ -7669,7 +7671,7 @@ CinnabarIslandBlocks: ; 90
 Route1_h: ; 0x1c0c3 to 0x1c0e5 (34 bytes) (bank=7) (id=12)
     db $00 ; tileset
     db $12, $0a ; dimensions (y, x)
-    dw Route1Blocks, $4ab2, $4aaf ; blocks, texts, scripts
+    dw Route1Blocks, Route1Texts, Route1Script ; blocks, texts, scripts
     db NORTH | SOUTH ; connections
 
     ; connections data
@@ -8043,7 +8045,7 @@ Route1Text3: ; 0x1cafd
 OaksLab_h: ; 0x1cb02 to 0x1cb0e (12 bytes) (bank=7) (id=40)
     db $05 ; tileset
     db $06, $05 ; dimensions (y, x)
-    dw OaksLabBlocks, $5082, $4b0e ; blocks, texts, scripts
+    dw OaksLabBlocks, OaksLabTexts, OaksLabScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $540a ; objects
@@ -8644,7 +8646,7 @@ OaksLabObject: ; 0x1d40a (size=88)
 ViridianMart_h: ; 0x1d462 to 0x1d46e (12 bytes) (bank=7) (id=42)
     db $02 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw ViridianMartBlocks, $54e0, $546e ; blocks, texts, scripts
+    dw ViridianMartBlocks, ViridianMartTexts, ViridianMartScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $550a ; objects
@@ -8737,7 +8739,7 @@ ViridianMartBlocks: ; 16
 School_h: ; 0x1d540 to 0x1d54c (12 bytes) (bank=7) (id=43)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw SchoolBlocks, $554f, $554c ; blocks, texts, scripts
+    dw SchoolBlocks, SchoolTexts, SchoolScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $555d ; objects
@@ -8777,7 +8779,7 @@ SchoolObject: ; 0x1d55d (size=32)
 ViridianHouse_h: ; 0x1d57d to 0x1d589 (12 bytes) (bank=7) (id=44)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw ViridianHouseBlocks, $558d, $558a ; blocks, texts, scripts
+    dw ViridianHouseBlocks, ViridianHouseTexts, ViridianHouseScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $55bb ; objects
@@ -8836,7 +8838,7 @@ ViridianHouseObject: ; 0x1d5bb (size=44)
 PewterHouse1_h: ; 0x1d5e7 to 0x1d5f3 (12 bytes) (bank=7) (id=55)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, $55f6, $55f3 ; blocks, texts, scripts
+    dw $41de, PewterHouse1Texts, PewterHouse1Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5616 ; objects
@@ -8885,7 +8887,7 @@ PewterHouse1Object: ; 0x1d616 (size=38)
 PewterHouse2_h: ; 0x1d63c to 0x1d648 (12 bytes) (bank=7) (id=57)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, $564b, $5648 ; blocks, texts, scripts
+    dw $41de, PewterHouse2Texts, PewterHouse2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5659 ; objects
@@ -8925,7 +8927,7 @@ PewterHouse2Object: ; 0x1d659 (size=32)
 CeruleanHouseTrashed_h: ; 0x1d679 to 0x1d685 (12 bytes) (bank=7) (id=62)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw CeruleanHouseTrashedBlocks, $5689, $5685 ; blocks, texts, scripts
+    dw CeruleanHouseTrashedBlocks, CeruleanHouseTrashedTexts, CeruleanHouseTrashedScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $56bf ; objects
@@ -8987,7 +8989,7 @@ CeruleanHouseTrashedObject: ; 0x1d6bf (size=43)
 CeruleanHouse2_h: ; 0x1d6ea to 0x1d6f6 (12 bytes) (bank=7) (id=63)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, $56f9, $56f6 ; blocks, texts, scripts
+    dw $41de, CeruleanHouse2Texts, CeruleanHouse2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5710 ; objects
@@ -9031,7 +9033,7 @@ CeruleanHouse2Object: ; 0x1d710 (size=32)
 BikeShop_h: ; 0x1d730 to 0x1d73c (12 bytes) (bank=7) (id=66)
     db $15 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw BikeShopBlocks, $573f, $573c ; blocks, texts, scripts
+    dw BikeShopBlocks, BikeShopTexts, BikeShopScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5866 ; objects
@@ -9166,7 +9168,7 @@ BikeShopBlocks: ; 16
 LavenderHouse1_h: ; 0x1d89c to 0x1d8a8 (12 bytes) (bank=7) (id=149)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, $58ac, $58a8 ; blocks, texts, scripts
+    dw $41de, LavenderHouse1Texts, LavenderHouse1Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $596a ; objects
@@ -9281,7 +9283,7 @@ LavenderHouse1Object: ; 0x1d96a (size=56)
 LavenderHouse2_h: ; 0x1d9a2 to 0x1d9ae (12 bytes) (bank=7) (id=151)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, $59b2, $59ae ; blocks, texts, scripts
+    dw $41de, LavenderHouse2Texts, LavenderHouse2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $59e6 ; objects
@@ -9338,7 +9340,7 @@ LavenderHouse2Object: ; 0x1d9e6 (size=32)
 NameRater_h: ; 0x1da06 to 0x1da12 (12 bytes) (bank=7) (id=229)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, $5a54, $5a12 ; blocks, texts, scripts
+    dw $41de, $5a54, NameRaterScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5ad6 ; objects
@@ -9411,7 +9413,7 @@ NameRaterObject: ; 0x1dad6 (size=26)
 VermilionHouse1_h: ; 0x1daf0 to 0x1dafc (12 bytes) (bank=7) (id=93)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, $5b00, $5afc ; blocks, texts, scripts
+    dw $41de, VermilionHouse1Texts, VermilionHouse1Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5b20 ; objects
@@ -9463,7 +9465,7 @@ VermilionHouse1Object: ; 0x1db20 (size=38)
 VermilionDock_h: ; 0x1db46 to 0x1db52 (12 bytes) (bank=7) (id=94)
     db $0e ; tileset
     db $06, $0e ; dimensions (y, x)
-    dw VermilionDockBlocks, $5cbf, $5b52 ; blocks, texts, scripts
+    dw VermilionDockBlocks, $5cbf, VermilionDockScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5cc6 ; objects
@@ -9507,6 +9509,7 @@ VermilionDockScript: ; 0x1db52
     set 5, [hl]
     ret
 ; 0x1db9b
+
 INCBIN "baserom.gbc",$1db9b,$12b
 
 VermilionDockObject: ; 0x1dcc6 (size=20)
@@ -9530,7 +9533,7 @@ VermilionDockBlocks: ; 84
 CeladonMansion5_h: ; 0x1dd2e to 0x1dd3a (12 bytes) (bank=7) (id=132)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41ee, $5d3d, $5d3a ; blocks, texts, scripts
+    dw $41ee, CeladonMansion5Texts, CeladonMansion5Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5d5c ; objects
@@ -9578,7 +9581,7 @@ CeladonMansion5Object: ; 0x1dd5c (size=32)
 FuchsiaMart_h: ; 0x1dd7c to 0x1dd88 (12 bytes) (bank=7) (id=152)
     db $02 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw FuchsiaMartBlocks, $5d8b, $5d88 ; blocks, texts, scripts
+    dw FuchsiaMartBlocks, FuchsiaMartTexts, FuchsiaMartScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5d9b ; objects
@@ -9622,7 +9625,7 @@ FuchsiaMartBlocks: ; 16
 SaffronHouse1_h: ; 0x1ddd1 to 0x1dddd (12 bytes) (bank=7) (id=179)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, $5de0, $5ddd ; blocks, texts, scripts
+    dw $41de, SaffronHouse1Texts, SaffronHouse1Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5e04 ; objects
@@ -9676,7 +9679,7 @@ SaffronHouse1Object: ; 0x1de04 (size=44)
 SaffronHouse2_h: ; 0x1de30 to 0x1de3c (12 bytes) (bank=7) (id=183)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, $5e3f, $5e3c ; blocks, texts, scripts
+    dw $41de, SaffronHouse2Texts, SaffronHouse2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5e8a ; objects
@@ -9734,7 +9737,7 @@ SaffronHouse2Object: ; 0x1de8a (size=26)
 DiglettsCaveRoute2_h: ; 0x1dea4 to 0x1deb0 (12 bytes) (bank=7) (id=46)
     db $11 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw DiglettsCaveRoute2Blocks, $5eb8, $5eb0 ; blocks, texts, scripts
+    dw DiglettsCaveRoute2Blocks, DiglettsCaveRoute2Texts, DiglettsCaveRoute2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5ebf ; objects
@@ -9773,7 +9776,7 @@ DiglettsCaveRoute2Object: ; 0x1debf (size=34)
 Route2House_h: ; 0x1dee1 to 0x1deed (12 bytes) (bank=7) (id=48)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, $5ef0, $5eed ; blocks, texts, scripts
+    dw $41de, Route2HouseTexts, Route2HouseScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5f07 ; objects
@@ -9817,7 +9820,7 @@ Route2HouseObject: ; 0x1df07 (size=32)
 Route5Gate_h: ; 0x1df27 to 0x1df33 (12 bytes) (bank=7) (id=70)
     db $0c ; tileset
     db $03, $04 ; dimensions (y, x)
-    dw Route5GateBlocks, $5fa4, $5f33 ; blocks, texts, scripts
+    dw Route5GateBlocks, Route5GateTexts, Route5GateScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5ffb ; objects
@@ -9944,7 +9947,7 @@ Route5GateBlocks: ; 12
 Route6Gate_h: ; 0x1e031 to 0x1e03d (12 bytes) (bank=7) (id=73)
     db $0c ; tileset
     db $03, $04 ; dimensions (y, x)
-    dw Route6GateBlocks, $60b8, $603d ; blocks, texts, scripts
+    dw Route6GateBlocks, Route6GateTexts, Route6GateScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $60be ; objects
@@ -10025,7 +10028,7 @@ Route6GateBlocks: ; 12
 Route7Gate_h: ; 0x1e0f4 to 0x1e100 (12 bytes) (bank=7) (id=76)
     db $0c ; tileset
     db $04, $03 ; dimensions (y, x)
-    dw Route7GateBlocks, $617f, $6100 ; blocks, texts, scripts
+    dw Route7GateBlocks, Route7GateTexts, Route7GateScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $6185 ; objects
@@ -10107,7 +10110,7 @@ Route7GateBlocks: ; 12
 Route8Gate_h: ; 0x1e1bb to 0x1e1c7 (12 bytes) (bank=7) (id=79)
     db $0c ; tileset
     db $04, $03 ; dimensions (y, x)
-    dw Route8GateBlocks, $6241, $61c7 ; blocks, texts, scripts
+    dw Route8GateBlocks, Route8GateTexts, Route8GateScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $6247 ; objects
@@ -10186,7 +10189,7 @@ Route8GateBlocks: ; 12
 UndergroundPathEntranceRoute8_h: ; 0x1e27d to 0x1e289 (12 bytes) (bank=7) (id=80)
     db $0c ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw UndergroundPathEntranceRoute8Blocks, $6291, $6289 ; blocks, texts, scripts
+    dw UndergroundPathEntranceRoute8Blocks, UndergroundPathEntranceRoute8Texts, UndergroundPathEntranceRoute8Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $6298 ; objects
@@ -10227,7 +10230,7 @@ UndergroundPathEntranceRoute8Object: ; 0x1e298 (size=34)
 PowerPlant_h: ; 0x1e2ba to 0x1e2c6 (12 bytes) (bank=7) (id=83)
     db $16 ; tileset
     db $12, $14 ; dimensions (y, x)
-    dw PowerPlantBlocks, $62df, $62c6 ; blocks, texts, scripts
+    dw PowerPlantBlocks, PowerPlantTexts, PowerPlantScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $63bf ; objects
@@ -10351,7 +10354,7 @@ PowerPlantBlocks: ; 360
 DiglettsCaveEntranceRoute11_h: ; 0x1e5ae to 0x1e5ba (12 bytes) (bank=7) (id=85)
     db $11 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $420e, $65c3, $65ba ; blocks, texts, scripts
+    dw $420e, DiglettsCaveEntranceRoute11Texts, DiglettsCaveEntranceRoute11Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $65ca ; objects
@@ -10393,7 +10396,7 @@ DiglettsCaveEntranceRoute11Object: ; 0x1e5ca (size=34)
 Route16House_h: ; 0x1e5ec to 0x1e5f8 (12 bytes) (bank=7) (id=188)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, $65fb, $65f8 ; blocks, texts, scripts
+    dw $41de, Route16HouseTexts, Route16HouseScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $6657 ; objects
@@ -10459,7 +10462,7 @@ Route16HouseObject: ; 0x1e657 (size=32)
 Route22Gate_h: ; 0x1e677 to 0x1e683 (12 bytes) (bank=7) (id=193)
     db $0c ; tileset
     db $04, $05 ; dimensions (y, x)
-    dw Route22GateBlocks, $66df, $6683 ; blocks, texts, scripts
+    dw Route22GateBlocks, Route22GateTexts, Route22GateScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $6720 ; objects
@@ -10559,7 +10562,7 @@ Route22GateBlocks: ; 20
 BillsHouse_h: ; 0x1e75e to 0x1e76a (12 bytes) (bank=7) (id=88)
     db $10 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $6905, $6834, $676a ; blocks, texts, scripts
+    dw $6905, BillsHouseTexts, BillsHouseScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $68df ; objects
@@ -17590,7 +17593,7 @@ SECTION "bank11",DATA,BANK[$11]
 LavenderTown_h: ; 0x44000 to 0x4402d (45 bytes) (bank=11) (id=4)
     db $00 ; tileset
     db $09, $0a ; dimensions (y, x)
-    dw LavenderTownBlocks, $410e, $410b ; blocks, texts, scripts
+    dw LavenderTownBlocks, LavenderTownTexts, LavenderTownScript ; blocks, texts, scripts
     db NORTH | SOUTH | WEST ; connections
 
     ; connections data
@@ -17710,7 +17713,7 @@ INCBIN "baserom.gbc",$44169,$e8
 ViridianPokecenter_h: ; 0x44251 to 0x4425d (12 bytes) (bank=11) (id=41)
     db $06 ; tileset
     db $04, $07 ; dimensions (y, x)
-    dw $40df, $4263, $425d ; blocks, texts, scripts
+    dw $40df, $4263, ViridianPokeCenterScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $4277 ; objects
@@ -17808,7 +17811,7 @@ INCBIN "baserom.gbc",$443fe,$d2
 RockTunnel1_h: ; 0x444d0 to 0x444dc (12 bytes) (bank=11) (id=82)
     db $11 ; tileset
     db $12, $14 ; dimensions (y, x)
-    dw RockTunnel1Blocks, $44f5, $44dc ; blocks, texts, scripts
+    dw RockTunnel1Blocks, RockTunnel1Texts, RockTunnel1Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $45f6 ; objects
@@ -17914,7 +17917,7 @@ RockTunnel1Blocks: ; 360
 SeafoamIslands1_h: ; 0x447dd to 0x447e9 (12 bytes) (bank=11) (id=192)
     db $11 ; tileset
     db $09, $0f ; dimensions (y, x)
-    dw SeafoamIslands1Blocks, $484b, $47e9 ; blocks, texts, scripts
+    dw SeafoamIslands1Blocks, SeafoamIslands1Texts, SeafoamIslands1Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $484f ; objects
@@ -18002,7 +18005,7 @@ SeafoamIslands1Blocks: ; 135
 SSAnne3_h: ; 0x44926 to 0x44932 (12 bytes) (bank=11) (id=97)
     db $0d ; tileset
     db $03, $0a ; dimensions (y, x)
-    dw SSAnne3Blocks, $4935, $4932 ; blocks, texts, scripts
+    dw SSAnne3Blocks, SSAnne3Texts, SSAnne3Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $493c ; objects
@@ -18040,7 +18043,7 @@ SSAnne3Blocks: ; 30
 VictoryRoad3_h: ; 0x44974 to 0x44980 (12 bytes) (bank=11) (id=198)
     db $11 ; tileset
     db $09, $0f ; dimensions (y, x)
-    dw VictoryRoad3Blocks, $4a24, $4980 ; blocks, texts, scripts
+    dw VictoryRoad3Blocks, VictoryRoad3Texts, VictoryRoad3Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $4acd ; objects
@@ -18124,7 +18127,7 @@ VictoryRoad3Blocks: ; 135
 RocketHideout1_h: ; 0x44bbe to 0x44bca (12 bytes) (bank=11) (id=199)
     db $16 ; tileset
     db $0e, $0f ; dimensions (y, x)
-    dw RocketHideout1Blocks, $4c14, $4bca ; blocks, texts, scripts
+    dw RocketHideout1Blocks, RocketHideout1Texts, RocketHideout1Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $4ce7 ; objects
@@ -18213,7 +18216,7 @@ RocketHideout1Blocks: ; 210
 RocketHideout2_h: ; 0x44e1b to 0x44e27 (12 bytes) (bank=11) (id=200)
     db $16 ; tileset
     db $0e, $0f ; dimensions (y, x)
-    dw RocketHideout2Blocks, $50c7, $4e27 ; blocks, texts, scripts
+    dw RocketHideout2Blocks, RocketHideout2Texts, RocketHideout2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $50f7 ; objects
@@ -18275,7 +18278,7 @@ RocketHideout2Blocks: ; 210
 RocketHideout3_h: ; 0x45219 to 0x45225 (12 bytes) (bank=11) (id=201)
     db $16 ; tileset
     db $0e, $0f ; dimensions (y, x)
-    dw RocketHideout3Blocks, $52fa, $5225 ; blocks, texts, scripts
+    dw RocketHideout3Blocks, RocketHideout3Texts, RocketHideout3Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $534d ; objects
@@ -18338,7 +18341,7 @@ RocketHideout3Blocks: ; 210
 RocketHideout4_h: ; 0x45451 to 0x4545d (12 bytes) (bank=11) (id=202)
     db $16 ; tileset
     db $0c, $0f ; dimensions (y, x)
-    dw RocketHideout4Blocks, $5501, $545d ; blocks, texts, scripts
+    dw RocketHideout4Blocks, RocketHideout4Texts, RocketHideout4Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $55f1 ; objects
@@ -18450,7 +18453,7 @@ RocketHideout4Blocks: ; 180
 RocketHideoutElevator_h: ; 0x45704 to 0x45710 (12 bytes) (bank=11) (id=203)
     db $12 ; tileset
     db $04, $03 ; dimensions (y, x)
-    dw RocketHideoutElevatorBlocks, $576b, $5710 ; blocks, texts, scripts
+    dw RocketHideoutElevatorBlocks, RocketHideoutElevatorTexts, RocketHideoutElevatorScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5791 ; objects
@@ -18517,7 +18520,7 @@ RocketHideoutElevatorBlocks: ; 12
 SilphCoElevator_h: ; 0x457b4 to 0x457c0 (12 bytes) (bank=11) (id=236)
     db $12 ; tileset
     db $02, $02 ; dimensions (y, x)
-    dw SilphCoElevatorBlocks, $5833, $57c0 ; blocks, texts, scripts
+    dw SilphCoElevatorBlocks, SilphCoElevatorTexts, SilphCoElevatorScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5844 ; objects
@@ -18574,7 +18577,7 @@ SilphCoElevatorBlocks: ; 4
 SafariZoneEast_h: ; 0x4585f to 0x4586b (12 bytes) (bank=11) (id=217)
     db $03 ; tileset
     db $0d, $0f ; dimensions (y, x)
-    dw SafariZoneEastBlocks, $586e, $586b ; blocks, texts, scripts
+    dw SafariZoneEastBlocks, SafariZoneEastTexts, SafariZoneEastScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $588b ; objects
@@ -18632,7 +18635,7 @@ SafariZoneEastBlocks: ; 195
 SafariZoneNorth_h: ; 0x4599f to 0x459ab (12 bytes) (bank=11) (id=218)
     db $03 ; tileset
     db $12, $14 ; dimensions (y, x)
-    dw SafariZoneNorthBlocks, $59ae, $59ab ; blocks, texts, scripts
+    dw SafariZoneNorthBlocks, SafariZoneNorthTexts, SafariZoneNorthScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $59d5 ; objects
@@ -18706,7 +18709,7 @@ SafariZoneNorthBlocks: ; 360
 SafariZoneCenter_h: ; 0x45ba6 to 0x45bb2 (12 bytes) (bank=11) (id=220)
     db $03 ; tileset
     db $0d, $0f ; dimensions (y, x)
-    dw SafariZoneCenterBlocks, $5bb5, $5bb2 ; blocks, texts, scripts
+    dw SafariZoneCenterBlocks, SafariZoneCenterTexts, SafariZoneCenterScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5bc5 ; objects
@@ -18764,7 +18767,7 @@ SafariZoneCenterBlocks: ; 195
 SafariZoneRestHouse1_h: ; 0x45ce1 to 0x45ced (12 bytes) (bank=11) (id=221)
     db $0c ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw SafariZoneRestHouse1Blocks, $5cf0, $5ced ; blocks, texts, scripts
+    dw SafariZoneRestHouse1Blocks, SafariZoneRestHouse1Texts, SafariZoneRestHouse1Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5cfe ; objects
@@ -18804,7 +18807,7 @@ SafariZoneRestHouse1Object: ; 0x45cfe (size=32)
 SafariZoneRestHouse2_h: ; 0x45d1e to 0x45d2a (12 bytes) (bank=11) (id=223)
     db $0c ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $40fb, $5d2e, $5d2a ; blocks, texts, scripts
+    dw $40fb, SafariZoneRestHouse2Texts, SafariZoneRestHouse2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5d43 ; objects
@@ -18850,7 +18853,7 @@ SafariZoneRestHouse2Object: ; 0x45d43 (size=38)
 SafariZoneRestHouse3_h: ; 0x45d69 to 0x45d75 (12 bytes) (bank=11) (id=224)
     db $0c ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $40fb, $5d79, $5d75 ; blocks, texts, scripts
+    dw $40fb, SafariZoneRestHouse3Texts, SafariZoneRestHouse3Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5d8e ; objects
@@ -18896,7 +18899,7 @@ SafariZoneRestHouse3Object: ; 0x45d8e (size=38)
 SafariZoneRestHouse4_h: ; 0x45db4 to 0x45dc0 (12 bytes) (bank=11) (id=225)
     db $0c ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $40fb, $5dc4, $5dc0 ; blocks, texts, scripts
+    dw $40fb, SafariZoneRestHouse4Texts, SafariZoneRestHouse4Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5dd9 ; objects
@@ -18942,7 +18945,7 @@ SafariZoneRestHouse4Object: ; 0x45dd9 (size=38)
 UnknownDungeon2_h: ; 0x45dff to 0x45e0b (12 bytes) (bank=11) (id=226)
     db $11 ; tileset
     db $09, $0f ; dimensions (y, x)
-    dw UnknownDungeon2Blocks, $5e0e, $5e0b ; blocks, texts, scripts
+    dw UnknownDungeon2Blocks, UnknownDungeon2Texts, UnknownDungeon2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5e14 ; objects
@@ -18986,7 +18989,7 @@ UnknownDungeon2Blocks: ; 135
 UnknownDungeon3_h: ; 0x45ee4 to 0x45ef0 (12 bytes) (bank=11) (id=227)
     db $11 ; tileset
     db $09, $0f ; dimensions (y, x)
-    dw UnknownDungeon3Blocks, $5f09, $5ef0 ; blocks, texts, scripts
+    dw UnknownDungeon3Blocks, UnknownDungeon3Texts, UnknownDungeon3Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5f36 ; objects
@@ -19038,7 +19041,7 @@ UnknownDungeon3Blocks: ; 135
 RockTunnel2_h: ; 0x45fdf to 0x45feb (12 bytes) (bank=11) (id=232)
     db $11 ; tileset
     db $12, $14 ; dimensions (y, x)
-    dw RockTunnel2Blocks, $6004, $5feb ; blocks, texts, scripts
+    dw RockTunnel2Blocks, RockTunnel2Texts, RockTunnel2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $613d ; objects
@@ -19143,7 +19146,7 @@ RockTunnel2Blocks: ; 360
 SeafoamIslands2_h: ; 0x46309 to 0x46315 (12 bytes) (bank=11) (id=159)
     db $11 ; tileset
     db $09, $0f ; dimensions (y, x)
-    dw SeafoamIslands2Blocks, $6372, $6315 ; blocks, texts, scripts
+    dw SeafoamIslands2Blocks, SeafoamIslands2Texts, SeafoamIslands2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $6376 ; objects
@@ -19227,7 +19230,7 @@ SeafoamIslands2Blocks: ; 135
 SeafoamIslands3_h: ; 0x46445 to 0x46451 (12 bytes) (bank=11) (id=160)
     db $11 ; tileset
     db $09, $0f ; dimensions (y, x)
-    dw SeafoamIslands3Blocks, $64ae, $6451 ; blocks, texts, scripts
+    dw SeafoamIslands3Blocks, SeafoamIslands3Texts, SeafoamIslands3Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $64b2 ; objects
@@ -19311,7 +19314,7 @@ SeafoamIslands3Blocks: ; 135
 SeafoamIslands4_h: ; 0x46581 to 0x4658d (12 bytes) (bank=11) (id=161)
     db $11 ; tileset
     db $09, $0f ; dimensions (y, x)
-    dw SeafoamIslands4Blocks, $669a, $658d ; blocks, texts, scripts
+    dw SeafoamIslands4Blocks, SeafoamIslands4Texts, SeafoamIslands4Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $66a6 ; objects
@@ -19449,7 +19452,7 @@ SeafoamIslands4Blocks: ; 135
 SeafoamIslands5_h: ; 0x4678d to 0x46799 (12 bytes) (bank=11) (id=162)
     db $11 ; tileset
     db $09, $0f ; dimensions (y, x)
-    dw SeafoamIslands5Blocks, $687c, $6799 ; blocks, texts, scripts
+    dw SeafoamIslands5Blocks, SeafoamIslands5Texts, SeafoamIslands5Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $68bc ; objects
@@ -19577,7 +19580,7 @@ SECTION "bank12",DATA,BANK[$12]
 Route7_h: ; 0x48000 to 0x48022 (34 bytes) (bank=12) (id=18)
     db $00 ; tileset
     db $09, $0a ; dimensions (y, x)
-    dw Route7Blocks, $4155, $4152 ; blocks, texts, scripts
+    dw Route7Blocks, $4155, Route7Script ; blocks, texts, scripts
     db WEST | EAST ; connections
 
     ; connections data
@@ -19647,7 +19650,7 @@ Route7Text1: ; 0x48157
 RedsHouse1F_h: ; 415C
 	db $01 ; tileset
 	db $04,$04 ; dimensions
-	dw RedsHouse1FBlocks,RedsHouse1FTexts,RedsHouse1FScript
+	dw RedsHouse1FBlocks, RedsHouse1FTexts, RedsHouse1FScript
 	db 0 ; no connections
 	dw RedsHouse1FObject
 
@@ -19752,7 +19755,7 @@ RedsHouse1FBlocks:
 CeladonMart3_h: ; 0x48219 to 0x48225 (12 bytes) (bank=12) (id=124)
     db $12 ; tileset
     db $04, $0a ; dimensions (y, x)
-    dw CeladonMart3Blocks, $4228, $4225 ; blocks, texts, scripts
+    dw CeladonMart3Blocks, CeladonMart3Texts, CeladonMart3Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $42c4 ; objects
@@ -19878,7 +19881,7 @@ CeladonMart3Blocks: ; 40
 CeladonMart4_h: ; 0x4834a to 0x48356 (12 bytes) (bank=12) (id=125)
     db $12 ; tileset
     db $04, $0a ; dimensions (y, x)
-    dw CeladonMart4Blocks, $4359, $4356 ; blocks, texts, scripts
+    dw CeladonMart4Blocks, CeladonMart4Texts, CeladonMart4Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $4370 ; objects
-- 
cgit v1.2.3


From c434dd294aabfef17e82ce0ed370b4107fd3f97a Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Fri, 13 Jan 2012 17:42:12 -0600
Subject: more map header labels

hg-commit-id: f69ff5be3cb6
---
 pokered.asm | 92 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index b4bfafe4..15b666fd 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -19932,9 +19932,9 @@ CeladonMart4Blocks: ; 40
 CeladonMartRoof_h: ; 0x483c9 to 0x483d5 (12 bytes) (bank=12) (id=126)
     db $12 ; tileset
     db $04, $0a ; dimensions (y, x)
-    dw CeladonMartRoofBlocks, $455b, $43d5 ; blocks, texts, scripts
+    dw CeladonMartRoofBlocks, $455b, CeladonMartRoofScript ; blocks, texts, scripts
     db $00 ; connections
-
+    
     dw $45a8 ; objects
 
 CeladonMartRoofScript: ; 0x483d5
@@ -20000,7 +20000,7 @@ CeladonMartRoofBlocks: ; 40
 CeladonMartElevator_h: ; 0x485f4 to 0x48600 (12 bytes) (bank=12) (id=127)
     db $12 ; tileset
     db $02, $02 ; dimensions (y, x)
-    dw CeladonMartElevatorBlocks, $465c, $4600 ; blocks, texts, scripts
+    dw CeladonMartElevatorBlocks, CeladonMartElevatorTexts, CeladonMartElevatorScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $466d ; objects
@@ -20057,7 +20057,7 @@ CeladonMartElevatorBlocks: ; 4
 CeladonMansion1_h: ; 0x48688 to 0x48694 (12 bytes) (bank=12) (id=128)
     db $13 ; tileset
     db $06, $04 ; dimensions (y, x)
-    dw CeladonMansion1Blocks, $4697, $4694 ; blocks, texts, scripts
+    dw CeladonMansion1Blocks, CeladonMansion1Texts, CeladonMansion1Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $46cf ; objects
@@ -20134,7 +20134,7 @@ CeladonMansion1Blocks: ; 24
 CeladonMansion2_h: ; 0x4872e to 0x4873a (12 bytes) (bank=12) (id=129)
     db $13 ; tileset
     db $06, $04 ; dimensions (y, x)
-    dw CeladonMansion2Blocks, $473e, $473a ; blocks, texts, scripts
+    dw CeladonMansion2Blocks, CeladonMansion2Texts, CeladonMansion2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $4745 ; objects
@@ -20177,7 +20177,7 @@ CeladonMansion2Blocks: ; 24
 CeladonMansion3_h: ; 0x48784 to 0x48790 (12 bytes) (bank=12) (id=130)
     db $13 ; tileset
     db $06, $04 ; dimensions (y, x)
-    dw CeladonMansion3Blocks, $4793, $4790 ; blocks, texts, scripts
+    dw CeladonMansion3Blocks, CeladonMansion3Texts, CeladonMansion3Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $47ff ; objects
@@ -20268,7 +20268,7 @@ CeladonMansion3Blocks: ; 24
 CeladonMansion4_h: ; 0x4885f to 0x4886b (12 bytes) (bank=12) (id=131)
     db $13 ; tileset
     db $06, $04 ; dimensions (y, x)
-    dw CeladonMansion4Blocks, $486e, $486b ; blocks, texts, scripts
+    dw CeladonMansion4Blocks, CeladonMansion4Texts, CeladonMansion4Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $4875 ; objects
@@ -20308,7 +20308,7 @@ CeladonMansion4Blocks: ; 24
 CeladonPokecenter_h: ; 0x488ac to 0x488b8 (12 bytes) (bank=12) (id=133)
     db $06 ; tileset
     db $04, $07 ; dimensions (y, x)
-    dw $40ab, $48be, $48b8 ; blocks, texts, scripts
+    dw $40ab, $48be, CeladonPokecenterScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $48d2 ; objects
@@ -20355,7 +20355,7 @@ CeladonPokecenterObject: ; 0x488d2 (size=44)
 CeladonGym_h: ; 0x488fe to 0x4890a (12 bytes) (bank=12) (id=134)
     db $07 ; tileset
     db $09, $05 ; dimensions (y, x)
-    dw CeladonGymBlocks, $49a6, $490a ; blocks, texts, scripts
+    dw CeladonGymBlocks, CeladonGymTexts, CeladonGymScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $4b30 ; objects
@@ -20515,7 +20515,7 @@ CeladonGymBlocks: ; 45
 CeladonGameCorner_h: ; 0x48bb1 to 0x48bbd (12 bytes) (bank=12) (id=135)
     db $12 ; tileset
     db $09, $0a ; dimensions (y, x)
-    dw CeladonGameCornerBlocks, $4c8a, $4bbd ; blocks, texts, scripts
+    dw CeladonGameCornerBlocks, CeladonGameCornerTexts, CeladonGameCornerScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $4fa0 ; objects
@@ -20844,7 +20844,7 @@ CeladonGameCornerBlocks: ; 90
 CeladonMart5_h: ; 0x4905d to 0x49069 (12 bytes) (bank=12) (id=136)
     db $12 ; tileset
     db $04, $0a ; dimensions (y, x)
-    dw CeladonMart5Blocks, $506c, $5069 ; blocks, texts, scripts
+    dw CeladonMart5Blocks, CeladonMart5Texts, CeladonMart5Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5085 ; objects
@@ -20943,7 +20943,7 @@ CeladonPrizeRoomBlocks: ; 20
 CeladonDiner_h: ; 0x49145 to 0x49151 (12 bytes) (bank=12) (id=138)
     db $12 ; tileset
     db $04, $05 ; dimensions (y, x)
-    dw CeladonDinerBlocks, $5155, $5151 ; blocks, texts, scripts
+    dw CeladonDinerBlocks, CeladonDinerTexts, CeladonDinerScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $51bc ; objects
@@ -21025,7 +21025,7 @@ CeladonDinerBlocks: ; 20
 CeladonHouse_h: ; 0x49202 to 0x4920e (12 bytes) (bank=12) (id=139)
     db $13 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw CeladonHouseBlocks, $5212, $520e ; blocks, texts, scripts
+    dw CeladonHouseBlocks, CeladonHouseTexts, CeladonHouseScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5227 ; objects
@@ -21074,7 +21074,7 @@ CeladonHouseBlocks: ; 16
 CeladonHotel_h: ; 0x4925d to 0x49269 (12 bytes) (bank=12) (id=140)
     db $06 ; tileset
     db $04, $07 ; dimensions (y, x)
-    dw CeladonHotelBlocks, $526c, $5269 ; blocks, texts, scripts
+    dw CeladonHotelBlocks, CeladonHotelTexts, CeladonHotelScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5281 ; objects
@@ -21122,7 +21122,7 @@ CeladonHotelBlocks: ; 28
 MtMoonPokecenter_h: ; 0x492c3 to 0x492cf (12 bytes) (bank=12) (id=68)
     db $06 ; tileset
     db $04, $07 ; dimensions (y, x)
-    dw MtMoonPokecenterBlocks, $52d5, $52cf ; blocks, texts, scripts
+    dw MtMoonPokecenterBlocks, $52d5, MtMoonPokecenterScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5376 ; objects
@@ -21226,7 +21226,7 @@ MtMoonPokecenterObject: ; 0x49376 (size=56)
 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
+    dw $40ab, $53c0, RockTunnelPokecenterScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $53d4 ; objects
@@ -21273,7 +21273,7 @@ RockTunnelPokecenterObject: ; 0x493d4 (size=44)
 Route11Gate_h: ; 0x49400 to 0x4940c (12 bytes) (id=84)
     db $0c ; tileset
     db $05, $04 ; dimensions (y, x)
-    dw Route11GateBlocks, $540f, $540c ; blocks, texts, scripts
+    dw Route11GateBlocks, Route11GateTexts, Route11GateScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5416 ; objects
@@ -21314,7 +21314,7 @@ Route11GateObject: ; 0x49416 (size=50)
 Route11GateUpstairs_h: ; 0x49448 to 0x49454 (12 bytes) (id=86)
     db $0c ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw Route11GateUpstairsBlocks, $5457, $5454 ; blocks, texts, scripts
+    dw Route11GateUpstairsBlocks, $5457, Route11GateUpstairsScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $54da ; objects
@@ -21410,7 +21410,7 @@ Route11GateUpstairsObject: ; 0x494da (size=30)
 Route12Gate_h: ; 0x494f8 to 0x49504 (12 bytes) (id=87)
     db $0c ; tileset
     db $04, $05 ; dimensions (y, x)
-    dw Route12GateBlocks, $5507, $5504 ; blocks, texts, scripts
+    dw Route12GateBlocks, Route12GateTexts, Route12GateScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $550e ; objects
@@ -21454,7 +21454,7 @@ Route12GateBlocks: ; 20
 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
+    dw $40db, Route12GateUpstairsTexts, Route12GateUpstairsScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $55de ; objects
@@ -21528,7 +21528,7 @@ Route12GateUpstairsObject: ; 0x495de (size=24)
 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
+    dw $40c7, Route15GateTexts, Route15GateScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $560c ; objects
@@ -21571,7 +21571,7 @@ INCBIN "baserom.gbc",$4963e,$74
 Route16GateMap_h: ; 0x496b2 to 0x496be (12 bytes) (id=186)
     db $0c ; tileset
     db $07, $04 ; dimensions (y, x)
-    dw Route16GateMapBlocks, $575a, $56be ; blocks, texts, scripts
+    dw Route16GateMapBlocks, Route16GateMapTexts, Route16GateMapScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $578b ; objects
@@ -21686,7 +21686,7 @@ Route16GateMapBlocks: ; 28
 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
+    dw $40db, Route16GateUpstairsTexts, Route16GateUpstairsScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $584c ; objects
@@ -21750,7 +21750,7 @@ Route16GateUpstairsObject: ; 0x4984c (size=30)
 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
+    dw $40c7, Route18GateTexts, Route18GateScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5937 ; objects
@@ -21849,7 +21849,7 @@ Route18GateObject: ; 0x49937 (size=50)
 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
+    dw $40db, Route18GateHeaderTexts, Route18GateHeaderScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $59a4 ; objects
@@ -21904,7 +21904,7 @@ Route18GateHeaderObject: ; 0x499a4 (size=24)
 MtMoon1_h: ; 0x499bc to 0x499c8 (12 bytes) (id=59)
     db $11 ; tileset
     db $12, $14 ; dimensions (y, x)
-    dw MtMoon1Blocks, $59e1, $59c8 ; blocks, texts, scripts
+    dw MtMoon1Blocks, MtMoon1Texts, MtMoon1Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5b06 ; objects
@@ -22015,7 +22015,7 @@ MtMoon1Blocks: ; 360
 MtMoon3_h: ; 0x49cff to 0x49d0b (12 bytes) (id=61)
     db $11 ; tileset
     db $12, $14 ; dimensions (y, x)
-    dw MtMoon3Blocks, $5e34, $5d0b ; blocks, texts, scripts
+    dw MtMoon3Blocks, MtMoon3Texts, MtMoon3Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5fdb ; objects
@@ -22196,7 +22196,7 @@ MtMoon3Blocks: ; 360
 SafariZoneWest_h: ; 0x4a1a9 to 0x4a1b5 (12 bytes) (id=219)
     db $03 ; tileset
     db $0d, $0f ; dimensions (y, x)
-    dw SafariZoneWestBlocks, $61b8, $61b5 ; blocks, texts, scripts
+    dw SafariZoneWestBlocks, SafariZoneWestTexts, SafariZoneWestScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $61dc ; objects
@@ -22265,7 +22265,7 @@ SafariZoneWestBlocks: ; 195
 SafariZoneSecretHouse_h: ; 0x4a30b to 0x4a317 (12 bytes) (id=222)
     db $14 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw SafariZoneSecretHouseBlocks, $631a, $6317 ; blocks, texts, scripts
+    dw SafariZoneSecretHouseBlocks, SafariZoneSecretHouseTexts, SafariZoneSecretHouseScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $6365 ; objects
@@ -22422,7 +22422,7 @@ LancePic:
 BattleCenterM_h: ; 0x4fd04 to 0x4fd10 (12 bytes) (id=239)
     db $15 ; tileset
     db $04, $05 ; dimensions (y, x)
-    dw BattleCenterMBlocks, $7d4c, $7d10 ; blocks, texts, scripts
+    dw BattleCenterMBlocks, BattleCenterMTexts, BattleCenterMScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $7d53 ; objects
@@ -22483,7 +22483,7 @@ BattleCenterMBlocks: ; 20
 TradeCenterM_h: ; 0x4fd71 to 0x4fd7d (12 bytes) (id=240)
     db $15 ; tileset
     db $04, $05 ; dimensions (y, x)
-    dw TradeCenterMBlocks, $7d80, $7d7d ; blocks, texts, scripts
+    dw TradeCenterMBlocks, TradeCenterMTexts, TradeCenterMScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $7d87 ; objects
@@ -22679,7 +22679,7 @@ SECTION "bank14",DATA,BANK[$14]
 Route22_h: ; 0x50000 to 0x50022 (34 bytes) (id=33)
     db $00 ; tileset
     db $09, $14 ; dimensions (y, x)
-    dw Route22Blocks, $5175, $4eb2 ; blocks, texts, scripts
+    dw Route22Blocks, Route22Texts, Route22Script ; blocks, texts, scripts
     db NORTH | EAST ; connections
 
     ; connections data
@@ -22722,7 +22722,7 @@ Route22Blocks: ; 180
 Route20_h: ; 0x500f1 to 0x50113 (34 bytes) (id=31)
     db $00 ; tileset
     db $09, $32 ; dimensions (y, x)
-    dw Route20Blocks, $4d22, $4ca9 ; blocks, texts, scripts
+    dw Route20Blocks, Route20Texts, Route20Script ; blocks, texts, scripts
     db WEST | EAST ; connections
 
     ; connections data
@@ -22776,7 +22776,7 @@ Route20Blocks: ; 450
 Route23_h: ; 0x5033f to 0x50361 (34 bytes) (id=34)
     db $17 ; tileset
     db $48, $0a ; dimensions (y, x)
-    dw Route23Blocks, $52f7, $51da ; blocks, texts, scripts
+    dw Route23Blocks, Route23Texts, Route23Script ; blocks, texts, scripts
     db NORTH | SOUTH ; connections
 
     ; connections data
@@ -22830,7 +22830,7 @@ Route23Blocks: ; 720
 Route24_h: ; 0x50682 to 0x506a4 (34 bytes) (id=35)
     db $00 ; tileset
     db $12, $0a ; dimensions (y, x)
-    dw Route24Blocks, $544b, $53ad ; blocks, texts, scripts
+    dw Route24Blocks, Route24Texts, Route24Script ; blocks, texts, scripts
     db SOUTH | EAST ; connections
 
     ; connections data
@@ -22874,7 +22874,7 @@ Route24Blocks: ; 180
 Route25_h: ; 0x5079b to 0x507b2 (23 bytes) (id=36)
     db $00 ; tileset
     db $09, $1e ; dimensions (y, x)
-    dw Route25Blocks, $5628, $55cb ; blocks, texts, scripts
+    dw Route25Blocks, Route25Texts, Route25Script ; blocks, texts, scripts
     db WEST ; connections
 
     ; connections data
@@ -22919,7 +22919,7 @@ Route25Blocks: ; 270
 IndigoPlateau_h: ; 0x5091e to 0x50935 (23 bytes) (id=9)
     db $17 ; tileset
     db $09, $0a ; dimensions (y, x)
-    dw IndigoPlateauBlocks, $4936, $4935 ; blocks, texts, scripts
+    dw IndigoPlateauBlocks, $4936, IndigoPlateauScript ; blocks, texts, scripts
     db SOUTH ; connections
 
     ; connections data
@@ -22959,7 +22959,7 @@ IndigoPlateauBlocks: ; 90
 SaffronCity_h: ; 0x509a4 to 0x509dc (56 bytes) (id=10)
     db $00 ; tileset
     db $12, $14 ; dimensions (y, x)
-    dw SaffronCityBlocks, $4c03, $4c00 ; blocks, texts, scripts
+    dw SaffronCityBlocks, SaffronCityTexts, SaffronCityScript ; blocks, texts, scripts
     db NORTH | SOUTH | WEST | EAST ; connections
 
     ; connections data
@@ -23731,7 +23731,7 @@ Route25Text11: ; 0x5178c
 VictoryRoad2_h: ; 0x51791 to 0x5179d (12 bytes) (id=194)
     db $11 ; tileset
     db $09, $0f ; dimensions (y, x)
-    dw VictoryRoad2Blocks, $581b, $579d ; blocks, texts, scripts
+    dw VictoryRoad2Blocks, VictoryRoad2Texts, VictoryRoad2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5915 ; objects
@@ -23843,7 +23843,7 @@ VictoryRoad2Blocks: ; 135
 MtMoon2_h: ; 0x51a36 to 0x51a42 (12 bytes) (id=60)
     db $11 ; tileset
     db $0e, $0e ; dimensions (y, x)
-    dw MtMoon2Blocks, $5a46, $5a42 ; blocks, texts, scripts
+    dw MtMoon2Blocks, $5a46, MtMoon2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5a4d ; objects
@@ -23888,7 +23888,7 @@ MtMoon2Blocks: ; 196
 SilphCo7_h: ; 0x51b55 to 0x51b61 (12 bytes) (id=212)
     db $16 ; tileset
     db $09, $0d ; dimensions (y, x)
-    dw SilphCo7Blocks, $5d3f, $5b61 ; blocks, texts, scripts
+    dw SilphCo7Blocks, SilphCo7Texts, SilphCo7Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5ed7 ; objects
@@ -24646,7 +24646,7 @@ Route2Blocks: ; 360
 Route3_h: ; 0x541e6 to 0x54208 (34 bytes) (id=14)
     db $00 ; tileset
     db $09, $23 ; dimensions (y, x)
-    dw Route3Blocks, $5511, $54f8 ; blocks, texts, scripts
+    dw Route3Blocks, Route3Texts, Route3Script ; blocks, texts, scripts
     db NORTH | WEST ; connections
 
     ; connections data
@@ -24692,7 +24692,7 @@ Route3Blocks: ; 315
 Route4_h: ; 0x54390 to 0x543b2 (34 bytes) (id=15)
     db $00 ; tileset
     db $09, $2d ; dimensions (y, x)
-    dw Route4Blocks, $5671, $5658 ; blocks, texts, scripts
+    dw Route4Blocks, Route4Texts, Route4Script; blocks, texts, scripts
     db SOUTH | EAST ; connections
 
     ; connections data
@@ -24742,7 +24742,7 @@ Route4Blocks: ; 405
 Route5_h: ; 0x54581 to 0x545a3 (34 bytes) (id=16)
     db $00 ; tileset
     db $12, $0a ; dimensions (y, x)
-    dw Route5Blocks, $56b5, $56b2 ; blocks, texts, scripts
+    dw Route5Blocks, Route5Texts, Route5Script ; blocks, texts, scripts
     db NORTH | SOUTH ; connections
 
     ; connections data
@@ -24791,7 +24791,7 @@ Route5Blocks: ; 180
 Route9_h: ; 0x54686 to 0x546a8 (34 bytes) (id=20)
     db $00 ; tileset
     db $09, $1e ; dimensions (y, x)
-    dw Route9Blocks, $56d5, $56bc ; blocks, texts, scripts
+    dw Route9Blocks, Route9Texts, Route9Script ; blocks, texts, scripts
     db WEST | EAST ; connections
 
     ; connections data
@@ -24838,7 +24838,7 @@ Route9Blocks: ; 270
 Route13_h: ; 0x5480c to 0x5482e (34 bytes) (id=24)
     db $00 ; tileset
     db $09, $1e ; dimensions (y, x)
-    dw Route13Blocks, $5837, $581e ; blocks, texts, scripts
+    dw Route13Blocks, Route13Texts, Route13Script ; blocks, texts, scripts
     db NORTH | WEST ; connections
 
     ; connections data
-- 
cgit v1.2.3


From beb4811963f68fdfb4832ab560389d00d342c649 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Fri, 13 Jan 2012 18:34:57 -0600
Subject: even more map header labels

hg-commit-id: 9def1fae3a6d
---
 pokered.asm | 186 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 94 insertions(+), 92 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index 15b666fd..ac4c2b39 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -24887,7 +24887,7 @@ Route13Blocks: ; 270
 Route14_h: ; 0x54999 to 0x549bb (34 bytes) (id=25)
     db $00 ; tileset
     db $1b, $0a ; dimensions (y, x)
-    dw Route14Blocks, $59ec, $59d3 ; blocks, texts, scripts
+    dw Route14Blocks, Route14Texts, Route14Script ; blocks, texts, scripts
     db WEST | EAST ; connections
 
     ; connections data
@@ -24934,7 +24934,7 @@ Route14Blocks: ; 270
 Route17_h: ; 0x54b20 to 0x54b42 (34 bytes) (id=28)
     db $00 ; tileset
     db $48, $0a ; dimensions (y, x)
-    dw Route17Blocks, $5b93, $5b7a ; blocks, texts, scripts
+    dw Route17Blocks, Route17Texts, Route17Script ; blocks, texts, scripts
     db NORTH | SOUTH ; connections
 
     ; connections data
@@ -24986,7 +24986,7 @@ Route17Blocks: ; 720
 Route19_h: ; 0x54e78 to 0x54e9a (34 bytes) (id=30)
     db $00 ; tileset
     db $1b, $0a ; dimensions (y, x)
-    dw Route19Blocks, $5d5d, $5d44 ; blocks, texts, scripts
+    dw Route19Blocks, Route19Texts, Route19Script ; blocks, texts, scripts
     db NORTH | WEST ; connections
 
     ; connections data
@@ -25033,7 +25033,7 @@ Route19Blocks: ; 270
 Route21_h: ; 0x54fff to 0x55021 (34 bytes) (id=32)
     db $00 ; tileset
     db $2d, $0a ; dimensions (y, x)
-    dw Route21Blocks, $5f04, $5eeb ; blocks, texts, scripts
+    dw Route21Blocks, Route21Texts, Route21Script ; blocks, texts, scripts
     db NORTH | SOUTH ; connections
 
     ; connections data
@@ -25799,7 +25799,7 @@ INCBIN "baserom.gbc",$55fdd,$87
 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
+    dw $522f, VermilionHouse2Texts, VermilionHouse2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $60cf ; objects
@@ -25862,7 +25862,7 @@ VermilionHouse2Object: ; 0x560cf (size=26)
 CeladonMart2_h: ; 0x560e9 to 0x560f5 (12 bytes) (id=123)
     db $12 ; tileset
     db $04, $0a ; dimensions (y, x)
-    dw CeladonMart2Blocks, $60f8, $60f5 ; blocks, texts, scripts
+    dw CeladonMart2Blocks, CeladonMart2Texts, CeladonMart2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $6111 ; objects
@@ -25914,7 +25914,7 @@ CeladonMart2Blocks: ; 40
 FuchsiaHouse3_h: ; 0x56170 to 0x5617c (12 bytes) (id=164)
     db $0d ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw FuchsiaHouse3Blocks, $617f, $617c ; blocks, texts, scripts
+    dw FuchsiaHouse3Blocks, FuchsiaHouse3Texts, FuchsiaHouse3Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $6221 ; objects
@@ -25979,7 +25979,7 @@ FuchsiaHouse3Object: ; 0x56221 (size=34)
 DayCareM_h: ; 0x56243 to 0x5624f (12 bytes) (id=72)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw DayCareMBlocks, $6252, $624f ; blocks, texts, scripts
+    dw DayCareMBlocks, DayCareMTexts, DayCareMScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $6459 ; objects
@@ -26068,7 +26068,7 @@ DayCareMObject: ; 0x56459 (size=26)
 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
+    dw $522f, Route12HouseTexts, Route12HouseScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $64de ; objects
@@ -26131,7 +26131,7 @@ Route12HouseObject: ; 0x564de (size=26)
 SilphCo8_h: ; 0x564f8 to 0x56504 (12 bytes) (id=213)
     db $16 ; tileset
     db $09, $0d ; dimensions (y, x)
-    dw SilphCo8Blocks, $657d, $6504 ; blocks, texts, scripts
+    dw SilphCo8Blocks, SilphCo8Texts, SilphCo8Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $6613 ; objects
@@ -26226,7 +26226,7 @@ SECTION "bank16",DATA,BANK[$16]
 Route6_h: ; 0x58000 to 0x58022 (34 bytes) (id=17)
     db $00 ; tileset
     db $12, $0a ; dimensions (y, x)
-    dw Route6Blocks, $50c9, $50b0 ; blocks, texts, scripts
+    dw Route6Blocks, $50c9, Route6Script ; blocks, texts, scripts
     db NORTH | SOUTH ; connections
 
     ; connections data
@@ -26279,7 +26279,7 @@ Route6Blocks: ; 180
 Route8_h: ; 0x5812d to 0x5814f (34 bytes) (id=19)
     db $00 ; tileset
     db $09, $1e ; dimensions (y, x)
-    dw Route8Blocks, $51cf, $51b6 ; blocks, texts, scripts
+    dw Route8Blocks, $51cf, Route8Script ; blocks, texts, scripts
     db WEST | EAST ; connections
 
     ; connections data
@@ -26337,7 +26337,7 @@ Route8Blocks: ; 270
 Route10_h: ; 0x582d4 to 0x582f6 (34 bytes) (id=21)
     db $00 ; tileset
     db $24, $0a ; dimensions (y, x)
-    dw Route10Blocks, $534f, $5336 ; blocks, texts, scripts
+    dw Route10Blocks, Route10Texts, Route10Script ; blocks, texts, scripts
     db SOUTH | WEST ; connections
 
     ; connections data
@@ -26393,7 +26393,7 @@ Route10Blocks: ; 360
 Route11_h: ; 0x584be to 0x584e0 (34 bytes) (id=22)
     db $00 ; tileset
     db $09, $1e ; dimensions (y, x)
-    dw Route11Blocks, $5465, $544c ; blocks, texts, scripts
+    dw Route11Blocks, $5465, Route11Script ; blocks, texts, scripts
     db WEST | EAST ; connections
 
     ; connections data
@@ -26452,7 +26452,7 @@ Route11Blocks: ; 270
 Route12_h: ; 0x5866d to 0x5869a (45 bytes) (id=23)
     db $00 ; tileset
     db $36, $0a ; dimensions (y, x)
-    dw Route12Blocks, $5675, $55f3 ; blocks, texts, scripts
+    dw Route12Blocks, Route12Texts, Route12Script ; blocks, texts, scripts
     db NORTH | SOUTH | WEST ; connections
 
     ; connections data
@@ -26516,7 +26516,7 @@ Route12Blocks: ; 540
 Route15_h: ; 0x5892c to 0x5894e (34 bytes) (id=26)
     db $00 ; tileset
     db $09, $1e ; dimensions (y, x)
-    dw Route15Blocks, $57c7, $57ae ; blocks, texts, scripts
+    dw Route15Blocks, Route15Texts, Route15Script ; blocks, texts, scripts
     db WEST | EAST ; connections
 
     ; connections data
@@ -26574,7 +26574,7 @@ Route15Blocks: ; 270
 Route16_h: ; 0x58ada to 0x58afc (34 bytes) (id=27)
     db $00 ; tileset
     db $09, $14 ; dimensions (y, x)
-    dw Route16Blocks, $59b9, $5933 ; blocks, texts, scripts
+    dw Route16Blocks, Route16Texts, Route16Script ; blocks, texts, scripts
     db SOUTH | EAST ; connections
 
     ; connections data
@@ -26639,7 +26639,7 @@ Route16Blocks: ; 180
 Route18_h: ; 0x58c38 to 0x58c5a (34 bytes) (id=29)
     db $00 ; tileset
     db $09, $19 ; dimensions (y, x)
-    dw Route18Blocks, $5ae0, $5ac7 ; blocks, texts, scripts
+    dw Route18Blocks, Route18Texts, Route18Script ; blocks, texts, scripts
     db NORTH | EAST ; connections
 
     ; connections data
@@ -27294,7 +27294,7 @@ Route18Text5: ; 0x59b5f
 FanClub_h: ; 0x59b64 to 0x59b70 (12 bytes) (id=90)
     db $10 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw FanClubBlocks, $5b84, $5b70 ; blocks, texts, scripts
+    dw FanClubBlocks, FanClubTexts, FanClubScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5c97 ; objects
@@ -27448,7 +27448,7 @@ FanClubBlocks: ; 16
 SilphCo2_h: ; 0x59ce5 to 0x59cf1 (12 bytes) (id=207)
     db $16 ; tileset
     db $09, $0f ; dimensions (y, x)
-    dw SilphCo2Blocks, $5d86, $5cf1 ; blocks, texts, scripts
+    dw SilphCo2Blocks, SilphCo2Texts, SilphCo2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5e66 ; objects
@@ -27556,7 +27556,7 @@ SilphCo2Blocks: ; 135
 SilphCo3_h: ; 0x59f4f to 0x59f5b (12 bytes) (id=208)
     db $16 ; tileset
     db $09, $0f ; dimensions (y, x)
-    dw SilphCo3Blocks, $5fc4, $5f5b ; blocks, texts, scripts
+    dw SilphCo3Blocks, SilphCo3Texts, SilphCo3Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $6035 ; objects
@@ -27649,7 +27649,7 @@ SilphCo3Blocks: ; 135
 SilphCo10_h: ; 0x5a12d to 0x5a139 (12 bytes) (id=234)
     db $16 ; tileset
     db $09, $08 ; dimensions (y, x)
-    dw SilphCo10Blocks, $6186, $6139 ; blocks, texts, scripts
+    dw SilphCo10Blocks, SilphCo10Texts, SilphCo10Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $61fb ; objects
@@ -27732,7 +27732,7 @@ SilphCo10Blocks: ; 72
 Lance_h: ; 0x5a2a2 to 0x5a2ae (12 bytes) (id=113)
     db $05 ; tileset
     db $0d, $0d ; dimensions (y, x)
-    dw LanceBlocks, $6395, $62ae ; blocks, texts, scripts
+    dw LanceBlocks, LanceTexts, LanceScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $63c5 ; objects
@@ -27787,7 +27787,7 @@ LanceBlocks: ; 169
 HallofFameRoom_h: ; 0x5a492 to 0x5a49e (12 bytes) (id=118)
     db $07 ; tileset
     db $04, $05 ; dimensions (y, x)
-    dw HallofFameRoomBlocks, $656a, $649e ; blocks, texts, scripts
+    dw HallofFameRoomBlocks, HallofFameRoomTexts, HallofFameRoomScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $6571 ; objects
@@ -27951,7 +27951,7 @@ ViridianForestexitBlocks: ; 20
 RedsHouse2F_h:
 	db $04 ; tileset
 	db $04,$04 ; dimensions
-	dw RedsHouse2FBlocks,RedsHouse2FTexts,RedsHouse2FScript
+	dw RedsHouse2FBlocks, RedsHouse2FTexts, RedsHouse2FScript
 	db 0 ; no connections
 	dw RedsHouse2FObject
 
@@ -27997,7 +27997,7 @@ 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 MuseumF1Blocks, $412b, $40f7 ; blocks, texts, scripts
+    dw MuseumF1Blocks, MuseumF1Texts, MuseumF1Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $42c1 ; objects
@@ -28229,7 +28229,7 @@ MuseumF1Object: ; 0x5c2c1 (size=74)
 MuseumF2_h: ; 0x5c30b to 0x5c317 (12 bytes) (id=53)
     db $0a ; tileset
     db $04, $07 ; dimensions (y, x)
-    dw MuseumF2Blocks, $431a, $4317 ; blocks, texts, scripts
+    dw MuseumF2Blocks, MuseumF2Texts, MuseumF2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $434b ; objects
@@ -28292,7 +28292,7 @@ MuseumF2Object: ; 0x5c34b (size=48)
 PewterGym_h: ; 0x5c37b to 0x5c387 (12 bytes) (id=54)
     db $07 ; tileset
     db $07, $05 ; dimensions (y, x)
-    dw PewterGymBlocks, $4435, $4387 ; blocks, texts, scripts
+    dw PewterGymBlocks, PewterGymTexts, PewterGymScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $452e ; objects
@@ -28431,7 +28431,7 @@ PewterGymBlocks: ; 35
 PewterPokecenter_h: ; 0x5c57b to 0x5c587 (12 bytes) (id=58)
     db $06 ; tileset
     db $04, $07 ; dimensions (y, x)
-    dw PewterPokecenterBlocks, $458d, $4587 ; blocks, texts, scripts
+    dw PewterPokecenterBlocks, $458d, PewterPokecenterScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $460d ; objects
@@ -28530,7 +28530,7 @@ PewterPokecenterObject: ; 0x5c60d (size=44)
 CeruleanPokecenter_h: ; 0x5c639 to 0x5c645 (12 bytes) (id=64)
     db $06 ; tileset
     db $04, $07 ; dimensions (y, x)
-    dw CeruleanPokecenterBlocks, $464b, $4645 ; blocks, texts, scripts
+    dw CeruleanPokecenterBlocks, $464b, CeruleanPokecenterScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $465f ; objects
@@ -28579,7 +28579,7 @@ CeruleanPokecenterBlocks: ; 28
 CeruleanGym_h: ; 0x5c6a7 to 0x5c6b3 (12 bytes) (id=65)
     db $07 ; tileset
     db $07, $05 ; dimensions (y, x)
-    dw CeruleanGymBlocks, $474a, $46b3 ; blocks, texts, scripts
+    dw CeruleanGymBlocks, CeruleanGymTexts, CeruleanGymScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $4834 ; objects
@@ -28713,7 +28713,7 @@ CeruleanGymBlocks: ; 35
 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
+    dw $4000, CeruleanMartTexts, CeruleanMartScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $48a8 ; objects
@@ -28754,7 +28754,7 @@ CeruleanMartObject: ; 0x5c8a8 (size=38)
 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
+    dw $4064, $48e0, LavenderPokecenterScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $48f4 ; objects
@@ -28801,7 +28801,7 @@ LavenderPokecenterObject: ; 0x5c8f4 (size=44)
 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
+    dw $4000, $492f, LavenderMartScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $495d ; objects
@@ -28854,7 +28854,7 @@ LavenderMartObject: ; 0x5c95d (size=38)
 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
+    dw $4064, $4995, VermilionPokecenterScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $49a9 ; objects
@@ -28900,7 +28900,7 @@ VermilionPokecenterObject: ; 0x5c9a9 (size=44)
 VermilionMart_h: ; 0x5c9d5 to 0x5c9e1 (12 bytes) (id=91)
     db $02 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw VermilionMartBlocks, $49e4, $49e1 ; blocks, texts, scripts
+    dw VermilionMartBlocks, VermilionMartTexts, VermilionMartScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $49f4 ; objects
@@ -28941,7 +28941,7 @@ VermilionMartObject: ; 0x5c9f4 (size=38)
 VermilionGym_h: ; 0x5ca1a to 0x5ca26 (12 bytes) (id=92)
     db $07 ; tileset
     db $09, $05 ; dimensions (y, x)
-    dw VermilionGymBlocks, $4ae8, $4a26 ; blocks, texts, scripts
+    dw VermilionGymBlocks, VermilionGymTexts, VermilionGymScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $4bfe ; objects
@@ -29090,7 +29090,7 @@ VermilionGymBlocks: ; 45
 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
+    dw $4010, CopycatsHouseF2Texts, CopycatsHouseF2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $4d21 ; objects
@@ -29191,7 +29191,7 @@ CopycatsHouseF2Object: ; 0x5cd21 (size=48)
 FightingDojo_h: ; 0x5cd51 to 0x5cd5d (12 bytes) (id=177)
     db $05 ; tileset
     db $06, $05 ; dimensions (y, x)
-    dw FightingDojoBlocks, $4e03, $4d5d ; blocks, texts, scripts
+    dw FightingDojoBlocks, FightingDojoTexts, FightingDojoScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $4f9b ; objects
@@ -29379,7 +29379,7 @@ FightingDojoBlocks: ; 30
 SaffronGym_h: ; 0x5d001 to 0x5d00d (12 bytes) (id=178)
     db $16 ; tileset
     db $09, $0a ; dimensions (y, x)
-    dw SaffronGymBlocks, $50ab, $500d ; blocks, texts, scripts
+    dw SaffronGymBlocks, SaffronGymTexts, SaffronGymScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5259 ; objects
@@ -29600,7 +29600,7 @@ SaffronGymBlocks: ; 90
 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
+    dw $4000, SaffronMartTexts, SaffronMartScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $541c ; objects
@@ -29641,7 +29641,7 @@ SaffronMartObject: ; 0x5d41c (size=38)
 SilphCo1_h: ; 0x5d442 to 0x5d44e (12 bytes) (id=181)
     db $16 ; tileset
     db $09, $0f ; dimensions (y, x)
-    dw SilphCo1Blocks, $5469, $544e ; blocks, texts, scripts
+    dw SilphCo1Blocks, SilphCo1Texts, SilphCo1Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5470 ; objects
@@ -29696,7 +29696,7 @@ SilphCo1Blocks: ; 135
 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
+    dw $4064, $553b, SaffronPokecenterScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $554f ; objects
@@ -29743,7 +29743,7 @@ SaffronPokecenterObject: ; 0x5d54f (size=44)
 ViridianForestexit_h: ; 0x5d57b to 0x5d587 (12 bytes) (id=47)
     db $09 ; tileset
     db $04, $05 ; dimensions (y, x)
-    dw ViridianForestexitBlocks, $558a, $5587 ; blocks, texts, scripts
+    dw ViridianForestexitBlocks, ViridianForestexitTexts, ViridianForestexitScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5598 ; objects
@@ -29787,7 +29787,7 @@ ViridianForestexitObject: ; 0x5d598 (size=48)
 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
+    dw $4090, Route2GateTexts, Route2GateScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5620 ; objects
@@ -29857,7 +29857,7 @@ Route2GateObject: ; 0x5d620 (size=48)
 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
+    dw $4090, ViridianForestEntranceTexts, ViridianForestEntranceScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $566d ; objects
@@ -29901,7 +29901,7 @@ ViridianForestEntranceObject: ; 0x5d66d (size=48)
 UndergroundTunnelEntranceRoute5_h: ; 0x5d69d to 0x5d6a9 (12 bytes) (id=71)
     db $0c ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw UndergroundTunnelEntranceRoute5Blocks, $56b0, $56a9 ; blocks, texts, scripts
+    dw UndergroundTunnelEntranceRoute5Blocks, UndergroundTunnelEntranceRoute5Texts, UndergroundTunnelEntranceRoute5Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $56c1 ; objects
@@ -29947,7 +29947,7 @@ UndergroundTunnelEntranceRoute5Object: ; 0x5d6c1 (size=34)
 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
+    dw $4080, UndergroundTunnelEntranceRoute6Texts, UndergroundTunnelEntranceRoute6Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $56fe ; objects
@@ -29988,7 +29988,7 @@ UndergroundTunnelEntranceRoute6Object: ; 0x5d6fe (size=34)
 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
+    dw $4080, UndergroundPathEntranceRoute7Texts, UndergroundPathEntranceRoute7Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $573b ; objects
@@ -30030,10 +30030,10 @@ INCBIN "baserom.gbc",$5d75d,$52
 SilphCo9_h: ; 0x5d7af to 0x5d7bb (12 bytes) (id=233)
     db $16 ; tileset
     db $09, $0d ; dimensions (y, x)
-    dw SilphCo9Blocks, $588b, $57bb ; blocks, texts, scripts
+    dw SilphCo9Blocks, SilphCo9Texts, SilphCo9Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $593f ; objects
+    dw SilphCo9Object ; objects
 
 SilphCo9Script: ; 0x5d7bb
     call $57d1
@@ -30127,7 +30127,7 @@ SilphCo9Blocks: ; 117
 VictoryRoad1_h: ; 0x5d9fe to 0x5da0a (12 bytes) (id=108)
     db $11 ; tileset
     db $09, $0a ; dimensions (y, x)
-    dw VictoryRoad1Blocks, $5a5f, $5a0a ; blocks, texts, scripts
+    dw VictoryRoad1Blocks, VictoryRoad1Texts, VictoryRoad1Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5ab8 ; objects
@@ -30211,7 +30211,7 @@ SSAnne9Blocks: ; 96
 PokemonTower1_h: ; 0x60420 to 0x6042c (12 bytes) (id=142)
     db $0f ; tileset
     db $09, $0a ; dimensions (y, x)
-    dw PokemonTower1Blocks, $442f, $442c ; blocks, texts, scripts
+    dw PokemonTower1Blocks, PokemonTower1Texts, PokemonTower1Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw $4452 ; objects
@@ -30271,10 +30271,10 @@ PokemonTower1Blocks: ; 90
 PokemonTower2_h: ; 0x604e6 to 0x604f2 (12 bytes) (id=143)
     db $0f ; tileset
     db $09, $0a ; dimensions (y, x)
-    dw PokemonTower2Blocks, $45db, $44f2 ; blocks, texts, scripts
+    dw PokemonTower2Blocks, PokemonTower2Texts, PokemonTower2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4646 ; objects
+    dw PokemonTower2Object ; objects
 
 PokemonTower2Script: ; 0x604f2
     call $3c3c
@@ -30452,10 +30452,10 @@ PokemonTower2Blocks: ; 90
 PokemonTower3_h: ; 0x606c0 to 0x606cc (12 bytes) (id=144)
     db $0f ; tileset
     db $09, $0a ; dimensions (y, x)
-    dw PokemonTower3Blocks, $46e5, $46cc ; blocks, texts, scripts
+    dw PokemonTower3Blocks, PokemonTower3Texts, PokemonTower3Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $475d ; objects
+    dw PokemonTower3Object ; objects
 
 PokemonTower3Script: ; 0x606cc
     call $3c3c
@@ -30519,10 +30519,10 @@ PokemonTower3Blocks: ; 90
 PokemonTower4_h: ; 0x607ea to 0x607f6 (12 bytes) (id=145)
     db $0f ; tileset
     db $09, $0a ; dimensions (y, x)
-    dw PokemonTower4Blocks, $480f, $47f6 ; blocks, texts, scripts
+    dw PokemonTower4Blocks, PokemonTower4Texts, PokemonTower4Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $488b ; objects
+    dw PokemonTower4Object ; objects
 
 PokemonTower4Script: ; 0x607f6
     call $3c3c
@@ -30588,10 +30588,10 @@ PokemonTower4Blocks: ; 90
 PokemonTower5_h: ; 0x60926 to 0x60932 (12 bytes) (id=146)
     db $0f ; tileset
     db $09, $0a ; dimensions (y, x)
-    dw PokemonTower5Blocks, $499b, $4932 ; blocks, texts, scripts
+    dw PokemonTower5Blocks, PokemonTower5Texts, PokemonTower5Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4a48 ; objects
+    dw PokemonTower5Object ; objects
 
 PokemonTower5Script: ; 0x60932
     call $3c3c
@@ -30676,10 +30676,10 @@ PokemonTower5Blocks: ; 90
 PokemonTower6_h: ; 0x60ae3 to 0x60aef (12 bytes) (id=147)
     db $0f ; tileset
     db $09, $0a ; dimensions (y, x)
-    dw PokemonTower6Blocks, $4bb1, $4aef ; blocks, texts, scripts
+    dw PokemonTower6Blocks, PokemonTower6Texts, PokemonTower6Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4c5b ; objects
+    dw PokemonTower6Object ; objects
 
 PokemonTower6Script: ; 0x60aef
     call $3c3c
@@ -30750,10 +30750,10 @@ INCBIN "baserom.gbc",$60cef,$a
 PokemonTower7_h: ; 0x60cf9 to 0x60d05 (12 bytes) (id=148)
     db $0f ; tileset
     db $09, $0a ; dimensions (y, x)
-    dw PokemonTower7Blocks, $4e3f, $4d05 ; blocks, texts, scripts
+    dw PokemonTower7Blocks, PokemonTower7Texts, PokemonTower7Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4ef6 ; objects
+    dw PokemonTower7Object ; objects
 
 PokemonTower7Script: ; 0x60d05
     call $3c3c
@@ -30840,10 +30840,10 @@ PokemonTower7Blocks: ; 90
 CeladonMart1_h: ; 0x60f7a to 0x60f86 (12 bytes) (id=122)
     db $12 ; tileset
     db $04, $0a ; dimensions (y, x)
-    dw CeladonMart1Blocks, $4f89, $4f86 ; blocks, texts, scripts
+    dw CeladonMart1Blocks, CeladonMart1Texts, CeladonMart1Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4f9e ; objects
+    dw CeladonMart1Object ; objects
 
 CeladonMart1Script: ; 0x60f86
     jp $3c3c
@@ -30898,10 +30898,10 @@ INCBIN "baserom.gbc",$61006,$fb
 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
+    dw $4000, ViridianForestTexts, ViridianForestScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $51da ; objects
+    dw ViridianForestObject ; objects
 
 ViridianForestScript: ; 0x6110d
     call $3c3c
@@ -31012,10 +31012,10 @@ ViridianForestObject: ; 0x611da (size=127)
 SSAnne1_h: ; 0x61259 to 0x61265 (12 bytes) (id=95)
     db $0d ; tileset
     db $09, $14 ; dimensions (y, x)
-    dw SSAnne1Blocks, $5269, $5265 ; blocks, texts, scripts
+    dw SSAnne1Blocks, SSAnne1Texts, SSAnne1Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5277 ; objects
+    dw SSAnne1Object ; objects
 
 SSAnne1Script: ; 0x61265
     call $3c3c
@@ -31074,10 +31074,10 @@ SSAnne1Blocks: ; 180
 SSAnne2_h: ; 0x61393 to 0x6139f (12 bytes) (id=96)
     db $0d ; tileset
     db $09, $14 ; dimensions (y, x)
-    dw SSAnne2Blocks, $54db, $539f ; blocks, texts, scripts
+    dw SSAnne2Blocks, SSAnne2Texts, SSAnne2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5514 ; objects
+    dw SSAnne2Object ; objects
 
 SSAnne2Script: ; 0x6139f
     call $3c3c
@@ -31283,15 +31283,16 @@ SSAnne2Blocks: ; 180
 SSAnne4_h: ; 0x61622 to 0x6162e (12 bytes) (id=98)
     db $0d ; tileset
     db $04, $0f ; dimensions (y, x)
-    dw SSAnne4Blocks, $5631, $562e ; blocks, texts, scripts
+    dw SSAnne4Blocks, SSAnne4Texts, SSAnne4Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5632 ; objects
+    dw SSAnne4Object ; objects
 
 SSAnne4Script: ; 0x6162e
     jp $3c3c
 ; 0x61631
 
+SSAnne4Texts:
 INCBIN "baserom.gbc",$61631,$1
 
 SSAnne4Object: ; 0x61632 (size=52)
@@ -31323,10 +31324,10 @@ SSAnne4Blocks: ; 60
 SSAnne5_h: ; 0x616a2 to 0x616ae (12 bytes) (id=99)
     db $0d ; tileset
     db $07, $0a ; dimensions (y, x)
-    dw SSAnne5Blocks, $56c7, $56ae ; blocks, texts, scripts
+    dw SSAnne5Blocks, SSAnne5Texts, SSAnne5Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $572b ; objects
+    dw SSAnne5Object ; objects
 
 SSAnne5Script: ; 0x616ae
     call $3c3c
@@ -31399,10 +31400,10 @@ SSAnne5Blocks: ; 70
 SSAnne6_h: ; 0x617a7 to 0x617b3 (12 bytes) (id=100)
     db $0d ; tileset
     db $08, $07 ; dimensions (y, x)
-    dw SSAnne6Blocks, $57b7, $57b3 ; blocks, texts, scripts
+    dw SSAnne6Blocks, SSAnne6Texts, SSAnne6Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $581b ; objects
+    dw SSAnne6Object ; objects
 
 SSAnne6Script: ; 0x617b3
     call $3c3c
@@ -31484,10 +31485,10 @@ SSAnne6Blocks: ; 56
 SSAnne7_h: ; 0x61889 to 0x61895 (12 bytes) (id=101)
     db $0d ; tileset
     db $04, $03 ; dimensions (y, x)
-    dw SSAnne7Blocks, $58a7, $5895 ; blocks, texts, scripts
+    dw SSAnne7Blocks, SSAnne7Texts, SSAnne7Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5946 ; objects
+    dw SSAnne7Object ; objects
 
 SSAnne7Script: ; 0x61895
     call $589b
@@ -31560,10 +31561,10 @@ SSAnne7Blocks: ; 12
 SSAnne8_h: ; 0x6196a to 0x61976 (12 bytes) (id=102)
     db $0d ; tileset
     db $08, $0c ; dimensions (y, x)
-    dw SSAnne8Blocks, $598f, $5976 ; blocks, texts, scripts
+    dw SSAnne8Blocks, SSAnne8Texts, SSAnne8Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5a60 ; objects
+    dw SSAnne8Object ; objects
 
 SSAnne8Script: ; 0x61976
     call $3c3c
@@ -31675,10 +31676,10 @@ SSAnne8Blocks: ; 96
 SSAnne9_h: ; 0x61b3f to 0x61b4b (12 bytes) (id=103)
     db $0d ; tileset
     db $08, $0c ; dimensions (y, x)
-    dw SSAnne9Blocks, $5b6a, $5b4b ; blocks, texts, scripts
+    dw SSAnne9Blocks, SSAnne9Texts, SSAnne9Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5c8d ; objects
+    dw SSAnne9Object ; objects
 
 SSAnne9Script: ; 0x61b4b
     ld a, $1
@@ -31835,10 +31836,10 @@ SSAnne9Object: ; 0x61c8d (size=188)
 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
+    dw $43c0, SSAnne10Texts, SSAnne10Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5e75 ; objects
+    dw SSAnne10Object ; objects
 
 SSAnne10Script: ; 0x61d55
     call $3c3c
@@ -31951,7 +31952,7 @@ SSAnne10Object: ; 0x61e75 (size=165)
 UndergroundPathNS_h: ; 0x61f1a to 0x61f26 (12 bytes) (id=119)
     db $0b ; tileset
     db $18, $04 ; dimensions (y, x)
-    dw UndergroundPathNSBlocks, $5f29, $5f26 ; blocks, texts, scripts
+    dw UndergroundPathNSBlocks, UndergroundPathNSTexts, UndergroundPathNSScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw $5f2a ; objects
@@ -31960,6 +31961,7 @@ UndergroundPathNSScript: ; 0x61f26
     jp $3c3c
 ; 0x61f29
 
+UndergroundPathNSTexts:
 INCBIN "baserom.gbc",$61f29,$1
 
 UndergroundPathNSObject: ; 0x61f2a (size=20)
@@ -31980,10 +31982,10 @@ UndergroundPathNSObject: ; 0x61f2a (size=20)
 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
+    dw $41f4, $5f4d, UndergroundPathWEScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5f4e ; objects
+    dw UndergroundPathWEObject ; objects
 
 UndergroundPathWEScript: ; 0x61f4a
     jp $3c3c
@@ -32009,10 +32011,10 @@ UndergroundPathWEObject: ; 0x61f4e (size=20)
 DiglettsCave_h: ; 0x61f62 to 0x61f6e (12 bytes) (id=197)
     db $11 ; tileset
     db $12, $14 ; dimensions (y, x)
-    dw DiglettsCaveBlocks, $5f71, $5f6e ; blocks, texts, scripts
+    dw DiglettsCaveBlocks, $5f71, DiglettsCaveScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5f72 ; objects
+    dw DiglettsCaveObject ; objects
 
 DiglettsCaveScript: ; 0x61f6e
     jp $3c3c
-- 
cgit v1.2.3


From 2dda443c4819d644a8f5d00fdacb9ae493b4be37 Mon Sep 17 00:00:00 2001
From: IIMarckus <iimarckus@gmail.com>
Date: Fri, 13 Jan 2012 17:56:52 -0700
Subject: =?UTF-8?q?Fix=20typo:=20Loreli=20=E2=86=92=20Lorelei.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

hg-commit-id: d4227f9b97e7
---
 extras/extract_maps.py |  2 +-
 pokered.asm            | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/extras/extract_maps.py b/extras/extract_maps.py
index 9793cfdc..297d6a20 100644
--- a/extras/extract_maps.py
+++ b/extras/extract_maps.py
@@ -267,7 +267,7 @@ maps = {
          0xF2: "FREEZE",
          0xF3: "FREEZE",
          0xF4: "FREEZE",
-         0xF5: "Loreli",
+         0xF5: "Lorelei",
          0xF6: "Bruno",
          0xF7: "Agatha"
        }
diff --git a/pokered.asm b/pokered.asm
index b3e396d3..11c70a7a 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -359,7 +359,7 @@ MapHeaderPointers: ; $01AE
 	dw $5CE5
 	dw $5CE5
 	dw $5CE5
-	dw Loreli_h
+	dw Lorelei_h
 	dw Bruno_h
 	dw Agatha_h
 
@@ -2803,7 +2803,7 @@ MapHeaderBanks: ; 423D
 	db $11
 	db $11
 	db $11
-	db BANK(Loreli_h)
+	db BANK(Lorelei_h)
 	db BANK(Bruno_h)
 	db BANK(Agatha_h)
 
@@ -34942,15 +34942,15 @@ GaryObject: ; 0x7612f (size=48)
 GaryBlocks: ; 16
     INCBIN "maps/gary.blk"
 
-Loreli_h: ; 0x7616f to 0x7617b (12 bytes) (id=245)
+Lorelei_h: ; 0x7616f to 0x7617b (12 bytes) (id=245)
     db $07 ; tileset
     db $06, $05 ; dimensions (y, x)
-    dw LoreliBlocks, $6251, $617b ; blocks, texts, scripts
+    dw LoreleiBlocks, $6251, $617b ; blocks, texts, scripts
     db $00 ; connections
 
     dw $6280 ; objects
 
-LoreliScript: ; 0x7617b
+LoreleiScript: ; 0x7617b
     call $6191
     call $3c3c
     ld hl, $6255
@@ -34963,12 +34963,12 @@ LoreliScript: ; 0x7617b
 
 INCBIN "baserom.gbc",$76191,$c0
 
-LoreliTexts: ; 0x76251
-    dw LoreliText1, LoreliText2
+LoreleiTexts: ; 0x76251
+    dw LoreleiText1, LoreleiText2
 
 INCBIN "baserom.gbc",$76255,$d
 
-LoreliText1: ; 0x76262
+LoreleiText1: ; 0x76262
     db $08 ; asm
     ld hl, $6255
     call LoadTrainerHeader
@@ -34976,10 +34976,10 @@ LoreliText1: ; 0x76262
 
 INCBIN "baserom.gbc",$7626c,$7627b - $7626c
 
-LoreliText2: ; 0x7627b
+LoreleiText2: ; 0x7627b
 INCBIN "baserom.gbc",$7627b,$76280 - $7627b
 
-LoreliObject: ; 0x76280 (size=44)
+LoreleiObject: ; 0x76280 (size=44)
     db $3 ; border tile
 
     db $4 ; warps
@@ -34999,7 +34999,7 @@ LoreliObject: ; 0x76280 (size=44)
     EVENT_DISP $5, $0, $4 ; BRUNOS_ROOM
     EVENT_DISP $5, $0, $5 ; BRUNOS_ROOM
 
-LoreliBlocks: ; 30
+LoreleiBlocks: ; 30
     INCBIN "maps/loreli.blk"
 
 Bruno_h: ; 0x762ca to 0x762d6 (12 bytes) (id=246)
-- 
cgit v1.2.3


From bd9cc5fbc8fdf76301744aa4a154f14862c59485 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Fri, 13 Jan 2012 19:15:33 -0600
Subject: insert object labels into map headers

hg-commit-id: 9126a8ee23e0
---
 pokered.asm | 431 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 216 insertions(+), 215 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index ac4c2b39..12d9a802 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -5309,7 +5309,7 @@ CeladonCity_h: ; 0x18000
 
     ; end connection data
 
-    dw $4022 ; objects
+    dw CeladonCityObject ; objects
 
 CeladonCityObject: ; 0x18022 (size=189)
     db $f ; border tile
@@ -5444,7 +5444,7 @@ ViridianCity_h: ; 0x18357 to 0x18384 (45 bytes) (bank=6) (id=1)
 
     ; end connection data
 
-    dw $4384 ; objects
+    dw ViridianCityObject ; objects
 
 ViridianCityObject: ; 0x18384 (size=104)
     db $f ; border tile
@@ -5505,7 +5505,7 @@ PewterCity_h: ; 0x18554 to 0x18576 (34 bytes) (bank=6) (id=2)
 
     ; end connection data
 
-    dw $4577 ; objects
+    dw PewterCityObject ; objects
 
 INCBIN "baserom.gbc",$18576,$18577 - $18576
 
@@ -5583,7 +5583,7 @@ CeruleanCity_h: ; 0x1874e to 0x18786 (56 bytes) (bank=6) (id=3)
 
     ; end connection data
 
-    dw $4786 ; objects
+    dw CeruleanCityObject ; objects
 
 CeruleanCityObject: ; 0x18786 (size=170)
     db $f ; border tile
@@ -5658,7 +5658,7 @@ VermilionCity_h: ; 0x18998 to 0x189ba (34 bytes) (bank=6) (id=5)
 
     ; end connection data
 
-    dw $49ba ; objects
+    dw VermilionCityObject ; objects
 
 VermilionCityObject: ; 0x189ba (size=133)
     db $43 ; border tile
@@ -5733,7 +5733,7 @@ FuchsiaCity_h: ; 0x18ba7 to 0x18bd4 (45 bytes) (bank=6) (id=7)
 
     ; end connection data
 
-    dw $4bd4 ; objects
+    dw FuchsiaCityObject ; objects
 
 FuchsiaCityObject: ; 0x18bd4 (size=178)
     db $f ; border tile
@@ -7160,7 +7160,7 @@ VermilionHouse3_h: ; 0x19c06 to 0x19c12 (12 bytes) (bank=6) (id=196)
     dw VermilionHouse3Blocks, VermilionHouse3Texts, VermilionHouse3Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5c25 ; objects
+    dw VermilionHouse3Object ; objects
 
 VermilionHouse3Script: ; 0x19c12
     jp $3c3c
@@ -7202,7 +7202,7 @@ IndigoPlateauLobby_h: ; 0x19c4f to 0x19c5b (12 bytes) (bank=6) (id=174)
     dw IndigoPlateauLobbyBlocks, IndigoPlateauLobbyTexts, IndigoPlateauLobbyScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5c95 ; objects
+    dw IndigoPlateauLobbyObject ; objects
 
 IndigoPlateauLobbyScript: ; 0x19c5b
     call $22fa
@@ -7274,7 +7274,7 @@ SilphCo4_h: ; 0x19cff to 0x19d0b (12 bytes) (bank=6) (id=209)
     dw SilphCo4Blocks, SilphCo4Texts, SilphCo4Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5e35 ; objects
+    dw SilphCo4Object ; objects
 
 SilphCo4Script: ; 0x19d0b
     call $5d21
@@ -7368,7 +7368,7 @@ SilphCo5_h: ; 0x19f2b to 0x19f37 (12 bytes) (bank=6) (id=210)
     dw SilphCo5Blocks, SilphCo5Texts, SilphCo5Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $608d ; objects
+    dw SilphCo5Object ; objects
 
 SilphCo5Script: ; 0x19f37
     call $5f4d
@@ -7486,7 +7486,7 @@ SilphCo6_h: ; 0x1a19d to 0x1a1a9 (12 bytes) (bank=6) (id=211)
     dw SilphCo6Blocks, SilphCo6Texts, SilphCo6Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $62fb ; objects
+    dw SilphCo6Object ; objects
 
 SilphCo6Script: ; 0x1a1a9
     call $61bf
@@ -7635,7 +7635,7 @@ CinnabarIsland_h: ; 0x1c000 to 0x1c022 (34 bytes) (bank=7) (id=8)
 
     ; end connection data
 
-    dw $4022 ; objects
+    dw CinnabarIslandObject ; objects
 
 CinnabarIslandObject: ; 0x1c022 (size=71)
     db $43 ; border tile
@@ -7690,7 +7690,7 @@ Route1_h: ; 0x1c0c3 to 0x1c0e5 (34 bytes) (bank=7) (id=12)
 
     ; end connection data
 
-    dw $40e5 ; objects
+    dw Route1Object ; objects
 
 Route1Object: ; 0x1c0e5 (size=19)
     db $b ; border tile
@@ -8048,7 +8048,7 @@ OaksLab_h: ; 0x1cb02 to 0x1cb0e (12 bytes) (bank=7) (id=40)
     dw OaksLabBlocks, OaksLabTexts, OaksLabScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $540a ; objects
+    dw OaksLabObject ; objects
 
 OaksLabScript: ; 0x1cb0e
     ld a, [$d74b]
@@ -8649,7 +8649,7 @@ ViridianMart_h: ; 0x1d462 to 0x1d46e (12 bytes) (bank=7) (id=42)
     dw ViridianMartBlocks, ViridianMartTexts, ViridianMartScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $550a ; objects
+    dw ViridianMartObject ; objects
 
 ViridianMartScript: ; 0x1d46e
     call $547d
@@ -8742,7 +8742,7 @@ School_h: ; 0x1d540 to 0x1d54c (12 bytes) (bank=7) (id=43)
     dw SchoolBlocks, SchoolTexts, SchoolScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $555d ; objects
+    dw SchoolObject ; objects
 
 SchoolScript: ; 0x1d54c
     jp $3c3c
@@ -8782,7 +8782,7 @@ ViridianHouse_h: ; 0x1d57d to 0x1d589 (12 bytes) (bank=7) (id=44)
     dw ViridianHouseBlocks, ViridianHouseTexts, ViridianHouseScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $55bb ; objects
+    dw ViridianHouseObject ; objects
 
 INCBIN "baserom.gbc",$1d589,$1d58a - $1d589
 
@@ -8841,7 +8841,7 @@ PewterHouse1_h: ; 0x1d5e7 to 0x1d5f3 (12 bytes) (bank=7) (id=55)
     dw $41de, PewterHouse1Texts, PewterHouse1Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5616 ; objects
+    dw PewterHouse1Object ; objects
 
 PewterHouse1Script: ; 0x1d5f3
     jp $3c3c
@@ -8890,7 +8890,7 @@ PewterHouse2_h: ; 0x1d63c to 0x1d648 (12 bytes) (bank=7) (id=57)
     dw $41de, PewterHouse2Texts, PewterHouse2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5659 ; objects
+    dw PewterHouse2Object ; objects
 
 PewterHouse2Script: ; 0x1d648
     jp $3c3c
@@ -8930,7 +8930,7 @@ CeruleanHouseTrashed_h: ; 0x1d679 to 0x1d685 (12 bytes) (bank=7) (id=62)
     dw CeruleanHouseTrashedBlocks, CeruleanHouseTrashedTexts, CeruleanHouseTrashedScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $56bf ; objects
+    dw CeruleanHouseTrashedObject ; objects
 
 CeruleanHouseTrashedScript: ; 0x1d685
     call $3c3c
@@ -8992,7 +8992,7 @@ CeruleanHouse2_h: ; 0x1d6ea to 0x1d6f6 (12 bytes) (bank=7) (id=63)
     dw $41de, CeruleanHouse2Texts, CeruleanHouse2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5710 ; objects
+    dw CeruleanHouse2Object ; objects
 
 CeruleanHouse2Script: ; 0x1d6f6
     jp $3c3c
@@ -9036,7 +9036,7 @@ BikeShop_h: ; 0x1d730 to 0x1d73c (12 bytes) (bank=7) (id=66)
     dw BikeShopBlocks, BikeShopTexts, BikeShopScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5866 ; objects
+    dw BikeShopObject ; objects
 
 BikeShopScript: ; 0x1d73c
     jp $3c3c
@@ -9171,7 +9171,7 @@ LavenderHouse1_h: ; 0x1d89c to 0x1d8a8 (12 bytes) (bank=7) (id=149)
     dw $41de, LavenderHouse1Texts, LavenderHouse1Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $596a ; objects
+    dw LavenderHouse1Object ; objects
 
 LavenderHouse1Script: ; 0x1d8a8
     call $3c3c
@@ -9286,7 +9286,7 @@ LavenderHouse2_h: ; 0x1d9a2 to 0x1d9ae (12 bytes) (bank=7) (id=151)
     dw $41de, LavenderHouse2Texts, LavenderHouse2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $59e6 ; objects
+    dw LavenderHouse2Object ; objects
 
 LavenderHouse2Script: ; 0x1d9ae
     call $3c3c
@@ -9343,7 +9343,7 @@ NameRater_h: ; 0x1da06 to 0x1da12 (12 bytes) (bank=7) (id=229)
     dw $41de, $5a54, NameRaterScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5ad6 ; objects
+    dw NameRaterObject ; objects
 
 NameRaterScript: ; 0x1da12
     jp $3c3c
@@ -9416,7 +9416,7 @@ VermilionHouse1_h: ; 0x1daf0 to 0x1dafc (12 bytes) (bank=7) (id=93)
     dw $41de, VermilionHouse1Texts, VermilionHouse1Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5b20 ; objects
+    dw VermilionHouse1Object ; objects
 
 VermilionHouse1Script: ; 0x1dafc
     call $3c3c
@@ -9468,7 +9468,7 @@ VermilionDock_h: ; 0x1db46 to 0x1db52 (12 bytes) (bank=7) (id=94)
     dw VermilionDockBlocks, $5cbf, VermilionDockScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5cc6 ; objects
+    dw VermilionDockObject ; objects
 
 VermilionDockScript: ; 0x1db52
     call $3c3c
@@ -9536,7 +9536,7 @@ CeladonMansion5_h: ; 0x1dd2e to 0x1dd3a (12 bytes) (bank=7) (id=132)
     dw $41ee, CeladonMansion5Texts, CeladonMansion5Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5d5c ; objects
+    dw CeladonMansion5Object ; objects
 
 CeladonMansion5Script: ; 0x1dd3a
     jp $3c3c
@@ -9584,7 +9584,7 @@ FuchsiaMart_h: ; 0x1dd7c to 0x1dd88 (12 bytes) (bank=7) (id=152)
     dw FuchsiaMartBlocks, FuchsiaMartTexts, FuchsiaMartScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5d9b ; objects
+    dw FuchsiaMartObject ; objects
 
 FuchsiaMartScript: ; 0x1dd88
     jp $3c3c
@@ -9628,7 +9628,7 @@ SaffronHouse1_h: ; 0x1ddd1 to 0x1dddd (12 bytes) (bank=7) (id=179)
     dw $41de, SaffronHouse1Texts, SaffronHouse1Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5e04 ; objects
+    dw SaffronHouse1Object ; objects
 
 SaffronHouse1Script: ; 0x1dddd
     jp $3c3c
@@ -9682,7 +9682,7 @@ SaffronHouse2_h: ; 0x1de30 to 0x1de3c (12 bytes) (bank=7) (id=183)
     dw $41de, SaffronHouse2Texts, SaffronHouse2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5e8a ; objects
+    dw SaffronHouse2Object ; objects
 
 SaffronHouse2Script: ; 0x1de3c
     jp $3c3c
@@ -9740,7 +9740,7 @@ DiglettsCaveRoute2_h: ; 0x1dea4 to 0x1deb0 (12 bytes) (bank=7) (id=46)
     dw DiglettsCaveRoute2Blocks, DiglettsCaveRoute2Texts, DiglettsCaveRoute2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5ebf ; objects
+    dw DiglettsCaveRoute2Object ; objects
 
 DiglettsCaveRoute2Script: ; 0x1deb0
     ld a, $d
@@ -9779,7 +9779,7 @@ Route2House_h: ; 0x1dee1 to 0x1deed (12 bytes) (bank=7) (id=48)
     dw $41de, Route2HouseTexts, Route2HouseScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5f07 ; objects
+    dw Route2HouseObject ; objects
 
 Route2HouseScript: ; 0x1deed
     jp $3c3c
@@ -9823,7 +9823,7 @@ Route5Gate_h: ; 0x1df27 to 0x1df33 (12 bytes) (bank=7) (id=70)
     dw Route5GateBlocks, Route5GateTexts, Route5GateScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5ffb ; objects
+    dw Route5GateObject ; objects
 
 Route5GateScript: ; 0x1df33
     call $3c3c
@@ -9950,7 +9950,7 @@ Route6Gate_h: ; 0x1e031 to 0x1e03d (12 bytes) (bank=7) (id=73)
     dw Route6GateBlocks, Route6GateTexts, Route6GateScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $60be ; objects
+    dw Route6GateObject ; objects
 
 Route6GateScript: ; 0x1e03d
     call $3c3c
@@ -10031,7 +10031,7 @@ Route7Gate_h: ; 0x1e0f4 to 0x1e100 (12 bytes) (bank=7) (id=76)
     dw Route7GateBlocks, Route7GateTexts, Route7GateScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $6185 ; objects
+    dw Route7GateObject ; objects
 
 Route7GateScript: ; 0x1e100
     call $3c3c
@@ -10113,7 +10113,7 @@ Route8Gate_h: ; 0x1e1bb to 0x1e1c7 (12 bytes) (bank=7) (id=79)
     dw Route8GateBlocks, Route8GateTexts, Route8GateScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $6247 ; objects
+    dw Route8GateObject ; objects
 
 Route8GateScript: ; 0x1e1c7
     call $3c3c
@@ -10192,7 +10192,7 @@ UndergroundPathEntranceRoute8_h: ; 0x1e27d to 0x1e289 (12 bytes) (bank=7) (id=80
     dw UndergroundPathEntranceRoute8Blocks, UndergroundPathEntranceRoute8Texts, UndergroundPathEntranceRoute8Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $6298 ; objects
+    dw UndergroundPathEntranceRoute8Object ; objects
 
 UndergroundPathEntranceRoute8Script: ; 0x1e289
     ld a, $13
@@ -10233,7 +10233,7 @@ PowerPlant_h: ; 0x1e2ba to 0x1e2c6 (12 bytes) (bank=7) (id=83)
     dw PowerPlantBlocks, PowerPlantTexts, PowerPlantScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $63bf ; objects
+    dw PowerPlantObject ; objects
 
 PowerPlantScript: ; 0x1e2c6
     call $3c3c
@@ -10357,7 +10357,7 @@ DiglettsCaveEntranceRoute11_h: ; 0x1e5ae to 0x1e5ba (12 bytes) (bank=7) (id=85)
     dw $420e, DiglettsCaveEntranceRoute11Texts, DiglettsCaveEntranceRoute11Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $65ca ; objects
+    dw DiglettsCaveEntranceRoute11Object ; objects
 
 DiglettsCaveEntranceRoute11Script: ; 0x1e5ba
     call $3c3c
@@ -10399,7 +10399,7 @@ Route16House_h: ; 0x1e5ec to 0x1e5f8 (12 bytes) (bank=7) (id=188)
     dw $41de, Route16HouseTexts, Route16HouseScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $6657 ; objects
+    dw Route16HouseObject ; objects
 
 Route16HouseScript: ; 0x1e5f8
     jp $3c3c
@@ -10465,7 +10465,7 @@ Route22Gate_h: ; 0x1e677 to 0x1e683 (12 bytes) (bank=7) (id=193)
     dw Route22GateBlocks, Route22GateTexts, Route22GateScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $6720 ; objects
+    dw Route22GateObject ; objects
 
 Route22GateScript: ; 0x1e683
     call $3c3c
@@ -10565,7 +10565,7 @@ BillsHouse_h: ; 0x1e75e to 0x1e76a (12 bytes) (bank=7) (id=88)
     dw $6905, BillsHouseTexts, BillsHouseScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $68df ; objects
+    dw BillsHouseObject ; objects
 
 BillsHouseScript: ; 0x1e76a
     call $3c3c
@@ -17618,7 +17618,7 @@ LavenderTown_h: ; 0x44000 to 0x4402d (45 bytes) (bank=11) (id=4)
 
     ; end connection data
 
-    dw $402d ; objects
+    dw LavenderTownObject ; objects
 
 LavenderTownObject: ; 0x4402d (size=88)
     db $2c ; border tile
@@ -17764,7 +17764,7 @@ Mansion1_h: ; 0x442a3 to 0x442af (12 bytes) (bank=11) (id=165)
     dw $43fe, $432c, $42af ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $43a4 ; objects
+    dw Mansion1Object ; objects
 
 INCBIN "baserom.gbc",$442af,$44341 - $442af
 
@@ -17814,7 +17814,7 @@ RockTunnel1_h: ; 0x444d0 to 0x444dc (12 bytes) (bank=11) (id=82)
     dw RockTunnel1Blocks, RockTunnel1Texts, RockTunnel1Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $45f6 ; objects
+    dw RockTunnel1Object ; objects
 
 RockTunnel1Script: ; 0x444dc
     call $3c3c
@@ -17920,7 +17920,7 @@ SeafoamIslands1_h: ; 0x447dd to 0x447e9 (12 bytes) (bank=11) (id=192)
     dw SeafoamIslands1Blocks, SeafoamIslands1Texts, SeafoamIslands1Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $484f ; objects
+    dw SeafoamIslands1Object ; objects
 
 SeafoamIslands1Script: ; 0x447e9
     call $3c3c
@@ -18008,7 +18008,7 @@ SSAnne3_h: ; 0x44926 to 0x44932 (12 bytes) (bank=11) (id=97)
     dw SSAnne3Blocks, SSAnne3Texts, SSAnne3Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $493c ; objects
+    dw SSAnne3Object ; objects
 
 SSAnne3Script: ; 0x44932
     jp $3c3c
@@ -18046,7 +18046,7 @@ VictoryRoad3_h: ; 0x44974 to 0x44980 (12 bytes) (bank=11) (id=198)
     dw VictoryRoad3Blocks, VictoryRoad3Texts, VictoryRoad3Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4acd ; objects
+    dw VictoryRoad3Object ; objects
 
 VictoryRoad3Script: ; 0x44980
     call $4996
@@ -18130,7 +18130,7 @@ RocketHideout1_h: ; 0x44bbe to 0x44bca (12 bytes) (bank=11) (id=199)
     dw RocketHideout1Blocks, RocketHideout1Texts, RocketHideout1Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4ce7 ; objects
+    dw RocketHideout1Object ; objects
 
 RocketHideout1Script: ; 0x44bca
     call $4be0
@@ -18219,7 +18219,7 @@ RocketHideout2_h: ; 0x44e1b to 0x44e27 (12 bytes) (bank=11) (id=200)
     dw RocketHideout2Blocks, RocketHideout2Texts, RocketHideout2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $50f7 ; objects
+    dw RocketHideout2Object ; objects
 
 RocketHideout2Script: ; 0x44e27
     call $3c3c
@@ -18281,7 +18281,7 @@ RocketHideout3_h: ; 0x45219 to 0x45225 (12 bytes) (bank=11) (id=201)
     dw RocketHideout3Blocks, RocketHideout3Texts, RocketHideout3Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $534d ; objects
+    dw RocketHideout3Object ; objects
 
 RocketHideout3Script: ; 0x45225
     call $3c3c
@@ -18344,7 +18344,7 @@ RocketHideout4_h: ; 0x45451 to 0x4545d (12 bytes) (bank=11) (id=202)
     dw RocketHideout4Blocks, RocketHideout4Texts, RocketHideout4Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $55f1 ; objects
+    dw RocketHideout4Object ; objects
 
 RocketHideout4Script: ; 0x4545d
     call $5473
@@ -18456,7 +18456,7 @@ RocketHideoutElevator_h: ; 0x45704 to 0x45710 (12 bytes) (bank=11) (id=203)
     dw RocketHideoutElevatorBlocks, RocketHideoutElevatorTexts, RocketHideoutElevatorScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5791 ; objects
+    dw RocketHideoutElevatorObject ; objects
 
 RocketHideoutElevatorScript: ; 0x45710
     ld hl, $d126
@@ -18523,7 +18523,7 @@ SilphCoElevator_h: ; 0x457b4 to 0x457c0 (12 bytes) (bank=11) (id=236)
     dw SilphCoElevatorBlocks, SilphCoElevatorTexts, SilphCoElevatorScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5844 ; objects
+    dw SilphCoElevatorObject ; objects
 
 SilphCoElevatorScript: ; 0x457c0
     ld hl, $d126
@@ -18580,7 +18580,7 @@ SafariZoneEast_h: ; 0x4585f to 0x4586b (12 bytes) (bank=11) (id=217)
     dw SafariZoneEastBlocks, SafariZoneEastTexts, SafariZoneEastScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $588b ; objects
+    dw SafariZoneEastObject ; objects
 
 SafariZoneEastScript: ; 0x4586b
     jp $3c3c
@@ -18638,7 +18638,7 @@ SafariZoneNorth_h: ; 0x4599f to 0x459ab (12 bytes) (bank=11) (id=218)
     dw SafariZoneNorthBlocks, SafariZoneNorthTexts, SafariZoneNorthScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $59d5 ; objects
+    dw SafariZoneNorthObject ; objects
 
 SafariZoneNorthScript: ; 0x459ab
     jp $3c3c
@@ -18712,7 +18712,7 @@ SafariZoneCenter_h: ; 0x45ba6 to 0x45bb2 (12 bytes) (bank=11) (id=220)
     dw SafariZoneCenterBlocks, SafariZoneCenterTexts, SafariZoneCenterScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5bc5 ; objects
+    dw SafariZoneCenterObject ; objects
 
 SafariZoneCenterScript: ; 0x45bb2
     jp $3c3c
@@ -18770,7 +18770,7 @@ SafariZoneRestHouse1_h: ; 0x45ce1 to 0x45ced (12 bytes) (bank=11) (id=221)
     dw SafariZoneRestHouse1Blocks, SafariZoneRestHouse1Texts, SafariZoneRestHouse1Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5cfe ; objects
+    dw SafariZoneRestHouse1Object ; objects
 
 SafariZoneRestHouse1Script: ; 0x45ced
     jp $3c3c
@@ -18810,7 +18810,7 @@ SafariZoneRestHouse2_h: ; 0x45d1e to 0x45d2a (12 bytes) (bank=11) (id=223)
     dw $40fb, SafariZoneRestHouse2Texts, SafariZoneRestHouse2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5d43 ; objects
+    dw SafariZoneRestHouse2Object ; objects
 
 SafariZoneRestHouse2Script: ; 0x45d2a
     call $3c3c
@@ -18856,7 +18856,7 @@ SafariZoneRestHouse3_h: ; 0x45d69 to 0x45d75 (12 bytes) (bank=11) (id=224)
     dw $40fb, SafariZoneRestHouse3Texts, SafariZoneRestHouse3Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5d8e ; objects
+    dw SafariZoneRestHouse3Object ; objects
 
 SafariZoneRestHouse3Script: ; 0x45d75
     call $3c3c
@@ -18902,7 +18902,7 @@ SafariZoneRestHouse4_h: ; 0x45db4 to 0x45dc0 (12 bytes) (bank=11) (id=225)
     dw $40fb, SafariZoneRestHouse4Texts, SafariZoneRestHouse4Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5dd9 ; objects
+    dw SafariZoneRestHouse4Object ; objects
 
 SafariZoneRestHouse4Script: ; 0x45dc0
     call $3c3c
@@ -18948,7 +18948,7 @@ UnknownDungeon2_h: ; 0x45dff to 0x45e0b (12 bytes) (bank=11) (id=226)
     dw UnknownDungeon2Blocks, UnknownDungeon2Texts, UnknownDungeon2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5e14 ; objects
+    dw UnknownDungeon2Object ; objects
 
 UnknownDungeon2Script: ; 0x45e0b
     jp $3c3c
@@ -18992,7 +18992,7 @@ UnknownDungeon3_h: ; 0x45ee4 to 0x45ef0 (12 bytes) (bank=11) (id=227)
     dw UnknownDungeon3Blocks, UnknownDungeon3Texts, UnknownDungeon3Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5f36 ; objects
+    dw UnknownDungeon3Object ; objects
 
 UnknownDungeon3Script: ; 0x45ef0
     call $3c3c
@@ -19044,7 +19044,7 @@ RockTunnel2_h: ; 0x45fdf to 0x45feb (12 bytes) (bank=11) (id=232)
     dw RockTunnel2Blocks, RockTunnel2Texts, RockTunnel2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $613d ; objects
+    dw RockTunnel2Object ; objects
 
 RockTunnel2Script: ; 0x45feb
     call $3c3c
@@ -19149,7 +19149,7 @@ SeafoamIslands2_h: ; 0x46309 to 0x46315 (12 bytes) (bank=11) (id=159)
     dw SeafoamIslands2Blocks, SeafoamIslands2Texts, SeafoamIslands2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $6376 ; objects
+    dw SeafoamIslands2Object ; objects
 
 SeafoamIslands2Script: ; 0x46315
     call $3c3c
@@ -19233,7 +19233,7 @@ SeafoamIslands3_h: ; 0x46445 to 0x46451 (12 bytes) (bank=11) (id=160)
     dw SeafoamIslands3Blocks, SeafoamIslands3Texts, SeafoamIslands3Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $64b2 ; objects
+    dw SeafoamIslands3Object ; objects
 
 SeafoamIslands3Script: ; 0x46451
     call $3c3c
@@ -19317,7 +19317,7 @@ SeafoamIslands4_h: ; 0x46581 to 0x4658d (12 bytes) (bank=11) (id=161)
     dw SeafoamIslands4Blocks, SeafoamIslands4Texts, SeafoamIslands4Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $66a6 ; objects
+    dw SeafoamIslands4Object ; objects
 
 SeafoamIslands4Script: ; 0x4658d
     call $3c3c
@@ -19455,7 +19455,7 @@ SeafoamIslands5_h: ; 0x4678d to 0x46799 (12 bytes) (bank=11) (id=162)
     dw SeafoamIslands5Blocks, SeafoamIslands5Texts, SeafoamIslands5Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $68bc ; objects
+    dw SeafoamIslands5Object ; objects
 
 SeafoamIslands5Script: ; 0x46799
     call $3c3c
@@ -19599,7 +19599,7 @@ Route7_h: ; 0x48000 to 0x48022 (34 bytes) (bank=12) (id=18)
 
     ; end connection data
 
-    dw $4022 ; objects
+    dw Route7Object ; objects
 
 Route7Object: ; 0x48022 (size=47)
     db $f ; border tile
@@ -19758,7 +19758,7 @@ CeladonMart3_h: ; 0x48219 to 0x48225 (12 bytes) (bank=12) (id=124)
     dw CeladonMart3Blocks, CeladonMart3Texts, CeladonMart3Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $42c4 ; objects
+    dw CeladonMart3Object ; objects
 
 CeladonMart3Script: ; 0x48225
     jp $3c3c
@@ -19884,7 +19884,7 @@ CeladonMart4_h: ; 0x4834a to 0x48356 (12 bytes) (bank=12) (id=125)
     dw CeladonMart4Blocks, CeladonMart4Texts, CeladonMart4Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4370 ; objects
+    dw CeladonMart4Object ; objects
 
 CeladonMart4Script: ; 0x48356
     jp $3c3c
@@ -19935,7 +19935,7 @@ CeladonMartRoof_h: ; 0x483c9 to 0x483d5 (12 bytes) (bank=12) (id=126)
     dw CeladonMartRoofBlocks, $455b, CeladonMartRoofScript ; blocks, texts, scripts
     db $00 ; connections
     
-    dw $45a8 ; objects
+    dw CeladonMartRoofObject ; objects
 
 CeladonMartRoofScript: ; 0x483d5
     jp $3c3c
@@ -20003,7 +20003,7 @@ CeladonMartElevator_h: ; 0x485f4 to 0x48600 (12 bytes) (bank=12) (id=127)
     dw CeladonMartElevatorBlocks, CeladonMartElevatorTexts, CeladonMartElevatorScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $466d ; objects
+    dw CeladonMartElevatorObject ; objects
 
 CeladonMartElevatorScript: ; 0x48600
     ld hl, $d126
@@ -20060,7 +20060,7 @@ CeladonMansion1_h: ; 0x48688 to 0x48694 (12 bytes) (bank=12) (id=128)
     dw CeladonMansion1Blocks, CeladonMansion1Texts, CeladonMansion1Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $46cf ; objects
+    dw CeladonMansion1Object ; objects
 
 CeladonMansion1Script: ; 0x48694
     jp $3c3c
@@ -20137,7 +20137,7 @@ CeladonMansion2_h: ; 0x4872e to 0x4873a (12 bytes) (bank=12) (id=129)
     dw CeladonMansion2Blocks, CeladonMansion2Texts, CeladonMansion2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4745 ; objects
+    dw CeladonMansion2Object ; objects
 
 CeladonMansion2Script: ; 0x4873a
     call $3c3c
@@ -20180,7 +20180,7 @@ CeladonMansion3_h: ; 0x48784 to 0x48790 (12 bytes) (bank=12) (id=130)
     dw CeladonMansion3Blocks, CeladonMansion3Texts, CeladonMansion3Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $47ff ; objects
+    dw CeladonMansion3Object ; objects
 
 CeladonMansion3Script: ; 0x48790
     jp $3c3c
@@ -20271,7 +20271,7 @@ CeladonMansion4_h: ; 0x4885f to 0x4886b (12 bytes) (bank=12) (id=131)
     dw CeladonMansion4Blocks, CeladonMansion4Texts, CeladonMansion4Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4875 ; objects
+    dw CeladonMansion4Object ; objects
 
 CeladonMansion4Script: ; 0x4886b
     jp $3c3c
@@ -20311,7 +20311,7 @@ CeladonPokecenter_h: ; 0x488ac to 0x488b8 (12 bytes) (bank=12) (id=133)
     dw $40ab, $48be, CeladonPokecenterScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $48d2 ; objects
+    dw CeladonPokecenterObject ; objects
 
 CeladonPokecenterScript: ; 0x488b8
     call $22fa
@@ -20358,7 +20358,7 @@ CeladonGym_h: ; 0x488fe to 0x4890a (12 bytes) (bank=12) (id=134)
     dw CeladonGymBlocks, CeladonGymTexts, CeladonGymScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4b30 ; objects
+    dw CeladonGymObject ; objects
 
 CeladonGymScript: ; 0x4890a
     ld hl, $d126
@@ -20518,7 +20518,7 @@ CeladonGameCorner_h: ; 0x48bb1 to 0x48bbd (12 bytes) (bank=12) (id=135)
     dw CeladonGameCornerBlocks, CeladonGameCornerTexts, CeladonGameCornerScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4fa0 ; objects
+    dw CeladonGameCornerObject ; objects
 
 CeladonGameCornerScript: ; 0x48bbd
     call $4bcf
@@ -20847,7 +20847,7 @@ CeladonMart5_h: ; 0x4905d to 0x49069 (12 bytes) (bank=12) (id=136)
     dw CeladonMart5Blocks, CeladonMart5Texts, CeladonMart5Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5085 ; objects
+    dw CeladonMart5Object ; objects
 
 CeladonMart5Script: ; 0x49069
     jp $3c3c
@@ -20899,7 +20899,7 @@ CeladonPrizeRoom_h: ; 0x490e4 to 0x490f0 (12 bytes) (bank=12) (id=137)
     dw CeladonPrizeRoomBlocks, $50f3, $50f0 ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5108 ; objects
+    dw CeladonPrizeRoomObject ; objects
 
 CeladonPrizeRoomScript: ; 0x490f0
     jp $3c3c
@@ -20946,7 +20946,7 @@ CeladonDiner_h: ; 0x49145 to 0x49151 (12 bytes) (bank=12) (id=138)
     dw CeladonDinerBlocks, CeladonDinerTexts, CeladonDinerScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $51bc ; objects
+    dw CeladonDinerObject ; objects
 
 CeladonDinerScript: ; 0x49151
     call $3c3c
@@ -21028,7 +21028,7 @@ CeladonHouse_h: ; 0x49202 to 0x4920e (12 bytes) (bank=12) (id=139)
     dw CeladonHouseBlocks, CeladonHouseTexts, CeladonHouseScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5227 ; objects
+    dw CeladonHouseObject ; objects
 
 CeladonHouseScript: ; 0x4920e
     call $3c3c
@@ -21077,7 +21077,7 @@ CeladonHotel_h: ; 0x4925d to 0x49269 (12 bytes) (bank=12) (id=140)
     dw CeladonHotelBlocks, CeladonHotelTexts, CeladonHotelScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5281 ; objects
+    dw CeladonHotelObject ; objects
 
 CeladonHotelScript: ; 0x49269
     jp $3c3c
@@ -21125,7 +21125,7 @@ MtMoonPokecenter_h: ; 0x492c3 to 0x492cf (12 bytes) (bank=12) (id=68)
     dw MtMoonPokecenterBlocks, $52d5, MtMoonPokecenterScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5376 ; objects
+    dw MtMoonPokecenterObject ; objects
 
 MtMoonPokecenterScript: ; 0x492cf
     call $22fa
@@ -21229,7 +21229,7 @@ RockTunnelPokecenter_h: ; 0x493ae to 0x493ba (12 bytes) (id=81)
     dw $40ab, $53c0, RockTunnelPokecenterScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $53d4 ; objects
+    dw RockTunnelPokecenterObject ; objects
 
 RockTunnelPokecenterScript: ; 0x493ba
     call $22fa
@@ -21276,7 +21276,7 @@ Route11Gate_h: ; 0x49400 to 0x4940c (12 bytes) (id=84)
     dw Route11GateBlocks, Route11GateTexts, Route11GateScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5416 ; objects
+    dw Route11GateObject ; objects
 
 Route11GateScript: ; 0x4940c
     jp $3c3c
@@ -21317,7 +21317,7 @@ Route11GateUpstairs_h: ; 0x49448 to 0x49454 (12 bytes) (id=86)
     dw Route11GateUpstairsBlocks, $5457, Route11GateUpstairsScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $54da ; objects
+    dw Route11GateUpstairsObject ; objects
 
 Route11GateUpstairsScript: ; 0x49454
     jp $3c3f
@@ -21413,7 +21413,7 @@ Route12Gate_h: ; 0x494f8 to 0x49504 (12 bytes) (id=87)
     dw Route12GateBlocks, Route12GateTexts, Route12GateScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $550e ; objects
+    dw Route12GateObject ; objects
 
 Route12GateScript: ; 0x49504
     jp $3c3c
@@ -21457,7 +21457,7 @@ Route12GateUpstairs_h: ; 0x49554 to 0x49560 (12 bytes) (id=195)
     dw $40db, Route12GateUpstairsTexts, Route12GateUpstairsScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $55de ; objects
+    dw Route12GateUpstairsObject ; objects
 
 Route12GateUpstairsScript: ; 0x49560
     jp $3c3f
@@ -21531,7 +21531,7 @@ Route15Gate_h: ; 0x495f6 to 0x49602 (12 bytes) (id=184)
     dw $40c7, Route15GateTexts, Route15GateScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $560c ; objects
+    dw Route15GateObject ; objects
 
 Route15GateScript: ; 0x49602
     jp $3c3c
@@ -21574,7 +21574,7 @@ Route16GateMap_h: ; 0x496b2 to 0x496be (12 bytes) (id=186)
     dw Route16GateMapBlocks, Route16GateMapTexts, Route16GateMapScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $578b ; objects
+    dw Route16GateMapObject ; objects
 
 Route16GateMapScript: ; 0x496be
     ld hl, $d732
@@ -21689,7 +21689,7 @@ Route16GateUpstairs_h: ; 0x497ff to 0x4980b (12 bytes) (id=187)
     dw $40db, Route16GateUpstairsTexts, Route16GateUpstairsScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $584c ; objects
+    dw Route16GateUpstairsObject ; objects
 
 Route16GateUpstairsScript: ; 0x4980b
     jp $3c3f
@@ -21753,7 +21753,7 @@ Route18Gate_h: ; 0x4986a to 0x49876 (12 bytes) (id=190)
     dw $40c7, Route18GateTexts, Route18GateScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5937 ; objects
+    dw Route18GateObject ; objects
 
 Route18GateScript: ; 0x49876
     ld hl, $d732
@@ -21852,7 +21852,7 @@ Route18GateHeader_h: ; 0x49969 to 0x49975 (12 bytes) (id=191)
     dw $40db, Route18GateHeaderTexts, Route18GateHeaderScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $59a4 ; objects
+    dw Route18GateHeaderObject ; objects
 
 Route18GateHeaderScript: ; 0x49975
     jp $3c3f
@@ -21907,7 +21907,7 @@ MtMoon1_h: ; 0x499bc to 0x499c8 (12 bytes) (id=59)
     dw MtMoon1Blocks, MtMoon1Texts, MtMoon1Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5b06 ; objects
+    dw MtMoon1Object ; objects
 
 MtMoon1Script: ; 0x499c8
     call $3c3c
@@ -22018,7 +22018,7 @@ MtMoon3_h: ; 0x49cff to 0x49d0b (12 bytes) (id=61)
     dw MtMoon3Blocks, MtMoon3Texts, MtMoon3Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5fdb ; objects
+    dw MtMoon3Object ; objects
 
 MtMoon3Script: ; 0x49d0b
     call $3c3c
@@ -22199,7 +22199,7 @@ SafariZoneWest_h: ; 0x4a1a9 to 0x4a1b5 (12 bytes) (id=219)
     dw SafariZoneWestBlocks, SafariZoneWestTexts, SafariZoneWestScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $61dc ; objects
+    dw SafariZoneWestObject ; objects
 
 SafariZoneWestScript: ; 0x4a1b5
     jp $3c3c
@@ -22268,7 +22268,7 @@ SafariZoneSecretHouse_h: ; 0x4a30b to 0x4a317 (12 bytes) (id=222)
     dw SafariZoneSecretHouseBlocks, SafariZoneSecretHouseTexts, SafariZoneSecretHouseScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $6365 ; objects
+    dw SafariZoneSecretHouseObject ; objects
 
 SafariZoneSecretHouseScript: ; 0x4a317
     jp $3c3c
@@ -22425,7 +22425,7 @@ BattleCenterM_h: ; 0x4fd04 to 0x4fd10 (12 bytes) (id=239)
     dw BattleCenterMBlocks, BattleCenterMTexts, BattleCenterMScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $7d53 ; objects
+    dw BattleCenterMObject ; objects
 
 BattleCenterMScript: ; 0x4fd10
     call $3c3c
@@ -22486,7 +22486,7 @@ TradeCenterM_h: ; 0x4fd71 to 0x4fd7d (12 bytes) (id=240)
     dw TradeCenterMBlocks, TradeCenterMTexts, TradeCenterMScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $7d87 ; objects
+    dw TradeCenterMObject ; objects
 
 TradeCenterMScript: ; 0x4fd7d
     jp $7d10
@@ -22698,7 +22698,7 @@ Route22_h: ; 0x50000 to 0x50022 (34 bytes) (id=33)
 
     ; end connection data
 
-    dw $4022 ; objects
+    dw Route22Object ; objects
 
 Route22Object: ; 0x50022 (size=27)
     db $2c ; border tile
@@ -22741,7 +22741,7 @@ Route20_h: ; 0x500f1 to 0x50113 (34 bytes) (id=31)
 
     ; end connection data
 
-    dw $4113 ; objects
+    dw Route20Object ; objects
 
 Route20Object: ; 0x50113 (size=106)
     db $43 ; border tile
@@ -22795,7 +22795,7 @@ Route23_h: ; 0x5033f to 0x50361 (34 bytes) (id=34)
 
     ; end connection data
 
-    dw $4361 ; objects
+    dw Route23Object ; objects
 
 Route23Object: ; 0x50361 (size=81)
     db $f ; border tile
@@ -22849,7 +22849,7 @@ Route24_h: ; 0x50682 to 0x506a4 (34 bytes) (id=35)
 
     ; end connection data
 
-    dw $46a4 ; objects
+    dw Route24Object ; objects
 
 Route24Object: ; 0x506a4 (size=67)
     db $2c ; border tile
@@ -22887,7 +22887,7 @@ Route25_h: ; 0x5079b to 0x507b2 (23 bytes) (id=36)
 
     ; end connection data
 
-    dw $47b2 ; objects
+    dw Route25Object ; objects
 
 Route25Object: ; 0x507b2 (size=94)
     db $2c ; border tile
@@ -22932,7 +22932,7 @@ IndigoPlateau_h: ; 0x5091e to 0x50935 (23 bytes) (id=9)
 
     ; end connection data
 
-    dw $4936 ; objects
+    dw IndigoPlateauObject ; objects
 
 IndigoPlateauScript: ; 0x50935
     ret
@@ -22990,7 +22990,7 @@ SaffronCity_h: ; 0x509a4 to 0x509dc (56 bytes) (id=10)
 
     ; end connection data
 
-    dw $49dc ; objects
+    dw SaffronCityObject ; objects
 
 SaffronCityObject: ; 0x509dc (size=188)
     db $f ; border tile
@@ -23734,7 +23734,7 @@ VictoryRoad2_h: ; 0x51791 to 0x5179d (12 bytes) (id=194)
     dw VictoryRoad2Blocks, VictoryRoad2Texts, VictoryRoad2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5915 ; objects
+    dw VictoryRoad2Object ; objects
 
 VictoryRoad2Script: ; 0x5179d
     ld hl, $d126
@@ -23846,7 +23846,7 @@ MtMoon2_h: ; 0x51a36 to 0x51a42 (12 bytes) (id=60)
     dw MtMoon2Blocks, $5a46, MtMoon2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5a4d ; objects
+    dw MtMoon2Object ; objects
 
 MtMoon2Script: ; 0x51a42
     call $3c3c
@@ -23891,7 +23891,7 @@ SilphCo7_h: ; 0x51b55 to 0x51b61 (12 bytes) (id=212)
     dw SilphCo7Blocks, SilphCo7Texts, SilphCo7Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5ed7 ; objects
+    dw SilphCo7Object ; objects
 
 SilphCo7Script: ; 0x51b61
     call $5b77
@@ -24087,7 +24087,7 @@ Mansion2_h: ; 0x51fcc to 0x51fd8 (12 bytes) (id=214)
     dw $6110, $604d, $5fd8 ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $60d1 ; objects
+    dw Mansion2Object ; objects
 
 INCBIN "baserom.gbc",$51fd8,$52064 - $51fd8
 
@@ -24140,7 +24140,7 @@ Mansion3_h: ; 0x521e2 to 0x521ee (12 bytes) (id=215)
     dw $6326, $628a, $61ee ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $62e6 ; objects
+    dw Mansion3Object ; objects
 
 INCBIN "baserom.gbc",$521ee,$522af - $521ee
 
@@ -24192,7 +24192,7 @@ Mansion4_h: ; 0x523ad to 0x523b9 (12 bytes) (id=216)
     dw $64dd, $6436, $63b9 ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $6498 ; objects
+    dw Mansion4Object ; objects
 
 INCBIN "baserom.gbc",$523b9,$52461 - $523b9
 
@@ -24665,7 +24665,7 @@ Route3_h: ; 0x541e6 to 0x54208 (34 bytes) (id=14)
 
     ; end connection data
 
-    dw $4208 ; objects
+    dw Route3Object ; objects
 
 Route3Object: ; 0x54208 (size=77)
     db $2c ; border tile
@@ -24711,7 +24711,7 @@ Route4_h: ; 0x54390 to 0x543b2 (34 bytes) (id=15)
 
     ; end connection data
 
-    dw $43b2 ; objects
+    dw Route4Object ; objects
 
 Route4Object: ; 0x543b2 (size=58)
     db $2c ; border tile
@@ -24761,7 +24761,7 @@ Route5_h: ; 0x54581 to 0x545a3 (34 bytes) (id=16)
 
     ; end connection data
 
-    dw $45a3 ; objects
+    dw Route5Object ; objects
 
 Route5Object: ; 0x545a3 (size=47)
     db $a ; border tile
@@ -24810,7 +24810,7 @@ Route9_h: ; 0x54686 to 0x546a8 (34 bytes) (id=20)
 
     ; end connection data
 
-    dw $46a8 ; objects
+    dw Route9Object ; objects
 
 Route9Object: ; 0x546a8 (size=86)
     db $2c ; border tile
@@ -24857,7 +24857,7 @@ Route13_h: ; 0x5480c to 0x5482e (34 bytes) (id=24)
 
     ; end connection data
 
-    dw $482e ; objects
+    dw Route13Object ; objects
 
 Route13Object: ; 0x5482e (size=93)
     db $43 ; border tile
@@ -24906,7 +24906,7 @@ Route14_h: ; 0x54999 to 0x549bb (34 bytes) (id=25)
 
     ; end connection data
 
-    dw $49bb ; objects
+    dw Route14Object ; objects
 
 Route14Object: ; 0x549bb (size=87)
     db $43 ; border tile
@@ -24953,7 +24953,7 @@ Route17_h: ; 0x54b20 to 0x54b42 (34 bytes) (id=28)
 
     ; end connection data
 
-    dw $4b42 ; objects
+    dw Route17Object ; objects
 
 Route17Object: ; 0x54b42 (size=102)
     db $43 ; border tile
@@ -25005,7 +25005,7 @@ Route19_h: ; 0x54e78 to 0x54e9a (34 bytes) (id=30)
 
     ; end connection data
 
-    dw $4e9a ; objects
+    dw Route19Object ; objects
 
 Route19Object: ; 0x54e9a (size=87)
     db $43 ; border tile
@@ -25052,7 +25052,7 @@ Route21_h: ; 0x54fff to 0x55021 (34 bytes) (id=32)
 
     ; end connection data
 
-    dw $5021 ; objects
+    dw Route21Object ; objects
 
 Route21Object: ; 0x55021 (size=76)
     db $43 ; border tile
@@ -25802,7 +25802,7 @@ VermilionHouse2_h: ; 0x56064 to 0x56070 (12 bytes) (id=163)
     dw $522f, VermilionHouse2Texts, VermilionHouse2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $60cf ; objects
+    dw VermilionHouse2Object ; objects
 
 VermilionHouse2Script: ; 0x56070
     jp $3c3c
@@ -25865,7 +25865,7 @@ CeladonMart2_h: ; 0x560e9 to 0x560f5 (12 bytes) (id=123)
     dw CeladonMart2Blocks, CeladonMart2Texts, CeladonMart2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $6111 ; objects
+    dw CeladonMart2Object ; objects
 
 CeladonMart2Script: ; 0x560f5
     jp $3c3c
@@ -25917,7 +25917,7 @@ FuchsiaHouse3_h: ; 0x56170 to 0x5617c (12 bytes) (id=164)
     dw FuchsiaHouse3Blocks, FuchsiaHouse3Texts, FuchsiaHouse3Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $6221 ; objects
+    dw FuchsiaHouse3Object ; objects
 
 FuchsiaHouse3Script: ; 0x5617c
     jp $3c3c
@@ -25982,7 +25982,7 @@ DayCareM_h: ; 0x56243 to 0x5624f (12 bytes) (id=72)
     dw DayCareMBlocks, DayCareMTexts, DayCareMScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $6459 ; objects
+    dw DayCareMObject ; objects
 
 DayCareMScript: ; 0x5624f
     jp $3c3c
@@ -26071,7 +26071,7 @@ Route12House_h: ; 0x56473 to 0x5647f (12 bytes) (id=189)
     dw $522f, Route12HouseTexts, Route12HouseScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $64de ; objects
+    dw Route12HouseObject ; objects
 
 Route12HouseScript: ; 0x5647f
     jp $3c3c
@@ -26134,7 +26134,7 @@ SilphCo8_h: ; 0x564f8 to 0x56504 (12 bytes) (id=213)
     dw SilphCo8Blocks, SilphCo8Texts, SilphCo8Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $6613 ; objects
+    dw SilphCo8Object ; objects
 
 SilphCo8Script: ; 0x56504
     call $651a
@@ -26245,7 +26245,7 @@ Route6_h: ; 0x58000 to 0x58022 (34 bytes) (id=17)
 
     ; end connection data
 
-    dw $4022 ; objects
+    dw Route6Object ; objects
 
 Route6Object: ; 0x58022 (size=87)
     db $f ; border tile
@@ -26298,7 +26298,7 @@ Route8_h: ; 0x5812d to 0x5814f (34 bytes) (id=19)
 
     ; end connection data
 
-    dw $414f ; objects
+    dw Route8Object ; objects
 
 Route8Object: ; 0x5814f (size=119)
     db $2c ; border tile
@@ -26356,7 +26356,7 @@ Route10_h: ; 0x582d4 to 0x582f6 (34 bytes) (id=21)
 
     ; end connection data
 
-    dw $42f6 ; objects
+    dw Route10Object ; objects
 
 Route10Object: ; 0x582f6 (size=96)
     db $2c ; border tile
@@ -26412,7 +26412,7 @@ Route11_h: ; 0x584be to 0x584e0 (34 bytes) (id=22)
 
     ; end connection data
 
-    dw $44e0 ; objects
+    dw Route11Object ; objects
 
 Route11Object: ; 0x584e0 (size=127)
     db $f ; border tile
@@ -26477,7 +26477,7 @@ Route12_h: ; 0x5866d to 0x5869a (45 bytes) (id=23)
 
     ; end connection data
 
-    dw $469a ; objects
+    dw Route12Object ; objects
 
 Route12Object: ; 0x5869a (size=118)
     db $43 ; border tile
@@ -26535,7 +26535,7 @@ Route15_h: ; 0x5892c to 0x5894e (34 bytes) (id=26)
 
     ; end connection data
 
-    dw $494e ; objects
+    dw Route15Object ; objects
 
 Route15Object: ; 0x5894e (size=126)
     db $43 ; border tile
@@ -26593,7 +26593,7 @@ Route16_h: ; 0x58ada to 0x58afc (34 bytes) (id=27)
 
     ; end connection data
 
-    dw $4afc ; objects
+    dw Route16Object ; objects
 
 Route16Object: ; 0x58afc (size=136)
     db $f ; border tile
@@ -26658,7 +26658,7 @@ Route18_h: ; 0x58c38 to 0x58c5a (34 bytes) (id=29)
 
     ; end connection data
 
-    dw $4c5a ; objects
+    dw Route18Object ; objects
 
 Route18Object: ; 0x58c5a (size=66)
     db $43 ; border tile
@@ -27297,7 +27297,7 @@ FanClub_h: ; 0x59b64 to 0x59b70 (12 bytes) (id=90)
     dw FanClubBlocks, FanClubTexts, FanClubScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5c97 ; objects
+    dw FanClubObject ; objects
 
 FanClubScript: ; 0x59b70
     jp $3c3c
@@ -27451,7 +27451,7 @@ SilphCo2_h: ; 0x59ce5 to 0x59cf1 (12 bytes) (id=207)
     dw SilphCo2Blocks, SilphCo2Texts, SilphCo2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5e66 ; objects
+    dw SilphCo2Object ; objects
 
 SilphCo2Script: ; 0x59cf1
     call $5d07
@@ -27559,7 +27559,7 @@ SilphCo3_h: ; 0x59f4f to 0x59f5b (12 bytes) (id=208)
     dw SilphCo3Blocks, SilphCo3Texts, SilphCo3Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $6035 ; objects
+    dw SilphCo3Object ; objects
 
 SilphCo3Script: ; 0x59f5b
     call $5f71
@@ -27652,7 +27652,7 @@ SilphCo10_h: ; 0x5a12d to 0x5a139 (12 bytes) (id=234)
     dw SilphCo10Blocks, SilphCo10Texts, SilphCo10Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $61fb ; objects
+    dw SilphCo10Object ; objects
 
 SilphCo10Script: ; 0x5a139
     call $614f
@@ -27735,7 +27735,7 @@ Lance_h: ; 0x5a2a2 to 0x5a2ae (12 bytes) (id=113)
     dw LanceBlocks, LanceTexts, LanceScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $63c5 ; objects
+    dw LanceObject ; objects
 
 LanceScript: ; 0x5a2ae
     call $62c4
@@ -27790,7 +27790,7 @@ HallofFameRoom_h: ; 0x5a492 to 0x5a49e (12 bytes) (id=118)
     dw HallofFameRoomBlocks, HallofFameRoomTexts, HallofFameRoomScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $6571 ; objects
+    dw HallofFameRoomObject ; objects
 
 HallofFameRoomScript: ; 0x5a49e
     call $3c3c
@@ -28000,7 +28000,7 @@ MuseumF1_h: ; 0x5c0eb to 0x5c0f7 (12 bytes) (id=52)
     dw MuseumF1Blocks, MuseumF1Texts, MuseumF1Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $42c1 ; objects
+    dw MuseumF1Object ; objects
 
 MuseumF1Script: ; 0x5c0f7
     ld a, $1
@@ -28232,7 +28232,7 @@ MuseumF2_h: ; 0x5c30b to 0x5c317 (12 bytes) (id=53)
     dw MuseumF2Blocks, MuseumF2Texts, MuseumF2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $434b ; objects
+    dw MuseumF2Object ; objects
 
 MuseumF2Script: ; 0x5c317
     jp $3c3c
@@ -28295,7 +28295,7 @@ PewterGym_h: ; 0x5c37b to 0x5c387 (12 bytes) (id=54)
     dw PewterGymBlocks, PewterGymTexts, PewterGymScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $452e ; objects
+    dw PewterGymObject ; objects
 
 PewterGymScript: ; 0x5c387
     ld hl, $d126
@@ -28434,7 +28434,7 @@ PewterPokecenter_h: ; 0x5c57b to 0x5c587 (12 bytes) (id=58)
     dw PewterPokecenterBlocks, $458d, PewterPokecenterScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $460d ; objects
+    dw PewterPokecenterObject ; objects
 
 PewterPokecenterScript: ; 0x5c587
     call $22fa
@@ -28533,7 +28533,7 @@ CeruleanPokecenter_h: ; 0x5c639 to 0x5c645 (12 bytes) (id=64)
     dw CeruleanPokecenterBlocks, $464b, CeruleanPokecenterScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $465f ; objects
+    dw CeruleanPokecenterObject ; objects
 
 CeruleanPokecenterScript: ; 0x5c645
     call $22fa
@@ -28582,7 +28582,7 @@ CeruleanGym_h: ; 0x5c6a7 to 0x5c6b3 (12 bytes) (id=65)
     dw CeruleanGymBlocks, CeruleanGymTexts, CeruleanGymScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4834 ; objects
+    dw CeruleanGymObject ; objects
 
 CeruleanGymScript: ; 0x5c6b3
     ld hl, $d126
@@ -28716,7 +28716,7 @@ CeruleanMart_h: ; 0x5c889 to 0x5c895 (12 bytes) (id=67)
     dw $4000, CeruleanMartTexts, CeruleanMartScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $48a8 ; objects
+    dw CeruleanMartObject ; objects
 
 CeruleanMartScript: ; 0x5c895
     jp $3c3c
@@ -28757,7 +28757,7 @@ LavenderPokecenter_h: ; 0x5c8ce to 0x5c8da (12 bytes) (id=141)
     dw $4064, $48e0, LavenderPokecenterScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $48f4 ; objects
+    dw LavenderPokecenterObject ; objects
 
 LavenderPokecenterScript: ; 0x5c8da
     call $22fa
@@ -28804,7 +28804,7 @@ LavenderMart_h: ; 0x5c920 to 0x5c92c (12 bytes) (id=150)
     dw $4000, $492f, LavenderMartScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $495d ; objects
+    dw LavenderMartObject ; objects
 
 LavenderMartScript: ; 0x5c92c
     jp $3c3c
@@ -28857,7 +28857,7 @@ VermilionPokecenter_h: ; 0x5c983 to 0x5c98f (12 bytes) (id=89)
     dw $4064, $4995, VermilionPokecenterScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $49a9 ; objects
+    dw VermilionPokecenterObject ; objects
 
 VermilionPokecenterScript: ; 0x5c98f
     call $22fa
@@ -28903,7 +28903,7 @@ VermilionMart_h: ; 0x5c9d5 to 0x5c9e1 (12 bytes) (id=91)
     dw VermilionMartBlocks, VermilionMartTexts, VermilionMartScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $49f4 ; objects
+    dw VermilionMartObject ; objects
 
 VermilionMartScript: ; 0x5c9e1
     jp $3c3c
@@ -28944,7 +28944,7 @@ VermilionGym_h: ; 0x5ca1a to 0x5ca26 (12 bytes) (id=92)
     dw VermilionGymBlocks, VermilionGymTexts, VermilionGymScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4bfe ; objects
+    dw VermilionGymObject ; objects
 
 VermilionGymScript: ; 0x5ca26
     ld hl, $d126
@@ -29093,7 +29093,7 @@ CopycatsHouseF2_h: ; 0x5cc65 to 0x5cc71 (12 bytes) (id=176)
     dw $4010, CopycatsHouseF2Texts, CopycatsHouseF2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4d21 ; objects
+    dw CopycatsHouseF2Object ; objects
 
 CopycatsHouseF2Script: ; 0x5cc71
     jp $3c3c
@@ -29194,7 +29194,7 @@ FightingDojo_h: ; 0x5cd51 to 0x5cd5d (12 bytes) (id=177)
     dw FightingDojoBlocks, FightingDojoTexts, FightingDojoScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4f9b ; objects
+    dw FightingDojoObject ; objects
 
 FightingDojoScript: ; 0x5cd5d
     call $3c3c
@@ -29382,7 +29382,7 @@ SaffronGym_h: ; 0x5d001 to 0x5d00d (12 bytes) (id=178)
     dw SaffronGymBlocks, SaffronGymTexts, SaffronGymScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5259 ; objects
+    dw SaffronGymObject ; objects
 
 SaffronGymScript: ; 0x5d00d
     ld hl, $d126
@@ -29603,7 +29603,7 @@ SaffronMart_h: ; 0x5d3fd to 0x5d409 (12 bytes) (id=180)
     dw $4000, SaffronMartTexts, SaffronMartScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $541c ; objects
+    dw SaffronMartObject ; objects
 
 SaffronMartScript: ; 0x5d409
     jp $3c3c
@@ -29644,7 +29644,7 @@ SilphCo1_h: ; 0x5d442 to 0x5d44e (12 bytes) (id=181)
     dw SilphCo1Blocks, SilphCo1Texts, SilphCo1Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5470 ; objects
+    dw SilphCo1Object ; objects
 
 SilphCo1Script: ; 0x5d44e
     call $3c3c
@@ -29699,7 +29699,7 @@ SaffronPokecenter_h: ; 0x5d529 to 0x5d535 (12 bytes) (id=182)
     dw $4064, $553b, SaffronPokecenterScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $554f ; objects
+    dw SaffronPokecenterObject ; objects
 
 SaffronPokecenterScript: ; 0x5d535
     call $22fa
@@ -29746,7 +29746,7 @@ ViridianForestexit_h: ; 0x5d57b to 0x5d587 (12 bytes) (id=47)
     dw ViridianForestexitBlocks, ViridianForestexitTexts, ViridianForestexitScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5598 ; objects
+    dw ViridianForestexitObject ; objects
 
 ViridianForestexitScript: ; 0x5d587
     jp $3c3c
@@ -29790,7 +29790,7 @@ Route2Gate_h: ; 0x5d5c8 to 0x5d5d4 (12 bytes) (id=49)
     dw $4090, Route2GateTexts, Route2GateScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5620 ; objects
+    dw Route2GateObject ; objects
 
 Route2GateScript: ; 0x5d5d4
     jp $3c3c
@@ -29860,7 +29860,7 @@ ViridianForestEntrance_h: ; 0x5d650 to 0x5d65c (12 bytes) (id=50)
     dw $4090, ViridianForestEntranceTexts, ViridianForestEntranceScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $566d ; objects
+    dw ViridianForestEntranceObject ; objects
 
 ViridianForestEntranceScript: ; 0x5d65c
     jp $3c3c
@@ -29904,7 +29904,7 @@ UndergroundTunnelEntranceRoute5_h: ; 0x5d69d to 0x5d6a9 (12 bytes) (id=71)
     dw UndergroundTunnelEntranceRoute5Blocks, UndergroundTunnelEntranceRoute5Texts, UndergroundTunnelEntranceRoute5Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $56c1 ; objects
+    dw UndergroundTunnelEntranceRoute5Object ; objects
 
 UndergroundTunnelEntranceRoute5Script: ; 0x5d6a9
     ld a, $10
@@ -29950,7 +29950,7 @@ UndergroundTunnelEntranceRoute6_h: ; 0x5d6e3 to 0x5d6ef (12 bytes) (id=74)
     dw $4080, UndergroundTunnelEntranceRoute6Texts, UndergroundTunnelEntranceRoute6Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $56fe ; objects
+    dw UndergroundTunnelEntranceRoute6Object ; objects
 
 UndergroundTunnelEntranceRoute6Script: ; 0x5d6ef
     ld a, $11
@@ -29991,7 +29991,7 @@ UndergroundPathEntranceRoute7_h: ; 0x5d720 to 0x5d72c (12 bytes) (id=77)
     dw $4080, UndergroundPathEntranceRoute7Texts, UndergroundPathEntranceRoute7Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $573b ; objects
+    dw UndergroundPathEntranceRoute7Object ; objects
 
 UndergroundPathEntranceRoute7Script: ; 0x5d72c
     ld a, $12
@@ -30130,7 +30130,7 @@ VictoryRoad1_h: ; 0x5d9fe to 0x5da0a (12 bytes) (id=108)
     dw VictoryRoad1Blocks, VictoryRoad1Texts, VictoryRoad1Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5ab8 ; objects
+    dw VictoryRoad1Object ; objects
 
 VictoryRoad1Script: ; 0x5da0a
     ld hl, $d126
@@ -30214,7 +30214,7 @@ PokemonTower1_h: ; 0x60420 to 0x6042c (12 bytes) (id=142)
     dw PokemonTower1Blocks, PokemonTower1Texts, PokemonTower1Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4452 ; objects
+    dw PokemonTower1Object ; objects
 
 PokemonTower1Script: ; 0x6042c
     jp $3c3c
@@ -31955,7 +31955,7 @@ UndergroundPathNS_h: ; 0x61f1a to 0x61f26 (12 bytes) (id=119)
     dw UndergroundPathNSBlocks, UndergroundPathNSTexts, UndergroundPathNSScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5f2a ; objects
+    dw UndergroundPathNSObject ; objects
 
 UndergroundPathNSScript: ; 0x61f26
     jp $3c3c
@@ -32043,10 +32043,10 @@ DiglettsCaveBlocks: ; 360
 SilphCo11_h: ; 0x620ee to 0x620fa (12 bytes) (id=235)
     db $10 ; tileset
     db $09, $09 ; dimensions (y, x)
-    dw SilphCo11Blocks, $62b7, $60fa ; blocks, texts, scripts
+    dw SilphCo11Blocks, SilphCo11Texts, SilphCo11Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $6380 ; objects
+    dw SilphCo11Object ; objects
 
 SilphCo11Script: ; 0x620fa
     call $6110
@@ -33258,10 +33258,10 @@ 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 ViridianGymBlocks, $49ec, $48a3 ; blocks, texts, scripts
+    dw ViridianGymBlocks, ViridianGymTexts, ViridianGymScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4bde ; objects
+    dw ViridianGymObject ; objects
 
 ViridianGymScript: ; 0x748a3
     ld hl, $48bf
@@ -33452,10 +33452,10 @@ ViridianGymBlocks: ; 90
 PewterMart_h: ; 0x74ca1 to 0x74cad (12 bytes) (id=56)
     db $02 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw PewterMartBlocks, $4cb6, $4cad ; blocks, texts, scripts
+    dw PewterMartBlocks, PewterMartTexts, PewterMartScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4cda ; objects
+    dw PewterMartObject ; objects
 
 PewterMartScript: ; 0x74cad
     call $3c3c
@@ -33504,10 +33504,10 @@ PewterMartObject: ; 0x74cda (size=38)
 UnknownDungeon1_h: ; 0x74d00 to 0x74d0c (12 bytes) (id=228)
     db $11 ; tileset
     db $09, $0f ; dimensions (y, x)
-    dw UnknownDungeon1Blocks, $4d0f, $4d0c ; blocks, texts, scripts
+    dw UnknownDungeon1Blocks, UnknownDungeon1Texts, UnknownDungeon1Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4d15 ; objects
+    dw UnknownDungeon1Object ; objects
 
 UnknownDungeon1Script: ; 0x74d0c
     jp $3c3c
@@ -33554,10 +33554,10 @@ UnknownDungeon1Blocks: ; 135
 CeruleanHouse3_h: ; 0x74dfd to 0x74e09 (12 bytes) (id=230)
     db $0d ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw CeruleanHouse3Blocks, $4e13, $4e09 ; blocks, texts, scripts
+    dw CeruleanHouse3Blocks, $4e13, CeruleanHouse3Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4ebe ; objects
+    dw CeruleanHouse3Object ; objects
 
 CeruleanHouse3Script: ; 0x74e09
     ld a, $1
@@ -33638,10 +33638,10 @@ INCBIN "baserom.gbc",$74ee0,$12c
 FuchsiaHouse1_h: ; 0x7500c to 0x75018 (12 bytes) (id=153)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw FuchsiaHouse1Blocks, $501c, $5018 ; blocks, texts, scripts
+    dw FuchsiaHouse1Blocks, FuchsiaHouse1Texts, FuchsiaHouse1Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5031 ; objects
+    dw FuchsiaHouse1Object ; objects
 
 FuchsiaHouse1Script: ; 0x75018
     call $3c3c
@@ -33684,10 +33684,10 @@ FuchsiaHouse1Object: ; 0x75031 (size=38)
 FuchsiaPokecenter_h: ; 0x75057 to 0x75063 (12 bytes) (id=154)
     db $06 ; tileset
     db $04, $07 ; dimensions (y, x)
-    dw FuchsiaPokecenterBlocks, $5069, $5063 ; blocks, texts, scripts
+    dw FuchsiaPokecenterBlocks, $5069, FuchsiaPokecenterScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $507d ; objects
+    dw FuchsiaPokecenterObject ; objects
 
 FuchsiaPokecenterScript: ; 0x75063
     call $22fa
@@ -33730,10 +33730,10 @@ FuchsiaPokecenterObject: ; 0x7507d (size=44)
 FuchsiaHouse2_h: ; 0x750a9 to 0x750b5 (12 bytes) (id=155)
     db $14 ; tileset
     db $04, $05 ; dimensions (y, x)
-    dw FuchsiaHouse2Blocks, $50b8, $50b5 ; blocks, texts, scripts
+    dw FuchsiaHouse2Blocks, FuchsiaHouse2Texts, FuchsiaHouse2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5180 ; objects
+    dw FuchsiaHouse2Object ; objects
 
 FuchsiaHouse2Script: ; 0x750b5
     jp $3c3c
@@ -33837,10 +33837,10 @@ FuchsiaHouse2Blocks: ; 20
 SafariZoneEntrance_h: ; 0x751c1 to 0x751cd (12 bytes) (id=156)
     db $0c ; tileset
     db $03, $04 ; dimensions (y, x)
-    dw SafariZoneEntranceBlocks, $52b9, $51cd ; blocks, texts, scripts
+    dw SafariZoneEntranceBlocks, SafariZoneEntranceTexts, SafariZoneEntranceScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $53f5 ; objects
+    dw SafariZoneEntranceObject ; objects
 
 SafariZoneEntranceScript: ; 0x751cd
     call $3c3c
@@ -33965,10 +33965,10 @@ SafariZoneEntranceBlocks: ; 12
 FuchsiaGym_h: ; 0x75431 to 0x7543d (12 bytes) (id=157)
     db $07 ; tileset
     db $09, $05 ; dimensions (y, x)
-    dw FuchsiaGymBlocks, $54d5, $543d ; blocks, texts, scripts
+    dw FuchsiaGymBlocks, FuchsiaGymTexts, FuchsiaGymScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5658 ; objects
+    dw FuchsiaGymObject ; objects
 
 FuchsiaGymScript: ; 0x7543d
     call $5453
@@ -34125,10 +34125,10 @@ FuchsiaGymBlocks: ; 45
 FuchsiaMeetingRoom_h: ; 0x756d7 to 0x756e3 (12 bytes) (id=158)
     db $14 ; tileset
     db $04, $07 ; dimensions (y, x)
-    dw FuchsiaMeetingRoomBlocks, $56e7, $56e3 ; blocks, texts, scripts
+    dw FuchsiaMeetingRoomBlocks, FuchsiaMeetingRoomTexts, FuchsiaMeetingRoomScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $56fc ; objects
+    dw FuchsiaMeetingRoomObject ; objects
 
 FuchsiaMeetingRoomScript: ; 0x756e3
     call $3c3c
@@ -34174,10 +34174,10 @@ FuchsiaMeetingRoomBlocks: ; 28
 CinnabarGym_h: ; 0x7573e to 0x7574a (12 bytes) (id=166)
     db $16 ; tileset
     db $09, $0a ; dimensions (y, x)
-    dw $5b26, $589f, $574a ; blocks, texts, scripts
+    dw $5b26, CinnabarGymTexts, CinnabarGymScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5acc ; objects
+    dw CinnabarGymObject ; objects
 
 CinnabarGymScript: ; 0x7574a
     call $5759
@@ -34446,10 +34446,10 @@ CinnabarGymBlocks: ; 90
 Lab1_h: ; 0x75b80 to 0x75b8c (12 bytes) (id=167)
     db $14 ; tileset
     db $04, $09 ; dimensions (y, x)
-    dw Lab1Blocks, $5b90, $5b8c ; blocks, texts, scripts
+    dw Lab1Blocks, Lab1Texts, Lab1Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5bb3 ; objects
+    dw Lab1Object ; objects
 
 Lab1Script: ; 0x75b8c
     call $3c3c
@@ -34511,10 +34511,10 @@ Lab1Blocks: ; 36
 Lab2_h: ; 0x75c15 to 0x75c21 (12 bytes) (id=168)
     db $14 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw Lab2Blocks, $5c24, $5c21 ; blocks, texts, scripts
+    dw Lab2Blocks, Lab2Texts, Lab2Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5c45 ; objects
+    dw Lab2Object ; objects
 
 Lab2Script: ; 0x75c21
     jp $3c3c
@@ -34566,10 +34566,10 @@ Lab2Blocks: ; 16
 Lab3_h: ; 0x75c7b to 0x75c87 (12 bytes) (id=169)
     db $14 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw Lab3Blocks, $5c8a, $5c87 ; blocks, texts, scripts
+    dw Lab3Blocks, Lab3Texts, Lab3Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5cec ; objects
+    dw Lab3Object ; objects
 
 Lab3Script: ; 0x75c87
     jp $3c3c
@@ -34647,7 +34647,7 @@ Lab4_h: ; 0x75d25 to 0x75d31 (12 bytes) (id=170)
     dw Lab4Blocks, $5d34, $5d31 ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5df0 ; objects
+    dw Lab4Object ; objects
 
 Lab4Script: ; 0x75d31
     jp $3c3c
@@ -34734,16 +34734,17 @@ Lab4Blocks: ; 16
 CinnabarPokecenter_h: ; 0x75e20 to 0x75e2c (12 bytes) (id=171)
     db $06 ; tileset
     db $04, $07 ; dimensions (y, x)
-    dw $4030, $5e32, $5e2c ; blocks, texts, scripts
+    dw $4030, CinnabarPokecenterTexts, CinnabarPokecenterScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5e46 ; objects
+    dw CinnabarPokecenterObject ; objects
 
 CinnabarPokecenterScript: ; 0x75e2c
     call $22fa
     jp $3c3c
 ; 0x75e32
 
+CinnabarPokecenterTexts:
 INCBIN "baserom.gbc",$75e32,$9
 
 CinnabarPokecenterText2:
@@ -34780,10 +34781,10 @@ CinnabarPokecenterObject: ; 0x75e46 (size=44)
 CinnabarMart_h: ; 0x75e72 to 0x75e7e (12 bytes) (id=172)
     db $02 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $4010, $5e81, $5e7e ; blocks, texts, scripts
+    dw $4010, CinnabarMartTexts, CinnabarMartScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5e91 ; objects
+    dw CinnabarMartObject ; objects
 
 CinnabarMartScript: ; 0x75e7e
     jp $3c3c
@@ -34821,10 +34822,10 @@ CinnabarMartObject: ; 0x75e91 (size=38)
 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
+    dw $4000, CopycatsHouseF1Texts, CopycatsHouseF1Script ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $5ee3 ; objects
+    dw CopycatsHouseF1Object ; objects
 
 CopycatsHouseF1Script: ; 0x75ec3
     jp $3c3c
@@ -34946,10 +34947,10 @@ GaryBlocks: ; 16
 Loreli_h: ; 0x7616f to 0x7617b (12 bytes) (id=245)
     db $07 ; tileset
     db $06, $05 ; dimensions (y, x)
-    dw LoreliBlocks, $6251, $617b ; blocks, texts, scripts
+    dw LoreliBlocks, LoreliTexts, LoreliScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $6280 ; objects
+    dw LoreliObject ; objects
 
 LoreliScript: ; 0x7617b
     call $6191
@@ -35006,10 +35007,10 @@ LoreliBlocks: ; 30
 Bruno_h: ; 0x762ca to 0x762d6 (12 bytes) (id=246)
     db $07 ; tileset
     db $06, $05 ; dimensions (y, x)
-    dw BrunoBlocks, $63a8, $62d6 ; blocks, texts, scripts
+    dw BrunoBlocks, BrunoTexts, BrunoScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $63d7 ; objects
+    dw BrunoObject ; objects
 
 BrunoScript: ; 0x762d6
     call $62ec
@@ -35066,10 +35067,10 @@ BrunoBlocks: ; 30
 Agatha_h: ; 0x76421 to 0x7642d (12 bytes) (id=247)
     db $0f ; tileset
     db $06, $05 ; dimensions (y, x)
-    dw AgathaBlocks, $6505, $642d ; blocks, texts, scripts
+    dw AgathaBlocks, AgathaTexts, AgathaScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $6534 ; objects
+    dw AgathaObject ; objects
 
 AgathaScript: ; 0x7642d
     call $6443
-- 
cgit v1.2.3


From 6412f7f501b006dcde6ea8a28b25ea65b09fcbdf Mon Sep 17 00:00:00 2001
From: stag019 <stag019@gmail.com>
Date: Fri, 13 Jan 2012 22:26:14 -0500
Subject: Fixed up Wild Pokemon Data and added data for all versions

hg-commit-id: ae728feaf7ec
---
 constants.asm |    8 +-
 pokered.asm   | 2879 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 2788 insertions(+), 99 deletions(-)

diff --git a/constants.asm b/constants.asm
index dafee50e..0e5f4061 100644
--- a/constants.asm
+++ b/constants.asm
@@ -1,6 +1,8 @@
-RED EQU 1
-BLUE EQU 0
-GREEN EQU 0
+_JAPAN EQU 0
+_RED EQU 1
+_BLUE EQU 0
+_GREEN EQU 0
+_YELLOW EQU 0
 
 ;\1 = X
 ;\2 = Y
diff --git a/pokered.asm b/pokered.asm
index aa6627ae..77cecb49 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -1905,7 +1905,7 @@ INCBIN "baserom.gbc",$425B,$4588-$425B
 
 TitleMons: ; 4588
 ; mons on the title screen are randomly chosen from here
-IF RED
+IF _RED
 	db CHARMANDER
 	db SQUIRTLE
 	db BULBASAUR
@@ -1923,7 +1923,7 @@ IF RED
 	db PONYTA
 	db MAGIKARP
 ENDC
-IF GREEN
+IF _GREEN
 	db BULBASAUR
 	db CHARMANDER
 	db SQUIRTLE
@@ -1941,7 +1941,7 @@ IF GREEN
 	db PONYTA
 	db MAGIKARP
 ENDC
-IF BLUE
+IF _BLUE
 	db SQUIRTLE
 	db CHARMANDER
 	db BULBASAUR
@@ -3714,9 +3714,11 @@ WildDataPointers: ; 4EEB
 		; followed by 20 bytes:
 		; level, species (ten times)
 
-NoMons: ; no wild pokemon
-	db 0
-	db 0
+IF _RED
+NoMons:
+	db $00
+
+	db $00
 
 Route1Mons:
 	db $19
@@ -3731,7 +3733,7 @@ Route1Mons:
 	db 4,PIDGEY
 	db 5,PIDGEY
 
-	db 0
+	db $00
 
 Route2Mons:
 	db $19
@@ -3746,7 +3748,7 @@ Route2Mons:
 	db 4,WEEDLE
 	db 5,WEEDLE
 
-	db 0
+	db $00
 
 Route22Mons:
 	db $19
@@ -3761,7 +3763,7 @@ Route22Mons:
 	db 3,NIDORAN_F
 	db 4,NIDORAN_F
 
-	db 0
+	db $00
 
 ForestMons:
 	db $08
@@ -3776,7 +3778,7 @@ ForestMons:
 	db 3,PIKACHU
 	db 5,PIKACHU
 
-	db 0
+	db $00
 
 Route3Mons:
 	db $14
@@ -3791,7 +3793,7 @@ Route3Mons:
 	db 5,JIGGLYPUFF
 	db 7,JIGGLYPUFF
 
-	db 0
+	db $00
 
 MoonMons1:
 	db $0A
@@ -3806,7 +3808,7 @@ MoonMons1:
 	db 11,ZUBAT
 	db 8,CLEFAIRY
 
-	db 0
+	db $00
 
 MoonMonsB1:
 	db $0A
@@ -3821,7 +3823,7 @@ MoonMonsB1:
 	db 9,CLEFAIRY
 	db 9,GEODUDE
 
-	db 0
+	db $00
 
 MoonMonsB2:
 	db $0A
@@ -3836,7 +3838,7 @@ MoonMonsB2:
 	db 12,ZUBAT
 	db 12,CLEFAIRY
 
-	db 0
+	db $00
 
 Route4Mons:
 	db $14
@@ -3851,7 +3853,7 @@ Route4Mons:
 	db 8,EKANS
 	db 12,EKANS
 
-	db 0
+	db $00
 
 Route24Mons:
 	db $19
@@ -3866,10 +3868,10 @@ Route24Mons:
 	db 8,ABRA
 	db 12,ABRA
 
-	db 0
+	db $00
 
 Route25Mons:
-	db 15
+	db $0F
 	db 8,WEEDLE
 	db 9,KAKUNA
 	db 13,PIDGEY
@@ -3881,10 +3883,10 @@ Route25Mons:
 	db 7,METAPOD
 	db 8,CATERPIE
 
-	db 0
+	db $00
 
 Route9Mons:
-	db 15
+	db $0F
 	db 16,RATTATA
 	db 16,SPEAROW
 	db 14,RATTATA
@@ -3896,10 +3898,10 @@ Route9Mons:
 	db 13,EKANS
 	db 17,EKANS
 
-	db 0
+	db $00
 
 Route5Mons:
-	db 15
+	db $0F
 	db 13,ODDISH
 	db 13,PIDGEY
 	db 15,PIDGEY
@@ -3911,10 +3913,10 @@ Route5Mons:
 	db 14,MANKEY
 	db 16,MANKEY
 
-	db 0
+	db $00
 
 Route6Mons:
-	db 15
+	db $0F
 	db 13,ODDISH
 	db 13,PIDGEY
 	db 15,PIDGEY
@@ -3926,10 +3928,10 @@ Route6Mons:
 	db 14,MANKEY
 	db 16,MANKEY
 
-	db 0
+	db $00
 
 Route11Mons:
-	db 15
+	db $0F
 	db 14,EKANS
 	db 15,SPEAROW
 	db 12,EKANS
@@ -3941,10 +3943,10 @@ Route11Mons:
 	db 11,DROWZEE
 	db 15,DROWZEE
 
-	db 0
+	db $00
 
 TunnelMonsB1:
-	db 15
+	db $0F
 	db 16,ZUBAT
 	db 17,ZUBAT
 	db 17,GEODUDE
@@ -3956,10 +3958,10 @@ TunnelMonsB1:
 	db 13,ONIX
 	db 15,ONIX
 
-	db 0
+	db $00
 
 TunnelMonsB2:
-	db 15
+	db $0F
 	db 16,ZUBAT
 	db 17,ZUBAT
 	db 17,GEODUDE
@@ -3971,10 +3973,10 @@ TunnelMonsB2:
 	db 13,ONIX
 	db 18,GEODUDE
 
-	db 0
+	db $00
 
 Route10Mons:
-	db 15
+	db $0F
 	db 16,VOLTORB
 	db 16,SPEAROW
 	db 14,VOLTORB
@@ -3986,10 +3988,10 @@ Route10Mons:
 	db 13,EKANS
 	db 17,EKANS
 
-	db 0
+	db $00
 
 Route12Mons:
-	db 15
+	db $0F
 	db 24,ODDISH
 	db 25,PIDGEY
 	db 23,PIDGEY
@@ -4001,10 +4003,10 @@ Route12Mons:
 	db 28,GLOOM
 	db 30,GLOOM
 
-	db 0
+	db $00
 
 Route8Mons:
-	db 15
+	db $0F
 	db 18,PIDGEY
 	db 18,MANKEY
 	db 17,EKANS
@@ -4016,10 +4018,10 @@ Route8Mons:
 	db 15,GROWLITHE
 	db 18,GROWLITHE
 
-	db 0
+	db $00
 
 Route7Mons:
-	db 15
+	db $0F
 	db 19,PIDGEY
 	db 19,ODDISH
 	db 17,MANKEY
@@ -4031,15 +4033,17 @@ Route7Mons:
 	db 19,MANKEY
 	db 20,MANKEY
 
-	db 0
+	db $00
 
 TowerMons1:
-	db 0
-	db 0
+	db $00
+
+	db $00
 
 TowerMons2:
-	db 0
-	db 0
+	db $00
+
+	db $00
 
 TowerMons3:
 	db $0A
@@ -4054,7 +4058,7 @@ TowerMons3:
 	db 22,CUBONE
 	db 25,HAUNTER
 
-	db 0
+	db $00
 
 TowerMons4:
 	db $0A
@@ -4069,7 +4073,7 @@ TowerMons4:
 	db 22,CUBONE
 	db 24,GASTLY
 
-	db 0
+	db $00
 
 TowerMons5:
 	db $0A
@@ -4084,10 +4088,10 @@ TowerMons5:
 	db 22,CUBONE
 	db 24,GASTLY
 
-	db 0
+	db $00
 
 TowerMons6:
-	db 15
+	db $0F
 	db 21,GASTLY
 	db 22,GASTLY
 	db 23,GASTLY
@@ -4099,10 +4103,10 @@ TowerMons6:
 	db 24,CUBONE
 	db 28,HAUNTER
 
-	db 0
+	db $00
 
 TowerMons7:
-	db 15
+	db $0F
 	db 21,GASTLY
 	db 22,GASTLY
 	db 23,GASTLY
@@ -4114,7 +4118,7 @@ TowerMons7:
 	db 28,HAUNTER
 	db 30,HAUNTER
 
-	db 0
+	db $00
 
 Route13Mons:
 	db $14
@@ -4129,10 +4133,10 @@ Route13Mons:
 	db 28,GLOOM
 	db 30,GLOOM
 
-	db 0
+	db $00
 
 Route14Mons:
-	db 15
+	db $0F
 	db 24,ODDISH
 	db 26,PIDGEY
 	db 23,DITTO
@@ -4144,10 +4148,10 @@ Route14Mons:
 	db 28,PIDGEOTTO
 	db 30,PIDGEOTTO
 
-	db 0
+	db $00
 
 Route15Mons:
-	db 15
+	db $0F
 	db 24,ODDISH
 	db 26,DITTO
 	db 23,PIDGEY
@@ -4159,7 +4163,7 @@ Route15Mons:
 	db 28,PIDGEOTTO
 	db 30,PIDGEOTTO
 
-	db 0
+	db $00
 
 Route16Mons:
 	db $19
@@ -4174,7 +4178,7 @@ Route16Mons:
 	db 23,RATICATE
 	db 25,RATICATE
 
-	db 0
+	db $00
 
 Route17Mons:
 	db $19
@@ -4189,7 +4193,7 @@ Route17Mons:
 	db 25,FEAROW
 	db 27,FEAROW
 
-	db 0
+	db $00
 
 Route18Mons:
 	db $19
@@ -4204,7 +4208,7 @@ Route18Mons:
 	db 27,FEAROW
 	db 29,FEAROW
 
-	db 0
+	db $00
 
 ZoneMonsCenter:
 	db $1E
@@ -4219,7 +4223,7 @@ ZoneMonsCenter:
 	db 23,SCYTHER
 	db 23,CHANSEY
 
-	db 0
+	db $00
 
 ZoneMons1:
 	db $1E
@@ -4234,7 +4238,7 @@ ZoneMons1:
 	db 25,KANGASKHAN
 	db 28,SCYTHER
 
-	db 0
+	db $00
 
 ZoneMons2:
 	db $1E
@@ -4249,7 +4253,7 @@ ZoneMons2:
 	db 26,CHANSEY
 	db 28,TAUROS
 
-	db 0
+	db $00
 
 ZoneMons3:
 	db $1E
@@ -4264,25 +4268,25 @@ ZoneMons3:
 	db 26,TAUROS
 	db 28,KANGASKHAN
 
-	db 0
+	db $00
 
 WaterMons:
-	db 0
+	db $00
 
-	db 5
-	db 5,   TENTACOOL
-	db 10,  TENTACOOL
-	db 15,  TENTACOOL
-	db 5,   TENTACOOL
-	db 10,  TENTACOOL
-	db 15,  TENTACOOL
-	db 20,  TENTACOOL
-	db 30,  TENTACOOL
-	db 35,  TENTACOOL
-	db 40,  TENTACOOL
+	db $05
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 20,TENTACOOL
+	db 30,TENTACOOL
+	db 35,TENTACOOL
+	db 40,TENTACOOL
 
 IslandMons1:
-	db 15
+	db $0F
 	db 30,SEEL
 	db 30,SLOWPOKE
 	db 30,SHELLDER
@@ -4294,7 +4298,7 @@ IslandMons1:
 	db 28,SHELLDER
 	db 38,GOLDUCK
 
-	db 0
+	db $00
 
 IslandMonsB1:
 	db $0A
@@ -4309,7 +4313,7 @@ IslandMonsB1:
 	db 38,DEWGONG
 	db 37,SEADRA
 
-	db 0
+	db $00
 
 IslandMonsB2:
 	db $0A
@@ -4324,7 +4328,7 @@ IslandMonsB2:
 	db 30,GOLBAT
 	db 37,SLOWBRO
 
-	db 0
+	db $00
 
 IslandMonsB3:
 	db $0A
@@ -4339,7 +4343,7 @@ IslandMonsB3:
 	db 39,SEADRA
 	db 37,DEWGONG
 
-	db 0
+	db $00
 
 IslandMonsB4:
 	db $0A
@@ -4354,7 +4358,7 @@ IslandMonsB4:
 	db 39,SLOWBRO
 	db 32,GOLBAT
 
-	db 0
+	db $00
 
 MansionMons1:
 	db $0A
@@ -4369,7 +4373,7 @@ MansionMons1:
 	db 37,WEEZING
 	db 39,MUK
 
-	db 0
+	db $00
 
 MansionMons2:
 	db $0A
@@ -4384,7 +4388,7 @@ MansionMons2:
 	db 39,WEEZING
 	db 37,MUK
 
-	db 0
+	db $00
 
 MansionMons3:
 	db $0A
@@ -4399,7 +4403,7 @@ MansionMons3:
 	db 36,PONYTA
 	db 42,MUK
 
-	db 0
+	db $00
 
 MansionMonsB1:
 	db $0A
@@ -4414,7 +4418,7 @@ MansionMonsB1:
 	db 42,WEEZING
 	db 42,MUK
 
-	db 0
+	db $00
 
 Route21Mons:
 	db $19
@@ -4429,7 +4433,7 @@ Route21Mons:
 	db 30,TANGELA
 	db 32,TANGELA
 
-	db 5
+	db $05
 	db 5,TENTACOOL
 	db 10,TENTACOOL
 	db 15,TENTACOOL
@@ -4454,10 +4458,10 @@ DungeonMons1:
 	db 53,RAICHU
 	db 53,DITTO
 
-	db 0
+	db $00
 
 DungeonMons2:
-	db 15
+	db $0F
 	db 51,DODRIO
 	db 51,VENOMOTH
 	db 51,KADABRA
@@ -4469,7 +4473,7 @@ DungeonMons2:
 	db 55,DITTO
 	db 60,DITTO
 
-	db 0
+	db $00
 
 DungeonMonsB1:
 	db $19
@@ -4484,7 +4488,7 @@ DungeonMonsB1:
 	db 63,DITTO
 	db 67,DITTO
 
-	db 0
+	db $00
 
 PowerPlantMons:
 	db $0A
@@ -4499,7 +4503,7 @@ PowerPlantMons:
 	db 33,ELECTABUZZ
 	db 36,ELECTABUZZ
 
-	db 0
+	db $00
 
 Route23Mons:
 	db $0A
@@ -4514,7 +4518,7 @@ Route23Mons:
 	db 41,FEAROW
 	db 43,FEAROW
 
-	db 0
+	db $00
 
 PlateauMons2:
 	db $0A
@@ -4529,10 +4533,10 @@ PlateauMons2:
 	db 40,MAROWAK
 	db 43,GRAVELER
 
-	db 0
+	db $00
 
 PlateauMons3:
-	db 15
+	db $0F
 	db 24,MACHOP
 	db 26,GEODUDE
 	db 22,ZUBAT
@@ -4544,10 +4548,10 @@ PlateauMons3:
 	db 42,MACHOKE
 	db 45,MACHOKE
 
-	db 0
+	db $00
 
 PlateauMons1:
-	db 15
+	db $0F
 	db 24,MACHOP
 	db 26,GEODUDE
 	db 22,ZUBAT
@@ -4559,7 +4563,7 @@ PlateauMons1:
 	db 42,MACHOKE
 	db 43,MAROWAK
 
-	db 0
+	db $00
 
 CaveMons:
 	db $14
@@ -4574,7 +4578,2690 @@ CaveMons:
 	db 29,DUGTRIO
 	db 31,DUGTRIO
 
-	db 0
+	db $00
+
+ENDC
+IF _GREEN || !_JAPAN && _BLUE
+NoMons:
+	db $00
+
+	db $00
+
+Route1Mons:
+	db $19
+	db 3,PIDGEY
+	db 3,RATTATA
+	db 3,RATTATA
+	db 2,RATTATA
+	db 2,PIDGEY
+	db 3,PIDGEY
+	db 3,PIDGEY
+	db 4,RATTATA
+	db 4,PIDGEY
+	db 5,PIDGEY
+
+	db $00
+
+Route2Mons:
+	db $19
+	db 3,RATTATA
+	db 3,PIDGEY
+	db 4,PIDGEY
+	db 4,RATTATA
+	db 5,PIDGEY
+	db 3,CATERPIE
+	db 2,RATTATA
+	db 5,RATTATA
+	db 4,CATERPIE
+	db 5,CATERPIE
+
+	db $00
+
+Route22Mons:
+	db $19
+	db 3,RATTATA
+	db 3,NIDORAN_F
+	db 4,RATTATA
+	db 4,NIDORAN_F
+	db 2,RATTATA
+	db 2,NIDORAN_F
+	db 3,SPEAROW
+	db 5,SPEAROW
+	db 3,NIDORAN_M
+	db 4,NIDORAN_M
+
+	db $00
+
+ForestMons:
+	db $08
+	db 4,CATERPIE
+	db 5,METAPOD
+	db 3,CATERPIE
+	db 5,CATERPIE
+	db 4,METAPOD
+	db 6,METAPOD
+	db 4,KAKUNA
+	db 3,WEEDLE
+	db 3,PIKACHU
+	db 5,PIKACHU
+
+	db $00
+
+Route3Mons:
+	db $14
+	db 6,PIDGEY
+	db 5,SPEAROW
+	db 7,PIDGEY
+	db 6,SPEAROW
+	db 7,SPEAROW
+	db 8,PIDGEY
+	db 8,SPEAROW
+	db 3,JIGGLYPUFF
+	db 5,JIGGLYPUFF
+	db 7,JIGGLYPUFF
+
+	db $00
+
+MoonMons1:
+	db $0A
+	db 8,ZUBAT
+	db 7,ZUBAT
+	db 9,ZUBAT
+	db 8,GEODUDE
+	db 6,ZUBAT
+	db 10,ZUBAT
+	db 10,GEODUDE
+	db 8,PARAS
+	db 11,ZUBAT
+	db 8,CLEFAIRY
+
+	db $00
+
+MoonMonsB1:
+	db $0A
+	db 8,ZUBAT
+	db 7,ZUBAT
+	db 7,GEODUDE
+	db 8,GEODUDE
+	db 9,ZUBAT
+	db 10,PARAS
+	db 10,ZUBAT
+	db 11,ZUBAT
+	db 9,CLEFAIRY
+	db 9,GEODUDE
+
+	db $00
+
+MoonMonsB2:
+	db $0A
+	db 9,ZUBAT
+	db 9,GEODUDE
+	db 10,ZUBAT
+	db 10,GEODUDE
+	db 11,ZUBAT
+	db 10,PARAS
+	db 12,PARAS
+	db 10,CLEFAIRY
+	db 12,ZUBAT
+	db 12,CLEFAIRY
+
+	db $00
+
+Route4Mons:
+	db $14
+	db 10,RATTATA
+	db 10,SPEAROW
+	db 8,RATTATA
+	db 6,SANDSHREW
+	db 8,SPEAROW
+	db 10,SANDSHREW
+	db 12,RATTATA
+	db 12,SPEAROW
+	db 8,SANDSHREW
+	db 12,SANDSHREW
+
+	db $00
+
+Route24Mons:
+	db $19
+	db 7,CATERPIE
+	db 8,METAPOD
+	db 12,PIDGEY
+	db 12,BELLSPROUT
+	db 13,BELLSPROUT
+	db 10,ABRA
+	db 14,BELLSPROUT
+	db 13,PIDGEY
+	db 8,ABRA
+	db 12,ABRA
+
+	db $00
+
+Route25Mons:
+	db $0F
+	db 8,CATERPIE
+	db 9,METAPOD
+	db 13,PIDGEY
+	db 12,BELLSPROUT
+	db 13,BELLSPROUT
+	db 12,ABRA
+	db 14,BELLSPROUT
+	db 10,ABRA
+	db 7,KAKUNA
+	db 8,WEEDLE
+
+	db $00
+
+Route9Mons:
+	db $0F
+	db 16,RATTATA
+	db 16,SPEAROW
+	db 14,RATTATA
+	db 11,SANDSHREW
+	db 13,SPEAROW
+	db 15,SANDSHREW
+	db 17,RATTATA
+	db 17,SPEAROW
+	db 13,SANDSHREW
+	db 17,SANDSHREW
+
+	db $00
+
+Route5Mons:
+	db $0F
+	db 13,BELLSPROUT
+	db 13,PIDGEY
+	db 15,PIDGEY
+	db 10,MEOWTH
+	db 12,MEOWTH
+	db 15,BELLSPROUT
+	db 16,BELLSPROUT
+	db 16,PIDGEY
+	db 14,MEOWTH
+	db 16,MEOWTH
+
+	db $00
+
+Route6Mons:
+	db $0F
+	db 13,BELLSPROUT
+	db 13,PIDGEY
+	db 15,PIDGEY
+	db 10,MEOWTH
+	db 12,MEOWTH
+	db 15,BELLSPROUT
+	db 16,BELLSPROUT
+	db 16,PIDGEY
+	db 14,MEOWTH
+	db 16,MEOWTH
+
+	db $00
+
+Route11Mons:
+	db $0F
+	db 14,SANDSHREW
+	db 15,SPEAROW
+	db 12,SANDSHREW
+	db 9,DROWZEE
+	db 13,SPEAROW
+	db 13,DROWZEE
+	db 15,SANDSHREW
+	db 17,SPEAROW
+	db 11,DROWZEE
+	db 15,DROWZEE
+
+	db $00
+
+TunnelMonsB1:
+	db $0F
+	db 16,ZUBAT
+	db 17,ZUBAT
+	db 17,GEODUDE
+	db 15,MACHOP
+	db 16,GEODUDE
+	db 18,ZUBAT
+	db 15,ZUBAT
+	db 17,MACHOP
+	db 13,ONIX
+	db 15,ONIX
+
+	db $00
+
+TunnelMonsB2:
+	db $0F
+	db 16,ZUBAT
+	db 17,ZUBAT
+	db 17,GEODUDE
+	db 15,MACHOP
+	db 16,GEODUDE
+	db 18,ZUBAT
+	db 17,MACHOP
+	db 17,ONIX
+	db 13,ONIX
+	db 18,GEODUDE
+
+	db $00
+
+Route10Mons:
+	db $0F
+	db 16,VOLTORB
+	db 16,SPEAROW
+	db 14,VOLTORB
+	db 11,SANDSHREW
+	db 13,SPEAROW
+	db 15,SANDSHREW
+	db 17,VOLTORB
+	db 17,SPEAROW
+	db 13,SANDSHREW
+	db 17,SANDSHREW
+
+	db $00
+
+Route12Mons:
+	db $0F
+	db 24,BELLSPROUT
+	db 25,PIDGEY
+	db 23,PIDGEY
+	db 24,VENONAT
+	db 22,BELLSPROUT
+	db 26,VENONAT
+	db 26,BELLSPROUT
+	db 27,PIDGEY
+	db 28,WEEPINBELL
+	db 30,WEEPINBELL
+
+	db $00
+
+Route8Mons:
+	db $0F
+	db 18,PIDGEY
+	db 18,MEOWTH
+	db 17,SANDSHREW
+	db 16,VULPIX
+	db 20,PIDGEY
+	db 20,MEOWTH
+	db 19,SANDSHREW
+	db 17,VULPIX
+	db 15,VULPIX
+	db 18,VULPIX
+
+	db $00
+
+Route7Mons:
+	db $0F
+	db 19,PIDGEY
+	db 19,BELLSPROUT
+	db 17,MEOWTH
+	db 22,BELLSPROUT
+	db 22,PIDGEY
+	db 18,MEOWTH
+	db 18,VULPIX
+	db 20,VULPIX
+	db 19,MEOWTH
+	db 20,MEOWTH
+
+	db $00
+
+TowerMons1:
+	db $00
+
+	db $00
+
+TowerMons2:
+	db $00
+
+	db $00
+
+TowerMons3:
+	db $0A
+	db 20,GASTLY
+	db 21,GASTLY
+	db 22,GASTLY
+	db 23,GASTLY
+	db 19,GASTLY
+	db 18,GASTLY
+	db 24,GASTLY
+	db 20,CUBONE
+	db 22,CUBONE
+	db 25,HAUNTER
+
+	db $00
+
+TowerMons4:
+	db $0A
+	db 20,GASTLY
+	db 21,GASTLY
+	db 22,GASTLY
+	db 23,GASTLY
+	db 19,GASTLY
+	db 18,GASTLY
+	db 25,HAUNTER
+	db 20,CUBONE
+	db 22,CUBONE
+	db 24,GASTLY
+
+	db $00
+
+TowerMons5:
+	db $0A
+	db 20,GASTLY
+	db 21,GASTLY
+	db 22,GASTLY
+	db 23,GASTLY
+	db 19,GASTLY
+	db 18,GASTLY
+	db 25,HAUNTER
+	db 20,CUBONE
+	db 22,CUBONE
+	db 24,GASTLY
+
+	db $00
+
+TowerMons6:
+	db $0F
+	db 21,GASTLY
+	db 22,GASTLY
+	db 23,GASTLY
+	db 24,GASTLY
+	db 20,GASTLY
+	db 19,GASTLY
+	db 26,HAUNTER
+	db 22,CUBONE
+	db 24,CUBONE
+	db 28,HAUNTER
+
+	db $00
+
+TowerMons7:
+	db $0F
+	db 21,GASTLY
+	db 22,GASTLY
+	db 23,GASTLY
+	db 24,GASTLY
+	db 20,GASTLY
+	db 28,HAUNTER
+	db 22,CUBONE
+	db 24,CUBONE
+	db 28,HAUNTER
+	db 30,HAUNTER
+
+	db $00
+
+Route13Mons:
+	db $14
+	db 24,BELLSPROUT
+	db 25,PIDGEY
+	db 27,PIDGEY
+	db 24,VENONAT
+	db 22,BELLSPROUT
+	db 26,VENONAT
+	db 26,BELLSPROUT
+	db 25,DITTO
+	db 28,WEEPINBELL
+	db 30,WEEPINBELL
+
+	db $00
+
+Route14Mons:
+	db $0F
+	db 24,BELLSPROUT
+	db 26,PIDGEY
+	db 23,DITTO
+	db 24,VENONAT
+	db 22,BELLSPROUT
+	db 26,VENONAT
+	db 26,BELLSPROUT
+	db 30,WEEPINBELL
+	db 28,PIDGEOTTO
+	db 30,PIDGEOTTO
+
+	db $00
+
+Route15Mons:
+	db $0F
+	db 24,BELLSPROUT
+	db 26,DITTO
+	db 23,PIDGEY
+	db 26,VENONAT
+	db 22,BELLSPROUT
+	db 28,VENONAT
+	db 26,BELLSPROUT
+	db 30,WEEPINBELL
+	db 28,PIDGEOTTO
+	db 30,PIDGEOTTO
+
+	db $00
+
+Route16Mons:
+	db $19
+	db 20,SPEAROW
+	db 22,SPEAROW
+	db 18,RATTATA
+	db 20,DODUO
+	db 20,RATTATA
+	db 18,DODUO
+	db 22,DODUO
+	db 22,RATTATA
+	db 23,RATICATE
+	db 25,RATICATE
+
+	db $00
+
+Route17Mons:
+	db $19
+	db 20,SPEAROW
+	db 22,SPEAROW
+	db 25,RATICATE
+	db 24,DODUO
+	db 27,RATICATE
+	db 26,DODUO
+	db 28,DODUO
+	db 29,RATICATE
+	db 25,FEAROW
+	db 27,FEAROW
+
+	db $00
+
+Route18Mons:
+	db $19
+	db 20,SPEAROW
+	db 22,SPEAROW
+	db 25,RATICATE
+	db 24,DODUO
+	db 25,FEAROW
+	db 26,DODUO
+	db 28,DODUO
+	db 29,RATICATE
+	db 27,FEAROW
+	db 29,FEAROW
+
+	db $00
+
+ZoneMonsCenter:
+	db $1E
+	db 22,NIDORAN_F
+	db 25,RHYHORN
+	db 22,VENONAT
+	db 24,EXEGGCUTE
+	db 31,NIDORINA
+	db 25,EXEGGCUTE
+	db 31,NIDORINO
+	db 30,PARASECT
+	db 23,PINSIR
+	db 23,CHANSEY
+
+	db $00
+
+ZoneMons1:
+	db $1E
+	db 24,NIDORAN_F
+	db 26,DODUO
+	db 22,PARAS
+	db 25,EXEGGCUTE
+	db 33,NIDORINA
+	db 23,EXEGGCUTE
+	db 24,NIDORAN_M
+	db 25,PARASECT
+	db 25,KANGASKHAN
+	db 28,PINSIR
+
+	db $00
+
+ZoneMons2:
+	db $1E
+	db 22,NIDORAN_F
+	db 26,RHYHORN
+	db 23,PARAS
+	db 25,EXEGGCUTE
+	db 30,NIDORINA
+	db 27,EXEGGCUTE
+	db 30,NIDORINO
+	db 32,VENOMOTH
+	db 26,CHANSEY
+	db 28,TAUROS
+
+	db $00
+
+ZoneMons3:
+	db $1E
+	db 25,NIDORAN_F
+	db 26,DODUO
+	db 23,VENONAT
+	db 24,EXEGGCUTE
+	db 33,NIDORINA
+	db 26,EXEGGCUTE
+	db 25,NIDORAN_M
+	db 31,VENOMOTH
+	db 26,TAUROS
+	db 28,KANGASKHAN
+
+	db $00
+
+WaterMons:
+	db $00
+
+	db $05
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 20,TENTACOOL
+	db 30,TENTACOOL
+	db 35,TENTACOOL
+	db 40,TENTACOOL
+
+IslandMons1:
+	db $0F
+	db 30,SEEL
+	db 30,PSYDUCK
+	db 30,STARYU
+	db 30,KRABBY
+	db 28,KRABBY
+	db 21,ZUBAT
+	db 29,GOLBAT
+	db 28,SLOWPOKE
+	db 28,STARYU
+	db 38,SLOWBRO
+
+	db $00
+
+IslandMonsB1:
+	db $0A
+	db 30,SHELLDER
+	db 30,KRABBY
+	db 32,STARYU
+	db 32,KRABBY
+	db 28,PSYDUCK
+	db 30,SEEL
+	db 30,PSYDUCK
+	db 28,SEEL
+	db 38,DEWGONG
+	db 37,KINGLER
+
+	db $00
+
+IslandMonsB2:
+	db $0A
+	db 30,SEEL
+	db 30,PSYDUCK
+	db 32,SEEL
+	db 32,PSYDUCK
+	db 28,KRABBY
+	db 30,SHELLDER
+	db 30,KRABBY
+	db 28,STARYU
+	db 30,GOLBAT
+	db 37,GOLDUCK
+
+	db $00
+
+IslandMonsB3:
+	db $0A
+	db 31,PSYDUCK
+	db 31,SEEL
+	db 33,PSYDUCK
+	db 33,SEEL
+	db 29,KRABBY
+	db 31,STARYU
+	db 31,KRABBY
+	db 29,STARYU
+	db 39,KINGLER
+	db 37,DEWGONG
+
+	db $00
+
+IslandMonsB4:
+	db $0A
+	db 31,KRABBY
+	db 31,STARYU
+	db 33,KRABBY
+	db 33,STARYU
+	db 29,PSYDUCK
+	db 31,SEEL
+	db 31,PSYDUCK
+	db 29,SEEL
+	db 39,GOLDUCK
+	db 32,GOLBAT
+
+	db $00
+
+MansionMons1:
+	db $0A
+	db 32,GRIMER
+	db 30,GRIMER
+	db 34,PONYTA
+	db 30,PONYTA
+	db 34,VULPIX
+	db 32,PONYTA
+	db 30,KOFFING
+	db 28,PONYTA
+	db 37,MUK
+	db 39,WEEZING
+
+	db $00
+
+MansionMons2:
+	db $0A
+	db 32,VULPIX
+	db 34,GRIMER
+	db 34,GRIMER
+	db 30,PONYTA
+	db 30,GRIMER
+	db 32,PONYTA
+	db 30,KOFFING
+	db 28,PONYTA
+	db 39,MUK
+	db 37,WEEZING
+
+	db $00
+
+MansionMons3:
+	db $0A
+	db 31,GRIMER
+	db 33,VULPIX
+	db 35,GRIMER
+	db 32,PONYTA
+	db 34,MAGMAR
+	db 40,MUK
+	db 34,KOFFING
+	db 38,MUK
+	db 36,PONYTA
+	db 42,WEEZING
+
+	db $00
+
+MansionMonsB1:
+	db $0A
+	db 33,GRIMER
+	db 31,GRIMER
+	db 35,VULPIX
+	db 32,PONYTA
+	db 31,GRIMER
+	db 40,MUK
+	db 34,PONYTA
+	db 35,KOFFING
+	db 38,MAGMAR
+	db 42,WEEZING
+
+	db $00
+
+Route21Mons:
+	db $19
+	db 21,RATTATA
+	db 23,PIDGEY
+	db 30,RATICATE
+	db 23,RATTATA
+	db 21,PIDGEY
+	db 30,PIDGEOTTO
+	db 32,PIDGEOTTO
+	db 28,TANGELA
+	db 30,TANGELA
+	db 32,TANGELA
+
+	db $05
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 20,TENTACOOL
+	db 30,TENTACOOL
+	db 35,TENTACOOL
+	db 40,TENTACOOL
+
+DungeonMons1:
+	db $0A
+	db 46,GOLBAT
+	db 46,HYPNO
+	db 46,MAGNETON
+	db 49,DODRIO
+	db 49,VENOMOTH
+	db 52,SANDSLASH
+	db 49,KADABRA
+	db 52,PARASECT
+	db 53,RAICHU
+	db 53,DITTO
+
+	db $00
+
+DungeonMons2:
+	db $0F
+	db 51,DODRIO
+	db 51,VENOMOTH
+	db 51,KADABRA
+	db 52,RHYDON
+	db 52,MAROWAK
+	db 52,ELECTRODE
+	db 56,CHANSEY
+	db 54,WIGGLYTUFF
+	db 55,DITTO
+	db 60,DITTO
+
+	db $00
+
+DungeonMonsB1:
+	db $19
+	db 55,RHYDON
+	db 55,MAROWAK
+	db 55,ELECTRODE
+	db 64,CHANSEY
+	db 64,PARASECT
+	db 64,RAICHU
+	db 57,SANDSLASH
+	db 65,DITTO
+	db 63,DITTO
+	db 67,DITTO
+
+	db $00
+
+PowerPlantMons:
+	db $0A
+	db 21,VOLTORB
+	db 21,MAGNEMITE
+	db 20,PIKACHU
+	db 24,PIKACHU
+	db 23,MAGNEMITE
+	db 23,VOLTORB
+	db 32,MAGNETON
+	db 35,MAGNETON
+	db 33,RAICHU
+	db 36,RAICHU
+
+	db $00
+
+Route23Mons:
+	db $0A
+	db 26,SANDSHREW
+	db 33,DITTO
+	db 26,SPEAROW
+	db 38,FEAROW
+	db 38,DITTO
+	db 38,FEAROW
+	db 41,SANDSLASH
+	db 43,DITTO
+	db 41,FEAROW
+	db 43,FEAROW
+
+	db $00
+
+PlateauMons2:
+	db $0A
+	db 22,MACHOP
+	db 24,GEODUDE
+	db 26,ZUBAT
+	db 36,ONIX
+	db 39,ONIX
+	db 42,ONIX
+	db 41,MACHOKE
+	db 40,GOLBAT
+	db 40,MAROWAK
+	db 43,GRAVELER
+
+	db $00
+
+PlateauMons3:
+	db $0F
+	db 24,MACHOP
+	db 26,GEODUDE
+	db 22,ZUBAT
+	db 42,ONIX
+	db 40,VENOMOTH
+	db 45,ONIX
+	db 43,GRAVELER
+	db 41,GOLBAT
+	db 42,MACHOKE
+	db 45,MACHOKE
+
+	db $00
+
+PlateauMons1:
+	db $0F
+	db 24,MACHOP
+	db 26,GEODUDE
+	db 22,ZUBAT
+	db 36,ONIX
+	db 39,ONIX
+	db 42,ONIX
+	db 41,GRAVELER
+	db 41,GOLBAT
+	db 42,MACHOKE
+	db 43,MAROWAK
+
+	db $00
+
+CaveMons:
+	db $14
+	db 18,DIGLETT
+	db 19,DIGLETT
+	db 17,DIGLETT
+	db 20,DIGLETT
+	db 16,DIGLETT
+	db 15,DIGLETT
+	db 21,DIGLETT
+	db 22,DIGLETT
+	db 29,DUGTRIO
+	db 31,DUGTRIO
+
+	db $00
+
+ENDC
+IF _JAPAN && _BLUE
+NoMons:
+	db $00
+
+	db $00
+
+Route1Mons:
+	db $19
+	db 3,PIDGEY
+	db 3,RATTATA
+	db 3,RATTATA
+	db 2,RATTATA
+	db 2,PIDGEY
+	db 3,PIDGEY
+	db 3,PIDGEY
+	db 4,RATTATA
+	db 4,PIDGEY
+	db 5,PIDGEY
+
+	db $00
+
+Route2Mons:
+	db $19
+	db 3,RATTATA
+	db 3,PIDGEY
+	db 4,PIDGEY
+	db 4,RATTATA
+	db 5,PIDGEY
+	db 3,CATERPIE
+	db 2,RATTATA
+	db 5,RATTATA
+	db 4,CATERPIE
+	db 5,CATERPIE
+
+	db $00
+
+Route22Mons:
+	db $19
+	db 3,RATTATA
+	db 3,NIDORAN_M
+	db 4,RATTATA
+	db 4,NIDORAN_M
+	db 2,RATTATA
+	db 2,NIDORAN_M
+	db 3,SPEAROW
+	db 5,SPEAROW
+	db 3,NIDORAN_F
+	db 4,NIDORAN_F
+
+	db $00
+
+ForestMons:
+	db $08
+	db 4,CATERPIE
+	db 5,METAPOD
+	db 3,CATERPIE
+	db 5,CATERPIE
+	db 4,METAPOD
+	db 6,METAPOD
+	db 4,KAKUNA
+	db 3,WEEDLE
+	db 3,PIKACHU
+	db 5,PIKACHU
+
+	db $00
+
+Route3Mons:
+	db $14
+	db 6,PIDGEY
+	db 5,SPEAROW
+	db 7,PIDGEY
+	db 6,SPEAROW
+	db 7,SPEAROW
+	db 8,PIDGEY
+	db 8,SPEAROW
+	db 3,JIGGLYPUFF
+	db 5,JIGGLYPUFF
+	db 7,JIGGLYPUFF
+
+	db $00
+
+MoonMons1:
+	db $0A
+	db 8,ZUBAT
+	db 7,ZUBAT
+	db 9,ZUBAT
+	db 8,GEODUDE
+	db 6,ZUBAT
+	db 10,ZUBAT
+	db 10,GEODUDE
+	db 8,PARAS
+	db 11,ZUBAT
+	db 8,CLEFAIRY
+
+	db $00
+
+MoonMonsB1:
+	db $0A
+	db 8,ZUBAT
+	db 7,ZUBAT
+	db 7,GEODUDE
+	db 8,GEODUDE
+	db 9,ZUBAT
+	db 10,PARAS
+	db 10,ZUBAT
+	db 11,ZUBAT
+	db 9,CLEFAIRY
+	db 9,GEODUDE
+
+	db $00
+
+MoonMonsB2:
+	db $0A
+	db 9,ZUBAT
+	db 9,GEODUDE
+	db 10,ZUBAT
+	db 10,GEODUDE
+	db 11,ZUBAT
+	db 10,PARAS
+	db 12,PARAS
+	db 10,CLEFAIRY
+	db 12,ZUBAT
+	db 12,CLEFAIRY
+
+	db $00
+
+Route4Mons:
+	db $14
+	db 10,RATTATA
+	db 10,SPEAROW
+	db 8,RATTATA
+	db 6,SANDSHREW
+	db 8,SPEAROW
+	db 10,SANDSHREW
+	db 12,RATTATA
+	db 12,SPEAROW
+	db 8,SANDSHREW
+	db 12,SANDSHREW
+
+	db $00
+
+Route24Mons:
+	db $19
+	db 7,CATERPIE
+	db 8,METAPOD
+	db 12,PIDGEY
+	db 12,ODDISH
+	db 13,ODDISH
+	db 10,ABRA
+	db 14,ODDISH
+	db 13,PIDGEY
+	db 8,ABRA
+	db 12,ABRA
+
+	db $00
+
+Route25Mons:
+	db $0F
+	db 8,CATERPIE
+	db 9,METAPOD
+	db 13,PIDGEY
+	db 12,ODDISH
+	db 13,ODDISH
+	db 12,ABRA
+	db 14,ODDISH
+	db 10,ABRA
+	db 7,KAKUNA
+	db 8,WEEDLE
+
+	db $00
+
+Route9Mons:
+	db $0F
+	db 16,RATTATA
+	db 16,SPEAROW
+	db 14,RATTATA
+	db 11,SANDSHREW
+	db 13,SPEAROW
+	db 15,SANDSHREW
+	db 17,RATTATA
+	db 17,SPEAROW
+	db 13,SANDSHREW
+	db 17,SANDSHREW
+
+	db $00
+
+Route5Mons:
+	db $0F
+	db 13,ODDISH
+	db 13,PIDGEY
+	db 15,PIDGEY
+	db 10,MEOWTH
+	db 12,MEOWTH
+	db 15,ODDISH
+	db 16,ODDISH
+	db 16,PIDGEY
+	db 14,MEOWTH
+	db 16,MEOWTH
+
+	db $00
+
+Route6Mons:
+	db $0F
+	db 13,ODDISH
+	db 13,PIDGEY
+	db 15,PIDGEY
+	db 10,MEOWTH
+	db 12,MEOWTH
+	db 15,ODDISH
+	db 16,ODDISH
+	db 16,PIDGEY
+	db 14,MEOWTH
+	db 16,MEOWTH
+
+	db $00
+
+Route11Mons:
+	db $0F
+	db 14,SANDSHREW
+	db 15,SPEAROW
+	db 12,SANDSHREW
+	db 9,DROWZEE
+	db 13,SPEAROW
+	db 13,DROWZEE
+	db 15,SANDSHREW
+	db 17,SPEAROW
+	db 11,DROWZEE
+	db 15,DROWZEE
+
+	db $00
+
+TunnelMonsB1:
+	db $0F
+	db 16,ZUBAT
+	db 17,ZUBAT
+	db 17,GEODUDE
+	db 15,MACHOP
+	db 16,GEODUDE
+	db 18,DITTO
+	db 15,ZUBAT
+	db 17,MACHOP
+	db 13,ONIX
+	db 15,ONIX
+
+	db $00
+
+TunnelMonsB2:
+	db $0F
+	db 16,ZUBAT
+	db 17,ZUBAT
+	db 17,GEODUDE
+	db 15,MACHOP
+	db 16,GEODUDE
+	db 18,DITTO
+	db 17,MACHOP
+	db 17,ONIX
+	db 13,ONIX
+	db 18,GEODUDE
+
+	db $00
+
+Route10Mons:
+	db $0F
+	db 16,VOLTORB
+	db 16,SPEAROW
+	db 14,VOLTORB
+	db 11,SANDSHREW
+	db 13,SPEAROW
+	db 15,SANDSHREW
+	db 17,VOLTORB
+	db 17,SPEAROW
+	db 13,SANDSHREW
+	db 17,SANDSHREW
+
+	db $00
+
+Route12Mons:
+	db $0F
+	db 24,ODDISH
+	db 25,PIDGEY
+	db 23,PIDGEY
+	db 24,VENONAT
+	db 22,ODDISH
+	db 26,VENONAT
+	db 26,ODDISH
+	db 27,PIDGEY
+	db 28,GLOOM
+	db 30,GLOOM
+
+	db $00
+
+Route8Mons:
+	db $0F
+	db 18,PIDGEY
+	db 18,MEOWTH
+	db 17,SANDSHREW
+	db 16,GROWLITHE
+	db 20,PIDGEY
+	db 20,MEOWTH
+	db 19,SANDSHREW
+	db 17,GROWLITHE
+	db 15,GROWLITHE
+	db 18,GROWLITHE
+
+	db $00
+
+Route7Mons:
+	db $0F
+	db 19,PIDGEY
+	db 19,ODDISH
+	db 17,MEOWTH
+	db 22,ODDISH
+	db 22,PIDGEY
+	db 18,MEOWTH
+	db 18,GROWLITHE
+	db 20,GROWLITHE
+	db 19,MEOWTH
+	db 20,MEOWTH
+
+	db $00
+
+TowerMons1:
+	db $00
+
+	db $00
+
+TowerMons2:
+	db $00
+
+	db $00
+
+TowerMons3:
+	db $0A
+	db 20,GASTLY
+	db 21,GASTLY
+	db 22,GASTLY
+	db 23,GASTLY
+	db 19,GASTLY
+	db 18,GASTLY
+	db 24,GASTLY
+	db 20,CUBONE
+	db 22,CUBONE
+	db 25,HAUNTER
+
+	db $00
+
+TowerMons4:
+	db $0A
+	db 20,GASTLY
+	db 21,GASTLY
+	db 22,GASTLY
+	db 23,GASTLY
+	db 19,GASTLY
+	db 18,GASTLY
+	db 25,HAUNTER
+	db 20,CUBONE
+	db 22,CUBONE
+	db 24,GASTLY
+
+	db $00
+
+TowerMons5:
+	db $0A
+	db 20,GASTLY
+	db 21,GASTLY
+	db 22,GASTLY
+	db 23,GASTLY
+	db 19,GASTLY
+	db 18,GASTLY
+	db 25,HAUNTER
+	db 20,CUBONE
+	db 22,CUBONE
+	db 24,GASTLY
+
+	db $00
+
+TowerMons6:
+	db $0F
+	db 21,GASTLY
+	db 22,GASTLY
+	db 23,GASTLY
+	db 24,GASTLY
+	db 20,GASTLY
+	db 19,GASTLY
+	db 26,HAUNTER
+	db 22,CUBONE
+	db 24,CUBONE
+	db 28,HAUNTER
+
+	db $00
+
+TowerMons7:
+	db $0F
+	db 21,GASTLY
+	db 22,GASTLY
+	db 23,GASTLY
+	db 24,GASTLY
+	db 20,GASTLY
+	db 28,HAUNTER
+	db 22,CUBONE
+	db 24,CUBONE
+	db 28,HAUNTER
+	db 30,HAUNTER
+
+	db $00
+
+Route13Mons:
+	db $14
+	db 24,ODDISH
+	db 25,PIDGEY
+	db 27,PIDGEY
+	db 24,VENONAT
+	db 22,ODDISH
+	db 26,VENONAT
+	db 26,ODDISH
+	db 25,DITTO
+	db 28,GLOOM
+	db 30,GLOOM
+
+	db $00
+
+Route14Mons:
+	db $0F
+	db 24,ODDISH
+	db 26,PIDGEY
+	db 23,DITTO
+	db 24,VENONAT
+	db 22,ODDISH
+	db 26,VENONAT
+	db 26,ODDISH
+	db 30,GLOOM
+	db 28,PIDGEOTTO
+	db 30,PIDGEOTTO
+
+	db $00
+
+Route15Mons:
+	db $0F
+	db 24,ODDISH
+	db 26,DITTO
+	db 23,PIDGEY
+	db 26,VENONAT
+	db 22,ODDISH
+	db 28,VENONAT
+	db 26,ODDISH
+	db 30,GLOOM
+	db 28,PIDGEOTTO
+	db 30,PIDGEOTTO
+
+	db $00
+
+Route16Mons:
+	db $19
+	db 20,SPEAROW
+	db 22,SPEAROW
+	db 18,RATTATA
+	db 20,DODUO
+	db 20,RATTATA
+	db 18,DODUO
+	db 22,DODUO
+	db 22,RATTATA
+	db 23,RATICATE
+	db 25,RATICATE
+
+	db $00
+
+Route17Mons:
+	db $19
+	db 20,SPEAROW
+	db 22,SPEAROW
+	db 25,RATICATE
+	db 24,DODUO
+	db 27,RATICATE
+	db 26,DODUO
+	db 28,DODUO
+	db 29,RATICATE
+	db 25,FEAROW
+	db 27,FEAROW
+
+	db $00
+
+Route18Mons:
+	db $19
+	db 20,SPEAROW
+	db 22,SPEAROW
+	db 25,RATICATE
+	db 24,DODUO
+	db 25,FEAROW
+	db 26,DODUO
+	db 28,DODUO
+	db 29,RATICATE
+	db 27,FEAROW
+	db 29,FEAROW
+
+	db $00
+
+ZoneMonsCenter:
+	db $1E
+	db 22,NIDORAN_M
+	db 25,RHYHORN
+	db 22,VENONAT
+	db 24,EXEGGCUTE
+	db 31,NIDORINO
+	db 25,EXEGGCUTE
+	db 31,NIDORINA
+	db 30,PARASECT
+	db 23,SCYTHER
+	db 23,CHANSEY
+
+	db $00
+
+ZoneMons1:
+	db $1E
+	db 24,NIDORAN_M
+	db 26,DODUO
+	db 22,PARAS
+	db 25,EXEGGCUTE
+	db 33,NIDORINO
+	db 23,EXEGGCUTE
+	db 24,NIDORAN_F
+	db 25,PARASECT
+	db 25,LICKITUNG
+	db 28,SCYTHER
+
+	db $00
+
+ZoneMons2:
+	db $1E
+	db 22,NIDORAN_M
+	db 26,RHYHORN
+	db 23,PARAS
+	db 25,EXEGGCUTE
+	db 30,NIDORINO
+	db 27,EXEGGCUTE
+	db 30,NIDORINA
+	db 32,VENOMOTH
+	db 26,CHANSEY
+	db 28,PINSIR
+
+	db $00
+
+ZoneMons3:
+	db $1E
+	db 25,NIDORAN_M
+	db 26,DODUO
+	db 23,VENONAT
+	db 24,EXEGGCUTE
+	db 33,NIDORINO
+	db 26,EXEGGCUTE
+	db 25,NIDORAN_F
+	db 31,VENOMOTH
+	db 26,PINSIR
+	db 28,LICKITUNG
+
+	db $00
+
+WaterMons:
+	db $00
+
+	db $05
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 20,TENTACOOL
+	db 30,TENTACOOL
+	db 35,TENTACOOL
+	db 40,TENTACOOL
+
+WaterMons:
+	db $00
+
+	db $05
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 20,TENTACOOL
+	db 30,TENTACOOL
+	db 35,TENTACOOL
+	db 40,TENTACOOL
+
+IslandMons1:
+	db $0F
+	db 30,SEEL
+	db 30,HORSEA
+	db 30,STARYU
+	db 30,KRABBY
+	db 28,KRABBY
+	db 21,ZUBAT
+	db 29,GOLBAT
+	db 28,SLOWPOKE
+	db 28,STARYU
+	db 38,SLOWBRO
+
+	db $00
+
+IslandMonsB1:
+	db $0A
+	db 30,SHELLDER
+	db 30,KRABBY
+	db 32,STARYU
+	db 32,KRABBY
+	db 28,HORSEA
+	db 30,SEEL
+	db 30,HORSEA
+	db 28,SEEL
+	db 38,DEWGONG
+	db 37,KINGLER
+
+	db $00
+
+IslandMonsB2:
+	db $0A
+	db 30,SEEL
+	db 30,HORSEA
+	db 32,SEEL
+	db 32,HORSEA
+	db 28,KRABBY
+	db 30,SHELLDER
+	db 30,KRABBY
+	db 28,STARYU
+	db 30,GOLBAT
+	db 37,JYNX
+
+	db $00
+
+IslandMonsB3:
+	db $0A
+	db 31,HORSEA
+	db 31,SEEL
+	db 33,HORSEA
+	db 33,SEEL
+	db 29,KRABBY
+	db 31,STARYU
+	db 31,KRABBY
+	db 29,STARYU
+	db 39,KINGLER
+	db 37,DEWGONG
+
+	db $00
+
+IslandMonsB4:
+	db $0A
+	db 31,KRABBY
+	db 31,STARYU
+	db 33,KRABBY
+	db 33,STARYU
+	db 29,HORSEA
+	db 31,SEEL
+	db 31,HORSEA
+	db 29,SEEL
+	db 39,JYNX
+	db 32,GOLBAT
+
+	db $00
+
+MansionMons1:
+	db $0A
+	db 32,GRIMER
+	db 30,GRIMER
+	db 34,PONYTA
+	db 30,PONYTA
+	db 34,GROWLITHE
+	db 32,PONYTA
+	db 30,KOFFING
+	db 28,PONYTA
+	db 37,MUK
+	db 39,WEEZING
+
+	db $00
+
+MansionMons2:
+	db $0A
+	db 32,GROWLITHE
+	db 34,GRIMER
+	db 34,GRIMER
+	db 30,PONYTA
+	db 30,GRIMER
+	db 32,PONYTA
+	db 30,KOFFING
+	db 28,PONYTA
+	db 39,MUK
+	db 37,WEEZING
+
+	db $00
+
+MansionMons3:
+	db $0A
+	db 31,GRIMER
+	db 33,GROWLITHE
+	db 35,GRIMER
+	db 32,PONYTA
+	db 34,PONYTA
+	db 40,MUK
+	db 34,KOFFING
+	db 38,MUK
+	db 36,PONYTA
+	db 42,WEEZING
+
+	db $00
+
+MansionMonsB1:
+	db $0A
+	db 33,GRIMER
+	db 31,GRIMER
+	db 35,GROWLITHE
+	db 32,PONYTA
+	db 31,GRIMER
+	db 40,MUK
+	db 34,PONYTA
+	db 35,KOFFING
+	db 38,MUK
+	db 42,WEEZING
+
+	db $00
+
+Route21Mons:
+	db $19
+	db 21,RATTATA
+	db 23,PIDGEY
+	db 30,RATICATE
+	db 23,RATTATA
+	db 21,PIDGEY
+	db 30,PIDGEOTTO
+	db 32,PIDGEOTTO
+	db 28,TANGELA
+	db 30,TANGELA
+	db 32,TANGELA
+
+	db $05
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 20,TENTACOOL
+	db 30,TENTACOOL
+	db 35,TENTACOOL
+	db 40,TENTACOOL
+
+DungeonMons1:
+	db $0A
+	db 46,GOLBAT
+	db 46,HYPNO
+	db 46,MAGNETON
+	db 49,RAPIDASH
+	db 49,VENOMOTH
+	db 52,SANDSLASH
+	db 49,KADABRA
+	db 52,PARASECT
+	db 53,RAICHU
+	db 53,DITTO
+
+	db $00
+
+DungeonMons2:
+	db $0F
+	db 51,DODRIO
+	db 51,VENOMOTH
+	db 51,KADABRA
+	db 52,RHYDON
+	db 52,RATICATE
+	db 52,ELECTRODE
+	db 56,CHANSEY
+	db 54,WIGGLYTUFF
+	db 55,DITTO
+	db 60,DITTO
+
+	db $00
+
+DungeonMonsB1:
+	db $19
+	db 55,RHYDON
+	db 55,MAROWAK
+	db 55,ELECTRODE
+	db 64,CLEFAIRY
+	db 64,PARASECT
+	db 64,RAICHU
+	db 57,SANDSLASH
+	db 65,DITTO
+	db 63,DITTO
+	db 67,DITTO
+
+	db $00
+
+PowerPlantMons:
+	db $0A
+	db 21,VOLTORB
+	db 21,MAGNEMITE
+	db 20,PIKACHU
+	db 24,PIKACHU
+	db 23,MAGNEMITE
+	db 23,VOLTORB
+	db 32,MAGNETON
+	db 35,MAGNETON
+	db 33,RAICHU
+	db 36,RAICHU
+
+	db $00
+
+Route23Mons:
+	db $0A
+	db 26,SANDSHREW
+	db 33,DITTO
+	db 26,SPEAROW
+	db 38,FEAROW
+	db 38,DITTO
+	db 38,FEAROW
+	db 41,SANDSLASH
+	db 43,DITTO
+	db 41,FEAROW
+	db 43,FEAROW
+
+	db $00
+
+PlateauMons2:
+	db $0A
+	db 22,MACHOP
+	db 24,GEODUDE
+	db 26,ZUBAT
+	db 36,ONIX
+	db 39,ONIX
+	db 42,ONIX
+	db 41,MACHOKE
+	db 40,GOLBAT
+	db 40,MAROWAK
+	db 43,GRAVELER
+
+	db $00
+
+PlateauMons3:
+	db $0F
+	db 24,MACHOP
+	db 26,GEODUDE
+	db 22,ZUBAT
+	db 42,ONIX
+	db 40,VENOMOTH
+	db 45,ONIX
+	db 43,GRAVELER
+	db 41,GOLBAT
+	db 42,MACHOKE
+	db 45,MACHOKE
+
+	db $00
+
+PlateauMons1:
+	db $0F
+	db 24,MACHOP
+	db 26,GEODUDE
+	db 22,ZUBAT
+	db 36,ONIX
+	db 39,ONIX
+	db 42,ONIX
+	db 41,GRAVELER
+	db 41,GOLBAT
+	db 42,MACHOKE
+	db 43,MAROWAK
+
+	db $00
+
+CaveMons:
+	db $14
+	db 18,DIGLETT
+	db 19,DIGLETT
+	db 17,DIGLETT
+	db 20,DIGLETT
+	db 16,DIGLETT
+	db 15,DIGLETT
+	db 21,DIGLETT
+	db 22,DIGLETT
+	db 29,DUGTRIO
+	db 31,DUGTRIO
+
+	db $00
+
+ENDC
+IF _YELLOW
+NoMons:
+	db $00
+
+	db $00
+
+Route1Mons:
+	db $19
+	db 3,PIDGEY
+	db 4,PIDGEY
+	db 2,RATTATA
+	db 3,RATTATA
+	db 2,PIDGEY
+	db 3,PIDGEY
+	db 5,PIDGEY
+	db 4,RATTATA
+	db 6,PIDGEY
+	db 7,PIDGEY
+
+	db $00
+
+Route2Mons:
+	db $19
+	db 3,RATTATA
+	db 3,PIDGEY
+	db 4,RATTATA
+	db 4,NIDORAN_M
+	db 4,NIDORAN_F
+	db 5,PIDGEY
+	db 6,NIDORAN_M
+	db 6,NIDORAN_F
+	db 7,PIDGEY
+	db 7,PIDGEY
+
+	db $00
+
+Route22Mons:
+	db $19
+	db 2,NIDORAN_M
+	db 2,NIDORAN_F
+	db 3,MANKEY
+	db 3,RATTATA
+	db 4,NIDORAN_M
+	db 4,NIDORAN_F
+	db 5,MANKEY
+	db 2,SPEAROW
+	db 4,SPEAROW
+	db 6,SPEAROW
+
+	db $00
+
+ForestMons:
+	db $19
+	db 3,CATERPIE
+	db 4,METAPOD
+	db 4,CATERPIE
+	db 5,CATERPIE
+	db 4,PIDGEY
+	db 6,PIDGEY
+	db 6,CATERPIE
+	db 6,METAPOD
+	db 8,PIDGEY
+	db 9,PIDGEOTTO
+
+	db $00
+
+Route3Mons:
+	db $14
+	db 8,SPEAROW
+	db 9,SPEAROW
+	db 9,MANKEY
+	db 10,SPEAROW
+	db 8,SANDSHREW
+	db 10,RATTATA
+	db 10,SANDSHREW
+	db 12,RATTATA
+	db 11,SPEAROW
+	db 12,SPEAROW
+
+	db $00
+
+MoonMons1:
+	db $0A
+	db 8,ZUBAT
+	db 9,ZUBAT
+	db 10,GEODUDE
+	db 6,ZUBAT
+	db 7,ZUBAT
+	db 10,ZUBAT
+	db 10,GEODUDE
+	db 11,ZUBAT
+	db 12,SANDSHREW
+	db 11,CLEFAIRY
+
+	db $00
+
+MoonMonsB1:
+	db $0A
+	db 8,ZUBAT
+	db 9,ZUBAT
+	db 10,ZUBAT
+	db 10,GEODUDE
+	db 11,GEODUDE
+	db 11,ZUBAT
+	db 9,PARAS
+	db 11,PARAS
+	db 10,CLEFAIRY
+	db 12,CLEFAIRY
+
+	db $00
+
+MoonMonsB2:
+	db $0A
+	db 10,ZUBAT
+	db 11,GEODUDE
+	db 13,PARAS
+	db 11,ZUBAT
+	db 11,ZUBAT
+	db 12,ZUBAT
+	db 13,ZUBAT
+	db 9,CLEFAIRY
+	db 11,CLEFAIRY
+	db 13,CLEFAIRY
+
+	db $00
+
+Route4Mons:
+	db $14
+	db 8,SPEAROW
+	db 9,SPEAROW
+	db 9,MANKEY
+	db 10,SPEAROW
+	db 8,SANDSHREW
+	db 10,RATTATA
+	db 10,SANDSHREW
+	db 12,RATTATA
+	db 11,SPEAROW
+	db 12,SPEAROW
+
+	db $00
+
+Route24Mons:
+	db $19
+	db 12,ODDISH
+	db 12,BELLSPROUT
+	db 13,PIDGEY
+	db 14,ODDISH
+	db 14,BELLSPROUT
+	db 15,PIDGEY
+	db 13,VENONAT
+	db 16,VENONAT
+	db 17,PIDGEY
+	db 17,PIDGEOTTO
+
+	db $00
+
+Route25Mons:
+	db $0F
+	db 12,ODDISH
+	db 12,BELLSPROUT
+	db 13,PIDGEY
+	db 14,ODDISH
+	db 14,BELLSPROUT
+	db 15,PIDGEY
+	db 13,VENONAT
+	db 16,VENONAT
+	db 17,PIDGEY
+	db 17,PIDGEOTTO
+
+	db $00
+
+Route9Mons:
+	db $0F
+	db 16,NIDORAN_M
+	db 16,NIDORAN_F
+	db 18,RATTATA
+	db 18,NIDORAN_M
+	db 18,NIDORAN_F
+	db 17,SPEAROW
+	db 18,NIDORINO
+	db 18,NIDORINA
+	db 20,RATICATE
+	db 19,FEAROW
+
+	db $00
+
+Route5Mons:
+	db $0F
+	db 15,PIDGEY
+	db 14,RATTATA
+	db 7,ABRA
+	db 16,PIDGEY
+	db 16,RATTATA
+	db 17,PIDGEY
+	db 17,PIDGEOTTO
+	db 3,JIGGLYPUFF
+	db 5,JIGGLYPUFF
+	db 7,JIGGLYPUFF
+
+	db $00
+
+Route6Mons:
+	db $0F
+	db 15,PIDGEY
+	db 14,RATTATA
+	db 7,ABRA
+	db 16,PIDGEY
+	db 16,RATTATA
+	db 17,PIDGEY
+	db 17,PIDGEOTTO
+	db 3,JIGGLYPUFF
+	db 5,JIGGLYPUFF
+	db 7,JIGGLYPUFF
+
+	db $03
+	db 15,PSYDUCK
+	db 15,PSYDUCK
+	db 15,PSYDUCK
+	db 15,PSYDUCK
+	db 15,PSYDUCK
+	db 15,PSYDUCK
+	db 15,PSYDUCK
+	db 15,PSYDUCK
+	db 15,GOLDUCK
+	db 20,GOLDUCK
+
+Route11Mons:
+	db $0F
+	db 16,PIDGEY
+	db 15,RATTATA
+	db 18,PIDGEY
+	db 15,DROWZEE
+	db 17,RATTATA
+	db 17,DROWZEE
+	db 18,PIDGEOTTO
+	db 20,PIDGEOTTO
+	db 19,DROWZEE
+	db 17,RATICATE
+
+	db $00
+
+TunnelMonsB1:
+	db $0F
+	db 15,ZUBAT
+	db 16,GEODUDE
+	db 17,ZUBAT
+	db 19,ZUBAT
+	db 18,GEODUDE
+	db 20,GEODUDE
+	db 21,ZUBAT
+	db 17,MACHOP
+	db 19,MACHOP
+	db 21,MACHOP
+
+	db $00
+
+TunnelMonsB2:
+	db $0F
+	db 20,ZUBAT
+	db 17,GEODUDE
+	db 18,MACHOP
+	db 21,ZUBAT
+	db 22,ZUBAT
+	db 21,GEODUDE
+	db 20,MACHOP
+	db 14,ONIX
+	db 18,ONIX
+	db 22,ONIX
+
+	db $00
+
+Route10Mons:
+	db $0F
+	db 16,MAGNEMITE
+	db 18,RATTATA
+	db 18,MAGNEMITE
+	db 20,MAGNEMITE
+	db 17,NIDORAN_M
+	db 17,NIDORAN_F
+	db 22,MAGNEMITE
+	db 20,RATICATE
+	db 16,MACHOP
+	db 18,MACHOP
+
+	db $00
+
+Route12Mons:
+	db $0F
+	db 25,ODDISH
+	db 25,BELLSPROUT
+	db 28,PIDGEY
+	db 28,PIDGEOTTO
+	db 27,ODDISH
+	db 27,BELLSPROUT
+	db 29,GLOOM
+	db 29,WEEPINBELL
+	db 26,FARFETCH_D
+	db 31,FARFETCH_D
+
+	db $03
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWBRO
+	db 20,SLOWBRO
+
+Route8Mons:
+	db $0F
+	db 20,PIDGEY
+	db 22,PIDGEY
+	db 20,RATTATA
+	db 15,ABRA
+	db 19,ABRA
+	db 24,PIDGEOTTO
+	db 19,JIGGLYPUFF
+	db 24,JIGGLYPUFF
+	db 20,KADABRA
+	db 27,KADABRA
+
+	db $00
+
+Route7Mons:
+	db $0F
+	db 20,PIDGEY
+	db 22,PIDGEY
+	db 20,RATTATA
+	db 15,ABRA
+	db 19,ABRA
+	db 24,PIDGEOTTO
+	db 26,ABRA
+	db 19,JIGGLYPUFF
+	db 24,JIGGLYPUFF
+	db 24,JIGGLYPUFF
+
+	db $00
+
+TowerMons1:
+	db $00
+
+	db $00
+
+TowerMons2:
+	db $00
+
+	db $00
+
+TowerMons3:
+	db $0A
+	db 20,GASTLY
+	db 21,GASTLY
+	db 22,GASTLY
+	db 23,GASTLY
+	db 24,GASTLY
+	db 19,GASTLY
+	db 18,GASTLY
+	db 25,GASTLY
+	db 20,HAUNTER
+	db 25,HAUNTER
+
+	db $00
+
+TowerMons4:
+	db $0A
+	db 20,GASTLY
+	db 21,GASTLY
+	db 22,GASTLY
+	db 23,GASTLY
+	db 24,GASTLY
+	db 19,GASTLY
+	db 18,GASTLY
+	db 25,GASTLY
+	db 20,HAUNTER
+	db 25,HAUNTER
+
+	db $00
+
+TowerMons5:
+	db $0F
+	db 22,GASTLY
+	db 23,GASTLY
+	db 24,GASTLY
+	db 25,GASTLY
+	db 26,GASTLY
+	db 21,GASTLY
+	db 20,CUBONE
+	db 27,GASTLY
+	db 22,HAUNTER
+	db 27,HAUNTER
+
+	db $00
+
+TowerMons6:
+	db $0F
+	db 22,GASTLY
+	db 23,GASTLY
+	db 24,GASTLY
+	db 25,GASTLY
+	db 26,GASTLY
+	db 21,GASTLY
+	db 22,CUBONE
+	db 27,GASTLY
+	db 22,HAUNTER
+	db 27,HAUNTER
+
+	db $00
+
+TowerMons7:
+	db $14
+	db 24,GASTLY
+	db 25,GASTLY
+	db 26,GASTLY
+	db 27,GASTLY
+	db 28,GASTLY
+	db 23,GASTLY
+	db 24,CUBONE
+	db 29,GASTLY
+	db 24,HAUNTER
+	db 29,HAUNTER
+
+	db $00
+
+Route13Mons:
+	db $0F
+	db 25,ODDISH
+	db 25,BELLSPROUT
+	db 28,PIDGEOTTO
+	db 28,PIDGEY
+	db 27,ODDISH
+	db 27,BELLSPROUT
+	db 29,GLOOM
+	db 29,WEEPINBELL
+	db 26,FARFETCH_D
+	db 31,FARFETCH_D
+
+	db $03
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWBRO
+	db 20,SLOWBRO
+
+Route14Mons:
+	db $0F
+	db 26,ODDISH
+	db 26,BELLSPROUT
+	db 24,VENONAT
+	db 30,PIDGEOTTO
+	db 28,ODDISH
+	db 28,BELLSPROUT
+	db 30,GLOOM
+	db 30,WEEPINBELL
+	db 27,VENONAT
+	db 30,VENOMOTH
+
+	db $00
+
+Route15Mons:
+	db $0F
+	db 26,ODDISH
+	db 26,BELLSPROUT
+	db 24,VENONAT
+	db 32,PIDGEOTTO
+	db 28,ODDISH
+	db 28,BELLSPROUT
+	db 30,GLOOM
+	db 30,WEEPINBELL
+	db 27,VENONAT
+	db 30,VENOMOTH
+
+	db $00
+
+Route16Mons:
+	db $19
+	db 22,SPEAROW
+	db 22,DODUO
+	db 23,RATTATA
+	db 24,DODUO
+	db 24,RATTATA
+	db 26,DODUO
+	db 23,SPEAROW
+	db 24,FEAROW
+	db 25,RATICATE
+	db 26,RATICATE
+
+	db $00
+
+Route17Mons:
+	db $19
+	db 26,DODUO
+	db 27,FEAROW
+	db 27,DODUO
+	db 28,DODUO
+	db 28,PONYTA
+	db 30,PONYTA
+	db 29,FEAROW
+	db 28,DODUO
+	db 32,PONYTA
+	db 29,DODRIO
+
+	db $00
+
+Route18Mons:
+	db $19
+	db 22,SPEAROW
+	db 22,DODUO
+	db 23,RATTATA
+	db 24,DODUO
+	db 24,RATTATA
+	db 26,DODUO
+	db 23,SPEAROW
+	db 24,FEAROW
+	db 25,RATICATE
+	db 26,RATICATE
+
+	db $00
+
+ZoneMonsCenter:
+	db $1E
+	db 14,NIDORAN_M
+	db 36,NIDORAN_F
+	db 24,EXEGGCUTE
+	db 20,RHYHORN
+	db 23,NIDORINO
+	db 27,PARASECT
+	db 27,PARAS
+	db 32,PARASECT
+	db 22,TANGELA
+	db 7,CHANSEY
+
+	db $00
+
+ZoneMons1:
+	db $1E
+	db 21,NIDORAN_M
+	db 29,NIDORAN_F
+	db 22,EXEGGCUTE
+	db 21,TAUROS
+	db 32,NIDORINA
+	db 19,CUBONE
+	db 26,EXEGGCUTE
+	db 24,MAROWAK
+	db 21,CHANSEY
+	db 15,SCYTHER
+
+	db $00
+
+ZoneMons2:
+	db $1E
+	db 36,NIDORAN_M
+	db 14,NIDORAN_F
+	db 20,EXEGGCUTE
+	db 25,RHYHORN
+	db 23,NIDORINA
+	db 28,KANGASKHAN
+	db 16,CUBONE
+	db 33,KANGASKHAN
+	db 25,SCYTHER
+	db 15,PINSIR
+
+	db $00
+
+ZoneMons3:
+	db $1E
+	db 29,NIDORAN_M
+	db 21,NIDORAN_F
+	db 22,EXEGGCUTE
+	db 21,TAUROS
+	db 32,NIDORINO
+	db 19,CUBONE
+	db 26,EXEGGCUTE
+	db 24,MAROWAK
+	db 25,PINSIR
+	db 27,TANGELA
+
+	db $00
+
+WaterMons:
+	db $00
+
+	db $05
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 20,TENTACOOL
+	db 30,TENTACOOL
+	db 35,TENTACOOL
+	db 40,TENTACOOL
+
+WaterMons:
+	db $00
+
+	db $05
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 20,TENTACOOL
+	db 30,TENTACOOL
+	db 35,TENTACOOL
+	db 40,TENTACOOL
+
+IslandMons1:
+	db $0F
+	db 18,ZUBAT
+	db 25,KRABBY
+	db 27,KRABBY
+	db 27,ZUBAT
+	db 36,ZUBAT
+	db 28,SLOWPOKE
+	db 30,SLOWPOKE
+	db 9,ZUBAT
+	db 27,GOLBAT
+	db 36,GOLBAT
+
+	db $00
+
+IslandMonsB1:
+	db $0A
+	db 27,ZUBAT
+	db 26,KRABBY
+	db 36,ZUBAT
+	db 28,KRABBY
+	db 27,GOLBAT
+	db 29,SLOWPOKE
+	db 18,ZUBAT
+	db 28,KINGLER
+	db 22,SEEL
+	db 26,SEEL
+
+	db $00
+
+IslandMonsB2:
+	db $0A
+	db 27,ZUBAT
+	db 27,KRABBY
+	db 36,ZUBAT
+	db 27,GOLBAT
+	db 28,KINGLER
+	db 24,SEEL
+	db 29,KRABBY
+	db 36,GOLBAT
+	db 31,SLOWPOKE
+	db 31,SLOWBRO
+
+	db $00
+
+IslandMonsB3:
+	db $0A
+	db 27,GOLBAT
+	db 36,ZUBAT
+	db 29,KRABBY
+	db 27,ZUBAT
+	db 30,KINGLER
+	db 26,SEEL
+	db 31,KRABBY
+	db 30,SEEL
+	db 28,DEWGONG
+	db 32,DEWGONG
+
+	db $05
+	db 25,TENTACOOL
+	db 30,TENTACOOL
+	db 20,TENTACOOL
+	db 30,STARYU
+	db 35,TENTACOOL
+	db 30,STARYU
+	db 40,TENTACOOL
+	db 30,STARYU
+	db 30,STARYU
+	db 30,STARYU
+
+IslandMonsB4:
+	db $0A
+	db 36,GOLBAT
+	db 36,ZUBAT
+	db 30,KRABBY
+	db 32,KINGLER
+	db 28,SEEL
+	db 32,SEEL
+	db 27,GOLBAT
+	db 45,ZUBAT
+	db 30,DEWGONG
+	db 34,DEWGONG
+
+	db $05
+	db 25,TENTACOOL
+	db 30,TENTACOOL
+	db 20,TENTACOOL
+	db 30,STARYU
+	db 35,TENTACOOL
+	db 30,STARYU
+	db 40,TENTACOOL
+	db 30,STARYU
+	db 30,STARYU
+	db 30,STARYU
+
+MansionMons1:
+	db $0A
+	db 34,RATTATA
+	db 34,RATICATE
+	db 23,GRIMER
+	db 26,GROWLITHE
+	db 37,RATTATA
+	db 37,RATICATE
+	db 30,GROWLITHE
+	db 26,GRIMER
+	db 34,GROWLITHE
+	db 38,GROWLITHE
+
+	db $00
+
+MansionMons2:
+	db $0A
+	db 37,RATTATA
+	db 37,RATICATE
+	db 26,GRIMER
+	db 29,GRIMER
+	db 40,RATTATA
+	db 40,RATICATE
+	db 32,GRIMER
+	db 35,GRIMER
+	db 35,MUK
+	db 38,MUK
+
+	db $00
+
+MansionMons3:
+	db $0A
+	db 40,RATTATA
+	db 40,RATICATE
+	db 32,GRIMER
+	db 35,GRIMER
+	db 43,RATTATA
+	db 43,RATICATE
+	db 38,GRIMER
+	db 38,GRIMER
+	db 38,MUK
+	db 41,MUK
+
+	db $00
+
+MansionMonsB1:
+	db $0A
+	db 35,GRIMER
+	db 38,GRIMER
+	db 37,RATICATE
+	db 40,RATICATE
+	db 41,MUK
+	db 43,RATICATE
+	db 24,DITTO
+	db 46,RATICATE
+	db 18,DITTO
+	db 12,DITTO
+
+	db $00
+
+Route21Mons:
+	db $19
+	db 15,PIDGEY
+	db 13,RATTATA
+	db 13,PIDGEY
+	db 11,PIDGEY
+	db 17,PIDGEY
+	db 15,RATTATA
+	db 15,RATICATE
+	db 17,PIDGEOTTO
+	db 19,PIDGEOTTO
+	db 15,PIDGEOTTO
+
+	db $05
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 20,TENTACOOL
+	db 30,TENTACOOL
+	db 35,TENTACOOL
+	db 40,TENTACOOL
+
+DungeonMons1:
+	db $0A
+	db 50,GOLBAT
+	db 55,GOLBAT
+	db 45,GRAVELER
+	db 55,GLOOM
+	db 55,WEEPINBELL
+	db 52,SANDSLASH
+	db 54,VENOMOTH
+	db 54,PARASECT
+	db 55,DITTO
+	db 60,DITTO
+
+	db $00
+
+DungeonMons2:
+	db $0F
+	db 52,GOLBAT
+	db 57,GOLBAT
+	db 50,GRAVELER
+	db 56,SANDSLASH
+	db 50,RHYHORN
+	db 60,DITTO
+	db 58,GLOOM
+	db 58,WEEPINBELL
+	db 60,RHYDON
+	db 58,RHYDON
+
+	db $00
+
+DungeonMonsB1:
+	db $19
+	db 54,GOLBAT
+	db 59,GOLBAT
+	db 55,GRAVELER
+	db 52,RHYHORN
+	db 62,RHYDON
+	db 60,DITTO
+	db 56,CHANSEY
+	db 65,DITTO
+	db 55,LICKITUNG
+	db 50,LICKITUNG
+
+	db $00
+
+PowerPlantMons:
+	db $0A
+	db 30,MAGNEMITE
+	db 35,MAGNEMITE
+	db 33,MAGNETON
+	db 33,VOLTORB
+	db 37,VOLTORB
+	db 33,GRIMER
+	db 37,GRIMER
+	db 38,MAGNETON
+	db 33,MUK
+	db 37,MUK
+
+	db $00
+
+Route23Mons:
+	db $0A
+	db 41,NIDORINO
+	db 41,NIDORINA
+	db 36,MANKEY
+	db 44,NIDORINO
+	db 44,NIDORINA
+	db 40,FEAROW
+	db 41,MANKEY
+	db 45,FEAROW
+	db 41,PRIMEAPE
+	db 46,PRIMEAPE
+
+	db $00
+
+PlateauMons2:
+	db $0A
+	db 31,GEODUDE
+	db 36,GEODUDE
+	db 41,GEODUDE
+	db 44,ZUBAT
+	db 39,GOLBAT
+	db 44,GRAVELER
+	db 45,ONIX
+	db 47,ONIX
+	db 39,MACHOKE
+	db 42,MACHOKE
+
+	db $00
+
+PlateauMons3:
+	db $0F
+	db 36,GEODUDE
+	db 44,GOLBAT
+	db 41,GEODUDE
+	db 49,ONIX
+	db 46,GEODUDE
+	db 41,GRAVELER
+	db 42,MACHOKE
+	db 45,MACHOKE
+	db 47,GRAVELER
+	db 47,GRAVELER
+
+	db $00
+
+PlateauMons1:
+	db $0F
+	db 26,GEODUDE
+	db 31,GEODUDE
+	db 36,GEODUDE
+	db 39,ZUBAT
+	db 44,ZUBAT
+	db 41,GEODUDE
+	db 43,ONIX
+	db 45,ONIX
+	db 41,GRAVELER
+	db 47,GRAVELER
+
+	db $00
+
+CaveMons:
+	db $14
+	db 18,DIGLETT
+	db 19,DIGLETT
+	db 17,DIGLETT
+	db 20,DIGLETT
+	db 16,DIGLETT
+	db 15,DIGLETT
+	db 21,DIGLETT
+	db 22,DIGLETT
+	db 29,DUGTRIO
+	db 31,DUGTRIO
+
+	db $00
+
+ENDC
 
 GetItemUse:		;$D5C7
 	ld a,1
-- 
cgit v1.2.3


From da2c784ae78800545e6f5080c26d8a05bba8996b Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Fri, 13 Jan 2012 22:21:16 -0600
Subject: romvisualizer - make gif animation of progress

hg-commit-id: c2fbb929af69
---
 extras/romvisualizer.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 extras/romvisualizer.py

diff --git a/extras/romvisualizer.py b/extras/romvisualizer.py
new file mode 100644
index 00000000..a5e2af7a
--- /dev/null
+++ b/extras/romvisualizer.py
@@ -0,0 +1,26 @@
+#!/usr/bin/python
+#author: Bryan Bishop <kanzure@gmail.com>
+#date: 2012-01-13
+import os
+
+changeset_numbers = range(266, 635)
+
+def take_snapshot_image(changeset_number):
+    "turn pokered.asm into an image at a certain version"
+
+    print "reverting pokered.asm to r" + str(changeset_number)
+
+    #revert the file
+    os.system("hg revert ../pokered.asm -r" + str(changeset_number))
+
+    print "generating the image.."
+
+    #draw the image
+    os.system("python romviz.py")
+
+    #move the file
+    os.system("mv test.png versions/" + str(changeset_number) + ".png")
+
+for changeset_number in changeset_numbers:
+    take_snapshot_image(changeset_number)
+
-- 
cgit v1.2.3


From 7cfb09f969f3112403c19ccfd114a1d2b91a35be Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Sat, 14 Jan 2012 00:40:03 -0600
Subject: tileset files in gfx/tilesets/

hg-commit-id: a1dd793bdd7f
---
 extras/extract_tilesets.py |  38 ++++++++++++++++++++++++++++++++++++++
 gfx/tilesets/00.2bpp       | Bin 0 -> 1504 bytes
 gfx/tilesets/01.2bpp       | Bin 0 -> 1168 bytes
 gfx/tilesets/02.2bpp       | Bin 0 -> 1536 bytes
 gfx/tilesets/03.2bpp       | Bin 0 -> 1536 bytes
 gfx/tilesets/05.2bpp       | Bin 0 -> 1536 bytes
 gfx/tilesets/08.2bpp       | Bin 0 -> 1504 bytes
 gfx/tilesets/09.2bpp       | Bin 0 -> 1520 bytes
 gfx/tilesets/0b.2bpp       | Bin 0 -> 400 bytes
 gfx/tilesets/0d.2bpp       | Bin 0 -> 1440 bytes
 gfx/tilesets/0e.2bpp       | Bin 0 -> 1504 bytes
 gfx/tilesets/0f.2bpp       | Bin 0 -> 1472 bytes
 gfx/tilesets/10.2bpp       | Bin 0 -> 1520 bytes
 gfx/tilesets/11.2bpp       | Bin 0 -> 1056 bytes
 gfx/tilesets/12.2bpp       | Bin 0 -> 1504 bytes
 gfx/tilesets/13.2bpp       | Bin 0 -> 1504 bytes
 gfx/tilesets/14.2bpp       | Bin 0 -> 1472 bytes
 gfx/tilesets/15.2bpp       | Bin 0 -> 1200 bytes
 gfx/tilesets/16.2bpp       | Bin 0 -> 1536 bytes
 gfx/tilesets/17.2bpp       | Bin 0 -> 1120 bytes
 pokered.asm                |  40 +++++++++++++++++++++-------------------
 21 files changed, 59 insertions(+), 19 deletions(-)
 create mode 100644 extras/extract_tilesets.py
 create mode 100644 gfx/tilesets/00.2bpp
 create mode 100644 gfx/tilesets/01.2bpp
 create mode 100644 gfx/tilesets/02.2bpp
 create mode 100644 gfx/tilesets/03.2bpp
 create mode 100644 gfx/tilesets/05.2bpp
 create mode 100644 gfx/tilesets/08.2bpp
 create mode 100644 gfx/tilesets/09.2bpp
 create mode 100644 gfx/tilesets/0b.2bpp
 create mode 100644 gfx/tilesets/0d.2bpp
 create mode 100644 gfx/tilesets/0e.2bpp
 create mode 100644 gfx/tilesets/0f.2bpp
 create mode 100644 gfx/tilesets/10.2bpp
 create mode 100644 gfx/tilesets/11.2bpp
 create mode 100644 gfx/tilesets/12.2bpp
 create mode 100644 gfx/tilesets/13.2bpp
 create mode 100644 gfx/tilesets/14.2bpp
 create mode 100644 gfx/tilesets/15.2bpp
 create mode 100644 gfx/tilesets/16.2bpp
 create mode 100644 gfx/tilesets/17.2bpp

diff --git a/extras/extract_tilesets.py b/extras/extract_tilesets.py
new file mode 100644
index 00000000..4fa71f8d
--- /dev/null
+++ b/extras/extract_tilesets.py
@@ -0,0 +1,38 @@
+#!/usr/bin/python
+#author: Bryan Bishop <kanzure@gmail.com>
+#date: 2012-01-14
+#throw tilesets into separate files
+import extract_maps
+extract_maps.load_rom()
+
+locations = {
+"Tset00_GFX": [0x64000, 0x645E0, "00"],
+"Tset01_GFX": [0x64DE0, 0x65270, "01"],
+"Tset08_GFX": [0x653A0, 0x65980, "08"],
+"Tset13_GFX": [0x65BB0, 0x66190, "13"],
+"Tset0E_GFX": [0x66610, 0x66BF0, "0e"],
+"Tset10_GFX": [0x66D60, 0x67350, "10"],
+"Tset17_GFX": [0x676F0, 0x67B50, "17"],
+"Tset05_GFX": [0x6807F, 0x6867F, "05"],
+"Tset02_GFX": [0x68DBF, 0x693BF, "02"],
+"Tset09_GFX": [0x6960F, 0x69BFF, "09"],
+"Tset03_GFX": [0x6A3FF, 0x6A9FF, "03"],
+"Tset16_GFX": [0x6B1FF, 0x6B7FF, "16"],
+"Tset0F_GFX": [0x6C000, 0x6C5C0, "0f"],
+"Tset11_GFX": [0x6CCA0, 0x6D0C0, "11"],
+"Tset12_GFX": [0x6D8C0, 0x6DEA0, "12"],
+"Tset0D_GFX": [0x6E390, 0x6E930, "0d"],
+"Tset14_GFX": [0x6ED10, 0x6F2D0, "14"],
+"Tset15_GFX": [0x6F670, 0x6FB20, "15"],
+"Tset0B_GFX": [0x6FD60, 0x6FEF0, "0b"],
+}
+
+for tileset_id in locations.keys():
+    tileset = locations[tileset_id]
+
+    print "writing ../gfx/tilesets/" + tileset[2] + ".2bpp"
+    fh = open("../gfx/tilesets/" + tileset[2] + ".2bpp", "w")
+    fh.write(extract_maps.rom[tileset[0]:tileset[1]])
+    fh.close()
+
+print "Done."
diff --git a/gfx/tilesets/00.2bpp b/gfx/tilesets/00.2bpp
new file mode 100644
index 00000000..6e480769
Binary files /dev/null and b/gfx/tilesets/00.2bpp differ
diff --git a/gfx/tilesets/01.2bpp b/gfx/tilesets/01.2bpp
new file mode 100644
index 00000000..1287b9a5
Binary files /dev/null and b/gfx/tilesets/01.2bpp differ
diff --git a/gfx/tilesets/02.2bpp b/gfx/tilesets/02.2bpp
new file mode 100644
index 00000000..8f10e418
Binary files /dev/null and b/gfx/tilesets/02.2bpp differ
diff --git a/gfx/tilesets/03.2bpp b/gfx/tilesets/03.2bpp
new file mode 100644
index 00000000..06cf7a20
Binary files /dev/null and b/gfx/tilesets/03.2bpp differ
diff --git a/gfx/tilesets/05.2bpp b/gfx/tilesets/05.2bpp
new file mode 100644
index 00000000..acca6721
Binary files /dev/null and b/gfx/tilesets/05.2bpp differ
diff --git a/gfx/tilesets/08.2bpp b/gfx/tilesets/08.2bpp
new file mode 100644
index 00000000..2c15989c
Binary files /dev/null and b/gfx/tilesets/08.2bpp differ
diff --git a/gfx/tilesets/09.2bpp b/gfx/tilesets/09.2bpp
new file mode 100644
index 00000000..68f93945
Binary files /dev/null and b/gfx/tilesets/09.2bpp differ
diff --git a/gfx/tilesets/0b.2bpp b/gfx/tilesets/0b.2bpp
new file mode 100644
index 00000000..9c827e13
Binary files /dev/null and b/gfx/tilesets/0b.2bpp differ
diff --git a/gfx/tilesets/0d.2bpp b/gfx/tilesets/0d.2bpp
new file mode 100644
index 00000000..7a032775
Binary files /dev/null and b/gfx/tilesets/0d.2bpp differ
diff --git a/gfx/tilesets/0e.2bpp b/gfx/tilesets/0e.2bpp
new file mode 100644
index 00000000..06dedfed
Binary files /dev/null and b/gfx/tilesets/0e.2bpp differ
diff --git a/gfx/tilesets/0f.2bpp b/gfx/tilesets/0f.2bpp
new file mode 100644
index 00000000..d24c6437
Binary files /dev/null and b/gfx/tilesets/0f.2bpp differ
diff --git a/gfx/tilesets/10.2bpp b/gfx/tilesets/10.2bpp
new file mode 100644
index 00000000..cef7ede4
Binary files /dev/null and b/gfx/tilesets/10.2bpp differ
diff --git a/gfx/tilesets/11.2bpp b/gfx/tilesets/11.2bpp
new file mode 100644
index 00000000..1f3b5a86
Binary files /dev/null and b/gfx/tilesets/11.2bpp differ
diff --git a/gfx/tilesets/12.2bpp b/gfx/tilesets/12.2bpp
new file mode 100644
index 00000000..779ed27f
Binary files /dev/null and b/gfx/tilesets/12.2bpp differ
diff --git a/gfx/tilesets/13.2bpp b/gfx/tilesets/13.2bpp
new file mode 100644
index 00000000..c0063628
Binary files /dev/null and b/gfx/tilesets/13.2bpp differ
diff --git a/gfx/tilesets/14.2bpp b/gfx/tilesets/14.2bpp
new file mode 100644
index 00000000..65a56f55
Binary files /dev/null and b/gfx/tilesets/14.2bpp differ
diff --git a/gfx/tilesets/15.2bpp b/gfx/tilesets/15.2bpp
new file mode 100644
index 00000000..da3072dc
Binary files /dev/null and b/gfx/tilesets/15.2bpp differ
diff --git a/gfx/tilesets/16.2bpp b/gfx/tilesets/16.2bpp
new file mode 100644
index 00000000..a06ce48b
Binary files /dev/null and b/gfx/tilesets/16.2bpp differ
diff --git a/gfx/tilesets/17.2bpp b/gfx/tilesets/17.2bpp
new file mode 100644
index 00000000..e277c12b
Binary files /dev/null and b/gfx/tilesets/17.2bpp differ
diff --git a/pokered.asm b/pokered.asm
index 77cecb49..d0aaa9c0 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -34838,32 +34838,33 @@ SilphCo11Blocks: ; 81
 INCBIN "baserom.gbc",$62419,$1be7
 
 SECTION "bank19",DATA,BANK[$19]
+
 Tset00_GFX:
-	INCBIN "baserom.gbc",$64000,$645E0-$64000
+    INCBIN "gfx/tilesets/00.2bpp"
 Tset00_Block:
 	INCBIN "baserom.gbc",$645E0,$64DE0-$645E0
 Tset01_GFX:
-	INCBIN "baserom.gbc",$64DE0,$65270-$64DE0
+    INCBIN "gfx/tilesets/01.2bpp"
 Tset01_Block:
 	INCBIN "baserom.gbc",$65270,$653A0-$65270
 Tset08_GFX:
-	INCBIN "baserom.gbc",$653A0,$65980-$653A0
+    INCBIN "gfx/tilesets/08.2bpp"
 Tset08_Block:
 	INCBIN "baserom.gbc",$65980,$65BB0-$65980
 Tset13_GFX:
-	INCBIN "baserom.gbc",$65BB0,$66190-$65BB0
+    INCBIN "gfx/tilesets/13.2bpp"
 Tset13_Block:
 	INCBIN "baserom.gbc",$66190,$66610-$66190
 Tset0E_GFX:
-	INCBIN "baserom.gbc",$66610,$66BF0-$66610
+    INCBIN "gfx/tilesets/0e.2bpp"
 Tset0E_Block:
 	INCBIN "baserom.gbc",$66BF0,$66D60-$66BF0
 Tset10_GFX:
-	INCBIN "baserom.gbc",$66D60,$67350-$66D60
+    INCBIN "gfx/tilesets/10.2bpp"
 Tset10_Block:
 	INCBIN "baserom.gbc",$67350,$676F0-$67350
 Tset17_GFX:
-	INCBIN "baserom.gbc",$676F0,$67B50-$676F0
+    INCBIN "gfx/tilesets/17.2bpp"
 Tset17_Block:
 	INCBIN "baserom.gbc",$67B50,$68000-$67B50
 
@@ -34902,53 +34903,54 @@ DecrementPP:
 INCBIN "baserom.gbc",$6802F,$6807F-$6802F
 
 Tset05_GFX:
-	INCBIN "baserom.gbc",$6807F,$6867F-$6807F
+    INCBIN "gfx/tilesets/05.2bpp"
 Tset05_Block:
 	INCBIN "baserom.gbc",$6867F,$68DBF-$6867F
 Tset02_GFX:
-	INCBIN "baserom.gbc",$68DBF,$693BF-$68DBF
+    INCBIN "gfx/tilesets/02.2bpp"
 Tset02_Block:
 	INCBIN "baserom.gbc",$693BF,$6960F-$693BF
 Tset09_GFX:
-	INCBIN "baserom.gbc",$6960F,$69BFF-$6960F
+    INCBIN "gfx/tilesets/09.2bpp"
 Tset09_Block:
 	INCBIN "baserom.gbc",$69BFF,$6A3FF-$69BFF
 Tset03_GFX:
-	INCBIN "baserom.gbc",$6A3FF,$6A9FF-$6A3FF
+    INCBIN "gfx/tilesets/03.2bpp"
 Tset03_Block:
 	INCBIN "baserom.gbc",$6A9FF,$6B1FF-$6A9FF
 Tset16_GFX:
-	INCBIN "baserom.gbc",$6B1FF,$6B7FF-$6B1FF
+    INCBIN "gfx/tilesets/16.2bpp"
 Tset16_Block:
 	INCBIN "baserom.gbc",$6B7FF,$6C000-$6B7FF
 
 SECTION "bank1B",DATA,BANK[$1B]
+
 Tset0F_GFX:
-	INCBIN "baserom.gbc",$6C000,$6C5C0-$6C000
+    INCBIN "gfx/tilesets/0f.2bpp"
 Tset0F_Block:
 	INCBIN "baserom.gbc",$6C5C0,$6CCA0-$6C5C0
 Tset11_GFX:
-	INCBIN "baserom.gbc",$6CCA0,$6D0C0-$6CCA0
+    INCBIN "gfx/tilesets/11.2bpp"
 Tset11_Block:
 	INCBIN "baserom.gbc",$6D0C0,$6D8C0-$6D0C0
 Tset12_GFX:
-	INCBIN "baserom.gbc",$6D8C0,$6DEA0-$6D8C0
+    INCBIN "gfx/tilesets/12.2bpp"
 Tset12_Block:
 	INCBIN "baserom.gbc",$6DEA0,$6E390-$6DEA0
 Tset0D_GFX:
-	INCBIN "baserom.gbc",$6E390,$6E930-$6E390
+    INCBIN "gfx/tilesets/0d.2bpp"
 Tset0D_Block:
 	INCBIN "baserom.gbc",$6E930,$6ED10-$6E930
 Tset14_GFX:
-	INCBIN "baserom.gbc",$6ED10,$6F2D0-$6ED10
+    INCBIN "gfx/tilesets/14.2bpp"
 Tset14_Block:
 	INCBIN "baserom.gbc",$6F2D0,$6F670-$6F2D0
 Tset15_GFX:
-	INCBIN "baserom.gbc",$6F670,$6FB20-$6F670
+    INCBIN "gfx/tilesets/15.2bpp"
 Tset15_Block:
 	INCBIN "baserom.gbc",$6FB20,$6FD60-$6FB20
 Tset0B_GFX:
-	INCBIN "baserom.gbc",$6FD60,$6FEF0-$6FD60
+    INCBIN "gfx/tilesets/0b.2bpp"
 Tset0B_Block:
 	INCBIN "baserom.gbc",$6FEF0,$70000-$6FEF0
 
-- 
cgit v1.2.3


From 8c57ee483c0072f84d82ac96dc1c3bba52c10bde Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Sat, 14 Jan 2012 00:58:39 -0600
Subject: gfx/redgreenversion.1bpp in bank $1A

hg-commit-id: d281dea4b799
---
 gfx/redgreenversion.1bpp | Bin 0 -> 80 bytes
 pokered.asm              |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 gfx/redgreenversion.1bpp

diff --git a/gfx/redgreenversion.1bpp b/gfx/redgreenversion.1bpp
new file mode 100644
index 00000000..2d99e99d
Binary files /dev/null and b/gfx/redgreenversion.1bpp differ
diff --git a/pokered.asm b/pokered.asm
index d0aaa9c0..4d70c123 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -34900,7 +34900,7 @@ DecrementPP:
 	dec [hl] ; Decrement PP
 	ret
 
-INCBIN "baserom.gbc",$6802F,$6807F-$6802F
+INCBIN "gfx/redgreenversion.1bpp"
 
 Tset05_GFX:
     INCBIN "gfx/tilesets/05.2bpp"
-- 
cgit v1.2.3


From 62a87707e30998ff163fd0539018dac11a2637f1 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Sat, 14 Jan 2012 11:21:35 -0600
Subject: ViridianHouseBlocks and PewterHouse1Blocks are the same

hg-commit-id: f2c45cdce8f7
---
 pokered.asm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index 4d70c123..394844e7 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -10402,7 +10402,8 @@ UndergroundPathEntranceRoute8Blocks: ; 16
 OaksLabBlocks: ; 30
     INCBIN "maps/oakslab.blk"
 
-ViridianHouseBlocks: ; 16
+PewterHouse1Blocks:
+ViridianHouseBlocks: ; 16 0x1c1de
     INCBIN "maps/viridianhouse.blk"
 
 SchoolBlocks: ; 16
@@ -11525,7 +11526,7 @@ ViridianHouseObject: ; 0x1d5bb (size=44)
 PewterHouse1_h: ; 0x1d5e7 to 0x1d5f3 (12 bytes) (bank=7) (id=55)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, PewterHouse1Texts, PewterHouse1Script ; blocks, texts, scripts
+    dw PewterHouse1Blocks, PewterHouse1Texts, PewterHouse1Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw PewterHouse1Object ; objects
-- 
cgit v1.2.3


From 9b02af7de5b9d0679f8221fc9d2c7cb303048c73 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Sat, 14 Jan 2012 11:26:47 -0600
Subject: common labels for house blocks

hg-commit-id: 970b15035441
---
 pokered.asm | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index 394844e7..1f539200 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -10402,8 +10402,18 @@ UndergroundPathEntranceRoute8Blocks: ; 16
 OaksLabBlocks: ; 30
     INCBIN "maps/oakslab.blk"
 
+Route16HouseBlocks:
+Route2HouseBlocks:
+SaffronHouse1Blocks:
+SaffronHouse2Blocks:
+VermilionHouse1Blocks:
+NameRaterBlocks:
+LavenderHouse1Blocks:
+LavenderHouse2Blocks:
+CeruleanHouse2Blocks:
 PewterHouse1Blocks:
-ViridianHouseBlocks: ; 16 0x1c1de
+PewterHouse2Blocks:
+ViridianHouseBlocks: ; 16 0x1c1de 41DE
     INCBIN "maps/viridianhouse.blk"
 
 SchoolBlocks: ; 16
@@ -11575,7 +11585,7 @@ PewterHouse1Object: ; 0x1d616 (size=38)
 PewterHouse2_h: ; 0x1d63c to 0x1d648 (12 bytes) (bank=7) (id=57)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, PewterHouse2Texts, PewterHouse2Script ; blocks, texts, scripts
+    dw PewterHouse2Blocks, PewterHouse2Texts, PewterHouse2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw PewterHouse2Object ; objects
@@ -11677,7 +11687,7 @@ CeruleanHouseTrashedObject: ; 0x1d6bf (size=43)
 CeruleanHouse2_h: ; 0x1d6ea to 0x1d6f6 (12 bytes) (bank=7) (id=63)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, CeruleanHouse2Texts, CeruleanHouse2Script ; blocks, texts, scripts
+    dw CeruleanHouse2Blocks, CeruleanHouse2Texts, CeruleanHouse2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw CeruleanHouse2Object ; objects
@@ -11856,7 +11866,7 @@ BikeShopBlocks: ; 16
 LavenderHouse1_h: ; 0x1d89c to 0x1d8a8 (12 bytes) (bank=7) (id=149)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, LavenderHouse1Texts, LavenderHouse1Script ; blocks, texts, scripts
+    dw LavenderHouse1Blocks, LavenderHouse1Texts, LavenderHouse1Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw LavenderHouse1Object ; objects
@@ -11971,7 +11981,7 @@ LavenderHouse1Object: ; 0x1d96a (size=56)
 LavenderHouse2_h: ; 0x1d9a2 to 0x1d9ae (12 bytes) (bank=7) (id=151)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, LavenderHouse2Texts, LavenderHouse2Script ; blocks, texts, scripts
+    dw LavenderHouse2Blocks, LavenderHouse2Texts, LavenderHouse2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw LavenderHouse2Object ; objects
@@ -12028,7 +12038,7 @@ LavenderHouse2Object: ; 0x1d9e6 (size=32)
 NameRater_h: ; 0x1da06 to 0x1da12 (12 bytes) (bank=7) (id=229)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, $5a54, NameRaterScript ; blocks, texts, scripts
+    dw NameRaterBlocks, $5a54, NameRaterScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw NameRaterObject ; objects
@@ -12101,7 +12111,7 @@ NameRaterObject: ; 0x1dad6 (size=26)
 VermilionHouse1_h: ; 0x1daf0 to 0x1dafc (12 bytes) (bank=7) (id=93)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, VermilionHouse1Texts, VermilionHouse1Script ; blocks, texts, scripts
+    dw VermilionHouse1Blocks, VermilionHouse1Texts, VermilionHouse1Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw VermilionHouse1Object ; objects
@@ -12313,7 +12323,7 @@ FuchsiaMartBlocks: ; 16
 SaffronHouse1_h: ; 0x1ddd1 to 0x1dddd (12 bytes) (bank=7) (id=179)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, SaffronHouse1Texts, SaffronHouse1Script ; blocks, texts, scripts
+    dw SaffronHouse1Blocks, SaffronHouse1Texts, SaffronHouse1Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw SaffronHouse1Object ; objects
@@ -12367,7 +12377,7 @@ SaffronHouse1Object: ; 0x1de04 (size=44)
 SaffronHouse2_h: ; 0x1de30 to 0x1de3c (12 bytes) (bank=7) (id=183)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, SaffronHouse2Texts, SaffronHouse2Script ; blocks, texts, scripts
+    dw SaffronHouse2Blocks, SaffronHouse2Texts, SaffronHouse2Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw SaffronHouse2Object ; objects
@@ -12464,7 +12474,7 @@ DiglettsCaveRoute2Object: ; 0x1debf (size=34)
 Route2House_h: ; 0x1dee1 to 0x1deed (12 bytes) (bank=7) (id=48)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, Route2HouseTexts, Route2HouseScript ; blocks, texts, scripts
+    dw Route2HouseBlocks, Route2HouseTexts, Route2HouseScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw Route2HouseObject ; objects
@@ -13084,7 +13094,7 @@ DiglettsCaveEntranceRoute11Object: ; 0x1e5ca (size=34)
 Route16House_h: ; 0x1e5ec to 0x1e5f8 (12 bytes) (bank=7) (id=188)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41de, Route16HouseTexts, Route16HouseScript ; blocks, texts, scripts
+    dw Route16HouseBlocks, Route16HouseTexts, Route16HouseScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw Route16HouseObject ; objects
-- 
cgit v1.2.3


From 417cc8813654ebd1c6613bf83bc111a06bb5d85e Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Sat, 14 Jan 2012 11:32:06 -0600
Subject: use the BillsHouseBlocks file

hg-commit-id: 67b094dbded2
---
 pokered.asm | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index 1f539200..46019edc 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -10416,12 +10416,14 @@ PewterHouse2Blocks:
 ViridianHouseBlocks: ; 16 0x1c1de 41DE
     INCBIN "maps/viridianhouse.blk"
 
-SchoolBlocks: ; 16
+CeladonMansion5Blocks:
+SchoolBlocks: ; 16 0x1c1ee 41EE
     INCBIN "maps/school.blk"
 
 CeruleanHouseTrashedBlocks: ; 16
     INCBIN "maps/ceruleanhousetrashed.blk"
 
+DiglettsCaveEntranceRoute11Blocks:
 DiglettsCaveRoute2Blocks: ; 16
     INCBIN "maps/diglettscaveroute2.blk"
 
@@ -12231,7 +12233,7 @@ VermilionDockBlocks: ; 84
 CeladonMansion5_h: ; 0x1dd2e to 0x1dd3a (12 bytes) (bank=7) (id=132)
     db $08 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $41ee, CeladonMansion5Texts, CeladonMansion5Script ; blocks, texts, scripts
+    dw CeladonMansion5Blocks, CeladonMansion5Texts, CeladonMansion5Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw CeladonMansion5Object ; objects
@@ -13052,7 +13054,7 @@ PowerPlantBlocks: ; 360
 DiglettsCaveEntranceRoute11_h: ; 0x1e5ae to 0x1e5ba (12 bytes) (bank=7) (id=85)
     db $11 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $420e, DiglettsCaveEntranceRoute11Texts, DiglettsCaveEntranceRoute11Script ; blocks, texts, scripts
+    dw DiglettsCaveEntranceRoute11Blocks, DiglettsCaveEntranceRoute11Texts, DiglettsCaveEntranceRoute11Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw DiglettsCaveEntranceRoute11Object ; objects
@@ -13260,7 +13262,7 @@ Route22GateBlocks: ; 20
 BillsHouse_h: ; 0x1e75e to 0x1e76a (12 bytes) (bank=7) (id=88)
     db $10 ; tileset
     db $04, $04 ; dimensions (y, x)
-    dw $6905, BillsHouseTexts, BillsHouseScript ; blocks, texts, scripts
+    dw BillsHouseBlocks, BillsHouseTexts, BillsHouseScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw BillsHouseObject ; objects
@@ -13388,7 +13390,10 @@ BillsHouseObject: ; 0x1e8df (size=38)
     EVENT_DISP $4, $7, $2
     EVENT_DISP $4, $7, $3
 
-INCBIN "baserom.gbc",$1e905,$16fb
+BillsHouseBlocks:
+    INCBIN "maps/billshouse.blk"
+
+INCBIN "baserom.gbc",$1e905 + 16,$16fb - 16
 
 SECTION "bank8",DATA,BANK[$8]
 
-- 
cgit v1.2.3


From ce40c8ca874a2098574a4349570550191b516186 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Sat, 14 Jan 2012 11:45:08 -0600
Subject: fixed up texts for ViridianPokecenter

hg-commit-id: 7ffd3107b10a
---
 pokered.asm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index 46019edc..1a0a249b 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -20358,7 +20358,7 @@ LavenderTownObject: ; 0x4402d (size=88)
 LavenderTownBlocks: ; 90
     INCBIN "maps/lavendertown.blk"
 
-ViridianPokeCenterBlocks: ; 28
+ViridianPokecenterBlocks: ; 28
     INCBIN "maps/viridianpokecenter.blk"
 
 SafariZoneRestHouse1Blocks: ; 16
@@ -20416,20 +20416,23 @@ INCBIN "baserom.gbc",$44169,$e8
 ViridianPokecenter_h: ; 0x44251 to 0x4425d (12 bytes) (bank=11) (id=41)
     db $06 ; tileset
     db $04, $07 ; dimensions (y, x)
-    dw $40df, $4263, ViridianPokeCenterScript ; blocks, texts, scripts
+    dw ViridianPokecenterBlocks, ViridianPokecenterTexts, ViridianPokeCenterScript ; blocks, texts, scripts
     db $00 ; connections
 
-    dw $4277 ; objects
+    dw ViridianPokecenterObject ; objects
 
 ViridianPokeCenterScript: ; 0x4425d
     call $22fa
     jp $3c3c
 ; 0x44263
 
-INCBIN "baserom.gbc",$44263,$9
+ViridianPokecenterTexts: ; 0x44263
+    dw ViridianPokeCenterText1, ViridianPokeCenterText2, ViridianPokeCenterText3, ViridianPokeCenterText4
 
-ViridianPokeCenterText2:
-ViridianPokeCenterText1: ; 0x4426c
+ViridianPokeCenterText1: ; 0x4426b
+    db $ff
+
+ViridianPokeCenterText2: ; 0x4426c
     TX_FAR _ViridianPokeCenterText1
     db $50
 
@@ -20442,7 +20445,7 @@ ViridianPokeCenterText3: ; 0x44271
 ViridianPokeCenterText4:
     db $f6
 
-ViridianPokeCenterObject: ; 0x44277 (size=44)
+ViridianPokecenterObject: ; 0x44277 (size=44)
     db $0 ; border tile
 
     db $2 ; warps
-- 
cgit v1.2.3


From fd8bfbd633376445efe501870a6ddbf3684af99f Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Sat, 14 Jan 2012 11:56:04 -0600
Subject: add labels and block file to Mansion1

hg-commit-id: 8092d8b19c96
---
 pokered.asm | 48 +++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/pokered.asm b/pokered.asm
index 1a0a249b..f60b37a0 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -20467,12 +20467,53 @@ ViridianPokecenterObject: ; 0x44277 (size=44)
 Mansion1_h: ; 0x442a3 to 0x442af (12 bytes) (bank=11) (id=165)
     db $16 ; tileset
     db $0e, $0f ; dimensions (y, x)
-    dw $43fe, $432c, $42af ; blocks, texts, scripts
+    dw Mansion1Blocks, Mansion1Texts, Mansion1Script ; blocks, texts, scripts
     db $00 ; connections
 
     dw Mansion1Object ; objects
 
-INCBIN "baserom.gbc",$442af,$44341 - $442af
+Mansion1Script:
+    call Mansion1Subscript1
+    call $3c3c
+    ld hl, $4334
+    ld de, $4326
+    ld a, [$d63a]
+    call $3160
+    ld [$d63a], a
+    ret
+; 0x442c5
+
+Mansion1Subscript1: ; 0x442c5
+    ld hl, $d126
+    bit 5, [hl]
+    res 5, [hl]
+    ret z
+    ld a, [$d796]
+    bit 0, a
+    jr nz, .asm_442ec ; 0x442d2 $18
+    ld bc, $060c
+    call $430b
+    ld bc, $0308
+    call $4304
+    ld bc, $080a
+    call $4304
+    ld bc, $0d0d
+    jp $4304
+.asm_442ec
+    ld bc, $060c
+    call $4304
+    ld bc, $0308
+    call $430b
+    ld bc, $080a
+    call $430b
+    ld bc, $0d0d
+    jp $430b
+; 0x44304
+
+INCBIN "baserom.gbc",$44304,$4432c - $44304
+
+Mansion1Texts: ; 4432c
+INCBIN "baserom.gbc",$4432c,$44341 - $4432c
 
 Mansion1Text1: ; 0x44341
     db $08 ; asm
@@ -20512,7 +20553,8 @@ Mansion1Object: ; 0x443a4 (size=90)
     EVENT_DISP $f, $1b, $1a
     EVENT_DISP $f, $1b, $1b
 
-INCBIN "baserom.gbc",$443fe,$d2
+Mansion1Blocks: ; 203
+    INCBIN "maps/mansion1.blk"
 
 RockTunnel1_h: ; 0x444d0 to 0x444dc (12 bytes) (bank=11) (id=82)
     db $11 ; tileset
-- 
cgit v1.2.3